Test Failed
Pull Request — master (#347)
by Kiran
17:16
created
geodirectory-functions/map-functions/map_functions.php 3 patches
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
                         global $sitepress;
246 246
                         $default_lang = $sitepress->get_default_language();
247 247
                         $term_id = icl_object_id($cat_term->term_id, $post_type.'category', true, $default_lang);
248
-                    }else{
248
+                    } else{
249 249
                         $term_id = $cat_term->term_id;
250 250
                     }
251 251
                     if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
@@ -273,8 +273,9 @@  discard block
 block discarded – undo
273 273
 
274 274
         return $out;
275 275
     } else {
276
-        if ($cat_parent == 0)
277
-            return _e('No category', 'geodirectory');
276
+        if ($cat_parent == 0) {
277
+                    return _e('No category', 'geodirectory');
278
+        }
278 279
     }
279 280
     return;
280 281
 }
Please login to merge, or discard this patch.
Indentation   +231 added lines, -231 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
  */
16 16
 function  geodir_init_map_jason()
17 17
 {
18
-    global $map_jason;
19
-    $map_jason = array();
18
+	global $map_jason;
19
+	$map_jason = array();
20 20
 }
21 21
 
22 22
 /**
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
28 28
  */
29 29
 function geodir_init_map_canvas_array()
30 30
 {
31
-    global $map_canvas_arr;
32
-    $map_canvas_arr = array();
31
+	global $map_canvas_arr;
32
+	$map_canvas_arr = array();
33 33
 }
34 34
 
35 35
 
@@ -50,56 +50,56 @@  discard block
 block discarded – undo
50 50
  */
51 51
 function create_marker_jason_of_posts($post)
52 52
 {
53
-    global $wpdb, $map_jason, $add_post_in_marker_array, $geodir_cat_icons, $gd_marker_sizes;
53
+	global $wpdb, $map_jason, $add_post_in_marker_array, $geodir_cat_icons, $gd_marker_sizes;
54 54
 
55
-    if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {
55
+	if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {
56 56
 
57
-        if(isset($map_jason[$post->ID])){return null;}
57
+		if(isset($map_jason[$post->ID])){return null;}
58 58
 
59
-        $srcharr = array("'", "/", "-", '"', '\\');
60
-        $replarr = array("′", "⁄", "–", "“", '');
59
+		$srcharr = array("'", "/", "-", '"', '\\');
60
+		$replarr = array("′", "⁄", "–", "“", '');
61 61
 
62 62
 
63
-        $geodir_cat_icons = geodir_get_term_icon();
64
-        $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$post->default_category]) ? $geodir_cat_icons[$post->default_category] : '';
63
+		$geodir_cat_icons = geodir_get_term_icon();
64
+		$icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$post->default_category]) ? $geodir_cat_icons[$post->default_category] : '';
65 65
 
66
-        $post_title = $post->post_title;
67
-        $title = str_replace($srcharr, $replarr, $post_title);
66
+		$post_title = $post->post_title;
67
+		$title = str_replace($srcharr, $replarr, $post_title);
68 68
 
69
-        if (is_ssl()) {
70
-            $icon = str_replace("http:","https:",$icon );
71
-        }
69
+		if (is_ssl()) {
70
+			$icon = str_replace("http:","https:",$icon );
71
+		}
72 72
         
73
-        if ($icon != '') {
74
-            $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes;
73
+		if ($icon != '') {
74
+			$gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes;
75 75
             
76
-            if (isset($gd_marker_sizes[$icon])) {
77
-                $icon_size = $gd_marker_sizes[$icon];
78
-            } else {
79
-                $icon_size = geodir_get_marker_size($icon);
80
-                $gd_marker_sizes[$icon] = $icon_size;
81
-            }               
82
-        } else {
83
-            $icon_size = array('w' => 36, 'h' => 45);
84
-        }
85
-
86
-        $post_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->default_category . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"}';
87
-
88
-        /**
89
-         * Filter the json data when creating output for post json marker..
90
-         *
91
-         * @since 1.5.7
92
-         * @param string $post_json JSON representation of the post marker info.
93
-         * @param object $post The post object.
94
-         */
95
-        $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
96
-
97
-        // only assign it if it has a value
98
-        if($post_map_json){
99
-            $map_jason[$post->ID] = $post_map_json;
100
-        }
101
-
102
-    }
76
+			if (isset($gd_marker_sizes[$icon])) {
77
+				$icon_size = $gd_marker_sizes[$icon];
78
+			} else {
79
+				$icon_size = geodir_get_marker_size($icon);
80
+				$gd_marker_sizes[$icon] = $icon_size;
81
+			}               
82
+		} else {
83
+			$icon_size = array('w' => 36, 'h' => 45);
84
+		}
85
+
86
+		$post_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->default_category . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"}';
87
+
88
+		/**
89
+		 * Filter the json data when creating output for post json marker..
90
+		 *
91
+		 * @since 1.5.7
92
+		 * @param string $post_json JSON representation of the post marker info.
93
+		 * @param object $post The post object.
94
+		 */
95
+		$post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
96
+
97
+		// only assign it if it has a value
98
+		if($post_map_json){
99
+			$map_jason[$post->ID] = $post_map_json;
100
+		}
101
+
102
+	}
103 103
 }
104 104
 
105 105
 /**
@@ -112,67 +112,67 @@  discard block
 block discarded – undo
112 112
  */
113 113
 function send_marker_jason_to_js()
114 114
 {
115
-    global $map_jason, $map_canvas_arr;
116
-
117
-    if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {
118
-        foreach ($map_canvas_arr as $canvas => $jason) {
119
-            if (is_array($map_jason) && !empty($map_jason)) {
120
-
121
-                // on details page only show the main marker on the map
122
-                if(geodir_is_page('detail')){
123
-                    global $post;
124
-                    if(isset($map_jason[$post->ID])){
125
-                        $map_jason = array($map_jason[$post->ID]);
126
-                    }
127
-                }
128
-                $canvas_jason = $canvas . "_jason";
129
-                $map_canvas_arr[$canvas] = array_unique($map_jason);
130
-                unset($cat_content_info);
131
-                $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
132
-                $totalcount = count(array_unique($map_jason));
133
-                if (!empty($cat_content_info)) {
134
-                    $json_content = substr(implode(',', $cat_content_info), 1);
135
-                    $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
136
-                    $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08
137
-                    $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
138
-                } else {
139
-                    $canvas_jason = '[{"totalcount":"0"}]';
140
-                }
141
-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);
142
-
143
-                /**
144
-                 * Filter the send_marker_jason_to_js() function map canvas json args.
145
-                 *
146
-                 * You can use this filter to modify map canvas json args.
147
-                 *
148
-                 * @since 1.0.0
149
-                 * @package GeoDirectory
150
-                 * @param string $canvas Map canvas array key.
151
-                 * @param array $map_canvas_jason_args Map canvas args.
152
-                 */
153
-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
154
-
155
-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
156
-            } else {
157
-                $canvas_jason = '[{"totalcount":"0"}]';
158
-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);
159
-
160
-                /**
161
-                 * Filter the send_marker_jason_to_js() function map canvas json args.
162
-                 *
163
-                 * You can use this filter to modify map canvas json args.
164
-                 *
165
-                 * @since 1.0.0
166
-                 * @package GeoDirectory
167
-                 * @param string $canvas Map canvas array key.
168
-                 * @param array $map_canvas_jason_args Map canvas args.
169
-                 */
170
-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
171
-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
172
-            }
173
-        }
174
-
175
-    }
115
+	global $map_jason, $map_canvas_arr;
116
+
117
+	if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {
118
+		foreach ($map_canvas_arr as $canvas => $jason) {
119
+			if (is_array($map_jason) && !empty($map_jason)) {
120
+
121
+				// on details page only show the main marker on the map
122
+				if(geodir_is_page('detail')){
123
+					global $post;
124
+					if(isset($map_jason[$post->ID])){
125
+						$map_jason = array($map_jason[$post->ID]);
126
+					}
127
+				}
128
+				$canvas_jason = $canvas . "_jason";
129
+				$map_canvas_arr[$canvas] = array_unique($map_jason);
130
+				unset($cat_content_info);
131
+				$cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
132
+				$totalcount = count(array_unique($map_jason));
133
+				if (!empty($cat_content_info)) {
134
+					$json_content = substr(implode(',', $cat_content_info), 1);
135
+					$json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
136
+					$json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08
137
+					$canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
138
+				} else {
139
+					$canvas_jason = '[{"totalcount":"0"}]';
140
+				}
141
+				$map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);
142
+
143
+				/**
144
+				 * Filter the send_marker_jason_to_js() function map canvas json args.
145
+				 *
146
+				 * You can use this filter to modify map canvas json args.
147
+				 *
148
+				 * @since 1.0.0
149
+				 * @package GeoDirectory
150
+				 * @param string $canvas Map canvas array key.
151
+				 * @param array $map_canvas_jason_args Map canvas args.
152
+				 */
153
+				$map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
154
+
155
+				wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
156
+			} else {
157
+				$canvas_jason = '[{"totalcount":"0"}]';
158
+				$map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);
159
+
160
+				/**
161
+				 * Filter the send_marker_jason_to_js() function map canvas json args.
162
+				 *
163
+				 * You can use this filter to modify map canvas json args.
164
+				 *
165
+				 * @since 1.0.0
166
+				 * @package GeoDirectory
167
+				 * @param string $canvas Map canvas array key.
168
+				 * @param array $map_canvas_jason_args Map canvas args.
169
+				 */
170
+				$map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
171
+				wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
172
+			}
173
+		}
174
+
175
+	}
176 176
 }
177 177
 
178 178
 /**
@@ -195,99 +195,99 @@  discard block
 block discarded – undo
195 195
  */
196 196
 function home_map_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = true, $pading = 0, $map_canvas_name = '', $child_collapse, $is_home_map = false)
197 197
 {
198
-    global $cat_count, $geodir_cat_icons, $gd_session;
198
+	global $cat_count, $geodir_cat_icons, $gd_session;
199 199
 
200
-    $exclude_categories = get_option('geodir_exclude_cat_on_map');
201
-    $exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');
200
+	$exclude_categories = get_option('geodir_exclude_cat_on_map');
201
+	$exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');
202 202
 
203
-    // check if exclude categories saved before fix of categories identical names
204
-    if ($exclude_categories_new) {
205
-        $gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : '';
206
-        $exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array();
207
-    }
203
+	// check if exclude categories saved before fix of categories identical names
204
+	if ($exclude_categories_new) {
205
+		$gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : '';
206
+		$exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array();
207
+	}
208 208
 
209
-    $exclude_cat_str = implode(',', $exclude_categories);
209
+	$exclude_cat_str = implode(',', $exclude_categories);
210 210
 
211
-    if ($exclude_cat_str == '') {
212
-        $exclude_cat_str = '0';
213
-    }
211
+	if ($exclude_cat_str == '') {
212
+		$exclude_cat_str = '0';
213
+	}
214 214
 
215
-    $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));
215
+	$cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));
216 216
 
217
-    if ($hide_empty) {
218
-        $cat_terms = geodir_filter_empty_terms($cat_terms);
219
-    }
217
+	if ($hide_empty) {
218
+		$cat_terms = geodir_filter_empty_terms($cat_terms);
219
+	}
220 220
 
221
-    $main_list_class = '';
222
-    //If there are terms, start displaying
223
-    if (count($cat_terms) > 0) {
224
-        //Displaying as a list
225
-        $p = $pading * 15;
226
-        $pading++;
221
+	$main_list_class = '';
222
+	//If there are terms, start displaying
223
+	if (count($cat_terms) > 0) {
224
+		//Displaying as a list
225
+		$p = $pading * 15;
226
+		$pading++;
227 227
 
228
-        if ($cat_parent == 0) {
229
-            $list_class = 'main_list';
230
-            $display = '';
231
-        } else {
232
-            $list_class = 'sub_list';
233
-            $display = !$child_collapse ? '' : 'display:none';
234
-        }
228
+		if ($cat_parent == 0) {
229
+			$list_class = 'main_list';
230
+			$display = '';
231
+		} else {
232
+			$list_class = 'sub_list';
233
+			$display = !$child_collapse ? '' : 'display:none';
234
+		}
235 235
 
236
-        $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">';
236
+		$out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">';
237 237
 
238
-        $geodir_cat_icons = geodir_get_term_icon();
238
+		$geodir_cat_icons = geodir_get_term_icon();
239 239
 
240
-        $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';
241
-        if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
242
-            $geodir_default_map_search_pt = $homemap_catlist_ptype;
243
-        }
244
-        $post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : $geodir_default_map_search_pt);
240
+		$geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';
241
+		if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
242
+			$geodir_default_map_search_pt = $homemap_catlist_ptype;
243
+		}
244
+		$post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : $geodir_default_map_search_pt);
245 245
         
246
-        foreach ($cat_terms as $cat_term):
247
-            $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : '';
248
-
249
-            if (!in_array($cat_term->term_id, $exclude_categories)):
250
-                //Secret sauce.  Function calls itself to display child elements, if any
251
-                $checked = 'checked="checked"';
252
-
253
-                // Untick the category by default on home map
254
-                if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
255
-                    if (function_exists('icl_object_id')) { // if WPML
256
-                        global $sitepress;
257
-                        $default_lang = $sitepress->get_default_language();
258
-                        $term_id = icl_object_id($cat_term->term_id, $post_type.'category', true, $default_lang);
259
-                    }else{
260
-                        $term_id = $cat_term->term_id;
261
-                    }
262
-                    if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
263
-                        $checked = '';
264
-                    }
265
-                }
266
-
267
-                $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';
268
-                $term_check .= ' name="' . $map_canvas_name . '_cat[]" ';
269
-                $term_check .= '  title="' . esc_attr(ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">';
270
-                $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . ucfirst($cat_term->name) . '"/>';
271
-                $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>';
272
-
273
-            endif;
274
-
275
-
276
-            // get sub category by recursion
277
-            $out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map);
278
-
279
-            $out .= '</li>';
280
-
281
-        endforeach;
282
-
283
-        $out .= '</ul>';
284
-
285
-        return $out;
286
-    } else {
287
-        if ($cat_parent == 0)
288
-            return _e('No category', 'geodirectory');
289
-    }
290
-    return;
246
+		foreach ($cat_terms as $cat_term):
247
+			$icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : '';
248
+
249
+			if (!in_array($cat_term->term_id, $exclude_categories)):
250
+				//Secret sauce.  Function calls itself to display child elements, if any
251
+				$checked = 'checked="checked"';
252
+
253
+				// Untick the category by default on home map
254
+				if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
255
+					if (function_exists('icl_object_id')) { // if WPML
256
+						global $sitepress;
257
+						$default_lang = $sitepress->get_default_language();
258
+						$term_id = icl_object_id($cat_term->term_id, $post_type.'category', true, $default_lang);
259
+					}else{
260
+						$term_id = $cat_term->term_id;
261
+					}
262
+					if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
263
+						$checked = '';
264
+					}
265
+				}
266
+
267
+				$term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';
268
+				$term_check .= ' name="' . $map_canvas_name . '_cat[]" ';
269
+				$term_check .= '  title="' . esc_attr(ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">';
270
+				$term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . ucfirst($cat_term->name) . '"/>';
271
+				$out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>';
272
+
273
+			endif;
274
+
275
+
276
+			// get sub category by recursion
277
+			$out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map);
278
+
279
+			$out .= '</li>';
280
+
281
+		endforeach;
282
+
283
+		$out .= '</ul>';
284
+
285
+		return $out;
286
+	} else {
287
+		if ($cat_parent == 0)
288
+			return _e('No category', 'geodirectory');
289
+	}
290
+	return;
291 291
 }
292 292
 
293 293
 /**
@@ -299,19 +299,19 @@  discard block
 block discarded – undo
299 299
  * @return string The map API provider name.
300 300
  */
301 301
 function geodir_map_name() {
302
-    $geodir_map_name = get_option('geodir_load_map', 'google');
302
+	$geodir_map_name = get_option('geodir_load_map', 'google');
303 303
     
304
-    if (!in_array($geodir_map_name, array('none', 'auto', 'google', 'osm'))) {
305
-        $geodir_map_name = 'auto';
306
-    }
307
-
308
-    /**
309
-     * Filter the map JS API provider name.
310
-     *
311
-     * @since 1.6.1
312
-     * @param string $geodir_map_name The map API provider name.
313
-     */
314
-    return apply_filters('geodir_map_name', $geodir_map_name);
304
+	if (!in_array($geodir_map_name, array('none', 'auto', 'google', 'osm'))) {
305
+		$geodir_map_name = 'auto';
306
+	}
307
+
308
+	/**
309
+	 * Filter the map JS API provider name.
310
+	 *
311
+	 * @since 1.6.1
312
+	 * @param string $geodir_map_name The map API provider name.
313
+	 */
314
+	return apply_filters('geodir_map_name', $geodir_map_name);
315 315
 }
316 316
 
317 317
 /**
@@ -327,48 +327,48 @@  discard block
 block discarded – undo
327 327
  * @return array The icon size.
328 328
  */
329 329
 function geodir_get_marker_size($icon, $default_size = array('w' => 36, 'h' => 45)) {
330
-    global $gd_marker_sizes;
330
+	global $gd_marker_sizes;
331 331
     
332
-    if (empty($gd_marker_sizes)) {
333
-        $gd_marker_sizes = array();
334
-    }
332
+	if (empty($gd_marker_sizes)) {
333
+		$gd_marker_sizes = array();
334
+	}
335 335
       
336
-    if (!empty($gd_marker_sizes[$icon])) {
337
-        return $gd_marker_sizes[$icon];
338
-    }
336
+	if (!empty($gd_marker_sizes[$icon])) {
337
+		return $gd_marker_sizes[$icon];
338
+	}
339 339
     
340
-    if (empty($icon)) {
341
-        $gd_marker_sizes[$icon] = $default_size;
340
+	if (empty($icon)) {
341
+		$gd_marker_sizes[$icon] = $default_size;
342 342
         
343
-        return $default_size;
344
-    }
343
+		return $default_size;
344
+	}
345 345
     
346
-    $icon_url = $icon;
346
+	$icon_url = $icon;
347 347
     
348
-    $uploads = wp_upload_dir(); // Array of key => value pairs
348
+	$uploads = wp_upload_dir(); // Array of key => value pairs
349 349
       
350
-    if (!path_is_absolute($icon)) {
351
-        $icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon);
352
-    }
350
+	if (!path_is_absolute($icon)) {
351
+		$icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon);
352
+	}
353 353
     
354
-    if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {
355
-        $icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon);
356
-    }
354
+	if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {
355
+		$icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon);
356
+	}
357 357
     
358
-    $sizes = array();
359
-    if (is_file($icon) && file_exists($icon)) {
360
-        $size = getimagesize(trim($icon));
358
+	$sizes = array();
359
+	if (is_file($icon) && file_exists($icon)) {
360
+		$size = getimagesize(trim($icon));
361 361
         
362
-        if (!empty($size[0]) && !empty($size[1])) {
363
-            $sizes = array('w' => $size[0], 'h' => $size[1]);
364
-        }
365
-    }
362
+		if (!empty($size[0]) && !empty($size[1])) {
363
+			$sizes = array('w' => $size[0], 'h' => $size[1]);
364
+		}
365
+	}
366 366
     
367
-    $sizes = !empty($sizes) ? $sizes : $default_size;
367
+	$sizes = !empty($sizes) ? $sizes : $default_size;
368 368
     
369
-    $gd_marker_sizes[$icon_url] = $sizes;
369
+	$gd_marker_sizes[$icon_url] = $sizes;
370 370
     
371
-    return $sizes;
371
+	return $sizes;
372 372
 }
373 373
 
374 374
 add_action('wp_footer', 'geodir_map_load_script', 10);
@@ -380,8 +380,8 @@  discard block
 block discarded – undo
380 380
  * @package GeoDirectory
381 381
  */
382 382
 function geodir_map_load_script() {
383
-    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {
384
-        $plugin_url = geodir_plugin_url();
383
+	if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {
384
+		$plugin_url = geodir_plugin_url();
385 385
 ?>
386 386
 <script type="text/javascript">
387 387
 if (!(window.google && typeof google.maps !== 'undefined')) {
@@ -395,5 +395,5 @@  discard block
 block discarded – undo
395 395
 }
396 396
 </script>
397 397
 <?php
398
-    }
398
+	}
399 399
 }
400 400
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 
55 55
     if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {
56 56
 
57
-        if(isset($map_jason[$post->ID])){return null;}
57
+        if (isset($map_jason[$post->ID])) {return null; }
58 58
 
59 59
         $srcharr = array("'", "/", "-", '"', '\\');
60 60
         $replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         $title = str_replace($srcharr, $replarr, $post_title);
68 68
 
69 69
         if (is_ssl()) {
70
-            $icon = str_replace("http:","https:",$icon );
70
+            $icon = str_replace("http:", "https:", $icon);
71 71
         }
72 72
         
73 73
         if ($icon != '') {
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
             $icon_size = array('w' => 36, 'h' => 45);
84 84
         }
85 85
 
86
-        $post_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->default_category . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"}';
86
+        $post_json = '{"id":"'.$post->ID.'","t": "'.$title.'","lt": "'.$post->post_latitude.'","ln": "'.$post->post_longitude.'","mk_id":"'.$post->ID.'_'.$post->default_category.'","i":"'.$icon.'","w":"'.$icon_size['w'].'","h":"'.$icon_size['h'].'"}';
87 87
 
88 88
         /**
89 89
          * Filter the json data when creating output for post json marker..
@@ -92,10 +92,10 @@  discard block
 block discarded – undo
92 92
          * @param string $post_json JSON representation of the post marker info.
93 93
          * @param object $post The post object.
94 94
          */
95
-        $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
95
+        $post_map_json = apply_filters('geodir_create_marker_jason_of_posts', $post_json, $post);
96 96
 
97 97
         // only assign it if it has a value
98
-        if($post_map_json){
98
+        if ($post_map_json) {
99 99
             $map_jason[$post->ID] = $post_map_json;
100 100
         }
101 101
 
@@ -119,13 +119,13 @@  discard block
 block discarded – undo
119 119
             if (is_array($map_jason) && !empty($map_jason)) {
120 120
 
121 121
                 // on details page only show the main marker on the map
122
-                if(geodir_is_page('detail')){
122
+                if (geodir_is_page('detail')) {
123 123
                     global $post;
124
-                    if(isset($map_jason[$post->ID])){
124
+                    if (isset($map_jason[$post->ID])) {
125 125
                         $map_jason = array($map_jason[$post->ID]);
126 126
                     }
127 127
                 }
128
-                $canvas_jason = $canvas . "_jason";
128
+                $canvas_jason = $canvas."_jason";
129 129
                 $map_canvas_arr[$canvas] = array_unique($map_jason);
130 130
                 unset($cat_content_info);
131 131
                 $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
                     $json_content = substr(implode(',', $cat_content_info), 1);
135 135
                     $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
136 136
                     $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08
137
-                    $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
137
+                    $canvas_jason = '[{"totalcount":"'.$totalcount.'",'.$json_content.']';
138 138
                 } else {
139 139
                     $canvas_jason = '[{"totalcount":"0"}]';
140 140
                 }
141
-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);
141
+                $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason);
142 142
 
143 143
                 /**
144 144
                  * Filter the send_marker_jason_to_js() function map canvas json args.
@@ -150,12 +150,12 @@  discard block
 block discarded – undo
150 150
                  * @param string $canvas Map canvas array key.
151 151
                  * @param array $map_canvas_jason_args Map canvas args.
152 152
                  */
153
-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
153
+                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);
154 154
 
155
-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
155
+                wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);
156 156
             } else {
157 157
                 $canvas_jason = '[{"totalcount":"0"}]';
158
-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);
158
+                $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason);
159 159
 
160 160
                 /**
161 161
                  * Filter the send_marker_jason_to_js() function map canvas json args.
@@ -167,8 +167,8 @@  discard block
 block discarded – undo
167 167
                  * @param string $canvas Map canvas array key.
168 168
                  * @param array $map_canvas_jason_args Map canvas args.
169 169
                  */
170
-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
171
-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
170
+                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);
171
+                wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);
172 172
             }
173 173
         }
174 174
 
@@ -233,11 +233,11 @@  discard block
 block discarded – undo
233 233
             $display = !$child_collapse ? '' : 'display:none';
234 234
         }
235 235
 
236
-        $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">';
236
+        $out = '<ul class="treeview '.$list_class.'" style="margin-left:'.$p.'px;'.$display.';">';
237 237
 
238 238
         $geodir_cat_icons = geodir_get_term_icon();
239 239
 
240
-        $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';
240
+        $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
241 241
         if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
242 242
             $geodir_default_map_search_pt = $homemap_catlist_ptype;
243 243
         }
@@ -256,19 +256,19 @@  discard block
 block discarded – undo
256 256
                         global $sitepress;
257 257
                         $default_lang = $sitepress->get_default_language();
258 258
                         $term_id = icl_object_id($cat_term->term_id, $post_type.'category', true, $default_lang);
259
-                    }else{
259
+                    } else {
260 260
                         $term_id = $cat_term->term_id;
261 261
                     }
262
-                    if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
262
+                    if (!empty($geodir_home_map_untick) && in_array($post_type.'_'.$term_id, $geodir_home_map_untick)) {
263 263
                         $checked = '';
264 264
                     }
265 265
                 }
266 266
 
267
-                $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';
268
-                $term_check .= ' name="' . $map_canvas_name . '_cat[]" ';
269
-                $term_check .= '  title="' . esc_attr(ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">';
270
-                $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . ucfirst($cat_term->name) . '"/>';
271
-                $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>';
267
+                $term_check = '<input type="checkbox" '.$checked.' id="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'" class="group_selector '.$main_list_class.'"';
268
+                $term_check .= ' name="'.$map_canvas_name.'_cat[]" ';
269
+                $term_check .= '  title="'.esc_attr(ucfirst($cat_term->name)).'" value="'.$cat_term->term_id.'" onclick="javascript:build_map_ajax_search_param(\''.$map_canvas_name.'\',false, this)">';
270
+                $term_img = '<img height="15" width="15" alt="'.$cat_term->taxonomy.'" src="'.$icon.'" title="'.ucfirst($cat_term->name).'"/>';
271
+                $out .= '<li>'.$term_check.'<label for="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'">'.$term_img.ucfirst($cat_term->name).'</label><i class="fa fa-long-arrow-down"></i>';
272 272
 
273 273
             endif;
274 274
 
@@ -380,18 +380,18 @@  discard block
 block discarded – undo
380 380
  * @package GeoDirectory
381 381
  */
382 382
 function geodir_map_load_script() {
383
-    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {
383
+    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is('geodirectory-googlemap-script', 'done')) {
384 384
         $plugin_url = geodir_plugin_url();
385 385
 ?>
386 386
 <script type="text/javascript">
387 387
 if (!(window.google && typeof google.maps !== 'undefined')) {
388
-    var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-style-css");css.setAttribute("href","<?php echo $plugin_url;?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION;?>");
388
+    var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-style-css");css.setAttribute("href","<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION; ?>");
389 389
     document.getElementsByTagName("head")[0].appendChild(css);
390
-    var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-routing-style");css.setAttribute("href","<?php echo $plugin_url;?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css?ver=<?php echo GEODIRECTORY_VERSION;?>");
390
+    var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-routing-style");css.setAttribute("href","<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css?ver=<?php echo GEODIRECTORY_VERSION; ?>");
391 391
     document.getElementsByTagName("head")[0].appendChild(css);
392
-    document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
393
-    document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/osm.geocode.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
394
-    document.write('<' + 'script id="geodirectory-leaflet-routing-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
392
+    document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
393
+    document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/osm.geocode.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
394
+    document.write('<' + 'script id="geodirectory-leaflet-routing-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
395 395
 }
396 396
 </script>
397 397
 <?php
Please login to merge, or discard this patch.
geodirectory-admin/admin_dummy_data_functions.php 3 patches
Braces   +13 added lines, -11 removed lines patch added patch discarded remove patch
@@ -42,10 +42,11 @@  discard block
 block discarded – undo
42 42
                     }
43 43
 
44 44
 
45
-                    if (geodir_dummy_folder_exists())
46
-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
47
-                    else
48
-                        $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
45
+                    if (geodir_dummy_folder_exists()) {
46
+                                            $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
47
+                    } else {
48
+                                            $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
49
+                    }
49 50
 
50 51
                     $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
51 52
 
@@ -86,10 +87,11 @@  discard block
 block discarded – undo
86 87
             if (!term_exists($catname, $post_type.'category')) {
87 88
                 $last_catid = wp_insert_term($catname, $post_type.'category');
88 89
 
89
-                if (geodir_dummy_folder_exists())
90
-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
91
-                else
92
-                    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
90
+                if (geodir_dummy_folder_exists()) {
91
+                                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
92
+                } else {
93
+                                    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
94
+                }
93 95
 
94 96
                 $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
95 97
 
@@ -218,7 +220,7 @@  discard block
 block discarded – undo
218 220
                  * @package GeoDirectory
219 221
                  */
220 222
                 include_once( 'dummy-data/standard_places.php' );
221
-            }elseif($key=='property_sale'){
223
+            } elseif($key=='property_sale'){
222 224
                 /**
223 225
                  * Contains dummy property for sale post content.
224 226
                  *
@@ -226,7 +228,7 @@  discard block
 block discarded – undo
226 228
                  * @package GeoDirectory
227 229
                  */
228 230
                 include_once( 'dummy-data/property_sale.php' );
229
-            }elseif($key=='property_rent'){
231
+            } elseif($key=='property_rent'){
230 232
                 /**
231 233
                  * Contains dummy property for sale post content.
232 234
                  *
@@ -330,7 +332,7 @@  discard block
 block discarded – undo
330 332
 
331 333
                     if($post_counts > 0){
332 334
                         echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
333
-                    }else{
335
+                    } else{
334 336
                         echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
335 337
                     }
336 338
 
Please login to merge, or discard this patch.
Indentation   +232 added lines, -232 removed lines patch added patch discarded remove patch
@@ -19,151 +19,151 @@  discard block
 block discarded – undo
19 19
  * @global string $dummy_image_path The dummy image path.
20 20
  */
21 21
 function geodir_dummy_data_taxonomies($post_type,$category_array) {
22
-    global $wpdb, $dummy_image_path;
22
+	global $wpdb, $dummy_image_path;
23 23
 
24 24
 
25 25
 
26
-    $last_catid = '';
26
+	$last_catid = '';
27 27
 
28
-    $uploads = wp_upload_dir(); // Array of key => value pairs
28
+	$uploads = wp_upload_dir(); // Array of key => value pairs
29 29
 
30
-    for ($i = 0; $i < count($category_array); $i++) {
31
-        $parent_catid = 0;
32
-        if (is_array($category_array[$i])) {
33
-            $cat_name_arr = $category_array[$i];
34
-            for ($j = 0; $j < count($cat_name_arr); $j++) {
35
-                $catname = $cat_name_arr[$j];
30
+	for ($i = 0; $i < count($category_array); $i++) {
31
+		$parent_catid = 0;
32
+		if (is_array($category_array[$i])) {
33
+			$cat_name_arr = $category_array[$i];
34
+			for ($j = 0; $j < count($cat_name_arr); $j++) {
35
+				$catname = $cat_name_arr[$j];
36 36
 
37
-                if (!term_exists($catname, $post_type.'category')) {
38
-                    $last_catid = wp_insert_term($catname, $post_type.'category', $args = array('parent' => $parent_catid));
37
+				if (!term_exists($catname, $post_type.'category')) {
38
+					$last_catid = wp_insert_term($catname, $post_type.'category', $args = array('parent' => $parent_catid));
39 39
 
40
-                    if ($j == 0) {
41
-                        $parent_catid = $last_catid;
42
-                    }
40
+					if ($j == 0) {
41
+						$parent_catid = $last_catid;
42
+					}
43 43
 
44 44
 
45
-                    if (geodir_dummy_folder_exists())
46
-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
47
-                    else
48
-                        $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
45
+					if (geodir_dummy_folder_exists())
46
+						$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
47
+					else
48
+						$dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
49 49
 
50
-                    $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
50
+					$dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
51 51
 
52
-                    $catname = str_replace(' ', '_', $catname);
53
-                    $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
52
+					$catname = str_replace(' ', '_', $catname);
53
+					$uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
54 54
 
55
-                    if (empty($uploaded['error'])) {
56
-                        $new_path = $uploaded['file'];
57
-                        $new_url = $uploaded['url'];
58
-                    }
55
+					if (empty($uploaded['error'])) {
56
+						$new_path = $uploaded['file'];
57
+						$new_url = $uploaded['url'];
58
+					}
59 59
 
60
-                    $wp_filetype = wp_check_filetype(basename($new_path), null);
61
-
62
-                    $attachment = array(
63
-                        'guid' => $uploads['baseurl'] . '/' . basename($new_path),
64
-                        'post_mime_type' => $wp_filetype['type'],
65
-                        'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
66
-                        'post_content' => '',
67
-                        'post_status' => 'inherit'
68
-                    );
69
-                    $attach_id = wp_insert_attachment($attachment, $new_path);
70
-
71
-                    // you must first include the image.php file
72
-                    // for the function wp_generate_attachment_metadata() to work
73
-                    require_once(ABSPATH . 'wp-admin/includes/image.php');
74
-                    $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
75
-                    wp_update_attachment_metadata($attach_id, $attach_data);
76
-
77
-                    if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
78
-                        update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), $post_type);
79
-                    }
80
-                }
81
-            }
60
+					$wp_filetype = wp_check_filetype(basename($new_path), null);
82 61
 
83
-        } else {
84
-            $catname = $category_array[$i];
62
+					$attachment = array(
63
+						'guid' => $uploads['baseurl'] . '/' . basename($new_path),
64
+						'post_mime_type' => $wp_filetype['type'],
65
+						'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
66
+						'post_content' => '',
67
+						'post_status' => 'inherit'
68
+					);
69
+					$attach_id = wp_insert_attachment($attachment, $new_path);
85 70
 
86
-            if (!term_exists($catname, $post_type.'category')) {
87
-                $last_catid = wp_insert_term($catname, $post_type.'category');
71
+					// you must first include the image.php file
72
+					// for the function wp_generate_attachment_metadata() to work
73
+					require_once(ABSPATH . 'wp-admin/includes/image.php');
74
+					$attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
75
+					wp_update_attachment_metadata($attach_id, $attach_data);
88 76
 
89
-                if (geodir_dummy_folder_exists())
90
-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
91
-                else
92
-                    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
77
+					if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
78
+						update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), $post_type);
79
+					}
80
+				}
81
+			}
93 82
 
94
-                $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
83
+		} else {
84
+			$catname = $category_array[$i];
95 85
 
96
-                $catname = str_replace(' ', '_', $catname);
97
-                $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
86
+			if (!term_exists($catname, $post_type.'category')) {
87
+				$last_catid = wp_insert_term($catname, $post_type.'category');
98 88
 
99
-                if (empty($uploaded['error'])) {
100
-                    $new_path = $uploaded['file'];
101
-                    $new_url = $uploaded['url'];
102
-                }
89
+				if (geodir_dummy_folder_exists())
90
+					$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
91
+				else
92
+					$dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
103 93
 
104
-                $wp_filetype = wp_check_filetype(basename($new_path), null);
94
+				$dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
105 95
 
106
-                $attachment = array(
107
-                    'guid' => $uploads['baseurl'] . '/' . basename($new_path),
108
-                    'post_mime_type' => $wp_filetype['type'],
109
-                    'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
110
-                    'post_content' => '',
111
-                    'post_status' => 'inherit'
112
-                );
96
+				$catname = str_replace(' ', '_', $catname);
97
+				$uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
113 98
 
114
-                $attach_id = wp_insert_attachment($attachment, $new_path);
99
+				if (empty($uploaded['error'])) {
100
+					$new_path = $uploaded['file'];
101
+					$new_url = $uploaded['url'];
102
+				}
115 103
 
104
+				$wp_filetype = wp_check_filetype(basename($new_path), null);
116 105
 
117
-                // you must first include the image.php file
118
-                // for the function wp_generate_attachment_metadata() to work
119
-                require_once(ABSPATH . 'wp-admin/includes/image.php');
120
-                $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
121
-                wp_update_attachment_metadata($attach_id, $attach_data);
106
+				$attachment = array(
107
+					'guid' => $uploads['baseurl'] . '/' . basename($new_path),
108
+					'post_mime_type' => $wp_filetype['type'],
109
+					'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
110
+					'post_content' => '',
111
+					'post_status' => 'inherit'
112
+				);
113
+
114
+				$attach_id = wp_insert_attachment($attachment, $new_path);
122 115
 
123
-                if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
124
-                    update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), $post_type);
125
-                }
126
-            }
127
-        }
128 116
 
129
-    }
117
+				// you must first include the image.php file
118
+				// for the function wp_generate_attachment_metadata() to work
119
+				require_once(ABSPATH . 'wp-admin/includes/image.php');
120
+				$attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
121
+				wp_update_attachment_metadata($attach_id, $attach_data);
122
+
123
+				if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
124
+					update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), $post_type);
125
+				}
126
+			}
127
+		}
128
+
129
+	}
130 130
 }
131 131
 
132 132
 
133 133
 function geodir_dummy_data_types(){
134
-    $data =  array(
135
-        'standard_places' => array(
136
-            'name'=>__('Default','geodirectory'),
137
-            'count'=> 30
138
-        ),
139
-        'property_sale' => array(
140
-            'name'=>__('Property for sale','geodirectory'),
141
-            'count'=> 10
142
-        ),
143
-        'property_rent' => array(
144
-            'name'=>__('Property for rent','geodirectory'),
145
-            'count'=> 10
146
-        )
147
-    );
148
-
149
-    return apply_filters('geodir_dummy_data_types',$data );
134
+	$data =  array(
135
+		'standard_places' => array(
136
+			'name'=>__('Default','geodirectory'),
137
+			'count'=> 30
138
+		),
139
+		'property_sale' => array(
140
+			'name'=>__('Property for sale','geodirectory'),
141
+			'count'=> 10
142
+		),
143
+		'property_rent' => array(
144
+			'name'=>__('Property for rent','geodirectory'),
145
+			'count'=> 10
146
+		)
147
+	);
148
+
149
+	return apply_filters('geodir_dummy_data_types',$data );
150 150
 }
151 151
 
152 152
 
153 153
 function geodir_create_dummy_fields($fields)
154 154
 {
155 155
     
156
-    /**
157
-     * Filter the array of default custom fields DB table data.
158
-     *
159
-     * @since 1.0.0
160
-     * @param string $fields The default custom fields as an array.
161
-     */
162
-    $fields = apply_filters('geodir_before_dummy_custom_fields_saved', $fields);
163
-    foreach ($fields as $field_index => $field) {
164
-        geodir_custom_field_save($field);
165
-
166
-    }
156
+	/**
157
+	 * Filter the array of default custom fields DB table data.
158
+	 *
159
+	 * @since 1.0.0
160
+	 * @param string $fields The default custom fields as an array.
161
+	 */
162
+	$fields = apply_filters('geodir_before_dummy_custom_fields_saved', $fields);
163
+	foreach ($fields as $field_index => $field) {
164
+		geodir_custom_field_save($field);
165
+
166
+	}
167 167
 }
168 168
 
169 169
 /**
@@ -176,20 +176,20 @@  discard block
 block discarded – undo
176 176
  */
177 177
 function geodir_delete_dummy_posts($post_type,$data_type)
178 178
 {
179
-    global $wpdb, $plugin_prefix;
179
+	global $wpdb, $plugin_prefix;
180 180
 
181 181
 
182
-    $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'");
182
+	$post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'");
183 183
 
184 184
 
185
-    foreach ($post_ids as $post_ids_obj) {
186
-        wp_delete_post($post_ids_obj->post_id);
187
-    }
185
+	foreach ($post_ids as $post_ids_obj) {
186
+		wp_delete_post($post_ids_obj->post_id);
187
+	}
188 188
 
189
-    //double check posts are deleted
190
-    $wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'");
189
+	//double check posts are deleted
190
+	$wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'");
191 191
 
192
-    update_option($post_type.'_dummy_data_type','');
192
+	update_option($post_type.'_dummy_data_type','');
193 193
 }
194 194
 
195 195
 /**
@@ -203,78 +203,78 @@  discard block
 block discarded – undo
203 203
 function geodir_insert_dummy_posts($post_type,$data_type,$item_index)
204 204
 {
205 205
 
206
-    ini_set('max_execution_time', 999999); //300 seconds = 5 minutes
207
-    $data_types = geodir_dummy_data_types();
208
-
209
-    $total_count = 0;
210
-    global $dummy_post_index;
211
-    $dummy_post_index = $item_index;
212
-    foreach( $data_types as $key=>$val){
213
-        if($key==$data_type){
214
-            $total_count = $val['count'];
215
-            if($key=='standard_places'){
216
-                /**
217
-                 * Contains dummy post content.
218
-                 *
219
-                 * @since 1.0.0
220
-                 * @package GeoDirectory
221
-                 */
222
-                include_once( 'dummy-data/standard_places.php' );
223
-            }elseif($key=='property_sale'){
224
-                /**
225
-                 * Contains dummy property for sale post content.
226
-                 *
227
-                 * @since 1.6.11
228
-                 * @package GeoDirectory
229
-                 */
230
-                include_once( 'dummy-data/property_sale.php' );
231
-            }elseif($key=='property_rent'){
232
-                /**
233
-                 * Contains dummy property for sale post content.
234
-                 *
235
-                 * @since 1.6.11
236
-                 * @package GeoDirectory
237
-                 */
238
-                include_once( 'dummy-data/property_rent.php' );
239
-            }
240
-
241
-        }
242
-
243
-        do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index);
244
-    }
245
-
246
-
247
-
248
-    // delete image cache on last entry
249
-    if($total_count == $item_index){
250
-        delete_transient( 'cached_dummy_images' );
251
-        flush_rewrite_rules();
252
-    }
206
+	ini_set('max_execution_time', 999999); //300 seconds = 5 minutes
207
+	$data_types = geodir_dummy_data_types();
208
+
209
+	$total_count = 0;
210
+	global $dummy_post_index;
211
+	$dummy_post_index = $item_index;
212
+	foreach( $data_types as $key=>$val){
213
+		if($key==$data_type){
214
+			$total_count = $val['count'];
215
+			if($key=='standard_places'){
216
+				/**
217
+				 * Contains dummy post content.
218
+				 *
219
+				 * @since 1.0.0
220
+				 * @package GeoDirectory
221
+				 */
222
+				include_once( 'dummy-data/standard_places.php' );
223
+			}elseif($key=='property_sale'){
224
+				/**
225
+				 * Contains dummy property for sale post content.
226
+				 *
227
+				 * @since 1.6.11
228
+				 * @package GeoDirectory
229
+				 */
230
+				include_once( 'dummy-data/property_sale.php' );
231
+			}elseif($key=='property_rent'){
232
+				/**
233
+				 * Contains dummy property for sale post content.
234
+				 *
235
+				 * @since 1.6.11
236
+				 * @package GeoDirectory
237
+				 */
238
+				include_once( 'dummy-data/property_rent.php' );
239
+			}
240
+
241
+		}
242
+
243
+		do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index);
244
+	}
245
+
246
+
247
+
248
+	// delete image cache on last entry
249
+	if($total_count == $item_index){
250
+		delete_transient( 'cached_dummy_images' );
251
+		flush_rewrite_rules();
252
+	}
253 253
 
254 254
 
255 255
 }
256 256
 
257 257
 
258 258
 if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) {
259
-    /**
260
-     * GeoDirectory dummy data installation.
261
-     *
262
-     * @since 1.0.0
263
-     * @package GeoDirectory
264
-     * @global object $wpdb WordPress Database object.
265
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
266
-     * @param string $post_type The post type.
267
-     */
268
-    function geodir_autoinstall_admin_header($post_type = 'gd_place')
269
-    {
270
-
271
-        global $wpdb, $plugin_prefix;
272
-
273
-        if (!geodir_is_default_location_set()) {
274
-            echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
275
-        } else {
276
-
277
-            ?>
259
+	/**
260
+	 * GeoDirectory dummy data installation.
261
+	 *
262
+	 * @since 1.0.0
263
+	 * @package GeoDirectory
264
+	 * @global object $wpdb WordPress Database object.
265
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
266
+	 * @param string $post_type The post type.
267
+	 */
268
+	function geodir_autoinstall_admin_header($post_type = 'gd_place')
269
+	{
270
+
271
+		global $wpdb, $plugin_prefix;
272
+
273
+		if (!geodir_is_default_location_set()) {
274
+			echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
275
+		} else {
276
+
277
+			?>
278 278
             <span class="gd-dummy-hint"><small><?php _e('*Hint*: Installing our Advanced Search addon FIRST will add extra search fields to non-default data types.','geodirectory');?></small></span>
279 279
             <table class="form-table gd-dummy-table">
280 280
                 <tbody>
@@ -286,78 +286,78 @@  discard block
 block discarded – undo
286 286
 
287 287
                 <?php
288 288
 
289
-                $cpts = geodir_get_posttypes('array');
289
+				$cpts = geodir_get_posttypes('array');
290 290
 
291
-                $data_types = geodir_dummy_data_types();
291
+				$data_types = geodir_dummy_data_types();
292 292
 
293
-                $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');
293
+				$nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');
294 294
 
295
-                foreach($cpts as $post_type=>$cpt){
295
+				foreach($cpts as $post_type=>$cpt){
296 296
 
297
-                    $data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type);
297
+					$data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type);
298 298
 
299 299
 
300
-                    $set_dt = get_option($post_type.'_dummy_data_type');
300
+					$set_dt = get_option($post_type.'_dummy_data_type');
301 301
 
302
-                    $count = 30;
302
+					$count = 30;
303 303
 
304
-                    geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
304
+					geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
305 305
 
306
-                    $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");
306
+					$post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");
307 307
 
308
-                    echo "<tr>";
309
-                    echo "<td><strong>".$cpt['labels']['name']."</strong></td>";
308
+					echo "<tr>";
309
+					echo "<td><strong>".$cpt['labels']['name']."</strong></td>";
310 310
 
311 311
 
312
-                    $select_disabled = $post_counts > 0 ? 'disabled' : '';
313
-                    echo "<td>";
314
-                    echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>";
312
+					$select_disabled = $post_counts > 0 ? 'disabled' : '';
313
+					echo "<td>";
314
+					echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>";
315 315
 
316
-                    foreach($data_types_for as $key=>$val){
317
-                        $selected = ($key==$set_dt) ? "selected='selected'" : '';
318
-                        if($selected || count($data_types_for)==1){$count = $val['count'];}
319
-                        echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>";
320
-                    }
321
-                    echo "</select>";
322
-
323
-                    $select_display = $post_counts > 0 ? 'display:none;' : '';
324
-                    echo "<select id='".$post_type."_data_type_count' style='$select_display' >";
325
-                    $x = 1;
326
-                    while($x <= $count){
327
-                        $selected = ($x==$count) ? "selected='selected'" : '';
328
-                        echo "<option $selected value='$x'>".$x."</option>";
329
-                        $x++;
330
-                    }
331
-                    echo "</select>";
332
-                    echo "</td>";
316
+					foreach($data_types_for as $key=>$val){
317
+						$selected = ($key==$set_dt) ? "selected='selected'" : '';
318
+						if($selected || count($data_types_for)==1){$count = $val['count'];}
319
+						echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>";
320
+					}
321
+					echo "</select>";
333 322
 
323
+					$select_display = $post_counts > 0 ? 'display:none;' : '';
324
+					echo "<select id='".$post_type."_data_type_count' style='$select_display' >";
325
+					$x = 1;
326
+					while($x <= $count){
327
+						$selected = ($x==$count) ? "selected='selected'" : '';
328
+						echo "<option $selected value='$x'>".$x."</option>";
329
+						$x++;
330
+					}
331
+					echo "</select>";
332
+					echo "</td>";
334 333
 
335 334
 
336 335
 
337 336
 
338
-                    if($post_counts > 0){
339
-                        echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
340
-                    }else{
341
-                        echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
342
-                    }
343 337
 
344
-                    echo "</tr>";
345
-                    //print_r($cpt);
346
-                }
338
+					if($post_counts > 0){
339
+						echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
340
+					}else{
341
+						echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
342
+					}
343
+
344
+					echo "</tr>";
345
+					//print_r($cpt);
346
+				}
347 347
 
348
-                ?>
348
+				?>
349 349
                 </tbody>
350 350
             </table>
351 351
             <?php
352 352
 
353 353
 
354
-            $default_location = geodir_get_default_location();
355
-            $city = isset($default_location->city) ? $default_location->city : '';
356
-            $region = isset($default_location->region) ? $default_location->region : '';
357
-            $country = isset($default_location->country) ? $default_location->country : '';
358
-            $city_latitude = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
359
-            $city_longitude = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
360
-            ?>
354
+			$default_location = geodir_get_default_location();
355
+			$city = isset($default_location->city) ? $default_location->city : '';
356
+			$region = isset($default_location->region) ? $default_location->region : '';
357
+			$country = isset($default_location->country) ? $default_location->country : '';
358
+			$city_latitude = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
359
+			$city_longitude = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
360
+			?>
361 361
             <script type="text/javascript">
362 362
 
363 363
                 function geodir_dummy_set_count(data,cpt){
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
                 }
534 534
             </script>
535 535
             <?php
536
-        }
537
-    }
536
+		}
537
+	}
538 538
 }
539 539
 
Please login to merge, or discard this patch.
Spacing   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
  * @global object $wpdb WordPress Database object.
19 19
  * @global string $dummy_image_path The dummy image path.
20 20
  */
21
-function geodir_dummy_data_taxonomies($post_type,$category_array) {
21
+function geodir_dummy_data_taxonomies($post_type, $category_array) {
22 22
     global $wpdb, $dummy_image_path;
23 23
 
24 24
 
@@ -43,14 +43,14 @@  discard block
 block discarded – undo
43 43
 
44 44
 
45 45
                     if (geodir_dummy_folder_exists())
46
-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
46
+                        $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon";
47 47
                     else
48 48
                         $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
49 49
 
50 50
                     $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
51 51
 
52 52
                     $catname = str_replace(' ', '_', $catname);
53
-                    $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
53
+                    $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png");
54 54
 
55 55
                     if (empty($uploaded['error'])) {
56 56
                         $new_path = $uploaded['file'];
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
                     $wp_filetype = wp_check_filetype(basename($new_path), null);
61 61
 
62 62
                     $attachment = array(
63
-                        'guid' => $uploads['baseurl'] . '/' . basename($new_path),
63
+                        'guid' => $uploads['baseurl'].'/'.basename($new_path),
64 64
                         'post_mime_type' => $wp_filetype['type'],
65 65
                         'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
66 66
                         'post_content' => '',
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 
71 71
                     // you must first include the image.php file
72 72
                     // for the function wp_generate_attachment_metadata() to work
73
-                    require_once(ABSPATH . 'wp-admin/includes/image.php');
73
+                    require_once(ABSPATH.'wp-admin/includes/image.php');
74 74
                     $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
75 75
                     wp_update_attachment_metadata($attach_id, $attach_data);
76 76
 
@@ -87,14 +87,14 @@  discard block
 block discarded – undo
87 87
                 $last_catid = wp_insert_term($catname, $post_type.'category');
88 88
 
89 89
                 if (geodir_dummy_folder_exists())
90
-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
90
+                    $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon";
91 91
                 else
92 92
                     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
93 93
 
94 94
                 $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
95 95
 
96 96
                 $catname = str_replace(' ', '_', $catname);
97
-                $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
97
+                $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png");
98 98
 
99 99
                 if (empty($uploaded['error'])) {
100 100
                     $new_path = $uploaded['file'];
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
                 $wp_filetype = wp_check_filetype(basename($new_path), null);
105 105
 
106 106
                 $attachment = array(
107
-                    'guid' => $uploads['baseurl'] . '/' . basename($new_path),
107
+                    'guid' => $uploads['baseurl'].'/'.basename($new_path),
108 108
                     'post_mime_type' => $wp_filetype['type'],
109 109
                     'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
110 110
                     'post_content' => '',
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 
117 117
                 // you must first include the image.php file
118 118
                 // for the function wp_generate_attachment_metadata() to work
119
-                require_once(ABSPATH . 'wp-admin/includes/image.php');
119
+                require_once(ABSPATH.'wp-admin/includes/image.php');
120 120
                 $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
121 121
                 wp_update_attachment_metadata($attach_id, $attach_data);
122 122
 
@@ -130,23 +130,23 @@  discard block
 block discarded – undo
130 130
 }
131 131
 
132 132
 
133
-function geodir_dummy_data_types(){
134
-    $data =  array(
133
+function geodir_dummy_data_types() {
134
+    $data = array(
135 135
         'standard_places' => array(
136
-            'name'=>__('Default','geodirectory'),
136
+            'name'=>__('Default', 'geodirectory'),
137 137
             'count'=> 30
138 138
         ),
139 139
         'property_sale' => array(
140
-            'name'=>__('Property for sale','geodirectory'),
140
+            'name'=>__('Property for sale', 'geodirectory'),
141 141
             'count'=> 10
142 142
         ),
143 143
         'property_rent' => array(
144
-            'name'=>__('Property for rent','geodirectory'),
144
+            'name'=>__('Property for rent', 'geodirectory'),
145 145
             'count'=> 10
146 146
         )
147 147
     );
148 148
 
149
-    return apply_filters('geodir_dummy_data_types',$data );
149
+    return apply_filters('geodir_dummy_data_types', $data);
150 150
 }
151 151
 
152 152
 
@@ -174,12 +174,12 @@  discard block
 block discarded – undo
174 174
  * @global object $wpdb WordPress Database object.
175 175
  * @global string $plugin_prefix Geodirectory plugin table prefix.
176 176
  */
177
-function geodir_delete_dummy_posts($post_type,$data_type)
177
+function geodir_delete_dummy_posts($post_type, $data_type)
178 178
 {
179 179
     global $wpdb, $plugin_prefix;
180 180
 
181 181
 
182
-    $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'");
182
+    $post_ids = $wpdb->get_results("SELECT post_id FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");
183 183
 
184 184
 
185 185
     foreach ($post_ids as $post_ids_obj) {
@@ -187,9 +187,9 @@  discard block
 block discarded – undo
187 187
     }
188 188
 
189 189
     //double check posts are deleted
190
-    $wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'");
190
+    $wpdb->get_results("DELETE FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");
191 191
 
192
-    update_option($post_type.'_dummy_data_type','');
192
+    update_option($post_type.'_dummy_data_type', '');
193 193
 }
194 194
 
195 195
 /**
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
  * @global object $wpdb WordPress Database object.
201 201
  * @global object $current_user Current user object.
202 202
  */
203
-function geodir_insert_dummy_posts($post_type,$data_type,$item_index)
203
+function geodir_insert_dummy_posts($post_type, $data_type, $item_index)
204 204
 {
205 205
 
206 206
     ini_set('max_execution_time', 999999); //300 seconds = 5 minutes
@@ -209,45 +209,45 @@  discard block
 block discarded – undo
209 209
     $total_count = 0;
210 210
     global $dummy_post_index;
211 211
     $dummy_post_index = $item_index;
212
-    foreach( $data_types as $key=>$val){
213
-        if($key==$data_type){
212
+    foreach ($data_types as $key=>$val) {
213
+        if ($key == $data_type) {
214 214
             $total_count = $val['count'];
215
-            if($key=='standard_places'){
215
+            if ($key == 'standard_places') {
216 216
                 /**
217 217
                  * Contains dummy post content.
218 218
                  *
219 219
                  * @since 1.0.0
220 220
                  * @package GeoDirectory
221 221
                  */
222
-                include_once( 'dummy-data/standard_places.php' );
223
-            }elseif($key=='property_sale'){
222
+                include_once('dummy-data/standard_places.php');
223
+            }elseif ($key == 'property_sale') {
224 224
                 /**
225 225
                  * Contains dummy property for sale post content.
226 226
                  *
227 227
                  * @since 1.6.11
228 228
                  * @package GeoDirectory
229 229
                  */
230
-                include_once( 'dummy-data/property_sale.php' );
231
-            }elseif($key=='property_rent'){
230
+                include_once('dummy-data/property_sale.php');
231
+            }elseif ($key == 'property_rent') {
232 232
                 /**
233 233
                  * Contains dummy property for sale post content.
234 234
                  *
235 235
                  * @since 1.6.11
236 236
                  * @package GeoDirectory
237 237
                  */
238
-                include_once( 'dummy-data/property_rent.php' );
238
+                include_once('dummy-data/property_rent.php');
239 239
             }
240 240
 
241 241
         }
242 242
 
243
-        do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index);
243
+        do_action('geodir_insert_dummy_data_loop', $post_type, $data_type, $item_index);
244 244
     }
245 245
 
246 246
 
247 247
 
248 248
     // delete image cache on last entry
249
-    if($total_count == $item_index){
250
-        delete_transient( 'cached_dummy_images' );
249
+    if ($total_count == $item_index) {
250
+        delete_transient('cached_dummy_images');
251 251
         flush_rewrite_rules();
252 252
     }
253 253
 
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 }
256 256
 
257 257
 
258
-if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) {
258
+if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined('GD_TESTING_MODE'))) {
259 259
     /**
260 260
      * GeoDirectory dummy data installation.
261 261
      *
@@ -271,17 +271,17 @@  discard block
 block discarded – undo
271 271
         global $wpdb, $plugin_prefix;
272 272
 
273 273
         if (!geodir_is_default_location_set()) {
274
-            echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
274
+            echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';
275 275
         } else {
276 276
 
277 277
             ?>
278
-            <span class="gd-dummy-hint"><small><?php _e('*Hint*: Installing our Advanced Search addon FIRST will add extra search fields to non-default data types.','geodirectory');?></small></span>
278
+            <span class="gd-dummy-hint"><small><?php _e('*Hint*: Installing our Advanced Search addon FIRST will add extra search fields to non-default data types.', 'geodirectory'); ?></small></span>
279 279
             <table class="form-table gd-dummy-table">
280 280
                 <tbody>
281 281
                 <tr>
282
-                    <td><strong><?php _e('CPT','geodirectory');?></strong></td>
283
-                    <td><strong><?php _e('Data Type','geodirectory');?></strong></td>
284
-                    <td><strong><?php _e('Action','geodirectory');?></strong></td>
282
+                    <td><strong><?php _e('CPT', 'geodirectory'); ?></strong></td>
283
+                    <td><strong><?php _e('Data Type', 'geodirectory'); ?></strong></td>
284
+                    <td><strong><?php _e('Action', 'geodirectory'); ?></strong></td>
285 285
                 </tr>
286 286
 
287 287
                 <?php
@@ -292,18 +292,18 @@  discard block
 block discarded – undo
292 292
 
293 293
                 $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');
294 294
 
295
-                foreach($cpts as $post_type=>$cpt){
295
+                foreach ($cpts as $post_type=>$cpt) {
296 296
 
297
-                    $data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type);
297
+                    $data_types_for = apply_filters('geodir_dummy_date_types_for', $data_types, $post_type);
298 298
 
299 299
 
300 300
                     $set_dt = get_option($post_type.'_dummy_data_type');
301 301
 
302 302
                     $count = 30;
303 303
 
304
-                    geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
304
+                    geodir_add_column_if_not_exist($plugin_prefix.$post_type."_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
305 305
 
306
-                    $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");
306
+                    $post_counts = $wpdb->get_var("SELECT count(post_id) FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");
307 307
 
308 308
                     echo "<tr>";
309 309
                     echo "<td><strong>".$cpt['labels']['name']."</strong></td>";
@@ -313,9 +313,9 @@  discard block
 block discarded – undo
313 313
                     echo "<td>";
314 314
                     echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>";
315 315
 
316
-                    foreach($data_types_for as $key=>$val){
317
-                        $selected = ($key==$set_dt) ? "selected='selected'" : '';
318
-                        if($selected || count($data_types_for)==1){$count = $val['count'];}
316
+                    foreach ($data_types_for as $key=>$val) {
317
+                        $selected = ($key == $set_dt) ? "selected='selected'" : '';
318
+                        if ($selected || count($data_types_for) == 1) {$count = $val['count']; }
319 319
                         echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>";
320 320
                     }
321 321
                     echo "</select>";
@@ -323,8 +323,8 @@  discard block
 block discarded – undo
323 323
                     $select_display = $post_counts > 0 ? 'display:none;' : '';
324 324
                     echo "<select id='".$post_type."_data_type_count' style='$select_display' >";
325 325
                     $x = 1;
326
-                    while($x <= $count){
327
-                        $selected = ($x==$count) ? "selected='selected'" : '';
326
+                    while ($x <= $count) {
327
+                        $selected = ($x == $count) ? "selected='selected'" : '';
328 328
                         echo "<option $selected value='$x'>".$x."</option>";
329 329
                         $x++;
330 330
                     }
@@ -335,10 +335,10 @@  discard block
 block discarded – undo
335 335
 
336 336
 
337 337
 
338
-                    if($post_counts > 0){
339
-                        echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
340
-                    }else{
341
-                        echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
338
+                    if ($post_counts > 0) {
339
+                        echo '<td><input type="button" value="'.__('Remove data', 'geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\''.$nonce.'\',\''.$post_type.'\'); return false;" ></td>';
340
+                    } else {
341
+                        echo '<td><input type="button" value="'.__('Insert data', 'geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\''.$nonce.'\',\''.$post_type.'\'); return false;" ></td>';
342 342
                     }
343 343
 
344 344
                     echo "</tr>";
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 
375 375
                 }
376 376
 
377
-                var CITY_ADDRESS = '<?php echo addslashes( $city . ',' . $region . ',' . $country );?>';
377
+                var CITY_ADDRESS = '<?php echo addslashes($city.','.$region.','.$country); ?>';
378 378
                 var bound_lat_lng;
379 379
                 var latlng = ['<?php echo $city_latitude; ?>', <?php echo $city_longitude; ?>];
380 380
                 var lat = <?php echo $city_latitude; ?>;
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
                                         return x.replace(" ", '');
408 408
                                     }); // remove spaces from lat/lon
409 409
                                 } else {
410
-                                    alert("<?php _e( 'Geocode was not successful for the following reason:', 'geodirectory' );?> " + status);
410
+                                    alert("<?php _e('Geocode was not successful for the following reason:', 'geodirectory'); ?> " + status);
411 411
                                 }
412 412
                             });
413 413
                     } else if (window.gdMaps == 'osm') {
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
                 var dummy_post_index = 1;
432 432
 
433 433
                 function gdRemoveDummyData(obj, nonce, posttype){
434
-                    if (confirm('<?php _e('Are you sure you want to delete dummy data?' , 'geodirectory'); ?>')) {
434
+                    if (confirm('<?php _e('Are you sure you want to delete dummy data?', 'geodirectory'); ?>')) {
435 435
                         jQuery(obj).prop('disabled', true);
436 436
                         jQuery('.gd-dummy-data-results-' + posttype).remove();
437 437
                         jQuery('<tr class="gd-dummy-data-results gd-dummy-data-results-' + posttype + '" >'+
@@ -446,14 +446,14 @@  discard block
 block discarded – undo
446 446
 
447 447
                         jQuery('.gd_progressbar_'+posttype).progressbar({value: 0});
448 448
 
449
-                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Removing data...', 'geodirlocation'));?>');
449
+                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Removing data...', 'geodirlocation')); ?>');
450 450
 
451 451
 
452 452
                         jQuery.post('<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=geodir_dummy_delete&posttype=' + posttype + '&_wpnonce=' + nonce,
453 453
                             function (data) {
454
-                                gd_progressbar('.gd_progressbar_container_'+posttype, 100, '<i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation'));?>');
454
+                                gd_progressbar('.gd_progressbar_container_'+posttype, 100, '<i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation')); ?>');
455 455
                                 jQuery(obj).removeClass('gd-remove-data');
456
-                                jQuery(obj).val('<?php _e('Insert data','geodirectory');?>');
456
+                                jQuery(obj).val('<?php _e('Insert data', 'geodirectory'); ?>');
457 457
                                 jQuery(obj).prop('disabled', false);
458 458
                                 jQuery('#'+posttype+'_data_type_count').show();
459 459
                                 jQuery('#'+posttype+'_data_type').prop('disabled', false);
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
496 496
 
497 497
                         jQuery('.gd_progressbar_'+posttype).progressbar({value: 0});
498 498
 
499
-                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '0% (0 / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Creating categories and custom fields...', 'geodirlocation'));?>');
499
+                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '0% (0 / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Creating categories and custom fields...', 'geodirlocation')); ?>');
500 500
                     }
501 501
 
502 502
                     if (!(typeof bound_lat_lng == 'object' && bound_lat_lng.length == 4)) {
@@ -516,15 +516,15 @@  discard block
 block discarded – undo
516 516
                             percentage = percentage > 100 ? 100 : percentage;
517 517
 
518 518
 
519
-                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Inserting data...', 'geodirlocation'));?>');
519
+                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Inserting data...', 'geodirlocation')); ?>');
520 520
 
521 521
                             gdInstallDummyData(obj, nonce, posttype,insertedCount);
522 522
                         }
523 523
                         else {
524 524
                             percentage = 100;
525
-                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation'));?>');
525
+                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation')); ?>');
526 526
                             jQuery(obj).addClass('gd-remove-data');
527
-                            jQuery(obj).val('<?php _e('Remove data','geodirectory');?>');
527
+                            jQuery(obj).val('<?php _e('Remove data', 'geodirectory'); ?>');
528 528
                             jQuery(obj).prop('disabled', false);
529 529
 
530 530
                         }
Please login to merge, or discard this patch.
geodirectory-admin/class.analytics.stats.php 4 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -223,6 +223,9 @@
 block discarded – undo
223 223
 	 * @param filter - the property to filter on
224 224
 	 * @param limit - the number of items to get
225 225
 	 * @param realtime - if the realtime api should be used
226
+	 * @param string $metric
227
+	 * @param string $startDate
228
+	 * @param string $endDate
226 229
 	 * @return the specific metrics in array form
227 230
 	 **/
228 231
 	function getMetrics($metric, $startDate, $endDate, $dimensions = false, $sort = false, $filter = false, $limit = false, $realtime = false)
Please login to merge, or discard this patch.
Indentation   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -30,135 +30,135 @@  discard block
 block discarded – undo
30 30
 			// Include the Google Service API
31 31
 			include_once('google-api-php-client/src/Google/autoload.php');
32 32
 
33
-            $this->client = new Google_Client();
34
-            $this->client->setApprovalPrompt("force");
35
-            $this->client->setAccessType('offline');
36
-            $this->client->setClientId(GEODIR_GA_CLIENTID);
37
-            $this->client->setClientSecret(GEODIR_GA_CLIENTSECRET);
38
-            $this->client->setRedirectUri(GEODIR_GA_REDIRECT);
33
+			$this->client = new Google_Client();
34
+			$this->client->setApprovalPrompt("force");
35
+			$this->client->setAccessType('offline');
36
+			$this->client->setClientId(GEODIR_GA_CLIENTID);
37
+			$this->client->setClientSecret(GEODIR_GA_CLIENTSECRET);
38
+			$this->client->setRedirectUri(GEODIR_GA_REDIRECT);
39 39
 			
40
-            $this->client->setScopes(array("https://www.googleapis.com/auth/analytics"));
41
-
42
-            try {
43
-                    $this->analytics = new Google_Service_Analytics($this->client);
44
-                }
45
-            catch (Google_ServiceException $e)
46
-                {
47
-                    print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage();
40
+			$this->client->setScopes(array("https://www.googleapis.com/auth/analytics"));
41
+
42
+			try {
43
+					$this->analytics = new Google_Service_Analytics($this->client);
44
+				}
45
+			catch (Google_ServiceException $e)
46
+				{
47
+					print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage();
48 48
 					return false;
49
-                }
49
+				}
50 50
 	}
51 51
 
52 52
 	function checkLogin()
53 53
 	{
54
-            $ga_google_authtoken = get_option('geodir_ga_auth_token');
54
+			$ga_google_authtoken = get_option('geodir_ga_auth_token');
55 55
 
56
-            if (!empty($ga_google_authtoken))
57
-            {
56
+			if (!empty($ga_google_authtoken))
57
+			{
58 58
 				try
59
-                {
60
-                    $this->client->setAccessToken($ga_google_authtoken);
59
+				{
60
+					$this->client->setAccessToken($ga_google_authtoken);
61 61
 				}
62 62
 				catch( Google_AuthException $e )
63
-                {
64
-                    print '(cas:72) GeoDirectory was unable to authenticate you with
63
+				{
64
+					print '(cas:72) GeoDirectory was unable to authenticate you with
65 65
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
66 66
                             This could mean either you pasted the token wrong, or the time/date on your server is wrong,
67 67
                             or an SSL issue preventing Google from Authenticating. <br><br>
68 68
                             <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage();
69 69
 
70
-                    return false;
71
-                }
72
-            }
73
-            else
74
-            {
75
-                $authCode = get_option('geodir_ga_auth_code');
76
-
77
-                if (empty($authCode)) return false;
78
-
79
-                try
80
-                {
81
-                    $accessToken = $this->client->authenticate($authCode);
82
-                }
83
-                catch( Exception $e )
84
-                {
85
-                    print '(cas:72) GeoDirectory was unable to authenticate you with
70
+					return false;
71
+				}
72
+			}
73
+			else
74
+			{
75
+				$authCode = get_option('geodir_ga_auth_code');
76
+
77
+				if (empty($authCode)) return false;
78
+
79
+				try
80
+				{
81
+					$accessToken = $this->client->authenticate($authCode);
82
+				}
83
+				catch( Exception $e )
84
+				{
85
+					print '(cas:72) GeoDirectory was unable to authenticate you with
86 86
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
87 87
                             This could mean either you pasted the token wrong, or the time/date on your server is wrong,
88 88
                             or an SSL issue preventing Google from Authenticating. <br><br>
89 89
                             <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage();
90 90
 
91
-                    return false;
92
-                }
93
-
94
-                if($accessToken)
95
-                {
96
-                    $this->client->setAccessToken($accessToken);
97
-                    update_option('geodir_ga_auth_token', $accessToken);
98
-                }
99
-                else
100
-                {
101
-                    return false;
102
-                }
103
-            }
104
-
105
-            $this->token =  $this->client->getAccessToken();
106
-            return true;
91
+					return false;
92
+				}
93
+
94
+				if($accessToken)
95
+				{
96
+					$this->client->setAccessToken($accessToken);
97
+					update_option('geodir_ga_auth_token', $accessToken);
98
+				}
99
+				else
100
+				{
101
+					return false;
102
+				}
103
+			}
104
+
105
+			$this->token =  $this->client->getAccessToken();
106
+			return true;
107 107
 	}
108 108
 
109 109
 	function deauthorize()
110 110
 	{
111
-            update_option('geodir_ga_auth_code', '');
112
-            update_option('geodir_ga_auth_token', '');
111
+			update_option('geodir_ga_auth_code', '');
112
+			update_option('geodir_ga_auth_token', '');
113 113
 	}
114 114
 
115 115
 	function getSingleProfile()
116 116
 	{
117
-            $webproperty_id = get_option('geodir_ga_account_id');
118
-            list($pre, $account_id, $post) = explode('-',$webproperty_id);
119
-
120
-            if (empty($webproperty_id)) return false;
121
-
122
-            try {
123
-                $profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id);
124
-            }
125
-            catch (Google_ServiceException $e)
126
-            {
127
-                print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
128
-                return false;
129
-            }
130
-
131
-            $profile_id = $profiles->items[0]->id;
132
-            if (empty($profile_id)) return false;
133
-
134
-            $account_array = array();
135
-            array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id));
136
-            return $account_array;
117
+			$webproperty_id = get_option('geodir_ga_account_id');
118
+			list($pre, $account_id, $post) = explode('-',$webproperty_id);
119
+
120
+			if (empty($webproperty_id)) return false;
121
+
122
+			try {
123
+				$profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id);
124
+			}
125
+			catch (Google_ServiceException $e)
126
+			{
127
+				print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
128
+				return false;
129
+			}
130
+
131
+			$profile_id = $profiles->items[0]->id;
132
+			if (empty($profile_id)) return false;
133
+
134
+			$account_array = array();
135
+			array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id));
136
+			return $account_array;
137 137
 	}
138 138
 
139
-        function getAllProfiles()
140
-        {
141
-            $profile_array = array();
139
+		function getAllProfiles()
140
+		{
141
+			$profile_array = array();
142 142
             
143
-            try {
144
-                    $profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all');
145
-                }
146
-                catch (Google_ServiceException $e)
147
-                {
148
-                    print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
149
-                }
150
-
151
-
152
-            if( !empty( $profiles->items ) )
153
-            {
154
-                foreach( $profiles->items as $profile )
155
-                {
156
-                    $profile_array[ $profile->id ] = str_replace('http://','',$profile->name );
157
-                }
158
-            }
159
-
160
-            return $profile_array;
161
-        }
143
+			try {
144
+					$profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all');
145
+				}
146
+				catch (Google_ServiceException $e)
147
+				{
148
+					print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
149
+				}
150
+
151
+
152
+			if( !empty( $profiles->items ) )
153
+			{
154
+				foreach( $profiles->items as $profile )
155
+				{
156
+					$profile_array[ $profile->id ] = str_replace('http://','',$profile->name );
157
+				}
158
+			}
159
+
160
+			return $profile_array;
161
+		}
162 162
 
163 163
 	function getAnalyticsAccounts()
164 164
 	{
@@ -241,13 +241,13 @@  discard block
 block discarded – undo
241 241
 			$params['max-results'] = $limit;
242 242
 		}
243 243
            
244
-           // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking
245
-           $filtered_id = str_replace( 'ga:', '', $this->accountId );
244
+		   // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking
245
+		   $filtered_id = str_replace( 'ga:', '', $this->accountId );
246 246
            
247
-           if(!$filtered_id){
248
-                echo 'Error - Account ID is blank';
249
-                return false;
250
-           }
247
+		   if(!$filtered_id){
248
+				echo 'Error - Account ID is blank';
249
+				return false;
250
+		   }
251 251
 
252 252
 		if($realtime){
253 253
 			return $analytics->data_realtime->get(
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
                 }
45 45
             catch (Google_ServiceException $e)
46 46
                 {
47
-                    print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage();
47
+                    print '(cas:48) There was an Analytics API service error '.$e->getCode().':'.$e->getMessage();
48 48
 					return false;
49 49
                 }
50 50
 	}
@@ -59,13 +59,13 @@  discard block
 block discarded – undo
59 59
                 {
60 60
                     $this->client->setAccessToken($ga_google_authtoken);
61 61
 				}
62
-				catch( Google_AuthException $e )
62
+				catch (Google_AuthException $e)
63 63
                 {
64 64
                     print '(cas:72) GeoDirectory was unable to authenticate you with
65 65
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
66 66
                             This could mean either you pasted the token wrong, or the time/date on your server is wrong,
67 67
                             or an SSL issue preventing Google from Authenticating. <br><br>
68
-                            <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage();
68
+                            <br><br><strong>Tech Info </strong> ' . $e->getCode().':'.$e->getMessage();
69 69
 
70 70
                     return false;
71 71
                 }
@@ -80,18 +80,18 @@  discard block
 block discarded – undo
80 80
                 {
81 81
                     $accessToken = $this->client->authenticate($authCode);
82 82
                 }
83
-                catch( Exception $e )
83
+                catch (Exception $e)
84 84
                 {
85 85
                     print '(cas:72) GeoDirectory was unable to authenticate you with
86 86
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
87 87
                             This could mean either you pasted the token wrong, or the time/date on your server is wrong,
88 88
                             or an SSL issue preventing Google from Authenticating. <br><br>
89
-                            <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage();
89
+                            <br><br><strong>Tech Info </strong> ' . $e->getCode().':'.$e->getMessage();
90 90
 
91 91
                     return false;
92 92
                 }
93 93
 
94
-                if($accessToken)
94
+                if ($accessToken)
95 95
                 {
96 96
                     $this->client->setAccessToken($accessToken);
97 97
                     update_option('geodir_ga_auth_token', $accessToken);
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
                 }
103 103
             }
104 104
 
105
-            $this->token =  $this->client->getAccessToken();
105
+            $this->token = $this->client->getAccessToken();
106 106
             return true;
107 107
 	}
108 108
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	function getSingleProfile()
116 116
 	{
117 117
             $webproperty_id = get_option('geodir_ga_account_id');
118
-            list($pre, $account_id, $post) = explode('-',$webproperty_id);
118
+            list($pre, $account_id, $post) = explode('-', $webproperty_id);
119 119
 
120 120
             if (empty($webproperty_id)) return false;
121 121
 
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
             }
125 125
             catch (Google_ServiceException $e)
126 126
             {
127
-                print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
127
+                print 'There was an Analytics API service error '.$e->getCode().': '.$e->getMessage();
128 128
                 return false;
129 129
             }
130 130
 
@@ -145,15 +145,15 @@  discard block
 block discarded – undo
145 145
                 }
146 146
                 catch (Google_ServiceException $e)
147 147
                 {
148
-                    print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
148
+                    print 'There was an Analytics API service error '.$e->getCode().': '.$e->getMessage();
149 149
                 }
150 150
 
151 151
 
152
-            if( !empty( $profiles->items ) )
152
+            if (!empty($profiles->items))
153 153
             {
154
-                foreach( $profiles->items as $profile )
154
+                foreach ($profiles->items as $profile)
155 155
                 {
156
-                    $profile_array[ $profile->id ] = str_replace('http://','',$profile->name );
156
+                    $profile_array[$profile->id] = str_replace('http://', '', $profile->name);
157 157
                 }
158 158
             }
159 159
 
@@ -242,20 +242,20 @@  discard block
 block discarded – undo
242 242
 		}
243 243
            
244 244
            // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking
245
-           $filtered_id = str_replace( 'ga:', '', $this->accountId );
245
+           $filtered_id = str_replace('ga:', '', $this->accountId);
246 246
            
247
-           if(!$filtered_id){
247
+           if (!$filtered_id) {
248 248
                 echo 'Error - Account ID is blank';
249 249
                 return false;
250 250
            }
251 251
 
252
-		if($realtime){
252
+		if ($realtime) {
253 253
 			return $analytics->data_realtime->get(
254 254
 				'ga:'.$filtered_id,
255 255
 				$metric,
256 256
 				$params
257 257
 			);
258
-		}else{
258
+		} else {
259 259
 			return $analytics->data_ga->get(
260 260
 				'ga:'.$filtered_id,
261 261
 				$startDate,
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 	 **/
280 280
 	function verifyStartDate($date)
281 281
 	{
282
-		if ( strtotime($date) > strtotime('2005-01-01') )
282
+		if (strtotime($date) > strtotime('2005-01-01'))
283 283
 			return $date;
284 284
 		else
285 285
 			return '2005-01-01';
Please login to merge, or discard this patch.
Braces   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -41,8 +41,7 @@  discard block
 block discarded – undo
41 41
 
42 42
             try {
43 43
                     $this->analytics = new Google_Service_Analytics($this->client);
44
-                }
45
-            catch (Google_ServiceException $e)
44
+                } catch (Google_ServiceException $e)
46 45
                 {
47 46
                     print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage();
48 47
 					return false;
@@ -58,8 +57,7 @@  discard block
 block discarded – undo
58 57
 				try
59 58
                 {
60 59
                     $this->client->setAccessToken($ga_google_authtoken);
61
-				}
62
-				catch( Google_AuthException $e )
60
+				} catch( Google_AuthException $e )
63 61
                 {
64 62
                     print '(cas:72) GeoDirectory was unable to authenticate you with
65 63
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
@@ -69,18 +67,18 @@  discard block
 block discarded – undo
69 67
 
70 68
                     return false;
71 69
                 }
72
-            }
73
-            else
70
+            } else
74 71
             {
75 72
                 $authCode = get_option('geodir_ga_auth_code');
76 73
 
77
-                if (empty($authCode)) return false;
74
+                if (empty($authCode)) {
75
+                	return false;
76
+                }
78 77
 
79 78
                 try
80 79
                 {
81 80
                     $accessToken = $this->client->authenticate($authCode);
82
-                }
83
-                catch( Exception $e )
81
+                } catch( Exception $e )
84 82
                 {
85 83
                     print '(cas:72) GeoDirectory was unable to authenticate you with
86 84
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
@@ -95,8 +93,7 @@  discard block
 block discarded – undo
95 93
                 {
96 94
                     $this->client->setAccessToken($accessToken);
97 95
                     update_option('geodir_ga_auth_token', $accessToken);
98
-                }
99
-                else
96
+                } else
100 97
                 {
101 98
                     return false;
102 99
                 }
@@ -117,19 +114,22 @@  discard block
 block discarded – undo
117 114
             $webproperty_id = get_option('geodir_ga_account_id');
118 115
             list($pre, $account_id, $post) = explode('-',$webproperty_id);
119 116
 
120
-            if (empty($webproperty_id)) return false;
117
+            if (empty($webproperty_id)) {
118
+            	return false;
119
+            }
121 120
 
122 121
             try {
123 122
                 $profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id);
124
-            }
125
-            catch (Google_ServiceException $e)
123
+            } catch (Google_ServiceException $e)
126 124
             {
127 125
                 print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
128 126
                 return false;
129 127
             }
130 128
 
131 129
             $profile_id = $profiles->items[0]->id;
132
-            if (empty($profile_id)) return false;
130
+            if (empty($profile_id)) {
131
+            	return false;
132
+            }
133 133
 
134 134
             $account_array = array();
135 135
             array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id));
@@ -142,8 +142,7 @@  discard block
 block discarded – undo
142 142
             
143 143
             try {
144 144
                     $profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all');
145
-                }
146
-                catch (Google_ServiceException $e)
145
+                } catch (Google_ServiceException $e)
147 146
                 {
148 147
                     print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
149 148
                 }
@@ -255,7 +254,7 @@  discard block
 block discarded – undo
255 254
 				$metric,
256 255
 				$params
257 256
 			);
258
-		}else{
257
+		} else{
259 258
 			return $analytics->data_ga->get(
260 259
 				'ga:'.$filtered_id,
261 260
 				$startDate,
@@ -279,10 +278,11 @@  discard block
 block discarded – undo
279 278
 	 **/
280 279
 	function verifyStartDate($date)
281 280
 	{
282
-		if ( strtotime($date) > strtotime('2005-01-01') )
283
-			return $date;
284
-		else
285
-			return '2005-01-01';
281
+		if ( strtotime($date) > strtotime('2005-01-01') ) {
282
+					return $date;
283
+		} else {
284
+					return '2005-01-01';
285
+		}
286 286
 	}
287 287
 
288 288
 } // END class	
289 289
\ No newline at end of file
Please login to merge, or discard this patch.
geodirectory-functions/google_analytics.php 4 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
  * @param string $page Page url to use in analytics filters.
56 56
  * @param bool   $ga_start The start date of the data to include in YYYY-MM-DD format.
57 57
  * @param bool   $ga_end The end date of the data to include in YYYY-MM-DD format.
58
- * @return string Html text content.
58
+ * @return false|null Html text content.
59 59
  */
60 60
 function geodir_getGoogleAnalytics($page, $ga_start, $ga_end)
61 61
 {
Please login to merge, or discard this patch.
Indentation   +128 added lines, -128 removed lines patch added patch discarded remove patch
@@ -17,34 +17,34 @@  discard block
 block discarded – undo
17 17
  */
18 18
 function geodir_sec2hms($sec, $padHours = false)
19 19
 {
20
-    // holds formatted string
21
-    $hms = "";
22
-    // there are 3600 seconds in an hour, so if we
23
-    // divide total seconds by 3600 and throw away
24
-    // the remainder, we've got the number of hours
25
-    $hours = intval(intval($sec) / 3600);
26
-
27
-    // add to $hms, with a leading 0 if asked for
28
-    $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':';
29
-
30
-    // dividing the total seconds by 60 will give us
31
-    // the number of minutes, but we're interested in
32
-    // minutes past the hour: to get that, we need to
33
-    // divide by 60 again and keep the remainder
34
-    $minutes = intval(($sec / 60) % 60);
35
-
36
-    // then add to $hms (with a leading 0 if needed)
37
-    $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':';
38
-
39
-    // seconds are simple - just divide the total
40
-    // seconds by 60 and keep the remainder
41
-    $seconds = intval($sec % 60);
42
-
43
-    // add to $hms, again with a leading 0 if needed
44
-    $hms .= str_pad($seconds, 2, "0", STR_PAD_LEFT);
45
-
46
-    // done!
47
-    return $hms;
20
+	// holds formatted string
21
+	$hms = "";
22
+	// there are 3600 seconds in an hour, so if we
23
+	// divide total seconds by 3600 and throw away
24
+	// the remainder, we've got the number of hours
25
+	$hours = intval(intval($sec) / 3600);
26
+
27
+	// add to $hms, with a leading 0 if asked for
28
+	$hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':';
29
+
30
+	// dividing the total seconds by 60 will give us
31
+	// the number of minutes, but we're interested in
32
+	// minutes past the hour: to get that, we need to
33
+	// divide by 60 again and keep the remainder
34
+	$minutes = intval(($sec / 60) % 60);
35
+
36
+	// then add to $hms (with a leading 0 if needed)
37
+	$hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':';
38
+
39
+	// seconds are simple - just divide the total
40
+	// seconds by 60 and keep the remainder
41
+	$seconds = intval($sec % 60);
42
+
43
+	// add to $hms, again with a leading 0 if needed
44
+	$hms .= str_pad($seconds, 2, "0", STR_PAD_LEFT);
45
+
46
+	// done!
47
+	return $hms;
48 48
 }
49 49
 
50 50
 /**
@@ -60,122 +60,122 @@  discard block
 block discarded – undo
60 60
 function geodir_getGoogleAnalytics($page, $ga_start, $ga_end)
61 61
 {
62 62
 
63
-    // NEW ANALYTICS
64
-
65
-    $start_date = '';
66
-    $end_date = '';
67
-    $dimensions = '';
68
-    $sort = '';
69
-    $filters = "ga:pagePath==".$page;
70
-    $metrics = "ga:pageviews";
71
-    $realtime = false;
72
-    $limit = false;
73
-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){
74
-        $start_date = date('Y-m-d', strtotime("-6 day"));
75
-        $end_date = date('Y-m-d');
76
-        $dimensions = "ga:date,ga:nthDay";
77
-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
78
-        $start_date = date('Y-m-d', strtotime("-13 day"));
79
-        $end_date = date('Y-m-d', strtotime("-7 day"));
80
-        $dimensions = "ga:date,ga:nthDay";
81
-    }
82
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
83
-        $start_date = date('Y')."-01-01";
84
-        $end_date = date('Y-m-d');
85
-        $dimensions = "ga:month,ga:nthMonth";
86
-    }
87
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
88
-        $start_date = date('Y', strtotime("-1 year"))."-01-01";
89
-        $end_date = date('Y', strtotime("-1 year"))."-12-31";
90
-        $dimensions = "ga:month,ga:nthMonth";
91
-    }
92
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
93
-        $start_date = "14daysAgo";
94
-        $end_date = "yesterday";
95
-        $dimensions = "ga:country";
96
-        $sort = "ga:pageviews";
97
-        $limit  = 5;
98
-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
99
-        $metrics = "rt:activeUsers";
100
-        $realtime = true;
101
-    }
102
-
103
-    # Create a new Gdata call
104
-    $gaApi = new GDGoogleAnalyticsStats();
105
-
106
-    # Check if Google sucessfully logged in
107
-    if (!$gaApi->checkLogin()){
108
-        echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
109
-        return false;
110
-    }
111
-
112
-    $account = $gaApi->getSingleProfile();
113
-
114
-    if(!isset($account[0]['id'])){
115
-        echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
116
-        return false;
117
-    }
118
-
119
-    $account = $account[0]['id'];
120
-
121
-    # Set the account to the one requested
122
-    $gaApi->setAccount($account);
123
-
124
-
125
-
126
-    # Get the metrics needed to build the visits graph;
127
-    try {
128
-        $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime);
129
-    }
130
-    catch (Exception $e) {
131
-        print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage();
132
-    }
133
-
134
-
135
-    //print_r($stats);
136
-    echo json_encode($stats);
137
-    exit;
63
+	// NEW ANALYTICS
64
+
65
+	$start_date = '';
66
+	$end_date = '';
67
+	$dimensions = '';
68
+	$sort = '';
69
+	$filters = "ga:pagePath==".$page;
70
+	$metrics = "ga:pageviews";
71
+	$realtime = false;
72
+	$limit = false;
73
+	if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){
74
+		$start_date = date('Y-m-d', strtotime("-6 day"));
75
+		$end_date = date('Y-m-d');
76
+		$dimensions = "ga:date,ga:nthDay";
77
+	}elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
78
+		$start_date = date('Y-m-d', strtotime("-13 day"));
79
+		$end_date = date('Y-m-d', strtotime("-7 day"));
80
+		$dimensions = "ga:date,ga:nthDay";
81
+	}
82
+	elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
83
+		$start_date = date('Y')."-01-01";
84
+		$end_date = date('Y-m-d');
85
+		$dimensions = "ga:month,ga:nthMonth";
86
+	}
87
+	elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
88
+		$start_date = date('Y', strtotime("-1 year"))."-01-01";
89
+		$end_date = date('Y', strtotime("-1 year"))."-12-31";
90
+		$dimensions = "ga:month,ga:nthMonth";
91
+	}
92
+	elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
93
+		$start_date = "14daysAgo";
94
+		$end_date = "yesterday";
95
+		$dimensions = "ga:country";
96
+		$sort = "ga:pageviews";
97
+		$limit  = 5;
98
+	}elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
99
+		$metrics = "rt:activeUsers";
100
+		$realtime = true;
101
+	}
102
+
103
+	# Create a new Gdata call
104
+	$gaApi = new GDGoogleAnalyticsStats();
105
+
106
+	# Check if Google sucessfully logged in
107
+	if (!$gaApi->checkLogin()){
108
+		echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
109
+		return false;
110
+	}
111
+
112
+	$account = $gaApi->getSingleProfile();
113
+
114
+	if(!isset($account[0]['id'])){
115
+		echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
116
+		return false;
117
+	}
118
+
119
+	$account = $account[0]['id'];
120
+
121
+	# Set the account to the one requested
122
+	$gaApi->setAccount($account);
123
+
124
+
125
+
126
+	# Get the metrics needed to build the visits graph;
127
+	try {
128
+		$stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime);
129
+	}
130
+	catch (Exception $e) {
131
+		print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage();
132
+	}
133
+
134
+
135
+	//print_r($stats);
136
+	echo json_encode($stats);
137
+	exit;
138 138
 
139 139
 
140 140
 }// end GA function
141 141
 
142 142
 
143 143
 function geodir_ga_get_token(){
144
-    $at = get_option('gd_ga_access_token');
145
-    $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at;
146
-    $response =  wp_remote_get($use_url,array('timeout' => 15));
144
+	$at = get_option('gd_ga_access_token');
145
+	$use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at;
146
+	$response =  wp_remote_get($use_url,array('timeout' => 15));
147 147
 
148
-    if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
148
+	if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
149 149
 
150
-    return $at;
151
-    }else{//else get new access token
150
+	return $at;
151
+	}else{//else get new access token
152 152
 
153
-        $refresh_at = get_option('gd_ga_refresh_token');
154
-        if(!$refresh_at){
155
-            echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;
156
-        }
153
+		$refresh_at = get_option('gd_ga_refresh_token');
154
+		if(!$refresh_at){
155
+			echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;
156
+		}
157 157
 
158
-        $rat_url = "https://www.googleapis.com/oauth2/v3/token?";
159
-        $client_id = "client_id=".get_option('geodir_ga_client_id');
160
-        $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
161
-        $refresh_token = "&refresh_token=".$refresh_at;
162
-        $grant_type = "&grant_type=refresh_token";
158
+		$rat_url = "https://www.googleapis.com/oauth2/v3/token?";
159
+		$client_id = "client_id=".get_option('geodir_ga_client_id');
160
+		$client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
161
+		$refresh_token = "&refresh_token=".$refresh_at;
162
+		$grant_type = "&grant_type=refresh_token";
163 163
 
164
-        $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type;
164
+		$rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type;
165 165
 
166
-        $rat_response =  wp_remote_post($rat_url_use,array('timeout' => 15));
167
-        if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {
168
-            $parts = json_decode($rat_response['body']);
166
+		$rat_response =  wp_remote_post($rat_url_use,array('timeout' => 15));
167
+		if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {
168
+			$parts = json_decode($rat_response['body']);
169 169
 
170 170
 
171
-            update_option('gd_ga_access_token', $parts->access_token);
172
-            return $parts->access_token;
171
+			update_option('gd_ga_access_token', $parts->access_token);
172
+			return $parts->access_token;
173 173
 
174
-        }else{
175
-            echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
176
-        }
174
+		}else{
175
+			echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
176
+		}
177 177
 
178 178
 
179
-    }
179
+	}
180 180
 
181 181
 }
182 182
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     $hours = intval(intval($sec) / 3600);
26 26
 
27 27
     // add to $hms, with a leading 0 if asked for
28
-    $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':';
28
+    $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT).':' : $hours.':';
29 29
 
30 30
     // dividing the total seconds by 60 will give us
31 31
     // the number of minutes, but we're interested in
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
     $minutes = intval(($sec / 60) % 60);
35 35
 
36 36
     // then add to $hms (with a leading 0 if needed)
37
-    $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':';
37
+    $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT).':';
38 38
 
39 39
     // seconds are simple - just divide the total
40 40
     // seconds by 60 and keep the remainder
@@ -70,32 +70,32 @@  discard block
 block discarded – undo
70 70
     $metrics = "ga:pageviews";
71 71
     $realtime = false;
72 72
     $limit = false;
73
-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){
73
+    if (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'thisweek') {
74 74
         $start_date = date('Y-m-d', strtotime("-6 day"));
75 75
         $end_date = date('Y-m-d');
76 76
         $dimensions = "ga:date,ga:nthDay";
77
-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
77
+    }elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'lastweek') {
78 78
         $start_date = date('Y-m-d', strtotime("-13 day"));
79 79
         $end_date = date('Y-m-d', strtotime("-7 day"));
80 80
         $dimensions = "ga:date,ga:nthDay";
81 81
     }
82
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
82
+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'thisyear') {
83 83
         $start_date = date('Y')."-01-01";
84 84
         $end_date = date('Y-m-d');
85 85
         $dimensions = "ga:month,ga:nthMonth";
86 86
     }
87
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
87
+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'lastyear') {
88 88
         $start_date = date('Y', strtotime("-1 year"))."-01-01";
89 89
         $end_date = date('Y', strtotime("-1 year"))."-12-31";
90 90
         $dimensions = "ga:month,ga:nthMonth";
91 91
     }
92
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
92
+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'country') {
93 93
         $start_date = "14daysAgo";
94 94
         $end_date = "yesterday";
95 95
         $dimensions = "ga:country";
96 96
         $sort = "ga:pageviews";
97
-        $limit  = 5;
98
-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
97
+        $limit = 5;
98
+    }elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'realtime') {
99 99
         $metrics = "rt:activeUsers";
100 100
         $realtime = true;
101 101
     }
@@ -104,15 +104,15 @@  discard block
 block discarded – undo
104 104
     $gaApi = new GDGoogleAnalyticsStats();
105 105
 
106 106
     # Check if Google sucessfully logged in
107
-    if (!$gaApi->checkLogin()){
108
-        echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
107
+    if (!$gaApi->checkLogin()) {
108
+        echo json_encode(array('error'=>__('Please check Google Analytics Settings', 'geodirectory')));
109 109
         return false;
110 110
     }
111 111
 
112 112
     $account = $gaApi->getSingleProfile();
113 113
 
114
-    if(!isset($account[0]['id'])){
115
-        echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
114
+    if (!isset($account[0]['id'])) {
115
+        echo json_encode(array('error'=>__('Please check Google Analytics Settings', 'geodirectory')));
116 116
         return false;
117 117
     }
118 118
 
@@ -125,10 +125,10 @@  discard block
 block discarded – undo
125 125
 
126 126
     # Get the metrics needed to build the visits graph;
127 127
     try {
128
-        $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime);
128
+        $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit, $realtime);
129 129
     }
130 130
     catch (Exception $e) {
131
-        print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage();
131
+        print 'GA Summary Widget - there was a service error '.$e->getCode().':'.$e->getMessage();
132 132
     }
133 133
 
134 134
 
@@ -140,19 +140,19 @@  discard block
 block discarded – undo
140 140
 }// end GA function
141 141
 
142 142
 
143
-function geodir_ga_get_token(){
143
+function geodir_ga_get_token() {
144 144
     $at = get_option('gd_ga_access_token');
145 145
     $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at;
146
-    $response =  wp_remote_get($use_url,array('timeout' => 15));
146
+    $response = wp_remote_get($use_url, array('timeout' => 15));
147 147
 
148
-    if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
148
+    if (!empty($response['response']['code']) && $response['response']['code'] == 200) {//access token is valid
149 149
 
150 150
     return $at;
151
-    }else{//else get new access token
151
+    } else {//else get new access token
152 152
 
153 153
         $refresh_at = get_option('gd_ga_refresh_token');
154
-        if(!$refresh_at){
155
-            echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;
154
+        if (!$refresh_at) {
155
+            echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory'))); exit;
156 156
         }
157 157
 
158 158
         $rat_url = "https://www.googleapis.com/oauth2/v3/token?";
@@ -163,16 +163,16 @@  discard block
 block discarded – undo
163 163
 
164 164
         $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type;
165 165
 
166
-        $rat_response =  wp_remote_post($rat_url_use,array('timeout' => 15));
167
-        if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {
166
+        $rat_response = wp_remote_post($rat_url_use, array('timeout' => 15));
167
+        if (!empty($rat_response['response']['code']) && $rat_response['response']['code'] == 200) {
168 168
             $parts = json_decode($rat_response['body']);
169 169
 
170 170
 
171 171
             update_option('gd_ga_access_token', $parts->access_token);
172 172
             return $parts->access_token;
173 173
 
174
-        }else{
175
-            echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
174
+        } else {
175
+            echo json_encode(array('error'=>__('Login failed', 'geodirectory'))); exit;
176 176
         }
177 177
 
178 178
 
Please login to merge, or discard this patch.
Braces   +8 added lines, -12 removed lines patch added patch discarded remove patch
@@ -74,28 +74,25 @@  discard block
 block discarded – undo
74 74
         $start_date = date('Y-m-d', strtotime("-6 day"));
75 75
         $end_date = date('Y-m-d');
76 76
         $dimensions = "ga:date,ga:nthDay";
77
-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
77
+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
78 78
         $start_date = date('Y-m-d', strtotime("-13 day"));
79 79
         $end_date = date('Y-m-d', strtotime("-7 day"));
80 80
         $dimensions = "ga:date,ga:nthDay";
81
-    }
82
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
81
+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
83 82
         $start_date = date('Y')."-01-01";
84 83
         $end_date = date('Y-m-d');
85 84
         $dimensions = "ga:month,ga:nthMonth";
86
-    }
87
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
85
+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
88 86
         $start_date = date('Y', strtotime("-1 year"))."-01-01";
89 87
         $end_date = date('Y', strtotime("-1 year"))."-12-31";
90 88
         $dimensions = "ga:month,ga:nthMonth";
91
-    }
92
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
89
+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
93 90
         $start_date = "14daysAgo";
94 91
         $end_date = "yesterday";
95 92
         $dimensions = "ga:country";
96 93
         $sort = "ga:pageviews";
97 94
         $limit  = 5;
98
-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
95
+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
99 96
         $metrics = "rt:activeUsers";
100 97
         $realtime = true;
101 98
     }
@@ -126,8 +123,7 @@  discard block
 block discarded – undo
126 123
     # Get the metrics needed to build the visits graph;
127 124
     try {
128 125
         $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime);
129
-    }
130
-    catch (Exception $e) {
126
+    } catch (Exception $e) {
131 127
         print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage();
132 128
     }
133 129
 
@@ -148,7 +144,7 @@  discard block
 block discarded – undo
148 144
     if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
149 145
 
150 146
     return $at;
151
-    }else{//else get new access token
147
+    } else{//else get new access token
152 148
 
153 149
         $refresh_at = get_option('gd_ga_refresh_token');
154 150
         if(!$refresh_at){
@@ -171,7 +167,7 @@  discard block
 block discarded – undo
171 167
             update_option('gd_ga_access_token', $parts->access_token);
172 168
             return $parts->access_token;
173 169
 
174
-        }else{
170
+        } else{
175 171
             echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
176 172
         }
177 173
 
Please login to merge, or discard this patch.
geodirectory.php 3 patches
Braces   +41 added lines, -13 removed lines patch added patch discarded remove patch
@@ -79,43 +79,71 @@
 block discarded – undo
79 79
 /**
80 80
  * Do not store any revisions (except the one autosave per post).
81 81
  */
82
-if (!defined('WP_POST_REVISIONS')) define('WP_POST_REVISIONS', 0);
82
+if (!defined('WP_POST_REVISIONS')) {
83
+	define('WP_POST_REVISIONS', 0);
84
+}
83 85
 
84 86
 /**
85 87
  * Define constants
86 88
  */
87
-if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
89
+if(!defined('GEODIRECTORY_PLUGIN_DIR')) {
90
+	define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
91
+}
88 92
 
89 93
 /*
90 94
  * Declare database table names. All since version 1.0.0
91 95
  */
92 96
 
93 97
 /** Define the database name for the countries table. */
94
-if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');
98
+if (!defined('GEODIR_COUNTRIES_TABLE')) {
99
+	define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');
100
+}
95 101
 /** Define the database name for the custom fields table. */
96
-if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');
102
+if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) {
103
+	define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');
104
+}
97 105
 /** Define the database name for the icons table. */
98
-if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');
106
+if (!defined('GEODIR_ICON_TABLE')) {
107
+	define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');
108
+}
99 109
 /** Define the database name for the attachments table. */
100
-if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');
110
+if (!defined('GEODIR_ATTACHMENT_TABLE')) {
111
+	define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');
112
+}
101 113
 /** Define the database name for the review table. */
102
-if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');
114
+if (!defined('GEODIR_REVIEW_TABLE')) {
115
+	define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');
116
+}
103 117
 /** Define the database name for the custom sort fields table. */
104
-if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');
118
+if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) {
119
+	define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');
120
+}
105 121
 
106 122
 /*
107 123
  * Define our Google Analytic app settings
108 124
  */
109
-if (!defined('GEODIR_GA_CLIENTID')) define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');
110
-if (!defined('GEODIR_GA_CLIENTSECRET')) define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C'); //don't worry - this don't need to be secret in our case
111
-if (!defined('GEODIR_GA_REDIRECT')) define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');
112
-if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');//.readonly
125
+if (!defined('GEODIR_GA_CLIENTID')) {
126
+	define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');
127
+}
128
+if (!defined('GEODIR_GA_CLIENTSECRET')) {
129
+	define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C');
130
+}
131
+//don't worry - this don't need to be secret in our case
132
+if (!defined('GEODIR_GA_REDIRECT')) {
133
+	define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');
134
+}
135
+if (!defined('GEODIR_GA_SCOPE')) {
136
+	define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');
137
+}
138
+//.readonly
113 139
 
114 140
 
115 141
 /*
116 142
  * Localisation items.
117 143
  */
118
-if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');
144
+if (!defined('GEODIRECTORY_TEXTDOMAIN')) {
145
+	define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');
146
+}
119 147
 
120 148
 // Load geodirectory plugin textdomain.
121 149
 add_action( 'init', 'geodir_load_textdomain' );
Please login to merge, or discard this patch.
Indentation   +90 added lines, -90 removed lines patch added patch discarded remove patch
@@ -31,30 +31,30 @@  discard block
 block discarded – undo
31 31
  * CHECK FOR OLD COMPATIBILITY PACKS AND DISABLE IF THEY ARE ACTIVE
32 32
  */
33 33
 if (is_admin()) {
34
-    /**
35
-     * Include WordPress core file so we can use core functions to check for active plugins.
36
-     */
37
-    include_once(ABSPATH . 'wp-admin/includes/plugin.php');
34
+	/**
35
+	 * Include WordPress core file so we can use core functions to check for active plugins.
36
+	 */
37
+	include_once(ABSPATH . 'wp-admin/includes/plugin.php');
38 38
 
39
-    if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {
40
-        deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');
41
-    }
39
+	if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {
40
+		deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');
41
+	}
42 42
 
43
-    if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {
44
-        deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');
45
-    }
43
+	if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {
44
+		deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');
45
+	}
46 46
 
47
-    if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {
48
-        deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');
49
-    }
47
+	if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {
48
+		deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');
49
+	}
50 50
 
51
-    if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {
52
-        deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');
53
-    }
51
+	if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {
52
+		deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');
53
+	}
54 54
 
55
-    if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {
56
-        deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');
57
-    }
55
+	if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {
56
+		deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');
57
+	}
58 58
 
59 59
 }
60 60
 
@@ -130,19 +130,19 @@  discard block
 block discarded – undo
130 130
  * @package GeoDirectory
131 131
  */
132 132
 function geodir_error_log($log){
133
-    /*
133
+	/*
134 134
      * A filter to override the WP_DEBUG setting for function geodir_error_log().
135 135
      *
136 136
      * @since 1.5.7
137 137
      */
138
-    $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);
139
-    if ( true === $should_log ) {
140
-        if ( is_array( $log ) || is_object( $log ) ) {
141
-            error_log( print_r( $log, true ) );
142
-        } else {
143
-            error_log( $log );
144
-        }
145
-    }
138
+	$should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);
139
+	if ( true === $should_log ) {
140
+		if ( is_array( $log ) || is_object( $log ) ) {
141
+			error_log( print_r( $log, true ) );
142
+		} else {
143
+			error_log( $log );
144
+		}
145
+	}
146 146
 }
147 147
 /**
148 148
  * Include all plugin functions.
@@ -181,72 +181,72 @@  discard block
 block discarded – undo
181 181
  */
182 182
 if (is_admin() || defined( 'GD_TESTING_MODE' ) || ( defined( 'WP_CLI' ) && WP_CLI )) {
183 183
 
184
-    /**
185
-     * Include functions used in admin area only.
186
-     *
187
-     * @since 1.0.0
188
-     */
189
-    require_once('geodirectory-admin/admin_functions.php');
190
-    /**
191
-     * Most actions/hooks used in admin area only are called from here.
192
-     *
193
-     * @since 1.6.11
194
-     */
195
-    require_once('geodirectory-admin/admin_dummy_data_functions.php');
196
-    /**
197
-     * Most actions/hooks used in admin area only are called from here.
198
-     *
199
-     * @since 1.0.0
200
-     */
201
-    require_once('geodirectory-admin/admin_hooks_actions.php');
202
-    /**
203
-     * Most admin JS and CSS is called from here.
204
-     *
205
-     * @since 1.0.0
206
-     */
207
-    require_once('geodirectory-admin/admin_template_tags.php');
208
-    /**
209
-     * Include Google Analytics Class.
210
-     *
211
-     * @since 1.6.11
212
-     */
213
-    require_once('geodirectory-admin/class.analytics.stats.php');
214
-    /**
215
-     * Include any functions needed for upgrades.
216
-     *
217
-     * @since 1.0.0
218
-     */
219
-    require_once(geodir_plugin_path() . '/upgrade.php');
220
-    if (get_option('geodir_installed') != 1) {
221
-        /**
222
-         * Define language constants, here as they are not loaded yet.
223
-         *
224
-         * @since 1.0.0
225
-         */
226
-        require_once(geodir_plugin_path() . '/language.php');
227
-        /**
228
-         * Include the plugin install file that sets up the databases and any options on first run.
229
-         *
230
-         * @since 1.0.0
231
-         */
232
-        require_once('geodirectory-admin/admin_install.php');
233
-        register_activation_hook(__FILE__, 'geodir_activation');
234
-    }
235
-    register_deactivation_hook(__FILE__, 'geodir_deactivation');
236
-
237
-    /*
184
+	/**
185
+	 * Include functions used in admin area only.
186
+	 *
187
+	 * @since 1.0.0
188
+	 */
189
+	require_once('geodirectory-admin/admin_functions.php');
190
+	/**
191
+	 * Most actions/hooks used in admin area only are called from here.
192
+	 *
193
+	 * @since 1.6.11
194
+	 */
195
+	require_once('geodirectory-admin/admin_dummy_data_functions.php');
196
+	/**
197
+	 * Most actions/hooks used in admin area only are called from here.
198
+	 *
199
+	 * @since 1.0.0
200
+	 */
201
+	require_once('geodirectory-admin/admin_hooks_actions.php');
202
+	/**
203
+	 * Most admin JS and CSS is called from here.
204
+	 *
205
+	 * @since 1.0.0
206
+	 */
207
+	require_once('geodirectory-admin/admin_template_tags.php');
208
+	/**
209
+	 * Include Google Analytics Class.
210
+	 *
211
+	 * @since 1.6.11
212
+	 */
213
+	require_once('geodirectory-admin/class.analytics.stats.php');
214
+	/**
215
+	 * Include any functions needed for upgrades.
216
+	 *
217
+	 * @since 1.0.0
218
+	 */
219
+	require_once(geodir_plugin_path() . '/upgrade.php');
220
+	if (get_option('geodir_installed') != 1) {
221
+		/**
222
+		 * Define language constants, here as they are not loaded yet.
223
+		 *
224
+		 * @since 1.0.0
225
+		 */
226
+		require_once(geodir_plugin_path() . '/language.php');
227
+		/**
228
+		 * Include the plugin install file that sets up the databases and any options on first run.
229
+		 *
230
+		 * @since 1.0.0
231
+		 */
232
+		require_once('geodirectory-admin/admin_install.php');
233
+		register_activation_hook(__FILE__, 'geodir_activation');
234
+	}
235
+	register_deactivation_hook(__FILE__, 'geodir_deactivation');
236
+
237
+	/*
238 238
      * Show a upgrade warning message if applicable.
239 239
      *
240 240
      * @since 1.5.6
241 241
      */
242
-    global $pagenow;
242
+	global $pagenow;
243 243
    if ( 'plugins.php' === $pagenow )
244
-    {
245
-        // Better update message
246
-        $file   = basename( __FILE__ );
247
-        $folder = basename( dirname( __FILE__ ) );
248
-        $hook = "in_plugin_update_message-{$folder}/{$file}";
249
-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );
250
-    }
244
+	{
245
+		// Better update message
246
+		$file   = basename( __FILE__ );
247
+		$folder = basename( dirname( __FILE__ ) );
248
+		$hook = "in_plugin_update_message-{$folder}/{$file}";
249
+		add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );
250
+	}
251 251
 
252 252
 }
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
     /**
35 35
      * Include WordPress core file so we can use core functions to check for active plugins.
36 36
      */
37
-    include_once(ABSPATH . 'wp-admin/includes/plugin.php');
37
+    include_once(ABSPATH.'wp-admin/includes/plugin.php');
38 38
 
39 39
     if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {
40 40
         deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
  * @global string $plugin_file_name Base file name. 'geodirectory/geodirectory.php'.
69 69
  */
70 70
 global $wpdb, $plugin_prefix, $geodir_addon_list, $plugin_file_name;
71
-$plugin_prefix = $wpdb->prefix . 'geodir_';
72
-$plugin_file_name = basename(plugin_dir_path(__FILE__)) . '/' . basename(__FILE__);
71
+$plugin_prefix = $wpdb->prefix.'geodir_';
72
+$plugin_file_name = basename(plugin_dir_path(__FILE__)).'/'.basename(__FILE__);
73 73
 
74 74
 /*
75 75
  * This will store the cached post custom fields per package for each page load so not to run for each listing.
@@ -84,24 +84,24 @@  discard block
 block discarded – undo
84 84
 /**
85 85
  * Define constants
86 86
  */
87
-if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
87
+if (!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path(__FILE__));
88 88
 
89 89
 /*
90 90
  * Declare database table names. All since version 1.0.0
91 91
  */
92 92
 
93 93
 /** Define the database name for the countries table. */
94
-if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');
94
+if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix.'countries');
95 95
 /** Define the database name for the custom fields table. */
96
-if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');
96
+if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix.'custom_fields');
97 97
 /** Define the database name for the icons table. */
98
-if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');
98
+if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix.'post_icon');
99 99
 /** Define the database name for the attachments table. */
100
-if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');
100
+if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix.'attachments');
101 101
 /** Define the database name for the review table. */
102
-if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');
102
+if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix.'post_review');
103 103
 /** Define the database name for the custom sort fields table. */
104
-if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');
104
+if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix.'custom_sort_fields');
105 105
 
106 106
 /*
107 107
  * Define our Google Analytic app settings
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 if (!defined('GEODIR_GA_CLIENTID')) define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');
110 110
 if (!defined('GEODIR_GA_CLIENTSECRET')) define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C'); //don't worry - this don't need to be secret in our case
111 111
 if (!defined('GEODIR_GA_REDIRECT')) define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');
112
-if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');//.readonly
112
+if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics'); //.readonly
113 113
 
114 114
 
115 115
 /*
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');
119 119
 
120 120
 // Load geodirectory plugin textdomain.
121
-add_action( 'init', 'geodir_load_textdomain' );
121
+add_action('init', 'geodir_load_textdomain');
122 122
 
123 123
 /*
124 124
  * A function to log GD errors no matter the type given.
@@ -129,18 +129,18 @@  discard block
 block discarded – undo
129 129
  * @param mixed $log The thing that should be logged.
130 130
  * @package GeoDirectory
131 131
  */
132
-function geodir_error_log($log){
132
+function geodir_error_log($log) {
133 133
     /*
134 134
      * A filter to override the WP_DEBUG setting for function geodir_error_log().
135 135
      *
136 136
      * @since 1.5.7
137 137
      */
138
-    $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);
139
-    if ( true === $should_log ) {
140
-        if ( is_array( $log ) || is_object( $log ) ) {
141
-            error_log( print_r( $log, true ) );
138
+    $should_log = apply_filters('geodir_log_errors', WP_DEBUG);
139
+    if (true === $should_log) {
140
+        if (is_array($log) || is_object($log)) {
141
+            error_log(print_r($log, true));
142 142
         } else {
143
-            error_log( $log );
143
+            error_log($log);
144 144
         }
145 145
     }
146 146
 }
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 /*
180 180
  * Admin init + activation hooks
181 181
  */
182
-if (is_admin() || defined( 'GD_TESTING_MODE' ) || ( defined( 'WP_CLI' ) && WP_CLI )) {
182
+if (is_admin() || defined('GD_TESTING_MODE') || (defined('WP_CLI') && WP_CLI)) {
183 183
 
184 184
     /**
185 185
      * Include functions used in admin area only.
@@ -216,14 +216,14 @@  discard block
 block discarded – undo
216 216
      *
217 217
      * @since 1.0.0
218 218
      */
219
-    require_once(geodir_plugin_path() . '/upgrade.php');
219
+    require_once(geodir_plugin_path().'/upgrade.php');
220 220
     if (get_option('geodir_installed') != 1) {
221 221
         /**
222 222
          * Define language constants, here as they are not loaded yet.
223 223
          *
224 224
          * @since 1.0.0
225 225
          */
226
-        require_once(geodir_plugin_path() . '/language.php');
226
+        require_once(geodir_plugin_path().'/language.php');
227 227
         /**
228 228
          * Include the plugin install file that sets up the databases and any options on first run.
229 229
          *
@@ -240,13 +240,13 @@  discard block
 block discarded – undo
240 240
      * @since 1.5.6
241 241
      */
242 242
     global $pagenow;
243
-   if ( 'plugins.php' === $pagenow )
243
+   if ('plugins.php' === $pagenow)
244 244
     {
245 245
         // Better update message
246
-        $file   = basename( __FILE__ );
247
-        $folder = basename( dirname( __FILE__ ) );
246
+        $file   = basename(__FILE__);
247
+        $folder = basename(dirname(__FILE__));
248 248
         $hook = "in_plugin_update_message-{$folder}/{$file}";
249
-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );
249
+        add_action($hook, 'geodire_admin_upgrade_notice', 20, 2);
250 250
     }
251 251
 
252 252
 }
Please login to merge, or discard this patch.
geodirectory-admin/dummy-data/recruitment_jobs.php 3 patches
Indentation   +646 added lines, -646 removed lines patch added patch discarded remove patch
@@ -7,232 +7,232 @@  discard block
 block discarded – undo
7 7
  */
8 8
 
9 9
 function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){
10
-    $fields = array();
11
-    $package = ($package_id=='') ? '' : array($package_id);
12
-
13
-    // Salary
14
-    $fields[] = array('listing_type' => $post_type,
15
-                      'field_type'          =>  'text',
16
-                      'data_type'           =>  'FLOAT',
17
-                      'decimal_point'       =>  '2',
18
-                      'admin_title'         =>  __('Salary', 'geodirectory'),
19
-                      'site_title'          =>  __('Salary', 'geodirectory'),
20
-                      'admin_desc'          =>  __('Enter the Salary in $ (no currency symbol) ie: 25000', 'geodirectory'),
21
-                      'htmlvar_name'        =>  'salary',
22
-                      'is_active'           =>  true,
23
-                      'for_admin_use'       =>  false,
24
-                      'default_value'       =>  '',
25
-                      'show_in' 	        =>  '[detail],[listing]',
26
-                      'is_required'         =>  false,
27
-                      'validation_pattern'  =>  '\d+(\.\d{2})?',
28
-                      'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
29
-                      'required_msg'        =>  '',
30
-                      'field_icon'          =>  'fa fa-usd',
31
-                      'css_class'           =>  '',
32
-                      'cat_sort'            =>  true,
33
-                      'cat_filter'	        =>  true,
34
-                      'extra'        =>  array(
35
-                          'is_price'                  =>  1,
36
-                          'thousand_separator'        =>  'comma',
37
-                          'decimal_separator'         =>  'period',
38
-                          'decimal_display'           =>  'if',
39
-                          'currency_symbol'           =>  '$',
40
-                          'currency_symbol_placement' =>  'left'
41
-                      )
42
-    );
43
-
44
-
45
-
46
-    // Job Type
47
-    $fields[] = array('listing_type' => $post_type,
48
-                      'field_type'          =>  'select',
49
-                      'data_type'           =>  'VARCHAR',
50
-                      'admin_title'         =>  __('Job Type', 'geodirectory'),
51
-                      'site_title'          =>  __('Job Type','geodirectory'),
52
-                      'admin_desc'          =>  __('Select the type of job.','geodirectory'),
53
-                      'htmlvar_name'        =>  'job_type',
54
-                      'is_active'           =>  true,
55
-                      'for_admin_use'       =>  false,
56
-                      'default_value'       =>  '',
57
-                      'show_in' 	        =>  '[detail],[listing]',
58
-                      'is_required'         =>  true,
59
-                      'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
60
-                      'validation_pattern'  =>  '',
61
-                      'validation_msg'      =>  '',
62
-                      'required_msg'        =>  '',
63
-                      'field_icon'          =>  'fa fa-briefcase',
64
-                      'css_class'           =>  '',
65
-                      'cat_sort'            =>  true,
66
-                      'cat_filter'	        =>  true
67
-    );
68
-
69
-    // Job Sector
70
-    $fields[] = array('listing_type' => $post_type,
71
-                      'field_type'          =>  'select',
72
-                      'data_type'           =>  'VARCHAR',
73
-                      'admin_title'         =>  __('Job Sector','geodirectory'),
74
-                      'site_title'          =>  __('Job Sector','geodirectory'),
75
-                      'admin_desc'          =>  __('Select the job sector.','geodirectory'),
76
-                      'htmlvar_name'        =>  'job_sector',
77
-                      'is_active'           =>  true,
78
-                      'for_admin_use'       =>  false,
79
-                      'default_value'       =>  '',
80
-                      'show_in' 	          =>  '[detail]',
81
-                      'is_required'         =>  true,
82
-                      'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
83
-                      'validation_pattern'  =>  '',
84
-                      'validation_msg'      =>  '',
85
-                      'required_msg'        =>  '',
86
-                      'field_icon'          =>  'fa fa-briefcase',
87
-                      'css_class'           =>  '',
88
-                      'cat_sort'            =>  true,
89
-                      'cat_filter'	      =>  true
90
-    );
91
-
92
-    // Required Experience
93
-    $fields[] = array('listing_type' => $post_type,
94
-                      'field_type'          =>  'select',
95
-                      'data_type'           =>  'VARCHAR',
96
-                      'admin_title'         =>  __('Required Experience', 'geodirectory'),
97
-                      'site_title'          =>  __('Required Experience', 'geodirectory'),
98
-                      'admin_desc'          =>  __('Select the number of years required experience', 'geodirectory'),
99
-                      'htmlvar_name'        =>  'job_experience',
100
-                      'is_active'           =>  true,
101
-                      'for_admin_use'       =>  false,
102
-                      'default_value'       =>  '',
103
-                      'show_in' 	        =>  '[detail],[listing]',
104
-                      'is_required'         =>  true,
105
-                      'option_values'       =>  __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years','geodirectory'),
106
-                      'validation_pattern'  =>  '',
107
-                      'validation_msg'      =>  '',
108
-                      'required_msg'        =>  '',
109
-                      'field_icon'          =>  'fa fa-life-ring',
110
-                      'css_class'           =>  '',
111
-                      'cat_sort'            =>  true,
112
-                      'cat_filter'	        =>  true
113
-    );
114
-
115
-    // Required Skills
116
-    $fields[] = array('listing_type' => $post_type,
117
-                      'field_type'          =>  'textarea',
118
-                      'data_type'           =>  'TEXT',
119
-                      'admin_title'         =>  __('Required Skills', 'geodirectory'),
120
-                      'site_title'          =>  __('Required Skills', 'geodirectory'),
121
-                      'admin_desc'          =>  __('Enter the required skills for the job', 'geodirectory'),
122
-                      'htmlvar_name'        =>  'property_area',
123
-                      'is_active'           =>  true,
124
-                      'for_admin_use'       =>  false,
125
-                      'default_value'       =>  '',
126
-                      'show_in' 	        =>  '[detail],[listing]',
127
-                      'is_required'         =>  false,
128
-                      'validation_pattern'  =>  '',
129
-                      'validation_msg'      =>  '',
130
-                      'required_msg'        =>  '',
131
-                      'field_icon'          =>  'fa fa-area-chart',
132
-                      'css_class'           =>  '',
133
-                      'cat_sort'            =>  true,
134
-                      'cat_filter'	        =>  true
135
-    );
136
-
137
-
138
-
139
-    // Company details fieldset
140
-    $fields[] = array('listing_type' => $post_type,
141
-                      'field_type'          =>  'fieldset',
142
-                      'data_type'           =>  '',
143
-                      'admin_title'         =>  __('Company Details', 'geodirectory'),
144
-                      'site_title'          =>  __('Company Details', 'geodirectory'),
145
-                      'admin_desc'          =>  __('Enter your company details here', 'geodirectory'),
146
-                      'htmlvar_name'        =>  'job_company_details',
147
-                      'is_active'           =>  true,
148
-                      'for_admin_use'       =>  false,
149
-                      'show_in' 	        =>  '[owntab]'
150
-
151
-    );
152
-
153
-    // Company Name
154
-    $fields[] = array('listing_type' => $post_type,
155
-                      'field_type'          =>  'text',
156
-                      'data_type'           =>  'VARCHAR',
157
-                      'admin_title'         =>  __('Company Name', 'geodirectory'),
158
-                      'site_title'          =>  __('Company Name', 'geodirectory'),
159
-                      'admin_desc'          =>  __('Enter your company name', 'geodirectory'),
160
-                      'htmlvar_name'        =>  'job_company_name',
161
-                      'is_active'           =>  true,
162
-                      'for_admin_use'       =>  false,
163
-                      'default_value'       =>  '',
164
-                      'show_in' 	        =>  '[owntab]',
165
-                      'is_required'         =>  false,
166
-                      'validation_pattern'  =>  '',
167
-                      'validation_msg'      =>  '',
168
-                      'required_msg'        =>  '',
169
-                      'field_icon'          =>  'fa fa-arrow-circle-right',
170
-                      'css_class'           =>  '',
171
-                      'cat_sort'            =>  false,
172
-                      'cat_filter'	        =>  false
173
-    );
174
-
175
-    // Company Logo
176
-    $fields[] = array('listing_type' => $post_type,
177
-                      'field_type'          =>  'file',
178
-                      'data_type'           =>  '',
179
-                      'admin_title'         =>  __('Company Logo', 'geodirectory'),
180
-                      'site_title'          =>  __('Company Logo', 'geodirectory'),
181
-                      'admin_desc'          =>  __('Enter your company Logo', 'geodirectory'),
182
-                      'htmlvar_name'        =>  'job_company_logo',
183
-                      'is_active'           =>  true,
184
-                      'for_admin_use'       =>  false,
185
-                      'default_value'       =>  '',
186
-                      'show_in' 	        =>  '[owntab]',
187
-                      'is_required'         =>  false,
188
-                      'validation_pattern'  =>  '',
189
-                      'validation_msg'      =>  '',
190
-                      'required_msg'        =>  '',
191
-                      'field_icon'          =>  'fa fa-arrow-circle-right',
192
-                      'css_class'           =>  '',
193
-                      'cat_sort'            =>  false,
194
-                      'cat_filter'	        =>  false,
195
-                      'extra'               =>  array(
196
-                          'gd_file_types'   =>  'jpg',
197
-                          'gd_file_types'   =>  'jpeg',
198
-                          'gd_file_types'   =>  'gif',
199
-                          'gd_file_types'   =>  'png',
200
-                      )
201
-    );
202
-
203
-    // Company Url
204
-    $fields[] = array('listing_type' => $post_type,
205
-                      'field_type'          =>  'url',
206
-                      'data_type'           =>  'VARCHAR',
207
-                      'admin_title'         =>  __('Company Url', 'geodirectory'),
208
-                      'site_title'          =>  __('Company Url', 'geodirectory'),
209
-                      'admin_desc'          =>  __('Enter your company Url', 'geodirectory'),
210
-                      'htmlvar_name'        =>  'job_company_url',
211
-                      'is_active'           =>  true,
212
-                      'for_admin_use'       =>  false,
213
-                      'default_value'       =>  '',
214
-                      'show_in' 	        =>  '[owntab]',
215
-                      'is_required'         =>  false,
216
-                      'validation_pattern'  =>  '',
217
-                      'validation_msg'      =>  '',
218
-                      'required_msg'        =>  '',
219
-                      'field_icon'          =>  'fa fa-arrow-circle-right',
220
-                      'css_class'           =>  '',
221
-                      'cat_sort'            =>  false,
222
-                      'cat_filter'	        =>  false
223
-    );
224
-
225
-
226
-
227
-    /**
228
-     * Filter the array of default custom fields DB table data.
229
-     *
230
-     * @since 1.6.6
231
-     * @param string $fields The default custom fields as an array.
232
-     */
233
-    $fields = apply_filters('geodir_property_sale_custom_fields', $fields);
234
-
235
-    return  $fields;
10
+	$fields = array();
11
+	$package = ($package_id=='') ? '' : array($package_id);
12
+
13
+	// Salary
14
+	$fields[] = array('listing_type' => $post_type,
15
+					  'field_type'          =>  'text',
16
+					  'data_type'           =>  'FLOAT',
17
+					  'decimal_point'       =>  '2',
18
+					  'admin_title'         =>  __('Salary', 'geodirectory'),
19
+					  'site_title'          =>  __('Salary', 'geodirectory'),
20
+					  'admin_desc'          =>  __('Enter the Salary in $ (no currency symbol) ie: 25000', 'geodirectory'),
21
+					  'htmlvar_name'        =>  'salary',
22
+					  'is_active'           =>  true,
23
+					  'for_admin_use'       =>  false,
24
+					  'default_value'       =>  '',
25
+					  'show_in' 	        =>  '[detail],[listing]',
26
+					  'is_required'         =>  false,
27
+					  'validation_pattern'  =>  '\d+(\.\d{2})?',
28
+					  'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
29
+					  'required_msg'        =>  '',
30
+					  'field_icon'          =>  'fa fa-usd',
31
+					  'css_class'           =>  '',
32
+					  'cat_sort'            =>  true,
33
+					  'cat_filter'	        =>  true,
34
+					  'extra'        =>  array(
35
+						  'is_price'                  =>  1,
36
+						  'thousand_separator'        =>  'comma',
37
+						  'decimal_separator'         =>  'period',
38
+						  'decimal_display'           =>  'if',
39
+						  'currency_symbol'           =>  '$',
40
+						  'currency_symbol_placement' =>  'left'
41
+					  )
42
+	);
43
+
44
+
45
+
46
+	// Job Type
47
+	$fields[] = array('listing_type' => $post_type,
48
+					  'field_type'          =>  'select',
49
+					  'data_type'           =>  'VARCHAR',
50
+					  'admin_title'         =>  __('Job Type', 'geodirectory'),
51
+					  'site_title'          =>  __('Job Type','geodirectory'),
52
+					  'admin_desc'          =>  __('Select the type of job.','geodirectory'),
53
+					  'htmlvar_name'        =>  'job_type',
54
+					  'is_active'           =>  true,
55
+					  'for_admin_use'       =>  false,
56
+					  'default_value'       =>  '',
57
+					  'show_in' 	        =>  '[detail],[listing]',
58
+					  'is_required'         =>  true,
59
+					  'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
60
+					  'validation_pattern'  =>  '',
61
+					  'validation_msg'      =>  '',
62
+					  'required_msg'        =>  '',
63
+					  'field_icon'          =>  'fa fa-briefcase',
64
+					  'css_class'           =>  '',
65
+					  'cat_sort'            =>  true,
66
+					  'cat_filter'	        =>  true
67
+	);
68
+
69
+	// Job Sector
70
+	$fields[] = array('listing_type' => $post_type,
71
+					  'field_type'          =>  'select',
72
+					  'data_type'           =>  'VARCHAR',
73
+					  'admin_title'         =>  __('Job Sector','geodirectory'),
74
+					  'site_title'          =>  __('Job Sector','geodirectory'),
75
+					  'admin_desc'          =>  __('Select the job sector.','geodirectory'),
76
+					  'htmlvar_name'        =>  'job_sector',
77
+					  'is_active'           =>  true,
78
+					  'for_admin_use'       =>  false,
79
+					  'default_value'       =>  '',
80
+					  'show_in' 	          =>  '[detail]',
81
+					  'is_required'         =>  true,
82
+					  'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
83
+					  'validation_pattern'  =>  '',
84
+					  'validation_msg'      =>  '',
85
+					  'required_msg'        =>  '',
86
+					  'field_icon'          =>  'fa fa-briefcase',
87
+					  'css_class'           =>  '',
88
+					  'cat_sort'            =>  true,
89
+					  'cat_filter'	      =>  true
90
+	);
91
+
92
+	// Required Experience
93
+	$fields[] = array('listing_type' => $post_type,
94
+					  'field_type'          =>  'select',
95
+					  'data_type'           =>  'VARCHAR',
96
+					  'admin_title'         =>  __('Required Experience', 'geodirectory'),
97
+					  'site_title'          =>  __('Required Experience', 'geodirectory'),
98
+					  'admin_desc'          =>  __('Select the number of years required experience', 'geodirectory'),
99
+					  'htmlvar_name'        =>  'job_experience',
100
+					  'is_active'           =>  true,
101
+					  'for_admin_use'       =>  false,
102
+					  'default_value'       =>  '',
103
+					  'show_in' 	        =>  '[detail],[listing]',
104
+					  'is_required'         =>  true,
105
+					  'option_values'       =>  __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years','geodirectory'),
106
+					  'validation_pattern'  =>  '',
107
+					  'validation_msg'      =>  '',
108
+					  'required_msg'        =>  '',
109
+					  'field_icon'          =>  'fa fa-life-ring',
110
+					  'css_class'           =>  '',
111
+					  'cat_sort'            =>  true,
112
+					  'cat_filter'	        =>  true
113
+	);
114
+
115
+	// Required Skills
116
+	$fields[] = array('listing_type' => $post_type,
117
+					  'field_type'          =>  'textarea',
118
+					  'data_type'           =>  'TEXT',
119
+					  'admin_title'         =>  __('Required Skills', 'geodirectory'),
120
+					  'site_title'          =>  __('Required Skills', 'geodirectory'),
121
+					  'admin_desc'          =>  __('Enter the required skills for the job', 'geodirectory'),
122
+					  'htmlvar_name'        =>  'property_area',
123
+					  'is_active'           =>  true,
124
+					  'for_admin_use'       =>  false,
125
+					  'default_value'       =>  '',
126
+					  'show_in' 	        =>  '[detail],[listing]',
127
+					  'is_required'         =>  false,
128
+					  'validation_pattern'  =>  '',
129
+					  'validation_msg'      =>  '',
130
+					  'required_msg'        =>  '',
131
+					  'field_icon'          =>  'fa fa-area-chart',
132
+					  'css_class'           =>  '',
133
+					  'cat_sort'            =>  true,
134
+					  'cat_filter'	        =>  true
135
+	);
136
+
137
+
138
+
139
+	// Company details fieldset
140
+	$fields[] = array('listing_type' => $post_type,
141
+					  'field_type'          =>  'fieldset',
142
+					  'data_type'           =>  '',
143
+					  'admin_title'         =>  __('Company Details', 'geodirectory'),
144
+					  'site_title'          =>  __('Company Details', 'geodirectory'),
145
+					  'admin_desc'          =>  __('Enter your company details here', 'geodirectory'),
146
+					  'htmlvar_name'        =>  'job_company_details',
147
+					  'is_active'           =>  true,
148
+					  'for_admin_use'       =>  false,
149
+					  'show_in' 	        =>  '[owntab]'
150
+
151
+	);
152
+
153
+	// Company Name
154
+	$fields[] = array('listing_type' => $post_type,
155
+					  'field_type'          =>  'text',
156
+					  'data_type'           =>  'VARCHAR',
157
+					  'admin_title'         =>  __('Company Name', 'geodirectory'),
158
+					  'site_title'          =>  __('Company Name', 'geodirectory'),
159
+					  'admin_desc'          =>  __('Enter your company name', 'geodirectory'),
160
+					  'htmlvar_name'        =>  'job_company_name',
161
+					  'is_active'           =>  true,
162
+					  'for_admin_use'       =>  false,
163
+					  'default_value'       =>  '',
164
+					  'show_in' 	        =>  '[owntab]',
165
+					  'is_required'         =>  false,
166
+					  'validation_pattern'  =>  '',
167
+					  'validation_msg'      =>  '',
168
+					  'required_msg'        =>  '',
169
+					  'field_icon'          =>  'fa fa-arrow-circle-right',
170
+					  'css_class'           =>  '',
171
+					  'cat_sort'            =>  false,
172
+					  'cat_filter'	        =>  false
173
+	);
174
+
175
+	// Company Logo
176
+	$fields[] = array('listing_type' => $post_type,
177
+					  'field_type'          =>  'file',
178
+					  'data_type'           =>  '',
179
+					  'admin_title'         =>  __('Company Logo', 'geodirectory'),
180
+					  'site_title'          =>  __('Company Logo', 'geodirectory'),
181
+					  'admin_desc'          =>  __('Enter your company Logo', 'geodirectory'),
182
+					  'htmlvar_name'        =>  'job_company_logo',
183
+					  'is_active'           =>  true,
184
+					  'for_admin_use'       =>  false,
185
+					  'default_value'       =>  '',
186
+					  'show_in' 	        =>  '[owntab]',
187
+					  'is_required'         =>  false,
188
+					  'validation_pattern'  =>  '',
189
+					  'validation_msg'      =>  '',
190
+					  'required_msg'        =>  '',
191
+					  'field_icon'          =>  'fa fa-arrow-circle-right',
192
+					  'css_class'           =>  '',
193
+					  'cat_sort'            =>  false,
194
+					  'cat_filter'	        =>  false,
195
+					  'extra'               =>  array(
196
+						  'gd_file_types'   =>  'jpg',
197
+						  'gd_file_types'   =>  'jpeg',
198
+						  'gd_file_types'   =>  'gif',
199
+						  'gd_file_types'   =>  'png',
200
+					  )
201
+	);
202
+
203
+	// Company Url
204
+	$fields[] = array('listing_type' => $post_type,
205
+					  'field_type'          =>  'url',
206
+					  'data_type'           =>  'VARCHAR',
207
+					  'admin_title'         =>  __('Company Url', 'geodirectory'),
208
+					  'site_title'          =>  __('Company Url', 'geodirectory'),
209
+					  'admin_desc'          =>  __('Enter your company Url', 'geodirectory'),
210
+					  'htmlvar_name'        =>  'job_company_url',
211
+					  'is_active'           =>  true,
212
+					  'for_admin_use'       =>  false,
213
+					  'default_value'       =>  '',
214
+					  'show_in' 	        =>  '[owntab]',
215
+					  'is_required'         =>  false,
216
+					  'validation_pattern'  =>  '',
217
+					  'validation_msg'      =>  '',
218
+					  'required_msg'        =>  '',
219
+					  'field_icon'          =>  'fa fa-arrow-circle-right',
220
+					  'css_class'           =>  '',
221
+					  'cat_sort'            =>  false,
222
+					  'cat_filter'	        =>  false
223
+	);
224
+
225
+
226
+
227
+	/**
228
+	 * Filter the array of default custom fields DB table data.
229
+	 *
230
+	 * @since 1.6.6
231
+	 * @param string $fields The default custom fields as an array.
232
+	 */
233
+	$fields = apply_filters('geodir_property_sale_custom_fields', $fields);
234
+
235
+	return  $fields;
236 236
 }
237 237
 
238 238
 global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
@@ -242,36 +242,36 @@  discard block
 block discarded – undo
242 242
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
243 243
 
244 244
 if($dummy_post_index==1){
245
-    // add the dummy categories
246
-    geodir_dummy_data_taxonomies($post_type,$category_array );
245
+	// add the dummy categories
246
+	geodir_dummy_data_taxonomies($post_type,$category_array );
247 247
 
248
-    // add the dummy custom fields
249
-    $fields = geodir_property_sale_custom_fields($post_type);
250
-    geodir_create_dummy_fields($fields);
251
-    update_option($post_type.'_dummy_data_type','property_sale');
248
+	// add the dummy custom fields
249
+	$fields = geodir_property_sale_custom_fields($post_type);
250
+	geodir_create_dummy_fields($fields);
251
+	update_option($post_type.'_dummy_data_type','property_sale');
252 252
 }
253 253
 
254 254
 if (geodir_dummy_folder_exists())
255
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
255
+	$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
256 256
 else
257
-    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
257
+	$dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
258 258
 
259 259
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
260 260
 
261 261
 switch ($dummy_post_index) {
262 262
 
263
-    case(1):
264
-        $image_array[] = "$dummy_image_url/ps/psf1.jpg";
265
-        $image_array[] = "$dummy_image_url/ps/psl1.jpg";
266
-        $image_array[] = "$dummy_image_url/ps/psb1.jpg";
267
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
268
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
263
+	case(1):
264
+		$image_array[] = "$dummy_image_url/ps/psf1.jpg";
265
+		$image_array[] = "$dummy_image_url/ps/psl1.jpg";
266
+		$image_array[] = "$dummy_image_url/ps/psb1.jpg";
267
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
268
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
269 269
 
270 270
 
271
-        $post_info[] = array(
272
-            "listing_type" => $post_type,
273
-            "post_title" => 'Eastern Lodge',
274
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
271
+		$post_info[] = array(
272
+			"listing_type" => $post_type,
273
+			"post_title" => 'Eastern Lodge',
274
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
275 275
 
276 276
 Aliquam ut odio ullamcorper, posuere enim sed, venenatis tortor. Donec justo elit, aliquam sed cursus sed, semper eget libero. Mauris consequat lorem sed fringilla tincidunt. Phasellus suscipit velit et elit tristique, ac commodo metus scelerisque. Vivamus finibus ipsum placerat pulvinar aliquet. Maecenas augue orci, blandit at nibh pharetra, condimentum congue ligula. Duis non ante sagittis odio convallis lacinia in quis sapien.
277 277
 
@@ -280,42 +280,42 @@  discard block
 block discarded – undo
280 280
 Vestibulum tristique quam eget bibendum pulvinar. Mauris sit amet magna ut arcu rutrum pellentesque feugiat et ipsum. Proin porta quam sed risus accumsan pharetra. Nulla quis semper nisl. Nulla facilisi. Nulla facilisi. Pellentesque euismod sollicitudin lacus vel ultricies. Vestibulum ut sem ut nulla ultricies convallis in at mi. Nunc vitae nibh arcu. Maecenas nunc enim, tempus a rhoncus eget, pellentesque ut erat.
281 281
 
282 282
 Suspendisse interdum accumsan magna et tempor. Suspendisse scelerisque at lorem sit amet faucibus. Aenean quis consectetur enim. Duis aliquet tristique tempus. Suspendisse id ullamcorper mauris. Aliquam in libero eu justo porttitor pulvinar. Nulla semper placerat lectus. Nulla mollis suscipit lacus, a blandit purus cursus non. Maecenas id tellus mi. Pellentesque sollicitudin nibh eget magna scelerisque consequat. Aliquam convallis orci arcu, et euismod dui cursus et. Donec nec pellentesque nulla, ac pretium massa. In gravida bibendum ornare.',
283
-            "post_images" => $image_array,
284
-            "post_category" => array($post_type.'category' => array($category_array[1])),
285
-            "post_tags" => array('Tags', 'Sample Tags'),
286
-            "geodir_video" => '',
287
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
288
-            "geodir_contact" => '(111) 677-4444',
289
-            "geodir_email" => '[email protected]',
290
-            "geodir_website" => 'http://example.com/',
291
-            "geodir_twitter" => 'http://example.com/',
292
-            "geodir_facebook" => 'http://example.com/',
293
-            "geodir_price" => '350000',
294
-            "geodir_property_status" => 'For Sale',
295
-            'geodir_property_furnishing' => 'Furnished',
296
-            'geodir_property_type' => 'Detached house',
297
-            'geodir_property_bedrooms' => '3',
298
-            'geodir_property_bathrooms' => '2',
299
-            'geodir_property_area' => '1850',
300
-            'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
301
-            "post_dummy" => '1'
302
-        );
303
-
304
-
305
-        break;
306
-    case 2:
307
-        $image_array = array();
308
-        $post_meta = array();
309
-        $image_array[] = "$dummy_image_url/ps/psf2.jpg";
310
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
311
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
312
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
313
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
314
-
315
-        $post_info[] = array(
316
-            "listing_type" => $post_type,
317
-            "post_title" => 'Daisy Street',
318
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
283
+			"post_images" => $image_array,
284
+			"post_category" => array($post_type.'category' => array($category_array[1])),
285
+			"post_tags" => array('Tags', 'Sample Tags'),
286
+			"geodir_video" => '',
287
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
288
+			"geodir_contact" => '(111) 677-4444',
289
+			"geodir_email" => '[email protected]',
290
+			"geodir_website" => 'http://example.com/',
291
+			"geodir_twitter" => 'http://example.com/',
292
+			"geodir_facebook" => 'http://example.com/',
293
+			"geodir_price" => '350000',
294
+			"geodir_property_status" => 'For Sale',
295
+			'geodir_property_furnishing' => 'Furnished',
296
+			'geodir_property_type' => 'Detached house',
297
+			'geodir_property_bedrooms' => '3',
298
+			'geodir_property_bathrooms' => '2',
299
+			'geodir_property_area' => '1850',
300
+			'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
301
+			"post_dummy" => '1'
302
+		);
303
+
304
+
305
+		break;
306
+	case 2:
307
+		$image_array = array();
308
+		$post_meta = array();
309
+		$image_array[] = "$dummy_image_url/ps/psf2.jpg";
310
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
311
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
312
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
313
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
314
+
315
+		$post_info[] = array(
316
+			"listing_type" => $post_type,
317
+			"post_title" => 'Daisy Street',
318
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
319 319
 
320 320
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
321 321
 
@@ -325,42 +325,42 @@  discard block
 block discarded – undo
325 325
 
326 326
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
327 327
 
328
-            "post_images" => $image_array,
329
-            "post_category" => array($post_type.'category' => array($category_array[1])),
330
-            "post_tags" => array('Garage'),
331
-            "geodir_video" => '',
332
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
333
-            "geodir_contact" => '(222) 777-1111',
334
-            "geodir_email" => '[email protected]',
335
-            "geodir_website" => 'http://example.com/',
336
-            "geodir_twitter" => 'http://example.com/',
337
-            "geodir_facebook" => 'http://example.com/',
338
-            "geodir_price" => '230000',
339
-            "geodir_property_status" => 'Sold',
340
-            'geodir_property_furnishing' => 'Unfurnished',
341
-            'geodir_property_type' => 'Detached house',
342
-            'geodir_property_bedrooms' => '5',
343
-            'geodir_property_bathrooms' => '3',
344
-            'geodir_property_area' => '2650',
345
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
346
-            "post_dummy" => '1'
347
-        );
348
-
349
-        break;
350
-
351
-    case 3:
352
-        $image_array = array();
353
-        $post_meta = array();
354
-        $image_array[] = "$dummy_image_url/ps/psf3.jpg";
355
-        $image_array[] = "$dummy_image_url/ps/psl3.jpg";
356
-        $image_array[] = "$dummy_image_url/ps/psb3.jpg";
357
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
358
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
359
-
360
-        $post_info[] = array(
361
-            "listing_type" => $post_type,
362
-            "post_title" => 'Northbay House',
363
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
328
+			"post_images" => $image_array,
329
+			"post_category" => array($post_type.'category' => array($category_array[1])),
330
+			"post_tags" => array('Garage'),
331
+			"geodir_video" => '',
332
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
333
+			"geodir_contact" => '(222) 777-1111',
334
+			"geodir_email" => '[email protected]',
335
+			"geodir_website" => 'http://example.com/',
336
+			"geodir_twitter" => 'http://example.com/',
337
+			"geodir_facebook" => 'http://example.com/',
338
+			"geodir_price" => '230000',
339
+			"geodir_property_status" => 'Sold',
340
+			'geodir_property_furnishing' => 'Unfurnished',
341
+			'geodir_property_type' => 'Detached house',
342
+			'geodir_property_bedrooms' => '5',
343
+			'geodir_property_bathrooms' => '3',
344
+			'geodir_property_area' => '2650',
345
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
346
+			"post_dummy" => '1'
347
+		);
348
+
349
+		break;
350
+
351
+	case 3:
352
+		$image_array = array();
353
+		$post_meta = array();
354
+		$image_array[] = "$dummy_image_url/ps/psf3.jpg";
355
+		$image_array[] = "$dummy_image_url/ps/psl3.jpg";
356
+		$image_array[] = "$dummy_image_url/ps/psb3.jpg";
357
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
358
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
359
+
360
+		$post_info[] = array(
361
+			"listing_type" => $post_type,
362
+			"post_title" => 'Northbay House',
363
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
364 364
 
365 365
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
366 366
 
@@ -370,43 +370,43 @@  discard block
 block discarded – undo
370 370
 
371 371
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
372 372
 
373
-            "post_images" => $image_array,
374
-            "post_category" => array($post_type.'category' => array($category_array[1])),
375
-            "post_tags" => array('Tags', 'Sample Tags'),
376
-            "geodir_video" => '',
377
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
378
-            "geodir_contact" => '(222) 777-1111',
379
-            "geodir_email" => '[email protected]',
380
-            "geodir_website" => 'http://example.com/',
381
-            "geodir_twitter" => 'http://example.com/',
382
-            "geodir_facebook" => 'http://example.com/',
383
-            "geodir_price" => '260000',
384
-            "geodir_property_status" => 'Under Offer',
385
-            'geodir_property_furnishing' => 'Unfurnished',
386
-            'geodir_property_type' => 'Detached house',
387
-            'geodir_property_bedrooms' => '6',
388
-            'geodir_property_bathrooms' => '6',
389
-            'geodir_property_area' => '1650',
390
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
391
-            "post_dummy" => '1'
392
-        );
393
-
394
-        break;
395
-
396
-
397
-    case 4:
398
-        $image_array = array();
399
-        $post_meta = array();
400
-        $image_array[] = "$dummy_image_url/ps/psf4.jpg";
401
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
402
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
403
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
404
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
405
-
406
-        $post_info[] = array(
407
-            "listing_type" => $post_type,
408
-            "post_title" => 'Jesmond Mansion',
409
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
373
+			"post_images" => $image_array,
374
+			"post_category" => array($post_type.'category' => array($category_array[1])),
375
+			"post_tags" => array('Tags', 'Sample Tags'),
376
+			"geodir_video" => '',
377
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
378
+			"geodir_contact" => '(222) 777-1111',
379
+			"geodir_email" => '[email protected]',
380
+			"geodir_website" => 'http://example.com/',
381
+			"geodir_twitter" => 'http://example.com/',
382
+			"geodir_facebook" => 'http://example.com/',
383
+			"geodir_price" => '260000',
384
+			"geodir_property_status" => 'Under Offer',
385
+			'geodir_property_furnishing' => 'Unfurnished',
386
+			'geodir_property_type' => 'Detached house',
387
+			'geodir_property_bedrooms' => '6',
388
+			'geodir_property_bathrooms' => '6',
389
+			'geodir_property_area' => '1650',
390
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
391
+			"post_dummy" => '1'
392
+		);
393
+
394
+		break;
395
+
396
+
397
+	case 4:
398
+		$image_array = array();
399
+		$post_meta = array();
400
+		$image_array[] = "$dummy_image_url/ps/psf4.jpg";
401
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
402
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
403
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
404
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
405
+
406
+		$post_info[] = array(
407
+			"listing_type" => $post_type,
408
+			"post_title" => 'Jesmond Mansion',
409
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
410 410
 
411 411
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
412 412
 
@@ -416,42 +416,42 @@  discard block
 block discarded – undo
416 416
 
417 417
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
418 418
 
419
-            "post_images" => $image_array,
420
-            "post_category" => array($post_type.'category' => array($category_array[1])),
421
-            "post_tags" => array('Tags', 'Sample Tags'),
422
-            "geodir_video" => '',
423
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
424
-            "geodir_contact" => '(222) 777-1111',
425
-            "geodir_email" => '[email protected]',
426
-            "geodir_website" => 'http://example.com/',
427
-            "geodir_twitter" => 'http://example.com/',
428
-            "geodir_facebook" => 'http://example.com/',
429
-            "geodir_price" => '2300000',
430
-            "geodir_property_status" => 'Under Offer',
431
-            'geodir_property_furnishing' => 'Partially furnished',
432
-            'geodir_property_type' => 'Detached house',
433
-            'geodir_property_bedrooms' => '10',
434
-            'geodir_property_bathrooms' => '7',
435
-            'geodir_property_area' => '6600',
436
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
437
-            "post_dummy" => '1'
438
-        );
439
-
440
-        break;
441
-
442
-    case 5:
443
-        $image_array = array();
444
-        $post_meta = array();
445
-        $image_array[] = "$dummy_image_url/ps/psf5.jpg";
446
-        $image_array[] = "$dummy_image_url/ps/psl5.jpg";
447
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
448
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
449
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
450
-
451
-        $post_info[] = array(
452
-            "listing_type" => $post_type,
453
-            "post_title" => 'Springfield Lodge',
454
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
419
+			"post_images" => $image_array,
420
+			"post_category" => array($post_type.'category' => array($category_array[1])),
421
+			"post_tags" => array('Tags', 'Sample Tags'),
422
+			"geodir_video" => '',
423
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
424
+			"geodir_contact" => '(222) 777-1111',
425
+			"geodir_email" => '[email protected]',
426
+			"geodir_website" => 'http://example.com/',
427
+			"geodir_twitter" => 'http://example.com/',
428
+			"geodir_facebook" => 'http://example.com/',
429
+			"geodir_price" => '2300000',
430
+			"geodir_property_status" => 'Under Offer',
431
+			'geodir_property_furnishing' => 'Partially furnished',
432
+			'geodir_property_type' => 'Detached house',
433
+			'geodir_property_bedrooms' => '10',
434
+			'geodir_property_bathrooms' => '7',
435
+			'geodir_property_area' => '6600',
436
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
437
+			"post_dummy" => '1'
438
+		);
439
+
440
+		break;
441
+
442
+	case 5:
443
+		$image_array = array();
444
+		$post_meta = array();
445
+		$image_array[] = "$dummy_image_url/ps/psf5.jpg";
446
+		$image_array[] = "$dummy_image_url/ps/psl5.jpg";
447
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
448
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
449
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
450
+
451
+		$post_info[] = array(
452
+			"listing_type" => $post_type,
453
+			"post_title" => 'Springfield Lodge',
454
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
455 455
 
456 456
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
457 457
 
@@ -461,42 +461,42 @@  discard block
 block discarded – undo
461 461
 
462 462
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
463 463
 
464
-            "post_images" => $image_array,
465
-            "post_category" => array($post_type.'category' => array($category_array[1])),
466
-            "post_tags" => array('Tags', 'Sample Tags'),
467
-            "geodir_video" => '',
468
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
469
-            "geodir_contact" => '(222) 777-1111',
470
-            "geodir_email" => '[email protected]',
471
-            "geodir_website" => 'http://example.com/',
472
-            "geodir_twitter" => 'http://example.com/',
473
-            "geodir_facebook" => 'http://example.com/',
474
-            "geodir_price" => '330000',
475
-            "geodir_property_status" => 'For Sale',
476
-            'geodir_property_furnishing' => 'Optional',
477
-            'geodir_property_type' => 'Detached house',
478
-            'geodir_property_bedrooms' => '4',
479
-            'geodir_property_bathrooms' => '3',
480
-            'geodir_property_area' => '3700',
481
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
482
-            "post_dummy" => '1'
483
-        );
484
-
485
-        break;
486
-
487
-    case 6:
488
-        $image_array = array();
489
-        $post_meta = array();
490
-        $image_array[] = "$dummy_image_url/ps/psf6.jpg";
491
-        $image_array[] = "$dummy_image_url/ps/psl6.jpg";
492
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
493
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
494
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
495
-
496
-        $post_info[] = array(
497
-            "listing_type" => $post_type,
498
-            "post_title" => 'Forrest Park',
499
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
464
+			"post_images" => $image_array,
465
+			"post_category" => array($post_type.'category' => array($category_array[1])),
466
+			"post_tags" => array('Tags', 'Sample Tags'),
467
+			"geodir_video" => '',
468
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
469
+			"geodir_contact" => '(222) 777-1111',
470
+			"geodir_email" => '[email protected]',
471
+			"geodir_website" => 'http://example.com/',
472
+			"geodir_twitter" => 'http://example.com/',
473
+			"geodir_facebook" => 'http://example.com/',
474
+			"geodir_price" => '330000',
475
+			"geodir_property_status" => 'For Sale',
476
+			'geodir_property_furnishing' => 'Optional',
477
+			'geodir_property_type' => 'Detached house',
478
+			'geodir_property_bedrooms' => '4',
479
+			'geodir_property_bathrooms' => '3',
480
+			'geodir_property_area' => '3700',
481
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
482
+			"post_dummy" => '1'
483
+		);
484
+
485
+		break;
486
+
487
+	case 6:
488
+		$image_array = array();
489
+		$post_meta = array();
490
+		$image_array[] = "$dummy_image_url/ps/psf6.jpg";
491
+		$image_array[] = "$dummy_image_url/ps/psl6.jpg";
492
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
493
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
494
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
495
+
496
+		$post_info[] = array(
497
+			"listing_type" => $post_type,
498
+			"post_title" => 'Forrest Park',
499
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
500 500
 
501 501
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
502 502
 
@@ -506,42 +506,42 @@  discard block
 block discarded – undo
506 506
 
507 507
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
508 508
 
509
-            "post_images" => $image_array,
510
-            "post_category" => array($post_type.'category' => array($category_array[1])),
511
-            "post_tags" => array('Tags', 'Sample Tags'),
512
-            "geodir_video" => '',
513
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
514
-            "geodir_contact" => '(222) 777-1111',
515
-            "geodir_email" => '[email protected]',
516
-            "geodir_website" => 'http://example.com/',
517
-            "geodir_twitter" => 'http://example.com/',
518
-            "geodir_facebook" => 'http://example.com/',
519
-            "geodir_price" => '530000',
520
-            "geodir_property_status" => 'For Sale',
521
-            'geodir_property_furnishing' => 'Unfurnished',
522
-            'geodir_property_type' => 'Detached house',
523
-            'geodir_property_bedrooms' => '5',
524
-            'geodir_property_bathrooms' => '4',
525
-            'geodir_property_area' => '2250',
526
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
527
-            "post_dummy" => '1'
528
-        );
529
-
530
-        break;
531
-
532
-    case 7:
533
-        $image_array = array();
534
-        $post_meta = array();
535
-        $image_array[] = "$dummy_image_url/ps/psf7.jpg";
536
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
537
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
538
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
539
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
540
-
541
-        $post_info[] = array(
542
-            "listing_type" => $post_type,
543
-            "post_title" => 'Fraser Suites',
544
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
509
+			"post_images" => $image_array,
510
+			"post_category" => array($post_type.'category' => array($category_array[1])),
511
+			"post_tags" => array('Tags', 'Sample Tags'),
512
+			"geodir_video" => '',
513
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
514
+			"geodir_contact" => '(222) 777-1111',
515
+			"geodir_email" => '[email protected]',
516
+			"geodir_website" => 'http://example.com/',
517
+			"geodir_twitter" => 'http://example.com/',
518
+			"geodir_facebook" => 'http://example.com/',
519
+			"geodir_price" => '530000',
520
+			"geodir_property_status" => 'For Sale',
521
+			'geodir_property_furnishing' => 'Unfurnished',
522
+			'geodir_property_type' => 'Detached house',
523
+			'geodir_property_bedrooms' => '5',
524
+			'geodir_property_bathrooms' => '4',
525
+			'geodir_property_area' => '2250',
526
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
527
+			"post_dummy" => '1'
528
+		);
529
+
530
+		break;
531
+
532
+	case 7:
533
+		$image_array = array();
534
+		$post_meta = array();
535
+		$image_array[] = "$dummy_image_url/ps/psf7.jpg";
536
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
537
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
538
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
539
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
540
+
541
+		$post_info[] = array(
542
+			"listing_type" => $post_type,
543
+			"post_title" => 'Fraser Suites',
544
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
545 545
 
546 546
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
547 547
 
@@ -551,42 +551,42 @@  discard block
 block discarded – undo
551 551
 
552 552
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
553 553
 
554
-            "post_images" => $image_array,
555
-            "post_category" => array($post_type.'category' => array($category_array[0])),
556
-            "post_tags" => array('Tags', 'Sample Tags'),
557
-            "geodir_video" => '',
558
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
559
-            "geodir_contact" => '(222) 777-1111',
560
-            "geodir_email" => '[email protected]',
561
-            "geodir_website" => 'http://example.com/',
562
-            "geodir_twitter" => 'http://example.com/',
563
-            "geodir_facebook" => 'http://example.com/',
564
-            "geodir_price" => '245000',
565
-            "geodir_property_status" => 'For Sale',
566
-            'geodir_property_furnishing' => 'Unfurnished',
567
-            'geodir_property_type' => 'Apartment',
568
-            'geodir_property_bedrooms' => '3',
569
-            'geodir_property_bathrooms' => '2',
570
-            'geodir_property_area' => '1250',
571
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
572
-            "post_dummy" => '1'
573
-        );
574
-
575
-        break;
576
-
577
-    case 8:
578
-        $image_array = array();
579
-        $post_meta = array();
580
-        $image_array[] = "$dummy_image_url/ps/psf8.jpg";
581
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
582
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
583
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
584
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
585
-
586
-        $post_info[] = array(
587
-            "listing_type" => $post_type,
588
-            "post_title" => 'Richmore Apartments',
589
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
554
+			"post_images" => $image_array,
555
+			"post_category" => array($post_type.'category' => array($category_array[0])),
556
+			"post_tags" => array('Tags', 'Sample Tags'),
557
+			"geodir_video" => '',
558
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
559
+			"geodir_contact" => '(222) 777-1111',
560
+			"geodir_email" => '[email protected]',
561
+			"geodir_website" => 'http://example.com/',
562
+			"geodir_twitter" => 'http://example.com/',
563
+			"geodir_facebook" => 'http://example.com/',
564
+			"geodir_price" => '245000',
565
+			"geodir_property_status" => 'For Sale',
566
+			'geodir_property_furnishing' => 'Unfurnished',
567
+			'geodir_property_type' => 'Apartment',
568
+			'geodir_property_bedrooms' => '3',
569
+			'geodir_property_bathrooms' => '2',
570
+			'geodir_property_area' => '1250',
571
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
572
+			"post_dummy" => '1'
573
+		);
574
+
575
+		break;
576
+
577
+	case 8:
578
+		$image_array = array();
579
+		$post_meta = array();
580
+		$image_array[] = "$dummy_image_url/ps/psf8.jpg";
581
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
582
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
583
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
584
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
585
+
586
+		$post_info[] = array(
587
+			"listing_type" => $post_type,
588
+			"post_title" => 'Richmore Apartments',
589
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
590 590
 
591 591
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
592 592
 
@@ -596,43 +596,43 @@  discard block
 block discarded – undo
596 596
 
597 597
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
598 598
 
599
-            "post_images" => $image_array,
600
-            "post_category" => array($post_type.'category' => array($category_array[0])),
601
-            "post_tags" => array('Tags', 'Sample Tags'),
602
-            "geodir_video" => '',
603
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
604
-            "geodir_contact" => '(222) 777-1111',
605
-            "geodir_email" => '[email protected]',
606
-            "geodir_website" => 'http://example.com/',
607
-            "geodir_twitter" => 'http://example.com/',
608
-            "geodir_facebook" => 'http://example.com/',
609
-            "geodir_price" => '395000',
610
-            "geodir_property_status" => 'For Sale',
611
-            'geodir_property_furnishing' => 'Unfurnished',
612
-            'geodir_property_type' => 'Apartment',
613
-            'geodir_property_bedrooms' => '2',
614
-            'geodir_property_bathrooms' => '2',
615
-            'geodir_property_area' => '1750',
616
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
617
-            "post_dummy" => '1'
618
-        );
619
-
620
-        break;
621
-
622
-
623
-    case 9:
624
-        $image_array = array();
625
-        $post_meta = array();
626
-        $image_array[] = "$dummy_image_url/ps/psf9.jpg";
627
-        $image_array[] = "$dummy_image_url/ps/psc9.jpg";
628
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
629
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
630
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
631
-
632
-        $post_info[] = array(
633
-            "listing_type" => $post_type,
634
-            "post_title" => 'Hotel Alpina',
635
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
599
+			"post_images" => $image_array,
600
+			"post_category" => array($post_type.'category' => array($category_array[0])),
601
+			"post_tags" => array('Tags', 'Sample Tags'),
602
+			"geodir_video" => '',
603
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
604
+			"geodir_contact" => '(222) 777-1111',
605
+			"geodir_email" => '[email protected]',
606
+			"geodir_website" => 'http://example.com/',
607
+			"geodir_twitter" => 'http://example.com/',
608
+			"geodir_facebook" => 'http://example.com/',
609
+			"geodir_price" => '395000',
610
+			"geodir_property_status" => 'For Sale',
611
+			'geodir_property_furnishing' => 'Unfurnished',
612
+			'geodir_property_type' => 'Apartment',
613
+			'geodir_property_bedrooms' => '2',
614
+			'geodir_property_bathrooms' => '2',
615
+			'geodir_property_area' => '1750',
616
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
617
+			"post_dummy" => '1'
618
+		);
619
+
620
+		break;
621
+
622
+
623
+	case 9:
624
+		$image_array = array();
625
+		$post_meta = array();
626
+		$image_array[] = "$dummy_image_url/ps/psf9.jpg";
627
+		$image_array[] = "$dummy_image_url/ps/psc9.jpg";
628
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
629
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
630
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
631
+
632
+		$post_info[] = array(
633
+			"listing_type" => $post_type,
634
+			"post_title" => 'Hotel Alpina',
635
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
636 636
 
637 637
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
638 638
 
@@ -642,39 +642,39 @@  discard block
 block discarded – undo
642 642
 
643 643
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
644 644
 
645
-            "post_images" => $image_array,
646
-            "post_category" => array($post_type.'category' => array($category_array[2])),
647
-            "post_tags" => array('Tags', 'Sample Tags'),
648
-            "geodir_video" => '',
649
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
650
-            "geodir_contact" => '(222) 777-1111',
651
-            "geodir_email" => '[email protected]',
652
-            "geodir_website" => 'http://example.com/',
653
-            "geodir_twitter" => 'http://example.com/',
654
-            "geodir_facebook" => 'http://example.com/',
655
-            "geodir_price" => '12500000',
656
-            "geodir_property_status" => 'For Sale',
657
-            'geodir_property_furnishing' => 'Furnished',
658
-            'geodir_property_type' => 'Hotel',
659
-            'geodir_property_bedrooms' => '120',
660
-            'geodir_property_bathrooms' => '133',
661
-            'geodir_property_area' => '35000',
662
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
663
-            "post_dummy" => '1'
664
-        );
665
-
666
-        break;
667
-
668
-    case 10:
669
-        $image_array = array();
670
-        $post_meta = array();
671
-        $image_array[] = "$dummy_image_url/ps/psf10.jpg";
672
-        $image_array[] = "$dummy_image_url/ps/psf102.jpg";
673
-
674
-        $post_info[] = array(
675
-            "listing_type" => $post_type,
676
-            "post_title" => 'Development Land',
677
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
645
+			"post_images" => $image_array,
646
+			"post_category" => array($post_type.'category' => array($category_array[2])),
647
+			"post_tags" => array('Tags', 'Sample Tags'),
648
+			"geodir_video" => '',
649
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
650
+			"geodir_contact" => '(222) 777-1111',
651
+			"geodir_email" => '[email protected]',
652
+			"geodir_website" => 'http://example.com/',
653
+			"geodir_twitter" => 'http://example.com/',
654
+			"geodir_facebook" => 'http://example.com/',
655
+			"geodir_price" => '12500000',
656
+			"geodir_property_status" => 'For Sale',
657
+			'geodir_property_furnishing' => 'Furnished',
658
+			'geodir_property_type' => 'Hotel',
659
+			'geodir_property_bedrooms' => '120',
660
+			'geodir_property_bathrooms' => '133',
661
+			'geodir_property_area' => '35000',
662
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
663
+			"post_dummy" => '1'
664
+		);
665
+
666
+		break;
667
+
668
+	case 10:
669
+		$image_array = array();
670
+		$post_meta = array();
671
+		$image_array[] = "$dummy_image_url/ps/psf10.jpg";
672
+		$image_array[] = "$dummy_image_url/ps/psf102.jpg";
673
+
674
+		$post_info[] = array(
675
+			"listing_type" => $post_type,
676
+			"post_title" => 'Development Land',
677
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
678 678
 
679 679
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
680 680
 
@@ -684,93 +684,93 @@  discard block
 block discarded – undo
684 684
 
685 685
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
686 686
 
687
-            "post_images" => $image_array,
688
-            "post_category" => array($post_type.'category' => array($category_array[3])),
689
-            "post_tags" => array('Tags', 'Sample Tags'),
690
-            "geodir_video" => '',
691
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
692
-            "geodir_contact" => '(222) 777-1111',
693
-            "geodir_email" => '[email protected]',
694
-            "geodir_website" => 'http://example.com/',
695
-            "geodir_twitter" => 'http://example.com/',
696
-            "geodir_facebook" => 'http://example.com/',
697
-            "geodir_price" => '80000',
698
-            "geodir_property_status" => 'For Sale',
699
-            'geodir_property_furnishing' => '',
700
-            'geodir_property_type' => 'Land',
701
-            'geodir_property_bedrooms' => '',
702
-            'geodir_property_bathrooms' => '',
703
-            'geodir_property_area' => '250000',
704
-            'geodir_property_features' => '',
705
-            "post_dummy" => '1'
706
-        );
707
-
708
-        break;
687
+			"post_images" => $image_array,
688
+			"post_category" => array($post_type.'category' => array($category_array[3])),
689
+			"post_tags" => array('Tags', 'Sample Tags'),
690
+			"geodir_video" => '',
691
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
692
+			"geodir_contact" => '(222) 777-1111',
693
+			"geodir_email" => '[email protected]',
694
+			"geodir_website" => 'http://example.com/',
695
+			"geodir_twitter" => 'http://example.com/',
696
+			"geodir_facebook" => 'http://example.com/',
697
+			"geodir_price" => '80000',
698
+			"geodir_property_status" => 'For Sale',
699
+			'geodir_property_furnishing' => '',
700
+			'geodir_property_type' => 'Land',
701
+			'geodir_property_bedrooms' => '',
702
+			'geodir_property_bathrooms' => '',
703
+			'geodir_property_area' => '250000',
704
+			'geodir_property_features' => '',
705
+			"post_dummy" => '1'
706
+		);
707
+
708
+		break;
709 709
 
710 710
 } // end of switch
711 711
 
712 712
 foreach ($post_info as $post_info) {
713
-    $default_location = geodir_get_default_location();
714
-    if ($city_bound_lat1 > $city_bound_lat2)
715
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
716
-    else
717
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
713
+	$default_location = geodir_get_default_location();
714
+	if ($city_bound_lat1 > $city_bound_lat2)
715
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
716
+	else
717
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
718 718
 
719 719
 
720
-    if ($city_bound_lng1 > $city_bound_lng2)
721
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
722
-    else
723
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
720
+	if ($city_bound_lng1 > $city_bound_lng2)
721
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
722
+	else
723
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
724 724
 
725
-    $load_map = get_option('geodir_load_map');
725
+	$load_map = get_option('geodir_load_map');
726 726
     
727
-    if ($load_map == 'osm') {
728
-        $post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
729
-    } else {
730
-        $post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
731
-    }
732
-
733
-    $postal_code = '';
734
-    if (!empty($post_address)) {
735
-        if ($load_map == 'osm') {
736
-            $address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
737
-            $postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
738
-        } else {
739
-            $addresses = array();
740
-            $addresses_default = array();
727
+	if ($load_map == 'osm') {
728
+		$post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
729
+	} else {
730
+		$post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
731
+	}
732
+
733
+	$postal_code = '';
734
+	if (!empty($post_address)) {
735
+		if ($load_map == 'osm') {
736
+			$address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
737
+			$postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
738
+		} else {
739
+			$addresses = array();
740
+			$addresses_default = array();
741 741
             
742
-            foreach ($post_address as $add_key => $add_value) {
743
-                if ($add_key < 2 && !empty($add_value->long_name)) {
744
-                    $addresses_default[] = $add_value->long_name;
745
-                }
746
-                if ($add_value->types[0] == 'postal_code') {
747
-                    $postal_code = $add_value->long_name;
748
-                }
749
-                if ($add_value->types[0] == 'street_number') {
750
-                    $addresses[] = $add_value->long_name;
751
-                }
752
-                if ($add_value->types[0] == 'route') {
753
-                    $addresses[] = $add_value->long_name;
754
-                }
755
-                if ($add_value->types[0] == 'neighborhood') {
756
-                    $addresses[] = $add_value->long_name;
757
-                }
758
-                if ($add_value->types[0] == 'sublocality') {
759
-                    $addresses[] = $add_value->long_name;
760
-                }
761
-            }
762
-            $address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
763
-        }
764
-
765
-        $post_info['post_address'] = !empty($address) ? $address : $default_location->city;
766
-        $post_info['post_city'] = $default_location->city;
767
-        $post_info['post_region'] = $default_location->region;
768
-        $post_info['post_country'] = $default_location->country;
769
-        $post_info['post_zip'] = $postal_code;
770
-        $post_info['post_latitude'] = $dummy_post_latitude;
771
-        $post_info['post_longitude'] = $dummy_post_longitude;
772
-    }
742
+			foreach ($post_address as $add_key => $add_value) {
743
+				if ($add_key < 2 && !empty($add_value->long_name)) {
744
+					$addresses_default[] = $add_value->long_name;
745
+				}
746
+				if ($add_value->types[0] == 'postal_code') {
747
+					$postal_code = $add_value->long_name;
748
+				}
749
+				if ($add_value->types[0] == 'street_number') {
750
+					$addresses[] = $add_value->long_name;
751
+				}
752
+				if ($add_value->types[0] == 'route') {
753
+					$addresses[] = $add_value->long_name;
754
+				}
755
+				if ($add_value->types[0] == 'neighborhood') {
756
+					$addresses[] = $add_value->long_name;
757
+				}
758
+				if ($add_value->types[0] == 'sublocality') {
759
+					$addresses[] = $add_value->long_name;
760
+				}
761
+			}
762
+			$address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
763
+		}
764
+
765
+		$post_info['post_address'] = !empty($address) ? $address : $default_location->city;
766
+		$post_info['post_city'] = $default_location->city;
767
+		$post_info['post_region'] = $default_location->region;
768
+		$post_info['post_country'] = $default_location->country;
769
+		$post_info['post_zip'] = $postal_code;
770
+		$post_info['post_latitude'] = $dummy_post_latitude;
771
+		$post_info['post_longitude'] = $dummy_post_longitude;
772
+	}
773 773
     
774
-    geodir_save_listing($post_info, true);
775
-    echo 1;
774
+	geodir_save_listing($post_info, true);
775
+	echo 1;
776 776
 }
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -6,9 +6,9 @@  discard block
 block discarded – undo
6 6
  * @package GeoDirectory
7 7
  */
8 8
 
9
-function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){
9
+function geodir_property_sale_custom_fields($post_type = 'gd_place', $package_id = '') {
10 10
     $fields = array();
11
-    $package = ($package_id=='') ? '' : array($package_id);
11
+    $package = ($package_id == '') ? '' : array($package_id);
12 12
 
13 13
     // Salary
14 14
     $fields[] = array('listing_type' => $post_type,
@@ -48,15 +48,15 @@  discard block
 block discarded – undo
48 48
                       'field_type'          =>  'select',
49 49
                       'data_type'           =>  'VARCHAR',
50 50
                       'admin_title'         =>  __('Job Type', 'geodirectory'),
51
-                      'site_title'          =>  __('Job Type','geodirectory'),
52
-                      'admin_desc'          =>  __('Select the type of job.','geodirectory'),
51
+                      'site_title'          =>  __('Job Type', 'geodirectory'),
52
+                      'admin_desc'          =>  __('Select the type of job.', 'geodirectory'),
53 53
                       'htmlvar_name'        =>  'job_type',
54 54
                       'is_active'           =>  true,
55 55
                       'for_admin_use'       =>  false,
56 56
                       'default_value'       =>  '',
57 57
                       'show_in' 	        =>  '[detail],[listing]',
58 58
                       'is_required'         =>  true,
59
-                      'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
59
+                      'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other', 'geodirectory'),
60 60
                       'validation_pattern'  =>  '',
61 61
                       'validation_msg'      =>  '',
62 62
                       'required_msg'        =>  '',
@@ -70,16 +70,16 @@  discard block
 block discarded – undo
70 70
     $fields[] = array('listing_type' => $post_type,
71 71
                       'field_type'          =>  'select',
72 72
                       'data_type'           =>  'VARCHAR',
73
-                      'admin_title'         =>  __('Job Sector','geodirectory'),
74
-                      'site_title'          =>  __('Job Sector','geodirectory'),
75
-                      'admin_desc'          =>  __('Select the job sector.','geodirectory'),
73
+                      'admin_title'         =>  __('Job Sector', 'geodirectory'),
74
+                      'site_title'          =>  __('Job Sector', 'geodirectory'),
75
+                      'admin_desc'          =>  __('Select the job sector.', 'geodirectory'),
76 76
                       'htmlvar_name'        =>  'job_sector',
77 77
                       'is_active'           =>  true,
78 78
                       'for_admin_use'       =>  false,
79 79
                       'default_value'       =>  '',
80 80
                       'show_in' 	          =>  '[detail]',
81 81
                       'is_required'         =>  true,
82
-                      'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
82
+                      'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies', 'geodirectory'),
83 83
                       'validation_pattern'  =>  '',
84 84
                       'validation_msg'      =>  '',
85 85
                       'required_msg'        =>  '',
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
                       'default_value'       =>  '',
103 103
                       'show_in' 	        =>  '[detail],[listing]',
104 104
                       'is_required'         =>  true,
105
-                      'option_values'       =>  __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years','geodirectory'),
105
+                      'option_values'       =>  __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years', 'geodirectory'),
106 106
                       'validation_pattern'  =>  '',
107 107
                       'validation_msg'      =>  '',
108 108
                       'required_msg'        =>  '',
@@ -235,24 +235,24 @@  discard block
 block discarded – undo
235 235
     return  $fields;
236 236
 }
237 237
 
238
-global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
238
+global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2, $wpdb, $current_user, $dummy_post_index;
239 239
 $post_info = array();
240 240
 $image_array = array();
241 241
 $post_meta = array();
242 242
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
243 243
 
244
-if($dummy_post_index==1){
244
+if ($dummy_post_index == 1) {
245 245
     // add the dummy categories
246
-    geodir_dummy_data_taxonomies($post_type,$category_array );
246
+    geodir_dummy_data_taxonomies($post_type, $category_array);
247 247
 
248 248
     // add the dummy custom fields
249 249
     $fields = geodir_property_sale_custom_fields($post_type);
250 250
     geodir_create_dummy_fields($fields);
251
-    update_option($post_type.'_dummy_data_type','property_sale');
251
+    update_option($post_type.'_dummy_data_type', 'property_sale');
252 252
 }
253 253
 
254 254
 if (geodir_dummy_folder_exists())
255
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
255
+    $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy";
256 256
 else
257 257
     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
258 258
 
Please login to merge, or discard this patch.
Braces   +13 added lines, -10 removed lines patch added patch discarded remove patch
@@ -231,10 +231,11 @@  discard block
 block discarded – undo
231 231
     update_option($post_type.'_dummy_data_type','property_sale');
232 232
 }
233 233
 
234
-if (geodir_dummy_folder_exists())
234
+if (geodir_dummy_folder_exists()) {
235 235
     $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
236
-else
236
+} else {
237 237
     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
238
+}
238 239
 
239 240
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
240 241
 
@@ -691,16 +692,18 @@  discard block
 block discarded – undo
691 692
 
692 693
 foreach ($post_info as $post_info) {
693 694
     $default_location = geodir_get_default_location();
694
-    if ($city_bound_lat1 > $city_bound_lat2)
695
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
696
-    else
697
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
695
+    if ($city_bound_lat1 > $city_bound_lat2) {
696
+            $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
697
+    } else {
698
+            $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
699
+    }
698 700
 
699 701
 
700
-    if ($city_bound_lng1 > $city_bound_lng2)
701
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
702
-    else
703
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
702
+    if ($city_bound_lng1 > $city_bound_lng2) {
703
+            $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
704
+    } else {
705
+            $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
706
+    }
704 707
 
705 708
     $load_map = get_option('geodir_load_map');
706 709
     
Please login to merge, or discard this patch.
geodirectory-functions/custom_fields_predefined.php 3 patches
Indentation   +403 added lines, -403 removed lines patch added patch discarded remove patch
@@ -17,370 +17,370 @@  discard block
 block discarded – undo
17 17
  */
18 18
 function geodir_custom_fields_predefined($post_type=''){
19 19
 
20
-    $custom_fields = array();
21
-
22
-
23
-    // price
24
-    $custom_fields['price'] = array( // The key value should be unique and not contain any spaces.
25
-        'field_type'  =>  'text',
26
-        'class'       =>  'gd-price',
27
-        'icon'        =>  'fa fa-usd',
28
-        'name'        =>  __('Price', 'geodirectory'),
29
-        'description' =>  __('Adds a input for a price field. This will let you filter and sort by price.', 'geodirectory'),
30
-        'defaults'    => array(
31
-            'data_type'           =>  'FLOAT',
32
-            'decimal_point'       =>  '2',
33
-            'admin_title'         =>  'Price',
34
-            'site_title'          =>  'Price',
35
-            'admin_desc'          =>  'Enter the price in $ (no currency symbol)',
36
-            'htmlvar_name'        =>  'price',
37
-            'is_active'           =>  true,
38
-            'for_admin_use'       =>  false,
39
-            'default_value'       =>  '',
40
-            'show_in' 	      =>  '[detail],[listing]',
41
-            'is_required'         =>  false,
42
-            'validation_pattern'  =>  '\d+(\.\d{2})?',
43
-            'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
44
-            'required_msg'        =>  '',
45
-            'field_icon'          =>  'fa fa-usd',
46
-            'css_class'           =>  '',
47
-            'cat_sort'            =>  true,
48
-            'cat_filter'	      =>  true,
49
-            'extra_fields'        =>  array(
50
-                'is_price'                  =>  1,
51
-                'thousand_separator'        =>  'comma',
52
-                'decimal_separator'         =>  'period',
53
-                'decimal_display'           =>  'if',
54
-                'currency_symbol'           =>  '$',
55
-                'currency_symbol_placement' =>  'left'
56
-            )
57
-        )
58
-    );
59
-
60
-    // property status
61
-    $custom_fields['property_status'] = array( // The key value should be unique and not contain any spaces.
62
-        'field_type'  =>  'select',
63
-        'class'       =>  'gd-property-status',
64
-        'icon'        =>  'fa fa-home',
65
-        'name'        =>  __('Property Status', 'geodirectory'),
66
-        'description' =>  __('Adds a select input to be able to set the status of a property ie: For Sale, For Rent', 'geodirectory'),
67
-        'defaults'    => array(
68
-            'data_type'           =>  'VARCHAR',
69
-            'admin_title'         =>  'Property Status',
70
-            'site_title'          =>  'Property Status',
71
-            'admin_desc'          =>  'Enter the status of the property.',
72
-            'htmlvar_name'        =>  'property_status',
73
-            'is_active'           =>  true,
74
-            'for_admin_use'       =>  false,
75
-            'default_value'       =>  '',
76
-            'show_in' 	          =>  '[detail],[listing]',
77
-            'is_required'         =>  true,
78
-            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
79
-            'validation_pattern'  =>  '',
80
-            'validation_msg'      =>  '',
81
-            'required_msg'        =>  '',
82
-            'field_icon'          =>  'fa fa-home',
83
-            'css_class'           =>  '',
84
-            'cat_sort'            =>  true,
85
-            'cat_filter'	      =>  true
86
-        )
87
-    );
88
-
89
-    // property furnishing
90
-    $custom_fields['property_furnishing'] = array( // The key value should be unique and not contain any spaces.
91
-        'field_type'  =>  'select',
92
-        'class'       =>  'gd-property-furnishing',
93
-        'icon'        =>  'fa fa-home',
94
-        'name'        =>  __('Property Furnishing', 'geodirectory'),
95
-        'description' =>  __('Adds a select input to be able to set the furnishing status of a property ie: Unfurnished, Furnished', 'geodirectory'),
96
-        'defaults'    => array(
97
-            'data_type'           =>  'VARCHAR',
98
-            'admin_title'         =>  'Furnishing',
99
-            'site_title'          =>  'Furnishing',
100
-            'admin_desc'          =>  'Enter the furnishing status of the property.',
101
-            'htmlvar_name'        =>  'property_furnishing',
102
-            'is_active'           =>  true,
103
-            'for_admin_use'       =>  false,
104
-            'default_value'       =>  '',
105
-            'show_in' 	          =>  '[detail],[listing]',
106
-            'is_required'         =>  true,
107
-            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
108
-            'validation_pattern'  =>  '',
109
-            'validation_msg'      =>  '',
110
-            'required_msg'        =>  '',
111
-            'field_icon'          =>  'fa fa-th-large',
112
-            'css_class'           =>  '',
113
-            'cat_sort'            =>  true,
114
-            'cat_filter'	      =>  true
115
-        )
116
-    );
117
-
118
-    // property type
119
-    $custom_fields['property_type'] = array( // The key value should be unique and not contain any spaces.
120
-        'field_type'  =>  'select',
121
-        'class'       =>  'gd-property-type',
122
-        'icon'        =>  'fa fa-home',
123
-        'name'        =>  __('Property Type', 'geodirectory'),
124
-        'description' =>  __('Adds a select input for the property type ie: Detached house, Apartment', 'geodirectory'),
125
-        'defaults'    => array(
126
-            'data_type'           =>  'VARCHAR',
127
-            'admin_title'         =>  'Property Type',
128
-            'site_title'          =>  'Property Type',
129
-            'admin_desc'          =>  'Select the property type.',
130
-            'htmlvar_name'        =>  'property_type',
131
-            'is_active'           =>  true,
132
-            'for_admin_use'       =>  false,
133
-            'default_value'       =>  '',
134
-            'show_in' 	          =>  '[detail],[listing]',
135
-            'is_required'         =>  true,
136
-            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
137
-            'validation_pattern'  =>  '',
138
-            'validation_msg'      =>  '',
139
-            'required_msg'        =>  '',
140
-            'field_icon'          =>  'fa fa-home',
141
-            'css_class'           =>  '',
142
-            'cat_sort'            =>  true,
143
-            'cat_filter'	      =>  true
144
-        )
145
-    );
146
-
147
-    // property bedrooms
148
-    $custom_fields['property_bedrooms'] = array( // The key value should be unique and not contain any spaces.
149
-        'field_type'  =>  'select',
150
-        'class'       =>  'gd-property-bedrooms',
151
-        'icon'        =>  'fa fa-home',
152
-        'name'        =>  __('Property Bedrooms', 'geodirectory'),
153
-        'description' =>  __('Adds a select input for the number of bedrooms.', 'geodirectory'),
154
-        'defaults'    => array(
155
-            'data_type'           =>  'VARCHAR',
156
-            'admin_title'         =>  'Property Bedrooms',
157
-            'site_title'          =>  'Bedrooms',
158
-            'admin_desc'          =>  'Select the number of bedrooms',
159
-            'htmlvar_name'        =>  'property_bedrooms',
160
-            'is_active'           =>  true,
161
-            'for_admin_use'       =>  false,
162
-            'default_value'       =>  '',
163
-            'show_in' 	          =>  '[detail],[listing]',
164
-            'is_required'         =>  true,
165
-            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
166
-            'validation_pattern'  =>  '',
167
-            'validation_msg'      =>  '',
168
-            'required_msg'        =>  '',
169
-            'field_icon'          =>  'fa fa-bed',
170
-            'css_class'           =>  '',
171
-            'cat_sort'            =>  true,
172
-            'cat_filter'	      =>  true
173
-        )
174
-    );
175
-
176
-    // property bathrooms
177
-    $custom_fields['property_bathrooms'] = array( // The key value should be unique and not contain any spaces.
178
-        'field_type'  =>  'select',
179
-        'class'       =>  'gd-property-bathrooms',
180
-        'icon'        =>  'fa fa-home',
181
-        'name'        =>  __('Property Bathrooms', 'geodirectory'),
182
-        'description' =>  __('Adds a select input for the number of bathrooms.', 'geodirectory'),
183
-        'defaults'    => array(
184
-            'data_type'           =>  'VARCHAR',
185
-            'admin_title'         =>  'Property Bathrooms',
186
-            'site_title'          =>  'Bathrooms',
187
-            'admin_desc'          =>  'Select the number of bathrooms',
188
-            'htmlvar_name'        =>  'property_bathrooms',
189
-            'is_active'           =>  true,
190
-            'for_admin_use'       =>  false,
191
-            'default_value'       =>  '',
192
-            'show_in' 	          =>  '[detail],[listing]',
193
-            'is_required'         =>  true,
194
-            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
195
-            'validation_pattern'  =>  '',
196
-            'validation_msg'      =>  '',
197
-            'required_msg'        =>  '',
198
-            'field_icon'          =>  'fa fa-bold',
199
-            'css_class'           =>  '',
200
-            'cat_sort'            =>  true,
201
-            'cat_filter'	      =>  true
202
-        )
203
-    );
204
-
205
-    // property area
206
-    $custom_fields['property_area'] = array( // The key value should be unique and not contain any spaces.
207
-        'field_type'  =>  'text',
208
-        'class'       =>  'gd-area',
209
-        'icon'        =>  'fa fa-home',
210
-        'name'        =>  __('Property Area', 'geodirectory'),
211
-        'description' =>  __('Adds a input for the property area.', 'geodirectory'),
212
-        'defaults'    => array(
213
-            'data_type'           =>  'FLOAT',
214
-            'admin_title'         =>  'Property Area',
215
-            'site_title'          =>  'Area (Sq Ft)',
216
-            'admin_desc'          =>  'Enter the Sq Ft value for the property',
217
-            'htmlvar_name'        =>  'property_area',
218
-            'is_active'           =>  true,
219
-            'for_admin_use'       =>  false,
220
-            'default_value'       =>  '',
221
-            'show_in' 	      =>  '[detail],[listing]',
222
-            'is_required'         =>  false,
223
-            'validation_pattern'  =>  '\d+(\.\d{2})?',
224
-            'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
225
-            'required_msg'        =>  '',
226
-            'field_icon'          =>  'fa fa-area-chart',
227
-            'css_class'           =>  '',
228
-            'cat_sort'            =>  true,
229
-            'cat_filter'	      =>  true
230
-        )
231
-    );
232
-
233
-    // property features
234
-    $custom_fields['property_features'] = array( // The key value should be unique and not contain any spaces.
235
-        'field_type'  =>  'multiselect',
236
-        'class'       =>  'gd-property-features',
237
-        'icon'        =>  'fa fa-home',
238
-        'name'        =>  __('Property Features', 'geodirectory'),
239
-        'description' =>  __('Adds a select input for the property features.', 'geodirectory'),
240
-        'defaults'    => array(
241
-            'data_type'           =>  'VARCHAR',
242
-            'admin_title'         =>  'Property Features',
243
-            'site_title'          =>  'Features',
244
-            'admin_desc'          =>  'Select the property features.',
245
-            'htmlvar_name'        =>  'property_features',
246
-            'is_active'           =>  true,
247
-            'for_admin_use'       =>  false,
248
-            'default_value'       =>  '',
249
-            'show_in' 	          =>  '[detail],[listing]',
250
-            'is_required'         =>  true,
251
-            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
252
-            'validation_pattern'  =>  '',
253
-            'validation_msg'      =>  '',
254
-            'required_msg'        =>  '',
255
-            'field_icon'          =>  'fa fa-plus-square',
256
-            'css_class'           =>  '',
257
-            'cat_sort'            =>  true,
258
-            'cat_filter'	      =>  true
259
-        )
260
-    );
261
-
262
-    // Twitter feed
263
-    $custom_fields['twitter_feed'] = array( // The key value should be unique and not contain any spaces.
264
-        'field_type'  =>  'text',
265
-        'class'       =>  'gd-twitter',
266
-        'icon'        =>  'fa fa-twitter',
267
-        'name'        =>  __('Twitter feed', 'geodirectory'),
268
-        'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
269
-        'defaults'    => array(
270
-            'data_type'           =>  'VARCHAR',
271
-            'admin_title'         =>  'Twitter',
272
-            'site_title'          =>  'Twitter',
273
-            'admin_desc'          =>  'Enter your Twitter username',
274
-            'htmlvar_name'        =>  'twitterusername',
275
-            'is_active'           =>  true,
276
-            'for_admin_use'       =>  false,
277
-            'default_value'       =>  '',
278
-            'show_in' 	      =>  '[detail],[owntab]',
279
-            'is_required'         =>  false,
280
-            'validation_pattern'  =>  '^[A-Za-z0-9_]{1,32}$',
281
-            'validation_msg'      =>  'Please enter a valid twitter username.',
282
-            'required_msg'        =>  '',
283
-            'field_icon'          =>  'fa fa-twitter',
284
-            'css_class'           =>  '',
285
-            'cat_sort'            =>  false,
286
-            'cat_filter'	      =>  false
287
-        )
288
-    );
289
-
290
-    // Get directions link
291
-    $custom_fields['get_directions'] = array( // The key value should be unique and not contain any spaces.
292
-        'field_type'  =>  'text',
293
-        'class'       =>  'gd-get-directions',
294
-        'icon'        =>  'fa fa-location-arrow',
295
-        'name'        =>  __('Get Directions Link', 'geodirectory'),
296
-        'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
297
-        'defaults'    => array(
298
-            'data_type'           =>  'VARCHAR',
299
-            'admin_title'         =>  'Get Directions',
300
-            'site_title'          =>  'Get Directions',
301
-            'admin_desc'          =>  '',
302
-            'htmlvar_name'        =>  'get_directions',
303
-            'is_active'           =>  true,
304
-            'for_admin_use'       =>  true,
305
-            'default_value'       =>  'Get Directions',
306
-            'show_in' 	      =>  '[detail],[listing]',
307
-            'is_required'         =>  false,
308
-            'validation_pattern'  =>  '',
309
-            'validation_msg'      =>  '',
310
-            'required_msg'        =>  '',
311
-            'field_icon'          =>  'fa fa-location-arrow',
312
-            'css_class'           =>  '',
313
-            'cat_sort'            =>  false,
314
-            'cat_filter'	      =>  false
315
-        )
316
-    );
317
-
318
-
319
-    // JOB TYPE CF
320
-
321
-    // job type
322
-    $custom_fields['job_type'] = array( // The key value should be unique and not contain any spaces.
323
-        'field_type'  =>  'select',
324
-        'class'       =>  'gd-job-type',
325
-        'icon'        =>  'fa fa-briefcase',
326
-        'name'        =>  __('Job Type', 'geodirectory'),
327
-        'description' =>  __('Adds a select input to be able to set the type of a job ie: Full Time, Part Time', 'geodirectory'),
328
-        'defaults'    => array(
329
-            'data_type'           =>  'VARCHAR',
330
-            'admin_title'         =>  __('Job Type', 'geodirectory'),
331
-            'site_title'          =>  __('Job Type','geodirectory'),
332
-            'admin_desc'          =>  __('Select the type of job.','geodirectory'),
333
-            'htmlvar_name'        =>  'job_type',
334
-            'is_active'           =>  true,
335
-            'for_admin_use'       =>  false,
336
-            'default_value'       =>  '',
337
-            'show_in' 	          =>  '[detail],[listing]',
338
-            'is_required'         =>  true,
339
-            'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
340
-            'validation_pattern'  =>  '',
341
-            'validation_msg'      =>  '',
342
-            'required_msg'        =>  '',
343
-            'field_icon'          =>  'fa fa-briefcase',
344
-            'css_class'           =>  '',
345
-            'cat_sort'            =>  true,
346
-            'cat_filter'	      =>  true
347
-        )
348
-    );
349
-
350
-    // job sector
351
-    $custom_fields['job_sector'] = array( // The key value should be unique and not contain any spaces.
352
-        'field_type'  =>  'select',
353
-        'class'       =>  'gd-job-type',
354
-        'icon'        =>  'fa fa-briefcase',
355
-        'name'        =>  __('Job Sector', 'geodirectory'),
356
-        'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
357
-        'defaults'    => array(
358
-            'data_type'           =>  'VARCHAR',
359
-            'admin_title'         =>  __('Job Sector','geodirectory'),
360
-            'site_title'          =>  __('Job Sector','geodirectory'),
361
-            'admin_desc'          =>  __('Select the job sector.','geodirectory'),
362
-            'htmlvar_name'        =>  'job_sector',
363
-            'is_active'           =>  true,
364
-            'for_admin_use'       =>  false,
365
-            'default_value'       =>  '',
366
-            'show_in' 	          =>  '[detail]',
367
-            'is_required'         =>  true,
368
-            'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
369
-            'validation_pattern'  =>  '',
370
-            'validation_msg'      =>  '',
371
-            'required_msg'        =>  '',
372
-            'field_icon'          =>  'fa fa-briefcase',
373
-            'css_class'           =>  '',
374
-            'cat_sort'            =>  true,
375
-            'cat_filter'	      =>  true
376
-        )
377
-    );
378
-
379
-
380
-    /**
381
-     * @see `geodir_custom_fields`
382
-     */
383
-    return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
20
+	$custom_fields = array();
21
+
22
+
23
+	// price
24
+	$custom_fields['price'] = array( // The key value should be unique and not contain any spaces.
25
+		'field_type'  =>  'text',
26
+		'class'       =>  'gd-price',
27
+		'icon'        =>  'fa fa-usd',
28
+		'name'        =>  __('Price', 'geodirectory'),
29
+		'description' =>  __('Adds a input for a price field. This will let you filter and sort by price.', 'geodirectory'),
30
+		'defaults'    => array(
31
+			'data_type'           =>  'FLOAT',
32
+			'decimal_point'       =>  '2',
33
+			'admin_title'         =>  'Price',
34
+			'site_title'          =>  'Price',
35
+			'admin_desc'          =>  'Enter the price in $ (no currency symbol)',
36
+			'htmlvar_name'        =>  'price',
37
+			'is_active'           =>  true,
38
+			'for_admin_use'       =>  false,
39
+			'default_value'       =>  '',
40
+			'show_in' 	      =>  '[detail],[listing]',
41
+			'is_required'         =>  false,
42
+			'validation_pattern'  =>  '\d+(\.\d{2})?',
43
+			'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
44
+			'required_msg'        =>  '',
45
+			'field_icon'          =>  'fa fa-usd',
46
+			'css_class'           =>  '',
47
+			'cat_sort'            =>  true,
48
+			'cat_filter'	      =>  true,
49
+			'extra_fields'        =>  array(
50
+				'is_price'                  =>  1,
51
+				'thousand_separator'        =>  'comma',
52
+				'decimal_separator'         =>  'period',
53
+				'decimal_display'           =>  'if',
54
+				'currency_symbol'           =>  '$',
55
+				'currency_symbol_placement' =>  'left'
56
+			)
57
+		)
58
+	);
59
+
60
+	// property status
61
+	$custom_fields['property_status'] = array( // The key value should be unique and not contain any spaces.
62
+		'field_type'  =>  'select',
63
+		'class'       =>  'gd-property-status',
64
+		'icon'        =>  'fa fa-home',
65
+		'name'        =>  __('Property Status', 'geodirectory'),
66
+		'description' =>  __('Adds a select input to be able to set the status of a property ie: For Sale, For Rent', 'geodirectory'),
67
+		'defaults'    => array(
68
+			'data_type'           =>  'VARCHAR',
69
+			'admin_title'         =>  'Property Status',
70
+			'site_title'          =>  'Property Status',
71
+			'admin_desc'          =>  'Enter the status of the property.',
72
+			'htmlvar_name'        =>  'property_status',
73
+			'is_active'           =>  true,
74
+			'for_admin_use'       =>  false,
75
+			'default_value'       =>  '',
76
+			'show_in' 	          =>  '[detail],[listing]',
77
+			'is_required'         =>  true,
78
+			'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
79
+			'validation_pattern'  =>  '',
80
+			'validation_msg'      =>  '',
81
+			'required_msg'        =>  '',
82
+			'field_icon'          =>  'fa fa-home',
83
+			'css_class'           =>  '',
84
+			'cat_sort'            =>  true,
85
+			'cat_filter'	      =>  true
86
+		)
87
+	);
88
+
89
+	// property furnishing
90
+	$custom_fields['property_furnishing'] = array( // The key value should be unique and not contain any spaces.
91
+		'field_type'  =>  'select',
92
+		'class'       =>  'gd-property-furnishing',
93
+		'icon'        =>  'fa fa-home',
94
+		'name'        =>  __('Property Furnishing', 'geodirectory'),
95
+		'description' =>  __('Adds a select input to be able to set the furnishing status of a property ie: Unfurnished, Furnished', 'geodirectory'),
96
+		'defaults'    => array(
97
+			'data_type'           =>  'VARCHAR',
98
+			'admin_title'         =>  'Furnishing',
99
+			'site_title'          =>  'Furnishing',
100
+			'admin_desc'          =>  'Enter the furnishing status of the property.',
101
+			'htmlvar_name'        =>  'property_furnishing',
102
+			'is_active'           =>  true,
103
+			'for_admin_use'       =>  false,
104
+			'default_value'       =>  '',
105
+			'show_in' 	          =>  '[detail],[listing]',
106
+			'is_required'         =>  true,
107
+			'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
108
+			'validation_pattern'  =>  '',
109
+			'validation_msg'      =>  '',
110
+			'required_msg'        =>  '',
111
+			'field_icon'          =>  'fa fa-th-large',
112
+			'css_class'           =>  '',
113
+			'cat_sort'            =>  true,
114
+			'cat_filter'	      =>  true
115
+		)
116
+	);
117
+
118
+	// property type
119
+	$custom_fields['property_type'] = array( // The key value should be unique and not contain any spaces.
120
+		'field_type'  =>  'select',
121
+		'class'       =>  'gd-property-type',
122
+		'icon'        =>  'fa fa-home',
123
+		'name'        =>  __('Property Type', 'geodirectory'),
124
+		'description' =>  __('Adds a select input for the property type ie: Detached house, Apartment', 'geodirectory'),
125
+		'defaults'    => array(
126
+			'data_type'           =>  'VARCHAR',
127
+			'admin_title'         =>  'Property Type',
128
+			'site_title'          =>  'Property Type',
129
+			'admin_desc'          =>  'Select the property type.',
130
+			'htmlvar_name'        =>  'property_type',
131
+			'is_active'           =>  true,
132
+			'for_admin_use'       =>  false,
133
+			'default_value'       =>  '',
134
+			'show_in' 	          =>  '[detail],[listing]',
135
+			'is_required'         =>  true,
136
+			'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
137
+			'validation_pattern'  =>  '',
138
+			'validation_msg'      =>  '',
139
+			'required_msg'        =>  '',
140
+			'field_icon'          =>  'fa fa-home',
141
+			'css_class'           =>  '',
142
+			'cat_sort'            =>  true,
143
+			'cat_filter'	      =>  true
144
+		)
145
+	);
146
+
147
+	// property bedrooms
148
+	$custom_fields['property_bedrooms'] = array( // The key value should be unique and not contain any spaces.
149
+		'field_type'  =>  'select',
150
+		'class'       =>  'gd-property-bedrooms',
151
+		'icon'        =>  'fa fa-home',
152
+		'name'        =>  __('Property Bedrooms', 'geodirectory'),
153
+		'description' =>  __('Adds a select input for the number of bedrooms.', 'geodirectory'),
154
+		'defaults'    => array(
155
+			'data_type'           =>  'VARCHAR',
156
+			'admin_title'         =>  'Property Bedrooms',
157
+			'site_title'          =>  'Bedrooms',
158
+			'admin_desc'          =>  'Select the number of bedrooms',
159
+			'htmlvar_name'        =>  'property_bedrooms',
160
+			'is_active'           =>  true,
161
+			'for_admin_use'       =>  false,
162
+			'default_value'       =>  '',
163
+			'show_in' 	          =>  '[detail],[listing]',
164
+			'is_required'         =>  true,
165
+			'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
166
+			'validation_pattern'  =>  '',
167
+			'validation_msg'      =>  '',
168
+			'required_msg'        =>  '',
169
+			'field_icon'          =>  'fa fa-bed',
170
+			'css_class'           =>  '',
171
+			'cat_sort'            =>  true,
172
+			'cat_filter'	      =>  true
173
+		)
174
+	);
175
+
176
+	// property bathrooms
177
+	$custom_fields['property_bathrooms'] = array( // The key value should be unique and not contain any spaces.
178
+		'field_type'  =>  'select',
179
+		'class'       =>  'gd-property-bathrooms',
180
+		'icon'        =>  'fa fa-home',
181
+		'name'        =>  __('Property Bathrooms', 'geodirectory'),
182
+		'description' =>  __('Adds a select input for the number of bathrooms.', 'geodirectory'),
183
+		'defaults'    => array(
184
+			'data_type'           =>  'VARCHAR',
185
+			'admin_title'         =>  'Property Bathrooms',
186
+			'site_title'          =>  'Bathrooms',
187
+			'admin_desc'          =>  'Select the number of bathrooms',
188
+			'htmlvar_name'        =>  'property_bathrooms',
189
+			'is_active'           =>  true,
190
+			'for_admin_use'       =>  false,
191
+			'default_value'       =>  '',
192
+			'show_in' 	          =>  '[detail],[listing]',
193
+			'is_required'         =>  true,
194
+			'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
195
+			'validation_pattern'  =>  '',
196
+			'validation_msg'      =>  '',
197
+			'required_msg'        =>  '',
198
+			'field_icon'          =>  'fa fa-bold',
199
+			'css_class'           =>  '',
200
+			'cat_sort'            =>  true,
201
+			'cat_filter'	      =>  true
202
+		)
203
+	);
204
+
205
+	// property area
206
+	$custom_fields['property_area'] = array( // The key value should be unique and not contain any spaces.
207
+		'field_type'  =>  'text',
208
+		'class'       =>  'gd-area',
209
+		'icon'        =>  'fa fa-home',
210
+		'name'        =>  __('Property Area', 'geodirectory'),
211
+		'description' =>  __('Adds a input for the property area.', 'geodirectory'),
212
+		'defaults'    => array(
213
+			'data_type'           =>  'FLOAT',
214
+			'admin_title'         =>  'Property Area',
215
+			'site_title'          =>  'Area (Sq Ft)',
216
+			'admin_desc'          =>  'Enter the Sq Ft value for the property',
217
+			'htmlvar_name'        =>  'property_area',
218
+			'is_active'           =>  true,
219
+			'for_admin_use'       =>  false,
220
+			'default_value'       =>  '',
221
+			'show_in' 	      =>  '[detail],[listing]',
222
+			'is_required'         =>  false,
223
+			'validation_pattern'  =>  '\d+(\.\d{2})?',
224
+			'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
225
+			'required_msg'        =>  '',
226
+			'field_icon'          =>  'fa fa-area-chart',
227
+			'css_class'           =>  '',
228
+			'cat_sort'            =>  true,
229
+			'cat_filter'	      =>  true
230
+		)
231
+	);
232
+
233
+	// property features
234
+	$custom_fields['property_features'] = array( // The key value should be unique and not contain any spaces.
235
+		'field_type'  =>  'multiselect',
236
+		'class'       =>  'gd-property-features',
237
+		'icon'        =>  'fa fa-home',
238
+		'name'        =>  __('Property Features', 'geodirectory'),
239
+		'description' =>  __('Adds a select input for the property features.', 'geodirectory'),
240
+		'defaults'    => array(
241
+			'data_type'           =>  'VARCHAR',
242
+			'admin_title'         =>  'Property Features',
243
+			'site_title'          =>  'Features',
244
+			'admin_desc'          =>  'Select the property features.',
245
+			'htmlvar_name'        =>  'property_features',
246
+			'is_active'           =>  true,
247
+			'for_admin_use'       =>  false,
248
+			'default_value'       =>  '',
249
+			'show_in' 	          =>  '[detail],[listing]',
250
+			'is_required'         =>  true,
251
+			'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
252
+			'validation_pattern'  =>  '',
253
+			'validation_msg'      =>  '',
254
+			'required_msg'        =>  '',
255
+			'field_icon'          =>  'fa fa-plus-square',
256
+			'css_class'           =>  '',
257
+			'cat_sort'            =>  true,
258
+			'cat_filter'	      =>  true
259
+		)
260
+	);
261
+
262
+	// Twitter feed
263
+	$custom_fields['twitter_feed'] = array( // The key value should be unique and not contain any spaces.
264
+		'field_type'  =>  'text',
265
+		'class'       =>  'gd-twitter',
266
+		'icon'        =>  'fa fa-twitter',
267
+		'name'        =>  __('Twitter feed', 'geodirectory'),
268
+		'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
269
+		'defaults'    => array(
270
+			'data_type'           =>  'VARCHAR',
271
+			'admin_title'         =>  'Twitter',
272
+			'site_title'          =>  'Twitter',
273
+			'admin_desc'          =>  'Enter your Twitter username',
274
+			'htmlvar_name'        =>  'twitterusername',
275
+			'is_active'           =>  true,
276
+			'for_admin_use'       =>  false,
277
+			'default_value'       =>  '',
278
+			'show_in' 	      =>  '[detail],[owntab]',
279
+			'is_required'         =>  false,
280
+			'validation_pattern'  =>  '^[A-Za-z0-9_]{1,32}$',
281
+			'validation_msg'      =>  'Please enter a valid twitter username.',
282
+			'required_msg'        =>  '',
283
+			'field_icon'          =>  'fa fa-twitter',
284
+			'css_class'           =>  '',
285
+			'cat_sort'            =>  false,
286
+			'cat_filter'	      =>  false
287
+		)
288
+	);
289
+
290
+	// Get directions link
291
+	$custom_fields['get_directions'] = array( // The key value should be unique and not contain any spaces.
292
+		'field_type'  =>  'text',
293
+		'class'       =>  'gd-get-directions',
294
+		'icon'        =>  'fa fa-location-arrow',
295
+		'name'        =>  __('Get Directions Link', 'geodirectory'),
296
+		'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
297
+		'defaults'    => array(
298
+			'data_type'           =>  'VARCHAR',
299
+			'admin_title'         =>  'Get Directions',
300
+			'site_title'          =>  'Get Directions',
301
+			'admin_desc'          =>  '',
302
+			'htmlvar_name'        =>  'get_directions',
303
+			'is_active'           =>  true,
304
+			'for_admin_use'       =>  true,
305
+			'default_value'       =>  'Get Directions',
306
+			'show_in' 	      =>  '[detail],[listing]',
307
+			'is_required'         =>  false,
308
+			'validation_pattern'  =>  '',
309
+			'validation_msg'      =>  '',
310
+			'required_msg'        =>  '',
311
+			'field_icon'          =>  'fa fa-location-arrow',
312
+			'css_class'           =>  '',
313
+			'cat_sort'            =>  false,
314
+			'cat_filter'	      =>  false
315
+		)
316
+	);
317
+
318
+
319
+	// JOB TYPE CF
320
+
321
+	// job type
322
+	$custom_fields['job_type'] = array( // The key value should be unique and not contain any spaces.
323
+		'field_type'  =>  'select',
324
+		'class'       =>  'gd-job-type',
325
+		'icon'        =>  'fa fa-briefcase',
326
+		'name'        =>  __('Job Type', 'geodirectory'),
327
+		'description' =>  __('Adds a select input to be able to set the type of a job ie: Full Time, Part Time', 'geodirectory'),
328
+		'defaults'    => array(
329
+			'data_type'           =>  'VARCHAR',
330
+			'admin_title'         =>  __('Job Type', 'geodirectory'),
331
+			'site_title'          =>  __('Job Type','geodirectory'),
332
+			'admin_desc'          =>  __('Select the type of job.','geodirectory'),
333
+			'htmlvar_name'        =>  'job_type',
334
+			'is_active'           =>  true,
335
+			'for_admin_use'       =>  false,
336
+			'default_value'       =>  '',
337
+			'show_in' 	          =>  '[detail],[listing]',
338
+			'is_required'         =>  true,
339
+			'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
340
+			'validation_pattern'  =>  '',
341
+			'validation_msg'      =>  '',
342
+			'required_msg'        =>  '',
343
+			'field_icon'          =>  'fa fa-briefcase',
344
+			'css_class'           =>  '',
345
+			'cat_sort'            =>  true,
346
+			'cat_filter'	      =>  true
347
+		)
348
+	);
349
+
350
+	// job sector
351
+	$custom_fields['job_sector'] = array( // The key value should be unique and not contain any spaces.
352
+		'field_type'  =>  'select',
353
+		'class'       =>  'gd-job-type',
354
+		'icon'        =>  'fa fa-briefcase',
355
+		'name'        =>  __('Job Sector', 'geodirectory'),
356
+		'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
357
+		'defaults'    => array(
358
+			'data_type'           =>  'VARCHAR',
359
+			'admin_title'         =>  __('Job Sector','geodirectory'),
360
+			'site_title'          =>  __('Job Sector','geodirectory'),
361
+			'admin_desc'          =>  __('Select the job sector.','geodirectory'),
362
+			'htmlvar_name'        =>  'job_sector',
363
+			'is_active'           =>  true,
364
+			'for_admin_use'       =>  false,
365
+			'default_value'       =>  '',
366
+			'show_in' 	          =>  '[detail]',
367
+			'is_required'         =>  true,
368
+			'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
369
+			'validation_pattern'  =>  '',
370
+			'validation_msg'      =>  '',
371
+			'required_msg'        =>  '',
372
+			'field_icon'          =>  'fa fa-briefcase',
373
+			'css_class'           =>  '',
374
+			'cat_sort'            =>  true,
375
+			'cat_filter'	      =>  true
376
+		)
377
+	);
378
+
379
+
380
+	/**
381
+	 * @see `geodir_custom_fields`
382
+	 */
383
+	return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
384 384
 }
385 385
 
386 386
 
@@ -395,32 +395,32 @@  discard block
 block discarded – undo
395 395
  * @return string The html to output.
396 396
  */
397 397
 function geodir_predefined_custom_field_output_twitter_feed($html,$location,$cf){
398
-    global $post;
398
+	global $post;
399 399
 
400 400
 
401
-    if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
401
+	if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
402 402
 
403
-        $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
403
+		$class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
404 404
 
405
-        $field_icon = geodir_field_icon_proccess($cf);
406
-        if (strpos($field_icon, 'http') !== false) {
407
-            $field_icon_af = '';
408
-        } elseif ($field_icon == '') {
409
-            $field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="fa fa-clock-o"></i>' : "";
410
-        } else {
411
-            $field_icon_af = $field_icon;
412
-            $field_icon = '';
413
-        }
405
+		$field_icon = geodir_field_icon_proccess($cf);
406
+		if (strpos($field_icon, 'http') !== false) {
407
+			$field_icon_af = '';
408
+		} elseif ($field_icon == '') {
409
+			$field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="fa fa-clock-o"></i>' : "";
410
+		} else {
411
+			$field_icon_af = $field_icon;
412
+			$field_icon = '';
413
+		}
414 414
 
415 415
 
416
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
416
+		$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
417 417
 
418
-        $html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
419
-        $html .= '</div>';
418
+		$html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
419
+		$html .= '</div>';
420 420
 
421
-    endif;
421
+	endif;
422 422
 
423
-    return $html;
423
+	return $html;
424 424
 }
425 425
 add_filter('geodir_custom_field_output_text_key_twitter_feed','geodir_predefined_custom_field_output_twitter_feed',10,3);
426 426
 
@@ -435,36 +435,36 @@  discard block
 block discarded – undo
435 435
  * @return string The html to output.
436 436
  */
437 437
 function geodir_predefined_custom_field_output_get_directions($html,$location,$cf) {
438
-    global $post;
438
+	global $post;
439 439
 
440 440
 
441
-    if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
441
+	if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
442 442
 
443
-        $field_icon = geodir_field_icon_proccess( $cf );
444
-        if ( strpos( $field_icon, 'http' ) !== false ) {
445
-            $field_icon_af = '';
446
-        } elseif ( $field_icon == '' ) {
447
-            $field_icon_af = '<i class="fa fa-location-arrow"></i>';
448
-        } else {
449
-            $field_icon_af = $field_icon;
450
-            $field_icon    = '';
451
-        }
443
+		$field_icon = geodir_field_icon_proccess( $cf );
444
+		if ( strpos( $field_icon, 'http' ) !== false ) {
445
+			$field_icon_af = '';
446
+		} elseif ( $field_icon == '' ) {
447
+			$field_icon_af = '<i class="fa fa-location-arrow"></i>';
448
+		} else {
449
+			$field_icon_af = $field_icon;
450
+			$field_icon    = '';
451
+		}
452 452
 
453
-        $link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
453
+		$link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
454 454
 
455
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
455
+		$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
456 456
 
457
-        if(isset( $cf['field_icon'] ) && $cf['field_icon']){
458
-            $html .= $field_icon_af;
459
-        }
457
+		if(isset( $cf['field_icon'] ) && $cf['field_icon']){
458
+			$html .= $field_icon_af;
459
+		}
460 460
 
461
-        $html .= '<a href="https://www.google.com/maps/dir//\'' . $post->post_latitude . ',' . $post->post_longitude . '\'/" target="_blank" >' . $link_text . '</a>';
462
-        $html .= '</div>';
461
+		$html .= '<a href="https://www.google.com/maps/dir//\'' . $post->post_latitude . ',' . $post->post_longitude . '\'/" target="_blank" >' . $link_text . '</a>';
462
+		$html .= '</div>';
463 463
 
464
-    }else{
465
-        $html ='';
466
-    }
464
+	}else{
465
+		$html ='';
466
+	}
467 467
 
468
-    return $html;
468
+	return $html;
469 469
 }
470 470
 add_filter('geodir_custom_field_output_text_key_get_directions','geodir_predefined_custom_field_output_get_directions',10,3);
Please login to merge, or discard this patch.
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
  * @package GeoDirectory
16 16
  * @see `geodir_custom_field_save` for array details.
17 17
  */
18
-function geodir_custom_fields_predefined($post_type=''){
18
+function geodir_custom_fields_predefined($post_type = '') {
19 19
 
20 20
     $custom_fields = array();
21 21
 
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
             'default_value'       =>  '',
76 76
             'show_in' 	          =>  '[detail],[listing]',
77 77
             'is_required'         =>  true,
78
-            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
78
+            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let', 'geodirectory'),
79 79
             'validation_pattern'  =>  '',
80 80
             'validation_msg'      =>  '',
81 81
             'required_msg'        =>  '',
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
             'default_value'       =>  '',
105 105
             'show_in' 	          =>  '[detail],[listing]',
106 106
             'is_required'         =>  true,
107
-            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
107
+            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional', 'geodirectory'),
108 108
             'validation_pattern'  =>  '',
109 109
             'validation_msg'      =>  '',
110 110
             'required_msg'        =>  '',
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
             'default_value'       =>  '',
134 134
             'show_in' 	          =>  '[detail],[listing]',
135 135
             'is_required'         =>  true,
136
-            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
136
+            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage', 'geodirectory'),
137 137
             'validation_pattern'  =>  '',
138 138
             'validation_msg'      =>  '',
139 139
             'required_msg'        =>  '',
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
             'default_value'       =>  '',
163 163
             'show_in' 	          =>  '[detail],[listing]',
164 164
             'is_required'         =>  true,
165
-            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
165
+            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
166 166
             'validation_pattern'  =>  '',
167 167
             'validation_msg'      =>  '',
168 168
             'required_msg'        =>  '',
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
             'default_value'       =>  '',
192 192
             'show_in' 	          =>  '[detail],[listing]',
193 193
             'is_required'         =>  true,
194
-            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
194
+            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
195 195
             'validation_pattern'  =>  '',
196 196
             'validation_msg'      =>  '',
197 197
             'required_msg'        =>  '',
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
             'default_value'       =>  '',
249 249
             'show_in' 	          =>  '[detail],[listing]',
250 250
             'is_required'         =>  true,
251
-            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
251
+            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace', 'geodirectory'),
252 252
             'validation_pattern'  =>  '',
253 253
             'validation_msg'      =>  '',
254 254
             'required_msg'        =>  '',
@@ -328,15 +328,15 @@  discard block
 block discarded – undo
328 328
         'defaults'    => array(
329 329
             'data_type'           =>  'VARCHAR',
330 330
             'admin_title'         =>  __('Job Type', 'geodirectory'),
331
-            'site_title'          =>  __('Job Type','geodirectory'),
332
-            'admin_desc'          =>  __('Select the type of job.','geodirectory'),
331
+            'site_title'          =>  __('Job Type', 'geodirectory'),
332
+            'admin_desc'          =>  __('Select the type of job.', 'geodirectory'),
333 333
             'htmlvar_name'        =>  'job_type',
334 334
             'is_active'           =>  true,
335 335
             'for_admin_use'       =>  false,
336 336
             'default_value'       =>  '',
337 337
             'show_in' 	          =>  '[detail],[listing]',
338 338
             'is_required'         =>  true,
339
-            'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
339
+            'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other', 'geodirectory'),
340 340
             'validation_pattern'  =>  '',
341 341
             'validation_msg'      =>  '',
342 342
             'required_msg'        =>  '',
@@ -356,16 +356,16 @@  discard block
 block discarded – undo
356 356
         'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
357 357
         'defaults'    => array(
358 358
             'data_type'           =>  'VARCHAR',
359
-            'admin_title'         =>  __('Job Sector','geodirectory'),
360
-            'site_title'          =>  __('Job Sector','geodirectory'),
361
-            'admin_desc'          =>  __('Select the job sector.','geodirectory'),
359
+            'admin_title'         =>  __('Job Sector', 'geodirectory'),
360
+            'site_title'          =>  __('Job Sector', 'geodirectory'),
361
+            'admin_desc'          =>  __('Select the job sector.', 'geodirectory'),
362 362
             'htmlvar_name'        =>  'job_sector',
363 363
             'is_active'           =>  true,
364 364
             'for_admin_use'       =>  false,
365 365
             'default_value'       =>  '',
366 366
             'show_in' 	          =>  '[detail]',
367 367
             'is_required'         =>  true,
368
-            'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
368
+            'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies', 'geodirectory'),
369 369
             'validation_pattern'  =>  '',
370 370
             'validation_msg'      =>  '',
371 371
             'required_msg'        =>  '',
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
     /**
381 381
      * @see `geodir_custom_fields`
382 382
      */
383
-    return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
383
+    return apply_filters('geodir_custom_fields_predefined', $custom_fields, $post_type);
384 384
 }
385 385
 
386 386
 
@@ -394,11 +394,11 @@  discard block
 block discarded – undo
394 394
  * @since 1.6.9
395 395
  * @return string The html to output.
396 396
  */
397
-function geodir_predefined_custom_field_output_twitter_feed($html,$location,$cf){
397
+function geodir_predefined_custom_field_output_twitter_feed($html, $location, $cf) {
398 398
     global $post;
399 399
 
400 400
 
401
-    if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
401
+    if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
402 402
 
403 403
         $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
404 404
 
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
         }
414 414
 
415 415
 
416
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
416
+        $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;">';
417 417
 
418 418
         $html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
419 419
         $html .= '</div>';
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
 
423 423
     return $html;
424 424
 }
425
-add_filter('geodir_custom_field_output_text_key_twitter_feed','geodir_predefined_custom_field_output_twitter_feed',10,3);
425
+add_filter('geodir_custom_field_output_text_key_twitter_feed', 'geodir_predefined_custom_field_output_twitter_feed', 10, 3);
426 426
 
427 427
 /**
428 428
  * Filter the get_directions custom field output to show a link.
@@ -434,37 +434,37 @@  discard block
 block discarded – undo
434 434
  * @since 1.6.9
435 435
  * @return string The html to output.
436 436
  */
437
-function geodir_predefined_custom_field_output_get_directions($html,$location,$cf) {
437
+function geodir_predefined_custom_field_output_get_directions($html, $location, $cf) {
438 438
     global $post;
439 439
 
440 440
 
441
-    if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
441
+    if (isset($post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset($post->post_latitude) && $post->post_latitude) {
442 442
 
443
-        $field_icon = geodir_field_icon_proccess( $cf );
444
-        if ( strpos( $field_icon, 'http' ) !== false ) {
443
+        $field_icon = geodir_field_icon_proccess($cf);
444
+        if (strpos($field_icon, 'http') !== false) {
445 445
             $field_icon_af = '';
446
-        } elseif ( $field_icon == '' ) {
446
+        } elseif ($field_icon == '') {
447 447
             $field_icon_af = '<i class="fa fa-location-arrow"></i>';
448 448
         } else {
449 449
             $field_icon_af = $field_icon;
450 450
             $field_icon    = '';
451 451
         }
452 452
 
453
-        $link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
453
+        $link_text = isset($post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __('Get Directions', 'geodirectory');
454 454
 
455
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
455
+        $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;">';
456 456
 
457
-        if(isset( $cf['field_icon'] ) && $cf['field_icon']){
457
+        if (isset($cf['field_icon']) && $cf['field_icon']) {
458 458
             $html .= $field_icon_af;
459 459
         }
460 460
 
461
-        $html .= '<a href="https://www.google.com/maps/dir//\'' . $post->post_latitude . ',' . $post->post_longitude . '\'/" target="_blank" >' . $link_text . '</a>';
461
+        $html .= '<a href="https://www.google.com/maps/dir//\''.$post->post_latitude.','.$post->post_longitude.'\'/" target="_blank" >'.$link_text.'</a>';
462 462
         $html .= '</div>';
463 463
 
464
-    }else{
465
-        $html ='';
464
+    } else {
465
+        $html = '';
466 466
     }
467 467
 
468 468
     return $html;
469 469
 }
470
-add_filter('geodir_custom_field_output_text_key_get_directions','geodir_predefined_custom_field_output_get_directions',10,3);
470
+add_filter('geodir_custom_field_output_text_key_get_directions', 'geodir_predefined_custom_field_output_get_directions', 10, 3);
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -461,7 +461,7 @@
 block discarded – undo
461 461
         $html .= '<a href="https://www.google.com/maps/dir//\'' . $post->post_latitude . ',' . $post->post_longitude . '\'/" target="_blank" >' . $link_text . '</a>';
462 462
         $html .= '</div>';
463 463
 
464
-    }else{
464
+    } else{
465 465
         $html ='';
466 466
     }
467 467
 
Please login to merge, or discard this patch.
geodirectory-functions/custom_fields_output_functions.php 3 patches
Spacing   +302 added lines, -302 removed lines patch added patch discarded remove patch
@@ -19,21 +19,21 @@  discard block
 block discarded – undo
19 19
  *
20 20
  * @return string The html to output for the custom field.
21 21
  */
22
-function geodir_cf_checkbox($html,$location,$cf,$p=''){
22
+function geodir_cf_checkbox($html, $location, $cf, $p = '') {
23 23
 
24 24
     // check we have the post value
25
-    if(is_int($p)){$post = geodir_get_post_info($p);}
26
-    else{ global $post;}
25
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
26
+    else { global $post; }
27 27
 
28
-    if(!is_array($cf) && $cf!=''){
28
+    if (!is_array($cf) && $cf != '') {
29 29
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
30
-        if(!$cf){return NULL;}
30
+        if (!$cf) {return NULL; }
31 31
     }
32 32
 
33 33
     $html_var = $cf['htmlvar_name'];
34 34
 
35 35
     // Check if there is a location specific filter.
36
-    if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
36
+    if (has_filter("geodir_custom_field_output_checkbox_loc_{$location}")) {
37 37
         /**
38 38
          * Filter the checkbox html by location.
39 39
          *
@@ -41,11 +41,11 @@  discard block
 block discarded – undo
41 41
          * @param array $cf The custom field array.
42 42
          * @since 1.6.6
43 43
          */
44
-        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
44
+        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}", $html, $cf);
45 45
     }
46 46
 
47 47
     // Check if there is a custom field specific filter.
48
-    if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
48
+    if (has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")) {
49 49
         /**
50 50
          * Filter the checkbox html by individual custom field.
51 51
          *
@@ -54,11 +54,11 @@  discard block
 block discarded – undo
54 54
          * @param array $cf The custom field array.
55 55
          * @since 1.6.6
56 56
          */
57
-        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
57
+        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}", $html, $location, $cf);
58 58
     }
59 59
 
60 60
     // Check if there is a custom field key specific filter.
61
-    if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
61
+    if (has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")) {
62 62
         /**
63 63
          * Filter the checkbox html by field type key.
64 64
          *
@@ -67,18 +67,18 @@  discard block
 block discarded – undo
67 67
          * @param array $cf The custom field array.
68 68
          * @since 1.6.6
69 69
          */
70
-        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
70
+        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}", $html, $location, $cf);
71 71
     }
72 72
 
73 73
     // If not html then we run the standard output.
74
-    if(empty($html)){
74
+    if (empty($html)) {
75 75
 
76
-        if ( (int) $post->{$html_var} == 1 ):
76
+        if ((int) $post->{$html_var} == 1):
77 77
 
78
-            if ( $post->{$html_var} == '1' ):
79
-                $html_val = __( 'Yes', 'geodirectory' );
78
+            if ($post->{$html_var} == '1'):
79
+                $html_val = __('Yes', 'geodirectory');
80 80
             else:
81
-                $html_val = __( 'No', 'geodirectory' );
81
+                $html_val = __('No', 'geodirectory');
82 82
             endif;
83 83
 
84 84
             $field_icon = geodir_field_icon_proccess($cf);
@@ -91,16 +91,16 @@  discard block
 block discarded – undo
91 91
                 $field_icon = '';
92 92
             }
93 93
 
94
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
95
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
96
-            $html .= '</span>' . $html_val . '</div>';
94
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-checkbox" style="'.$field_icon.'">'.$field_icon_af;
95
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
96
+            $html .= '</span>'.$html_val.'</div>';
97 97
         endif;
98 98
 
99 99
     }
100 100
 
101 101
     return $html;
102 102
 }
103
-add_filter('geodir_custom_field_output_checkbox','geodir_cf_checkbox',10,3);
103
+add_filter('geodir_custom_field_output_checkbox', 'geodir_cf_checkbox', 10, 3);
104 104
 
105 105
 
106 106
 /**
@@ -113,21 +113,21 @@  discard block
 block discarded – undo
113 113
  *
114 114
  * @return string The html to output for the custom field.
115 115
  */
116
-function geodir_cf_fieldset($html,$location,$cf,$p=''){
116
+function geodir_cf_fieldset($html, $location, $cf, $p = '') {
117 117
 
118 118
     // check we have the post value
119
-    if(is_int($p)){$post = geodir_get_post_info($p);}
120
-    else{ global $post;}
119
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
120
+    else { global $post; }
121 121
 
122
-    if(!is_array($cf) && $cf!=''){
122
+    if (!is_array($cf) && $cf != '') {
123 123
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
124
-        if(!$cf){return NULL;}
124
+        if (!$cf) {return NULL; }
125 125
     }
126 126
 
127 127
     $html_var = $cf['htmlvar_name'];
128 128
 
129 129
     // Check if there is a location specific filter.
130
-    if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
130
+    if (has_filter("geodir_custom_field_output_fieldset_loc_{$location}")) {
131 131
         /**
132 132
          * Filter the fieldset html by location.
133 133
          *
@@ -135,11 +135,11 @@  discard block
 block discarded – undo
135 135
          * @param array $cf The custom field array.
136 136
          * @since 1.6.6
137 137
          */
138
-        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
138
+        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}", $html, $cf);
139 139
     }
140 140
 
141 141
     // Check if there is a custom field specific filter.
142
-    if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
142
+    if (has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")) {
143 143
         /**
144 144
          * Filter the fieldset html by individual custom field.
145 145
          *
@@ -148,11 +148,11 @@  discard block
 block discarded – undo
148 148
          * @param array $cf The custom field array.
149 149
          * @since 1.6.6
150 150
          */
151
-        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
151
+        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}", $html, $location, $cf);
152 152
     }
153 153
 
154 154
     // Check if there is a custom field key specific filter.
155
-    if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
155
+    if (has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")) {
156 156
         /**
157 157
          * Filter the fieldset html by field type key.
158 158
          *
@@ -161,11 +161,11 @@  discard block
 block discarded – undo
161 161
          * @param array $cf The custom field array.
162 162
          * @since 1.6.6
163 163
          */
164
-        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
164
+        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}", $html, $location, $cf);
165 165
     }
166 166
 
167 167
     // If not html then we run the standard output.
168
-    if(empty($html)){
168
+    if (empty($html)) {
169 169
 
170 170
         global $field_set_start;
171 171
         $fieldset_class = 'fieldset-'.sanitize_title_with_dashes($cf['site_title']);
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
         if ($field_set_start == 1) {
174 174
             $html = '';
175 175
         } else {
176
-            $html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
176
+            $html = '<h2 class="'.$fieldset_class.'">'.__($cf['site_title'], 'geodirectory').'</h2>';
177 177
             //$field_set_start = 1;
178 178
         }
179 179
 
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 
182 182
     return $html;
183 183
 }
184
-add_filter('geodir_custom_field_output_fieldset','geodir_cf_fieldset',10,3);
184
+add_filter('geodir_custom_field_output_fieldset', 'geodir_cf_fieldset', 10, 3);
185 185
 
186 186
 
187 187
 /**
@@ -194,21 +194,21 @@  discard block
 block discarded – undo
194 194
  *
195 195
  * @return string The html to output for the custom field.
196 196
  */
197
-function geodir_cf_url($html,$location,$cf,$p=''){
197
+function geodir_cf_url($html, $location, $cf, $p = '') {
198 198
 
199 199
     // check we have the post value
200
-    if(is_int($p)){$post = geodir_get_post_info($p);}
201
-    else{ global $post;}
200
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
201
+    else { global $post; }
202 202
 
203
-    if(!is_array($cf) && $cf!=''){
203
+    if (!is_array($cf) && $cf != '') {
204 204
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
205
-        if(!$cf){return NULL;}
205
+        if (!$cf) {return NULL; }
206 206
     }
207 207
 
208 208
     $html_var = $cf['htmlvar_name'];
209 209
 
210 210
     // Check if there is a location specific filter.
211
-    if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
211
+    if (has_filter("geodir_custom_field_output_url_loc_{$location}")) {
212 212
         /**
213 213
          * Filter the url html by location.
214 214
          *
@@ -216,11 +216,11 @@  discard block
 block discarded – undo
216 216
          * @param array $cf The custom field array.
217 217
          * @since 1.6.6
218 218
          */
219
-        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
219
+        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}", $html, $cf);
220 220
     }
221 221
 
222 222
     // Check if there is a custom field specific filter.
223
-    if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
223
+    if (has_filter("geodir_custom_field_output_url_var_{$html_var}")) {
224 224
         /**
225 225
          * Filter the url html by individual custom field.
226 226
          *
@@ -229,11 +229,11 @@  discard block
 block discarded – undo
229 229
          * @param array $cf The custom field array.
230 230
          * @since 1.6.6
231 231
          */
232
-        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
232
+        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}", $html, $location, $cf);
233 233
     }
234 234
 
235 235
     // Check if there is a custom field key specific filter.
236
-    if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
236
+    if (has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")) {
237 237
         /**
238 238
          * Filter the url html by field type key.
239 239
          *
@@ -242,11 +242,11 @@  discard block
 block discarded – undo
242 242
          * @param array $cf The custom field array.
243 243
          * @since 1.6.6
244 244
          */
245
-        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
245
+        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}", $html, $location, $cf);
246 246
     }
247 247
 
248 248
     // If not html then we run the standard output.
249
-    if(empty($html)){
249
+    if (empty($html)) {
250 250
 
251 251
         if ($post->{$cf['htmlvar_name']}):
252 252
 
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 
274 274
             $website = !empty($a_url['url']) ? $a_url['url'] : '';
275 275
             $title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
276
-            if(!empty($cf['default_value'])){$title = $cf['default_value'];}
276
+            if (!empty($cf['default_value'])) {$title = $cf['default_value']; }
277 277
             $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
278 278
 
279 279
 
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
              * @param string $website Website URL.
290 290
              * @param int $post->ID Post ID.
291 291
              */
292
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
292
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'"><span class="geodir-i-website" style="'.$field_icon.'">'.$field_icon_af.'<a href="'.$website.'" target="_blank" '.$rel.' ><strong>'.apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID).'</strong></a></span></div>';
293 293
 
294 294
         endif;
295 295
 
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 
298 298
     return $html;
299 299
 }
300
-add_filter('geodir_custom_field_output_url','geodir_cf_url',10,3);
300
+add_filter('geodir_custom_field_output_url', 'geodir_cf_url', 10, 3);
301 301
 
302 302
 
303 303
 /**
@@ -310,21 +310,21 @@  discard block
 block discarded – undo
310 310
  *
311 311
  * @return string The html to output for the custom field.
312 312
  */
313
-function geodir_cf_phone($html,$location,$cf,$p=''){
313
+function geodir_cf_phone($html, $location, $cf, $p = '') {
314 314
 
315 315
     // check we have the post value
316
-    if(is_int($p)){$post = geodir_get_post_info($p);}
317
-    else{ global $post;}
316
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
317
+    else { global $post; }
318 318
 
319
-    if(!is_array($cf) && $cf!=''){
319
+    if (!is_array($cf) && $cf != '') {
320 320
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
321
-        if(!$cf){return NULL;}
321
+        if (!$cf) {return NULL; }
322 322
     }
323 323
 
324 324
     $html_var = $cf['htmlvar_name'];
325 325
 
326 326
     // Check if there is a location specific filter.
327
-    if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
327
+    if (has_filter("geodir_custom_field_output_phone_loc_{$location}")) {
328 328
         /**
329 329
          * Filter the phone html by location.
330 330
          *
@@ -332,11 +332,11 @@  discard block
 block discarded – undo
332 332
          * @param array $cf The custom field array.
333 333
          * @since 1.6.6
334 334
          */
335
-        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
335
+        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}", $html, $cf);
336 336
     }
337 337
 
338 338
     // Check if there is a custom field specific filter.
339
-    if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
339
+    if (has_filter("geodir_custom_field_output_phone_var_{$html_var}")) {
340 340
         /**
341 341
          * Filter the phone html by individual custom field.
342 342
          *
@@ -345,11 +345,11 @@  discard block
 block discarded – undo
345 345
          * @param array $cf The custom field array.
346 346
          * @since 1.6.6
347 347
          */
348
-        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
348
+        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}", $html, $location, $cf);
349 349
     }
350 350
 
351 351
     // Check if there is a custom field key specific filter.
352
-    if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
352
+    if (has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")) {
353 353
         /**
354 354
          * Filter the phone html by field type key.
355 355
          *
@@ -358,11 +358,11 @@  discard block
 block discarded – undo
358 358
          * @param array $cf The custom field array.
359 359
          * @since 1.6.6
360 360
          */
361
-        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
361
+        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}", $html, $location, $cf);
362 362
     }
363 363
 
364 364
     // If not html then we run the standard output.
365
-    if(empty($html)){
365
+    if (empty($html)) {
366 366
 
367 367
         if ($post->{$cf['htmlvar_name']}):
368 368
 
@@ -377,9 +377,9 @@  discard block
 block discarded – undo
377 377
             }
378 378
 
379 379
 
380
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
381
-                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
382
-            $html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
380
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-contact" style="'.$field_icon.'">'.$field_icon_af.
381
+                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
382
+            $html .= '</span><a href="tel:'.preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}).'">'.$post->{$cf['htmlvar_name']}.'</a></div>';
383 383
 
384 384
         endif;
385 385
 
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
 
388 388
     return $html;
389 389
 }
390
-add_filter('geodir_custom_field_output_phone','geodir_cf_phone',10,3);
390
+add_filter('geodir_custom_field_output_phone', 'geodir_cf_phone', 10, 3);
391 391
 
392 392
 
393 393
 /**
@@ -400,21 +400,21 @@  discard block
 block discarded – undo
400 400
  *
401 401
  * @return string The html to output for the custom field.
402 402
  */
403
-function geodir_cf_time($html,$location,$cf,$p=''){
403
+function geodir_cf_time($html, $location, $cf, $p = '') {
404 404
 
405 405
     // check we have the post value
406
-    if(is_int($p)){$post = geodir_get_post_info($p);}
407
-    else{ global $post;}
406
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
407
+    else { global $post; }
408 408
 
409
-    if(!is_array($cf) && $cf!=''){
409
+    if (!is_array($cf) && $cf != '') {
410 410
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
411
-        if(!$cf){return NULL;}
411
+        if (!$cf) {return NULL; }
412 412
     }
413 413
 
414 414
     $html_var = $cf['htmlvar_name'];
415 415
 
416 416
     // Check if there is a location specific filter.
417
-    if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
417
+    if (has_filter("geodir_custom_field_output_time_loc_{$location}")) {
418 418
         /**
419 419
          * Filter the time html by location.
420 420
          *
@@ -422,11 +422,11 @@  discard block
 block discarded – undo
422 422
          * @param array $cf The custom field array.
423 423
          * @since 1.6.6
424 424
          */
425
-        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
425
+        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}", $html, $cf);
426 426
     }
427 427
 
428 428
     // Check if there is a custom field specific filter.
429
-    if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
429
+    if (has_filter("geodir_custom_field_output_time_var_{$html_var}")) {
430 430
         /**
431 431
          * Filter the time html by individual custom field.
432 432
          *
@@ -435,11 +435,11 @@  discard block
 block discarded – undo
435 435
          * @param array $cf The custom field array.
436 436
          * @since 1.6.6
437 437
          */
438
-        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
438
+        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}", $html, $location, $cf);
439 439
     }
440 440
 
441 441
     // Check if there is a custom field key specific filter.
442
-    if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
442
+    if (has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")) {
443 443
         /**
444 444
          * Filter the time html by field type key.
445 445
          *
@@ -448,11 +448,11 @@  discard block
 block discarded – undo
448 448
          * @param array $cf The custom field array.
449 449
          * @since 1.6.6
450 450
          */
451
-        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
451
+        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}", $html, $location, $cf);
452 452
     }
453 453
 
454 454
     // If not html then we run the standard output.
455
-    if(empty($html)){
455
+    if (empty($html)) {
456 456
 
457 457
         if ($post->{$cf['htmlvar_name']}):
458 458
 
@@ -472,9 +472,9 @@  discard block
 block discarded – undo
472 472
             }
473 473
 
474 474
 
475
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
476
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
477
-            $html .= '</span>' . $value . '</div>';
475
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-time" style="'.$field_icon.'">'.$field_icon_af;
476
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
477
+            $html .= '</span>'.$value.'</div>';
478 478
 
479 479
         endif;
480 480
 
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
482 482
 
483 483
     return $html;
484 484
 }
485
-add_filter('geodir_custom_field_output_time','geodir_cf_time',10,3);
485
+add_filter('geodir_custom_field_output_time', 'geodir_cf_time', 10, 3);
486 486
 
487 487
 
488 488
 /**
@@ -495,21 +495,21 @@  discard block
 block discarded – undo
495 495
  *
496 496
  * @return string The html to output for the custom field.
497 497
  */
498
-function geodir_cf_datepicker($html,$location,$cf,$p=''){
498
+function geodir_cf_datepicker($html, $location, $cf, $p = '') {
499 499
     global $preview;
500 500
     // check we have the post value
501
-    if(is_int($p)){$post = geodir_get_post_info($p);}
502
-    else{ global $post;}
501
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
502
+    else { global $post; }
503 503
 
504
-    if(!is_array($cf) && $cf!=''){
504
+    if (!is_array($cf) && $cf != '') {
505 505
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
506
-        if(!$cf){return NULL;}
506
+        if (!$cf) {return NULL; }
507 507
     }
508 508
 
509 509
     $html_var = $cf['htmlvar_name'];
510 510
 
511 511
     // Check if there is a location specific filter.
512
-    if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
512
+    if (has_filter("geodir_custom_field_output_datepicker_loc_{$location}")) {
513 513
         /**
514 514
          * Filter the datepicker html by location.
515 515
          *
@@ -517,11 +517,11 @@  discard block
 block discarded – undo
517 517
          * @param array $cf The custom field array.
518 518
          * @since 1.6.6
519 519
          */
520
-        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
520
+        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}", $html, $cf);
521 521
     }
522 522
 
523 523
     // Check if there is a custom field specific filter.
524
-    if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
524
+    if (has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")) {
525 525
         /**
526 526
          * Filter the datepicker html by individual custom field.
527 527
          *
@@ -530,11 +530,11 @@  discard block
 block discarded – undo
530 530
          * @param array $cf The custom field array.
531 531
          * @since 1.6.6
532 532
          */
533
-        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
533
+        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}", $html, $location, $cf);
534 534
     }
535 535
 
536 536
     // Check if there is a custom field key specific filter.
537
-    if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
537
+    if (has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")) {
538 538
         /**
539 539
          * Filter the datepicker html by field type key.
540 540
          *
@@ -543,11 +543,11 @@  discard block
 block discarded – undo
543 543
          * @param array $cf The custom field array.
544 544
          * @since 1.6.6
545 545
          */
546
-        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
546
+        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}", $html, $location, $cf);
547 547
     }
548 548
 
549 549
     // If not html then we run the standard output.
550
-    if(empty($html)){
550
+    if (empty($html)) {
551 551
 
552 552
         if ($post->{$cf['htmlvar_name']}):
553 553
 
@@ -558,24 +558,24 @@  discard block
 block discarded – undo
558 558
             }
559 559
             // check if we need to change the format or not
560 560
             $date_format_len = strlen(str_replace(' ', '', $date_format));
561
-            if($date_format_len>5){// if greater then 4 then it's the old style format.
561
+            if ($date_format_len > 5) {// if greater then 4 then it's the old style format.
562 562
 
563
-                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
564
-                $replace = array('d','j','l','m','n','F','Y');//PHP date format
563
+                $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format
564
+                $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format
565 565
 
566 566
                 $date_format = str_replace($search, $replace, $date_format);
567 567
 
568
-                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
569
-            }else{
568
+                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y') ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
569
+            } else {
570 570
                 $post_htmlvar_value = $post->{$cf['htmlvar_name']};
571 571
             }
572 572
 
573
-            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
573
+            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']} != "0000-00-00") {
574 574
                 $date_format_from = $preview ? $date_format : 'Y-m-d';
575 575
                 $value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
576 576
                 //$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
577 577
                 //$value = date_i18n($date_format, strtotime($post_htmlvar_value));
578
-            }else{
578
+            } else {
579 579
                 return '';
580 580
             }
581 581
 
@@ -592,9 +592,9 @@  discard block
 block discarded – undo
592 592
 
593 593
 
594 594
 
595
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
596
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
597
-            $html .= '</span>' . $value . '</div>';
595
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-datepicker" style="'.$field_icon.'">'.$field_icon_af;
596
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
597
+            $html .= '</span>'.$value.'</div>';
598 598
 
599 599
         endif;
600 600
 
@@ -602,7 +602,7 @@  discard block
 block discarded – undo
602 602
 
603 603
     return $html;
604 604
 }
605
-add_filter('geodir_custom_field_output_datepicker','geodir_cf_datepicker',10,3);
605
+add_filter('geodir_custom_field_output_datepicker', 'geodir_cf_datepicker', 10, 3);
606 606
 
607 607
 
608 608
 /**
@@ -615,21 +615,21 @@  discard block
 block discarded – undo
615 615
  *
616 616
  * @return string The html to output for the custom field.
617 617
  */
618
-function geodir_cf_text($html,$location,$cf,$p=''){
618
+function geodir_cf_text($html, $location, $cf, $p = '') {
619 619
 
620 620
     // check we have the post value
621
-    if(is_int($p)){$post = geodir_get_post_info($p);}
622
-    else{ global $post;}
621
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
622
+    else { global $post; }
623 623
 
624
-    if(!is_array($cf) && $cf!=''){
624
+    if (!is_array($cf) && $cf != '') {
625 625
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
626
-        if(!$cf){return NULL;}
626
+        if (!$cf) {return NULL; }
627 627
     }
628 628
 
629 629
     $html_var = $cf['htmlvar_name'];
630 630
 
631 631
     // Check if there is a location specific filter.
632
-    if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
632
+    if (has_filter("geodir_custom_field_output_text_loc_{$location}")) {
633 633
         /**
634 634
          * Filter the text html by location.
635 635
          *
@@ -637,11 +637,11 @@  discard block
 block discarded – undo
637 637
          * @param array $cf The custom field array.
638 638
          * @since 1.6.6
639 639
          */
640
-        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
640
+        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}", $html, $cf);
641 641
     }
642 642
 
643 643
     // Check if there is a custom field specific filter.
644
-    if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
644
+    if (has_filter("geodir_custom_field_output_text_var_{$html_var}")) {
645 645
         /**
646 646
          * Filter the text html by individual custom field.
647 647
          *
@@ -650,11 +650,11 @@  discard block
 block discarded – undo
650 650
          * @param array $cf The custom field array.
651 651
          * @since 1.6.6
652 652
          */
653
-        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
653
+        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}", $html, $location, $cf);
654 654
     }
655 655
 
656 656
     // Check if there is a custom field key specific filter.
657
-    if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
657
+    if (has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")) {
658 658
         /**
659 659
          * Filter the text html by field type key.
660 660
          *
@@ -663,15 +663,15 @@  discard block
 block discarded – undo
663 663
          * @param array $cf The custom field array.
664 664
          * @since 1.6.6
665 665
          */
666
-        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
666
+        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}", $html, $location, $cf);
667 667
     }
668 668
 
669 669
     
670 670
 
671 671
     // If not html then we run the standard output.
672
-    if(empty($html)){
672
+    if (empty($html)) {
673 673
 
674
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
674
+        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
675 675
 
676 676
             $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
677 677
 
@@ -686,16 +686,16 @@  discard block
 block discarded – undo
686 686
             }
687 687
 
688 688
 
689
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
690
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
689
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="'.$class.'" style="'.$field_icon.'">'.$field_icon_af;
690
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
691 691
             $html .= '</span>';
692 692
 
693 693
             $value = $post->{$cf['htmlvar_name']};
694
-            if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
694
+            if (isset($cf['data_type']) && ($cf['data_type'] == 'INT' || $cf['data_type'] == 'FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']) {
695 695
                 $extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
696
-                if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
697
-                    if(!ceil($value) > 0){return '';}// dont output blank prices
698
-                    $value = geodir_currency_format_number($value,$cf);
696
+                if (isset($extra_fields['is_price']) && $extra_fields['is_price']) {
697
+                    if (!ceil($value) > 0) {return ''; }// dont output blank prices
698
+                    $value = geodir_currency_format_number($value, $cf);
699 699
                 }
700 700
             }
701 701
 
@@ -709,7 +709,7 @@  discard block
 block discarded – undo
709 709
 
710 710
     return $html;
711 711
 }
712
-add_filter('geodir_custom_field_output_text','geodir_cf_text',10,3);
712
+add_filter('geodir_custom_field_output_text', 'geodir_cf_text', 10, 3);
713 713
 
714 714
 
715 715
 /**
@@ -722,21 +722,21 @@  discard block
 block discarded – undo
722 722
  *
723 723
  * @return string The html to output for the custom field.
724 724
  */
725
-function geodir_cf_radio($html,$location,$cf,$p=''){
725
+function geodir_cf_radio($html, $location, $cf, $p = '') {
726 726
 
727 727
     // check we have the post value
728
-    if(is_int($p)){$post = geodir_get_post_info($p);}
729
-    else{ global $post;}
728
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
729
+    else { global $post; }
730 730
 
731
-    if(!is_array($cf) && $cf!=''){
731
+    if (!is_array($cf) && $cf != '') {
732 732
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
733
-        if(!$cf){return NULL;}
733
+        if (!$cf) {return NULL; }
734 734
     }
735 735
 
736 736
     $html_var = $cf['htmlvar_name'];
737 737
 
738 738
     // Check if there is a location specific filter.
739
-    if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
739
+    if (has_filter("geodir_custom_field_output_radio_loc_{$location}")) {
740 740
         /**
741 741
          * Filter the radio html by location.
742 742
          *
@@ -744,11 +744,11 @@  discard block
 block discarded – undo
744 744
          * @param array $cf The custom field array.
745 745
          * @since 1.6.6
746 746
          */
747
-        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
747
+        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}", $html, $cf);
748 748
     }
749 749
 
750 750
     // Check if there is a custom field specific filter.
751
-    if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
751
+    if (has_filter("geodir_custom_field_output_radio_var_{$html_var}")) {
752 752
         /**
753 753
          * Filter the radio html by individual custom field.
754 754
          *
@@ -757,11 +757,11 @@  discard block
 block discarded – undo
757 757
          * @param array $cf The custom field array.
758 758
          * @since 1.6.6
759 759
          */
760
-        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
760
+        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}", $html, $location, $cf);
761 761
     }
762 762
 
763 763
     // Check if there is a custom field key specific filter.
764
-    if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
764
+    if (has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")) {
765 765
         /**
766 766
          * Filter the radio html by field type key.
767 767
          *
@@ -770,11 +770,11 @@  discard block
 block discarded – undo
770 770
          * @param array $cf The custom field array.
771 771
          * @since 1.6.6
772 772
          */
773
-        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
773
+        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}", $html, $location, $cf);
774 774
     }
775 775
 
776 776
     // If not html then we run the standard output.
777
-    if(empty($html)){
777
+    if (empty($html)) {
778 778
 
779 779
         $html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
780 780
         if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
@@ -808,16 +808,16 @@  discard block
 block discarded – undo
808 808
             }
809 809
 
810 810
 
811
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
812
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
813
-            $html .= '</span>' . $html_val . '</div>';
811
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-radio" style="'.$field_icon.'">'.$field_icon_af;
812
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
813
+            $html .= '</span>'.$html_val.'</div>';
814 814
         endif;
815 815
 
816 816
     }
817 817
 
818 818
     return $html;
819 819
 }
820
-add_filter('geodir_custom_field_output_radio','geodir_cf_radio',10,3);
820
+add_filter('geodir_custom_field_output_radio', 'geodir_cf_radio', 10, 3);
821 821
 
822 822
 
823 823
 /**
@@ -830,21 +830,21 @@  discard block
 block discarded – undo
830 830
  *
831 831
  * @return string The html to output for the custom field.
832 832
  */
833
-function geodir_cf_select($html,$location,$cf,$p=''){
833
+function geodir_cf_select($html, $location, $cf, $p = '') {
834 834
 
835 835
     // check we have the post value
836
-    if(is_int($p)){$post = geodir_get_post_info($p);}
837
-    else{ global $post;}
836
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
837
+    else { global $post; }
838 838
 
839
-    if(!is_array($cf) && $cf!=''){
839
+    if (!is_array($cf) && $cf != '') {
840 840
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
841
-        if(!$cf){return NULL;}
841
+        if (!$cf) {return NULL; }
842 842
     }
843 843
 
844 844
     $html_var = $cf['htmlvar_name'];
845 845
 
846 846
     // Check if there is a location specific filter.
847
-    if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
847
+    if (has_filter("geodir_custom_field_output_select_loc_{$location}")) {
848 848
         /**
849 849
          * Filter the select html by location.
850 850
          *
@@ -852,11 +852,11 @@  discard block
 block discarded – undo
852 852
          * @param array $cf The custom field array.
853 853
          * @since 1.6.6
854 854
          */
855
-        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
855
+        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}", $html, $cf);
856 856
     }
857 857
 
858 858
     // Check if there is a custom field specific filter.
859
-    if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
859
+    if (has_filter("geodir_custom_field_output_select_var_{$html_var}")) {
860 860
         /**
861 861
          * Filter the select html by individual custom field.
862 862
          *
@@ -865,11 +865,11 @@  discard block
 block discarded – undo
865 865
          * @param array $cf The custom field array.
866 866
          * @since 1.6.6
867 867
          */
868
-        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
868
+        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}", $html, $location, $cf);
869 869
     }
870 870
 
871 871
     // Check if there is a custom field key specific filter.
872
-    if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
872
+    if (has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")) {
873 873
         /**
874 874
          * Filter the select html by field type key.
875 875
          *
@@ -878,11 +878,11 @@  discard block
 block discarded – undo
878 878
          * @param array $cf The custom field array.
879 879
          * @since 1.6.6
880 880
          */
881
-        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
881
+        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}", $html, $location, $cf);
882 882
     }
883 883
 
884 884
     // If not html then we run the standard output.
885
-    if(empty($html)){
885
+    if (empty($html)) {
886 886
 
887 887
         if ($post->{$cf['htmlvar_name']}):
888 888
             $field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
@@ -910,16 +910,16 @@  discard block
 block discarded – undo
910 910
             }
911 911
 
912 912
 
913
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
914
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
915
-            $html .= '</span>' . $field_value . '</div>';
913
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
914
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
915
+            $html .= '</span>'.$field_value.'</div>';
916 916
         endif;
917 917
 
918 918
     }
919 919
 
920 920
     return $html;
921 921
 }
922
-add_filter('geodir_custom_field_output_select','geodir_cf_select',10,3);
922
+add_filter('geodir_custom_field_output_select', 'geodir_cf_select', 10, 3);
923 923
 
924 924
 
925 925
 /**
@@ -932,21 +932,21 @@  discard block
 block discarded – undo
932 932
  *
933 933
  * @return string The html to output for the custom field.
934 934
  */
935
-function geodir_cf_multiselect($html,$location,$cf,$p=''){
935
+function geodir_cf_multiselect($html, $location, $cf, $p = '') {
936 936
 
937 937
     // check we have the post value
938
-    if(is_int($p)){$post = geodir_get_post_info($p);}
939
-    else{ global $post;}
938
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
939
+    else { global $post; }
940 940
 
941
-    if(!is_array($cf) && $cf!=''){
941
+    if (!is_array($cf) && $cf != '') {
942 942
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
943
-        if(!$cf){return NULL;}
943
+        if (!$cf) {return NULL; }
944 944
     }
945 945
 
946 946
     $html_var = $cf['htmlvar_name'];
947 947
 
948 948
     // Check if there is a location specific filter.
949
-    if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
949
+    if (has_filter("geodir_custom_field_output_multiselect_loc_{$location}")) {
950 950
         /**
951 951
          * Filter the multiselect html by location.
952 952
          *
@@ -954,11 +954,11 @@  discard block
 block discarded – undo
954 954
          * @param array $cf The custom field array.
955 955
          * @since 1.6.6
956 956
          */
957
-        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
957
+        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}", $html, $cf);
958 958
     }
959 959
 
960 960
     // Check if there is a custom field specific filter.
961
-    if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
961
+    if (has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")) {
962 962
         /**
963 963
          * Filter the multiselect html by individual custom field.
964 964
          *
@@ -967,11 +967,11 @@  discard block
 block discarded – undo
967 967
          * @param array $cf The custom field array.
968 968
          * @since 1.6.6
969 969
          */
970
-        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
970
+        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}", $html, $location, $cf);
971 971
     }
972 972
 
973 973
     // Check if there is a custom field key specific filter.
974
-    if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
974
+    if (has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")) {
975 975
         /**
976 976
          * Filter the multiselect html by field type key.
977 977
          *
@@ -980,11 +980,11 @@  discard block
 block discarded – undo
980 980
          * @param array $cf The custom field array.
981 981
          * @since 1.6.6
982 982
          */
983
-        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
983
+        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}", $html, $location, $cf);
984 984
     }
985 985
 
986 986
     // If not html then we run the standard output.
987
-    if(empty($html)){
987
+    if (empty($html)) {
988 988
 
989 989
 
990 990
         if (!empty($post->{$cf['htmlvar_name']})):
@@ -1005,7 +1005,7 @@  discard block
 block discarded – undo
1005 1005
 
1006 1006
             $field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
1007 1007
 
1008
-            if(is_array($field_values)){
1008
+            if (is_array($field_values)) {
1009 1009
                 $field_values = array_map('trim', $field_values);
1010 1010
             }
1011 1011
 
@@ -1023,15 +1023,15 @@  discard block
 block discarded – undo
1023 1023
             }
1024 1024
 
1025 1025
 
1026
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
1027
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1026
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
1027
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
1028 1028
             $html .= '</span>';
1029 1029
 
1030 1030
             if (count($option_values) > 1) {
1031 1031
                 $html .= '<ul>';
1032 1032
 
1033 1033
                 foreach ($option_values as $val) {
1034
-                    $html .= '<li>' . $val . '</li>';
1034
+                    $html .= '<li>'.$val.'</li>';
1035 1035
                 }
1036 1036
 
1037 1037
                 $html .= '</ul>';
@@ -1046,7 +1046,7 @@  discard block
 block discarded – undo
1046 1046
 
1047 1047
     return $html;
1048 1048
 }
1049
-add_filter('geodir_custom_field_output_multiselect','geodir_cf_multiselect',10,3);
1049
+add_filter('geodir_custom_field_output_multiselect', 'geodir_cf_multiselect', 10, 3);
1050 1050
 
1051 1051
 
1052 1052
 /**
@@ -1059,21 +1059,21 @@  discard block
 block discarded – undo
1059 1059
  *
1060 1060
  * @return string The html to output for the custom field.
1061 1061
  */
1062
-function geodir_cf_email($html,$location,$cf,$p=''){
1062
+function geodir_cf_email($html, $location, $cf, $p = '') {
1063 1063
 
1064 1064
     // check we have the post value
1065
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1066
-    else{ global $post;}
1065
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
1066
+    else { global $post; }
1067 1067
 
1068
-    if(!is_array($cf) && $cf!=''){
1068
+    if (!is_array($cf) && $cf != '') {
1069 1069
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1070
-        if(!$cf){return NULL;}
1070
+        if (!$cf) {return NULL; }
1071 1071
     }
1072 1072
 
1073 1073
     $html_var = $cf['htmlvar_name'];
1074 1074
 
1075 1075
     // Check if there is a location specific filter.
1076
-    if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
1076
+    if (has_filter("geodir_custom_field_output_email_loc_{$location}")) {
1077 1077
         /**
1078 1078
          * Filter the email html by location.
1079 1079
          *
@@ -1081,11 +1081,11 @@  discard block
 block discarded – undo
1081 1081
          * @param array $cf The custom field array.
1082 1082
          * @since 1.6.6
1083 1083
          */
1084
-        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
1084
+        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}", $html, $cf);
1085 1085
     }
1086 1086
 
1087 1087
     // Check if there is a custom field specific filter.
1088
-    if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
1088
+    if (has_filter("geodir_custom_field_output_email_var_{$html_var}")) {
1089 1089
         /**
1090 1090
          * Filter the email html by individual custom field.
1091 1091
          *
@@ -1094,11 +1094,11 @@  discard block
 block discarded – undo
1094 1094
          * @param array $cf The custom field array.
1095 1095
          * @since 1.6.6
1096 1096
          */
1097
-        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
1097
+        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}", $html, $location, $cf);
1098 1098
     }
1099 1099
 
1100 1100
     // Check if there is a custom field key specific filter.
1101
-    if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
1101
+    if (has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")) {
1102 1102
         /**
1103 1103
          * Filter the email html by field type key.
1104 1104
          *
@@ -1107,18 +1107,18 @@  discard block
 block discarded – undo
1107 1107
          * @param array $cf The custom field array.
1108 1108
          * @since 1.6.6
1109 1109
          */
1110
-        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
1110
+        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}", $html, $location, $cf);
1111 1111
     }
1112 1112
 
1113 1113
     // If not html then we run the standard output.
1114
-    if(empty($html)){
1114
+    if (empty($html)) {
1115 1115
 
1116 1116
         global $preview;
1117 1117
         if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
1118 1118
             return ''; // Remove Send Enquiry | Send To Friend from listings page
1119 1119
         }
1120 1120
 
1121
-        $package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
1121
+        $package_info = (array) geodir_post_package_info(array(), $post, $post->post_type);
1122 1122
 
1123 1123
         if ($cf['htmlvar_name'] == 'geodir_email' && ((isset($package_info['sendtofriend']) && $package_info['sendtofriend']) || $post->{$cf['htmlvar_name']})) {
1124 1124
             global $send_to_friend;
@@ -1130,7 +1130,7 @@  discard block
 block discarded – undo
1130 1130
             if (!$preview) {
1131 1131
                 $b_send_inquiry = 'b_send_inquiry';
1132 1132
                 $b_sendtofriend = 'b_sendtofriend';
1133
-                $html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
1133
+                $html = '<input type="hidden" name="geodir_popup_post_id" value="'.$post->ID.'" /><div class="geodir_display_popup_forms"></div>';
1134 1134
             }
1135 1135
 
1136 1136
             $field_icon = geodir_field_icon_proccess($cf);
@@ -1143,26 +1143,26 @@  discard block
 block discarded – undo
1143 1143
                 $field_icon = '';
1144 1144
             }
1145 1145
 
1146
-            $html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
1146
+            $html .= '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'"><span class="geodir-i-email" style="'.$field_icon.'">'.$field_icon_af;
1147 1147
             $seperator = '';
1148 1148
             if ($post->{$cf['htmlvar_name']}) {
1149
-                $html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
1149
+                $html .= '<a href="javascript:void(0);" class="'.$b_send_inquiry.'" >'.SEND_INQUIRY.'</a>';
1150 1150
                 $seperator = ' | ';
1151 1151
             }
1152 1152
 
1153 1153
             if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
1154
-                $html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
1154
+                $html .= $seperator.'<a href="javascript:void(0);" class="'.$b_sendtofriend.'">'.SEND_TO_FRIEND.'</a>';
1155 1155
             }
1156 1156
 
1157 1157
             $html .= '</span></div>';
1158 1158
 
1159 1159
 
1160 1160
             if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
1161
-                $html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
1161
+                $html .= '<p class="sucess_msg">'.SEND_INQUIRY_SUCCESS.'</p>';
1162 1162
             } elseif (isset($_REQUEST['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {
1163
-                $html .= '<p class="sucess_msg">' . SEND_FRIEND_SUCCESS . '</p>';
1163
+                $html .= '<p class="sucess_msg">'.SEND_FRIEND_SUCCESS.'</p>';
1164 1164
             } elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
1165
-                $html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
1165
+                $html .= '<p class="error_msg_fix">'.WRONG_CAPTCH_MSG.'</p>';
1166 1166
             }
1167 1167
 
1168 1168
             /*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
@@ -1182,11 +1182,11 @@  discard block
 block discarded – undo
1182 1182
                 }
1183 1183
 
1184 1184
 
1185
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
1186
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1185
+                $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-email" style="'.$field_icon.'">'.$field_icon_af;
1186
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
1187 1187
                 $html .= '</span><span class="geodir-email-address-output">';
1188 1188
                 $email = $post->{$cf['htmlvar_name']} ;
1189
-                if($e_split = explode('@',$email)){
1189
+                if ($e_split = explode('@', $email)) {
1190 1190
                     /**
1191 1191
                      * Filter email custom field name output.
1192 1192
                      *
@@ -1195,10 +1195,10 @@  discard block
 block discarded – undo
1195 1195
                      * @param string $email The email string being output.
1196 1196
                      * @param array $cf Custom field variables array.
1197 1197
                      */
1198
-                    $email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
1199
-                    $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
1200
-                }else{
1201
-                    $html .=  $email;
1198
+                    $email_name = apply_filters('geodir_email_field_name_output', $email, $cf);
1199
+                    $html .= "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
1200
+                } else {
1201
+                    $html .= $email;
1202 1202
                 }
1203 1203
                 $html .= '</span></div>';
1204 1204
             }
@@ -1209,7 +1209,7 @@  discard block
 block discarded – undo
1209 1209
 
1210 1210
     return $html;
1211 1211
 }
1212
-add_filter('geodir_custom_field_output_email','geodir_cf_email',10,3);
1212
+add_filter('geodir_custom_field_output_email', 'geodir_cf_email', 10, 3);
1213 1213
 
1214 1214
 
1215 1215
 /**
@@ -1222,21 +1222,21 @@  discard block
 block discarded – undo
1222 1222
  *
1223 1223
  * @return string The html to output for the custom field.
1224 1224
  */
1225
-function geodir_cf_file($html,$location,$cf,$p=''){
1225
+function geodir_cf_file($html, $location, $cf, $p = '') {
1226 1226
 
1227 1227
     // check we have the post value
1228
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1229
-    else{ global $post;}
1228
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
1229
+    else { global $post; }
1230 1230
 
1231
-    if(!is_array($cf) && $cf!=''){
1231
+    if (!is_array($cf) && $cf != '') {
1232 1232
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1233
-        if(!$cf){return NULL;}
1233
+        if (!$cf) {return NULL; }
1234 1234
     }
1235 1235
 
1236 1236
     $html_var = $cf['htmlvar_name'];
1237 1237
 
1238 1238
     // Check if there is a location specific filter.
1239
-    if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
1239
+    if (has_filter("geodir_custom_field_output_file_loc_{$location}")) {
1240 1240
         /**
1241 1241
          * Filter the file html by location.
1242 1242
          *
@@ -1244,11 +1244,11 @@  discard block
 block discarded – undo
1244 1244
          * @param array $cf The custom field array.
1245 1245
          * @since 1.6.6
1246 1246
          */
1247
-        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
1247
+        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}", $html, $cf);
1248 1248
     }
1249 1249
 
1250 1250
     // Check if there is a custom field specific filter.
1251
-    if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
1251
+    if (has_filter("geodir_custom_field_output_file_var_{$html_var}")) {
1252 1252
         /**
1253 1253
          * Filter the file html by individual custom field.
1254 1254
          *
@@ -1257,11 +1257,11 @@  discard block
 block discarded – undo
1257 1257
          * @param array $cf The custom field array.
1258 1258
          * @since 1.6.6
1259 1259
          */
1260
-        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
1260
+        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}", $html, $location, $cf);
1261 1261
     }
1262 1262
 
1263 1263
     // Check if there is a custom field key specific filter.
1264
-    if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
1264
+    if (has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")) {
1265 1265
         /**
1266 1266
          * Filter the file html by field type key.
1267 1267
          *
@@ -1270,11 +1270,11 @@  discard block
 block discarded – undo
1270 1270
          * @param array $cf The custom field array.
1271 1271
          * @since 1.6.6
1272 1272
          */
1273
-        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
1273
+        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}", $html, $location, $cf);
1274 1274
     }
1275 1275
 
1276 1276
     // If not html then we run the standard output.
1277
-    if(empty($html)){
1277
+    if (empty($html)) {
1278 1278
 
1279 1279
         if (!empty($post->{$cf['htmlvar_name']})):
1280 1280
 
@@ -1282,7 +1282,7 @@  discard block
 block discarded – undo
1282 1282
             if (!empty($files)):
1283 1283
 
1284 1284
                 $extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
1285
-                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
1285
+                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';
1286 1286
 
1287 1287
                 $file_paths = '';
1288 1288
                 foreach ($files as $file) {
@@ -1319,9 +1319,9 @@  discard block
 block discarded – undo
1319 1319
                             //$file_paths .= '<img src="'.$file.'"  />';	
1320 1320
                             $file_paths .= '</div>';
1321 1321
                         } else {
1322
-                            $ext_path = '_' . $html_var . '_';
1322
+                            $ext_path = '_'.$html_var.'_';
1323 1323
                             $filename = explode($ext_path, $filename);
1324
-                            $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
1324
+                            $file_paths .= '<a href="'.$file.'" target="_blank">'.$filename[count($filename) - 1].'</a>';
1325 1325
                         }
1326 1326
                     }
1327 1327
                 }
@@ -1336,11 +1336,11 @@  discard block
 block discarded – undo
1336 1336
                     $field_icon = '';
1337 1337
                 }
1338 1338
 
1339
-                $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
1339
+                $html = '<div class="geodir_more_info  '.$cf['css_class'].' geodir-custom-file-box '.$cf['htmlvar_name'].'"><div class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
1340 1340
                 $html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
1341
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1341
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
1342 1342
                 $html .= '</span>';
1343
-                $html .= $file_paths . '</div></div>';
1343
+                $html .= $file_paths.'</div></div>';
1344 1344
 
1345 1345
             endif;
1346 1346
         endif;
@@ -1349,7 +1349,7 @@  discard block
 block discarded – undo
1349 1349
 
1350 1350
     return $html;
1351 1351
 }
1352
-add_filter('geodir_custom_field_output_file','geodir_cf_file',10,3);
1352
+add_filter('geodir_custom_field_output_file', 'geodir_cf_file', 10, 3);
1353 1353
 
1354 1354
 
1355 1355
 
@@ -1363,21 +1363,21 @@  discard block
 block discarded – undo
1363 1363
  *
1364 1364
  * @return string The html to output for the custom field.
1365 1365
  */
1366
-function geodir_cf_textarea($html,$location,$cf,$p=''){
1366
+function geodir_cf_textarea($html, $location, $cf, $p = '') {
1367 1367
 
1368 1368
     // check we have the post value
1369
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1370
-    else{ global $post;}
1369
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
1370
+    else { global $post; }
1371 1371
 
1372
-    if(!is_array($cf) && $cf!=''){
1372
+    if (!is_array($cf) && $cf != '') {
1373 1373
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1374
-        if(!$cf){return NULL;}
1374
+        if (!$cf) {return NULL; }
1375 1375
     }
1376 1376
 
1377 1377
     $html_var = $cf['htmlvar_name'];
1378 1378
 
1379 1379
     // Check if there is a location specific filter.
1380
-    if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
1380
+    if (has_filter("geodir_custom_field_output_textarea_loc_{$location}")) {
1381 1381
         /**
1382 1382
          * Filter the textarea html by location.
1383 1383
          *
@@ -1385,11 +1385,11 @@  discard block
 block discarded – undo
1385 1385
          * @param array $cf The custom field array.
1386 1386
          * @since 1.6.6
1387 1387
          */
1388
-        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
1388
+        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}", $html, $cf);
1389 1389
     }
1390 1390
 
1391 1391
     // Check if there is a custom field specific filter.
1392
-    if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
1392
+    if (has_filter("geodir_custom_field_output_textarea_var_{$html_var}")) {
1393 1393
         /**
1394 1394
          * Filter the textarea html by individual custom field.
1395 1395
          *
@@ -1398,11 +1398,11 @@  discard block
 block discarded – undo
1398 1398
          * @param array $cf The custom field array.
1399 1399
          * @since 1.6.6
1400 1400
          */
1401
-        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
1401
+        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}", $html, $location, $cf);
1402 1402
     }
1403 1403
 
1404 1404
     // Check if there is a custom field key specific filter.
1405
-    if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
1405
+    if (has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")) {
1406 1406
         /**
1407 1407
          * Filter the textarea html by field type key.
1408 1408
          *
@@ -1411,11 +1411,11 @@  discard block
 block discarded – undo
1411 1411
          * @param array $cf The custom field array.
1412 1412
          * @since 1.6.6
1413 1413
          */
1414
-        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
1414
+        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}", $html, $location, $cf);
1415 1415
     }
1416 1416
 
1417 1417
     // If not html then we run the standard output.
1418
-    if(empty($html)){
1418
+    if (empty($html)) {
1419 1419
 
1420 1420
         if (!empty($post->{$cf['htmlvar_name']})) {
1421 1421
 
@@ -1430,9 +1430,9 @@  discard block
 block discarded – undo
1430 1430
             }
1431 1431
 
1432 1432
 
1433
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
1434
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1435
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
1433
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;
1434
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
1435
+            $html .= '</span>'.wpautop($post->{$cf['htmlvar_name']}).'</div>';
1436 1436
 
1437 1437
         }
1438 1438
 
@@ -1440,7 +1440,7 @@  discard block
 block discarded – undo
1440 1440
 
1441 1441
     return $html;
1442 1442
 }
1443
-add_filter('geodir_custom_field_output_textarea','geodir_cf_textarea',10,3);
1443
+add_filter('geodir_custom_field_output_textarea', 'geodir_cf_textarea', 10, 3);
1444 1444
 
1445 1445
 
1446 1446
 
@@ -1454,21 +1454,21 @@  discard block
 block discarded – undo
1454 1454
  *
1455 1455
  * @return string The html to output for the custom field.
1456 1456
  */
1457
-function geodir_cf_html($html,$location,$cf,$p=''){
1457
+function geodir_cf_html($html, $location, $cf, $p = '') {
1458 1458
 
1459 1459
     // check we have the post value
1460
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1461
-    else{ global $post;}
1460
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
1461
+    else { global $post; }
1462 1462
 
1463
-    if(!is_array($cf) && $cf!=''){
1463
+    if (!is_array($cf) && $cf != '') {
1464 1464
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1465
-        if(!$cf){return NULL;}
1465
+        if (!$cf) {return NULL; }
1466 1466
     }
1467 1467
 
1468 1468
     $html_var = $cf['htmlvar_name'];
1469 1469
 
1470 1470
     // Check if there is a location specific filter.
1471
-    if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
1471
+    if (has_filter("geodir_custom_field_output_html_loc_{$location}")) {
1472 1472
         /**
1473 1473
          * Filter the html html by location.
1474 1474
          *
@@ -1476,11 +1476,11 @@  discard block
 block discarded – undo
1476 1476
          * @param array $cf The custom field array.
1477 1477
          * @since 1.6.6
1478 1478
          */
1479
-        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
1479
+        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}", $html, $cf);
1480 1480
     }
1481 1481
 
1482 1482
     // Check if there is a custom field specific filter.
1483
-    if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
1483
+    if (has_filter("geodir_custom_field_output_html_var_{$html_var}")) {
1484 1484
         /**
1485 1485
          * Filter the html html by individual custom field.
1486 1486
          *
@@ -1489,11 +1489,11 @@  discard block
 block discarded – undo
1489 1489
          * @param array $cf The custom field array.
1490 1490
          * @since 1.6.6
1491 1491
          */
1492
-        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
1492
+        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}", $html, $location, $cf);
1493 1493
     }
1494 1494
 
1495 1495
     // Check if there is a custom field key specific filter.
1496
-    if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
1496
+    if (has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")) {
1497 1497
         /**
1498 1498
          * Filter the html html by field type key.
1499 1499
          *
@@ -1502,11 +1502,11 @@  discard block
 block discarded – undo
1502 1502
          * @param array $cf The custom field array.
1503 1503
          * @since 1.6.6
1504 1504
          */
1505
-        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
1505
+        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}", $html, $location, $cf);
1506 1506
     }
1507 1507
 
1508 1508
     // If not html then we run the standard output.
1509
-    if(empty($html)){
1509
+    if (empty($html)) {
1510 1510
 
1511 1511
         if (!empty($post->{$cf['htmlvar_name']})) {
1512 1512
 
@@ -1520,9 +1520,9 @@  discard block
 block discarded – undo
1520 1520
                 $field_icon = '';
1521 1521
             }
1522 1522
 
1523
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
1524
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1525
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
1523
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;
1524
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
1525
+            $html .= '</span>'.wpautop($post->{$cf['htmlvar_name']}).'</div>';
1526 1526
 
1527 1527
         }
1528 1528
 
@@ -1530,7 +1530,7 @@  discard block
 block discarded – undo
1530 1530
 
1531 1531
     return $html;
1532 1532
 }
1533
-add_filter('geodir_custom_field_output_html','geodir_cf_html',10,3);
1533
+add_filter('geodir_custom_field_output_html', 'geodir_cf_html', 10, 3);
1534 1534
 
1535 1535
 
1536 1536
 
@@ -1544,21 +1544,21 @@  discard block
 block discarded – undo
1544 1544
  *
1545 1545
  * @return string The html to output for the custom field.
1546 1546
  */
1547
-function geodir_cf_taxonomy($html,$location,$cf,$p=''){
1547
+function geodir_cf_taxonomy($html, $location, $cf, $p = '') {
1548 1548
 
1549 1549
     // check we have the post value
1550
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1551
-    else{ global $post;}
1550
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
1551
+    else { global $post; }
1552 1552
 
1553
-    if(!is_array($cf) && $cf!=''){
1553
+    if (!is_array($cf) && $cf != '') {
1554 1554
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1555
-        if(!$cf){return NULL;}
1555
+        if (!$cf) {return NULL; }
1556 1556
     }
1557 1557
 
1558 1558
     $html_var = $cf['htmlvar_name'];
1559 1559
 
1560 1560
     // Check if there is a location specific filter.
1561
-    if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
1561
+    if (has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")) {
1562 1562
         /**
1563 1563
          * Filter the taxonomy html by location.
1564 1564
          *
@@ -1566,11 +1566,11 @@  discard block
 block discarded – undo
1566 1566
          * @param array $cf The custom field array.
1567 1567
          * @since 1.6.6
1568 1568
          */
1569
-        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
1569
+        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}", $html, $cf);
1570 1570
     }
1571 1571
 
1572 1572
     // Check if there is a custom field specific filter.
1573
-    if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
1573
+    if (has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")) {
1574 1574
         /**
1575 1575
          * Filter the taxonomy html by individual custom field.
1576 1576
          *
@@ -1579,11 +1579,11 @@  discard block
 block discarded – undo
1579 1579
          * @param array $cf The custom field array.
1580 1580
          * @since 1.6.6
1581 1581
          */
1582
-        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
1582
+        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}", $html, $location, $cf);
1583 1583
     }
1584 1584
 
1585 1585
     // Check if there is a custom field key specific filter.
1586
-    if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
1586
+    if (has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")) {
1587 1587
         /**
1588 1588
          * Filter the taxonomy html by field type key.
1589 1589
          *
@@ -1592,14 +1592,14 @@  discard block
 block discarded – undo
1592 1592
          * @param array $cf The custom field array.
1593 1593
          * @since 1.6.6
1594 1594
          */
1595
-        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
1595
+        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}", $html, $location, $cf);
1596 1596
     }
1597 1597
 
1598 1598
     // If not html then we run the standard output.
1599
-    if(empty($html)){
1599
+    if (empty($html)) {
1600 1600
 
1601
-        if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
1602
-            $post_taxonomy = $post->post_type . 'category';
1601
+        if ($html_var == $post->post_type.'category' && !empty($post->{$html_var})) {
1602
+            $post_taxonomy = $post->post_type.'category';
1603 1603
             $field_value = $post->{$html_var};
1604 1604
             $links = array();
1605 1605
             $terms = array();
@@ -1617,7 +1617,7 @@  discard block
 block discarded – undo
1617 1617
                     if ($term != '') {
1618 1618
                         $term = get_term_by('id', $term, $html_var);
1619 1619
                         if (is_object($term)) {
1620
-                            $links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
1620
+                            $links[] = "<a href='".esc_attr(get_term_link($term, $post_taxonomy))."'>".$term->name."</a>";
1621 1621
                             $terms[] = $term;
1622 1622
                         }
1623 1623
                     }
@@ -1631,7 +1631,7 @@  discard block
 block discarded – undo
1631 1631
                     $terms = $termsOrdered;
1632 1632
                 }
1633 1633
             }
1634
-            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
1634
+            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object) $terms) : '';
1635 1635
 
1636 1636
             if ($html_value != '') {
1637 1637
                 $field_icon = geodir_field_icon_proccess($cf);
@@ -1644,9 +1644,9 @@  discard block
 block discarded – undo
1644 1644
                     $field_icon = '';
1645 1645
                 }
1646 1646
 
1647
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
1648
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1649
-                $html .= '</span> ' . $html_value . '</div>';
1647
+                $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$html_var.'" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="'.$field_icon.'">'.$field_icon_af;
1648
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
1649
+                $html .= '</span> '.$html_value.'</div>';
1650 1650
             }
1651 1651
         }
1652 1652
 
@@ -1654,7 +1654,7 @@  discard block
 block discarded – undo
1654 1654
 
1655 1655
     return $html;
1656 1656
 }
1657
-add_filter('geodir_custom_field_output_taxonomy','geodir_cf_taxonomy',10,3);
1657
+add_filter('geodir_custom_field_output_taxonomy', 'geodir_cf_taxonomy', 10, 3);
1658 1658
 
1659 1659
 
1660 1660
 /**
@@ -1667,21 +1667,21 @@  discard block
 block discarded – undo
1667 1667
  *
1668 1668
  * @return string The html to output for the custom field.
1669 1669
  */
1670
-function geodir_cf_address($html,$location,$cf,$p=''){
1670
+function geodir_cf_address($html, $location, $cf, $p = '') {
1671 1671
 
1672 1672
     // check we have the post value
1673
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1674
-    else{ global $post;}
1673
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
1674
+    else { global $post; }
1675 1675
 
1676
-    if(!is_array($cf) && $cf!=''){
1676
+    if (!is_array($cf) && $cf != '') {
1677 1677
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1678
-        if(!$cf){return NULL;}
1678
+        if (!$cf) {return NULL; }
1679 1679
     }
1680 1680
 
1681 1681
     $html_var = $cf['htmlvar_name'];
1682 1682
 
1683 1683
     // Check if there is a location specific filter.
1684
-    if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
1684
+    if (has_filter("geodir_custom_field_output_address_loc_{$location}")) {
1685 1685
         /**
1686 1686
          * Filter the address html by location.
1687 1687
          *
@@ -1689,11 +1689,11 @@  discard block
 block discarded – undo
1689 1689
          * @param array $cf The custom field array.
1690 1690
          * @since 1.6.6
1691 1691
          */
1692
-        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
1692
+        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}", $html, $cf);
1693 1693
     }
1694 1694
 
1695 1695
     // Check if there is a custom field specific filter.
1696
-    if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
1696
+    if (has_filter("geodir_custom_field_output_address_var_{$html_var}")) {
1697 1697
         /**
1698 1698
          * Filter the address html by individual custom field.
1699 1699
          *
@@ -1702,11 +1702,11 @@  discard block
 block discarded – undo
1702 1702
          * @param array $cf The custom field array.
1703 1703
          * @since 1.6.6
1704 1704
          */
1705
-        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
1705
+        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}", $html, $location, $cf);
1706 1706
     }
1707 1707
 
1708 1708
     // Check if there is a custom field key specific filter.
1709
-    if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
1709
+    if (has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")) {
1710 1710
         /**
1711 1711
          * Filter the address html by field type key.
1712 1712
          *
@@ -1715,14 +1715,14 @@  discard block
 block discarded – undo
1715 1715
          * @param array $cf The custom field array.
1716 1716
          * @since 1.6.6
1717 1717
          */
1718
-        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
1718
+        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}", $html, $location, $cf);
1719 1719
     }
1720 1720
 
1721 1721
     // If not html then we run the standard output.
1722
-    if(empty($html)){
1722
+    if (empty($html)) {
1723 1723
 
1724 1724
         global $preview;
1725
-        $html_var = $cf['htmlvar_name'] . '_address';
1725
+        $html_var = $cf['htmlvar_name'].'_address';
1726 1726
 
1727 1727
         if ($cf['extra_fields']) {
1728 1728
 
@@ -1785,10 +1785,10 @@  discard block
 block discarded – undo
1785 1785
 
1786 1786
         if ($post->{$html_var}) {
1787 1787
 
1788
-            $field_icon = geodir_field_icon_proccess( $cf );
1789
-            if ( strpos( $field_icon, 'http' ) !== false ) {
1788
+            $field_icon = geodir_field_icon_proccess($cf);
1789
+            if (strpos($field_icon, 'http') !== false) {
1790 1790
                 $field_icon_af = '';
1791
-            } elseif ( $field_icon == '' ) {
1791
+            } elseif ($field_icon == '') {
1792 1792
                 $field_icon_af = '<i class="fa fa-home"></i>';
1793 1793
             } else {
1794 1794
                 $field_icon_af = $field_icon;
@@ -1797,25 +1797,25 @@  discard block
 block discarded – undo
1797 1797
             
1798 1798
 
1799 1799
 
1800
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
1801
-            $html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
1802
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
1800
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$html_var.'" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
1801
+            $html .= '<span class="geodir-i-location" style="'.$field_icon.'">'.$field_icon_af;
1802
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
1803 1803
             $html .= '</span>';
1804 1804
 
1805
-            if ( isset($post->post_address) ) {
1806
-                $html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';
1805
+            if (isset($post->post_address)) {
1806
+                $html .= '<span itemprop="streetAddress">'.$post->post_address.'</span><br>';
1807 1807
             }
1808
-            if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
1809
-                $html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';
1808
+            if ($show_city_in_address && isset($post->post_city) && $post->post_city) {
1809
+                $html .= '<span itemprop="addressLocality">'.$post->post_city.'</span><br>';
1810 1810
             }
1811
-            if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
1812
-                $html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';
1811
+            if ($show_region_in_address && isset($post->post_region) && $post->post_region) {
1812
+                $html .= '<span itemprop="addressRegion">'.$post->post_region.'</span><br>';
1813 1813
             }
1814
-            if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
1815
-                $html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';
1814
+            if ($show_zip_in_address && isset($post->post_zip) && $post->post_zip) {
1815
+                $html .= '<span itemprop="postalCode">'.$post->post_zip.'</span><br>';
1816 1816
             }
1817
-            if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
1818
-                $html .= '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span><br>';
1817
+            if ($show_country_in_address && isset($post->post_country) && $post->post_country) {
1818
+                $html .= '<span itemprop="addressCountry">'.__($post->post_country, 'geodirectory').'</span><br>';
1819 1819
             }
1820 1820
             $html .= '</div>';
1821 1821
 
@@ -1826,4 +1826,4 @@  discard block
 block discarded – undo
1826 1826
 
1827 1827
     return $html;
1828 1828
 }
1829
-add_filter('geodir_custom_field_output_address','geodir_cf_address',10,3);
1830 1829
\ No newline at end of file
1830
+add_filter('geodir_custom_field_output_address', 'geodir_cf_address', 10, 3);
1831 1831
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +25 added lines, -38 removed lines patch added patch discarded remove patch
@@ -22,8 +22,7 @@  discard block
 block discarded – undo
22 22
 function geodir_cf_checkbox($html,$location,$cf,$p=''){
23 23
 
24 24
     // check we have the post value
25
-    if(is_int($p)){$post = geodir_get_post_info($p);}
26
-    else{ global $post;}
25
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
27 26
 
28 27
     if(!is_array($cf) && $cf!=''){
29 28
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -77,8 +76,10 @@  discard block
 block discarded – undo
77 76
 
78 77
             if ( $post->{$html_var} == '1' ):
79 78
                 $html_val = __( 'Yes', 'geodirectory' );
80
-            else:
79
+            else {
80
+            	:
81 81
                 $html_val = __( 'No', 'geodirectory' );
82
+            }
82 83
             endif;
83 84
 
84 85
             $field_icon = geodir_field_icon_proccess($cf);
@@ -116,8 +117,7 @@  discard block
 block discarded – undo
116 117
 function geodir_cf_fieldset($html,$location,$cf,$p=''){
117 118
 
118 119
     // check we have the post value
119
-    if(is_int($p)){$post = geodir_get_post_info($p);}
120
-    else{ global $post;}
120
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
121 121
 
122 122
     if(!is_array($cf) && $cf!=''){
123 123
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -197,8 +197,7 @@  discard block
 block discarded – undo
197 197
 function geodir_cf_url($html,$location,$cf,$p=''){
198 198
 
199 199
     // check we have the post value
200
-    if(is_int($p)){$post = geodir_get_post_info($p);}
201
-    else{ global $post;}
200
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
202 201
 
203 202
     if(!is_array($cf) && $cf!=''){
204 203
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -313,8 +312,7 @@  discard block
 block discarded – undo
313 312
 function geodir_cf_phone($html,$location,$cf,$p=''){
314 313
 
315 314
     // check we have the post value
316
-    if(is_int($p)){$post = geodir_get_post_info($p);}
317
-    else{ global $post;}
315
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
318 316
 
319 317
     if(!is_array($cf) && $cf!=''){
320 318
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -403,8 +401,7 @@  discard block
 block discarded – undo
403 401
 function geodir_cf_time($html,$location,$cf,$p=''){
404 402
 
405 403
     // check we have the post value
406
-    if(is_int($p)){$post = geodir_get_post_info($p);}
407
-    else{ global $post;}
404
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
408 405
 
409 406
     if(!is_array($cf) && $cf!=''){
410 407
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -457,9 +454,10 @@  discard block
 block discarded – undo
457 454
         if ($post->{$cf['htmlvar_name']}):
458 455
 
459 456
             $value = '';
460
-            if ($post->{$cf['htmlvar_name']} != '')
461
-                //$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
457
+            if ($post->{$cf['htmlvar_name']} != '') {
458
+                            //$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
462 459
                 $value = date(get_option('time_format'), strtotime($post->{$cf['htmlvar_name']}));
460
+            }
463 461
 
464 462
             $field_icon = geodir_field_icon_proccess($cf);
465 463
             if (strpos($field_icon, 'http') !== false) {
@@ -498,8 +496,7 @@  discard block
 block discarded – undo
498 496
 function geodir_cf_datepicker($html,$location,$cf,$p=''){
499 497
     global $preview;
500 498
     // check we have the post value
501
-    if(is_int($p)){$post = geodir_get_post_info($p);}
502
-    else{ global $post;}
499
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
503 500
 
504 501
     if(!is_array($cf) && $cf!=''){
505 502
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -566,7 +563,7 @@  discard block
 block discarded – undo
566 563
                 $date_format = str_replace($search, $replace, $date_format);
567 564
 
568 565
                 $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
569
-            }else{
566
+            } else{
570 567
                 $post_htmlvar_value = $post->{$cf['htmlvar_name']};
571 568
             }
572 569
 
@@ -575,7 +572,7 @@  discard block
 block discarded – undo
575 572
                 $value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
576 573
                 //$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
577 574
                 //$value = date_i18n($date_format, strtotime($post_htmlvar_value));
578
-            }else{
575
+            } else{
579 576
                 return '';
580 577
             }
581 578
 
@@ -618,8 +615,7 @@  discard block
 block discarded – undo
618 615
 function geodir_cf_text($html,$location,$cf,$p=''){
619 616
 
620 617
     // check we have the post value
621
-    if(is_int($p)){$post = geodir_get_post_info($p);}
622
-    else{ global $post;}
618
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
623 619
 
624 620
     if(!is_array($cf) && $cf!=''){
625 621
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -725,8 +721,7 @@  discard block
 block discarded – undo
725 721
 function geodir_cf_radio($html,$location,$cf,$p=''){
726 722
 
727 723
     // check we have the post value
728
-    if(is_int($p)){$post = geodir_get_post_info($p);}
729
-    else{ global $post;}
724
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
730 725
 
731 726
     if(!is_array($cf) && $cf!=''){
732 727
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -833,8 +828,7 @@  discard block
 block discarded – undo
833 828
 function geodir_cf_select($html,$location,$cf,$p=''){
834 829
 
835 830
     // check we have the post value
836
-    if(is_int($p)){$post = geodir_get_post_info($p);}
837
-    else{ global $post;}
831
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
838 832
 
839 833
     if(!is_array($cf) && $cf!=''){
840 834
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -935,8 +929,7 @@  discard block
 block discarded – undo
935 929
 function geodir_cf_multiselect($html,$location,$cf,$p=''){
936 930
 
937 931
     // check we have the post value
938
-    if(is_int($p)){$post = geodir_get_post_info($p);}
939
-    else{ global $post;}
932
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
940 933
 
941 934
     if(!is_array($cf) && $cf!=''){
942 935
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1062,8 +1055,7 @@  discard block
 block discarded – undo
1062 1055
 function geodir_cf_email($html,$location,$cf,$p=''){
1063 1056
 
1064 1057
     // check we have the post value
1065
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1066
-    else{ global $post;}
1058
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
1067 1059
 
1068 1060
     if(!is_array($cf) && $cf!=''){
1069 1061
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1197,7 +1189,7 @@  discard block
 block discarded – undo
1197 1189
                      */
1198 1190
                     $email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
1199 1191
                     $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
1200
-                }else{
1192
+                } else{
1201 1193
                     $html .=  $email;
1202 1194
                 }
1203 1195
                 $html .= '</span></div>';
@@ -1225,8 +1217,7 @@  discard block
 block discarded – undo
1225 1217
 function geodir_cf_file($html,$location,$cf,$p=''){
1226 1218
 
1227 1219
     // check we have the post value
1228
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1229
-    else{ global $post;}
1220
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
1230 1221
 
1231 1222
     if(!is_array($cf) && $cf!=''){
1232 1223
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1366,8 +1357,7 @@  discard block
 block discarded – undo
1366 1357
 function geodir_cf_textarea($html,$location,$cf,$p=''){
1367 1358
 
1368 1359
     // check we have the post value
1369
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1370
-    else{ global $post;}
1360
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
1371 1361
 
1372 1362
     if(!is_array($cf) && $cf!=''){
1373 1363
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1457,8 +1447,7 @@  discard block
 block discarded – undo
1457 1447
 function geodir_cf_html($html,$location,$cf,$p=''){
1458 1448
 
1459 1449
     // check we have the post value
1460
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1461
-    else{ global $post;}
1450
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
1462 1451
 
1463 1452
     if(!is_array($cf) && $cf!=''){
1464 1453
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1547,8 +1536,7 @@  discard block
 block discarded – undo
1547 1536
 function geodir_cf_taxonomy($html,$location,$cf,$p=''){
1548 1537
 
1549 1538
     // check we have the post value
1550
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1551
-    else{ global $post;}
1539
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
1552 1540
 
1553 1541
     if(!is_array($cf) && $cf!=''){
1554 1542
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1670,8 +1658,7 @@  discard block
 block discarded – undo
1670 1658
 function geodir_cf_address($html,$location,$cf,$p=''){
1671 1659
 
1672 1660
     // check we have the post value
1673
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1674
-    else{ global $post;}
1661
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
1675 1662
 
1676 1663
     if(!is_array($cf) && $cf!=''){
1677 1664
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
Please login to merge, or discard this patch.
Indentation   +1540 added lines, -1540 removed lines patch added patch discarded remove patch
@@ -21,84 +21,84 @@  discard block
 block discarded – undo
21 21
  */
22 22
 function geodir_cf_checkbox($html,$location,$cf,$p=''){
23 23
 
24
-    // check we have the post value
25
-    if(is_int($p)){$post = geodir_get_post_info($p);}
26
-    else{ global $post;}
27
-
28
-    if(!is_array($cf) && $cf!=''){
29
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
30
-        if(!$cf){return NULL;}
31
-    }
32
-
33
-    $html_var = $cf['htmlvar_name'];
34
-
35
-    // Check if there is a location specific filter.
36
-    if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
37
-        /**
38
-         * Filter the checkbox html by location.
39
-         *
40
-         * @param string $html The html to filter.
41
-         * @param array $cf The custom field array.
42
-         * @since 1.6.6
43
-         */
44
-        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
45
-    }
46
-
47
-    // Check if there is a custom field specific filter.
48
-    if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
49
-        /**
50
-         * Filter the checkbox html by individual custom field.
51
-         *
52
-         * @param string $html The html to filter.
53
-         * @param string $location The location to output the html.
54
-         * @param array $cf The custom field array.
55
-         * @since 1.6.6
56
-         */
57
-        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
58
-    }
59
-
60
-    // Check if there is a custom field key specific filter.
61
-    if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
62
-        /**
63
-         * Filter the checkbox html by field type key.
64
-         *
65
-         * @param string $html The html to filter.
66
-         * @param string $location The location to output the html.
67
-         * @param array $cf The custom field array.
68
-         * @since 1.6.6
69
-         */
70
-        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
71
-    }
72
-
73
-    // If not html then we run the standard output.
74
-    if(empty($html)){
75
-
76
-        if ( (int) $post->{$html_var} == 1 ):
77
-
78
-            if ( $post->{$html_var} == '1' ):
79
-                $html_val = __( 'Yes', 'geodirectory' );
80
-            else:
81
-                $html_val = __( 'No', 'geodirectory' );
82
-            endif;
83
-
84
-            $field_icon = geodir_field_icon_proccess($cf);
85
-            if (strpos($field_icon, 'http') !== false) {
86
-                $field_icon_af = '';
87
-            } elseif ($field_icon == '') {
88
-                $field_icon_af = '';
89
-            } else {
90
-                $field_icon_af = $field_icon;
91
-                $field_icon = '';
92
-            }
93
-
94
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
95
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
96
-            $html .= '</span>' . $html_val . '</div>';
97
-        endif;
98
-
99
-    }
100
-
101
-    return $html;
24
+	// check we have the post value
25
+	if(is_int($p)){$post = geodir_get_post_info($p);}
26
+	else{ global $post;}
27
+
28
+	if(!is_array($cf) && $cf!=''){
29
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
30
+		if(!$cf){return NULL;}
31
+	}
32
+
33
+	$html_var = $cf['htmlvar_name'];
34
+
35
+	// Check if there is a location specific filter.
36
+	if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
37
+		/**
38
+		 * Filter the checkbox html by location.
39
+		 *
40
+		 * @param string $html The html to filter.
41
+		 * @param array $cf The custom field array.
42
+		 * @since 1.6.6
43
+		 */
44
+		$html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
45
+	}
46
+
47
+	// Check if there is a custom field specific filter.
48
+	if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
49
+		/**
50
+		 * Filter the checkbox html by individual custom field.
51
+		 *
52
+		 * @param string $html The html to filter.
53
+		 * @param string $location The location to output the html.
54
+		 * @param array $cf The custom field array.
55
+		 * @since 1.6.6
56
+		 */
57
+		$html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
58
+	}
59
+
60
+	// Check if there is a custom field key specific filter.
61
+	if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
62
+		/**
63
+		 * Filter the checkbox html by field type key.
64
+		 *
65
+		 * @param string $html The html to filter.
66
+		 * @param string $location The location to output the html.
67
+		 * @param array $cf The custom field array.
68
+		 * @since 1.6.6
69
+		 */
70
+		$html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
71
+	}
72
+
73
+	// If not html then we run the standard output.
74
+	if(empty($html)){
75
+
76
+		if ( (int) $post->{$html_var} == 1 ):
77
+
78
+			if ( $post->{$html_var} == '1' ):
79
+				$html_val = __( 'Yes', 'geodirectory' );
80
+			else:
81
+				$html_val = __( 'No', 'geodirectory' );
82
+			endif;
83
+
84
+			$field_icon = geodir_field_icon_proccess($cf);
85
+			if (strpos($field_icon, 'http') !== false) {
86
+				$field_icon_af = '';
87
+			} elseif ($field_icon == '') {
88
+				$field_icon_af = '';
89
+			} else {
90
+				$field_icon_af = $field_icon;
91
+				$field_icon = '';
92
+			}
93
+
94
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
95
+			$html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
96
+			$html .= '</span>' . $html_val . '</div>';
97
+		endif;
98
+
99
+	}
100
+
101
+	return $html;
102 102
 }
103 103
 add_filter('geodir_custom_field_output_checkbox','geodir_cf_checkbox',10,3);
104 104
 
@@ -115,71 +115,71 @@  discard block
 block discarded – undo
115 115
  */
116 116
 function geodir_cf_fieldset($html,$location,$cf,$p=''){
117 117
 
118
-    // check we have the post value
119
-    if(is_int($p)){$post = geodir_get_post_info($p);}
120
-    else{ global $post;}
121
-
122
-    if(!is_array($cf) && $cf!=''){
123
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
124
-        if(!$cf){return NULL;}
125
-    }
126
-
127
-    $html_var = $cf['htmlvar_name'];
128
-
129
-    // Check if there is a location specific filter.
130
-    if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
131
-        /**
132
-         * Filter the fieldset html by location.
133
-         *
134
-         * @param string $html The html to filter.
135
-         * @param array $cf The custom field array.
136
-         * @since 1.6.6
137
-         */
138
-        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
139
-    }
140
-
141
-    // Check if there is a custom field specific filter.
142
-    if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
143
-        /**
144
-         * Filter the fieldset html by individual custom field.
145
-         *
146
-         * @param string $html The html to filter.
147
-         * @param string $location The location to output the html.
148
-         * @param array $cf The custom field array.
149
-         * @since 1.6.6
150
-         */
151
-        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
152
-    }
153
-
154
-    // Check if there is a custom field key specific filter.
155
-    if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
156
-        /**
157
-         * Filter the fieldset html by field type key.
158
-         *
159
-         * @param string $html The html to filter.
160
-         * @param string $location The location to output the html.
161
-         * @param array $cf The custom field array.
162
-         * @since 1.6.6
163
-         */
164
-        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
165
-    }
166
-
167
-    // If not html then we run the standard output.
168
-    if(empty($html)){
169
-
170
-        global $field_set_start;
171
-        $fieldset_class = 'fieldset-'.sanitize_title_with_dashes($cf['site_title']);
172
-
173
-        if ($field_set_start == 1) {
174
-            $html = '';
175
-        } else {
176
-            $html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
177
-            //$field_set_start = 1;
178
-        }
179
-
180
-    }
181
-
182
-    return $html;
118
+	// check we have the post value
119
+	if(is_int($p)){$post = geodir_get_post_info($p);}
120
+	else{ global $post;}
121
+
122
+	if(!is_array($cf) && $cf!=''){
123
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
124
+		if(!$cf){return NULL;}
125
+	}
126
+
127
+	$html_var = $cf['htmlvar_name'];
128
+
129
+	// Check if there is a location specific filter.
130
+	if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
131
+		/**
132
+		 * Filter the fieldset html by location.
133
+		 *
134
+		 * @param string $html The html to filter.
135
+		 * @param array $cf The custom field array.
136
+		 * @since 1.6.6
137
+		 */
138
+		$html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
139
+	}
140
+
141
+	// Check if there is a custom field specific filter.
142
+	if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
143
+		/**
144
+		 * Filter the fieldset html by individual custom field.
145
+		 *
146
+		 * @param string $html The html to filter.
147
+		 * @param string $location The location to output the html.
148
+		 * @param array $cf The custom field array.
149
+		 * @since 1.6.6
150
+		 */
151
+		$html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
152
+	}
153
+
154
+	// Check if there is a custom field key specific filter.
155
+	if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
156
+		/**
157
+		 * Filter the fieldset html by field type key.
158
+		 *
159
+		 * @param string $html The html to filter.
160
+		 * @param string $location The location to output the html.
161
+		 * @param array $cf The custom field array.
162
+		 * @since 1.6.6
163
+		 */
164
+		$html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
165
+	}
166
+
167
+	// If not html then we run the standard output.
168
+	if(empty($html)){
169
+
170
+		global $field_set_start;
171
+		$fieldset_class = 'fieldset-'.sanitize_title_with_dashes($cf['site_title']);
172
+
173
+		if ($field_set_start == 1) {
174
+			$html = '';
175
+		} else {
176
+			$html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
177
+			//$field_set_start = 1;
178
+		}
179
+
180
+	}
181
+
182
+	return $html;
183 183
 }
184 184
 add_filter('geodir_custom_field_output_fieldset','geodir_cf_fieldset',10,3);
185 185
 
@@ -196,106 +196,106 @@  discard block
 block discarded – undo
196 196
  */
197 197
 function geodir_cf_url($html,$location,$cf,$p=''){
198 198
 
199
-    // check we have the post value
200
-    if(is_int($p)){$post = geodir_get_post_info($p);}
201
-    else{ global $post;}
202
-
203
-    if(!is_array($cf) && $cf!=''){
204
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
205
-        if(!$cf){return NULL;}
206
-    }
207
-
208
-    $html_var = $cf['htmlvar_name'];
209
-
210
-    // Check if there is a location specific filter.
211
-    if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
212
-        /**
213
-         * Filter the url html by location.
214
-         *
215
-         * @param string $html The html to filter.
216
-         * @param array $cf The custom field array.
217
-         * @since 1.6.6
218
-         */
219
-        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
220
-    }
221
-
222
-    // Check if there is a custom field specific filter.
223
-    if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
224
-        /**
225
-         * Filter the url html by individual custom field.
226
-         *
227
-         * @param string $html The html to filter.
228
-         * @param string $location The location to output the html.
229
-         * @param array $cf The custom field array.
230
-         * @since 1.6.6
231
-         */
232
-        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
233
-    }
234
-
235
-    // Check if there is a custom field key specific filter.
236
-    if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
237
-        /**
238
-         * Filter the url html by field type key.
239
-         *
240
-         * @param string $html The html to filter.
241
-         * @param string $location The location to output the html.
242
-         * @param array $cf The custom field array.
243
-         * @since 1.6.6
244
-         */
245
-        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
246
-    }
247
-
248
-    // If not html then we run the standard output.
249
-    if(empty($html)){
250
-
251
-        if ($post->{$cf['htmlvar_name']}):
252
-
253
-            $field_icon = geodir_field_icon_proccess($cf);
254
-            if (strpos($field_icon, 'http') !== false) {
255
-                $field_icon_af = '';
256
-            } elseif ($field_icon == '') {
257
-
258
-                if ($cf['name'] == 'geodir_facebook') {
259
-                    $field_icon_af = '<i class="fa fa-facebook-square"></i>';
260
-                } elseif ($cf['name'] == 'geodir_twitter') {
261
-                    $field_icon_af = '<i class="fa fa-twitter-square"></i>';
262
-                } else {
263
-                    $field_icon_af = '<i class="fa fa-link"></i>';
264
-                }
265
-
266
-            } else {
267
-                $field_icon_af = $field_icon;
268
-                $field_icon = '';
269
-            }
270
-
271
-            $a_url = geodir_parse_custom_field_url($post->{$cf['htmlvar_name']});
272
-
273
-
274
-            $website = !empty($a_url['url']) ? $a_url['url'] : '';
275
-            $title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
276
-            if(!empty($cf['default_value'])){$title = $cf['default_value'];}
277
-            $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
278
-
279
-
280
-
281
-            // all search engines that use the nofollow value exclude links that use it from their ranking calculation
282
-            $rel = strpos($website, get_site_url()) !== false ? '' : 'rel="nofollow"';
283
-            /**
284
-             * Filter custom field website name.
285
-             *
286
-             * @since 1.0.0
287
-             *
288
-             * @param string $title Website Title.
289
-             * @param string $website Website URL.
290
-             * @param int $post->ID Post ID.
291
-             */
292
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
293
-
294
-        endif;
295
-
296
-    }
297
-
298
-    return $html;
199
+	// check we have the post value
200
+	if(is_int($p)){$post = geodir_get_post_info($p);}
201
+	else{ global $post;}
202
+
203
+	if(!is_array($cf) && $cf!=''){
204
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
205
+		if(!$cf){return NULL;}
206
+	}
207
+
208
+	$html_var = $cf['htmlvar_name'];
209
+
210
+	// Check if there is a location specific filter.
211
+	if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
212
+		/**
213
+		 * Filter the url html by location.
214
+		 *
215
+		 * @param string $html The html to filter.
216
+		 * @param array $cf The custom field array.
217
+		 * @since 1.6.6
218
+		 */
219
+		$html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
220
+	}
221
+
222
+	// Check if there is a custom field specific filter.
223
+	if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
224
+		/**
225
+		 * Filter the url html by individual custom field.
226
+		 *
227
+		 * @param string $html The html to filter.
228
+		 * @param string $location The location to output the html.
229
+		 * @param array $cf The custom field array.
230
+		 * @since 1.6.6
231
+		 */
232
+		$html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
233
+	}
234
+
235
+	// Check if there is a custom field key specific filter.
236
+	if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
237
+		/**
238
+		 * Filter the url html by field type key.
239
+		 *
240
+		 * @param string $html The html to filter.
241
+		 * @param string $location The location to output the html.
242
+		 * @param array $cf The custom field array.
243
+		 * @since 1.6.6
244
+		 */
245
+		$html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
246
+	}
247
+
248
+	// If not html then we run the standard output.
249
+	if(empty($html)){
250
+
251
+		if ($post->{$cf['htmlvar_name']}):
252
+
253
+			$field_icon = geodir_field_icon_proccess($cf);
254
+			if (strpos($field_icon, 'http') !== false) {
255
+				$field_icon_af = '';
256
+			} elseif ($field_icon == '') {
257
+
258
+				if ($cf['name'] == 'geodir_facebook') {
259
+					$field_icon_af = '<i class="fa fa-facebook-square"></i>';
260
+				} elseif ($cf['name'] == 'geodir_twitter') {
261
+					$field_icon_af = '<i class="fa fa-twitter-square"></i>';
262
+				} else {
263
+					$field_icon_af = '<i class="fa fa-link"></i>';
264
+				}
265
+
266
+			} else {
267
+				$field_icon_af = $field_icon;
268
+				$field_icon = '';
269
+			}
270
+
271
+			$a_url = geodir_parse_custom_field_url($post->{$cf['htmlvar_name']});
272
+
273
+
274
+			$website = !empty($a_url['url']) ? $a_url['url'] : '';
275
+			$title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
276
+			if(!empty($cf['default_value'])){$title = $cf['default_value'];}
277
+			$title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
278
+
279
+
280
+
281
+			// all search engines that use the nofollow value exclude links that use it from their ranking calculation
282
+			$rel = strpos($website, get_site_url()) !== false ? '' : 'rel="nofollow"';
283
+			/**
284
+			 * Filter custom field website name.
285
+			 *
286
+			 * @since 1.0.0
287
+			 *
288
+			 * @param string $title Website Title.
289
+			 * @param string $website Website URL.
290
+			 * @param int $post->ID Post ID.
291
+			 */
292
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
293
+
294
+		endif;
295
+
296
+	}
297
+
298
+	return $html;
299 299
 }
300 300
 add_filter('geodir_custom_field_output_url','geodir_cf_url',10,3);
301 301
 
@@ -312,80 +312,80 @@  discard block
 block discarded – undo
312 312
  */
313 313
 function geodir_cf_phone($html,$location,$cf,$p=''){
314 314
 
315
-    // check we have the post value
316
-    if(is_int($p)){$post = geodir_get_post_info($p);}
317
-    else{ global $post;}
318
-
319
-    if(!is_array($cf) && $cf!=''){
320
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
321
-        if(!$cf){return NULL;}
322
-    }
323
-
324
-    $html_var = $cf['htmlvar_name'];
325
-
326
-    // Check if there is a location specific filter.
327
-    if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
328
-        /**
329
-         * Filter the phone html by location.
330
-         *
331
-         * @param string $html The html to filter.
332
-         * @param array $cf The custom field array.
333
-         * @since 1.6.6
334
-         */
335
-        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
336
-    }
337
-
338
-    // Check if there is a custom field specific filter.
339
-    if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
340
-        /**
341
-         * Filter the phone html by individual custom field.
342
-         *
343
-         * @param string $html The html to filter.
344
-         * @param string $location The location to output the html.
345
-         * @param array $cf The custom field array.
346
-         * @since 1.6.6
347
-         */
348
-        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
349
-    }
350
-
351
-    // Check if there is a custom field key specific filter.
352
-    if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
353
-        /**
354
-         * Filter the phone html by field type key.
355
-         *
356
-         * @param string $html The html to filter.
357
-         * @param string $location The location to output the html.
358
-         * @param array $cf The custom field array.
359
-         * @since 1.6.6
360
-         */
361
-        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
362
-    }
363
-
364
-    // If not html then we run the standard output.
365
-    if(empty($html)){
366
-
367
-        if ($post->{$cf['htmlvar_name']}):
368
-
369
-            $field_icon = geodir_field_icon_proccess($cf);
370
-            if (strpos($field_icon, 'http') !== false) {
371
-                $field_icon_af = '';
372
-            } elseif ($field_icon == '') {
373
-                $field_icon_af = '<i class="fa fa-phone"></i>';
374
-            } else {
375
-                $field_icon_af = $field_icon;
376
-                $field_icon = '';
377
-            }
378
-
379
-
380
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
381
-                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
382
-            $html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
383
-
384
-        endif;
385
-
386
-    }
387
-
388
-    return $html;
315
+	// check we have the post value
316
+	if(is_int($p)){$post = geodir_get_post_info($p);}
317
+	else{ global $post;}
318
+
319
+	if(!is_array($cf) && $cf!=''){
320
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
321
+		if(!$cf){return NULL;}
322
+	}
323
+
324
+	$html_var = $cf['htmlvar_name'];
325
+
326
+	// Check if there is a location specific filter.
327
+	if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
328
+		/**
329
+		 * Filter the phone html by location.
330
+		 *
331
+		 * @param string $html The html to filter.
332
+		 * @param array $cf The custom field array.
333
+		 * @since 1.6.6
334
+		 */
335
+		$html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
336
+	}
337
+
338
+	// Check if there is a custom field specific filter.
339
+	if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
340
+		/**
341
+		 * Filter the phone html by individual custom field.
342
+		 *
343
+		 * @param string $html The html to filter.
344
+		 * @param string $location The location to output the html.
345
+		 * @param array $cf The custom field array.
346
+		 * @since 1.6.6
347
+		 */
348
+		$html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
349
+	}
350
+
351
+	// Check if there is a custom field key specific filter.
352
+	if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
353
+		/**
354
+		 * Filter the phone html by field type key.
355
+		 *
356
+		 * @param string $html The html to filter.
357
+		 * @param string $location The location to output the html.
358
+		 * @param array $cf The custom field array.
359
+		 * @since 1.6.6
360
+		 */
361
+		$html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
362
+	}
363
+
364
+	// If not html then we run the standard output.
365
+	if(empty($html)){
366
+
367
+		if ($post->{$cf['htmlvar_name']}):
368
+
369
+			$field_icon = geodir_field_icon_proccess($cf);
370
+			if (strpos($field_icon, 'http') !== false) {
371
+				$field_icon_af = '';
372
+			} elseif ($field_icon == '') {
373
+				$field_icon_af = '<i class="fa fa-phone"></i>';
374
+			} else {
375
+				$field_icon_af = $field_icon;
376
+				$field_icon = '';
377
+			}
378
+
379
+
380
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
381
+					$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
382
+			$html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
383
+
384
+		endif;
385
+
386
+	}
387
+
388
+	return $html;
389 389
 }
390 390
 add_filter('geodir_custom_field_output_phone','geodir_cf_phone',10,3);
391 391
 
@@ -402,85 +402,85 @@  discard block
 block discarded – undo
402 402
  */
403 403
 function geodir_cf_time($html,$location,$cf,$p=''){
404 404
 
405
-    // check we have the post value
406
-    if(is_int($p)){$post = geodir_get_post_info($p);}
407
-    else{ global $post;}
408
-
409
-    if(!is_array($cf) && $cf!=''){
410
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
411
-        if(!$cf){return NULL;}
412
-    }
413
-
414
-    $html_var = $cf['htmlvar_name'];
415
-
416
-    // Check if there is a location specific filter.
417
-    if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
418
-        /**
419
-         * Filter the time html by location.
420
-         *
421
-         * @param string $html The html to filter.
422
-         * @param array $cf The custom field array.
423
-         * @since 1.6.6
424
-         */
425
-        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
426
-    }
427
-
428
-    // Check if there is a custom field specific filter.
429
-    if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
430
-        /**
431
-         * Filter the time html by individual custom field.
432
-         *
433
-         * @param string $html The html to filter.
434
-         * @param string $location The location to output the html.
435
-         * @param array $cf The custom field array.
436
-         * @since 1.6.6
437
-         */
438
-        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
439
-    }
440
-
441
-    // Check if there is a custom field key specific filter.
442
-    if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
443
-        /**
444
-         * Filter the time html by field type key.
445
-         *
446
-         * @param string $html The html to filter.
447
-         * @param string $location The location to output the html.
448
-         * @param array $cf The custom field array.
449
-         * @since 1.6.6
450
-         */
451
-        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
452
-    }
453
-
454
-    // If not html then we run the standard output.
455
-    if(empty($html)){
456
-
457
-        if ($post->{$cf['htmlvar_name']}):
458
-
459
-            $value = '';
460
-            if ($post->{$cf['htmlvar_name']} != '')
461
-                //$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
462
-                $value = date(get_option('time_format'), strtotime($post->{$cf['htmlvar_name']}));
463
-
464
-            $field_icon = geodir_field_icon_proccess($cf);
465
-            if (strpos($field_icon, 'http') !== false) {
466
-                $field_icon_af = '';
467
-            } elseif ($field_icon == '') {
468
-                $field_icon_af = '<i class="fa fa-clock-o"></i>';
469
-            } else {
470
-                $field_icon_af = $field_icon;
471
-                $field_icon = '';
472
-            }
473
-
474
-
475
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
476
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
477
-            $html .= '</span>' . $value . '</div>';
478
-
479
-        endif;
480
-
481
-    }
482
-
483
-    return $html;
405
+	// check we have the post value
406
+	if(is_int($p)){$post = geodir_get_post_info($p);}
407
+	else{ global $post;}
408
+
409
+	if(!is_array($cf) && $cf!=''){
410
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
411
+		if(!$cf){return NULL;}
412
+	}
413
+
414
+	$html_var = $cf['htmlvar_name'];
415
+
416
+	// Check if there is a location specific filter.
417
+	if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
418
+		/**
419
+		 * Filter the time html by location.
420
+		 *
421
+		 * @param string $html The html to filter.
422
+		 * @param array $cf The custom field array.
423
+		 * @since 1.6.6
424
+		 */
425
+		$html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
426
+	}
427
+
428
+	// Check if there is a custom field specific filter.
429
+	if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
430
+		/**
431
+		 * Filter the time html by individual custom field.
432
+		 *
433
+		 * @param string $html The html to filter.
434
+		 * @param string $location The location to output the html.
435
+		 * @param array $cf The custom field array.
436
+		 * @since 1.6.6
437
+		 */
438
+		$html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
439
+	}
440
+
441
+	// Check if there is a custom field key specific filter.
442
+	if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
443
+		/**
444
+		 * Filter the time html by field type key.
445
+		 *
446
+		 * @param string $html The html to filter.
447
+		 * @param string $location The location to output the html.
448
+		 * @param array $cf The custom field array.
449
+		 * @since 1.6.6
450
+		 */
451
+		$html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
452
+	}
453
+
454
+	// If not html then we run the standard output.
455
+	if(empty($html)){
456
+
457
+		if ($post->{$cf['htmlvar_name']}):
458
+
459
+			$value = '';
460
+			if ($post->{$cf['htmlvar_name']} != '')
461
+				//$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
462
+				$value = date(get_option('time_format'), strtotime($post->{$cf['htmlvar_name']}));
463
+
464
+			$field_icon = geodir_field_icon_proccess($cf);
465
+			if (strpos($field_icon, 'http') !== false) {
466
+				$field_icon_af = '';
467
+			} elseif ($field_icon == '') {
468
+				$field_icon_af = '<i class="fa fa-clock-o"></i>';
469
+			} else {
470
+				$field_icon_af = $field_icon;
471
+				$field_icon = '';
472
+			}
473
+
474
+
475
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
476
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
477
+			$html .= '</span>' . $value . '</div>';
478
+
479
+		endif;
480
+
481
+	}
482
+
483
+	return $html;
484 484
 }
485 485
 add_filter('geodir_custom_field_output_time','geodir_cf_time',10,3);
486 486
 
@@ -496,111 +496,111 @@  discard block
 block discarded – undo
496 496
  * @return string The html to output for the custom field.
497 497
  */
498 498
 function geodir_cf_datepicker($html,$location,$cf,$p=''){
499
-    global $preview;
500
-    // check we have the post value
501
-    if(is_int($p)){$post = geodir_get_post_info($p);}
502
-    else{ global $post;}
503
-
504
-    if(!is_array($cf) && $cf!=''){
505
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
506
-        if(!$cf){return NULL;}
507
-    }
508
-
509
-    $html_var = $cf['htmlvar_name'];
510
-
511
-    // Check if there is a location specific filter.
512
-    if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
513
-        /**
514
-         * Filter the datepicker html by location.
515
-         *
516
-         * @param string $html The html to filter.
517
-         * @param array $cf The custom field array.
518
-         * @since 1.6.6
519
-         */
520
-        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
521
-    }
522
-
523
-    // Check if there is a custom field specific filter.
524
-    if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
525
-        /**
526
-         * Filter the datepicker html by individual custom field.
527
-         *
528
-         * @param string $html The html to filter.
529
-         * @param string $location The location to output the html.
530
-         * @param array $cf The custom field array.
531
-         * @since 1.6.6
532
-         */
533
-        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
534
-    }
535
-
536
-    // Check if there is a custom field key specific filter.
537
-    if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
538
-        /**
539
-         * Filter the datepicker html by field type key.
540
-         *
541
-         * @param string $html The html to filter.
542
-         * @param string $location The location to output the html.
543
-         * @param array $cf The custom field array.
544
-         * @since 1.6.6
545
-         */
546
-        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
547
-    }
548
-
549
-    // If not html then we run the standard output.
550
-    if(empty($html)){
551
-
552
-        if ($post->{$cf['htmlvar_name']}):
553
-
554
-            $date_format = geodir_default_date_format();
555
-            if ($cf['extra_fields'] != '') {
556
-                $date_format = stripslashes_deep(unserialize($cf['extra_fields']));
557
-                $date_format = $date_format['date_format'];
558
-            }
559
-            // check if we need to change the format or not
560
-            $date_format_len = strlen(str_replace(' ', '', $date_format));
561
-            if($date_format_len>5){// if greater then 4 then it's the old style format.
562
-
563
-                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
564
-                $replace = array('d','j','l','m','n','F','Y');//PHP date format
565
-
566
-                $date_format = str_replace($search, $replace, $date_format);
567
-
568
-                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
569
-            }else{
570
-                $post_htmlvar_value = $post->{$cf['htmlvar_name']};
571
-            }
572
-
573
-            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
574
-                $date_format_from = $preview ? $date_format : 'Y-m-d';
575
-                $value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
576
-                //$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
577
-                //$value = date_i18n($date_format, strtotime($post_htmlvar_value));
578
-            }else{
579
-                return '';
580
-            }
581
-
582
-            $field_icon = geodir_field_icon_proccess($cf);
583
-
584
-            if (strpos($field_icon, 'http') !== false) {
585
-                $field_icon_af = '';
586
-            } elseif ($field_icon == '') {
587
-                $field_icon_af = '<i class="fa fa-calendar"></i>';
588
-            } else {
589
-                $field_icon_af = $field_icon;
590
-                $field_icon = '';
591
-            }
592
-
593
-
594
-
595
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
596
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
597
-            $html .= '</span>' . $value . '</div>';
598
-
599
-        endif;
600
-
601
-    }
602
-
603
-    return $html;
499
+	global $preview;
500
+	// check we have the post value
501
+	if(is_int($p)){$post = geodir_get_post_info($p);}
502
+	else{ global $post;}
503
+
504
+	if(!is_array($cf) && $cf!=''){
505
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
506
+		if(!$cf){return NULL;}
507
+	}
508
+
509
+	$html_var = $cf['htmlvar_name'];
510
+
511
+	// Check if there is a location specific filter.
512
+	if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
513
+		/**
514
+		 * Filter the datepicker html by location.
515
+		 *
516
+		 * @param string $html The html to filter.
517
+		 * @param array $cf The custom field array.
518
+		 * @since 1.6.6
519
+		 */
520
+		$html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
521
+	}
522
+
523
+	// Check if there is a custom field specific filter.
524
+	if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
525
+		/**
526
+		 * Filter the datepicker html by individual custom field.
527
+		 *
528
+		 * @param string $html The html to filter.
529
+		 * @param string $location The location to output the html.
530
+		 * @param array $cf The custom field array.
531
+		 * @since 1.6.6
532
+		 */
533
+		$html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
534
+	}
535
+
536
+	// Check if there is a custom field key specific filter.
537
+	if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
538
+		/**
539
+		 * Filter the datepicker html by field type key.
540
+		 *
541
+		 * @param string $html The html to filter.
542
+		 * @param string $location The location to output the html.
543
+		 * @param array $cf The custom field array.
544
+		 * @since 1.6.6
545
+		 */
546
+		$html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
547
+	}
548
+
549
+	// If not html then we run the standard output.
550
+	if(empty($html)){
551
+
552
+		if ($post->{$cf['htmlvar_name']}):
553
+
554
+			$date_format = geodir_default_date_format();
555
+			if ($cf['extra_fields'] != '') {
556
+				$date_format = stripslashes_deep(unserialize($cf['extra_fields']));
557
+				$date_format = $date_format['date_format'];
558
+			}
559
+			// check if we need to change the format or not
560
+			$date_format_len = strlen(str_replace(' ', '', $date_format));
561
+			if($date_format_len>5){// if greater then 4 then it's the old style format.
562
+
563
+				$search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
564
+				$replace = array('d','j','l','m','n','F','Y');//PHP date format
565
+
566
+				$date_format = str_replace($search, $replace, $date_format);
567
+
568
+				$post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
569
+			}else{
570
+				$post_htmlvar_value = $post->{$cf['htmlvar_name']};
571
+			}
572
+
573
+			if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
574
+				$date_format_from = $preview ? $date_format : 'Y-m-d';
575
+				$value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
576
+				//$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
577
+				//$value = date_i18n($date_format, strtotime($post_htmlvar_value));
578
+			}else{
579
+				return '';
580
+			}
581
+
582
+			$field_icon = geodir_field_icon_proccess($cf);
583
+
584
+			if (strpos($field_icon, 'http') !== false) {
585
+				$field_icon_af = '';
586
+			} elseif ($field_icon == '') {
587
+				$field_icon_af = '<i class="fa fa-calendar"></i>';
588
+			} else {
589
+				$field_icon_af = $field_icon;
590
+				$field_icon = '';
591
+			}
592
+
593
+
594
+
595
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
596
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
597
+			$html .= '</span>' . $value . '</div>';
598
+
599
+		endif;
600
+
601
+	}
602
+
603
+	return $html;
604 604
 }
605 605
 add_filter('geodir_custom_field_output_datepicker','geodir_cf_datepicker',10,3);
606 606
 
@@ -617,97 +617,97 @@  discard block
 block discarded – undo
617 617
  */
618 618
 function geodir_cf_text($html,$location,$cf,$p=''){
619 619
 
620
-    // check we have the post value
621
-    if(is_int($p)){$post = geodir_get_post_info($p);}
622
-    else{ global $post;}
623
-
624
-    if(!is_array($cf) && $cf!=''){
625
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
626
-        if(!$cf){return NULL;}
627
-    }
628
-
629
-    $html_var = $cf['htmlvar_name'];
630
-
631
-    // Check if there is a location specific filter.
632
-    if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
633
-        /**
634
-         * Filter the text html by location.
635
-         *
636
-         * @param string $html The html to filter.
637
-         * @param array $cf The custom field array.
638
-         * @since 1.6.6
639
-         */
640
-        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
641
-    }
642
-
643
-    // Check if there is a custom field specific filter.
644
-    if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
645
-        /**
646
-         * Filter the text html by individual custom field.
647
-         *
648
-         * @param string $html The html to filter.
649
-         * @param string $location The location to output the html.
650
-         * @param array $cf The custom field array.
651
-         * @since 1.6.6
652
-         */
653
-        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
654
-    }
655
-
656
-    // Check if there is a custom field key specific filter.
657
-    if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
658
-        /**
659
-         * Filter the text html by field type key.
660
-         *
661
-         * @param string $html The html to filter.
662
-         * @param string $location The location to output the html.
663
-         * @param array $cf The custom field array.
664
-         * @since 1.6.6
665
-         */
666
-        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
667
-    }
620
+	// check we have the post value
621
+	if(is_int($p)){$post = geodir_get_post_info($p);}
622
+	else{ global $post;}
623
+
624
+	if(!is_array($cf) && $cf!=''){
625
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
626
+		if(!$cf){return NULL;}
627
+	}
628
+
629
+	$html_var = $cf['htmlvar_name'];
630
+
631
+	// Check if there is a location specific filter.
632
+	if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
633
+		/**
634
+		 * Filter the text html by location.
635
+		 *
636
+		 * @param string $html The html to filter.
637
+		 * @param array $cf The custom field array.
638
+		 * @since 1.6.6
639
+		 */
640
+		$html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
641
+	}
642
+
643
+	// Check if there is a custom field specific filter.
644
+	if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
645
+		/**
646
+		 * Filter the text html by individual custom field.
647
+		 *
648
+		 * @param string $html The html to filter.
649
+		 * @param string $location The location to output the html.
650
+		 * @param array $cf The custom field array.
651
+		 * @since 1.6.6
652
+		 */
653
+		$html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
654
+	}
655
+
656
+	// Check if there is a custom field key specific filter.
657
+	if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
658
+		/**
659
+		 * Filter the text html by field type key.
660
+		 *
661
+		 * @param string $html The html to filter.
662
+		 * @param string $location The location to output the html.
663
+		 * @param array $cf The custom field array.
664
+		 * @since 1.6.6
665
+		 */
666
+		$html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
667
+	}
668 668
 
669 669
     
670 670
 
671
-    // If not html then we run the standard output.
672
-    if(empty($html)){
671
+	// If not html then we run the standard output.
672
+	if(empty($html)){
673 673
 
674
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
674
+		if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
675 675
 
676
-            $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
676
+			$class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
677 677
 
678
-            $field_icon = geodir_field_icon_proccess($cf);
679
-            if (strpos($field_icon, 'http') !== false) {
680
-                $field_icon_af = '';
681
-            } elseif ($field_icon == '') {
682
-                $field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="fa fa-clock-o"></i>' : "";
683
-            } else {
684
-                $field_icon_af = $field_icon;
685
-                $field_icon = '';
686
-            }
678
+			$field_icon = geodir_field_icon_proccess($cf);
679
+			if (strpos($field_icon, 'http') !== false) {
680
+				$field_icon_af = '';
681
+			} elseif ($field_icon == '') {
682
+				$field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="fa fa-clock-o"></i>' : "";
683
+			} else {
684
+				$field_icon_af = $field_icon;
685
+				$field_icon = '';
686
+			}
687 687
 
688 688
 
689
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
690
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
691
-            $html .= '</span>';
689
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
690
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
691
+			$html .= '</span>';
692 692
 
693
-            $value = $post->{$cf['htmlvar_name']};
694
-            if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
695
-                $extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
696
-                if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
697
-                    if(!ceil($value) > 0){return '';}// dont output blank prices
698
-                    $value = geodir_currency_format_number($value,$cf);
699
-                }
700
-            }
693
+			$value = $post->{$cf['htmlvar_name']};
694
+			if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
695
+				$extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
696
+				if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
697
+					if(!ceil($value) > 0){return '';}// dont output blank prices
698
+					$value = geodir_currency_format_number($value,$cf);
699
+				}
700
+			}
701 701
 
702 702
 
703
-            $html .= $value;
704
-            $html .= '</div>';
703
+			$html .= $value;
704
+			$html .= '</div>';
705 705
 
706
-        endif;
706
+		endif;
707 707
 
708
-    }
708
+	}
709 709
 
710
-    return $html;
710
+	return $html;
711 711
 }
712 712
 add_filter('geodir_custom_field_output_text','geodir_cf_text',10,3);
713 713
 
@@ -724,98 +724,98 @@  discard block
 block discarded – undo
724 724
  */
725 725
 function geodir_cf_radio($html,$location,$cf,$p=''){
726 726
 
727
-    // check we have the post value
728
-    if(is_int($p)){$post = geodir_get_post_info($p);}
729
-    else{ global $post;}
730
-
731
-    if(!is_array($cf) && $cf!=''){
732
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
733
-        if(!$cf){return NULL;}
734
-    }
735
-
736
-    $html_var = $cf['htmlvar_name'];
737
-
738
-    // Check if there is a location specific filter.
739
-    if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
740
-        /**
741
-         * Filter the radio html by location.
742
-         *
743
-         * @param string $html The html to filter.
744
-         * @param array $cf The custom field array.
745
-         * @since 1.6.6
746
-         */
747
-        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
748
-    }
749
-
750
-    // Check if there is a custom field specific filter.
751
-    if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
752
-        /**
753
-         * Filter the radio html by individual custom field.
754
-         *
755
-         * @param string $html The html to filter.
756
-         * @param string $location The location to output the html.
757
-         * @param array $cf The custom field array.
758
-         * @since 1.6.6
759
-         */
760
-        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
761
-    }
762
-
763
-    // Check if there is a custom field key specific filter.
764
-    if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
765
-        /**
766
-         * Filter the radio html by field type key.
767
-         *
768
-         * @param string $html The html to filter.
769
-         * @param string $location The location to output the html.
770
-         * @param array $cf The custom field array.
771
-         * @since 1.6.6
772
-         */
773
-        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
774
-    }
775
-
776
-    // If not html then we run the standard output.
777
-    if(empty($html)){
778
-
779
-        $html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
780
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
781
-
782
-            if ($post->{$cf['htmlvar_name']} == 'f' || $post->{$cf['htmlvar_name']} == '0') {
783
-                $html_val = __('No', 'geodirectory');
784
-            } else if ($post->{$cf['htmlvar_name']} == 't' || $post->{$cf['htmlvar_name']} == '1') {
785
-                $html_val = __('Yes', 'geodirectory');
786
-            } else {
787
-                if (!empty($cf['option_values'])) {
788
-                    $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
789
-
790
-                    if (!empty($cf_option_values)) {
791
-                        foreach ($cf_option_values as $cf_option_value) {
792
-                            if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
793
-                                $html_val = $cf_option_value['label'];
794
-                            }
795
-                        }
796
-                    }
797
-                }
798
-            }
799
-
800
-            $field_icon = geodir_field_icon_proccess($cf);
801
-            if (strpos($field_icon, 'http') !== false) {
802
-                $field_icon_af = '';
803
-            } elseif ($field_icon == '') {
804
-                $field_icon_af = '';
805
-            } else {
806
-                $field_icon_af = $field_icon;
807
-                $field_icon = '';
808
-            }
809
-
810
-
811
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
812
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
813
-            $html .= '</span>' . $html_val . '</div>';
814
-        endif;
815
-
816
-    }
817
-
818
-    return $html;
727
+	// check we have the post value
728
+	if(is_int($p)){$post = geodir_get_post_info($p);}
729
+	else{ global $post;}
730
+
731
+	if(!is_array($cf) && $cf!=''){
732
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
733
+		if(!$cf){return NULL;}
734
+	}
735
+
736
+	$html_var = $cf['htmlvar_name'];
737
+
738
+	// Check if there is a location specific filter.
739
+	if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
740
+		/**
741
+		 * Filter the radio html by location.
742
+		 *
743
+		 * @param string $html The html to filter.
744
+		 * @param array $cf The custom field array.
745
+		 * @since 1.6.6
746
+		 */
747
+		$html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
748
+	}
749
+
750
+	// Check if there is a custom field specific filter.
751
+	if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
752
+		/**
753
+		 * Filter the radio html by individual custom field.
754
+		 *
755
+		 * @param string $html The html to filter.
756
+		 * @param string $location The location to output the html.
757
+		 * @param array $cf The custom field array.
758
+		 * @since 1.6.6
759
+		 */
760
+		$html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
761
+	}
762
+
763
+	// Check if there is a custom field key specific filter.
764
+	if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
765
+		/**
766
+		 * Filter the radio html by field type key.
767
+		 *
768
+		 * @param string $html The html to filter.
769
+		 * @param string $location The location to output the html.
770
+		 * @param array $cf The custom field array.
771
+		 * @since 1.6.6
772
+		 */
773
+		$html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
774
+	}
775
+
776
+	// If not html then we run the standard output.
777
+	if(empty($html)){
778
+
779
+		$html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
780
+		if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
781
+
782
+			if ($post->{$cf['htmlvar_name']} == 'f' || $post->{$cf['htmlvar_name']} == '0') {
783
+				$html_val = __('No', 'geodirectory');
784
+			} else if ($post->{$cf['htmlvar_name']} == 't' || $post->{$cf['htmlvar_name']} == '1') {
785
+				$html_val = __('Yes', 'geodirectory');
786
+			} else {
787
+				if (!empty($cf['option_values'])) {
788
+					$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
789
+
790
+					if (!empty($cf_option_values)) {
791
+						foreach ($cf_option_values as $cf_option_value) {
792
+							if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
793
+								$html_val = $cf_option_value['label'];
794
+							}
795
+						}
796
+					}
797
+				}
798
+			}
799
+
800
+			$field_icon = geodir_field_icon_proccess($cf);
801
+			if (strpos($field_icon, 'http') !== false) {
802
+				$field_icon_af = '';
803
+			} elseif ($field_icon == '') {
804
+				$field_icon_af = '';
805
+			} else {
806
+				$field_icon_af = $field_icon;
807
+				$field_icon = '';
808
+			}
809
+
810
+
811
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
812
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
813
+			$html .= '</span>' . $html_val . '</div>';
814
+		endif;
815
+
816
+	}
817
+
818
+	return $html;
819 819
 }
820 820
 add_filter('geodir_custom_field_output_radio','geodir_cf_radio',10,3);
821 821
 
@@ -833,92 +833,92 @@  discard block
 block discarded – undo
833 833
  */
834 834
 function geodir_cf_select($html,$location,$cf,$p=''){
835 835
 
836
-    // check we have the post value
837
-    if(is_int($p)){$post = geodir_get_post_info($p);}
838
-    else{ global $post;}
839
-
840
-    if(!is_array($cf) && $cf!=''){
841
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
842
-        if(!$cf){return NULL;}
843
-    }
844
-
845
-    $html_var = $cf['htmlvar_name'];
846
-
847
-    // Check if there is a location specific filter.
848
-    if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
849
-        /**
850
-         * Filter the select html by location.
851
-         *
852
-         * @param string $html The html to filter.
853
-         * @param array $cf The custom field array.
854
-         * @since 1.6.6
855
-         */
856
-        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
857
-    }
858
-
859
-    // Check if there is a custom field specific filter.
860
-    if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
861
-        /**
862
-         * Filter the select html by individual custom field.
863
-         *
864
-         * @param string $html The html to filter.
865
-         * @param string $location The location to output the html.
866
-         * @param array $cf The custom field array.
867
-         * @since 1.6.6
868
-         */
869
-        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
870
-    }
871
-
872
-    // Check if there is a custom field key specific filter.
873
-    if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
874
-        /**
875
-         * Filter the select html by field type key.
876
-         *
877
-         * @param string $html The html to filter.
878
-         * @param string $location The location to output the html.
879
-         * @param array $cf The custom field array.
880
-         * @since 1.6.6
881
-         */
882
-        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
883
-    }
884
-
885
-    // If not html then we run the standard output.
886
-    if(empty($html)){
887
-
888
-        if ($post->{$cf['htmlvar_name']}):
889
-            $field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
890
-
891
-            if (!empty($cf['option_values'])) {
892
-                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
893
-
894
-                if (!empty($cf_option_values)) {
895
-                    foreach ($cf_option_values as $cf_option_value) {
896
-                        if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
897
-                            $field_value = $cf_option_value['label']; // no longer needed here. Removed comment because it displays number instead of label if option vales set like "Good/1,Fair/2".
898
-                        }
899
-                    }
900
-                }
901
-            }
902
-
903
-            $field_icon = geodir_field_icon_proccess($cf);
904
-            if (strpos($field_icon, 'http') !== false) {
905
-                $field_icon_af = '';
906
-            } elseif ($field_icon == '') {
907
-                $field_icon_af = '';
908
-            } else {
909
-                $field_icon_af = $field_icon;
910
-                $field_icon = '';
911
-            }
912
-
913
-
914
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
915
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
916
-            $html .= '</span>' . $field_value . '</div>';
917
-        endif;
918
-
919
-    }
920
-
921
-    return $html;
836
+	// check we have the post value
837
+	if(is_int($p)){$post = geodir_get_post_info($p);}
838
+	else{ global $post;}
839
+
840
+	if(!is_array($cf) && $cf!=''){
841
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
842
+		if(!$cf){return NULL;}
843
+	}
844
+
845
+	$html_var = $cf['htmlvar_name'];
846
+
847
+	// Check if there is a location specific filter.
848
+	if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
849
+		/**
850
+		 * Filter the select html by location.
851
+		 *
852
+		 * @param string $html The html to filter.
853
+		 * @param array $cf The custom field array.
854
+		 * @since 1.6.6
855
+		 */
856
+		$html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
857
+	}
858
+
859
+	// Check if there is a custom field specific filter.
860
+	if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
861
+		/**
862
+		 * Filter the select html by individual custom field.
863
+		 *
864
+		 * @param string $html The html to filter.
865
+		 * @param string $location The location to output the html.
866
+		 * @param array $cf The custom field array.
867
+		 * @since 1.6.6
868
+		 */
869
+		$html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
870
+	}
871
+
872
+	// Check if there is a custom field key specific filter.
873
+	if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
874
+		/**
875
+		 * Filter the select html by field type key.
876
+		 *
877
+		 * @param string $html The html to filter.
878
+		 * @param string $location The location to output the html.
879
+		 * @param array $cf The custom field array.
880
+		 * @since 1.6.6
881
+		 */
882
+		$html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
883
+	}
884
+
885
+	// If not html then we run the standard output.
886
+	if(empty($html)){
887
+
888
+		if ($post->{$cf['htmlvar_name']}):
889
+			$field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
890
+
891
+			if (!empty($cf['option_values'])) {
892
+				$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
893
+
894
+				if (!empty($cf_option_values)) {
895
+					foreach ($cf_option_values as $cf_option_value) {
896
+						if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
897
+							$field_value = $cf_option_value['label']; // no longer needed here. Removed comment because it displays number instead of label if option vales set like "Good/1,Fair/2".
898
+						}
899
+					}
900
+				}
901
+			}
902
+
903
+			$field_icon = geodir_field_icon_proccess($cf);
904
+			if (strpos($field_icon, 'http') !== false) {
905
+				$field_icon_af = '';
906
+			} elseif ($field_icon == '') {
907
+				$field_icon_af = '';
908
+			} else {
909
+				$field_icon_af = $field_icon;
910
+				$field_icon = '';
911
+			}
912
+
913
+
914
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
915
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
916
+			$html .= '</span>' . $field_value . '</div>';
917
+		endif;
918
+
919
+	}
920
+
921
+	return $html;
922 922
 }
923 923
 add_filter('geodir_custom_field_output_select','geodir_cf_select',10,3);
924 924
 
@@ -935,117 +935,117 @@  discard block
 block discarded – undo
935 935
  */
936 936
 function geodir_cf_multiselect($html,$location,$cf,$p=''){
937 937
 
938
-    // check we have the post value
939
-    if(is_int($p)){$post = geodir_get_post_info($p);}
940
-    else{ global $post;}
941
-
942
-    if(!is_array($cf) && $cf!=''){
943
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
944
-        if(!$cf){return NULL;}
945
-    }
946
-
947
-    $html_var = $cf['htmlvar_name'];
948
-
949
-    // Check if there is a location specific filter.
950
-    if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
951
-        /**
952
-         * Filter the multiselect html by location.
953
-         *
954
-         * @param string $html The html to filter.
955
-         * @param array $cf The custom field array.
956
-         * @since 1.6.6
957
-         */
958
-        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
959
-    }
960
-
961
-    // Check if there is a custom field specific filter.
962
-    if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
963
-        /**
964
-         * Filter the multiselect html by individual custom field.
965
-         *
966
-         * @param string $html The html to filter.
967
-         * @param string $location The location to output the html.
968
-         * @param array $cf The custom field array.
969
-         * @since 1.6.6
970
-         */
971
-        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
972
-    }
973
-
974
-    // Check if there is a custom field key specific filter.
975
-    if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
976
-        /**
977
-         * Filter the multiselect html by field type key.
978
-         *
979
-         * @param string $html The html to filter.
980
-         * @param string $location The location to output the html.
981
-         * @param array $cf The custom field array.
982
-         * @since 1.6.6
983
-         */
984
-        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
985
-    }
986
-
987
-    // If not html then we run the standard output.
988
-    if(empty($html)){
989
-
990
-
991
-        if (!empty($post->{$cf['htmlvar_name']})):
992
-
993
-            if (is_array($post->{$cf['htmlvar_name']})) {
994
-                $post->{$cf['htmlvar_name']} = implode(', ', $post->{$cf['htmlvar_name']});
995
-            }
996
-
997
-            $field_icon = geodir_field_icon_proccess($cf);
998
-            if (strpos($field_icon, 'http') !== false) {
999
-                $field_icon_af = '';
1000
-            } elseif ($field_icon == '') {
1001
-                $field_icon_af = '';
1002
-            } else {
1003
-                $field_icon_af = $field_icon;
1004
-                $field_icon = '';
1005
-            }
1006
-
1007
-            $field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
1008
-
1009
-            if(is_array($field_values)){
1010
-                $field_values = array_map('trim', $field_values);
1011
-            }
1012
-
1013
-            $option_values = array();
1014
-            if (!empty($cf['option_values'])) {
1015
-                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
1016
-
1017
-                if (!empty($cf_option_values)) {
1018
-                    foreach ($cf_option_values as $cf_option_value) {
1019
-                        if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {
1020
-                            $option_values[] = $cf_option_value['label'];
1021
-                        }
1022
-                    }
1023
-                }
1024
-            }
1025
-
1026
-
1027
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
1028
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1029
-            $html .= '</span>';
1030
-
1031
-            if (count($option_values) > 1) {
1032
-                $html .= '<ul>';
1033
-
1034
-                foreach ($option_values as $val) {
1035
-                    $html .= '<li>' . $val . '</li>';
1036
-                }
1037
-
1038
-                $html .= '</ul>';
1039
-            } else {
1040
-                $html .= __($post->{$cf['htmlvar_name']}, 'geodirectory');
1041
-            }
1042
-
1043
-            $html .= '</div>';
1044
-        endif;
1045
-
1046
-    }
1047
-
1048
-    return $html;
938
+	// check we have the post value
939
+	if(is_int($p)){$post = geodir_get_post_info($p);}
940
+	else{ global $post;}
941
+
942
+	if(!is_array($cf) && $cf!=''){
943
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
944
+		if(!$cf){return NULL;}
945
+	}
946
+
947
+	$html_var = $cf['htmlvar_name'];
948
+
949
+	// Check if there is a location specific filter.
950
+	if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
951
+		/**
952
+		 * Filter the multiselect html by location.
953
+		 *
954
+		 * @param string $html The html to filter.
955
+		 * @param array $cf The custom field array.
956
+		 * @since 1.6.6
957
+		 */
958
+		$html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
959
+	}
960
+
961
+	// Check if there is a custom field specific filter.
962
+	if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
963
+		/**
964
+		 * Filter the multiselect html by individual custom field.
965
+		 *
966
+		 * @param string $html The html to filter.
967
+		 * @param string $location The location to output the html.
968
+		 * @param array $cf The custom field array.
969
+		 * @since 1.6.6
970
+		 */
971
+		$html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
972
+	}
973
+
974
+	// Check if there is a custom field key specific filter.
975
+	if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
976
+		/**
977
+		 * Filter the multiselect html by field type key.
978
+		 *
979
+		 * @param string $html The html to filter.
980
+		 * @param string $location The location to output the html.
981
+		 * @param array $cf The custom field array.
982
+		 * @since 1.6.6
983
+		 */
984
+		$html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
985
+	}
986
+
987
+	// If not html then we run the standard output.
988
+	if(empty($html)){
989
+
990
+
991
+		if (!empty($post->{$cf['htmlvar_name']})):
992
+
993
+			if (is_array($post->{$cf['htmlvar_name']})) {
994
+				$post->{$cf['htmlvar_name']} = implode(', ', $post->{$cf['htmlvar_name']});
995
+			}
996
+
997
+			$field_icon = geodir_field_icon_proccess($cf);
998
+			if (strpos($field_icon, 'http') !== false) {
999
+				$field_icon_af = '';
1000
+			} elseif ($field_icon == '') {
1001
+				$field_icon_af = '';
1002
+			} else {
1003
+				$field_icon_af = $field_icon;
1004
+				$field_icon = '';
1005
+			}
1006
+
1007
+			$field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
1008
+
1009
+			if(is_array($field_values)){
1010
+				$field_values = array_map('trim', $field_values);
1011
+			}
1012
+
1013
+			$option_values = array();
1014
+			if (!empty($cf['option_values'])) {
1015
+				$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
1016
+
1017
+				if (!empty($cf_option_values)) {
1018
+					foreach ($cf_option_values as $cf_option_value) {
1019
+						if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {
1020
+							$option_values[] = $cf_option_value['label'];
1021
+						}
1022
+					}
1023
+				}
1024
+			}
1025
+
1026
+
1027
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
1028
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1029
+			$html .= '</span>';
1030
+
1031
+			if (count($option_values) > 1) {
1032
+				$html .= '<ul>';
1033
+
1034
+				foreach ($option_values as $val) {
1035
+					$html .= '<li>' . $val . '</li>';
1036
+				}
1037
+
1038
+				$html .= '</ul>';
1039
+			} else {
1040
+				$html .= __($post->{$cf['htmlvar_name']}, 'geodirectory');
1041
+			}
1042
+
1043
+			$html .= '</div>';
1044
+		endif;
1045
+
1046
+	}
1047
+
1048
+	return $html;
1049 1049
 }
1050 1050
 add_filter('geodir_custom_field_output_multiselect','geodir_cf_multiselect',10,3);
1051 1051
 
@@ -1062,153 +1062,153 @@  discard block
 block discarded – undo
1062 1062
  */
1063 1063
 function geodir_cf_email($html,$location,$cf,$p=''){
1064 1064
 
1065
-    // check we have the post value
1066
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1067
-    else{ global $post;}
1068
-
1069
-    if(!is_array($cf) && $cf!=''){
1070
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1071
-        if(!$cf){return NULL;}
1072
-    }
1073
-
1074
-    $html_var = $cf['htmlvar_name'];
1075
-
1076
-    // Check if there is a location specific filter.
1077
-    if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
1078
-        /**
1079
-         * Filter the email html by location.
1080
-         *
1081
-         * @param string $html The html to filter.
1082
-         * @param array $cf The custom field array.
1083
-         * @since 1.6.6
1084
-         */
1085
-        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
1086
-    }
1087
-
1088
-    // Check if there is a custom field specific filter.
1089
-    if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
1090
-        /**
1091
-         * Filter the email html by individual custom field.
1092
-         *
1093
-         * @param string $html The html to filter.
1094
-         * @param string $location The location to output the html.
1095
-         * @param array $cf The custom field array.
1096
-         * @since 1.6.6
1097
-         */
1098
-        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
1099
-    }
1100
-
1101
-    // Check if there is a custom field key specific filter.
1102
-    if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
1103
-        /**
1104
-         * Filter the email html by field type key.
1105
-         *
1106
-         * @param string $html The html to filter.
1107
-         * @param string $location The location to output the html.
1108
-         * @param array $cf The custom field array.
1109
-         * @since 1.6.6
1110
-         */
1111
-        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
1112
-    }
1113
-
1114
-    // If not html then we run the standard output.
1115
-    if(empty($html)){
1116
-
1117
-        global $preview;
1118
-        if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
1119
-            return ''; // Remove Send Enquiry | Send To Friend from listings page
1120
-        }
1121
-
1122
-        $package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
1123
-
1124
-        if ($cf['htmlvar_name'] == 'geodir_email' && ((isset($package_info['sendtofriend']) && $package_info['sendtofriend']) || $post->{$cf['htmlvar_name']})) {
1125
-            global $send_to_friend;
1126
-            $send_to_friend = true;
1127
-            $b_send_inquiry = '';
1128
-            $b_sendtofriend = '';
1129
-
1130
-            $html = '';
1131
-            if (!$preview) {
1132
-                $b_send_inquiry = 'b_send_inquiry';
1133
-                $b_sendtofriend = 'b_sendtofriend';
1134
-                $html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
1135
-            }
1136
-
1137
-            $field_icon = geodir_field_icon_proccess($cf);
1138
-            if (strpos($field_icon, 'http') !== false) {
1139
-                $field_icon_af = '';
1140
-            } elseif ($field_icon == '') {
1141
-                $field_icon_af = '<i class="fa fa-envelope"></i>';
1142
-            } else {
1143
-                $field_icon_af = $field_icon;
1144
-                $field_icon = '';
1145
-            }
1146
-
1147
-            $html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
1148
-            $seperator = '';
1149
-            if ($post->{$cf['htmlvar_name']}) {
1150
-                $html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
1151
-                $seperator = ' | ';
1152
-            }
1153
-
1154
-            if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
1155
-                $html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
1156
-            }
1157
-
1158
-            $html .= '</span></div>';
1159
-
1160
-
1161
-            if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
1162
-                $html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
1163
-            } elseif (isset($_REQUEST['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {
1164
-                $html .= '<p class="sucess_msg">' . SEND_FRIEND_SUCCESS . '</p>';
1165
-            } elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
1166
-                $html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
1167
-            }
1168
-
1169
-            /*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
1170
-
1171
-        } else {
1172
-
1173
-            if ($post->{$cf['htmlvar_name']}) {
1174
-
1175
-                $field_icon = geodir_field_icon_proccess($cf);
1176
-                if (strpos($field_icon, 'http') !== false) {
1177
-                    $field_icon_af = '';
1178
-                } elseif ($field_icon == '') {
1179
-                    $field_icon_af = '<i class="fa fa-envelope"></i>';
1180
-                } else {
1181
-                    $field_icon_af = $field_icon;
1182
-                    $field_icon = '';
1183
-                }
1184
-
1185
-
1186
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
1187
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1188
-                $html .= '</span><span class="geodir-email-address-output">';
1189
-                $email = $post->{$cf['htmlvar_name']} ;
1190
-                if($e_split = explode('@',$email)){
1191
-                    /**
1192
-                     * Filter email custom field name output.
1193
-                     *
1194
-                     * @since 1.5.3
1195
-                     *
1196
-                     * @param string $email The email string being output.
1197
-                     * @param array $cf Custom field variables array.
1198
-                     */
1199
-                    $email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
1200
-                    $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
1201
-                }else{
1202
-                    $html .=  $email;
1203
-                }
1204
-                $html .= '</span></div>';
1205
-            }
1206
-
1207
-        }
1208
-
1209
-    }
1210
-
1211
-    return $html;
1065
+	// check we have the post value
1066
+	if(is_int($p)){$post = geodir_get_post_info($p);}
1067
+	else{ global $post;}
1068
+
1069
+	if(!is_array($cf) && $cf!=''){
1070
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1071
+		if(!$cf){return NULL;}
1072
+	}
1073
+
1074
+	$html_var = $cf['htmlvar_name'];
1075
+
1076
+	// Check if there is a location specific filter.
1077
+	if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
1078
+		/**
1079
+		 * Filter the email html by location.
1080
+		 *
1081
+		 * @param string $html The html to filter.
1082
+		 * @param array $cf The custom field array.
1083
+		 * @since 1.6.6
1084
+		 */
1085
+		$html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
1086
+	}
1087
+
1088
+	// Check if there is a custom field specific filter.
1089
+	if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
1090
+		/**
1091
+		 * Filter the email html by individual custom field.
1092
+		 *
1093
+		 * @param string $html The html to filter.
1094
+		 * @param string $location The location to output the html.
1095
+		 * @param array $cf The custom field array.
1096
+		 * @since 1.6.6
1097
+		 */
1098
+		$html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
1099
+	}
1100
+
1101
+	// Check if there is a custom field key specific filter.
1102
+	if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
1103
+		/**
1104
+		 * Filter the email html by field type key.
1105
+		 *
1106
+		 * @param string $html The html to filter.
1107
+		 * @param string $location The location to output the html.
1108
+		 * @param array $cf The custom field array.
1109
+		 * @since 1.6.6
1110
+		 */
1111
+		$html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
1112
+	}
1113
+
1114
+	// If not html then we run the standard output.
1115
+	if(empty($html)){
1116
+
1117
+		global $preview;
1118
+		if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
1119
+			return ''; // Remove Send Enquiry | Send To Friend from listings page
1120
+		}
1121
+
1122
+		$package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
1123
+
1124
+		if ($cf['htmlvar_name'] == 'geodir_email' && ((isset($package_info['sendtofriend']) && $package_info['sendtofriend']) || $post->{$cf['htmlvar_name']})) {
1125
+			global $send_to_friend;
1126
+			$send_to_friend = true;
1127
+			$b_send_inquiry = '';
1128
+			$b_sendtofriend = '';
1129
+
1130
+			$html = '';
1131
+			if (!$preview) {
1132
+				$b_send_inquiry = 'b_send_inquiry';
1133
+				$b_sendtofriend = 'b_sendtofriend';
1134
+				$html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
1135
+			}
1136
+
1137
+			$field_icon = geodir_field_icon_proccess($cf);
1138
+			if (strpos($field_icon, 'http') !== false) {
1139
+				$field_icon_af = '';
1140
+			} elseif ($field_icon == '') {
1141
+				$field_icon_af = '<i class="fa fa-envelope"></i>';
1142
+			} else {
1143
+				$field_icon_af = $field_icon;
1144
+				$field_icon = '';
1145
+			}
1146
+
1147
+			$html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
1148
+			$seperator = '';
1149
+			if ($post->{$cf['htmlvar_name']}) {
1150
+				$html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
1151
+				$seperator = ' | ';
1152
+			}
1153
+
1154
+			if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
1155
+				$html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
1156
+			}
1157
+
1158
+			$html .= '</span></div>';
1159
+
1160
+
1161
+			if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
1162
+				$html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
1163
+			} elseif (isset($_REQUEST['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {
1164
+				$html .= '<p class="sucess_msg">' . SEND_FRIEND_SUCCESS . '</p>';
1165
+			} elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
1166
+				$html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
1167
+			}
1168
+
1169
+			/*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
1170
+
1171
+		} else {
1172
+
1173
+			if ($post->{$cf['htmlvar_name']}) {
1174
+
1175
+				$field_icon = geodir_field_icon_proccess($cf);
1176
+				if (strpos($field_icon, 'http') !== false) {
1177
+					$field_icon_af = '';
1178
+				} elseif ($field_icon == '') {
1179
+					$field_icon_af = '<i class="fa fa-envelope"></i>';
1180
+				} else {
1181
+					$field_icon_af = $field_icon;
1182
+					$field_icon = '';
1183
+				}
1184
+
1185
+
1186
+				$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
1187
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1188
+				$html .= '</span><span class="geodir-email-address-output">';
1189
+				$email = $post->{$cf['htmlvar_name']} ;
1190
+				if($e_split = explode('@',$email)){
1191
+					/**
1192
+					 * Filter email custom field name output.
1193
+					 *
1194
+					 * @since 1.5.3
1195
+					 *
1196
+					 * @param string $email The email string being output.
1197
+					 * @param array $cf Custom field variables array.
1198
+					 */
1199
+					$email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
1200
+					$html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
1201
+				}else{
1202
+					$html .=  $email;
1203
+				}
1204
+				$html .= '</span></div>';
1205
+			}
1206
+
1207
+		}
1208
+
1209
+	}
1210
+
1211
+	return $html;
1212 1212
 }
1213 1213
 add_filter('geodir_custom_field_output_email','geodir_cf_email',10,3);
1214 1214
 
@@ -1225,130 +1225,130 @@  discard block
 block discarded – undo
1225 1225
  */
1226 1226
 function geodir_cf_file($html,$location,$cf,$p=''){
1227 1227
 
1228
-    // check we have the post value
1229
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1230
-    else{ global $post;}
1231
-
1232
-    if(!is_array($cf) && $cf!=''){
1233
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1234
-        if(!$cf){return NULL;}
1235
-    }
1236
-
1237
-    $html_var = $cf['htmlvar_name'];
1238
-
1239
-    // Check if there is a location specific filter.
1240
-    if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
1241
-        /**
1242
-         * Filter the file html by location.
1243
-         *
1244
-         * @param string $html The html to filter.
1245
-         * @param array $cf The custom field array.
1246
-         * @since 1.6.6
1247
-         */
1248
-        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
1249
-    }
1250
-
1251
-    // Check if there is a custom field specific filter.
1252
-    if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
1253
-        /**
1254
-         * Filter the file html by individual custom field.
1255
-         *
1256
-         * @param string $html The html to filter.
1257
-         * @param string $location The location to output the html.
1258
-         * @param array $cf The custom field array.
1259
-         * @since 1.6.6
1260
-         */
1261
-        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
1262
-    }
1263
-
1264
-    // Check if there is a custom field key specific filter.
1265
-    if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
1266
-        /**
1267
-         * Filter the file html by field type key.
1268
-         *
1269
-         * @param string $html The html to filter.
1270
-         * @param string $location The location to output the html.
1271
-         * @param array $cf The custom field array.
1272
-         * @since 1.6.6
1273
-         */
1274
-        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
1275
-    }
1276
-
1277
-    // If not html then we run the standard output.
1278
-    if(empty($html)){
1279
-
1280
-        if (!empty($post->{$cf['htmlvar_name']})):
1281
-
1282
-            $files = explode(",", $post->{$cf['htmlvar_name']});
1283
-            if (!empty($files)):
1284
-
1285
-                $extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
1286
-                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
1287
-
1288
-                $file_paths = '';
1289
-                foreach ($files as $file) {
1290
-                    if (!empty($file)) {
1291
-
1292
-                        // $filetype = wp_check_filetype($file);
1293
-
1294
-                        $image_name_arr = explode('/', $file);
1295
-                        $curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
1296
-                        $filename = end($image_name_arr);
1297
-                        $img_name_arr = explode('.', $filename);
1298
-
1299
-                        $arr_file_type = wp_check_filetype($filename);
1300
-                        if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
1301
-                            continue;
1302
-                        }
1303
-
1304
-                        $uploaded_file_type = $arr_file_type['type'];
1305
-                        $uploaded_file_ext = $arr_file_type['ext'];
1306
-
1307
-                        if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
1308
-                            continue; // Invalid file type.
1309
-                        }
1310
-
1311
-                        //$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
1312
-                        $image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');
1313
-
1314
-                        // If the uploaded file is image
1315
-                        if (in_array($uploaded_file_type, $image_file_types)) {
1316
-                            $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';
1317
-                            $file_paths .= '<a href="'.$file.'">';
1318
-                            $file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);
1319
-                            $file_paths .= '</a>';
1320
-                            //$file_paths .= '<img src="'.$file.'"  />';	
1321
-                            $file_paths .= '</div>';
1322
-                        } else {
1323
-                            $ext_path = '_' . $html_var . '_';
1324
-                            $filename = explode($ext_path, $filename);
1325
-                            $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
1326
-                        }
1327
-                    }
1328
-                }
1329
-
1330
-                $field_icon = geodir_field_icon_proccess($cf);
1331
-                if (strpos($field_icon, 'http') !== false) {
1332
-                    $field_icon_af = '';
1333
-                } elseif ($field_icon == '') {
1334
-                    $field_icon_af = '';
1335
-                } else {
1336
-                    $field_icon_af = $field_icon;
1337
-                    $field_icon = '';
1338
-                }
1339
-
1340
-                $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
1341
-                $html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
1342
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1343
-                $html .= '</span>';
1344
-                $html .= $file_paths . '</div></div>';
1345
-
1346
-            endif;
1347
-        endif;
1348
-
1349
-    }
1350
-
1351
-    return $html;
1228
+	// check we have the post value
1229
+	if(is_int($p)){$post = geodir_get_post_info($p);}
1230
+	else{ global $post;}
1231
+
1232
+	if(!is_array($cf) && $cf!=''){
1233
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1234
+		if(!$cf){return NULL;}
1235
+	}
1236
+
1237
+	$html_var = $cf['htmlvar_name'];
1238
+
1239
+	// Check if there is a location specific filter.
1240
+	if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
1241
+		/**
1242
+		 * Filter the file html by location.
1243
+		 *
1244
+		 * @param string $html The html to filter.
1245
+		 * @param array $cf The custom field array.
1246
+		 * @since 1.6.6
1247
+		 */
1248
+		$html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
1249
+	}
1250
+
1251
+	// Check if there is a custom field specific filter.
1252
+	if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
1253
+		/**
1254
+		 * Filter the file html by individual custom field.
1255
+		 *
1256
+		 * @param string $html The html to filter.
1257
+		 * @param string $location The location to output the html.
1258
+		 * @param array $cf The custom field array.
1259
+		 * @since 1.6.6
1260
+		 */
1261
+		$html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
1262
+	}
1263
+
1264
+	// Check if there is a custom field key specific filter.
1265
+	if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
1266
+		/**
1267
+		 * Filter the file html by field type key.
1268
+		 *
1269
+		 * @param string $html The html to filter.
1270
+		 * @param string $location The location to output the html.
1271
+		 * @param array $cf The custom field array.
1272
+		 * @since 1.6.6
1273
+		 */
1274
+		$html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
1275
+	}
1276
+
1277
+	// If not html then we run the standard output.
1278
+	if(empty($html)){
1279
+
1280
+		if (!empty($post->{$cf['htmlvar_name']})):
1281
+
1282
+			$files = explode(",", $post->{$cf['htmlvar_name']});
1283
+			if (!empty($files)):
1284
+
1285
+				$extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
1286
+				$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
1287
+
1288
+				$file_paths = '';
1289
+				foreach ($files as $file) {
1290
+					if (!empty($file)) {
1291
+
1292
+						// $filetype = wp_check_filetype($file);
1293
+
1294
+						$image_name_arr = explode('/', $file);
1295
+						$curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
1296
+						$filename = end($image_name_arr);
1297
+						$img_name_arr = explode('.', $filename);
1298
+
1299
+						$arr_file_type = wp_check_filetype($filename);
1300
+						if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
1301
+							continue;
1302
+						}
1303
+
1304
+						$uploaded_file_type = $arr_file_type['type'];
1305
+						$uploaded_file_ext = $arr_file_type['ext'];
1306
+
1307
+						if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
1308
+							continue; // Invalid file type.
1309
+						}
1310
+
1311
+						//$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
1312
+						$image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');
1313
+
1314
+						// If the uploaded file is image
1315
+						if (in_array($uploaded_file_type, $image_file_types)) {
1316
+							$file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';
1317
+							$file_paths .= '<a href="'.$file.'">';
1318
+							$file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);
1319
+							$file_paths .= '</a>';
1320
+							//$file_paths .= '<img src="'.$file.'"  />';	
1321
+							$file_paths .= '</div>';
1322
+						} else {
1323
+							$ext_path = '_' . $html_var . '_';
1324
+							$filename = explode($ext_path, $filename);
1325
+							$file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
1326
+						}
1327
+					}
1328
+				}
1329
+
1330
+				$field_icon = geodir_field_icon_proccess($cf);
1331
+				if (strpos($field_icon, 'http') !== false) {
1332
+					$field_icon_af = '';
1333
+				} elseif ($field_icon == '') {
1334
+					$field_icon_af = '';
1335
+				} else {
1336
+					$field_icon_af = $field_icon;
1337
+					$field_icon = '';
1338
+				}
1339
+
1340
+				$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
1341
+				$html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
1342
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1343
+				$html .= '</span>';
1344
+				$html .= $file_paths . '</div></div>';
1345
+
1346
+			endif;
1347
+		endif;
1348
+
1349
+	}
1350
+
1351
+	return $html;
1352 1352
 }
1353 1353
 add_filter('geodir_custom_field_output_file','geodir_cf_file',10,3);
1354 1354
 
@@ -1366,80 +1366,80 @@  discard block
 block discarded – undo
1366 1366
  */
1367 1367
 function geodir_cf_textarea($html,$location,$cf,$p=''){
1368 1368
 
1369
-    // check we have the post value
1370
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1371
-    else{ global $post;}
1372
-
1373
-    if(!is_array($cf) && $cf!=''){
1374
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1375
-        if(!$cf){return NULL;}
1376
-    }
1377
-
1378
-    $html_var = $cf['htmlvar_name'];
1379
-
1380
-    // Check if there is a location specific filter.
1381
-    if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
1382
-        /**
1383
-         * Filter the textarea html by location.
1384
-         *
1385
-         * @param string $html The html to filter.
1386
-         * @param array $cf The custom field array.
1387
-         * @since 1.6.6
1388
-         */
1389
-        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
1390
-    }
1391
-
1392
-    // Check if there is a custom field specific filter.
1393
-    if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
1394
-        /**
1395
-         * Filter the textarea html by individual custom field.
1396
-         *
1397
-         * @param string $html The html to filter.
1398
-         * @param string $location The location to output the html.
1399
-         * @param array $cf The custom field array.
1400
-         * @since 1.6.6
1401
-         */
1402
-        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
1403
-    }
1404
-
1405
-    // Check if there is a custom field key specific filter.
1406
-    if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
1407
-        /**
1408
-         * Filter the textarea html by field type key.
1409
-         *
1410
-         * @param string $html The html to filter.
1411
-         * @param string $location The location to output the html.
1412
-         * @param array $cf The custom field array.
1413
-         * @since 1.6.6
1414
-         */
1415
-        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
1416
-    }
1417
-
1418
-    // If not html then we run the standard output.
1419
-    if(empty($html)){
1420
-
1421
-        if (!empty($post->{$cf['htmlvar_name']})) {
1422
-
1423
-            $field_icon = geodir_field_icon_proccess($cf);
1424
-            if (strpos($field_icon, 'http') !== false) {
1425
-                $field_icon_af = '';
1426
-            } elseif ($field_icon == '') {
1427
-                $field_icon_af = '';
1428
-            } else {
1429
-                $field_icon_af = $field_icon;
1430
-                $field_icon = '';
1431
-            }
1432
-
1433
-
1434
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
1435
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1436
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
1437
-
1438
-        }
1439
-
1440
-    }
1441
-
1442
-    return $html;
1369
+	// check we have the post value
1370
+	if(is_int($p)){$post = geodir_get_post_info($p);}
1371
+	else{ global $post;}
1372
+
1373
+	if(!is_array($cf) && $cf!=''){
1374
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1375
+		if(!$cf){return NULL;}
1376
+	}
1377
+
1378
+	$html_var = $cf['htmlvar_name'];
1379
+
1380
+	// Check if there is a location specific filter.
1381
+	if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
1382
+		/**
1383
+		 * Filter the textarea html by location.
1384
+		 *
1385
+		 * @param string $html The html to filter.
1386
+		 * @param array $cf The custom field array.
1387
+		 * @since 1.6.6
1388
+		 */
1389
+		$html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
1390
+	}
1391
+
1392
+	// Check if there is a custom field specific filter.
1393
+	if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
1394
+		/**
1395
+		 * Filter the textarea html by individual custom field.
1396
+		 *
1397
+		 * @param string $html The html to filter.
1398
+		 * @param string $location The location to output the html.
1399
+		 * @param array $cf The custom field array.
1400
+		 * @since 1.6.6
1401
+		 */
1402
+		$html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
1403
+	}
1404
+
1405
+	// Check if there is a custom field key specific filter.
1406
+	if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
1407
+		/**
1408
+		 * Filter the textarea html by field type key.
1409
+		 *
1410
+		 * @param string $html The html to filter.
1411
+		 * @param string $location The location to output the html.
1412
+		 * @param array $cf The custom field array.
1413
+		 * @since 1.6.6
1414
+		 */
1415
+		$html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
1416
+	}
1417
+
1418
+	// If not html then we run the standard output.
1419
+	if(empty($html)){
1420
+
1421
+		if (!empty($post->{$cf['htmlvar_name']})) {
1422
+
1423
+			$field_icon = geodir_field_icon_proccess($cf);
1424
+			if (strpos($field_icon, 'http') !== false) {
1425
+				$field_icon_af = '';
1426
+			} elseif ($field_icon == '') {
1427
+				$field_icon_af = '';
1428
+			} else {
1429
+				$field_icon_af = $field_icon;
1430
+				$field_icon = '';
1431
+			}
1432
+
1433
+
1434
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
1435
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1436
+			$html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
1437
+
1438
+		}
1439
+
1440
+	}
1441
+
1442
+	return $html;
1443 1443
 }
1444 1444
 add_filter('geodir_custom_field_output_textarea','geodir_cf_textarea',10,3);
1445 1445
 
@@ -1457,79 +1457,79 @@  discard block
 block discarded – undo
1457 1457
  */
1458 1458
 function geodir_cf_html($html,$location,$cf,$p=''){
1459 1459
 
1460
-    // check we have the post value
1461
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1462
-    else{ global $post;}
1463
-
1464
-    if(!is_array($cf) && $cf!=''){
1465
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1466
-        if(!$cf){return NULL;}
1467
-    }
1468
-
1469
-    $html_var = $cf['htmlvar_name'];
1470
-
1471
-    // Check if there is a location specific filter.
1472
-    if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
1473
-        /**
1474
-         * Filter the html html by location.
1475
-         *
1476
-         * @param string $html The html to filter.
1477
-         * @param array $cf The custom field array.
1478
-         * @since 1.6.6
1479
-         */
1480
-        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
1481
-    }
1482
-
1483
-    // Check if there is a custom field specific filter.
1484
-    if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
1485
-        /**
1486
-         * Filter the html html by individual custom field.
1487
-         *
1488
-         * @param string $html The html to filter.
1489
-         * @param string $location The location to output the html.
1490
-         * @param array $cf The custom field array.
1491
-         * @since 1.6.6
1492
-         */
1493
-        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
1494
-    }
1495
-
1496
-    // Check if there is a custom field key specific filter.
1497
-    if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
1498
-        /**
1499
-         * Filter the html html by field type key.
1500
-         *
1501
-         * @param string $html The html to filter.
1502
-         * @param string $location The location to output the html.
1503
-         * @param array $cf The custom field array.
1504
-         * @since 1.6.6
1505
-         */
1506
-        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
1507
-    }
1508
-
1509
-    // If not html then we run the standard output.
1510
-    if(empty($html)){
1511
-
1512
-        if (!empty($post->{$cf['htmlvar_name']})) {
1513
-
1514
-            $field_icon = geodir_field_icon_proccess($cf);
1515
-            if (strpos($field_icon, 'http') !== false) {
1516
-                $field_icon_af = '';
1517
-            } elseif ($field_icon == '') {
1518
-                $field_icon_af = '';
1519
-            } else {
1520
-                $field_icon_af = $field_icon;
1521
-                $field_icon = '';
1522
-            }
1523
-
1524
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
1525
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1526
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
1527
-
1528
-        }
1529
-
1530
-    }
1531
-
1532
-    return $html;
1460
+	// check we have the post value
1461
+	if(is_int($p)){$post = geodir_get_post_info($p);}
1462
+	else{ global $post;}
1463
+
1464
+	if(!is_array($cf) && $cf!=''){
1465
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1466
+		if(!$cf){return NULL;}
1467
+	}
1468
+
1469
+	$html_var = $cf['htmlvar_name'];
1470
+
1471
+	// Check if there is a location specific filter.
1472
+	if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
1473
+		/**
1474
+		 * Filter the html html by location.
1475
+		 *
1476
+		 * @param string $html The html to filter.
1477
+		 * @param array $cf The custom field array.
1478
+		 * @since 1.6.6
1479
+		 */
1480
+		$html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
1481
+	}
1482
+
1483
+	// Check if there is a custom field specific filter.
1484
+	if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
1485
+		/**
1486
+		 * Filter the html html by individual custom field.
1487
+		 *
1488
+		 * @param string $html The html to filter.
1489
+		 * @param string $location The location to output the html.
1490
+		 * @param array $cf The custom field array.
1491
+		 * @since 1.6.6
1492
+		 */
1493
+		$html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
1494
+	}
1495
+
1496
+	// Check if there is a custom field key specific filter.
1497
+	if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
1498
+		/**
1499
+		 * Filter the html html by field type key.
1500
+		 *
1501
+		 * @param string $html The html to filter.
1502
+		 * @param string $location The location to output the html.
1503
+		 * @param array $cf The custom field array.
1504
+		 * @since 1.6.6
1505
+		 */
1506
+		$html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
1507
+	}
1508
+
1509
+	// If not html then we run the standard output.
1510
+	if(empty($html)){
1511
+
1512
+		if (!empty($post->{$cf['htmlvar_name']})) {
1513
+
1514
+			$field_icon = geodir_field_icon_proccess($cf);
1515
+			if (strpos($field_icon, 'http') !== false) {
1516
+				$field_icon_af = '';
1517
+			} elseif ($field_icon == '') {
1518
+				$field_icon_af = '';
1519
+			} else {
1520
+				$field_icon_af = $field_icon;
1521
+				$field_icon = '';
1522
+			}
1523
+
1524
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
1525
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1526
+			$html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
1527
+
1528
+		}
1529
+
1530
+	}
1531
+
1532
+	return $html;
1533 1533
 }
1534 1534
 add_filter('geodir_custom_field_output_html','geodir_cf_html',10,3);
1535 1535
 
@@ -1547,113 +1547,113 @@  discard block
 block discarded – undo
1547 1547
  */
1548 1548
 function geodir_cf_taxonomy($html,$location,$cf,$p=''){
1549 1549
 
1550
-    // check we have the post value
1551
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1552
-    else{ global $post;}
1553
-
1554
-    if(!is_array($cf) && $cf!=''){
1555
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1556
-        if(!$cf){return NULL;}
1557
-    }
1558
-
1559
-    $html_var = $cf['htmlvar_name'];
1560
-
1561
-    // Check if there is a location specific filter.
1562
-    if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
1563
-        /**
1564
-         * Filter the taxonomy html by location.
1565
-         *
1566
-         * @param string $html The html to filter.
1567
-         * @param array $cf The custom field array.
1568
-         * @since 1.6.6
1569
-         */
1570
-        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
1571
-    }
1572
-
1573
-    // Check if there is a custom field specific filter.
1574
-    if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
1575
-        /**
1576
-         * Filter the taxonomy html by individual custom field.
1577
-         *
1578
-         * @param string $html The html to filter.
1579
-         * @param string $location The location to output the html.
1580
-         * @param array $cf The custom field array.
1581
-         * @since 1.6.6
1582
-         */
1583
-        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
1584
-    }
1585
-
1586
-    // Check if there is a custom field key specific filter.
1587
-    if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
1588
-        /**
1589
-         * Filter the taxonomy html by field type key.
1590
-         *
1591
-         * @param string $html The html to filter.
1592
-         * @param string $location The location to output the html.
1593
-         * @param array $cf The custom field array.
1594
-         * @since 1.6.6
1595
-         */
1596
-        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
1597
-    }
1598
-
1599
-    // If not html then we run the standard output.
1600
-    if(empty($html)){
1601
-
1602
-        if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
1603
-            $post_taxonomy = $post->post_type . 'category';
1604
-            $field_value = $post->{$html_var};
1605
-            $links = array();
1606
-            $terms = array();
1607
-            $termsOrdered = array();
1608
-            if (!is_array($field_value)) {
1609
-                $field_value = explode(",", trim($field_value, ","));
1610
-            }
1611
-
1612
-            $field_value = array_unique($field_value);
1613
-
1614
-            if (!empty($field_value)) {
1615
-                foreach ($field_value as $term) {
1616
-                    $term = trim($term);
1617
-
1618
-                    if ($term != '') {
1619
-                        $term = get_term_by('id', $term, $html_var);
1620
-                        if (is_object($term)) {
1621
-                            $links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
1622
-                            $terms[] = $term;
1623
-                        }
1624
-                    }
1625
-                }
1626
-                if (!empty($links)) {
1627
-                    // order alphabetically
1628
-                    asort($links);
1629
-                    foreach (array_keys($links) as $key) {
1630
-                        $termsOrdered[$key] = $terms[$key];
1631
-                    }
1632
-                    $terms = $termsOrdered;
1633
-                }
1634
-            }
1635
-            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
1636
-
1637
-            if ($html_value != '') {
1638
-                $field_icon = geodir_field_icon_proccess($cf);
1639
-                if (strpos($field_icon, 'http') !== false) {
1640
-                    $field_icon_af = '';
1641
-                } else if ($field_icon == '') {
1642
-                    $field_icon_af = '';
1643
-                } else {
1644
-                    $field_icon_af = $field_icon;
1645
-                    $field_icon = '';
1646
-                }
1647
-
1648
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
1649
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1650
-                $html .= '</span> ' . $html_value . '</div>';
1651
-            }
1652
-        }
1653
-
1654
-    }
1655
-
1656
-    return $html;
1550
+	// check we have the post value
1551
+	if(is_int($p)){$post = geodir_get_post_info($p);}
1552
+	else{ global $post;}
1553
+
1554
+	if(!is_array($cf) && $cf!=''){
1555
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1556
+		if(!$cf){return NULL;}
1557
+	}
1558
+
1559
+	$html_var = $cf['htmlvar_name'];
1560
+
1561
+	// Check if there is a location specific filter.
1562
+	if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
1563
+		/**
1564
+		 * Filter the taxonomy html by location.
1565
+		 *
1566
+		 * @param string $html The html to filter.
1567
+		 * @param array $cf The custom field array.
1568
+		 * @since 1.6.6
1569
+		 */
1570
+		$html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
1571
+	}
1572
+
1573
+	// Check if there is a custom field specific filter.
1574
+	if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
1575
+		/**
1576
+		 * Filter the taxonomy html by individual custom field.
1577
+		 *
1578
+		 * @param string $html The html to filter.
1579
+		 * @param string $location The location to output the html.
1580
+		 * @param array $cf The custom field array.
1581
+		 * @since 1.6.6
1582
+		 */
1583
+		$html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
1584
+	}
1585
+
1586
+	// Check if there is a custom field key specific filter.
1587
+	if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
1588
+		/**
1589
+		 * Filter the taxonomy html by field type key.
1590
+		 *
1591
+		 * @param string $html The html to filter.
1592
+		 * @param string $location The location to output the html.
1593
+		 * @param array $cf The custom field array.
1594
+		 * @since 1.6.6
1595
+		 */
1596
+		$html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
1597
+	}
1598
+
1599
+	// If not html then we run the standard output.
1600
+	if(empty($html)){
1601
+
1602
+		if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
1603
+			$post_taxonomy = $post->post_type . 'category';
1604
+			$field_value = $post->{$html_var};
1605
+			$links = array();
1606
+			$terms = array();
1607
+			$termsOrdered = array();
1608
+			if (!is_array($field_value)) {
1609
+				$field_value = explode(",", trim($field_value, ","));
1610
+			}
1611
+
1612
+			$field_value = array_unique($field_value);
1613
+
1614
+			if (!empty($field_value)) {
1615
+				foreach ($field_value as $term) {
1616
+					$term = trim($term);
1617
+
1618
+					if ($term != '') {
1619
+						$term = get_term_by('id', $term, $html_var);
1620
+						if (is_object($term)) {
1621
+							$links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
1622
+							$terms[] = $term;
1623
+						}
1624
+					}
1625
+				}
1626
+				if (!empty($links)) {
1627
+					// order alphabetically
1628
+					asort($links);
1629
+					foreach (array_keys($links) as $key) {
1630
+						$termsOrdered[$key] = $terms[$key];
1631
+					}
1632
+					$terms = $termsOrdered;
1633
+				}
1634
+			}
1635
+			$html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
1636
+
1637
+			if ($html_value != '') {
1638
+				$field_icon = geodir_field_icon_proccess($cf);
1639
+				if (strpos($field_icon, 'http') !== false) {
1640
+					$field_icon_af = '';
1641
+				} else if ($field_icon == '') {
1642
+					$field_icon_af = '';
1643
+				} else {
1644
+					$field_icon_af = $field_icon;
1645
+					$field_icon = '';
1646
+				}
1647
+
1648
+				$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
1649
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
1650
+				$html .= '</span> ' . $html_value . '</div>';
1651
+			}
1652
+		}
1653
+
1654
+	}
1655
+
1656
+	return $html;
1657 1657
 }
1658 1658
 add_filter('geodir_custom_field_output_taxonomy','geodir_cf_taxonomy',10,3);
1659 1659
 
@@ -1670,161 +1670,161 @@  discard block
 block discarded – undo
1670 1670
  */
1671 1671
 function geodir_cf_address($html,$location,$cf,$p=''){
1672 1672
 
1673
-    // check we have the post value
1674
-    if(is_int($p)){$post = geodir_get_post_info($p);}
1675
-    else{ global $post;}
1676
-
1677
-    if(!is_array($cf) && $cf!=''){
1678
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1679
-        if(!$cf){return NULL;}
1680
-    }
1681
-
1682
-    $html_var = $cf['htmlvar_name'];
1683
-
1684
-    // Check if there is a location specific filter.
1685
-    if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
1686
-        /**
1687
-         * Filter the address html by location.
1688
-         *
1689
-         * @param string $html The html to filter.
1690
-         * @param array $cf The custom field array.
1691
-         * @since 1.6.6
1692
-         */
1693
-        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
1694
-    }
1695
-
1696
-    // Check if there is a custom field specific filter.
1697
-    if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
1698
-        /**
1699
-         * Filter the address html by individual custom field.
1700
-         *
1701
-         * @param string $html The html to filter.
1702
-         * @param string $location The location to output the html.
1703
-         * @param array $cf The custom field array.
1704
-         * @since 1.6.6
1705
-         */
1706
-        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
1707
-    }
1708
-
1709
-    // Check if there is a custom field key specific filter.
1710
-    if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
1711
-        /**
1712
-         * Filter the address html by field type key.
1713
-         *
1714
-         * @param string $html The html to filter.
1715
-         * @param string $location The location to output the html.
1716
-         * @param array $cf The custom field array.
1717
-         * @since 1.6.6
1718
-         */
1719
-        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
1720
-    }
1721
-
1722
-    // If not html then we run the standard output.
1723
-    if(empty($html)){
1724
-
1725
-        global $preview;
1726
-        $html_var = $cf['htmlvar_name'] . '_address';
1727
-
1728
-        if ($cf['extra_fields']) {
1729
-
1730
-            $extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
1731
-
1732
-            $addition_fields = '';
1733
-
1734
-            if (!empty($extra_fields)) {
1735
-
1736
-                $show_city_in_address = false;
1737
-                if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
1738
-                    $show_city_in_address = true;
1739
-                }
1740
-                /**
1741
-                 * Filter "show city in address" value.
1742
-                 *
1743
-                 * @since 1.0.0
1744
-                 */
1745
-                $show_city_in_address = apply_filters('geodir_show_city_in_address', $show_city_in_address);
1746
-
1747
-
1748
-                $show_region_in_address = false;
1749
-                if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
1750
-                    $show_region_in_address = true;
1751
-                }
1752
-                /**
1753
-                 * Filter "show region in address" value.
1754
-                 *
1755
-                 * @since 1.6.6
1756
-                 */
1757
-                $show_region_in_address = apply_filters('geodir_show_region_in_address', $show_region_in_address);
1758
-
1759
-                $show_country_in_address = false;
1760
-                if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
1761
-                    $show_country_in_address = true;
1762
-                }
1763
-                /**
1764
-                 * Filter "show country in address" value.
1765
-                 *
1766
-                 * @since 1.6.6
1767
-                 */
1768
-                $show_country_in_address = apply_filters('geodir_show_country_in_address', $show_country_in_address);
1769
-
1770
-                $show_zip_in_address = false;
1771
-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
1772
-                    $show_zip_in_address = true;
1773
-                }
1774
-                /**
1775
-                 * Filter "show zip in address" value.
1776
-                 *
1777
-                 * @since 1.6.6
1778
-                 */
1779
-                $show_zip_in_address = apply_filters('geodir_show_zip_in_address', $show_zip_in_address);
1780
-
1781
-
1782
-            }
1783
-
1784
-        }
1785
-
1786
-
1787
-        if ($post->{$html_var}) {
1788
-
1789
-            $field_icon = geodir_field_icon_proccess( $cf );
1790
-            if ( strpos( $field_icon, 'http' ) !== false ) {
1791
-                $field_icon_af = '';
1792
-            } elseif ( $field_icon == '' ) {
1793
-                $field_icon_af = '<i class="fa fa-home"></i>';
1794
-            } else {
1795
-                $field_icon_af = $field_icon;
1796
-                $field_icon    = '';
1797
-            }
1673
+	// check we have the post value
1674
+	if(is_int($p)){$post = geodir_get_post_info($p);}
1675
+	else{ global $post;}
1676
+
1677
+	if(!is_array($cf) && $cf!=''){
1678
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
1679
+		if(!$cf){return NULL;}
1680
+	}
1681
+
1682
+	$html_var = $cf['htmlvar_name'];
1683
+
1684
+	// Check if there is a location specific filter.
1685
+	if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
1686
+		/**
1687
+		 * Filter the address html by location.
1688
+		 *
1689
+		 * @param string $html The html to filter.
1690
+		 * @param array $cf The custom field array.
1691
+		 * @since 1.6.6
1692
+		 */
1693
+		$html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
1694
+	}
1695
+
1696
+	// Check if there is a custom field specific filter.
1697
+	if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
1698
+		/**
1699
+		 * Filter the address html by individual custom field.
1700
+		 *
1701
+		 * @param string $html The html to filter.
1702
+		 * @param string $location The location to output the html.
1703
+		 * @param array $cf The custom field array.
1704
+		 * @since 1.6.6
1705
+		 */
1706
+		$html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
1707
+	}
1708
+
1709
+	// Check if there is a custom field key specific filter.
1710
+	if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
1711
+		/**
1712
+		 * Filter the address html by field type key.
1713
+		 *
1714
+		 * @param string $html The html to filter.
1715
+		 * @param string $location The location to output the html.
1716
+		 * @param array $cf The custom field array.
1717
+		 * @since 1.6.6
1718
+		 */
1719
+		$html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
1720
+	}
1721
+
1722
+	// If not html then we run the standard output.
1723
+	if(empty($html)){
1724
+
1725
+		global $preview;
1726
+		$html_var = $cf['htmlvar_name'] . '_address';
1727
+
1728
+		if ($cf['extra_fields']) {
1729
+
1730
+			$extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
1731
+
1732
+			$addition_fields = '';
1733
+
1734
+			if (!empty($extra_fields)) {
1735
+
1736
+				$show_city_in_address = false;
1737
+				if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
1738
+					$show_city_in_address = true;
1739
+				}
1740
+				/**
1741
+				 * Filter "show city in address" value.
1742
+				 *
1743
+				 * @since 1.0.0
1744
+				 */
1745
+				$show_city_in_address = apply_filters('geodir_show_city_in_address', $show_city_in_address);
1746
+
1747
+
1748
+				$show_region_in_address = false;
1749
+				if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
1750
+					$show_region_in_address = true;
1751
+				}
1752
+				/**
1753
+				 * Filter "show region in address" value.
1754
+				 *
1755
+				 * @since 1.6.6
1756
+				 */
1757
+				$show_region_in_address = apply_filters('geodir_show_region_in_address', $show_region_in_address);
1758
+
1759
+				$show_country_in_address = false;
1760
+				if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
1761
+					$show_country_in_address = true;
1762
+				}
1763
+				/**
1764
+				 * Filter "show country in address" value.
1765
+				 *
1766
+				 * @since 1.6.6
1767
+				 */
1768
+				$show_country_in_address = apply_filters('geodir_show_country_in_address', $show_country_in_address);
1769
+
1770
+				$show_zip_in_address = false;
1771
+				if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
1772
+					$show_zip_in_address = true;
1773
+				}
1774
+				/**
1775
+				 * Filter "show zip in address" value.
1776
+				 *
1777
+				 * @since 1.6.6
1778
+				 */
1779
+				$show_zip_in_address = apply_filters('geodir_show_zip_in_address', $show_zip_in_address);
1780
+
1781
+
1782
+			}
1783
+
1784
+		}
1785
+
1786
+
1787
+		if ($post->{$html_var}) {
1788
+
1789
+			$field_icon = geodir_field_icon_proccess( $cf );
1790
+			if ( strpos( $field_icon, 'http' ) !== false ) {
1791
+				$field_icon_af = '';
1792
+			} elseif ( $field_icon == '' ) {
1793
+				$field_icon_af = '<i class="fa fa-home"></i>';
1794
+			} else {
1795
+				$field_icon_af = $field_icon;
1796
+				$field_icon    = '';
1797
+			}
1798 1798
             
1799 1799
 
1800 1800
 
1801
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
1802
-            $html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
1803
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
1804
-            $html .= '</span>';
1801
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
1802
+			$html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
1803
+			$html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
1804
+			$html .= '</span>';
1805 1805
 
1806
-            if ( isset($post->post_address) ) {
1807
-                $html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';
1808
-            }
1809
-            if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
1810
-                $html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';
1811
-            }
1812
-            if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
1813
-                $html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';
1814
-            }
1815
-            if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
1816
-                $html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';
1817
-            }
1818
-            if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
1819
-                $html .= '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span><br>';
1820
-            }
1821
-            $html .= '</div>';
1806
+			if ( isset($post->post_address) ) {
1807
+				$html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';
1808
+			}
1809
+			if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
1810
+				$html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';
1811
+			}
1812
+			if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
1813
+				$html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';
1814
+			}
1815
+			if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
1816
+				$html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';
1817
+			}
1818
+			if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
1819
+				$html .= '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span><br>';
1820
+			}
1821
+			$html .= '</div>';
1822 1822
 
1823
-        }
1823
+		}
1824 1824
 
1825
-    }
1825
+	}
1826 1826
 
1827 1827
 
1828
-    return $html;
1828
+	return $html;
1829 1829
 }
1830 1830
 add_filter('geodir_custom_field_output_address','geodir_cf_address',10,3);
1831 1831
\ No newline at end of file
Please login to merge, or discard this patch.
geodirectory-functions/ajax_handler_functions.php 3 patches
Braces   +27 added lines, -20 removed lines patch added patch discarded remove patch
@@ -112,10 +112,11 @@  discard block
 block discarded – undo
112 112
     }
113 113
 
114 114
     if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
115
-        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))
116
-            geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
117
-        else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))
118
-            geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
115
+        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude'])) {
116
+                    geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
117
+        } else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax'])) {
118
+                    geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
119
+        }
119 120
     }
120 121
 
121 122
     if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {
@@ -137,12 +138,13 @@  discard block
 block discarded – undo
137 138
         if (current_user_can('manage_options')) {
138 139
             switch ($_REQUEST['geodir_autofill']):
139 140
                 case "geodir_dummy_delete" :
140
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
141
-                        return;
141
+                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) {
142
+                                            return;
143
+                    }
142 144
 
143 145
                     $datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';
144
-                    if (isset($_REQUEST['posttype']))
145
-                        /**
146
+                    if (isset($_REQUEST['posttype'])) {
147
+                                            /**
146 148
                          * Used to delete the dummy post data per post type.
147 149
                          *
148 150
                          * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].
@@ -151,11 +153,13 @@  discard block
 block discarded – undo
151 153
                          * @param string $posttype The post type to insert.
152 154
                          * @param string $datatype The type of dummy data to insert.
153 155
                          */
154
-                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
156
+                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
157
+                    }
155 158
                     break;
156 159
                 case "geodir_dummy_insert" :
157
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
158
-                        return;
160
+                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) {
161
+                                            return;
162
+                    }
159 163
 
160 164
                     global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
161 165
                     $city_bound_lat1 = $_REQUEST['city_bound_lat1'];
@@ -254,8 +258,9 @@  discard block
 block discarded – undo
254 258
                         } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
255 259
                             $redirect_to = get_permalink(geodir_add_listing_page_id());
256 260
                             $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
257
-                        } else
258
-                            $redirect_to = get_permalink(geodir_add_listing_page_id());
261
+                        } else {
262
+                                                    $redirect_to = get_permalink(geodir_add_listing_page_id());
263
+                        }
259 264
 
260 265
                         wp_redirect($redirect_to);
261 266
                     } else {
@@ -268,9 +273,9 @@  discard block
 block discarded – undo
268 273
 
269 274
                     $gd_session->un_set('listing');
270 275
 
271
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))
272
-                        wp_redirect(get_permalink($_REQUEST['pid']));
273
-                    else {
276
+                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid'])) {
277
+                                            wp_redirect(get_permalink($_REQUEST['pid']));
278
+                    } else {
274 279
                         geodir_remove_temp_images();
275 280
                         wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
276 281
                     }
@@ -298,8 +303,9 @@  discard block
 block discarded – undo
298 303
                             } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
299 304
                                 $redirect_to = get_permalink(geodir_add_listing_page_id());
300 305
                                 $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
301
-                            } else
302
-                                $redirect_to = get_permalink(geodir_add_listing_page_id());
306
+                            } else {
307
+                                                            $redirect_to = get_permalink(geodir_add_listing_page_id());
308
+                            }
303 309
 
304 310
                             $gd_session->un_set('listing');
305 311
                             wp_redirect($redirect_to);
@@ -320,8 +326,9 @@  discard block
 block discarded – undo
320 326
                             $lastid = wp_delete_post($_REQUEST['pid']);
321 327
                         }
322 328
 
323
-                        if ($lastid && !is_wp_error($lastid))
324
-                            wp_redirect($_SERVER['HTTP_REFERER']);
329
+                        if ($lastid && !is_wp_error($lastid)) {
330
+                                                    wp_redirect($_SERVER['HTTP_REFERER']);
331
+                        }
325 332
 
326 333
                         //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
327 334
                     }
Please login to merge, or discard this patch.
Indentation   +314 added lines, -314 removed lines patch added patch discarded remove patch
@@ -16,22 +16,22 @@  discard block
 block discarded – undo
16 16
  */
17 17
 function geodir_on_wp_loaded()
18 18
 {
19
-    /**
20
-     * Called on the wp_loaded WP hook and used to send the send inquiry and send to friend forms.
21
-     *
22
-     * @since 1.0.0
23
-     */
24
-    do_action('giodir_handle_request_plugins_loaded');
25
-    global $wpdb;
19
+	/**
20
+	 * Called on the wp_loaded WP hook and used to send the send inquiry and send to friend forms.
21
+	 *
22
+	 * @since 1.0.0
23
+	 */
24
+	do_action('giodir_handle_request_plugins_loaded');
25
+	global $wpdb;
26 26
 
27 27
 
28
-    if (isset($_POST['sendact']) && $_POST['sendact'] == 'send_inqury') {
29
-        geodir_send_inquiry($_REQUEST); // function in custom_functions.php
28
+	if (isset($_POST['sendact']) && $_POST['sendact'] == 'send_inqury') {
29
+		geodir_send_inquiry($_REQUEST); // function in custom_functions.php
30 30
 
31
-    } elseif (isset($_POST['sendact']) && $_POST['sendact'] == 'email_frnd') {
32
-        geodir_send_friend($_REQUEST); // function in custom_functions.php
31
+	} elseif (isset($_POST['sendact']) && $_POST['sendact'] == 'email_frnd') {
32
+		geodir_send_friend($_REQUEST); // function in custom_functions.php
33 33
 
34
-    }
34
+	}
35 35
 
36 36
 }
37 37
 
@@ -44,9 +44,9 @@  discard block
 block discarded – undo
44 44
  */
45 45
 function geodir_on_wp()
46 46
 {
47
-    if(geodir_is_page('login')) {
48
-        geodir_user_signup();
49
-    }
47
+	if(geodir_is_page('login')) {
48
+		geodir_user_signup();
49
+	}
50 50
 
51 51
 }
52 52
 
@@ -59,32 +59,32 @@  discard block
 block discarded – undo
59 59
  */
60 60
 function geodir_on_init()
61 61
 {
62
-    /**
63
-     * Called on the wp_init WP hook at the start of the geodir_on_init() function.
64
-     *
65
-     * @since 1.0.0
66
-     */
67
-    do_action('giodir_handle_request');
68
-    global $wpdb;
62
+	/**
63
+	 * Called on the wp_init WP hook at the start of the geodir_on_init() function.
64
+	 *
65
+	 * @since 1.0.0
66
+	 */
67
+	do_action('giodir_handle_request');
68
+	global $wpdb;
69 69
 
70 70
 
71 71
 
72 72
 
73
-    if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && !current_user_can('manage_options') && !class_exists('BuddyPress')) {
74
-        show_admin_bar(false);
75
-    }
73
+	if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && !current_user_can('manage_options') && !class_exists('BuddyPress')) {
74
+		show_admin_bar(false);
75
+	}
76 76
 
77 77
 
78
-    if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'get_markers') {
79
-        /**
80
-         * Contains map marker functions.
81
-         *
82
-         * @since 1.0.0
83
-         * @package GeoDirectory
84
-         */
85
-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
86
-        die;
87
-    }
78
+	if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'get_markers') {
79
+		/**
80
+		 * Contains map marker functions.
81
+		 *
82
+		 * @since 1.0.0
83
+		 * @package GeoDirectory
84
+		 */
85
+		include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
86
+		die;
87
+	}
88 88
 
89 89
 
90 90
 
@@ -104,294 +104,294 @@  discard block
 block discarded – undo
104 104
  * @todo check if nonce is required here and if so add one.
105 105
  */
106 106
 function geodir_ajax_handler() {
107
-    global $wpdb, $gd_session,$post;
107
+	global $wpdb, $gd_session,$post;
108 108
 
109
-    if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
109
+	if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
110 110
 		$gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);
111
-        echo '1';
112
-    }
113
-
114
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
115
-        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))
116
-            geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
117
-        else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))
118
-            geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
119
-    }
120
-
121
-    if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {
122
-        if (current_user_can('manage_options')) {
123
-            /**
124
-             * Contains admin ajax handling functions.
125
-             *
126
-             * @since 1.0.0
127
-             * @package GeoDirectory
128
-             */
129
-            include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');
130
-        } else {
131
-            wp_redirect(geodir_login_url());
132
-            gd_die();
133
-        }
134
-    }
135
-
136
-    if (isset($_REQUEST['geodir_autofill']) && $_REQUEST['geodir_autofill'] != '' && isset($_REQUEST['_wpnonce'])) {
137
-        if (current_user_can('manage_options')) {
138
-            switch ($_REQUEST['geodir_autofill']):
139
-                case "geodir_dummy_delete" :
140
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
141
-                        return;
142
-
143
-                    $datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';
144
-                    if (isset($_REQUEST['posttype']))
145
-                        /**
146
-                         * Used to delete the dummy post data per post type.
147
-                         *
148
-                         * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].
149
-                         *
150
-                         * @since 1.6.11
151
-                         * @param string $posttype The post type to insert.
152
-                         * @param string $datatype The type of dummy data to insert.
153
-                         */
154
-                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
155
-                    break;
156
-                case "geodir_dummy_insert" :
157
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
158
-                        return;
159
-
160
-                    global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
161
-                    $city_bound_lat1 = $_REQUEST['city_bound_lat1'];
162
-                    $city_bound_lng1 = $_REQUEST['city_bound_lng1'];
163
-                    $city_bound_lat2 = $_REQUEST['city_bound_lat2'];
164
-                    $city_bound_lng2 = $_REQUEST['city_bound_lng2'];
165
-
166
-                    if (isset($_REQUEST['posttype'])){
167
-                        /**
168
-                         * Used to insert the dummy post data per post type.
169
-                         *
170
-                         * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].
171
-                         *
172
-                         * @since 1.6.11
173
-                         * @param string $posttype The post type to insert.
174
-                         * @param string $datatype The type of dummy data to insert.
175
-                         * @param int $post_index The item number to insert.
176
-                         */
177
-                        do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));
178
-                    }
179
-
180
-
181
-                    break;
182
-            endswitch;
183
-        } else {
184
-            wp_redirect(geodir_login_url());
185
-            exit();
186
-        }
187
-    }
188
-
189
-    if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {
190
-
191
-        if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
192
-            $template = locate_template(array("geodirectory/popup-forms.php"));
193
-            if (!$template) {
194
-                $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';
195
-            }
196
-            require_once($template);
197
-        }
198
-
199
-        gd_die();
200
-    }
201
-
202
-    /*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){
111
+		echo '1';
112
+	}
113
+
114
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
115
+		if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))
116
+			geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
117
+		else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))
118
+			geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
119
+	}
120
+
121
+	if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {
122
+		if (current_user_can('manage_options')) {
123
+			/**
124
+			 * Contains admin ajax handling functions.
125
+			 *
126
+			 * @since 1.0.0
127
+			 * @package GeoDirectory
128
+			 */
129
+			include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');
130
+		} else {
131
+			wp_redirect(geodir_login_url());
132
+			gd_die();
133
+		}
134
+	}
135
+
136
+	if (isset($_REQUEST['geodir_autofill']) && $_REQUEST['geodir_autofill'] != '' && isset($_REQUEST['_wpnonce'])) {
137
+		if (current_user_can('manage_options')) {
138
+			switch ($_REQUEST['geodir_autofill']):
139
+				case "geodir_dummy_delete" :
140
+					if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
141
+						return;
142
+
143
+					$datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';
144
+					if (isset($_REQUEST['posttype']))
145
+						/**
146
+						 * Used to delete the dummy post data per post type.
147
+						 *
148
+						 * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].
149
+						 *
150
+						 * @since 1.6.11
151
+						 * @param string $posttype The post type to insert.
152
+						 * @param string $datatype The type of dummy data to insert.
153
+						 */
154
+						do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
155
+					break;
156
+				case "geodir_dummy_insert" :
157
+					if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
158
+						return;
159
+
160
+					global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
161
+					$city_bound_lat1 = $_REQUEST['city_bound_lat1'];
162
+					$city_bound_lng1 = $_REQUEST['city_bound_lng1'];
163
+					$city_bound_lat2 = $_REQUEST['city_bound_lat2'];
164
+					$city_bound_lng2 = $_REQUEST['city_bound_lng2'];
165
+
166
+					if (isset($_REQUEST['posttype'])){
167
+						/**
168
+						 * Used to insert the dummy post data per post type.
169
+						 *
170
+						 * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].
171
+						 *
172
+						 * @since 1.6.11
173
+						 * @param string $posttype The post type to insert.
174
+						 * @param string $datatype The type of dummy data to insert.
175
+						 * @param int $post_index The item number to insert.
176
+						 */
177
+						do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));
178
+					}
179
+
180
+
181
+					break;
182
+			endswitch;
183
+		} else {
184
+			wp_redirect(geodir_login_url());
185
+			exit();
186
+		}
187
+	}
188
+
189
+	if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {
190
+
191
+		if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
192
+			$template = locate_template(array("geodirectory/popup-forms.php"));
193
+			if (!$template) {
194
+				$template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';
195
+			}
196
+			require_once($template);
197
+		}
198
+
199
+		gd_die();
200
+	}
201
+
202
+	/*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){
203 203
         include_once ( geodir_plugin_path() . '/geodirectory-templates/advance-search-form.php');
204 204
     }*/
205 205
 
206
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {
207
-        /**
208
-         * Contains map marker functions.
209
-         *
210
-         * @since 1.0.0
211
-         * @package GeoDirectory
212
-         */
213
-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
214
-    }
215
-
216
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
217
-        if (is_user_logged_in()) {
218
-            switch ($_REQUEST['ajax_action']):
219
-                case "add" :
220
-                    geodir_add_to_favorite((int)$_REQUEST['pid']);
221
-                    break;
222
-                case "remove" :
223
-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);
224
-                    break;
225
-            endswitch;
226
-        } else {
227
-            wp_redirect(geodir_login_url());
228
-            exit();
229
-        }
230
-    }
231
-
232
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {
233
-
234
-        $is_current_user_owner = true;
235
-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
236
-            $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);
237
-        }
238
-
239
-        $request = $gd_session->get('listing');
240
-
241
-        if (is_user_logged_in() && $is_current_user_owner) {
242
-
243
-            switch ($_REQUEST['ajax_action']):
244
-                case "add":
245
-                case "update":
246
-
247
-                    if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
248
-                        $last_id = geodir_save_listing();
249
-
250
-                        if ($last_id) {
251
-                            //$redirect_to = get_permalink( $last_id );
252
-                            $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
253
-
254
-                        } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
255
-                            $redirect_to = get_permalink(geodir_add_listing_page_id());
256
-                            $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
257
-                        } else
258
-                            $redirect_to = get_permalink(geodir_add_listing_page_id());
259
-
260
-                        wp_redirect($redirect_to);
261
-                    } else {
262
-                        $gd_session->un_set('listing');
263
-                        wp_redirect(home_url());
264
-                    }
265
-
266
-                    break;
267
-                case "cancel" :
268
-
269
-                    $gd_session->un_set('listing');
270
-
271
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))
272
-                        wp_redirect(get_permalink($_REQUEST['pid']));
273
-                    else {
274
-                        geodir_remove_temp_images();
275
-                        wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
276
-                    }
277
-
278
-                    break;
279
-
280
-                case "publish" :
281
-
282
-                    if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
283
-
284
-                        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
285
-                            $new_post = array();
286
-                            $new_post['ID'] = $_REQUEST['pid'];
287
-
288
-                            $lastid = wp_update_post($new_post);
289
-
290
-                            $gd_session->un_set('listing');
291
-                            wp_redirect(get_permalink($lastid));
292
-                        } else {
293
-                            $last_id = geodir_save_listing();
294
-
295
-                            if ($last_id) {
296
-                                //$redirect_to = get_permalink( $last_id );
297
-                                $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
298
-                            } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
299
-                                $redirect_to = get_permalink(geodir_add_listing_page_id());
300
-                                $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
301
-                            } else
302
-                                $redirect_to = get_permalink(geodir_add_listing_page_id());
303
-
304
-                            $gd_session->un_set('listing');
305
-                            wp_redirect($redirect_to);
306
-                        }
307
-                    } else {
308
-                        $gd_session->un_set('listing');
309
-                        wp_redirect(home_url());
310
-                    }
311
-
312
-                    break;
313
-                case "delete" :
314
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
315
-                        global $current_user;
316
-
317
-                        if (get_option('geodir_disable_perm_delete')) {
318
-                            $lastid = wp_trash_post($_REQUEST['pid']);
319
-                        } else {
320
-                            $lastid = wp_delete_post($_REQUEST['pid']);
321
-                        }
322
-
323
-                        if ($lastid && !is_wp_error($lastid))
324
-                            wp_redirect($_SERVER['HTTP_REFERER']);
325
-
326
-                        //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
327
-                    }
328
-                    break;
329
-            endswitch;
330
-
331
-            $gd_session->un_set('listing');
332
-        } else {
333
-            $gd_session->un_set('listing');
334
-            wp_redirect(geodir_login_url());
335
-            exit();
336
-        }
337
-    }
338
-
339
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {
340
-        /**
341
-         * Contains registration and login functions.
342
-         * @todo Fix the file path.
343
-         *
344
-         * @since 1.0.0
345
-         * @package GeoDirectory
346
-         */
347
-        include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');
348
-    }
349
-
350
-    if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {
351
-        $args = array('taxonomy' => sanitize_text_field($_REQUEST['term']));
352
-        if (!empty($_REQUEST['parent_only'])) {
353
-            $args['parent'] = 0;
354
-        }
355
-        $terms_o = get_terms($args);
356
-
357
-        // Skip terms which has no listing
358
-        if (!empty($terms_o)) {
359
-            $filter_terms = array();
360
-
361
-            foreach ($terms_o as $term) {
362
-                if (isset($term->count) && $term->count > 0) {
363
-                    $filter_terms[] = $term;
364
-                }
365
-            }
366
-            $terms_o = $filter_terms;
367
-        }
368
-
369
-        $terms = geodir_sort_terms($terms_o, 'count');
370
-        geodir_helper_cat_list_output($terms, intval($_REQUEST['limit']));
371
-        exit();
372
-    }
373
-
374
-    gd_die();
206
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {
207
+		/**
208
+		 * Contains map marker functions.
209
+		 *
210
+		 * @since 1.0.0
211
+		 * @package GeoDirectory
212
+		 */
213
+		include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
214
+	}
215
+
216
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
217
+		if (is_user_logged_in()) {
218
+			switch ($_REQUEST['ajax_action']):
219
+				case "add" :
220
+					geodir_add_to_favorite((int)$_REQUEST['pid']);
221
+					break;
222
+				case "remove" :
223
+					geodir_remove_from_favorite((int)$_REQUEST['pid']);
224
+					break;
225
+			endswitch;
226
+		} else {
227
+			wp_redirect(geodir_login_url());
228
+			exit();
229
+		}
230
+	}
231
+
232
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {
233
+
234
+		$is_current_user_owner = true;
235
+		if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
236
+			$is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);
237
+		}
238
+
239
+		$request = $gd_session->get('listing');
240
+
241
+		if (is_user_logged_in() && $is_current_user_owner) {
242
+
243
+			switch ($_REQUEST['ajax_action']):
244
+				case "add":
245
+				case "update":
246
+
247
+					if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
248
+						$last_id = geodir_save_listing();
249
+
250
+						if ($last_id) {
251
+							//$redirect_to = get_permalink( $last_id );
252
+							$redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
253
+
254
+						} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
255
+							$redirect_to = get_permalink(geodir_add_listing_page_id());
256
+							$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
257
+						} else
258
+							$redirect_to = get_permalink(geodir_add_listing_page_id());
259
+
260
+						wp_redirect($redirect_to);
261
+					} else {
262
+						$gd_session->un_set('listing');
263
+						wp_redirect(home_url());
264
+					}
265
+
266
+					break;
267
+				case "cancel" :
268
+
269
+					$gd_session->un_set('listing');
270
+
271
+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))
272
+						wp_redirect(get_permalink($_REQUEST['pid']));
273
+					else {
274
+						geodir_remove_temp_images();
275
+						wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
276
+					}
277
+
278
+					break;
279
+
280
+				case "publish" :
281
+
282
+					if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
283
+
284
+						if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
285
+							$new_post = array();
286
+							$new_post['ID'] = $_REQUEST['pid'];
287
+
288
+							$lastid = wp_update_post($new_post);
289
+
290
+							$gd_session->un_set('listing');
291
+							wp_redirect(get_permalink($lastid));
292
+						} else {
293
+							$last_id = geodir_save_listing();
294
+
295
+							if ($last_id) {
296
+								//$redirect_to = get_permalink( $last_id );
297
+								$redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
298
+							} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
299
+								$redirect_to = get_permalink(geodir_add_listing_page_id());
300
+								$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
301
+							} else
302
+								$redirect_to = get_permalink(geodir_add_listing_page_id());
303
+
304
+							$gd_session->un_set('listing');
305
+							wp_redirect($redirect_to);
306
+						}
307
+					} else {
308
+						$gd_session->un_set('listing');
309
+						wp_redirect(home_url());
310
+					}
311
+
312
+					break;
313
+				case "delete" :
314
+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
315
+						global $current_user;
316
+
317
+						if (get_option('geodir_disable_perm_delete')) {
318
+							$lastid = wp_trash_post($_REQUEST['pid']);
319
+						} else {
320
+							$lastid = wp_delete_post($_REQUEST['pid']);
321
+						}
322
+
323
+						if ($lastid && !is_wp_error($lastid))
324
+							wp_redirect($_SERVER['HTTP_REFERER']);
325
+
326
+						//wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
327
+					}
328
+					break;
329
+			endswitch;
330
+
331
+			$gd_session->un_set('listing');
332
+		} else {
333
+			$gd_session->un_set('listing');
334
+			wp_redirect(geodir_login_url());
335
+			exit();
336
+		}
337
+	}
338
+
339
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {
340
+		/**
341
+		 * Contains registration and login functions.
342
+		 * @todo Fix the file path.
343
+		 *
344
+		 * @since 1.0.0
345
+		 * @package GeoDirectory
346
+		 */
347
+		include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');
348
+	}
349
+
350
+	if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {
351
+		$args = array('taxonomy' => sanitize_text_field($_REQUEST['term']));
352
+		if (!empty($_REQUEST['parent_only'])) {
353
+			$args['parent'] = 0;
354
+		}
355
+		$terms_o = get_terms($args);
356
+
357
+		// Skip terms which has no listing
358
+		if (!empty($terms_o)) {
359
+			$filter_terms = array();
360
+
361
+			foreach ($terms_o as $term) {
362
+				if (isset($term->count) && $term->count > 0) {
363
+					$filter_terms[] = $term;
364
+				}
365
+			}
366
+			$terms_o = $filter_terms;
367
+		}
368
+
369
+		$terms = geodir_sort_terms($terms_o, 'count');
370
+		geodir_helper_cat_list_output($terms, intval($_REQUEST['limit']));
371
+		exit();
372
+	}
373
+
374
+	gd_die();
375 375
 }
376 376
 
377 377
 
378 378
 function geodir_show_ga_stats(){
379
-    if (isset($_REQUEST['ga_start'])) {
380
-        $ga_start = $_REQUEST['ga_start'];
381
-    } else {
382
-        $ga_start = '';
383
-    }
384
-    if (isset($_REQUEST['ga_end'])) {
385
-        $ga_end = $_REQUEST['ga_end'];
386
-    } else {
387
-        $ga_end = '';
388
-    }
389
-    try {
390
-        geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);
391
-    } catch (Exception $e) {
392
-        geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) );
393
-    }
394
-    die;
379
+	if (isset($_REQUEST['ga_start'])) {
380
+		$ga_start = $_REQUEST['ga_start'];
381
+	} else {
382
+		$ga_start = '';
383
+	}
384
+	if (isset($_REQUEST['ga_end'])) {
385
+		$ga_end = $_REQUEST['ga_end'];
386
+	} else {
387
+		$ga_end = '';
388
+	}
389
+	try {
390
+		geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);
391
+	} catch (Exception $e) {
392
+		geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) );
393
+	}
394
+	die;
395 395
 }
396 396
 add_action( 'wp_ajax_gdga', 'geodir_show_ga_stats' );
397 397
 add_action( 'wp_ajax_nopriv_gdga', 'geodir_show_ga_stats' );
398 398
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
  */
45 45
 function geodir_on_wp()
46 46
 {
47
-    if(geodir_is_page('login')) {
47
+    if (geodir_is_page('login')) {
48 48
         geodir_user_signup();
49 49
     }
50 50
 
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
          * @since 1.0.0
83 83
          * @package GeoDirectory
84 84
          */
85
-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
85
+        include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');
86 86
         die;
87 87
     }
88 88
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
  * @todo check if nonce is required here and if so add one.
105 105
  */
106 106
 function geodir_ajax_handler() {
107
-    global $wpdb, $gd_session,$post;
107
+    global $wpdb, $gd_session, $post;
108 108
 
109 109
     if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
110 110
 		$gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
              * @since 1.0.0
127 127
              * @package GeoDirectory
128 128
              */
129
-            include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');
129
+            include_once(geodir_plugin_path().'/geodirectory-admin/geodir_admin_ajax.php');
130 130
         } else {
131 131
             wp_redirect(geodir_login_url());
132 132
             gd_die();
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
                          * @param string $posttype The post type to insert.
152 152
                          * @param string $datatype The type of dummy data to insert.
153 153
                          */
154
-                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
154
+                        do_action('geodir_delete_dummy_posts', sanitize_key($_REQUEST['posttype']), $datatype);
155 155
                     break;
156 156
                 case "geodir_dummy_insert" :
157 157
                     if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
                     $city_bound_lat2 = $_REQUEST['city_bound_lat2'];
164 164
                     $city_bound_lng2 = $_REQUEST['city_bound_lng2'];
165 165
 
166
-                    if (isset($_REQUEST['posttype'])){
166
+                    if (isset($_REQUEST['posttype'])) {
167 167
                         /**
168 168
                          * Used to insert the dummy post data per post type.
169 169
                          *
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
                          * @param string $datatype The type of dummy data to insert.
175 175
                          * @param int $post_index The item number to insert.
176 176
                          */
177
-                        do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));
177
+                        do_action('geodir_insert_dummy_posts', sanitize_key($_REQUEST['posttype']), sanitize_key($_REQUEST['datatype']), absint($_REQUEST['insert_dummy_post_index']));
178 178
                     }
179 179
 
180 180
 
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
         if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
192 192
             $template = locate_template(array("geodirectory/popup-forms.php"));
193 193
             if (!$template) {
194
-                $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';
194
+                $template = geodir_plugin_path().'/geodirectory-templates/popup-forms.php';
195 195
             }
196 196
             require_once($template);
197 197
         }
@@ -210,17 +210,17 @@  discard block
 block discarded – undo
210 210
          * @since 1.0.0
211 211
          * @package GeoDirectory
212 212
          */
213
-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
213
+        include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');
214 214
     }
215 215
 
216 216
     if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
217 217
         if (is_user_logged_in()) {
218 218
             switch ($_REQUEST['ajax_action']):
219 219
                 case "add" :
220
-                    geodir_add_to_favorite((int)$_REQUEST['pid']);
220
+                    geodir_add_to_favorite((int) $_REQUEST['pid']);
221 221
                     break;
222 222
                 case "remove" :
223
-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);
223
+                    geodir_remove_from_favorite((int) $_REQUEST['pid']);
224 224
                     break;
225 225
             endswitch;
226 226
         } else {
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 
234 234
         $is_current_user_owner = true;
235 235
         if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
236
-            $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);
236
+            $is_current_user_owner = geodir_listing_belong_to_current_user((int) $_REQUEST['pid']);
237 237
         }
238 238
 
239 239
         $request = $gd_session->get('listing');
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
          * @since 1.0.0
345 345
          * @package GeoDirectory
346 346
          */
347
-        include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');
347
+        include_once(geodir_plugin_path().'/geodirectory-functions/geodirectory_reg.php');
348 348
     }
349 349
 
350 350
     if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 }
376 376
 
377 377
 
378
-function geodir_show_ga_stats(){
378
+function geodir_show_ga_stats() {
379 379
     if (isset($_REQUEST['ga_start'])) {
380 380
         $ga_start = $_REQUEST['ga_start'];
381 381
     } else {
@@ -389,9 +389,9 @@  discard block
 block discarded – undo
389 389
     try {
390 390
         geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);
391 391
     } catch (Exception $e) {
392
-        geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) );
392
+        geodir_error_log(wp_sprintf(__('GD Google Analytics API Error(%s) : %s', 'geodirectory'), $e->getCode(), $e->getMessage()));
393 393
     }
394 394
     die;
395 395
 }
396
-add_action( 'wp_ajax_gdga', 'geodir_show_ga_stats' );
397
-add_action( 'wp_ajax_nopriv_gdga', 'geodir_show_ga_stats' );
398 396
\ No newline at end of file
397
+add_action('wp_ajax_gdga', 'geodir_show_ga_stats');
398
+add_action('wp_ajax_nopriv_gdga', 'geodir_show_ga_stats');
399 399
\ No newline at end of file
Please login to merge, or discard this patch.