Test Failed
Pull Request — master (#286)
by Kiran
09:42
created
geodirectory-functions/custom_fields_functions.php 4 patches
Doc Comments   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1345,6 +1345,9 @@  discard block
 block discarded – undo
1345 1345
 }
1346 1346
 
1347 1347
 
1348
+/**
1349
+ * @return string
1350
+ */
1348 1351
 function geodir_field_icon_proccess($cf){
1349 1352
 
1350 1353
 
@@ -1738,7 +1741,7 @@  discard block
 block discarded – undo
1738 1741
  * @global object $wpdb WordPress Database object.
1739 1742
  * @global string $plugin_prefix Geodirectory plugin table prefix.
1740 1743
  * @param int $post_id The post ID.
1741
- * @return mixed Returns video.
1744
+ * @return string Returns video.
1742 1745
  */
1743 1746
 function geodir_get_video($post_id)
1744 1747
 {
@@ -1764,7 +1767,7 @@  discard block
 block discarded – undo
1764 1767
  * @global object $wpdb WordPress Database object.
1765 1768
  * @global string $plugin_prefix Geodirectory plugin table prefix.
1766 1769
  * @param int $post_id The post ID.
1767
- * @return mixed Returns special offers.
1770
+ * @return string Returns special offers.
1768 1771
  */
1769 1772
 function geodir_get_special_offers($post_id)
1770 1773
 {
@@ -1788,7 +1791,7 @@  discard block
 block discarded – undo
1788 1791
      *
1789 1792
      * @since 1.0.0
1790 1793
      * @package GeoDirectory
1791
-     * @return mixed|void Returns max upload file size.
1794
+     * @return string|null Returns max upload file size.
1792 1795
      */
1793 1796
     function geodir_max_upload_size()
1794 1797
     {
@@ -2157,7 +2160,6 @@  discard block
 block discarded – undo
2157 2160
      * @param string $field_type The form field type.
2158 2161
      * @param object|int $result_str The custom field results object or row id.
2159 2162
      * @param string $field_ins_upd When set to "submit" displays form.
2160
-     * @param bool $default when set to true field will be for admin use only.
2161 2163
      */
2162 2164
     function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')
2163 2165
     {
Please login to merge, or discard this patch.
Indentation   +2166 added lines, -2166 removed lines patch added patch discarded remove patch
@@ -10,52 +10,52 @@  discard block
 block discarded – undo
10 10
 global $wpdb, $table_prefix;
11 11
 
12 12
 if (!function_exists('geodir_column_exist')) {
13
-    /**
14
-     * Check table column exist or not.
15
-     *
16
-     * @since 1.0.0
17
-     * @package GeoDirectory
18
-     * @global object $wpdb WordPress Database object.
19
-     * @param string $db The table name.
20
-     * @param string $column The column name.
21
-     * @return bool If column exists returns true. Otherwise false.
22
-     */
23
-    function geodir_column_exist($db, $column)
24
-    {
25
-        global $wpdb;
26
-        $exists = false;
27
-        $columns = $wpdb->get_col("show columns from $db");
28
-        foreach ($columns as $c) {
29
-            if ($c == $column) {
30
-                $exists = true;
31
-                break;
32
-            }
33
-        }
34
-        return $exists;
35
-    }
13
+	/**
14
+	 * Check table column exist or not.
15
+	 *
16
+	 * @since 1.0.0
17
+	 * @package GeoDirectory
18
+	 * @global object $wpdb WordPress Database object.
19
+	 * @param string $db The table name.
20
+	 * @param string $column The column name.
21
+	 * @return bool If column exists returns true. Otherwise false.
22
+	 */
23
+	function geodir_column_exist($db, $column)
24
+	{
25
+		global $wpdb;
26
+		$exists = false;
27
+		$columns = $wpdb->get_col("show columns from $db");
28
+		foreach ($columns as $c) {
29
+			if ($c == $column) {
30
+				$exists = true;
31
+				break;
32
+			}
33
+		}
34
+		return $exists;
35
+	}
36 36
 }
37 37
 
38 38
 if (!function_exists('geodir_add_column_if_not_exist')) {
39
-    /**
40
-     * Add column if table column not exist.
41
-     *
42
-     * @since 1.0.0
43
-     * @package GeoDirectory
44
-     * @global object $wpdb WordPress Database object.
45
-     * @param string $db The table name.
46
-     * @param string $column The column name.
47
-     * @param string $column_attr The column attributes.
48
-     */
49
-    function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")
50
-    {
51
-        global $wpdb;
52
-        $result = 0;// no rows affected
53
-        if (!geodir_column_exist($db, $column)) {
54
-            if (!empty($db) && !empty($column))
55
-                $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
56
-        }
57
-        return $result;
58
-    }
39
+	/**
40
+	 * Add column if table column not exist.
41
+	 *
42
+	 * @since 1.0.0
43
+	 * @package GeoDirectory
44
+	 * @global object $wpdb WordPress Database object.
45
+	 * @param string $db The table name.
46
+	 * @param string $column The column name.
47
+	 * @param string $column_attr The column attributes.
48
+	 */
49
+	function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")
50
+	{
51
+		global $wpdb;
52
+		$result = 0;// no rows affected
53
+		if (!geodir_column_exist($db, $column)) {
54
+			if (!empty($db) && !empty($column))
55
+				$result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
56
+		}
57
+		return $result;
58
+	}
59 59
 }
60 60
 
61 61
 /**
@@ -72,705 +72,705 @@  discard block
 block discarded – undo
72 72
  */
73 73
 function geodir_post_custom_fields($package_id = '', $default = 'all', $post_type = 'gd_place', $fields_location = 'none')
74 74
 {
75
-    global $wpdb, $geodir_post_custom_fields_cache;
76
-
77
-    $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;
78
-
79
-    if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {
80
-        return $geodir_post_custom_fields_cache[$cache_stored];
81
-    }
82
-
83
-    $default_query = '';
84
-
85
-    if ($default == 'default')
86
-        $default_query .= " and is_admin IN ('1') ";
87
-    elseif ($default == 'custom')
88
-        $default_query .= " and is_admin = '0' ";
89
-
90
-    if ($fields_location == 'none') {
91
-    } else{
92
-        $fields_location = esc_sql( $fields_location );
93
-        $default_query .= " and show_in LIKE '%%[$fields_location]%%' ";
94
-    }
95
-
96
-    $post_meta_info = $wpdb->get_results(
97
-        $wpdb->prepare(
98
-            "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
99
-            array($post_type)
100
-        )
101
-    );
102
-
103
-
104
-    $return_arr = array();
105
-    if ($post_meta_info) {
106
-
107
-        foreach ($post_meta_info as $post_meta_info_obj) {
108
-
109
-            $custom_fields = array(
110
-                "name" => $post_meta_info_obj->htmlvar_name,
111
-                "label" => $post_meta_info_obj->clabels,
112
-                "default" => $post_meta_info_obj->default_value,
113
-                "type" => $post_meta_info_obj->field_type,
114
-                "desc" => $post_meta_info_obj->admin_desc);
115
-
116
-            if ($post_meta_info_obj->field_type) {
117
-                $options = explode(',', $post_meta_info_obj->option_values);
118
-                $custom_fields["options"] = $options;
119
-            }
120
-
121
-            foreach ($post_meta_info_obj as $key => $val) {
122
-                $custom_fields[$key] = $val;
123
-            }
124
-
125
-            $pricearr = array();
126
-            $pricearr = explode(',', $post_meta_info_obj->packages);
127
-
128
-            if ($package_id != '' && in_array($package_id, $pricearr)) {
129
-                $return_arr[$post_meta_info_obj->sort_order] = $custom_fields;
130
-            } elseif ($package_id == '') {
131
-                $return_arr[$post_meta_info_obj->sort_order] = $custom_fields;
132
-            }
133
-        }
134
-    }
135
-    $geodir_post_custom_fields_cache[$cache_stored] = $return_arr;
136
-
137
-    if (has_filter('geodir_filter_geodir_post_custom_fields')) {
138
-        /**
139
-         * Filter the post custom fields array.
140
-         *
141
-         * @since 1.0.0
142
-         *
143
-         * @param array $return_arr Post custom fields array.
144
-         * @param int|string $package_id The package ID.
145
-         * @param string $post_type Optional. The wordpress post type.
146
-         * @param string $fields_location Optional. Where exactly are you going to place this custom fields?.
147
-         */
148
-        $return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);
149
-    }
150
-
151
-    return $return_arr;
75
+	global $wpdb, $geodir_post_custom_fields_cache;
76
+
77
+	$cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;
78
+
79
+	if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {
80
+		return $geodir_post_custom_fields_cache[$cache_stored];
81
+	}
82
+
83
+	$default_query = '';
84
+
85
+	if ($default == 'default')
86
+		$default_query .= " and is_admin IN ('1') ";
87
+	elseif ($default == 'custom')
88
+		$default_query .= " and is_admin = '0' ";
89
+
90
+	if ($fields_location == 'none') {
91
+	} else{
92
+		$fields_location = esc_sql( $fields_location );
93
+		$default_query .= " and show_in LIKE '%%[$fields_location]%%' ";
94
+	}
95
+
96
+	$post_meta_info = $wpdb->get_results(
97
+		$wpdb->prepare(
98
+			"select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
99
+			array($post_type)
100
+		)
101
+	);
102
+
103
+
104
+	$return_arr = array();
105
+	if ($post_meta_info) {
106
+
107
+		foreach ($post_meta_info as $post_meta_info_obj) {
108
+
109
+			$custom_fields = array(
110
+				"name" => $post_meta_info_obj->htmlvar_name,
111
+				"label" => $post_meta_info_obj->clabels,
112
+				"default" => $post_meta_info_obj->default_value,
113
+				"type" => $post_meta_info_obj->field_type,
114
+				"desc" => $post_meta_info_obj->admin_desc);
115
+
116
+			if ($post_meta_info_obj->field_type) {
117
+				$options = explode(',', $post_meta_info_obj->option_values);
118
+				$custom_fields["options"] = $options;
119
+			}
120
+
121
+			foreach ($post_meta_info_obj as $key => $val) {
122
+				$custom_fields[$key] = $val;
123
+			}
124
+
125
+			$pricearr = array();
126
+			$pricearr = explode(',', $post_meta_info_obj->packages);
127
+
128
+			if ($package_id != '' && in_array($package_id, $pricearr)) {
129
+				$return_arr[$post_meta_info_obj->sort_order] = $custom_fields;
130
+			} elseif ($package_id == '') {
131
+				$return_arr[$post_meta_info_obj->sort_order] = $custom_fields;
132
+			}
133
+		}
134
+	}
135
+	$geodir_post_custom_fields_cache[$cache_stored] = $return_arr;
136
+
137
+	if (has_filter('geodir_filter_geodir_post_custom_fields')) {
138
+		/**
139
+		 * Filter the post custom fields array.
140
+		 *
141
+		 * @since 1.0.0
142
+		 *
143
+		 * @param array $return_arr Post custom fields array.
144
+		 * @param int|string $package_id The package ID.
145
+		 * @param string $post_type Optional. The wordpress post type.
146
+		 * @param string $fields_location Optional. Where exactly are you going to place this custom fields?.
147
+		 */
148
+		$return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);
149
+	}
150
+
151
+	return $return_arr;
152 152
 }
153 153
 
154
-    /**
155
-     * Adds admin html for custom fields.
156
-     *
157
-     * @since 1.0.0
158
-     * @package GeoDirectory
159
-     * @global object $wpdb WordPress Database object.
160
-     * @param string $field_type The form field type.
161
-     * @param object|int $result_str The custom field results object or row id.
162
-     * @param string $field_ins_upd When set to "submit" displays form.
163
-     * @param string $field_type_key The key of the custom field.
164
-     */
165
-    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='')
166
-    {
167
-        global $wpdb;
168
-        $cf = $result_str;
169
-        if (!is_object($cf)) {
170
-
171
-            $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));
172
-
173
-        } else {
174
-            $field_info = $cf;
175
-            $result_str = $cf->id;
176
-        }
177
-        /**
178
-         * Contains custom field html.
179
-         *
180
-         * @since 1.0.0
181
-         */
182
-        include('custom_field_html.php');
183
-
184
-    }
154
+	/**
155
+	 * Adds admin html for custom fields.
156
+	 *
157
+	 * @since 1.0.0
158
+	 * @package GeoDirectory
159
+	 * @global object $wpdb WordPress Database object.
160
+	 * @param string $field_type The form field type.
161
+	 * @param object|int $result_str The custom field results object or row id.
162
+	 * @param string $field_ins_upd When set to "submit" displays form.
163
+	 * @param string $field_type_key The key of the custom field.
164
+	 */
165
+	function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='')
166
+	{
167
+		global $wpdb;
168
+		$cf = $result_str;
169
+		if (!is_object($cf)) {
170
+
171
+			$field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));
172
+
173
+		} else {
174
+			$field_info = $cf;
175
+			$result_str = $cf->id;
176
+		}
177
+		/**
178
+		 * Contains custom field html.
179
+		 *
180
+		 * @since 1.0.0
181
+		 */
182
+		include('custom_field_html.php');
183
+
184
+	}
185 185
 
186 186
 
187 187
 if (!function_exists('geodir_custom_field_delete')) {
188
-    /**
189
-     * Delete custom field using field id.
190
-     *
191
-     * @since 1.0.0
192
-     * @since 1.5.7 Delete field from sorting fields table when custom field deleted.
193
-     * @package GeoDirectory
194
-     * @global object $wpdb WordPress Database object.
195
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
196
-     * @param string $field_id The custom field ID.
197
-     * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.
198
-     */
199
-    function geodir_custom_field_delete($field_id = '') {
200
-        global $wpdb, $plugin_prefix;
201
-
202
-        if ($field_id != '') {
203
-            $cf = trim($field_id, '_');
204
-
205
-            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {
206
-                $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));
207
-
208
-                $post_type = $field->post_type;
209
-                $htmlvar_name = $field->htmlvar_name;
210
-
211
-                if ($post_type != '' && $htmlvar_name != '') {
212
-                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
213
-                }
214
-
215
-                /**
216
-                 * Called after a custom field is deleted.
217
-                 *
218
-                 * @since 1.0.0
219
-                 * @param string $cf The fields ID.
220
-                 * @param string $field->htmlvar_name The html variable name for the field.
221
-                 * @param string $post_type The post type the field belongs to.
222
-                 */
223
-                do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);
224
-
225
-                if ($field->field_type == 'address') {
226
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");
227
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");
228
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");
229
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");
230
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");
231
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");
232
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");
233
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");
234
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");
235
-                } else {
236
-                    if ($field->field_type != 'fieldset') {
237
-                        $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");
238
-                    }
239
-                }
240
-
241
-                return $field_id;
242
-            } else
243
-                return 0;
244
-        } else
245
-            return 0;
246
-    }
188
+	/**
189
+	 * Delete custom field using field id.
190
+	 *
191
+	 * @since 1.0.0
192
+	 * @since 1.5.7 Delete field from sorting fields table when custom field deleted.
193
+	 * @package GeoDirectory
194
+	 * @global object $wpdb WordPress Database object.
195
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
196
+	 * @param string $field_id The custom field ID.
197
+	 * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.
198
+	 */
199
+	function geodir_custom_field_delete($field_id = '') {
200
+		global $wpdb, $plugin_prefix;
201
+
202
+		if ($field_id != '') {
203
+			$cf = trim($field_id, '_');
204
+
205
+			if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {
206
+				$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));
207
+
208
+				$post_type = $field->post_type;
209
+				$htmlvar_name = $field->htmlvar_name;
210
+
211
+				if ($post_type != '' && $htmlvar_name != '') {
212
+					$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
213
+				}
214
+
215
+				/**
216
+				 * Called after a custom field is deleted.
217
+				 *
218
+				 * @since 1.0.0
219
+				 * @param string $cf The fields ID.
220
+				 * @param string $field->htmlvar_name The html variable name for the field.
221
+				 * @param string $post_type The post type the field belongs to.
222
+				 */
223
+				do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);
224
+
225
+				if ($field->field_type == 'address') {
226
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");
227
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");
228
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");
229
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");
230
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");
231
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");
232
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");
233
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");
234
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");
235
+				} else {
236
+					if ($field->field_type != 'fieldset') {
237
+						$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");
238
+					}
239
+				}
240
+
241
+				return $field_id;
242
+			} else
243
+				return 0;
244
+		} else
245
+			return 0;
246
+	}
247 247
 }
248 248
 
249 249
 if (!function_exists('geodir_custom_field_save')) {
250
-    /**
251
-     * Save or Update custom fields into the database.
252
-     *
253
-     * @since 1.0.0
254
-     * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt.
255
-     * @package GeoDirectory
256
-     * @global object $wpdb WordPress Database object.
257
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
258
-     * @param array $request_field {
259
-     *    Attributes of the request field array.
260
-     *
261
-     *    @type string $action Ajax Action name. Default "geodir_ajax_action".
262
-     *    @type string $manage_field_type Field type Default "custom_fields".
263
-     *    @type string $create_field Create field Default "true".
264
-     *    @type string $field_ins_upd Field ins upd Default "submit".
265
-     *    @type string $_wpnonce WP nonce value.
266
-     *    @type string $listing_type Listing type Example "gd_place".
267
-     *    @type string $field_type Field type Example "radio".
268
-     *    @type string $field_id Field id Example "12".
269
-     *    @type string $data_type Data type Example "VARCHAR".
270
-     *    @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere.
271
-     *    @type array $show_on_pkg Package list to display this field.
272
-     *    @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings.
273
-     *    @type string $site_title Section title which you wish to display in frontend.
274
-     *    @type string $admin_desc Section description which will appear in frontend.
275
-     *    @type string $htmlvar_name Html variable name. This should be a unique name.
276
-     *    @type string $clabels Section Title which will appear in backend.
277
-     *    @type string $default_value The default value (for "link" this will be used as the link text).
278
-     *    @type string $sort_order The display order of this field in backend. e.g. 5.
279
-     *    @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field.
280
-     *    @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field.
281
-     *    @type string $is_required Use "1" to set field as required.
282
-     *    @type string $required_msg Enter text for error message if field required and have not full fill requirment.
283
-     *    @type string $show_on_listing Want to show this on listing page?.
284
-     *    @type string $show_in What locations to show the custom field in.
285
-     *    @type string $show_on_detail Want to show this in More Info tab on detail page?.
286
-     *    @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes.
287
-     *    @type string $option_values Option Values should be separated by comma.
288
-     *    @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class.
289
-     *    @type string $css_class Enter custom css class for field custom style.
290
-     *
291
-     * }
292
-     * @param bool $default Not yet implemented.
293
-     * @return int|string If field is unique returns inserted row id. Otherwise returns error string.
294
-     */
295
-    function geodir_custom_field_save($request_field = array(), $default = false)
296
-    {
297
-
298
-        global $wpdb, $plugin_prefix;
299
-
300
-        $old_html_variable = '';
301
-
302
-        $data_type = trim($request_field['data_type']);
303
-
304
-        $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';
305
-
306
-        // some servers fail if a POST value is VARCHAR so we change it.
307
-        if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){
308
-            $request_field['data_type'] = 'VARCHAR';
309
-        }
310
-
311
-        $cf = trim($result_str, '_');
312
-
313
-
314
-        /*-------- check dublicate validation --------*/
315
-
316
-        $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
317
-        $post_type = $request_field['listing_type'];
318
-
319
-        if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {
320
-            $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;
321
-        }
322
-
323
-        $check_html_variable = $wpdb->get_var(
324
-            $wpdb->prepare(
325
-                "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",
326
-                array($cf, $cehhtmlvar_name, $post_type)
327
-            )
328
-        );
329
-
330
-
331
-        if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {
332
-
333
-            if ($cf != '') {
334
-
335
-                $post_meta_info = $wpdb->get_row(
336
-                    $wpdb->prepare(
337
-                        "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",
338
-                        array($cf)
339
-                    )
340
-                );
341
-
342
-            }
343
-
344
-            if (!empty($post_meta_info)) {
345
-                $post_val = $post_meta_info;
346
-                $old_html_variable = $post_val->htmlvar_name;
347
-
348
-            }
349
-
350
-
351
-
352
-            if ($post_type == '') $post_type = 'gd_place';
353
-
354
-
355
-            $detail_table = $plugin_prefix . $post_type . '_detail';
356
-
357
-            $admin_title = $request_field['admin_title'];
358
-            $site_title = $request_field['site_title'];
359
-            $data_type = $request_field['data_type'];
360
-            $field_type = $request_field['field_type'];
361
-            $field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type;
362
-            $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
363
-            $admin_desc = $request_field['admin_desc'];
364
-            $clabels = $request_field['clabels'];
365
-            $default_value = isset($request_field['default_value']) ? $request_field['default_value'] : '';
366
-            $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : '';
367
-            $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : '';
368
-            $is_required = isset($request_field['is_required']) ? $request_field['is_required'] : '';
369
-            $required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : '';
370
-            $css_class = isset($request_field['css_class']) ? $request_field['css_class'] : '';
371
-            $field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : '';
372
-            $show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : '';
373
-            $show_in = isset($request_field['show_in']) ? $request_field['show_in'] : '';
374
-            $show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : '';
375
-            $show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : '';
376
-            $decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type
377
-            $decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : '';
378
-            $validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : '';
379
-            $validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : '';
380
-            $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';
250
+	/**
251
+	 * Save or Update custom fields into the database.
252
+	 *
253
+	 * @since 1.0.0
254
+	 * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt.
255
+	 * @package GeoDirectory
256
+	 * @global object $wpdb WordPress Database object.
257
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
258
+	 * @param array $request_field {
259
+	 *    Attributes of the request field array.
260
+	 *
261
+	 *    @type string $action Ajax Action name. Default "geodir_ajax_action".
262
+	 *    @type string $manage_field_type Field type Default "custom_fields".
263
+	 *    @type string $create_field Create field Default "true".
264
+	 *    @type string $field_ins_upd Field ins upd Default "submit".
265
+	 *    @type string $_wpnonce WP nonce value.
266
+	 *    @type string $listing_type Listing type Example "gd_place".
267
+	 *    @type string $field_type Field type Example "radio".
268
+	 *    @type string $field_id Field id Example "12".
269
+	 *    @type string $data_type Data type Example "VARCHAR".
270
+	 *    @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere.
271
+	 *    @type array $show_on_pkg Package list to display this field.
272
+	 *    @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings.
273
+	 *    @type string $site_title Section title which you wish to display in frontend.
274
+	 *    @type string $admin_desc Section description which will appear in frontend.
275
+	 *    @type string $htmlvar_name Html variable name. This should be a unique name.
276
+	 *    @type string $clabels Section Title which will appear in backend.
277
+	 *    @type string $default_value The default value (for "link" this will be used as the link text).
278
+	 *    @type string $sort_order The display order of this field in backend. e.g. 5.
279
+	 *    @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field.
280
+	 *    @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field.
281
+	 *    @type string $is_required Use "1" to set field as required.
282
+	 *    @type string $required_msg Enter text for error message if field required and have not full fill requirment.
283
+	 *    @type string $show_on_listing Want to show this on listing page?.
284
+	 *    @type string $show_in What locations to show the custom field in.
285
+	 *    @type string $show_on_detail Want to show this in More Info tab on detail page?.
286
+	 *    @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes.
287
+	 *    @type string $option_values Option Values should be separated by comma.
288
+	 *    @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class.
289
+	 *    @type string $css_class Enter custom css class for field custom style.
290
+	 *
291
+	 * }
292
+	 * @param bool $default Not yet implemented.
293
+	 * @return int|string If field is unique returns inserted row id. Otherwise returns error string.
294
+	 */
295
+	function geodir_custom_field_save($request_field = array(), $default = false)
296
+	{
297
+
298
+		global $wpdb, $plugin_prefix;
299
+
300
+		$old_html_variable = '';
301
+
302
+		$data_type = trim($request_field['data_type']);
303
+
304
+		$result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';
305
+
306
+		// some servers fail if a POST value is VARCHAR so we change it.
307
+		if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){
308
+			$request_field['data_type'] = 'VARCHAR';
309
+		}
310
+
311
+		$cf = trim($result_str, '_');
312
+
313
+
314
+		/*-------- check dublicate validation --------*/
315
+
316
+		$cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
317
+		$post_type = $request_field['listing_type'];
318
+
319
+		if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {
320
+			$cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;
321
+		}
322
+
323
+		$check_html_variable = $wpdb->get_var(
324
+			$wpdb->prepare(
325
+				"select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",
326
+				array($cf, $cehhtmlvar_name, $post_type)
327
+			)
328
+		);
329
+
330
+
331
+		if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {
332
+
333
+			if ($cf != '') {
334
+
335
+				$post_meta_info = $wpdb->get_row(
336
+					$wpdb->prepare(
337
+						"select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",
338
+						array($cf)
339
+					)
340
+				);
341
+
342
+			}
343
+
344
+			if (!empty($post_meta_info)) {
345
+				$post_val = $post_meta_info;
346
+				$old_html_variable = $post_val->htmlvar_name;
347
+
348
+			}
349
+
350
+
351
+
352
+			if ($post_type == '') $post_type = 'gd_place';
353
+
354
+
355
+			$detail_table = $plugin_prefix . $post_type . '_detail';
356
+
357
+			$admin_title = $request_field['admin_title'];
358
+			$site_title = $request_field['site_title'];
359
+			$data_type = $request_field['data_type'];
360
+			$field_type = $request_field['field_type'];
361
+			$field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type;
362
+			$htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
363
+			$admin_desc = $request_field['admin_desc'];
364
+			$clabels = $request_field['clabels'];
365
+			$default_value = isset($request_field['default_value']) ? $request_field['default_value'] : '';
366
+			$sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : '';
367
+			$is_active = isset($request_field['is_active']) ? $request_field['is_active'] : '';
368
+			$is_required = isset($request_field['is_required']) ? $request_field['is_required'] : '';
369
+			$required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : '';
370
+			$css_class = isset($request_field['css_class']) ? $request_field['css_class'] : '';
371
+			$field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : '';
372
+			$show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : '';
373
+			$show_in = isset($request_field['show_in']) ? $request_field['show_in'] : '';
374
+			$show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : '';
375
+			$show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : '';
376
+			$decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type
377
+			$decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : '';
378
+			$validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : '';
379
+			$validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : '';
380
+			$for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';
381 381
 
382 382
             
383
-            if(is_array($show_in)){
384
-                $show_in = implode(",", $request_field['show_in']);
385
-            }
383
+			if(is_array($show_in)){
384
+				$show_in = implode(",", $request_field['show_in']);
385
+			}
386 386
             
387
-            if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {
388
-                $htmlvar_name = 'geodir_' . $htmlvar_name;
389
-            }
387
+			if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {
388
+				$htmlvar_name = 'geodir_' . $htmlvar_name;
389
+			}
390 390
 
391
-            $option_values = '';
392
-            if (isset($request_field['option_values']))
393
-                $option_values = $request_field['option_values'];
391
+			$option_values = '';
392
+			if (isset($request_field['option_values']))
393
+				$option_values = $request_field['option_values'];
394 394
 
395
-            $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0';
395
+			$cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0';
396 396
 
397
-            $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0';
397
+			$cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0';
398 398
 
399
-            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))
400
-                $price_pkg = implode(",", $request_field['show_on_pkg']);
401
-            else {
402
-                $package_info = array();
399
+			if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))
400
+				$price_pkg = implode(",", $request_field['show_on_pkg']);
401
+			else {
402
+				$package_info = array();
403 403
 
404
-                $package_info = geodir_post_package_info($package_info, '', $post_type);
405
-                $price_pkg = !empty($package_info->pid) ? $package_info->pid : '';
406
-            }
404
+				$package_info = geodir_post_package_info($package_info, '', $post_type);
405
+				$price_pkg = !empty($package_info->pid) ? $package_info->pid : '';
406
+			}
407 407
 
408 408
 
409
-            if (isset($request_field['extra']) && !empty($request_field['extra']))
410
-                $extra_fields = $request_field['extra'];
409
+			if (isset($request_field['extra']) && !empty($request_field['extra']))
410
+				$extra_fields = $request_field['extra'];
411 411
 
412
-            if (isset($request_field['is_default']) && $request_field['is_default'] != '')
413
-                $is_default = $request_field['is_default'];
414
-            else
415
-                $is_default = '0';
412
+			if (isset($request_field['is_default']) && $request_field['is_default'] != '')
413
+				$is_default = $request_field['is_default'];
414
+			else
415
+				$is_default = '0';
416 416
 
417
-            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')
418
-                $is_admin = $request_field['is_admin'];
419
-            else
420
-                $is_admin = '0';
417
+			if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')
418
+				$is_admin = $request_field['is_admin'];
419
+			else
420
+				$is_admin = '0';
421 421
 
422 422
 
423
-            if ($is_active == '') $is_active = 1;
424
-            if ($is_required == '') $is_required = 0;
423
+			if ($is_active == '') $is_active = 1;
424
+			if ($is_required == '') $is_required = 0;
425 425
 
426 426
 
427
-            if ($sort_order == '') {
427
+			if ($sort_order == '') {
428 428
 
429
-                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);
429
+				$last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);
430 430
 
431
-                $sort_order = (int)$last_order + 1;
432
-            }
431
+				$sort_order = (int)$last_order + 1;
432
+			}
433 433
 
434
-            $default_value_add = '';
434
+			$default_value_add = '';
435 435
 
436 436
 
437
-            if (!empty($post_meta_info)) {
438
-                switch ($field_type):
437
+			if (!empty($post_meta_info)) {
438
+				switch ($field_type):
439 439
 
440
-                    case 'address':
440
+					case 'address':
441 441
 
442
-                        if ($htmlvar_name != '') {
443
-                            $prefix = $htmlvar_name . '_';
444
-                        }
445
-                        $old_prefix = $old_html_variable . '_';
442
+						if ($htmlvar_name != '') {
443
+							$prefix = $htmlvar_name . '_';
444
+						}
445
+						$old_prefix = $old_html_variable . '_';
446 446
 
447 447
 
448
-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";
448
+						$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";
449 449
 
450
-                        if ($default_value != '') {
451
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
452
-                        }
450
+						if ($default_value != '') {
451
+							$meta_field_add .= " DEFAULT '" . $default_value . "'";
452
+						}
453 453
 
454
-                        $wpdb->query($meta_field_add);
454
+						$wpdb->query($meta_field_add);
455 455
 
456
-                        if ($extra_fields != '') {
456
+						if ($extra_fields != '') {
457 457
 
458
-                            if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
458
+							if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
459 459
 
460
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");
461
-                                if ($is_column) {
462
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";
460
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");
461
+								if ($is_column) {
462
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";
463 463
 
464
-                                    if ($default_value != '') {
465
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
466
-                                    }
464
+									if ($default_value != '') {
465
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
466
+									}
467 467
 
468
-                                    $wpdb->query($meta_field_add);
469
-                                } else {
468
+									$wpdb->query($meta_field_add);
469
+								} else {
470 470
 
471
-                                    $meta_field_add = "VARCHAR( 50 ) NULL";
472
-                                    if ($default_value != '') {
473
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
474
-                                    }
475
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);
471
+									$meta_field_add = "VARCHAR( 50 ) NULL";
472
+									if ($default_value != '') {
473
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
474
+									}
475
+									geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);
476 476
 
477
-                                }
477
+								}
478 478
 
479 479
 
480
-                            }
480
+							}
481 481
 
482 482
 
483
-                            if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
483
+							if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
484 484
 
485
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");
485
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");
486 486
 
487
-                                if ($is_column) {
488
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";
487
+								if ($is_column) {
488
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";
489 489
 
490
-                                    if ($default_value != '') {
491
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
492
-                                    }
490
+									if ($default_value != '') {
491
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
492
+									}
493 493
 
494
-                                    $wpdb->query($meta_field_add);
495
-                                } else {
496
-                                    $meta_field_add = "VARCHAR( 50 ) NULL";
497
-                                    if ($default_value != '') {
498
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
499
-                                    }
494
+									$wpdb->query($meta_field_add);
495
+								} else {
496
+									$meta_field_add = "VARCHAR( 50 ) NULL";
497
+									if ($default_value != '') {
498
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
499
+									}
500 500
 
501
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);
502
-                                }
501
+									geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);
502
+								}
503 503
 
504
-                            }
505
-                            if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
504
+							}
505
+							if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
506 506
 
507
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");
507
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");
508 508
 
509
-                                if ($is_column) {
509
+								if ($is_column) {
510 510
 
511
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";
511
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";
512 512
 
513
-                                    if ($default_value != '') {
514
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
515
-                                    }
513
+									if ($default_value != '') {
514
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
515
+									}
516 516
 
517
-                                    $wpdb->query($meta_field_add);
518
-                                } else {
517
+									$wpdb->query($meta_field_add);
518
+								} else {
519 519
 
520
-                                    $meta_field_add = "VARCHAR( 50 ) NULL";
521
-                                    if ($default_value != '') {
522
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
523
-                                    }
520
+									$meta_field_add = "VARCHAR( 50 ) NULL";
521
+									if ($default_value != '') {
522
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
523
+									}
524 524
 
525
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);
525
+									geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);
526 526
 
527
-                                }
527
+								}
528 528
 
529
-                            }
530
-                            if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
529
+							}
530
+							if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
531 531
 
532
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");
532
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");
533 533
 
534
-                                if ($is_column) {
534
+								if ($is_column) {
535 535
 
536
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";
536
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";
537 537
 
538
-                                    if ($default_value != '') {
539
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
540
-                                    }
538
+									if ($default_value != '') {
539
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
540
+									}
541 541
 
542
-                                    $wpdb->query($meta_field_add);
543
-                                } else {
542
+									$wpdb->query($meta_field_add);
543
+								} else {
544 544
 
545
-                                    $meta_field_add = "VARCHAR( 50 ) NULL";
546
-                                    if ($default_value != '') {
547
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
548
-                                    }
545
+									$meta_field_add = "VARCHAR( 50 ) NULL";
546
+									if ($default_value != '') {
547
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
548
+									}
549 549
 
550
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);
550
+									geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);
551 551
 
552
-                                }
552
+								}
553 553
 
554
-                            }
555
-                            if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
554
+							}
555
+							if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
556 556
 
557
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");
558
-                                if ($is_column) {
557
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");
558
+								if ($is_column) {
559 559
 
560
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
560
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
561 561
 
562
-                                    if ($default_value != '') {
563
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
564
-                                    }
562
+									if ($default_value != '') {
563
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
564
+									}
565 565
 
566
-                                    $wpdb->query($meta_field_add);
567
-                                } else {
566
+									$wpdb->query($meta_field_add);
567
+								} else {
568 568
 
569
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
570
-                                    $meta_field_add = "VARCHAR( 20 ) NULL";
571
-                                    if ($default_value != '') {
572
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
573
-                                    }
569
+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
570
+									$meta_field_add = "VARCHAR( 20 ) NULL";
571
+									if ($default_value != '') {
572
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
573
+									}
574 574
 
575
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);
575
+									geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);
576 576
 
577
-                                }
577
+								}
578 578
 
579 579
 
580
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");
580
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");
581 581
 
582
-                                if ($is_column) {
583
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
582
+								if ($is_column) {
583
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
584 584
 
585
-                                    if ($default_value != '') {
586
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
587
-                                    }
585
+									if ($default_value != '') {
586
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
587
+									}
588 588
 
589
-                                    $wpdb->query($meta_field_add);
590
-                                } else {
589
+									$wpdb->query($meta_field_add);
590
+								} else {
591 591
 
592
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
593
-                                    $meta_field_add = "VARCHAR( 20 ) NULL";
594
-                                    if ($default_value != '') {
595
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
596
-                                    }
592
+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
593
+									$meta_field_add = "VARCHAR( 20 ) NULL";
594
+									if ($default_value != '') {
595
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
596
+									}
597 597
 
598
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);
599
-                                }
598
+									geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);
599
+								}
600 600
 
601
-                            }
602
-                            if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
601
+							}
602
+							if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
603 603
 
604
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");
604
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");
605 605
 
606
-                                if ($is_column) {
607
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
606
+								if ($is_column) {
607
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
608 608
 
609
-                                    if ($default_value != '') {
610
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
611
-                                    }
609
+									if ($default_value != '') {
610
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
611
+									}
612 612
 
613
-                                    $wpdb->query($meta_field_add);
614
-                                } else {
613
+									$wpdb->query($meta_field_add);
614
+								} else {
615 615
 
616
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
616
+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
617 617
 
618
-                                    $meta_field_add = "VARCHAR( 15 ) NULL";
619
-                                    if ($default_value != '') {
620
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
621
-                                    }
618
+									$meta_field_add = "VARCHAR( 15 ) NULL";
619
+									if ($default_value != '') {
620
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
621
+									}
622 622
 
623
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);
624
-                                }
623
+									geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);
624
+								}
625 625
 
626 626
 
627
-                            }
628
-                            if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
627
+							}
628
+							if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
629 629
 
630
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");
631
-                                if ($is_column) {
632
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
630
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");
631
+								if ($is_column) {
632
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
633 633
 
634
-                                    if ($default_value != '') {
635
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
636
-                                    }
634
+									if ($default_value != '') {
635
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
636
+									}
637 637
 
638
-                                    $wpdb->query($meta_field_add);
638
+									$wpdb->query($meta_field_add);
639 639
 
640
-                                } else {
640
+								} else {
641 641
 
642
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
642
+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
643 643
 
644
-                                    $meta_field_add = "VARCHAR( 3 ) NULL";
645
-                                    if ($default_value != '') {
646
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
647
-                                    }
644
+									$meta_field_add = "VARCHAR( 3 ) NULL";
645
+									if ($default_value != '') {
646
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
647
+									}
648 648
 
649
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);
650
-                                }
649
+									geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);
650
+								}
651 651
 
652
-                            }
653
-                            // show lat lng
654
-                            if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
655
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");
652
+							}
653
+							// show lat lng
654
+							if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
655
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");
656 656
 
657
-                                if ($is_column) {
658
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
659
-                                    $meta_field_add .= " DEFAULT '1'";
657
+								if ($is_column) {
658
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
659
+									$meta_field_add .= " DEFAULT '1'";
660 660
 
661
-                                    $wpdb->query($meta_field_add);
662
-                                } else {
663
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
661
+									$wpdb->query($meta_field_add);
662
+								} else {
663
+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
664 664
 
665
-                                    $meta_field_add = "VARCHAR( 3 ) NULL";
666
-                                    $meta_field_add .= " DEFAULT '1'";
665
+									$meta_field_add = "VARCHAR( 3 ) NULL";
666
+									$meta_field_add .= " DEFAULT '1'";
667 667
 
668
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);
669
-                                }
668
+									geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);
669
+								}
670 670
 
671
-                            }
672
-                        }// end extra
671
+							}
672
+						}// end extra
673 673
 
674
-                        break;
674
+						break;
675 675
 
676
-                    case 'checkbox':
677
-                    case 'multiselect':
678
-                    case 'select':
679
-                    case 'taxonomy':
676
+					case 'checkbox':
677
+					case 'multiselect':
678
+					case 'select':
679
+					case 'taxonomy':
680 680
 
681
-                        $op_size = '500';
681
+						$op_size = '500';
682 682
 
683
-                        // only make the field as big as it needs to be.
684
-                        if(isset($option_values) && $option_values && $field_type=='select'){
685
-                            $option_values_arr = explode(',',$option_values);
686
-                            if(is_array($option_values_arr)){
687
-                                $op_max = 0;
688
-                                foreach($option_values_arr as $op_val){
689
-                                    if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}
690
-                                }
691
-                                if($op_max){$op_size =$op_max; }
692
-                            }
693
-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
694
-                            if(strlen($option_values)){
695
-                                $op_size =  strlen($option_values);
696
-                            }
697
-                        }
683
+						// only make the field as big as it needs to be.
684
+						if(isset($option_values) && $option_values && $field_type=='select'){
685
+							$option_values_arr = explode(',',$option_values);
686
+							if(is_array($option_values_arr)){
687
+								$op_max = 0;
688
+								foreach($option_values_arr as $op_val){
689
+									if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}
690
+								}
691
+								if($op_max){$op_size =$op_max; }
692
+							}
693
+						}elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
694
+							if(strlen($option_values)){
695
+								$op_size =  strlen($option_values);
696
+							}
697
+						}
698 698
 
699
-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";
699
+						$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";
700 700
 
701
-                        if ($default_value != '') {
702
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
703
-                        }
701
+						if ($default_value != '') {
702
+							$meta_field_add .= " DEFAULT '" . $default_value . "'";
703
+						}
704 704
 
705
-                        $alter_result = $wpdb->query($meta_field_add);
706
-                        if($alter_result===false){
707
-                            return __('Column change failed, you may have too many columns.','geodirectory');
708
-                        }
705
+						$alter_result = $wpdb->query($meta_field_add);
706
+						if($alter_result===false){
707
+							return __('Column change failed, you may have too many columns.','geodirectory');
708
+						}
709 709
 
710
-                        if (isset($request_field['cat_display_type']))
711
-                            $extra_fields = $request_field['cat_display_type'];
710
+						if (isset($request_field['cat_display_type']))
711
+							$extra_fields = $request_field['cat_display_type'];
712 712
 
713
-                        if (isset($request_field['multi_display_type']))
714
-                            $extra_fields = $request_field['multi_display_type'];
713
+						if (isset($request_field['multi_display_type']))
714
+							$extra_fields = $request_field['multi_display_type'];
715 715
 
716 716
 
717
-                        break;
717
+						break;
718 718
 
719
-                    case 'textarea':
720
-                    case 'html':
721
-                    case 'url':
722
-                    case 'file':
719
+					case 'textarea':
720
+					case 'html':
721
+					case 'url':
722
+					case 'file':
723 723
 
724
-                        $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");
725
-                        if($alter_result===false){
726
-                            return __('Column change failed, you may have too many columns.','geodirectory');
727
-                        }
728
-                        if (isset($request_field['advanced_editor']))
729
-                            $extra_fields = $request_field['advanced_editor'];
730
-
731
-                        break;
724
+						$alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");
725
+						if($alter_result===false){
726
+							return __('Column change failed, you may have too many columns.','geodirectory');
727
+						}
728
+						if (isset($request_field['advanced_editor']))
729
+							$extra_fields = $request_field['advanced_editor'];
730
+
731
+						break;
732 732
 
733
-                    case 'fieldset':
734
-                        // Nothig happend for fieldset
735
-                        break;
733
+					case 'fieldset':
734
+						// Nothig happend for fieldset
735
+						break;
736 736
 
737
-                    default:
738
-                        if ($data_type != 'VARCHAR' && $data_type != '') {
739
-                            if ($data_type == 'FLOAT' && $decimal_point > 0) {
740
-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";
741
-                            } else {
742
-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";
743
-                            }
744
-
745
-                            if (is_numeric($default_value) && $default_value != '') {
746
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
747
-                            }
748
-                        } else {
749
-                            $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";
750
-                            if ($default_value != '') {
751
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
752
-                            }
753
-                        }
754
-
755
-                        $alter_result = $wpdb->query($default_value_add);
756
-                        if($alter_result===false){
757
-                            return __('Column change failed, you may have too many columns.','geodirectory');
758
-                        }
759
-                        break;
760
-                endswitch;
761
-
762
-                $extra_field_query = '';
763
-                if (!empty($extra_fields)) {
764
-                    $extra_field_query = serialize($extra_fields);
765
-                }
766
-
767
-                $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';
768
-
769
-                $wpdb->query(
770
-
771
-                    $wpdb->prepare(
772
-
773
-                        "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
737
+					default:
738
+						if ($data_type != 'VARCHAR' && $data_type != '') {
739
+							if ($data_type == 'FLOAT' && $decimal_point > 0) {
740
+								$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";
741
+							} else {
742
+								$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";
743
+							}
744
+
745
+							if (is_numeric($default_value) && $default_value != '') {
746
+								$default_value_add .= " DEFAULT '" . $default_value . "'";
747
+							}
748
+						} else {
749
+							$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";
750
+							if ($default_value != '') {
751
+								$default_value_add .= " DEFAULT '" . $default_value . "'";
752
+							}
753
+						}
754
+
755
+						$alter_result = $wpdb->query($default_value_add);
756
+						if($alter_result===false){
757
+							return __('Column change failed, you may have too many columns.','geodirectory');
758
+						}
759
+						break;
760
+				endswitch;
761
+
762
+				$extra_field_query = '';
763
+				if (!empty($extra_fields)) {
764
+					$extra_field_query = serialize($extra_fields);
765
+				}
766
+
767
+				$decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';
768
+
769
+				$wpdb->query(
770
+
771
+					$wpdb->prepare(
772
+
773
+						"update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
774 774
 					post_type = %s,
775 775
 					admin_title = %s,
776 776
 					site_title = %s,
@@ -804,308 +804,308 @@  discard block
 block discarded – undo
804 804
 					for_admin_use = %s
805 805
 					where id = %d",
806 806
 
807
-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)
808
-                    )
807
+						array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)
808
+					)
809 809
 
810
-                );
810
+				);
811 811
 
812
-                $lastid = trim($cf);
812
+				$lastid = trim($cf);
813 813
 
814 814
 
815
-                $wpdb->query(
816
-                    $wpdb->prepare(
817
-                        "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
815
+				$wpdb->query(
816
+					$wpdb->prepare(
817
+						"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
818 818
 					 	site_title=%s
819 819
 					where post_type = %s and htmlvar_name = %s",
820
-                        array($site_title, $post_type, $htmlvar_name)
821
-                    )
822
-                );
823
-
824
-
825
-                if ($cat_sort == '')
826
-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
827
-
828
-
829
-                /**
830
-                 * Called after all custom fields are saved for a post.
831
-                 *
832
-                 * @since 1.0.0
833
-                 * @param int $lastid The post ID.
834
-                 */
835
-                do_action('geodir_after_custom_fields_updated', $lastid);
836
-
837
-            } else {
838
-
839
-                switch ($field_type):
840
-
841
-                    case 'address':
842
-
843
-                        $data_type = '';
844
-
845
-                        if ($htmlvar_name != '') {
846
-                            $prefix = $htmlvar_name . '_';
847
-                        }
848
-                        $old_prefix = $old_html_variable;
849
-
850
-                        //$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL";
851
-
852
-                        $meta_field_add = "VARCHAR( 254 ) NULL";
853
-                        if ($default_value != '') {
854
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
855
-                        }
856
-
857
-                        geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);
858
-                        //$wpdb->query($meta_field_add);
859
-
860
-
861
-                        if (!empty($extra_fields)) {
820
+						array($site_title, $post_type, $htmlvar_name)
821
+					)
822
+				);
823
+
824
+
825
+				if ($cat_sort == '')
826
+					$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
827
+
828
+
829
+				/**
830
+				 * Called after all custom fields are saved for a post.
831
+				 *
832
+				 * @since 1.0.0
833
+				 * @param int $lastid The post ID.
834
+				 */
835
+				do_action('geodir_after_custom_fields_updated', $lastid);
836
+
837
+			} else {
838
+
839
+				switch ($field_type):
840
+
841
+					case 'address':
842
+
843
+						$data_type = '';
844
+
845
+						if ($htmlvar_name != '') {
846
+							$prefix = $htmlvar_name . '_';
847
+						}
848
+						$old_prefix = $old_html_variable;
849
+
850
+						//$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL";
851
+
852
+						$meta_field_add = "VARCHAR( 254 ) NULL";
853
+						if ($default_value != '') {
854
+							$meta_field_add .= " DEFAULT '" . $default_value . "'";
855
+						}
856
+
857
+						geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);
858
+						//$wpdb->query($meta_field_add);
859
+
860
+
861
+						if (!empty($extra_fields)) {
862 862
 
863
-                            if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
864
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";
865
-                                $meta_field_add = "VARCHAR( 30 ) NULL";
866
-                                if ($default_value != '') {
867
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
868
-                                }
869
-
870
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);
871
-                                //$wpdb->query($meta_field_add);
872
-                            }
873
-                            if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
874
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";
875
-                                $meta_field_add = "VARCHAR( 30 ) NULL";
876
-                                if ($default_value != '') {
877
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
878
-                                }
879
-
880
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);
881
-                                //$wpdb->query($meta_field_add);
882
-                            }
883
-                            if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
884
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";
885
-
886
-                                $meta_field_add = "VARCHAR( 30 ) NULL";
887
-                                if ($default_value != '') {
888
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
889
-                                }
890
-
891
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);
892
-                                //$wpdb->query($meta_field_add);
893
-                            }
894
-                            if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
895
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";
896
-                                $meta_field_add = "VARCHAR( 15 ) NULL";
897
-                                if ($default_value != '') {
898
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
899
-                                }
900
-
901
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);
902
-                                //$wpdb->query($meta_field_add);
903
-                            }
904
-                            if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
905
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
906
-                                $meta_field_add = "VARCHAR( 20 ) NULL";
907
-                                if ($default_value != '') {
908
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
909
-                                }
910
-
911
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);
912
-                                //$wpdb->query($meta_field_add);
913
-
914
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
915
-
916
-                                $meta_field_add = "VARCHAR( 20 ) NULL";
917
-                                if ($default_value != '') {
918
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
919
-                                }
920
-
921
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);
922
-
923
-                                //$wpdb->query($meta_field_add);
924
-                            }
925
-                            if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
926
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
927
-
928
-                                $meta_field_add = "VARCHAR( 15 ) NULL";
929
-                                if ($default_value != '') {
930
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
931
-                                }
932
-
933
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);
934
-
935
-                                //$wpdb->query($meta_field_add);
936
-                            }
937
-                            if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
938
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
939
-
940
-                                $meta_field_add = "VARCHAR( 3 ) NULL";
941
-                                if ($default_value != '') {
942
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
943
-                                }
944
-
945
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);
946
-
947
-                                //$wpdb->query($meta_field_add);
948
-                            }
949
-                            // show lat lng
950
-                            if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
951
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
952
-
953
-                                $meta_field_add = "VARCHAR( 3 ) NULL";
954
-                                $meta_field_add .= " DEFAULT '1'";
955
-
956
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);
957
-                                //$wpdb->query($meta_field_add);
958
-                            }
959
-                        }
960
-
961
-                        break;
962
-
963
-                    case 'checkbox':
964
-                        $data_type = 'TINYINT';
965
-
966
-                        $meta_field_add = $data_type . "( 1 ) NOT NULL ";
967
-                        if ((int)$default_value === 1) {
968
-                            $meta_field_add .= " DEFAULT '1'";
969
-                        }
970
-
971
-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
972
-                        if ($add_result === false) {
973
-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
974
-                        }
975
-                        break;
976
-                    case 'multiselect':
977
-                    case 'select':
978
-                        $data_type = 'VARCHAR';
979
-                        $op_size = '500';
980
-
981
-                        // only make the field as big as it needs to be.
982
-                        if (isset($option_values) && $option_values && $field_type == 'select') {
983
-                            $option_values_arr = explode(',', $option_values);
984
-
985
-                            if (is_array($option_values_arr)) {
986
-                                $op_max = 0;
987
-
988
-                                foreach ($option_values_arr as $op_val) {
989
-                                    if (strlen($op_val) && strlen($op_val) > $op_max) {
990
-                                        $op_max = strlen($op_val);
991
-                                    }
992
-                                }
993
-
994
-                                if ($op_max) {
995
-                                    $op_size = $op_max;
996
-                                }
997
-                            }
998
-                        } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
999
-                            if (strlen($option_values)) {
1000
-                                $op_size =  strlen($option_values);
1001
-                            }
1002
-
1003
-                            if (isset($request_field['multi_display_type'])) {
1004
-                                $extra_fields = $request_field['multi_display_type'];
1005
-                            }
1006
-                        }
1007
-
1008
-                        $meta_field_add = $data_type . "( $op_size ) NULL ";
1009
-                        if ($default_value != '') {
1010
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
1011
-                        }
1012
-
1013
-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1014
-                        if ($add_result === false) {
1015
-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
1016
-                        }
1017
-                        break;
1018
-                    case 'textarea':
1019
-                    case 'html':
1020
-                    case 'url':
1021
-                    case 'file':
1022
-
1023
-                        $data_type = 'TEXT';
1024
-
1025
-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1026
-
1027
-                        $meta_field_add = $data_type . " NULL ";
1028
-                        /*if($default_value != '')
863
+							if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
864
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";
865
+								$meta_field_add = "VARCHAR( 30 ) NULL";
866
+								if ($default_value != '') {
867
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
868
+								}
869
+
870
+								geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);
871
+								//$wpdb->query($meta_field_add);
872
+							}
873
+							if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
874
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";
875
+								$meta_field_add = "VARCHAR( 30 ) NULL";
876
+								if ($default_value != '') {
877
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
878
+								}
879
+
880
+								geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);
881
+								//$wpdb->query($meta_field_add);
882
+							}
883
+							if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
884
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";
885
+
886
+								$meta_field_add = "VARCHAR( 30 ) NULL";
887
+								if ($default_value != '') {
888
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
889
+								}
890
+
891
+								geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);
892
+								//$wpdb->query($meta_field_add);
893
+							}
894
+							if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
895
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";
896
+								$meta_field_add = "VARCHAR( 15 ) NULL";
897
+								if ($default_value != '') {
898
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
899
+								}
900
+
901
+								geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);
902
+								//$wpdb->query($meta_field_add);
903
+							}
904
+							if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
905
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
906
+								$meta_field_add = "VARCHAR( 20 ) NULL";
907
+								if ($default_value != '') {
908
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
909
+								}
910
+
911
+								geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);
912
+								//$wpdb->query($meta_field_add);
913
+
914
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
915
+
916
+								$meta_field_add = "VARCHAR( 20 ) NULL";
917
+								if ($default_value != '') {
918
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
919
+								}
920
+
921
+								geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);
922
+
923
+								//$wpdb->query($meta_field_add);
924
+							}
925
+							if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
926
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
927
+
928
+								$meta_field_add = "VARCHAR( 15 ) NULL";
929
+								if ($default_value != '') {
930
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
931
+								}
932
+
933
+								geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);
934
+
935
+								//$wpdb->query($meta_field_add);
936
+							}
937
+							if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
938
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
939
+
940
+								$meta_field_add = "VARCHAR( 3 ) NULL";
941
+								if ($default_value != '') {
942
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
943
+								}
944
+
945
+								geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);
946
+
947
+								//$wpdb->query($meta_field_add);
948
+							}
949
+							// show lat lng
950
+							if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
951
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
952
+
953
+								$meta_field_add = "VARCHAR( 3 ) NULL";
954
+								$meta_field_add .= " DEFAULT '1'";
955
+
956
+								geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);
957
+								//$wpdb->query($meta_field_add);
958
+							}
959
+						}
960
+
961
+						break;
962
+
963
+					case 'checkbox':
964
+						$data_type = 'TINYINT';
965
+
966
+						$meta_field_add = $data_type . "( 1 ) NOT NULL ";
967
+						if ((int)$default_value === 1) {
968
+							$meta_field_add .= " DEFAULT '1'";
969
+						}
970
+
971
+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
972
+						if ($add_result === false) {
973
+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
974
+						}
975
+						break;
976
+					case 'multiselect':
977
+					case 'select':
978
+						$data_type = 'VARCHAR';
979
+						$op_size = '500';
980
+
981
+						// only make the field as big as it needs to be.
982
+						if (isset($option_values) && $option_values && $field_type == 'select') {
983
+							$option_values_arr = explode(',', $option_values);
984
+
985
+							if (is_array($option_values_arr)) {
986
+								$op_max = 0;
987
+
988
+								foreach ($option_values_arr as $op_val) {
989
+									if (strlen($op_val) && strlen($op_val) > $op_max) {
990
+										$op_max = strlen($op_val);
991
+									}
992
+								}
993
+
994
+								if ($op_max) {
995
+									$op_size = $op_max;
996
+								}
997
+							}
998
+						} elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
999
+							if (strlen($option_values)) {
1000
+								$op_size =  strlen($option_values);
1001
+							}
1002
+
1003
+							if (isset($request_field['multi_display_type'])) {
1004
+								$extra_fields = $request_field['multi_display_type'];
1005
+							}
1006
+						}
1007
+
1008
+						$meta_field_add = $data_type . "( $op_size ) NULL ";
1009
+						if ($default_value != '') {
1010
+							$meta_field_add .= " DEFAULT '" . $default_value . "'";
1011
+						}
1012
+
1013
+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1014
+						if ($add_result === false) {
1015
+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
1016
+						}
1017
+						break;
1018
+					case 'textarea':
1019
+					case 'html':
1020
+					case 'url':
1021
+					case 'file':
1022
+
1023
+						$data_type = 'TEXT';
1024
+
1025
+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1026
+
1027
+						$meta_field_add = $data_type . " NULL ";
1028
+						/*if($default_value != '')
1029 1029
 					{ $meta_field_add .= " DEFAULT '".$default_value."'"; }*/
1030 1030
 
1031
-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1032
-                        if ($add_result === false) {
1033
-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
1034
-                        }
1031
+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1032
+						if ($add_result === false) {
1033
+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
1034
+						}
1035 1035
 
1036
-                        break;
1036
+						break;
1037 1037
 
1038
-                    case 'datepicker':
1038
+					case 'datepicker':
1039 1039
 
1040
-                        $data_type = 'DATE';
1040
+						$data_type = 'DATE';
1041 1041
 
1042
-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1042
+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1043 1043
 
1044
-                        $meta_field_add = $data_type . " NULL ";
1044
+						$meta_field_add = $data_type . " NULL ";
1045 1045
 
1046
-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1047
-                        if ($add_result === false) {
1048
-                            return __('Column creation failed, you may have too many columns or the default value must have in valid date format.', 'geodirectory');
1049
-                        }
1046
+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1047
+						if ($add_result === false) {
1048
+							return __('Column creation failed, you may have too many columns or the default value must have in valid date format.', 'geodirectory');
1049
+						}
1050 1050
 
1051
-                        break;
1051
+						break;
1052 1052
 
1053
-                    case 'time':
1053
+					case 'time':
1054 1054
 
1055
-                        $data_type = 'TIME';
1055
+						$data_type = 'TIME';
1056 1056
 
1057
-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1057
+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1058 1058
 
1059
-                        $meta_field_add = $data_type . " NULL ";
1059
+						$meta_field_add = $data_type . " NULL ";
1060 1060
 
1061
-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1062
-                        if ($add_result === false) {
1063
-                            return __('Column creation failed, you may have too many columns or the default value must have in valid time format.', 'geodirectory');
1064
-                        }
1061
+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1062
+						if ($add_result === false) {
1063
+							return __('Column creation failed, you may have too many columns or the default value must have in valid time format.', 'geodirectory');
1064
+						}
1065 1065
 
1066
-                        break;
1066
+						break;
1067 1067
 
1068
-                    default:
1068
+					default:
1069 1069
 
1070
-                        if ($data_type != 'VARCHAR' && $data_type != '') {
1071
-                            $meta_field_add = $data_type . " NULL ";
1070
+						if ($data_type != 'VARCHAR' && $data_type != '') {
1071
+							$meta_field_add = $data_type . " NULL ";
1072 1072
 
1073
-                            if ($data_type == 'FLOAT' && $decimal_point > 0) {
1074
-                                $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";
1075
-                            }
1073
+							if ($data_type == 'FLOAT' && $decimal_point > 0) {
1074
+								$meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";
1075
+							}
1076 1076
 
1077
-                            if (is_numeric($default_value) && $default_value != '') {
1078
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
1079
-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";
1080
-                            }
1081
-                        } else {
1082
-                            $meta_field_add = " VARCHAR( 254 ) NULL ";
1077
+							if (is_numeric($default_value) && $default_value != '') {
1078
+								$default_value_add .= " DEFAULT '" . $default_value . "'";
1079
+								$meta_field_add .= " DEFAULT '" . $default_value . "'";
1080
+							}
1081
+						} else {
1082
+							$meta_field_add = " VARCHAR( 254 ) NULL ";
1083 1083
 
1084
-                            if ($default_value != '') {
1085
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
1086
-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";
1087
-                            }
1088
-                        }
1084
+							if ($default_value != '') {
1085
+								$default_value_add .= " DEFAULT '" . $default_value . "'";
1086
+								$meta_field_add .= " DEFAULT '" . $default_value . "'";
1087
+							}
1088
+						}
1089 1089
 
1090
-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1091
-                        if ($add_result === false) {
1092
-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
1093
-                        }
1094
-                        break;
1095
-                endswitch;
1090
+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1091
+						if ($add_result === false) {
1092
+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
1093
+						}
1094
+						break;
1095
+				endswitch;
1096 1096
 
1097
-                $extra_field_query = '';
1098
-                if (!empty($extra_fields)) {
1099
-                    $extra_field_query = serialize($extra_fields);
1100
-                }
1097
+				$extra_field_query = '';
1098
+				if (!empty($extra_fields)) {
1099
+					$extra_field_query = serialize($extra_fields);
1100
+				}
1101 1101
 
1102
-                $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';
1102
+				$decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';
1103 1103
 
1104
-                $wpdb->query(
1104
+				$wpdb->query(
1105 1105
 
1106
-                    $wpdb->prepare(
1106
+					$wpdb->prepare(
1107 1107
 
1108
-                        "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
1108
+						"insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
1109 1109
 					post_type = %s,
1110 1110
 					admin_title = %s,
1111 1111
 					site_title = %s,
@@ -1138,26 +1138,26 @@  discard block
 block discarded – undo
1138 1138
 					validation_msg = %s,
1139 1139
 					for_admin_use = %s ",
1140 1140
 
1141
-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)
1141
+						array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)
1142 1142
 
1143
-                    )
1143
+					)
1144 1144
 
1145
-                );
1145
+				);
1146 1146
 
1147
-                $lastid = $wpdb->insert_id;
1147
+				$lastid = $wpdb->insert_id;
1148 1148
 
1149
-                $lastid = trim($lastid);
1149
+				$lastid = trim($lastid);
1150 1150
 
1151
-            }
1151
+			}
1152 1152
 
1153
-            return (int)$lastid;
1153
+			return (int)$lastid;
1154 1154
 
1155 1155
 
1156
-        } else {
1157
-            return 'HTML Variable Name should be a unique name';
1158
-        }
1156
+		} else {
1157
+			return 'HTML Variable Name should be a unique name';
1158
+		}
1159 1159
 
1160
-    }
1160
+	}
1161 1161
 }
1162 1162
 
1163 1163
 /**
@@ -1172,54 +1172,54 @@  discard block
 block discarded – undo
1172 1172
 function godir_set_field_order($field_ids = array())
1173 1173
 {
1174 1174
 
1175
-    global $wpdb;
1175
+	global $wpdb;
1176 1176
 
1177
-    $count = 0;
1178
-    if (!empty($field_ids)):
1179
-        $post_meta_info = false;
1180
-        foreach ($field_ids as $id) {
1177
+	$count = 0;
1178
+	if (!empty($field_ids)):
1179
+		$post_meta_info = false;
1180
+		foreach ($field_ids as $id) {
1181 1181
 
1182
-            $cf = trim($id, '_');
1182
+			$cf = trim($id, '_');
1183 1183
 
1184
-            $post_meta_info = $wpdb->query(
1185
-                $wpdb->prepare(
1186
-                    "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
1184
+			$post_meta_info = $wpdb->query(
1185
+				$wpdb->prepare(
1186
+					"update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
1187 1187
 															sort_order=%d 
1188 1188
 															where id= %d",
1189
-                    array($count, $cf)
1190
-                )
1191
-            );
1192
-            $count++;
1193
-        }
1194
-
1195
-        return $post_meta_info;
1196
-    else:
1197
-        return false;
1198
-    endif;
1189
+					array($count, $cf)
1190
+				)
1191
+			);
1192
+			$count++;
1193
+		}
1194
+
1195
+		return $post_meta_info;
1196
+	else:
1197
+		return false;
1198
+	endif;
1199 1199
 }
1200 1200
 
1201 1201
 
1202 1202
 function geodir_get_cf_value($cf){
1203
-    global $gd_session;
1204
-    $value = '';
1205
-    if (is_admin()) {
1206
-        global $post,$gd_session;
1207
-
1208
-        if (isset($_REQUEST['post']))
1209
-            $_REQUEST['pid'] = $_REQUEST['post'];
1210
-    }
1211
-
1212
-    if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
1213
-        $post = $gd_ses_listing;
1214
-        $value = isset($post[$cf['name']]) ? $post[$cf['name']] : '';
1215
-    } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
1216
-        $value = geodir_get_post_meta($_REQUEST['pid'], $cf['name'], true);
1217
-    } else {
1218
-        if ($value == '') {
1219
-            $value = $cf['default'];
1220
-        }
1221
-    }
1222
-    return $value;
1203
+	global $gd_session;
1204
+	$value = '';
1205
+	if (is_admin()) {
1206
+		global $post,$gd_session;
1207
+
1208
+		if (isset($_REQUEST['post']))
1209
+			$_REQUEST['pid'] = $_REQUEST['post'];
1210
+	}
1211
+
1212
+	if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
1213
+		$post = $gd_ses_listing;
1214
+		$value = isset($post[$cf['name']]) ? $post[$cf['name']] : '';
1215
+	} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
1216
+		$value = geodir_get_post_meta($_REQUEST['pid'], $cf['name'], true);
1217
+	} else {
1218
+		if ($value == '') {
1219
+			$value = $cf['default'];
1220
+		}
1221
+	}
1222
+	return $value;
1223 1223
 }
1224 1224
 
1225 1225
 /**
@@ -1238,420 +1238,420 @@  discard block
 block discarded – undo
1238 1238
  * @param string $post_type Optional. The wordpress post type.
1239 1239
  */
1240 1240
 function geodir_get_custom_fields_html($package_id = '', $default = 'custom', $post_type = 'gd_place') {
1241
-    global $is_default, $mapzoom, $gd_session;
1241
+	global $is_default, $mapzoom, $gd_session;
1242 1242
 
1243
-    $listing_type = $post_type;
1243
+	$listing_type = $post_type;
1244 1244
 
1245
-    $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);
1245
+	$custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);
1246 1246
 
1247
-    foreach ($custom_fields as $key => $val) {
1248
-        $val = stripslashes_deep($val); // strip slashes from labels
1249
-        $name = $val['name'];
1250
-        $type = $val['type'];
1251
-        $is_default = $val['is_default'];
1247
+	foreach ($custom_fields as $key => $val) {
1248
+		$val = stripslashes_deep($val); // strip slashes from labels
1249
+		$name = $val['name'];
1250
+		$type = $val['type'];
1251
+		$is_default = $val['is_default'];
1252 1252
 
1253
-        /* field available to site admin only for edit */
1254
-        $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;
1255
-        if ($for_admin_use && !is_super_admin()) {
1256
-            continue;
1257
-        }
1253
+		/* field available to site admin only for edit */
1254
+		$for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;
1255
+		if ($for_admin_use && !is_super_admin()) {
1256
+			continue;
1257
+		}
1258 1258
 
1259
-        if (is_admin()) {
1260
-            global $post;
1259
+		if (is_admin()) {
1260
+			global $post;
1261 1261
 
1262
-            if (isset($_REQUEST['post']))
1263
-                $_REQUEST['pid'] = $_REQUEST['post'];
1264
-        }
1262
+			if (isset($_REQUEST['post']))
1263
+				$_REQUEST['pid'] = $_REQUEST['post'];
1264
+		}
1265 1265
 
1266 1266
         
1267 1267
 
1268
-        /**
1269
-         * Called before the custom fields info is output for submitting a post.
1270
-         *
1271
-         * Used dynamic hook type geodir_before_custom_form_field_$name.
1272
-         *
1273
-         * @since 1.0.0
1274
-         * @param string $listing_type The post post type.
1275
-         * @param int $package_id The price package ID for the post.
1276
-         * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
1277
-         * @see 'geodir_after_custom_form_field_$name'
1278
-         */
1279
-        do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);
1280
-
1281
-
1282
-        $custom_field = $val;
1283
-        $html ='';
1284
-        /**
1285
-         * Filter the output for custom fields.
1286
-         *
1287
-         * Here we can remove or add new functions depending on the field type.
1288
-         *
1289
-         * @param string $html The html to be filtered (blank).
1290
-         * @param array $custom_field The custom field array values.
1291
-         */
1292
-        echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);
1293
-
1294
-
1295
-
1296
-        /**
1297
-         * Called after the custom fields info is output for submitting a post.
1298
-         *
1299
-         * Used dynamic hook type geodir_after_custom_form_field_$name.
1300
-         *
1301
-         * @since 1.0.0
1302
-         * @param string $listing_type The post post type.
1303
-         * @param int $package_id The price package ID for the post.
1304
-         * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
1305
-         * @see 'geodir_before_custom_form_field_$name'
1306
-         */
1307
-        do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);
1308
-
1309
-    }
1268
+		/**
1269
+		 * Called before the custom fields info is output for submitting a post.
1270
+		 *
1271
+		 * Used dynamic hook type geodir_before_custom_form_field_$name.
1272
+		 *
1273
+		 * @since 1.0.0
1274
+		 * @param string $listing_type The post post type.
1275
+		 * @param int $package_id The price package ID for the post.
1276
+		 * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
1277
+		 * @see 'geodir_after_custom_form_field_$name'
1278
+		 */
1279
+		do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);
1280
+
1281
+
1282
+		$custom_field = $val;
1283
+		$html ='';
1284
+		/**
1285
+		 * Filter the output for custom fields.
1286
+		 *
1287
+		 * Here we can remove or add new functions depending on the field type.
1288
+		 *
1289
+		 * @param string $html The html to be filtered (blank).
1290
+		 * @param array $custom_field The custom field array values.
1291
+		 */
1292
+		echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);
1293
+
1294
+
1295
+
1296
+		/**
1297
+		 * Called after the custom fields info is output for submitting a post.
1298
+		 *
1299
+		 * Used dynamic hook type geodir_after_custom_form_field_$name.
1300
+		 *
1301
+		 * @since 1.0.0
1302
+		 * @param string $listing_type The post post type.
1303
+		 * @param int $package_id The price package ID for the post.
1304
+		 * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
1305
+		 * @see 'geodir_before_custom_form_field_$name'
1306
+		 */
1307
+		do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);
1308
+
1309
+	}
1310 1310
 
1311 1311
 }
1312 1312
 
1313 1313
 
1314 1314
 if (!function_exists('geodir_get_field_infoby')) {
1315
-    /**
1316
-     * Get custom field using key and value.
1317
-     *
1318
-     * @since 1.0.0
1319
-     * @package GeoDirectory
1320
-     * @global object $wpdb WordPress Database object.
1321
-     * @param string $key The key you want to look for.
1322
-     * @param string $value The value of the key you want to look for.
1323
-     * @param string $geodir_post_type The post type.
1324
-     * @return bool|mixed Returns field info when available. otherwise returns false.
1325
-     */
1326
-    function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')
1327
-    {
1328
-
1329
-        global $wpdb;
1330
-
1331
-        $filter = $wpdb->get_row(
1332
-            $wpdb->prepare(
1333
-                "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",
1334
-                array($geodir_post_type)
1335
-            )
1336
-        );
1337
-
1338
-        if ($filter) {
1339
-            return $filter;
1340
-        } else {
1341
-            return false;
1342
-        }
1343
-
1344
-    }
1315
+	/**
1316
+	 * Get custom field using key and value.
1317
+	 *
1318
+	 * @since 1.0.0
1319
+	 * @package GeoDirectory
1320
+	 * @global object $wpdb WordPress Database object.
1321
+	 * @param string $key The key you want to look for.
1322
+	 * @param string $value The value of the key you want to look for.
1323
+	 * @param string $geodir_post_type The post type.
1324
+	 * @return bool|mixed Returns field info when available. otherwise returns false.
1325
+	 */
1326
+	function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')
1327
+	{
1328
+
1329
+		global $wpdb;
1330
+
1331
+		$filter = $wpdb->get_row(
1332
+			$wpdb->prepare(
1333
+				"SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",
1334
+				array($geodir_post_type)
1335
+			)
1336
+		);
1337
+
1338
+		if ($filter) {
1339
+			return $filter;
1340
+		} else {
1341
+			return false;
1342
+		}
1343
+
1344
+	}
1345 1345
 }
1346 1346
 
1347 1347
 
1348 1348
 function geodir_field_icon_proccess($cf){
1349 1349
 
1350 1350
 
1351
-    if (strpos($cf['field_icon'], 'http') !== false) {
1352
-        $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
1353
-    } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
1354
-        $field_icon = '<i class="' . $cf['field_icon'] . '"></i>';
1355
-    }else{
1356
-        $field_icon = $cf['field_icon'];
1357
-    }
1351
+	if (strpos($cf['field_icon'], 'http') !== false) {
1352
+		$field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
1353
+	} elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
1354
+		$field_icon = '<i class="' . $cf['field_icon'] . '"></i>';
1355
+	}else{
1356
+		$field_icon = $cf['field_icon'];
1357
+	}
1358 1358
 
1359
-    return $field_icon;
1359
+	return $field_icon;
1360 1360
 }
1361 1361
 
1362 1362
 if (!function_exists('geodir_show_listing_info')) {
1363
-    /**
1364
-     * Show listing info depending on field location.
1365
-     *
1366
-     * @since 1.0.0
1367
-     * @since 1.5.7 Custom fields option values added to db translation.
1368
-     *              Changes to display url fields title.
1369
-     * @package GeoDirectory
1370
-     * @global object $wpdb WordPress Database object.
1371
-     * @global object $post The current post object.
1372
-     * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false.
1373
-     *
1374
-     * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.
1375
-     * @return string Returns listing info html.
1376
-     */
1377
-    function geodir_show_listing_info($fields_location = '') {
1378
-        global $post, $preview, $wpdb, $send_to_friend;
1379
-
1380
-        $package_info = array();
1381
-
1382
-        $package_info = geodir_post_package_info($package_info, $post);
1383
-        $post_package_id = !empty($package_info->pid) ? $package_info->pid : '';
1384
-        $p_type = !empty($post->post_type) ? $post->post_type : geodir_get_current_posttype();
1385
-        $send_to_friend = false;
1386
-
1387
-        ob_start();
1388
-        $fields_info = geodir_post_custom_fields($post_package_id, 'all', $p_type, $fields_location);
1389
-
1390
-        if (!empty($fields_info)) {
1391
-            $post = stripslashes_deep($post); // strip slashes
1363
+	/**
1364
+	 * Show listing info depending on field location.
1365
+	 *
1366
+	 * @since 1.0.0
1367
+	 * @since 1.5.7 Custom fields option values added to db translation.
1368
+	 *              Changes to display url fields title.
1369
+	 * @package GeoDirectory
1370
+	 * @global object $wpdb WordPress Database object.
1371
+	 * @global object $post The current post object.
1372
+	 * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false.
1373
+	 *
1374
+	 * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.
1375
+	 * @return string Returns listing info html.
1376
+	 */
1377
+	function geodir_show_listing_info($fields_location = '') {
1378
+		global $post, $preview, $wpdb, $send_to_friend;
1379
+
1380
+		$package_info = array();
1381
+
1382
+		$package_info = geodir_post_package_info($package_info, $post);
1383
+		$post_package_id = !empty($package_info->pid) ? $package_info->pid : '';
1384
+		$p_type = !empty($post->post_type) ? $post->post_type : geodir_get_current_posttype();
1385
+		$send_to_friend = false;
1386
+
1387
+		ob_start();
1388
+		$fields_info = geodir_post_custom_fields($post_package_id, 'all', $p_type, $fields_location);
1389
+
1390
+		if (!empty($fields_info)) {
1391
+			$post = stripslashes_deep($post); // strip slashes
1392 1392
             
1393
-            //echo '<div class="geodir-company_info field-group">';
1394
-            global $field_set_start;
1395
-            $field_set_start = 0;
1393
+			//echo '<div class="geodir-company_info field-group">';
1394
+			global $field_set_start;
1395
+			$field_set_start = 0;
1396 1396
 
1397 1397
 
1398 1398
 
1399
-            foreach ($fields_info as $type) {
1400
-                $type = stripslashes_deep($type); // strip slashes
1401
-                $html = '';
1402
-                $field_icon = geodir_field_icon_proccess($type);
1403
-                $filed_type = $type['type'];
1404
-                $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';
1405
-                if($html_var=='post'){$html_var='post_address';}
1399
+			foreach ($fields_info as $type) {
1400
+				$type = stripslashes_deep($type); // strip slashes
1401
+				$html = '';
1402
+				$field_icon = geodir_field_icon_proccess($type);
1403
+				$filed_type = $type['type'];
1404
+				$html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';
1405
+				if($html_var=='post'){$html_var='post_address';}
1406 1406
 
1407
-                /**
1408
-                 * Filter the output for custom fields.
1409
-                 *
1410
-                 * Here we can remove or add new functions depending on the field type.
1411
-                 *
1412
-                 * @param string $html The html to be filtered (blank).
1413
-                 * @param string $fields_location The location the field is to be show.
1414
-                 * @param array $type The array of field values.
1415
-                 */
1416
-                $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
1407
+				/**
1408
+				 * Filter the output for custom fields.
1409
+				 *
1410
+				 * Here we can remove or add new functions depending on the field type.
1411
+				 *
1412
+				 * @param string $html The html to be filtered (blank).
1413
+				 * @param string $fields_location The location the field is to be show.
1414
+				 * @param array $type The array of field values.
1415
+				 */
1416
+				$html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
1417 1417
 
1418
-                $variables_array = array();
1418
+				$variables_array = array();
1419 1419
 
1420 1420
 //                if ($fields_location == 'detail' && isset($type['show_as_tab']) && (int)$type['show_as_tab'] == 1 && in_array($type['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {
1421 1421
 //                    continue;
1422 1422
 //                }
1423 1423
 
1424
-                if ($type['type'] != 'fieldset'):
1425
-                    $variables_array['post_id'] = $post->ID;
1426
-                    $variables_array['label'] = __($type['site_title'], 'geodirectory');
1427
-                    $variables_array['value'] = '';
1428
-                    if (isset($post->{$type['htmlvar_name']}))
1429
-                        $variables_array['value'] = $post->{$type['htmlvar_name']};
1430
-                endif;
1431
-
1432
-
1433
-                if ($html):
1434
-
1435
-                    /**
1436
-                     * Called before a custom fields is output on the frontend.
1437
-                     *
1438
-                     * @since 1.0.0
1439
-                     * @param string $html_var The HTML variable name for the field.
1440
-                     */
1441
-                    do_action("geodir_before_show_{$html_var}");
1442
-                    /**
1443
-                     * Filter custom field output.
1444
-                     *
1445
-                     * @since 1.0.0
1446
-                     *
1447
-                     * @param string $html_var The HTML variable name for the field.
1448
-                     * @param string $html Custom field unfiltered HTML.
1449
-                     * @param array $variables_array Custom field variables array.
1450
-                     */
1451
-                    if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
1452
-
1453
-                    /**
1454
-                     * Called after a custom fields is output on the frontend.
1455
-                     *
1456
-                     * @since 1.0.0
1457
-                     * @param string $html_var The HTML variable name for the field.
1458
-                     */
1459
-                    do_action("geodir_after_show_{$html_var}");
1460
-
1461
-                endif;
1462
-
1463
-            }
1464
-
1465
-            //echo '</div>';
1466
-
1467
-        }
1468
-
1469
-
1470
-        $html = ob_get_clean();
1471
-
1472
-        /**
1473
-         * Filter the custom fields over all output.
1474
-         *
1475
-         * @param string $html The html of the custom fields.
1476
-         * @param string $fields_location The location the fields are being output.
1477
-         * @since 1.6.9
1478
-         */
1479
-        return apply_filters('geodir_show_listing_info',$html,$fields_location);
1480
-
1481
-    }
1424
+				if ($type['type'] != 'fieldset'):
1425
+					$variables_array['post_id'] = $post->ID;
1426
+					$variables_array['label'] = __($type['site_title'], 'geodirectory');
1427
+					$variables_array['value'] = '';
1428
+					if (isset($post->{$type['htmlvar_name']}))
1429
+						$variables_array['value'] = $post->{$type['htmlvar_name']};
1430
+				endif;
1431
+
1432
+
1433
+				if ($html):
1434
+
1435
+					/**
1436
+					 * Called before a custom fields is output on the frontend.
1437
+					 *
1438
+					 * @since 1.0.0
1439
+					 * @param string $html_var The HTML variable name for the field.
1440
+					 */
1441
+					do_action("geodir_before_show_{$html_var}");
1442
+					/**
1443
+					 * Filter custom field output.
1444
+					 *
1445
+					 * @since 1.0.0
1446
+					 *
1447
+					 * @param string $html_var The HTML variable name for the field.
1448
+					 * @param string $html Custom field unfiltered HTML.
1449
+					 * @param array $variables_array Custom field variables array.
1450
+					 */
1451
+					if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
1452
+
1453
+					/**
1454
+					 * Called after a custom fields is output on the frontend.
1455
+					 *
1456
+					 * @since 1.0.0
1457
+					 * @param string $html_var The HTML variable name for the field.
1458
+					 */
1459
+					do_action("geodir_after_show_{$html_var}");
1460
+
1461
+				endif;
1462
+
1463
+			}
1464
+
1465
+			//echo '</div>';
1466
+
1467
+		}
1468
+
1469
+
1470
+		$html = ob_get_clean();
1471
+
1472
+		/**
1473
+		 * Filter the custom fields over all output.
1474
+		 *
1475
+		 * @param string $html The html of the custom fields.
1476
+		 * @param string $fields_location The location the fields are being output.
1477
+		 * @since 1.6.9
1478
+		 */
1479
+		return apply_filters('geodir_show_listing_info',$html,$fields_location);
1480
+
1481
+	}
1482 1482
 }
1483 1483
 
1484 1484
 if (!function_exists('geodir_default_date_format')) {
1485
-    /**
1486
-     * Returns default date format.
1487
-     *
1488
-     * @since 1.0.0
1489
-     * @package GeoDirectory
1490
-     * @return mixed|string|void Returns default date format.
1491
-     */
1492
-    function geodir_default_date_format()
1493
-    {
1494
-        if ($format = get_option('date_format'))
1495
-            return $format;
1496
-        else
1497
-            return 'dd-mm-yy';
1498
-    }
1485
+	/**
1486
+	 * Returns default date format.
1487
+	 *
1488
+	 * @since 1.0.0
1489
+	 * @package GeoDirectory
1490
+	 * @return mixed|string|void Returns default date format.
1491
+	 */
1492
+	function geodir_default_date_format()
1493
+	{
1494
+		if ($format = get_option('date_format'))
1495
+			return $format;
1496
+		else
1497
+			return 'dd-mm-yy';
1498
+	}
1499 1499
 }
1500 1500
 
1501 1501
 if (!function_exists('geodir_get_formated_date')) {
1502
-    /**
1503
-     * Returns formatted date.
1504
-     *
1505
-     * @since 1.0.0
1506
-     * @package GeoDirectory
1507
-     * @param string $date Date string to convert.
1508
-     * @return bool|int|string Returns formatted date.
1509
-     */
1510
-    function geodir_get_formated_date($date)
1511
-    {
1512
-        return mysql2date(get_option('date_format'), $date);
1513
-    }
1502
+	/**
1503
+	 * Returns formatted date.
1504
+	 *
1505
+	 * @since 1.0.0
1506
+	 * @package GeoDirectory
1507
+	 * @param string $date Date string to convert.
1508
+	 * @return bool|int|string Returns formatted date.
1509
+	 */
1510
+	function geodir_get_formated_date($date)
1511
+	{
1512
+		return mysql2date(get_option('date_format'), $date);
1513
+	}
1514 1514
 }
1515 1515
 
1516 1516
 if (!function_exists('geodir_get_formated_time')) {
1517
-    /**
1518
-     * Returns formatted time.
1519
-     *
1520
-     * @since 1.0.0
1521
-     * @package GeoDirectory
1522
-     * @param string $time Time string to convert.
1523
-     * @return bool|int|string Returns formatted time.
1524
-     */
1525
-    function geodir_get_formated_time($time)
1526
-    {
1527
-        return mysql2date(get_option('time_format'), $time, $translate = true);
1528
-    }
1517
+	/**
1518
+	 * Returns formatted time.
1519
+	 *
1520
+	 * @since 1.0.0
1521
+	 * @package GeoDirectory
1522
+	 * @param string $time Time string to convert.
1523
+	 * @return bool|int|string Returns formatted time.
1524
+	 */
1525
+	function geodir_get_formated_time($time)
1526
+	{
1527
+		return mysql2date(get_option('time_format'), $time, $translate = true);
1528
+	}
1529 1529
 }
1530 1530
 
1531 1531
 
1532 1532
 if (!function_exists('geodir_save_post_file_fields')) {
1533
-    /**
1534
-     * Save post file fields
1535
-     *
1536
-     * @since 1.0.0
1537
-     * @since 1.4.7 Added `$extra_fields` parameter.
1538
-     * @package GeoDirectory
1539
-     * @global object $wpdb WordPress Database object.
1540
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
1541
-     * @global object $current_user Current user object.
1542
-     * @param int $post_id
1543
-     * @param string $field_id
1544
-     * @param array $post_image
1545
-     * @param array $extra_fields Array of extra fields.
1546
-     */
1547
-    function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())
1548
-    {
1533
+	/**
1534
+	 * Save post file fields
1535
+	 *
1536
+	 * @since 1.0.0
1537
+	 * @since 1.4.7 Added `$extra_fields` parameter.
1538
+	 * @package GeoDirectory
1539
+	 * @global object $wpdb WordPress Database object.
1540
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
1541
+	 * @global object $current_user Current user object.
1542
+	 * @param int $post_id
1543
+	 * @param string $field_id
1544
+	 * @param array $post_image
1545
+	 * @param array $extra_fields Array of extra fields.
1546
+	 */
1547
+	function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())
1548
+	{
1549 1549
 
1550
-        global $wpdb, $plugin_prefix, $current_user;
1550
+		global $wpdb, $plugin_prefix, $current_user;
1551 1551
 
1552
-        $post_type = get_post_type($post_id);
1553
-        //echo $field_id; exit;
1554
-        $table = $plugin_prefix . $post_type . '_detail';
1552
+		$post_type = get_post_type($post_id);
1553
+		//echo $field_id; exit;
1554
+		$table = $plugin_prefix . $post_type . '_detail';
1555 1555
 
1556
-        $postcurr_images = array();
1557
-        $postcurr_images = geodir_get_post_meta($post_id, $field_id, true);
1558
-        $file_urls = '';
1556
+		$postcurr_images = array();
1557
+		$postcurr_images = geodir_get_post_meta($post_id, $field_id, true);
1558
+		$file_urls = '';
1559 1559
 
1560
-        if (!empty($post_image)) {
1560
+		if (!empty($post_image)) {
1561 1561
 
1562
-            $invalid_files = array();
1562
+			$invalid_files = array();
1563 1563
 
1564
-            //Get and remove all old images of post from database to set by new order
1565
-            $geodir_uploaddir = '';
1566
-            $uploads = wp_upload_dir();
1567
-            $uploads_dir = $uploads['path'];
1564
+			//Get and remove all old images of post from database to set by new order
1565
+			$geodir_uploaddir = '';
1566
+			$uploads = wp_upload_dir();
1567
+			$uploads_dir = $uploads['path'];
1568 1568
 
1569
-            $geodir_uploadpath = $uploads['path'];
1570
-            $geodir_uploadurl = $uploads['url'];
1571
-            $sub_dir = $uploads['subdir'];
1569
+			$geodir_uploadpath = $uploads['path'];
1570
+			$geodir_uploadurl = $uploads['url'];
1571
+			$sub_dir = $uploads['subdir'];
1572 1572
 
1573
-            $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'] : '';
1573
+			$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'] : '';
1574 1574
 
1575
-            for ($m = 0; $m < count($post_image); $m++) {
1575
+			for ($m = 0; $m < count($post_image); $m++) {
1576 1576
 
1577
-                /* --------- start ------- */
1577
+				/* --------- start ------- */
1578 1578
 
1579
-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
1579
+				if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
1580 1580
 
1581 1581
 
1582
-                    $curr_img_url = $post_image[$m];
1583
-                    $image_name_arr = explode('/', $curr_img_url);
1584
-                    $curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
1585
-                    $filename = end($image_name_arr);
1586
-                    $img_name_arr = explode('.', $filename);
1582
+					$curr_img_url = $post_image[$m];
1583
+					$image_name_arr = explode('/', $curr_img_url);
1584
+					$curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
1585
+					$filename = end($image_name_arr);
1586
+					$img_name_arr = explode('.', $filename);
1587 1587
 
1588
-                    $arr_file_type = wp_check_filetype($filename);
1588
+					$arr_file_type = wp_check_filetype($filename);
1589 1589
 
1590
-                    if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
1591
-                        continue;
1592
-                    }
1590
+					if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
1591
+						continue;
1592
+					}
1593 1593
 
1594
-                    $uploaded_file_type = $arr_file_type['type'];
1595
-                    $uploaded_file_ext = $arr_file_type['ext'];
1594
+					$uploaded_file_type = $arr_file_type['type'];
1595
+					$uploaded_file_ext = $arr_file_type['ext'];
1596 1596
 
1597
-                    if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
1598
-                        continue; // Invalid file type.
1599
-                    }
1597
+					if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
1598
+						continue; // Invalid file type.
1599
+					}
1600 1600
 
1601
-                    // Set an array containing a list of acceptable formats
1602
-                    //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
1601
+					// Set an array containing a list of acceptable formats
1602
+					//$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
1603 1603
 
1604
-                    if (!function_exists('wp_handle_upload'))
1605
-                        require_once(ABSPATH . 'wp-admin/includes/file.php');
1604
+					if (!function_exists('wp_handle_upload'))
1605
+						require_once(ABSPATH . 'wp-admin/includes/file.php');
1606 1606
 
1607
-                    if (!is_dir($geodir_uploadpath))
1608
-                        mkdir($geodir_uploadpath);
1607
+					if (!is_dir($geodir_uploadpath))
1608
+						mkdir($geodir_uploadpath);
1609 1609
 
1610
-                    $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];
1611
-                    $explode_sub_dir = explode("/", $sub_dir);
1612
-                    if ($curr_img_dir == end($explode_sub_dir)) {
1613
-                        $img_path = $geodir_uploadpath . '/' . $filename;
1614
-                        $img_url = $geodir_uploadurl . '/' . $filename;
1615
-                    } else {
1616
-                        $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1617
-                        $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;
1618
-                    }
1610
+					$new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];
1611
+					$explode_sub_dir = explode("/", $sub_dir);
1612
+					if ($curr_img_dir == end($explode_sub_dir)) {
1613
+						$img_path = $geodir_uploadpath . '/' . $filename;
1614
+						$img_url = $geodir_uploadurl . '/' . $filename;
1615
+					} else {
1616
+						$img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1617
+						$img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;
1618
+					}
1619 1619
 
1620
-                    $uploaded_file = '';
1621
-                    if (file_exists($img_path))
1622
-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1620
+					$uploaded_file = '';
1621
+					if (file_exists($img_path))
1622
+						$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1623 1623
 
1624
-                    if ($curr_img_dir != $geodir_uploaddir) {
1625
-                        if (file_exists($img_path))
1626
-                            unlink($img_path);
1627
-                    }
1624
+					if ($curr_img_dir != $geodir_uploaddir) {
1625
+						if (file_exists($img_path))
1626
+							unlink($img_path);
1627
+					}
1628 1628
 
1629
-                    if (!empty($uploaded_file))
1630
-                        $file_urls = $geodir_uploadurl . '/' . $new_name;
1629
+					if (!empty($uploaded_file))
1630
+						$file_urls = $geodir_uploadurl . '/' . $new_name;
1631 1631
 
1632
-                } else {
1633
-                    $file_urls = $post_image[$m];
1634
-                }
1635
-            }
1632
+				} else {
1633
+					$file_urls = $post_image[$m];
1634
+				}
1635
+			}
1636 1636
 
1637 1637
 
1638
-        }
1638
+		}
1639 1639
 
1640
-        //Remove all old attachments and temp images
1641
-        if (!empty($postcurr_images)) {
1640
+		//Remove all old attachments and temp images
1641
+		if (!empty($postcurr_images)) {
1642 1642
 
1643
-            if ($file_urls != $postcurr_images) {
1644
-                $invalid_files[] = (object)array('src' => $postcurr_images);
1645
-                $invalid_files = (object)$invalid_files;
1646
-            }
1647
-        }
1643
+			if ($file_urls != $postcurr_images) {
1644
+				$invalid_files[] = (object)array('src' => $postcurr_images);
1645
+				$invalid_files = (object)$invalid_files;
1646
+			}
1647
+		}
1648 1648
 
1649
-        geodir_save_post_meta($post_id, $field_id, $file_urls);
1649
+		geodir_save_post_meta($post_id, $field_id, $file_urls);
1650 1650
 
1651
-        if (!empty($invalid_files))
1652
-            geodir_remove_attachments($invalid_files);
1651
+		if (!empty($invalid_files))
1652
+			geodir_remove_attachments($invalid_files);
1653 1653
 
1654
-    }
1654
+	}
1655 1655
 }
1656 1656
 
1657 1657
 
@@ -1666,76 +1666,76 @@  discard block
 block discarded – undo
1666 1666
  */
1667 1667
 function geodir_custom_upload_mimes($existing_mimes = array())
1668 1668
 {
1669
-    $existing_mimes['wif'] = 'text/plain';
1670
-    $existing_mimes['jpg|jpeg'] = 'image/jpeg';
1671
-    $existing_mimes['gif'] = 'image/gif';
1672
-    $existing_mimes['png'] = 'image/png';
1673
-    $existing_mimes['pdf'] = 'application/pdf';
1674
-    $existing_mimes['txt'] = 'text/text';
1675
-    $existing_mimes['csv'] = 'application/octet-stream';
1676
-    $existing_mimes['doc'] = 'application/msword';
1677
-    $existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel';
1678
-    $existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
1679
-    $existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
1680
-    return $existing_mimes;
1669
+	$existing_mimes['wif'] = 'text/plain';
1670
+	$existing_mimes['jpg|jpeg'] = 'image/jpeg';
1671
+	$existing_mimes['gif'] = 'image/gif';
1672
+	$existing_mimes['png'] = 'image/png';
1673
+	$existing_mimes['pdf'] = 'application/pdf';
1674
+	$existing_mimes['txt'] = 'text/text';
1675
+	$existing_mimes['csv'] = 'application/octet-stream';
1676
+	$existing_mimes['doc'] = 'application/msword';
1677
+	$existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel';
1678
+	$existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
1679
+	$existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
1680
+	return $existing_mimes;
1681 1681
 }
1682 1682
 
1683 1683
 if (!function_exists('geodir_plupload_action')) {
1684 1684
 
1685
-    /**
1686
-     * Get upload directory path details
1687
-     *
1688
-     * @since 1.0.0
1689
-     * @package GeoDirectory
1690
-     * @global object $current_user Current user object.
1691
-     * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.
1692
-     * @return mixed Returns upload directory details as an array.
1693
-     */
1694
-    function geodir_upload_dir($upload)
1695
-    {
1696
-        global $current_user;
1697
-        $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;
1698
-        $upload['path'] = $upload['basedir'] . $upload['subdir'];
1699
-        $upload['url'] = $upload['baseurl'] . $upload['subdir'];
1700
-        return $upload;
1701
-    }
1702
-
1703
-    /**
1704
-     * Handles place file and image upload.
1705
-     *
1706
-     * @since 1.0.0
1707
-     * @package GeoDirectory
1708
-     */
1709
-    function geodir_plupload_action()
1710
-    {
1711
-        // check ajax noonce
1712
-        $imgid = $_POST["imgid"];
1713
-
1714
-        check_ajax_referer($imgid . 'pluploadan');
1715
-
1716
-        // handle custom file uploaddir
1717
-        add_filter('upload_dir', 'geodir_upload_dir');
1718
-
1719
-        // change file orinetation if needed
1720
-        $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);
1721
-
1722
-        // handle file upload
1723
-        $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));
1724
-        // remove handle custom file uploaddir
1725
-        remove_filter('upload_dir', 'geodir_upload_dir');
1726
-
1727
-        if(!isset($status['url']) && isset($status['error'])){
1728
-            print_r($status);
1729
-        }
1730
-
1731
-        // send the uploaded file url in response
1732
-        if (isset($status['url'])) {
1733
-            echo $status['url'];
1734
-        } else {
1735
-            echo 'x';
1736
-        }
1737
-        exit;
1738
-    }
1685
+	/**
1686
+	 * Get upload directory path details
1687
+	 *
1688
+	 * @since 1.0.0
1689
+	 * @package GeoDirectory
1690
+	 * @global object $current_user Current user object.
1691
+	 * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.
1692
+	 * @return mixed Returns upload directory details as an array.
1693
+	 */
1694
+	function geodir_upload_dir($upload)
1695
+	{
1696
+		global $current_user;
1697
+		$upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;
1698
+		$upload['path'] = $upload['basedir'] . $upload['subdir'];
1699
+		$upload['url'] = $upload['baseurl'] . $upload['subdir'];
1700
+		return $upload;
1701
+	}
1702
+
1703
+	/**
1704
+	 * Handles place file and image upload.
1705
+	 *
1706
+	 * @since 1.0.0
1707
+	 * @package GeoDirectory
1708
+	 */
1709
+	function geodir_plupload_action()
1710
+	{
1711
+		// check ajax noonce
1712
+		$imgid = $_POST["imgid"];
1713
+
1714
+		check_ajax_referer($imgid . 'pluploadan');
1715
+
1716
+		// handle custom file uploaddir
1717
+		add_filter('upload_dir', 'geodir_upload_dir');
1718
+
1719
+		// change file orinetation if needed
1720
+		$fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);
1721
+
1722
+		// handle file upload
1723
+		$status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));
1724
+		// remove handle custom file uploaddir
1725
+		remove_filter('upload_dir', 'geodir_upload_dir');
1726
+
1727
+		if(!isset($status['url']) && isset($status['error'])){
1728
+			print_r($status);
1729
+		}
1730
+
1731
+		// send the uploaded file url in response
1732
+		if (isset($status['url'])) {
1733
+			echo $status['url'];
1734
+		} else {
1735
+			echo 'x';
1736
+		}
1737
+		exit;
1738
+	}
1739 1739
 }
1740 1740
 
1741 1741
 /**
@@ -1750,17 +1750,17 @@  discard block
 block discarded – undo
1750 1750
  */
1751 1751
 function geodir_get_video($post_id)
1752 1752
 {
1753
-    global $wpdb, $plugin_prefix;
1753
+	global $wpdb, $plugin_prefix;
1754 1754
 
1755
-    $post_type = get_post_type($post_id);
1755
+	$post_type = get_post_type($post_id);
1756 1756
 
1757
-    $table = $plugin_prefix . $post_type . '_detail';
1757
+	$table = $plugin_prefix . $post_type . '_detail';
1758 1758
 
1759
-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));
1759
+	$results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));
1760 1760
 
1761
-    if ($results) {
1762
-        return $results[0]->geodir_video;
1763
-    }
1761
+	if ($results) {
1762
+		return $results[0]->geodir_video;
1763
+	}
1764 1764
 
1765 1765
 }
1766 1766
 
@@ -1776,40 +1776,40 @@  discard block
 block discarded – undo
1776 1776
  */
1777 1777
 function geodir_get_special_offers($post_id)
1778 1778
 {
1779
-    global $wpdb, $plugin_prefix;
1779
+	global $wpdb, $plugin_prefix;
1780 1780
 
1781
-    $post_type = get_post_type($post_id);
1781
+	$post_type = get_post_type($post_id);
1782 1782
 
1783
-    $table = $plugin_prefix . $post_type . '_detail';
1783
+	$table = $plugin_prefix . $post_type . '_detail';
1784 1784
 
1785
-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));
1785
+	$results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));
1786 1786
 
1787
-    if ($results) {
1788
-        return $results[0]->geodir_special_offers;
1789
-    }
1787
+	if ($results) {
1788
+		return $results[0]->geodir_special_offers;
1789
+	}
1790 1790
 
1791 1791
 }
1792 1792
 
1793 1793
 if (!function_exists('geodir_max_upload_size')) {
1794
-    /**
1795
-     * Get max upload file size
1796
-     *
1797
-     * @since 1.0.0
1798
-     * @package GeoDirectory
1799
-     * @return mixed|void Returns max upload file size.
1800
-     */
1801
-    function geodir_max_upload_size()
1802
-    {
1803
-        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);
1804
-
1805
-        if ($max_filesize > 0 && $max_filesize < 1) {
1806
-            $max_filesize = (int)($max_filesize * 1024) . 'kb';
1807
-        } else {
1808
-            $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';
1809
-        }
1810
-        /** Filter documented in geodirectory-functions/general_functions.php **/
1811
-        return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
1812
-    }
1794
+	/**
1795
+	 * Get max upload file size
1796
+	 *
1797
+	 * @since 1.0.0
1798
+	 * @package GeoDirectory
1799
+	 * @return mixed|void Returns max upload file size.
1800
+	 */
1801
+	function geodir_max_upload_size()
1802
+	{
1803
+		$max_filesize = (float)get_option('geodir_upload_max_filesize', 2);
1804
+
1805
+		if ($max_filesize > 0 && $max_filesize < 1) {
1806
+			$max_filesize = (int)($max_filesize * 1024) . 'kb';
1807
+		} else {
1808
+			$max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';
1809
+		}
1810
+		/** Filter documented in geodirectory-functions/general_functions.php **/
1811
+		return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
1812
+	}
1813 1813
 }
1814 1814
 
1815 1815
 
@@ -1827,33 +1827,33 @@  discard block
 block discarded – undo
1827 1827
  */
1828 1828
 function geodir_add_custom_sort_options($fields, $post_type)
1829 1829
 {
1830
-    global $wpdb;
1830
+	global $wpdb;
1831 1831
 
1832
-    if ($post_type != '') {
1832
+	if ($post_type != '') {
1833 1833
 
1834
-        $all_postypes = geodir_get_posttypes();
1834
+		$all_postypes = geodir_get_posttypes();
1835 1835
 
1836
-        if (in_array($post_type, $all_postypes)) {
1836
+		if (in_array($post_type, $all_postypes)) {
1837 1837
 
1838
-            $custom_fields = $wpdb->get_results(
1839
-                $wpdb->prepare(
1840
-                    "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",
1841
-                    array($post_type)
1842
-                ), 'ARRAY_A'
1843
-            );
1838
+			$custom_fields = $wpdb->get_results(
1839
+				$wpdb->prepare(
1840
+					"select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",
1841
+					array($post_type)
1842
+				), 'ARRAY_A'
1843
+			);
1844 1844
 
1845
-            if (!empty($custom_fields)) {
1845
+			if (!empty($custom_fields)) {
1846 1846
 
1847
-                foreach ($custom_fields as $val) {
1848
-                    $fields[] = $val;
1849
-                }
1850
-            }
1847
+				foreach ($custom_fields as $val) {
1848
+					$fields[] = $val;
1849
+				}
1850
+			}
1851 1851
 
1852
-        }
1852
+		}
1853 1853
 
1854
-    }
1854
+	}
1855 1855
 
1856
-    return $fields;
1856
+	return $fields;
1857 1857
 }
1858 1858
 
1859 1859
 
@@ -1869,76 +1869,76 @@  discard block
 block discarded – undo
1869 1869
 function geodir_get_custom_sort_options($post_type = '')
1870 1870
 {
1871 1871
 
1872
-    global $wpdb;
1873
-
1874
-    if ($post_type != '') {
1875
-
1876
-        $all_postypes = geodir_get_posttypes();
1877
-
1878
-        if (!in_array($post_type, $all_postypes))
1879
-            return false;
1880
-
1881
-        $fields = array();
1882
-
1883
-        $fields[] = array(
1884
-            'post_type' => $post_type,
1885
-            'data_type' => '',
1886
-            'field_type' => 'random',
1887
-            'site_title' => 'Random',
1888
-            'htmlvar_name' => 'post_title',
1889
-            'field_icon' =>  'fa fa-random',
1890
-            'description' =>  __('Random sort (not recommended for large sites)', 'geodirectory')
1891
-        );
1892
-
1893
-        $fields[] = array(
1894
-            'post_type' => $post_type,
1895
-            'data_type' => '',
1896
-            'field_type' => 'datetime',
1897
-            'site_title' => __('Add date', 'geodirectory'),
1898
-            'htmlvar_name' => 'post_date',
1899
-            'field_icon' =>  'fa fa-calendar',
1900
-            'description' =>  __('Sort by date added', 'geodirectory')
1901
-        );
1902
-        $fields[] = array(
1903
-            'post_type' => $post_type,
1904
-            'data_type' => '',
1905
-            'field_type' => 'bigint',
1906
-            'site_title' => __('Review', 'geodirectory'),
1907
-            'htmlvar_name' => 'comment_count',
1908
-            'field_icon' =>  'fa fa-commenting-o',
1909
-            'description' =>  __('Sort by the number of reviews', 'geodirectory')
1910
-        );
1911
-        $fields[] = array(
1912
-            'post_type' => $post_type,
1913
-            'data_type' => '',
1914
-            'field_type' => 'float',
1915
-            'site_title' => __('Rating', 'geodirectory'),
1916
-            'htmlvar_name' => 'overall_rating',
1917
-            'field_icon' =>  'fa fa-star-o',
1918
-            'description' =>  __('Sort by the overall rating value', 'geodirectory')
1919
-        );
1920
-        $fields[] = array(
1921
-            'post_type' => $post_type,
1922
-            'data_type' => '',
1923
-            'field_type' => 'text',
1924
-            'site_title' => __('Title', 'geodirectory'),
1925
-            'htmlvar_name' => 'post_title',
1926
-            'field_icon' =>  'fa fa-sort-alpha-desc',
1927
-            'description' =>  __('Sort alphabetically by title', 'geodirectory')
1928
-        );
1929
-
1930
-        /**
1931
-         * Hook to add custom sort options.
1932
-         *
1933
-         * @since 1.0.0
1934
-         * @param array $fields Unmodified sort options array.
1935
-         * @param string $post_type Post type.
1936
-         */
1937
-        return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);
1938
-
1939
-    }
1940
-
1941
-    return false;
1872
+	global $wpdb;
1873
+
1874
+	if ($post_type != '') {
1875
+
1876
+		$all_postypes = geodir_get_posttypes();
1877
+
1878
+		if (!in_array($post_type, $all_postypes))
1879
+			return false;
1880
+
1881
+		$fields = array();
1882
+
1883
+		$fields[] = array(
1884
+			'post_type' => $post_type,
1885
+			'data_type' => '',
1886
+			'field_type' => 'random',
1887
+			'site_title' => 'Random',
1888
+			'htmlvar_name' => 'post_title',
1889
+			'field_icon' =>  'fa fa-random',
1890
+			'description' =>  __('Random sort (not recommended for large sites)', 'geodirectory')
1891
+		);
1892
+
1893
+		$fields[] = array(
1894
+			'post_type' => $post_type,
1895
+			'data_type' => '',
1896
+			'field_type' => 'datetime',
1897
+			'site_title' => __('Add date', 'geodirectory'),
1898
+			'htmlvar_name' => 'post_date',
1899
+			'field_icon' =>  'fa fa-calendar',
1900
+			'description' =>  __('Sort by date added', 'geodirectory')
1901
+		);
1902
+		$fields[] = array(
1903
+			'post_type' => $post_type,
1904
+			'data_type' => '',
1905
+			'field_type' => 'bigint',
1906
+			'site_title' => __('Review', 'geodirectory'),
1907
+			'htmlvar_name' => 'comment_count',
1908
+			'field_icon' =>  'fa fa-commenting-o',
1909
+			'description' =>  __('Sort by the number of reviews', 'geodirectory')
1910
+		);
1911
+		$fields[] = array(
1912
+			'post_type' => $post_type,
1913
+			'data_type' => '',
1914
+			'field_type' => 'float',
1915
+			'site_title' => __('Rating', 'geodirectory'),
1916
+			'htmlvar_name' => 'overall_rating',
1917
+			'field_icon' =>  'fa fa-star-o',
1918
+			'description' =>  __('Sort by the overall rating value', 'geodirectory')
1919
+		);
1920
+		$fields[] = array(
1921
+			'post_type' => $post_type,
1922
+			'data_type' => '',
1923
+			'field_type' => 'text',
1924
+			'site_title' => __('Title', 'geodirectory'),
1925
+			'htmlvar_name' => 'post_title',
1926
+			'field_icon' =>  'fa fa-sort-alpha-desc',
1927
+			'description' =>  __('Sort alphabetically by title', 'geodirectory')
1928
+		);
1929
+
1930
+		/**
1931
+		 * Hook to add custom sort options.
1932
+		 *
1933
+		 * @since 1.0.0
1934
+		 * @param array $fields Unmodified sort options array.
1935
+		 * @param string $post_type Post type.
1936
+		 */
1937
+		return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);
1938
+
1939
+	}
1940
+
1941
+	return false;
1942 1942
 }
1943 1943
 
1944 1944
 
@@ -1954,117 +1954,117 @@  discard block
 block discarded – undo
1954 1954
 function godir_set_sort_field_order($field_ids = array())
1955 1955
 {
1956 1956
 
1957
-    global $wpdb;
1957
+	global $wpdb;
1958 1958
 
1959
-    $count = 0;
1960
-    if (!empty($field_ids)):
1961
-        foreach ($field_ids as $id) {
1959
+	$count = 0;
1960
+	if (!empty($field_ids)):
1961
+		foreach ($field_ids as $id) {
1962 1962
 
1963
-            $cf = trim($id, '_');
1963
+			$cf = trim($id, '_');
1964 1964
 
1965
-            $post_meta_info = $wpdb->query(
1966
-                $wpdb->prepare(
1967
-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
1965
+			$post_meta_info = $wpdb->query(
1966
+				$wpdb->prepare(
1967
+					"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
1968 1968
 															sort_order=%d 
1969 1969
 															where id= %d",
1970
-                    array($count, $cf)
1971
-                )
1972
-            );
1973
-            $count++;
1974
-        }
1975
-
1976
-        return $field_ids;
1977
-    else:
1978
-        return false;
1979
-    endif;
1970
+					array($count, $cf)
1971
+				)
1972
+			);
1973
+			$count++;
1974
+		}
1975
+
1976
+		return $field_ids;
1977
+	else:
1978
+		return false;
1979
+	endif;
1980 1980
 }
1981 1981
 
1982 1982
 
1983 1983
 if (!function_exists('geodir_custom_sort_field_save')) {
1984
-    /**
1985
-     * Save or Update custom sort fields into the database.
1986
-     *
1987
-     * @since 1.0.0
1988
-     * @package GeoDirectory
1989
-     * @global object $wpdb WordPress Database object.
1990
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
1991
-     * @param array $request_field {
1992
-     *    Attributes of the Request field.
1993
-     *
1994
-     *    @type string $action Ajax action name.
1995
-     *    @type string $manage_field_type Manage field type Default "sorting_options".
1996
-     *    @type string $create_field Do you want to create this field?.
1997
-     *    @type string $field_ins_upd Field created or updated?.
1998
-     *    @type string $_wpnonce Nonce value.
1999
-     *    @type string $listing_type The Post type.
2000
-     *    @type string $field_type Field Type.
2001
-     *    @type string $field_id Field ID.
2002
-     *    @type string $data_type Data Type.
2003
-     *    @type string $htmlvar_name HTML variable name.
2004
-     *    @type string $site_title Section title which you wish to display in frontend.
2005
-     *    @type string $is_default Is this default sorting?.
2006
-     *    @type string $is_active If not active then the field will not be displayed anywhere.
2007
-     *    @type string $sort_order Sort Order.
2008
-     *
2009
-     * }
2010
-     * @param bool $default Not yet implemented.
2011
-     * @return int Returns the last affected db table row id.
2012
-     */
2013
-    function geodir_custom_sort_field_save($request_field = array(), $default = false)
2014
-    {
2015
-
2016
-        global $wpdb, $plugin_prefix;
2017
-
2018
-        $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';
2019
-
2020
-        $cf = trim($result_str, '_');
2021
-
2022
-        /*-------- check dublicate validation --------*/
2023
-
2024
-        $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';
2025
-        $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
2026
-
2027
-        $post_type = $request_field['listing_type'];
2028
-        $data_type = isset($request_field['data_type']) ? $request_field['data_type'] : '';
2029
-        $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';
2030
-        $site_title = isset($request_field['site_title']) ? $request_field['site_title'] : '';
2031
-        $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
2032
-        $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0;
2033
-        $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0;
2034
-        $is_default = isset($request_field['is_default']) ? $request_field['is_default'] : '';
2035
-        $asc = isset($request_field['asc']) ? $request_field['asc'] : 0;
2036
-        $desc = isset($request_field['desc']) ? $request_field['desc'] : 0;
2037
-        $asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : '';
2038
-        $desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : '';
2039
-
2040
-        $default_order = '';
2041
-        if ($is_default != '') {
2042
-            $default_order = $is_default;
2043
-            $is_default = '1';
2044
-        }
2045
-
2046
-
2047
-        $check_html_variable = $wpdb->get_var(
2048
-            $wpdb->prepare(
2049
-                "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ",
2050
-                array($cehhtmlvar_name, $post_type, $field_type)
2051
-            )
2052
-        );
2053
-
2054
-        if ($is_default == 1) {
2055
-
2056
-            $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));
2057
-
2058
-        }
2059
-
2060
-
2061
-        if (!$check_html_variable) {
2062
-
2063
-            $wpdb->query(
2064
-
2065
-                $wpdb->prepare(
2066
-
2067
-                    "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
1984
+	/**
1985
+	 * Save or Update custom sort fields into the database.
1986
+	 *
1987
+	 * @since 1.0.0
1988
+	 * @package GeoDirectory
1989
+	 * @global object $wpdb WordPress Database object.
1990
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
1991
+	 * @param array $request_field {
1992
+	 *    Attributes of the Request field.
1993
+	 *
1994
+	 *    @type string $action Ajax action name.
1995
+	 *    @type string $manage_field_type Manage field type Default "sorting_options".
1996
+	 *    @type string $create_field Do you want to create this field?.
1997
+	 *    @type string $field_ins_upd Field created or updated?.
1998
+	 *    @type string $_wpnonce Nonce value.
1999
+	 *    @type string $listing_type The Post type.
2000
+	 *    @type string $field_type Field Type.
2001
+	 *    @type string $field_id Field ID.
2002
+	 *    @type string $data_type Data Type.
2003
+	 *    @type string $htmlvar_name HTML variable name.
2004
+	 *    @type string $site_title Section title which you wish to display in frontend.
2005
+	 *    @type string $is_default Is this default sorting?.
2006
+	 *    @type string $is_active If not active then the field will not be displayed anywhere.
2007
+	 *    @type string $sort_order Sort Order.
2008
+	 *
2009
+	 * }
2010
+	 * @param bool $default Not yet implemented.
2011
+	 * @return int Returns the last affected db table row id.
2012
+	 */
2013
+	function geodir_custom_sort_field_save($request_field = array(), $default = false)
2014
+	{
2015
+
2016
+		global $wpdb, $plugin_prefix;
2017
+
2018
+		$result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';
2019
+
2020
+		$cf = trim($result_str, '_');
2021
+
2022
+		/*-------- check dublicate validation --------*/
2023
+
2024
+		$field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';
2025
+		$cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
2026
+
2027
+		$post_type = $request_field['listing_type'];
2028
+		$data_type = isset($request_field['data_type']) ? $request_field['data_type'] : '';
2029
+		$field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';
2030
+		$site_title = isset($request_field['site_title']) ? $request_field['site_title'] : '';
2031
+		$htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
2032
+		$sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0;
2033
+		$is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0;
2034
+		$is_default = isset($request_field['is_default']) ? $request_field['is_default'] : '';
2035
+		$asc = isset($request_field['asc']) ? $request_field['asc'] : 0;
2036
+		$desc = isset($request_field['desc']) ? $request_field['desc'] : 0;
2037
+		$asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : '';
2038
+		$desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : '';
2039
+
2040
+		$default_order = '';
2041
+		if ($is_default != '') {
2042
+			$default_order = $is_default;
2043
+			$is_default = '1';
2044
+		}
2045
+
2046
+
2047
+		$check_html_variable = $wpdb->get_var(
2048
+			$wpdb->prepare(
2049
+				"select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ",
2050
+				array($cehhtmlvar_name, $post_type, $field_type)
2051
+			)
2052
+		);
2053
+
2054
+		if ($is_default == 1) {
2055
+
2056
+			$wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));
2057
+
2058
+		}
2059
+
2060
+
2061
+		if (!$check_html_variable) {
2062
+
2063
+			$wpdb->query(
2064
+
2065
+				$wpdb->prepare(
2066
+
2067
+					"insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
2068 2068
 				post_type = %s,
2069 2069
 				data_type = %s,
2070 2070
 				field_type = %s,
@@ -2079,23 +2079,23 @@  discard block
 block discarded – undo
2079 2079
 				asc_title = %s,
2080 2080
 				desc_title = %s",
2081 2081
 
2082
-                    array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title)
2083
-                )
2082
+					array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title)
2083
+				)
2084 2084
 
2085
-            );
2085
+			);
2086 2086
 
2087 2087
 
2088
-            $lastid = $wpdb->insert_id;
2088
+			$lastid = $wpdb->insert_id;
2089 2089
 
2090
-            $lastid = trim($lastid);
2090
+			$lastid = trim($lastid);
2091 2091
 
2092
-        } else {
2092
+		} else {
2093 2093
 
2094
-            $wpdb->query(
2094
+			$wpdb->query(
2095 2095
 
2096
-                $wpdb->prepare(
2096
+				$wpdb->prepare(
2097 2097
 
2098
-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
2098
+					"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
2099 2099
 				post_type = %s,
2100 2100
 				data_type = %s,
2101 2101
 				field_type = %s,
@@ -2111,123 +2111,123 @@  discard block
 block discarded – undo
2111 2111
 				desc_title = %s
2112 2112
 				where id = %d",
2113 2113
 
2114
-                    array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf)
2115
-                )
2114
+					array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf)
2115
+				)
2116 2116
 
2117
-            );
2117
+			);
2118 2118
 
2119
-            $lastid = trim($cf);
2119
+			$lastid = trim($cf);
2120 2120
 
2121
-        }
2121
+		}
2122 2122
 
2123 2123
 
2124
-        return (int)$lastid;
2124
+		return (int)$lastid;
2125 2125
 
2126
-    }
2126
+	}
2127 2127
 }
2128 2128
 
2129 2129
 
2130 2130
 if (!function_exists('geodir_custom_sort_field_delete')) {
2131
-    /**
2132
-     * Delete a custom sort field using field id.
2133
-     * @since 1.0.0
2134
-     * @package GeoDirectory
2135
-     * @global object $wpdb WordPress Database object.
2136
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
2137
-     * @param string $field_id The field ID.
2138
-     * @return int|string Returns field id when successful deletion, else returns 0.
2139
-     */
2140
-    function geodir_custom_sort_field_delete($field_id = '')
2141
-    {
2142
-
2143
-        global $wpdb, $plugin_prefix;
2144
-        if ($field_id != '') {
2145
-            $cf = trim($field_id, '_');
2146
-
2147
-            $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));
2148
-
2149
-            return $field_id;
2150
-
2151
-        } else
2152
-            return 0;
2153
-
2154
-    }
2131
+	/**
2132
+	 * Delete a custom sort field using field id.
2133
+	 * @since 1.0.0
2134
+	 * @package GeoDirectory
2135
+	 * @global object $wpdb WordPress Database object.
2136
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
2137
+	 * @param string $field_id The field ID.
2138
+	 * @return int|string Returns field id when successful deletion, else returns 0.
2139
+	 */
2140
+	function geodir_custom_sort_field_delete($field_id = '')
2141
+	{
2142
+
2143
+		global $wpdb, $plugin_prefix;
2144
+		if ($field_id != '') {
2145
+			$cf = trim($field_id, '_');
2146
+
2147
+			$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));
2148
+
2149
+			return $field_id;
2150
+
2151
+		} else
2152
+			return 0;
2153
+
2154
+	}
2155 2155
 }
2156 2156
 
2157 2157
 
2158 2158
 if (!function_exists('geodir_custom_sort_field_adminhtml')) {
2159
-    /**
2160
-     * Custom sort field admin html.
2161
-     *
2162
-     * @since 1.0.0
2163
-     * @package GeoDirectory
2164
-     * @global object $wpdb WordPress Database object.
2165
-     * @param string $field_type The form field type.
2166
-     * @param object|int $result_str The custom field results object or row id.
2167
-     * @param string $field_ins_upd When set to "submit" displays form.
2168
-     * @param bool $default when set to true field will be for admin use only.
2169
-     */
2170
-    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')
2171
-    {
2172
-        global $wpdb;
2173
-        $cf = $result_str;
2174
-        if (!is_object($cf)) {
2175
-            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));
2176
-        } else {
2177
-            $field_info = $cf;
2178
-            $result_str = $cf->id;
2179
-        }
2180
-
2181
-        $field_info = stripslashes_deep($field_info); // strip slashes
2182
-
2183
-        if (!isset($field_info->post_type)) {
2184
-            $post_type = sanitize_text_field($_REQUEST['listing_type']);
2185
-        } else {
2186
-            $post_type = $field_info->post_type;
2187
-        }
2188
-
2189
-
2190
-        $htmlvar_name = isset($field_type_key) ? $field_type_key : '';
2191
-
2192
-        $site_title = '';
2193
-        if ($site_title == '')
2194
-            $site_title = isset($field_info->site_title) ? $field_info->site_title : '';
2195
-
2196
-        if ($site_title == '') {
2197
-            $fields = geodir_get_custom_sort_options($post_type);
2198
-
2199
-            foreach ($fields as $val) {
2200
-                $val = stripslashes_deep($val); // strip slashes
2201
-
2202
-                if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {
2203
-                    $site_title = isset($val['site_title']) ? $val['site_title'] : '';
2204
-                }
2205
-            }
2206
-        }
2207
-
2208
-        if ($htmlvar_name == '')
2209
-            $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
2210
-
2211
-        $nonce = wp_create_nonce('custom_fields_' . $result_str);
2212
-
2213
-        $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';
2214
-        $cso_arr = geodir_get_custom_sort_options($post_type);
2215
-
2216
-        $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']);
2217
-        foreach($cso_arr as $cso){
2218
-            if($cur_field_type==$cso['field_type']){
2219
-
2220
-                if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
2221
-                    $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';
2222
-                }elseif(isset($cso['field_icon']) && $cso['field_icon']){
2223
-                    $field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';
2224
-                }
2225
-
2226
-            }
2227
-        }
2228
-
2229
-        $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500);
2230
-        ?>
2159
+	/**
2160
+	 * Custom sort field admin html.
2161
+	 *
2162
+	 * @since 1.0.0
2163
+	 * @package GeoDirectory
2164
+	 * @global object $wpdb WordPress Database object.
2165
+	 * @param string $field_type The form field type.
2166
+	 * @param object|int $result_str The custom field results object or row id.
2167
+	 * @param string $field_ins_upd When set to "submit" displays form.
2168
+	 * @param bool $default when set to true field will be for admin use only.
2169
+	 */
2170
+	function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')
2171
+	{
2172
+		global $wpdb;
2173
+		$cf = $result_str;
2174
+		if (!is_object($cf)) {
2175
+			$field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));
2176
+		} else {
2177
+			$field_info = $cf;
2178
+			$result_str = $cf->id;
2179
+		}
2180
+
2181
+		$field_info = stripslashes_deep($field_info); // strip slashes
2182
+
2183
+		if (!isset($field_info->post_type)) {
2184
+			$post_type = sanitize_text_field($_REQUEST['listing_type']);
2185
+		} else {
2186
+			$post_type = $field_info->post_type;
2187
+		}
2188
+
2189
+
2190
+		$htmlvar_name = isset($field_type_key) ? $field_type_key : '';
2191
+
2192
+		$site_title = '';
2193
+		if ($site_title == '')
2194
+			$site_title = isset($field_info->site_title) ? $field_info->site_title : '';
2195
+
2196
+		if ($site_title == '') {
2197
+			$fields = geodir_get_custom_sort_options($post_type);
2198
+
2199
+			foreach ($fields as $val) {
2200
+				$val = stripslashes_deep($val); // strip slashes
2201
+
2202
+				if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {
2203
+					$site_title = isset($val['site_title']) ? $val['site_title'] : '';
2204
+				}
2205
+			}
2206
+		}
2207
+
2208
+		if ($htmlvar_name == '')
2209
+			$htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
2210
+
2211
+		$nonce = wp_create_nonce('custom_fields_' . $result_str);
2212
+
2213
+		$field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';
2214
+		$cso_arr = geodir_get_custom_sort_options($post_type);
2215
+
2216
+		$cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']);
2217
+		foreach($cso_arr as $cso){
2218
+			if($cur_field_type==$cso['field_type']){
2219
+
2220
+				if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
2221
+					$field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';
2222
+				}elseif(isset($cso['field_icon']) && $cso['field_icon']){
2223
+					$field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';
2224
+				}
2225
+
2226
+			}
2227
+		}
2228
+
2229
+		$radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500);
2230
+		?>
2231 2231
 
2232 2232
         <li class="text" id="licontainer_<?php echo $result_str;?>">
2233 2233
             <form><!-- we need to wrap in a fom so we can use radio buttons with same name -->
@@ -2236,7 +2236,7 @@  discard block
 block discarded – undo
2236 2236
                  ondblclick="show_hide('field_frm<?php echo $result_str;?>')">
2237 2237
                 <?php
2238 2238
 
2239
-                ?>
2239
+				?>
2240 2240
 
2241 2241
                 <div title="<?php _e('Click to remove field', 'geodirectory');?>"
2242 2242
                      onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"
@@ -2251,17 +2251,17 @@  discard block
 block discarded – undo
2251 2251
 
2252 2252
             <div id="field_frm<?php echo $result_str;?>" class="field_frm"
2253 2253
                  style="display:<?php if ($field_ins_upd == 'submit') {
2254
-                     echo 'block;';
2255
-                 } else {
2256
-                     echo 'none;';
2257
-                 } ?>">
2254
+					 echo 'block;';
2255
+				 } else {
2256
+					 echo 'none;';
2257
+				 } ?>">
2258 2258
                 <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/>
2259 2259
                 <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/>
2260 2260
                 <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/>
2261 2261
                 <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/>
2262 2262
                 <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {
2263
-                    echo $field_info->data_type;
2264
-                }?>"/>
2263
+					echo $field_info->data_type;
2264
+				}?>"/>
2265 2265
                 <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/>
2266 2266
 
2267 2267
 
@@ -2284,14 +2284,14 @@  discard block
 block discarded – undo
2284 2284
 
2285 2285
                                 <input type="radio" id="asc_yes<?php echo $radio_id;?>" name="asc" class="gdri-enabled"  value="1"
2286 2286
                                     <?php if ($value == '1') {
2287
-                                        echo 'checked';
2288
-                                    } ?>/>
2287
+										echo 'checked';
2288
+									} ?>/>
2289 2289
                                 <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2290 2290
 
2291 2291
                                 <input type="radio" id="asc_no<?php echo $radio_id;?>" name="asc" class="gdri-disabled" value="0"
2292 2292
                                     <?php if ($value == '0' || !$value) {
2293
-                                        echo 'checked';
2294
-                                    } ?>/>
2293
+										echo 'checked';
2294
+									} ?>/>
2295 2295
                                 <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2296 2296
 
2297 2297
                             </div>
@@ -2328,8 +2328,8 @@  discard block
 block discarded – undo
2328 2328
 
2329 2329
                                 <input type="radio" name="is_default"
2330 2330
                                        value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {
2331
-                                    echo 'checked="checked"';
2332
-                                } ?>/>
2331
+									echo 'checked="checked"';
2332
+								} ?>/>
2333 2333
                             </div>
2334 2334
 
2335 2335
                         </li>
@@ -2349,14 +2349,14 @@  discard block
 block discarded – undo
2349 2349
 
2350 2350
                                 <input type="radio" id="desc_yes<?php echo $radio_id;?>" name="desc" class="gdri-enabled"  value="1"
2351 2351
                                     <?php if ($value == '1') {
2352
-                                        echo 'checked';
2353
-                                    } ?>/>
2352
+										echo 'checked';
2353
+									} ?>/>
2354 2354
                                 <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2355 2355
 
2356 2356
                                 <input type="radio" id="desc_no<?php echo $radio_id;?>" name="desc" class="gdri-disabled" value="0"
2357 2357
                                     <?php if ($value == '0' || !$value) {
2358
-                                        echo 'checked';
2359
-                                    } ?>/>
2358
+										echo 'checked';
2359
+									} ?>/>
2360 2360
                                 <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2361 2361
 
2362 2362
                             </div>
@@ -2392,8 +2392,8 @@  discard block
 block discarded – undo
2392 2392
 
2393 2393
                                 <input type="radio" name="is_default"
2394 2394
                                        value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {
2395
-                                    echo 'checked="checked"';
2396
-                                } ?>/>
2395
+									echo 'checked="checked"';
2396
+								} ?>/>
2397 2397
                             </div>
2398 2398
 
2399 2399
                         </li>
@@ -2435,8 +2435,8 @@  discard block
 block discarded – undo
2435 2435
 
2436 2436
                                 <input type="checkbox" name="is_default"
2437 2437
                                        value="<?php echo $field_type; ?>"  <?php if (isset($value) && $value == '1') {
2438
-                                    echo 'checked="checked"';
2439
-                                } ?>/>
2438
+									echo 'checked="checked"';
2439
+								} ?>/>
2440 2440
                             </div>
2441 2441
 
2442 2442
 
@@ -2459,14 +2459,14 @@  discard block
 block discarded – undo
2459 2459
 
2460 2460
                             <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"
2461 2461
                                 <?php if ($value == '1') {
2462
-                                    echo 'checked';
2463
-                                } ?>/>
2462
+									echo 'checked';
2463
+								} ?>/>
2464 2464
                             <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2465 2465
 
2466 2466
                             <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"
2467 2467
                                 <?php if ($value == '0' || !$value) {
2468
-                                    echo 'checked';
2469
-                                } ?>/>
2468
+									echo 'checked';
2469
+								} ?>/>
2470 2470
                             <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2471 2471
 
2472 2472
                         </div>
@@ -2476,8 +2476,8 @@  discard block
 block discarded – undo
2476 2476
 
2477 2477
                     <input type="hidden" readonly="readonly" name="sort_order" id="sort_order"
2478 2478
                                                 value="<?php if (isset($field_info->sort_order)) {
2479
-                                                    echo esc_attr($field_info->sort_order);
2480
-                                                }?>" size="50"/>
2479
+													echo esc_attr($field_info->sort_order);
2480
+												}?>" size="50"/>
2481 2481
 
2482 2482
 
2483 2483
 
@@ -2501,38 +2501,38 @@  discard block
 block discarded – undo
2501 2501
             </form>
2502 2502
         </li> <?php
2503 2503
 
2504
-    }
2504
+	}
2505 2505
 }
2506 2506
 
2507 2507
 if (!function_exists('check_field_visibility')) {
2508
-    /**
2509
-     * Check field visibility as per price package.
2510
-     *
2511
-     * @since 1.0.0
2512
-     * @package GeoDirectory
2513
-     * @global object $wpdb WordPress Database object.
2514
-     * @global array $geodir_addon_list List of active GeoDirectory extensions.
2515
-     * @param int|string $package_id The package ID.
2516
-     * @param string $field_name The field name.
2517
-     * @param string $post_type Optional. The wordpress post type.
2518
-     * @return bool Returns true when field visible, otherwise false.
2519
-     */
2520
-    function check_field_visibility($package_id, $field_name, $post_type)
2521
-    {
2522
-        global $wpdb, $geodir_addon_list;
2523
-        if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {
2524
-            return true;
2525
-        }
2526
-        if (!$package_id || !$field_name || !$post_type) {
2527
-            return true;
2528
-        }
2529
-        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));
2530
-
2531
-        if ($wpdb->get_var($sql)) {
2532
-            return true;
2533
-        }
2534
-        return false;
2535
-    }
2508
+	/**
2509
+	 * Check field visibility as per price package.
2510
+	 *
2511
+	 * @since 1.0.0
2512
+	 * @package GeoDirectory
2513
+	 * @global object $wpdb WordPress Database object.
2514
+	 * @global array $geodir_addon_list List of active GeoDirectory extensions.
2515
+	 * @param int|string $package_id The package ID.
2516
+	 * @param string $field_name The field name.
2517
+	 * @param string $post_type Optional. The wordpress post type.
2518
+	 * @return bool Returns true when field visible, otherwise false.
2519
+	 */
2520
+	function check_field_visibility($package_id, $field_name, $post_type)
2521
+	{
2522
+		global $wpdb, $geodir_addon_list;
2523
+		if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {
2524
+			return true;
2525
+		}
2526
+		if (!$package_id || !$field_name || !$post_type) {
2527
+			return true;
2528
+		}
2529
+		$sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));
2530
+
2531
+		if ($wpdb->get_var($sql)) {
2532
+			return true;
2533
+		}
2534
+		return false;
2535
+	}
2536 2536
 }
2537 2537
 
2538 2538
 /**
@@ -2547,43 +2547,43 @@  discard block
 block discarded – undo
2547 2547
  */
2548 2548
 function geodir_string_to_options($input = '', $translated = false)
2549 2549
 {
2550
-    $return = array();
2551
-    if ($input != '') {
2552
-        $input = trim($input);
2553
-        $input = rtrim($input, ",");
2554
-        $input = ltrim($input, ",");
2555
-        $input = trim($input);
2556
-    }
2557
-
2558
-    $input_arr = explode(',', $input);
2559
-
2560
-    if (!empty($input_arr)) {
2561
-        foreach ($input_arr as $input_str) {
2562
-            $input_str = trim($input_str);
2563
-
2564
-            if (strpos($input_str, "/") !== false) {
2565
-                $input_str = explode("/", $input_str, 2);
2566
-                $label = trim($input_str[0]);
2567
-                if ($translated && $label != '') {
2568
-                    $label = __($label, 'geodirectory');
2569
-                }
2570
-                $label = ucfirst($label);
2571
-                $value = trim($input_str[1]);
2572
-            } else {
2573
-                if ($translated && $input_str != '') {
2574
-                    $input_str = __($input_str, 'geodirectory');
2575
-                }
2576
-                $label = ucfirst($input_str);
2577
-                $value = $input_str;
2578
-            }
2579
-
2580
-            if ($label != '') {
2581
-                $return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);
2582
-            }
2583
-        }
2584
-    }
2585
-
2586
-    return $return;
2550
+	$return = array();
2551
+	if ($input != '') {
2552
+		$input = trim($input);
2553
+		$input = rtrim($input, ",");
2554
+		$input = ltrim($input, ",");
2555
+		$input = trim($input);
2556
+	}
2557
+
2558
+	$input_arr = explode(',', $input);
2559
+
2560
+	if (!empty($input_arr)) {
2561
+		foreach ($input_arr as $input_str) {
2562
+			$input_str = trim($input_str);
2563
+
2564
+			if (strpos($input_str, "/") !== false) {
2565
+				$input_str = explode("/", $input_str, 2);
2566
+				$label = trim($input_str[0]);
2567
+				if ($translated && $label != '') {
2568
+					$label = __($label, 'geodirectory');
2569
+				}
2570
+				$label = ucfirst($label);
2571
+				$value = trim($input_str[1]);
2572
+			} else {
2573
+				if ($translated && $input_str != '') {
2574
+					$input_str = __($input_str, 'geodirectory');
2575
+				}
2576
+				$label = ucfirst($input_str);
2577
+				$value = $input_str;
2578
+			}
2579
+
2580
+			if ($label != '') {
2581
+				$return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);
2582
+			}
2583
+		}
2584
+	}
2585
+
2586
+	return $return;
2587 2587
 }
2588 2588
 
2589 2589
 /**
@@ -2598,66 +2598,66 @@  discard block
 block discarded – undo
2598 2598
  */
2599 2599
 function geodir_string_values_to_options($option_values = '', $translated = false)
2600 2600
 {
2601
-    $options = array();
2602
-    if ($option_values == '') {
2603
-        return NULL;
2604
-    }
2605
-
2606
-    if (strpos($option_values, "{/optgroup}") !== false) {
2607
-        $option_values_arr = explode("{/optgroup}", $option_values);
2608
-
2609
-        foreach ($option_values_arr as $optgroup) {
2610
-            if (strpos($optgroup, "{optgroup}") !== false) {
2611
-                $optgroup_arr = explode("{optgroup}", $optgroup);
2612
-
2613
-                $count = 0;
2614
-                foreach ($optgroup_arr as $optgroup_str) {
2615
-                    $count++;
2616
-                    $optgroup_str = trim($optgroup_str);
2617
-
2618
-                    $optgroup_label = '';
2619
-                    if (strpos($optgroup_str, "|") !== false) {
2620
-                        $optgroup_str_arr = explode("|", $optgroup_str, 2);
2621
-                        $optgroup_label = trim($optgroup_str_arr[0]);
2622
-                        if ($translated && $optgroup_label != '') {
2623
-                            $optgroup_label = __($optgroup_label, 'geodirectory');
2624
-                        }
2625
-                        $optgroup_label = ucfirst($optgroup_label);
2626
-                        $optgroup_str = $optgroup_str_arr[1];
2627
-                    }
2628
-
2629
-                    $optgroup3 = geodir_string_to_options($optgroup_str, $translated);
2630
-
2631
-                    if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {
2632
-                        $optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));
2633
-                        $optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));
2634
-                        $optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end);
2635
-                    }
2636
-                    $options = array_merge($options, $optgroup3);
2637
-                }
2638
-            } else {
2639
-                $optgroup1 = geodir_string_to_options($optgroup, $translated);
2640
-                $options = array_merge($options, $optgroup1);
2641
-            }
2642
-        }
2643
-    } else {
2644
-        $options = geodir_string_to_options($option_values, $translated);
2645
-    }
2646
-
2647
-    return $options;
2601
+	$options = array();
2602
+	if ($option_values == '') {
2603
+		return NULL;
2604
+	}
2605
+
2606
+	if (strpos($option_values, "{/optgroup}") !== false) {
2607
+		$option_values_arr = explode("{/optgroup}", $option_values);
2608
+
2609
+		foreach ($option_values_arr as $optgroup) {
2610
+			if (strpos($optgroup, "{optgroup}") !== false) {
2611
+				$optgroup_arr = explode("{optgroup}", $optgroup);
2612
+
2613
+				$count = 0;
2614
+				foreach ($optgroup_arr as $optgroup_str) {
2615
+					$count++;
2616
+					$optgroup_str = trim($optgroup_str);
2617
+
2618
+					$optgroup_label = '';
2619
+					if (strpos($optgroup_str, "|") !== false) {
2620
+						$optgroup_str_arr = explode("|", $optgroup_str, 2);
2621
+						$optgroup_label = trim($optgroup_str_arr[0]);
2622
+						if ($translated && $optgroup_label != '') {
2623
+							$optgroup_label = __($optgroup_label, 'geodirectory');
2624
+						}
2625
+						$optgroup_label = ucfirst($optgroup_label);
2626
+						$optgroup_str = $optgroup_str_arr[1];
2627
+					}
2628
+
2629
+					$optgroup3 = geodir_string_to_options($optgroup_str, $translated);
2630
+
2631
+					if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {
2632
+						$optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));
2633
+						$optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));
2634
+						$optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end);
2635
+					}
2636
+					$options = array_merge($options, $optgroup3);
2637
+				}
2638
+			} else {
2639
+				$optgroup1 = geodir_string_to_options($optgroup, $translated);
2640
+				$options = array_merge($options, $optgroup1);
2641
+			}
2642
+		}
2643
+	} else {
2644
+		$options = geodir_string_to_options($option_values, $translated);
2645
+	}
2646
+
2647
+	return $options;
2648 2648
 }
2649 2649
 
2650 2650
 
2651 2651
 function geodir_cfa_data_type_text($output,$result_str,$cf,$field_info){
2652
-    ob_start();
2653
-
2654
-    $dt_value = '';
2655
-    if (isset($field_info->data_type)) {
2656
-        $dt_value  = esc_attr($field_info->data_type);
2657
-    }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
2658
-        $dt_value  = $cf['defaults']['data_type'];
2659
-    }
2660
-    ?>
2652
+	ob_start();
2653
+
2654
+	$dt_value = '';
2655
+	if (isset($field_info->data_type)) {
2656
+		$dt_value  = esc_attr($field_info->data_type);
2657
+	}elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
2658
+		$dt_value  = $cf['defaults']['data_type'];
2659
+	}
2660
+	?>
2661 2661
     <li>
2662 2662
         <label for="data_type"><?php _e('Field Data Type ? :', 'geodirectory'); ?></label>
2663 2663
         <div class="gd-cf-input-wrap">
@@ -2666,16 +2666,16 @@  discard block
 block discarded – undo
2666 2666
                     onchange="javascript:gd_data_type_changed(this, '<?php echo $result_str; ?>');">
2667 2667
                 <option
2668 2668
                     value="XVARCHAR" <?php if ($dt_value  == 'VARCHAR') {
2669
-                    echo 'selected="selected"';
2670
-                } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>
2669
+					echo 'selected="selected"';
2670
+				} ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>
2671 2671
                 <option
2672 2672
                     value="INT" <?php if ($dt_value   == 'INT') {
2673
-                    echo 'selected="selected"';
2674
-                } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>
2673
+					echo 'selected="selected"';
2674
+				} ?>><?php _e('NUMBER', 'geodirectory'); ?></option>
2675 2675
                 <option
2676 2676
                     value="FLOAT" <?php if ($dt_value   == 'FLOAT') {
2677
-                    echo 'selected="selected"';
2678
-                } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>
2677
+					echo 'selected="selected"';
2678
+				} ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>
2679 2679
             </select>
2680 2680
             <br/> <span><?php _e('Select Custom Field type', 'geodirectory'); ?></span>
2681 2681
 
@@ -2683,13 +2683,13 @@  discard block
 block discarded – undo
2683 2683
     </li>
2684 2684
 
2685 2685
     <?php
2686
-    $value = '';
2687
-    if (isset($field_info->decimal_point)) {
2688
-        $value = esc_attr($field_info->decimal_point);
2689
-    }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
2690
-        $value = $cf['defaults']['decimal_point'];
2691
-    }
2692
-    ?>
2686
+	$value = '';
2687
+	if (isset($field_info->decimal_point)) {
2688
+		$value = esc_attr($field_info->decimal_point);
2689
+	}elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
2690
+		$value = $cf['defaults']['decimal_point'];
2691
+	}
2692
+	?>
2693 2693
 
2694 2694
     <li class="decimal-point-wrapper"
2695 2695
         style="<?php echo ($dt_value  == 'FLOAT') ? '' : 'display:none' ?>">
@@ -2698,7 +2698,7 @@  discard block
 block discarded – undo
2698 2698
             <select name="decimal_point" id="decimal_point">
2699 2699
                 <option value=""><?php echo _e('Select', 'geodirectory'); ?></option>
2700 2700
                 <?php for ($i = 1; $i <= 10; $i++) {
2701
-                    $selected = $i == $value ? 'selected="selected"' : ''; ?>
2701
+					$selected = $i == $value ? 'selected="selected"' : ''; ?>
2702 2702
                     <option value="<?php echo $i; ?>" <?php echo $selected; ?>><?php echo $i; ?></option>
2703 2703
                 <?php } ?>
2704 2704
             </select>
@@ -2707,8 +2707,8 @@  discard block
 block discarded – undo
2707 2707
     </li>
2708 2708
 <?php
2709 2709
 
2710
-    $output = ob_get_clean();
2711
-    return $output;
2710
+	$output = ob_get_clean();
2711
+	return $output;
2712 2712
 }
2713 2713
 add_filter('geodir_cfa_data_type_text','geodir_cfa_data_type_text',10,4);
2714 2714
 
@@ -2746,9 +2746,9 @@  discard block
 block discarded – undo
2746 2746
 
2747 2747
 
2748 2748
 function geodir_cfa_advanced_editor_geodir_special_offers($output,$result_str,$cf,$field_info){
2749
-    if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}
2750
-    ob_start();
2751
-    ?>
2749
+	if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}
2750
+	ob_start();
2751
+	?>
2752 2752
     <li>
2753 2753
         <label for="advanced_editor" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show advanced editor :', 'geodirectory'); ?>
2754 2754
             <div class="gdcf-tooltip">
@@ -2759,13 +2759,13 @@  discard block
 block discarded – undo
2759 2759
         <div class="gd-cf-input-wrap">
2760 2760
 
2761 2761
             <?php
2762
-            $selected = '';
2763
-            if (isset($field_info->extra_fields))
2764
-                $advanced_editor = unserialize($field_info->extra_fields);
2762
+			$selected = '';
2763
+			if (isset($field_info->extra_fields))
2764
+				$advanced_editor = unserialize($field_info->extra_fields);
2765 2765
 
2766
-            if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))
2767
-                $selected = 'checked="checked"';
2768
-            ?>
2766
+			if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))
2767
+				$selected = 'checked="checked"';
2768
+			?>
2769 2769
 
2770 2770
             <input type="checkbox" name="advanced_editor[]" id="advanced_editor"
2771 2771
                    value="1" <?php echo $selected; ?>/>
@@ -2774,22 +2774,22 @@  discard block
 block discarded – undo
2774 2774
     </li>
2775 2775
     <?php
2776 2776
 
2777
-    $output = ob_get_clean();
2778
-    return $output;
2777
+	$output = ob_get_clean();
2778
+	return $output;
2779 2779
 }
2780 2780
 add_filter('geodir_cfa_advanced_editor_textarea','geodir_cfa_advanced_editor_geodir_special_offers',10,4);
2781 2781
 
2782 2782
 
2783 2783
 function geodir_cfa_validation_pattern_text($output,$result_str,$cf,$field_info){
2784
-    ob_start();
2785
-
2786
-    $value = '';
2787
-    if (isset($field_info->validation_pattern)) {
2788
-        $value = esc_attr($field_info->validation_pattern);
2789
-    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
2790
-        $value = esc_attr($cf['defaults']['validation_pattern']);
2791
-    }
2792
-    ?>
2784
+	ob_start();
2785
+
2786
+	$value = '';
2787
+	if (isset($field_info->validation_pattern)) {
2788
+		$value = esc_attr($field_info->validation_pattern);
2789
+	}elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
2790
+		$value = esc_attr($cf['defaults']['validation_pattern']);
2791
+	}
2792
+	?>
2793 2793
     <li>
2794 2794
         <label for="validation_pattern" class="gd-cf-tooltip-wrap">
2795 2795
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Validation Pattern:', 'geodirectory'); ?>
@@ -2803,13 +2803,13 @@  discard block
 block discarded – undo
2803 2803
         </div>
2804 2804
     </li>
2805 2805
     <?php
2806
-    $value = '';
2807
-    if (isset($field_info->validation_msg)) {
2808
-        $value = esc_attr($field_info->validation_msg);
2809
-    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
2810
-        $value = esc_attr($cf['defaults']['validation_msg']);
2811
-    }
2812
-    ?>
2806
+	$value = '';
2807
+	if (isset($field_info->validation_msg)) {
2808
+		$value = esc_attr($field_info->validation_msg);
2809
+	}elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
2810
+		$value = esc_attr($cf['defaults']['validation_msg']);
2811
+	}
2812
+	?>
2813 2813
     <li>
2814 2814
         <label for="validation_msg" class="gd-cf-tooltip-wrap">
2815 2815
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Validation Message:', 'geodirectory'); ?>
@@ -2824,21 +2824,21 @@  discard block
 block discarded – undo
2824 2824
     </li>
2825 2825
     <?php
2826 2826
 
2827
-    $output = ob_get_clean();
2828
-    return $output;
2827
+	$output = ob_get_clean();
2828
+	return $output;
2829 2829
 }
2830 2830
 add_filter('geodir_cfa_validation_pattern_text','geodir_cfa_validation_pattern_text',10,4);
2831 2831
 
2832 2832
 
2833 2833
 function geodir_cfa_htmlvar_name_taxonomy($output,$result_str,$cf,$field_info){
2834
-    ob_start();
2835
-    global $post_type;
2836
-
2837
-    if (!isset($field_info->post_type)) {
2838
-        $post_type = sanitize_text_field($_REQUEST['listing_type']);
2839
-    } else
2840
-        $post_type = $field_info->post_type;
2841
-    ?>
2834
+	ob_start();
2835
+	global $post_type;
2836
+
2837
+	if (!isset($field_info->post_type)) {
2838
+		$post_type = sanitize_text_field($_REQUEST['listing_type']);
2839
+	} else
2840
+		$post_type = $field_info->post_type;
2841
+	?>
2842 2842
     <li style="display: none;">
2843 2843
         <label for="htmlvar_name" class="gd-cf-tooltip-wrap">
2844 2844
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Select taxonomy:', 'geodirectory'); ?>
@@ -2849,15 +2849,15 @@  discard block
 block discarded – undo
2849 2849
         <div class="gd-cf-input-wrap">
2850 2850
             <select name="htmlvar_name" id="htmlvar_name">
2851 2851
                 <?php
2852
-                $gd_taxonomy = geodir_get_taxonomies($post_type);
2852
+				$gd_taxonomy = geodir_get_taxonomies($post_type);
2853 2853
 
2854
-                foreach ($gd_taxonomy as $gd_tax) {
2855
-                    ?>
2854
+				foreach ($gd_taxonomy as $gd_tax) {
2855
+					?>
2856 2856
                     <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {
2857
-                        echo 'selected="selected"';
2858
-                    }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php
2859
-                }
2860
-                ?>
2857
+						echo 'selected="selected"';
2858
+					}?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php
2859
+				}
2860
+				?>
2861 2861
             </select>
2862 2862
         </div>
2863 2863
     </li>
@@ -2873,49 +2873,49 @@  discard block
 block discarded – undo
2873 2873
 
2874 2874
             <select name="cat_display_type" id="cat_display_type">
2875 2875
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {
2876
-                    echo 'selected="selected"';
2877
-                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
2876
+					echo 'selected="selected"';
2877
+				}?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
2878 2878
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
2879
-                    echo 'selected="selected"';
2880
-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>
2879
+					echo 'selected="selected"';
2880
+				}?> value="select"><?php _e('Select', 'geodirectory');?></option>
2881 2881
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {
2882
-                    echo 'selected="selected"';
2883
-                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
2882
+					echo 'selected="selected"';
2883
+				}?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
2884 2884
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
2885
-                    echo 'selected="selected"';
2886
-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
2885
+					echo 'selected="selected"';
2886
+				}?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
2887 2887
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
2888
-                    echo 'selected="selected"';
2889
-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
2888
+					echo 'selected="selected"';
2889
+				}?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
2890 2890
             </select>
2891 2891
         </div>
2892 2892
     </li>
2893 2893
     <?php
2894 2894
 
2895
-    $output = ob_get_clean();
2896
-    return $output;
2895
+	$output = ob_get_clean();
2896
+	return $output;
2897 2897
 }
2898 2898
 add_filter('geodir_cfa_htmlvar_name_taxonomy','geodir_cfa_htmlvar_name_taxonomy',10,4);
2899 2899
 
2900 2900
 
2901 2901
 function geodir_cfa_extra_fields_address($output,$result_str,$cf,$field_info){
2902 2902
 
2903
-    ob_start();
2904
-    if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
2905
-        $address = unserialize($field_info->extra_fields);
2906
-    }
2903
+	ob_start();
2904
+	if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
2905
+		$address = unserialize($field_info->extra_fields);
2906
+	}
2907 2907
 
2908
-    $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500);
2909
-    ?>
2908
+	$radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500);
2909
+	?>
2910 2910
     <?php
2911
-    /**
2912
-     * Called on the add custom fields settings page before the address field is output.
2913
-     *
2914
-     * @since 1.0.0
2915
-     * @param array $address The address settings array.
2916
-     * @param object $field_info Extra fields info.
2917
-     */
2918
-    do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>
2911
+	/**
2912
+	 * Called on the add custom fields settings page before the address field is output.
2913
+	 *
2914
+	 * @since 1.0.0
2915
+	 * @param array $address The address settings array.
2916
+	 * @param object $field_info Extra fields info.
2917
+	 */
2918
+	do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>
2919 2919
 
2920 2920
     <li>
2921 2921
         <label for="show_zip" class="gd-cf-tooltip-wrap">
@@ -2928,14 +2928,14 @@  discard block
 block discarded – undo
2928 2928
 
2929 2929
             <input type="radio" id="show_zip_yes<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-enabled"  value="1"
2930 2930
                 <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {
2931
-                    echo 'checked';
2932
-                } ?>/>
2931
+					echo 'checked';
2932
+				} ?>/>
2933 2933
             <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2934 2934
 
2935 2935
             <input type="radio" id="show_zip_no<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-disabled" value="0"
2936 2936
                 <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {
2937
-                    echo 'checked';
2938
-                } ?>/>
2937
+					echo 'checked';
2938
+				} ?>/>
2939 2939
             <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2940 2940
 
2941 2941
 
@@ -2952,8 +2952,8 @@  discard block
 block discarded – undo
2952 2952
         <div class="gd-cf-input-wrap">
2953 2953
             <input type="text" name="extra[zip_lable]" id="zip_lable"
2954 2954
                    value="<?php if (isset($address['zip_lable'])) {
2955
-                       echo esc_attr($address['zip_lable']);
2956
-                   }?>"/>
2955
+					   echo esc_attr($address['zip_lable']);
2956
+				   }?>"/>
2957 2957
         </div>
2958 2958
     </li>
2959 2959
 
@@ -2970,8 +2970,8 @@  discard block
 block discarded – undo
2970 2970
         <div class="gd-cf-input-wrap">
2971 2971
             <input type="text" name="extra[map_lable]" id="map_lable"
2972 2972
                    value="<?php if (isset($address['map_lable'])) {
2973
-                       echo esc_attr($address['map_lable']);
2974
-                   }?>"/>
2973
+					   echo esc_attr($address['map_lable']);
2974
+				   }?>"/>
2975 2975
         </div>
2976 2976
     </li>
2977 2977
 
@@ -2986,14 +2986,14 @@  discard block
 block discarded – undo
2986 2986
 
2987 2987
             <input type="radio" id="show_mapzoom_yes<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-enabled"  value="1"
2988 2988
                 <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {
2989
-                    echo 'checked';
2990
-                } ?>/>
2989
+					echo 'checked';
2990
+				} ?>/>
2991 2991
             <label for="show_mapzoom_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2992 2992
 
2993 2993
             <input type="radio" id="show_mapzoom_no<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0"
2994 2994
                 <?php if ((isset($address['show_mapzoom']) && !$address['show_mapzoom']) || !isset($address['show_mapzoom'])) {
2995
-                    echo 'checked';
2996
-                } ?>/>
2995
+					echo 'checked';
2996
+				} ?>/>
2997 2997
             <label for="show_mapzoom_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2998 2998
 
2999 2999
         </div>
@@ -3010,14 +3010,14 @@  discard block
 block discarded – undo
3010 3010
 
3011 3011
             <input type="radio" id="show_mapview_yes<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-enabled"  value="1"
3012 3012
                 <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {
3013
-                    echo 'checked';
3014
-                } ?>/>
3013
+					echo 'checked';
3014
+				} ?>/>
3015 3015
             <label for="show_mapview_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3016 3016
 
3017 3017
             <input type="radio" id="show_mapview_no<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-disabled" value="0"
3018 3018
                 <?php if ((isset($address['show_mapview']) && !$address['show_mapview']) || !isset($address['show_mapview'])) {
3019
-                    echo 'checked';
3020
-                } ?>/>
3019
+					echo 'checked';
3020
+				} ?>/>
3021 3021
             <label for="show_mapview_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3022 3022
 
3023 3023
         </div>
@@ -3034,8 +3034,8 @@  discard block
 block discarded – undo
3034 3034
         <div class="gd-cf-input-wrap">
3035 3035
             <input type="text" name="extra[mapview_lable]" id="mapview_lable"
3036 3036
                    value="<?php if (isset($address['mapview_lable'])) {
3037
-                       echo esc_attr($address['mapview_lable']);
3038
-                   }?>"/>
3037
+					   echo esc_attr($address['mapview_lable']);
3038
+				   }?>"/>
3039 3039
         </div>
3040 3040
     </li>
3041 3041
     <li>
@@ -3049,29 +3049,29 @@  discard block
 block discarded – undo
3049 3049
 
3050 3050
             <input type="radio" id="show_latlng_yes<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-enabled"  value="1"
3051 3051
                 <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {
3052
-                    echo 'checked';
3053
-                } ?>/>
3052
+					echo 'checked';
3053
+				} ?>/>
3054 3054
             <label for="show_latlng_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3055 3055
 
3056 3056
             <input type="radio" id="show_latlng_no<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-disabled" value="0"
3057 3057
                 <?php if ((isset($address['show_latlng']) && !$address['show_latlng']) || !isset($address['show_latlng'])) {
3058
-                    echo 'checked';
3059
-                } ?>/>
3058
+					echo 'checked';
3059
+				} ?>/>
3060 3060
             <label for="show_latlng_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3061 3061
 
3062 3062
         </div>
3063 3063
     </li>
3064 3064
     <?php
3065 3065
 
3066
-    $html = ob_get_clean();
3067
-    return $output.$html;
3066
+	$html = ob_get_clean();
3067
+	return $output.$html;
3068 3068
 }
3069 3069
 add_filter('geodir_cfa_extra_fields_address','geodir_cfa_extra_fields_address',10,4);
3070 3070
 
3071 3071
 
3072 3072
 function geodir_cfa_extra_fields_multiselect($output,$result_str,$cf,$field_info){
3073
-    ob_start();
3074
-    ?>
3073
+	ob_start();
3074
+	?>
3075 3075
     <li>
3076 3076
         <label for="multi_display_type" class="gd-cf-tooltip-wrap">
3077 3077
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Multiselect display type :', 'geodirectory'); ?>
@@ -3083,14 +3083,14 @@  discard block
 block discarded – undo
3083 3083
 
3084 3084
             <select name="multi_display_type" id="multi_display_type">
3085 3085
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
3086
-                    echo 'selected="selected"';
3087
-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>
3086
+					echo 'selected="selected"';
3087
+				}?> value="select"><?php _e('Select', 'geodirectory');?></option>
3088 3088
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
3089
-                    echo 'selected="selected"';
3090
-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
3089
+					echo 'selected="selected"';
3090
+				}?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
3091 3091
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
3092
-                    echo 'selected="selected"';
3093
-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
3092
+					echo 'selected="selected"';
3093
+				}?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
3094 3094
             </select>
3095 3095
 
3096 3096
             <br/>
@@ -3098,25 +3098,25 @@  discard block
 block discarded – undo
3098 3098
     </li>
3099 3099
     <?php
3100 3100
 
3101
-    $html = ob_get_clean();
3102
-    return $output.$html;
3101
+	$html = ob_get_clean();
3102
+	return $output.$html;
3103 3103
 }
3104 3104
 add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_multiselect',10,4);
3105 3105
 
3106 3106
 
3107 3107
 function geodir_cfa_extra_fields_smr($output,$result_str,$cf,$field_info){
3108 3108
 
3109
-    ob_start();
3109
+	ob_start();
3110 3110
 
3111
-    $value = '';
3112
-    if (isset($field_info->option_values)) {
3113
-        $value = esc_attr($field_info->option_values);
3114
-    }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
3115
-        $value = esc_attr($cf['defaults']['option_values']);
3116
-    }
3111
+	$value = '';
3112
+	if (isset($field_info->option_values)) {
3113
+		$value = esc_attr($field_info->option_values);
3114
+	}elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
3115
+		$value = esc_attr($cf['defaults']['option_values']);
3116
+	}
3117 3117
 
3118
-    $field_type = isset($field_info->field_type) ? $field_info->field_type : '';
3119
-    ?>
3118
+	$field_type = isset($field_info->field_type) ? $field_info->field_type : '';
3119
+	?>
3120 3120
     <li>
3121 3121
         <label for="option_values" class="gd-cf-tooltip-wrap">
3122 3122
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Option Values :', 'geodirectory'); ?>
@@ -3143,8 +3143,8 @@  discard block
 block discarded – undo
3143 3143
     </li>
3144 3144
     <?php
3145 3145
 
3146
-    $html = ob_get_clean();
3147
-    return $output.$html;
3146
+	$html = ob_get_clean();
3147
+	return $output.$html;
3148 3148
 }
3149 3149
 add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_smr',10,4);
3150 3150
 add_filter('geodir_cfa_extra_fields_select','geodir_cfa_extra_fields_smr',10,4);
@@ -3152,12 +3152,12 @@  discard block
 block discarded – undo
3152 3152
 
3153 3153
 
3154 3154
 function geodir_cfa_extra_fields_datepicker($output,$result_str,$cf,$field_info){
3155
-    ob_start();
3156
-    $extra = array();
3157
-    if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
3158
-        $extra = unserialize($field_info->extra_fields);
3159
-    }
3160
-    ?>
3155
+	ob_start();
3156
+	$extra = array();
3157
+	if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
3158
+		$extra = unserialize($field_info->extra_fields);
3159
+	}
3160
+	?>
3161 3161
     <li>
3162 3162
         <label for="date_format" class="gd-cf-tooltip-wrap">
3163 3163
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Date Format :', 'geodirectory'); ?>
@@ -3167,52 +3167,52 @@  discard block
 block discarded – undo
3167 3167
         </label>
3168 3168
         <div class="gd-cf-input-wrap" style="overflow:inherit;">
3169 3169
             <?php
3170
-            $date_formats = array(
3171
-                'm/d/Y',
3172
-                'd/m/Y',
3173
-                'Y/m/d',
3174
-                'm-d-Y',
3175
-                'd-m-Y',
3176
-                'Y-m-d',
3177
-                'F j, Y',
3178
-            );
3179
-            /**
3180
-             * Filter the custom field date format options.
3181
-             *
3182
-             * @since 1.6.5
3183
-             * @param array $date_formats The PHP date format array.
3184
-             */
3185
-            $date_formats = apply_filters('geodir_date_formats',$date_formats);
3186
-            ?>
3170
+			$date_formats = array(
3171
+				'm/d/Y',
3172
+				'd/m/Y',
3173
+				'Y/m/d',
3174
+				'm-d-Y',
3175
+				'd-m-Y',
3176
+				'Y-m-d',
3177
+				'F j, Y',
3178
+			);
3179
+			/**
3180
+			 * Filter the custom field date format options.
3181
+			 *
3182
+			 * @since 1.6.5
3183
+			 * @param array $date_formats The PHP date format array.
3184
+			 */
3185
+			$date_formats = apply_filters('geodir_date_formats',$date_formats);
3186
+			?>
3187 3187
             <select name="extra[date_format]" id="date_format">
3188 3188
                 <?php
3189
-                foreach($date_formats as $format){
3190
-                    $selected = '';
3191
-                    if(!empty($extra) && esc_attr($extra['date_format'])==$format){
3192
-                        $selected = "selected='selected'";
3193
-                    }
3194
-                    echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";
3195
-                }
3196
-                ?>
3189
+				foreach($date_formats as $format){
3190
+					$selected = '';
3191
+					if(!empty($extra) && esc_attr($extra['date_format'])==$format){
3192
+						$selected = "selected='selected'";
3193
+					}
3194
+					echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";
3195
+				}
3196
+				?>
3197 3197
             </select>
3198 3198
 
3199 3199
         </div>
3200 3200
     </li>
3201 3201
     <?php
3202 3202
 
3203
-    $html = ob_get_clean();
3204
-    return $output.$html;
3203
+	$html = ob_get_clean();
3204
+	return $output.$html;
3205 3205
 }
3206 3206
 add_filter('geodir_cfa_extra_fields_datepicker','geodir_cfa_extra_fields_datepicker',10,4);
3207 3207
 
3208 3208
 
3209 3209
 function geodir_cfa_extra_fields_file($output,$result_str,$cf,$field_info){
3210
-    ob_start();
3211
-    $allowed_file_types = geodir_allowed_mime_types();
3210
+	ob_start();
3211
+	$allowed_file_types = geodir_allowed_mime_types();
3212 3212
 
3213
-    $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';
3214
-    $gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');
3215
-    ?>
3213
+	$extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';
3214
+	$gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');
3215
+	?>
3216 3216
     <li>
3217 3217
         <label for="gd_file_types" class="gd-cf-tooltip-wrap">
3218 3218
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Allowed file types :', 'geodirectory'); ?>
@@ -3235,182 +3235,182 @@  discard block
 block discarded – undo
3235 3235
     </li>
3236 3236
     <?php
3237 3237
 
3238
-    $html = ob_get_clean();
3239
-    return $output.$html;
3238
+	$html = ob_get_clean();
3239
+	return $output.$html;
3240 3240
 }
3241 3241
 add_filter('geodir_cfa_extra_fields_file','geodir_cfa_extra_fields_file',10,4);
3242 3242
 
3243 3243
 function geodir_default_custom_fields($post_type='gd_place',$package_id=''){
3244
-    $fields = array();
3245
-    $package = ($package_id=='') ? '' : array($package_id);
3246
-
3247
-    $fields[] = array('listing_type' => $post_type,
3248
-                      'data_type' => 'VARCHAR',
3249
-                      'field_type' => 'taxonomy',
3250
-                      'admin_title' => __('Category', 'geodirectory'),
3251
-                      'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),
3252
-                      'site_title' => __('Category', 'geodirectory'),
3253
-                      'htmlvar_name' => $post_type.'category',
3254
-                      'default_value' => '',
3255
-                      'is_default' => '1',
3256
-                      'is_admin' => '1',
3257
-                      'is_required' => '1',
3258
-                      'show_in'   =>  '[detail]',
3259
-                      'show_on_pkg' => $package,
3260
-                      'clabels' => __('Category', 'geodirectory'));
3261
-
3262
-    $fields[] = array('listing_type' => $post_type,
3263
-                      'data_type' => 'VARCHAR',
3264
-                      'field_type' => 'address',
3265
-                      'admin_title' => __('Address', 'geodirectory'),
3266
-                      'admin_desc' => ADDRESS_MSG,
3267
-                      'site_title' => __('Address', 'geodirectory'),
3268
-                      'htmlvar_name' => 'post',
3269
-                      'default_value' => '',
3270
-                      'option_values' => '',
3271
-                      'is_default' => '1',
3272
-                      'is_admin' => '1',
3273
-                      'is_required' => '1',
3274
-                      'show_in'   =>  '[detail],[mapbubble]',
3275
-                      'show_on_pkg' => $package,
3276
-                      'required_msg' => __('Address fields are required', 'geodirectory'),
3277
-                      'clabels' => __('Address', 'geodirectory'),
3278
-                      'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),
3279
-                                       'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),
3280
-                                       'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),
3281
-                                       'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),
3282
-                                       'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),
3283
-                                       'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),
3284
-                                       'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden',
3285
-                                       'show_latlng' => 1));
3286
-
3287
-    $fields[] = array('listing_type' => $post_type,
3288
-                      'data_type' => 'VARCHAR',
3289
-                      'field_type' => 'text',
3290
-                      'admin_title' => __('Time', 'geodirectory'),
3291
-                      'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),
3292
-                      'site_title' => __('Time', 'geodirectory'),
3293
-                      'htmlvar_name' => 'timing',
3294
-                      'default_value' => '',
3295
-                      'option_values' => '',
3296
-                      'is_default' => '1',
3297
-                      'is_admin' => '1',
3298
-                      'show_in' =>  '[detail],[mapbubble]',
3299
-                      'show_on_pkg' => $package,
3300
-                      'clabels' => __('Time', 'geodirectory'));
3301
-
3302
-    $fields[] = array('listing_type' => $post_type,
3303
-                      'data_type' => 'VARCHAR',
3304
-                      'field_type' => 'phone',
3305
-                      'admin_title' => __('Phone', 'geodirectory'),
3306
-                      'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),
3307
-                      'site_title' => __('Phone', 'geodirectory'),
3308
-                      'htmlvar_name' => 'contact',
3309
-                      'default_value' => '',
3310
-                      'option_values' => '',
3311
-                      'is_default' => '1',
3312
-                      'is_admin' => '1',
3313
-                      'show_in' =>  '[detail],[mapbubble]',
3314
-                      'show_on_pkg' => $package,
3315
-                      'clabels' => __('Phone', 'geodirectory'));
3316
-
3317
-    $fields[] = array('listing_type' => $post_type,
3318
-                      'data_type' => 'VARCHAR',
3319
-                      'field_type' => 'email',
3320
-                      'admin_title' => __('Email', 'geodirectory'),
3321
-                      'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),
3322
-                      'site_title' => __('Email', 'geodirectory'),
3323
-                      'htmlvar_name' => 'email',
3324
-                      'default_value' => '',
3325
-                      'option_values' => '',
3326
-                      'is_default' => '1',
3327
-                      'is_admin' => '1',
3328
-                      'show_in' => '[detail]',
3329
-                      'show_on_pkg' => $package,
3330
-                      'clabels' => __('Email', 'geodirectory'));
3331
-
3332
-    $fields[] = array('listing_type' => $post_type,
3333
-                      'data_type' => 'VARCHAR',
3334
-                      'field_type' => 'url',
3335
-                      'admin_title' => __('Website', 'geodirectory'),
3336
-                      'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),
3337
-                      'site_title' => __('Website', 'geodirectory'),
3338
-                      'htmlvar_name' => 'website',
3339
-                      'default_value' => '',
3340
-                      'option_values' => '',
3341
-                      'is_default' => '1',
3342
-                      'is_admin' => '1',
3343
-                      'show_in' => '[detail]',
3344
-                      'show_on_pkg' => $package,
3345
-                      'clabels' => __('Website', 'geodirectory'));
3346
-
3347
-    $fields[] = array('listing_type' => $post_type,
3348
-                      'data_type' => 'VARCHAR',
3349
-                      'field_type' => 'url',
3350
-                      'admin_title' => __('Twitter', 'geodirectory'),
3351
-                      'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),
3352
-                      'site_title' => __('Twitter', 'geodirectory'),
3353
-                      'htmlvar_name' => 'twitter',
3354
-                      'default_value' => '',
3355
-                      'option_values' => '',
3356
-                      'is_default' => '1',
3357
-                      'is_admin' => '1',
3358
-                      'show_in' => '[detail]',
3359
-                      'show_on_pkg' => $package,
3360
-                      'clabels' => __('Twitter', 'geodirectory'));
3361
-
3362
-    $fields[] = array('listing_type' => $post_type,
3363
-                      'data_type' => 'VARCHAR',
3364
-                      'field_type' => 'url',
3365
-                      'admin_title' => __('Facebook', 'geodirectory'),
3366
-                      'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),
3367
-                      'site_title' => __('Facebook', 'geodirectory'),
3368
-                      'htmlvar_name' => 'facebook',
3369
-                      'default_value' => '',
3370
-                      'option_values' => '',
3371
-                      'is_default' => '1',
3372
-                      'is_admin' => '1',
3373
-                      'show_in' => '[detail]',
3374
-                      'show_on_pkg' => $package,
3375
-                      'clabels' => __('Facebook', 'geodirectory'));
3376
-
3377
-    $fields[] = array('listing_type' => $post_type,
3378
-                      'data_type' => 'TEXT',
3379
-                      'field_type' => 'textarea',
3380
-                      'admin_title' => __('Video', 'geodirectory'),
3381
-                      'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),
3382
-                      'site_title' => __('Video', 'geodirectory'),
3383
-                      'htmlvar_name' => 'video',
3384
-                      'default_value' => '',
3385
-                      'option_values' => '',
3386
-                      'is_default' => '0',
3387
-                      'is_admin' => '1',
3388
-                      'show_in' => '[owntab]',
3389
-                      'show_on_pkg' => $package,
3390
-                      'clabels' => __('Video', 'geodirectory'));
3391
-
3392
-    $fields[] = array('listing_type' => $post_type,
3393
-                      'data_type' => 'TEXT',
3394
-                      'field_type' => 'textarea',
3395
-                      'admin_title' => __('Special Offers', 'geodirectory'),
3396
-                      'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),
3397
-                      'site_title' => __('Special Offers', 'geodirectory'),
3398
-                      'htmlvar_name' => 'special_offers',
3399
-                      'default_value' => '',
3400
-                      'option_values' => '',
3401
-                      'is_default' => '0',
3402
-                      'is_admin' => '1',
3403
-                      'show_in' => '[owntab]',
3404
-                      'show_on_pkg' => $package,
3405
-                      'clabels' => __('Special Offers', 'geodirectory'));
3406
-
3407
-    /**
3408
-     * Filter the array of default custom fields DB table data.
3409
-     *
3410
-     * @since 1.6.6
3411
-     * @param string $fields The default custom fields as an array.
3412
-     */
3413
-    $fields = apply_filters('geodir_default_custom_fields', $fields);
3414
-
3415
-    return  $fields;
3244
+	$fields = array();
3245
+	$package = ($package_id=='') ? '' : array($package_id);
3246
+
3247
+	$fields[] = array('listing_type' => $post_type,
3248
+					  'data_type' => 'VARCHAR',
3249
+					  'field_type' => 'taxonomy',
3250
+					  'admin_title' => __('Category', 'geodirectory'),
3251
+					  'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),
3252
+					  'site_title' => __('Category', 'geodirectory'),
3253
+					  'htmlvar_name' => $post_type.'category',
3254
+					  'default_value' => '',
3255
+					  'is_default' => '1',
3256
+					  'is_admin' => '1',
3257
+					  'is_required' => '1',
3258
+					  'show_in'   =>  '[detail]',
3259
+					  'show_on_pkg' => $package,
3260
+					  'clabels' => __('Category', 'geodirectory'));
3261
+
3262
+	$fields[] = array('listing_type' => $post_type,
3263
+					  'data_type' => 'VARCHAR',
3264
+					  'field_type' => 'address',
3265
+					  'admin_title' => __('Address', 'geodirectory'),
3266
+					  'admin_desc' => ADDRESS_MSG,
3267
+					  'site_title' => __('Address', 'geodirectory'),
3268
+					  'htmlvar_name' => 'post',
3269
+					  'default_value' => '',
3270
+					  'option_values' => '',
3271
+					  'is_default' => '1',
3272
+					  'is_admin' => '1',
3273
+					  'is_required' => '1',
3274
+					  'show_in'   =>  '[detail],[mapbubble]',
3275
+					  'show_on_pkg' => $package,
3276
+					  'required_msg' => __('Address fields are required', 'geodirectory'),
3277
+					  'clabels' => __('Address', 'geodirectory'),
3278
+					  'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),
3279
+									   'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),
3280
+									   'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),
3281
+									   'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),
3282
+									   'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),
3283
+									   'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),
3284
+									   'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden',
3285
+									   'show_latlng' => 1));
3286
+
3287
+	$fields[] = array('listing_type' => $post_type,
3288
+					  'data_type' => 'VARCHAR',
3289
+					  'field_type' => 'text',
3290
+					  'admin_title' => __('Time', 'geodirectory'),
3291
+					  'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),
3292
+					  'site_title' => __('Time', 'geodirectory'),
3293
+					  'htmlvar_name' => 'timing',
3294
+					  'default_value' => '',
3295
+					  'option_values' => '',
3296
+					  'is_default' => '1',
3297
+					  'is_admin' => '1',
3298
+					  'show_in' =>  '[detail],[mapbubble]',
3299
+					  'show_on_pkg' => $package,
3300
+					  'clabels' => __('Time', 'geodirectory'));
3301
+
3302
+	$fields[] = array('listing_type' => $post_type,
3303
+					  'data_type' => 'VARCHAR',
3304
+					  'field_type' => 'phone',
3305
+					  'admin_title' => __('Phone', 'geodirectory'),
3306
+					  'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),
3307
+					  'site_title' => __('Phone', 'geodirectory'),
3308
+					  'htmlvar_name' => 'contact',
3309
+					  'default_value' => '',
3310
+					  'option_values' => '',
3311
+					  'is_default' => '1',
3312
+					  'is_admin' => '1',
3313
+					  'show_in' =>  '[detail],[mapbubble]',
3314
+					  'show_on_pkg' => $package,
3315
+					  'clabels' => __('Phone', 'geodirectory'));
3316
+
3317
+	$fields[] = array('listing_type' => $post_type,
3318
+					  'data_type' => 'VARCHAR',
3319
+					  'field_type' => 'email',
3320
+					  'admin_title' => __('Email', 'geodirectory'),
3321
+					  'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),
3322
+					  'site_title' => __('Email', 'geodirectory'),
3323
+					  'htmlvar_name' => 'email',
3324
+					  'default_value' => '',
3325
+					  'option_values' => '',
3326
+					  'is_default' => '1',
3327
+					  'is_admin' => '1',
3328
+					  'show_in' => '[detail]',
3329
+					  'show_on_pkg' => $package,
3330
+					  'clabels' => __('Email', 'geodirectory'));
3331
+
3332
+	$fields[] = array('listing_type' => $post_type,
3333
+					  'data_type' => 'VARCHAR',
3334
+					  'field_type' => 'url',
3335
+					  'admin_title' => __('Website', 'geodirectory'),
3336
+					  'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),
3337
+					  'site_title' => __('Website', 'geodirectory'),
3338
+					  'htmlvar_name' => 'website',
3339
+					  'default_value' => '',
3340
+					  'option_values' => '',
3341
+					  'is_default' => '1',
3342
+					  'is_admin' => '1',
3343
+					  'show_in' => '[detail]',
3344
+					  'show_on_pkg' => $package,
3345
+					  'clabels' => __('Website', 'geodirectory'));
3346
+
3347
+	$fields[] = array('listing_type' => $post_type,
3348
+					  'data_type' => 'VARCHAR',
3349
+					  'field_type' => 'url',
3350
+					  'admin_title' => __('Twitter', 'geodirectory'),
3351
+					  'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),
3352
+					  'site_title' => __('Twitter', 'geodirectory'),
3353
+					  'htmlvar_name' => 'twitter',
3354
+					  'default_value' => '',
3355
+					  'option_values' => '',
3356
+					  'is_default' => '1',
3357
+					  'is_admin' => '1',
3358
+					  'show_in' => '[detail]',
3359
+					  'show_on_pkg' => $package,
3360
+					  'clabels' => __('Twitter', 'geodirectory'));
3361
+
3362
+	$fields[] = array('listing_type' => $post_type,
3363
+					  'data_type' => 'VARCHAR',
3364
+					  'field_type' => 'url',
3365
+					  'admin_title' => __('Facebook', 'geodirectory'),
3366
+					  'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),
3367
+					  'site_title' => __('Facebook', 'geodirectory'),
3368
+					  'htmlvar_name' => 'facebook',
3369
+					  'default_value' => '',
3370
+					  'option_values' => '',
3371
+					  'is_default' => '1',
3372
+					  'is_admin' => '1',
3373
+					  'show_in' => '[detail]',
3374
+					  'show_on_pkg' => $package,
3375
+					  'clabels' => __('Facebook', 'geodirectory'));
3376
+
3377
+	$fields[] = array('listing_type' => $post_type,
3378
+					  'data_type' => 'TEXT',
3379
+					  'field_type' => 'textarea',
3380
+					  'admin_title' => __('Video', 'geodirectory'),
3381
+					  'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),
3382
+					  'site_title' => __('Video', 'geodirectory'),
3383
+					  'htmlvar_name' => 'video',
3384
+					  'default_value' => '',
3385
+					  'option_values' => '',
3386
+					  'is_default' => '0',
3387
+					  'is_admin' => '1',
3388
+					  'show_in' => '[owntab]',
3389
+					  'show_on_pkg' => $package,
3390
+					  'clabels' => __('Video', 'geodirectory'));
3391
+
3392
+	$fields[] = array('listing_type' => $post_type,
3393
+					  'data_type' => 'TEXT',
3394
+					  'field_type' => 'textarea',
3395
+					  'admin_title' => __('Special Offers', 'geodirectory'),
3396
+					  'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),
3397
+					  'site_title' => __('Special Offers', 'geodirectory'),
3398
+					  'htmlvar_name' => 'special_offers',
3399
+					  'default_value' => '',
3400
+					  'option_values' => '',
3401
+					  'is_default' => '0',
3402
+					  'is_admin' => '1',
3403
+					  'show_in' => '[owntab]',
3404
+					  'show_on_pkg' => $package,
3405
+					  'clabels' => __('Special Offers', 'geodirectory'));
3406
+
3407
+	/**
3408
+	 * Filter the array of default custom fields DB table data.
3409
+	 *
3410
+	 * @since 1.6.6
3411
+	 * @param string $fields The default custom fields as an array.
3412
+	 */
3413
+	$fields = apply_filters('geodir_default_custom_fields', $fields);
3414
+
3415
+	return  $fields;
3416 3416
 }
3417 3417
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +359 added lines, -359 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
     function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")
50 50
     {
51 51
         global $wpdb;
52
-        $result = 0;// no rows affected
52
+        $result = 0; // no rows affected
53 53
         if (!geodir_column_exist($db, $column)) {
54 54
             if (!empty($db) && !empty($column))
55 55
                 $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 {
75 75
     global $wpdb, $geodir_post_custom_fields_cache;
76 76
 
77
-    $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;
77
+    $cache_stored = $post_type.'_'.$package_id.'_'.$default.'_'.$fields_location;
78 78
 
79 79
     if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {
80 80
         return $geodir_post_custom_fields_cache[$cache_stored];
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
88 88
         $default_query .= " and is_admin = '0' ";
89 89
 
90 90
     if ($fields_location == 'none') {
91
-    } else{
92
-        $fields_location = esc_sql( $fields_location );
91
+    } else {
92
+        $fields_location = esc_sql($fields_location);
93 93
         $default_query .= " and show_in LIKE '%%[$fields_location]%%' ";
94 94
     }
95 95
 
96 96
     $post_meta_info = $wpdb->get_results(
97 97
         $wpdb->prepare(
98
-            "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
98
+            "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
99 99
             array($post_type)
100 100
         )
101 101
     );
@@ -162,13 +162,13 @@  discard block
 block discarded – undo
162 162
      * @param string $field_ins_upd When set to "submit" displays form.
163 163
      * @param string $field_type_key The key of the custom field.
164 164
      */
165
-    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='')
165
+    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key = '')
166 166
     {
167 167
         global $wpdb;
168 168
         $cf = $result_str;
169 169
         if (!is_object($cf)) {
170 170
 
171
-            $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));
171
+            $field_info = $wpdb->get_row($wpdb->prepare("select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)));
172 172
 
173 173
         } else {
174 174
             $field_info = $cf;
@@ -202,14 +202,14 @@  discard block
 block discarded – undo
202 202
         if ($field_id != '') {
203 203
             $cf = trim($field_id, '_');
204 204
 
205
-            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {
206
-                $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));
205
+            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)))) {
206
+                $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d ", array($cf)));
207 207
 
208 208
                 $post_type = $field->post_type;
209 209
                 $htmlvar_name = $field->htmlvar_name;
210 210
 
211 211
                 if ($post_type != '' && $htmlvar_name != '') {
212
-                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
212
+                    $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
213 213
                 }
214 214
 
215 215
                 /**
@@ -223,18 +223,18 @@  discard block
 block discarded – undo
223 223
                 do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);
224 224
 
225 225
                 if ($field->field_type == 'address') {
226
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");
227
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");
228
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");
229
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");
230
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");
231
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");
232
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");
233
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");
234
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");
226
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_address`");
227
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_city`");
228
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_region`");
229
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_country`");
230
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_zip`");
231
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_latitude`");
232
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_longitude`");
233
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapview`");
234
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapzoom`");
235 235
                 } else {
236 236
                     if ($field->field_type != 'fieldset') {
237
-                        $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");
237
+                        $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."`");
238 238
                     }
239 239
                 }
240 240
 
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
         $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';
305 305
 
306 306
         // some servers fail if a POST value is VARCHAR so we change it.
307
-        if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){
307
+        if (isset($request_field['data_type']) && $request_field['data_type'] == 'XVARCHAR') {
308 308
             $request_field['data_type'] = 'VARCHAR';
309 309
         }
310 310
 
@@ -317,12 +317,12 @@  discard block
 block discarded – undo
317 317
         $post_type = $request_field['listing_type'];
318 318
 
319 319
         if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {
320
-            $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;
320
+            $cehhtmlvar_name = 'geodir_'.$cehhtmlvar_name;
321 321
         }
322 322
 
323 323
         $check_html_variable = $wpdb->get_var(
324 324
             $wpdb->prepare(
325
-                "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",
325
+                "select htmlvar_name from ".GEODIR_CUSTOM_FIELDS_TABLE." where id <> %d and htmlvar_name = %s and post_type = %s ",
326 326
                 array($cf, $cehhtmlvar_name, $post_type)
327 327
             )
328 328
         );
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 
335 335
                 $post_meta_info = $wpdb->get_row(
336 336
                     $wpdb->prepare(
337
-                        "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",
337
+                        "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id = %d",
338 338
                         array($cf)
339 339
                     )
340 340
                 );
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
             if ($post_type == '') $post_type = 'gd_place';
353 353
 
354 354
 
355
-            $detail_table = $plugin_prefix . $post_type . '_detail';
355
+            $detail_table = $plugin_prefix.$post_type.'_detail';
356 356
 
357 357
             $admin_title = $request_field['admin_title'];
358 358
             $site_title = $request_field['site_title'];
@@ -380,12 +380,12 @@  discard block
 block discarded – undo
380 380
             $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';
381 381
 
382 382
             
383
-            if(is_array($show_in)){
383
+            if (is_array($show_in)) {
384 384
                 $show_in = implode(",", $request_field['show_in']);
385 385
             }
386 386
             
387 387
             if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {
388
-                $htmlvar_name = 'geodir_' . $htmlvar_name;
388
+                $htmlvar_name = 'geodir_'.$htmlvar_name;
389 389
             }
390 390
 
391 391
             $option_values = '';
@@ -426,9 +426,9 @@  discard block
 block discarded – undo
426 426
 
427 427
             if ($sort_order == '') {
428 428
 
429
-                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);
429
+                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM ".GEODIR_CUSTOM_FIELDS_TABLE);
430 430
 
431
-                $sort_order = (int)$last_order + 1;
431
+                $sort_order = (int) $last_order + 1;
432 432
             }
433 433
 
434 434
             $default_value_add = '';
@@ -440,15 +440,15 @@  discard block
 block discarded – undo
440 440
                     case 'address':
441 441
 
442 442
                         if ($htmlvar_name != '') {
443
-                            $prefix = $htmlvar_name . '_';
443
+                            $prefix = $htmlvar_name.'_';
444 444
                         }
445
-                        $old_prefix = $old_html_variable . '_';
445
+                        $old_prefix = $old_html_variable.'_';
446 446
 
447 447
 
448
-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";
448
+                        $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."address` `".$prefix."address` VARCHAR( 254 ) NULL";
449 449
 
450 450
                         if ($default_value != '') {
451
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
451
+                            $meta_field_add .= " DEFAULT '".$default_value."'";
452 452
                         }
453 453
 
454 454
                         $wpdb->query($meta_field_add);
@@ -457,12 +457,12 @@  discard block
 block discarded – undo
457 457
 
458 458
                             if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
459 459
 
460
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");
460
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."city'");
461 461
                                 if ($is_column) {
462
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";
462
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."city` `".$prefix."city` VARCHAR( 50 ) NULL";
463 463
 
464 464
                                     if ($default_value != '') {
465
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
465
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
466 466
                                     }
467 467
 
468 468
                                     $wpdb->query($meta_field_add);
@@ -470,9 +470,9 @@  discard block
 block discarded – undo
470 470
 
471 471
                                     $meta_field_add = "VARCHAR( 50 ) NULL";
472 472
                                     if ($default_value != '') {
473
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
473
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
474 474
                                     }
475
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);
475
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add);
476 476
 
477 477
                                 }
478 478
 
@@ -482,36 +482,36 @@  discard block
 block discarded – undo
482 482
 
483 483
                             if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
484 484
 
485
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");
485
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."region'");
486 486
 
487 487
                                 if ($is_column) {
488
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";
488
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."region` `".$prefix."region` VARCHAR( 50 ) NULL";
489 489
 
490 490
                                     if ($default_value != '') {
491
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
491
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
492 492
                                     }
493 493
 
494 494
                                     $wpdb->query($meta_field_add);
495 495
                                 } else {
496 496
                                     $meta_field_add = "VARCHAR( 50 ) NULL";
497 497
                                     if ($default_value != '') {
498
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
498
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
499 499
                                     }
500 500
 
501
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);
501
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add);
502 502
                                 }
503 503
 
504 504
                             }
505 505
                             if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
506 506
 
507
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");
507
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."country'");
508 508
 
509 509
                                 if ($is_column) {
510 510
 
511
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";
511
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."country` `".$prefix."country` VARCHAR( 50 ) NULL";
512 512
 
513 513
                                     if ($default_value != '') {
514
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
514
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
515 515
                                     }
516 516
 
517 517
                                     $wpdb->query($meta_field_add);
@@ -519,24 +519,24 @@  discard block
 block discarded – undo
519 519
 
520 520
                                     $meta_field_add = "VARCHAR( 50 ) NULL";
521 521
                                     if ($default_value != '') {
522
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
522
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
523 523
                                     }
524 524
 
525
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);
525
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add);
526 526
 
527 527
                                 }
528 528
 
529 529
                             }
530 530
                             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
531 531
 
532
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");
532
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."zip'");
533 533
 
534 534
                                 if ($is_column) {
535 535
 
536
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";
536
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."zip` `".$prefix."zip` VARCHAR( 50 ) NULL";
537 537
 
538 538
                                     if ($default_value != '') {
539
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
539
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
540 540
                                     }
541 541
 
542 542
                                     $wpdb->query($meta_field_add);
@@ -544,128 +544,128 @@  discard block
 block discarded – undo
544 544
 
545 545
                                     $meta_field_add = "VARCHAR( 50 ) NULL";
546 546
                                     if ($default_value != '') {
547
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
547
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
548 548
                                     }
549 549
 
550
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);
550
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add);
551 551
 
552 552
                                 }
553 553
 
554 554
                             }
555 555
                             if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
556 556
 
557
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");
557
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latitude'");
558 558
                                 if ($is_column) {
559 559
 
560
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
560
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latitude` `".$prefix."latitude` VARCHAR( 20 ) NULL";
561 561
 
562 562
                                     if ($default_value != '') {
563
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
563
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
564 564
                                     }
565 565
 
566 566
                                     $wpdb->query($meta_field_add);
567 567
                                 } else {
568 568
 
569
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
569
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL";
570 570
                                     $meta_field_add = "VARCHAR( 20 ) NULL";
571 571
                                     if ($default_value != '') {
572
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
572
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
573 573
                                     }
574 574
 
575
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);
575
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add);
576 576
 
577 577
                                 }
578 578
 
579 579
 
580
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");
580
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."longitude'");
581 581
 
582 582
                                 if ($is_column) {
583
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
583
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."longitude` `".$prefix."longitude` VARCHAR( 20 ) NULL";
584 584
 
585 585
                                     if ($default_value != '') {
586
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
586
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
587 587
                                     }
588 588
 
589 589
                                     $wpdb->query($meta_field_add);
590 590
                                 } else {
591 591
 
592
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
592
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL";
593 593
                                     $meta_field_add = "VARCHAR( 20 ) NULL";
594 594
                                     if ($default_value != '') {
595
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
595
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
596 596
                                     }
597 597
 
598
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);
598
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add);
599 599
                                 }
600 600
 
601 601
                             }
602 602
                             if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
603 603
 
604
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");
604
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapview'");
605 605
 
606 606
                                 if ($is_column) {
607
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
607
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapview` `".$prefix."mapview` VARCHAR( 15 ) NULL";
608 608
 
609 609
                                     if ($default_value != '') {
610
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
610
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
611 611
                                     }
612 612
 
613 613
                                     $wpdb->query($meta_field_add);
614 614
                                 } else {
615 615
 
616
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
616
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL";
617 617
 
618 618
                                     $meta_field_add = "VARCHAR( 15 ) NULL";
619 619
                                     if ($default_value != '') {
620
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
620
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
621 621
                                     }
622 622
 
623
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);
623
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add);
624 624
                                 }
625 625
 
626 626
 
627 627
                             }
628 628
                             if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
629 629
 
630
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");
630
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapzoom'");
631 631
                                 if ($is_column) {
632
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
632
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapzoom` `".$prefix."mapzoom` VARCHAR( 3 ) NULL";
633 633
 
634 634
                                     if ($default_value != '') {
635
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
635
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
636 636
                                     }
637 637
 
638 638
                                     $wpdb->query($meta_field_add);
639 639
 
640 640
                                 } else {
641 641
 
642
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
642
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL";
643 643
 
644 644
                                     $meta_field_add = "VARCHAR( 3 ) NULL";
645 645
                                     if ($default_value != '') {
646
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
646
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
647 647
                                     }
648 648
 
649
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);
649
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add);
650 650
                                 }
651 651
 
652 652
                             }
653 653
                             // show lat lng
654 654
                             if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
655
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");
655
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latlng'");
656 656
 
657 657
                                 if ($is_column) {
658
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
658
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latlng` `".$prefix."latlng` VARCHAR( 3 ) NULL";
659 659
                                     $meta_field_add .= " DEFAULT '1'";
660 660
 
661 661
                                     $wpdb->query($meta_field_add);
662 662
                                 } else {
663
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
663
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL";
664 664
 
665 665
                                     $meta_field_add = "VARCHAR( 3 ) NULL";
666 666
                                     $meta_field_add .= " DEFAULT '1'";
667 667
 
668
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);
668
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add);
669 669
                                 }
670 670
 
671 671
                             }
@@ -681,30 +681,30 @@  discard block
 block discarded – undo
681 681
                         $op_size = '500';
682 682
 
683 683
                         // only make the field as big as it needs to be.
684
-                        if(isset($option_values) && $option_values && $field_type=='select'){
685
-                            $option_values_arr = explode(',',$option_values);
686
-                            if(is_array($option_values_arr)){
684
+                        if (isset($option_values) && $option_values && $field_type == 'select') {
685
+                            $option_values_arr = explode(',', $option_values);
686
+                            if (is_array($option_values_arr)) {
687 687
                                 $op_max = 0;
688
-                                foreach($option_values_arr as $op_val){
689
-                                    if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}
688
+                                foreach ($option_values_arr as $op_val) {
689
+                                    if (strlen($op_val) && strlen($op_val) > $op_max) {$op_max = strlen($op_val); }
690 690
                                 }
691
-                                if($op_max){$op_size =$op_max; }
691
+                                if ($op_max) {$op_size = $op_max; }
692 692
                             }
693
-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
694
-                            if(strlen($option_values)){
695
-                                $op_size =  strlen($option_values);
693
+                        }elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
694
+                            if (strlen($option_values)) {
695
+                                $op_size = strlen($option_values);
696 696
                             }
697 697
                         }
698 698
 
699
-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";
699
+                        $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."`VARCHAR( $op_size ) NULL";
700 700
 
701 701
                         if ($default_value != '') {
702
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
702
+                            $meta_field_add .= " DEFAULT '".$default_value."'";
703 703
                         }
704 704
 
705 705
                         $alter_result = $wpdb->query($meta_field_add);
706
-                        if($alter_result===false){
707
-                            return __('Column change failed, you may have too many columns.','geodirectory');
706
+                        if ($alter_result === false) {
707
+                            return __('Column change failed, you may have too many columns.', 'geodirectory');
708 708
                         }
709 709
 
710 710
                         if (isset($request_field['cat_display_type']))
@@ -721,9 +721,9 @@  discard block
 block discarded – undo
721 721
                     case 'url':
722 722
                     case 'file':
723 723
 
724
-                        $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");
725
-                        if($alter_result===false){
726
-                            return __('Column change failed, you may have too many columns.','geodirectory');
724
+                        $alter_result = $wpdb->query("ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` TEXT NULL");
725
+                        if ($alter_result === false) {
726
+                            return __('Column change failed, you may have too many columns.', 'geodirectory');
727 727
                         }
728 728
                         if (isset($request_field['advanced_editor']))
729 729
                             $extra_fields = $request_field['advanced_editor'];
@@ -737,24 +737,24 @@  discard block
 block discarded – undo
737 737
                     default:
738 738
                         if ($data_type != 'VARCHAR' && $data_type != '') {
739 739
                             if ($data_type == 'FLOAT' && $decimal_point > 0) {
740
-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";
740
+                                $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` DECIMAL(11, ".(int) $decimal_point.") NULL";
741 741
                             } else {
742
-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";
742
+                                $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` ".$data_type." NULL";
743 743
                             }
744 744
 
745 745
                             if (is_numeric($default_value) && $default_value != '') {
746
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
746
+                                $default_value_add .= " DEFAULT '".$default_value."'";
747 747
                             }
748 748
                         } else {
749
-                            $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";
749
+                            $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` VARCHAR( 254 ) NULL";
750 750
                             if ($default_value != '') {
751
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
751
+                                $default_value_add .= " DEFAULT '".$default_value."'";
752 752
                             }
753 753
                         }
754 754
 
755 755
                         $alter_result = $wpdb->query($default_value_add);
756
-                        if($alter_result===false){
757
-                            return __('Column change failed, you may have too many columns.','geodirectory');
756
+                        if ($alter_result === false) {
757
+                            return __('Column change failed, you may have too many columns.', 'geodirectory');
758 758
                         }
759 759
                         break;
760 760
                 endswitch;
@@ -770,7 +770,7 @@  discard block
 block discarded – undo
770 770
 
771 771
                     $wpdb->prepare(
772 772
 
773
-                        "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
773
+                        "update ".GEODIR_CUSTOM_FIELDS_TABLE." set 
774 774
 					post_type = %s,
775 775
 					admin_title = %s,
776 776
 					site_title = %s,
@@ -804,7 +804,7 @@  discard block
 block discarded – undo
804 804
 					for_admin_use = %s
805 805
 					where id = %d",
806 806
 
807
-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)
807
+                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use, $cf)
808 808
                     )
809 809
 
810 810
                 );
@@ -814,7 +814,7 @@  discard block
 block discarded – undo
814 814
 
815 815
                 $wpdb->query(
816 816
                     $wpdb->prepare(
817
-                        "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
817
+                        "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 
818 818
 					 	site_title=%s
819 819
 					where post_type = %s and htmlvar_name = %s",
820 820
                         array($site_title, $post_type, $htmlvar_name)
@@ -823,7 +823,7 @@  discard block
 block discarded – undo
823 823
 
824 824
 
825 825
                 if ($cat_sort == '')
826
-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
826
+                    $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
827 827
 
828 828
 
829 829
                 /**
@@ -843,7 +843,7 @@  discard block
 block discarded – undo
843 843
                         $data_type = '';
844 844
 
845 845
                         if ($htmlvar_name != '') {
846
-                            $prefix = $htmlvar_name . '_';
846
+                            $prefix = $htmlvar_name.'_';
847 847
                         }
848 848
                         $old_prefix = $old_html_variable;
849 849
 
@@ -851,109 +851,109 @@  discard block
 block discarded – undo
851 851
 
852 852
                         $meta_field_add = "VARCHAR( 254 ) NULL";
853 853
                         if ($default_value != '') {
854
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
854
+                            $meta_field_add .= " DEFAULT '".$default_value."'";
855 855
                         }
856 856
 
857
-                        geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);
857
+                        geodir_add_column_if_not_exist($detail_table, $prefix."address", $meta_field_add);
858 858
                         //$wpdb->query($meta_field_add);
859 859
 
860 860
 
861 861
                         if (!empty($extra_fields)) {
862 862
 
863 863
                             if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
864
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";
864
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."city` VARCHAR( 30 ) NULL";
865 865
                                 $meta_field_add = "VARCHAR( 30 ) NULL";
866 866
                                 if ($default_value != '') {
867
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
867
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
868 868
                                 }
869 869
 
870
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);
870
+                                geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add);
871 871
                                 //$wpdb->query($meta_field_add);
872 872
                             }
873 873
                             if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
874
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";
874
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."region` VARCHAR( 30 ) NULL";
875 875
                                 $meta_field_add = "VARCHAR( 30 ) NULL";
876 876
                                 if ($default_value != '') {
877
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
877
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
878 878
                                 }
879 879
 
880
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);
880
+                                geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add);
881 881
                                 //$wpdb->query($meta_field_add);
882 882
                             }
883 883
                             if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
884
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";
884
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."country` VARCHAR( 30 ) NULL";
885 885
 
886 886
                                 $meta_field_add = "VARCHAR( 30 ) NULL";
887 887
                                 if ($default_value != '') {
888
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
888
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
889 889
                                 }
890 890
 
891
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);
891
+                                geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add);
892 892
                                 //$wpdb->query($meta_field_add);
893 893
                             }
894 894
                             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
895
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";
895
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."zip` VARCHAR( 15 ) NULL";
896 896
                                 $meta_field_add = "VARCHAR( 15 ) NULL";
897 897
                                 if ($default_value != '') {
898
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
898
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
899 899
                                 }
900 900
 
901
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);
901
+                                geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add);
902 902
                                 //$wpdb->query($meta_field_add);
903 903
                             }
904 904
                             if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
905
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
905
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL";
906 906
                                 $meta_field_add = "VARCHAR( 20 ) NULL";
907 907
                                 if ($default_value != '') {
908
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
908
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
909 909
                                 }
910 910
 
911
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);
911
+                                geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add);
912 912
                                 //$wpdb->query($meta_field_add);
913 913
 
914
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
914
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL";
915 915
 
916 916
                                 $meta_field_add = "VARCHAR( 20 ) NULL";
917 917
                                 if ($default_value != '') {
918
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
918
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
919 919
                                 }
920 920
 
921
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);
921
+                                geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add);
922 922
 
923 923
                                 //$wpdb->query($meta_field_add);
924 924
                             }
925 925
                             if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
926
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
926
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL";
927 927
 
928 928
                                 $meta_field_add = "VARCHAR( 15 ) NULL";
929 929
                                 if ($default_value != '') {
930
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
930
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
931 931
                                 }
932 932
 
933
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);
933
+                                geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add);
934 934
 
935 935
                                 //$wpdb->query($meta_field_add);
936 936
                             }
937 937
                             if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
938
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
938
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL";
939 939
 
940 940
                                 $meta_field_add = "VARCHAR( 3 ) NULL";
941 941
                                 if ($default_value != '') {
942
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
942
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
943 943
                                 }
944 944
 
945
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);
945
+                                geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add);
946 946
 
947 947
                                 //$wpdb->query($meta_field_add);
948 948
                             }
949 949
                             // show lat lng
950 950
                             if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
951
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
951
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL";
952 952
 
953 953
                                 $meta_field_add = "VARCHAR( 3 ) NULL";
954 954
                                 $meta_field_add .= " DEFAULT '1'";
955 955
 
956
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);
956
+                                geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add);
957 957
                                 //$wpdb->query($meta_field_add);
958 958
                             }
959 959
                         }
@@ -963,8 +963,8 @@  discard block
 block discarded – undo
963 963
                     case 'checkbox':
964 964
                         $data_type = 'TINYINT';
965 965
 
966
-                        $meta_field_add = $data_type . "( 1 ) NOT NULL ";
967
-                        if ((int)$default_value === 1) {
966
+                        $meta_field_add = $data_type."( 1 ) NOT NULL ";
967
+                        if ((int) $default_value === 1) {
968 968
                             $meta_field_add .= " DEFAULT '1'";
969 969
                         }
970 970
 
@@ -997,7 +997,7 @@  discard block
 block discarded – undo
997 997
                             }
998 998
                         } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
999 999
                             if (strlen($option_values)) {
1000
-                                $op_size =  strlen($option_values);
1000
+                                $op_size = strlen($option_values);
1001 1001
                             }
1002 1002
 
1003 1003
                             if (isset($request_field['multi_display_type'])) {
@@ -1005,9 +1005,9 @@  discard block
 block discarded – undo
1005 1005
                             }
1006 1006
                         }
1007 1007
 
1008
-                        $meta_field_add = $data_type . "( $op_size ) NULL ";
1008
+                        $meta_field_add = $data_type."( $op_size ) NULL ";
1009 1009
                         if ($default_value != '') {
1010
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
1010
+                            $meta_field_add .= " DEFAULT '".$default_value."'";
1011 1011
                         }
1012 1012
 
1013 1013
                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
@@ -1022,9 +1022,9 @@  discard block
 block discarded – undo
1022 1022
 
1023 1023
                         $data_type = 'TEXT';
1024 1024
 
1025
-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1025
+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";
1026 1026
 
1027
-                        $meta_field_add = $data_type . " NULL ";
1027
+                        $meta_field_add = $data_type." NULL ";
1028 1028
                         /*if($default_value != '')
1029 1029
 					{ $meta_field_add .= " DEFAULT '".$default_value."'"; }*/
1030 1030
 
@@ -1039,9 +1039,9 @@  discard block
 block discarded – undo
1039 1039
 
1040 1040
                         $data_type = 'DATE';
1041 1041
 
1042
-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1042
+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";
1043 1043
 
1044
-                        $meta_field_add = $data_type . " NULL ";
1044
+                        $meta_field_add = $data_type." NULL ";
1045 1045
 
1046 1046
                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1047 1047
                         if ($add_result === false) {
@@ -1054,9 +1054,9 @@  discard block
 block discarded – undo
1054 1054
 
1055 1055
                         $data_type = 'TIME';
1056 1056
 
1057
-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1057
+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";
1058 1058
 
1059
-                        $meta_field_add = $data_type . " NULL ";
1059
+                        $meta_field_add = $data_type." NULL ";
1060 1060
 
1061 1061
                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1062 1062
                         if ($add_result === false) {
@@ -1068,22 +1068,22 @@  discard block
 block discarded – undo
1068 1068
                     default:
1069 1069
 
1070 1070
                         if ($data_type != 'VARCHAR' && $data_type != '') {
1071
-                            $meta_field_add = $data_type . " NULL ";
1071
+                            $meta_field_add = $data_type." NULL ";
1072 1072
 
1073 1073
                             if ($data_type == 'FLOAT' && $decimal_point > 0) {
1074
-                                $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";
1074
+                                $meta_field_add = "DECIMAL(11, ".(int) $decimal_point.") NULL ";
1075 1075
                             }
1076 1076
 
1077 1077
                             if (is_numeric($default_value) && $default_value != '') {
1078
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
1079
-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";
1078
+                                $default_value_add .= " DEFAULT '".$default_value."'";
1079
+                                $meta_field_add .= " DEFAULT '".$default_value."'";
1080 1080
                             }
1081 1081
                         } else {
1082 1082
                             $meta_field_add = " VARCHAR( 254 ) NULL ";
1083 1083
 
1084 1084
                             if ($default_value != '') {
1085
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
1086
-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";
1085
+                                $default_value_add .= " DEFAULT '".$default_value."'";
1086
+                                $meta_field_add .= " DEFAULT '".$default_value."'";
1087 1087
                             }
1088 1088
                         }
1089 1089
 
@@ -1105,7 +1105,7 @@  discard block
 block discarded – undo
1105 1105
 
1106 1106
                     $wpdb->prepare(
1107 1107
 
1108
-                        "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
1108
+                        "insert into ".GEODIR_CUSTOM_FIELDS_TABLE." set 
1109 1109
 					post_type = %s,
1110 1110
 					admin_title = %s,
1111 1111
 					site_title = %s,
@@ -1138,7 +1138,7 @@  discard block
 block discarded – undo
1138 1138
 					validation_msg = %s,
1139 1139
 					for_admin_use = %s ",
1140 1140
 
1141
-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)
1141
+                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use)
1142 1142
 
1143 1143
                     )
1144 1144
 
@@ -1150,7 +1150,7 @@  discard block
 block discarded – undo
1150 1150
 
1151 1151
             }
1152 1152
 
1153
-            return (int)$lastid;
1153
+            return (int) $lastid;
1154 1154
 
1155 1155
 
1156 1156
         } else {
@@ -1183,7 +1183,7 @@  discard block
 block discarded – undo
1183 1183
 
1184 1184
             $post_meta_info = $wpdb->query(
1185 1185
                 $wpdb->prepare(
1186
-                    "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
1186
+                    "update ".GEODIR_CUSTOM_FIELDS_TABLE." set 
1187 1187
 															sort_order=%d 
1188 1188
 															where id= %d",
1189 1189
                     array($count, $cf)
@@ -1199,11 +1199,11 @@  discard block
 block discarded – undo
1199 1199
 }
1200 1200
 
1201 1201
 
1202
-function geodir_get_cf_value($cf){
1202
+function geodir_get_cf_value($cf) {
1203 1203
     global $gd_session;
1204 1204
     $value = '';
1205 1205
     if (is_admin()) {
1206
-        global $post,$gd_session;
1206
+        global $post, $gd_session;
1207 1207
 
1208 1208
         if (isset($_REQUEST['post']))
1209 1209
             $_REQUEST['pid'] = $_REQUEST['post'];
@@ -1251,7 +1251,7 @@  discard block
 block discarded – undo
1251 1251
         $is_default = $val['is_default'];
1252 1252
 
1253 1253
         /* field available to site admin only for edit */
1254
-        $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;
1254
+        $for_admin_use = isset($val['for_admin_use']) && (int) $val['for_admin_use'] == 1 ? true : false;
1255 1255
         if ($for_admin_use && !is_super_admin()) {
1256 1256
             continue;
1257 1257
         }
@@ -1276,11 +1276,11 @@  discard block
 block discarded – undo
1276 1276
          * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
1277 1277
          * @see 'geodir_after_custom_form_field_$name'
1278 1278
          */
1279
-        do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);
1279
+        do_action('geodir_before_custom_form_field_'.$name, $listing_type, $package_id, $val);
1280 1280
 
1281 1281
 
1282 1282
         $custom_field = $val;
1283
-        $html ='';
1283
+        $html = '';
1284 1284
         /**
1285 1285
          * Filter the output for custom fields.
1286 1286
          *
@@ -1289,7 +1289,7 @@  discard block
 block discarded – undo
1289 1289
          * @param string $html The html to be filtered (blank).
1290 1290
          * @param array $custom_field The custom field array values.
1291 1291
          */
1292
-        echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);
1292
+        echo apply_filters("geodir_custom_field_input_{$type}", $html, $custom_field);
1293 1293
 
1294 1294
 
1295 1295
 
@@ -1304,7 +1304,7 @@  discard block
 block discarded – undo
1304 1304
          * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
1305 1305
          * @see 'geodir_before_custom_form_field_$name'
1306 1306
          */
1307
-        do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);
1307
+        do_action('geodir_after_custom_form_field_'.$name, $listing_type, $package_id, $val);
1308 1308
 
1309 1309
     }
1310 1310
 
@@ -1330,7 +1330,7 @@  discard block
 block discarded – undo
1330 1330
 
1331 1331
         $filter = $wpdb->get_row(
1332 1332
             $wpdb->prepare(
1333
-                "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",
1333
+                "SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND ".$key."='".$value."'",
1334 1334
                 array($geodir_post_type)
1335 1335
             )
1336 1336
         );
@@ -1345,14 +1345,14 @@  discard block
 block discarded – undo
1345 1345
 }
1346 1346
 
1347 1347
 
1348
-function geodir_field_icon_proccess($cf){
1348
+function geodir_field_icon_proccess($cf) {
1349 1349
 
1350 1350
 
1351 1351
     if (strpos($cf['field_icon'], 'http') !== false) {
1352
-        $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
1352
+        $field_icon = ' background: url('.$cf['field_icon'].') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
1353 1353
     } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
1354
-        $field_icon = '<i class="' . $cf['field_icon'] . '"></i>';
1355
-    }else{
1354
+        $field_icon = '<i class="'.$cf['field_icon'].'"></i>';
1355
+    } else {
1356 1356
         $field_icon = $cf['field_icon'];
1357 1357
     }
1358 1358
 
@@ -1402,7 +1402,7 @@  discard block
 block discarded – undo
1402 1402
                 $field_icon = geodir_field_icon_proccess($type);
1403 1403
                 $filed_type = $type['type'];
1404 1404
                 $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';
1405
-                if($html_var=='post'){$html_var='post_address';}
1405
+                if ($html_var == 'post') {$html_var = 'post_address'; }
1406 1406
 
1407 1407
                 /**
1408 1408
                  * Filter the output for custom fields.
@@ -1413,7 +1413,7 @@  discard block
 block discarded – undo
1413 1413
                  * @param string $fields_location The location the field is to be show.
1414 1414
                  * @param array $type The array of field values.
1415 1415
                  */
1416
-                $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
1416
+                $html = apply_filters("geodir_custom_field_output_{$filed_type}", $html, $fields_location, $type);
1417 1417
 
1418 1418
                 $variables_array = array();
1419 1419
 
@@ -1476,7 +1476,7 @@  discard block
 block discarded – undo
1476 1476
          * @param string $fields_location The location the fields are being output.
1477 1477
          * @since 1.6.9
1478 1478
          */
1479
-        return apply_filters('geodir_show_listing_info',$html,$fields_location);
1479
+        return apply_filters('geodir_show_listing_info', $html, $fields_location);
1480 1480
 
1481 1481
     }
1482 1482
 }
@@ -1551,7 +1551,7 @@  discard block
 block discarded – undo
1551 1551
 
1552 1552
         $post_type = get_post_type($post_id);
1553 1553
         //echo $field_id; exit;
1554
-        $table = $plugin_prefix . $post_type . '_detail';
1554
+        $table = $plugin_prefix.$post_type.'_detail';
1555 1555
 
1556 1556
         $postcurr_images = array();
1557 1557
         $postcurr_images = geodir_get_post_meta($post_id, $field_id, true);
@@ -1570,13 +1570,13 @@  discard block
 block discarded – undo
1570 1570
             $geodir_uploadurl = $uploads['url'];
1571 1571
             $sub_dir = $uploads['subdir'];
1572 1572
 
1573
-            $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'] : '';
1573
+            $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'] : '';
1574 1574
 
1575 1575
             for ($m = 0; $m < count($post_image); $m++) {
1576 1576
 
1577 1577
                 /* --------- start ------- */
1578 1578
 
1579
-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
1579
+                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM ".$table." WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
1580 1580
 
1581 1581
 
1582 1582
                     $curr_img_url = $post_image[$m];
@@ -1602,24 +1602,24 @@  discard block
 block discarded – undo
1602 1602
                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
1603 1603
 
1604 1604
                     if (!function_exists('wp_handle_upload'))
1605
-                        require_once(ABSPATH . 'wp-admin/includes/file.php');
1605
+                        require_once(ABSPATH.'wp-admin/includes/file.php');
1606 1606
 
1607 1607
                     if (!is_dir($geodir_uploadpath))
1608 1608
                         mkdir($geodir_uploadpath);
1609 1609
 
1610
-                    $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];
1610
+                    $new_name = $post_id.'_'.$field_id.'_'.$img_name_arr[0].'.'.$img_name_arr[1];
1611 1611
                     $explode_sub_dir = explode("/", $sub_dir);
1612 1612
                     if ($curr_img_dir == end($explode_sub_dir)) {
1613
-                        $img_path = $geodir_uploadpath . '/' . $filename;
1614
-                        $img_url = $geodir_uploadurl . '/' . $filename;
1613
+                        $img_path = $geodir_uploadpath.'/'.$filename;
1614
+                        $img_url = $geodir_uploadurl.'/'.$filename;
1615 1615
                     } else {
1616
-                        $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1617
-                        $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;
1616
+                        $img_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename;
1617
+                        $img_url = $uploads['url'].'/temp_'.$current_user->data->ID.'/'.$filename;
1618 1618
                     }
1619 1619
 
1620 1620
                     $uploaded_file = '';
1621 1621
                     if (file_exists($img_path))
1622
-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1622
+                        $uploaded_file = copy($img_path, $geodir_uploadpath.'/'.$new_name);
1623 1623
 
1624 1624
                     if ($curr_img_dir != $geodir_uploaddir) {
1625 1625
                         if (file_exists($img_path))
@@ -1627,7 +1627,7 @@  discard block
 block discarded – undo
1627 1627
                     }
1628 1628
 
1629 1629
                     if (!empty($uploaded_file))
1630
-                        $file_urls = $geodir_uploadurl . '/' . $new_name;
1630
+                        $file_urls = $geodir_uploadurl.'/'.$new_name;
1631 1631
 
1632 1632
                 } else {
1633 1633
                     $file_urls = $post_image[$m];
@@ -1641,8 +1641,8 @@  discard block
 block discarded – undo
1641 1641
         if (!empty($postcurr_images)) {
1642 1642
 
1643 1643
             if ($file_urls != $postcurr_images) {
1644
-                $invalid_files[] = (object)array('src' => $postcurr_images);
1645
-                $invalid_files = (object)$invalid_files;
1644
+                $invalid_files[] = (object) array('src' => $postcurr_images);
1645
+                $invalid_files = (object) $invalid_files;
1646 1646
             }
1647 1647
         }
1648 1648
 
@@ -1694,9 +1694,9 @@  discard block
 block discarded – undo
1694 1694
     function geodir_upload_dir($upload)
1695 1695
     {
1696 1696
         global $current_user;
1697
-        $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;
1698
-        $upload['path'] = $upload['basedir'] . $upload['subdir'];
1699
-        $upload['url'] = $upload['baseurl'] . $upload['subdir'];
1697
+        $upload['subdir'] = $upload['subdir'].'/temp_'.$current_user->data->ID;
1698
+        $upload['path'] = $upload['basedir'].$upload['subdir'];
1699
+        $upload['url'] = $upload['baseurl'].$upload['subdir'];
1700 1700
         return $upload;
1701 1701
     }
1702 1702
 
@@ -1711,20 +1711,20 @@  discard block
 block discarded – undo
1711 1711
         // check ajax noonce
1712 1712
         $imgid = $_POST["imgid"];
1713 1713
 
1714
-        check_ajax_referer($imgid . 'pluploadan');
1714
+        check_ajax_referer($imgid.'pluploadan');
1715 1715
 
1716 1716
         // handle custom file uploaddir
1717 1717
         add_filter('upload_dir', 'geodir_upload_dir');
1718 1718
 
1719 1719
         // change file orinetation if needed
1720
-        $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);
1720
+        $fixed_file = geodir_exif($_FILES[$imgid.'async-upload']);
1721 1721
 
1722 1722
         // handle file upload
1723 1723
         $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));
1724 1724
         // remove handle custom file uploaddir
1725 1725
         remove_filter('upload_dir', 'geodir_upload_dir');
1726 1726
 
1727
-        if(!isset($status['url']) && isset($status['error'])){
1727
+        if (!isset($status['url']) && isset($status['error'])) {
1728 1728
             print_r($status);
1729 1729
         }
1730 1730
 
@@ -1754,9 +1754,9 @@  discard block
 block discarded – undo
1754 1754
 
1755 1755
     $post_type = get_post_type($post_id);
1756 1756
 
1757
-    $table = $plugin_prefix . $post_type . '_detail';
1757
+    $table = $plugin_prefix.$post_type.'_detail';
1758 1758
 
1759
-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));
1759
+    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM ".$table." WHERE post_id=%d", array($post_id)));
1760 1760
 
1761 1761
     if ($results) {
1762 1762
         return $results[0]->geodir_video;
@@ -1780,9 +1780,9 @@  discard block
 block discarded – undo
1780 1780
 
1781 1781
     $post_type = get_post_type($post_id);
1782 1782
 
1783
-    $table = $plugin_prefix . $post_type . '_detail';
1783
+    $table = $plugin_prefix.$post_type.'_detail';
1784 1784
 
1785
-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));
1785
+    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM ".$table." WHERE post_id=%d", array($post_id)));
1786 1786
 
1787 1787
     if ($results) {
1788 1788
         return $results[0]->geodir_special_offers;
@@ -1800,12 +1800,12 @@  discard block
 block discarded – undo
1800 1800
      */
1801 1801
     function geodir_max_upload_size()
1802 1802
     {
1803
-        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);
1803
+        $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);
1804 1804
 
1805 1805
         if ($max_filesize > 0 && $max_filesize < 1) {
1806
-            $max_filesize = (int)($max_filesize * 1024) . 'kb';
1806
+            $max_filesize = (int) ($max_filesize * 1024).'kb';
1807 1807
         } else {
1808
-            $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';
1808
+            $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb';
1809 1809
         }
1810 1810
         /** Filter documented in geodirectory-functions/general_functions.php **/
1811 1811
         return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
@@ -1837,7 +1837,7 @@  discard block
 block discarded – undo
1837 1837
 
1838 1838
             $custom_fields = $wpdb->get_results(
1839 1839
                 $wpdb->prepare(
1840
-                    "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",
1840
+                    "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from ".GEODIR_CUSTOM_FIELDS_TABLE." where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",
1841 1841
                     array($post_type)
1842 1842
                 ), 'ARRAY_A'
1843 1843
             );
@@ -1964,7 +1964,7 @@  discard block
 block discarded – undo
1964 1964
 
1965 1965
             $post_meta_info = $wpdb->query(
1966 1966
                 $wpdb->prepare(
1967
-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
1967
+                    "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 
1968 1968
 															sort_order=%d 
1969 1969
 															where id= %d",
1970 1970
                     array($count, $cf)
@@ -2046,14 +2046,14 @@  discard block
 block discarded – undo
2046 2046
 
2047 2047
         $check_html_variable = $wpdb->get_var(
2048 2048
             $wpdb->prepare(
2049
-                "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ",
2049
+                "select htmlvar_name from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s and field_type=%s ",
2050 2050
                 array($cehhtmlvar_name, $post_type, $field_type)
2051 2051
             )
2052 2052
         );
2053 2053
 
2054 2054
         if ($is_default == 1) {
2055 2055
 
2056
-            $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));
2056
+            $wpdb->query($wpdb->prepare("update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set is_default='0', default_order='' where post_type = %s", array($post_type)));
2057 2057
 
2058 2058
         }
2059 2059
 
@@ -2064,7 +2064,7 @@  discard block
 block discarded – undo
2064 2064
 
2065 2065
                 $wpdb->prepare(
2066 2066
 
2067
-                    "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
2067
+                    "insert into ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 
2068 2068
 				post_type = %s,
2069 2069
 				data_type = %s,
2070 2070
 				field_type = %s,
@@ -2095,7 +2095,7 @@  discard block
 block discarded – undo
2095 2095
 
2096 2096
                 $wpdb->prepare(
2097 2097
 
2098
-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
2098
+                    "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 
2099 2099
 				post_type = %s,
2100 2100
 				data_type = %s,
2101 2101
 				field_type = %s,
@@ -2121,7 +2121,7 @@  discard block
 block discarded – undo
2121 2121
         }
2122 2122
 
2123 2123
 
2124
-        return (int)$lastid;
2124
+        return (int) $lastid;
2125 2125
 
2126 2126
     }
2127 2127
 }
@@ -2144,7 +2144,7 @@  discard block
 block discarded – undo
2144 2144
         if ($field_id != '') {
2145 2145
             $cf = trim($field_id, '_');
2146 2146
 
2147
-            $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));
2147
+            $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where id= %d ", array($cf)));
2148 2148
 
2149 2149
             return $field_id;
2150 2150
 
@@ -2167,12 +2167,12 @@  discard block
 block discarded – undo
2167 2167
      * @param string $field_ins_upd When set to "submit" displays form.
2168 2168
      * @param bool $default when set to true field will be for admin use only.
2169 2169
      */
2170
-    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')
2170
+    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key = '')
2171 2171
     {
2172 2172
         global $wpdb;
2173 2173
         $cf = $result_str;
2174 2174
         if (!is_object($cf)) {
2175
-            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));
2175
+            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE id = %d", array($cf)));
2176 2176
         } else {
2177 2177
             $field_info = $cf;
2178 2178
             $result_str = $cf->id;
@@ -2208,18 +2208,18 @@  discard block
 block discarded – undo
2208 2208
         if ($htmlvar_name == '')
2209 2209
             $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
2210 2210
 
2211
-        $nonce = wp_create_nonce('custom_fields_' . $result_str);
2211
+        $nonce = wp_create_nonce('custom_fields_'.$result_str);
2212 2212
 
2213 2213
         $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';
2214 2214
         $cso_arr = geodir_get_custom_sort_options($post_type);
2215 2215
 
2216 2216
         $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']);
2217
-        foreach($cso_arr as $cso){
2218
-            if($cur_field_type==$cso['field_type']){
2217
+        foreach ($cso_arr as $cso) {
2218
+            if ($cur_field_type == $cso['field_type']) {
2219 2219
 
2220 2220
                 if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
2221 2221
                     $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';
2222
-                }elseif(isset($cso['field_icon']) && $cso['field_icon']){
2222
+                }elseif (isset($cso['field_icon']) && $cso['field_icon']) {
2223 2223
                     $field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';
2224 2224
                 }
2225 2225
 
@@ -2229,40 +2229,40 @@  discard block
 block discarded – undo
2229 2229
         $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500);
2230 2230
         ?>
2231 2231
 
2232
-        <li class="text" id="licontainer_<?php echo $result_str;?>">
2232
+        <li class="text" id="licontainer_<?php echo $result_str; ?>">
2233 2233
             <form><!-- we need to wrap in a fom so we can use radio buttons with same name -->
2234
-            <div class="title title<?php echo $result_str;?> gt-fieldset"
2235
-                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory');?>"
2236
-                 ondblclick="show_hide('field_frm<?php echo $result_str;?>')">
2234
+            <div class="title title<?php echo $result_str; ?> gt-fieldset"
2235
+                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory'); ?>"
2236
+                 ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">
2237 2237
                 <?php
2238 2238
 
2239 2239
                 ?>
2240 2240
 
2241
-                <div title="<?php _e('Click to remove field', 'geodirectory');?>"
2242
-                     onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"
2241
+                <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"
2242
+                     onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"
2243 2243
                      class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div>
2244 2244
 
2245 2245
 
2246
-                <?php echo $field_icon;?>
2246
+                <?php echo $field_icon; ?>
2247 2247
                 <b style="cursor:pointer;"
2248
-                   onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' (' . $site_title . ')');?></b>
2248
+                   onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory').' ('.$site_title.')'); ?></b>
2249 2249
 
2250 2250
             </div>
2251 2251
 
2252
-            <div id="field_frm<?php echo $result_str;?>" class="field_frm"
2252
+            <div id="field_frm<?php echo $result_str; ?>" class="field_frm"
2253 2253
                  style="display:<?php if ($field_ins_upd == 'submit') {
2254 2254
                      echo 'block;';
2255 2255
                  } else {
2256 2256
                      echo 'none;';
2257 2257
                  } ?>">
2258 2258
                 <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/>
2259
-                <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/>
2260
-                <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/>
2261
-                <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/>
2259
+                <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type; ?>"/>
2260
+                <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type; ?>"/>
2261
+                <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str; ?>"/>
2262 2262
                 <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {
2263 2263
                     echo $field_info->data_type;
2264 2264
                 }?>"/>
2265
-                <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/>
2265
+                <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name; ?>"/>
2266 2266
 
2267 2267
 
2268 2268
                 <ul class="widefat post fixed" border="0" style="width:100%;">
@@ -2272,7 +2272,7 @@  discard block
 block discarded – undo
2272 2272
                         <input type="hidden" name="site_title" id="site_title" value="<?php echo esc_attr($site_title); ?>"/>
2273 2273
 
2274 2274
                         <li>
2275
-                            <?php $value = (isset($field_info->sort_asc) && $field_info->sort_asc) ? $field_info->sort_asc : 0;?>
2275
+                            <?php $value = (isset($field_info->sort_asc) && $field_info->sort_asc) ? $field_info->sort_asc : 0; ?>
2276 2276
 
2277 2277
                             <label for="asc" class="gd-cf-tooltip-wrap">
2278 2278
                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show Ascending Sort (low to high)', 'geodirectory'); ?>
@@ -2282,24 +2282,24 @@  discard block
 block discarded – undo
2282 2282
                             </label>
2283 2283
                             <div class="gd-cf-input-wrap gd-switch">
2284 2284
 
2285
-                                <input type="radio" id="asc_yes<?php echo $radio_id;?>" name="asc" class="gdri-enabled"  value="1"
2285
+                                <input type="radio" id="asc_yes<?php echo $radio_id; ?>" name="asc" class="gdri-enabled"  value="1"
2286 2286
                                     <?php if ($value == '1') {
2287 2287
                                         echo 'checked';
2288 2288
                                     } ?>/>
2289
-                                <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2289
+                                <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2290 2290
 
2291
-                                <input type="radio" id="asc_no<?php echo $radio_id;?>" name="asc" class="gdri-disabled" value="0"
2291
+                                <input type="radio" id="asc_no<?php echo $radio_id; ?>" name="asc" class="gdri-disabled" value="0"
2292 2292
                                     <?php if ($value == '0' || !$value) {
2293 2293
                                         echo 'checked';
2294 2294
                                     } ?>/>
2295
-                                <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2295
+                                <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2296 2296
 
2297 2297
                             </div>
2298 2298
 
2299 2299
                         </li>
2300 2300
 
2301
-                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'";}?>>
2302
-                            <?php $value = (isset($field_info->asc_title) && $field_info->asc_title) ? esc_attr($field_info->asc_title) : '';?>
2301
+                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'"; }?>>
2302
+                            <?php $value = (isset($field_info->asc_title) && $field_info->asc_title) ? esc_attr($field_info->asc_title) : ''; ?>
2303 2303
 
2304 2304
                             <label for="asc_title" class="gd-cf-tooltip-wrap">
2305 2305
                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Ascending title', 'geodirectory'); ?>
@@ -2309,14 +2309,14 @@  discard block
 block discarded – undo
2309 2309
                             </label>
2310 2310
                             <div class="gd-cf-input-wrap">
2311 2311
 
2312
-                                <input type="text" name="asc_title" id="asc_title" value="<?php echo $value;?>" />
2312
+                                <input type="text" name="asc_title" id="asc_title" value="<?php echo $value; ?>" />
2313 2313
                             </div>
2314 2314
 
2315 2315
 
2316 2316
                         </li>
2317 2317
 
2318 2318
 
2319
-                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'";}?>>
2319
+                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'"; }?>>
2320 2320
 
2321 2321
                             <label for="is_default" class="gd-cf-tooltip-wrap">
2322 2322
                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>
@@ -2327,7 +2327,7 @@  discard block
 block discarded – undo
2327 2327
                             <div class="gd-cf-input-wrap">
2328 2328
 
2329 2329
                                 <input type="radio" name="is_default"
2330
-                                       value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {
2330
+                                       value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_asc') {
2331 2331
                                     echo 'checked="checked"';
2332 2332
                                 } ?>/>
2333 2333
                             </div>
@@ -2337,7 +2337,7 @@  discard block
 block discarded – undo
2337 2337
 
2338 2338
 
2339 2339
                         <li>
2340
-                            <?php $value = (isset($field_info->sort_desc) && $field_info->sort_desc) ? $field_info->sort_desc : 0;?>
2340
+                            <?php $value = (isset($field_info->sort_desc) && $field_info->sort_desc) ? $field_info->sort_desc : 0; ?>
2341 2341
 
2342 2342
                             <label for="desc" class="gd-cf-tooltip-wrap">
2343 2343
                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show Descending Sort (high to low)', 'geodirectory'); ?>
@@ -2347,24 +2347,24 @@  discard block
 block discarded – undo
2347 2347
                             </label>
2348 2348
                             <div class="gd-cf-input-wrap gd-switch">
2349 2349
 
2350
-                                <input type="radio" id="desc_yes<?php echo $radio_id;?>" name="desc" class="gdri-enabled"  value="1"
2350
+                                <input type="radio" id="desc_yes<?php echo $radio_id; ?>" name="desc" class="gdri-enabled"  value="1"
2351 2351
                                     <?php if ($value == '1') {
2352 2352
                                         echo 'checked';
2353 2353
                                     } ?>/>
2354
-                                <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2354
+                                <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2355 2355
 
2356
-                                <input type="radio" id="desc_no<?php echo $radio_id;?>" name="desc" class="gdri-disabled" value="0"
2356
+                                <input type="radio" id="desc_no<?php echo $radio_id; ?>" name="desc" class="gdri-disabled" value="0"
2357 2357
                                     <?php if ($value == '0' || !$value) {
2358 2358
                                         echo 'checked';
2359 2359
                                     } ?>/>
2360
-                                <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2360
+                                <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2361 2361
 
2362 2362
                             </div>
2363 2363
 
2364 2364
                         </li>
2365 2365
 
2366
-                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'";}?>>
2367
-                            <?php $value = (isset($field_info->desc_title) && $field_info->desc_title) ? esc_attr($field_info->desc_title) : '';?>
2366
+                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'"; }?>>
2367
+                            <?php $value = (isset($field_info->desc_title) && $field_info->desc_title) ? esc_attr($field_info->desc_title) : ''; ?>
2368 2368
 
2369 2369
                             <label for="desc_title" class="gd-cf-tooltip-wrap">
2370 2370
                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Descending title', 'geodirectory'); ?>
@@ -2374,13 +2374,13 @@  discard block
 block discarded – undo
2374 2374
                             </label>
2375 2375
                             <div class="gd-cf-input-wrap">
2376 2376
 
2377
-                                <input type="text" name="desc_title" id="desc_title" value="<?php echo $value;?>" />
2377
+                                <input type="text" name="desc_title" id="desc_title" value="<?php echo $value; ?>" />
2378 2378
                             </div>
2379 2379
 
2380 2380
 
2381 2381
                         </li>
2382 2382
 
2383
-                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'";}?>>
2383
+                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'"; }?>>
2384 2384
 
2385 2385
                             <label for="is_default" class="gd-cf-tooltip-wrap">
2386 2386
                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>
@@ -2391,7 +2391,7 @@  discard block
 block discarded – undo
2391 2391
                             <div class="gd-cf-input-wrap">
2392 2392
 
2393 2393
                                 <input type="radio" name="is_default"
2394
-                                       value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {
2394
+                                       value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_desc') {
2395 2395
                                     echo 'checked="checked"';
2396 2396
                                 } ?>/>
2397 2397
                             </div>
@@ -2416,14 +2416,14 @@  discard block
 block discarded – undo
2416 2416
                             </label>
2417 2417
                             <div class="gd-cf-input-wrap">
2418 2418
 
2419
-                                <input type="text" name="site_title" id="site_title" value="<?php echo $value;?>" />
2419
+                                <input type="text" name="site_title" id="site_title" value="<?php echo $value; ?>" />
2420 2420
                             </div>
2421 2421
 
2422 2422
 
2423 2423
                         </li>
2424 2424
 
2425 2425
                         <li>
2426
-                            <?php $value = (isset($field_info->is_default) && $field_info->is_default) ? esc_attr($field_info->is_default) : '';?>
2426
+                            <?php $value = (isset($field_info->is_default) && $field_info->is_default) ? esc_attr($field_info->is_default) : ''; ?>
2427 2427
 
2428 2428
                             <label for="is_default" class="gd-cf-tooltip-wrap">
2429 2429
                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>
@@ -2447,7 +2447,7 @@  discard block
 block discarded – undo
2447 2447
 
2448 2448
 
2449 2449
                     <li>
2450
-                        <?php $value = (isset($field_info->is_active) && $field_info->is_active) ? $field_info->is_active: 0;?>
2450
+                        <?php $value = (isset($field_info->is_active) && $field_info->is_active) ? $field_info->is_active : 0; ?>
2451 2451
 
2452 2452
                         <label for="is_active" class="gd-cf-tooltip-wrap">
2453 2453
                             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is active', 'geodirectory'); ?>
@@ -2457,17 +2457,17 @@  discard block
 block discarded – undo
2457 2457
                         </label>
2458 2458
                         <div class="gd-cf-input-wrap gd-switch">
2459 2459
 
2460
-                            <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"
2460
+                            <input type="radio" id="is_active_yes<?php echo $radio_id; ?>" name="is_active" class="gdri-enabled"  value="1"
2461 2461
                                 <?php if ($value == '1') {
2462 2462
                                     echo 'checked';
2463 2463
                                 } ?>/>
2464
-                            <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2464
+                            <label for="is_active_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2465 2465
 
2466
-                            <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"
2466
+                            <input type="radio" id="is_active_no<?php echo $radio_id; ?>" name="is_active" class="gdri-disabled" value="0"
2467 2467
                                 <?php if ($value == '0' || !$value) {
2468 2468
                                     echo 'checked';
2469 2469
                                 } ?>/>
2470
-                            <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2470
+                            <label for="is_active_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2471 2471
 
2472 2472
                         </div>
2473 2473
 
@@ -2488,10 +2488,10 @@  discard block
 block discarded – undo
2488 2488
                             <h3></h3>
2489 2489
                         </label>
2490 2490
                         <div class="gd-cf-input-wrap">
2491
-                            <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save','geodirectory'));?>"
2491
+                            <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save', 'geodirectory')); ?>"
2492 2492
                                    onclick="save_sort_field('<?php echo esc_attr($result_str); ?>')"/>
2493
-                                <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete','geodirectory'));?>"
2494
-                                                                    onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"
2493
+                                <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete', 'geodirectory')); ?>"
2494
+                                                                    onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"
2495 2495
                                                                     class="button"/></a>
2496 2496
                         </div>
2497 2497
                     </li>
@@ -2526,7 +2526,7 @@  discard block
 block discarded – undo
2526 2526
         if (!$package_id || !$field_name || !$post_type) {
2527 2527
             return true;
2528 2528
         }
2529
-        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));
2529
+        $sql = $wpdb->prepare("SELECT id FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int) $package_id));
2530 2530
 
2531 2531
         if ($wpdb->get_var($sql)) {
2532 2532
             return true;
@@ -2648,13 +2648,13 @@  discard block
 block discarded – undo
2648 2648
 }
2649 2649
 
2650 2650
 
2651
-function geodir_cfa_data_type_text($output,$result_str,$cf,$field_info){
2651
+function geodir_cfa_data_type_text($output, $result_str, $cf, $field_info) {
2652 2652
     ob_start();
2653 2653
 
2654 2654
     $dt_value = '';
2655 2655
     if (isset($field_info->data_type)) {
2656 2656
         $dt_value  = esc_attr($field_info->data_type);
2657
-    }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
2657
+    }elseif (isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']) {
2658 2658
         $dt_value  = $cf['defaults']['data_type'];
2659 2659
     }
2660 2660
     ?>
@@ -2665,15 +2665,15 @@  discard block
 block discarded – undo
2665 2665
             <select name="data_type" id="data_type"
2666 2666
                     onchange="javascript:gd_data_type_changed(this, '<?php echo $result_str; ?>');">
2667 2667
                 <option
2668
-                    value="XVARCHAR" <?php if ($dt_value  == 'VARCHAR') {
2668
+                    value="XVARCHAR" <?php if ($dt_value == 'VARCHAR') {
2669 2669
                     echo 'selected="selected"';
2670 2670
                 } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>
2671 2671
                 <option
2672
-                    value="INT" <?php if ($dt_value   == 'INT') {
2672
+                    value="INT" <?php if ($dt_value == 'INT') {
2673 2673
                     echo 'selected="selected"';
2674 2674
                 } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>
2675 2675
                 <option
2676
-                    value="FLOAT" <?php if ($dt_value   == 'FLOAT') {
2676
+                    value="FLOAT" <?php if ($dt_value == 'FLOAT') {
2677 2677
                     echo 'selected="selected"';
2678 2678
                 } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>
2679 2679
             </select>
@@ -2686,13 +2686,13 @@  discard block
 block discarded – undo
2686 2686
     $value = '';
2687 2687
     if (isset($field_info->decimal_point)) {
2688 2688
         $value = esc_attr($field_info->decimal_point);
2689
-    }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
2689
+    }elseif (isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']) {
2690 2690
         $value = $cf['defaults']['decimal_point'];
2691 2691
     }
2692 2692
     ?>
2693 2693
 
2694 2694
     <li class="decimal-point-wrapper"
2695
-        style="<?php echo ($dt_value  == 'FLOAT') ? '' : 'display:none' ?>">
2695
+        style="<?php echo ($dt_value == 'FLOAT') ? '' : 'display:none' ?>">
2696 2696
         <label for="decimal_point"><?php _e('Select decimal point :', 'geodirectory'); ?></label>
2697 2697
         <div class="gd-cf-input-wrap">
2698 2698
             <select name="decimal_point" id="decimal_point">
@@ -2710,43 +2710,43 @@  discard block
 block discarded – undo
2710 2710
     $output = ob_get_clean();
2711 2711
     return $output;
2712 2712
 }
2713
-add_filter('geodir_cfa_data_type_text','geodir_cfa_data_type_text',10,4);
2713
+add_filter('geodir_cfa_data_type_text', 'geodir_cfa_data_type_text', 10, 4);
2714 2714
 
2715 2715
 // htmlvar not needed for fieldset and taxonomy
2716
-add_filter('geodir_cfa_htmlvar_name_fieldset','__return_empty_string',10,4);
2717
-add_filter('geodir_cfa_htmlvar_name_taxonomy','__return_empty_string',10,4);
2716
+add_filter('geodir_cfa_htmlvar_name_fieldset', '__return_empty_string', 10, 4);
2717
+add_filter('geodir_cfa_htmlvar_name_taxonomy', '__return_empty_string', 10, 4);
2718 2718
 
2719 2719
 
2720 2720
 // default_value not needed for textarea, html, file, fieldset, taxonomy, address
2721
-add_filter('geodir_cfa_default_value_textarea','__return_empty_string',10,4);
2722
-add_filter('geodir_cfa_default_value_html','__return_empty_string',10,4);
2723
-add_filter('geodir_cfa_default_value_file','__return_empty_string',10,4);
2724
-add_filter('geodir_cfa_default_value_taxonomy','__return_empty_string',10,4);
2725
-add_filter('geodir_cfa_default_value_address','__return_empty_string',10,4);
2726
-add_filter('geodir_cfa_default_value_fieldset','__return_empty_string',10,4);
2721
+add_filter('geodir_cfa_default_value_textarea', '__return_empty_string', 10, 4);
2722
+add_filter('geodir_cfa_default_value_html', '__return_empty_string', 10, 4);
2723
+add_filter('geodir_cfa_default_value_file', '__return_empty_string', 10, 4);
2724
+add_filter('geodir_cfa_default_value_taxonomy', '__return_empty_string', 10, 4);
2725
+add_filter('geodir_cfa_default_value_address', '__return_empty_string', 10, 4);
2726
+add_filter('geodir_cfa_default_value_fieldset', '__return_empty_string', 10, 4);
2727 2727
 
2728 2728
 // is_required not needed for fieldset
2729
-add_filter('geodir_cfa_is_required_fieldset','__return_empty_string',10,4);
2730
-add_filter('geodir_cfa_required_msg_fieldset','__return_empty_string',10,4);
2729
+add_filter('geodir_cfa_is_required_fieldset', '__return_empty_string', 10, 4);
2730
+add_filter('geodir_cfa_required_msg_fieldset', '__return_empty_string', 10, 4);
2731 2731
 
2732 2732
 // field_icon not needed for fieldset
2733
-add_filter('geodir_cfa_field_icon_fieldset','__return_empty_string',10,4);
2734
-add_filter('geodir_cfa_css_class_fieldset','__return_empty_string',10,4);
2733
+add_filter('geodir_cfa_field_icon_fieldset', '__return_empty_string', 10, 4);
2734
+add_filter('geodir_cfa_css_class_fieldset', '__return_empty_string', 10, 4);
2735 2735
 
2736 2736
 // cat_sort not needed for some fields
2737
-add_filter('geodir_cfa_cat_sort_html','__return_empty_string',10,4);
2738
-add_filter('geodir_cfa_cat_sort_file','__return_empty_string',10,4);
2739
-add_filter('geodir_cfa_cat_sort_url','__return_empty_string',10,4);
2740
-add_filter('geodir_cfa_cat_sort_fieldset','__return_empty_string',10,4);
2741
-add_filter('geodir_cfa_cat_sort_multiselect','__return_empty_string',10,4);
2742
-add_filter('geodir_cfa_cat_sort_textarea','__return_empty_string',10,4);
2743
-add_filter('geodir_cfa_cat_sort_taxonomy','__return_empty_string',10,4);
2744
-add_filter('geodir_cfa_cat_sort_address','__return_empty_string',10,4);
2737
+add_filter('geodir_cfa_cat_sort_html', '__return_empty_string', 10, 4);
2738
+add_filter('geodir_cfa_cat_sort_file', '__return_empty_string', 10, 4);
2739
+add_filter('geodir_cfa_cat_sort_url', '__return_empty_string', 10, 4);
2740
+add_filter('geodir_cfa_cat_sort_fieldset', '__return_empty_string', 10, 4);
2741
+add_filter('geodir_cfa_cat_sort_multiselect', '__return_empty_string', 10, 4);
2742
+add_filter('geodir_cfa_cat_sort_textarea', '__return_empty_string', 10, 4);
2743
+add_filter('geodir_cfa_cat_sort_taxonomy', '__return_empty_string', 10, 4);
2744
+add_filter('geodir_cfa_cat_sort_address', '__return_empty_string', 10, 4);
2745 2745
 
2746 2746
 
2747 2747
 
2748
-function geodir_cfa_advanced_editor_geodir_special_offers($output,$result_str,$cf,$field_info){
2749
-    if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}
2748
+function geodir_cfa_advanced_editor_geodir_special_offers($output, $result_str, $cf, $field_info) {
2749
+    if ($field_info->htmlvar_name != 'geodir_special_offers') {return ''; }
2750 2750
     ob_start();
2751 2751
     ?>
2752 2752
     <li>
@@ -2777,16 +2777,16 @@  discard block
 block discarded – undo
2777 2777
     $output = ob_get_clean();
2778 2778
     return $output;
2779 2779
 }
2780
-add_filter('geodir_cfa_advanced_editor_textarea','geodir_cfa_advanced_editor_geodir_special_offers',10,4);
2780
+add_filter('geodir_cfa_advanced_editor_textarea', 'geodir_cfa_advanced_editor_geodir_special_offers', 10, 4);
2781 2781
 
2782 2782
 
2783
-function geodir_cfa_validation_pattern_text($output,$result_str,$cf,$field_info){
2783
+function geodir_cfa_validation_pattern_text($output, $result_str, $cf, $field_info) {
2784 2784
     ob_start();
2785 2785
 
2786 2786
     $value = '';
2787 2787
     if (isset($field_info->validation_pattern)) {
2788 2788
         $value = esc_attr($field_info->validation_pattern);
2789
-    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
2789
+    }elseif (isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']) {
2790 2790
         $value = esc_attr($cf['defaults']['validation_pattern']);
2791 2791
     }
2792 2792
     ?>
@@ -2806,7 +2806,7 @@  discard block
 block discarded – undo
2806 2806
     $value = '';
2807 2807
     if (isset($field_info->validation_msg)) {
2808 2808
         $value = esc_attr($field_info->validation_msg);
2809
-    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
2809
+    }elseif (isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']) {
2810 2810
         $value = esc_attr($cf['defaults']['validation_msg']);
2811 2811
     }
2812 2812
     ?>
@@ -2827,10 +2827,10 @@  discard block
 block discarded – undo
2827 2827
     $output = ob_get_clean();
2828 2828
     return $output;
2829 2829
 }
2830
-add_filter('geodir_cfa_validation_pattern_text','geodir_cfa_validation_pattern_text',10,4);
2830
+add_filter('geodir_cfa_validation_pattern_text', 'geodir_cfa_validation_pattern_text', 10, 4);
2831 2831
 
2832 2832
 
2833
-function geodir_cfa_htmlvar_name_taxonomy($output,$result_str,$cf,$field_info){
2833
+function geodir_cfa_htmlvar_name_taxonomy($output, $result_str, $cf, $field_info) {
2834 2834
     ob_start();
2835 2835
     global $post_type;
2836 2836
 
@@ -2855,7 +2855,7 @@  discard block
 block discarded – undo
2855 2855
                     ?>
2856 2856
                     <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {
2857 2857
                         echo 'selected="selected"';
2858
-                    }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php
2858
+                    }?> id="<?php echo $gd_tax; ?>"><?php echo $gd_tax; ?></option><?php
2859 2859
                 }
2860 2860
                 ?>
2861 2861
             </select>
@@ -2866,7 +2866,7 @@  discard block
 block discarded – undo
2866 2866
         <label for="cat_display_type" class="gd-cf-tooltip-wrap">
2867 2867
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Category display type :', 'geodirectory'); ?>
2868 2868
             <div class="gdcf-tooltip">
2869
-                <?php _e('Show categories list as select, multiselect, checkbox or radio', 'geodirectory');?>
2869
+                <?php _e('Show categories list as select, multiselect, checkbox or radio', 'geodirectory'); ?>
2870 2870
             </div>
2871 2871
         </label>
2872 2872
         <div class="gd-cf-input-wrap">
@@ -2874,19 +2874,19 @@  discard block
 block discarded – undo
2874 2874
             <select name="cat_display_type" id="cat_display_type">
2875 2875
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {
2876 2876
                     echo 'selected="selected"';
2877
-                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
2877
+                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory'); ?></option>
2878 2878
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
2879 2879
                     echo 'selected="selected"';
2880
-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>
2880
+                }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>
2881 2881
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {
2882 2882
                     echo 'selected="selected"';
2883
-                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
2883
+                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory'); ?></option>
2884 2884
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
2885 2885
                     echo 'selected="selected"';
2886
-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
2886
+                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>
2887 2887
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
2888 2888
                     echo 'selected="selected"';
2889
-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
2889
+                }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>
2890 2890
             </select>
2891 2891
         </div>
2892 2892
     </li>
@@ -2895,10 +2895,10 @@  discard block
 block discarded – undo
2895 2895
     $output = ob_get_clean();
2896 2896
     return $output;
2897 2897
 }
2898
-add_filter('geodir_cfa_htmlvar_name_taxonomy','geodir_cfa_htmlvar_name_taxonomy',10,4);
2898
+add_filter('geodir_cfa_htmlvar_name_taxonomy', 'geodir_cfa_htmlvar_name_taxonomy', 10, 4);
2899 2899
 
2900 2900
 
2901
-function geodir_cfa_extra_fields_address($output,$result_str,$cf,$field_info){
2901
+function geodir_cfa_extra_fields_address($output, $result_str, $cf, $field_info) {
2902 2902
 
2903 2903
     ob_start();
2904 2904
     if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
@@ -2921,32 +2921,32 @@  discard block
 block discarded – undo
2921 2921
         <label for="show_zip" class="gd-cf-tooltip-wrap">
2922 2922
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display zip/post code :', 'geodirectory'); ?>
2923 2923
             <div class="gdcf-tooltip">
2924
-                <?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory');?>
2924
+                <?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory'); ?>
2925 2925
             </div>
2926 2926
         </label>
2927 2927
         <div class="gd-cf-input-wrap gd-switch">
2928 2928
 
2929
-            <input type="radio" id="show_zip_yes<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-enabled"  value="1"
2929
+            <input type="radio" id="show_zip_yes<?php echo $radio_id; ?>" name="extra[show_zip]" class="gdri-enabled"  value="1"
2930 2930
                 <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {
2931 2931
                     echo 'checked';
2932 2932
                 } ?>/>
2933
-            <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2933
+            <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2934 2934
 
2935
-            <input type="radio" id="show_zip_no<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-disabled" value="0"
2935
+            <input type="radio" id="show_zip_no<?php echo $radio_id; ?>" name="extra[show_zip]" class="gdri-disabled" value="0"
2936 2936
                 <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {
2937 2937
                     echo 'checked';
2938 2938
                 } ?>/>
2939
-            <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2939
+            <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2940 2940
 
2941 2941
 
2942 2942
         </div>
2943 2943
     </li>
2944 2944
 
2945
-    <li class="cf-zip-lable"  <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {echo "style='display:none;'";}?> >
2945
+    <li class="cf-zip-lable"  <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {echo "style='display:none;'"; }?> >
2946 2946
         <label for="zip_lable" class="gd-cf-tooltip-wrap">
2947 2947
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Zip/Post code label :', 'geodirectory'); ?>
2948 2948
             <div class="gdcf-tooltip">
2949
-                <?php _e('Enter zip/post code field label in address section.', 'geodirectory');?>
2949
+                <?php _e('Enter zip/post code field label in address section.', 'geodirectory'); ?>
2950 2950
             </div>
2951 2951
         </label>
2952 2952
         <div class="gd-cf-input-wrap">
@@ -2964,7 +2964,7 @@  discard block
 block discarded – undo
2964 2964
         <label for="map_lable" class="gd-cf-tooltip-wrap">
2965 2965
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Map button label :', 'geodirectory'); ?>
2966 2966
             <div class="gdcf-tooltip">
2967
-                <?php _e('Enter text for `set address on map` button in address section.', 'geodirectory');?>
2967
+                <?php _e('Enter text for `set address on map` button in address section.', 'geodirectory'); ?>
2968 2968
             </div>
2969 2969
         </label>
2970 2970
         <div class="gd-cf-input-wrap">
@@ -2979,22 +2979,22 @@  discard block
 block discarded – undo
2979 2979
         <label for="show_mapzoom" class="gd-cf-tooltip-wrap">
2980 2980
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Use user zoom level:', 'geodirectory'); ?>
2981 2981
             <div class="gdcf-tooltip">
2982
-                <?php _e('Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory');?>
2982
+                <?php _e('Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory'); ?>
2983 2983
             </div>
2984 2984
         </label>
2985 2985
         <div class="gd-cf-input-wrap gd-switch">
2986 2986
 
2987
-            <input type="radio" id="show_mapzoom_yes<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-enabled"  value="1"
2987
+            <input type="radio" id="show_mapzoom_yes<?php echo $radio_id; ?>" name="extra[show_mapzoom]" class="gdri-enabled"  value="1"
2988 2988
                 <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {
2989 2989
                     echo 'checked';
2990 2990
                 } ?>/>
2991
-            <label for="show_mapzoom_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2991
+            <label for="show_mapzoom_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2992 2992
 
2993
-            <input type="radio" id="show_mapzoom_no<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0"
2993
+            <input type="radio" id="show_mapzoom_no<?php echo $radio_id; ?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0"
2994 2994
                 <?php if ((isset($address['show_mapzoom']) && !$address['show_mapzoom']) || !isset($address['show_mapzoom'])) {
2995 2995
                     echo 'checked';
2996 2996
                 } ?>/>
2997
-            <label for="show_mapzoom_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2997
+            <label for="show_mapzoom_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2998 2998
 
2999 2999
         </div>
3000 3000
     </li>
@@ -3003,22 +3003,22 @@  discard block
 block discarded – undo
3003 3003
         <label for="show_mapview" class="gd-cf-tooltip-wrap">
3004 3004
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display map view:', 'geodirectory'); ?>
3005 3005
             <div class="gdcf-tooltip">
3006
-                <?php _e('Select if you want to `set default map` options in address section. ( Satellite Map, Hybrid Map, Terrain Map)', 'geodirectory');?>
3006
+                <?php _e('Select if you want to `set default map` options in address section. ( Satellite Map, Hybrid Map, Terrain Map)', 'geodirectory'); ?>
3007 3007
             </div>
3008 3008
         </label>
3009 3009
         <div class="gd-cf-input-wrap gd-switch">
3010 3010
 
3011
-            <input type="radio" id="show_mapview_yes<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-enabled"  value="1"
3011
+            <input type="radio" id="show_mapview_yes<?php echo $radio_id; ?>" name="extra[show_mapview]" class="gdri-enabled"  value="1"
3012 3012
                 <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {
3013 3013
                     echo 'checked';
3014 3014
                 } ?>/>
3015
-            <label for="show_mapview_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3015
+            <label for="show_mapview_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3016 3016
 
3017
-            <input type="radio" id="show_mapview_no<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-disabled" value="0"
3017
+            <input type="radio" id="show_mapview_no<?php echo $radio_id; ?>" name="extra[show_mapview]" class="gdri-disabled" value="0"
3018 3018
                 <?php if ((isset($address['show_mapview']) && !$address['show_mapview']) || !isset($address['show_mapview'])) {
3019 3019
                     echo 'checked';
3020 3020
                 } ?>/>
3021
-            <label for="show_mapview_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3021
+            <label for="show_mapview_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3022 3022
 
3023 3023
         </div>
3024 3024
     </li>
@@ -3028,7 +3028,7 @@  discard block
 block discarded – undo
3028 3028
         <label for="mapview_lable" class="gd-cf-tooltip-wrap">
3029 3029
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Map view label:', 'geodirectory'); ?>
3030 3030
             <div class="gdcf-tooltip">
3031
-                <?php _e('Enter mapview field label in address section.', 'geodirectory');?>
3031
+                <?php _e('Enter mapview field label in address section.', 'geodirectory'); ?>
3032 3032
             </div>
3033 3033
         </label>
3034 3034
         <div class="gd-cf-input-wrap">
@@ -3042,22 +3042,22 @@  discard block
 block discarded – undo
3042 3042
         <label for="show_latlng" class="gd-cf-tooltip-wrap">
3043 3043
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show latitude and longitude', 'geodirectory'); ?>
3044 3044
             <div class="gdcf-tooltip">
3045
-                <?php _e('This will show/hide the longitude fields in the address section add listing form.', 'geodirectory');?>
3045
+                <?php _e('This will show/hide the longitude fields in the address section add listing form.', 'geodirectory'); ?>
3046 3046
             </div>
3047 3047
         </label>
3048 3048
         <div class="gd-cf-input-wrap gd-switch">
3049 3049
 
3050
-            <input type="radio" id="show_latlng_yes<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-enabled"  value="1"
3050
+            <input type="radio" id="show_latlng_yes<?php echo $radio_id; ?>" name="extra[show_latlng]" class="gdri-enabled"  value="1"
3051 3051
                 <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {
3052 3052
                     echo 'checked';
3053 3053
                 } ?>/>
3054
-            <label for="show_latlng_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3054
+            <label for="show_latlng_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3055 3055
 
3056
-            <input type="radio" id="show_latlng_no<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-disabled" value="0"
3056
+            <input type="radio" id="show_latlng_no<?php echo $radio_id; ?>" name="extra[show_latlng]" class="gdri-disabled" value="0"
3057 3057
                 <?php if ((isset($address['show_latlng']) && !$address['show_latlng']) || !isset($address['show_latlng'])) {
3058 3058
                     echo 'checked';
3059 3059
                 } ?>/>
3060
-            <label for="show_latlng_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3060
+            <label for="show_latlng_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3061 3061
 
3062 3062
         </div>
3063 3063
     </li>
@@ -3066,17 +3066,17 @@  discard block
 block discarded – undo
3066 3066
     $html = ob_get_clean();
3067 3067
     return $output.$html;
3068 3068
 }
3069
-add_filter('geodir_cfa_extra_fields_address','geodir_cfa_extra_fields_address',10,4);
3069
+add_filter('geodir_cfa_extra_fields_address', 'geodir_cfa_extra_fields_address', 10, 4);
3070 3070
 
3071 3071
 
3072
-function geodir_cfa_extra_fields_multiselect($output,$result_str,$cf,$field_info){
3072
+function geodir_cfa_extra_fields_multiselect($output, $result_str, $cf, $field_info) {
3073 3073
     ob_start();
3074 3074
     ?>
3075 3075
     <li>
3076 3076
         <label for="multi_display_type" class="gd-cf-tooltip-wrap">
3077 3077
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Multiselect display type :', 'geodirectory'); ?>
3078 3078
             <div class="gdcf-tooltip">
3079
-                <?php _e('Show multiselect list as multiselect,checkbox or radio.', 'geodirectory');?>
3079
+                <?php _e('Show multiselect list as multiselect,checkbox or radio.', 'geodirectory'); ?>
3080 3080
             </div>
3081 3081
         </label>
3082 3082
         <div class="gd-cf-input-wrap">
@@ -3084,13 +3084,13 @@  discard block
 block discarded – undo
3084 3084
             <select name="multi_display_type" id="multi_display_type">
3085 3085
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
3086 3086
                     echo 'selected="selected"';
3087
-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>
3087
+                }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>
3088 3088
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
3089 3089
                     echo 'selected="selected"';
3090
-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
3090
+                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>
3091 3091
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
3092 3092
                     echo 'selected="selected"';
3093
-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
3093
+                }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>
3094 3094
             </select>
3095 3095
 
3096 3096
             <br/>
@@ -3101,17 +3101,17 @@  discard block
 block discarded – undo
3101 3101
     $html = ob_get_clean();
3102 3102
     return $output.$html;
3103 3103
 }
3104
-add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_multiselect',10,4);
3104
+add_filter('geodir_cfa_extra_fields_multiselect', 'geodir_cfa_extra_fields_multiselect', 10, 4);
3105 3105
 
3106 3106
 
3107
-function geodir_cfa_extra_fields_smr($output,$result_str,$cf,$field_info){
3107
+function geodir_cfa_extra_fields_smr($output, $result_str, $cf, $field_info) {
3108 3108
 
3109 3109
     ob_start();
3110 3110
 
3111 3111
     $value = '';
3112 3112
     if (isset($field_info->option_values)) {
3113 3113
         $value = esc_attr($field_info->option_values);
3114
-    }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
3114
+    }elseif (isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']) {
3115 3115
         $value = esc_attr($cf['defaults']['option_values']);
3116 3116
     }
3117 3117
 
@@ -3121,11 +3121,11 @@  discard block
 block discarded – undo
3121 3121
         <label for="option_values" class="gd-cf-tooltip-wrap">
3122 3122
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Option Values :', 'geodirectory'); ?>
3123 3123
             <div class="gdcf-tooltip">
3124
-                <span><?php _e('Option Values should be separated by comma.', 'geodirectory');?></span>
3124
+                <span><?php _e('Option Values should be separated by comma.', 'geodirectory'); ?></span>
3125 3125
                 <br/>
3126
-                <small><span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory');?></span>
3126
+                <small><span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory'); ?></span>
3127 3127
                     <br/>
3128
-                    <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory');?></span>
3128
+                    <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory'); ?></span>
3129 3129
                     <?php if ($field_type == 'multiselect' || $field_type == 'select') { ?>
3130 3130
                         <br/>
3131 3131
                         <span><?php _e('- If using OPTGROUP tag to grouping options, use "{optgroup}OPTGROUP-LABEL|OPTION-1,OPTION-2{/optgroup}"', 'geodirectory'); ?></span>
@@ -3136,7 +3136,7 @@  discard block
 block discarded – undo
3136 3136
         </label>
3137 3137
         <div class="gd-cf-input-wrap">
3138 3138
             <input type="text" name="option_values" id="option_values"
3139
-                   value="<?php echo $value;?>"/>
3139
+                   value="<?php echo $value; ?>"/>
3140 3140
             <br/>
3141 3141
 
3142 3142
         </div>
@@ -3146,12 +3146,12 @@  discard block
 block discarded – undo
3146 3146
     $html = ob_get_clean();
3147 3147
     return $output.$html;
3148 3148
 }
3149
-add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_smr',10,4);
3150
-add_filter('geodir_cfa_extra_fields_select','geodir_cfa_extra_fields_smr',10,4);
3151
-add_filter('geodir_cfa_extra_fields_radio','geodir_cfa_extra_fields_smr',10,4);
3149
+add_filter('geodir_cfa_extra_fields_multiselect', 'geodir_cfa_extra_fields_smr', 10, 4);
3150
+add_filter('geodir_cfa_extra_fields_select', 'geodir_cfa_extra_fields_smr', 10, 4);
3151
+add_filter('geodir_cfa_extra_fields_radio', 'geodir_cfa_extra_fields_smr', 10, 4);
3152 3152
 
3153 3153
 
3154
-function geodir_cfa_extra_fields_datepicker($output,$result_str,$cf,$field_info){
3154
+function geodir_cfa_extra_fields_datepicker($output, $result_str, $cf, $field_info) {
3155 3155
     ob_start();
3156 3156
     $extra = array();
3157 3157
     if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
@@ -3162,7 +3162,7 @@  discard block
 block discarded – undo
3162 3162
         <label for="date_format" class="gd-cf-tooltip-wrap">
3163 3163
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Date Format :', 'geodirectory'); ?>
3164 3164
             <div class="gdcf-tooltip">
3165
-                <?php _e('Select the date format.', 'geodirectory');?>
3165
+                <?php _e('Select the date format.', 'geodirectory'); ?>
3166 3166
             </div>
3167 3167
         </label>
3168 3168
         <div class="gd-cf-input-wrap" style="overflow:inherit;">
@@ -3182,16 +3182,16 @@  discard block
 block discarded – undo
3182 3182
              * @since 1.6.5
3183 3183
              * @param array $date_formats The PHP date format array.
3184 3184
              */
3185
-            $date_formats = apply_filters('geodir_date_formats',$date_formats);
3185
+            $date_formats = apply_filters('geodir_date_formats', $date_formats);
3186 3186
             ?>
3187 3187
             <select name="extra[date_format]" id="date_format">
3188 3188
                 <?php
3189
-                foreach($date_formats as $format){
3189
+                foreach ($date_formats as $format) {
3190 3190
                     $selected = '';
3191
-                    if(!empty($extra) && esc_attr($extra['date_format'])==$format){
3191
+                    if (!empty($extra) && esc_attr($extra['date_format']) == $format) {
3192 3192
                         $selected = "selected='selected'";
3193 3193
                     }
3194
-                    echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";
3194
+                    echo "<option $selected value='$format'>$format       (".date_i18n($format, time()).")</option>";
3195 3195
                 }
3196 3196
                 ?>
3197 3197
             </select>
@@ -3203,10 +3203,10 @@  discard block
 block discarded – undo
3203 3203
     $html = ob_get_clean();
3204 3204
     return $output.$html;
3205 3205
 }
3206
-add_filter('geodir_cfa_extra_fields_datepicker','geodir_cfa_extra_fields_datepicker',10,4);
3206
+add_filter('geodir_cfa_extra_fields_datepicker', 'geodir_cfa_extra_fields_datepicker', 10, 4);
3207 3207
 
3208 3208
 
3209
-function geodir_cfa_extra_fields_file($output,$result_str,$cf,$field_info){
3209
+function geodir_cfa_extra_fields_file($output, $result_str, $cf, $field_info) {
3210 3210
     ob_start();
3211 3211
     $allowed_file_types = geodir_allowed_mime_types();
3212 3212
 
@@ -3217,16 +3217,16 @@  discard block
 block discarded – undo
3217 3217
         <label for="gd_file_types" class="gd-cf-tooltip-wrap">
3218 3218
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Allowed file types :', 'geodirectory'); ?>
3219 3219
             <div class="gdcf-tooltip">
3220
-                <?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', 'geodirectory');?>
3220
+                <?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', 'geodirectory'); ?>
3221 3221
             </div>
3222 3222
         </label>
3223 3223
         <div class="gd-cf-input-wrap">
3224 3224
             <select name="extra[gd_file_types][]" id="gd_file_types" multiple="multiple" style="height:100px;width:90%;">
3225
-                <option value="*" <?php selected(true, in_array('*', $gd_file_types));?>><?php _e('All types', 'geodirectory') ;?></option>
3226
-                <?php foreach ( $allowed_file_types as $format => $types ) { ?>
3227
-                    <optgroup label="<?php echo esc_attr( wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory') ) ) ;?>">
3228
-                        <?php foreach ( $types as $ext => $type ) { ?>
3229
-                            <option value="<?php echo esc_attr($ext) ;?>" <?php selected(true, in_array($ext, $gd_file_types));?>><?php echo '.' . $ext ;?></option>
3225
+                <option value="*" <?php selected(true, in_array('*', $gd_file_types)); ?>><?php _e('All types', 'geodirectory'); ?></option>
3226
+                <?php foreach ($allowed_file_types as $format => $types) { ?>
3227
+                    <optgroup label="<?php echo esc_attr(wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory'))); ?>">
3228
+                        <?php foreach ($types as $ext => $type) { ?>
3229
+                            <option value="<?php echo esc_attr($ext); ?>" <?php selected(true, in_array($ext, $gd_file_types)); ?>><?php echo '.'.$ext; ?></option>
3230 3230
                         <?php } ?>
3231 3231
                     </optgroup>
3232 3232
                 <?php } ?>
@@ -3238,11 +3238,11 @@  discard block
 block discarded – undo
3238 3238
     $html = ob_get_clean();
3239 3239
     return $output.$html;
3240 3240
 }
3241
-add_filter('geodir_cfa_extra_fields_file','geodir_cfa_extra_fields_file',10,4);
3241
+add_filter('geodir_cfa_extra_fields_file', 'geodir_cfa_extra_fields_file', 10, 4);
3242 3242
 
3243
-function geodir_default_custom_fields($post_type='gd_place',$package_id=''){
3243
+function geodir_default_custom_fields($post_type = 'gd_place', $package_id = '') {
3244 3244
     $fields = array();
3245
-    $package = ($package_id=='') ? '' : array($package_id);
3245
+    $package = ($package_id == '') ? '' : array($package_id);
3246 3246
 
3247 3247
     $fields[] = array('listing_type' => $post_type,
3248 3248
                       'data_type' => 'VARCHAR',
Please login to merge, or discard this patch.
Braces   +126 added lines, -85 removed lines patch added patch discarded remove patch
@@ -51,8 +51,9 @@  discard block
 block discarded – undo
51 51
         global $wpdb;
52 52
         $result = 0;// no rows affected
53 53
         if (!geodir_column_exist($db, $column)) {
54
-            if (!empty($db) && !empty($column))
55
-                $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
54
+            if (!empty($db) && !empty($column)) {
55
+                            $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
56
+            }
56 57
         }
57 58
         return $result;
58 59
     }
@@ -82,10 +83,11 @@  discard block
 block discarded – undo
82 83
 
83 84
     $default_query = '';
84 85
 
85
-    if ($default == 'default')
86
-        $default_query .= " and is_admin IN ('1') ";
87
-    elseif ($default == 'custom')
88
-        $default_query .= " and is_admin = '0' ";
86
+    if ($default == 'default') {
87
+            $default_query .= " and is_admin IN ('1') ";
88
+    } elseif ($default == 'custom') {
89
+            $default_query .= " and is_admin = '0' ";
90
+    }
89 91
 
90 92
     if ($fields_location == 'none') {
91 93
     } else{
@@ -239,10 +241,12 @@  discard block
 block discarded – undo
239 241
                 }
240 242
 
241 243
                 return $field_id;
242
-            } else
243
-                return 0;
244
-        } else
245
-            return 0;
244
+            } else {
245
+                            return 0;
246
+            }
247
+        } else {
248
+                    return 0;
249
+        }
246 250
     }
247 251
 }
248 252
 
@@ -349,7 +353,9 @@  discard block
 block discarded – undo
349 353
 
350 354
 
351 355
 
352
-            if ($post_type == '') $post_type = 'gd_place';
356
+            if ($post_type == '') {
357
+            	$post_type = 'gd_place';
358
+            }
353 359
 
354 360
 
355 361
             $detail_table = $plugin_prefix . $post_type . '_detail';
@@ -389,16 +395,17 @@  discard block
 block discarded – undo
389 395
             }
390 396
 
391 397
             $option_values = '';
392
-            if (isset($request_field['option_values']))
393
-                $option_values = $request_field['option_values'];
398
+            if (isset($request_field['option_values'])) {
399
+                            $option_values = $request_field['option_values'];
400
+            }
394 401
 
395 402
             $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0';
396 403
 
397 404
             $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0';
398 405
 
399
-            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))
400
-                $price_pkg = implode(",", $request_field['show_on_pkg']);
401
-            else {
406
+            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) {
407
+                            $price_pkg = implode(",", $request_field['show_on_pkg']);
408
+            } else {
402 409
                 $package_info = array();
403 410
 
404 411
                 $package_info = geodir_post_package_info($package_info, '', $post_type);
@@ -406,22 +413,29 @@  discard block
 block discarded – undo
406 413
             }
407 414
 
408 415
 
409
-            if (isset($request_field['extra']) && !empty($request_field['extra']))
410
-                $extra_fields = $request_field['extra'];
416
+            if (isset($request_field['extra']) && !empty($request_field['extra'])) {
417
+                            $extra_fields = $request_field['extra'];
418
+            }
411 419
 
412
-            if (isset($request_field['is_default']) && $request_field['is_default'] != '')
413
-                $is_default = $request_field['is_default'];
414
-            else
415
-                $is_default = '0';
420
+            if (isset($request_field['is_default']) && $request_field['is_default'] != '') {
421
+                            $is_default = $request_field['is_default'];
422
+            } else {
423
+                            $is_default = '0';
424
+            }
416 425
 
417
-            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')
418
-                $is_admin = $request_field['is_admin'];
419
-            else
420
-                $is_admin = '0';
426
+            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') {
427
+                            $is_admin = $request_field['is_admin'];
428
+            } else {
429
+                            $is_admin = '0';
430
+            }
421 431
 
422 432
 
423
-            if ($is_active == '') $is_active = 1;
424
-            if ($is_required == '') $is_required = 0;
433
+            if ($is_active == '') {
434
+            	$is_active = 1;
435
+            }
436
+            if ($is_required == '') {
437
+            	$is_required = 0;
438
+            }
425 439
 
426 440
 
427 441
             if ($sort_order == '') {
@@ -690,7 +704,7 @@  discard block
 block discarded – undo
690 704
                                 }
691 705
                                 if($op_max){$op_size =$op_max; }
692 706
                             }
693
-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
707
+                        } elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
694 708
                             if(strlen($option_values)){
695 709
                                 $op_size =  strlen($option_values);
696 710
                             }
@@ -707,11 +721,13 @@  discard block
 block discarded – undo
707 721
                             return __('Column change failed, you may have too many columns.','geodirectory');
708 722
                         }
709 723
 
710
-                        if (isset($request_field['cat_display_type']))
711
-                            $extra_fields = $request_field['cat_display_type'];
724
+                        if (isset($request_field['cat_display_type'])) {
725
+                                                    $extra_fields = $request_field['cat_display_type'];
726
+                        }
712 727
 
713
-                        if (isset($request_field['multi_display_type']))
714
-                            $extra_fields = $request_field['multi_display_type'];
728
+                        if (isset($request_field['multi_display_type'])) {
729
+                                                    $extra_fields = $request_field['multi_display_type'];
730
+                        }
715 731
 
716 732
 
717 733
                         break;
@@ -725,8 +741,9 @@  discard block
 block discarded – undo
725 741
                         if($alter_result===false){
726 742
                             return __('Column change failed, you may have too many columns.','geodirectory');
727 743
                         }
728
-                        if (isset($request_field['advanced_editor']))
729
-                            $extra_fields = $request_field['advanced_editor'];
744
+                        if (isset($request_field['advanced_editor'])) {
745
+                                                    $extra_fields = $request_field['advanced_editor'];
746
+                        }
730 747
 
731 748
                         break;
732 749
 
@@ -822,8 +839,9 @@  discard block
 block discarded – undo
822 839
                 );
823 840
 
824 841
 
825
-                if ($cat_sort == '')
826
-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
842
+                if ($cat_sort == '') {
843
+                                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
844
+                }
827 845
 
828 846
 
829 847
                 /**
@@ -1193,8 +1211,10 @@  discard block
 block discarded – undo
1193 1211
         }
1194 1212
 
1195 1213
         return $post_meta_info;
1196
-    else:
1197
-        return false;
1214
+    else {
1215
+    	:
1216
+        return false;
1217
+    }
1198 1218
     endif;
1199 1219
 }
1200 1220
 
@@ -1205,8 +1225,9 @@  discard block
 block discarded – undo
1205 1225
     if (is_admin()) {
1206 1226
         global $post,$gd_session;
1207 1227
 
1208
-        if (isset($_REQUEST['post']))
1209
-            $_REQUEST['pid'] = $_REQUEST['post'];
1228
+        if (isset($_REQUEST['post'])) {
1229
+                    $_REQUEST['pid'] = $_REQUEST['post'];
1230
+        }
1210 1231
     }
1211 1232
 
1212 1233
     if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
@@ -1259,8 +1280,9 @@  discard block
 block discarded – undo
1259 1280
         if (is_admin()) {
1260 1281
             global $post;
1261 1282
 
1262
-            if (isset($_REQUEST['post']))
1263
-                $_REQUEST['pid'] = $_REQUEST['post'];
1283
+            if (isset($_REQUEST['post'])) {
1284
+                            $_REQUEST['pid'] = $_REQUEST['post'];
1285
+            }
1264 1286
         }
1265 1287
 
1266 1288
         
@@ -1352,7 +1374,7 @@  discard block
 block discarded – undo
1352 1374
         $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
1353 1375
     } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
1354 1376
         $field_icon = '<i class="' . $cf['field_icon'] . '"></i>';
1355
-    }else{
1377
+    } else{
1356 1378
         $field_icon = $cf['field_icon'];
1357 1379
     }
1358 1380
 
@@ -1425,8 +1447,9 @@  discard block
 block discarded – undo
1425 1447
                     $variables_array['post_id'] = $post->ID;
1426 1448
                     $variables_array['label'] = __($type['site_title'], 'geodirectory');
1427 1449
                     $variables_array['value'] = '';
1428
-                    if (isset($post->{$type['htmlvar_name']}))
1429
-                        $variables_array['value'] = $post->{$type['htmlvar_name']};
1450
+                    if (isset($post->{$type['htmlvar_name']})) {
1451
+                                            $variables_array['value'] = $post->{$type['htmlvar_name']};
1452
+                    }
1430 1453
                 endif;
1431 1454
 
1432 1455
 
@@ -1448,7 +1471,9 @@  discard block
 block discarded – undo
1448 1471
                      * @param string $html Custom field unfiltered HTML.
1449 1472
                      * @param array $variables_array Custom field variables array.
1450 1473
                      */
1451
-                    if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
1474
+                    if ($html) {
1475
+                    	echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
1476
+                    }
1452 1477
 
1453 1478
                     /**
1454 1479
                      * Called after a custom fields is output on the frontend.
@@ -1491,10 +1516,11 @@  discard block
 block discarded – undo
1491 1516
      */
1492 1517
     function geodir_default_date_format()
1493 1518
     {
1494
-        if ($format = get_option('date_format'))
1495
-            return $format;
1496
-        else
1497
-            return 'dd-mm-yy';
1519
+        if ($format = get_option('date_format')) {
1520
+                    return $format;
1521
+        } else {
1522
+                    return 'dd-mm-yy';
1523
+        }
1498 1524
     }
1499 1525
 }
1500 1526
 
@@ -1601,11 +1627,13 @@  discard block
 block discarded – undo
1601 1627
                     // Set an array containing a list of acceptable formats
1602 1628
                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
1603 1629
 
1604
-                    if (!function_exists('wp_handle_upload'))
1605
-                        require_once(ABSPATH . 'wp-admin/includes/file.php');
1630
+                    if (!function_exists('wp_handle_upload')) {
1631
+                                            require_once(ABSPATH . 'wp-admin/includes/file.php');
1632
+                    }
1606 1633
 
1607
-                    if (!is_dir($geodir_uploadpath))
1608
-                        mkdir($geodir_uploadpath);
1634
+                    if (!is_dir($geodir_uploadpath)) {
1635
+                                            mkdir($geodir_uploadpath);
1636
+                    }
1609 1637
 
1610 1638
                     $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];
1611 1639
                     $explode_sub_dir = explode("/", $sub_dir);
@@ -1618,16 +1646,19 @@  discard block
 block discarded – undo
1618 1646
                     }
1619 1647
 
1620 1648
                     $uploaded_file = '';
1621
-                    if (file_exists($img_path))
1622
-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1649
+                    if (file_exists($img_path)) {
1650
+                                            $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1651
+                    }
1623 1652
 
1624 1653
                     if ($curr_img_dir != $geodir_uploaddir) {
1625
-                        if (file_exists($img_path))
1626
-                            unlink($img_path);
1654
+                        if (file_exists($img_path)) {
1655
+                                                    unlink($img_path);
1656
+                        }
1627 1657
                     }
1628 1658
 
1629
-                    if (!empty($uploaded_file))
1630
-                        $file_urls = $geodir_uploadurl . '/' . $new_name;
1659
+                    if (!empty($uploaded_file)) {
1660
+                                            $file_urls = $geodir_uploadurl . '/' . $new_name;
1661
+                    }
1631 1662
 
1632 1663
                 } else {
1633 1664
                     $file_urls = $post_image[$m];
@@ -1648,8 +1679,9 @@  discard block
 block discarded – undo
1648 1679
 
1649 1680
         geodir_save_post_meta($post_id, $field_id, $file_urls);
1650 1681
 
1651
-        if (!empty($invalid_files))
1652
-            geodir_remove_attachments($invalid_files);
1682
+        if (!empty($invalid_files)) {
1683
+                    geodir_remove_attachments($invalid_files);
1684
+        }
1653 1685
 
1654 1686
     }
1655 1687
 }
@@ -1875,8 +1907,9 @@  discard block
 block discarded – undo
1875 1907
 
1876 1908
         $all_postypes = geodir_get_posttypes();
1877 1909
 
1878
-        if (!in_array($post_type, $all_postypes))
1879
-            return false;
1910
+        if (!in_array($post_type, $all_postypes)) {
1911
+                    return false;
1912
+        }
1880 1913
 
1881 1914
         $fields = array();
1882 1915
 
@@ -1974,8 +2007,10 @@  discard block
 block discarded – undo
1974 2007
         }
1975 2008
 
1976 2009
         return $field_ids;
1977
-    else:
1978
-        return false;
2010
+    else {
2011
+    	:
2012
+        return false;
2013
+    }
1979 2014
     endif;
1980 2015
 }
1981 2016
 
@@ -2148,8 +2183,9 @@  discard block
 block discarded – undo
2148 2183
 
2149 2184
             return $field_id;
2150 2185
 
2151
-        } else
2152
-            return 0;
2186
+        } else {
2187
+                    return 0;
2188
+        }
2153 2189
 
2154 2190
     }
2155 2191
 }
@@ -2190,8 +2226,9 @@  discard block
 block discarded – undo
2190 2226
         $htmlvar_name = isset($field_type_key) ? $field_type_key : '';
2191 2227
 
2192 2228
         $site_title = '';
2193
-        if ($site_title == '')
2194
-            $site_title = isset($field_info->site_title) ? $field_info->site_title : '';
2229
+        if ($site_title == '') {
2230
+                    $site_title = isset($field_info->site_title) ? $field_info->site_title : '';
2231
+        }
2195 2232
 
2196 2233
         if ($site_title == '') {
2197 2234
             $fields = geodir_get_custom_sort_options($post_type);
@@ -2205,8 +2242,9 @@  discard block
 block discarded – undo
2205 2242
             }
2206 2243
         }
2207 2244
 
2208
-        if ($htmlvar_name == '')
2209
-            $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
2245
+        if ($htmlvar_name == '') {
2246
+                    $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
2247
+        }
2210 2248
 
2211 2249
         $nonce = wp_create_nonce('custom_fields_' . $result_str);
2212 2250
 
@@ -2219,7 +2257,7 @@  discard block
 block discarded – undo
2219 2257
 
2220 2258
                 if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
2221 2259
                     $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';
2222
-                }elseif(isset($cso['field_icon']) && $cso['field_icon']){
2260
+                } elseif(isset($cso['field_icon']) && $cso['field_icon']){
2223 2261
                     $field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';
2224 2262
                 }
2225 2263
 
@@ -2654,7 +2692,7 @@  discard block
 block discarded – undo
2654 2692
     $dt_value = '';
2655 2693
     if (isset($field_info->data_type)) {
2656 2694
         $dt_value  = esc_attr($field_info->data_type);
2657
-    }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
2695
+    } elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
2658 2696
         $dt_value  = $cf['defaults']['data_type'];
2659 2697
     }
2660 2698
     ?>
@@ -2686,7 +2724,7 @@  discard block
 block discarded – undo
2686 2724
     $value = '';
2687 2725
     if (isset($field_info->decimal_point)) {
2688 2726
         $value = esc_attr($field_info->decimal_point);
2689
-    }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
2727
+    } elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
2690 2728
         $value = $cf['defaults']['decimal_point'];
2691 2729
     }
2692 2730
     ?>
@@ -2760,11 +2798,13 @@  discard block
 block discarded – undo
2760 2798
 
2761 2799
             <?php
2762 2800
             $selected = '';
2763
-            if (isset($field_info->extra_fields))
2764
-                $advanced_editor = unserialize($field_info->extra_fields);
2801
+            if (isset($field_info->extra_fields)) {
2802
+                            $advanced_editor = unserialize($field_info->extra_fields);
2803
+            }
2765 2804
 
2766
-            if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))
2767
-                $selected = 'checked="checked"';
2805
+            if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor)) {
2806
+                            $selected = 'checked="checked"';
2807
+            }
2768 2808
             ?>
2769 2809
 
2770 2810
             <input type="checkbox" name="advanced_editor[]" id="advanced_editor"
@@ -2786,7 +2826,7 @@  discard block
 block discarded – undo
2786 2826
     $value = '';
2787 2827
     if (isset($field_info->validation_pattern)) {
2788 2828
         $value = esc_attr($field_info->validation_pattern);
2789
-    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
2829
+    } elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
2790 2830
         $value = esc_attr($cf['defaults']['validation_pattern']);
2791 2831
     }
2792 2832
     ?>
@@ -2806,7 +2846,7 @@  discard block
 block discarded – undo
2806 2846
     $value = '';
2807 2847
     if (isset($field_info->validation_msg)) {
2808 2848
         $value = esc_attr($field_info->validation_msg);
2809
-    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
2849
+    } elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
2810 2850
         $value = esc_attr($cf['defaults']['validation_msg']);
2811 2851
     }
2812 2852
     ?>
@@ -2836,8 +2876,9 @@  discard block
 block discarded – undo
2836 2876
 
2837 2877
     if (!isset($field_info->post_type)) {
2838 2878
         $post_type = sanitize_text_field($_REQUEST['listing_type']);
2839
-    } else
2840
-        $post_type = $field_info->post_type;
2879
+    } else {
2880
+            $post_type = $field_info->post_type;
2881
+    }
2841 2882
     ?>
2842 2883
     <li style="display: none;">
2843 2884
         <label for="htmlvar_name" class="gd-cf-tooltip-wrap">
@@ -3111,7 +3152,7 @@  discard block
 block discarded – undo
3111 3152
     $value = '';
3112 3153
     if (isset($field_info->option_values)) {
3113 3154
         $value = esc_attr($field_info->option_values);
3114
-    }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
3155
+    } elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
3115 3156
         $value = esc_attr($cf['defaults']['option_values']);
3116 3157
     }
3117 3158
 
Please login to merge, or discard this patch.
geodirectory-functions/ajax_handler_functions.php 3 patches
Spacing   +11 added lines, -11 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
 
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
              * @since 1.0.0
141 141
              * @package GeoDirectory
142 142
              */
143
-            include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');
143
+            include_once(geodir_plugin_path().'/geodirectory-admin/geodir_admin_ajax.php');
144 144
         } else {
145 145
             wp_redirect(geodir_login_url());
146 146
             gd_die();
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
                          *
163 163
                          * @since 1.0.0
164 164
                          */
165
-                        do_action('geodir_delete_dummy_posts_' . $_REQUEST['posttype']);
165
+                        do_action('geodir_delete_dummy_posts_'.$_REQUEST['posttype']);
166 166
                     break;
167 167
                 case "geodir_dummy_insert" :
168 168
                     if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
                          *
184 184
                          * @since 1.0.0
185 185
                          */
186
-                        do_action('geodir_insert_dummy_posts_' . $_REQUEST['posttype']);
186
+                        do_action('geodir_insert_dummy_posts_'.$_REQUEST['posttype']);
187 187
 
188 188
                     break;
189 189
             endswitch;
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
         if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
199 199
             $template = locate_template(array("geodirectory/popup-forms.php"));
200 200
             if (!$template) {
201
-                $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';
201
+                $template = geodir_plugin_path().'/geodirectory-templates/popup-forms.php';
202 202
             }
203 203
             require_once($template);
204 204
         }
@@ -217,17 +217,17 @@  discard block
 block discarded – undo
217 217
          * @since 1.0.0
218 218
          * @package GeoDirectory
219 219
          */
220
-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
220
+        include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');
221 221
     }
222 222
 
223 223
     if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
224 224
         if (is_user_logged_in()) {
225 225
             switch ($_REQUEST['ajax_action']):
226 226
                 case "add" :
227
-                    geodir_add_to_favorite((int)$_REQUEST['pid']);
227
+                    geodir_add_to_favorite((int) $_REQUEST['pid']);
228 228
                     break;
229 229
                 case "remove" :
230
-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);
230
+                    geodir_remove_from_favorite((int) $_REQUEST['pid']);
231 231
                     break;
232 232
             endswitch;
233 233
         } else {
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 
241 241
         $is_current_user_owner = true;
242 242
         if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
243
-            $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);
243
+            $is_current_user_owner = geodir_listing_belong_to_current_user((int) $_REQUEST['pid']);
244 244
         }
245 245
 
246 246
         $request = $gd_session->get('listing');
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
          * @since 1.0.0
352 352
          * @package GeoDirectory
353 353
          */
354
-        include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');
354
+        include_once(geodir_plugin_path().'/geodirectory-functions/geodirectory_reg.php');
355 355
     }
356 356
 
357 357
 
Please login to merge, or discard this patch.
Braces   +31 added lines, -23 removed lines patch added patch discarded remove patch
@@ -126,10 +126,11 @@  discard block
 block discarded – undo
126 126
     }
127 127
 
128 128
     if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
129
-        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))
130
-            geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
131
-        else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))
132
-            geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
129
+        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude'])) {
130
+                    geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
131
+        } else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax'])) {
132
+                    geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
133
+        }
133 134
     }
134 135
 
135 136
     if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {
@@ -151,22 +152,25 @@  discard block
 block discarded – undo
151 152
         if (current_user_can('manage_options')) {
152 153
             switch ($_REQUEST['geodir_autofill']):
153 154
                 case "geodir_dummy_delete" :
154
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_delete_noncename'))
155
-                        return;
155
+                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_delete_noncename')) {
156
+                                            return;
157
+                    }
156 158
 
157
-                    if (isset($_REQUEST['posttype']))
158
-                        /**
159
+                    if (isset($_REQUEST['posttype'])) {
160
+                                            /**
159 161
                          * Used to delete the dummy post data per post type.
160 162
                          *
161 163
                          * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].
162 164
                          *
163 165
                          * @since 1.0.0
164 166
                          */
165
-                        do_action('geodir_delete_dummy_posts_' . $_REQUEST['posttype']);
167
+                        do_action('geodir_delete_dummy_posts_' . $_REQUEST['posttype']);
168
+                    }
166 169
                     break;
167 170
                 case "geodir_dummy_insert" :
168
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
169
-                        return;
171
+                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) {
172
+                                            return;
173
+                    }
170 174
 
171 175
                     global $dummy_post_index, $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
172 176
                     $dummy_post_index = $_REQUEST['insert_dummy_post_index'];
@@ -175,15 +179,16 @@  discard block
 block discarded – undo
175 179
                     $city_bound_lat2 = $_REQUEST['city_bound_lat2'];
176 180
                     $city_bound_lng2 = $_REQUEST['city_bound_lng2'];
177 181
 
178
-                    if (isset($_REQUEST['posttype']))
179
-                        /**
182
+                    if (isset($_REQUEST['posttype'])) {
183
+                                            /**
180 184
                          * Used to insert the dummy post data per post type.
181 185
                          *
182 186
                          * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].
183 187
                          *
184 188
                          * @since 1.0.0
185 189
                          */
186
-                        do_action('geodir_insert_dummy_posts_' . $_REQUEST['posttype']);
190
+                        do_action('geodir_insert_dummy_posts_' . $_REQUEST['posttype']);
191
+                    }
187 192
 
188 193
                     break;
189 194
             endswitch;
@@ -261,8 +266,9 @@  discard block
 block discarded – undo
261 266
                         } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
262 267
                             $redirect_to = get_permalink(geodir_add_listing_page_id());
263 268
                             $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
264
-                        } else
265
-                            $redirect_to = get_permalink(geodir_add_listing_page_id());
269
+                        } else {
270
+                                                    $redirect_to = get_permalink(geodir_add_listing_page_id());
271
+                        }
266 272
 
267 273
                         wp_redirect($redirect_to);
268 274
                     } else {
@@ -275,9 +281,9 @@  discard block
 block discarded – undo
275 281
 
276 282
                     $gd_session->un_set('listing');
277 283
 
278
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))
279
-                        wp_redirect(get_permalink($_REQUEST['pid']));
280
-                    else {
284
+                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid'])) {
285
+                                            wp_redirect(get_permalink($_REQUEST['pid']));
286
+                    } else {
281 287
                         geodir_remove_temp_images();
282 288
                         wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
283 289
                     }
@@ -305,8 +311,9 @@  discard block
 block discarded – undo
305 311
                             } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
306 312
                                 $redirect_to = get_permalink(geodir_add_listing_page_id());
307 313
                                 $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
308
-                            } else
309
-                                $redirect_to = get_permalink(geodir_add_listing_page_id());
314
+                            } else {
315
+                                                            $redirect_to = get_permalink(geodir_add_listing_page_id());
316
+                            }
310 317
 
311 318
                             $gd_session->un_set('listing');
312 319
                             wp_redirect($redirect_to);
@@ -327,8 +334,9 @@  discard block
 block discarded – undo
327 334
                             $lastid = wp_delete_post($_REQUEST['pid']);
328 335
                         }
329 336
 
330
-                        if ($lastid && !is_wp_error($lastid))
331
-                            wp_redirect($_SERVER['HTTP_REFERER']);
337
+                        if ($lastid && !is_wp_error($lastid)) {
338
+                                                    wp_redirect($_SERVER['HTTP_REFERER']);
339
+                        }
332 340
 
333 341
                         //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
334 342
                     }
Please login to merge, or discard this patch.
Indentation   +308 added lines, -308 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,47 +59,47 @@  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;
69
-
70
-
71
-
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
-    }
76
-
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
-    }
88
-
89
-    if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'ga') {
90
-        if (isset($_REQUEST['ga_start'])) {
91
-            $ga_start = $_REQUEST['ga_start'];
92
-        } else {
93
-            $ga_start = '';
94
-        }
95
-        if (isset($_REQUEST['ga_end'])) {
96
-            $ga_end = $_REQUEST['ga_end'];
97
-        } else {
98
-            $ga_end = '';
99
-        }
100
-        geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);
101
-        die;
102
-    }
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
+
70
+
71
+
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
+	}
76
+
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
+	}
88
+
89
+	if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'ga') {
90
+		if (isset($_REQUEST['ga_start'])) {
91
+			$ga_start = $_REQUEST['ga_start'];
92
+		} else {
93
+			$ga_start = '';
94
+		}
95
+		if (isset($_REQUEST['ga_end'])) {
96
+			$ga_end = $_REQUEST['ga_end'];
97
+		} else {
98
+			$ga_end = '';
99
+		}
100
+		geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);
101
+		die;
102
+	}
103 103
 
104 104
 
105 105
 }
@@ -118,265 +118,265 @@  discard block
 block discarded – undo
118 118
  * @todo check if nonce is required here and if so add one.
119 119
  */
120 120
 function geodir_ajax_handler() {
121
-    global $wpdb, $gd_session;
121
+	global $wpdb, $gd_session;
122 122
 
123
-    if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
123
+	if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
124 124
 		$gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);
125
-        echo '1';
126
-    }
127
-
128
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
129
-        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))
130
-            geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
131
-        else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))
132
-            geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
133
-    }
134
-
135
-    if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {
136
-        if (current_user_can('manage_options')) {
137
-            /**
138
-             * Contains admin ajax handling functions.
139
-             *
140
-             * @since 1.0.0
141
-             * @package GeoDirectory
142
-             */
143
-            include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');
144
-        } else {
145
-            wp_redirect(geodir_login_url());
146
-            gd_die();
147
-        }
148
-    }
149
-
150
-    if (isset($_REQUEST['geodir_autofill']) && $_REQUEST['geodir_autofill'] != '' && isset($_REQUEST['_wpnonce'])) {
151
-        if (current_user_can('manage_options')) {
152
-            switch ($_REQUEST['geodir_autofill']):
153
-                case "geodir_dummy_delete" :
154
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_delete_noncename'))
155
-                        return;
156
-
157
-                    if (isset($_REQUEST['posttype']))
158
-                        /**
159
-                         * Used to delete the dummy post data per post type.
160
-                         *
161
-                         * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].
162
-                         *
163
-                         * @since 1.0.0
164
-                         */
165
-                        do_action('geodir_delete_dummy_posts_' . $_REQUEST['posttype']);
166
-                    break;
167
-                case "geodir_dummy_insert" :
168
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
169
-                        return;
170
-
171
-                    global $dummy_post_index, $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
172
-                    $dummy_post_index = $_REQUEST['insert_dummy_post_index'];
173
-                    $city_bound_lat1 = $_REQUEST['city_bound_lat1'];
174
-                    $city_bound_lng1 = $_REQUEST['city_bound_lng1'];
175
-                    $city_bound_lat2 = $_REQUEST['city_bound_lat2'];
176
-                    $city_bound_lng2 = $_REQUEST['city_bound_lng2'];
177
-
178
-                    if (isset($_REQUEST['posttype']))
179
-                        /**
180
-                         * Used to insert the dummy post data per post type.
181
-                         *
182
-                         * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].
183
-                         *
184
-                         * @since 1.0.0
185
-                         */
186
-                        do_action('geodir_insert_dummy_posts_' . $_REQUEST['posttype']);
187
-
188
-                    break;
189
-            endswitch;
190
-        } else {
191
-            wp_redirect(geodir_login_url());
192
-            exit();
193
-        }
194
-    }
195
-
196
-    if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {
197
-
198
-        if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
199
-            $template = locate_template(array("geodirectory/popup-forms.php"));
200
-            if (!$template) {
201
-                $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';
202
-            }
203
-            require_once($template);
204
-        }
205
-
206
-        gd_die();
207
-    }
208
-
209
-    /*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){
125
+		echo '1';
126
+	}
127
+
128
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
129
+		if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))
130
+			geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
131
+		else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))
132
+			geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
133
+	}
134
+
135
+	if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {
136
+		if (current_user_can('manage_options')) {
137
+			/**
138
+			 * Contains admin ajax handling functions.
139
+			 *
140
+			 * @since 1.0.0
141
+			 * @package GeoDirectory
142
+			 */
143
+			include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');
144
+		} else {
145
+			wp_redirect(geodir_login_url());
146
+			gd_die();
147
+		}
148
+	}
149
+
150
+	if (isset($_REQUEST['geodir_autofill']) && $_REQUEST['geodir_autofill'] != '' && isset($_REQUEST['_wpnonce'])) {
151
+		if (current_user_can('manage_options')) {
152
+			switch ($_REQUEST['geodir_autofill']):
153
+				case "geodir_dummy_delete" :
154
+					if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_delete_noncename'))
155
+						return;
156
+
157
+					if (isset($_REQUEST['posttype']))
158
+						/**
159
+						 * Used to delete the dummy post data per post type.
160
+						 *
161
+						 * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].
162
+						 *
163
+						 * @since 1.0.0
164
+						 */
165
+						do_action('geodir_delete_dummy_posts_' . $_REQUEST['posttype']);
166
+					break;
167
+				case "geodir_dummy_insert" :
168
+					if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
169
+						return;
170
+
171
+					global $dummy_post_index, $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
172
+					$dummy_post_index = $_REQUEST['insert_dummy_post_index'];
173
+					$city_bound_lat1 = $_REQUEST['city_bound_lat1'];
174
+					$city_bound_lng1 = $_REQUEST['city_bound_lng1'];
175
+					$city_bound_lat2 = $_REQUEST['city_bound_lat2'];
176
+					$city_bound_lng2 = $_REQUEST['city_bound_lng2'];
177
+
178
+					if (isset($_REQUEST['posttype']))
179
+						/**
180
+						 * Used to insert the dummy post data per post type.
181
+						 *
182
+						 * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].
183
+						 *
184
+						 * @since 1.0.0
185
+						 */
186
+						do_action('geodir_insert_dummy_posts_' . $_REQUEST['posttype']);
187
+
188
+					break;
189
+			endswitch;
190
+		} else {
191
+			wp_redirect(geodir_login_url());
192
+			exit();
193
+		}
194
+	}
195
+
196
+	if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {
197
+
198
+		if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
199
+			$template = locate_template(array("geodirectory/popup-forms.php"));
200
+			if (!$template) {
201
+				$template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';
202
+			}
203
+			require_once($template);
204
+		}
205
+
206
+		gd_die();
207
+	}
208
+
209
+	/*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){
210 210
         include_once ( geodir_plugin_path() . '/geodirectory-templates/advance-search-form.php');
211 211
     }*/
212 212
 
213
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {
214
-        /**
215
-         * Contains map marker functions.
216
-         *
217
-         * @since 1.0.0
218
-         * @package GeoDirectory
219
-         */
220
-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
221
-    }
222
-
223
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
224
-        if (is_user_logged_in()) {
225
-            switch ($_REQUEST['ajax_action']):
226
-                case "add" :
227
-                    geodir_add_to_favorite((int)$_REQUEST['pid']);
228
-                    break;
229
-                case "remove" :
230
-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);
231
-                    break;
232
-            endswitch;
233
-        } else {
234
-            wp_redirect(geodir_login_url());
235
-            exit();
236
-        }
237
-    }
238
-
239
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {
240
-
241
-        $is_current_user_owner = true;
242
-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
243
-            $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);
244
-        }
245
-
246
-        $request = $gd_session->get('listing');
247
-
248
-        if (is_user_logged_in() && $is_current_user_owner) {
249
-
250
-            switch ($_REQUEST['ajax_action']):
251
-                case "add":
252
-                case "update":
253
-
254
-                    if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
255
-                        $last_id = geodir_save_listing();
256
-
257
-                        if ($last_id) {
258
-                            //$redirect_to = get_permalink( $last_id );
259
-                            $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
260
-
261
-                        } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
262
-                            $redirect_to = get_permalink(geodir_add_listing_page_id());
263
-                            $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
264
-                        } else
265
-                            $redirect_to = get_permalink(geodir_add_listing_page_id());
266
-
267
-                        wp_redirect($redirect_to);
268
-                    } else {
269
-                        $gd_session->un_set('listing');
270
-                        wp_redirect(home_url());
271
-                    }
272
-
273
-                    break;
274
-                case "cancel" :
275
-
276
-                    $gd_session->un_set('listing');
277
-
278
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))
279
-                        wp_redirect(get_permalink($_REQUEST['pid']));
280
-                    else {
281
-                        geodir_remove_temp_images();
282
-                        wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
283
-                    }
284
-
285
-                    break;
286
-
287
-                case "publish" :
288
-
289
-                    if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
290
-
291
-                        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
292
-                            $new_post = array();
293
-                            $new_post['ID'] = $_REQUEST['pid'];
294
-
295
-                            $lastid = wp_update_post($new_post);
296
-
297
-                            $gd_session->un_set('listing');
298
-                            wp_redirect(get_permalink($lastid));
299
-                        } else {
300
-                            $last_id = geodir_save_listing();
301
-
302
-                            if ($last_id) {
303
-                                //$redirect_to = get_permalink( $last_id );
304
-                                $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
305
-                            } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
306
-                                $redirect_to = get_permalink(geodir_add_listing_page_id());
307
-                                $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
308
-                            } else
309
-                                $redirect_to = get_permalink(geodir_add_listing_page_id());
310
-
311
-                            $gd_session->un_set('listing');
312
-                            wp_redirect($redirect_to);
313
-                        }
314
-                    } else {
315
-                        $gd_session->un_set('listing');
316
-                        wp_redirect(home_url());
317
-                    }
318
-
319
-                    break;
320
-                case "delete" :
321
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
322
-                        global $current_user;
323
-
324
-                        if (get_option('geodir_disable_perm_delete')) {
325
-                            $lastid = wp_trash_post($_REQUEST['pid']);
326
-                        } else {
327
-                            $lastid = wp_delete_post($_REQUEST['pid']);
328
-                        }
329
-
330
-                        if ($lastid && !is_wp_error($lastid))
331
-                            wp_redirect($_SERVER['HTTP_REFERER']);
332
-
333
-                        //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
334
-                    }
335
-                    break;
336
-            endswitch;
337
-
338
-            $gd_session->un_set('listing');
339
-        } else {
340
-            $gd_session->un_set('listing');
341
-            wp_redirect(geodir_login_url());
342
-            exit();
343
-        }
344
-    }
345
-
346
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {
347
-        /**
348
-         * Contains registration and login functions.
349
-         * @todo Fix the file path.
350
-         *
351
-         * @since 1.0.0
352
-         * @package GeoDirectory
353
-         */
354
-        include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');
355
-    }
356
-
357
-    if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {
358
-        $args = array('taxonomy' => sanitize_text_field($_REQUEST['term']));
359
-        if (!empty($_REQUEST['parent_only'])) {
360
-            $args['parent'] = 0;
361
-        }
362
-        $terms_o = get_terms($args);
213
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {
214
+		/**
215
+		 * Contains map marker functions.
216
+		 *
217
+		 * @since 1.0.0
218
+		 * @package GeoDirectory
219
+		 */
220
+		include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
221
+	}
222
+
223
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
224
+		if (is_user_logged_in()) {
225
+			switch ($_REQUEST['ajax_action']):
226
+				case "add" :
227
+					geodir_add_to_favorite((int)$_REQUEST['pid']);
228
+					break;
229
+				case "remove" :
230
+					geodir_remove_from_favorite((int)$_REQUEST['pid']);
231
+					break;
232
+			endswitch;
233
+		} else {
234
+			wp_redirect(geodir_login_url());
235
+			exit();
236
+		}
237
+	}
238
+
239
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {
240
+
241
+		$is_current_user_owner = true;
242
+		if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
243
+			$is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);
244
+		}
245
+
246
+		$request = $gd_session->get('listing');
247
+
248
+		if (is_user_logged_in() && $is_current_user_owner) {
249
+
250
+			switch ($_REQUEST['ajax_action']):
251
+				case "add":
252
+				case "update":
253
+
254
+					if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
255
+						$last_id = geodir_save_listing();
256
+
257
+						if ($last_id) {
258
+							//$redirect_to = get_permalink( $last_id );
259
+							$redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
260
+
261
+						} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
262
+							$redirect_to = get_permalink(geodir_add_listing_page_id());
263
+							$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
264
+						} else
265
+							$redirect_to = get_permalink(geodir_add_listing_page_id());
266
+
267
+						wp_redirect($redirect_to);
268
+					} else {
269
+						$gd_session->un_set('listing');
270
+						wp_redirect(home_url());
271
+					}
272
+
273
+					break;
274
+				case "cancel" :
275
+
276
+					$gd_session->un_set('listing');
277
+
278
+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))
279
+						wp_redirect(get_permalink($_REQUEST['pid']));
280
+					else {
281
+						geodir_remove_temp_images();
282
+						wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
283
+					}
284
+
285
+					break;
286
+
287
+				case "publish" :
288
+
289
+					if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
290
+
291
+						if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
292
+							$new_post = array();
293
+							$new_post['ID'] = $_REQUEST['pid'];
294
+
295
+							$lastid = wp_update_post($new_post);
296
+
297
+							$gd_session->un_set('listing');
298
+							wp_redirect(get_permalink($lastid));
299
+						} else {
300
+							$last_id = geodir_save_listing();
301
+
302
+							if ($last_id) {
303
+								//$redirect_to = get_permalink( $last_id );
304
+								$redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
305
+							} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
306
+								$redirect_to = get_permalink(geodir_add_listing_page_id());
307
+								$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
308
+							} else
309
+								$redirect_to = get_permalink(geodir_add_listing_page_id());
310
+
311
+							$gd_session->un_set('listing');
312
+							wp_redirect($redirect_to);
313
+						}
314
+					} else {
315
+						$gd_session->un_set('listing');
316
+						wp_redirect(home_url());
317
+					}
318
+
319
+					break;
320
+				case "delete" :
321
+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
322
+						global $current_user;
323
+
324
+						if (get_option('geodir_disable_perm_delete')) {
325
+							$lastid = wp_trash_post($_REQUEST['pid']);
326
+						} else {
327
+							$lastid = wp_delete_post($_REQUEST['pid']);
328
+						}
329
+
330
+						if ($lastid && !is_wp_error($lastid))
331
+							wp_redirect($_SERVER['HTTP_REFERER']);
332
+
333
+						//wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
334
+					}
335
+					break;
336
+			endswitch;
337
+
338
+			$gd_session->un_set('listing');
339
+		} else {
340
+			$gd_session->un_set('listing');
341
+			wp_redirect(geodir_login_url());
342
+			exit();
343
+		}
344
+	}
345
+
346
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {
347
+		/**
348
+		 * Contains registration and login functions.
349
+		 * @todo Fix the file path.
350
+		 *
351
+		 * @since 1.0.0
352
+		 * @package GeoDirectory
353
+		 */
354
+		include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');
355
+	}
356
+
357
+	if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {
358
+		$args = array('taxonomy' => sanitize_text_field($_REQUEST['term']));
359
+		if (!empty($_REQUEST['parent_only'])) {
360
+			$args['parent'] = 0;
361
+		}
362
+		$terms_o = get_terms($args);
363 363
         
364
-        // Skip terms which has no listing
365
-        if (!empty($terms_o)) {
366
-            $filter_terms = array();
364
+		// Skip terms which has no listing
365
+		if (!empty($terms_o)) {
366
+			$filter_terms = array();
367 367
             
368
-            foreach ($terms_o as $term) {
369
-                if (isset($term->count) && $term->count > 0) {
370
-                    $filter_terms[] = $term;
371
-                }
372
-            }
373
-            $terms_o = $filter_terms;
374
-        }
368
+			foreach ($terms_o as $term) {
369
+				if (isset($term->count) && $term->count > 0) {
370
+					$filter_terms[] = $term;
371
+				}
372
+			}
373
+			$terms_o = $filter_terms;
374
+		}
375 375
         
376
-        $terms = geodir_sort_terms($terms_o, 'count');
377
-        geodir_helper_cat_list_output($terms, intval($_REQUEST['limit']));
378
-        exit();
379
-    }
376
+		$terms = geodir_sort_terms($terms_o, 'count');
377
+		geodir_helper_cat_list_output($terms, intval($_REQUEST['limit']));
378
+		exit();
379
+	}
380 380
 
381
-    gd_die();
381
+	gd_die();
382 382
 }
Please login to merge, or discard this patch.
geodirectory-widgets/geodirectory_listing_slider_widget.php 3 patches
Indentation   +109 added lines, -109 removed lines patch added patch discarded remove patch
@@ -15,40 +15,40 @@  discard block
 block discarded – undo
15 15
 class geodir_listing_slider_widget extends WP_Widget
16 16
 {
17 17
 
18
-    /**
18
+	/**
19 19
 	 * Register the listing slider widget.
20 20
 	 *
21 21
 	 * @since 1.0.0
22
-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
22
+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
23 23
 	 */
24
-    public function __construct() {
25
-        $widget_ops = array('classname' => 'geodir_listing_slider_view', 'description' => __('GD > Listing Slider', 'geodirectory'));
26
-        parent::__construct(
27
-            'listing_slider_view', // Base ID
28
-            __('GD > Listing Slider', 'geodirectory'), // Name
29
-            $widget_ops// Args
30
-        );
31
-    }
24
+	public function __construct() {
25
+		$widget_ops = array('classname' => 'geodir_listing_slider_view', 'description' => __('GD > Listing Slider', 'geodirectory'));
26
+		parent::__construct(
27
+			'listing_slider_view', // Base ID
28
+			__('GD > Listing Slider', 'geodirectory'), // Name
29
+			$widget_ops// Args
30
+		);
31
+	}
32 32
 	
33 33
 	/**
34 34
 	 * Front-end display content for listing slider widget.
35 35
 	 *
36 36
 	 * @since 1.0.0
37
-     * @since 1.5.1 Declare function public.
37
+	 * @since 1.5.1 Declare function public.
38 38
 	 *
39 39
 	 * @param array $args     Widget arguments.
40 40
 	 * @param array $instance Saved values from database.
41 41
 	 */
42
-    public function widget($args, $instance)
43
-    {
44
-        geodir_listing_slider_widget_output($args, $instance);
45
-    }
42
+	public function widget($args, $instance)
43
+	{
44
+		geodir_listing_slider_widget_output($args, $instance);
45
+	}
46 46
 
47 47
 	/**
48 48
 	 * Sanitize listing slider widget form values as they are saved.
49 49
 	 *
50 50
 	 * @since 1.0.0
51
-     * @since 1.5.1 Declare function public.
51
+	 * @since 1.5.1 Declare function public.
52 52
 	 *
53 53
 	 * @param array $new_instance Values just sent to be saved.
54 54
 	 * @param array $old_instance Previously saved values from database.
@@ -56,101 +56,101 @@  discard block
 block discarded – undo
56 56
 	 * @return array Updated safe values to be saved.
57 57
 	 */
58 58
 	public function update($new_instance, $old_instance)
59
-    {
60
-        //save the widget
61
-        $instance = $old_instance;
62
-        $instance['title'] = strip_tags($new_instance['title']);
63
-        $instance['post_type'] = strip_tags($new_instance['post_type']);
64
-        $instance['category'] = strip_tags($new_instance['category']);
65
-        $instance['post_number'] = strip_tags($new_instance['post_number']);
66
-        $instance['max_show'] = strip_tags($new_instance['max_show']);
67
-        $instance['slide_width'] = strip_tags($new_instance['slide_width']);
68
-        $instance['show_title'] = isset($new_instance['show_title']) ? $new_instance['show_title'] : '';
69
-        $instance['slideshow'] = isset($new_instance['slideshow']) ? $new_instance['slideshow'] : '';
70
-        $instance['animationLoop'] = isset($new_instance['animationLoop']) ? $new_instance['animationLoop'] : '';
71
-        $instance['directionNav'] = isset($new_instance['directionNav']) ? $new_instance['directionNav'] : '';
72
-        $instance['slideshowSpeed'] = $new_instance['slideshowSpeed'];
73
-        $instance['animationSpeed'] = $new_instance['animationSpeed'];
74
-        $instance['animation'] = $new_instance['animation'];
75
-        $instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';
76
-        $instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;
77
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
78
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
79
-        else
80
-            $instance['add_location_filter'] = '0';
81
-
82
-        return $instance;
83
-    }
59
+	{
60
+		//save the widget
61
+		$instance = $old_instance;
62
+		$instance['title'] = strip_tags($new_instance['title']);
63
+		$instance['post_type'] = strip_tags($new_instance['post_type']);
64
+		$instance['category'] = strip_tags($new_instance['category']);
65
+		$instance['post_number'] = strip_tags($new_instance['post_number']);
66
+		$instance['max_show'] = strip_tags($new_instance['max_show']);
67
+		$instance['slide_width'] = strip_tags($new_instance['slide_width']);
68
+		$instance['show_title'] = isset($new_instance['show_title']) ? $new_instance['show_title'] : '';
69
+		$instance['slideshow'] = isset($new_instance['slideshow']) ? $new_instance['slideshow'] : '';
70
+		$instance['animationLoop'] = isset($new_instance['animationLoop']) ? $new_instance['animationLoop'] : '';
71
+		$instance['directionNav'] = isset($new_instance['directionNav']) ? $new_instance['directionNav'] : '';
72
+		$instance['slideshowSpeed'] = $new_instance['slideshowSpeed'];
73
+		$instance['animationSpeed'] = $new_instance['animationSpeed'];
74
+		$instance['animation'] = $new_instance['animation'];
75
+		$instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';
76
+		$instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;
77
+		if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
78
+			$instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
79
+		else
80
+			$instance['add_location_filter'] = '0';
81
+
82
+		return $instance;
83
+	}
84 84
 
85 85
 	/**
86 86
 	 * Back-end listing slider widget settings form.
87 87
 	 *
88 88
 	 * @since 1.0.0
89
-     * @since 1.5.1 Declare function public.
89
+	 * @since 1.5.1 Declare function public.
90 90
 	 *
91 91
 	 * @param array $instance Previously saved values from database.
92 92
 	 */
93 93
 	public function form($instance)
94
-    {
94
+	{
95 95
 
96
-        //widgetform in backend
97
-        $instance = wp_parse_args((array)$instance,
98
-            array('title' => '',
99
-                'post_type' => '',
100
-                'category' => '',
101
-                'post_number' => '5',
102
-                'max_show' => '1',
103
-                'slide_width' => '',
104
-                'show_title' => '',
105
-                'slideshow' => '',
106
-                'animationLoop' => '',
107
-                'directionNav' => '',
108
-                'slideshowSpeed' => 5000,
109
-                'animationSpeed' => 600,
110
-                'animation' => '',
111
-                'list_sort' => 'latest',
112
-                'show_featured_only' => '',
113
-                'add_location_filter' => '0',
114
-            )
115
-        );
96
+		//widgetform in backend
97
+		$instance = wp_parse_args((array)$instance,
98
+			array('title' => '',
99
+				'post_type' => '',
100
+				'category' => '',
101
+				'post_number' => '5',
102
+				'max_show' => '1',
103
+				'slide_width' => '',
104
+				'show_title' => '',
105
+				'slideshow' => '',
106
+				'animationLoop' => '',
107
+				'directionNav' => '',
108
+				'slideshowSpeed' => 5000,
109
+				'animationSpeed' => 600,
110
+				'animation' => '',
111
+				'list_sort' => 'latest',
112
+				'show_featured_only' => '',
113
+				'add_location_filter' => '0',
114
+			)
115
+		);
116 116
 
117
-        $title = strip_tags($instance['title']);
117
+		$title = strip_tags($instance['title']);
118 118
 
119
-        $post_type = strip_tags($instance['post_type']);
119
+		$post_type = strip_tags($instance['post_type']);
120 120
 
121
-        $category = strip_tags($instance['category']);
121
+		$category = strip_tags($instance['category']);
122 122
 
123
-        $post_number = strip_tags($instance['post_number']);
123
+		$post_number = strip_tags($instance['post_number']);
124 124
 
125
-        $max_show = strip_tags($instance['max_show']);
125
+		$max_show = strip_tags($instance['max_show']);
126 126
 
127
-        $slide_width = strip_tags($instance['slide_width']);
127
+		$slide_width = strip_tags($instance['slide_width']);
128 128
 
129
-        $show_title = $instance['show_title'];
129
+		$show_title = $instance['show_title'];
130 130
 
131
-        $slideshow = $instance['slideshow'];
131
+		$slideshow = $instance['slideshow'];
132 132
 
133
-        $animationLoop = $instance['animationLoop'];
133
+		$animationLoop = $instance['animationLoop'];
134 134
 
135
-        $directionNav = $instance['directionNav'];
135
+		$directionNav = $instance['directionNav'];
136 136
 
137
-        $slideshowSpeed = $instance['slideshowSpeed'];
137
+		$slideshowSpeed = $instance['slideshowSpeed'];
138 138
 
139
-        $animationSpeed = $instance['animationSpeed'];
139
+		$animationSpeed = $instance['animationSpeed'];
140 140
 
141
-        $add_location_filter = strip_tags($instance['add_location_filter']);
141
+		$add_location_filter = strip_tags($instance['add_location_filter']);
142 142
 
143
-        $animation = $instance['animation'];
144
-        $list_sort = $instance['list_sort'];
145
-        $show_featured_only = isset($instance['show_featured_only']) && $instance['show_featured_only'] ? true : false;
143
+		$animation = $instance['animation'];
144
+		$list_sort = $instance['list_sort'];
145
+		$show_featured_only = isset($instance['show_featured_only']) && $instance['show_featured_only'] ? true : false;
146 146
 
147
-        $sort_fields = array();
148
-        $sort_fields[] = array('field' => 'latest', 'label' => __('Latest', 'geodirectory'));
149
-        $sort_fields[] = array('field' => 'featured', 'label' => __('Featured', 'geodirectory'));
150
-        $sort_fields[] = array('field' => 'high_review', 'label' => __('Review', 'geodirectory'));
151
-        $sort_fields[] = array('field' => 'high_rating', 'label' => __('Rating', 'geodirectory'));
152
-        $sort_fields[] = array('field' => 'random', 'label' => __('Random', 'geodirectory'));
153
-        ?>
147
+		$sort_fields = array();
148
+		$sort_fields[] = array('field' => 'latest', 'label' => __('Latest', 'geodirectory'));
149
+		$sort_fields[] = array('field' => 'featured', 'label' => __('Featured', 'geodirectory'));
150
+		$sort_fields[] = array('field' => 'high_review', 'label' => __('Review', 'geodirectory'));
151
+		$sort_fields[] = array('field' => 'high_rating', 'label' => __('Rating', 'geodirectory'));
152
+		$sort_fields[] = array('field' => 'random', 'label' => __('Random', 'geodirectory'));
153
+		?>
154 154
 
155 155
         <p>
156 156
             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
@@ -174,9 +174,9 @@  discard block
 block discarded – undo
174 174
                     <?php foreach ($postypes as $postypes_obj) { ?>
175 175
 
176 176
                         <option <?php if ($post_type == $postypes_obj) {
177
-                            echo 'selected="selected"';
178
-                        } ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);
179
-                            echo ucfirst($extvalue[1]); ?></option>
177
+							echo 'selected="selected"';
178
+						} ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);
179
+							echo ucfirst($extvalue[1]); ?></option>
180 180
 
181 181
                     <?php } ?>
182 182
 
@@ -190,20 +190,20 @@  discard block
 block discarded – undo
190 190
                 for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory');?>
191 191
 
192 192
                 <?php
193
-                $category_taxonomy = geodir_get_taxonomies('gd_place');
194
-                $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));
195
-                ?>
193
+				$category_taxonomy = geodir_get_taxonomies('gd_place');
194
+				$categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));
195
+				?>
196 196
 
197 197
                 <select class="widefat" id="<?php echo $this->get_field_id('category'); ?>"
198 198
                         name="<?php echo $this->get_field_name('category'); ?>">
199 199
                     <option <?php if ($category == '0') {
200
-                        echo 'selected="selected"';
201
-                    } ?> value="0"><?php _e('All', 'geodirectory'); ?></option>
200
+						echo 'selected="selected"';
201
+					} ?> value="0"><?php _e('All', 'geodirectory'); ?></option>
202 202
                     <?php foreach ($categories as $category_obj) { ?>
203 203
 
204 204
                         <option <?php if ($category == $category_obj->term_id) {
205
-                            echo 'selected="selected"';
206
-                        } ?>
205
+							echo 'selected="selected"';
206
+						} ?>
207 207
                             value="<?php echo $category_obj->term_id; ?>"><?php echo ucfirst($category_obj->name); ?></option>
208 208
 
209 209
                     <?php } ?>
@@ -256,12 +256,12 @@  discard block
 block discarded – undo
256 256
                 <select class="widefat" id="<?php echo $this->get_field_id('animation'); ?>"
257 257
                         name="<?php echo $this->get_field_name('animation'); ?>">
258 258
                     <option <?php if ($animation == 'slide') {
259
-                        echo 'selected="selected"';
260
-                    } ?> value="slide">Slide
259
+						echo 'selected="selected"';
260
+					} ?> value="slide">Slide
261 261
                     </option>
262 262
                     <option <?php if ($animation == 'fade') {
263
-                        echo 'selected="selected"';
264
-                    } ?> value="fade">Fade
263
+						echo 'selected="selected"';
264
+					} ?> value="fade">Fade
265 265
                     </option>
266 266
                 </select>
267 267
             </label>
@@ -292,8 +292,8 @@  discard block
 block discarded – undo
292 292
                 for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory');?>
293 293
 
294 294
                 <input type="checkbox" <?php if ($slideshow) {
295
-                    echo 'checked="checked"';
296
-                } ?> id="<?php echo $this->get_field_id('slideshow'); ?>" value="1"
295
+					echo 'checked="checked"';
296
+				} ?> id="<?php echo $this->get_field_id('slideshow'); ?>" value="1"
297 297
                        name="<?php echo $this->get_field_name('slideshow'); ?>"/>
298 298
 
299 299
             </label>
@@ -304,8 +304,8 @@  discard block
 block discarded – undo
304 304
                 for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory');?>
305 305
 
306 306
                 <input type="checkbox" <?php if ($animationLoop) {
307
-                    echo 'checked="checked"';
308
-                } ?> id="<?php echo $this->get_field_id('animationLoop'); ?>" value="1"
307
+					echo 'checked="checked"';
308
+				} ?> id="<?php echo $this->get_field_id('animationLoop'); ?>" value="1"
309 309
                        name="<?php echo $this->get_field_name('animationLoop'); ?>"/>
310 310
 
311 311
             </label>
@@ -316,8 +316,8 @@  discard block
 block discarded – undo
316 316
                 for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory');?>
317 317
 
318 318
                 <input type="checkbox" <?php if ($directionNav) {
319
-                    echo 'checked="checked"';
320
-                } ?> id="<?php echo $this->get_field_id('directionNav'); ?>" value="1"
319
+					echo 'checked="checked"';
320
+				} ?> id="<?php echo $this->get_field_id('directionNav'); ?>" value="1"
321 321
                        name="<?php echo $this->get_field_name('directionNav'); ?>"/>
322 322
 
323 323
             </label>
@@ -329,8 +329,8 @@  discard block
 block discarded – undo
329 329
                 for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory');?>
330 330
 
331 331
                 <input type="checkbox" <?php if ($show_title) {
332
-                    echo 'checked="checked"';
333
-                } ?> id="<?php echo $this->get_field_id('show_title'); ?>" value="1"
332
+					echo 'checked="checked"';
333
+				} ?> id="<?php echo $this->get_field_id('show_title'); ?>" value="1"
334 334
                        name="<?php echo $this->get_field_name('show_title'); ?>"/>
335 335
 
336 336
             </label>
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 
379 379
 
380 380
     <?php
381
-    }
381
+	}
382 382
 } // class geodir_listing_slider_widget
383 383
 
384 384
 register_widget('geodir_listing_slider_widget');
385 385
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
     {
95 95
 
96 96
         //widgetform in backend
97
-        $instance = wp_parse_args((array)$instance,
97
+        $instance = wp_parse_args((array) $instance,
98 98
             array('title' => '',
99 99
                 'post_type' => '',
100 100
                 'category' => '',
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
         ?>
154 154
 
155 155
         <p>
156
-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
156
+            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?>
157 157
 
158 158
                 <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
159 159
                        name="<?php echo $this->get_field_name('title'); ?>" type="text"
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 
164 164
         <p>
165 165
             <label
166
-                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory');?>
166
+                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory'); ?>
167 167
 
168 168
                 <?php $postypes = geodir_get_posttypes(); ?>
169 169
 
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 
188 188
         <p>
189 189
             <label
190
-                for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory');?>
190
+                for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory'); ?>
191 191
 
192 192
                 <?php
193 193
                 $category_taxonomy = geodir_get_taxonomies('gd_place');
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
         </p>
225 225
         <p>
226 226
             <label
227
-                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts(total):', 'geodirectory');?>
227
+                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts(total):', 'geodirectory'); ?>
228 228
                 <input class="widefat" id="<?php echo $this->get_field_id('post_number'); ?>"
229 229
                        name="<?php echo $this->get_field_name('post_number'); ?>" type="text"
230 230
                        value="<?php echo esc_attr($post_number); ?>"/>
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 
234 234
         <p>
235 235
             <label
236
-                for="<?php echo $this->get_field_id('max_show'); ?>"><?php _e('Number of posts(shown at one time, requires a slide width to be set):', 'geodirectory');?>
236
+                for="<?php echo $this->get_field_id('max_show'); ?>"><?php _e('Number of posts(shown at one time, requires a slide width to be set):', 'geodirectory'); ?>
237 237
                 <input class="widefat" id="<?php echo $this->get_field_id('max_show'); ?>"
238 238
                        name="<?php echo $this->get_field_name('max_show'); ?>" type="text"
239 239
                        value="<?php echo esc_attr($max_show); ?>"/>
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 
243 243
         <p>
244 244
             <label
245
-                for="<?php echo $this->get_field_id('slide_width'); ?>"><?php _e('Slide width(leave blank unless showing more than one slide at a time, ex: 210):', 'geodirectory');?>
245
+                for="<?php echo $this->get_field_id('slide_width'); ?>"><?php _e('Slide width(leave blank unless showing more than one slide at a time, ex: 210):', 'geodirectory'); ?>
246 246
                 <input class="widefat" id="<?php echo $this->get_field_id('slide_width'); ?>"
247 247
                        name="<?php echo $this->get_field_name('slide_width'); ?>" type="text"
248 248
                        value="<?php echo esc_attr($slide_width); ?>"/>
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 
252 252
         <p>
253 253
             <label
254
-                for="<?php echo $this->get_field_id('animation'); ?>"><?php _e('Animation:', 'geodirectory');?>
254
+                for="<?php echo $this->get_field_id('animation'); ?>"><?php _e('Animation:', 'geodirectory'); ?>
255 255
 
256 256
                 <select class="widefat" id="<?php echo $this->get_field_id('animation'); ?>"
257 257
                         name="<?php echo $this->get_field_name('animation'); ?>">
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 
270 270
         <p>
271 271
             <label
272
-                for="<?php echo $this->get_field_id('slideshowSpeed'); ?>"><?php _e('Slide Show Speed: (milliseconds)', 'geodirectory');?>
272
+                for="<?php echo $this->get_field_id('slideshowSpeed'); ?>"><?php _e('Slide Show Speed: (milliseconds)', 'geodirectory'); ?>
273 273
 
274 274
                 <input class="widefat" id="<?php echo $this->get_field_id('slideshowSpeed'); ?>"
275 275
                        name="<?php echo $this->get_field_name('slideshowSpeed'); ?>" type="text"
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 
280 280
         <p>
281 281
             <label
282
-                for="<?php echo $this->get_field_id('animationSpeed'); ?>"><?php _e('Animation Speed: (milliseconds)', 'geodirectory');?>
282
+                for="<?php echo $this->get_field_id('animationSpeed'); ?>"><?php _e('Animation Speed: (milliseconds)', 'geodirectory'); ?>
283 283
 
284 284
                 <input class="widefat" id="<?php echo $this->get_field_id('animationSpeed'); ?>"
285 285
                        name="<?php echo $this->get_field_name('animationSpeed'); ?>" type="text"
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
 
290 290
         <p>
291 291
             <label
292
-                for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory');?>
292
+                for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory'); ?>
293 293
 
294 294
                 <input type="checkbox" <?php if ($slideshow) {
295 295
                     echo 'checked="checked"';
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 
302 302
         <p>
303 303
             <label
304
-                for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory');?>
304
+                for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory'); ?>
305 305
 
306 306
                 <input type="checkbox" <?php if ($animationLoop) {
307 307
                     echo 'checked="checked"';
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 
314 314
         <p>
315 315
             <label
316
-                for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory');?>
316
+                for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory'); ?>
317 317
 
318 318
                 <input type="checkbox" <?php if ($directionNav) {
319 319
                     echo 'checked="checked"';
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 
327 327
         <p>
328 328
             <label
329
-                for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory');?>
329
+                for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory'); ?>
330 330
 
331 331
                 <input type="checkbox" <?php if ($show_title) {
332 332
                     echo 'checked="checked"';
@@ -345,9 +345,9 @@  discard block
 block discarded – undo
345 345
         </p>
346 346
         <p>
347 347
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
348
-                <?php _e('Enable Location Filter:', 'geodirectory');?>
348
+                <?php _e('Enable Location Filter:', 'geodirectory'); ?>
349 349
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
350
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
350
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"'; ?>
351 351
                        value="1"/>
352 352
             </label>
353 353
         </p>
@@ -368,10 +368,10 @@  discard block
 block discarded – undo
368 368
 
369 369
             }
370 370
 
371
-            <?php if(is_active_widget( false, false, $this->id_base, true )){ ?>
371
+            <?php if (is_active_widget(false, false, $this->id_base, true)) { ?>
372 372
             var post_type = jQuery('#<?php echo $this->get_field_id('post_type'); ?>').val();
373 373
 
374
-            geodir_change_category_list(post_type, '<?php echo $category;?>');
374
+            geodir_change_category_list(post_type, '<?php echo $category; ?>');
375 375
             <?php } ?>
376 376
 
377 377
         </script>
Please login to merge, or discard this patch.
Braces   +13 added lines, -6 removed lines patch added patch discarded remove patch
@@ -74,10 +74,11 @@  discard block
 block discarded – undo
74 74
         $instance['animation'] = $new_instance['animation'];
75 75
         $instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';
76 76
         $instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;
77
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
78
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
79
-        else
80
-            $instance['add_location_filter'] = '0';
77
+        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '') {
78
+                    $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
79
+        } else {
80
+                    $instance['add_location_filter'] = '0';
81
+        }
81 82
 
82 83
         return $instance;
83 84
     }
@@ -339,7 +340,10 @@  discard block
 block discarded – undo
339 340
             <label
340 341
                 for="<?php echo $this->get_field_id('show_featured_only'); ?>"><?php _e('Show only featured listings:', 'geodirectory'); ?>
341 342
                 <input type="checkbox" id="<?php echo $this->get_field_id('show_featured_only'); ?>"
342
-                       name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) echo 'checked="checked"'; ?>
343
+                       name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) {
344
+	echo 'checked="checked"';
345
+}
346
+?>
343 347
                        value="1"/>
344 348
             </label>
345 349
         </p>
@@ -347,7 +351,10 @@  discard block
 block discarded – undo
347 351
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
348 352
                 <?php _e('Enable Location Filter:', 'geodirectory');?>
349 353
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
350
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
354
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) {
355
+	echo 'checked="checked"';
356
+}
357
+?>
351 358
                        value="1"/>
352 359
             </label>
353 360
         </p>
Please login to merge, or discard this patch.
geodirectory-admin/admin_hooks_actions.php 4 patches
Braces   +63 added lines, -55 removed lines patch added patch discarded remove patch
@@ -24,8 +24,11 @@  discard block
 block discarded – undo
24 24
             global $current_tab;
25 25
             geodir_redirect_to_admin_panel_on_installed();
26 26
             $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';
27
-            if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests
28
-                geodir_handle_option_form_submit($current_tab); // located in admin function.php
27
+            if (!(isset($_REQUEST['action']))) {
28
+            	// this will avoid Ajax requests
29
+                geodir_handle_option_form_submit($current_tab);
30
+            }
31
+            // located in admin function.php
29 32
             /**
30 33
              * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.
31 34
              *
@@ -316,8 +319,9 @@  discard block
 block discarded – undo
316 319
     if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {
317 320
 
318 321
         foreach ($notification as $key => $value) {
319
-            if ($value['type'] == 'textarea')
320
-                $notification[$key]['type'] = 'editor';
322
+            if ($value['type'] == 'textarea') {
323
+                            $notification[$key]['type'] = 'editor';
324
+            }
321 325
         }
322 326
 
323 327
     }
@@ -342,8 +346,9 @@  discard block
 block discarded – undo
342 346
     if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {
343 347
 
344 348
         foreach ($design_setting as $key => $value) {
345
-            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')
346
-                $design_setting[$key]['type'] = 'editor';
349
+            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') {
350
+                            $design_setting[$key]['type'] = 'editor';
351
+            }
347 352
         }
348 353
 
349 354
     }
@@ -462,9 +467,9 @@  discard block
 block discarded – undo
462 467
                    class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">
463 468
                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {
464 469
                         echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';
465
-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){
470
+                    } elseif(isset($val['field_icon']) && $val['field_icon'] ){
466 471
                         echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';
467
-                    }else{
472
+                    } else{
468 473
                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';
469 474
                     }?>
470 475
                     <?php echo $val['site_title'];?>
@@ -693,9 +698,9 @@  discard block
 block discarded – undo
693 698
         <?php
694 699
         if($type=='predefined'){
695 700
             $cfs = geodir_custom_fields_predefined($listing_type);
696
-        }elseif($type=='custom'){
701
+        } elseif($type=='custom'){
697 702
             $cfs = geodir_custom_fields_custom($listing_type);
698
-        }else{
703
+        } else{
699 704
             $cfs = geodir_custom_fields($listing_type);
700 705
             ?>
701 706
             <ul class="full gd-cf-tooltip-wrap">
@@ -750,7 +755,7 @@  discard block
 block discarded – undo
750 755
             </li>
751 756
             <?php
752 757
         }
753
-    }else{
758
+    } else{
754 759
         _e('There are no custom fields here yet.', 'geodirectory');
755 760
     }
756 761
         ?>
@@ -947,8 +952,9 @@  discard block
 block discarded – undo
947 952
 
948 953
     if (!get_option('geodir_remove_unnecessary_fields')) {
949 954
 
950
-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
951
-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
955
+        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'")) {
956
+                    $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
957
+        }
952 958
 
953 959
         update_option('geodir_remove_unnecessary_fields', '1');
954 960
 
@@ -974,15 +980,17 @@  discard block
 block discarded – undo
974 980
         $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];
975 981
         switch ($geodir_admin_ajax_action) {
976 982
             case 'diagnosis' :
977
-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')
978
-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
983
+                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
984
+                                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
985
+                }
979 986
                 call_user_func('geodir_diagnose_' . $diagnose_this);
980 987
                 exit();
981 988
                 break;
982 989
 
983 990
             case 'diagnosis-fix' :
984
-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')
985
-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
991
+                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
992
+                                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
993
+                }
986 994
                 call_user_func('geodir_diagnose_' . $diagnose_this);
987 995
                 exit();
988 996
                 break;
@@ -1540,11 +1548,11 @@  discard block
 block discarded – undo
1540 1548
     //////////////////////////////////
1541 1549
     $option_value = get_option('geodir_home_page');
1542 1550
     $page = get_post($option_value);
1543
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1551
+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
1544 1552
 
1545
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1546
-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
1547
-    else {
1553
+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
1554
+            $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
1555
+    } else {
1548 1556
         $is_error_during_diagnose = true;
1549 1557
         $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
1550 1558
         if ($fix) {
@@ -1565,11 +1573,11 @@  discard block
 block discarded – undo
1565 1573
     //////////////////////////////////
1566 1574
     $option_value = get_option('geodir_add_listing_page');
1567 1575
     $page = get_post($option_value);
1568
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1576
+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
1569 1577
 
1570
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1571
-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
1572
-    else {
1578
+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
1579
+            $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
1580
+    } else {
1573 1581
         $is_error_during_diagnose = true;
1574 1582
         $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
1575 1583
         if ($fix) {
@@ -1591,11 +1599,11 @@  discard block
 block discarded – undo
1591 1599
     //////////////////////////////////
1592 1600
     $option_value = get_option('geodir_preview_page');
1593 1601
     $page = get_post($option_value);
1594
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1602
+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
1595 1603
 
1596
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1597
-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
1598
-    else {
1604
+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
1605
+            $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
1606
+    } else {
1599 1607
         $is_error_during_diagnose = true;
1600 1608
         $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
1601 1609
         if ($fix) {
@@ -1616,11 +1624,11 @@  discard block
 block discarded – undo
1616 1624
     //////////////////////////////////
1617 1625
     $option_value = get_option('geodir_success_page');
1618 1626
     $page = get_post($option_value);
1619
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1627
+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
1620 1628
 
1621
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1622
-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
1623
-    else {
1629
+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
1630
+            $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
1631
+    } else {
1624 1632
         $is_error_during_diagnose = true;
1625 1633
         $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
1626 1634
         if ($fix) {
@@ -1641,11 +1649,11 @@  discard block
 block discarded – undo
1641 1649
     //////////////////////////////////
1642 1650
     $option_value = get_option('geodir_info_page');
1643 1651
     $page = get_post($option_value);
1644
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1652
+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
1645 1653
 
1646
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1647
-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
1648
-    else {
1654
+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
1655
+            $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
1656
+    } else {
1649 1657
         $is_error_during_diagnose = true;
1650 1658
         $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
1651 1659
         if ($fix) {
@@ -1666,11 +1674,11 @@  discard block
 block discarded – undo
1666 1674
     //////////////////////////////////
1667 1675
     $option_value = get_option('geodir_login_page');
1668 1676
     $page = get_post($option_value);
1669
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1677
+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
1670 1678
 
1671
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1672
-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
1673
-    else {
1679
+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
1680
+            $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
1681
+    } else {
1674 1682
         $is_error_during_diagnose = true;
1675 1683
         $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
1676 1684
         if ($fix) {
@@ -1691,11 +1699,11 @@  discard block
 block discarded – undo
1691 1699
     //////////////////////////////////
1692 1700
     $option_value = get_option('geodir_location_page');
1693 1701
     $page = get_post($option_value);
1694
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1702
+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
1695 1703
 
1696
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1697
-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
1698
-    else {
1704
+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
1705
+            $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
1706
+    } else {
1699 1707
         $is_error_during_diagnose = true;
1700 1708
         $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
1701 1709
         if ($fix) {
@@ -2140,8 +2148,9 @@  discard block
 block discarded – undo
2140 2148
                             );
2141 2149
 
2142 2150
                             $post_location_info = $request_info['post_location'];
2143
-                            if ($location_id = geodir_add_new_location($post_location_info))
2144
-                                $post_location_id = $location_id;
2151
+                            if ($location_id = geodir_add_new_location($post_location_info)) {
2152
+                                                            $post_location_id = $location_id;
2153
+                            }
2145 2154
                         } else {
2146 2155
                             $post_location_id = 0;
2147 2156
                         }
@@ -2204,8 +2213,9 @@  discard block
 block discarded – undo
2204 2213
                             $attachment_set = '';
2205 2214
 
2206 2215
                             foreach ($attachment as $key => $val) {
2207
-                                if ($val != '')
2208
-                                    $attachment_set .= $key . " = '" . $val . "', ";
2216
+                                if ($val != '') {
2217
+                                                                    $attachment_set .= $key . " = '" . $val . "', ";
2218
+                                }
2209 2219
                             }
2210 2220
                             $attachment_set = trim($attachment_set, ", ");
2211 2221
 
@@ -2301,8 +2311,7 @@  discard block
 block discarded – undo
2301 2311
 
2302 2312
         $parts = json_decode($response['body']);
2303 2313
         //print_r($parts);
2304
-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
2305
-        else{
2314
+        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;} else{
2306 2315
 
2307 2316
             update_option('gd_ga_access_token', $parts->access_token);
2308 2317
             update_option('gd_ga_refresh_token', $parts->refresh_token);
@@ -2310,17 +2319,16 @@  discard block
 block discarded – undo
2310 2319
         }
2311 2320
 
2312 2321
 
2313
-    }
2314
-    elseif(!empty($response['response']['code'])) {
2322
+    } elseif(!empty($response['response']['code'])) {
2315 2323
         $parts = json_decode($response['body']);
2316 2324
 
2317 2325
         if(isset($parts->error)){
2318 2326
             echo $parts->error.": ".$parts->error_description;exit;
2319
-        }else{
2327
+        } else{
2320 2328
             echo $error_msg." - #2";exit;
2321 2329
         }
2322 2330
 
2323
-    }else{
2331
+    } else{
2324 2332
 
2325 2333
         echo $error_msg." - #3";exit;
2326 2334
 
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1844,6 +1844,7 @@  discard block
 block discarded – undo
1844 1844
  * @since 1.0.0
1845 1845
  * @package GeoDirectory
1846 1846
  * @global object $current_user Current user object.
1847
+ * @param string|null $input
1847 1848
  * @return array Returns parsed data as array.
1848 1849
  */
1849 1850
 function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")
@@ -2373,7 +2374,6 @@  discard block
 block discarded – undo
2373 2374
  *
2374 2375
  * @since 1.6.9
2375 2376
  *
2376
- * @param array $settings Array of GeoDirectory general settings.
2377 2377
  * @return array Array of settings.
2378 2378
  */
2379 2379
 function geodir_uninstall_settings($general_settings) {
Please login to merge, or discard this patch.
Indentation   +1524 added lines, -1524 removed lines patch added patch discarded remove patch
@@ -10,33 +10,33 @@  discard block
 block discarded – undo
10 10
 
11 11
 add_action('admin_init', 'geodir_admin_init');
12 12
 if (!function_exists('geodir_admin_init')) {
13
-    /**
14
-     * Adds GD setting pages in admin.
15
-     *
16
-     * @since 1.0.0
17
-     * @package GeoDirectory
18
-     * @global string $current_tab The current settings tab name.
19
-     */
20
-    function geodir_admin_init()
21
-    {
22
-
23
-        if (is_admin()):
24
-            global $current_tab;
25
-            geodir_redirect_to_admin_panel_on_installed();
26
-            $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';
27
-            if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests
28
-                geodir_handle_option_form_submit($current_tab); // located in admin function.php
29
-            /**
30
-             * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.
31
-             *
32
-             * @since 1.0.0
33
-             */
34
-            do_action('admin_panel_init');
35
-            add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);
36
-
37
-
38
-        endif;
39
-    }
13
+	/**
14
+	 * Adds GD setting pages in admin.
15
+	 *
16
+	 * @since 1.0.0
17
+	 * @package GeoDirectory
18
+	 * @global string $current_tab The current settings tab name.
19
+	 */
20
+	function geodir_admin_init()
21
+	{
22
+
23
+		if (is_admin()):
24
+			global $current_tab;
25
+			geodir_redirect_to_admin_panel_on_installed();
26
+			$current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';
27
+			if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests
28
+				geodir_handle_option_form_submit($current_tab); // located in admin function.php
29
+			/**
30
+			 * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.
31
+			 *
32
+			 * @since 1.0.0
33
+			 */
34
+			do_action('admin_panel_init');
35
+			add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);
36
+
37
+
38
+		endif;
39
+	}
40 40
 }
41 41
 
42 42
 /**
@@ -47,10 +47,10 @@  discard block
 block discarded – undo
47 47
  */
48 48
 function geodir_redirect_to_admin_panel_on_installed()
49 49
 {
50
-    if (get_option('geodir_installation_redirect', false)) {
51
-        delete_option('geodir_installation_redirect');
52
-        wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));
53
-    }
50
+	if (get_option('geodir_installation_redirect', false)) {
51
+		delete_option('geodir_installation_redirect');
52
+		wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));
53
+	}
54 54
 }
55 55
 
56 56
 /**
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
  */
63 63
 function geodir_get_admin_option_form($current_tab)
64 64
 {
65
-    geodir_admin_option_form($current_tab);// defined in admin template tags.php
65
+	geodir_admin_option_form($current_tab);// defined in admin template tags.php
66 66
 }
67 67
 
68 68
 
@@ -85,19 +85,19 @@  discard block
 block discarded – undo
85 85
  */
86 86
 function geodir_conditional_admin_script_load()
87 87
 {
88
-    global $pagenow;
88
+	global $pagenow;
89 89
 	
90 90
 	// Get the current post type
91 91
 	$post_type = geodir_admin_current_post_type();
92 92
 	$geodir_post_types = geodir_get_posttypes();
93 93
     
94 94
 	if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'term.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {
95
-        add_action('admin_enqueue_scripts', 'geodir_admin_scripts');
96
-        add_action('admin_enqueue_scripts', 'geodir_admin_styles');
97
-        add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);
98
-    }
95
+		add_action('admin_enqueue_scripts', 'geodir_admin_scripts');
96
+		add_action('admin_enqueue_scripts', 'geodir_admin_styles');
97
+		add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);
98
+	}
99 99
 
100
-    add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');
100
+	add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');
101 101
 
102 102
 }
103 103
 
@@ -131,12 +131,12 @@  discard block
 block discarded – undo
131 131
  */
132 132
 function create_default_admin_main_nav()
133 133
 {
134
-    add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);
135
-    add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);
136
-    add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);
137
-    add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);
138
-    add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);
139
-    //add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);
134
+	add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);
135
+	add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);
136
+	add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);
137
+	add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);
138
+	add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);
139
+	//add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);
140 140
 
141 141
 }
142 142
 
@@ -149,16 +149,16 @@  discard block
 block discarded – undo
149 149
  */
150 150
 function geodir_admin_list_columns()
151 151
 {
152
-    if ($post_types = geodir_get_posttypes()) {
152
+	if ($post_types = geodir_get_posttypes()) {
153 153
 
154
-        foreach ($post_types as $post_type):
155
-            add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);
156
-            //Filter-Payment-Manager to show Package
157
-            add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);
154
+		foreach ($post_types as $post_type):
155
+			add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);
156
+			//Filter-Payment-Manager to show Package
157
+			add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);
158 158
 
159
-            add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');
160
-        endforeach;
161
-    }
159
+			add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');
160
+		endforeach;
161
+	}
162 162
 }
163 163
 
164 164
 /**
@@ -171,15 +171,15 @@  discard block
 block discarded – undo
171 171
  */
172 172
 function geodir_default_admin_main_tabs($tabs)
173 173
 {
174
-    return $tabs = array(
175
-        'general_settings' => array('label' => __('General', 'geodirectory')),
176
-        'design_settings' => array('label' => __('Design', 'geodirectory')),
177
-        'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),
178
-        'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),
179
-        'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),
180
-        'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),
181
-
182
-    );
174
+	return $tabs = array(
175
+		'general_settings' => array('label' => __('General', 'geodirectory')),
176
+		'design_settings' => array('label' => __('Design', 'geodirectory')),
177
+		'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),
178
+		'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),
179
+		'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),
180
+		'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),
181
+
182
+	);
183 183
 }
184 184
 
185 185
 add_action('do_meta_boxes', 'geodir_remove_image_box');
@@ -192,16 +192,16 @@  discard block
 block discarded – undo
192 192
  */
193 193
 function geodir_remove_image_box()
194 194
 {
195
-    global $post;
195
+	global $post;
196 196
 
197
-    $geodir_posttypes = geodir_get_posttypes();
197
+	$geodir_posttypes = geodir_get_posttypes();
198 198
 
199
-    if (isset($post) && in_array($post->post_type, $geodir_posttypes)):
199
+	if (isset($post) && in_array($post->post_type, $geodir_posttypes)):
200 200
 
201
-        remove_meta_box('postimagediv', $post->post_type, 'side');
202
-        remove_meta_box('revisionsdiv', $post->post_type, 'normal');
201
+		remove_meta_box('postimagediv', $post->post_type, 'side');
202
+		remove_meta_box('revisionsdiv', $post->post_type, 'normal');
203 203
 
204
-    endif;
204
+	endif;
205 205
 
206 206
 }
207 207
 
@@ -216,26 +216,26 @@  discard block
 block discarded – undo
216 216
  */
217 217
 function geodir_meta_box_add()
218 218
 {
219
-    global $post;
219
+	global $post;
220 220
 
221
-    $geodir_post_types = geodir_get_posttypes('array');
222
-    $geodir_posttypes = array_keys($geodir_post_types);
221
+	$geodir_post_types = geodir_get_posttypes('array');
222
+	$geodir_posttypes = array_keys($geodir_post_types);
223 223
 
224
-    if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)):
224
+	if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)):
225 225
 
226
-        $geodir_posttype = $post->post_type;
227
-        $post_typename = geodir_ucwords($geodir_post_types[$geodir_posttype]['labels']['singular_name']);
226
+		$geodir_posttype = $post->post_type;
227
+		$post_typename = geodir_ucwords($geodir_post_types[$geodir_posttype]['labels']['singular_name']);
228 228
 
229
-        // Filter-Payment-Manager
229
+		// Filter-Payment-Manager
230 230
 
231
-        add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
231
+		add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
232 232
 
233
-        add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
233
+		add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
234 234
 
235
-        // no need of this box as all fields moved to main information box
236
-        //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
235
+		// no need of this box as all fields moved to main information box
236
+		//add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
237 237
 
238
-    endif;
238
+	endif;
239 239
 
240 240
 }
241 241
 
@@ -259,23 +259,23 @@  discard block
 block discarded – undo
259 259
 function geodir_hide_post_taxonomy_meta_boxes()
260 260
 {
261 261
 
262
-    $geodir_post_types = get_option('geodir_post_types');
262
+	$geodir_post_types = get_option('geodir_post_types');
263 263
 
264
-    if (!empty($geodir_post_types)) {
265
-        foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {
264
+	if (!empty($geodir_post_types)) {
265
+		foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {
266 266
 
267
-            $gd_taxonomy = geodir_get_taxonomies($geodir_post_type);
267
+			$gd_taxonomy = geodir_get_taxonomies($geodir_post_type);
268 268
 
269
-            if(!empty($gd_taxonomy)) {
270
-                foreach ($gd_taxonomy as $tax) {
269
+			if(!empty($gd_taxonomy)) {
270
+				foreach ($gd_taxonomy as $tax) {
271 271
 
272
-                    remove_meta_box($tax . 'div', $geodir_post_type, 'normal');
272
+					remove_meta_box($tax . 'div', $geodir_post_type, 'normal');
273 273
 
274
-                }
275
-            }
274
+				}
275
+			}
276 276
 
277
-        }
278
-    }
277
+		}
278
+	}
279 279
 }
280 280
 
281 281
 add_filter('geodir_add_listing_map_restrict', 'geodir_add_listing_map_restrict');
@@ -289,12 +289,12 @@  discard block
 block discarded – undo
289 289
  */
290 290
 function geodir_add_listing_map_restrict($map_restirct)
291 291
 {
292
-    if (is_admin()) {
293
-        if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {
294
-            $map_restirct = false;
295
-        }
296
-    }
297
-    return $map_restirct;
292
+	if (is_admin()) {
293
+		if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {
294
+			$map_restirct = false;
295
+		}
296
+	}
297
+	return $map_restirct;
298 298
 }
299 299
 
300 300
 
@@ -313,16 +313,16 @@  discard block
 block discarded – undo
313 313
 function geodir_enable_editor_on_notifications($notification)
314 314
 {
315 315
 
316
-    if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {
316
+	if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {
317 317
 
318
-        foreach ($notification as $key => $value) {
319
-            if ($value['type'] == 'textarea')
320
-                $notification[$key]['type'] = 'editor';
321
-        }
318
+		foreach ($notification as $key => $value) {
319
+			if ($value['type'] == 'textarea')
320
+				$notification[$key]['type'] = 'editor';
321
+		}
322 322
 
323
-    }
323
+	}
324 324
 
325
-    return $notification;
325
+	return $notification;
326 326
 }
327 327
 
328 328
 
@@ -339,16 +339,16 @@  discard block
 block discarded – undo
339 339
 function geodir_enable_editor_on_design_settings($design_setting)
340 340
 {
341 341
 
342
-    if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {
342
+	if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {
343 343
 
344
-        foreach ($design_setting as $key => $value) {
345
-            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')
346
-                $design_setting[$key]['type'] = 'editor';
347
-        }
344
+		foreach ($design_setting as $key => $value) {
345
+			if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')
346
+				$design_setting[$key]['type'] = 'editor';
347
+		}
348 348
 
349
-    }
349
+	}
350 350
 
351
-    return $design_setting;
351
+	return $design_setting;
352 352
 }
353 353
 
354 354
 /* ----------- START MANAGE CUSTOM FIELDS ---------------- */
@@ -356,15 +356,15 @@  discard block
 block discarded – undo
356 356
 add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');
357 357
 
358 358
 function geodir_manage_available_fields_predefined($sub_tab){
359
-    if($sub_tab=='custom_fields'){
360
-        geodir_custom_available_fields('predefined');
361
-    }
359
+	if($sub_tab=='custom_fields'){
360
+		geodir_custom_available_fields('predefined');
361
+	}
362 362
 }
363 363
 
364 364
 function geodir_manage_available_fields_custom($sub_tab){
365
-    if($sub_tab=='custom_fields'){
366
-        geodir_custom_available_fields('custom');
367
-    }
365
+	if($sub_tab=='custom_fields'){
366
+		geodir_custom_available_fields('custom');
367
+	}
368 368
 }
369 369
 
370 370
 
@@ -383,16 +383,16 @@  discard block
 block discarded – undo
383 383
 function geodir_manage_available_fields($sub_tab)
384 384
 {
385 385
 
386
-    switch ($sub_tab) {
387
-        case 'custom_fields':
388
-            geodir_custom_available_fields();
389
-            break;
386
+	switch ($sub_tab) {
387
+		case 'custom_fields':
388
+			geodir_custom_available_fields();
389
+			break;
390 390
 
391
-        case 'sorting_options':
392
-            geodir_sorting_options_available_fields();
393
-            break;
391
+		case 'sorting_options':
392
+			geodir_sorting_options_available_fields();
393
+			break;
394 394
 
395
-    }
395
+	}
396 396
 }
397 397
 
398 398
 
@@ -408,16 +408,16 @@  discard block
 block discarded – undo
408 408
 function geodir_manage_selected_fields($sub_tab)
409 409
 {
410 410
 
411
-    switch ($sub_tab) {
412
-        case 'custom_fields':
413
-            geodir_custom_selected_fields();
414
-            break;
411
+	switch ($sub_tab) {
412
+		case 'custom_fields':
413
+			geodir_custom_selected_fields();
414
+			break;
415 415
 
416
-        case 'sorting_options':
417
-            geodir_sorting_options_selected_fields();
418
-            break;
416
+		case 'sorting_options':
417
+			geodir_sorting_options_selected_fields();
418
+			break;
419 419
 
420
-    }
420
+	}
421 421
 }
422 422
 
423 423
 /**
@@ -429,52 +429,52 @@  discard block
 block discarded – undo
429 429
  */
430 430
 function geodir_sorting_options_available_fields()
431 431
 {
432
-    global $wpdb;
433
-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
434
-    ?>
432
+	global $wpdb;
433
+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
434
+	?>
435 435
     <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>
436 436
     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>
437 437
     <ul>
438 438
     <?php
439
-        $sort_options = geodir_get_custom_sort_options($listing_type);
439
+		$sort_options = geodir_get_custom_sort_options($listing_type);
440 440
         
441
-        foreach ($sort_options as $key => $val) {
442
-            $val = stripslashes_deep($val); // strip slashes
443
-
444
-            $check_html_variable = $wpdb->get_var(
445
-                $wpdb->prepare(
446
-                    "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",
447
-                    array($val['htmlvar_name'], $listing_type, $val['field_type'])
448
-                )
449
-            );
441
+		foreach ($sort_options as $key => $val) {
442
+			$val = stripslashes_deep($val); // strip slashes
443
+
444
+			$check_html_variable = $wpdb->get_var(
445
+				$wpdb->prepare(
446
+					"SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",
447
+					array($val['htmlvar_name'], $listing_type, $val['field_type'])
448
+				)
449
+			);
450 450
             
451
-            $display = $check_html_variable ? ' style="display:none;"' : '';
452
-           ?>
451
+			$display = $check_html_variable ? ' style="display:none;"' : '';
452
+		   ?>
453 453
 
454 454
             <li   class="gd-cf-tooltip-wrap" <?php echo $display;?>>
455 455
                 <?php
456
-                if(isset($val['description']) && $val['description']){
457
-                    echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';
458
-                }?>
456
+				if(isset($val['description']) && $val['description']){
457
+					echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';
458
+				}?>
459 459
 
460 460
                 <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>"  data-field-type="<?php echo $val['field_type'];?>"
461 461
                    title="<?php echo $val['site_title'];?>"
462 462
                    class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">
463 463
                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {
464
-                        echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';
465
-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){
466
-                        echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';
467
-                    }else{
468
-                        echo '<i class="fa fa-cog" aria-hidden="true"></i>';
469
-                    }?>
464
+						echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';
465
+					}elseif(isset($val['field_icon']) && $val['field_icon'] ){
466
+						echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';
467
+					}else{
468
+						echo '<i class="fa fa-cog" aria-hidden="true"></i>';
469
+					}?>
470 470
                     <?php echo $val['site_title'];?>
471 471
                 </a>
472 472
             </li>
473 473
 
474 474
 
475 475
             <?php
476
-        }
477
-    ?>
476
+		}
477
+	?>
478 478
     </ul>
479 479
     <?php
480 480
 }
@@ -488,28 +488,28 @@  discard block
 block discarded – undo
488 488
  */
489 489
 function geodir_sorting_options_selected_fields()
490 490
 {
491
-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
492
-    ?>
491
+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
492
+	?>
493 493
     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>
494 494
     <ul class="core">
495 495
     <?php 
496
-        global $wpdb;
496
+		global $wpdb;
497 497
         
498
-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
498
+		$fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
499 499
 
500
-        if (!empty($fields)) {
501
-            foreach ($fields as $field) {
502
-                //$result_str = $field->id;
503
-                $result_str = $field;
504
-                $field_type = $field->field_type;
505
-                $field_ins_upd = 'display';
500
+		if (!empty($fields)) {
501
+			foreach ($fields as $field) {
502
+				//$result_str = $field->id;
503
+				$result_str = $field;
504
+				$field_type = $field->field_type;
505
+				$field_ins_upd = 'display';
506 506
 
507
-                $default = false;
507
+				$default = false;
508 508
 
509
-                geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default);
510
-            }
511
-        }
512
-    ?>
509
+				geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default);
510
+			}
511
+		}
512
+	?>
513 513
     </ul>
514 514
     <?php
515 515
 }
@@ -522,12 +522,12 @@  discard block
 block discarded – undo
522 522
  */
523 523
 function geodir_custom_fields_custom($post_type=''){
524 524
 
525
-    $custom_fields = array();
525
+	$custom_fields = array();
526 526
 
527
-    /**
528
-     * @see `geodir_custom_fields`
529
-     */
530
-    return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
527
+	/**
528
+	 * @see `geodir_custom_fields`
529
+	 */
530
+	return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
531 531
 }
532 532
 
533 533
 
@@ -540,140 +540,140 @@  discard block
 block discarded – undo
540 540
  */
541 541
 function geodir_custom_fields($post_type=''){
542 542
     
543
-    $custom_fields = array(
544
-        'text' => array(
545
-            'field_type'  =>  'text',
546
-            'class' =>  'gd-text',
547
-            'icon'  =>  'fa fa-minus',
548
-            'name'  =>  __('Text', 'geodirectory'),
549
-            'description' =>  __('Add any sort of text field, text or numbers', 'geodirectory')
550
-        ),
551
-        'datepicker' => array(
552
-            'field_type'  =>  'datepicker',
553
-            'class' =>  'gd-datepicker',
554
-            'icon'  =>  'fa fa-calendar',
555
-            'name'  =>  __('Date', 'geodirectory'),
556
-            'description' =>  __('Adds a date picker.', 'geodirectory')
557
-        ),
558
-        'textarea' => array(
559
-            'field_type'  =>  'textarea',
560
-            'class' =>  'gd-textarea',
561
-            'icon'  =>  'fa fa-bars',
562
-            'name'  =>  __('Textarea', 'geodirectory'),
563
-            'description' =>  __('Adds a textarea', 'geodirectory')
564
-        ),
565
-        'time' => array(
566
-            'field_type'  =>  'time',
567
-            'class' =>  'gd-time',
568
-            'icon' =>  'fa fa-clock-o',
569
-            'name'  =>  __('Time', 'geodirectory'),
570
-            'description' =>  __('Adds a time picker', 'geodirectory')
571
-        ),
572
-        'checkbox' => array(
573
-            'field_type'  =>  'checkbox',
574
-            'class' =>  'gd-checkbox',
575
-            'icon' =>  'fa fa-check-square-o',
576
-            'name'  =>  __('Checkbox', 'geodirectory'),
577
-            'description' =>  __('Adds a checkbox', 'geodirectory')
578
-        ),
579
-        'phone' => array(
580
-            'field_type'  =>  'phone',
581
-            'class' =>  'gd-phone',
582
-            'icon' =>  'fa fa-phone',
583
-            'name'  =>  __('Phone', 'geodirectory'),
584
-            'description' =>  __('Adds a phone input', 'geodirectory')
585
-        ),
586
-        'radio' => array(
587
-            'field_type'  =>  'radio',
588
-            'class' =>  'gd-radio',
589
-            'icon' =>  'fa fa-dot-circle-o',
590
-            'name'  =>  __('Radio', 'geodirectory'),
591
-            'description' =>  __('Adds a radio input', 'geodirectory')
592
-        ),
593
-        'email' => array(
594
-            'field_type'  =>  'email',
595
-            'class' =>  'gd-email',
596
-            'icon' =>  'fa fa-envelope-o',
597
-            'name'  =>  __('Email', 'geodirectory'),
598
-            'description' =>  __('Adds a email input', 'geodirectory')
599
-        ),
600
-        'select' => array(
601
-            'field_type'  =>  'select',
602
-            'class' =>  'gd-select',
603
-            'icon' =>  'fa fa-caret-square-o-down',
604
-            'name'  =>  __('Select', 'geodirectory'),
605
-            'description' =>  __('Adds a select input', 'geodirectory')
606
-        ),
607
-        'multiselect' => array(
608
-            'field_type'  =>  'multiselect',
609
-            'class' =>  'gd-multiselect',
610
-            'icon' =>  'fa fa-caret-square-o-down',
611
-            'name'  =>  __('Multi Select', 'geodirectory'),
612
-            'description' =>  __('Adds a multiselect input', 'geodirectory')
613
-        ),
614
-        'url' => array(
615
-            'field_type'  =>  'url',
616
-            'class' =>  'gd-url',
617
-            'icon' =>  'fa fa-link',
618
-            'name'  =>  __('URL', 'geodirectory'),
619
-            'description' =>  __('Adds a url input', 'geodirectory')
620
-        ),
621
-        'html' => array(
622
-            'field_type'  =>  'html',
623
-            'class' =>  'gd-html',
624
-            'icon' =>  'fa fa-code',
625
-            'name'  =>  __('HTML', 'geodirectory'),
626
-            'description' =>  __('Adds a html input textarea', 'geodirectory')
627
-        ),
628
-        'file' => array(
629
-            'field_type'  =>  'file',
630
-            'class' =>  'gd-file',
631
-            'icon' =>  'fa fa-file',
632
-            'name'  =>  __('File Upload', 'geodirectory'),
633
-            'description' =>  __('Adds a file input', 'geodirectory')
634
-        )
635
-    );
636
-
637
-    /**
638
-     * Filter the custom fields array to be able to add or remove items.
639
-     * 
640
-     * @since 1.6.6
641
-     *
642
-     * @param array $custom_fields {
643
-     *     The custom fields array to be filtered.
644
-     *
645
-     *     @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file.
646
-     *     @type string $class The class for the field in backend.
647
-     *     @type string $icon Can be font-awesome class name or icon image url.
648
-     *     @type string $name The name of the field.
649
-     *     @type string $description A short description about the field.
650
-     *     @type array $defaults {
651
-     *                    Optional. Used to set the default value of the field.
652
-     *
653
-     *                    @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE
654
-     *                    @type int decimal_point limit if using FLOAT data_type
655
-     *                    @type string admin_title The admin title for the field.
656
-     *                    @type string site_title This will be the title for the field on the frontend.
657
-     *                    @type string admin_desc This will be shown below the field on the add listing form.
658
-     *                    @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.
659
-     *                    @type bool is_active If false the field will not be displayed anywhere.
660
-     *                    @type bool for_admin_use If true then only site admin can see and edit this field.
661
-     *                    @type string default_value The default value for the input on the add listing page.
662
-     *                    @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble]
663
-     *                    @type bool is_required If true the field will be required on the add listing page.
664
-     *                    @type string option_values The option values for select and multiselect only
665
-     *                    @type string validation_pattern HTML5 validation pattern (text input only by default).
666
-     *                    @type string validation_msg HTML5 validation message (text input only by default).
667
-     *                    @type string required_msg Required warning message.
668
-     *                    @type string field_icon Icon url or font awesome class.
669
-     *                    @type string css_class Field custom css class for field custom style.
670
-     *                    @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option.
671
-     *                    @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required)
672
-     *     }
673
-     * }
674
-     * @param string $post_type The post type requested.
675
-     */
676
-    return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
543
+	$custom_fields = array(
544
+		'text' => array(
545
+			'field_type'  =>  'text',
546
+			'class' =>  'gd-text',
547
+			'icon'  =>  'fa fa-minus',
548
+			'name'  =>  __('Text', 'geodirectory'),
549
+			'description' =>  __('Add any sort of text field, text or numbers', 'geodirectory')
550
+		),
551
+		'datepicker' => array(
552
+			'field_type'  =>  'datepicker',
553
+			'class' =>  'gd-datepicker',
554
+			'icon'  =>  'fa fa-calendar',
555
+			'name'  =>  __('Date', 'geodirectory'),
556
+			'description' =>  __('Adds a date picker.', 'geodirectory')
557
+		),
558
+		'textarea' => array(
559
+			'field_type'  =>  'textarea',
560
+			'class' =>  'gd-textarea',
561
+			'icon'  =>  'fa fa-bars',
562
+			'name'  =>  __('Textarea', 'geodirectory'),
563
+			'description' =>  __('Adds a textarea', 'geodirectory')
564
+		),
565
+		'time' => array(
566
+			'field_type'  =>  'time',
567
+			'class' =>  'gd-time',
568
+			'icon' =>  'fa fa-clock-o',
569
+			'name'  =>  __('Time', 'geodirectory'),
570
+			'description' =>  __('Adds a time picker', 'geodirectory')
571
+		),
572
+		'checkbox' => array(
573
+			'field_type'  =>  'checkbox',
574
+			'class' =>  'gd-checkbox',
575
+			'icon' =>  'fa fa-check-square-o',
576
+			'name'  =>  __('Checkbox', 'geodirectory'),
577
+			'description' =>  __('Adds a checkbox', 'geodirectory')
578
+		),
579
+		'phone' => array(
580
+			'field_type'  =>  'phone',
581
+			'class' =>  'gd-phone',
582
+			'icon' =>  'fa fa-phone',
583
+			'name'  =>  __('Phone', 'geodirectory'),
584
+			'description' =>  __('Adds a phone input', 'geodirectory')
585
+		),
586
+		'radio' => array(
587
+			'field_type'  =>  'radio',
588
+			'class' =>  'gd-radio',
589
+			'icon' =>  'fa fa-dot-circle-o',
590
+			'name'  =>  __('Radio', 'geodirectory'),
591
+			'description' =>  __('Adds a radio input', 'geodirectory')
592
+		),
593
+		'email' => array(
594
+			'field_type'  =>  'email',
595
+			'class' =>  'gd-email',
596
+			'icon' =>  'fa fa-envelope-o',
597
+			'name'  =>  __('Email', 'geodirectory'),
598
+			'description' =>  __('Adds a email input', 'geodirectory')
599
+		),
600
+		'select' => array(
601
+			'field_type'  =>  'select',
602
+			'class' =>  'gd-select',
603
+			'icon' =>  'fa fa-caret-square-o-down',
604
+			'name'  =>  __('Select', 'geodirectory'),
605
+			'description' =>  __('Adds a select input', 'geodirectory')
606
+		),
607
+		'multiselect' => array(
608
+			'field_type'  =>  'multiselect',
609
+			'class' =>  'gd-multiselect',
610
+			'icon' =>  'fa fa-caret-square-o-down',
611
+			'name'  =>  __('Multi Select', 'geodirectory'),
612
+			'description' =>  __('Adds a multiselect input', 'geodirectory')
613
+		),
614
+		'url' => array(
615
+			'field_type'  =>  'url',
616
+			'class' =>  'gd-url',
617
+			'icon' =>  'fa fa-link',
618
+			'name'  =>  __('URL', 'geodirectory'),
619
+			'description' =>  __('Adds a url input', 'geodirectory')
620
+		),
621
+		'html' => array(
622
+			'field_type'  =>  'html',
623
+			'class' =>  'gd-html',
624
+			'icon' =>  'fa fa-code',
625
+			'name'  =>  __('HTML', 'geodirectory'),
626
+			'description' =>  __('Adds a html input textarea', 'geodirectory')
627
+		),
628
+		'file' => array(
629
+			'field_type'  =>  'file',
630
+			'class' =>  'gd-file',
631
+			'icon' =>  'fa fa-file',
632
+			'name'  =>  __('File Upload', 'geodirectory'),
633
+			'description' =>  __('Adds a file input', 'geodirectory')
634
+		)
635
+	);
636
+
637
+	/**
638
+	 * Filter the custom fields array to be able to add or remove items.
639
+	 * 
640
+	 * @since 1.6.6
641
+	 *
642
+	 * @param array $custom_fields {
643
+	 *     The custom fields array to be filtered.
644
+	 *
645
+	 *     @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file.
646
+	 *     @type string $class The class for the field in backend.
647
+	 *     @type string $icon Can be font-awesome class name or icon image url.
648
+	 *     @type string $name The name of the field.
649
+	 *     @type string $description A short description about the field.
650
+	 *     @type array $defaults {
651
+	 *                    Optional. Used to set the default value of the field.
652
+	 *
653
+	 *                    @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE
654
+	 *                    @type int decimal_point limit if using FLOAT data_type
655
+	 *                    @type string admin_title The admin title for the field.
656
+	 *                    @type string site_title This will be the title for the field on the frontend.
657
+	 *                    @type string admin_desc This will be shown below the field on the add listing form.
658
+	 *                    @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.
659
+	 *                    @type bool is_active If false the field will not be displayed anywhere.
660
+	 *                    @type bool for_admin_use If true then only site admin can see and edit this field.
661
+	 *                    @type string default_value The default value for the input on the add listing page.
662
+	 *                    @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble]
663
+	 *                    @type bool is_required If true the field will be required on the add listing page.
664
+	 *                    @type string option_values The option values for select and multiselect only
665
+	 *                    @type string validation_pattern HTML5 validation pattern (text input only by default).
666
+	 *                    @type string validation_msg HTML5 validation message (text input only by default).
667
+	 *                    @type string required_msg Required warning message.
668
+	 *                    @type string field_icon Icon url or font awesome class.
669
+	 *                    @type string css_class Field custom css class for field custom style.
670
+	 *                    @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option.
671
+	 *                    @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required)
672
+	 *     }
673
+	 * }
674
+	 * @param string $post_type The post type requested.
675
+	 */
676
+	return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
677 677
 }
678 678
 
679 679
 /**
@@ -686,19 +686,19 @@  discard block
 block discarded – undo
686 686
  */
687 687
 function geodir_custom_available_fields($type='')
688 688
 {
689
-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
690
-    ?>
689
+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
690
+	?>
691 691
     <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>
692 692
     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" />
693 693
 
694 694
         <?php
695
-        if($type=='predefined'){
696
-            $cfs = geodir_custom_fields_predefined($listing_type);
697
-        }elseif($type=='custom'){
698
-            $cfs = geodir_custom_fields_custom($listing_type);
699
-        }else{
700
-            $cfs = geodir_custom_fields($listing_type);
701
-            ?>
695
+		if($type=='predefined'){
696
+			$cfs = geodir_custom_fields_predefined($listing_type);
697
+		}elseif($type=='custom'){
698
+			$cfs = geodir_custom_fields_custom($listing_type);
699
+		}else{
700
+			$cfs = geodir_custom_fields($listing_type);
701
+			?>
702 702
             <ul class="full gd-cf-tooltip-wrap">
703 703
                 <li>
704 704
                     <div class="gdcf-tooltip">
@@ -719,18 +719,18 @@  discard block
 block discarded – undo
719 719
             </ul>
720 720
 
721 721
             <?php
722
-        }
722
+		}
723 723
 
724
-    if(!empty($cfs)) {
724
+	if(!empty($cfs)) {
725 725
 
726
-        foreach ( $cfs as $id => $cf ) {
727
-            ?>
726
+		foreach ( $cfs as $id => $cf ) {
727
+			?>
728 728
             <ul>
729 729
             <li class="gd-cf-tooltip-wrap">
730 730
                 <?php
731
-                if ( isset( $cf['description'] ) && $cf['description'] ) {
732
-                    echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';
733
-                } ?>
731
+				if ( isset( $cf['description'] ) && $cf['description'] ) {
732
+					echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';
733
+				} ?>
734 734
 
735 735
                 <a id="gd-<?php echo $id; ?>"
736 736
                    data-field-custom-type="<?php echo $type; ?>"
@@ -740,21 +740,21 @@  discard block
 block discarded – undo
740 740
                    href="javascript:void(0);">
741 741
 
742 742
                     <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {
743
-                        echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';
744
-                    } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
745
-                        echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';
746
-                    } else {
747
-                        echo '<i class="fa fa-cog" aria-hidden="true"></i>';
748
-                    } ?>
743
+						echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';
744
+					} elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
745
+						echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';
746
+					} else {
747
+						echo '<i class="fa fa-cog" aria-hidden="true"></i>';
748
+					} ?>
749 749
                     <?php echo $cf['name']; ?>
750 750
                 </a>
751 751
             </li>
752 752
             <?php
753
-        }
754
-    }else{
755
-        _e('There are no custom fields here yet.', 'geodirectory');
756
-    }
757
-        ?>
753
+		}
754
+	}else{
755
+		_e('There are no custom fields here yet.', 'geodirectory');
756
+	}
757
+		?>
758 758
 
759 759
 
760 760
     </ul>
@@ -773,26 +773,26 @@  discard block
 block discarded – undo
773 773
  */
774 774
 function geodir_custom_selected_fields()
775 775
 {
776
-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
777
-    ?>
776
+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
777
+	?>
778 778
     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>
779 779
     <ul class="core">
780 780
     <?php 
781
-        global $wpdb;
782
-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
783
-
784
-        if (!empty($fields)) {
785
-            foreach ($fields as $field) {
786
-                //$result_str = $field->id;
787
-                $result_str = $field;
788
-                $field_type = $field->field_type;
789
-                $field_type_key = $field->field_type_key;
790
-                $field_ins_upd = 'display';
791
-
792
-                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);
793
-            }
794
-        }
795
-        ?></ul>
781
+		global $wpdb;
782
+		$fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
783
+
784
+		if (!empty($fields)) {
785
+			foreach ($fields as $field) {
786
+				//$result_str = $field->id;
787
+				$result_str = $field;
788
+				$field_type = $field->field_type;
789
+				$field_type_key = $field->field_type_key;
790
+				$field_ins_upd = 'display';
791
+
792
+				geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);
793
+			}
794
+		}
795
+		?></ul>
796 796
 <?php
797 797
 
798 798
 }
@@ -811,16 +811,16 @@  discard block
 block discarded – undo
811 811
 function geodir_custom_fields_panel_head($heading, $sub_tab, $listing_type)
812 812
 {
813 813
 
814
-    switch ($sub_tab) {
815
-        case 'custom_fields':
816
-            $heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type));
817
-            break;
814
+	switch ($sub_tab) {
815
+		case 'custom_fields':
816
+			$heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type));
817
+			break;
818 818
 
819
-        case 'sorting_options':
820
-            $heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type));
821
-            break;
822
-    }
823
-    return $heading;
819
+		case 'sorting_options':
820
+			$heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type));
821
+			break;
822
+	}
823
+	return $heading;
824 824
 }
825 825
 
826 826
 
@@ -838,16 +838,16 @@  discard block
 block discarded – undo
838 838
 function geodir_cf_panel_available_fields_head($heading, $sub_tab, $listing_type)
839 839
 {
840 840
 
841
-    switch ($sub_tab) {
842
-        case 'custom_fields':
843
-            $heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type));
844
-            break;
841
+	switch ($sub_tab) {
842
+		case 'custom_fields':
843
+			$heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type));
844
+			break;
845 845
 
846
-        case 'sorting_options':
847
-            $heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type));
848
-            break;
849
-    }
850
-    return $heading;
846
+		case 'sorting_options':
847
+			$heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type));
848
+			break;
849
+	}
850
+	return $heading;
851 851
 }
852 852
 
853 853
 
@@ -865,16 +865,16 @@  discard block
 block discarded – undo
865 865
 function geodir_cf_panel_available_fields_note($note, $sub_tab, $listing_type)
866 866
 {
867 867
 
868
-    switch ($sub_tab) {
869
-        case 'custom_fields':
870
-            $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type));;
871
-            break;
868
+	switch ($sub_tab) {
869
+		case 'custom_fields':
870
+			$note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type));;
871
+			break;
872 872
 
873
-        case 'sorting_options':
874
-            $note = sprintf(__('Click on any box below to make it appear in the sorting option dropdown on %s listing and search results.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type));
875
-            break;
876
-    }
877
-    return $note;
873
+		case 'sorting_options':
874
+			$note = sprintf(__('Click on any box below to make it appear in the sorting option dropdown on %s listing and search results.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type));
875
+			break;
876
+	}
877
+	return $note;
878 878
 }
879 879
 
880 880
 
@@ -892,16 +892,16 @@  discard block
 block discarded – undo
892 892
 function geodir_cf_panel_selected_fields_head($heading, $sub_tab, $listing_type)
893 893
 {
894 894
 
895
-    switch ($sub_tab) {
896
-        case 'custom_fields':
897
-            $heading = sprintf(__('List of fields that will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type));
898
-            break;
895
+	switch ($sub_tab) {
896
+		case 'custom_fields':
897
+			$heading = sprintf(__('List of fields that will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type));
898
+			break;
899 899
 
900
-        case 'sorting_options':
901
-            $heading = sprintf(__('List of fields that will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type));
902
-            break;
903
-    }
904
-    return $heading;
900
+		case 'sorting_options':
901
+			$heading = sprintf(__('List of fields that will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type));
902
+			break;
903
+	}
904
+	return $heading;
905 905
 }
906 906
 
907 907
 
@@ -919,16 +919,16 @@  discard block
 block discarded – undo
919 919
 function geodir_cf_panel_selected_fields_note($note, $sub_tab, $listing_type)
920 920
 {
921 921
 
922
-    switch ($sub_tab) {
923
-        case 'custom_fields':
924
-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type));;
925
-            break;
922
+	switch ($sub_tab) {
923
+		case 'custom_fields':
924
+			$note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type));;
925
+			break;
926 926
 
927
-        case 'sorting_options':
928
-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing and search results page.', 'geodirectory'), get_post_type_singular_label($listing_type));
929
-            break;
930
-    }
931
-    return $note;
927
+		case 'sorting_options':
928
+			$note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing and search results page.', 'geodirectory'), get_post_type_singular_label($listing_type));
929
+			break;
930
+	}
931
+	return $note;
932 932
 }
933 933
 
934 934
 
@@ -944,16 +944,16 @@  discard block
 block discarded – undo
944 944
  */
945 945
 function geodir_remove_unnecessary_fields()
946 946
 {
947
-    global $wpdb, $plugin_prefix;
947
+	global $wpdb, $plugin_prefix;
948 948
 
949
-    if (!get_option('geodir_remove_unnecessary_fields')) {
949
+	if (!get_option('geodir_remove_unnecessary_fields')) {
950 950
 
951
-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
952
-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
951
+		if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
952
+			$wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
953 953
 
954
-        update_option('geodir_remove_unnecessary_fields', '1');
954
+		update_option('geodir_remove_unnecessary_fields', '1');
955 955
 
956
-    }
956
+	}
957 957
 
958 958
 }
959 959
 
@@ -971,25 +971,25 @@  discard block
 block discarded – undo
971 971
  */
972 972
 function geodir_admin_ajax_handler()
973 973
 {
974
-    if (isset($_REQUEST['geodir_admin_ajax_action']) && $_REQUEST['geodir_admin_ajax_action'] != '') {
975
-        $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];
976
-        switch ($geodir_admin_ajax_action) {
977
-            case 'diagnosis' :
978
-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')
979
-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
980
-                call_user_func('geodir_diagnose_' . $diagnose_this);
981
-                exit();
982
-                break;
983
-
984
-            case 'diagnosis-fix' :
985
-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')
986
-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
987
-                call_user_func('geodir_diagnose_' . $diagnose_this);
988
-                exit();
989
-                break;
990
-        }
991
-    }
992
-    exit();
974
+	if (isset($_REQUEST['geodir_admin_ajax_action']) && $_REQUEST['geodir_admin_ajax_action'] != '') {
975
+		$geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];
976
+		switch ($geodir_admin_ajax_action) {
977
+			case 'diagnosis' :
978
+				if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')
979
+					$diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
980
+				call_user_func('geodir_diagnose_' . $diagnose_this);
981
+				exit();
982
+				break;
983
+
984
+			case 'diagnosis-fix' :
985
+				if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')
986
+					$diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
987
+				call_user_func('geodir_diagnose_' . $diagnose_this);
988
+				exit();
989
+				break;
990
+		}
991
+	}
992
+	exit();
993 993
 }
994 994
 
995 995
 
@@ -1007,127 +1007,127 @@  discard block
 block discarded – undo
1007 1007
  */
1008 1008
 function geodir_diagnose_multisite_table($filter_arr, $table, $tabel_name, $fix)
1009 1009
 {
1010
-    global $wpdb;
1011
-    //$filter_arr['output_str'] .='###'.$table.'###';
1012
-    if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
1013
-        $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
1014
-        $filter_arr['is_error_during_diagnose'] = true;
1015
-
1016
-    } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
1017
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
1018
-        $filter_arr['is_error_during_diagnose'] = true;
1019
-        $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
1020
-        $filter_arr['is_error_during_diagnose'] = true;
1021
-
1022
-        if ($fix) {
1023
-            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
1024
-            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
1025
-
1026
-            if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
1027
-                //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
1028
-
1029
-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
1030
-
1031
-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
1032
-                    $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
1033
-                } else {
1034
-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1035
-                }
1036
-
1037
-            } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
1038
-
1039
-                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
1040
-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
1041
-
1042
-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1043
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
1044
-                } else {
1045
-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1046
-                }
1047
-
1048
-            } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
1049
-
1050
-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
1051
-
1052
-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
1053
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
1054
-                } else {
1055
-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1056
-                }
1057
-
1058
-            }
1059
-
1060
-        }
1061
-
1062
-
1063
-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
1064
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
1065
-        $filter_arr['is_error_during_diagnose'] = true;
1066
-
1067
-        if ($fix) {
1068
-            if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
1069
-                if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
1070
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
1071
-                } else {
1072
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
1073
-                }
1074
-
1075
-            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
1076
-                if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
1077
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
1078
-                } else {
1079
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
1080
-                }
1081
-                if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1082
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1083
-                } else {
1084
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1085
-                }
1086
-            } else {// else rename the original table to _ms_bak
1087
-                if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1088
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
1089
-                } else {
1090
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
1091
-                }
1092
-            }
1093
-        }
1094
-
1095
-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
1096
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
1097
-        $filter_arr['is_error_during_diagnose'] = true;
1098
-
1099
-        if ($fix) {
1100
-            // if original table exists but new does not, rename
1101
-            if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1102
-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1103
-            } else {
1104
-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1105
-            }
1106
-
1107
-        }
1108
-
1109
-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
1110
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
1111
-        $filter_arr['is_error_during_diagnose'] = true;
1112
-
1113
-        if ($fix) {
1114
-            // if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run;
1115
-            delete_option('geodirlocation_db_version');
1116
-            delete_option('geodirevents_db_version');
1117
-            delete_option('geodir_reviewrating_db_version');
1118
-            delete_option('gdevents_db_version');
1119
-            delete_option('geodirectory_db_version');
1120
-            delete_option('geodirclaim_db_version');
1121
-            delete_option('geodir_custom_posts_db_version');
1122
-            delete_option('geodir_reviewratings_db_version');
1123
-            delete_option('geodiradvancesearch_db_version');
1124
-            $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
1125
-        }
1126
-
1127
-    } else {
1128
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
1129
-    }
1130
-    return $filter_arr;
1010
+	global $wpdb;
1011
+	//$filter_arr['output_str'] .='###'.$table.'###';
1012
+	if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
1013
+		$filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
1014
+		$filter_arr['is_error_during_diagnose'] = true;
1015
+
1016
+	} elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
1017
+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
1018
+		$filter_arr['is_error_during_diagnose'] = true;
1019
+		$filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
1020
+		$filter_arr['is_error_during_diagnose'] = true;
1021
+
1022
+		if ($fix) {
1023
+			$ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
1024
+			$new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
1025
+
1026
+			if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
1027
+				//$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
1028
+
1029
+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
1030
+
1031
+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
1032
+					$filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
1033
+				} else {
1034
+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1035
+				}
1036
+
1037
+			} elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
1038
+
1039
+				$wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
1040
+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
1041
+
1042
+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1043
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
1044
+				} else {
1045
+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1046
+				}
1047
+
1048
+			} elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
1049
+
1050
+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
1051
+
1052
+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
1053
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
1054
+				} else {
1055
+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1056
+				}
1057
+
1058
+			}
1059
+
1060
+		}
1061
+
1062
+
1063
+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
1064
+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
1065
+		$filter_arr['is_error_during_diagnose'] = true;
1066
+
1067
+		if ($fix) {
1068
+			if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
1069
+				if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
1070
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
1071
+				} else {
1072
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
1073
+				}
1074
+
1075
+			} elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
1076
+				if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
1077
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
1078
+				} else {
1079
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
1080
+				}
1081
+				if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1082
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1083
+				} else {
1084
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1085
+				}
1086
+			} else {// else rename the original table to _ms_bak
1087
+				if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1088
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
1089
+				} else {
1090
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
1091
+				}
1092
+			}
1093
+		}
1094
+
1095
+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
1096
+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
1097
+		$filter_arr['is_error_during_diagnose'] = true;
1098
+
1099
+		if ($fix) {
1100
+			// if original table exists but new does not, rename
1101
+			if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1102
+				$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1103
+			} else {
1104
+				$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1105
+			}
1106
+
1107
+		}
1108
+
1109
+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
1110
+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
1111
+		$filter_arr['is_error_during_diagnose'] = true;
1112
+
1113
+		if ($fix) {
1114
+			// if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run;
1115
+			delete_option('geodirlocation_db_version');
1116
+			delete_option('geodirevents_db_version');
1117
+			delete_option('geodir_reviewrating_db_version');
1118
+			delete_option('gdevents_db_version');
1119
+			delete_option('geodirectory_db_version');
1120
+			delete_option('geodirclaim_db_version');
1121
+			delete_option('geodir_custom_posts_db_version');
1122
+			delete_option('geodir_reviewratings_db_version');
1123
+			delete_option('geodiradvancesearch_db_version');
1124
+			$filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
1125
+		}
1126
+
1127
+	} else {
1128
+		$filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
1129
+	}
1130
+	return $filter_arr;
1131 1131
 }
1132 1132
 
1133 1133
 
@@ -1141,53 +1141,53 @@  discard block
 block discarded – undo
1141 1141
  */
1142 1142
 function geodir_diagnose_tags_sync()
1143 1143
 {
1144
-    global $wpdb, $plugin_prefix;
1145
-    $fix = isset($_POST['fix']) ? true : false;
1146
-
1147
-    //if($fix){echo 'true';}else{echo 'false';}
1148
-    $is_error_during_diagnose = false;
1149
-    $output_str = '';
1150
-
1151
-
1152
-    $all_postypes = geodir_get_posttypes();
1153
-
1154
-    if (!empty($all_postypes)) {
1155
-        foreach ($all_postypes as $key) {
1156
-            // update each GD CPT
1157
-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");
1158
-
1159
-            if (!empty($posts)) {
1160
-
1161
-                foreach ($posts as $p) {
1162
-                    $p->post_type = $key;
1163
-                    $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
1164
-                    if (empty($raw_tags)) {
1165
-                        $post_tags = '';
1166
-                    } else {
1167
-                        $post_tags = implode(",", $raw_tags);
1168
-                    }
1169
-                    $tablename = $plugin_prefix . $p->post_type . '_detail';
1170
-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
1171
-
1172
-                }
1173
-                $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
1174
-            }
1175
-
1176
-        }
1177
-
1178
-    }
1179
-
1180
-    if ($is_error_during_diagnose) {
1181
-        $info_div_class = "geodir_problem_info";
1182
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1183
-    } else {
1184
-        $info_div_class = "geodir_noproblem_info";
1185
-        $fix_button_txt = '';
1186
-    }
1187
-    echo "<ul class='$info_div_class'>";
1188
-    echo $output_str;
1189
-    echo $fix_button_txt;
1190
-    echo "</ul>";
1144
+	global $wpdb, $plugin_prefix;
1145
+	$fix = isset($_POST['fix']) ? true : false;
1146
+
1147
+	//if($fix){echo 'true';}else{echo 'false';}
1148
+	$is_error_during_diagnose = false;
1149
+	$output_str = '';
1150
+
1151
+
1152
+	$all_postypes = geodir_get_posttypes();
1153
+
1154
+	if (!empty($all_postypes)) {
1155
+		foreach ($all_postypes as $key) {
1156
+			// update each GD CPT
1157
+			$posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");
1158
+
1159
+			if (!empty($posts)) {
1160
+
1161
+				foreach ($posts as $p) {
1162
+					$p->post_type = $key;
1163
+					$raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
1164
+					if (empty($raw_tags)) {
1165
+						$post_tags = '';
1166
+					} else {
1167
+						$post_tags = implode(",", $raw_tags);
1168
+					}
1169
+					$tablename = $plugin_prefix . $p->post_type . '_detail';
1170
+					$wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
1171
+
1172
+				}
1173
+				$output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
1174
+			}
1175
+
1176
+		}
1177
+
1178
+	}
1179
+
1180
+	if ($is_error_during_diagnose) {
1181
+		$info_div_class = "geodir_problem_info";
1182
+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1183
+	} else {
1184
+		$info_div_class = "geodir_noproblem_info";
1185
+		$fix_button_txt = '';
1186
+	}
1187
+	echo "<ul class='$info_div_class'>";
1188
+	echo $output_str;
1189
+	echo $fix_button_txt;
1190
+	echo "</ul>";
1191 1191
 
1192 1192
 }
1193 1193
 
@@ -1203,75 +1203,75 @@  discard block
 block discarded – undo
1203 1203
  */
1204 1204
 function geodir_diagnose_cats_sync()
1205 1205
 {
1206
-    global $wpdb, $plugin_prefix;
1207
-    $fix = isset($_POST['fix']) ? true : false;
1206
+	global $wpdb, $plugin_prefix;
1207
+	$fix = isset($_POST['fix']) ? true : false;
1208 1208
 
1209
-    //if($fix){echo 'true';}else{echo 'false';}
1210
-    $is_error_during_diagnose = false;
1211
-    $output_str = '';
1209
+	//if($fix){echo 'true';}else{echo 'false';}
1210
+	$is_error_during_diagnose = false;
1211
+	$output_str = '';
1212 1212
 
1213 1213
 
1214
-    $all_postypes = geodir_get_posttypes();
1214
+	$all_postypes = geodir_get_posttypes();
1215 1215
 
1216
-    if (!empty($all_postypes)) {
1217
-        foreach ($all_postypes as $key) {
1218
-            // update each GD CTP
1219
-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
1216
+	if (!empty($all_postypes)) {
1217
+		foreach ($all_postypes as $key) {
1218
+			// update each GD CTP
1219
+			$posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
1220 1220
 
1221
-            if (!empty($posts)) {
1221
+			if (!empty($posts)) {
1222 1222
 
1223
-                foreach ($posts as $p) {
1224
-                    $p->post_type = $key;
1225
-                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
1223
+				foreach ($posts as $p) {
1224
+					$p->post_type = $key;
1225
+					$raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
1226 1226
 
1227
-                    if (empty($raw_cats)) {
1228
-                        $post_categories = get_post_meta($p->post_id, 'post_categories', true);
1227
+					if (empty($raw_cats)) {
1228
+						$post_categories = get_post_meta($p->post_id, 'post_categories', true);
1229 1229
 
1230
-                        if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
1231
-                            $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
1232
-                            foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
1233
-                                if (is_numeric($cat_part)) {
1234
-                                    $raw_cats[] = (int)$cat_part;
1235
-                                }
1236
-                            }
1230
+						if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
1231
+							$post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
1232
+							foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
1233
+								if (is_numeric($cat_part)) {
1234
+									$raw_cats[] = (int)$cat_part;
1235
+								}
1236
+							}
1237 1237
 
1238
-                        }
1238
+						}
1239 1239
 
1240
-                        if (!empty($raw_cats)) {
1241
-                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');
1240
+						if (!empty($raw_cats)) {
1241
+							$term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');
1242 1242
 
1243
-                        }
1243
+						}
1244 1244
 
1245
-                    }
1245
+					}
1246 1246
 
1247 1247
 
1248
-                    if (empty($raw_cats)) {
1249
-                        $post_cats = '';
1250
-                    } else {
1251
-                        $post_cats = ',' . implode(",", $raw_cats) . ',';
1252
-                    }
1253
-                    $tablename = $plugin_prefix . $p->post_type . '_detail';
1254
-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
1255
-                }
1248
+					if (empty($raw_cats)) {
1249
+						$post_cats = '';
1250
+					} else {
1251
+						$post_cats = ',' . implode(",", $raw_cats) . ',';
1252
+					}
1253
+					$tablename = $plugin_prefix . $p->post_type . '_detail';
1254
+					$wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
1255
+				}
1256 1256
 
1257
-            }
1258
-            $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
1257
+			}
1258
+			$output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
1259 1259
 
1260
-        }
1260
+		}
1261 1261
 
1262
-    }
1262
+	}
1263 1263
 
1264
-    if ($is_error_during_diagnose) {
1265
-        $info_div_class = "geodir_problem_info";
1266
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1267
-    } else {
1268
-        $info_div_class = "geodir_noproblem_info";
1269
-        $fix_button_txt = '';
1270
-    }
1271
-    echo "<ul class='$info_div_class'>";
1272
-    echo $output_str;
1273
-    echo $fix_button_txt;
1274
-    echo "</ul>";
1264
+	if ($is_error_during_diagnose) {
1265
+		$info_div_class = "geodir_problem_info";
1266
+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1267
+	} else {
1268
+		$info_div_class = "geodir_noproblem_info";
1269
+		$fix_button_txt = '';
1270
+	}
1271
+	echo "<ul class='$info_div_class'>";
1272
+	echo $output_str;
1273
+	echo $fix_button_txt;
1274
+	echo "</ul>";
1275 1275
 
1276 1276
 }
1277 1277
 
@@ -1285,61 +1285,61 @@  discard block
 block discarded – undo
1285 1285
  */
1286 1286
 function geodir_diagnose_version_clear()
1287 1287
 {
1288
-    global $wpdb, $plugin_prefix;
1289
-    $fix = isset($_POST['fix']) ? true : false;
1290
-
1291
-    //if($fix){echo 'true';}else{echo 'false';}
1292
-    $is_error_during_diagnose = false;
1293
-    $output_str = '';
1294
-
1295
-
1296
-    $gd_arr = array('GeoDirectory' => 'geodirectory_db_version',
1297
-        'Payment Manager' => 'geodir_payments_db_version',
1298
-        'GeoDirectory Framework' => 'gdf_db_version',
1299
-        'Advanced Search' => 'geodiradvancesearch_db_version',
1300
-        'Review Rating Manager' => 'geodir_reviewratings_db_version',
1301
-        'Claim Manager' => 'geodirclaim_db_version',
1302
-        'CPT Manager' => 'geodir_custom_posts_db_version',
1303
-        'Location Manager' => 'geodirlocation_db_version',
1304
-        'Payment Manager' => 'geodir_payments_db_version',
1305
-        'Events Manager' => 'geodirevents_db_version',
1306
-    );
1307
-
1308
-    /**
1309
-     * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers.
1310
-     *
1311
-     * @since 1.0.0
1312
-     * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...
1313
-     */
1314
-    $ver_arr = apply_filters('geodir_db_version_name', $gd_arr);
1315
-
1316
-    if (!empty($ver_arr)) {
1317
-        foreach ($ver_arr as $key => $val) {
1318
-            if (delete_option($val)) {
1319
-                $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
1320
-            } else {
1321
-                $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
1322
-            }
1323
-
1324
-        }
1325
-
1326
-        if ($output_str) {
1327
-            $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
1328
-        }
1329
-
1330
-    }
1331
-
1332
-    if ($is_error_during_diagnose) {
1333
-        $info_div_class = "geodir_problem_info";
1334
-        $fix_button_txt = "";
1335
-    } else {
1336
-        $info_div_class = "geodir_noproblem_info";
1337
-        $fix_button_txt = '';
1338
-    }
1339
-    echo "<ul class='$info_div_class'>";
1340
-    echo $output_str;
1341
-    echo $fix_button_txt;
1342
-    echo "</ul>";
1288
+	global $wpdb, $plugin_prefix;
1289
+	$fix = isset($_POST['fix']) ? true : false;
1290
+
1291
+	//if($fix){echo 'true';}else{echo 'false';}
1292
+	$is_error_during_diagnose = false;
1293
+	$output_str = '';
1294
+
1295
+
1296
+	$gd_arr = array('GeoDirectory' => 'geodirectory_db_version',
1297
+		'Payment Manager' => 'geodir_payments_db_version',
1298
+		'GeoDirectory Framework' => 'gdf_db_version',
1299
+		'Advanced Search' => 'geodiradvancesearch_db_version',
1300
+		'Review Rating Manager' => 'geodir_reviewratings_db_version',
1301
+		'Claim Manager' => 'geodirclaim_db_version',
1302
+		'CPT Manager' => 'geodir_custom_posts_db_version',
1303
+		'Location Manager' => 'geodirlocation_db_version',
1304
+		'Payment Manager' => 'geodir_payments_db_version',
1305
+		'Events Manager' => 'geodirevents_db_version',
1306
+	);
1307
+
1308
+	/**
1309
+	 * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers.
1310
+	 *
1311
+	 * @since 1.0.0
1312
+	 * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...
1313
+	 */
1314
+	$ver_arr = apply_filters('geodir_db_version_name', $gd_arr);
1315
+
1316
+	if (!empty($ver_arr)) {
1317
+		foreach ($ver_arr as $key => $val) {
1318
+			if (delete_option($val)) {
1319
+				$output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
1320
+			} else {
1321
+				$output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
1322
+			}
1323
+
1324
+		}
1325
+
1326
+		if ($output_str) {
1327
+			$output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
1328
+		}
1329
+
1330
+	}
1331
+
1332
+	if ($is_error_during_diagnose) {
1333
+		$info_div_class = "geodir_problem_info";
1334
+		$fix_button_txt = "";
1335
+	} else {
1336
+		$info_div_class = "geodir_noproblem_info";
1337
+		$fix_button_txt = '';
1338
+	}
1339
+	echo "<ul class='$info_div_class'>";
1340
+	echo $output_str;
1341
+	echo $fix_button_txt;
1342
+	echo "</ul>";
1343 1343
 
1344 1344
 }
1345 1345
 
@@ -1353,59 +1353,59 @@  discard block
 block discarded – undo
1353 1353
  */
1354 1354
 function geodir_diagnose_ratings()
1355 1355
 {
1356
-    global $wpdb;
1357
-    $fix = isset($_POST['fix']) ? true : false;
1358
-
1359
-    //if($fix){echo 'true';}else{echo 'false';}
1360
-    $is_error_during_diagnose = false;
1361
-    $output_str = '';
1362
-
1363
-    // check review locations
1364
-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
1365
-        $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
1366
-        $is_error_during_diagnose = true;
1367
-
1368
-        if ($fix) {
1369
-            if (geodir_fix_review_location()) {
1370
-                $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
1371
-            } else {
1372
-                $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
1373
-            }
1374
-        }
1375
-
1376
-    } else {
1377
-        $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
1378
-    }
1379
-
1380
-    // check review content
1381
-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
1382
-        $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
1383
-        $is_error_during_diagnose = true;
1384
-
1385
-        if ($fix) {
1386
-            if (geodir_fix_review_content()) {
1387
-                $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
1388
-            } else {
1389
-                $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
1390
-            }
1391
-        }
1392
-
1393
-    } else {
1394
-        $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
1395
-    }
1396
-
1397
-
1398
-    if ($is_error_during_diagnose) {
1399
-        $info_div_class = "geodir_problem_info";
1400
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1401
-    } else {
1402
-        $info_div_class = "geodir_noproblem_info";
1403
-        $fix_button_txt = '';
1404
-    }
1405
-    echo "<ul class='$info_div_class'>";
1406
-    echo $output_str;
1407
-    echo $fix_button_txt;
1408
-    echo "</ul>";
1356
+	global $wpdb;
1357
+	$fix = isset($_POST['fix']) ? true : false;
1358
+
1359
+	//if($fix){echo 'true';}else{echo 'false';}
1360
+	$is_error_during_diagnose = false;
1361
+	$output_str = '';
1362
+
1363
+	// check review locations
1364
+	if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
1365
+		$output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
1366
+		$is_error_during_diagnose = true;
1367
+
1368
+		if ($fix) {
1369
+			if (geodir_fix_review_location()) {
1370
+				$output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
1371
+			} else {
1372
+				$output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
1373
+			}
1374
+		}
1375
+
1376
+	} else {
1377
+		$output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
1378
+	}
1379
+
1380
+	// check review content
1381
+	if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
1382
+		$output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
1383
+		$is_error_during_diagnose = true;
1384
+
1385
+		if ($fix) {
1386
+			if (geodir_fix_review_content()) {
1387
+				$output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
1388
+			} else {
1389
+				$output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
1390
+			}
1391
+		}
1392
+
1393
+	} else {
1394
+		$output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
1395
+	}
1396
+
1397
+
1398
+	if ($is_error_during_diagnose) {
1399
+		$info_div_class = "geodir_problem_info";
1400
+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1401
+	} else {
1402
+		$info_div_class = "geodir_noproblem_info";
1403
+		$fix_button_txt = '';
1404
+	}
1405
+	echo "<ul class='$info_div_class'>";
1406
+	echo $output_str;
1407
+	echo $fix_button_txt;
1408
+	echo "</ul>";
1409 1409
 
1410 1410
 }
1411 1411
 
@@ -1419,57 +1419,57 @@  discard block
 block discarded – undo
1419 1419
  */
1420 1420
 function geodir_diagnose_multisite_conversion()
1421 1421
 {
1422
-    global $wpdb;
1423
-    $fix = isset($_POST['fix']) ? true : false;
1424
-    //if($fix){echo 'true';}else{echo 'false';}
1425
-    $is_error_during_diagnose = false;
1426
-    $output_str = '';
1427
-
1428
-    $filter_arr = array();
1429
-    $filter_arr['output_str'] = $output_str;
1430
-    $filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose;
1431
-    $table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),
1432
-        'geodir_custom_fields' => __('Custom fields', 'geodirectory'),
1433
-        'geodir_post_icon' => __('Post icon', 'geodirectory'),
1434
-        'geodir_attachments' => __('Attachments', 'geodirectory'),
1435
-        'geodir_post_review' => __('Reviews', 'geodirectory'),
1436
-        'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),
1437
-        'geodir_gd_place_detail' => __('Place detail', 'geodirectory')
1438
-    );
1439
-
1440
-    // allow other addons to hook in and add their checks
1441
-
1442
-    /**
1443
-     * Filter the array of tables.
1444
-     *
1445
-     * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks.
1446
-     *
1447
-     * @since 1.0.0
1448
-     * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...
1449
-     */
1450
-    $table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);
1451
-
1452
-    foreach ($table_arr as $table => $table_name) {
1453
-        // Diagnose table
1454
-        $filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix);
1455
-    }
1456
-
1457
-
1458
-    $output_str = $filter_arr['output_str'];
1459
-    $is_error_during_diagnose = $filter_arr['is_error_during_diagnose'];
1460
-
1461
-
1462
-    if ($is_error_during_diagnose) {
1463
-        $info_div_class = "geodir_problem_info";
1464
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
1465
-    } else {
1466
-        $info_div_class = "geodir_noproblem_info";
1467
-        $fix_button_txt = '';
1468
-    }
1469
-    echo "<ul class='$info_div_class'>";
1470
-    echo $output_str;
1471
-    echo $fix_button_txt;
1472
-    echo "</ul>";
1422
+	global $wpdb;
1423
+	$fix = isset($_POST['fix']) ? true : false;
1424
+	//if($fix){echo 'true';}else{echo 'false';}
1425
+	$is_error_during_diagnose = false;
1426
+	$output_str = '';
1427
+
1428
+	$filter_arr = array();
1429
+	$filter_arr['output_str'] = $output_str;
1430
+	$filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose;
1431
+	$table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),
1432
+		'geodir_custom_fields' => __('Custom fields', 'geodirectory'),
1433
+		'geodir_post_icon' => __('Post icon', 'geodirectory'),
1434
+		'geodir_attachments' => __('Attachments', 'geodirectory'),
1435
+		'geodir_post_review' => __('Reviews', 'geodirectory'),
1436
+		'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),
1437
+		'geodir_gd_place_detail' => __('Place detail', 'geodirectory')
1438
+	);
1439
+
1440
+	// allow other addons to hook in and add their checks
1441
+
1442
+	/**
1443
+	 * Filter the array of tables.
1444
+	 *
1445
+	 * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks.
1446
+	 *
1447
+	 * @since 1.0.0
1448
+	 * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...
1449
+	 */
1450
+	$table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);
1451
+
1452
+	foreach ($table_arr as $table => $table_name) {
1453
+		// Diagnose table
1454
+		$filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix);
1455
+	}
1456
+
1457
+
1458
+	$output_str = $filter_arr['output_str'];
1459
+	$is_error_during_diagnose = $filter_arr['is_error_during_diagnose'];
1460
+
1461
+
1462
+	if ($is_error_during_diagnose) {
1463
+		$info_div_class = "geodir_problem_info";
1464
+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
1465
+	} else {
1466
+		$info_div_class = "geodir_noproblem_info";
1467
+		$fix_button_txt = '';
1468
+	}
1469
+	echo "<ul class='$info_div_class'>";
1470
+	echo $output_str;
1471
+	echo $fix_button_txt;
1472
+	echo "</ul>";
1473 1473
 }
1474 1474
 
1475 1475
 /**
@@ -1487,39 +1487,39 @@  discard block
 block discarded – undo
1487 1487
  */
1488 1488
 function geodir_fix_virtual_page($slug, $page_title, $old_id, $option)
1489 1489
 {
1490
-    global $wpdb, $current_user;
1491
-
1492
-    if (!empty($old_id)) {
1493
-        wp_delete_post($old_id, true);
1494
-    }//delete post if already there
1495
-    else {
1496
-        $page_found = $wpdb->get_var(
1497
-            $wpdb->prepare(
1498
-                "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",
1499
-                array($slug)
1500
-            )
1501
-        );
1502
-        wp_delete_post($page_found, true);
1503
-
1504
-    }
1505
-
1506
-    $page_data = array(
1507
-        'post_status' => 'publish',
1508
-        'post_type' => 'page',
1509
-        'post_author' => $current_user->ID,
1510
-        'post_name' => $slug,
1511
-        'post_title' => $page_title,
1512
-        'post_content' => '',
1513
-        'post_parent' => 0,
1514
-        'comment_status' => 'closed'
1515
-    );
1516
-    $page_id = wp_insert_post($page_data);
1517
-    update_option($option, $page_id);
1518
-    if ($page_id) {
1519
-        return true;
1520
-    } else {
1521
-        return false;
1522
-    }
1490
+	global $wpdb, $current_user;
1491
+
1492
+	if (!empty($old_id)) {
1493
+		wp_delete_post($old_id, true);
1494
+	}//delete post if already there
1495
+	else {
1496
+		$page_found = $wpdb->get_var(
1497
+			$wpdb->prepare(
1498
+				"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",
1499
+				array($slug)
1500
+			)
1501
+		);
1502
+		wp_delete_post($page_found, true);
1503
+
1504
+	}
1505
+
1506
+	$page_data = array(
1507
+		'post_status' => 'publish',
1508
+		'post_type' => 'page',
1509
+		'post_author' => $current_user->ID,
1510
+		'post_name' => $slug,
1511
+		'post_title' => $page_title,
1512
+		'post_content' => '',
1513
+		'post_parent' => 0,
1514
+		'comment_status' => 'closed'
1515
+	);
1516
+	$page_id = wp_insert_post($page_data);
1517
+	update_option($option, $page_id);
1518
+	if ($page_id) {
1519
+		return true;
1520
+	} else {
1521
+		return false;
1522
+	}
1523 1523
 }
1524 1524
 
1525 1525
 /**
@@ -1531,212 +1531,212 @@  discard block
 block discarded – undo
1531 1531
  */
1532 1532
 function geodir_diagnose_default_pages()
1533 1533
 {
1534
-    global $wpdb;
1535
-    $is_error_during_diagnose = false;
1536
-    $output_str = '';
1537
-    $fix = isset($_POST['fix']) ? true : false;
1538
-
1539
-    //////////////////////////////////
1540
-    /* Diagnose GD Home Page Starts */
1541
-    //////////////////////////////////
1542
-    $option_value = get_option('geodir_home_page');
1543
-    $page = get_post($option_value);
1544
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1545
-
1546
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1547
-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
1548
-    else {
1549
-        $is_error_during_diagnose = true;
1550
-        $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
1551
-        if ($fix) {
1552
-            if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
1553
-                $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
1554
-            } else {
1555
-                $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
1556
-            }
1557
-        }
1558
-    }
1559
-
1560
-    ////////////////////////////////
1561
-    /* Diagnose GD Home Page Ends */
1562
-    ////////////////////////////////
1563
-
1564
-    //////////////////////////////////
1565
-    /* Diagnose Add Listing Page Starts */
1566
-    //////////////////////////////////
1567
-    $option_value = get_option('geodir_add_listing_page');
1568
-    $page = get_post($option_value);
1569
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1570
-
1571
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1572
-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
1573
-    else {
1574
-        $is_error_during_diagnose = true;
1575
-        $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
1576
-        if ($fix) {
1577
-            if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
1578
-                $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
1579
-            } else {
1580
-                $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
1581
-            }
1582
-        }
1583
-    }
1584
-
1585
-    ////////////////////////////////
1586
-    /* Diagnose Add Listing Page Ends */
1587
-    ////////////////////////////////
1588
-
1589
-
1590
-    //////////////////////////////////
1591
-    /* Diagnose Listing Preview Page Starts */
1592
-    //////////////////////////////////
1593
-    $option_value = get_option('geodir_preview_page');
1594
-    $page = get_post($option_value);
1595
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1596
-
1597
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1598
-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
1599
-    else {
1600
-        $is_error_during_diagnose = true;
1601
-        $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
1602
-        if ($fix) {
1603
-            if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
1604
-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
1605
-            } else {
1606
-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
1607
-            }
1608
-        }
1609
-    }
1610
-
1611
-    ////////////////////////////////
1612
-    /* Diagnose Listing Preview Page Ends */
1613
-    ////////////////////////////////
1614
-
1615
-    //////////////////////////////////
1616
-    /* Diagnose Listing Success Page Starts */
1617
-    //////////////////////////////////
1618
-    $option_value = get_option('geodir_success_page');
1619
-    $page = get_post($option_value);
1620
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1621
-
1622
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1623
-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
1624
-    else {
1625
-        $is_error_during_diagnose = true;
1626
-        $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
1627
-        if ($fix) {
1628
-            if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
1629
-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
1630
-            } else {
1631
-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
1632
-            }
1633
-        }
1634
-    }
1635
-
1636
-    ////////////////////////////////
1637
-    /* Diagnose Listing Sucess Page Ends */
1638
-    ////////////////////////////////
1639
-
1640
-    //////////////////////////////////
1641
-    /* Diagnose Info Page Starts */
1642
-    //////////////////////////////////
1643
-    $option_value = get_option('geodir_info_page');
1644
-    $page = get_post($option_value);
1645
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1646
-
1647
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1648
-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
1649
-    else {
1650
-        $is_error_during_diagnose = true;
1651
-        $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
1652
-        if ($fix) {
1653
-            if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
1654
-                $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
1655
-            } else {
1656
-                $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
1657
-            }
1658
-        }
1659
-    }
1660
-
1661
-    ////////////////////////////////
1662
-    /* Diagnose Info Page Ends */
1663
-    ////////////////////////////////
1664
-
1665
-    //////////////////////////////////
1666
-    /* Diagnose Login Page Starts */
1667
-    //////////////////////////////////
1668
-    $option_value = get_option('geodir_login_page');
1669
-    $page = get_post($option_value);
1670
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1671
-
1672
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1673
-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
1674
-    else {
1675
-        $is_error_during_diagnose = true;
1676
-        $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
1677
-        if ($fix) {
1678
-            if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
1679
-                $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
1680
-            } else {
1681
-                $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
1682
-            }
1683
-        }
1684
-    }
1685
-
1686
-    ////////////////////////////////
1687
-    /* Diagnose Info Page Ends */
1688
-    ////////////////////////////////
1689
-
1690
-    //////////////////////////////////
1691
-    /* Diagnose Location Page Starts */
1692
-    //////////////////////////////////
1693
-    $option_value = get_option('geodir_location_page');
1694
-    $page = get_post($option_value);
1695
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1696
-
1697
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1698
-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
1699
-    else {
1700
-        $is_error_during_diagnose = true;
1701
-        $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
1702
-        if ($fix) {
1703
-            if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
1704
-                $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
1705
-            } else {
1706
-                $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
1707
-            }
1708
-        }
1709
-    }
1710
-
1711
-    ////////////////////////////////
1712
-    /* Diagnose Location Page Ends */
1713
-    ////////////////////////////////
1714
-
1715
-    $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
1716
-    /**
1717
-     * This action is called at the end of the GD Tools page check function.
1718
-     *
1719
-     * @since 1.5.2
1720
-     */
1721
-    $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
1722
-
1723
-    $output_str = $page_chk_arr['output_str'];
1724
-    $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];
1725
-
1726
-    if ($is_error_during_diagnose) {
1727
-        if ($fix) {
1728
-            flush_rewrite_rules();
1729
-        }
1730
-        $info_div_class = "geodir_problem_info";
1731
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
1732
-    } else {
1733
-        $info_div_class = "geodir_noproblem_info";
1734
-        $fix_button_txt = '';
1735
-    }
1736
-    echo "<ul class='$info_div_class'>";
1737
-    echo $output_str;
1738
-    echo $fix_button_txt;
1739
-    echo "</ul>";
1534
+	global $wpdb;
1535
+	$is_error_during_diagnose = false;
1536
+	$output_str = '';
1537
+	$fix = isset($_POST['fix']) ? true : false;
1538
+
1539
+	//////////////////////////////////
1540
+	/* Diagnose GD Home Page Starts */
1541
+	//////////////////////////////////
1542
+	$option_value = get_option('geodir_home_page');
1543
+	$page = get_post($option_value);
1544
+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1545
+
1546
+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1547
+		$output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
1548
+	else {
1549
+		$is_error_during_diagnose = true;
1550
+		$output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
1551
+		if ($fix) {
1552
+			if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
1553
+				$output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
1554
+			} else {
1555
+				$output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
1556
+			}
1557
+		}
1558
+	}
1559
+
1560
+	////////////////////////////////
1561
+	/* Diagnose GD Home Page Ends */
1562
+	////////////////////////////////
1563
+
1564
+	//////////////////////////////////
1565
+	/* Diagnose Add Listing Page Starts */
1566
+	//////////////////////////////////
1567
+	$option_value = get_option('geodir_add_listing_page');
1568
+	$page = get_post($option_value);
1569
+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1570
+
1571
+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1572
+		$output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
1573
+	else {
1574
+		$is_error_during_diagnose = true;
1575
+		$output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
1576
+		if ($fix) {
1577
+			if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
1578
+				$output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
1579
+			} else {
1580
+				$output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
1581
+			}
1582
+		}
1583
+	}
1584
+
1585
+	////////////////////////////////
1586
+	/* Diagnose Add Listing Page Ends */
1587
+	////////////////////////////////
1588
+
1589
+
1590
+	//////////////////////////////////
1591
+	/* Diagnose Listing Preview Page Starts */
1592
+	//////////////////////////////////
1593
+	$option_value = get_option('geodir_preview_page');
1594
+	$page = get_post($option_value);
1595
+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1596
+
1597
+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1598
+		$output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
1599
+	else {
1600
+		$is_error_during_diagnose = true;
1601
+		$output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
1602
+		if ($fix) {
1603
+			if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
1604
+				$output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
1605
+			} else {
1606
+				$output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
1607
+			}
1608
+		}
1609
+	}
1610
+
1611
+	////////////////////////////////
1612
+	/* Diagnose Listing Preview Page Ends */
1613
+	////////////////////////////////
1614
+
1615
+	//////////////////////////////////
1616
+	/* Diagnose Listing Success Page Starts */
1617
+	//////////////////////////////////
1618
+	$option_value = get_option('geodir_success_page');
1619
+	$page = get_post($option_value);
1620
+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1621
+
1622
+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1623
+		$output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
1624
+	else {
1625
+		$is_error_during_diagnose = true;
1626
+		$output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
1627
+		if ($fix) {
1628
+			if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
1629
+				$output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
1630
+			} else {
1631
+				$output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
1632
+			}
1633
+		}
1634
+	}
1635
+
1636
+	////////////////////////////////
1637
+	/* Diagnose Listing Sucess Page Ends */
1638
+	////////////////////////////////
1639
+
1640
+	//////////////////////////////////
1641
+	/* Diagnose Info Page Starts */
1642
+	//////////////////////////////////
1643
+	$option_value = get_option('geodir_info_page');
1644
+	$page = get_post($option_value);
1645
+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1646
+
1647
+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1648
+		$output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
1649
+	else {
1650
+		$is_error_during_diagnose = true;
1651
+		$output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
1652
+		if ($fix) {
1653
+			if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
1654
+				$output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
1655
+			} else {
1656
+				$output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
1657
+			}
1658
+		}
1659
+	}
1660
+
1661
+	////////////////////////////////
1662
+	/* Diagnose Info Page Ends */
1663
+	////////////////////////////////
1664
+
1665
+	//////////////////////////////////
1666
+	/* Diagnose Login Page Starts */
1667
+	//////////////////////////////////
1668
+	$option_value = get_option('geodir_login_page');
1669
+	$page = get_post($option_value);
1670
+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1671
+
1672
+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1673
+		$output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
1674
+	else {
1675
+		$is_error_during_diagnose = true;
1676
+		$output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
1677
+		if ($fix) {
1678
+			if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
1679
+				$output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
1680
+			} else {
1681
+				$output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
1682
+			}
1683
+		}
1684
+	}
1685
+
1686
+	////////////////////////////////
1687
+	/* Diagnose Info Page Ends */
1688
+	////////////////////////////////
1689
+
1690
+	//////////////////////////////////
1691
+	/* Diagnose Location Page Starts */
1692
+	//////////////////////////////////
1693
+	$option_value = get_option('geodir_location_page');
1694
+	$page = get_post($option_value);
1695
+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1696
+
1697
+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1698
+		$output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
1699
+	else {
1700
+		$is_error_during_diagnose = true;
1701
+		$output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
1702
+		if ($fix) {
1703
+			if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
1704
+				$output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
1705
+			} else {
1706
+				$output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
1707
+			}
1708
+		}
1709
+	}
1710
+
1711
+	////////////////////////////////
1712
+	/* Diagnose Location Page Ends */
1713
+	////////////////////////////////
1714
+
1715
+	$page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
1716
+	/**
1717
+	 * This action is called at the end of the GD Tools page check function.
1718
+	 *
1719
+	 * @since 1.5.2
1720
+	 */
1721
+	$page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
1722
+
1723
+	$output_str = $page_chk_arr['output_str'];
1724
+	$is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];
1725
+
1726
+	if ($is_error_during_diagnose) {
1727
+		if ($fix) {
1728
+			flush_rewrite_rules();
1729
+		}
1730
+		$info_div_class = "geodir_problem_info";
1731
+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
1732
+	} else {
1733
+		$info_div_class = "geodir_noproblem_info";
1734
+		$fix_button_txt = '';
1735
+	}
1736
+	echo "<ul class='$info_div_class'>";
1737
+	echo $output_str;
1738
+	echo $fix_button_txt;
1739
+	echo "</ul>";
1740 1740
 
1741 1741
 }
1742 1742
 
@@ -1748,26 +1748,26 @@  discard block
 block discarded – undo
1748 1748
  * @global object $wpdb WordPress Database object.
1749 1749
  */
1750 1750
 function geodir_diagnose_load_db_language() {
1751
-    global $wpdb;
1751
+	global $wpdb;
1752 1752
 	
1753 1753
 	$is_error_during_diagnose = geodirectory_load_db_language();
1754 1754
 
1755
-    $output_str = '';
1756
-    $fix_button_txt = '';
1755
+	$output_str = '';
1756
+	$fix_button_txt = '';
1757 1757
 
1758
-    if ($is_error_during_diagnose) {
1759
-        $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
1758
+	if ($is_error_during_diagnose) {
1759
+		$output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
1760 1760
 		$info_div_class = "geodir_problem_info";
1761
-    } else {
1762
-        $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
1761
+	} else {
1762
+		$output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
1763 1763
 		$info_div_class = "geodir_noproblem_info";
1764
-        $fix_button_txt = '';
1765
-    }
1764
+		$fix_button_txt = '';
1765
+	}
1766 1766
     
1767 1767
 	echo "<ul class='$info_div_class'>";
1768
-    echo $output_str;
1769
-    echo $fix_button_txt;
1770
-    echo "</ul>";
1768
+	echo $output_str;
1769
+	echo $fix_button_txt;
1770
+	echo "</ul>";
1771 1771
 
1772 1772
 }
1773 1773
 
@@ -1798,23 +1798,23 @@  discard block
 block discarded – undo
1798 1798
  */
1799 1799
 function geodir_posts_clauses_request($clauses)
1800 1800
 {
1801
-    global $wpdb, $wp_query, $plugin_prefix;
1801
+	global $wpdb, $wp_query, $plugin_prefix;
1802 1802
 
1803
-    if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
1804
-        $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';
1803
+	if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
1804
+		$table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';
1805 1805
 
1806
-        $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';
1807
-        $clauses['join'] = $join;
1806
+		$join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';
1807
+		$clauses['join'] = $join;
1808 1808
 
1809
-        $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';
1810
-        $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';
1811
-        $clauses['fields'] = $fields;
1809
+		$fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';
1810
+		$fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';
1811
+		$clauses['fields'] = $fields;
1812 1812
 
1813
-        $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';
1814
-        $orderby = 'gd_expire ' . $order;
1815
-        $clauses['orderby'] = $orderby;
1816
-    }
1817
-    return $clauses;
1813
+		$order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';
1814
+		$orderby = 'gd_expire ' . $order;
1815
+		$clauses['orderby'] = $orderby;
1816
+	}
1817
+	return $clauses;
1818 1818
 }
1819 1819
 
1820 1820
 
@@ -1835,7 +1835,7 @@  discard block
 block discarded – undo
1835 1835
  */
1836 1836
 function gd_theme_switch_compat_check()
1837 1837
 {
1838
-    gd_set_theme_compat();
1838
+	gd_set_theme_compat();
1839 1839
 }
1840 1840
 
1841 1841
 /**
@@ -1848,27 +1848,27 @@  discard block
 block discarded – undo
1848 1848
  */
1849 1849
 function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")
1850 1850
 {
1851
-    if (function_exists('str_getcsv')) {
1852
-        $fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape);
1853
-    } else {
1854
-        global $current_user;
1855
-        $upload_dir = wp_upload_dir();
1856
-
1857
-        $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';
1858
-        $handle = fopen($file, 'w');
1859
-
1860
-        fwrite($handle, $input);
1861
-        fclose($handle);
1862
-
1863
-        $handle = fopen($file, 'rt');
1864
-        if (PHP_VERSION >= '5.3.0') {
1865
-            $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape);
1866
-        } else {
1867
-            $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure);
1868
-        }
1869
-        fclose($handle);
1870
-    }
1871
-    return $fgetcsv;
1851
+	if (function_exists('str_getcsv')) {
1852
+		$fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape);
1853
+	} else {
1854
+		global $current_user;
1855
+		$upload_dir = wp_upload_dir();
1856
+
1857
+		$file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';
1858
+		$handle = fopen($file, 'w');
1859
+
1860
+		fwrite($handle, $input);
1861
+		fclose($handle);
1862
+
1863
+		$handle = fopen($file, 'rt');
1864
+		if (PHP_VERSION >= '5.3.0') {
1865
+			$fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape);
1866
+		} else {
1867
+			$fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure);
1868
+		}
1869
+		fclose($handle);
1870
+	}
1871
+	return $fgetcsv;
1872 1872
 }
1873 1873
 
1874 1874
 add_action('wp_ajax_gdImportCsv', 'geodir_ajax_import_csv');
@@ -1883,375 +1883,375 @@  discard block
 block discarded – undo
1883 1883
  */
1884 1884
 function geodir_ajax_import_csv()
1885 1885
 {
1886
-    error_reporting(0); // hide error to get clean json response
1886
+	error_reporting(0); // hide error to get clean json response
1887 1887
 
1888
-    global $wpdb, $plugin_prefix, $current_user;
1889
-    $uploads = wp_upload_dir();
1890
-    ini_set('auto_detect_line_endings', true);
1888
+	global $wpdb, $plugin_prefix, $current_user;
1889
+	$uploads = wp_upload_dir();
1890
+	ini_set('auto_detect_line_endings', true);
1891 1891
 	
1892 1892
 	$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.
1893 1893
 
1894
-    $task = isset($_POST['task']) ? $_POST['task'] : '';
1895
-    $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;
1896
-    $filename = $uploadedFile;
1897
-
1898
-    $uploads = wp_upload_dir();
1899
-    $uploads_dir = $uploads['path'];
1900
-    $image_name_arr = explode('/', $filename);
1901
-    $filename = end($image_name_arr);
1902
-    $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1903
-    $return = array();
1904
-    $return['file'] = $uploadedFile;
1905
-    $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
1906
-
1907
-    if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {
1908
-        $wp_filetype = wp_check_filetype_and_ext($target_path, $filename);
1909
-
1910
-        if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
1911
-            $return['error'] = NULL;
1912
-
1913
-            $return['rows'] = 0;
1914
-
1915
-
1916
-
1917
-                if (($handle = fopen($target_path, "r")) !== FALSE) {
1918
-                    while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
1919
-                        if(is_array($data) && !empty($data)) {
1920
-                            $file[] = '"' . implode('","', $data) . '"';
1921
-                        }
1922
-                    }
1923
-                    fclose($handle);
1924
-                    $file = $file;
1925
-                }
1926
-
1927
-
1928
-
1929
-                $return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;
1930
-
1931
-
1932
-            if (!$return['rows'] > 0) {
1933
-                $return['error'] = __('No data found in csv file.', 'geodirectory');
1934
-            }
1935
-        }
1936
-    }
1937
-    if ($task == 'prepare' || !empty($return['error'])) {
1938
-        echo json_encode($return);
1939
-        exit;
1940
-    }
1941
-
1942
-    $totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL;
1943
-    $importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1;
1944
-    $count = $importlimit;
1945
-    $requested_limit = $importlimit;
1946
-    $tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0;
1947
-
1948
-    if ($count < $totRecords) {
1949
-        $count = $tmpCnt + $count;
1950
-        if ($count > $totRecords) {
1951
-            $count = $totRecords;
1952
-        }
1953
-    } else {
1954
-        $count = $totRecords;
1955
-    }
1956
-
1957
-    $total_records = 0;
1958
-    $rowcount = 0;
1959
-    $address_invalid = 0;
1960
-    $blank_address = 0;
1961
-    $upload_files = 0;
1962
-    $invalid_post_type = 0;
1963
-    $invalid_title = 0;
1964
-    $customKeyarray = array();
1965
-    $gd_post_info = array();
1966
-    $post_location = array();
1967
-    $countpost = 0;
1968
-
1969
-    if (!empty($file)) {
1970
-        $columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL;
1971
-        $customKeyarray = $columns;
1972
-
1973
-        if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
1974
-            $return['error'] = CSV_INVAILD_FILE;
1975
-            echo json_encode($return);
1976
-            exit;
1977
-        }
1978
-
1979
-        for ($i = 1; $i <= $importlimit; $i++) {
1980
-            $current_index = $tmpCnt + $i;
1981
-            if (isset($file[$current_index])) {
1982
-                $total_records++;
1983
-
1984
-                $buffer = geodir_str_getcsv($file[$current_index]);
1985
-                $post_title = addslashes($buffer[0]);
1986
-                $current_post_author = $buffer[1];
1987
-                $post_desc = addslashes($buffer[2]);
1988
-                $post_cat = array();
1989
-                $catids_arr = array();
1990
-                $post_cat = trim($buffer[3]); // comma seperated category name
1991
-
1992
-                if ($post_cat) {
1993
-                    $post_cat_arr = explode(',', $post_cat);
1994
-
1995
-                    for ($c = 0; $c < count($post_cat_arr); $c++) {
1996
-                        $catid = wp_kses_normalize_entities(trim($post_cat_arr[$c]));
1997
-
1998
-                        if (!empty($buffer[5])) {
1999
-                            if (in_array($buffer[5], geodir_get_posttypes())) {
2000
-
2001
-                                $p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5]));
2002
-
2003
-                                if (get_term_by('name', $catid, $p_taxonomy[0])) {
2004
-                                    $cat = get_term_by('name', $catid, $p_taxonomy[0]);
2005
-                                    $catids_arr[] = $cat->slug;
2006
-                                } else if (get_term_by('slug', $catid, $p_taxonomy[0])) {
2007
-                                    $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
2008
-                                    $catids_arr[] = $cat->slug;
2009
-                                } else {
2010
-                                    $ret = wp_insert_term($catid, $p_taxonomy[0]);
2011
-                                    if ($ret && !is_wp_error($ret)) {
2012
-                                        if (get_term_by('name', $catid, $p_taxonomy[0])) {
2013
-                                            $cat = get_term_by('name', $catid, $p_taxonomy[0]);
2014
-                                            $catids_arr[] = $cat->slug;
2015
-                                        } elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {
2016
-                                            $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
2017
-                                            $catids_arr[] = $cat->slug;
2018
-                                        }
2019
-                                    }
2020
-                                }
2021
-                            }
2022
-                        }
2023
-                    }
2024
-                }
2025
-
2026
-                if (!$catids_arr) {
2027
-                    $catids_arr[] = 1;
2028
-                }
2029
-
2030
-                $post_tags = trim($buffer[4]); // comma seperated tags
2031
-
2032
-                $tag_arr = '';
2033
-                if ($post_tags) {
2034
-                    $tag_arr = explode(',', $post_tags);
2035
-                }
2036
-
2037
-                $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database
2038
-
2039
-                $error = '';
2040
-                if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
2041
-                    $invalid_post_type++;
2042
-                    continue;
2043
-                }
2044
-
2045
-                if ($post_title != '') {
2046
-                    $menu_order = 0;
2047
-                    $image_folder_name = 'uplaod/';
2048
-
2049
-                    $image_names = array();
2050
-
2051
-                    for ($c = 5; $c < count($customKeyarray); $c++) {
2052
-                        $gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]);
2053
-
2054
-                        if ($customKeyarray[$c] == 'IMAGE') {
2055
-                            $buffer[$c] = trim($buffer[$c]);
2056
-
2057
-                            if (!empty($buffer[$c])) {
2058
-                                $image_names[] = $buffer[$c];
2059
-                            }
2060
-                        }
2061
-
2062
-                        if ($customKeyarray[$c] == 'alive_days') {
2063
-                            if ($buffer[$c] != '0' && $buffer[$c] != '') {
2064
-                                $submitdata = date('Y-m-d');
2065
-
2066
-                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
2067
-                            } else {
2068
-                                $gd_post_info['expire_date'] = 'Never';
2069
-                            }
2070
-                        }
2071
-
2072
-                        if ($customKeyarray[$c] == 'post_city') {
2073
-                            $post_city = addslashes($buffer[$c]);
2074
-                        }
2075
-
2076
-                        if ($customKeyarray[$c] == 'post_region') {
2077
-                            $post_region = addslashes($buffer[$c]);
2078
-                        }
2079
-
2080
-                        if ($customKeyarray[$c] == 'post_country') {
2081
-                            $post_country = addslashes($buffer[$c]);
2082
-                        }
2083
-
2084
-                        if ($customKeyarray[$c] == 'post_latitude') {
2085
-                            $post_latitude = addslashes($buffer[$c]);
2086
-                        }
2087
-
2088
-                        if ($customKeyarray[$c] == 'post_longitude') {
2089
-                            $post_longitude = addslashes($buffer[$c]);
2090
-                        }
1894
+	$task = isset($_POST['task']) ? $_POST['task'] : '';
1895
+	$uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;
1896
+	$filename = $uploadedFile;
1897
+
1898
+	$uploads = wp_upload_dir();
1899
+	$uploads_dir = $uploads['path'];
1900
+	$image_name_arr = explode('/', $filename);
1901
+	$filename = end($image_name_arr);
1902
+	$target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1903
+	$return = array();
1904
+	$return['file'] = $uploadedFile;
1905
+	$return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
1906
+
1907
+	if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {
1908
+		$wp_filetype = wp_check_filetype_and_ext($target_path, $filename);
1909
+
1910
+		if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
1911
+			$return['error'] = NULL;
1912
+
1913
+			$return['rows'] = 0;
1914
+
1915
+
1916
+
1917
+				if (($handle = fopen($target_path, "r")) !== FALSE) {
1918
+					while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
1919
+						if(is_array($data) && !empty($data)) {
1920
+							$file[] = '"' . implode('","', $data) . '"';
1921
+						}
1922
+					}
1923
+					fclose($handle);
1924
+					$file = $file;
1925
+				}
1926
+
1927
+
1928
+
1929
+				$return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;
1930
+
1931
+
1932
+			if (!$return['rows'] > 0) {
1933
+				$return['error'] = __('No data found in csv file.', 'geodirectory');
1934
+			}
1935
+		}
1936
+	}
1937
+	if ($task == 'prepare' || !empty($return['error'])) {
1938
+		echo json_encode($return);
1939
+		exit;
1940
+	}
1941
+
1942
+	$totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL;
1943
+	$importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1;
1944
+	$count = $importlimit;
1945
+	$requested_limit = $importlimit;
1946
+	$tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0;
1947
+
1948
+	if ($count < $totRecords) {
1949
+		$count = $tmpCnt + $count;
1950
+		if ($count > $totRecords) {
1951
+			$count = $totRecords;
1952
+		}
1953
+	} else {
1954
+		$count = $totRecords;
1955
+	}
1956
+
1957
+	$total_records = 0;
1958
+	$rowcount = 0;
1959
+	$address_invalid = 0;
1960
+	$blank_address = 0;
1961
+	$upload_files = 0;
1962
+	$invalid_post_type = 0;
1963
+	$invalid_title = 0;
1964
+	$customKeyarray = array();
1965
+	$gd_post_info = array();
1966
+	$post_location = array();
1967
+	$countpost = 0;
1968
+
1969
+	if (!empty($file)) {
1970
+		$columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL;
1971
+		$customKeyarray = $columns;
1972
+
1973
+		if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
1974
+			$return['error'] = CSV_INVAILD_FILE;
1975
+			echo json_encode($return);
1976
+			exit;
1977
+		}
1978
+
1979
+		for ($i = 1; $i <= $importlimit; $i++) {
1980
+			$current_index = $tmpCnt + $i;
1981
+			if (isset($file[$current_index])) {
1982
+				$total_records++;
1983
+
1984
+				$buffer = geodir_str_getcsv($file[$current_index]);
1985
+				$post_title = addslashes($buffer[0]);
1986
+				$current_post_author = $buffer[1];
1987
+				$post_desc = addslashes($buffer[2]);
1988
+				$post_cat = array();
1989
+				$catids_arr = array();
1990
+				$post_cat = trim($buffer[3]); // comma seperated category name
1991
+
1992
+				if ($post_cat) {
1993
+					$post_cat_arr = explode(',', $post_cat);
1994
+
1995
+					for ($c = 0; $c < count($post_cat_arr); $c++) {
1996
+						$catid = wp_kses_normalize_entities(trim($post_cat_arr[$c]));
1997
+
1998
+						if (!empty($buffer[5])) {
1999
+							if (in_array($buffer[5], geodir_get_posttypes())) {
2000
+
2001
+								$p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5]));
2002
+
2003
+								if (get_term_by('name', $catid, $p_taxonomy[0])) {
2004
+									$cat = get_term_by('name', $catid, $p_taxonomy[0]);
2005
+									$catids_arr[] = $cat->slug;
2006
+								} else if (get_term_by('slug', $catid, $p_taxonomy[0])) {
2007
+									$cat = get_term_by('slug', $catid, $p_taxonomy[0]);
2008
+									$catids_arr[] = $cat->slug;
2009
+								} else {
2010
+									$ret = wp_insert_term($catid, $p_taxonomy[0]);
2011
+									if ($ret && !is_wp_error($ret)) {
2012
+										if (get_term_by('name', $catid, $p_taxonomy[0])) {
2013
+											$cat = get_term_by('name', $catid, $p_taxonomy[0]);
2014
+											$catids_arr[] = $cat->slug;
2015
+										} elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {
2016
+											$cat = get_term_by('slug', $catid, $p_taxonomy[0]);
2017
+											$catids_arr[] = $cat->slug;
2018
+										}
2019
+									}
2020
+								}
2021
+							}
2022
+						}
2023
+					}
2024
+				}
2025
+
2026
+				if (!$catids_arr) {
2027
+					$catids_arr[] = 1;
2028
+				}
2029
+
2030
+				$post_tags = trim($buffer[4]); // comma seperated tags
2031
+
2032
+				$tag_arr = '';
2033
+				if ($post_tags) {
2034
+					$tag_arr = explode(',', $post_tags);
2035
+				}
2036
+
2037
+				$table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database
2038
+
2039
+				$error = '';
2040
+				if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
2041
+					$invalid_post_type++;
2042
+					continue;
2043
+				}
2044
+
2045
+				if ($post_title != '') {
2046
+					$menu_order = 0;
2047
+					$image_folder_name = 'uplaod/';
2048
+
2049
+					$image_names = array();
2050
+
2051
+					for ($c = 5; $c < count($customKeyarray); $c++) {
2052
+						$gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]);
2053
+
2054
+						if ($customKeyarray[$c] == 'IMAGE') {
2055
+							$buffer[$c] = trim($buffer[$c]);
2056
+
2057
+							if (!empty($buffer[$c])) {
2058
+								$image_names[] = $buffer[$c];
2059
+							}
2060
+						}
2061
+
2062
+						if ($customKeyarray[$c] == 'alive_days') {
2063
+							if ($buffer[$c] != '0' && $buffer[$c] != '') {
2064
+								$submitdata = date('Y-m-d');
2065
+
2066
+								$gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
2067
+							} else {
2068
+								$gd_post_info['expire_date'] = 'Never';
2069
+							}
2070
+						}
2071
+
2072
+						if ($customKeyarray[$c] == 'post_city') {
2073
+							$post_city = addslashes($buffer[$c]);
2074
+						}
2075
+
2076
+						if ($customKeyarray[$c] == 'post_region') {
2077
+							$post_region = addslashes($buffer[$c]);
2078
+						}
2079
+
2080
+						if ($customKeyarray[$c] == 'post_country') {
2081
+							$post_country = addslashes($buffer[$c]);
2082
+						}
2083
+
2084
+						if ($customKeyarray[$c] == 'post_latitude') {
2085
+							$post_latitude = addslashes($buffer[$c]);
2086
+						}
2087
+
2088
+						if ($customKeyarray[$c] == 'post_longitude') {
2089
+							$post_longitude = addslashes($buffer[$c]);
2090
+						}
2091 2091
 						
2092 2092
 						// Post status
2093 2093
 						if ($customKeyarray[$c] == 'post_status') {
2094
-                            $post_status = sanitize_key( $buffer[$c] );
2095
-                        }
2096
-                    }
2097
-
2098
-                    /* ================ before array create ============== */
2099
-                    $location_result = geodir_get_default_location();
2100
-                    if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {
2101
-                        $blank_address++;
2102
-                        continue;
2103
-                    } else if ($location_result->location_id == 0) {
2104
-                        if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {
2105
-                            $address_invalid++;
2106
-                            continue;
2107
-                        }
2108
-                    }
2094
+							$post_status = sanitize_key( $buffer[$c] );
2095
+						}
2096
+					}
2097
+
2098
+					/* ================ before array create ============== */
2099
+					$location_result = geodir_get_default_location();
2100
+					if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {
2101
+						$blank_address++;
2102
+						continue;
2103
+					} else if ($location_result->location_id == 0) {
2104
+						if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {
2105
+							$address_invalid++;
2106
+							continue;
2107
+						}
2108
+					}
2109 2109
 					
2110 2110
 					// Default post status
2111 2111
 					$default_status = 'publish';
2112 2112
 					$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;
2113 2113
 					$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;
2114 2114
 
2115
-                    $my_post['post_title'] = $post_title;
2116
-                    $my_post['post_content'] = $post_desc;
2117
-                    $my_post['post_type'] = addslashes($buffer[5]);
2118
-                    $my_post['post_author'] = $current_post_author;
2119
-                    $my_post['post_status'] = $post_status;
2120
-                    $my_post['post_category'] = $catids_arr;
2121
-                    $my_post['post_tags'] = $tag_arr;
2122
-
2123
-                    $gd_post_info['post_tags'] = $tag_arr;
2124
-                    $gd_post_info['post_title'] = $post_title;
2125
-                    $gd_post_info['post_status'] = $post_status;
2126
-                    $gd_post_info['submit_time'] = time();
2127
-                    $gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR'];
2128
-
2129
-                    $last_postid = wp_insert_post($my_post);
2130
-                    $countpost++;
2131
-
2132
-                    // Check if we need to save post location as new location
2133
-                    if ($location_result->location_id > 0) {
2134
-                        if (isset($post_city) && isset($post_region)) {
2135
-                            $request_info['post_location'] = array(
2136
-                                'city' => $post_city,
2137
-                                'region' => $post_region,
2138
-                                'country' => $post_country,
2139
-                                'geo_lat' => $post_latitude,
2140
-                                'geo_lng' => $post_longitude
2141
-                            );
2142
-
2143
-                            $post_location_info = $request_info['post_location'];
2144
-                            if ($location_id = geodir_add_new_location($post_location_info))
2145
-                                $post_location_id = $location_id;
2146
-                        } else {
2147
-                            $post_location_id = 0;
2148
-                        }
2149
-                    } else {
2150
-                        $post_location_id = 0;
2151
-                    }
2152
-
2153
-                    /* ------- get default package info ----- */
2154
-                    $payment_info = array();
2155
-                    $package_info = array();
2156
-
2157
-                    $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);
2158
-                    $package_id = '';
2159
-                    if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
2160
-                        $package_id = $gd_post_info['package_id'];
2161
-                    }
2162
-
2163
-                    if (!empty($package_info)) {
2164
-                        $payment_info['package_id'] = $package_info['pid'];
2165
-
2166
-                        if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
2167
-                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
2168
-                        } else {
2169
-                            $payment_info['expire_date'] = 'Never';
2170
-                        }
2171
-
2172
-                        $gd_post_info = array_merge($gd_post_info, $payment_info);
2173
-                    }
2174
-
2175
-                    $gd_post_info['post_location_id'] = $post_location_id;
2176
-
2177
-                    $post_type = get_post_type($last_postid);
2178
-
2179
-                    $table = $plugin_prefix . $post_type . '_detail';
2180
-
2181
-                    geodir_save_post_info($last_postid, $gd_post_info);
2182
-
2183
-                    if (!empty($image_names)) {
2184
-                        $upload_files++;
2185
-                        $menu_order = 1;
2186
-
2187
-                        foreach ($image_names as $image_name) {
2188
-                            $img_name_arr = explode('.', $image_name);
2189
-
2190
-                            $uploads = wp_upload_dir();
2191
-                            $sub_dir = $uploads['subdir'];
2192
-
2193
-                            $arr_file_type = wp_check_filetype($image_name);
2194
-                            $uploaded_file_type = $arr_file_type['type'];
2195
-
2196
-                            $attachment = array();
2197
-                            $attachment['post_id'] = $last_postid;
2198
-                            $attachment['title'] = $img_name_arr[0];
2199
-                            $attachment['content'] = '';
2200
-                            $attachment['file'] = $sub_dir . '/' . $image_name;
2201
-                            $attachment['mime_type'] = $uploaded_file_type;
2202
-                            $attachment['menu_order'] = $menu_order;
2203
-                            $attachment['is_featured'] = 0;
2204
-
2205
-                            $attachment_set = '';
2206
-
2207
-                            foreach ($attachment as $key => $val) {
2208
-                                if ($val != '')
2209
-                                    $attachment_set .= $key . " = '" . $val . "', ";
2210
-                            }
2211
-                            $attachment_set = trim($attachment_set, ", ");
2212
-
2213
-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
2214
-
2215
-                            if ($menu_order == 1) {
2216
-                                $post_type = get_post_type($last_postid);
2217
-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
2218
-                            }
2219
-                            $menu_order++;
2220
-                        }
2221
-                    }
2222
-
2223
-                    $gd_post_info['package_id'] = $package_id;
2224
-
2225
-                    /** This action is documented in geodirectory-functions/post-functions.php */
2226
-                    do_action('geodir_after_save_listing', $last_postid, $gd_post_info);
2227
-
2228
-                    if (!empty($buffer[5])) {
2229
-                        if (in_array($buffer[5], geodir_get_posttypes())) {
2230
-                            $taxonomies = geodir_get_posttype_info(addslashes($buffer[5]));
2231
-                            wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]);
2232
-                            wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]);
2233
-
2234
-                            $post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : '';
2235
-                            $post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : '';
2236
-                            geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str);
2237
-                        }
2238
-                    }
2239
-                } else {
2240
-                    $invalid_title++;
2241
-                }
2242
-            }
2243
-        }
2244
-    }
2245
-    $return['rowcount'] = $countpost;
2246
-    $return['invalidcount'] = $address_invalid;
2247
-    $return['blank_address'] = $blank_address;
2248
-    $return['upload_files'] = $upload_files;
2249
-    $return['invalid_post_type'] = $invalid_post_type;
2250
-    $return['invalid_title'] = $invalid_title;
2251
-    $return['total_records'] = $total_records;
2252
-
2253
-    echo json_encode($return);
2254
-    exit;
2115
+					$my_post['post_title'] = $post_title;
2116
+					$my_post['post_content'] = $post_desc;
2117
+					$my_post['post_type'] = addslashes($buffer[5]);
2118
+					$my_post['post_author'] = $current_post_author;
2119
+					$my_post['post_status'] = $post_status;
2120
+					$my_post['post_category'] = $catids_arr;
2121
+					$my_post['post_tags'] = $tag_arr;
2122
+
2123
+					$gd_post_info['post_tags'] = $tag_arr;
2124
+					$gd_post_info['post_title'] = $post_title;
2125
+					$gd_post_info['post_status'] = $post_status;
2126
+					$gd_post_info['submit_time'] = time();
2127
+					$gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR'];
2128
+
2129
+					$last_postid = wp_insert_post($my_post);
2130
+					$countpost++;
2131
+
2132
+					// Check if we need to save post location as new location
2133
+					if ($location_result->location_id > 0) {
2134
+						if (isset($post_city) && isset($post_region)) {
2135
+							$request_info['post_location'] = array(
2136
+								'city' => $post_city,
2137
+								'region' => $post_region,
2138
+								'country' => $post_country,
2139
+								'geo_lat' => $post_latitude,
2140
+								'geo_lng' => $post_longitude
2141
+							);
2142
+
2143
+							$post_location_info = $request_info['post_location'];
2144
+							if ($location_id = geodir_add_new_location($post_location_info))
2145
+								$post_location_id = $location_id;
2146
+						} else {
2147
+							$post_location_id = 0;
2148
+						}
2149
+					} else {
2150
+						$post_location_id = 0;
2151
+					}
2152
+
2153
+					/* ------- get default package info ----- */
2154
+					$payment_info = array();
2155
+					$package_info = array();
2156
+
2157
+					$package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);
2158
+					$package_id = '';
2159
+					if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
2160
+						$package_id = $gd_post_info['package_id'];
2161
+					}
2162
+
2163
+					if (!empty($package_info)) {
2164
+						$payment_info['package_id'] = $package_info['pid'];
2165
+
2166
+						if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
2167
+							$payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
2168
+						} else {
2169
+							$payment_info['expire_date'] = 'Never';
2170
+						}
2171
+
2172
+						$gd_post_info = array_merge($gd_post_info, $payment_info);
2173
+					}
2174
+
2175
+					$gd_post_info['post_location_id'] = $post_location_id;
2176
+
2177
+					$post_type = get_post_type($last_postid);
2178
+
2179
+					$table = $plugin_prefix . $post_type . '_detail';
2180
+
2181
+					geodir_save_post_info($last_postid, $gd_post_info);
2182
+
2183
+					if (!empty($image_names)) {
2184
+						$upload_files++;
2185
+						$menu_order = 1;
2186
+
2187
+						foreach ($image_names as $image_name) {
2188
+							$img_name_arr = explode('.', $image_name);
2189
+
2190
+							$uploads = wp_upload_dir();
2191
+							$sub_dir = $uploads['subdir'];
2192
+
2193
+							$arr_file_type = wp_check_filetype($image_name);
2194
+							$uploaded_file_type = $arr_file_type['type'];
2195
+
2196
+							$attachment = array();
2197
+							$attachment['post_id'] = $last_postid;
2198
+							$attachment['title'] = $img_name_arr[0];
2199
+							$attachment['content'] = '';
2200
+							$attachment['file'] = $sub_dir . '/' . $image_name;
2201
+							$attachment['mime_type'] = $uploaded_file_type;
2202
+							$attachment['menu_order'] = $menu_order;
2203
+							$attachment['is_featured'] = 0;
2204
+
2205
+							$attachment_set = '';
2206
+
2207
+							foreach ($attachment as $key => $val) {
2208
+								if ($val != '')
2209
+									$attachment_set .= $key . " = '" . $val . "', ";
2210
+							}
2211
+							$attachment_set = trim($attachment_set, ", ");
2212
+
2213
+							$wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
2214
+
2215
+							if ($menu_order == 1) {
2216
+								$post_type = get_post_type($last_postid);
2217
+								$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
2218
+							}
2219
+							$menu_order++;
2220
+						}
2221
+					}
2222
+
2223
+					$gd_post_info['package_id'] = $package_id;
2224
+
2225
+					/** This action is documented in geodirectory-functions/post-functions.php */
2226
+					do_action('geodir_after_save_listing', $last_postid, $gd_post_info);
2227
+
2228
+					if (!empty($buffer[5])) {
2229
+						if (in_array($buffer[5], geodir_get_posttypes())) {
2230
+							$taxonomies = geodir_get_posttype_info(addslashes($buffer[5]));
2231
+							wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]);
2232
+							wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]);
2233
+
2234
+							$post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : '';
2235
+							$post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : '';
2236
+							geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str);
2237
+						}
2238
+					}
2239
+				} else {
2240
+					$invalid_title++;
2241
+				}
2242
+			}
2243
+		}
2244
+	}
2245
+	$return['rowcount'] = $countpost;
2246
+	$return['invalidcount'] = $address_invalid;
2247
+	$return['blank_address'] = $blank_address;
2248
+	$return['upload_files'] = $upload_files;
2249
+	$return['invalid_post_type'] = $invalid_post_type;
2250
+	$return['invalid_title'] = $invalid_title;
2251
+	$return['total_records'] = $total_records;
2252
+
2253
+	echo json_encode($return);
2254
+	exit;
2255 2255
 }
2256 2256
 
2257 2257
 // Add the tab in left sidebar menu fro import & export page.
@@ -2271,9 +2271,9 @@  discard block
 block discarded – undo
2271 2271
  * @param $post object $post The post object of the post being saved.
2272 2272
  */
2273 2273
 function geodir_update_location_prefix($post_id,$post){
2274
-    if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
2275
-        update_option('geodir_location_prefix',$post->post_name);
2276
-    }
2274
+	if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
2275
+		update_option('geodir_location_prefix',$post->post_name);
2276
+	}
2277 2277
 
2278 2278
 }
2279 2279
 
@@ -2284,50 +2284,50 @@  discard block
 block discarded – undo
2284 2284
 function geodir_ga_callback(){
2285 2285
 
2286 2286
 if(isset($_REQUEST['code']) && $_REQUEST['code']) {
2287
-    $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";
2288
-    $code = "code=".$_REQUEST['code'];
2289
-    $grant_type = "&grant_type=authorization_code";
2290
-    $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
2291
-    $client_id = "&client_id=".get_option('geodir_ga_client_id');
2292
-    $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
2287
+	$oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";
2288
+	$code = "code=".$_REQUEST['code'];
2289
+	$grant_type = "&grant_type=authorization_code";
2290
+	$redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
2291
+	$client_id = "&client_id=".get_option('geodir_ga_client_id');
2292
+	$client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
2293 2293
 
2294
-    $auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;
2294
+	$auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;
2295 2295
 
2296
-    $response = wp_remote_post($auth_url, array('timeout' => 15));
2296
+	$response = wp_remote_post($auth_url, array('timeout' => 15));
2297 2297
 
2298
-    //print_r($response);
2298
+	//print_r($response);
2299 2299
 
2300
-    $error_msg =  __('Something went wrong','geodirectory');
2301
-    if(!empty($response['response']['code']) && $response['response']['code']==200){
2300
+	$error_msg =  __('Something went wrong','geodirectory');
2301
+	if(!empty($response['response']['code']) && $response['response']['code']==200){
2302 2302
 
2303
-        $parts = json_decode($response['body']);
2304
-        //print_r($parts);
2305
-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
2306
-        else{
2303
+		$parts = json_decode($response['body']);
2304
+		//print_r($parts);
2305
+		if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
2306
+		else{
2307 2307
 
2308
-            update_option('gd_ga_access_token', $parts->access_token);
2309
-            update_option('gd_ga_refresh_token', $parts->refresh_token);
2310
-            ?><script>window.close();</script><?php
2311
-        }
2308
+			update_option('gd_ga_access_token', $parts->access_token);
2309
+			update_option('gd_ga_refresh_token', $parts->refresh_token);
2310
+			?><script>window.close();</script><?php
2311
+		}
2312 2312
 
2313 2313
 
2314
-    }
2315
-    elseif(!empty($response['response']['code'])) {
2316
-        $parts = json_decode($response['body']);
2314
+	}
2315
+	elseif(!empty($response['response']['code'])) {
2316
+		$parts = json_decode($response['body']);
2317 2317
 
2318
-        if(isset($parts->error)){
2319
-            echo $parts->error.": ".$parts->error_description;exit;
2320
-        }else{
2321
-            echo $error_msg." - #2";exit;
2322
-        }
2318
+		if(isset($parts->error)){
2319
+			echo $parts->error.": ".$parts->error_description;exit;
2320
+		}else{
2321
+			echo $error_msg." - #2";exit;
2322
+		}
2323 2323
 
2324
-    }else{
2324
+	}else{
2325 2325
 
2326
-        echo $error_msg." - #3";exit;
2326
+		echo $error_msg." - #3";exit;
2327 2327
 
2328
-    }
2328
+	}
2329 2329
 }
2330
-    exit;
2330
+	exit;
2331 2331
 }
2332 2332
 
2333 2333
 add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );
@@ -2345,45 +2345,45 @@  discard block
 block discarded – undo
2345 2345
  * @return array Array of settings.
2346 2346
  */
2347 2347
 function geodir_uninstall_settings($general_settings) {
2348
-    $settings   = array();
2349
-    $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
2350
-    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
2348
+	$settings   = array();
2349
+	$settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
2350
+	$settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
2351 2351
     
2352
-    $plugins    = get_plugins();
2353
-    $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
2352
+	$plugins    = get_plugins();
2353
+	$un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
2354 2354
     
2355
-    if (!empty($plugins) && !empty($un_plugins)) {
2356
-        foreach ($plugins as $plugin => $data) {
2357
-            $plugin_name = plugin_basename(dirname($plugin));
2355
+	if (!empty($plugins) && !empty($un_plugins)) {
2356
+		foreach ($plugins as $plugin => $data) {
2357
+			$plugin_name = plugin_basename(dirname($plugin));
2358 2358
             
2359
-            if (in_array($plugin_name, $un_plugins)) {
2360
-                $settings[] = array(
2361
-                    'type' => 'checkbox',
2362
-                    'id' => 'geodir_un_' . $plugin_name,
2363
-                    'name' => $data['Name'],
2364
-                    'desc' => wp_sprintf(__('Remove all of its data when the <b>%s</b> is deleted', 'geodirectory'), $plugin_name),
2365
-                    'std' => '0'
2366
-                );
2367
-            }
2368
-        }
2369
-    }
2359
+			if (in_array($plugin_name, $un_plugins)) {
2360
+				$settings[] = array(
2361
+					'type' => 'checkbox',
2362
+					'id' => 'geodir_un_' . $plugin_name,
2363
+					'name' => $data['Name'],
2364
+					'desc' => wp_sprintf(__('Remove all of its data when the <b>%s</b> is deleted', 'geodirectory'), $plugin_name),
2365
+					'std' => '0'
2366
+				);
2367
+			}
2368
+		}
2369
+	}
2370 2370
         
2371
-    $settings[] = array('type' => 'sectionend', 'id' => 'uninstall_settings_main');
2371
+	$settings[] = array('type' => 'sectionend', 'id' => 'uninstall_settings_main');
2372 2372
     
2373
-    /**
2374
-     * Filter the uninstall settings array.
2375
-     *
2376
-     * @since 1.6.9
2377
-     *
2378
-     * @param array $settings The settings array.
2379
-     */
2380
-    $settings = apply_filters('geodir_uninstall_settings', $settings);
2373
+	/**
2374
+	 * Filter the uninstall settings array.
2375
+	 *
2376
+	 * @since 1.6.9
2377
+	 *
2378
+	 * @param array $settings The settings array.
2379
+	 */
2380
+	$settings = apply_filters('geodir_uninstall_settings', $settings);
2381 2381
     
2382
-    if (!empty($settings) && count($settings) > 3) {
2383
-        return array_merge($general_settings, $settings);
2384
-    }
2382
+	if (!empty($settings) && count($settings) > 3) {
2383
+		return array_merge($general_settings, $settings);
2384
+	}
2385 2385
     
2386
-    return $general_settings;
2386
+	return $general_settings;
2387 2387
 }
2388 2388
 add_filter('geodir_general_settings', 'geodir_uninstall_settings', 100, 1);
2389 2389
 
@@ -2393,7 +2393,7 @@  discard block
 block discarded – undo
2393 2393
  * @since 1.6.9
2394 2394
  */
2395 2395
 function geodir_uninstall_settings_desc() {
2396
-    echo '<p class="gd-un-settings-desc">' . __('Select the plugins that you would like to completely remove all of its data when the plugin is deleted.', 'geodirectory') . '</p>';
2396
+	echo '<p class="gd-un-settings-desc">' . __('Select the plugins that you would like to completely remove all of its data when the plugin is deleted.', 'geodirectory') . '</p>';
2397 2397
 }
2398 2398
 add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');
2399 2399
 
@@ -2409,16 +2409,16 @@  discard block
 block discarded – undo
2409 2409
  * @return array The settings array.
2410 2410
  */
2411 2411
 function geodir_resave_settings($settings = array()) {
2412
-    if (!empty($settings) && is_array($settings)) {
2413
-        $c = 0;
2412
+	if (!empty($settings) && is_array($settings)) {
2413
+		$c = 0;
2414 2414
         
2415
-        foreach ($settings as $setting) {
2416
-            if (!empty($setting['id']) && false !== ($value = get_option($setting['id']))) {
2417
-                $settings[$c]['std'] = $value;
2418
-            }
2419
-            $c++;
2420
-        }
2421
-    }
2422
-
2423
-    return $settings;
2415
+		foreach ($settings as $setting) {
2416
+			if (!empty($setting['id']) && false !== ($value = get_option($setting['id']))) {
2417
+				$settings[$c]['std'] = $value;
2418
+			}
2419
+			$c++;
2420
+		}
2421
+	}
2422
+
2423
+	return $settings;
2424 2424
 }
2425 2425
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +222 added lines, -222 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
  */
63 63
 function geodir_get_admin_option_form($current_tab)
64 64
 {
65
-    geodir_admin_option_form($current_tab);// defined in admin template tags.php
65
+    geodir_admin_option_form($current_tab); // defined in admin template tags.php
66 66
 }
67 67
 
68 68
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 add_action('geodir_update_options_compatibility_settings', 'geodir_update_options_compatibility_settings');
71 71
 add_action('geodir_update_options_default_location_settings', 'geodir_location_form_submit');
72 72
 add_action('geodir_before_admin_panel', 'geodir_before_admin_panel'); // this function is in admin_functions.php
73
-add_action('geodir_before_update_options', 'geodir_before_update_options',10,2);
73
+add_action('geodir_before_update_options', 'geodir_before_update_options', 10, 2);
74 74
 
75 75
 //add_action('geodir_before_admin_panel', 'geodir_autoinstall_admin_header');
76 76
 
@@ -228,9 +228,9 @@  discard block
 block discarded – undo
228 228
 
229 229
         // Filter-Payment-Manager
230 230
 
231
-        add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
231
+        add_meta_box('geodir_post_images', $post_typename.' '.__('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
232 232
 
233
-        add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
233
+        add_meta_box('geodir_post_info', $post_typename.' '.__('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
234 234
 
235 235
         // no need of this box as all fields moved to main information box
236 236
         //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 
240 240
 }
241 241
 
242
-add_action('save_post', 'geodir_post_information_save',10,2);
242
+add_action('save_post', 'geodir_post_information_save', 10, 2);
243 243
 
244 244
 
245 245
 
@@ -266,10 +266,10 @@  discard block
 block discarded – undo
266 266
 
267 267
             $gd_taxonomy = geodir_get_taxonomies($geodir_post_type);
268 268
 
269
-            if(!empty($gd_taxonomy)) {
269
+            if (!empty($gd_taxonomy)) {
270 270
                 foreach ($gd_taxonomy as $tax) {
271 271
 
272
-                    remove_meta_box($tax . 'div', $geodir_post_type, 'normal');
272
+                    remove_meta_box($tax.'div', $geodir_post_type, 'normal');
273 273
 
274 274
                 }
275 275
             }
@@ -355,14 +355,14 @@  discard block
 block discarded – undo
355 355
 add_action('geodir_manage_available_fields_predefined', 'geodir_manage_available_fields_predefined');
356 356
 add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');
357 357
 
358
-function geodir_manage_available_fields_predefined($sub_tab){
359
-    if($sub_tab=='custom_fields'){
358
+function geodir_manage_available_fields_predefined($sub_tab) {
359
+    if ($sub_tab == 'custom_fields') {
360 360
         geodir_custom_available_fields('predefined');
361 361
     }
362 362
 }
363 363
 
364
-function geodir_manage_available_fields_custom($sub_tab){
365
-    if($sub_tab=='custom_fields'){
364
+function geodir_manage_available_fields_custom($sub_tab) {
365
+    if ($sub_tab == 'custom_fields') {
366 366
         geodir_custom_available_fields('custom');
367 367
     }
368 368
 }
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
     global $wpdb;
433 433
     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
434 434
     ?>
435
-    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>
435
+    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/>
436 436
     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>
437 437
     <ul>
438 438
     <?php
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
443 443
 
444 444
             $check_html_variable = $wpdb->get_var(
445 445
                 $wpdb->prepare(
446
-                    "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",
446
+                    "SELECT htmlvar_name FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",
447 447
                     array($val['htmlvar_name'], $listing_type, $val['field_type'])
448 448
                 )
449 449
             );
@@ -451,23 +451,23 @@  discard block
 block discarded – undo
451 451
             $display = $check_html_variable ? ' style="display:none;"' : '';
452 452
            ?>
453 453
 
454
-            <li   class="gd-cf-tooltip-wrap" <?php echo $display;?>>
454
+            <li   class="gd-cf-tooltip-wrap" <?php echo $display; ?>>
455 455
                 <?php
456
-                if(isset($val['description']) && $val['description']){
456
+                if (isset($val['description']) && $val['description']) {
457 457
                     echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';
458 458
                 }?>
459 459
 
460
-                <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>"  data-field-type="<?php echo $val['field_type'];?>"
461
-                   title="<?php echo $val['site_title'];?>"
462
-                   class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">
460
+                <a id="gd-<?php echo $val['field_type']; ?>-_-<?php echo $val['htmlvar_name']; ?>" data-field-type-key="<?php echo $val['htmlvar_name']; ?>"  data-field-type="<?php echo $val['field_type']; ?>"
461
+                   title="<?php echo $val['site_title']; ?>"
462
+                   class="gd-draggable-form-items  gd-<?php echo $val['field_type']; ?> geodir-sort-<?php echo $val['htmlvar_name']; ?>" href="javascript:void(0);">
463 463
                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {
464 464
                         echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';
465
-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){
465
+                    }elseif (isset($val['field_icon']) && $val['field_icon']) {
466 466
                         echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';
467
-                    }else{
467
+                    } else {
468 468
                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';
469 469
                     }?>
470
-                    <?php echo $val['site_title'];?>
470
+                    <?php echo $val['site_title']; ?>
471 471
                 </a>
472 472
             </li>
473 473
 
@@ -495,7 +495,7 @@  discard block
 block discarded – undo
495 495
     <?php 
496 496
         global $wpdb;
497 497
         
498
-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
498
+        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
499 499
 
500 500
         if (!empty($fields)) {
501 501
             foreach ($fields as $field) {
@@ -520,14 +520,14 @@  discard block
 block discarded – undo
520 520
  * @since 1.6.9
521 521
  * @package GeoDirectory
522 522
  */
523
-function geodir_custom_fields_custom($post_type=''){
523
+function geodir_custom_fields_custom($post_type = '') {
524 524
 
525 525
     $custom_fields = array();
526 526
 
527 527
     /**
528 528
      * @see `geodir_custom_fields`
529 529
      */
530
-    return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
530
+    return apply_filters('geodir_custom_fields_custom', $custom_fields, $post_type);
531 531
 }
532 532
 
533 533
 
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
  * @since 1.6.6
539 539
  * @package GeoDirectory
540 540
  */
541
-function geodir_custom_fields($post_type=''){
541
+function geodir_custom_fields($post_type = '') {
542 542
     
543 543
     $custom_fields = array(
544 544
         'text' => array(
@@ -673,7 +673,7 @@  discard block
 block discarded – undo
673 673
      * }
674 674
      * @param string $post_type The post type requested.
675 675
      */
676
-    return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
676
+    return apply_filters('geodir_custom_fields', $custom_fields, $post_type);
677 677
 }
678 678
 
679 679
 /**
@@ -684,25 +684,25 @@  discard block
 block discarded – undo
684 684
  * @param string $type The custom field type, predefined, custom or blank for default
685 685
  * @package GeoDirectory
686 686
  */
687
-function geodir_custom_available_fields($type='')
687
+function geodir_custom_available_fields($type = '')
688 688
 {
689 689
     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
690 690
     ?>
691
-    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>
691
+    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/>
692 692
     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" />
693 693
 
694 694
         <?php
695
-        if($type=='predefined'){
695
+        if ($type == 'predefined') {
696 696
             $cfs = geodir_custom_fields_predefined($listing_type);
697
-        }elseif($type=='custom'){
697
+        }elseif ($type == 'custom') {
698 698
             $cfs = geodir_custom_fields_custom($listing_type);
699
-        }else{
699
+        } else {
700 700
             $cfs = geodir_custom_fields($listing_type);
701 701
             ?>
702 702
             <ul class="full gd-cf-tooltip-wrap">
703 703
                 <li>
704 704
                     <div class="gdcf-tooltip">
705
-                        <?php _e('This adds a section separator with a title.', 'geodirectory');?>
705
+                        <?php _e('This adds a section separator with a title.', 'geodirectory'); ?>
706 706
                     </div>
707 707
                     <a id="gt-fieldset"
708 708
                        class="gd-draggable-form-items gt-fieldset"
@@ -713,7 +713,7 @@  discard block
 block discarded – undo
713 713
 
714 714
                         <i class="fa fa-long-arrow-left " aria-hidden="true"></i>
715 715
                         <i class="fa fa-long-arrow-right " aria-hidden="true"></i>
716
-                        <?php _e('Fieldset (section separator)', 'geodirectory');?>
716
+                        <?php _e('Fieldset (section separator)', 'geodirectory'); ?>
717 717
                     </a>
718 718
                 </li>
719 719
             </ul>
@@ -721,15 +721,15 @@  discard block
 block discarded – undo
721 721
             <?php
722 722
         }
723 723
 
724
-    if(!empty($cfs)) {
724
+    if (!empty($cfs)) {
725 725
 
726
-        foreach ( $cfs as $id => $cf ) {
726
+        foreach ($cfs as $id => $cf) {
727 727
             ?>
728 728
             <ul>
729 729
             <li class="gd-cf-tooltip-wrap">
730 730
                 <?php
731
-                if ( isset( $cf['description'] ) && $cf['description'] ) {
732
-                    echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';
731
+                if (isset($cf['description']) && $cf['description']) {
732
+                    echo '<div class="gdcf-tooltip">'.$cf['description'].'</div>';
733 733
                 } ?>
734 734
 
735 735
                 <a id="gd-<?php echo $id; ?>"
@@ -739,10 +739,10 @@  discard block
 block discarded – undo
739 739
                    class="gd-draggable-form-items <?php echo $cf['class']; ?>"
740 740
                    href="javascript:void(0);">
741 741
 
742
-                    <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {
743
-                        echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';
744
-                    } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
745
-                        echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';
742
+                    <?php if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {
743
+                        echo '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';
744
+                    } elseif (isset($cf['icon']) && $cf['icon']) {
745
+                        echo '<b style="background-image: url("'.$cf['icon'].'")"></b>';
746 746
                     } else {
747 747
                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';
748 748
                     } ?>
@@ -751,7 +751,7 @@  discard block
 block discarded – undo
751 751
             </li>
752 752
             <?php
753 753
         }
754
-    }else{
754
+    } else {
755 755
         _e('There are no custom fields here yet.', 'geodirectory');
756 756
     }
757 757
         ?>
@@ -779,7 +779,7 @@  discard block
 block discarded – undo
779 779
     <ul class="core">
780 780
     <?php 
781 781
         global $wpdb;
782
-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
782
+        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
783 783
 
784 784
         if (!empty($fields)) {
785 785
             foreach ($fields as $field) {
@@ -789,7 +789,7 @@  discard block
 block discarded – undo
789 789
                 $field_type_key = $field->field_type_key;
790 790
                 $field_ins_upd = 'display';
791 791
 
792
-                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);
792
+                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd, $field_type_key);
793 793
             }
794 794
         }
795 795
         ?></ul>
@@ -867,7 +867,7 @@  discard block
 block discarded – undo
867 867
 
868 868
     switch ($sub_tab) {
869 869
         case 'custom_fields':
870
-            $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type));;
870
+            $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type)); ;
871 871
             break;
872 872
 
873 873
         case 'sorting_options':
@@ -921,7 +921,7 @@  discard block
 block discarded – undo
921 921
 
922 922
     switch ($sub_tab) {
923 923
         case 'custom_fields':
924
-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type));;
924
+            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type)); ;
925 925
             break;
926 926
 
927 927
         case 'sorting_options':
@@ -948,8 +948,8 @@  discard block
 block discarded – undo
948 948
 
949 949
     if (!get_option('geodir_remove_unnecessary_fields')) {
950 950
 
951
-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
952
-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
951
+        if ($wpdb->get_var("SHOW COLUMNS FROM ".$plugin_prefix."gd_place_detail WHERE field = 'categories'"))
952
+            $wpdb->query("ALTER TABLE `".$plugin_prefix."gd_place_detail` DROP `categories`");
953 953
 
954 954
         update_option('geodir_remove_unnecessary_fields', '1');
955 955
 
@@ -977,14 +977,14 @@  discard block
 block discarded – undo
977 977
             case 'diagnosis' :
978 978
                 if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')
979 979
                     $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
980
-                call_user_func('geodir_diagnose_' . $diagnose_this);
980
+                call_user_func('geodir_diagnose_'.$diagnose_this);
981 981
                 exit();
982 982
                 break;
983 983
 
984 984
             case 'diagnosis-fix' :
985 985
                 if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')
986 986
                     $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
987
-                call_user_func('geodir_diagnose_' . $diagnose_this);
987
+                call_user_func('geodir_diagnose_'.$diagnose_this);
988 988
                 exit();
989 989
                 break;
990 990
         }
@@ -1009,50 +1009,50 @@  discard block
 block discarded – undo
1009 1009
 {
1010 1010
     global $wpdb;
1011 1011
     //$filter_arr['output_str'] .='###'.$table.'###';
1012
-    if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
1013
-        $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
1012
+    if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0) {
1013
+        $filter_arr['output_str'] .= "<li>".__('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory')."</li>";
1014 1014
         $filter_arr['is_error_during_diagnose'] = true;
1015 1015
 
1016
-    } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
1017
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
1016
+    } elseif ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {
1017
+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name)."</li>";
1018 1018
         $filter_arr['is_error_during_diagnose'] = true;
1019
-        $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
1019
+        $filter_arr['output_str'] .= "<li>".__('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory')."</li>";
1020 1020
         $filter_arr['is_error_during_diagnose'] = true;
1021 1021
 
1022 1022
         if ($fix) {
1023
-            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
1024
-            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
1023
+            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$table."_ms_bak"); // get backup table count
1024
+            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table"); // get new table count
1025 1025
 
1026 1026
             if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
1027 1027
                 //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
1028 1028
 
1029
-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
1029
+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename bak table to new table
1030 1030
 
1031
-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
1032
-                    $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
1031
+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {
1032
+                    $filter_arr['output_str'] .= "<li>".__('-->FIXED: Renamed and backed up the tables', 'geodirectory')."</li>";
1033 1033
                 } else {
1034
-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1034
+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
1035 1035
                 }
1036 1036
 
1037 1037
             } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
1038 1038
 
1039
-                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
1040
-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
1039
+                $wpdb->query("RENAME TABLE ".$wpdb->prefix."$table TO ".$table."_ms_bak2"); // rename new table to bak2
1040
+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$wpdb->prefix."$table"); // rename bak table to new table
1041 1041
 
1042
-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1043
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
1042
+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1043
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table)."</li>";
1044 1044
                 } else {
1045
-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1045
+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
1046 1046
                 }
1047 1047
 
1048 1048
             } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
1049 1049
 
1050
-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
1050
+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename ms_bak table to ms_bak2
1051 1051
 
1052
-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
1053
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
1052
+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {
1053
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table)."</li>";
1054 1054
                 } else {
1055
-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1055
+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
1056 1056
                 }
1057 1057
 
1058 1058
             }
@@ -1060,54 +1060,54 @@  discard block
 block discarded – undo
1060 1060
         }
1061 1061
 
1062 1062
 
1063
-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
1064
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
1063
+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {
1064
+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name)."</li>";
1065 1065
         $filter_arr['is_error_during_diagnose'] = true;
1066 1066
 
1067 1067
         if ($fix) {
1068 1068
             if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
1069 1069
                 if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
1070
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
1070
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table)."</li>";
1071 1071
                 } else {
1072
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
1072
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table)."</li>";
1073 1073
                 }
1074 1074
 
1075
-            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
1076
-                if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
1077
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
1075
+            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table") == 0) {// if main table is empty but original is not, delete main and rename original
1076
+                if ($wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."$table")) {
1077
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix.$table)."</li>";
1078 1078
                 } else {
1079
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
1079
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix.$table)."</li>";
1080 1080
                 }
1081
-                if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1082
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1081
+                if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1082
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
1083 1083
                 } else {
1084
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1084
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
1085 1085
                 }
1086 1086
             } else {// else rename the original table to _ms_bak
1087
-                if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1088
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
1087
+                if ($wpdb->query("RENAME TABLE $table TO ".$table."_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1088
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table."_ms_bak")."</li>";
1089 1089
                 } else {
1090
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
1090
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table."_ms_bak")."</li>";
1091 1091
                 }
1092 1092
             }
1093 1093
         }
1094 1094
 
1095
-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
1096
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
1095
+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {
1096
+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name)."</li>";
1097 1097
         $filter_arr['is_error_during_diagnose'] = true;
1098 1098
 
1099 1099
         if ($fix) {
1100 1100
             // if original table exists but new does not, rename
1101
-            if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1102
-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1101
+            if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1102
+                $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
1103 1103
             } else {
1104
-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1104
+                $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
1105 1105
             }
1106 1106
 
1107 1107
         }
1108 1108
 
1109
-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
1110
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
1109
+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {
1110
+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name)."</li>";
1111 1111
         $filter_arr['is_error_during_diagnose'] = true;
1112 1112
 
1113 1113
         if ($fix) {
@@ -1121,11 +1121,11 @@  discard block
 block discarded – undo
1121 1121
             delete_option('geodir_custom_posts_db_version');
1122 1122
             delete_option('geodir_reviewratings_db_version');
1123 1123
             delete_option('geodiradvancesearch_db_version');
1124
-            $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
1124
+            $filter_arr['output_str'] .= "<li>".__('-->TRY: Please refresh page to run table install functions', 'geodirectory')."</li>";
1125 1125
         }
1126 1126
 
1127 1127
     } else {
1128
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
1128
+        $filter_arr['output_str'] .= "<li>".sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name)."</li>";
1129 1129
     }
1130 1130
     return $filter_arr;
1131 1131
 }
@@ -1154,23 +1154,23 @@  discard block
 block discarded – undo
1154 1154
     if (!empty($all_postypes)) {
1155 1155
         foreach ($all_postypes as $key) {
1156 1156
             // update each GD CPT
1157
-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");
1157
+            $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail d");
1158 1158
 
1159 1159
             if (!empty($posts)) {
1160 1160
 
1161 1161
                 foreach ($posts as $p) {
1162 1162
                     $p->post_type = $key;
1163
-                    $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
1163
+                    $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));
1164 1164
                     if (empty($raw_tags)) {
1165 1165
                         $post_tags = '';
1166 1166
                     } else {
1167 1167
                         $post_tags = implode(",", $raw_tags);
1168 1168
                     }
1169
-                    $tablename = $plugin_prefix . $p->post_type . '_detail';
1170
-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
1169
+                    $tablename = $plugin_prefix.$p->post_type.'_detail';
1170
+                    $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
1171 1171
 
1172 1172
                 }
1173
-                $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
1173
+                $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";
1174 1174
             }
1175 1175
 
1176 1176
         }
@@ -1179,7 +1179,7 @@  discard block
 block discarded – undo
1179 1179
 
1180 1180
     if ($is_error_during_diagnose) {
1181 1181
         $info_div_class = "geodir_problem_info";
1182
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1182
+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1183 1183
     } else {
1184 1184
         $info_div_class = "geodir_noproblem_info";
1185 1185
         $fix_button_txt = '';
@@ -1216,29 +1216,29 @@  discard block
 block discarded – undo
1216 1216
     if (!empty($all_postypes)) {
1217 1217
         foreach ($all_postypes as $key) {
1218 1218
             // update each GD CTP
1219
-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
1219
+            $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail d WHERE d.".$key."category='' ");
1220 1220
 
1221 1221
             if (!empty($posts)) {
1222 1222
 
1223 1223
                 foreach ($posts as $p) {
1224 1224
                     $p->post_type = $key;
1225
-                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
1225
+                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type.'category', array('fields' => 'ids'));
1226 1226
 
1227 1227
                     if (empty($raw_cats)) {
1228 1228
                         $post_categories = get_post_meta($p->post_id, 'post_categories', true);
1229 1229
 
1230
-                        if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
1231
-                            $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
1232
-                            foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
1230
+                        if (!empty($post_categories) && !empty($post_categories[$p->post_type.'category'])) {
1231
+                            $post_categories[$p->post_type.'category'] = str_replace("d:", "", $post_categories[$p->post_type.'category']);
1232
+                            foreach (explode(",", $post_categories[$p->post_type.'category']) as $cat_part) {
1233 1233
                                 if (is_numeric($cat_part)) {
1234
-                                    $raw_cats[] = (int)$cat_part;
1234
+                                    $raw_cats[] = (int) $cat_part;
1235 1235
                                 }
1236 1236
                             }
1237 1237
 
1238 1238
                         }
1239 1239
 
1240 1240
                         if (!empty($raw_cats)) {
1241
-                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');
1241
+                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type.'category');
1242 1242
 
1243 1243
                         }
1244 1244
 
@@ -1248,14 +1248,14 @@  discard block
 block discarded – undo
1248 1248
                     if (empty($raw_cats)) {
1249 1249
                         $post_cats = '';
1250 1250
                     } else {
1251
-                        $post_cats = ',' . implode(",", $raw_cats) . ',';
1251
+                        $post_cats = ','.implode(",", $raw_cats).',';
1252 1252
                     }
1253
-                    $tablename = $plugin_prefix . $p->post_type . '_detail';
1254
-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
1253
+                    $tablename = $plugin_prefix.$p->post_type.'_detail';
1254
+                    $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET ".$p->post_type."category=%s WHERE post_id =%d", $post_cats, $p->post_id));
1255 1255
                 }
1256 1256
 
1257 1257
             }
1258
-            $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
1258
+            $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";
1259 1259
 
1260 1260
         }
1261 1261
 
@@ -1263,7 +1263,7 @@  discard block
 block discarded – undo
1263 1263
 
1264 1264
     if ($is_error_during_diagnose) {
1265 1265
         $info_div_class = "geodir_problem_info";
1266
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1266
+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1267 1267
     } else {
1268 1268
         $info_div_class = "geodir_noproblem_info";
1269 1269
         $fix_button_txt = '';
@@ -1316,15 +1316,15 @@  discard block
 block discarded – undo
1316 1316
     if (!empty($ver_arr)) {
1317 1317
         foreach ($ver_arr as $key => $val) {
1318 1318
             if (delete_option($val)) {
1319
-                $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
1319
+                $output_str .= "<li>".$key.__(' Version: Deleted', 'geodirectory')."</li>";
1320 1320
             } else {
1321
-                $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
1321
+                $output_str .= "<li>".$key.__(' Version: Not Found', 'geodirectory')."</li>";
1322 1322
             }
1323 1323
 
1324 1324
         }
1325 1325
 
1326 1326
         if ($output_str) {
1327
-            $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
1327
+            $output_str .= "<li><strong>".__(' Upgrade/install scripts will run on next page reload.', 'geodirectory')."</strong></li>";
1328 1328
         }
1329 1329
 
1330 1330
     }
@@ -1361,43 +1361,43 @@  discard block
 block discarded – undo
1361 1361
     $output_str = '';
1362 1362
 
1363 1363
     // check review locations
1364
-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
1365
-        $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
1364
+    if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
1365
+        $output_str .= "<li>".__('Review locations missing or broken', 'geodirectory')."</li>";
1366 1366
         $is_error_during_diagnose = true;
1367 1367
 
1368 1368
         if ($fix) {
1369 1369
             if (geodir_fix_review_location()) {
1370
-                $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
1370
+                $output_str .= "<li><strong>".__('-->FIXED: Review locations fixed', 'geodirectory')."</strong></li>";
1371 1371
             } else {
1372
-                $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
1372
+                $output_str .= "<li><strong>".__('-->FAILED: Review locations fix failed', 'geodirectory')."</strong></li>";
1373 1373
             }
1374 1374
         }
1375 1375
 
1376 1376
     } else {
1377
-        $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
1377
+        $output_str .= "<li>".__('Review locations ok', 'geodirectory')."</li>";
1378 1378
     }
1379 1379
 
1380 1380
     // check review content
1381
-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
1382
-        $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
1381
+    if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_content IS NULL")) {
1382
+        $output_str .= "<li>".__('Review content missing or broken', 'geodirectory')."</li>";
1383 1383
         $is_error_during_diagnose = true;
1384 1384
 
1385 1385
         if ($fix) {
1386 1386
             if (geodir_fix_review_content()) {
1387
-                $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
1387
+                $output_str .= "<li><strong>".__('-->FIXED: Review content fixed', 'geodirectory')."</strong></li>";
1388 1388
             } else {
1389
-                $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
1389
+                $output_str .= "<li><strong>".__('-->FAILED: Review content fix failed', 'geodirectory')."</strong></li>";
1390 1390
             }
1391 1391
         }
1392 1392
 
1393 1393
     } else {
1394
-        $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
1394
+        $output_str .= "<li>".__('Review content ok', 'geodirectory')."</li>";
1395 1395
     }
1396 1396
 
1397 1397
 
1398 1398
     if ($is_error_during_diagnose) {
1399 1399
         $info_div_class = "geodir_problem_info";
1400
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1400
+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1401 1401
     } else {
1402 1402
         $info_div_class = "geodir_noproblem_info";
1403 1403
         $fix_button_txt = '';
@@ -1461,7 +1461,7 @@  discard block
 block discarded – undo
1461 1461
 
1462 1462
     if ($is_error_during_diagnose) {
1463 1463
         $info_div_class = "geodir_problem_info";
1464
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
1464
+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
1465 1465
     } else {
1466 1466
         $info_div_class = "geodir_noproblem_info";
1467 1467
         $fix_button_txt = '';
@@ -1495,7 +1495,7 @@  discard block
 block discarded – undo
1495 1495
     else {
1496 1496
         $page_found = $wpdb->get_var(
1497 1497
             $wpdb->prepare(
1498
-                "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",
1498
+                "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;",
1499 1499
                 array($slug)
1500 1500
             )
1501 1501
         );
@@ -1541,18 +1541,18 @@  discard block
 block discarded – undo
1541 1541
     //////////////////////////////////
1542 1542
     $option_value = get_option('geodir_home_page');
1543 1543
     $page = get_post($option_value);
1544
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1544
+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
1545 1545
 
1546
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1547
-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
1546
+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')
1547
+        $output_str .= "<li>".__('GD Home page exists with proper setting.', 'geodirectory')."</li>";
1548 1548
     else {
1549 1549
         $is_error_during_diagnose = true;
1550
-        $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
1550
+        $output_str .= "<li><strong>".__('GD Home page is missing.', 'geodirectory')."</strong></li>";
1551 1551
         if ($fix) {
1552 1552
             if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
1553
-                $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
1553
+                $output_str .= "<li><strong>".__('-->FIXED: GD Home page fixed', 'geodirectory')."</strong></li>";
1554 1554
             } else {
1555
-                $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
1555
+                $output_str .= "<li><strong>".__('-->FAILED: GD Home page fix failed', 'geodirectory')."</strong></li>";
1556 1556
             }
1557 1557
         }
1558 1558
     }
@@ -1566,18 +1566,18 @@  discard block
 block discarded – undo
1566 1566
     //////////////////////////////////
1567 1567
     $option_value = get_option('geodir_add_listing_page');
1568 1568
     $page = get_post($option_value);
1569
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1569
+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
1570 1570
 
1571
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1572
-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
1571
+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')
1572
+        $output_str .= "<li>".__('Add Listing page exists with proper setting.', 'geodirectory')."</li>";
1573 1573
     else {
1574 1574
         $is_error_during_diagnose = true;
1575
-        $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
1575
+        $output_str .= "<li><strong>".__('Add Listing page is missing.', 'geodirectory')."</strong></li>";
1576 1576
         if ($fix) {
1577 1577
             if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
1578
-                $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
1578
+                $output_str .= "<li><strong>".__('-->FIXED: Add Listing page fixed', 'geodirectory')."</strong></li>";
1579 1579
             } else {
1580
-                $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
1580
+                $output_str .= "<li><strong>".__('-->FAILED: Add Listing page fix failed', 'geodirectory')."</strong></li>";
1581 1581
             }
1582 1582
         }
1583 1583
     }
@@ -1592,18 +1592,18 @@  discard block
 block discarded – undo
1592 1592
     //////////////////////////////////
1593 1593
     $option_value = get_option('geodir_preview_page');
1594 1594
     $page = get_post($option_value);
1595
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1595
+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
1596 1596
 
1597
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1598
-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
1597
+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')
1598
+        $output_str .= "<li>".__('Listing Preview page exists with proper setting.', 'geodirectory')."</li>";
1599 1599
     else {
1600 1600
         $is_error_during_diagnose = true;
1601
-        $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
1601
+        $output_str .= "<li><strong>".__('Listing Preview page is missing.', 'geodirectory')."</strong></li>";
1602 1602
         if ($fix) {
1603 1603
             if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
1604
-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
1604
+                $output_str .= "<li><strong>".__('-->FIXED: Listing Preview page fixed', 'geodirectory')."</strong></li>";
1605 1605
             } else {
1606
-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
1606
+                $output_str .= "<li><strong>".__('-->FAILED: Listing Preview page fix failed', 'geodirectory')."</strong></li>";
1607 1607
             }
1608 1608
         }
1609 1609
     }
@@ -1617,18 +1617,18 @@  discard block
 block discarded – undo
1617 1617
     //////////////////////////////////
1618 1618
     $option_value = get_option('geodir_success_page');
1619 1619
     $page = get_post($option_value);
1620
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1620
+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
1621 1621
 
1622
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1623
-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
1622
+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')
1623
+        $output_str .= "<li>".__('Listing Success page exists with proper setting.', 'geodirectory')."</li>";
1624 1624
     else {
1625 1625
         $is_error_during_diagnose = true;
1626
-        $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
1626
+        $output_str .= "<li><strong>".__('Listing Success page is missing.', 'geodirectory')."</strong></li>";
1627 1627
         if ($fix) {
1628 1628
             if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
1629
-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
1629
+                $output_str .= "<li><strong>".__('-->FIXED: Listing Success page fixed', 'geodirectory')."</strong></li>";
1630 1630
             } else {
1631
-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
1631
+                $output_str .= "<li><strong>".__('-->FAILED: Listing Success page fix failed', 'geodirectory')."</strong></li>";
1632 1632
             }
1633 1633
         }
1634 1634
     }
@@ -1642,18 +1642,18 @@  discard block
 block discarded – undo
1642 1642
     //////////////////////////////////
1643 1643
     $option_value = get_option('geodir_info_page');
1644 1644
     $page = get_post($option_value);
1645
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1645
+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
1646 1646
 
1647
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1648
-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
1647
+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')
1648
+        $output_str .= "<li>".__('Info page exists with proper setting.', 'geodirectory')."</li>";
1649 1649
     else {
1650 1650
         $is_error_during_diagnose = true;
1651
-        $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
1651
+        $output_str .= "<li><strong>".__('Info page is missing.', 'geodirectory')."</strong></li>";
1652 1652
         if ($fix) {
1653 1653
             if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
1654
-                $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
1654
+                $output_str .= "<li><strong>".__('-->FIXED: Info page fixed', 'geodirectory')."</strong></li>";
1655 1655
             } else {
1656
-                $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
1656
+                $output_str .= "<li><strong>".__('-->FAILED: Info page fix failed', 'geodirectory')."</strong></li>";
1657 1657
             }
1658 1658
         }
1659 1659
     }
@@ -1667,18 +1667,18 @@  discard block
 block discarded – undo
1667 1667
     //////////////////////////////////
1668 1668
     $option_value = get_option('geodir_login_page');
1669 1669
     $page = get_post($option_value);
1670
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1670
+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
1671 1671
 
1672
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1673
-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
1672
+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')
1673
+        $output_str .= "<li>".__('Login page exists with proper setting.', 'geodirectory')."</li>";
1674 1674
     else {
1675 1675
         $is_error_during_diagnose = true;
1676
-        $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
1676
+        $output_str .= "<li><strong>".__('Login page is missing.', 'geodirectory')."</strong></li>";
1677 1677
         if ($fix) {
1678 1678
             if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
1679
-                $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
1679
+                $output_str .= "<li><strong>".__('-->FIXED: Login page fixed', 'geodirectory')."</strong></li>";
1680 1680
             } else {
1681
-                $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
1681
+                $output_str .= "<li><strong>".__('-->FAILED: Login page fix failed', 'geodirectory')."</strong></li>";
1682 1682
             }
1683 1683
         }
1684 1684
     }
@@ -1692,18 +1692,18 @@  discard block
 block discarded – undo
1692 1692
     //////////////////////////////////
1693 1693
     $option_value = get_option('geodir_location_page');
1694 1694
     $page = get_post($option_value);
1695
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1695
+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
1696 1696
 
1697
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1698
-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
1697
+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')
1698
+        $output_str .= "<li>".__('Location page exists with proper setting.', 'geodirectory')."</li>";
1699 1699
     else {
1700 1700
         $is_error_during_diagnose = true;
1701
-        $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
1701
+        $output_str .= "<li><strong>".__('Location page is missing.', 'geodirectory')."</strong></li>";
1702 1702
         if ($fix) {
1703 1703
             if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
1704
-                $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
1704
+                $output_str .= "<li><strong>".__('-->FIXED: Location page fixed', 'geodirectory')."</strong></li>";
1705 1705
             } else {
1706
-                $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
1706
+                $output_str .= "<li><strong>".__('-->FAILED: Location page fix failed', 'geodirectory')."</strong></li>";
1707 1707
             }
1708 1708
         }
1709 1709
     }
@@ -1712,13 +1712,13 @@  discard block
 block discarded – undo
1712 1712
     /* Diagnose Location Page Ends */
1713 1713
     ////////////////////////////////
1714 1714
 
1715
-    $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
1715
+    $page_chk_arr = array('output_str'=>$output_str, 'is_error_during_diagnose'=>$is_error_during_diagnose);
1716 1716
     /**
1717 1717
      * This action is called at the end of the GD Tools page check function.
1718 1718
      *
1719 1719
      * @since 1.5.2
1720 1720
      */
1721
-    $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
1721
+    $page_chk_arr = apply_filters('geodir_diagnose_default_pages', $page_chk_arr);
1722 1722
 
1723 1723
     $output_str = $page_chk_arr['output_str'];
1724 1724
     $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];
@@ -1728,7 +1728,7 @@  discard block
 block discarded – undo
1728 1728
             flush_rewrite_rules();
1729 1729
         }
1730 1730
         $info_div_class = "geodir_problem_info";
1731
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
1731
+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
1732 1732
     } else {
1733 1733
         $info_div_class = "geodir_noproblem_info";
1734 1734
         $fix_button_txt = '';
@@ -1756,10 +1756,10 @@  discard block
 block discarded – undo
1756 1756
     $fix_button_txt = '';
1757 1757
 
1758 1758
     if ($is_error_during_diagnose) {
1759
-        $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
1759
+        $output_str .= "<li>".__('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory').' '.geodir_plugin_path().'/db-language.php'."</li>";
1760 1760
 		$info_div_class = "geodir_problem_info";
1761 1761
     } else {
1762
-        $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
1762
+        $output_str .= "<li>".__('Load custom fields in to file for translation: ok', 'geodirectory')."</li>";
1763 1763
 		$info_div_class = "geodir_noproblem_info";
1764 1764
         $fix_button_txt = '';
1765 1765
     }
@@ -1801,17 +1801,17 @@  discard block
 block discarded – undo
1801 1801
     global $wpdb, $wp_query, $plugin_prefix;
1802 1802
 
1803 1803
     if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
1804
-        $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';
1804
+        $table = $plugin_prefix.$wp_query->query_vars['post_type'].'_detail';
1805 1805
 
1806
-        $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';
1806
+        $join = $clauses['join'].' INNER JOIN '.$table.' AS gd_posts ON (gd_posts.post_id = '.$wpdb->posts.'.ID)';
1807 1807
         $clauses['join'] = $join;
1808 1808
 
1809
-        $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';
1809
+        $fields = $clauses['fields'] != '' ? $clauses['fields'].', ' : '';
1810 1810
         $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';
1811 1811
         $clauses['fields'] = $fields;
1812 1812
 
1813 1813
         $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';
1814
-        $orderby = 'gd_expire ' . $order;
1814
+        $orderby = 'gd_expire '.$order;
1815 1815
         $clauses['orderby'] = $orderby;
1816 1816
     }
1817 1817
     return $clauses;
@@ -1854,7 +1854,7 @@  discard block
 block discarded – undo
1854 1854
         global $current_user;
1855 1855
         $upload_dir = wp_upload_dir();
1856 1856
 
1857
-        $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';
1857
+        $file = $upload_dir['path'].'/temp_'.$current_user->data->ID.'/geodir_tmp.csv';
1858 1858
         $handle = fopen($file, 'w');
1859 1859
 
1860 1860
         fwrite($handle, $input);
@@ -1899,7 +1899,7 @@  discard block
 block discarded – undo
1899 1899
     $uploads_dir = $uploads['path'];
1900 1900
     $image_name_arr = explode('/', $filename);
1901 1901
     $filename = end($image_name_arr);
1902
-    $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1902
+    $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename;
1903 1903
     $return = array();
1904 1904
     $return['file'] = $uploadedFile;
1905 1905
     $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
@@ -1916,8 +1916,8 @@  discard block
 block discarded – undo
1916 1916
 
1917 1917
                 if (($handle = fopen($target_path, "r")) !== FALSE) {
1918 1918
                     while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
1919
-                        if(is_array($data) && !empty($data)) {
1920
-                            $file[] = '"' . implode('","', $data) . '"';
1919
+                        if (is_array($data) && !empty($data)) {
1920
+                            $file[] = '"'.implode('","', $data).'"';
1921 1921
                         }
1922 1922
                     }
1923 1923
                     fclose($handle);
@@ -2034,10 +2034,10 @@  discard block
 block discarded – undo
2034 2034
                     $tag_arr = explode(',', $post_tags);
2035 2035
                 }
2036 2036
 
2037
-                $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database
2037
+                $table = $plugin_prefix.$buffer[5].'_detail'; // check table in database
2038 2038
 
2039 2039
                 $error = '';
2040
-                if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
2040
+                if ($wpdb->get_var("SHOW TABLES LIKE '".$table."'") != $table) {
2041 2041
                     $invalid_post_type++;
2042 2042
                     continue;
2043 2043
                 }
@@ -2063,7 +2063,7 @@  discard block
 block discarded – undo
2063 2063
                             if ($buffer[$c] != '0' && $buffer[$c] != '') {
2064 2064
                                 $submitdata = date('Y-m-d');
2065 2065
 
2066
-                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
2066
+                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata."+".addslashes($buffer[$c])." days"));
2067 2067
                             } else {
2068 2068
                                 $gd_post_info['expire_date'] = 'Never';
2069 2069
                             }
@@ -2091,7 +2091,7 @@  discard block
 block discarded – undo
2091 2091
 						
2092 2092
 						// Post status
2093 2093
 						if ($customKeyarray[$c] == 'post_status') {
2094
-                            $post_status = sanitize_key( $buffer[$c] );
2094
+                            $post_status = sanitize_key($buffer[$c]);
2095 2095
                         }
2096 2096
                     }
2097 2097
 
@@ -2109,8 +2109,8 @@  discard block
 block discarded – undo
2109 2109
 					
2110 2110
 					// Default post status
2111 2111
 					$default_status = 'publish';
2112
-					$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;
2113
-					$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;
2112
+					$post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status;
2113
+					$post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status;
2114 2114
 
2115 2115
                     $my_post['post_title'] = $post_title;
2116 2116
                     $my_post['post_content'] = $post_desc;
@@ -2154,7 +2154,7 @@  discard block
 block discarded – undo
2154 2154
                     $payment_info = array();
2155 2155
                     $package_info = array();
2156 2156
 
2157
-                    $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);
2157
+                    $package_info = (array) geodir_post_package_info($package_info, '', $buffer[5]);
2158 2158
                     $package_id = '';
2159 2159
                     if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
2160 2160
                         $package_id = $gd_post_info['package_id'];
@@ -2164,7 +2164,7 @@  discard block
 block discarded – undo
2164 2164
                         $payment_info['package_id'] = $package_info['pid'];
2165 2165
 
2166 2166
                         if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
2167
-                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
2167
+                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['alive_days']." days"));
2168 2168
                         } else {
2169 2169
                             $payment_info['expire_date'] = 'Never';
2170 2170
                         }
@@ -2176,7 +2176,7 @@  discard block
 block discarded – undo
2176 2176
 
2177 2177
                     $post_type = get_post_type($last_postid);
2178 2178
 
2179
-                    $table = $plugin_prefix . $post_type . '_detail';
2179
+                    $table = $plugin_prefix.$post_type.'_detail';
2180 2180
 
2181 2181
                     geodir_save_post_info($last_postid, $gd_post_info);
2182 2182
 
@@ -2197,7 +2197,7 @@  discard block
 block discarded – undo
2197 2197
                             $attachment['post_id'] = $last_postid;
2198 2198
                             $attachment['title'] = $img_name_arr[0];
2199 2199
                             $attachment['content'] = '';
2200
-                            $attachment['file'] = $sub_dir . '/' . $image_name;
2200
+                            $attachment['file'] = $sub_dir.'/'.$image_name;
2201 2201
                             $attachment['mime_type'] = $uploaded_file_type;
2202 2202
                             $attachment['menu_order'] = $menu_order;
2203 2203
                             $attachment['is_featured'] = 0;
@@ -2206,15 +2206,15 @@  discard block
 block discarded – undo
2206 2206
 
2207 2207
                             foreach ($attachment as $key => $val) {
2208 2208
                                 if ($val != '')
2209
-                                    $attachment_set .= $key . " = '" . $val . "', ";
2209
+                                    $attachment_set .= $key." = '".$val."', ";
2210 2210
                             }
2211 2211
                             $attachment_set = trim($attachment_set, ", ");
2212 2212
 
2213
-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
2213
+                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
2214 2214
 
2215 2215
                             if ($menu_order == 1) {
2216 2216
                                 $post_type = get_post_type($last_postid);
2217
-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
2217
+                                $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($sub_dir.'/'.$image_name, $last_postid)));
2218 2218
                             }
2219 2219
                             $menu_order++;
2220 2220
                         }
@@ -2255,11 +2255,11 @@  discard block
 block discarded – undo
2255 2255
 }
2256 2256
 
2257 2257
 // Add the tab in left sidebar menu fro import & export page.
2258
-add_filter( 'geodir_settings_tabs_array', 'geodir_import_export_tab', 94 );
2258
+add_filter('geodir_settings_tabs_array', 'geodir_import_export_tab', 94);
2259 2259
 
2260 2260
 // Handle ajax request for import/export.
2261
-add_action( 'wp_ajax_geodir_import_export', 'geodir_ajax_import_export' );
2262
-add_action( 'wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export' );
2261
+add_action('wp_ajax_geodir_import_export', 'geodir_ajax_import_export');
2262
+add_action('wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export');
2263 2263
 
2264 2264
 
2265 2265
 /**
@@ -2270,40 +2270,40 @@  discard block
 block discarded – undo
2270 2270
  * @param $post_id int $post_id The post ID of the post being saved.
2271 2271
  * @param $post object $post The post object of the post being saved.
2272 2272
  */
2273
-function geodir_update_location_prefix($post_id,$post){
2274
-    if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
2275
-        update_option('geodir_location_prefix',$post->post_name);
2273
+function geodir_update_location_prefix($post_id, $post) {
2274
+    if ($post->post_type == 'page' && $post->post_name && $post_id == get_option('geodir_location_page')) {
2275
+        update_option('geodir_location_prefix', $post->post_name);
2276 2276
     }
2277 2277
 
2278 2278
 }
2279 2279
 
2280
-add_action('save_post', 'geodir_update_location_prefix',10,2);
2280
+add_action('save_post', 'geodir_update_location_prefix', 10, 2);
2281 2281
 
2282
-add_action( 'wp_ajax_geodir_ga_callback', 'geodir_ga_callback' );
2282
+add_action('wp_ajax_geodir_ga_callback', 'geodir_ga_callback');
2283 2283
 
2284
-function geodir_ga_callback(){
2284
+function geodir_ga_callback() {
2285 2285
 
2286
-if(isset($_REQUEST['code']) && $_REQUEST['code']) {
2286
+if (isset($_REQUEST['code']) && $_REQUEST['code']) {
2287 2287
     $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";
2288 2288
     $code = "code=".$_REQUEST['code'];
2289 2289
     $grant_type = "&grant_type=authorization_code";
2290
-    $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
2290
+    $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";
2291 2291
     $client_id = "&client_id=".get_option('geodir_ga_client_id');
2292 2292
     $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
2293 2293
 
2294
-    $auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;
2294
+    $auth_url = $oAuthURL.$code.$redirect_uri.$grant_type.$client_id.$client_secret;
2295 2295
 
2296 2296
     $response = wp_remote_post($auth_url, array('timeout' => 15));
2297 2297
 
2298 2298
     //print_r($response);
2299 2299
 
2300
-    $error_msg =  __('Something went wrong','geodirectory');
2301
-    if(!empty($response['response']['code']) && $response['response']['code']==200){
2300
+    $error_msg = __('Something went wrong', 'geodirectory');
2301
+    if (!empty($response['response']['code']) && $response['response']['code'] == 200) {
2302 2302
 
2303 2303
         $parts = json_decode($response['body']);
2304 2304
         //print_r($parts);
2305
-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
2306
-        else{
2305
+        if (!isset($parts->access_token)) {echo $error_msg." - #1"; exit; }
2306
+        else {
2307 2307
 
2308 2308
             update_option('gd_ga_access_token', $parts->access_token);
2309 2309
             update_option('gd_ga_refresh_token', $parts->refresh_token);
@@ -2312,25 +2312,25 @@  discard block
 block discarded – undo
2312 2312
 
2313 2313
 
2314 2314
     }
2315
-    elseif(!empty($response['response']['code'])) {
2315
+    elseif (!empty($response['response']['code'])) {
2316 2316
         $parts = json_decode($response['body']);
2317 2317
 
2318
-        if(isset($parts->error)){
2319
-            echo $parts->error.": ".$parts->error_description;exit;
2320
-        }else{
2321
-            echo $error_msg." - #2";exit;
2318
+        if (isset($parts->error)) {
2319
+            echo $parts->error.": ".$parts->error_description; exit;
2320
+        } else {
2321
+            echo $error_msg." - #2"; exit;
2322 2322
         }
2323 2323
 
2324
-    }else{
2324
+    } else {
2325 2325
 
2326
-        echo $error_msg." - #3";exit;
2326
+        echo $error_msg." - #3"; exit;
2327 2327
 
2328 2328
     }
2329 2329
 }
2330 2330
     exit;
2331 2331
 }
2332 2332
 
2333
-add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );
2333
+add_filter('icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4);
2334 2334
 
2335 2335
 if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {
2336 2336
 	add_action('geodir_before_admin_panel', 'geodir_wpml_permalink_setting_notice');
@@ -2347,7 +2347,7 @@  discard block
 block discarded – undo
2347 2347
 function geodir_uninstall_settings($general_settings) {
2348 2348
     $settings   = array();
2349 2349
     $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
2350
-    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
2350
+    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory'));
2351 2351
     
2352 2352
     $plugins    = get_plugins();
2353 2353
     $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
@@ -2359,7 +2359,7 @@  discard block
 block discarded – undo
2359 2359
             if (in_array($plugin_name, $un_plugins)) {
2360 2360
                 $settings[] = array(
2361 2361
                     'type' => 'checkbox',
2362
-                    'id' => 'geodir_un_' . $plugin_name,
2362
+                    'id' => 'geodir_un_'.$plugin_name,
2363 2363
                     'name' => $data['Name'],
2364 2364
                     'desc' => wp_sprintf(__('Remove all of its data when the <b>%s</b> is deleted', 'geodirectory'), $plugin_name),
2365 2365
                     'std' => '0'
@@ -2393,7 +2393,7 @@  discard block
 block discarded – undo
2393 2393
  * @since 1.6.9
2394 2394
  */
2395 2395
 function geodir_uninstall_settings_desc() {
2396
-    echo '<p class="gd-un-settings-desc">' . __('Select the plugins that you would like to completely remove all of its data when the plugin is deleted.', 'geodirectory') . '</p>';
2396
+    echo '<p class="gd-un-settings-desc">'.__('Select the plugins that you would like to completely remove all of its data when the plugin is deleted.', 'geodirectory').'</p>';
2397 2397
 }
2398 2398
 add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');
2399 2399
 
Please login to merge, or discard this patch.
geodirectory-templates/listing-filter-form.php 2 patches
Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -14,18 +14,18 @@  discard block
 block discarded – undo
14 14
 
15 15
 
16 16
 if (function_exists('geodir_location_geo_home_link')) {
17
-    remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
17
+	remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
18 18
 }
19 19
 $search_url = trailingslashit(get_home_url());
20 20
 if (function_exists('geodir_location_geo_home_link')) {
21
-    add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
21
+	add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
22 22
 }
23 23
 
24 24
 
25 25
 $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
26 26
 $form_class = 'geodir-listing-search';
27 27
 if($new_style){
28
-    $form_class .= ' gd-search-bar-style';
28
+	$form_class .= ' gd-search-bar-style';
29 29
 }
30 30
 ?>
31 31
 
@@ -44,56 +44,56 @@  discard block
 block discarded – undo
44 44
     <div class="geodir-loc-bar">
45 45
 
46 46
         <?php
47
-        /**
48
-         * Called inside the search form but before any of the fields.
49
-         *
50
-         * @since 1.0.0
51
-         */
52
-        do_action('geodir_before_search_form') ?>
47
+		/**
48
+		 * Called inside the search form but before any of the fields.
49
+		 *
50
+		 * @since 1.0.0
51
+		 */
52
+		do_action('geodir_before_search_form') ?>
53 53
 
54 54
         <div class="clearfix geodir-loc-bar-in">
55 55
             <div class="geodir-search">
56 56
 
57 57
                 <?php
58 58
 
59
-                /**
60
-                 * Adds the input fields to the search form.
61
-                 *
62
-                 * @since 1.6.9
63
-                 */
64
-                do_action('geodir_search_form_inputs');
59
+				/**
60
+				 * Adds the input fields to the search form.
61
+				 *
62
+				 * @since 1.6.9
63
+				 */
64
+				do_action('geodir_search_form_inputs');
65 65
 
66 66
 
67 67
 
68
-                /**
69
-                 * Called on the GD search form just before the search button.
70
-                 *
71
-                 * @since 1.0.0
72
-                 */
73
-                do_action('geodir_before_search_button');
68
+				/**
69
+				 * Called on the GD search form just before the search button.
70
+				 *
71
+				 * @since 1.0.0
72
+				 */
73
+				do_action('geodir_before_search_button');
74 74
 
75 75
                 
76
-                /**
77
-                 * Called on the GD search form just after the search button.
78
-                 *
79
-                 * @since 1.0.0
80
-                 */
81
-                do_action('geodir_after_search_button');
76
+				/**
77
+				 * Called on the GD search form just after the search button.
78
+				 *
79
+				 * @since 1.0.0
80
+				 */
81
+				do_action('geodir_after_search_button');
82 82
 
83 83
                 
84
-                ?>
84
+				?>
85 85
             </div>
86 86
 
87 87
 
88 88
         </div>
89 89
 
90 90
         <?php
91
-        /**
92
-         * Called inside the search form but after all the input fields.
93
-         *
94
-         * @since 1.0.0
95
-         */
96
-        do_action('geodir_after_search_form') ?>
91
+		/**
92
+		 * Called inside the search form but after all the input fields.
93
+		 *
94
+		 * @since 1.0.0
95
+		 */
96
+		do_action('geodir_after_search_form') ?>
97 97
 
98 98
 
99 99
     </div>
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 
25 25
 $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
26 26
 $form_class = 'geodir-listing-search';
27
-if($new_style){
27
+if ($new_style) {
28 28
     $form_class .= ' gd-search-bar-style';
29 29
 }
30 30
 ?>
Please login to merge, or discard this patch.
geodirectory-functions/custom_field_html.php 3 patches
Indentation   +328 added lines, -328 removed lines patch added patch discarded remove patch
@@ -18,9 +18,9 @@  discard block
 block discarded – undo
18 18
 global $post_type;
19 19
 
20 20
 if (!isset($field_info->post_type)) {
21
-    $post_type = sanitize_text_field($_REQUEST['listing_type']);
21
+	$post_type = sanitize_text_field($_REQUEST['listing_type']);
22 22
 } else
23
-    $post_type = $field_info->post_type;
23
+	$post_type = $field_info->post_type;
24 24
 
25 25
 //if(isset($_REQUEST['custom_type']) && $_REQUEST['custom_type']=='predefined'){
26 26
 //    $cf_arr = geodir_custom_fields_predefined($post_type);
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
 $field_admin_title = '';
46 46
 if (isset($field_info->admin_title))
47
-    $field_admin_title = $field_info->admin_title;
47
+	$field_admin_title = $field_info->admin_title;
48 48
 
49 49
 $default = isset($field_info->is_admin) ? $field_info->is_admin : '';
50 50
 
@@ -64,17 +64,17 @@  discard block
 block discarded – undo
64 64
 //print_r($field_info);
65 65
 
66 66
 if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {
67
-    $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';
67
+	$field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';
68 68
 }elseif(isset($cf['icon']) && $cf['icon']){
69
-    $field_icon = '<b style="background-image: url("'.$cf['icon'].'")"></b>';
69
+	$field_icon = '<b style="background-image: url("'.$cf['icon'].'")"></b>';
70 70
 }else{
71
-    $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';
71
+	$field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';
72 72
 }
73 73
 
74 74
 if(isset($cf['name']) && $cf['name']){
75
-    $field_type_name = $cf['name'];
75
+	$field_type_name = $cf['name'];
76 76
 }else{
77
-    $field_type_name = $field_type;
77
+	$field_type_name = $field_type;
78 78
 }
79 79
 
80 80
 ?>
@@ -84,8 +84,8 @@  discard block
 block discarded – undo
84 84
          ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">
85 85
         <?php
86 86
 
87
-        $nonce = wp_create_nonce('custom_fields_' . $result_str);
88
-        ?>
87
+		$nonce = wp_create_nonce('custom_fields_' . $result_str);
88
+		?>
89 89
 
90 90
         <?php if ($default): ?>
91 91
             <div title="<?php _e('Default field, should not be removed.', 'geodirectory'); ?>" class="handlediv move gd-default-remove"><i class="fa fa-times" aria-hidden="true"></i></div>
@@ -94,37 +94,37 @@  discard block
 block discarded – undo
94 94
                  onclick="delete_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>')"
95 95
                  class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div>
96 96
         <?php endif;
97
-        if ($field_type == 'fieldset') {
98
-            ?>
97
+		if ($field_type == 'fieldset') {
98
+			?>
99 99
             <i class="fa fa-long-arrow-left " aria-hidden="true"></i>
100 100
             <i class="fa fa-long-arrow-right " aria-hidden="true"></i>
101 101
             <b style="cursor:pointer;"
102 102
                onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory') . ' ' . $field_admin_title);?></b>
103 103
         <?php
104
-        } else {echo $field_icon;
105
-            ?>
104
+		} else {echo $field_icon;
105
+			?>
106 106
             <b style="cursor:pointer;"
107 107
                onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(' ' . $field_admin_title . ' (' . $field_type_name . ')');?></b>
108 108
         <?php
109
-        }
110
-        ?>
109
+		}
110
+		?>
111 111
     </div>
112 112
 
113 113
     <form><!-- we need to wrap in a fom so we can use radio buttons with same name -->
114 114
     <div id="field_frm<?php echo $result_str; ?>" class="field_frm"
115 115
          style="display:<?php if ($field_ins_upd == 'submit') {
116
-             echo 'block;';
117
-         } else {
118
-             echo 'none;';
119
-         } ?>">
116
+			 echo 'block;';
117
+		 } else {
118
+			 echo 'none;';
119
+		 } ?>">
120 120
         <input type="hidden" name="_wpnonce" value="<?php echo esc_attr($nonce); ?>"/>
121 121
         <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type; ?>"/>
122 122
         <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type; ?>"/>
123 123
         <input type="hidden" name="field_type_key" id="field_type_key" value="<?php echo $field_type_key; ?>"/>
124 124
         <input type="hidden" name="field_id" id="field_id" value="<?php echo esc_attr($result_str); ?>"/>
125 125
         <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {
126
-            echo $field_info->data_type;
127
-        } ?>"/>
126
+			echo $field_info->data_type;
127
+		} ?>"/>
128 128
         <input type="hidden" name="is_active" id="is_active" value="1"/>
129 129
 
130 130
         <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : '';?>" /><?php // show in sidebar value?>
@@ -136,37 +136,37 @@  discard block
 block discarded – undo
136 136
 
137 137
             <?php
138 138
 
139
-            // data_type
140
-            if(has_filter("geodir_cfa_data_type_{$field_type}")){
139
+			// data_type
140
+			if(has_filter("geodir_cfa_data_type_{$field_type}")){
141 141
 
142
-                echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);
142
+				echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);
143 143
 
144
-            }else{
145
-                $value = '';
146
-                if (isset($field_info->data_type)) {
147
-                    $value = esc_attr($field_info->data_type);
148
-                }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
149
-                    $value = $cf['defaults']['data_type'];
150
-                }
151
-                ?>
144
+			}else{
145
+				$value = '';
146
+				if (isset($field_info->data_type)) {
147
+					$value = esc_attr($field_info->data_type);
148
+				}elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
149
+					$value = $cf['defaults']['data_type'];
150
+				}
151
+				?>
152 152
                 <input type="hidden" name="data_type" id="data_type" value="<?php echo $value;?>"/>
153 153
             <?php
154
-            }
154
+			}
155 155
 
156 156
 
157
-            // admin_title
158
-            if(has_filter("geodir_cfa_admin_title_{$field_type}")){
157
+			// admin_title
158
+			if(has_filter("geodir_cfa_admin_title_{$field_type}")){
159 159
 
160
-                echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);
160
+				echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);
161 161
 
162
-            }else{
163
-                $value = '';
164
-                if (isset($field_info->admin_title)) {
165
-                    $value = esc_attr($field_info->admin_title);
166
-                }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){
167
-                    $value = $cf['defaults']['admin_title'];
168
-                }
169
-                ?>
162
+			}else{
163
+				$value = '';
164
+				if (isset($field_info->admin_title)) {
165
+					$value = esc_attr($field_info->admin_title);
166
+				}elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){
167
+					$value = $cf['defaults']['admin_title'];
168
+				}
169
+				?>
170 170
                 <li>
171 171
                     <label for="admin_title" class="gd-cf-tooltip-wrap">
172 172
                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Admin title :', 'geodirectory'); ?>
@@ -180,22 +180,22 @@  discard block
 block discarded – undo
180 180
                     </div>
181 181
                 </li>
182 182
                 <?php
183
-            }
183
+			}
184 184
 
185 185
 
186
-            // site_title
187
-            if(has_filter("geodir_cfa_site_title_{$field_type}")){
186
+			// site_title
187
+			if(has_filter("geodir_cfa_site_title_{$field_type}")){
188 188
 
189
-                echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);
189
+				echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);
190 190
 
191
-            }else{
192
-                $value = '';
193
-                if (isset($field_info->site_title)) {
194
-                    $value = esc_attr($field_info->site_title);
195
-                }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){
196
-                    $value = $cf['defaults']['site_title'];
197
-                }
198
-                ?>
191
+			}else{
192
+				$value = '';
193
+				if (isset($field_info->site_title)) {
194
+					$value = esc_attr($field_info->site_title);
195
+				}elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){
196
+					$value = $cf['defaults']['site_title'];
197
+				}
198
+				?>
199 199
                 <li>
200 200
                     <label for="site_title" class="gd-cf-tooltip-wrap"> <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Frontend title :', 'geodirectory'); ?>
201 201
                         <div class="gdcf-tooltip">
@@ -208,22 +208,22 @@  discard block
 block discarded – undo
208 208
                     </div>
209 209
                 </li>
210 210
                 <?php
211
-            }
211
+			}
212 212
 
213 213
 
214
-            // admin_desc
215
-            if(has_filter("geodir_cfa_admin_desc_{$field_type}")){
214
+			// admin_desc
215
+			if(has_filter("geodir_cfa_admin_desc_{$field_type}")){
216 216
 
217
-                echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);
217
+				echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);
218 218
 
219
-            }else{
220
-                $value = '';
221
-                if (isset($field_info->admin_desc)) {
222
-                    $value = esc_attr($field_info->admin_desc);
223
-                }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){
224
-                    $value = $cf['defaults']['admin_desc'];
225
-                }
226
-                ?>
219
+			}else{
220
+				$value = '';
221
+				if (isset($field_info->admin_desc)) {
222
+					$value = esc_attr($field_info->admin_desc);
223
+				}elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){
224
+					$value = $cf['defaults']['admin_desc'];
225
+				}
226
+				?>
227 227
                 <li>
228 228
                     <label for="admin_desc" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Frontend description :', 'geodirectory'); ?>
229 229
                         <div class="gdcf-tooltip">
@@ -235,23 +235,23 @@  discard block
 block discarded – undo
235 235
                     </div>
236 236
                 </li>
237 237
                 <?php
238
-            }
238
+			}
239 239
 
240 240
 
241 241
 
242
-            // htmlvar_name
243
-            if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){
242
+			// htmlvar_name
243
+			if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){
244 244
 
245
-                echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);
245
+				echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);
246 246
 
247
-            }else{
248
-                $value = '';
249
-                if (isset($field_info->htmlvar_name)) {
250
-                    $value = esc_attr($field_info->htmlvar_name);
251
-                }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){
252
-                    $value = $cf['defaults']['htmlvar_name'];
253
-                }
254
-                ?>
247
+			}else{
248
+				$value = '';
249
+				if (isset($field_info->htmlvar_name)) {
250
+					$value = esc_attr($field_info->htmlvar_name);
251
+				}elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){
252
+					$value = $cf['defaults']['htmlvar_name'];
253
+				}
254
+				?>
255 255
                 <li>
256 256
                     <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory');?>
257 257
                         <div class="gdcf-tooltip">
@@ -261,29 +261,29 @@  discard block
 block discarded – undo
261 261
                     <div class="gd-cf-input-wrap">
262 262
                         <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory');?>"
263 263
                                value="<?php if ($value) {
264
-                                   echo preg_replace('/geodir_/', '', $value, 1);
265
-                               }?>" <?php if ($default) {
266
-                            echo 'readonly="readonly"';
267
-                        }?> />
264
+								   echo preg_replace('/geodir_/', '', $value, 1);
265
+							   }?>" <?php if ($default) {
266
+							echo 'readonly="readonly"';
267
+						}?> />
268 268
                     </div>
269 269
                 </li>
270 270
                 <?php
271
-            }
271
+			}
272 272
 
273 273
 
274
-            // is_active
275
-            if(has_filter("geodir_cfa_is_active_{$field_type}")){
274
+			// is_active
275
+			if(has_filter("geodir_cfa_is_active_{$field_type}")){
276 276
 
277
-                echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);
277
+				echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);
278 278
 
279
-            }else{
280
-                $value = '';
281
-                if (isset($field_info->is_active)) {
282
-                    $value = esc_attr($field_info->is_active);
283
-                }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){
284
-                    $value = $cf['defaults']['is_active'];
285
-                }
286
-                ?>
279
+			}else{
280
+				$value = '';
281
+				if (isset($field_info->is_active)) {
282
+					$value = esc_attr($field_info->is_active);
283
+				}elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){
284
+					$value = $cf['defaults']['is_active'];
285
+				}
286
+				?>
287 287
                 <li <?php echo $field_display; ?>>
288 288
                     <label for="is_active" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is active :', 'geodirectory'); ?>
289 289
                         <div class="gdcf-tooltip">
@@ -294,35 +294,35 @@  discard block
 block discarded – undo
294 294
 
295 295
                         <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"
296 296
                             <?php if ($value == '1') {
297
-                                echo 'checked';
298
-                            } ?>/>
297
+								echo 'checked';
298
+							} ?>/>
299 299
                         <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
300 300
 
301 301
                         <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"
302 302
                             <?php if ($value == '0' || !$value) {
303
-                                echo 'checked';
304
-                            } ?>/>
303
+								echo 'checked';
304
+							} ?>/>
305 305
                         <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
306 306
 
307 307
                     </div>
308 308
                 </li>
309 309
                 <?php
310
-            }
310
+			}
311 311
 
312 312
 
313
-            // for_admin_use
314
-            if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){
313
+			// for_admin_use
314
+			if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){
315 315
 
316
-                echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);
316
+				echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);
317 317
 
318
-            }else{
319
-                $value = '';
320
-                if (isset($field_info->for_admin_use)) {
321
-                    $value = esc_attr($field_info->for_admin_use);
322
-                }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){
323
-                    $value = $cf['defaults']['for_admin_use'];
324
-                }
325
-                ?>
318
+			}else{
319
+				$value = '';
320
+				if (isset($field_info->for_admin_use)) {
321
+					$value = esc_attr($field_info->for_admin_use);
322
+				}elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){
323
+					$value = $cf['defaults']['for_admin_use'];
324
+				}
325
+				?>
326 326
                 <li>
327 327
                     <label for="for_admin_use" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('For admin use only? :', 'geodirectory'); ?>
328 328
                         <div class="gdcf-tooltip">
@@ -333,47 +333,47 @@  discard block
 block discarded – undo
333 333
 
334 334
                         <input type="radio" id="for_admin_use_yes<?php echo $radio_id;?>" name="for_admin_use" class="gdri-enabled"  value="1"
335 335
                             <?php if ($value == '1') {
336
-                                echo 'checked';
337
-                            } ?>/>
336
+								echo 'checked';
337
+							} ?>/>
338 338
                         <label for="for_admin_use_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
339 339
 
340 340
                         <input type="radio" id="for_admin_use_no<?php echo $radio_id;?>" name="for_admin_use" class="gdri-disabled" value="0"
341 341
                             <?php if ($value == '0' || !$value) {
342
-                                echo 'checked';
343
-                            } ?>/>
342
+								echo 'checked';
343
+							} ?>/>
344 344
                         <label for="for_admin_use_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
345 345
 
346 346
                     </div>
347 347
                 </li>
348 348
                 <?php
349
-            }
349
+			}
350 350
 
351 351
 
352
-            // default_value
353
-            if(has_filter("geodir_cfa_default_value_{$field_type}")){
352
+			// default_value
353
+			if(has_filter("geodir_cfa_default_value_{$field_type}")){
354 354
 
355
-                echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);
355
+				echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);
356 356
 
357
-            }else{
358
-                $value = '';
359
-                if (isset($field_info->default_value)) {
360
-                    $value = esc_attr($field_info->default_value);
361
-                }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){
362
-                    $value = $cf['defaults']['default_value'];
363
-                }
364
-                ?>
357
+			}else{
358
+				$value = '';
359
+				if (isset($field_info->default_value)) {
360
+					$value = esc_attr($field_info->default_value);
361
+				}elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){
362
+					$value = $cf['defaults']['default_value'];
363
+				}
364
+				?>
365 365
                 <li>
366 366
                     <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory');?>
367 367
                         <div class="gdcf-tooltip">
368 368
                             <?php
369
-                            if ($field_type == 'checkbox') {
370
-                                _e('Should the checkbox be checked by default?', 'geodirectory');
371
-                            } else if ($field_type == 'email') {
372
-                                _e('A default value for the field, usually blank. Ex: [email protected]', 'geodirectory');
373
-                            } else {
374
-                                _e('A default value for the field, usually blank. (for "link" this will be used as the link text)', 'geodirectory');
375
-                            }
376
-                            ?>
369
+							if ($field_type == 'checkbox') {
370
+								_e('Should the checkbox be checked by default?', 'geodirectory');
371
+							} else if ($field_type == 'email') {
372
+								_e('A default value for the field, usually blank. Ex: [email protected]', 'geodirectory');
373
+							} else {
374
+								_e('A default value for the field, usually blank. (for "link" this will be used as the link text)', 'geodirectory');
375
+							}
376
+							?>
377 377
                         </div>
378 378
                     </label>
379 379
                     <div class="gd-cf-input-wrap">
@@ -390,22 +390,22 @@  discard block
 block discarded – undo
390 390
                     </div>
391 391
                 </li>
392 392
                 <?php
393
-            }
393
+			}
394 394
 
395 395
 
396
-            // show_in
397
-            if(has_filter("geodir_cfa_show_in_{$field_type}")){
396
+			// show_in
397
+			if(has_filter("geodir_cfa_show_in_{$field_type}")){
398 398
 
399
-                echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);
399
+				echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);
400 400
 
401
-            }else{
402
-                $value = '';
403
-                if (isset($field_info->show_in)) {
404
-                    $value = esc_attr($field_info->show_in);
405
-                }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){
406
-                    $value = esc_attr($cf['defaults']['show_in']);
407
-                }
408
-                ?>
401
+			}else{
402
+				$value = '';
403
+				if (isset($field_info->show_in)) {
404
+					$value = esc_attr($field_info->show_in);
405
+				}elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){
406
+					$value = esc_attr($cf['defaults']['show_in']);
407
+				}
408
+				?>
409 409
                 <li>
410 410
                     <label for="show_in" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show in what locations?:', 'geodirectory'); ?>
411 411
                         <div class="gdcf-tooltip">
@@ -416,42 +416,42 @@  discard block
 block discarded – undo
416 416
 
417 417
                         <?php
418 418
 
419
-                        /*
419
+						/*
420 420
 						 * We wrap the key values in [] so we can search the DB easier with a LIKE query.
421 421
 						 */
422
-                        $show_in_locations = array(
423
-                            "[detail]" => __("Details page sidebar", 'geodirectory'),
424
-                            "[moreinfo]" => __("More info tab", 'geodirectory'),
425
-                            "[listing]" => __("Listings page", 'geodirectory'),
426
-                            "[owntab]" => __("Details page own tab", 'geodirectory'),
427
-                            "[mapbubble]" => __("Map bubble", 'geodirectory'),
428
-                        );
429
-
430
-                        /**
431
-                         * Filter the locations array for where to display custom fields.
432
-                         *
433
-                         * @since 1.6.6
434
-                         * @param array $show_in_locations The array of locations and descriptions.
435
-                         * @param object $field_info The field being displayed info.
436
-                         * @param string $field_info The type of field.
437
-                         */
438
-                        $show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);
422
+						$show_in_locations = array(
423
+							"[detail]" => __("Details page sidebar", 'geodirectory'),
424
+							"[moreinfo]" => __("More info tab", 'geodirectory'),
425
+							"[listing]" => __("Listings page", 'geodirectory'),
426
+							"[owntab]" => __("Details page own tab", 'geodirectory'),
427
+							"[mapbubble]" => __("Map bubble", 'geodirectory'),
428
+						);
429
+
430
+						/**
431
+						 * Filter the locations array for where to display custom fields.
432
+						 *
433
+						 * @since 1.6.6
434
+						 * @param array $show_in_locations The array of locations and descriptions.
435
+						 * @param object $field_info The field being displayed info.
436
+						 * @param string $field_info The type of field.
437
+						 */
438
+						$show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);
439 439
 
440 440
 
441
-                        // remove some locations for some field types
441
+						// remove some locations for some field types
442 442
 
443
-                        // don't show new tab option for some types
443
+						// don't show new tab option for some types
444 444
 
445
-                        if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {
446
-                        }else{
447
-                            unset($show_in_locations['[owntab]']);
448
-                        }
445
+						if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {
446
+						}else{
447
+							unset($show_in_locations['[owntab]']);
448
+						}
449 449
 
450
-                        if(!$display_on_listing){
451
-                            unset($show_in_locations['[listings]']);
452
-                        }
450
+						if(!$display_on_listing){
451
+							unset($show_in_locations['[listings]']);
452
+						}
453 453
 
454
-                        ?>
454
+						?>
455 455
 
456 456
                         <select multiple="multiple" name="show_in[]"
457 457
                                 id="show_in"
@@ -461,38 +461,38 @@  discard block
 block discarded – undo
461 461
                                 option-ajaxchosen="false">
462 462
                             <?php
463 463
 
464
-                            $show_in_values = explode(',',$value);
464
+							$show_in_values = explode(',',$value);
465 465
 
466
-                            foreach( $show_in_locations as $key => $val){
467
-                                $selected = '';
466
+							foreach( $show_in_locations as $key => $val){
467
+								$selected = '';
468 468
 
469
-                                if(is_array($show_in_values) && in_array($key,$show_in_values ) ){
470
-                                    $selected = 'selected';
471
-                                }
469
+								if(is_array($show_in_values) && in_array($key,$show_in_values ) ){
470
+									$selected = 'selected';
471
+								}
472 472
 
473
-                                ?>
473
+								?>
474 474
                                 <option  value="<?php echo $key;?>" <?php echo $selected;?>><?php echo $val;?></option>
475 475
                                 <?php
476
-                            }
477
-                            ?>
476
+							}
477
+							?>
478 478
                         </select>
479 479
                     </div>
480 480
                 </li>
481 481
                 <?php
482
-            }
482
+			}
483 483
 
484 484
 
485
-            // advanced_editor
486
-            if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){
485
+			// advanced_editor
486
+			if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){
487 487
 
488
-                echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);
488
+				echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);
489 489
 
490
-            }
490
+			}
491 491
 
492 492
 
493 493
 
494 494
 
495
-            ?>
495
+			?>
496 496
 
497 497
 
498 498
             <?php // @todo this does not seem to be used for anything, it can be removed or replaced ?>
@@ -505,38 +505,38 @@  discard block
 block discarded – undo
505 505
 
506 506
             <?php
507 507
 
508
-            $pricearr = array();
509
-            if (isset($field_info->packages) && $field_info->packages != '') {
510
-                $pricearr = explode(',', trim($field_info->packages, ','));
511
-            } else {
512
-                $package_info = array();
508
+			$pricearr = array();
509
+			if (isset($field_info->packages) && $field_info->packages != '') {
510
+				$pricearr = explode(',', trim($field_info->packages, ','));
511
+			} else {
512
+				$package_info = array();
513 513
 
514
-                $package_info = geodir_post_package_info($package_info, '', $post_type);
515
-                $pricearr[] = $package_info->pid;
516
-            }
514
+				$package_info = geodir_post_package_info($package_info, '', $post_type);
515
+				$pricearr[] = $package_info->pid;
516
+			}
517 517
 
518
-            ob_start()
519
-            ?>
518
+			ob_start()
519
+			?>
520 520
 
521 521
             <select style="display:none" name="show_on_pkg[]" id="show_on_pkg" multiple="multiple">
522 522
                 <?php
523
-                if (!empty($pricearr)) {
524
-                    foreach ($pricearr as $val) {
525
-                        ?>
523
+				if (!empty($pricearr)) {
524
+					foreach ($pricearr as $val) {
525
+						?>
526 526
                         <option selected="selected" value="<?php echo esc_attr($val); ?>" ><?php echo $val; ?></option><?php
527
-                    }
528
-                }
529
-                ?>
527
+					}
528
+				}
529
+				?>
530 530
             </select>
531 531
 
532 532
             <?php
533
-            $html = ob_get_clean();
533
+			$html = ob_get_clean();
534 534
 
535 535
 			/**
536 536
 			 * Filter the price packages list.
537 537
 			 *
538 538
 			 * Filter the price packages list in custom field form in admin
539
-             * custom fields settings.
539
+			 * custom fields settings.
540 540
 			 *
541 541
 			 * @since 1.0.0
542 542
 			 *
@@ -545,25 +545,25 @@  discard block
 block discarded – undo
545 545
 			 */
546 546
 			echo $html = apply_filters('geodir_packages_list_on_custom_fields', $html, $field_info);
547 547
 
548
-            ?>
548
+			?>
549 549
 
550 550
 
551 551
 
552 552
             <?php
553 553
 
554
-            // is_required
555
-            if(has_filter("geodir_cfa_is_required_{$field_type}")){
554
+			// is_required
555
+			if(has_filter("geodir_cfa_is_required_{$field_type}")){
556 556
 
557
-                echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);
557
+				echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);
558 558
 
559
-            }else{
560
-                $value = '';
561
-                if (isset($field_info->is_required)) {
562
-                    $value = esc_attr($field_info->is_required);
563
-                }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){
564
-                    $value = $cf['defaults']['is_required'];
565
-                }
566
-                ?>
559
+			}else{
560
+				$value = '';
561
+				if (isset($field_info->is_required)) {
562
+					$value = esc_attr($field_info->is_required);
563
+				}elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){
564
+					$value = $cf['defaults']['is_required'];
565
+				}
566
+				?>
567 567
                 <li>
568 568
                     <label for="is_required" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is required :', 'geodirectory'); ?>
569 569
                         <div class="gdcf-tooltip">
@@ -575,14 +575,14 @@  discard block
 block discarded – undo
575 575
 
576 576
                         <input type="radio" id="is_required_yes<?php echo $radio_id;?>" name="is_required" class="gdri-enabled"  value="1"
577 577
                             <?php if ($value == '1') {
578
-                                echo 'checked';
579
-                            } ?>/>
578
+								echo 'checked';
579
+							} ?>/>
580 580
                         <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
581 581
 
582 582
                         <input type="radio" id="is_required_no<?php echo $radio_id;?>" name="is_required" class="gdri-disabled" value="0"
583 583
                             <?php if ($value == '0' || !$value) {
584
-                                echo 'checked';
585
-                            } ?>/>
584
+								echo 'checked';
585
+							} ?>/>
586 586
                         <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
587 587
 
588 588
                     </div>
@@ -590,21 +590,21 @@  discard block
 block discarded – undo
590 590
                 </li>
591 591
 
592 592
                 <?php
593
-            }
593
+			}
594 594
 
595
-            // required_msg
596
-            if(has_filter("geodir_cfa_required_msg_{$field_type}")){
595
+			// required_msg
596
+			if(has_filter("geodir_cfa_required_msg_{$field_type}")){
597 597
 
598
-                echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);
598
+				echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);
599 599
 
600
-            }else{
601
-                $value = '';
602
-                if (isset($field_info->required_msg)) {
603
-                    $value = esc_attr($field_info->required_msg);
604
-                }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){
605
-                    $value = $cf['defaults']['required_msg'];
606
-                }
607
-                ?>
600
+			}else{
601
+				$value = '';
602
+				if (isset($field_info->required_msg)) {
603
+					$value = esc_attr($field_info->required_msg);
604
+				}elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){
605
+					$value = $cf['defaults']['required_msg'];
606
+				}
607
+				?>
608 608
                 <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'";}?>>
609 609
                     <label for="required_msg" class="gd-cf-tooltip-wrap">
610 610
                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Required message:', 'geodirectory'); ?>
@@ -618,38 +618,38 @@  discard block
 block discarded – undo
618 618
                     </div>
619 619
                 </li>
620 620
                 <?php
621
-            }
621
+			}
622 622
 
623 623
 
624
-            // required_msg
625
-            if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){
624
+			// required_msg
625
+			if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){
626 626
 
627
-                echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);
627
+				echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);
628 628
 
629
-            }
629
+			}
630 630
 
631 631
 
632
-            // extra_fields
633
-            if(has_filter("geodir_cfa_extra_fields_{$field_type}")){
632
+			// extra_fields
633
+			if(has_filter("geodir_cfa_extra_fields_{$field_type}")){
634 634
 
635
-                echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);
635
+				echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);
636 636
 
637
-            }
637
+			}
638 638
 
639 639
 
640
-            // field_icon
641
-            if(has_filter("geodir_cfa_field_icon_{$field_type}")){
640
+			// field_icon
641
+			if(has_filter("geodir_cfa_field_icon_{$field_type}")){
642 642
 
643
-                echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);
643
+				echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);
644 644
 
645
-            }else{
646
-                $value = '';
647
-                if (isset($field_info->field_icon)) {
648
-                    $value = esc_attr($field_info->field_icon);
649
-                }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){
650
-                    $value = $cf['defaults']['field_icon'];
651
-                }
652
-                ?>
645
+			}else{
646
+				$value = '';
647
+				if (isset($field_info->field_icon)) {
648
+					$value = esc_attr($field_info->field_icon);
649
+				}elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){
650
+					$value = $cf['defaults']['field_icon'];
651
+				}
652
+				?>
653 653
                 <li>
654 654
                     <h3><?php echo __('Custom css', 'geodirectory'); ?></h3>
655 655
 
@@ -667,22 +667,22 @@  discard block
 block discarded – undo
667 667
 
668 668
                 </li>
669 669
                 <?php
670
-            }
670
+			}
671 671
 
672 672
 
673
-            // css_class
674
-            if(has_filter("geodir_cfa_css_class_{$field_type}")){
673
+			// css_class
674
+			if(has_filter("geodir_cfa_css_class_{$field_type}")){
675 675
 
676
-                echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);
676
+				echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);
677 677
 
678
-            }else{
679
-                $value = '';
680
-                if (isset($field_info->css_class)) {
681
-                    $value = esc_attr($field_info->css_class);
682
-                }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){
683
-                    $value = $cf['defaults']['css_class'];
684
-                }
685
-                ?>
678
+			}else{
679
+				$value = '';
680
+				if (isset($field_info->css_class)) {
681
+					$value = esc_attr($field_info->css_class);
682
+				}elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){
683
+					$value = $cf['defaults']['css_class'];
684
+				}
685
+				?>
686 686
                 <li>
687 687
 
688 688
                     <label for="css_class" class="gd-cf-tooltip-wrap">
@@ -695,47 +695,47 @@  discard block
 block discarded – undo
695 695
                     <div class="gd-cf-input-wrap">
696 696
                         <input type="text" name="css_class" id="css_class"
697 697
                                value="<?php if (isset($field_info->css_class)) {
698
-                                   echo esc_attr($field_info->css_class);
699
-                               }?>"/>
698
+								   echo esc_attr($field_info->css_class);
699
+							   }?>"/>
700 700
                     </div>
701 701
                 </li>
702 702
                 <?php
703
-            }
703
+			}
704 704
 
705 705
 
706
-            // cat_sort
707
-            if(has_filter("geodir_cfa_cat_sort_{$field_type}")){
706
+			// cat_sort
707
+			if(has_filter("geodir_cfa_cat_sort_{$field_type}")){
708 708
 
709
-                echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);
709
+				echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);
710 710
 
711
-            }else{
712
-                $value = '';
713
-                $hide_cat_sort  ='';
714
-                if (isset($field_info->cat_sort)) {
715
-                    $value = esc_attr($field_info->cat_sort);
716
-                }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){
717
-                    $value = $cf['defaults']['cat_sort'];
718
-                    $hide_cat_sort = ($value===false) ? "style='display:none;'" : '';
719
-                }
711
+			}else{
712
+				$value = '';
713
+				$hide_cat_sort  ='';
714
+				if (isset($field_info->cat_sort)) {
715
+					$value = esc_attr($field_info->cat_sort);
716
+				}elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){
717
+					$value = $cf['defaults']['cat_sort'];
718
+					$hide_cat_sort = ($value===false) ? "style='display:none;'" : '';
719
+				}
720 720
 
721
-                $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : '';
722
-                ?>
721
+				$hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : '';
722
+				?>
723 723
                 <li <?php echo $hide_cat_sort ;?>>
724 724
                     <h3><?php
725
-                        /**
726
-                         * Filter the section title.
727
-                         *
728
-                         * Filter the section title in custom field form in admin
729
-                         * custom fields settings.
730
-                         *
731
-                         * @since 1.0.0
732
-                         *
733
-                         * @param string $title Title of the section.
734
-                         * @param string $field_type Current field type.
735
-                         */
736
-                        echo apply_filters('geodir_advance_custom_fields_heading', __('Posts sort options', 'geodirectory'), $field_type);
737
-
738
-                        ?></h3>
725
+						/**
726
+						 * Filter the section title.
727
+						 *
728
+						 * Filter the section title in custom field form in admin
729
+						 * custom fields settings.
730
+						 *
731
+						 * @since 1.0.0
732
+						 *
733
+						 * @param string $title Title of the section.
734
+						 * @param string $field_type Current field type.
735
+						 */
736
+						echo apply_filters('geodir_advance_custom_fields_heading', __('Posts sort options', 'geodirectory'), $field_type);
737
+
738
+						?></h3>
739 739
                     <label for="cat_sort" class="gd-cf-tooltip-wrap">
740 740
                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Include this field in sorting options :', 'geodirectory'); ?>
741 741
                         <div class="gdcf-tooltip">
@@ -747,42 +747,42 @@  discard block
 block discarded – undo
747 747
 
748 748
                         <input type="radio" id="cat_sort_yes<?php echo $radio_id;?>" name="cat_sort" class="gdri-enabled"  value="1"
749 749
                             <?php if ($value == '1') {
750
-                                echo 'checked';
751
-                            } ?>/>
750
+								echo 'checked';
751
+							} ?>/>
752 752
                         <label for="cat_sort_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
753 753
 
754 754
                         <input type="radio" id="cat_sort_no<?php echo $radio_id;?>" name="cat_sort" class="gdri-disabled" value="0"
755 755
                             <?php if (!$value) {
756
-                                echo 'checked';
757
-                            } ?>/>
756
+								echo 'checked';
757
+							} ?>/>
758 758
                         <label for="cat_sort_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
759 759
 
760 760
                     </div>
761 761
                 </li>
762 762
                 <?php
763
-            }
764
-
765
-
766
-
767
-            switch ($field_type):
768
-                case 'html':
769
-                case 'file':
770
-                case 'url':
771
-                case 'fieldset':
772
-                    break;
773
-                default:
774
-
775
-                    /**
776
-                     * Called at the end of the advanced custom fields settings page loop.
777
-                     *
778
-                     * Can be used to add or deal with different settings types.
779
-                     *
780
-                     * @since 1.0.0
781
-                     * @since 1.6.6 $cf param added.
782
-                     * @param object $field_info The current fields info.
783
-                     * @param array $cf The custom field settings
784
-                     */
785
-                    do_action('geodir_advance_custom_fields', $field_info,$cf);?>
763
+			}
764
+
765
+
766
+
767
+			switch ($field_type):
768
+				case 'html':
769
+				case 'file':
770
+				case 'url':
771
+				case 'fieldset':
772
+					break;
773
+				default:
774
+
775
+					/**
776
+					 * Called at the end of the advanced custom fields settings page loop.
777
+					 *
778
+					 * Can be used to add or deal with different settings types.
779
+					 *
780
+					 * @since 1.0.0
781
+					 * @since 1.6.6 $cf param added.
782
+					 * @param object $field_info The current fields info.
783
+					 * @param array $cf The custom field settings
784
+					 */
785
+					do_action('geodir_advance_custom_fields', $field_info,$cf);?>
786 786
 
787 787
 
788 788
                 <?php endswitch; ?>
Please login to merge, or discard this patch.
Spacing   +121 added lines, -121 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 
41 41
 $field_info = stripslashes_deep($field_info); // strip slashes from labels
42 42
 
43
-$nonce = wp_create_nonce('custom_fields_' . $result_str);
43
+$nonce = wp_create_nonce('custom_fields_'.$result_str);
44 44
 
45 45
 $field_admin_title = '';
46 46
 if (isset($field_info->admin_title))
@@ -65,15 +65,15 @@  discard block
 block discarded – undo
65 65
 
66 66
 if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {
67 67
     $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';
68
-}elseif(isset($cf['icon']) && $cf['icon']){
68
+}elseif (isset($cf['icon']) && $cf['icon']) {
69 69
     $field_icon = '<b style="background-image: url("'.$cf['icon'].'")"></b>';
70
-}else{
70
+} else {
71 71
     $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';
72 72
 }
73 73
 
74
-if(isset($cf['name']) && $cf['name']){
74
+if (isset($cf['name']) && $cf['name']) {
75 75
     $field_type_name = $cf['name'];
76
-}else{
76
+} else {
77 77
     $field_type_name = $field_type;
78 78
 }
79 79
 
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
          ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">
85 85
         <?php
86 86
 
87
-        $nonce = wp_create_nonce('custom_fields_' . $result_str);
87
+        $nonce = wp_create_nonce('custom_fields_'.$result_str);
88 88
         ?>
89 89
 
90 90
         <?php if ($default): ?>
@@ -99,12 +99,12 @@  discard block
 block discarded – undo
99 99
             <i class="fa fa-long-arrow-left " aria-hidden="true"></i>
100 100
             <i class="fa fa-long-arrow-right " aria-hidden="true"></i>
101 101
             <b style="cursor:pointer;"
102
-               onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory') . ' ' . $field_admin_title);?></b>
102
+               onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory').' '.$field_admin_title); ?></b>
103 103
         <?php
104 104
         } else {echo $field_icon;
105 105
             ?>
106 106
             <b style="cursor:pointer;"
107
-               onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(' ' . $field_admin_title . ' (' . $field_type_name . ')');?></b>
107
+               onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(' '.$field_admin_title.' ('.$field_type_name.')'); ?></b>
108 108
         <?php
109 109
         }
110 110
         ?>
@@ -127,43 +127,43 @@  discard block
 block discarded – undo
127 127
         } ?>"/>
128 128
         <input type="hidden" name="is_active" id="is_active" value="1"/>
129 129
 
130
-        <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : '';?>" /><?php // show in sidebar value?>
131
-        <input type="hidden" name="show_on_listing" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : '';?>" />
132
-        <input type="hidden" name="show_on_detail" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : '';?>" />
133
-        <input type="hidden" name="show_as_tab" value="<?php echo isset($field_info->show_as_tab) ? $field_info->show_as_tab : '';?>" />
130
+        <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : ''; ?>" /><?php // show in sidebar value?>
131
+        <input type="hidden" name="show_on_listing" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : ''; ?>" />
132
+        <input type="hidden" name="show_on_detail" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : ''; ?>" />
133
+        <input type="hidden" name="show_as_tab" value="<?php echo isset($field_info->show_as_tab) ? $field_info->show_as_tab : ''; ?>" />
134 134
 
135 135
         <ul class="widefat post fixed" border="0" style="width:100%;">
136 136
 
137 137
             <?php
138 138
 
139 139
             // data_type
140
-            if(has_filter("geodir_cfa_data_type_{$field_type}")){
140
+            if (has_filter("geodir_cfa_data_type_{$field_type}")) {
141 141
 
142
-                echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);
142
+                echo apply_filters("geodir_cfa_data_type_{$field_type}", '', $result_str, $cf, $field_info);
143 143
 
144
-            }else{
144
+            } else {
145 145
                 $value = '';
146 146
                 if (isset($field_info->data_type)) {
147 147
                     $value = esc_attr($field_info->data_type);
148
-                }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
148
+                }elseif (isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']) {
149 149
                     $value = $cf['defaults']['data_type'];
150 150
                 }
151 151
                 ?>
152
-                <input type="hidden" name="data_type" id="data_type" value="<?php echo $value;?>"/>
152
+                <input type="hidden" name="data_type" id="data_type" value="<?php echo $value; ?>"/>
153 153
             <?php
154 154
             }
155 155
 
156 156
 
157 157
             // admin_title
158
-            if(has_filter("geodir_cfa_admin_title_{$field_type}")){
158
+            if (has_filter("geodir_cfa_admin_title_{$field_type}")) {
159 159
 
160
-                echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);
160
+                echo apply_filters("geodir_cfa_admin_title_{$field_type}", '', $result_str, $cf, $field_info);
161 161
 
162
-            }else{
162
+            } else {
163 163
                 $value = '';
164 164
                 if (isset($field_info->admin_title)) {
165 165
                     $value = esc_attr($field_info->admin_title);
166
-                }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){
166
+                }elseif (isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']) {
167 167
                     $value = $cf['defaults']['admin_title'];
168 168
                 }
169 169
                 ?>
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
                     </label>
177 177
                     <div class="gd-cf-input-wrap">
178 178
                         <input type="text" name="admin_title" id="admin_title"
179
-                               value="<?php echo $value;?>"/>
179
+                               value="<?php echo $value; ?>"/>
180 180
                     </div>
181 181
                 </li>
182 182
                 <?php
@@ -184,15 +184,15 @@  discard block
 block discarded – undo
184 184
 
185 185
 
186 186
             // site_title
187
-            if(has_filter("geodir_cfa_site_title_{$field_type}")){
187
+            if (has_filter("geodir_cfa_site_title_{$field_type}")) {
188 188
 
189
-                echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);
189
+                echo apply_filters("geodir_cfa_site_title_{$field_type}", '', $result_str, $cf, $field_info);
190 190
 
191
-            }else{
191
+            } else {
192 192
                 $value = '';
193 193
                 if (isset($field_info->site_title)) {
194 194
                     $value = esc_attr($field_info->site_title);
195
-                }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){
195
+                }elseif (isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']) {
196 196
                     $value = $cf['defaults']['site_title'];
197 197
                 }
198 198
                 ?>
@@ -212,15 +212,15 @@  discard block
 block discarded – undo
212 212
 
213 213
 
214 214
             // admin_desc
215
-            if(has_filter("geodir_cfa_admin_desc_{$field_type}")){
215
+            if (has_filter("geodir_cfa_admin_desc_{$field_type}")) {
216 216
 
217
-                echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);
217
+                echo apply_filters("geodir_cfa_admin_desc_{$field_type}", '', $result_str, $cf, $field_info);
218 218
 
219
-            }else{
219
+            } else {
220 220
                 $value = '';
221 221
                 if (isset($field_info->admin_desc)) {
222 222
                     $value = esc_attr($field_info->admin_desc);
223
-                }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){
223
+                }elseif (isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']) {
224 224
                     $value = $cf['defaults']['admin_desc'];
225 225
                 }
226 226
                 ?>
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
                         </div>
232 232
                     </label>
233 233
                     <div class="gd-cf-input-wrap">
234
-                        <input type="text" name="admin_desc" id="admin_desc" value="<?php echo $value;?>"/>
234
+                        <input type="text" name="admin_desc" id="admin_desc" value="<?php echo $value; ?>"/>
235 235
                     </div>
236 236
                 </li>
237 237
                 <?php
@@ -240,26 +240,26 @@  discard block
 block discarded – undo
240 240
 
241 241
 
242 242
             // htmlvar_name
243
-            if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){
243
+            if (has_filter("geodir_cfa_htmlvar_name_{$field_type}")) {
244 244
 
245
-                echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);
245
+                echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}", '', $result_str, $cf, $field_info);
246 246
 
247
-            }else{
247
+            } else {
248 248
                 $value = '';
249 249
                 if (isset($field_info->htmlvar_name)) {
250 250
                     $value = esc_attr($field_info->htmlvar_name);
251
-                }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){
251
+                }elseif (isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']) {
252 252
                     $value = $cf['defaults']['htmlvar_name'];
253 253
                 }
254 254
                 ?>
255 255
                 <li>
256
-                    <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory');?>
256
+                    <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory'); ?>
257 257
                         <div class="gdcf-tooltip">
258 258
                             <?php _e('This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.', 'geodirectory'); ?>
259 259
                         </div>
260 260
                     </label>
261 261
                     <div class="gd-cf-input-wrap">
262
-                        <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory');?>"
262
+                        <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory'); ?>"
263 263
                                value="<?php if ($value) {
264 264
                                    echo preg_replace('/geodir_/', '', $value, 1);
265 265
                                }?>" <?php if ($default) {
@@ -272,15 +272,15 @@  discard block
 block discarded – undo
272 272
 
273 273
 
274 274
             // is_active
275
-            if(has_filter("geodir_cfa_is_active_{$field_type}")){
275
+            if (has_filter("geodir_cfa_is_active_{$field_type}")) {
276 276
 
277
-                echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);
277
+                echo apply_filters("geodir_cfa_is_active_{$field_type}", '', $result_str, $cf, $field_info);
278 278
 
279
-            }else{
279
+            } else {
280 280
                 $value = '';
281 281
                 if (isset($field_info->is_active)) {
282 282
                     $value = esc_attr($field_info->is_active);
283
-                }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){
283
+                }elseif (isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']) {
284 284
                     $value = $cf['defaults']['is_active'];
285 285
                 }
286 286
                 ?>
@@ -292,17 +292,17 @@  discard block
 block discarded – undo
292 292
                     </label>
293 293
                     <div class="gd-cf-input-wrap gd-switch">
294 294
 
295
-                        <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"
295
+                        <input type="radio" id="is_active_yes<?php echo $radio_id; ?>" name="is_active" class="gdri-enabled"  value="1"
296 296
                             <?php if ($value == '1') {
297 297
                                 echo 'checked';
298 298
                             } ?>/>
299
-                        <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
299
+                        <label for="is_active_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
300 300
 
301
-                        <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"
301
+                        <input type="radio" id="is_active_no<?php echo $radio_id; ?>" name="is_active" class="gdri-disabled" value="0"
302 302
                             <?php if ($value == '0' || !$value) {
303 303
                                 echo 'checked';
304 304
                             } ?>/>
305
-                        <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
305
+                        <label for="is_active_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
306 306
 
307 307
                     </div>
308 308
                 </li>
@@ -311,15 +311,15 @@  discard block
 block discarded – undo
311 311
 
312 312
 
313 313
             // for_admin_use
314
-            if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){
314
+            if (has_filter("geodir_cfa_for_admin_use_{$field_type}")) {
315 315
 
316
-                echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);
316
+                echo apply_filters("geodir_cfa_for_admin_use_{$field_type}", '', $result_str, $cf, $field_info);
317 317
 
318
-            }else{
318
+            } else {
319 319
                 $value = '';
320 320
                 if (isset($field_info->for_admin_use)) {
321 321
                     $value = esc_attr($field_info->for_admin_use);
322
-                }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){
322
+                }elseif (isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']) {
323 323
                     $value = $cf['defaults']['for_admin_use'];
324 324
                 }
325 325
                 ?>
@@ -331,17 +331,17 @@  discard block
 block discarded – undo
331 331
                     </label>
332 332
                     <div class="gd-cf-input-wrap gd-switch">
333 333
 
334
-                        <input type="radio" id="for_admin_use_yes<?php echo $radio_id;?>" name="for_admin_use" class="gdri-enabled"  value="1"
334
+                        <input type="radio" id="for_admin_use_yes<?php echo $radio_id; ?>" name="for_admin_use" class="gdri-enabled"  value="1"
335 335
                             <?php if ($value == '1') {
336 336
                                 echo 'checked';
337 337
                             } ?>/>
338
-                        <label for="for_admin_use_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
338
+                        <label for="for_admin_use_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
339 339
 
340
-                        <input type="radio" id="for_admin_use_no<?php echo $radio_id;?>" name="for_admin_use" class="gdri-disabled" value="0"
340
+                        <input type="radio" id="for_admin_use_no<?php echo $radio_id; ?>" name="for_admin_use" class="gdri-disabled" value="0"
341 341
                             <?php if ($value == '0' || !$value) {
342 342
                                 echo 'checked';
343 343
                             } ?>/>
344
-                        <label for="for_admin_use_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
344
+                        <label for="for_admin_use_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
345 345
 
346 346
                     </div>
347 347
                 </li>
@@ -350,20 +350,20 @@  discard block
 block discarded – undo
350 350
 
351 351
 
352 352
             // default_value
353
-            if(has_filter("geodir_cfa_default_value_{$field_type}")){
353
+            if (has_filter("geodir_cfa_default_value_{$field_type}")) {
354 354
 
355
-                echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);
355
+                echo apply_filters("geodir_cfa_default_value_{$field_type}", '', $result_str, $cf, $field_info);
356 356
 
357
-            }else{
357
+            } else {
358 358
                 $value = '';
359 359
                 if (isset($field_info->default_value)) {
360 360
                     $value = esc_attr($field_info->default_value);
361
-                }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){
361
+                }elseif (isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']) {
362 362
                     $value = $cf['defaults']['default_value'];
363 363
                 }
364 364
                 ?>
365 365
                 <li>
366
-                    <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory');?>
366
+                    <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory'); ?>
367 367
                         <div class="gdcf-tooltip">
368 368
                             <?php
369 369
                             if ($field_type == 'checkbox') {
@@ -380,12 +380,12 @@  discard block
 block discarded – undo
380 380
                         <?php if ($field_type == 'checkbox') { ?>
381 381
                             <select name="default_value" id="default_value">
382 382
                                 <option value=""><?php _e('Unchecked', 'geodirectory'); ?></option>
383
-                                <option value="1" <?php selected(true, (int)$value === 1);?>><?php _e('Checked', 'geodirectory'); ?></option>
383
+                                <option value="1" <?php selected(true, (int) $value === 1); ?>><?php _e('Checked', 'geodirectory'); ?></option>
384 384
                             </select>
385 385
                         <?php } else if ($field_type == 'email') { ?>
386
-                            <input type="email" name="default_value" placeholder="<?php _e('[email protected]', 'geodirectory') ;?>" id="default_value" value="<?php echo esc_attr($value);?>" /><br/>
386
+                            <input type="email" name="default_value" placeholder="<?php _e('[email protected]', 'geodirectory'); ?>" id="default_value" value="<?php echo esc_attr($value); ?>" /><br/>
387 387
                         <?php } else { ?>
388
-                            <input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($value);?>" /><br/>
388
+                            <input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($value); ?>" /><br/>
389 389
                         <?php } ?>
390 390
                     </div>
391 391
                 </li>
@@ -394,15 +394,15 @@  discard block
 block discarded – undo
394 394
 
395 395
 
396 396
             // show_in
397
-            if(has_filter("geodir_cfa_show_in_{$field_type}")){
397
+            if (has_filter("geodir_cfa_show_in_{$field_type}")) {
398 398
 
399
-                echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);
399
+                echo apply_filters("geodir_cfa_show_in_{$field_type}", '', $result_str, $cf, $field_info);
400 400
 
401
-            }else{
401
+            } else {
402 402
                 $value = '';
403 403
                 if (isset($field_info->show_in)) {
404 404
                     $value = esc_attr($field_info->show_in);
405
-                }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){
405
+                }elseif (isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']) {
406 406
                     $value = esc_attr($cf['defaults']['show_in']);
407 407
                 }
408 408
                 ?>
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
                          * @param object $field_info The field being displayed info.
436 436
                          * @param string $field_info The type of field.
437 437
                          */
438
-                        $show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);
438
+                        $show_in_locations = apply_filters('geodir_show_in_locations', $show_in_locations, $field_info, $field_type);
439 439
 
440 440
 
441 441
                         // remove some locations for some field types
@@ -443,11 +443,11 @@  discard block
 block discarded – undo
443 443
                         // don't show new tab option for some types
444 444
 
445 445
                         if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {
446
-                        }else{
446
+                        } else {
447 447
                             unset($show_in_locations['[owntab]']);
448 448
                         }
449 449
 
450
-                        if(!$display_on_listing){
450
+                        if (!$display_on_listing) {
451 451
                             unset($show_in_locations['[listings]']);
452 452
                         }
453 453
 
@@ -461,17 +461,17 @@  discard block
 block discarded – undo
461 461
                                 option-ajaxchosen="false">
462 462
                             <?php
463 463
 
464
-                            $show_in_values = explode(',',$value);
464
+                            $show_in_values = explode(',', $value);
465 465
 
466
-                            foreach( $show_in_locations as $key => $val){
466
+                            foreach ($show_in_locations as $key => $val) {
467 467
                                 $selected = '';
468 468
 
469
-                                if(is_array($show_in_values) && in_array($key,$show_in_values ) ){
469
+                                if (is_array($show_in_values) && in_array($key, $show_in_values)) {
470 470
                                     $selected = 'selected';
471 471
                                 }
472 472
 
473 473
                                 ?>
474
-                                <option  value="<?php echo $key;?>" <?php echo $selected;?>><?php echo $val;?></option>
474
+                                <option  value="<?php echo $key; ?>" <?php echo $selected; ?>><?php echo $val; ?></option>
475 475
                                 <?php
476 476
                             }
477 477
                             ?>
@@ -483,9 +483,9 @@  discard block
 block discarded – undo
483 483
 
484 484
 
485 485
             // advanced_editor
486
-            if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){
486
+            if (has_filter("geodir_cfa_advanced_editor_{$field_type}")) {
487 487
 
488
-                echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);
488
+                echo apply_filters("geodir_cfa_advanced_editor_{$field_type}", '', $result_str, $cf, $field_info);
489 489
 
490 490
             }
491 491
 
@@ -496,10 +496,10 @@  discard block
 block discarded – undo
496 496
 
497 497
 
498 498
             <?php // @todo this does not seem to be used for anything, it can be removed or replaced ?>
499
-            <input type="hidden" name="clabels" id="clabels" value="<?php if (isset($field_info->clabels)) { echo esc_attr($field_info->clabels);} ?>"/>
499
+            <input type="hidden" name="clabels" id="clabels" value="<?php if (isset($field_info->clabels)) { echo esc_attr($field_info->clabels); } ?>"/>
500 500
 
501 501
             <?php // we dont need to show the sort order ?>
502
-            <input type="hidden" readonly="readonly" name="sort_order" id="sort_order" value="<?php if (isset($field_info->sort_order)) { echo esc_attr($field_info->sort_order);} ?>"/>
502
+            <input type="hidden" readonly="readonly" name="sort_order" id="sort_order" value="<?php if (isset($field_info->sort_order)) { echo esc_attr($field_info->sort_order); } ?>"/>
503 503
 
504 504
 
505 505
 
@@ -552,15 +552,15 @@  discard block
 block discarded – undo
552 552
             <?php
553 553
 
554 554
             // is_required
555
-            if(has_filter("geodir_cfa_is_required_{$field_type}")){
555
+            if (has_filter("geodir_cfa_is_required_{$field_type}")) {
556 556
 
557
-                echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);
557
+                echo apply_filters("geodir_cfa_is_required_{$field_type}", '', $result_str, $cf, $field_info);
558 558
 
559
-            }else{
559
+            } else {
560 560
                 $value = '';
561 561
                 if (isset($field_info->is_required)) {
562 562
                     $value = esc_attr($field_info->is_required);
563
-                }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){
563
+                }elseif (isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']) {
564 564
                     $value = $cf['defaults']['is_required'];
565 565
                 }
566 566
                 ?>
@@ -573,17 +573,17 @@  discard block
 block discarded – undo
573 573
 
574 574
                     <div class="gd-cf-input-wrap gd-switch">
575 575
 
576
-                        <input type="radio" id="is_required_yes<?php echo $radio_id;?>" name="is_required" class="gdri-enabled"  value="1"
576
+                        <input type="radio" id="is_required_yes<?php echo $radio_id; ?>" name="is_required" class="gdri-enabled"  value="1"
577 577
                             <?php if ($value == '1') {
578 578
                                 echo 'checked';
579 579
                             } ?>/>
580
-                        <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
580
+                        <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
581 581
 
582
-                        <input type="radio" id="is_required_no<?php echo $radio_id;?>" name="is_required" class="gdri-disabled" value="0"
582
+                        <input type="radio" id="is_required_no<?php echo $radio_id; ?>" name="is_required" class="gdri-disabled" value="0"
583 583
                             <?php if ($value == '0' || !$value) {
584 584
                                 echo 'checked';
585 585
                             } ?>/>
586
-                        <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
586
+                        <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
587 587
 
588 588
                     </div>
589 589
 
@@ -593,19 +593,19 @@  discard block
 block discarded – undo
593 593
             }
594 594
 
595 595
             // required_msg
596
-            if(has_filter("geodir_cfa_required_msg_{$field_type}")){
596
+            if (has_filter("geodir_cfa_required_msg_{$field_type}")) {
597 597
 
598
-                echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);
598
+                echo apply_filters("geodir_cfa_required_msg_{$field_type}", '', $result_str, $cf, $field_info);
599 599
 
600
-            }else{
600
+            } else {
601 601
                 $value = '';
602 602
                 if (isset($field_info->required_msg)) {
603 603
                     $value = esc_attr($field_info->required_msg);
604
-                }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){
604
+                }elseif (isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']) {
605 605
                     $value = $cf['defaults']['required_msg'];
606 606
                 }
607 607
                 ?>
608
-                <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'";}?>>
608
+                <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'"; }?>>
609 609
                     <label for="required_msg" class="gd-cf-tooltip-wrap">
610 610
                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Required message:', 'geodirectory'); ?>
611 611
                         <div class="gdcf-tooltip">
@@ -622,31 +622,31 @@  discard block
 block discarded – undo
622 622
 
623 623
 
624 624
             // required_msg
625
-            if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){
625
+            if (has_filter("geodir_cfa_validation_pattern_{$field_type}")) {
626 626
 
627
-                echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);
627
+                echo apply_filters("geodir_cfa_validation_pattern_{$field_type}", '', $result_str, $cf, $field_info);
628 628
 
629 629
             }
630 630
 
631 631
 
632 632
             // extra_fields
633
-            if(has_filter("geodir_cfa_extra_fields_{$field_type}")){
633
+            if (has_filter("geodir_cfa_extra_fields_{$field_type}")) {
634 634
 
635
-                echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);
635
+                echo apply_filters("geodir_cfa_extra_fields_{$field_type}", '', $result_str, $cf, $field_info);
636 636
 
637 637
             }
638 638
 
639 639
 
640 640
             // field_icon
641
-            if(has_filter("geodir_cfa_field_icon_{$field_type}")){
641
+            if (has_filter("geodir_cfa_field_icon_{$field_type}")) {
642 642
 
643
-                echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);
643
+                echo apply_filters("geodir_cfa_field_icon_{$field_type}", '', $result_str, $cf, $field_info);
644 644
 
645
-            }else{
645
+            } else {
646 646
                 $value = '';
647 647
                 if (isset($field_info->field_icon)) {
648 648
                     $value = esc_attr($field_info->field_icon);
649
-                }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){
649
+                }elseif (isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']) {
650 650
                     $value = $cf['defaults']['field_icon'];
651 651
                 }
652 652
                 ?>
@@ -657,12 +657,12 @@  discard block
 block discarded – undo
657 657
                     <label for="field_icon" class="gd-cf-tooltip-wrap">
658 658
                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Upload icon :', 'geodirectory'); ?>
659 659
                         <div class="gdcf-tooltip">
660
-                            <?php _e('Upload icon using media and enter its url path, or enter <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" >font awesome </a>class eg:"fa fa-home"', 'geodirectory');?>
660
+                            <?php _e('Upload icon using media and enter its url path, or enter <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" >font awesome </a>class eg:"fa fa-home"', 'geodirectory'); ?>
661 661
                         </div>
662 662
                     </label>
663 663
                     <div class="gd-cf-input-wrap">
664 664
                         <input type="text" name="field_icon" id="field_icon"
665
-                               value="<?php echo $value;?>"/>
665
+                               value="<?php echo $value; ?>"/>
666 666
                     </div>
667 667
 
668 668
                 </li>
@@ -671,15 +671,15 @@  discard block
 block discarded – undo
671 671
 
672 672
 
673 673
             // css_class
674
-            if(has_filter("geodir_cfa_css_class_{$field_type}")){
674
+            if (has_filter("geodir_cfa_css_class_{$field_type}")) {
675 675
 
676
-                echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);
676
+                echo apply_filters("geodir_cfa_css_class_{$field_type}", '', $result_str, $cf, $field_info);
677 677
 
678
-            }else{
678
+            } else {
679 679
                 $value = '';
680 680
                 if (isset($field_info->css_class)) {
681 681
                     $value = esc_attr($field_info->css_class);
682
-                }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){
682
+                }elseif (isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']) {
683 683
                     $value = $cf['defaults']['css_class'];
684 684
                 }
685 685
                 ?>
@@ -688,8 +688,8 @@  discard block
 block discarded – undo
688 688
                     <label for="css_class" class="gd-cf-tooltip-wrap">
689 689
                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Css class :', 'geodirectory'); ?>
690 690
                         <div class="gdcf-tooltip">
691
-                            <?php _e('Enter custom css class for field custom style.', 'geodirectory');?>
692
-                            <?php if($field_type=='multiselect'){_e('(Enter class `gd-comma-list` to show list as comma separated)', 'geodirectory');}?>
691
+                            <?php _e('Enter custom css class for field custom style.', 'geodirectory'); ?>
692
+                            <?php if ($field_type == 'multiselect') {_e('(Enter class `gd-comma-list` to show list as comma separated)', 'geodirectory'); }?>
693 693
                         </div>
694 694
                     </label>
695 695
                     <div class="gd-cf-input-wrap">
@@ -704,23 +704,23 @@  discard block
 block discarded – undo
704 704
 
705 705
 
706 706
             // cat_sort
707
-            if(has_filter("geodir_cfa_cat_sort_{$field_type}")){
707
+            if (has_filter("geodir_cfa_cat_sort_{$field_type}")) {
708 708
 
709
-                echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);
709
+                echo apply_filters("geodir_cfa_cat_sort_{$field_type}", '', $result_str, $cf, $field_info);
710 710
 
711
-            }else{
711
+            } else {
712 712
                 $value = '';
713
-                $hide_cat_sort  ='';
713
+                $hide_cat_sort = '';
714 714
                 if (isset($field_info->cat_sort)) {
715 715
                     $value = esc_attr($field_info->cat_sort);
716
-                }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){
716
+                }elseif (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']) {
717 717
                     $value = $cf['defaults']['cat_sort'];
718
-                    $hide_cat_sort = ($value===false) ? "style='display:none;'" : '';
718
+                    $hide_cat_sort = ($value === false) ? "style='display:none;'" : '';
719 719
                 }
720 720
 
721
-                $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : '';
721
+                $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort'] === false) ? "style='display:none;'" : '';
722 722
                 ?>
723
-                <li <?php echo $hide_cat_sort ;?>>
723
+                <li <?php echo $hide_cat_sort; ?>>
724 724
                     <h3><?php
725 725
                         /**
726 726
                          * Filter the section title.
@@ -739,23 +739,23 @@  discard block
 block discarded – undo
739 739
                     <label for="cat_sort" class="gd-cf-tooltip-wrap">
740 740
                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Include this field in sorting options :', 'geodirectory'); ?>
741 741
                         <div class="gdcf-tooltip">
742
-                            <?php _e('Lets you use this filed as a sorting option, set from sorting options above.', 'geodirectory');?>
742
+                            <?php _e('Lets you use this filed as a sorting option, set from sorting options above.', 'geodirectory'); ?>
743 743
                         </div>
744 744
                     </label>
745 745
 
746 746
                     <div class="gd-cf-input-wrap gd-switch">
747 747
 
748
-                        <input type="radio" id="cat_sort_yes<?php echo $radio_id;?>" name="cat_sort" class="gdri-enabled"  value="1"
748
+                        <input type="radio" id="cat_sort_yes<?php echo $radio_id; ?>" name="cat_sort" class="gdri-enabled"  value="1"
749 749
                             <?php if ($value == '1') {
750 750
                                 echo 'checked';
751 751
                             } ?>/>
752
-                        <label for="cat_sort_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
752
+                        <label for="cat_sort_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
753 753
 
754
-                        <input type="radio" id="cat_sort_no<?php echo $radio_id;?>" name="cat_sort" class="gdri-disabled" value="0"
754
+                        <input type="radio" id="cat_sort_no<?php echo $radio_id; ?>" name="cat_sort" class="gdri-disabled" value="0"
755 755
                             <?php if (!$value) {
756 756
                                 echo 'checked';
757 757
                             } ?>/>
758
-                        <label for="cat_sort_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
758
+                        <label for="cat_sort_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
759 759
 
760 760
                     </div>
761 761
                 </li>
@@ -782,7 +782,7 @@  discard block
 block discarded – undo
782 782
                      * @param object $field_info The current fields info.
783 783
                      * @param array $cf The custom field settings
784 784
                      */
785
-                    do_action('geodir_advance_custom_fields', $field_info,$cf);?>
785
+                    do_action('geodir_advance_custom_fields', $field_info, $cf); ?>
786 786
 
787 787
 
788 788
                 <?php endswitch; ?>
@@ -794,10 +794,10 @@  discard block
 block discarded – undo
794 794
                     <h3></h3>
795 795
                 </label>
796 796
                 <div class="gd-cf-input-wrap">
797
-                    <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save','geodirectory'));?>"
797
+                    <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save', 'geodirectory')); ?>"
798 798
                            onclick="save_field('<?php echo esc_attr($result_str); ?>')"/>
799 799
                     <?php if (!$default): ?>
800
-                        <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete','geodirectory'));?>"
800
+                        <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete', 'geodirectory')); ?>"
801 801
                                                             onclick="delete_field('<?php echo esc_attr($result_str); ?>', '<?php echo $nonce; ?>')"
802 802
                                                             class="button"/></a>
803 803
                     <?php endif; ?>
Please login to merge, or discard this patch.
Braces   +43 added lines, -38 removed lines patch added patch discarded remove patch
@@ -19,8 +19,9 @@  discard block
 block discarded – undo
19 19
 
20 20
 if (!isset($field_info->post_type)) {
21 21
     $post_type = sanitize_text_field($_REQUEST['listing_type']);
22
-} else
23
-    $post_type = $field_info->post_type;
22
+} else {
23
+    $post_type = $field_info->post_type;
24
+}
24 25
 
25 26
 //if(isset($_REQUEST['custom_type']) && $_REQUEST['custom_type']=='predefined'){
26 27
 //    $cf_arr = geodir_custom_fields_predefined($post_type);
@@ -43,8 +44,9 @@  discard block
 block discarded – undo
43 44
 $nonce = wp_create_nonce('custom_fields_' . $result_str);
44 45
 
45 46
 $field_admin_title = '';
46
-if (isset($field_info->admin_title))
47
-    $field_admin_title = $field_info->admin_title;
47
+if (isset($field_info->admin_title)) {
48
+    $field_admin_title = $field_info->admin_title;
49
+}
48 50
 
49 51
 $default = isset($field_info->is_admin) ? $field_info->is_admin : '';
50 52
 
@@ -65,15 +67,15 @@  discard block
 block discarded – undo
65 67
 
66 68
 if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {
67 69
     $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';
68
-}elseif(isset($cf['icon']) && $cf['icon']){
70
+} elseif(isset($cf['icon']) && $cf['icon']){
69 71
     $field_icon = '<b style="background-image: url("'.$cf['icon'].'")"></b>';
70
-}else{
72
+} else{
71 73
     $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';
72 74
 }
73 75
 
74 76
 if(isset($cf['name']) && $cf['name']){
75 77
     $field_type_name = $cf['name'];
76
-}else{
78
+} else{
77 79
     $field_type_name = $field_type;
78 80
 }
79 81
 
@@ -89,8 +91,11 @@  discard block
 block discarded – undo
89 91
 
90 92
         <?php if ($default): ?>
91 93
             <div title="<?php _e('Default field, should not be removed.', 'geodirectory'); ?>" class="handlediv move gd-default-remove"><i class="fa fa-times" aria-hidden="true"></i></div>
92
-        <?php else: ?>
93
-            <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"
94
+        <?php else {
95
+	: ?>
96
+            <div title="<?php _e('Click to remove field', 'geodirectory');
97
+}
98
+?>"
94 99
                  onclick="delete_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>')"
95 100
                  class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div>
96 101
         <?php endif;
@@ -141,11 +146,11 @@  discard block
 block discarded – undo
141 146
 
142 147
                 echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);
143 148
 
144
-            }else{
149
+            } else{
145 150
                 $value = '';
146 151
                 if (isset($field_info->data_type)) {
147 152
                     $value = esc_attr($field_info->data_type);
148
-                }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
153
+                } elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
149 154
                     $value = $cf['defaults']['data_type'];
150 155
                 }
151 156
                 ?>
@@ -159,11 +164,11 @@  discard block
 block discarded – undo
159 164
 
160 165
                 echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);
161 166
 
162
-            }else{
167
+            } else{
163 168
                 $value = '';
164 169
                 if (isset($field_info->admin_title)) {
165 170
                     $value = esc_attr($field_info->admin_title);
166
-                }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){
171
+                } elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){
167 172
                     $value = $cf['defaults']['admin_title'];
168 173
                 }
169 174
                 ?>
@@ -188,11 +193,11 @@  discard block
 block discarded – undo
188 193
 
189 194
                 echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);
190 195
 
191
-            }else{
196
+            } else{
192 197
                 $value = '';
193 198
                 if (isset($field_info->site_title)) {
194 199
                     $value = esc_attr($field_info->site_title);
195
-                }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){
200
+                } elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){
196 201
                     $value = $cf['defaults']['site_title'];
197 202
                 }
198 203
                 ?>
@@ -216,11 +221,11 @@  discard block
 block discarded – undo
216 221
 
217 222
                 echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);
218 223
 
219
-            }else{
224
+            } else{
220 225
                 $value = '';
221 226
                 if (isset($field_info->admin_desc)) {
222 227
                     $value = esc_attr($field_info->admin_desc);
223
-                }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){
228
+                } elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){
224 229
                     $value = $cf['defaults']['admin_desc'];
225 230
                 }
226 231
                 ?>
@@ -244,11 +249,11 @@  discard block
 block discarded – undo
244 249
 
245 250
                 echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);
246 251
 
247
-            }else{
252
+            } else{
248 253
                 $value = '';
249 254
                 if (isset($field_info->htmlvar_name)) {
250 255
                     $value = esc_attr($field_info->htmlvar_name);
251
-                }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){
256
+                } elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){
252 257
                     $value = $cf['defaults']['htmlvar_name'];
253 258
                 }
254 259
                 ?>
@@ -276,11 +281,11 @@  discard block
 block discarded – undo
276 281
 
277 282
                 echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);
278 283
 
279
-            }else{
284
+            } else{
280 285
                 $value = '';
281 286
                 if (isset($field_info->is_active)) {
282 287
                     $value = esc_attr($field_info->is_active);
283
-                }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){
288
+                } elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){
284 289
                     $value = $cf['defaults']['is_active'];
285 290
                 }
286 291
                 ?>
@@ -315,11 +320,11 @@  discard block
 block discarded – undo
315 320
 
316 321
                 echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);
317 322
 
318
-            }else{
323
+            } else{
319 324
                 $value = '';
320 325
                 if (isset($field_info->for_admin_use)) {
321 326
                     $value = esc_attr($field_info->for_admin_use);
322
-                }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){
327
+                } elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){
323 328
                     $value = $cf['defaults']['for_admin_use'];
324 329
                 }
325 330
                 ?>
@@ -354,11 +359,11 @@  discard block
 block discarded – undo
354 359
 
355 360
                 echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);
356 361
 
357
-            }else{
362
+            } else{
358 363
                 $value = '';
359 364
                 if (isset($field_info->default_value)) {
360 365
                     $value = esc_attr($field_info->default_value);
361
-                }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){
366
+                } elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){
362 367
                     $value = $cf['defaults']['default_value'];
363 368
                 }
364 369
                 ?>
@@ -398,11 +403,11 @@  discard block
 block discarded – undo
398 403
 
399 404
                 echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);
400 405
 
401
-            }else{
406
+            } else{
402 407
                 $value = '';
403 408
                 if (isset($field_info->show_in)) {
404 409
                     $value = esc_attr($field_info->show_in);
405
-                }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){
410
+                } elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){
406 411
                     $value = esc_attr($cf['defaults']['show_in']);
407 412
                 }
408 413
                 ?>
@@ -443,7 +448,7 @@  discard block
 block discarded – undo
443 448
                         // don't show new tab option for some types
444 449
 
445 450
                         if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {
446
-                        }else{
451
+                        } else{
447 452
                             unset($show_in_locations['[owntab]']);
448 453
                         }
449 454
 
@@ -556,11 +561,11 @@  discard block
 block discarded – undo
556 561
 
557 562
                 echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);
558 563
 
559
-            }else{
564
+            } else{
560 565
                 $value = '';
561 566
                 if (isset($field_info->is_required)) {
562 567
                     $value = esc_attr($field_info->is_required);
563
-                }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){
568
+                } elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){
564 569
                     $value = $cf['defaults']['is_required'];
565 570
                 }
566 571
                 ?>
@@ -597,11 +602,11 @@  discard block
 block discarded – undo
597 602
 
598 603
                 echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);
599 604
 
600
-            }else{
605
+            } else{
601 606
                 $value = '';
602 607
                 if (isset($field_info->required_msg)) {
603 608
                     $value = esc_attr($field_info->required_msg);
604
-                }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){
609
+                } elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){
605 610
                     $value = $cf['defaults']['required_msg'];
606 611
                 }
607 612
                 ?>
@@ -642,11 +647,11 @@  discard block
 block discarded – undo
642 647
 
643 648
                 echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);
644 649
 
645
-            }else{
650
+            } else{
646 651
                 $value = '';
647 652
                 if (isset($field_info->field_icon)) {
648 653
                     $value = esc_attr($field_info->field_icon);
649
-                }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){
654
+                } elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){
650 655
                     $value = $cf['defaults']['field_icon'];
651 656
                 }
652 657
                 ?>
@@ -675,11 +680,11 @@  discard block
 block discarded – undo
675 680
 
676 681
                 echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);
677 682
 
678
-            }else{
683
+            } else{
679 684
                 $value = '';
680 685
                 if (isset($field_info->css_class)) {
681 686
                     $value = esc_attr($field_info->css_class);
682
-                }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){
687
+                } elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){
683 688
                     $value = $cf['defaults']['css_class'];
684 689
                 }
685 690
                 ?>
@@ -708,12 +713,12 @@  discard block
 block discarded – undo
708 713
 
709 714
                 echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);
710 715
 
711
-            }else{
716
+            } else{
712 717
                 $value = '';
713 718
                 $hide_cat_sort  ='';
714 719
                 if (isset($field_info->cat_sort)) {
715 720
                     $value = esc_attr($field_info->cat_sort);
716
-                }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){
721
+                } elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){
717 722
                     $value = $cf['defaults']['cat_sort'];
718 723
                     $hide_cat_sort = ($value===false) ? "style='display:none;'" : '';
719 724
                 }
Please login to merge, or discard this patch.
geodirectory-functions/custom_fields_predefined.php 3 patches
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
  * @since 1.6.9
15 15
  * @package GeoDirectory
16 16
  */
17
-function geodir_custom_fields_predefined($post_type=''){
17
+function geodir_custom_fields_predefined($post_type = '') {
18 18
 
19 19
     $custom_fields = array();
20 20
 
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
             'default_value'       =>  '',
66 66
             'show_in' 	          =>  '[detail],[listing]',
67 67
             'is_required'         =>  true,
68
-            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
68
+            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let', 'geodirectory'),
69 69
             'validation_pattern'  =>  '',
70 70
             'validation_msg'      =>  '',
71 71
             'required_msg'        =>  '',
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
             'default_value'       =>  '',
95 95
             'show_in' 	          =>  '[detail],[listing]',
96 96
             'is_required'         =>  true,
97
-            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
97
+            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional', 'geodirectory'),
98 98
             'validation_pattern'  =>  '',
99 99
             'validation_msg'      =>  '',
100 100
             'required_msg'        =>  '',
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
             'default_value'       =>  '',
124 124
             'show_in' 	          =>  '[detail],[listing]',
125 125
             'is_required'         =>  true,
126
-            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
126
+            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage', 'geodirectory'),
127 127
             'validation_pattern'  =>  '',
128 128
             'validation_msg'      =>  '',
129 129
             'required_msg'        =>  '',
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
             'default_value'       =>  '',
153 153
             'show_in' 	          =>  '[detail],[listing]',
154 154
             'is_required'         =>  true,
155
-            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
155
+            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
156 156
             'validation_pattern'  =>  '',
157 157
             'validation_msg'      =>  '',
158 158
             'required_msg'        =>  '',
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
             'default_value'       =>  '',
182 182
             'show_in' 	          =>  '[detail],[listing]',
183 183
             'is_required'         =>  true,
184
-            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
184
+            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
185 185
             'validation_pattern'  =>  '',
186 186
             'validation_msg'      =>  '',
187 187
             'required_msg'        =>  '',
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
             'default_value'       =>  '',
239 239
             'show_in' 	          =>  '[detail],[listing]',
240 240
             'is_required'         =>  true,
241
-            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
241
+            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace', 'geodirectory'),
242 242
             'validation_pattern'  =>  '',
243 243
             'validation_msg'      =>  '',
244 244
             'required_msg'        =>  '',
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
     /**
311 311
      * @see `geodir_custom_fields`
312 312
      */
313
-    return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
313
+    return apply_filters('geodir_custom_fields_predefined', $custom_fields, $post_type);
314 314
 }
315 315
 
316 316
 
@@ -324,11 +324,11 @@  discard block
 block discarded – undo
324 324
  * @since 1.6.9
325 325
  * @return string The html to output.
326 326
  */
327
-function geodir_predefined_custom_field_output_twitter_feed($html,$location,$cf){
327
+function geodir_predefined_custom_field_output_twitter_feed($html, $location, $cf) {
328 328
     global $post;
329 329
 
330 330
 
331
-    if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
331
+    if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
332 332
 
333 333
         $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
334 334
 
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
         }
344 344
 
345 345
 
346
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
346
+        $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;">';
347 347
 
348 348
         $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>';
349 349
         $html .= '</div>';
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
 
353 353
     return $html;
354 354
 }
355
-add_filter('geodir_custom_field_output_text_key_twitter_feed','geodir_predefined_custom_field_output_twitter_feed',10,3);
355
+add_filter('geodir_custom_field_output_text_key_twitter_feed', 'geodir_predefined_custom_field_output_twitter_feed', 10, 3);
356 356
 
357 357
 /**
358 358
  * Filter the get_directions custom field output to show a link.
@@ -364,37 +364,37 @@  discard block
 block discarded – undo
364 364
  * @since 1.6.9
365 365
  * @return string The html to output.
366 366
  */
367
-function geodir_predefined_custom_field_output_get_directions($html,$location,$cf) {
367
+function geodir_predefined_custom_field_output_get_directions($html, $location, $cf) {
368 368
     global $post;
369 369
 
370 370
 
371
-    if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
371
+    if (isset($post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset($post->post_latitude) && $post->post_latitude) {
372 372
 
373
-        $field_icon = geodir_field_icon_proccess( $cf );
374
-        if ( strpos( $field_icon, 'http' ) !== false ) {
373
+        $field_icon = geodir_field_icon_proccess($cf);
374
+        if (strpos($field_icon, 'http') !== false) {
375 375
             $field_icon_af = '';
376
-        } elseif ( $field_icon == '' ) {
376
+        } elseif ($field_icon == '') {
377 377
             $field_icon_af = '<i class="fa fa-location-arrow"></i>';
378 378
         } else {
379 379
             $field_icon_af = $field_icon;
380 380
             $field_icon    = '';
381 381
         }
382 382
 
383
-        $link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
383
+        $link_text = isset($post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __('Get Directions', 'geodirectory');
384 384
 
385
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
385
+        $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;">';
386 386
 
387
-        if(isset( $cf['field_icon'] ) && $cf['field_icon']){
387
+        if (isset($cf['field_icon']) && $cf['field_icon']) {
388 388
             $html .= $field_icon_af;
389 389
         }
390 390
 
391
-        $html .= '<a href="https://www.google.com/maps/dir//\'' . $post->post_latitude . ',' . $post->post_longitude . '\'/" target="_blank" >' . $link_text . '</a>';
391
+        $html .= '<a href="https://www.google.com/maps/dir//\''.$post->post_latitude.','.$post->post_longitude.'\'/" target="_blank" >'.$link_text.'</a>';
392 392
         $html .= '</div>';
393 393
 
394
-    }else{
395
-        $html ='';
394
+    } else {
395
+        $html = '';
396 396
     }
397 397
 
398 398
     return $html;
399 399
 }
400
-add_filter('geodir_custom_field_output_text_key_get_directions','geodir_predefined_custom_field_output_get_directions',10,3);
400
+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
@@ -353,7 +353,7 @@
 block discarded – undo
353 353
 
354 354
     if(!$cpt_left){
355 355
         $cpt_left = "gd-cpt-flat";
356
-    }else{
356
+    } else{
357 357
         $cpt_left = '';
358 358
     }
359 359
 
Please login to merge, or discard this patch.
Indentation   +335 added lines, -335 removed lines patch added patch discarded remove patch
@@ -16,302 +16,302 @@  discard block
 block discarded – undo
16 16
  */
17 17
 function geodir_custom_fields_predefined($post_type=''){
18 18
 
19
-    $custom_fields = array();
20
-
21
-
22
-    // price
23
-    $custom_fields['price'] = array( // The key value should be unique and not contain any spaces.
24
-        'field_type'  =>  'text',
25
-        'class'       =>  'gd-price',
26
-        'icon'        =>  'fa fa-usd',
27
-        'name'        =>  __('Price', 'geodirectory'),
28
-        'description' =>  __('Adds a input for a price field. This will let you filter and sort by price.', 'geodirectory'),
29
-        'defaults'    => array(
30
-            'data_type'           =>  'FLOAT',
31
-            'decimal_point'       =>  '2',
32
-            'admin_title'         =>  'Price',
33
-            'site_title'          =>  'Price',
34
-            'admin_desc'          =>  'Enter the price in $ (no currency symbol)',
35
-            'htmlvar_name'        =>  'price',
36
-            'is_active'           =>  true,
37
-            'for_admin_use'       =>  false,
38
-            'default_value'       =>  '',
39
-            'show_in' 	      =>  '[detail],[listing]',
40
-            'is_required'         =>  false,
41
-            'validation_pattern'  =>  '\d+(\.\d{2})?',
42
-            'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
43
-            'required_msg'        =>  '',
44
-            'field_icon'          =>  'fa fa-usd',
45
-            'css_class'           =>  '',
46
-            'cat_sort'            =>  true,
47
-            'cat_filter'	      =>  true
48
-        )
49
-    );
50
-
51
-    // property status
52
-    $custom_fields['property_status'] = array( // The key value should be unique and not contain any spaces.
53
-        'field_type'  =>  'select',
54
-        'class'       =>  'gd-property-status',
55
-        'icon'        =>  'fa fa-home',
56
-        'name'        =>  __('Property Status', 'geodirectory'),
57
-        'description' =>  __('Adds a select input to be able to set the status of a property ie: For Sale, For Rent', 'geodirectory'),
58
-        'defaults'    => array(
59
-            'data_type'           =>  'VARCHAR',
60
-            'admin_title'         =>  'Property Status',
61
-            'site_title'          =>  'Property Status',
62
-            'admin_desc'          =>  'Enter the status of the property.',
63
-            'htmlvar_name'        =>  'property_status',
64
-            'is_active'           =>  true,
65
-            'for_admin_use'       =>  false,
66
-            'default_value'       =>  '',
67
-            'show_in' 	          =>  '[detail],[listing]',
68
-            'is_required'         =>  true,
69
-            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
70
-            'validation_pattern'  =>  '',
71
-            'validation_msg'      =>  '',
72
-            'required_msg'        =>  '',
73
-            'field_icon'          =>  'fa fa-home',
74
-            'css_class'           =>  '',
75
-            'cat_sort'            =>  true,
76
-            'cat_filter'	      =>  true
77
-        )
78
-    );
79
-
80
-    // property furnishing
81
-    $custom_fields['property_furnishing'] = array( // The key value should be unique and not contain any spaces.
82
-        'field_type'  =>  'select',
83
-        'class'       =>  'gd-property-furnishing',
84
-        'icon'        =>  'fa fa-home',
85
-        'name'        =>  __('Property Furnishing', 'geodirectory'),
86
-        'description' =>  __('Adds a select input to be able to set the furnishing status of a property ie: Unfurnished, Furnished', 'geodirectory'),
87
-        'defaults'    => array(
88
-            'data_type'           =>  'VARCHAR',
89
-            'admin_title'         =>  'Furnishing',
90
-            'site_title'          =>  'Furnishing',
91
-            'admin_desc'          =>  'Enter the furnishing status of the property.',
92
-            'htmlvar_name'        =>  'property_furnishing',
93
-            'is_active'           =>  true,
94
-            'for_admin_use'       =>  false,
95
-            'default_value'       =>  '',
96
-            'show_in' 	          =>  '[detail],[listing]',
97
-            'is_required'         =>  true,
98
-            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
99
-            'validation_pattern'  =>  '',
100
-            'validation_msg'      =>  '',
101
-            'required_msg'        =>  '',
102
-            'field_icon'          =>  'fa fa-th-large',
103
-            'css_class'           =>  '',
104
-            'cat_sort'            =>  true,
105
-            'cat_filter'	      =>  true
106
-        )
107
-    );
108
-
109
-    // property type
110
-    $custom_fields['property_type'] = array( // The key value should be unique and not contain any spaces.
111
-        'field_type'  =>  'select',
112
-        'class'       =>  'gd-property-type',
113
-        'icon'        =>  'fa fa-home',
114
-        'name'        =>  __('Property Type', 'geodirectory'),
115
-        'description' =>  __('Adds a select input for the property type ie: Detached house, Apartment', 'geodirectory'),
116
-        'defaults'    => array(
117
-            'data_type'           =>  'VARCHAR',
118
-            'admin_title'         =>  'Property Type',
119
-            'site_title'          =>  'Property Type',
120
-            'admin_desc'          =>  'Select the property type.',
121
-            'htmlvar_name'        =>  'property_type',
122
-            'is_active'           =>  true,
123
-            'for_admin_use'       =>  false,
124
-            'default_value'       =>  '',
125
-            'show_in' 	          =>  '[detail],[listing]',
126
-            'is_required'         =>  true,
127
-            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
128
-            'validation_pattern'  =>  '',
129
-            'validation_msg'      =>  '',
130
-            'required_msg'        =>  '',
131
-            'field_icon'          =>  'fa fa-home',
132
-            'css_class'           =>  '',
133
-            'cat_sort'            =>  true,
134
-            'cat_filter'	      =>  true
135
-        )
136
-    );
137
-
138
-    // property bedrooms
139
-    $custom_fields['property_bedrooms'] = array( // The key value should be unique and not contain any spaces.
140
-        'field_type'  =>  'select',
141
-        'class'       =>  'gd-property-bedrooms',
142
-        'icon'        =>  'fa fa-home',
143
-        'name'        =>  __('Property Bedrooms', 'geodirectory'),
144
-        'description' =>  __('Adds a select input for the number of bedrooms.', 'geodirectory'),
145
-        'defaults'    => array(
146
-            'data_type'           =>  'VARCHAR',
147
-            'admin_title'         =>  'Property Bedrooms',
148
-            'site_title'          =>  'Bedrooms',
149
-            'admin_desc'          =>  'Select the number of bedrooms',
150
-            'htmlvar_name'        =>  'property_bedrooms',
151
-            'is_active'           =>  true,
152
-            'for_admin_use'       =>  false,
153
-            'default_value'       =>  '',
154
-            'show_in' 	          =>  '[detail],[listing]',
155
-            'is_required'         =>  true,
156
-            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
157
-            'validation_pattern'  =>  '',
158
-            'validation_msg'      =>  '',
159
-            'required_msg'        =>  '',
160
-            'field_icon'          =>  'fa fa-bed',
161
-            'css_class'           =>  '',
162
-            'cat_sort'            =>  true,
163
-            'cat_filter'	      =>  true
164
-        )
165
-    );
166
-
167
-    // property bathrooms
168
-    $custom_fields['property_bathrooms'] = array( // The key value should be unique and not contain any spaces.
169
-        'field_type'  =>  'select',
170
-        'class'       =>  'gd-property-bathrooms',
171
-        'icon'        =>  'fa fa-home',
172
-        'name'        =>  __('Property Bathrooms', 'geodirectory'),
173
-        'description' =>  __('Adds a select input for the number of bathrooms.', 'geodirectory'),
174
-        'defaults'    => array(
175
-            'data_type'           =>  'VARCHAR',
176
-            'admin_title'         =>  'Property Bathrooms',
177
-            'site_title'          =>  'Bathrooms',
178
-            'admin_desc'          =>  'Select the number of bathrooms',
179
-            'htmlvar_name'        =>  'property_bathrooms',
180
-            'is_active'           =>  true,
181
-            'for_admin_use'       =>  false,
182
-            'default_value'       =>  '',
183
-            'show_in' 	          =>  '[detail],[listing]',
184
-            'is_required'         =>  true,
185
-            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
186
-            'validation_pattern'  =>  '',
187
-            'validation_msg'      =>  '',
188
-            'required_msg'        =>  '',
189
-            'field_icon'          =>  'fa fa-bold',
190
-            'css_class'           =>  '',
191
-            'cat_sort'            =>  true,
192
-            'cat_filter'	      =>  true
193
-        )
194
-    );
195
-
196
-    // property area
197
-    $custom_fields['property_area'] = array( // The key value should be unique and not contain any spaces.
198
-        'field_type'  =>  'text',
199
-        'class'       =>  'gd-area',
200
-        'icon'        =>  'fa fa-home',
201
-        'name'        =>  __('Property Area', 'geodirectory'),
202
-        'description' =>  __('Adds a input for the property area.', 'geodirectory'),
203
-        'defaults'    => array(
204
-            'data_type'           =>  'FLOAT',
205
-            'admin_title'         =>  'Property Area',
206
-            'site_title'          =>  'Area (Sq Ft)',
207
-            'admin_desc'          =>  'Enter the Sq Ft value for the property',
208
-            'htmlvar_name'        =>  'property_area',
209
-            'is_active'           =>  true,
210
-            'for_admin_use'       =>  false,
211
-            'default_value'       =>  '',
212
-            'show_in' 	      =>  '[detail],[listing]',
213
-            'is_required'         =>  false,
214
-            'validation_pattern'  =>  '\d+(\.\d{2})?',
215
-            'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
216
-            'required_msg'        =>  '',
217
-            'field_icon'          =>  'fa fa-area-chart',
218
-            'css_class'           =>  '',
219
-            'cat_sort'            =>  true,
220
-            'cat_filter'	      =>  true
221
-        )
222
-    );
223
-
224
-    // property type
225
-    $custom_fields['property_features'] = array( // The key value should be unique and not contain any spaces.
226
-        'field_type'  =>  'multiselect',
227
-        'class'       =>  'gd-property-features',
228
-        'icon'        =>  'fa fa-home',
229
-        'name'        =>  __('Property Features', 'geodirectory'),
230
-        'description' =>  __('Adds a select input for the property features.', 'geodirectory'),
231
-        'defaults'    => array(
232
-            'data_type'           =>  'VARCHAR',
233
-            'admin_title'         =>  'Property Features',
234
-            'site_title'          =>  'Features',
235
-            'admin_desc'          =>  'Select the property features.',
236
-            'htmlvar_name'        =>  'property_features',
237
-            'is_active'           =>  true,
238
-            'for_admin_use'       =>  false,
239
-            'default_value'       =>  '',
240
-            'show_in' 	          =>  '[detail],[listing]',
241
-            'is_required'         =>  true,
242
-            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
243
-            'validation_pattern'  =>  '',
244
-            'validation_msg'      =>  '',
245
-            'required_msg'        =>  '',
246
-            'field_icon'          =>  'fa fa-plus-square',
247
-            'css_class'           =>  '',
248
-            'cat_sort'            =>  true,
249
-            'cat_filter'	      =>  true
250
-        )
251
-    );
252
-
253
-    // Twitter feed
254
-    $custom_fields['twitter_feed'] = array( // The key value should be unique and not contain any spaces.
255
-        'field_type'  =>  'text',
256
-        'class'       =>  'gd-twitter',
257
-        'icon'        =>  'fa fa-twitter',
258
-        'name'        =>  __('Twitter feed', 'geodirectory'),
259
-        'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
260
-        'defaults'    => array(
261
-            'data_type'           =>  'VARCHAR',
262
-            'admin_title'         =>  'Twitter',
263
-            'site_title'          =>  'Twitter',
264
-            'admin_desc'          =>  'Enter your Twitter username',
265
-            'htmlvar_name'        =>  'twitterusername',
266
-            'is_active'           =>  true,
267
-            'for_admin_use'       =>  false,
268
-            'default_value'       =>  '',
269
-            'show_in' 	      =>  '[detail],[owntab]',
270
-            'is_required'         =>  false,
271
-            'validation_pattern'  =>  '^[A-Za-z0-9_]{1,32}$',
272
-            'validation_msg'      =>  'Please enter a valid twitter username.',
273
-            'required_msg'        =>  '',
274
-            'field_icon'          =>  'fa fa-twitter',
275
-            'css_class'           =>  '',
276
-            'cat_sort'            =>  false,
277
-            'cat_filter'	      =>  false
278
-        )
279
-    );
280
-
281
-    // Get directions link
282
-    $custom_fields['get_directions'] = array( // The key value should be unique and not contain any spaces.
283
-        'field_type'  =>  'text',
284
-        'class'       =>  'gd-get-directions',
285
-        'icon'        =>  'fa fa-location-arrow',
286
-        'name'        =>  __('Get Directions Link', 'geodirectory'),
287
-        'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
288
-        'defaults'    => array(
289
-            'data_type'           =>  'VARCHAR',
290
-            'admin_title'         =>  'Get Directions',
291
-            'site_title'          =>  'Get Directions',
292
-            'admin_desc'          =>  '',
293
-            'htmlvar_name'        =>  'get_directions',
294
-            'is_active'           =>  true,
295
-            'for_admin_use'       =>  true,
296
-            'default_value'       =>  'Get Directions',
297
-            'show_in' 	      =>  '[detail],[listing]',
298
-            'is_required'         =>  false,
299
-            'validation_pattern'  =>  '',
300
-            'validation_msg'      =>  '',
301
-            'required_msg'        =>  '',
302
-            'field_icon'          =>  'fa fa-location-arrow',
303
-            'css_class'           =>  '',
304
-            'cat_sort'            =>  false,
305
-            'cat_filter'	      =>  false
306
-        )
307
-    );
308
-
309
-
310
-
311
-    /**
312
-     * @see `geodir_custom_fields`
313
-     */
314
-    return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
19
+	$custom_fields = array();
20
+
21
+
22
+	// price
23
+	$custom_fields['price'] = array( // The key value should be unique and not contain any spaces.
24
+		'field_type'  =>  'text',
25
+		'class'       =>  'gd-price',
26
+		'icon'        =>  'fa fa-usd',
27
+		'name'        =>  __('Price', 'geodirectory'),
28
+		'description' =>  __('Adds a input for a price field. This will let you filter and sort by price.', 'geodirectory'),
29
+		'defaults'    => array(
30
+			'data_type'           =>  'FLOAT',
31
+			'decimal_point'       =>  '2',
32
+			'admin_title'         =>  'Price',
33
+			'site_title'          =>  'Price',
34
+			'admin_desc'          =>  'Enter the price in $ (no currency symbol)',
35
+			'htmlvar_name'        =>  'price',
36
+			'is_active'           =>  true,
37
+			'for_admin_use'       =>  false,
38
+			'default_value'       =>  '',
39
+			'show_in' 	      =>  '[detail],[listing]',
40
+			'is_required'         =>  false,
41
+			'validation_pattern'  =>  '\d+(\.\d{2})?',
42
+			'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
43
+			'required_msg'        =>  '',
44
+			'field_icon'          =>  'fa fa-usd',
45
+			'css_class'           =>  '',
46
+			'cat_sort'            =>  true,
47
+			'cat_filter'	      =>  true
48
+		)
49
+	);
50
+
51
+	// property status
52
+	$custom_fields['property_status'] = array( // The key value should be unique and not contain any spaces.
53
+		'field_type'  =>  'select',
54
+		'class'       =>  'gd-property-status',
55
+		'icon'        =>  'fa fa-home',
56
+		'name'        =>  __('Property Status', 'geodirectory'),
57
+		'description' =>  __('Adds a select input to be able to set the status of a property ie: For Sale, For Rent', 'geodirectory'),
58
+		'defaults'    => array(
59
+			'data_type'           =>  'VARCHAR',
60
+			'admin_title'         =>  'Property Status',
61
+			'site_title'          =>  'Property Status',
62
+			'admin_desc'          =>  'Enter the status of the property.',
63
+			'htmlvar_name'        =>  'property_status',
64
+			'is_active'           =>  true,
65
+			'for_admin_use'       =>  false,
66
+			'default_value'       =>  '',
67
+			'show_in' 	          =>  '[detail],[listing]',
68
+			'is_required'         =>  true,
69
+			'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
70
+			'validation_pattern'  =>  '',
71
+			'validation_msg'      =>  '',
72
+			'required_msg'        =>  '',
73
+			'field_icon'          =>  'fa fa-home',
74
+			'css_class'           =>  '',
75
+			'cat_sort'            =>  true,
76
+			'cat_filter'	      =>  true
77
+		)
78
+	);
79
+
80
+	// property furnishing
81
+	$custom_fields['property_furnishing'] = array( // The key value should be unique and not contain any spaces.
82
+		'field_type'  =>  'select',
83
+		'class'       =>  'gd-property-furnishing',
84
+		'icon'        =>  'fa fa-home',
85
+		'name'        =>  __('Property Furnishing', 'geodirectory'),
86
+		'description' =>  __('Adds a select input to be able to set the furnishing status of a property ie: Unfurnished, Furnished', 'geodirectory'),
87
+		'defaults'    => array(
88
+			'data_type'           =>  'VARCHAR',
89
+			'admin_title'         =>  'Furnishing',
90
+			'site_title'          =>  'Furnishing',
91
+			'admin_desc'          =>  'Enter the furnishing status of the property.',
92
+			'htmlvar_name'        =>  'property_furnishing',
93
+			'is_active'           =>  true,
94
+			'for_admin_use'       =>  false,
95
+			'default_value'       =>  '',
96
+			'show_in' 	          =>  '[detail],[listing]',
97
+			'is_required'         =>  true,
98
+			'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
99
+			'validation_pattern'  =>  '',
100
+			'validation_msg'      =>  '',
101
+			'required_msg'        =>  '',
102
+			'field_icon'          =>  'fa fa-th-large',
103
+			'css_class'           =>  '',
104
+			'cat_sort'            =>  true,
105
+			'cat_filter'	      =>  true
106
+		)
107
+	);
108
+
109
+	// property type
110
+	$custom_fields['property_type'] = array( // The key value should be unique and not contain any spaces.
111
+		'field_type'  =>  'select',
112
+		'class'       =>  'gd-property-type',
113
+		'icon'        =>  'fa fa-home',
114
+		'name'        =>  __('Property Type', 'geodirectory'),
115
+		'description' =>  __('Adds a select input for the property type ie: Detached house, Apartment', 'geodirectory'),
116
+		'defaults'    => array(
117
+			'data_type'           =>  'VARCHAR',
118
+			'admin_title'         =>  'Property Type',
119
+			'site_title'          =>  'Property Type',
120
+			'admin_desc'          =>  'Select the property type.',
121
+			'htmlvar_name'        =>  'property_type',
122
+			'is_active'           =>  true,
123
+			'for_admin_use'       =>  false,
124
+			'default_value'       =>  '',
125
+			'show_in' 	          =>  '[detail],[listing]',
126
+			'is_required'         =>  true,
127
+			'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
128
+			'validation_pattern'  =>  '',
129
+			'validation_msg'      =>  '',
130
+			'required_msg'        =>  '',
131
+			'field_icon'          =>  'fa fa-home',
132
+			'css_class'           =>  '',
133
+			'cat_sort'            =>  true,
134
+			'cat_filter'	      =>  true
135
+		)
136
+	);
137
+
138
+	// property bedrooms
139
+	$custom_fields['property_bedrooms'] = array( // The key value should be unique and not contain any spaces.
140
+		'field_type'  =>  'select',
141
+		'class'       =>  'gd-property-bedrooms',
142
+		'icon'        =>  'fa fa-home',
143
+		'name'        =>  __('Property Bedrooms', 'geodirectory'),
144
+		'description' =>  __('Adds a select input for the number of bedrooms.', 'geodirectory'),
145
+		'defaults'    => array(
146
+			'data_type'           =>  'VARCHAR',
147
+			'admin_title'         =>  'Property Bedrooms',
148
+			'site_title'          =>  'Bedrooms',
149
+			'admin_desc'          =>  'Select the number of bedrooms',
150
+			'htmlvar_name'        =>  'property_bedrooms',
151
+			'is_active'           =>  true,
152
+			'for_admin_use'       =>  false,
153
+			'default_value'       =>  '',
154
+			'show_in' 	          =>  '[detail],[listing]',
155
+			'is_required'         =>  true,
156
+			'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
157
+			'validation_pattern'  =>  '',
158
+			'validation_msg'      =>  '',
159
+			'required_msg'        =>  '',
160
+			'field_icon'          =>  'fa fa-bed',
161
+			'css_class'           =>  '',
162
+			'cat_sort'            =>  true,
163
+			'cat_filter'	      =>  true
164
+		)
165
+	);
166
+
167
+	// property bathrooms
168
+	$custom_fields['property_bathrooms'] = array( // The key value should be unique and not contain any spaces.
169
+		'field_type'  =>  'select',
170
+		'class'       =>  'gd-property-bathrooms',
171
+		'icon'        =>  'fa fa-home',
172
+		'name'        =>  __('Property Bathrooms', 'geodirectory'),
173
+		'description' =>  __('Adds a select input for the number of bathrooms.', 'geodirectory'),
174
+		'defaults'    => array(
175
+			'data_type'           =>  'VARCHAR',
176
+			'admin_title'         =>  'Property Bathrooms',
177
+			'site_title'          =>  'Bathrooms',
178
+			'admin_desc'          =>  'Select the number of bathrooms',
179
+			'htmlvar_name'        =>  'property_bathrooms',
180
+			'is_active'           =>  true,
181
+			'for_admin_use'       =>  false,
182
+			'default_value'       =>  '',
183
+			'show_in' 	          =>  '[detail],[listing]',
184
+			'is_required'         =>  true,
185
+			'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
186
+			'validation_pattern'  =>  '',
187
+			'validation_msg'      =>  '',
188
+			'required_msg'        =>  '',
189
+			'field_icon'          =>  'fa fa-bold',
190
+			'css_class'           =>  '',
191
+			'cat_sort'            =>  true,
192
+			'cat_filter'	      =>  true
193
+		)
194
+	);
195
+
196
+	// property area
197
+	$custom_fields['property_area'] = array( // The key value should be unique and not contain any spaces.
198
+		'field_type'  =>  'text',
199
+		'class'       =>  'gd-area',
200
+		'icon'        =>  'fa fa-home',
201
+		'name'        =>  __('Property Area', 'geodirectory'),
202
+		'description' =>  __('Adds a input for the property area.', 'geodirectory'),
203
+		'defaults'    => array(
204
+			'data_type'           =>  'FLOAT',
205
+			'admin_title'         =>  'Property Area',
206
+			'site_title'          =>  'Area (Sq Ft)',
207
+			'admin_desc'          =>  'Enter the Sq Ft value for the property',
208
+			'htmlvar_name'        =>  'property_area',
209
+			'is_active'           =>  true,
210
+			'for_admin_use'       =>  false,
211
+			'default_value'       =>  '',
212
+			'show_in' 	      =>  '[detail],[listing]',
213
+			'is_required'         =>  false,
214
+			'validation_pattern'  =>  '\d+(\.\d{2})?',
215
+			'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
216
+			'required_msg'        =>  '',
217
+			'field_icon'          =>  'fa fa-area-chart',
218
+			'css_class'           =>  '',
219
+			'cat_sort'            =>  true,
220
+			'cat_filter'	      =>  true
221
+		)
222
+	);
223
+
224
+	// property type
225
+	$custom_fields['property_features'] = array( // The key value should be unique and not contain any spaces.
226
+		'field_type'  =>  'multiselect',
227
+		'class'       =>  'gd-property-features',
228
+		'icon'        =>  'fa fa-home',
229
+		'name'        =>  __('Property Features', 'geodirectory'),
230
+		'description' =>  __('Adds a select input for the property features.', 'geodirectory'),
231
+		'defaults'    => array(
232
+			'data_type'           =>  'VARCHAR',
233
+			'admin_title'         =>  'Property Features',
234
+			'site_title'          =>  'Features',
235
+			'admin_desc'          =>  'Select the property features.',
236
+			'htmlvar_name'        =>  'property_features',
237
+			'is_active'           =>  true,
238
+			'for_admin_use'       =>  false,
239
+			'default_value'       =>  '',
240
+			'show_in' 	          =>  '[detail],[listing]',
241
+			'is_required'         =>  true,
242
+			'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
243
+			'validation_pattern'  =>  '',
244
+			'validation_msg'      =>  '',
245
+			'required_msg'        =>  '',
246
+			'field_icon'          =>  'fa fa-plus-square',
247
+			'css_class'           =>  '',
248
+			'cat_sort'            =>  true,
249
+			'cat_filter'	      =>  true
250
+		)
251
+	);
252
+
253
+	// Twitter feed
254
+	$custom_fields['twitter_feed'] = array( // The key value should be unique and not contain any spaces.
255
+		'field_type'  =>  'text',
256
+		'class'       =>  'gd-twitter',
257
+		'icon'        =>  'fa fa-twitter',
258
+		'name'        =>  __('Twitter feed', 'geodirectory'),
259
+		'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
260
+		'defaults'    => array(
261
+			'data_type'           =>  'VARCHAR',
262
+			'admin_title'         =>  'Twitter',
263
+			'site_title'          =>  'Twitter',
264
+			'admin_desc'          =>  'Enter your Twitter username',
265
+			'htmlvar_name'        =>  'twitterusername',
266
+			'is_active'           =>  true,
267
+			'for_admin_use'       =>  false,
268
+			'default_value'       =>  '',
269
+			'show_in' 	      =>  '[detail],[owntab]',
270
+			'is_required'         =>  false,
271
+			'validation_pattern'  =>  '^[A-Za-z0-9_]{1,32}$',
272
+			'validation_msg'      =>  'Please enter a valid twitter username.',
273
+			'required_msg'        =>  '',
274
+			'field_icon'          =>  'fa fa-twitter',
275
+			'css_class'           =>  '',
276
+			'cat_sort'            =>  false,
277
+			'cat_filter'	      =>  false
278
+		)
279
+	);
280
+
281
+	// Get directions link
282
+	$custom_fields['get_directions'] = array( // The key value should be unique and not contain any spaces.
283
+		'field_type'  =>  'text',
284
+		'class'       =>  'gd-get-directions',
285
+		'icon'        =>  'fa fa-location-arrow',
286
+		'name'        =>  __('Get Directions Link', 'geodirectory'),
287
+		'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
288
+		'defaults'    => array(
289
+			'data_type'           =>  'VARCHAR',
290
+			'admin_title'         =>  'Get Directions',
291
+			'site_title'          =>  'Get Directions',
292
+			'admin_desc'          =>  '',
293
+			'htmlvar_name'        =>  'get_directions',
294
+			'is_active'           =>  true,
295
+			'for_admin_use'       =>  true,
296
+			'default_value'       =>  'Get Directions',
297
+			'show_in' 	      =>  '[detail],[listing]',
298
+			'is_required'         =>  false,
299
+			'validation_pattern'  =>  '',
300
+			'validation_msg'      =>  '',
301
+			'required_msg'        =>  '',
302
+			'field_icon'          =>  'fa fa-location-arrow',
303
+			'css_class'           =>  '',
304
+			'cat_sort'            =>  false,
305
+			'cat_filter'	      =>  false
306
+		)
307
+	);
308
+
309
+
310
+
311
+	/**
312
+	 * @see `geodir_custom_fields`
313
+	 */
314
+	return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
315 315
 }
316 316
 
317 317
 
@@ -326,32 +326,32 @@  discard block
 block discarded – undo
326 326
  * @return string The html to output.
327 327
  */
328 328
 function geodir_predefined_custom_field_output_twitter_feed($html,$location,$cf){
329
-    global $post;
329
+	global $post;
330 330
 
331 331
 
332
-    if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
332
+	if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
333 333
 
334
-        $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
334
+		$class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
335 335
 
336
-        $field_icon = geodir_field_icon_proccess($cf);
337
-        if (strpos($field_icon, 'http') !== false) {
338
-            $field_icon_af = '';
339
-        } elseif ($field_icon == '') {
340
-            $field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="fa fa-clock-o"></i>' : "";
341
-        } else {
342
-            $field_icon_af = $field_icon;
343
-            $field_icon = '';
344
-        }
336
+		$field_icon = geodir_field_icon_proccess($cf);
337
+		if (strpos($field_icon, 'http') !== false) {
338
+			$field_icon_af = '';
339
+		} elseif ($field_icon == '') {
340
+			$field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="fa fa-clock-o"></i>' : "";
341
+		} else {
342
+			$field_icon_af = $field_icon;
343
+			$field_icon = '';
344
+		}
345 345
 
346 346
 
347
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
347
+		$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
348 348
 
349
-        $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>';
350
-        $html .= '</div>';
349
+		$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>';
350
+		$html .= '</div>';
351 351
 
352
-    endif;
352
+	endif;
353 353
 
354
-    return $html;
354
+	return $html;
355 355
 }
356 356
 add_filter('geodir_custom_field_output_text_key_twitter_feed','geodir_predefined_custom_field_output_twitter_feed',10,3);
357 357
 
@@ -366,36 +366,36 @@  discard block
 block discarded – undo
366 366
  * @return string The html to output.
367 367
  */
368 368
 function geodir_predefined_custom_field_output_get_directions($html,$location,$cf) {
369
-    global $post;
369
+	global $post;
370 370
 
371 371
 
372
-    if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
372
+	if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
373 373
 
374
-        $field_icon = geodir_field_icon_proccess( $cf );
375
-        if ( strpos( $field_icon, 'http' ) !== false ) {
376
-            $field_icon_af = '';
377
-        } elseif ( $field_icon == '' ) {
378
-            $field_icon_af = '<i class="fa fa-location-arrow"></i>';
379
-        } else {
380
-            $field_icon_af = $field_icon;
381
-            $field_icon    = '';
382
-        }
374
+		$field_icon = geodir_field_icon_proccess( $cf );
375
+		if ( strpos( $field_icon, 'http' ) !== false ) {
376
+			$field_icon_af = '';
377
+		} elseif ( $field_icon == '' ) {
378
+			$field_icon_af = '<i class="fa fa-location-arrow"></i>';
379
+		} else {
380
+			$field_icon_af = $field_icon;
381
+			$field_icon    = '';
382
+		}
383 383
 
384
-        $link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
384
+		$link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
385 385
 
386
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
386
+		$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
387 387
 
388
-        if(isset( $cf['field_icon'] ) && $cf['field_icon']){
389
-            $html .= $field_icon_af;
390
-        }
388
+		if(isset( $cf['field_icon'] ) && $cf['field_icon']){
389
+			$html .= $field_icon_af;
390
+		}
391 391
 
392
-        $html .= '<a href="https://www.google.com/maps/dir//\'' . $post->post_latitude . ',' . $post->post_longitude . '\'/" target="_blank" >' . $link_text . '</a>';
393
-        $html .= '</div>';
392
+		$html .= '<a href="https://www.google.com/maps/dir//\'' . $post->post_latitude . ',' . $post->post_longitude . '\'/" target="_blank" >' . $link_text . '</a>';
393
+		$html .= '</div>';
394 394
 
395
-    }else{
396
-        $html ='';
397
-    }
395
+	}else{
396
+		$html ='';
397
+	}
398 398
 
399
-    return $html;
399
+	return $html;
400 400
 }
401 401
 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.