Test Failed
Push — master ( 4eb591...3e14b5 )
by Stiofan
20:20
created
geodirectory-admin/option-pages/design_settings_array.php 3 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,8 +40,9 @@
 block discarded – undo
40 40
     $geodir_active_nav_locations = get_nav_menu_locations();
41 41
     if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) {
42 42
         foreach ($geodir_active_nav_locations as $key => $theme_location) {
43
-            if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations))
44
-                $post_type_arr[$key] = $geodir_all_nav_locations[$key];
43
+            if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations)) {
44
+                            $post_type_arr[$key] = $geodir_all_nav_locations[$key];
45
+            }
45 46
         }
46 47
     }
47 48
 
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
     ),
143 143
     array(
144 144
         'name' => __('Resize image large size', 'geodirectory'),
145
-        'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')),
145
+        'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w').'x'.get_option('large_size_h')),
146 146
         'id' => 'geodir_use_wp_media_large_size',
147 147
         'type' => 'checkbox',
148 148
         'std' => '0'
@@ -584,11 +584,11 @@  discard block
 block discarded – undo
584 584
         'id' => 'geodir_default_rating_star_icon',
585 585
         'type' => 'file',
586 586
         'std' => '0',
587
-        'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section
587
+        'value' => geodir_plugin_url().'/geodirectory-assets/images/stars.png'// Default value to show home top section
588 588
     ),
589 589
 	array(
590 590
 		'name' => __('Enable Font Awesome', 'geodirectory'),
591
-		'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory' ),
591
+		'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory'),
592 592
 		'id' => 'geodir_reviewrating_enable_font_awesome',
593 593
 		'type' => 'checkbox',
594 594
 		'std' => '0'
@@ -1054,7 +1054,7 @@  discard block
 block discarded – undo
1054 1054
         'name' => __('Google Maps API KEY', 'geodirectory'),
1055 1055
         'desc' => sprintf(
1056 1056
             __('This is a requirement to use Google Maps, you can get a key from <a href="%s" target="_blank">here</a> OR you can set GD to use Open Street Maps below under Select Maps API setting.   (<a href="%s" target="_blank">How to add a Google API KEY?</a>)', 'geodirectory'),
1057
-            'https://console.developers.google.com/flows/enableapi?apiid=static_maps_backend,street_view_image_backend,maps_embed_backend,places_backend,geocoding_backend,directions_backend,distance_matrix_backend,geolocation,elevation_backend,timezone_backend,maps_backend&keyType=CLIENT_SIDE&reusekey=true','https://wpgeodirectory.com/docs/add-google-api-key/' ),
1057
+            'https://console.developers.google.com/flows/enableapi?apiid=static_maps_backend,street_view_image_backend,maps_embed_backend,places_backend,geocoding_backend,directions_backend,distance_matrix_backend,geolocation,elevation_backend,timezone_backend,maps_backend&keyType=CLIENT_SIDE&reusekey=true', 'https://wpgeodirectory.com/docs/add-google-api-key/' ),
1058 1058
         'tip' => '',
1059 1059
         'id' => 'geodir_google_api_key',
1060 1060
         'css' => 'min-width:300px;',
@@ -1129,7 +1129,7 @@  discard block
 block discarded – undo
1129 1129
         'id' => 'geodir_default_marker_icon',
1130 1130
         'type' => 'file',
1131 1131
         'std' => '0',
1132
-        'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section
1132
+        'value' => geodir_plugin_url().'/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section
1133 1133
     ),
1134 1134
     // add option that allows enable/disable map dragging to phone devices
1135 1135
     array(
Please login to merge, or discard this patch.
Indentation   +933 added lines, -933 removed lines patch added patch discarded remove patch
@@ -16,17 +16,17 @@  discard block
 block discarded – undo
16 16
  */
17 17
 function geodir_theme_location_setting_fun()
18 18
 {
19
-    $post_type_arr = array();
20
-    $geodir_all_nav_locations = get_registered_nav_menus();
21
-    $geodir_active_nav_locations = get_nav_menu_locations();
22
-    if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) {
23
-        foreach ($geodir_active_nav_locations as $key => $theme_location) {
24
-            if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations))
25
-                $post_type_arr[$key] = $geodir_all_nav_locations[$key];
26
-        }
27
-    }
28
-
29
-    return $post_type_arr;
19
+	$post_type_arr = array();
20
+	$geodir_all_nav_locations = get_registered_nav_menus();
21
+	$geodir_active_nav_locations = get_nav_menu_locations();
22
+	if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) {
23
+		foreach ($geodir_active_nav_locations as $key => $theme_location) {
24
+			if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations))
25
+				$post_type_arr[$key] = $geodir_all_nav_locations[$key];
26
+		}
27
+	}
28
+
29
+	return $post_type_arr;
30 30
 }
31 31
 
32 32
 /**
@@ -37,536 +37,536 @@  discard block
 block discarded – undo
37 37
  */
38 38
 $geodir_settings['design_settings'] = apply_filters('geodir_design_settings', array(
39 39
 
40
-    /* Home Layout Settings start */
41
-    array('name' => __('Home', 'geodirectory'), 'type' => 'title', 'desc' => 'Setting to set home page layout', 'id' => 'home_page_settings '),
40
+	/* Home Layout Settings start */
41
+	array('name' => __('Home', 'geodirectory'), 'type' => 'title', 'desc' => 'Setting to set home page layout', 'id' => 'home_page_settings '),
42 42
 
43 43
 
44
-    array('name' => __('Home Top Section Settings', 'geodirectory'),
45
-        'type' => 'sectionstart',
46
-        'desc' => '',
47
-        'id' => 'geodir_home_top_section'),
44
+	array('name' => __('Home Top Section Settings', 'geodirectory'),
45
+		'type' => 'sectionstart',
46
+		'desc' => '',
47
+		'id' => 'geodir_home_top_section'),
48 48
 
49
-    array(
50
-        'name' => __('Home top section', 'geodirectory'),
51
-        'desc' => __('Show the top section of home page', 'geodirectory'),
52
-        'id' => 'geodir_show_home_top_section',
53
-        'type' => 'checkbox',
54
-        'std' => '1' // Default value to show home top section
55
-    ),
49
+	array(
50
+		'name' => __('Home top section', 'geodirectory'),
51
+		'desc' => __('Show the top section of home page', 'geodirectory'),
52
+		'id' => 'geodir_show_home_top_section',
53
+		'type' => 'checkbox',
54
+		'std' => '1' // Default value to show home top section
55
+	),
56 56
 
57 57
 
58
-    array('type' => 'sectionend', 'id' => 'geodir_home_top_section'),
58
+	array('type' => 'sectionend', 'id' => 'geodir_home_top_section'),
59 59
 
60 60
 
61
-    array('name' => __('Home Page Layout Settings', 'geodirectory'),
62
-        'type' => 'sectionstart',
63
-        'desc' => '',
64
-        'id' => 'geodir_home_layout'),
61
+	array('name' => __('Home Page Layout Settings', 'geodirectory'),
62
+		'type' => 'sectionstart',
63
+		'desc' => '',
64
+		'id' => 'geodir_home_layout'),
65 65
 
66
-    array(
67
-        'name' => __('Home right section', 'geodirectory'),
68
-        'desc' => __('Show the right section of home page', 'geodirectory'),
69
-        'id' => 'geodir_show_home_right_section',
70
-        'type' => 'checkbox',
71
-        'std' => '1' // Default value to show home top section
72
-    ),
66
+	array(
67
+		'name' => __('Home right section', 'geodirectory'),
68
+		'desc' => __('Show the right section of home page', 'geodirectory'),
69
+		'id' => 'geodir_show_home_right_section',
70
+		'type' => 'checkbox',
71
+		'std' => '1' // Default value to show home top section
72
+	),
73 73
 
74
-    array(
75
-        'name' => __('Width of home right section', 'geodirectory'),
76
-        'desc' => __('Enter the width of right section of home page in %', 'geodirectory'),
77
-        'id' => 'geodir_width_home_right_section',
78
-        'type' => 'text',
79
-        'css' => 'min-width:300px;',
80
-        'std' => '30' // Default value to show home top section
81
-    ),
74
+	array(
75
+		'name' => __('Width of home right section', 'geodirectory'),
76
+		'desc' => __('Enter the width of right section of home page in %', 'geodirectory'),
77
+		'id' => 'geodir_width_home_right_section',
78
+		'type' => 'text',
79
+		'css' => 'min-width:300px;',
80
+		'std' => '30' // Default value to show home top section
81
+	),
82 82
 
83
-    array(
84
-        'name' => __('Home content section', 'geodirectory'),
85
-        'desc' => __('Show the content section of home page', 'geodirectory'),
86
-        'id' => 'geodir_show_home_contant_section',
87
-        'type' => 'checkbox',
88
-        'std' => '1' // Default value to show home top section
89
-    ),
83
+	array(
84
+		'name' => __('Home content section', 'geodirectory'),
85
+		'desc' => __('Show the content section of home page', 'geodirectory'),
86
+		'id' => 'geodir_show_home_contant_section',
87
+		'type' => 'checkbox',
88
+		'std' => '1' // Default value to show home top section
89
+	),
90 90
 
91
-    array(
92
-        'name' => __('Width of home content section', 'geodirectory'),
93
-        'desc' => __('Enter the width of content section of home page in %', 'geodirectory'),
94
-        'id' => 'geodir_width_home_contant_section',
95
-        'type' => 'text',
96
-        'css' => 'min-width:300px;',
97
-        'std' => '63' // Default value to show home top section
98
-    ),
91
+	array(
92
+		'name' => __('Width of home content section', 'geodirectory'),
93
+		'desc' => __('Enter the width of content section of home page in %', 'geodirectory'),
94
+		'id' => 'geodir_width_home_contant_section',
95
+		'type' => 'text',
96
+		'css' => 'min-width:300px;',
97
+		'std' => '63' // Default value to show home top section
98
+	),
99 99
 
100
-    array(
101
-        'name' => __('Home left section', 'geodirectory'),
102
-        'desc' => __('Show the left section of home page', 'geodirectory'),
103
-        'id' => 'geodir_show_home_left_section',
104
-        'type' => 'checkbox',
105
-        'std' => '0' // Default value to show home top section
106
-    ),
100
+	array(
101
+		'name' => __('Home left section', 'geodirectory'),
102
+		'desc' => __('Show the left section of home page', 'geodirectory'),
103
+		'id' => 'geodir_show_home_left_section',
104
+		'type' => 'checkbox',
105
+		'std' => '0' // Default value to show home top section
106
+	),
107 107
 
108
-    array(
109
-        'name' => __('Width of home left section', 'geodirectory'),
110
-        'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),
111
-        'id' => 'geodir_width_home_left_section',
112
-        'type' => 'text',
113
-        'css' => 'min-width:300px;',
114
-        'std' => '30' // Default value to show home top section
115
-    ),
108
+	array(
109
+		'name' => __('Width of home left section', 'geodirectory'),
110
+		'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),
111
+		'id' => 'geodir_width_home_left_section',
112
+		'type' => 'text',
113
+		'css' => 'min-width:300px;',
114
+		'std' => '30' // Default value to show home top section
115
+	),
116 116
 
117
-    array(
118
-        'name' => __('Home bottom section', 'geodirectory'),
119
-        'desc' => __('Show the bottom section of home page', 'geodirectory'),
120
-        'id' => 'geodir_show_home_bottom_section',
121
-        'type' => 'checkbox',
122
-        'std' => '0' // Default value to show home top section
123
-    ),
124
-    array(
125
-        'name' => __('Resize image large size', 'geodirectory'),
126
-        'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')),
127
-        'id' => 'geodir_use_wp_media_large_size',
128
-        'type' => 'checkbox',
129
-        'std' => '0'
130
-    ),
117
+	array(
118
+		'name' => __('Home bottom section', 'geodirectory'),
119
+		'desc' => __('Show the bottom section of home page', 'geodirectory'),
120
+		'id' => 'geodir_show_home_bottom_section',
121
+		'type' => 'checkbox',
122
+		'std' => '0' // Default value to show home top section
123
+	),
124
+	array(
125
+		'name' => __('Resize image large size', 'geodirectory'),
126
+		'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')),
127
+		'id' => 'geodir_use_wp_media_large_size',
128
+		'type' => 'checkbox',
129
+		'std' => '0'
130
+	),
131 131
 
132
-    array('type' => 'sectionend', 'id' => 'geodir_home_layout'),
132
+	array('type' => 'sectionend', 'id' => 'geodir_home_layout'),
133 133
 
134 134
 
135
-    /* Home Layout Settings end */
135
+	/* Home Layout Settings end */
136 136
 
137 137
 
138
-    /* Listing Layout Settings end */
138
+	/* Listing Layout Settings end */
139 139
 
140
-    array('name' => __('Listings', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_listing_settings '),
140
+	array('name' => __('Listings', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_listing_settings '),
141 141
 
142 142
 
143
-    array('name' => __('Listing Page Layout Settings', 'geodirectory'),
144
-        'type' => 'sectionstart',
145
-        'desc' => '',
146
-        'id' => 'geodir_listing_layout'),
143
+	array('name' => __('Listing Page Layout Settings', 'geodirectory'),
144
+		'type' => 'sectionstart',
145
+		'desc' => '',
146
+		'id' => 'geodir_listing_layout'),
147 147
 
148
-    array(
149
-        'name' => __('Listing top section', 'geodirectory'),
150
-        'desc' => __('Show the top section of listing page', 'geodirectory'),
151
-        'id' => 'geodir_show_listing_top_section',
152
-        'type' => 'checkbox',
153
-        'std' => '1' // Default value to show home top section
154
-    ),
148
+	array(
149
+		'name' => __('Listing top section', 'geodirectory'),
150
+		'desc' => __('Show the top section of listing page', 'geodirectory'),
151
+		'id' => 'geodir_show_listing_top_section',
152
+		'type' => 'checkbox',
153
+		'std' => '1' // Default value to show home top section
154
+	),
155 155
 
156
-    array(
157
-        'name' => __('Listing right section', 'geodirectory'),
158
-        'desc' => __('Show the right section of listing page', 'geodirectory'),
159
-        'id' => 'geodir_show_listing_right_section',
160
-        'type' => 'checkbox',
161
-        'std' => '1' // Default value to show home top section
162
-    ),
156
+	array(
157
+		'name' => __('Listing right section', 'geodirectory'),
158
+		'desc' => __('Show the right section of listing page', 'geodirectory'),
159
+		'id' => 'geodir_show_listing_right_section',
160
+		'type' => 'checkbox',
161
+		'std' => '1' // Default value to show home top section
162
+	),
163 163
 
164
-    array(
165
-        'name' => __('Width of listing right section', 'geodirectory'),
166
-        'desc' => __('Enter the width of right section of listing page in %', 'geodirectory'),
167
-        'id' => 'geodir_width_listing_right_section',
168
-        'type' => 'text',
169
-        'css' => 'min-width:300px;',
170
-        'std' => '30' // Default value to show home top section
171
-    ),
164
+	array(
165
+		'name' => __('Width of listing right section', 'geodirectory'),
166
+		'desc' => __('Enter the width of right section of listing page in %', 'geodirectory'),
167
+		'id' => 'geodir_width_listing_right_section',
168
+		'type' => 'text',
169
+		'css' => 'min-width:300px;',
170
+		'std' => '30' // Default value to show home top section
171
+	),
172 172
 
173 173
 
174
-    array(
175
-        'name' => __('Listing content section view', 'geodirectory'),
176
-        'desc' => __('Set the listing view of listing page', 'geodirectory'),
177
-        'id' => 'geodir_listing_view',
178
-        'css' => 'min-width:300px;',
179
-        'std' => 'gridview_onehalf',
180
-        'type' => 'select',
181
-        'class' => 'chosen_select',
182
-        'options' => array_unique(array(
183
-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
184
-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
185
-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
186
-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
187
-            'listview' => __('List view', 'geodirectory'),
188
-        ))
189
-    ),
174
+	array(
175
+		'name' => __('Listing content section view', 'geodirectory'),
176
+		'desc' => __('Set the listing view of listing page', 'geodirectory'),
177
+		'id' => 'geodir_listing_view',
178
+		'css' => 'min-width:300px;',
179
+		'std' => 'gridview_onehalf',
180
+		'type' => 'select',
181
+		'class' => 'chosen_select',
182
+		'options' => array_unique(array(
183
+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
184
+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
185
+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
186
+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
187
+			'listview' => __('List view', 'geodirectory'),
188
+		))
189
+	),
190 190
 
191
-    array(
192
-        'name' => __('Width of listing content section', 'geodirectory'),
193
-        'desc' => __('Enter the width of content section of listing page in %', 'geodirectory'),
194
-        'id' => 'geodir_width_listing_contant_section',
195
-        'type' => 'text',
196
-        'css' => 'min-width:300px;',
197
-        'std' => '63' // Default value to show home top section
198
-    ),
191
+	array(
192
+		'name' => __('Width of listing content section', 'geodirectory'),
193
+		'desc' => __('Enter the width of content section of listing page in %', 'geodirectory'),
194
+		'id' => 'geodir_width_listing_contant_section',
195
+		'type' => 'text',
196
+		'css' => 'min-width:300px;',
197
+		'std' => '63' // Default value to show home top section
198
+	),
199 199
 
200
-    array(
201
-        'name' => __('Listing left section', 'geodirectory'),
202
-        'desc' => __('Show the left section of listing page', 'geodirectory'),
203
-        'id' => 'geodir_show_listing_left_section',
204
-        'type' => 'checkbox',
205
-        'std' => '0' // Default value to show home top section
206
-    ),
200
+	array(
201
+		'name' => __('Listing left section', 'geodirectory'),
202
+		'desc' => __('Show the left section of listing page', 'geodirectory'),
203
+		'id' => 'geodir_show_listing_left_section',
204
+		'type' => 'checkbox',
205
+		'std' => '0' // Default value to show home top section
206
+	),
207 207
 
208
-    array(
209
-        'name' => __('Width of listing left section', 'geodirectory'),
210
-        'desc' => __('Enter the width of left section of listing in %', 'geodirectory'),
211
-        'id' => 'geodir_width_listing_left_section',
212
-        'type' => 'text',
213
-        'css' => 'min-width:300px;',
214
-        'std' => '30' // Default value to show home top section
215
-    ),
208
+	array(
209
+		'name' => __('Width of listing left section', 'geodirectory'),
210
+		'desc' => __('Enter the width of left section of listing in %', 'geodirectory'),
211
+		'id' => 'geodir_width_listing_left_section',
212
+		'type' => 'text',
213
+		'css' => 'min-width:300px;',
214
+		'std' => '30' // Default value to show home top section
215
+	),
216 216
 
217
-    array(
218
-        'name' => __('Listing bottom section', 'geodirectory'),
219
-        'desc' => __('Show the bottom section of listing page', 'geodirectory'),
220
-        'id' => 'geodir_show_listing_bottom_section',
221
-        'type' => 'checkbox',
222
-        'std' => '0' // Default value to show home top section
223
-    ),
217
+	array(
218
+		'name' => __('Listing bottom section', 'geodirectory'),
219
+		'desc' => __('Show the bottom section of listing page', 'geodirectory'),
220
+		'id' => 'geodir_show_listing_bottom_section',
221
+		'type' => 'checkbox',
222
+		'std' => '0' // Default value to show home top section
223
+	),
224 224
 
225
-    array(
226
-        'name' => __('Upload listing no image', 'geodirectory'),
227
-        'desc' => '',
228
-        'id' => 'geodir_listing_no_img',
229
-        'type' => 'file',
230
-        'std' => '0' // Default value to show home top section
231
-    ),
225
+	array(
226
+		'name' => __('Upload listing no image', 'geodirectory'),
227
+		'desc' => '',
228
+		'id' => 'geodir_listing_no_img',
229
+		'type' => 'file',
230
+		'std' => '0' // Default value to show home top section
231
+	),
232 232
 
233
-    array(
234
-        'name' => __('Description word limit', 'geodirectory'),
235
-        'desc' => '',
236
-        'id' => 'geodir_desc_word_limit',
237
-        'type' => 'text',
238
-        'css' => 'min-width:300px;',
239
-        'std' => '50' // Default value to show home top section
240
-    ),
233
+	array(
234
+		'name' => __('Description word limit', 'geodirectory'),
235
+		'desc' => '',
236
+		'id' => 'geodir_desc_word_limit',
237
+		'type' => 'text',
238
+		'css' => 'min-width:300px;',
239
+		'std' => '50' // Default value to show home top section
240
+	),
241 241
 
242
-    array(
243
-        'name' => __('Hover listing map animation', 'geodirectory'),
244
-        'desc' => __('Bounce map pin if listing hovered', 'geodirectory'),
245
-        'id' => 'geodir_listing_hover_bounce_map_pin',
246
-        'type' => 'checkbox',
247
-        'std' => '1' // Default value to show home top section
248
-    ),
242
+	array(
243
+		'name' => __('Hover listing map animation', 'geodirectory'),
244
+		'desc' => __('Bounce map pin if listing hovered', 'geodirectory'),
245
+		'id' => 'geodir_listing_hover_bounce_map_pin',
246
+		'type' => 'checkbox',
247
+		'std' => '1' // Default value to show home top section
248
+	),
249 249
 
250
-    array('type' => 'sectionend', 'id' => 'geodir_listing_layout'),
250
+	array('type' => 'sectionend', 'id' => 'geodir_listing_layout'),
251 251
 
252 252
 
253
-    array('name' => __('Listing General Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_listing_gen_settings '),
253
+	array('name' => __('Listing General Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_listing_gen_settings '),
254 254
 
255
-    array(
256
-        'name' => __('New listing default status', 'geodirectory'),
257
-        'desc' => __('Select new listing default status.', 'geodirectory'),
258
-        'tip' => '',
259
-        'id' => 'geodir_new_post_default_status',
260
-        'css' => 'min-width:300px;',
261
-        'std' => 'publish',
262
-        'type' => 'select',
263
-        'class' => 'chosen_select',
264
-        'options' => array_unique(array(
265
-            'publish' => __('publish', 'geodirectory'),
266
-            'draft' => __('draft', 'geodirectory'),
267
-        ))
268
-    ),
255
+	array(
256
+		'name' => __('New listing default status', 'geodirectory'),
257
+		'desc' => __('Select new listing default status.', 'geodirectory'),
258
+		'tip' => '',
259
+		'id' => 'geodir_new_post_default_status',
260
+		'css' => 'min-width:300px;',
261
+		'std' => 'publish',
262
+		'type' => 'select',
263
+		'class' => 'chosen_select',
264
+		'options' => array_unique(array(
265
+			'publish' => __('publish', 'geodirectory'),
266
+			'draft' => __('draft', 'geodirectory'),
267
+		))
268
+	),
269 269
 
270
-    array(
271
-        'name' => __('New listings settings', 'geodirectory'),
272
-        'desc' => __('Enter number of days a listing will appear new.(enter 0 to disable feature)', 'geodirectory'),
273
-        'id' => 'geodir_listing_new_days',
274
-        'type' => 'text',
275
-        'css' => 'min-width:300px;',
276
-        'std' => '30' // Default value for the page title - changed in settings
277
-    ),
270
+	array(
271
+		'name' => __('New listings settings', 'geodirectory'),
272
+		'desc' => __('Enter number of days a listing will appear new.(enter 0 to disable feature)', 'geodirectory'),
273
+		'id' => 'geodir_listing_new_days',
274
+		'type' => 'text',
275
+		'css' => 'min-width:300px;',
276
+		'std' => '30' // Default value for the page title - changed in settings
277
+	),
278 278
 
279
-    array('type' => 'sectionend', 'id' => 'geodir_listing_gen_settings'),
279
+	array('type' => 'sectionend', 'id' => 'geodir_listing_gen_settings'),
280 280
 
281 281
 
282
-    array('name' => __('Add Listing Form Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_add_listing_gen_settings'),
282
+	array('name' => __('Add Listing Form Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_add_listing_gen_settings'),
283 283
 
284
-    array(
285
-        'name' => __('Enable "Accept Terms and Conditions"', 'geodirectory'),
286
-        'desc' => __('Show the "Accept Terms and Conditions" field on add listing.', 'geodirectory'),
287
-        'id' => 'geodir_accept_term_condition',
288
-        'type' => 'checkbox',
289
-        'std' => '1' // Default value to show home top section
290
-    ),
284
+	array(
285
+		'name' => __('Enable "Accept Terms and Conditions"', 'geodirectory'),
286
+		'desc' => __('Show the "Accept Terms and Conditions" field on add listing.', 'geodirectory'),
287
+		'id' => 'geodir_accept_term_condition',
288
+		'type' => 'checkbox',
289
+		'std' => '1' // Default value to show home top section
290
+	),
291 291
 
292 292
 
293
-    array(
294
-        'name' => __('Show description field as editor', 'geodirectory'),
295
-        'desc' => __('Select post types to show advanced editor on add listing page.', 'geodirectory'),
296
-        'tip' => '',
297
-        'id' => 'geodir_tiny_editor_on_add_listing',
298
-        'css' => 'min-width:300px;',
299
-        'std' => array(),
300
-        'type' => 'multiselect',
301
-        'placeholder_text' => __('Select post types', 'geodirectory'),
302
-        'class' => 'chosen_select',
303
-        'options' => array_unique(geodir_post_type_setting_fun())
304
-    ),
293
+	array(
294
+		'name' => __('Show description field as editor', 'geodirectory'),
295
+		'desc' => __('Select post types to show advanced editor on add listing page.', 'geodirectory'),
296
+		'tip' => '',
297
+		'id' => 'geodir_tiny_editor_on_add_listing',
298
+		'css' => 'min-width:300px;',
299
+		'std' => array(),
300
+		'type' => 'multiselect',
301
+		'placeholder_text' => __('Select post types', 'geodirectory'),
302
+		'class' => 'chosen_select',
303
+		'options' => array_unique(geodir_post_type_setting_fun())
304
+	),
305 305
 
306
-    array('type' => 'sectionend', 'id' => 'geodir_add_listing_gen_settings'),
307
-    /* Listing Layout Settings end */
306
+	array('type' => 'sectionend', 'id' => 'geodir_add_listing_gen_settings'),
307
+	/* Listing Layout Settings end */
308 308
 
309 309
 
310
-    /* Search Layout Settings end */
310
+	/* Search Layout Settings end */
311 311
 
312
-    array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_search_settings '),
312
+	array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_search_settings '),
313 313
 
314 314
 
315
-    array('name' => __('Search Page Layout Settings', 'geodirectory'),
316
-        'type' => 'sectionstart',
317
-        'desc' => '',
318
-        'id' => 'geodir_search_layout'),
315
+	array('name' => __('Search Page Layout Settings', 'geodirectory'),
316
+		'type' => 'sectionstart',
317
+		'desc' => '',
318
+		'id' => 'geodir_search_layout'),
319 319
 
320
-    array(
321
-        'name' => __('Search top section', 'geodirectory'),
322
-        'desc' => __('Show the top section of search page', 'geodirectory'),
323
-        'id' => 'geodir_show_search_top_section',
324
-        'type' => 'checkbox',
325
-        'std' => '1' // Default value to show home top section
326
-    ),
320
+	array(
321
+		'name' => __('Search top section', 'geodirectory'),
322
+		'desc' => __('Show the top section of search page', 'geodirectory'),
323
+		'id' => 'geodir_show_search_top_section',
324
+		'type' => 'checkbox',
325
+		'std' => '1' // Default value to show home top section
326
+	),
327 327
 
328
-    array(
329
-        'name' => __('Search right section', 'geodirectory'),
330
-        'desc' => __('Show the right section of search page', 'geodirectory'),
331
-        'id' => 'geodir_show_search_right_section',
332
-        'type' => 'checkbox',
333
-        'std' => '1' // Default value to show home top section
334
-    ),
328
+	array(
329
+		'name' => __('Search right section', 'geodirectory'),
330
+		'desc' => __('Show the right section of search page', 'geodirectory'),
331
+		'id' => 'geodir_show_search_right_section',
332
+		'type' => 'checkbox',
333
+		'std' => '1' // Default value to show home top section
334
+	),
335 335
 
336
-    array(
337
-        'name' => __('Width of search right section', 'geodirectory'),
338
-        'desc' => __('Enter the width of right section of search page in %', 'geodirectory'),
339
-        'id' => 'geodir_width_search_right_section',
340
-        'type' => 'text',
341
-        'css' => 'min-width:300px;',
342
-        'std' => '30' // Default value to show home top section
343
-    ),
336
+	array(
337
+		'name' => __('Width of search right section', 'geodirectory'),
338
+		'desc' => __('Enter the width of right section of search page in %', 'geodirectory'),
339
+		'id' => 'geodir_width_search_right_section',
340
+		'type' => 'text',
341
+		'css' => 'min-width:300px;',
342
+		'std' => '30' // Default value to show home top section
343
+	),
344 344
 
345 345
 
346
-    array(
347
-        'name' => __('Search content section view', 'geodirectory'),
348
-        'desc' => __('Set the listing view of search page', 'geodirectory'),
349
-        'id' => 'geodir_search_view',
350
-        'css' => 'min-width:300px;',
351
-        'std' => 'gridview_onehalf',
352
-        'type' => 'select',
353
-        'class' => 'chosen_select',
354
-        'options' => array_unique(array(
355
-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
356
-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
357
-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
358
-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
359
-            'listview' => __('List view', 'geodirectory'),
360
-        ))
361
-    ),
346
+	array(
347
+		'name' => __('Search content section view', 'geodirectory'),
348
+		'desc' => __('Set the listing view of search page', 'geodirectory'),
349
+		'id' => 'geodir_search_view',
350
+		'css' => 'min-width:300px;',
351
+		'std' => 'gridview_onehalf',
352
+		'type' => 'select',
353
+		'class' => 'chosen_select',
354
+		'options' => array_unique(array(
355
+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
356
+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
357
+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
358
+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
359
+			'listview' => __('List view', 'geodirectory'),
360
+		))
361
+	),
362 362
 
363
-    array(
364
-        'name' => __('Width of search content section', 'geodirectory'),
365
-        'desc' => __('Enter the width of content section of search page in %', 'geodirectory'),
366
-        'id' => 'geodir_width_search_contant_section',
367
-        'type' => 'text',
368
-        'css' => 'min-width:300px;',
369
-        'std' => '63' // Default value to show home top section
370
-    ),
363
+	array(
364
+		'name' => __('Width of search content section', 'geodirectory'),
365
+		'desc' => __('Enter the width of content section of search page in %', 'geodirectory'),
366
+		'id' => 'geodir_width_search_contant_section',
367
+		'type' => 'text',
368
+		'css' => 'min-width:300px;',
369
+		'std' => '63' // Default value to show home top section
370
+	),
371 371
 
372
-    array(
373
-        'name' => __('Search left section', 'geodirectory'),
374
-        'desc' => __('Show the left section of search page', 'geodirectory'),
375
-        'id' => 'geodir_show_search_left_section',
376
-        'type' => 'checkbox',
377
-        'std' => '0' // Default value to show home top section
378
-    ),
372
+	array(
373
+		'name' => __('Search left section', 'geodirectory'),
374
+		'desc' => __('Show the left section of search page', 'geodirectory'),
375
+		'id' => 'geodir_show_search_left_section',
376
+		'type' => 'checkbox',
377
+		'std' => '0' // Default value to show home top section
378
+	),
379 379
 
380
-    array(
381
-        'name' => __('Width of search left section', 'geodirectory'),
382
-        'desc' => __('Enter the width of left section of search in %', 'geodirectory'),
383
-        'id' => 'geodir_width_search_left_section',
384
-        'type' => 'text',
385
-        'css' => 'min-width:300px;',
386
-        'std' => '30' // Default value to show home top section
387
-    ),
380
+	array(
381
+		'name' => __('Width of search left section', 'geodirectory'),
382
+		'desc' => __('Enter the width of left section of search in %', 'geodirectory'),
383
+		'id' => 'geodir_width_search_left_section',
384
+		'type' => 'text',
385
+		'css' => 'min-width:300px;',
386
+		'std' => '30' // Default value to show home top section
387
+	),
388 388
 
389
-    array(
390
-        'name' => __('Search bottom section', 'geodirectory'),
391
-        'desc' => __('Show the bottom section of search page', 'geodirectory'),
392
-        'id' => 'geodir_show_search_bottom_section',
393
-        'type' => 'checkbox',
394
-        'std' => '0' // Default value to show home top section
395
-    ),
389
+	array(
390
+		'name' => __('Search bottom section', 'geodirectory'),
391
+		'desc' => __('Show the bottom section of search page', 'geodirectory'),
392
+		'id' => 'geodir_show_search_bottom_section',
393
+		'type' => 'checkbox',
394
+		'std' => '0' // Default value to show home top section
395
+	),
396 396
 	
397 397
 	array(
398
-        'name' => __('Show advanced pagination details', 'geodirectory'),
399
-        'desc' => __('This will add extra pagination info like "Showing listings x-y of z" after/before pagination.', 'geodirectory'),
400
-        'id' => 'geodir_pagination_advance_info',
401
-        'css' => 'min-width:300px;',
402
-        'std' => '',
403
-        'type' => 'select',
404
-        'class' => 'chosen_select',
405
-        'options' => array(
398
+		'name' => __('Show advanced pagination details', 'geodirectory'),
399
+		'desc' => __('This will add extra pagination info like "Showing listings x-y of z" after/before pagination.', 'geodirectory'),
400
+		'id' => 'geodir_pagination_advance_info',
401
+		'css' => 'min-width:300px;',
402
+		'std' => '',
403
+		'type' => 'select',
404
+		'class' => 'chosen_select',
405
+		'options' => array(
406 406
 						'' => __('Never Display', 'geodirectory'),
407 407
 						'after' => __('After Pagination', 'geodirectory'),
408 408
 						'before' => __('Before Pagination', 'geodirectory')
409 409
 					)
410
-    ),
410
+	),
411 411
 
412
-    array('type' => 'sectionend', 'id' => 'geodir_search_layout'),
412
+	array('type' => 'sectionend', 'id' => 'geodir_search_layout'),
413 413
 
414 414
 
415
-    array('name' => __('Search form settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_search_form_default_text_settings'),
415
+	array('name' => __('Search form settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_search_form_default_text_settings'),
416 416
 
417
-    array(
418
-        'name' => __('Use old non-styled form', 'geodirectory'),
419
-        'desc' => __('Will show the old type form (not recommended unless you had added your own styles)', 'geodirectory'),
420
-        'id' => 'geodir_show_search_old_search_from',
421
-        'type' => 'checkbox',
422
-        'std' => '0' // Default value to show
423
-    ),
417
+	array(
418
+		'name' => __('Use old non-styled form', 'geodirectory'),
419
+		'desc' => __('Will show the old type form (not recommended unless you had added your own styles)', 'geodirectory'),
420
+		'id' => 'geodir_show_search_old_search_from',
421
+		'type' => 'checkbox',
422
+		'std' => '0' // Default value to show
423
+	),
424 424
 
425
-    array(
426
-        'name' => __('Search field default value', 'geodirectory'),
427
-        'desc' => __('Show the search text box \'placeholder\' value on search form.', 'geodirectory'),
428
-        'id' => 'geodir_search_field_default_text',
429
-        'type' => 'text',
430
-        'css' => 'min-width:300px;',
431
-        'std' => 'Search for' // show on the listing page.
432
-    ),
425
+	array(
426
+		'name' => __('Search field default value', 'geodirectory'),
427
+		'desc' => __('Show the search text box \'placeholder\' value on search form.', 'geodirectory'),
428
+		'id' => 'geodir_search_field_default_text',
429
+		'type' => 'text',
430
+		'css' => 'min-width:300px;',
431
+		'std' => 'Search for' // show on the listing page.
432
+	),
433 433
 
434
-    array(
435
-        'name' => __('Near field default value', 'geodirectory'),
436
-        'desc' => __('Show the near text box \'placeholder\' value on search form.', 'geodirectory'),
437
-        'id' => 'geodir_near_field_default_text',
438
-        'type' => 'text',
439
-        'css' => 'min-width:300px;',
440
-        'std' => 'Near' // show on the listing page.
441
-    ),
434
+	array(
435
+		'name' => __('Near field default value', 'geodirectory'),
436
+		'desc' => __('Show the near text box \'placeholder\' value on search form.', 'geodirectory'),
437
+		'id' => 'geodir_near_field_default_text',
438
+		'type' => 'text',
439
+		'css' => 'min-width:300px;',
440
+		'std' => 'Near' // show on the listing page.
441
+	),
442 442
 
443
-    array(
444
-        'name' => __('Search button label', 'geodirectory'),
445
-        'desc' => __('Show the search button label on search form.', 'geodirectory'),
446
-        'id' => 'geodir_search_button_label',
447
-        'type' => 'text',
448
-        'css' => 'min-width:300px;',
449
-        'std' => 'Search' // show on the listing page.
450
-    ),
443
+	array(
444
+		'name' => __('Search button label', 'geodirectory'),
445
+		'desc' => __('Show the search button label on search form.', 'geodirectory'),
446
+		'id' => 'geodir_search_button_label',
447
+		'type' => 'text',
448
+		'css' => 'min-width:300px;',
449
+		'std' => 'Search' // show on the listing page.
450
+	),
451 451
 
452
-    array('type' => 'sectionend', 'id' => 'geodir_search_form_default_text_settings'),
452
+	array('type' => 'sectionend', 'id' => 'geodir_search_form_default_text_settings'),
453 453
 
454
-    /* Listing Layout Settings end */
454
+	/* Listing Layout Settings end */
455 455
 
456 456
 
457
-    /* Detail Layout Settings end */
457
+	/* Detail Layout Settings end */
458 458
 
459
-    array('name' => __('Detail', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_detail_settings '),
459
+	array('name' => __('Detail', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_detail_settings '),
460 460
 
461
-    array('name' => __('Detail/Single Page Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_settings '),
461
+	array('name' => __('Detail/Single Page Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_settings '),
462 462
 
463
-    array(
464
-        'name' => __('Detail top section', 'geodirectory'),
465
-        'desc' => __('Show the top section of listing page', 'geodirectory'),
466
-        'id' => 'geodir_show_detail_top_section',
467
-        'type' => 'checkbox',
468
-        'std' => '1' // Default value to show home top section
469
-    ),
463
+	array(
464
+		'name' => __('Detail top section', 'geodirectory'),
465
+		'desc' => __('Show the top section of listing page', 'geodirectory'),
466
+		'id' => 'geodir_show_detail_top_section',
467
+		'type' => 'checkbox',
468
+		'std' => '1' // Default value to show home top section
469
+	),
470 470
 
471
-    array(
472
-        'name' => __('Detail bottom section', 'geodirectory'),
473
-        'desc' => __('Show the bottom section of listing page', 'geodirectory'),
474
-        'id' => 'geodir_show_detail_bottom_section',
475
-        'type' => 'checkbox',
476
-        'std' => '1' // Default value to show home top section
477
-    ),
478
-    array(
479
-        'name' => __('Detail sidebar section on left side', 'geodirectory'),
480
-        'desc' => __('Display detail sidebar section on left side of the detail page', 'geodirectory'),
481
-        'id' => 'geodir_detail_sidebar_left_section',
482
-        'type' => 'checkbox',
483
-        'std' => '0'
484
-    ),
485
-    array(
486
-        'name' => __('Disable GD modal', 'geodirectory'),
487
-        'desc' => __('Disable GD modal that displays slideshow images in popup', 'geodirectory'),
488
-        'id' => 'geodir_disable_gb_modal',
489
-        'type' => 'checkbox',
490
-        'std' => '0'
491
-    ),
492
-    array(
493
-        'name' => __('Disable Tweet, Fb Like, Google+ buttons section', 'geodirectory'),
494
-        'desc' => __('Disable Tweet, Fb Like, Google+ buttons section that displays on Detail page sidebar', 'geodirectory'),
495
-        'id' => 'geodir_disable_tfg_buttons_section',
496
-        'type' => 'checkbox',
497
-        'std' => '0'
498
-    ),
499
-    array(
500
-        'name' => __('Disable Google Analytics section', 'geodirectory'),
501
-        'desc' => __('Disable Google Analytics section that displays on Detail page sidebar', 'geodirectory'),
502
-        'id' => 'geodir_disable_google_analytics_section',
503
-        'type' => 'checkbox',
504
-        'std' => '0'
505
-    ),
506
-    array(
507
-        'name' => __('Disable User Links section', 'geodirectory'),
508
-        'desc' => __('Disable User Links section (Edit post, Favorite etc..) that displays on Detail page sidebar', 'geodirectory'),
509
-        'id' => 'geodir_disable_user_links_section',
510
-        'type' => 'checkbox',
511
-        'std' => '0'
512
-    ),
513
-    array(
514
-        'name' => __('Disable Rating Info section', 'geodirectory'),
515
-        'desc' => __('Disable Rating Info section that displays on Detail page sidebar', 'geodirectory'),
516
-        'id' => 'geodir_disable_rating_info_section',
517
-        'type' => 'checkbox',
518
-        'std' => '0'
519
-    ),
520
-    array(
521
-        'name' => __('Disable Listing Info section', 'geodirectory'),
522
-        'desc' => __('Disable Listing Info section that displays on Detail page sidebar', 'geodirectory'),
523
-        'id' => 'geodir_disable_listing_info_section',
524
-        'type' => 'checkbox',
525
-        'std' => '0'
526
-    ),
471
+	array(
472
+		'name' => __('Detail bottom section', 'geodirectory'),
473
+		'desc' => __('Show the bottom section of listing page', 'geodirectory'),
474
+		'id' => 'geodir_show_detail_bottom_section',
475
+		'type' => 'checkbox',
476
+		'std' => '1' // Default value to show home top section
477
+	),
478
+	array(
479
+		'name' => __('Detail sidebar section on left side', 'geodirectory'),
480
+		'desc' => __('Display detail sidebar section on left side of the detail page', 'geodirectory'),
481
+		'id' => 'geodir_detail_sidebar_left_section',
482
+		'type' => 'checkbox',
483
+		'std' => '0'
484
+	),
485
+	array(
486
+		'name' => __('Disable GD modal', 'geodirectory'),
487
+		'desc' => __('Disable GD modal that displays slideshow images in popup', 'geodirectory'),
488
+		'id' => 'geodir_disable_gb_modal',
489
+		'type' => 'checkbox',
490
+		'std' => '0'
491
+	),
492
+	array(
493
+		'name' => __('Disable Tweet, Fb Like, Google+ buttons section', 'geodirectory'),
494
+		'desc' => __('Disable Tweet, Fb Like, Google+ buttons section that displays on Detail page sidebar', 'geodirectory'),
495
+		'id' => 'geodir_disable_tfg_buttons_section',
496
+		'type' => 'checkbox',
497
+		'std' => '0'
498
+	),
499
+	array(
500
+		'name' => __('Disable Google Analytics section', 'geodirectory'),
501
+		'desc' => __('Disable Google Analytics section that displays on Detail page sidebar', 'geodirectory'),
502
+		'id' => 'geodir_disable_google_analytics_section',
503
+		'type' => 'checkbox',
504
+		'std' => '0'
505
+	),
506
+	array(
507
+		'name' => __('Disable User Links section', 'geodirectory'),
508
+		'desc' => __('Disable User Links section (Edit post, Favorite etc..) that displays on Detail page sidebar', 'geodirectory'),
509
+		'id' => 'geodir_disable_user_links_section',
510
+		'type' => 'checkbox',
511
+		'std' => '0'
512
+	),
513
+	array(
514
+		'name' => __('Disable Rating Info section', 'geodirectory'),
515
+		'desc' => __('Disable Rating Info section that displays on Detail page sidebar', 'geodirectory'),
516
+		'id' => 'geodir_disable_rating_info_section',
517
+		'type' => 'checkbox',
518
+		'std' => '0'
519
+	),
520
+	array(
521
+		'name' => __('Disable Listing Info section', 'geodirectory'),
522
+		'desc' => __('Disable Listing Info section that displays on Detail page sidebar', 'geodirectory'),
523
+		'id' => 'geodir_disable_listing_info_section',
524
+		'type' => 'checkbox',
525
+		'std' => '0'
526
+	),
527 527
 
528
-    array('type' => 'sectionend', 'id' => 'detail_page_settings'),
528
+	array('type' => 'sectionend', 'id' => 'detail_page_settings'),
529 529
 
530 530
 
531
-    /* ---------- DETAIL PAGE TAB SETTING START*/
531
+	/* ---------- DETAIL PAGE TAB SETTING START*/
532 532
 
533
-    array('name' => __('Detail Page Tab Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_detail_page_tab_settings '),
533
+	array('name' => __('Detail Page Tab Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_detail_page_tab_settings '),
534 534
 
535
-    array(
536
-        'name' => __('Exclude selected tabs from detail page', 'geodirectory'),
537
-        'desc' => __('Select tabs to exclude from the list of all appearing tabs on detail page.', 'geodirectory'),
538
-        'tip' => '',
539
-        'id' => 'geodir_detail_page_tabs_excluded',
540
-        'css' => 'min-width:300px;',
541
-        'std' => geodir_get_posttypes(),
542
-        'type' => 'multiselect',
543
-        'placeholder_text' => __('Select tabs', 'geodirectory'),
544
-        'class' => 'chosen_select',
545
-        'options' => array_unique(geodir_detail_page_tabs_key_value_array())
546
-    ),
535
+	array(
536
+		'name' => __('Exclude selected tabs from detail page', 'geodirectory'),
537
+		'desc' => __('Select tabs to exclude from the list of all appearing tabs on detail page.', 'geodirectory'),
538
+		'tip' => '',
539
+		'id' => 'geodir_detail_page_tabs_excluded',
540
+		'css' => 'min-width:300px;',
541
+		'std' => geodir_get_posttypes(),
542
+		'type' => 'multiselect',
543
+		'placeholder_text' => __('Select tabs', 'geodirectory'),
544
+		'class' => 'chosen_select',
545
+		'options' => array_unique(geodir_detail_page_tabs_key_value_array())
546
+	),
547 547
     
548
-    array(
549
-        'name' => __('Show as list', 'geodirectory'),
550
-        'desc' => __('Show as list instead of tabs', 'geodirectory'),
551
-        'id' => 'geodir_disable_tabs',
552
-        'type' => 'checkbox',
553
-        'std' => '0'
554
-    ),
548
+	array(
549
+		'name' => __('Show as list', 'geodirectory'),
550
+		'desc' => __('Show as list instead of tabs', 'geodirectory'),
551
+		'id' => 'geodir_disable_tabs',
552
+		'type' => 'checkbox',
553
+		'std' => '0'
554
+	),
555 555
 
556
-    array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),
557
-    /* ---------- DETAIL PAGE TAB SETTING END*/
556
+	array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),
557
+	/* ---------- DETAIL PAGE TAB SETTING END*/
558 558
 
559
-    /* START DEFAULT STAR IMAGE*/
560
-    array('name' => __('Default Rating Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_rating_settings '),
559
+	/* START DEFAULT STAR IMAGE*/
560
+	array('name' => __('Default Rating Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_rating_settings '),
561 561
 
562
-    array(
563
-        'name' => __('Upload default rating star icon', 'geodirectory'),
564
-        'desc' => '',
565
-        'id' => 'geodir_default_rating_star_icon',
566
-        'type' => 'file',
567
-        'std' => '0',
568
-        'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section
569
-    ),
562
+	array(
563
+		'name' => __('Upload default rating star icon', 'geodirectory'),
564
+		'desc' => '',
565
+		'id' => 'geodir_default_rating_star_icon',
566
+		'type' => 'file',
567
+		'std' => '0',
568
+		'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section
569
+	),
570 570
 	array(
571 571
 		'name' => __('Enable Font Awesome', 'geodirectory'),
572 572
 		'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory' ),
@@ -582,369 +582,369 @@  discard block
 block discarded – undo
582 582
 		'std' => '#757575'
583 583
 	),
584 584
 
585
-    array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),
585
+	array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),
586 586
 
587
-    /* END DEFAULT STAR IMAGE*/
587
+	/* END DEFAULT STAR IMAGE*/
588 588
 
589
-    /* Detail related post settings start */
589
+	/* Detail related post settings start */
590 590
 
591
-    array('name' => __('Related Post Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_related_post_settings '),
591
+	array('name' => __('Related Post Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_related_post_settings '),
592 592
 
593
-    array(
594
-        'name' => __('Show related post listing on', 'geodirectory'),
595
-        'desc' => __('Select the post types to display related listing on detail page.', 'geodirectory'),
596
-        'tip' => '',
597
-        'id' => 'geodir_add_related_listing_posttypes',
598
-        'css' => 'min-width:300px;',
599
-        'std' => geodir_get_posttypes(),
600
-        'type' => 'multiselect',
601
-        'placeholder_text' => __('Select post types', 'geodirectory'),
602
-        'class' => 'chosen_select',
603
-        'options' => array_unique(geodir_post_type_setting_fun())
604
-    ),
593
+	array(
594
+		'name' => __('Show related post listing on', 'geodirectory'),
595
+		'desc' => __('Select the post types to display related listing on detail page.', 'geodirectory'),
596
+		'tip' => '',
597
+		'id' => 'geodir_add_related_listing_posttypes',
598
+		'css' => 'min-width:300px;',
599
+		'std' => geodir_get_posttypes(),
600
+		'type' => 'multiselect',
601
+		'placeholder_text' => __('Select post types', 'geodirectory'),
602
+		'class' => 'chosen_select',
603
+		'options' => array_unique(geodir_post_type_setting_fun())
604
+	),
605 605
 
606
-    array(
607
-        'name' => __('Relate to', 'geodirectory'),
608
-        'desc' => __('Set the relation between current post to related posts.', 'geodirectory'),
609
-        'id' => 'geodir_related_post_relate_to',
610
-        'css' => 'min-width:300px;',
611
-        'std' => 'category',
612
-        'type' => 'select',
613
-        'class' => 'chosen_select',
614
-        'options' => array_unique(array(
615
-            'category' => __('Categories', 'geodirectory'),
616
-            'tags' => __('Tags', 'geodirectory'),
617
-        ))
618
-    ),
606
+	array(
607
+		'name' => __('Relate to', 'geodirectory'),
608
+		'desc' => __('Set the relation between current post to related posts.', 'geodirectory'),
609
+		'id' => 'geodir_related_post_relate_to',
610
+		'css' => 'min-width:300px;',
611
+		'std' => 'category',
612
+		'type' => 'select',
613
+		'class' => 'chosen_select',
614
+		'options' => array_unique(array(
615
+			'category' => __('Categories', 'geodirectory'),
616
+			'tags' => __('Tags', 'geodirectory'),
617
+		))
618
+	),
619 619
 
620
-    array(
621
-        'name' => __('Layout', 'geodirectory'),
622
-        'desc' => __('Set the listing view of relate post on detail page', 'geodirectory'),
623
-        'id' => 'geodir_related_post_listing_view',
624
-        'css' => 'min-width:300px;',
625
-        'std' => 'gridview_onehalf',
626
-        'type' => 'select',
627
-        'class' => 'chosen_select',
628
-        'options' => array_unique(array(
629
-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
630
-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
631
-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
632
-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
633
-            'listview' => __('List view', 'geodirectory'),
634
-        ))
635
-    ),
620
+	array(
621
+		'name' => __('Layout', 'geodirectory'),
622
+		'desc' => __('Set the listing view of relate post on detail page', 'geodirectory'),
623
+		'id' => 'geodir_related_post_listing_view',
624
+		'css' => 'min-width:300px;',
625
+		'std' => 'gridview_onehalf',
626
+		'type' => 'select',
627
+		'class' => 'chosen_select',
628
+		'options' => array_unique(array(
629
+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
630
+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
631
+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
632
+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
633
+			'listview' => __('List view', 'geodirectory'),
634
+		))
635
+	),
636 636
 
637
-    array(
638
-        'name' => __('Sort by', 'geodirectory'),
639
-        'desc' => __('Set the related post listing sort by view', 'geodirectory'),
640
-        'id' => 'geodir_related_post_sortby',
641
-        'css' => 'min-width:300px;',
642
-        'std' => 'latest',
643
-        'type' => 'select',
644
-        'class' => 'chosen_select',
645
-        'options' => array_unique(array(
646
-            'latest' => __('Latest', 'geodirectory'),
647
-            'featured' => __('Featured', 'geodirectory'),
648
-            'high_review' => __('Review', 'geodirectory'),
649
-            'high_rating' => __('Rating', 'geodirectory'),
650
-            'random' => __('Random', 'geodirectory'),
651
-            'nearest' => __('Nearest', 'geodirectory'),
652
-        ))
653
-    ),
637
+	array(
638
+		'name' => __('Sort by', 'geodirectory'),
639
+		'desc' => __('Set the related post listing sort by view', 'geodirectory'),
640
+		'id' => 'geodir_related_post_sortby',
641
+		'css' => 'min-width:300px;',
642
+		'std' => 'latest',
643
+		'type' => 'select',
644
+		'class' => 'chosen_select',
645
+		'options' => array_unique(array(
646
+			'latest' => __('Latest', 'geodirectory'),
647
+			'featured' => __('Featured', 'geodirectory'),
648
+			'high_review' => __('Review', 'geodirectory'),
649
+			'high_rating' => __('Rating', 'geodirectory'),
650
+			'random' => __('Random', 'geodirectory'),
651
+			'nearest' => __('Nearest', 'geodirectory'),
652
+		))
653
+	),
654 654
 
655
-    array(
656
-        'name' => __('Number of posts:', 'geodirectory'),
657
-        'desc' => __('Enter number of posts to display on related posts listing', 'geodirectory'),
658
-        'id' => 'geodir_related_post_count',
659
-        'type' => 'text',
660
-        'css' => 'min-width:300px;',
661
-        'std' => '5' // Default value to show home top section
662
-    ),
655
+	array(
656
+		'name' => __('Number of posts:', 'geodirectory'),
657
+		'desc' => __('Enter number of posts to display on related posts listing', 'geodirectory'),
658
+		'id' => 'geodir_related_post_count',
659
+		'type' => 'text',
660
+		'css' => 'min-width:300px;',
661
+		'std' => '5' // Default value to show home top section
662
+	),
663 663
 
664
-    array(
665
-        'name' => __('Post excerpt', 'geodirectory'),
666
-        'desc' => __('Post content excerpt character count', 'geodirectory'),
667
-        'id' => 'geodir_related_post_excerpt',
668
-        'type' => 'text',
669
-        'css' => 'min-width:300px;',
670
-        'std' => '20' // Default value to show home top section
671
-    ),
664
+	array(
665
+		'name' => __('Post excerpt', 'geodirectory'),
666
+		'desc' => __('Post content excerpt character count', 'geodirectory'),
667
+		'id' => 'geodir_related_post_excerpt',
668
+		'type' => 'text',
669
+		'css' => 'min-width:300px;',
670
+		'std' => '20' // Default value to show home top section
671
+	),
672 672
 
673 673
 
674
-    array('type' => 'sectionend', 'id' => 'detail_page_related_post_settings'),
675
-    /* Detail Layout Settings end */
674
+	array('type' => 'sectionend', 'id' => 'detail_page_related_post_settings'),
675
+	/* Detail Layout Settings end */
676 676
 
677
-    /* Author Layout Settings Start */
677
+	/* Author Layout Settings Start */
678 678
 
679
-    array('name' => __('Author', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_author_settings '),
679
+	array('name' => __('Author', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_author_settings '),
680 680
 
681 681
 
682
-    array('name' => __('Author Page Layout Settings', 'geodirectory'),
683
-        'type' => 'sectionstart',
684
-        'desc' => '',
685
-        'id' => 'geodir_author_layout'),
682
+	array('name' => __('Author Page Layout Settings', 'geodirectory'),
683
+		'type' => 'sectionstart',
684
+		'desc' => '',
685
+		'id' => 'geodir_author_layout'),
686 686
 
687
-    array(
688
-        'name' => __('Author top section', 'geodirectory'),
689
-        'desc' => __('Show the top section of author page', 'geodirectory'),
690
-        'id' => 'geodir_show_author_top_section',
691
-        'type' => 'checkbox',
692
-        'std' => '1' // Default value to show home top section
693
-    ),
687
+	array(
688
+		'name' => __('Author top section', 'geodirectory'),
689
+		'desc' => __('Show the top section of author page', 'geodirectory'),
690
+		'id' => 'geodir_show_author_top_section',
691
+		'type' => 'checkbox',
692
+		'std' => '1' // Default value to show home top section
693
+	),
694 694
 
695
-    array(
696
-        'name' => __('Author right section', 'geodirectory'),
697
-        'desc' => __('Show the right section of author page', 'geodirectory'),
698
-        'id' => 'geodir_show_author_right_section',
699
-        'type' => 'checkbox',
700
-        'std' => '1' // Default value to show home top section
701
-    ),
695
+	array(
696
+		'name' => __('Author right section', 'geodirectory'),
697
+		'desc' => __('Show the right section of author page', 'geodirectory'),
698
+		'id' => 'geodir_show_author_right_section',
699
+		'type' => 'checkbox',
700
+		'std' => '1' // Default value to show home top section
701
+	),
702 702
 
703
-    array(
704
-        'name' => __('Width of author right section', 'geodirectory'),
705
-        'desc' => __('Enter the width of right section of author page in %', 'geodirectory'),
706
-        'id' => 'geodir_width_author_right_section',
707
-        'type' => 'text',
708
-        'css' => 'min-width:300px;',
709
-        'std' => '30' // Default value to show home top section
710
-    ),
703
+	array(
704
+		'name' => __('Width of author right section', 'geodirectory'),
705
+		'desc' => __('Enter the width of right section of author page in %', 'geodirectory'),
706
+		'id' => 'geodir_width_author_right_section',
707
+		'type' => 'text',
708
+		'css' => 'min-width:300px;',
709
+		'std' => '30' // Default value to show home top section
710
+	),
711 711
 
712
-    array(
713
-        'name' => __('Author content section view', 'geodirectory'),
714
-        'desc' => __('Set the listing view of author page', 'geodirectory'),
715
-        'id' => 'geodir_author_view',
716
-        'css' => 'min-width:300px;',
717
-        'std' => 'gridview_onehalf',
718
-        'type' => 'select',
719
-        'class' => 'chosen_select',
720
-        'options' => array_unique(array(
721
-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
722
-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
723
-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
724
-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
725
-            'listview' => __('List view', 'geodirectory'),
726
-        ))
727
-    ),
712
+	array(
713
+		'name' => __('Author content section view', 'geodirectory'),
714
+		'desc' => __('Set the listing view of author page', 'geodirectory'),
715
+		'id' => 'geodir_author_view',
716
+		'css' => 'min-width:300px;',
717
+		'std' => 'gridview_onehalf',
718
+		'type' => 'select',
719
+		'class' => 'chosen_select',
720
+		'options' => array_unique(array(
721
+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
722
+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
723
+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
724
+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
725
+			'listview' => __('List view', 'geodirectory'),
726
+		))
727
+	),
728 728
 
729
-    array(
730
-        'name' => __('Width of author content section', 'geodirectory'),
731
-        'desc' => __('Enter the width of content section of author page in %', 'geodirectory'),
732
-        'id' => 'geodir_width_author_contant_section',
733
-        'type' => 'text',
734
-        'css' => 'min-width:300px;',
735
-        'std' => '63' // Default value to show home top section
736
-    ),
729
+	array(
730
+		'name' => __('Width of author content section', 'geodirectory'),
731
+		'desc' => __('Enter the width of content section of author page in %', 'geodirectory'),
732
+		'id' => 'geodir_width_author_contant_section',
733
+		'type' => 'text',
734
+		'css' => 'min-width:300px;',
735
+		'std' => '63' // Default value to show home top section
736
+	),
737 737
 
738
-    array(
739
-        'name' => __('Author left section', 'geodirectory'),
740
-        'desc' => __('Show the left section of author page', 'geodirectory'),
741
-        'id' => 'geodir_show_author_left_section',
742
-        'type' => 'checkbox',
743
-        'std' => '0' // Default value to show home top section
744
-    ),
738
+	array(
739
+		'name' => __('Author left section', 'geodirectory'),
740
+		'desc' => __('Show the left section of author page', 'geodirectory'),
741
+		'id' => 'geodir_show_author_left_section',
742
+		'type' => 'checkbox',
743
+		'std' => '0' // Default value to show home top section
744
+	),
745 745
 
746
-    array(
747
-        'name' => __('Width of author left section', 'geodirectory'),
748
-        'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),
749
-        'id' => 'geodir_width_author_left_section',
750
-        'type' => 'text',
751
-        'css' => 'min-width:300px;',
752
-        'std' => '30' // Default value to show home top section
753
-    ),
746
+	array(
747
+		'name' => __('Width of author left section', 'geodirectory'),
748
+		'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),
749
+		'id' => 'geodir_width_author_left_section',
750
+		'type' => 'text',
751
+		'css' => 'min-width:300px;',
752
+		'std' => '30' // Default value to show home top section
753
+	),
754 754
 
755
-    array(
756
-        'name' => __('Author bottom section', 'geodirectory'),
757
-        'desc' => __('Show the bottom section of author page', 'geodirectory'),
758
-        'id' => 'geodir_show_author_bottom_section',
759
-        'type' => 'checkbox',
760
-        'std' => '0' // Default value to show home top section
761
-    ),
755
+	array(
756
+		'name' => __('Author bottom section', 'geodirectory'),
757
+		'desc' => __('Show the bottom section of author page', 'geodirectory'),
758
+		'id' => 'geodir_show_author_bottom_section',
759
+		'type' => 'checkbox',
760
+		'std' => '0' // Default value to show home top section
761
+	),
762 762
 
763 763
 
764
-    array(
765
-        'name' => __('Description word limit', 'geodirectory'),
766
-        'desc' => '',
767
-        'id' => 'geodir_author_desc_word_limit',
768
-        'type' => 'text',
769
-        'css' => 'min-width:300px;',
770
-        'std' => '50' // Default value to show home top section
771
-    ),
764
+	array(
765
+		'name' => __('Description word limit', 'geodirectory'),
766
+		'desc' => '',
767
+		'id' => 'geodir_author_desc_word_limit',
768
+		'type' => 'text',
769
+		'css' => 'min-width:300px;',
770
+		'std' => '50' // Default value to show home top section
771
+	),
772 772
 
773
-    array('type' => 'sectionend', 'id' => 'geodir_author_layout'),
774
-    /* Author Layout Settings end */
773
+	array('type' => 'sectionend', 'id' => 'geodir_author_layout'),
774
+	/* Author Layout Settings end */
775 775
 
776 776
 
777
-    /* Post Type Navigation Settings Start */
778
-    array('name' => __('Navigation', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_navigation_settings'),
777
+	/* Post Type Navigation Settings Start */
778
+	array('name' => __('Navigation', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_navigation_settings'),
779 779
 
780 780
 
781
-    /* Post Type Navigation Settings Start */
781
+	/* Post Type Navigation Settings Start */
782 782
 
783
-    array('name' => __('Navigation Locations', 'geodirectory'),
784
-        'type' => 'sectionstart',
785
-        'desc' => '',
786
-        'id' => 'geodir_navigation_locations'),
783
+	array('name' => __('Navigation Locations', 'geodirectory'),
784
+		'type' => 'sectionstart',
785
+		'desc' => '',
786
+		'id' => 'geodir_navigation_locations'),
787 787
 
788
-    array(
789
-        'name' => __('Show geodirectory navigation in selected menu locations', 'geodirectory'),
790
-        'desc' => '',
791
-        'tip' => '',
792
-        'id' => 'geodir_theme_location_nav',
793
-        'css' => 'min-width:300px;',
794
-        'std' => array(),
795
-        'type' => 'multiselect',
796
-        'placeholder_text' => __('Select menu locations', 'geodirectory'),
797
-        'class' => 'chosen_select',
798
-        'options' => array_unique(geodir_theme_location_setting_fun())
799
-    ),
800
-    array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),
801
-
802
-
803
-    array('name' => __('Navigation Settings', 'geodirectory'),
804
-        'type' => 'sectionstart',
805
-        'desc' => '',
806
-        'id' => 'geodir_navigation_options'),
788
+	array(
789
+		'name' => __('Show geodirectory navigation in selected menu locations', 'geodirectory'),
790
+		'desc' => '',
791
+		'tip' => '',
792
+		'id' => 'geodir_theme_location_nav',
793
+		'css' => 'min-width:300px;',
794
+		'std' => array(),
795
+		'type' => 'multiselect',
796
+		'placeholder_text' => __('Select menu locations', 'geodirectory'),
797
+		'class' => 'chosen_select',
798
+		'options' => array_unique(geodir_theme_location_setting_fun())
799
+	),
800
+	array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),
807 801
 
808 802
 
809
-    array(
810
-        'name' => __('Show add listing navigation in menu', 'geodirectory'),
811
-        'desc' => sprintf(__('Show add listing navigation in main menu? (untick to disable) If you disable this option, none of the add listing link will appear in main navigation.', 'geodirectory')),
812
-        'id' => 'geodir_show_addlisting_nav',
813
-        'std' => '1',
814
-        'type' => 'checkbox'
815
-    ),
803
+	array('name' => __('Navigation Settings', 'geodirectory'),
804
+		'type' => 'sectionstart',
805
+		'desc' => '',
806
+		'id' => 'geodir_navigation_options'),
816 807
 
817
-    array(
818
-        'name' => __('Show listings navigation in menu', 'geodirectory'),
819
-        'desc' => sprintf(__('Show listing navigation in main menu? (untick to disable) If you disable this option, none of the listing link will appear in main navigation.', 'geodirectory')),
820
-        'id' => 'geodir_show_listing_nav',
821
-        'std' => '1',
822
-        'type' => 'checkbox'
823
-    ),
824 808
 
825
-    array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),
809
+	array(
810
+		'name' => __('Show add listing navigation in menu', 'geodirectory'),
811
+		'desc' => sprintf(__('Show add listing navigation in main menu? (untick to disable) If you disable this option, none of the add listing link will appear in main navigation.', 'geodirectory')),
812
+		'id' => 'geodir_show_addlisting_nav',
813
+		'std' => '1',
814
+		'type' => 'checkbox'
815
+	),
826 816
 
817
+	array(
818
+		'name' => __('Show listings navigation in menu', 'geodirectory'),
819
+		'desc' => sprintf(__('Show listing navigation in main menu? (untick to disable) If you disable this option, none of the listing link will appear in main navigation.', 'geodirectory')),
820
+		'id' => 'geodir_show_listing_nav',
821
+		'std' => '1',
822
+		'type' => 'checkbox'
823
+	),
827 824
 
828
-    array('name' => __('Post Type Navigation Settings', 'geodirectory'),
829
-        'type' => 'sectionstart',
830
-        'desc' => '',
831
-        'id' => 'geodir_post_type_navigation_layout'),
832
-    array(
833
-        'name' => __('Show listing link in main navigation', 'geodirectory'),
834
-        'desc' => '',
835
-        'tip' => '',
836
-        'id' => 'geodir_add_posttype_in_main_nav',
837
-        'css' => 'min-width:300px;',
838
-        'std' => array(),
839
-        'type' => 'multiselect',
840
-        'placeholder_text' => __('Select post types', 'geodirectory'),
841
-        'class' => 'chosen_select',
842
-        'options' => array_unique(geodir_post_type_setting_fun())
843
-    ),
825
+	array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),
844 826
 
845
-    array(
846
-        'name' => __('Show listing link in listing navigation', 'geodirectory'),
847
-        'desc' => '',
848
-        'tip' => '',
849
-        'id' => 'geodir_add_posttype_in_listing_nav',
850
-        'css' => 'min-width:300px;',
851
-        'std' => geodir_get_posttypes(),
852
-        'type' => 'multiselect',
853
-        'placeholder_text' => __('Select post types', 'geodirectory'),
854
-        'class' => 'chosen_select',
855
-        'options' => array_unique(geodir_post_type_setting_fun())
856
-    ),
857 827
 
858
-    array(
859
-        'name' => __('Allow post type to add from frontend', 'geodirectory'),
860
-        'desc' => '',
861
-        'tip' => '',
862
-        'id' => 'geodir_allow_posttype_frontend',
863
-        'css' => 'min-width:300px;',
864
-        'std' => geodir_get_posttypes(),
865
-        'type' => 'multiselect',
866
-        'placeholder_text' => __('Select post types', 'geodirectory'),
867
-        'class' => 'chosen_select',
868
-        'options' => array_unique(geodir_post_type_setting_fun())
869
-    ),
828
+	array('name' => __('Post Type Navigation Settings', 'geodirectory'),
829
+		'type' => 'sectionstart',
830
+		'desc' => '',
831
+		'id' => 'geodir_post_type_navigation_layout'),
832
+	array(
833
+		'name' => __('Show listing link in main navigation', 'geodirectory'),
834
+		'desc' => '',
835
+		'tip' => '',
836
+		'id' => 'geodir_add_posttype_in_main_nav',
837
+		'css' => 'min-width:300px;',
838
+		'std' => array(),
839
+		'type' => 'multiselect',
840
+		'placeholder_text' => __('Select post types', 'geodirectory'),
841
+		'class' => 'chosen_select',
842
+		'options' => array_unique(geodir_post_type_setting_fun())
843
+	),
870 844
 
871
-    array(
872
-        'name' => __('Show add listing link in main navigation', 'geodirectory'),
873
-        'desc' => '',
874
-        'tip' => '',
875
-        'id' => 'geodir_add_listing_link_main_nav',
876
-        'css' => 'min-width:300px;',
877
-        'std' => array(),
878
-        'type' => 'multiselect',
879
-        'placeholder_text' => __('Select post types', 'geodirectory'),
880
-        'class' => 'chosen_select',
881
-        'options' => array_unique(geodir_post_type_setting_fun())
882
-    ),
845
+	array(
846
+		'name' => __('Show listing link in listing navigation', 'geodirectory'),
847
+		'desc' => '',
848
+		'tip' => '',
849
+		'id' => 'geodir_add_posttype_in_listing_nav',
850
+		'css' => 'min-width:300px;',
851
+		'std' => geodir_get_posttypes(),
852
+		'type' => 'multiselect',
853
+		'placeholder_text' => __('Select post types', 'geodirectory'),
854
+		'class' => 'chosen_select',
855
+		'options' => array_unique(geodir_post_type_setting_fun())
856
+	),
883 857
 
884
-    array(
885
-        'name' => __('Show add listing link in add listing navigation', 'geodirectory'),
886
-        'desc' => '',
887
-        'tip' => '',
888
-        'id' => 'geodir_add_listing_link_add_listing_nav',
889
-        'css' => 'min-width:300px;',
890
-        'std' => geodir_get_posttypes(),
891
-        'type' => 'multiselect',
892
-        'class' => 'chosen_select',
893
-        'options' => array_unique(geodir_post_type_setting_fun())
894
-    ),
858
+	array(
859
+		'name' => __('Allow post type to add from frontend', 'geodirectory'),
860
+		'desc' => '',
861
+		'tip' => '',
862
+		'id' => 'geodir_allow_posttype_frontend',
863
+		'css' => 'min-width:300px;',
864
+		'std' => geodir_get_posttypes(),
865
+		'type' => 'multiselect',
866
+		'placeholder_text' => __('Select post types', 'geodirectory'),
867
+		'class' => 'chosen_select',
868
+		'options' => array_unique(geodir_post_type_setting_fun())
869
+	),
895 870
 
896
-    array('type' => 'sectionend', 'id' => 'geodir_post_type_navigation_layout'),
871
+	array(
872
+		'name' => __('Show add listing link in main navigation', 'geodirectory'),
873
+		'desc' => '',
874
+		'tip' => '',
875
+		'id' => 'geodir_add_listing_link_main_nav',
876
+		'css' => 'min-width:300px;',
877
+		'std' => array(),
878
+		'type' => 'multiselect',
879
+		'placeholder_text' => __('Select post types', 'geodirectory'),
880
+		'class' => 'chosen_select',
881
+		'options' => array_unique(geodir_post_type_setting_fun())
882
+	),
897 883
 
884
+	array(
885
+		'name' => __('Show add listing link in add listing navigation', 'geodirectory'),
886
+		'desc' => '',
887
+		'tip' => '',
888
+		'id' => 'geodir_add_listing_link_add_listing_nav',
889
+		'css' => 'min-width:300px;',
890
+		'std' => geodir_get_posttypes(),
891
+		'type' => 'multiselect',
892
+		'class' => 'chosen_select',
893
+		'options' => array_unique(geodir_post_type_setting_fun())
894
+	),
898 895
 
899
-    array('name' => __('User Dashboard Post Type Navigation Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_user_dashboard_post_type '),
896
+	array('type' => 'sectionend', 'id' => 'geodir_post_type_navigation_layout'),
900 897
 
901 898
 
902
-    array(
903
-        'name' => __('Show add listing link in user dashboard', 'geodirectory'),
904
-        'desc' => '',
905
-        'tip' => '',
906
-        'id' => 'geodir_add_listing_link_user_dashboard',
907
-        'css' => 'min-width:300px;',
908
-        'std' => geodir_get_posttypes(),
909
-        'type' => 'multiselect',
910
-        'placeholder_text' => __('Select post types', 'geodirectory'),
911
-        'class' => 'chosen_select',
912
-        'options' => array_unique(geodir_post_type_setting_fun())
913
-    ),
899
+	array('name' => __('User Dashboard Post Type Navigation Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_user_dashboard_post_type '),
914 900
 
915
-    array(
916
-        'name' => __('Show favorite link in user dashboard', 'geodirectory'),
917
-        'desc' => __('Option will not appear if user does not have a favorite of that post type', 'geodirectory'),
918
-        'tip' => '',
919
-        'id' => 'geodir_favorite_link_user_dashboard',
920
-        'css' => 'min-width:300px;',
921
-        'std' => geodir_get_posttypes(),
922
-        'type' => 'multiselect',
923
-        'placeholder_text' => __('Select post types', 'geodirectory'),
924
-        'class' => 'chosen_select',
925
-        'options' => array_unique(geodir_post_type_setting_fun())
926
-    ),
927 901
 
928
-    array(
929
-        'name' => __('Show listing link in user dashboard', 'geodirectory'),
930
-        'desc' => __('Option will not appear if user does not have his/her own listing of that post type', 'geodirectory'),
931
-        'tip' => '',
932
-        'id' => 'geodir_listing_link_user_dashboard',
933
-        'css' => 'min-width:300px;',
934
-        'std' => geodir_get_posttypes(),
935
-        'type' => 'multiselect',
936
-        'placeholder_text' => __('Select post types', 'geodirectory'),
937
-        'class' => 'chosen_select',
938
-        'options' => array_unique(geodir_post_type_setting_fun())
939
-    ),
940
-
941
-    array('type' => 'sectionend', 'id' => 'geodir_user_dashboard_post_type'),
942
-    /* Post Type Navigation Settings End */
943
-
944
-    /* Script Settings Start */
945
-    array('name' => __('Scripts', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_script_settings '),
946
-
947
-    /*
902
+	array(
903
+		'name' => __('Show add listing link in user dashboard', 'geodirectory'),
904
+		'desc' => '',
905
+		'tip' => '',
906
+		'id' => 'geodir_add_listing_link_user_dashboard',
907
+		'css' => 'min-width:300px;',
908
+		'std' => geodir_get_posttypes(),
909
+		'type' => 'multiselect',
910
+		'placeholder_text' => __('Select post types', 'geodirectory'),
911
+		'class' => 'chosen_select',
912
+		'options' => array_unique(geodir_post_type_setting_fun())
913
+	),
914
+
915
+	array(
916
+		'name' => __('Show favorite link in user dashboard', 'geodirectory'),
917
+		'desc' => __('Option will not appear if user does not have a favorite of that post type', 'geodirectory'),
918
+		'tip' => '',
919
+		'id' => 'geodir_favorite_link_user_dashboard',
920
+		'css' => 'min-width:300px;',
921
+		'std' => geodir_get_posttypes(),
922
+		'type' => 'multiselect',
923
+		'placeholder_text' => __('Select post types', 'geodirectory'),
924
+		'class' => 'chosen_select',
925
+		'options' => array_unique(geodir_post_type_setting_fun())
926
+	),
927
+
928
+	array(
929
+		'name' => __('Show listing link in user dashboard', 'geodirectory'),
930
+		'desc' => __('Option will not appear if user does not have his/her own listing of that post type', 'geodirectory'),
931
+		'tip' => '',
932
+		'id' => 'geodir_listing_link_user_dashboard',
933
+		'css' => 'min-width:300px;',
934
+		'std' => geodir_get_posttypes(),
935
+		'type' => 'multiselect',
936
+		'placeholder_text' => __('Select post types', 'geodirectory'),
937
+		'class' => 'chosen_select',
938
+		'options' => array_unique(geodir_post_type_setting_fun())
939
+	),
940
+
941
+	array('type' => 'sectionend', 'id' => 'geodir_user_dashboard_post_type'),
942
+	/* Post Type Navigation Settings End */
943
+
944
+	/* Script Settings Start */
945
+	array('name' => __('Scripts', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_script_settings '),
946
+
947
+	/*
948 948
     array( 	'name' => __( 'Add/Remove Scripts', 'geodirectory' ),
949 949
                 'type' => 'sectionstart',
950 950
                 'desc' => '',
@@ -970,190 +970,190 @@  discard block
 block discarded – undo
970 970
 
971 971
     */
972 972
 
973
-    array('name' => __('GD Lazy Load Images', 'geodirectory'),
974
-        'type' => 'sectionstart',
975
-        'desc' => '',
976
-        'id' => 'geodir_gdll_settings'),
973
+	array('name' => __('GD Lazy Load Images', 'geodirectory'),
974
+		'type' => 'sectionstart',
975
+		'desc' => '',
976
+		'id' => 'geodir_gdll_settings'),
977 977
 
978
-    array(
979
-        'name' => __('Enable lazy load images?', 'geodirectory'),
980
-        'desc' => __('GD images will be loaded only when visible on the page', 'geodirectory'),
981
-        'id' => 'geodir_lazy_load',
982
-        'type' => 'checkbox',
983
-        'std' => '1' // Default value to show home top section
984
-    ),
985
-    array('type' => 'sectionend', 'id' => 'geodir_gdll_settings'),
978
+	array(
979
+		'name' => __('Enable lazy load images?', 'geodirectory'),
980
+		'desc' => __('GD images will be loaded only when visible on the page', 'geodirectory'),
981
+		'id' => 'geodir_lazy_load',
982
+		'type' => 'checkbox',
983
+		'std' => '1' // Default value to show home top section
984
+	),
985
+	array('type' => 'sectionend', 'id' => 'geodir_gdll_settings'),
986 986
     
987 987
 
988
-    array('name' => __('Script Settings', 'geodirectory'),
989
-        'type' => 'sectionstart',
990
-        'desc' => '',
991
-        'id' => 'geodir_script_settings'),
988
+	array('name' => __('Script Settings', 'geodirectory'),
989
+		'type' => 'sectionstart',
990
+		'desc' => '',
991
+		'id' => 'geodir_script_settings'),
992 992
 
993
-    array(
994
-        'name' => __('Custom style css code', 'geodirectory'),
995
-        'desc' => '',
996
-        'id' => 'geodir_coustem_css',
997
-        'type' => 'textarea',
998
-        'css' => 'min-width:300px;',
999
-        'std' => '' // Default value for the page title - changed in settings
1000
-    ),
993
+	array(
994
+		'name' => __('Custom style css code', 'geodirectory'),
995
+		'desc' => '',
996
+		'id' => 'geodir_coustem_css',
997
+		'type' => 'textarea',
998
+		'css' => 'min-width:300px;',
999
+		'std' => '' // Default value for the page title - changed in settings
1000
+	),
1001 1001
 
1002
-    array(
1003
-        'name' => __('Header script code', 'geodirectory'),
1004
-        'desc' => '',
1005
-        'id' => 'geodir_header_scripts',
1006
-        'type' => 'textarea',
1007
-        'css' => 'min-width:300px;',
1008
-        'std' => '' // Default value for the page title - changed in settings
1009
-    ),
1002
+	array(
1003
+		'name' => __('Header script code', 'geodirectory'),
1004
+		'desc' => '',
1005
+		'id' => 'geodir_header_scripts',
1006
+		'type' => 'textarea',
1007
+		'css' => 'min-width:300px;',
1008
+		'std' => '' // Default value for the page title - changed in settings
1009
+	),
1010 1010
 
1011
-    array(
1012
-        'name' => __('Footer script code', 'geodirectory'),
1013
-        'desc' => '',
1014
-        'id' => 'geodir_footer_scripts',
1015
-        'type' => 'textarea',
1016
-        'css' => 'min-width:300px;',
1017
-        'std' => '' // Default value for the page title - changed in settings
1018
-    ),
1011
+	array(
1012
+		'name' => __('Footer script code', 'geodirectory'),
1013
+		'desc' => '',
1014
+		'id' => 'geodir_footer_scripts',
1015
+		'type' => 'textarea',
1016
+		'css' => 'min-width:300px;',
1017
+		'std' => '' // Default value for the page title - changed in settings
1018
+	),
1019 1019
 
1020
-    array('type' => 'sectionend', 'id' => 'geodir_script_settings'),
1021
-    /* Script Settings End */
1020
+	array('type' => 'sectionend', 'id' => 'geodir_script_settings'),
1021
+	/* Script Settings End */
1022 1022
 
1023
-    /* Map Settings Start */
1024
-    array('name' => __('Map', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_map_settings '),
1023
+	/* Map Settings Start */
1024
+	array('name' => __('Map', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_map_settings '),
1025 1025
 
1026 1026
 
1027
-    // Google API key
1028
-    array(
1029
-        'name' => __('Google Maps API KEY', 'geodirectory'),
1030
-        'type' => 'sectionstart',
1031
-        'desc' => '',
1032
-        'id' => 'geodir_google_api_key'
1033
-    ),
1034
-    array(
1035
-        'name' => __('Google Maps API KEY', 'geodirectory'),
1036
-        'desc' => sprintf(
1037
-            __('This is a requirement to use Google Maps, you can get a key from <a href="%s" target="_blank">here</a> OR you can set GD to use Open Street Maps below under Select Maps API setting.   (<a href="%s" target="_blank">How to add a Google API KEY?</a>)', 'geodirectory'),
1038
-            'https://console.developers.google.com/flows/enableapi?apiid=static_maps_backend,street_view_image_backend,maps_embed_backend,places_backend,geocoding_backend,directions_backend,distance_matrix_backend,geolocation,elevation_backend,timezone_backend,maps_backend&keyType=CLIENT_SIDE&reusekey=true','https://wpgeodirectory.com/docs/add-google-api-key/' ),
1039
-        'tip' => '',
1040
-        'id' => 'geodir_google_api_key',
1041
-        'css' => 'min-width:300px;',
1042
-        'std' => '',
1043
-        'type' => 'map-key',
1044
-    ),
1045
-    array(
1046
-        'type' => 'sectionend',
1047
-        'id' => 'geodir_google_api_key'
1048
-    ),
1027
+	// Google API key
1028
+	array(
1029
+		'name' => __('Google Maps API KEY', 'geodirectory'),
1030
+		'type' => 'sectionstart',
1031
+		'desc' => '',
1032
+		'id' => 'geodir_google_api_key'
1033
+	),
1034
+	array(
1035
+		'name' => __('Google Maps API KEY', 'geodirectory'),
1036
+		'desc' => sprintf(
1037
+			__('This is a requirement to use Google Maps, you can get a key from <a href="%s" target="_blank">here</a> OR you can set GD to use Open Street Maps below under Select Maps API setting.   (<a href="%s" target="_blank">How to add a Google API KEY?</a>)', 'geodirectory'),
1038
+			'https://console.developers.google.com/flows/enableapi?apiid=static_maps_backend,street_view_image_backend,maps_embed_backend,places_backend,geocoding_backend,directions_backend,distance_matrix_backend,geolocation,elevation_backend,timezone_backend,maps_backend&keyType=CLIENT_SIDE&reusekey=true','https://wpgeodirectory.com/docs/add-google-api-key/' ),
1039
+		'tip' => '',
1040
+		'id' => 'geodir_google_api_key',
1041
+		'css' => 'min-width:300px;',
1042
+		'std' => '',
1043
+		'type' => 'map-key',
1044
+	),
1045
+	array(
1046
+		'type' => 'sectionend',
1047
+		'id' => 'geodir_google_api_key'
1048
+	),
1049 1049
 
1050
-    /* Untick the category by default on home map */
1051
-    array(
1052
-        'name' => __('Home Map Settings', 'geodirectory'),
1053
-        'type' => 'sectionstart',
1054
-        'desc' => '',
1055
-        'id' => 'geodir_home_map_section'
1056
-    ),
1057
-    array(
1058
-        'name' => __('Select category to untick by default on map', 'geodirectory'),
1059
-        'desc' => __('Select category to untick by default on the home map.', 'geodirectory'),
1060
-        'tip' => '',
1061
-        'id' => 'geodir_home_map_untick',
1062
-        'css' => 'min-width:300px;',
1063
-        'std' => '',
1064
-        'type' => 'multiselect',
1065
-        'placeholder_text' => __('Select category', 'geodirectory'),
1066
-        'class' => 'chosen_select',
1067
-        'options' => geodir_home_map_cats_key_value_array()
1068
-    ),
1069
-    array(
1070
-        'type' => 'sectionend',
1071
-        'id' => 'geodir_home_map_section'
1072
-    ),
1050
+	/* Untick the category by default on home map */
1051
+	array(
1052
+		'name' => __('Home Map Settings', 'geodirectory'),
1053
+		'type' => 'sectionstart',
1054
+		'desc' => '',
1055
+		'id' => 'geodir_home_map_section'
1056
+	),
1057
+	array(
1058
+		'name' => __('Select category to untick by default on map', 'geodirectory'),
1059
+		'desc' => __('Select category to untick by default on the home map.', 'geodirectory'),
1060
+		'tip' => '',
1061
+		'id' => 'geodir_home_map_untick',
1062
+		'css' => 'min-width:300px;',
1063
+		'std' => '',
1064
+		'type' => 'multiselect',
1065
+		'placeholder_text' => __('Select category', 'geodirectory'),
1066
+		'class' => 'chosen_select',
1067
+		'options' => geodir_home_map_cats_key_value_array()
1068
+	),
1069
+	array(
1070
+		'type' => 'sectionend',
1071
+		'id' => 'geodir_home_map_section'
1072
+	),
1073 1073
 
1074
-    array(
1075
-        'name' => __('Add Listing Map Settings', 'geodirectory'),
1076
-        'type' => 'sectionstart',
1077
-        'desc' => '',
1078
-        'id' => 'geodir_add_listing_map_section'
1079
-    ),
1080
-    array(
1081
-        'name' => __('Disable mouse scroll on details page map tab', 'geodirectory'),
1082
-        'desc' => __('Stops the mouse scroll zooming the map (home and listings settings set from widget)', 'geodirectory'),
1083
-        'id' => 'geodir_add_listing_mouse_scroll',
1084
-        'type' => 'checkbox',
1085
-        'std' => '0' // Default value to show home top section
1086
-    ),
1087
-    array(
1088
-        'type' => 'sectionend',
1089
-        'id' => 'geodir_add_listing_map_section'
1090
-    ),
1074
+	array(
1075
+		'name' => __('Add Listing Map Settings', 'geodirectory'),
1076
+		'type' => 'sectionstart',
1077
+		'desc' => '',
1078
+		'id' => 'geodir_add_listing_map_section'
1079
+	),
1080
+	array(
1081
+		'name' => __('Disable mouse scroll on details page map tab', 'geodirectory'),
1082
+		'desc' => __('Stops the mouse scroll zooming the map (home and listings settings set from widget)', 'geodirectory'),
1083
+		'id' => 'geodir_add_listing_mouse_scroll',
1084
+		'type' => 'checkbox',
1085
+		'std' => '0' // Default value to show home top section
1086
+	),
1087
+	array(
1088
+		'type' => 'sectionend',
1089
+		'id' => 'geodir_add_listing_map_section'
1090
+	),
1091 1091
 
1092 1092
 
1093
-    array('name' => __('Default map settings', 'geodirectory'),
1094
-        'type' => 'sectionstart',
1095
-        'desc' => '',
1096
-        'id' => 'geodir_map_default_settings'),
1093
+	array('name' => __('Default map settings', 'geodirectory'),
1094
+		'type' => 'sectionstart',
1095
+		'desc' => '',
1096
+		'id' => 'geodir_map_default_settings'),
1097 1097
 
1098
-    array(
1099
-        'name' => '',
1100
-        'desc' => '',
1101
-        'id' => 'map_default_settings',
1102
-        'type' => 'map_default_settings',
1103
-        'css' => 'min-width:300px;',
1104
-        'std' => '' // Default value for the page title - changed in settings
1105
-    ),
1098
+	array(
1099
+		'name' => '',
1100
+		'desc' => '',
1101
+		'id' => 'map_default_settings',
1102
+		'type' => 'map_default_settings',
1103
+		'css' => 'min-width:300px;',
1104
+		'std' => '' // Default value for the page title - changed in settings
1105
+	),
1106 1106
 
1107
-    array(
1108
-        'name' => __('Upload map default marker icon', 'geodirectory'),
1109
-        'desc' => '',
1110
-        'id' => 'geodir_default_marker_icon',
1111
-        'type' => 'file',
1112
-        'std' => '0',
1113
-        'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section
1114
-    ),
1115
-    // add option that allows enable/disable map dragging to phone devices
1116
-    array(
1117
-        'name' => __('Show button control on map to enable/disable dragging', 'geodirectory'),
1118
-        'desc' => __('If checked, it displays button control to enable/disable dragging on google maps for phone devices', 'geodirectory'),
1119
-        'id' => 'geodir_map_onoff_dragging',
1120
-        'type' => 'checkbox',
1121
-        'std' => '0' // Default value to show home top section
1122
-    ),
1123
-    array(
1124
-        'name' => __('Select Maps API', 'geodirectory'),
1125
-        'desc' => __('- Google Maps API will force to load Google JS library only.<br>- OpenStreetMap API will force to load OpenStreetMap JS library only.<br>- Load Automatic will load Google JS library first, but if Google maps JS library not loaded it then loads the OpenStreetMap JS library to load the maps (recommended for regions where Google maps banned).<br>- Disable Maps will disable and hides maps for entire site.', 'geodirectory'),
1126
-        'tip' => '',
1127
-        'id' => 'geodir_load_map',
1128
-        'css' => 'min-width:300px;',
1129
-        'std' => 'auto',
1130
-        'type' => 'select',
1131
-        'placeholder_text' => __('Select Map', 'geodirectory'),
1132
-        'options' => array(
1133
-                        'auto' => __('Load Automatic', 'geodirectory'),
1134
-                        'google' => __('Load Google Maps API', 'geodirectory'),
1135
-                        'osm' => __('Load OpenStreetMap API', 'geodirectory'),
1136
-                        'none' => __('Disable Maps', 'geodirectory')
1137
-                    )
1138
-    ),
1139
-
1140
-    array('type' => 'sectionend', 'id' => 'geodir_map_default_settings'),
1141
-
1142
-    array('name' => __('Show / hide post type and category on map', 'geodirectory'),
1143
-        'type' => 'sectionstart',
1144
-        'desc' => '',
1145
-        'id' => 'geodir_map_settings'),
1107
+	array(
1108
+		'name' => __('Upload map default marker icon', 'geodirectory'),
1109
+		'desc' => '',
1110
+		'id' => 'geodir_default_marker_icon',
1111
+		'type' => 'file',
1112
+		'std' => '0',
1113
+		'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section
1114
+	),
1115
+	// add option that allows enable/disable map dragging to phone devices
1116
+	array(
1117
+		'name' => __('Show button control on map to enable/disable dragging', 'geodirectory'),
1118
+		'desc' => __('If checked, it displays button control to enable/disable dragging on google maps for phone devices', 'geodirectory'),
1119
+		'id' => 'geodir_map_onoff_dragging',
1120
+		'type' => 'checkbox',
1121
+		'std' => '0' // Default value to show home top section
1122
+	),
1123
+	array(
1124
+		'name' => __('Select Maps API', 'geodirectory'),
1125
+		'desc' => __('- Google Maps API will force to load Google JS library only.<br>- OpenStreetMap API will force to load OpenStreetMap JS library only.<br>- Load Automatic will load Google JS library first, but if Google maps JS library not loaded it then loads the OpenStreetMap JS library to load the maps (recommended for regions where Google maps banned).<br>- Disable Maps will disable and hides maps for entire site.', 'geodirectory'),
1126
+		'tip' => '',
1127
+		'id' => 'geodir_load_map',
1128
+		'css' => 'min-width:300px;',
1129
+		'std' => 'auto',
1130
+		'type' => 'select',
1131
+		'placeholder_text' => __('Select Map', 'geodirectory'),
1132
+		'options' => array(
1133
+						'auto' => __('Load Automatic', 'geodirectory'),
1134
+						'google' => __('Load Google Maps API', 'geodirectory'),
1135
+						'osm' => __('Load OpenStreetMap API', 'geodirectory'),
1136
+						'none' => __('Disable Maps', 'geodirectory')
1137
+					)
1138
+	),
1146 1139
 
1147
-    array(
1148
-        'name' => __('Select Map Category', 'geodirectory'),
1149
-        'desc' => '',
1150
-        'id' => 'geodir_map_settings',
1151
-        'type' => 'map',
1152
-        'css' => 'min-width:300px;',
1153
-        'std' => '' // Default value for the page title - changed in settings
1154
-    ),
1155
-
1156
-    array('type' => 'sectionend', 'id' => 'geodir_map_settings'),
1157
-    /* Map Settings End */
1140
+	array('type' => 'sectionend', 'id' => 'geodir_map_default_settings'),
1141
+
1142
+	array('name' => __('Show / hide post type and category on map', 'geodirectory'),
1143
+		'type' => 'sectionstart',
1144
+		'desc' => '',
1145
+		'id' => 'geodir_map_settings'),
1146
+
1147
+	array(
1148
+		'name' => __('Select Map Category', 'geodirectory'),
1149
+		'desc' => '',
1150
+		'id' => 'geodir_map_settings',
1151
+		'type' => 'map',
1152
+		'css' => 'min-width:300px;',
1153
+		'std' => '' // Default value for the page title - changed in settings
1154
+	),
1155
+
1156
+	array('type' => 'sectionend', 'id' => 'geodir_map_settings'),
1157
+	/* Map Settings End */
1158 1158
 
1159 1159
 )); // End Design settings
Please login to merge, or discard this patch.
geodirectory-functions/custom_taxonomy_hooks_actions.php 3 patches
Braces   +103 added lines, -70 removed lines patch added patch discarded remove patch
@@ -106,24 +106,30 @@  discard block
 block discarded – undo
106 106
         $listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix']));
107 107
 
108 108
         if ($post_type == 'gd_place') {
109
-            if (array_key_exists('has_archive', $args))
110
-                $args['has_archive'] = $listing_slug;
109
+            if (array_key_exists('has_archive', $args)) {
110
+                            $args['has_archive'] = $listing_slug;
111
+            }
111 112
 
112 113
             if (array_key_exists('rewrite', $args)) {
113
-                if (array_key_exists('slug', $args['rewrite']))
114
-                    $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';
114
+                if (array_key_exists('slug', $args['rewrite'])) {
115
+                                    $args['rewrite']['slug'] = $listing_slug;
116
+                }
117
+                // . '/%gd_taxonomy%';
115 118
             }
116 119
 
117 120
             $geodir_post_types = get_option('geodir_post_types');
118 121
 
119 122
             if (array_key_exists($post_type, $geodir_post_types)) {
120 123
 
121
-                if (array_key_exists('has_archive', $geodir_post_types[$post_type]))
122
-                    $geodir_post_types[$post_type]['has_archive'] = $listing_slug;
124
+                if (array_key_exists('has_archive', $geodir_post_types[$post_type])) {
125
+                                    $geodir_post_types[$post_type]['has_archive'] = $listing_slug;
126
+                }
123 127
 
124
-                if (array_key_exists('rewrite', $geodir_post_types[$post_type]))
125
-                    if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))
126
-                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';
128
+                if (array_key_exists('rewrite', $geodir_post_types[$post_type])) {
129
+                                    if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))
130
+                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;
131
+                }
132
+                // . '/%gd_taxonomy%';
127 133
 
128 134
                 update_option('geodir_post_types', $geodir_post_types);
129 135
 
@@ -138,10 +144,11 @@  discard block
 block discarded – undo
138 144
             if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {
139 145
                 $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;
140 146
 
141
-                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))
142
-                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))
147
+                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category'])) {
148
+                                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))
143 149
                         if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))
144
-                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;
150
+                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;
151
+                }
145 152
 
146 153
                 update_option('geodir_taxonomies', $geodir_taxonomies);
147 154
 
@@ -152,10 +159,11 @@  discard block
 block discarded – undo
152 159
             if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {
153 160
                 $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';
154 161
 
155
-                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))
156
-                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))
162
+                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags'])) {
163
+                                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))
157 164
                         if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))
158
-                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';
165
+                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';
166
+                }
159 167
 
160 168
                 update_option('geodir_taxonomies', $geodir_taxonomies_tag);
161 169
 
@@ -221,8 +229,9 @@  discard block
 block discarded – undo
221 229
         global $wpdb;
222 230
         $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));
223 231
     }
224
-    if (!isset($location_prefix))
225
-        $location_prefix = 'location';
232
+    if (!isset($location_prefix)) {
233
+            $location_prefix = 'location';
234
+    }
226 235
 
227 236
 	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
228 237
 	if ($location_manager) {
@@ -441,14 +450,17 @@  discard block
 block discarded – undo
441 450
         $gd_country = '';
442 451
         $gd_region = '';
443 452
         $gd_city = '';
444
-        if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '')
445
-            $gd_country = urldecode($wp->query_vars['gd_country']);
453
+        if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') {
454
+                    $gd_country = urldecode($wp->query_vars['gd_country']);
455
+        }
446 456
 
447
-        if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '')
448
-            $gd_region = urldecode($wp->query_vars['gd_region']);
457
+        if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') {
458
+                    $gd_region = urldecode($wp->query_vars['gd_region']);
459
+        }
449 460
 
450
-        if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '')
451
-            $gd_city = urldecode($wp->query_vars['gd_city']);
461
+        if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') {
462
+                    $gd_city = urldecode($wp->query_vars['gd_city']);
463
+        }
452 464
 
453 465
         if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) {
454 466
             $default_location = geodir_get_default_location();
@@ -456,17 +468,19 @@  discard block
 block discarded – undo
456 468
             if (get_option('geodir_add_location_url')) {
457 469
                 if ($geodir_show_location_url != 'all') {
458 470
                     if ($gd_region == '') {
459
-                        if ($gd_ses_region = $gd_session->get('gd_region'))
460
-                            $gd_region = $gd_ses_region;
461
-                        else
462
-                            $gd_region = $default_location->region_slug;
471
+                        if ($gd_ses_region = $gd_session->get('gd_region')) {
472
+                                                    $gd_region = $gd_ses_region;
473
+                        } else {
474
+                                                    $gd_region = $default_location->region_slug;
475
+                        }
463 476
                     }
464 477
 
465 478
                     if ($gd_city == '') {
466
-                        if ($gd_ses_city = $gd_session->get('gd_city'))
467
-                            $gd_city = $gd_ses_city;
468
-                        else
469
-                            $gd_city = $default_location->city_slug;
479
+                        if ($gd_ses_city = $gd_session->get('gd_city')) {
480
+                                                    $gd_city = $gd_ses_city;
481
+                        } else {
482
+                                                    $gd_city = $default_location->city_slug;
483
+                        }
470 484
 
471 485
                         $base_location_link = geodir_get_location_link('base');
472 486
                         wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);
@@ -585,8 +599,9 @@  discard block
 block discarded – undo
585 599
 
586 600
 
587 601
 				$geodir_term = str_replace('/' . $geodir_last_term, '', $geodir_term, $post_title_replace_count);
588
-				if (!$post_title_replace_count)
589
-					$geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count);
602
+				if (!$post_title_replace_count) {
603
+									$geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count);
604
+				}
590 605
 				$geodir_terms = explode('/', $geodir_term);
591 606
 				$geodir_last_term = end($geodir_terms);
592 607
 
@@ -622,8 +637,9 @@  discard block
 block discarded – undo
622 637
                     if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&
623 638
                         geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) &&
624 639
                         geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)
625
-                    )
626
-                        $is_geodir_location_found = true;
640
+                    ) {
641
+                                            $is_geodir_location_found = true;
642
+                    }
627 643
 
628 644
                     // if location has not been found for country , region and city then search for country and region only
629 645
 
@@ -631,8 +647,9 @@  discard block
 block discarded – undo
631 647
                         $gd_city = '';
632 648
                         if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&
633 649
                             geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)
634
-                        )
635
-                            $is_geodir_location_found = true;
650
+                        ) {
651
+                                                    $is_geodir_location_found = true;
652
+                        }
636 653
 
637 654
                     }
638 655
 
@@ -640,8 +657,9 @@  discard block
 block discarded – undo
640 657
                     if (!$is_geodir_location_found) {
641 658
                         $gd_city = '';
642 659
                         $gd_region = '';
643
-                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))
644
-                            $is_geodir_location_found = true;
660
+                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) {
661
+                                                    $is_geodir_location_found = true;
662
+                        }
645 663
                     }
646 664
                 } else if ($geodir_show_location_url == 'country_city') {
647 665
                     if (count($geodir_terms) >= 2) {
@@ -651,17 +669,19 @@  discard block
 block discarded – undo
651 669
                         $gd_country = urldecode($geodir_terms[0]);
652 670
                     }
653 671
 
654
-                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))
655
-                        $is_geodir_location_found = true;
672
+                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {
673
+                                            $is_geodir_location_found = true;
674
+                    }
656 675
 
657 676
                     // if location has not been found for country and city  then search for country only
658 677
                     if (!$is_geodir_location_found) {
659 678
                         $gd_city = '';
660 679
                         
661
-						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))
662
-                            $is_geodir_location_found = true;
680
+						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) {
681
+						                            $is_geodir_location_found = true;
682
+						}
663 683
                     }
664
-                }  else if ($geodir_show_location_url == 'region_city') {
684
+                } else if ($geodir_show_location_url == 'region_city') {
665 685
                     if (count($geodir_terms) >= 2) {
666 686
                         $gd_region = urldecode($geodir_terms[0]);
667 687
                         $gd_city = urldecode($geodir_terms[1]);
@@ -669,15 +689,17 @@  discard block
 block discarded – undo
669 689
                         $gd_region = urldecode($geodir_terms[0]);
670 690
                     }
671 691
 
672
-                    if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))
673
-                        $is_geodir_location_found = true;
692
+                    if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {
693
+                                            $is_geodir_location_found = true;
694
+                    }
674 695
 
675 696
                     // if location has not been found for region and city  then search for region only
676 697
                     if (!$is_geodir_location_found) {
677 698
                         $gd_city = '';
678 699
                         
679
-						if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region))
680
-                            $is_geodir_location_found = true;
700
+						if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)) {
701
+						                            $is_geodir_location_found = true;
702
+						}
681 703
                     }
682 704
                 } else {
683 705
                     $gd_city = $geodir_terms[0];
@@ -719,14 +741,17 @@  discard block
 block discarded – undo
719 741
 
720 742
             $wp->query_vars[$geodir_taxonomy] = $geodir_term;
721 743
             // eliminate location related terms from taxonomy term
722
-            if ($gd_country != '')
723
-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
744
+            if ($gd_country != '') {
745
+                            $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
746
+            }
724 747
 
725
-            if ($gd_region != '')
726
-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
748
+            if ($gd_region != '') {
749
+                            $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
750
+            }
727 751
 
728
-            if ($gd_city != '')
729
-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
752
+            if ($gd_city != '') {
753
+                            $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
754
+            }
730 755
 
731 756
 
732 757
             $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);
@@ -762,27 +787,34 @@  discard block
 block discarded – undo
762 787
     if (get_option('geodir_add_location_url')) {        
763 788
 		if ($geodir_show_location_url == 'all') {
764 789
 		} else if ($geodir_show_location_url == 'country_city') {
765
-			 if (isset($wp->query_vars['gd_region']))
766
-                $wp->query_vars['gd_region'] = '';
790
+			 if (isset($wp->query_vars['gd_region'])) {
791
+			                 $wp->query_vars['gd_region'] = '';
792
+			 }
767 793
 		} else if ($geodir_show_location_url == 'region_city') {
768
-			if (isset($wp->query_vars['gd_country']))
769
-                $wp->query_vars['gd_country'] = '';
794
+			if (isset($wp->query_vars['gd_country'])) {
795
+			                $wp->query_vars['gd_country'] = '';
796
+			}
770 797
 		} else {
771
-			if (isset($wp->query_vars['gd_country']))
772
-                $wp->query_vars['gd_country'] = '';
798
+			if (isset($wp->query_vars['gd_country'])) {
799
+			                $wp->query_vars['gd_country'] = '';
800
+			}
773 801
 
774
-            if (isset($wp->query_vars['gd_region']))
775
-                $wp->query_vars['gd_region'] = '';
802
+            if (isset($wp->query_vars['gd_region'])) {
803
+                            $wp->query_vars['gd_region'] = '';
804
+            }
776 805
 		}
777 806
     } else {
778
-        if (isset($wp->query_vars['gd_country']))
779
-            $wp->query_vars['gd_country'] = '';
807
+        if (isset($wp->query_vars['gd_country'])) {
808
+                    $wp->query_vars['gd_country'] = '';
809
+        }
780 810
 
781
-        if (isset($wp->query_vars['gd_region']))
782
-            $wp->query_vars['gd_region'] = '';
811
+        if (isset($wp->query_vars['gd_region'])) {
812
+                    $wp->query_vars['gd_region'] = '';
813
+        }
783 814
 
784
-        if (isset($wp->query_vars['gd_city']))
785
-            $wp->query_vars['gd_city'] = '';
815
+        if (isset($wp->query_vars['gd_city'])) {
816
+                    $wp->query_vars['gd_city'] = '';
817
+        }
786 818
     }
787 819
 }
788 820
 
@@ -894,8 +926,9 @@  discard block
 block discarded – undo
894 926
 function geodir_exclude_page_where($where)
895 927
 {
896 928
     global $wpdb;
897
-    if (is_admin())
898
-        $where .= " AND $wpdb->posts.post_status != 'virtual'";
929
+    if (is_admin()) {
930
+            $where .= " AND $wpdb->posts.post_status != 'virtual'";
931
+    }
899 932
 
900 933
     return $where;
901 934
 }
Please login to merge, or discard this patch.
Spacing   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 
71 71
             if (!empty($args['labels'])) {
72 72
                 foreach ($args['labels'] as $key => $val) {
73
-                    $args['labels'][$key] = __($val, 'geodirectory');// allow translation
73
+                    $args['labels'][$key] = __($val, 'geodirectory'); // allow translation
74 74
                 }
75 75
             }
76 76
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 
112 112
             if (array_key_exists('rewrite', $args)) {
113 113
                 if (array_key_exists('slug', $args['rewrite']))
114
-                    $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';
114
+                    $args['rewrite']['slug'] = $listing_slug; // . '/%gd_taxonomy%';
115 115
             }
116 116
 
117 117
             $geodir_post_types = get_option('geodir_post_types');
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 
124 124
                 if (array_key_exists('rewrite', $geodir_post_types[$post_type]))
125 125
                     if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))
126
-                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';
126
+                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug; // . '/%gd_taxonomy%';
127 127
 
128 128
                 update_option('geodir_post_types', $geodir_post_types);
129 129
 
@@ -135,13 +135,13 @@  discard block
 block discarded – undo
135 135
 
136 136
             $geodir_taxonomies = get_option('geodir_taxonomies');
137 137
 
138
-            if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {
139
-                $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;
138
+            if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type.'category'])) {
139
+                $geodir_taxonomies[$post_type.'category']['listing_slug'] = $listing_slug;
140 140
 
141
-                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))
142
-                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))
143
-                        if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))
144
-                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;
141
+                if (array_key_exists('args', $geodir_taxonomies[$post_type.'category']))
142
+                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type.'category']['args']))
143
+                        if (array_key_exists('slug', $geodir_taxonomies[$post_type.'category']['args']['rewrite']))
144
+                            $geodir_taxonomies[$post_type.'category']['args']['rewrite']['slug'] = $listing_slug;
145 145
 
146 146
                 update_option('geodir_taxonomies', $geodir_taxonomies);
147 147
 
@@ -149,13 +149,13 @@  discard block
 block discarded – undo
149 149
 
150 150
             /* --- update taxonomies (tags) --- */
151 151
             $geodir_taxonomies_tag = get_option('geodir_taxonomies');
152
-            if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {
153
-                $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';
152
+            if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type.'_tags'])) {
153
+                $geodir_taxonomies_tag[$post_type.'_tags']['listing_slug'] = $listing_slug.'/tags';
154 154
 
155
-                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))
156
-                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))
157
-                        if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))
158
-                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';
155
+                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type.'_tags']))
156
+                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type.'_tags']['args']))
157
+                        if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type.'_tags']['args']['rewrite']))
158
+                            $geodir_taxonomies_tag[$post_type.'_tags']['args']['rewrite']['slug'] = $listing_slug.'/tags';
159 159
 
160 160
                 update_option('geodir_taxonomies', $geodir_taxonomies_tag);
161 161
 
@@ -205,11 +205,11 @@  discard block
 block discarded – undo
205 205
             $listing_slug = $args['listing_slug'];
206 206
 
207 207
             if (strpos($taxonomy, 'tags')) {
208
-                $newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';
209
-                $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]';
208
+                $newrules[$listing_slug.'/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?'.$taxonomy.'=$matches[1]&paged=$matches[2]';
209
+                $newrules[$listing_slug.'/(.+?)/?$'] = 'index.php?'.$taxonomy.'=$matches[1]';
210 210
             } else {
211 211
                 // use this loop to add paging for details page comments paging
212
-                $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';
212
+                $newrules[str_replace("/tags", "", $listing_slug).'/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?'.$taxonomy.'=$matches[1]&cpage=$matches[2]';
213 213
             }
214 214
         endforeach;
215 215
     endif;
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
     // create rules for location listing
218 218
     $location_page = get_option('geodir_location_page');
219 219
 	
220
-    if($location_page) {
220
+    if ($location_page) {
221 221
         global $wpdb;
222 222
         $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));
223 223
     }
@@ -247,30 +247,30 @@  discard block
 block discarded – undo
247 247
 		
248 248
 		if ($matches2) {
249 249
 			if ($neighbourhood_active) {
250
-				$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]';
250
+				$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]&gd_neighbourhood=$matches[3]';
251 251
 			}
252
-			$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]';
252
+			$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]';
253 253
 		} else {
254 254
 			if ($neighbourhood_active) {
255
-				$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]';
255
+				$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&gd_neighbourhood=$matches[2]';
256 256
 			}
257 257
 		}
258 258
 		
259
-		$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]';
259
+		$newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]';
260 260
 	} else { // country/region/city
261 261
 		if ($neighbourhood_active) {
262
-			$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';
262
+			$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';
263 263
 		}
264
-		$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';
265
-		$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]';
266
-		$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]';
264
+		$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';
265
+		$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]';
266
+		$newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]';
267 267
 	}
268 268
 
269 269
     if ($location_page && function_exists('icl_object_id')) {
270
-        foreach(icl_get_languages('skip_missing=N') as $lang){
270
+        foreach (icl_get_languages('skip_missing=N') as $lang) {
271 271
             $alt_page_id = '';
272
-            $alt_page_id = icl_object_id($location_page, 'page', false,$lang['language_code']);
273
-            if($alt_page_id){
272
+            $alt_page_id = icl_object_id($location_page, 'page', false, $lang['language_code']);
273
+            if ($alt_page_id) {
274 274
                 $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));
275 275
 
276 276
 				if ($location_manager && ($hide_country_part || $hide_region_part)) {
@@ -289,29 +289,29 @@  discard block
 block discarded – undo
289 289
 					
290 290
 					if ($matches2) {
291 291
 						if ($neighbourhood_active) {
292
-							$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]';
292
+							$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]&gd_neighbourhood=$matches[3]';
293 293
 						}
294
-						$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]';
294
+						$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]';
295 295
 					} else {
296 296
 						if ($neighbourhood_active) {
297
-							$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]';
297
+							$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&gd_neighbourhood=$matches[2]';
298 298
 						}
299 299
 					}
300 300
 					
301
-					$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]';
301
+					$newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]';
302 302
 				} else { // country/region/city
303 303
 					if ($neighbourhood_active) {
304
-						$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';
304
+						$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';
305 305
 					}
306
-					$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';
307
-					$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]';
308
-					$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]';
306
+					$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';
307
+					$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]';
308
+					$newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]';
309 309
 				}
310 310
             }
311 311
         }
312 312
     }
313 313
 
314
-    $newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page;
314
+    $newrules[$location_prefix.'/?$'] = 'index.php?page_id='.$location_page;
315 315
 
316 316
     $rules = array_merge($newrules, $rules);
317 317
     return $rules;
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 #Redirect 301 /location/ /$location_prefix/
341 341
 # END GeoDirectory Rules\n\n
342 342
 EOD;
343
-    return $my_content . $rules;
343
+    return $my_content.$rules;
344 344
 }
345 345
 //add_filter('mod_rewrite_rules', 'geodir_htaccess_contents');
346 346
 
@@ -416,12 +416,12 @@  discard block
 block discarded – undo
416 416
         global $wpdb;
417 417
 
418 418
         $page_for_posts = get_option('page_for_posts');
419
-        $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));
419
+        $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s", $wp->query_vars['pagename']));
420 420
 
421 421
         if (function_exists('icl_object_id')) {
422 422
             $real_page_id = icl_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE);
423 423
         }
424
-        if ($real_page_id && $real_page_id!=$page_for_posts) {
424
+        if ($real_page_id && $real_page_id != $page_for_posts) {
425 425
             $wp->query_vars['page_id'] = $real_page_id;
426 426
         }
427 427
     }
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
                             $gd_city = $default_location->city_slug;
470 470
 
471 471
                         $base_location_link = geodir_get_location_link('base');
472
-                        wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);
472
+                        wp_redirect($base_location_link.'/'.$gd_country.'/'.$gd_region.'/'.$gd_city);
473 473
                         exit();
474 474
                     }
475 475
                 }
@@ -530,7 +530,7 @@  discard block
 block discarded – undo
530 530
         $geodir_set_location_session = true;
531 531
         $geodir_taxonomis = geodir_get_taxonomies('', true);
532 532
 
533
-        if(!empty($geodir_taxonomis)){
533
+        if (!empty($geodir_taxonomis)) {
534 534
             foreach ($geodir_taxonomis as $taxonomy) {
535 535
                 if (array_key_exists($taxonomy, $wp->query_vars)) {
536 536
                     $is_geodir_taxonomy = true;
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
 				}
588 588
 
589 589
 
590
-				$geodir_term = str_replace('/' . $geodir_last_term, '', $geodir_term, $post_title_replace_count);
590
+				$geodir_term = str_replace('/'.$geodir_last_term, '', $geodir_term, $post_title_replace_count);
591 591
 				if (!$post_title_replace_count)
592 592
 					$geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count);
593 593
 				$geodir_terms = explode('/', $geodir_term);
@@ -664,7 +664,7 @@  discard block
 block discarded – undo
664 664
 						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))
665 665
                             $is_geodir_location_found = true;
666 666
                     }
667
-                }  else if ($geodir_show_location_url == 'region_city') {
667
+                } else if ($geodir_show_location_url == 'region_city') {
668 668
                     if (count($geodir_terms) >= 2) {
669 669
                         $gd_region = urldecode($geodir_terms[0]);
670 670
                         $gd_city = urldecode($geodir_terms[1]);
@@ -723,13 +723,13 @@  discard block
 block discarded – undo
723 723
             $wp->query_vars[$geodir_taxonomy] = $geodir_term;
724 724
             // eliminate location related terms from taxonomy term
725 725
             if ($gd_country != '')
726
-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
726
+                $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_country).'/', '', $wp->query_vars[$geodir_taxonomy], 1);
727 727
 
728 728
             if ($gd_region != '')
729
-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
729
+                $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_region).'/', '', $wp->query_vars[$geodir_taxonomy], 1);
730 730
 
731 731
             if ($gd_city != '')
732
-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
732
+                $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_city).'/', '', $wp->query_vars[$geodir_taxonomy], 1);
733 733
 
734 734
 
735 735
             $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);
@@ -914,16 +914,16 @@  discard block
 block discarded – undo
914 914
  * @param string $option Option name.
915 915
  * @return mixed The taxonomy option value.
916 916
  */
917
-function geodir_wpseo_taxonomy_meta( $value, $option = '' ) {
917
+function geodir_wpseo_taxonomy_meta($value, $option = '') {
918 918
     global $wp_query;
919 919
     
920
-    if ( !empty( $value ) && ( is_category() || is_tax() ) ) {
920
+    if (!empty($value) && (is_category() || is_tax())) {
921 921
         $term = $wp_query->get_queried_object();
922 922
         
923
-        if ( !empty( $term->term_id ) && !empty( $term->taxonomy ) && isset( $value[$term->taxonomy][$term->term_id] ) && in_array( str_replace( 'category', '', $term->taxonomy ), geodir_get_posttypes() ) ) {
924
-            $image  = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) );
923
+        if (!empty($term->term_id) && !empty($term->taxonomy) && isset($value[$term->taxonomy][$term->term_id]) && in_array(str_replace('category', '', $term->taxonomy), geodir_get_posttypes())) {
924
+            $image = geodir_get_default_catimage($term->term_id, str_replace('category', '', $term->taxonomy));
925 925
             
926
-            if ( !empty( $image['src'] ) ) {
926
+            if (!empty($image['src'])) {
927 927
                 $value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src'];
928 928
                 $value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src'];
929 929
             }
@@ -931,4 +931,4 @@  discard block
 block discarded – undo
931 931
     }
932 932
     return $value;
933 933
 }
934
-add_filter( 'option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2 );
934
+add_filter('option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2);
Please login to merge, or discard this patch.
Indentation   +472 added lines, -472 removed lines patch added patch discarded remove patch
@@ -13,29 +13,29 @@  discard block
 block discarded – undo
13 13
  */
14 14
 function geodir_register_taxonomies()
15 15
 {
16
-    $taxonomies = array();
17
-    $taxonomies = get_option('geodir_taxonomies');
18
-    // If custom taxonomies are present, register them
19
-    if (is_array($taxonomies)) {
20
-        // Sort taxonomies
21
-        ksort($taxonomies);
22
-
23
-        // Register taxonomies
24
-        foreach ($taxonomies as $taxonomy => $args) {
25
-            // Allow taxonomy names to be translated
26
-            if (!empty($args['args']['labels'])) {
27
-                foreach ($args['args']['labels'] as $key => $tax_label) {
28
-                    $args['args']['labels'][$key] = __($tax_label, 'geodirectory');
29
-                }
30
-            }
31
-
32
-            $tax = register_taxonomy($taxonomy, $args['object_type'], $args['args']);
33
-
34
-            if (taxonomy_exists($taxonomy)) {
35
-                $tax = register_taxonomy_for_object_type($taxonomy, $args['object_type']);
36
-            }
37
-        }
38
-    }
16
+	$taxonomies = array();
17
+	$taxonomies = get_option('geodir_taxonomies');
18
+	// If custom taxonomies are present, register them
19
+	if (is_array($taxonomies)) {
20
+		// Sort taxonomies
21
+		ksort($taxonomies);
22
+
23
+		// Register taxonomies
24
+		foreach ($taxonomies as $taxonomy => $args) {
25
+			// Allow taxonomy names to be translated
26
+			if (!empty($args['args']['labels'])) {
27
+				foreach ($args['args']['labels'] as $key => $tax_label) {
28
+					$args['args']['labels'][$key] = __($tax_label, 'geodirectory');
29
+				}
30
+			}
31
+
32
+			$tax = register_taxonomy($taxonomy, $args['object_type'], $args['args']);
33
+
34
+			if (taxonomy_exists($taxonomy)) {
35
+				$tax = register_taxonomy_for_object_type($taxonomy, $args['object_type']);
36
+			}
37
+		}
38
+	}
39 39
 }
40 40
 
41 41
 
@@ -53,40 +53,40 @@  discard block
 block discarded – undo
53 53
  */
54 54
 function geodir_register_post_types() 
55 55
 {
56
-    global $wp_post_types;
56
+	global $wp_post_types;
57 57
 
58
-    $post_types = array();
59
-    $post_types = get_option('geodir_post_types');
58
+	$post_types = array();
59
+	$post_types = get_option('geodir_post_types');
60 60
 
61
-    // Register each post type if array of data is returned
62
-    if (is_array($post_types)):
61
+	// Register each post type if array of data is returned
62
+	if (is_array($post_types)):
63 63
 
64
-        foreach ($post_types as $post_type => $args):
64
+		foreach ($post_types as $post_type => $args):
65 65
 
66
-            if (!empty($args['rewrite']['slug'])) {
67
-                $args['rewrite']['slug'] = _x($args['rewrite']['slug'], 'URL slug', 'geodirectory');
68
-            }
69
-            $args = stripslashes_deep($args);
66
+			if (!empty($args['rewrite']['slug'])) {
67
+				$args['rewrite']['slug'] = _x($args['rewrite']['slug'], 'URL slug', 'geodirectory');
68
+			}
69
+			$args = stripslashes_deep($args);
70 70
 
71
-            if (!empty($args['labels'])) {
72
-                foreach ($args['labels'] as $key => $val) {
73
-                    $args['labels'][$key] = __($val, 'geodirectory');// allow translation
74
-                }
75
-            }
71
+			if (!empty($args['labels'])) {
72
+				foreach ($args['labels'] as $key => $val) {
73
+					$args['labels'][$key] = __($val, 'geodirectory');// allow translation
74
+				}
75
+			}
76 76
 
77
-            /**
78
-             * Filter post type args.
79
-             *
80
-             * @since 1.0.0
81
-             * @param string $args Post type args.
82
-             * @param string $post_type The post type.
83
-             */
84
-            $args = apply_filters('geodir_post_type_args', $args, $post_type);
77
+			/**
78
+			 * Filter post type args.
79
+			 *
80
+			 * @since 1.0.0
81
+			 * @param string $args Post type args.
82
+			 * @param string $post_type The post type.
83
+			 */
84
+			$args = apply_filters('geodir_post_type_args', $args, $post_type);
85 85
 
86
-            $post_type = register_post_type($post_type, $args);
86
+			$post_type = register_post_type($post_type, $args);
87 87
 
88
-        endforeach;
89
-    endif;
88
+		endforeach;
89
+	endif;
90 90
 }
91 91
 
92 92
 /**
@@ -100,72 +100,72 @@  discard block
 block discarded – undo
100 100
  */
101 101
 function geodir_post_type_args_modify($args, $post_type)
102 102
 {
103
-    $geodir_location_prefix = isset($_REQUEST['geodir_location_prefix']) ? trim($_REQUEST['geodir_location_prefix']) : get_option('geodir_location_prefix');
103
+	$geodir_location_prefix = isset($_REQUEST['geodir_location_prefix']) ? trim($_REQUEST['geodir_location_prefix']) : get_option('geodir_location_prefix');
104 104
 	if (isset($_REQUEST['geodir_listing_prefix']) && $_REQUEST['geodir_listing_prefix'] != '' && geodir_strtolower($_REQUEST['geodir_listing_prefix']) != geodir_strtolower($geodir_location_prefix)) {
105 105
 
106
-        $listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix']));
106
+		$listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix']));
107 107
 
108
-        if ($post_type == 'gd_place') {
109
-            if (array_key_exists('has_archive', $args))
110
-                $args['has_archive'] = $listing_slug;
108
+		if ($post_type == 'gd_place') {
109
+			if (array_key_exists('has_archive', $args))
110
+				$args['has_archive'] = $listing_slug;
111 111
 
112
-            if (array_key_exists('rewrite', $args)) {
113
-                if (array_key_exists('slug', $args['rewrite']))
114
-                    $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';
115
-            }
112
+			if (array_key_exists('rewrite', $args)) {
113
+				if (array_key_exists('slug', $args['rewrite']))
114
+					$args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';
115
+			}
116 116
 
117
-            $geodir_post_types = get_option('geodir_post_types');
117
+			$geodir_post_types = get_option('geodir_post_types');
118 118
 
119
-            if (array_key_exists($post_type, $geodir_post_types)) {
119
+			if (array_key_exists($post_type, $geodir_post_types)) {
120 120
 
121
-                if (array_key_exists('has_archive', $geodir_post_types[$post_type]))
122
-                    $geodir_post_types[$post_type]['has_archive'] = $listing_slug;
121
+				if (array_key_exists('has_archive', $geodir_post_types[$post_type]))
122
+					$geodir_post_types[$post_type]['has_archive'] = $listing_slug;
123 123
 
124
-                if (array_key_exists('rewrite', $geodir_post_types[$post_type]))
125
-                    if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))
126
-                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';
124
+				if (array_key_exists('rewrite', $geodir_post_types[$post_type]))
125
+					if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))
126
+						$geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';
127 127
 
128
-                update_option('geodir_post_types', $geodir_post_types);
128
+				update_option('geodir_post_types', $geodir_post_types);
129 129
 
130
-            }
130
+			}
131 131
 
132
-            $geodir_post_types = get_option('geodir_post_types');
132
+			$geodir_post_types = get_option('geodir_post_types');
133 133
 
134
-            /* --- update taxonomies (category) --- */
134
+			/* --- update taxonomies (category) --- */
135 135
 
136
-            $geodir_taxonomies = get_option('geodir_taxonomies');
136
+			$geodir_taxonomies = get_option('geodir_taxonomies');
137 137
 
138
-            if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {
139
-                $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;
138
+			if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {
139
+				$geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;
140 140
 
141
-                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))
142
-                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))
143
-                        if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))
144
-                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;
141
+				if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))
142
+					if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))
143
+						if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))
144
+							$geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;
145 145
 
146
-                update_option('geodir_taxonomies', $geodir_taxonomies);
146
+				update_option('geodir_taxonomies', $geodir_taxonomies);
147 147
 
148
-            }
148
+			}
149 149
 
150
-            /* --- update taxonomies (tags) --- */
151
-            $geodir_taxonomies_tag = get_option('geodir_taxonomies');
152
-            if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {
153
-                $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';
150
+			/* --- update taxonomies (tags) --- */
151
+			$geodir_taxonomies_tag = get_option('geodir_taxonomies');
152
+			if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {
153
+				$geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';
154 154
 
155
-                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))
156
-                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))
157
-                        if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))
158
-                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';
155
+				if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))
156
+					if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))
157
+						if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))
158
+							$geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';
159 159
 
160
-                update_option('geodir_taxonomies', $geodir_taxonomies_tag);
160
+				update_option('geodir_taxonomies', $geodir_taxonomies_tag);
161 161
 
162
-            }
162
+			}
163 163
 
164
-        }
164
+		}
165 165
 
166
-    }
166
+	}
167 167
 
168
-    return $args;
168
+	return $args;
169 169
 }
170 170
 
171 171
 /**
@@ -178,8 +178,8 @@  discard block
 block discarded – undo
178 178
  */
179 179
 function geodir_flush_rewrite_rules()
180 180
 {
181
-    global $wp_rewrite;
182
-    $wp_rewrite->flush_rules(false);
181
+	global $wp_rewrite;
182
+	$wp_rewrite->flush_rules(false);
183 183
 }
184 184
 
185 185
 /**
@@ -194,35 +194,35 @@  discard block
 block discarded – undo
194 194
  * @return array Rewrite rules.
195 195
  */
196 196
 function geodir_listing_rewrite_rules($rules) {
197
-    $newrules = array();
198
-    $taxonomies = get_option('geodir_taxonomies');
199
-    $detail_url_seprator = get_option('geodir_detailurl_separator');
197
+	$newrules = array();
198
+	$taxonomies = get_option('geodir_taxonomies');
199
+	$detail_url_seprator = get_option('geodir_detailurl_separator');
200 200
     
201 201
 	// create rules for post listing
202
-    if (is_array($taxonomies)):
203
-        foreach ($taxonomies as $taxonomy => $args):
204
-            $post_type = $args['object_type'];
205
-            $listing_slug = $args['listing_slug'];
206
-
207
-            if (strpos($taxonomy, 'tags')) {
208
-                $newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';
209
-                $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]';
210
-            } else {
211
-                // use this loop to add paging for details page comments paging
212
-                $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';
213
-            }
214
-        endforeach;
215
-    endif;
216
-
217
-    // create rules for location listing
218
-    $location_page = get_option('geodir_location_page');
202
+	if (is_array($taxonomies)):
203
+		foreach ($taxonomies as $taxonomy => $args):
204
+			$post_type = $args['object_type'];
205
+			$listing_slug = $args['listing_slug'];
206
+
207
+			if (strpos($taxonomy, 'tags')) {
208
+				$newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';
209
+				$newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]';
210
+			} else {
211
+				// use this loop to add paging for details page comments paging
212
+				$newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';
213
+			}
214
+		endforeach;
215
+	endif;
216
+
217
+	// create rules for location listing
218
+	$location_page = get_option('geodir_location_page');
219 219
 	
220
-    if($location_page) {
221
-        global $wpdb;
222
-        $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));
223
-    }
224
-    if (!isset($location_prefix))
225
-        $location_prefix = 'location';
220
+	if($location_page) {
221
+		global $wpdb;
222
+		$location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));
223
+	}
224
+	if (!isset($location_prefix))
225
+		$location_prefix = 'location';
226 226
 
227 227
 	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
228 228
 	if ($location_manager) {
@@ -266,12 +266,12 @@  discard block
 block discarded – undo
266 266
 		$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]';
267 267
 	}
268 268
 
269
-    if ($location_page && function_exists('icl_object_id')) {
270
-        foreach(icl_get_languages('skip_missing=N') as $lang){
271
-            $alt_page_id = '';
272
-            $alt_page_id = icl_object_id($location_page, 'page', false,$lang['language_code']);
273
-            if($alt_page_id){
274
-                $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));
269
+	if ($location_page && function_exists('icl_object_id')) {
270
+		foreach(icl_get_languages('skip_missing=N') as $lang){
271
+			$alt_page_id = '';
272
+			$alt_page_id = icl_object_id($location_page, 'page', false,$lang['language_code']);
273
+			if($alt_page_id){
274
+				$location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));
275 275
 
276 276
 				if ($location_manager && ($hide_country_part || $hide_region_part)) {
277 277
 					$matches2 = '';
@@ -307,14 +307,14 @@  discard block
 block discarded – undo
307 307
 					$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]';
308 308
 					$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]';
309 309
 				}
310
-            }
311
-        }
312
-    }
310
+			}
311
+		}
312
+	}
313 313
 
314
-    $newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page;
314
+	$newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page;
315 315
 
316
-    $rules = array_merge($newrules, $rules);
317
-    return $rules;
316
+	$rules = array_merge($newrules, $rules);
317
+	return $rules;
318 318
 }
319 319
 
320 320
 /**
@@ -329,18 +329,18 @@  discard block
 block discarded – undo
329 329
  */
330 330
 function geodir_htaccess_contents($rules)
331 331
 {
332
-    global $wpdb;
333
-    $location_prefix = get_option('geodir_location_prefix');
334
-    // if location page slug changed then add redirect
335
-    if ($location_prefix == 'location') {
336
-        return $rules;
337
-    }
338
-    $my_content = <<<EOD
332
+	global $wpdb;
333
+	$location_prefix = get_option('geodir_location_prefix');
334
+	// if location page slug changed then add redirect
335
+	if ($location_prefix == 'location') {
336
+		return $rules;
337
+	}
338
+	$my_content = <<<EOD
339 339
 \n# BEGIN GeoDirectory Rules
340 340
 #Redirect 301 /location/ /$location_prefix/
341 341
 # END GeoDirectory Rules\n\n
342 342
 EOD;
343
-    return $my_content . $rules;
343
+	return $my_content . $rules;
344 344
 }
345 345
 //add_filter('mod_rewrite_rules', 'geodir_htaccess_contents');
346 346
 
@@ -354,10 +354,10 @@  discard block
 block discarded – undo
354 354
  */
355 355
 function geodir_add_location_var($public_query_vars)
356 356
 {
357
-    $public_query_vars[] = 'gd_country';
358
-    $public_query_vars[] = 'gd_region';
359
-    $public_query_vars[] = 'gd_city';
360
-    return $public_query_vars;
357
+	$public_query_vars[] = 'gd_country';
358
+	$public_query_vars[] = 'gd_region';
359
+	$public_query_vars[] = 'gd_city';
360
+	return $public_query_vars;
361 361
 }
362 362
 
363 363
 /**
@@ -370,8 +370,8 @@  discard block
 block discarded – undo
370 370
  */
371 371
 function geodir_add_geodir_page_var($public_query_vars)
372 372
 {
373
-    $public_query_vars[] = 'gd_is_geodir_page';
374
-    return $public_query_vars;
373
+	$public_query_vars[] = 'gd_is_geodir_page';
374
+	return $public_query_vars;
375 375
 }
376 376
 
377 377
 /**
@@ -383,20 +383,20 @@  discard block
 block discarded – undo
383 383
  */
384 384
 function geodir_add_page_id_in_query_var()
385 385
 {
386
-    global $wp_query;
386
+	global $wp_query;
387 387
 
388
-    $page_id = $wp_query->get_queried_object_id();
388
+	$page_id = $wp_query->get_queried_object_id();
389 389
 
390
-    if (!get_query_var('page_id') && !is_archive()) {
391
-        // fix for WP tags conflict with enfold theme
392
-        $theme_name = geodir_strtolower(wp_get_theme());
393
-        if (!geodir_is_geodir_page() && strpos($theme_name, 'enfold') !== false) {
394
-            return $wp_query;
395
-        }
396
-        $wp_query->set('page_id', $page_id);
397
-    }
390
+	if (!get_query_var('page_id') && !is_archive()) {
391
+		// fix for WP tags conflict with enfold theme
392
+		$theme_name = geodir_strtolower(wp_get_theme());
393
+		if (!geodir_is_geodir_page() && strpos($theme_name, 'enfold') !== false) {
394
+			return $wp_query;
395
+		}
396
+		$wp_query->set('page_id', $page_id);
397
+	}
398 398
 
399
-    return $wp_query;
399
+	return $wp_query;
400 400
 }
401 401
 
402 402
 /**
@@ -411,23 +411,23 @@  discard block
 block discarded – undo
411 411
 function geodir_set_location_var_in_session_in_core($wp) {
412 412
 	global $gd_session;
413 413
 
414
-    // Fix for WPML removing page_id query var:
415
-    if (isset($wp->query_vars['page']) && !isset($wp->query_vars['page_id']) && isset($wp->query_vars['pagename']) && !is_home()) {
416
-        global $wpdb;
414
+	// Fix for WPML removing page_id query var:
415
+	if (isset($wp->query_vars['page']) && !isset($wp->query_vars['page_id']) && isset($wp->query_vars['pagename']) && !is_home()) {
416
+		global $wpdb;
417 417
 
418
-        $page_for_posts = get_option('page_for_posts');
419
-        $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));
418
+		$page_for_posts = get_option('page_for_posts');
419
+		$real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));
420 420
 
421
-        if (function_exists('icl_object_id')) {
422
-            $real_page_id = icl_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE);
423
-        }
424
-        if ($real_page_id && $real_page_id!=$page_for_posts) {
425
-            $wp->query_vars['page_id'] = $real_page_id;
426
-        }
427
-    }
421
+		if (function_exists('icl_object_id')) {
422
+			$real_page_id = icl_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE);
423
+		}
424
+		if ($real_page_id && $real_page_id!=$page_for_posts) {
425
+			$wp->query_vars['page_id'] = $real_page_id;
426
+		}
427
+	}
428 428
 	// Query Vars will have page_id parameter
429 429
 	// check if query var has page_id and that page id is location page
430
-    geodir_set_is_geodir_page($wp);
430
+	geodir_set_is_geodir_page($wp);
431 431
 	// if is GD homepage set the page ID
432 432
 	if (geodir_is_page('home')) {
433 433
 		$wp->query_vars['page_id'] = get_option('page_on_front');
@@ -436,118 +436,118 @@  discard block
 block discarded – undo
436 436
 	// The location url format (all or country_city or region_city or city).
437 437
 	$geodir_show_location_url = get_option('geodir_show_location_url');
438 438
 
439
-    if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id()) {
440
-        $gd_country = '';
441
-        $gd_region = '';
442
-        $gd_city = '';
443
-        if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '')
444
-            $gd_country = urldecode($wp->query_vars['gd_country']);
445
-
446
-        if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '')
447
-            $gd_region = urldecode($wp->query_vars['gd_region']);
448
-
449
-        if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '')
450
-            $gd_city = urldecode($wp->query_vars['gd_city']);
451
-
452
-        if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) {
453
-            $default_location = geodir_get_default_location();
454
-
455
-            if (get_option('geodir_add_location_url')) {
456
-                if ($geodir_show_location_url != 'all') {
457
-                    if ($gd_region == '') {
458
-                        if ($gd_ses_region = $gd_session->get('gd_region'))
459
-                            $gd_region = $gd_ses_region;
460
-                        else
461
-                            $gd_region = $default_location->region_slug;
462
-                    }
463
-
464
-                    if ($gd_city == '') {
465
-                        if ($gd_ses_city = $gd_session->get('gd_city'))
466
-                            $gd_city = $gd_ses_city;
467
-                        else
468
-                            $gd_city = $default_location->city_slug;
469
-
470
-                        $base_location_link = geodir_get_location_link('base');
471
-                        wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);
472
-                        exit();
473
-                    }
474
-                }
475
-            }
476
-
477
-            $args = array(
478
-                'what' => 'city',
479
-                'city_val' => $gd_city,
480
-                'region_val' => $gd_region,
481
-                'country_val' => $gd_country,
482
-                'country_column_name' => 'country_slug',
483
-                'region_column_name' => 'region_slug',
484
-                'city_column_name' => 'city_slug',
485
-                'location_link_part' => false,
486
-                'compare_operator' => ''
487
-            );
488
-
489
-            $location_array = function_exists('geodir_get_location_array') ? geodir_get_location_array($args) : array();
490
-            if (!empty($location_array)) {
491
-                $gd_session->set('gd_multi_location', 1);
492
-                $gd_session->set('gd_country', $gd_country);
493
-                $gd_session->set('gd_region', $gd_region);
494
-                $gd_session->set('gd_city', $gd_city);
439
+	if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id()) {
440
+		$gd_country = '';
441
+		$gd_region = '';
442
+		$gd_city = '';
443
+		if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '')
444
+			$gd_country = urldecode($wp->query_vars['gd_country']);
445
+
446
+		if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '')
447
+			$gd_region = urldecode($wp->query_vars['gd_region']);
448
+
449
+		if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '')
450
+			$gd_city = urldecode($wp->query_vars['gd_city']);
451
+
452
+		if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) {
453
+			$default_location = geodir_get_default_location();
454
+
455
+			if (get_option('geodir_add_location_url')) {
456
+				if ($geodir_show_location_url != 'all') {
457
+					if ($gd_region == '') {
458
+						if ($gd_ses_region = $gd_session->get('gd_region'))
459
+							$gd_region = $gd_ses_region;
460
+						else
461
+							$gd_region = $default_location->region_slug;
462
+					}
463
+
464
+					if ($gd_city == '') {
465
+						if ($gd_ses_city = $gd_session->get('gd_city'))
466
+							$gd_city = $gd_ses_city;
467
+						else
468
+							$gd_city = $default_location->city_slug;
469
+
470
+						$base_location_link = geodir_get_location_link('base');
471
+						wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);
472
+						exit();
473
+					}
474
+				}
475
+			}
476
+
477
+			$args = array(
478
+				'what' => 'city',
479
+				'city_val' => $gd_city,
480
+				'region_val' => $gd_region,
481
+				'country_val' => $gd_country,
482
+				'country_column_name' => 'country_slug',
483
+				'region_column_name' => 'region_slug',
484
+				'city_column_name' => 'city_slug',
485
+				'location_link_part' => false,
486
+				'compare_operator' => ''
487
+			);
488
+
489
+			$location_array = function_exists('geodir_get_location_array') ? geodir_get_location_array($args) : array();
490
+			if (!empty($location_array)) {
491
+				$gd_session->set('gd_multi_location', 1);
492
+				$gd_session->set('gd_country', $gd_country);
493
+				$gd_session->set('gd_region', $gd_region);
494
+				$gd_session->set('gd_city', $gd_city);
495 495
                 
496 496
 				$wp->query_vars['gd_country'] = $gd_country;
497
-                $wp->query_vars['gd_region'] = $gd_region;
498
-                $wp->query_vars['gd_city'] = $gd_city;
499
-            } else {
500
-                $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));
501
-            }
502
-        } else {
503
-            $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));
504
-        }
505
-
506
-    } else if (isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {
507
-        if (!is_admin()) {
508
-            $requested_post_type = $wp->query_vars['post_type'];
509
-            // check if this post type is geodirectory post types
510
-            $post_type_array = geodir_get_posttypes();
497
+				$wp->query_vars['gd_region'] = $gd_region;
498
+				$wp->query_vars['gd_city'] = $gd_city;
499
+			} else {
500
+				$gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));
501
+			}
502
+		} else {
503
+			$gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));
504
+		}
505
+
506
+	} else if (isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {
507
+		if (!is_admin()) {
508
+			$requested_post_type = $wp->query_vars['post_type'];
509
+			// check if this post type is geodirectory post types
510
+			$post_type_array = geodir_get_posttypes();
511 511
             
512 512
 			if (in_array($requested_post_type, $post_type_array)) {
513
-                // now u can apply geodirectory related manipulation.
514
-            }
515
-        }
516
-    } else {
517
-        // check if a geodirectory taxonomy is set
518
-        $gd_country = '';
519
-        $gd_region = '';
520
-        $gd_city = '';
513
+				// now u can apply geodirectory related manipulation.
514
+			}
515
+		}
516
+	} else {
517
+		// check if a geodirectory taxonomy is set
518
+		$gd_country = '';
519
+		$gd_region = '';
520
+		$gd_city = '';
521 521
         
522 522
 		$is_geodir_taxonomy = false;
523
-        $is_geodir_taxonomy_term = false; // the last term is real geodirectory taxonomy term or not
524
-        $is_geodir_location_found = false;
523
+		$is_geodir_taxonomy_term = false; // the last term is real geodirectory taxonomy term or not
524
+		$is_geodir_location_found = false;
525 525
 		
526 526
 		$geodir_taxonomy = '';
527
-        $geodir_post_type = '';
528
-        $geodir_term = '';
529
-        $geodir_set_location_session = true;
530
-        $geodir_taxonomis = geodir_get_taxonomies('', true);
531
-
532
-        if(!empty($geodir_taxonomis)){
533
-            foreach ($geodir_taxonomis as $taxonomy) {
534
-                if (array_key_exists($taxonomy, $wp->query_vars)) {
535
-                    $is_geodir_taxonomy = true;
536
-                    $geodir_taxonomy = $taxonomy;
537
-                    $geodir_post_type = str_replace('category', '', $taxonomy);
538
-                    $geodir_post_type = str_replace('_tags', '', $geodir_post_type);
539
-                    $geodir_term = $wp->query_vars[$geodir_taxonomy];
540
-                    break;
541
-                }
542
-            }
543
-        }
544
-
545
-        // now get an array of all terms seperated by '/'
546
-        $geodir_terms = explode('/', $geodir_term);
547
-        $geodir_last_term = end($geodir_terms);
548
-
549
-        if ($is_geodir_taxonomy) { // do all these only when it is a geodirectory taxonomy
550
-            $wp->query_vars['post_type'] = $geodir_post_type;
527
+		$geodir_post_type = '';
528
+		$geodir_term = '';
529
+		$geodir_set_location_session = true;
530
+		$geodir_taxonomis = geodir_get_taxonomies('', true);
531
+
532
+		if(!empty($geodir_taxonomis)){
533
+			foreach ($geodir_taxonomis as $taxonomy) {
534
+				if (array_key_exists($taxonomy, $wp->query_vars)) {
535
+					$is_geodir_taxonomy = true;
536
+					$geodir_taxonomy = $taxonomy;
537
+					$geodir_post_type = str_replace('category', '', $taxonomy);
538
+					$geodir_post_type = str_replace('_tags', '', $geodir_post_type);
539
+					$geodir_term = $wp->query_vars[$geodir_taxonomy];
540
+					break;
541
+				}
542
+			}
543
+		}
544
+
545
+		// now get an array of all terms seperated by '/'
546
+		$geodir_terms = explode('/', $geodir_term);
547
+		$geodir_last_term = end($geodir_terms);
548
+
549
+		if ($is_geodir_taxonomy) { // do all these only when it is a geodirectory taxonomy
550
+			$wp->query_vars['post_type'] = $geodir_post_type;
551 551
 
552 552
 			// now check if last term is a post of geodirectory post types
553 553
 			$geodir_post = get_posts(array(
@@ -596,196 +596,196 @@  discard block
 block discarded – undo
596 596
 				//return ;
597 597
 			}
598 598
 
599
-            $geodir_location_terms = '';
600
-            // if last term is not a post then check if last term is a term of the specific texonomy or not
601
-            if (geodir_term_exists($geodir_last_term, $geodir_taxonomy)) {
602
-                $is_geodir_taxonomy_term = true;
599
+			$geodir_location_terms = '';
600
+			// if last term is not a post then check if last term is a term of the specific texonomy or not
601
+			if (geodir_term_exists($geodir_last_term, $geodir_taxonomy)) {
602
+				$is_geodir_taxonomy_term = true;
603 603
 
604
-                $geodir_set_location_session = false;
605
-            }
604
+				$geodir_set_location_session = false;
605
+			}
606 606
 
607 607
 
608
-            // now check if there is location parts in the url or not
609
-            if (get_option('geodir_add_location_url')) {				
608
+			// now check if there is location parts in the url or not
609
+			if (get_option('geodir_add_location_url')) {				
610 610
 				$default_location = geodir_get_default_location();
611 611
                 
612 612
 				if ($geodir_show_location_url == 'all') {
613
-                    if (count($geodir_terms) >= 3) {
614
-                        $gd_country = urldecode($geodir_terms[0]);
615
-                        $gd_region = urldecode($geodir_terms[1]);
616
-                        $gd_city = urldecode($geodir_terms[2]);
617
-                    } else if (count($geodir_terms) >= 2) {
618
-                        $gd_country = urldecode($geodir_terms[0]);
619
-                        $gd_region = urldecode($geodir_terms[1]);
620
-                    } else if (count($geodir_terms) >= 1) {
621
-                        $gd_country = urldecode($geodir_terms[0]);
622
-                    }
623
-
624
-                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&
625
-                        geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) &&
626
-                        geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)
627
-                    )
628
-                        $is_geodir_location_found = true;
629
-
630
-                    // if location has not been found for country , region and city then search for country and region only
631
-
632
-                    if (!$is_geodir_location_found) {
633
-                        $gd_city = '';
634
-                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&
635
-                            geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)
636
-                        )
637
-                            $is_geodir_location_found = true;
638
-
639
-                    }
640
-
641
-                    // if location has not been found for country , region  then search for country only
642
-                    if (!$is_geodir_location_found) {
643
-                        $gd_city = '';
644
-                        $gd_region = '';
645
-                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))
646
-                            $is_geodir_location_found = true;
647
-                    }
648
-                } else if ($geodir_show_location_url == 'country_city') {
649
-                    if (count($geodir_terms) >= 2) {
650
-                        $gd_country = urldecode($geodir_terms[0]);
651
-                        $gd_city = urldecode($geodir_terms[1]);
652
-                    } else if (count($geodir_terms) >= 1) {
653
-                        $gd_country = urldecode($geodir_terms[0]);
654
-                    }
655
-
656
-                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))
657
-                        $is_geodir_location_found = true;
658
-
659
-                    // if location has not been found for country and city  then search for country only
660
-                    if (!$is_geodir_location_found) {
661
-                        $gd_city = '';
613
+					if (count($geodir_terms) >= 3) {
614
+						$gd_country = urldecode($geodir_terms[0]);
615
+						$gd_region = urldecode($geodir_terms[1]);
616
+						$gd_city = urldecode($geodir_terms[2]);
617
+					} else if (count($geodir_terms) >= 2) {
618
+						$gd_country = urldecode($geodir_terms[0]);
619
+						$gd_region = urldecode($geodir_terms[1]);
620
+					} else if (count($geodir_terms) >= 1) {
621
+						$gd_country = urldecode($geodir_terms[0]);
622
+					}
623
+
624
+					if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&
625
+						geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) &&
626
+						geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)
627
+					)
628
+						$is_geodir_location_found = true;
629
+
630
+					// if location has not been found for country , region and city then search for country and region only
631
+
632
+					if (!$is_geodir_location_found) {
633
+						$gd_city = '';
634
+						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&
635
+							geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)
636
+						)
637
+							$is_geodir_location_found = true;
638
+
639
+					}
640
+
641
+					// if location has not been found for country , region  then search for country only
642
+					if (!$is_geodir_location_found) {
643
+						$gd_city = '';
644
+						$gd_region = '';
645
+						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))
646
+							$is_geodir_location_found = true;
647
+					}
648
+				} else if ($geodir_show_location_url == 'country_city') {
649
+					if (count($geodir_terms) >= 2) {
650
+						$gd_country = urldecode($geodir_terms[0]);
651
+						$gd_city = urldecode($geodir_terms[1]);
652
+					} else if (count($geodir_terms) >= 1) {
653
+						$gd_country = urldecode($geodir_terms[0]);
654
+					}
655
+
656
+					if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))
657
+						$is_geodir_location_found = true;
658
+
659
+					// if location has not been found for country and city  then search for country only
660
+					if (!$is_geodir_location_found) {
661
+						$gd_city = '';
662 662
                         
663 663
 						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))
664
-                            $is_geodir_location_found = true;
665
-                    }
666
-                }  else if ($geodir_show_location_url == 'region_city') {
667
-                    if (count($geodir_terms) >= 2) {
668
-                        $gd_region = urldecode($geodir_terms[0]);
669
-                        $gd_city = urldecode($geodir_terms[1]);
670
-                    } else if (count($geodir_terms) >= 1) {
671
-                        $gd_region = urldecode($geodir_terms[0]);
672
-                    }
673
-
674
-                    if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))
675
-                        $is_geodir_location_found = true;
676
-
677
-                    // if location has not been found for region and city  then search for region only
678
-                    if (!$is_geodir_location_found) {
679
-                        $gd_city = '';
664
+							$is_geodir_location_found = true;
665
+					}
666
+				}  else if ($geodir_show_location_url == 'region_city') {
667
+					if (count($geodir_terms) >= 2) {
668
+						$gd_region = urldecode($geodir_terms[0]);
669
+						$gd_city = urldecode($geodir_terms[1]);
670
+					} else if (count($geodir_terms) >= 1) {
671
+						$gd_region = urldecode($geodir_terms[0]);
672
+					}
673
+
674
+					if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))
675
+						$is_geodir_location_found = true;
676
+
677
+					// if location has not been found for region and city  then search for region only
678
+					if (!$is_geodir_location_found) {
679
+						$gd_city = '';
680 680
                         
681 681
 						if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region))
682
-                            $is_geodir_location_found = true;
683
-                    }
684
-                } else {
685
-                    $gd_city = $geodir_terms[0];
686
-
687
-                    if (geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {
688
-                        $is_geodir_location_found = true;
689
-                        $gd_region = $default_location->region_slug;
690
-                        $gd_country = $default_location->country_slug;
691
-                    }
692
-                }
693
-                // if location still not found then clear location related session variables
694
-                if ($is_geodir_location_found && $geodir_set_location_session) {
695
-                    $gd_session->set('gd_multi_location', 1);
696
-                    $gd_session->set('gd_country', $gd_country);
697
-                    $gd_session->set('gd_region', $gd_region);
698
-                    $gd_session->set('gd_city', $gd_city);
699
-                }
700
-
701
-                if ($geodir_show_location_url == 'all') {
682
+							$is_geodir_location_found = true;
683
+					}
684
+				} else {
685
+					$gd_city = $geodir_terms[0];
686
+
687
+					if (geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {
688
+						$is_geodir_location_found = true;
689
+						$gd_region = $default_location->region_slug;
690
+						$gd_country = $default_location->country_slug;
691
+					}
692
+				}
693
+				// if location still not found then clear location related session variables
694
+				if ($is_geodir_location_found && $geodir_set_location_session) {
695
+					$gd_session->set('gd_multi_location', 1);
696
+					$gd_session->set('gd_country', $gd_country);
697
+					$gd_session->set('gd_region', $gd_region);
698
+					$gd_session->set('gd_city', $gd_city);
699
+				}
700
+
701
+				if ($geodir_show_location_url == 'all') {
702 702
 				} else if ($geodir_show_location_url == 'country_city') {
703 703
 					$gd_region = '';
704 704
 				} else if ($geodir_show_location_url == 'region_city') {
705 705
 					$gd_country = '';
706 706
 				} else {
707 707
 					$gd_country = '';
708
-                    $gd_region = '';
708
+					$gd_region = '';
709
+				}
710
+
711
+				if ($is_geodir_location_found) {
712
+					$wp->query_vars['gd_country'] = $gd_country;
713
+					$wp->query_vars['gd_region'] = $gd_region;
714
+					$wp->query_vars['gd_city'] = $gd_city;
715
+				} else {
716
+					$gd_country = '';
717
+					$gd_region = '';
718
+					$gd_city = '';
709 719
 				}
720
+			}
721
+
722
+			$wp->query_vars[$geodir_taxonomy] = $geodir_term;
723
+			// eliminate location related terms from taxonomy term
724
+			if ($gd_country != '')
725
+				$wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
726
+
727
+			if ($gd_region != '')
728
+				$wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
710 729
 
711
-                if ($is_geodir_location_found) {
712
-                    $wp->query_vars['gd_country'] = $gd_country;
713
-                    $wp->query_vars['gd_region'] = $gd_region;
714
-                    $wp->query_vars['gd_city'] = $gd_city;
715
-                } else {
716
-                    $gd_country = '';
717
-                    $gd_region = '';
718
-                    $gd_city = '';
719
-                }
720
-            }
721
-
722
-            $wp->query_vars[$geodir_taxonomy] = $geodir_term;
723
-            // eliminate location related terms from taxonomy term
724
-            if ($gd_country != '')
725
-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
726
-
727
-            if ($gd_region != '')
728
-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
729
-
730
-            if ($gd_city != '')
731
-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
732
-
733
-
734
-            $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);
735
-            $wp->query_vars[$geodir_taxonomy] = str_replace('//', '', $wp->query_vars[$geodir_taxonomy]);
736
-
737
-            $wp->query_vars[$geodir_taxonomy] = trim($wp->query_vars[$geodir_taxonomy], '/');
738
-
739
-            if ($wp->query_vars[$geodir_taxonomy] == '') {
740
-                unset($wp->query_vars[$geodir_taxonomy]);
741
-            } else {
742
-                if (!$is_geodir_taxonomy_term) {
743
-                    foreach ($wp->query_vars as $key => $vars) {
744
-                        unset($wp->query_vars[$key]);
745
-                    }
746
-                    $wp->query_vars['error'] = '404';
747
-                }
748
-            }
749
-        }
750
-    }
730
+			if ($gd_city != '')
731
+				$wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
732
+
733
+
734
+			$wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);
735
+			$wp->query_vars[$geodir_taxonomy] = str_replace('//', '', $wp->query_vars[$geodir_taxonomy]);
736
+
737
+			$wp->query_vars[$geodir_taxonomy] = trim($wp->query_vars[$geodir_taxonomy], '/');
738
+
739
+			if ($wp->query_vars[$geodir_taxonomy] == '') {
740
+				unset($wp->query_vars[$geodir_taxonomy]);
741
+			} else {
742
+				if (!$is_geodir_taxonomy_term) {
743
+					foreach ($wp->query_vars as $key => $vars) {
744
+						unset($wp->query_vars[$key]);
745
+					}
746
+					$wp->query_vars['error'] = '404';
747
+				}
748
+			}
749
+		}
750
+	}
751 751
 	
752 752
 	// Unset location session if gd page and location not set.
753 753
 	if (isset($wp->query_vars['gd_is_geodir_page']) && !isset($wp->query_vars['gd_country'])) {
754 754
 		$gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));
755 755
 	}
756 756
 
757
-    if ($gd_session->get('gd_multi_location') == 1) {
758
-        $wp->query_vars['gd_country'] = $gd_session->get('gd_country');
759
-        $wp->query_vars['gd_region'] = $gd_session->get('gd_region');
760
-        $wp->query_vars['gd_city'] = $gd_session->get('gd_city');
761
-    }
757
+	if ($gd_session->get('gd_multi_location') == 1) {
758
+		$wp->query_vars['gd_country'] = $gd_session->get('gd_country');
759
+		$wp->query_vars['gd_region'] = $gd_session->get('gd_region');
760
+		$wp->query_vars['gd_city'] = $gd_session->get('gd_city');
761
+	}
762 762
 
763
-    // now check if there is location parts in the url or not
764
-    if (get_option('geodir_add_location_url')) {        
763
+	// now check if there is location parts in the url or not
764
+	if (get_option('geodir_add_location_url')) {        
765 765
 		if ($geodir_show_location_url == 'all') {
766 766
 		} else if ($geodir_show_location_url == 'country_city') {
767 767
 			 if (isset($wp->query_vars['gd_region']))
768
-                $wp->query_vars['gd_region'] = '';
768
+				$wp->query_vars['gd_region'] = '';
769 769
 		} else if ($geodir_show_location_url == 'region_city') {
770 770
 			if (isset($wp->query_vars['gd_country']))
771
-                $wp->query_vars['gd_country'] = '';
771
+				$wp->query_vars['gd_country'] = '';
772 772
 		} else {
773 773
 			if (isset($wp->query_vars['gd_country']))
774
-                $wp->query_vars['gd_country'] = '';
774
+				$wp->query_vars['gd_country'] = '';
775 775
 
776
-            if (isset($wp->query_vars['gd_region']))
777
-                $wp->query_vars['gd_region'] = '';
776
+			if (isset($wp->query_vars['gd_region']))
777
+				$wp->query_vars['gd_region'] = '';
778 778
 		}
779
-    } else {
780
-        if (isset($wp->query_vars['gd_country']))
781
-            $wp->query_vars['gd_country'] = '';
779
+	} else {
780
+		if (isset($wp->query_vars['gd_country']))
781
+			$wp->query_vars['gd_country'] = '';
782 782
 
783
-        if (isset($wp->query_vars['gd_region']))
784
-            $wp->query_vars['gd_region'] = '';
783
+		if (isset($wp->query_vars['gd_region']))
784
+			$wp->query_vars['gd_region'] = '';
785 785
 
786
-        if (isset($wp->query_vars['gd_city']))
787
-            $wp->query_vars['gd_city'] = '';
788
-    }
786
+		if (isset($wp->query_vars['gd_city']))
787
+			$wp->query_vars['gd_city'] = '';
788
+	}
789 789
 }
790 790
 
791 791
 /**
@@ -799,24 +799,24 @@  discard block
 block discarded – undo
799 799
  */
800 800
 function geodir_custom_post_status()
801 801
 {
802
-    // Virtual Page Status
803
-    register_post_status('virtual', array(
804
-        'label' => _x('Virtual', 'page', 'geodirectory'),
805
-        'public' => true,
806
-        'exclude_from_search' => true,
807
-        'show_in_admin_all_list' => true,
808
-        'show_in_admin_status_list' => true,
809
-        'label_count' => _n_noop('Virtual <span class="count">(%s)</span>', 'Virtual <span class="count">(%s)</span>', 'geodirectory'),
810
-    ));
811
-
812
-    /**
813
-     * Called after we register the custom post status 'Virtual'.
814
-     *
815
-     * Can be use to add more post statuses.
816
-     *
817
-     * @since 1.0.0
818
-     */
819
-    do_action('geodir_custom_post_status');
802
+	// Virtual Page Status
803
+	register_post_status('virtual', array(
804
+		'label' => _x('Virtual', 'page', 'geodirectory'),
805
+		'public' => true,
806
+		'exclude_from_search' => true,
807
+		'show_in_admin_all_list' => true,
808
+		'show_in_admin_status_list' => true,
809
+		'label_count' => _n_noop('Virtual <span class="count">(%s)</span>', 'Virtual <span class="count">(%s)</span>', 'geodirectory'),
810
+	));
811
+
812
+	/**
813
+	 * Called after we register the custom post status 'Virtual'.
814
+	 *
815
+	 * Can be use to add more post statuses.
816
+	 *
817
+	 * @since 1.0.0
818
+	 */
819
+	do_action('geodir_custom_post_status');
820 820
 }
821 821
 
822 822
 /**
@@ -831,7 +831,7 @@  discard block
 block discarded – undo
831 831
  */
832 832
 function geodir_get_term_link($termlink, $term, $taxonomy)
833 833
 {
834
-    return geodir_term_link($termlink, $term, $taxonomy); // taxonomy_functions.php
834
+	return geodir_term_link($termlink, $term, $taxonomy); // taxonomy_functions.php
835 835
 }
836 836
 
837 837
 /**
@@ -845,7 +845,7 @@  discard block
 block discarded – undo
845 845
  */
846 846
 function geodir_get_posttype_link($link, $post_type)
847 847
 {
848
-    return geodir_posttype_link($link, $post_type); // taxonomy_functions.php
848
+	return geodir_posttype_link($link, $post_type); // taxonomy_functions.php
849 849
 }
850 850
 
851 851
 /**
@@ -860,13 +860,13 @@  discard block
 block discarded – undo
860 860
  */
861 861
 function exclude_from_wp_list_pages($exclude_array)
862 862
 {
863
-    $pages_ids = array();
864
-    $pages_array = get_posts(array('post_type' => 'page', 'post_status' => 'virtual'));
865
-    foreach ($pages_array as $page) {
866
-        $pages_ids[] = $page->ID;
867
-    }
868
-    $exclude_array = $exclude_array + $pages_ids;
869
-    return $exclude_array;
863
+	$pages_ids = array();
864
+	$pages_array = get_posts(array('post_type' => 'page', 'post_status' => 'virtual'));
865
+	foreach ($pages_array as $page) {
866
+		$pages_ids[] = $page->ID;
867
+	}
868
+	$exclude_array = $exclude_array + $pages_ids;
869
+	return $exclude_array;
870 870
 }
871 871
 
872 872
 /**
@@ -879,8 +879,8 @@  discard block
 block discarded – undo
879 879
  */
880 880
 function geodir_exclude_page($query)
881 881
 {
882
-    add_filter('posts_where', 'geodir_exclude_page_where', 100);
883
-    return $query;
882
+	add_filter('posts_where', 'geodir_exclude_page_where', 100);
883
+	return $query;
884 884
 }
885 885
 
886 886
 /**
@@ -895,11 +895,11 @@  discard block
 block discarded – undo
895 895
  */
896 896
 function geodir_exclude_page_where($where)
897 897
 {
898
-    global $wpdb;
899
-    if (is_admin())
900
-        $where .= " AND $wpdb->posts.post_status != 'virtual'";
898
+	global $wpdb;
899
+	if (is_admin())
900
+		$where .= " AND $wpdb->posts.post_status != 'virtual'";
901 901
 
902
-    return $where;
902
+	return $where;
903 903
 }
904 904
 
905 905
 /**
@@ -914,20 +914,20 @@  discard block
 block discarded – undo
914 914
  * @return mixed The taxonomy option value.
915 915
  */
916 916
 function geodir_wpseo_taxonomy_meta( $value, $option = '' ) {
917
-    global $wp_query;
917
+	global $wp_query;
918 918
     
919
-    if ( !empty( $value ) && ( is_category() || is_tax() ) ) {
920
-        $term = $wp_query->get_queried_object();
919
+	if ( !empty( $value ) && ( is_category() || is_tax() ) ) {
920
+		$term = $wp_query->get_queried_object();
921 921
         
922
-        if ( !empty( $term->term_id ) && !empty( $term->taxonomy ) && isset( $value[$term->taxonomy][$term->term_id] ) && in_array( str_replace( 'category', '', $term->taxonomy ), geodir_get_posttypes() ) ) {
923
-            $image  = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) );
922
+		if ( !empty( $term->term_id ) && !empty( $term->taxonomy ) && isset( $value[$term->taxonomy][$term->term_id] ) && in_array( str_replace( 'category', '', $term->taxonomy ), geodir_get_posttypes() ) ) {
923
+			$image  = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) );
924 924
             
925
-            if ( !empty( $image['src'] ) ) {
926
-                $value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src'];
927
-                $value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src'];
928
-            }
929
-        }
930
-    }
931
-    return $value;
925
+			if ( !empty( $image['src'] ) ) {
926
+				$value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src'];
927
+				$value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src'];
928
+			}
929
+		}
930
+	}
931
+	return $value;
932 932
 }
933 933
 add_filter( 'option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2 );
Please login to merge, or discard this patch.
geodirectory-functions/reviews.php 3 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,8 +16,9 @@
 block discarded – undo
16 16
  * the visitor has not yet entered the password we will
17 17
  * return early without loading the comments.
18 18
  */
19
-if (post_password_required())
20
-    return;
19
+if (post_password_required()) {
20
+    return;
21
+}
21 22
 ?>
22 23
 
23 24
 <div id="comments" class="comments-area">
Please login to merge, or discard this patch.
Indentation   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
  * return early without loading the comments.
18 18
  */
19 19
 if (post_password_required())
20
-    return;
20
+	return;
21 21
 ?>
22 22
 
23 23
 <div id="comments" class="comments-area">
@@ -25,35 +25,35 @@  discard block
 block discarded – undo
25 25
     <?php // You can start editing here -- including this comment! ?>
26 26
 
27 27
     <?php
28
-    /**
29
-     * Called before displaying reviews.
30
-     *
31
-     * If you would like to wrap reviews inside a div this is the place to print your open div. @see geodir_before_review_form to print your closing div.
32
-     *
33
-     * @since 1.5.7
34
-     */
35
-    do_action('geodir_before_review_list'); ?>
28
+	/**
29
+	 * Called before displaying reviews.
30
+	 *
31
+	 * If you would like to wrap reviews inside a div this is the place to print your open div. @see geodir_before_review_form to print your closing div.
32
+	 *
33
+	 * @since 1.5.7
34
+	 */
35
+	do_action('geodir_before_review_list'); ?>
36 36
 
37 37
     <?php if (have_comments()) : ?>
38 38
         <h2 class="comments-title">
39 39
             <?php
40
-            printf(_n('1 Review <span class="r-title-on">on</span> <span class="r-title">&ldquo;%2$s&rdquo;</span>', '%1$s Reviews <span>on</span> <span class="r-title"> &ldquo;%2$s&rdquo;</span>', get_comments_number(), 'geodirectory'),
41
-                number_format_i18n(get_comments_number()), get_the_title());
42
-            ?>
40
+			printf(_n('1 Review <span class="r-title-on">on</span> <span class="r-title">&ldquo;%2$s&rdquo;</span>', '%1$s Reviews <span>on</span> <span class="r-title"> &ldquo;%2$s&rdquo;</span>', get_comments_number(), 'geodirectory'),
41
+				number_format_i18n(get_comments_number()), get_the_title());
42
+			?>
43 43
         </h2>
44 44
 
45 45
         <?php
46
-        /**
47
-         * Called after displaying review listing title.
48
-         *
49
-         * @since 1.5.7
50
-         */
51
-        do_action('geodir_after_review_list_title'); ?>
46
+		/**
47
+		 * Called after displaying review listing title.
48
+		 *
49
+		 * @since 1.5.7
50
+		 */
51
+		do_action('geodir_after_review_list_title'); ?>
52 52
 
53 53
         <ol class="commentlist">
54 54
             <?php $reverse_top_level = is_plugin_active('geodir_review_rating_manager/geodir_review_rating_manager.php') ? false : null; ?>
55 55
 			<?php wp_list_comments(array('callback' => 'geodir_comment', 'reverse_top_level' => $reverse_top_level, 'style' => 'ol'));
56
-            ?>
56
+			?>
57 57
         </ol><!-- .commentlist -->
58 58
 
59 59
         <?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // are there comments to navigate through ?>
@@ -68,51 +68,51 @@  discard block
 block discarded – undo
68 68
         <?php endif; // check for comment navigation ?>
69 69
 
70 70
         <?php
71
-        /* If there are no comments and comments are closed, let's leave a note.
71
+		/* If there are no comments and comments are closed, let's leave a note.
72 72
          * But we only want the note on posts and pages that had comments in the first place.
73 73
          */
74
-        if (!comments_open() && get_comments_number()) : ?>
74
+		if (!comments_open() && get_comments_number()) : ?>
75 75
             <p class="nocomments"><?php _e('Reviews are closed.', 'geodirectory'); ?></p>
76 76
         <?php endif; ?>
77 77
 
78 78
     <?php endif; // have_comments() ?>
79 79
 
80 80
     <?php
81
-    /**
82
-     * Called before displaying "Leave a review form".
83
-     *
84
-     * If you would like to wrap "review form" inside a div this is the best place to hook your open div. @see geodir_after_review_form to print your closing div.
85
-     * Also If you would like to wrap "reviews" inside a div this is the best place to print your closing div. @see geodir_before_review_list to print your open div.
86
-     *
87
-     * @since 1.5.7
88
-     */
89
-    do_action('geodir_before_review_form'); ?>
81
+	/**
82
+	 * Called before displaying "Leave a review form".
83
+	 *
84
+	 * If you would like to wrap "review form" inside a div this is the best place to hook your open div. @see geodir_after_review_form to print your closing div.
85
+	 * Also If you would like to wrap "reviews" inside a div this is the best place to print your closing div. @see geodir_before_review_list to print your open div.
86
+	 *
87
+	 * @since 1.5.7
88
+	 */
89
+	do_action('geodir_before_review_form'); ?>
90 90
 
91 91
     <?php
92
-    /**
93
-     * Filters comment form args
94
-     *
95
-     * If you would like to modify your comment form args, use this filter. @see https://codex.wordpress.org/Function_Reference/comment_form for accepted args.
96
-     *
97
-     * @since 1.0.0
98
-     */
99
-    $args = apply_filters('geodir_review_form_args', array(
100
-        'title_reply' => __('Leave a Review', 'geodirectory'),
101
-        'label_submit' => __('Post Review', 'geodirectory'),
102
-        'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',
103
-        'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'
104
-    ));
105
-    comment_form($args);
106
-    ?>
92
+	/**
93
+	 * Filters comment form args
94
+	 *
95
+	 * If you would like to modify your comment form args, use this filter. @see https://codex.wordpress.org/Function_Reference/comment_form for accepted args.
96
+	 *
97
+	 * @since 1.0.0
98
+	 */
99
+	$args = apply_filters('geodir_review_form_args', array(
100
+		'title_reply' => __('Leave a Review', 'geodirectory'),
101
+		'label_submit' => __('Post Review', 'geodirectory'),
102
+		'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',
103
+		'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'
104
+	));
105
+	comment_form($args);
106
+	?>
107 107
 
108 108
     <?php
109
-    /**
110
-     * Called after displaying "Leave a review form".
111
-     *
112
-     * If you would like to wrap "review form" inside a div this is the best place to print your closing div. @see geodir_before_review_form to print your open div.
113
-     *
114
-     * @since 1.5.7
115
-     */
116
-    do_action('geodir_after_review_form'); ?>
109
+	/**
110
+	 * Called after displaying "Leave a review form".
111
+	 *
112
+	 * If you would like to wrap "review form" inside a div this is the best place to print your closing div. @see geodir_before_review_form to print your open div.
113
+	 *
114
+	 * @since 1.5.7
115
+	 */
116
+	do_action('geodir_after_review_form'); ?>
117 117
 
118 118
 </div><!-- #comments .comments-area -->
119 119
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,8 +99,8 @@
 block discarded – undo
99 99
     $args = apply_filters('geodir_review_form_args', array(
100 100
         'title_reply' => __('Leave a Review', 'geodirectory'),
101 101
         'label_submit' => __('Post Review', 'geodirectory'),
102
-        'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',
103
-        'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'
102
+        'comment_field' => '<p class="comment-form-comment"><label for="comment">'.__('Review text', 'geodirectory').'</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',
103
+        'must_log_in' => '<p class="must-log-in">'.sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()).'</p>'
104 104
     ));
105 105
     comment_form($args);
106 106
     ?>
Please login to merge, or discard this patch.
geodirectory-templates/preview-buttons.php 3 patches
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -61,10 +61,11 @@
 block discarded – undo
61 61
                 ob_start();
62 62
                 echo '<h5 class="geodir_information">';
63 63
 
64
-                if (!isset($_REQUEST['pid']))
65
-                    printf(GOING_TO_FREE_MSG, $type_title, $alive_days);
66
-                else
67
-                    printf(GOING_TO_UPDATE_MSG, $type_title, $alive_days);
64
+                if (!isset($_REQUEST['pid'])) {
65
+                                    printf(GOING_TO_FREE_MSG, $type_title, $alive_days);
66
+                } else {
67
+                                    printf(GOING_TO_UPDATE_MSG, $type_title, $alive_days);
68
+                }
68 69
 
69 70
                 echo '</h5>';
70 71
                 $publish_listing_form_message = ob_get_clean();
Please login to merge, or discard this patch.
Indentation   +76 added lines, -76 removed lines patch added patch discarded remove patch
@@ -15,9 +15,9 @@  discard block
 block discarded – undo
15 15
 $post_type = $post->listing_type;
16 16
 
17 17
 if (isset($_REQUEST['preview']) && $_REQUEST['preview'] && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
18
-    $form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=update&listing_type=' . $post_type;
18
+	$form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=update&listing_type=' . $post_type;
19 19
 } elseif (isset($_REQUEST['preview']) && $_REQUEST['preview']) {
20
-    $form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=publish&listing_type=' . $post_type;
20
+	$form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=publish&listing_type=' . $post_type;
21 21
 }
22 22
 
23 23
 /**
@@ -45,48 +45,48 @@  discard block
 block discarded – undo
45 45
         <form action="<?php echo $form_action_url; ?>" name="publish_listing" id="publish_listing" method="post">
46 46
             <div class="clearfix">
47 47
                 <input type="hidden" name="pid" value="<?php if (isset($post->pid)) {
48
-                    echo $post->pid;
49
-                } ?>">
48
+					echo $post->pid;
49
+				} ?>">
50 50
                 <?php
51
-                /**
52
-                 * Called on the add listing preview page inside the publish listings form, before the publish message.
53
-                 *
54
-                 * @since 1.0.0
55
-                 * @see 'geodir_publish_listing_form_after_msg'
56
-                 */
57
-                do_action('geodir_publish_listing_form_before_msg'); ?>
51
+				/**
52
+				 * Called on the add listing preview page inside the publish listings form, before the publish message.
53
+				 *
54
+				 * @since 1.0.0
55
+				 * @see 'geodir_publish_listing_form_after_msg'
56
+				 */
57
+				do_action('geodir_publish_listing_form_before_msg'); ?>
58 58
                 <?php
59
-                $alive_days = UNLIMITED;
60
-                $type_title = '';
61
-                ob_start();
62
-                echo '<h5 class="geodir_information">';
63
-
64
-                if (!isset($_REQUEST['pid']))
65
-                    printf(GOING_TO_FREE_MSG, $type_title, $alive_days);
66
-                else
67
-                    printf(GOING_TO_UPDATE_MSG, $type_title, $alive_days);
68
-
69
-                echo '</h5>';
70
-                $publish_listing_form_message = ob_get_clean();
71
-                /**
72
-                 * Filter the publish listing message on the preview page.
73
-                 *
74
-                 * @since 1.0.0
75
-                 * @param string $publish_listing_form_message The message to be filtered.
76
-                 */
77
-                $publish_listing_form_message = apply_filters('geodir_publish_listing_form_message', $publish_listing_form_message);
78
-                echo $publish_listing_form_message;
79
-
80
-                /**
81
-                 * Called on the add listing preview page inside the publish listings form, after the publish message.
82
-                 *
83
-                 * @since 1.0.0
84
-                 * @see 'geodir_publish_listing_form_before_msg'
85
-                 */
86
-                do_action('geodir_publish_listing_form_after_msg');
87
-
88
-                ob_start(); // start action button buffering
89
-                ?>
59
+				$alive_days = UNLIMITED;
60
+				$type_title = '';
61
+				ob_start();
62
+				echo '<h5 class="geodir_information">';
63
+
64
+				if (!isset($_REQUEST['pid']))
65
+					printf(GOING_TO_FREE_MSG, $type_title, $alive_days);
66
+				else
67
+					printf(GOING_TO_UPDATE_MSG, $type_title, $alive_days);
68
+
69
+				echo '</h5>';
70
+				$publish_listing_form_message = ob_get_clean();
71
+				/**
72
+				 * Filter the publish listing message on the preview page.
73
+				 *
74
+				 * @since 1.0.0
75
+				 * @param string $publish_listing_form_message The message to be filtered.
76
+				 */
77
+				$publish_listing_form_message = apply_filters('geodir_publish_listing_form_message', $publish_listing_form_message);
78
+				echo $publish_listing_form_message;
79
+
80
+				/**
81
+				 * Called on the add listing preview page inside the publish listings form, after the publish message.
82
+				 *
83
+				 * @since 1.0.0
84
+				 * @see 'geodir_publish_listing_form_before_msg'
85
+				 */
86
+				do_action('geodir_publish_listing_form_after_msg');
87
+
88
+				ob_start(); // start action button buffering
89
+				?>
90 90
                 <?php if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { ?>
91 91
 
92 92
                     <input type="submit" name="Submit and Pay" value="<?php echo PRO_UPDATE_BUTTON; ?>"
@@ -95,46 +95,46 @@  discard block
 block discarded – undo
95 95
                     <input type="submit" name="Submit and Pay" value="<?php echo PRO_SUBMIT_BUTTON; ?>"
96 96
                            class=" geodir_button geodir_publish_button"/>
97 97
                 <?php
98
-                }
99
-                $publish_listing_form_button = ob_get_clean();
100
-                /**
101
-                 * Filter the HTML button for publishing the listing on the preview page.
102
-                 *
103
-                 * @since 1.0.0
104
-                 * @param string $publish_listing_form_button The HTML for the submit button.
105
-                 */
106
-                $publish_listing_form_button = apply_filters('geodir_publish_listing_form_button', $publish_listing_form_button);
107
-                echo $publish_listing_form_button;
108
-
109
-                $post_id = '';
110
-                if (isset($post->pid)) {
111
-                    $post_id = $post->pid;
112
-                } else if (isset($_REQUEST['pid'])) {
113
-                    $post_id = (int)$_REQUEST['pid'];
114
-                }
115
-
116
-                $postlink = get_permalink(geodir_add_listing_page_id());
117
-                $postlink = geodir_getlink($postlink, array('pid' => $post_id, 'backandedit' => '1', 'listing_type' => $post_type), false);
118
-
119
-                ob_start(); // start go back and edit / cancel buffering
120
-                ?>
98
+				}
99
+				$publish_listing_form_button = ob_get_clean();
100
+				/**
101
+				 * Filter the HTML button for publishing the listing on the preview page.
102
+				 *
103
+				 * @since 1.0.0
104
+				 * @param string $publish_listing_form_button The HTML for the submit button.
105
+				 */
106
+				$publish_listing_form_button = apply_filters('geodir_publish_listing_form_button', $publish_listing_form_button);
107
+				echo $publish_listing_form_button;
108
+
109
+				$post_id = '';
110
+				if (isset($post->pid)) {
111
+					$post_id = $post->pid;
112
+				} else if (isset($_REQUEST['pid'])) {
113
+					$post_id = (int)$_REQUEST['pid'];
114
+				}
115
+
116
+				$postlink = get_permalink(geodir_add_listing_page_id());
117
+				$postlink = geodir_getlink($postlink, array('pid' => $post_id, 'backandedit' => '1', 'listing_type' => $post_type), false);
118
+
119
+				ob_start(); // start go back and edit / cancel buffering
120
+				?>
121 121
                 <a href="<?php echo esc_url($postlink); ?>" class="geodir_goback"><?php echo PRO_BACK_AND_EDIT_TEXT; ?></a>
122 122
                 <input type="button" name="Cancel" value="<?php echo(PRO_CANCEL_BUTTON); ?>"
123 123
                        class="geodir_button geodir_cancle_button"
124 124
                        onclick="window.location.href='<?php echo geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=cancel&pid=' . $post_id . '&listing_type=' . $post_type; ?>'"/>
125 125
                 <?php
126 126
 
127
-                $publish_listing_form_go_back = ob_get_clean();
128
-                /**
129
-                 * Filter the cancel and go back and edit HTML on the preview page.
130
-                 *
131
-                 * @since 1.0.0
132
-                 * @param string $publish_listing_form_go_back The HTML for the cancel and go back and edit button/link.
133
-                 */
134
-                $publish_listing_form_go_back = apply_filters('geodir_publish_listing_form_go_back', $publish_listing_form_go_back);
135
-                echo $publish_listing_form_go_back;
136
-
137
-                ?>
127
+				$publish_listing_form_go_back = ob_get_clean();
128
+				/**
129
+				 * Filter the cancel and go back and edit HTML on the preview page.
130
+				 *
131
+				 * @since 1.0.0
132
+				 * @param string $publish_listing_form_go_back The HTML for the cancel and go back and edit button/link.
133
+				 */
134
+				$publish_listing_form_go_back = apply_filters('geodir_publish_listing_form_go_back', $publish_listing_form_go_back);
135
+				echo $publish_listing_form_go_back;
136
+
137
+				?>
138 138
             </div>
139 139
         </form>
140 140
     </div>
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,9 +15,9 @@  discard block
 block discarded – undo
15 15
 $post_type = $post->listing_type;
16 16
 
17 17
 if (isset($_REQUEST['preview']) && $_REQUEST['preview'] && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
18
-    $form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=update&listing_type=' . $post_type;
18
+    $form_action_url = geodir_get_ajax_url().'&geodir_ajax=add_listing&ajax_action=update&listing_type='.$post_type;
19 19
 } elseif (isset($_REQUEST['preview']) && $_REQUEST['preview']) {
20
-    $form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=publish&listing_type=' . $post_type;
20
+    $form_action_url = geodir_get_ajax_url().'&geodir_ajax=add_listing&ajax_action=publish&listing_type='.$post_type;
21 21
 }
22 22
 
23 23
 /**
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
                 if (isset($post->pid)) {
111 111
                     $post_id = $post->pid;
112 112
                 } else if (isset($_REQUEST['pid'])) {
113
-                    $post_id = (int)$_REQUEST['pid'];
113
+                    $post_id = (int) $_REQUEST['pid'];
114 114
                 }
115 115
 
116 116
                 $postlink = get_permalink(geodir_add_listing_page_id());
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
                 <a href="<?php echo esc_url($postlink); ?>" class="geodir_goback"><?php echo PRO_BACK_AND_EDIT_TEXT; ?></a>
122 122
                 <input type="button" name="Cancel" value="<?php echo(PRO_CANCEL_BUTTON); ?>"
123 123
                        class="geodir_button geodir_cancle_button"
124
-                       onclick="window.location.href='<?php echo geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=cancel&pid=' . $post_id . '&listing_type=' . $post_type; ?>'"/>
124
+                       onclick="window.location.href='<?php echo geodir_get_ajax_url().'&geodir_ajax=add_listing&ajax_action=cancel&pid='.$post_id.'&listing_type='.$post_type; ?>'"/>
125 125
                 <?php
126 126
 
127 127
                 $publish_listing_form_go_back = ob_get_clean();
Please login to merge, or discard this patch.
geodirectory-widgets/geodirectory_cpt_categories_widget.php 3 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -353,7 +353,7 @@
 block discarded – undo
353 353
 
354 354
     if(!$cpt_left){
355 355
         $cpt_left = "gd-cpt-flat";
356
-    }else{
356
+    } else{
357 357
         $cpt_left = '';
358 358
     }
359 359
 
Please login to merge, or discard this patch.
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -169,9 +169,9 @@  discard block
 block discarded – undo
169 169
         $output = geodir_cpt_categories_output($params);
170 170
 
171 171
         echo $args['before_widget'];
172
-        if ( $params['title'] ) {
172
+        if ($params['title']) {
173 173
             echo '<div class="geodir_list_heading clearfix">';
174
-            echo $args['before_title'] . $params['title'] . $args['after_title'];
174
+            echo $args['before_title'].$params['title'].$args['after_title'];
175 175
             echo '</div>';
176 176
         }
177 177
         echo '<div class="gd-cptcats-widget">';
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
      * @param array $instance Previously saved values from database.
219 219
      */
220 220
     public function form($instance) {
221
-        $instance = wp_parse_args( (array)$instance,
221
+        $instance = wp_parse_args((array) $instance,
222 222
             array(
223 223
                 'title' => '',
224 224
                 'post_type' => array(), // NULL for all
@@ -252,50 +252,50 @@  discard block
 block discarded – undo
252 252
         <p>
253 253
             <label for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Select CPT:', 'geodirectory'); ?></label>
254 254
             <select name="<?php echo $this->get_field_name('post_type'); ?>[]" id="<?php echo $this->get_field_id('post_type'); ?>" class="widefat" multiple="multiple">
255
-                <option value="0" <?php selected( (empty($post_type) || (is_array($post_type) && in_array('0', $post_type))), true ); ?>><?php _e('All', 'geodirectory'); ?></option>
255
+                <option value="0" <?php selected((empty($post_type) || (is_array($post_type) && in_array('0', $post_type))), true); ?>><?php _e('All', 'geodirectory'); ?></option>
256 256
                 <?php foreach ($post_type_options as $name => $title) { ?>
257
-                    <option value="<?php echo $name;?>" <?php selected( is_array($post_type) && in_array($name, $post_type), true ); ?>><?php echo $title; ?></option>
257
+                    <option value="<?php echo $name; ?>" <?php selected(is_array($post_type) && in_array($name, $post_type), true); ?>><?php echo $title; ?></option>
258 258
                 <?php } ?>
259 259
             </select>
260 260
         </p>
261
-        <p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_empty'); ?>" name="<?php echo $this->get_field_name('hide_empty'); ?>"<?php checked( $hide_empty ); ?> value="1" />
262
-            <label for="<?php echo $this->get_field_id('hide_empty'); ?>"><?php _e( 'Hide empty categories', 'geodirectory' ); ?></label><br />
263
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('show_count'); ?>" name="<?php echo $this->get_field_name('show_count'); ?>"<?php checked( $show_count ); ?> value="1" />
264
-            <label for="<?php echo $this->get_field_id('show_count'); ?>"><?php _e( 'Show category count' ); ?></label> <small><?php _e( '( Enabling will slow down page loading for big directories. )', 'geodirectory' ); ?></small><br />
265
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_icon'); ?>" name="<?php echo $this->get_field_name('hide_icon'); ?>"<?php checked( $hide_icon ); ?> value="1" />
266
-            <label for="<?php echo $this->get_field_id('hide_icon'); ?>"><?php _e( 'Hide category icon', 'geodirectory' ); ?></label><br />
267
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('cpt_left'); ?>" name="<?php echo $this->get_field_name('cpt_left'); ?>"<?php checked( $cpt_left ); ?> value="1" />
268
-            <label for="<?php echo $this->get_field_id('cpt_left'); ?>"><?php _e( 'Show CPT on same line', 'geodirectory' ); ?></label>
261
+        <p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_empty'); ?>" name="<?php echo $this->get_field_name('hide_empty'); ?>"<?php checked($hide_empty); ?> value="1" />
262
+            <label for="<?php echo $this->get_field_id('hide_empty'); ?>"><?php _e('Hide empty categories', 'geodirectory'); ?></label><br />
263
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('show_count'); ?>" name="<?php echo $this->get_field_name('show_count'); ?>"<?php checked($show_count); ?> value="1" />
264
+            <label for="<?php echo $this->get_field_id('show_count'); ?>"><?php _e('Show category count'); ?></label> <small><?php _e('( Enabling will slow down page loading for big directories. )', 'geodirectory'); ?></small><br />
265
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_icon'); ?>" name="<?php echo $this->get_field_name('hide_icon'); ?>"<?php checked($hide_icon); ?> value="1" />
266
+            <label for="<?php echo $this->get_field_id('hide_icon'); ?>"><?php _e('Hide category icon', 'geodirectory'); ?></label><br />
267
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('cpt_left'); ?>" name="<?php echo $this->get_field_name('cpt_left'); ?>"<?php checked($cpt_left); ?> value="1" />
268
+            <label for="<?php echo $this->get_field_id('cpt_left'); ?>"><?php _e('Show CPT on same line', 'geodirectory'); ?></label>
269 269
         <p>
270 270
             <label for="<?php echo $this->get_field_id('sort_by'); ?>"><?php _e('Sort by:', 'geodirectory'); ?></label>
271 271
             <select name="<?php echo $this->get_field_name('sort_by'); ?>" id="<?php echo $this->get_field_id('sort_by'); ?>" class="widefat">
272
-                <option value="az" <?php selected( $sort_by, 'az' ); ?>><?php _e('A-Z', 'geodirectory'); ?></option>
273
-                <option value="count" <?php selected( $sort_by, 'count' ); ?>><?php _e('Count', 'geodirectory'); ?></option>
272
+                <option value="az" <?php selected($sort_by, 'az'); ?>><?php _e('A-Z', 'geodirectory'); ?></option>
273
+                <option value="count" <?php selected($sort_by, 'count'); ?>><?php _e('Count', 'geodirectory'); ?></option>
274 274
             </select>
275 275
         </p>
276 276
         <p>
277 277
             <label for="<?php echo $this->get_field_id('max_count'); ?>"><?php _e('Max no of sub-categories:', 'geodirectory'); ?></label>
278 278
             <select name="<?php echo $this->get_field_name('max_count'); ?>" id="<?php echo $this->get_field_id('max_count'); ?>" class="widefat">
279
-                <option value="all" <?php selected( $max_count, 'all' ); ?>><?php _e('All', 'geodirectory'); ?></option>
279
+                <option value="all" <?php selected($max_count, 'all'); ?>><?php _e('All', 'geodirectory'); ?></option>
280 280
                 <?php for ($n = 10; $n >= 0; $n--) { ?>
281
-                    <option value="<?php echo $n;?>" <?php selected( $max_count, $n ); ?>><?php echo $n; ?></option>
281
+                    <option value="<?php echo $n; ?>" <?php selected($max_count, $n); ?>><?php echo $n; ?></option>
282 282
                 <?php } ?>
283 283
             </select>
284 284
         </p>
285 285
         <p>
286 286
             <label for="<?php echo $this->get_field_id('max_level'); ?>"><?php _e('Show max sub-categories depth:', 'geodirectory'); ?></label>
287 287
             <select name="<?php echo $this->get_field_name('max_level'); ?>" id="<?php echo $this->get_field_id('max_level'); ?>" class="widefat">
288
-                <option value="all" <?php selected( $max_level, 'all' ); ?>><?php _e('All', 'geodirectory'); ?></option>
288
+                <option value="all" <?php selected($max_level, 'all'); ?>><?php _e('All', 'geodirectory'); ?></option>
289 289
                 <?php for ($n = 0; $n <= 10; $n++) { ?>
290
-                    <option value="<?php echo $n;?>" <?php selected( $max_level, $n ); ?>><?php echo $n; ?></option>
290
+                    <option value="<?php echo $n; ?>" <?php selected($max_level, $n); ?>><?php echo $n; ?></option>
291 291
                 <?php } ?>
292 292
             </select>
293 293
         </p>
294 294
         <p>
295
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cpt_filter'); ?>" name="<?php echo $this->get_field_name('no_cpt_filter'); ?>"<?php checked( $no_cpt_filter ); ?> value="1" />
296
-            <label for="<?php echo $this->get_field_id('no_cpt_filter'); ?>"><?php _e( 'Don\'t filter for current viewing post type', 'geodirectory' ); ?></label>
297
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cat_filter'); ?>" name="<?php echo $this->get_field_name('no_cat_filter'); ?>"<?php checked( $no_cat_filter ); ?> value="1" />
298
-            <label for="<?php echo $this->get_field_id('no_cat_filter'); ?>"><?php _e( 'Don\'t filter for current viewing category', 'geodirectory' ); ?></label>
295
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cpt_filter'); ?>" name="<?php echo $this->get_field_name('no_cpt_filter'); ?>"<?php checked($no_cpt_filter); ?> value="1" />
296
+            <label for="<?php echo $this->get_field_id('no_cpt_filter'); ?>"><?php _e('Don\'t filter for current viewing post type', 'geodirectory'); ?></label>
297
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cat_filter'); ?>" name="<?php echo $this->get_field_name('no_cat_filter'); ?>"<?php checked($no_cat_filter); ?> value="1" />
298
+            <label for="<?php echo $this->get_field_id('no_cat_filter'); ?>"><?php _e('Don\'t filter for current viewing category', 'geodirectory'); ?></label>
299 299
         </p>
300 300
     <?php
301 301
     }
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
  * @return string CPT categories content.
314 314
  */
315 315
 function geodir_cpt_categories_output($params) {
316
-    $args = wp_parse_args((array)$params,
316
+    $args = wp_parse_args((array) $params,
317 317
         array(
318 318
             'title' => '',
319 319
             'post_type' => array(), // NULL for all
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
                 $current_taxonomy = get_query_var('taxonomy');
352 352
                 $current_posttype = geodir_get_current_posttype();
353 353
 
354
-                if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') {
354
+                if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype.'category') {
355 355
                     $is_category = true;
356 356
                 }
357 357
             }
@@ -383,15 +383,15 @@  discard block
 block discarded – undo
383 383
     $hide_empty = !empty($args['hide_empty']) ? true : false;
384 384
     $max_count = strip_tags($args['max_count']);
385 385
     $all_childs = $max_count == 'all' ? true : false;
386
-    $max_count = $max_count > 0 ? (int)$max_count : 0;
386
+    $max_count = $max_count > 0 ? (int) $max_count : 0;
387 387
     $max_level = strip_tags($args['max_level']);
388 388
     $show_count = !empty($args['show_count']) ? true : false;
389 389
     $hide_icon = !empty($args['hide_icon']) ? true : false;
390 390
     $cpt_left = !empty($args['cpt_left']) ? true : false;
391 391
 
392
-    if(!$cpt_left){
392
+    if (!$cpt_left) {
393 393
         $cpt_left = "gd-cpt-flat";
394
-    }else{
394
+    } else {
395 395
         $cpt_left = '';
396 396
     }
397 397
 
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
     if (!empty($post_types)) {
407 407
         foreach ($post_types as $cpt => $cpt_info) {
408 408
             $parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0;
409
-            $cat_taxonomy = $cpt . 'category';
409
+            $cat_taxonomy = $cpt.'category';
410 410
             $categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category));
411 411
             if ($hide_empty) {
412 412
                 $categories = geodir_filter_empty_terms($categories);
@@ -422,32 +422,32 @@  discard block
 block discarded – undo
422 422
                 if ($is_listing) {
423 423
                     $row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
424 424
                 }
425
-                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
425
+                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-'.$cpt.$row_class.' '.$cpt_left.'">';
426 426
 
427 427
                 if ($is_category && $cat_filter && $cpt == $current_posttype) {
428 428
                     $term_info = get_term($current_term_id, $cat_taxonomy);
429 429
 
430 430
                     $term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : '';
431
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
431
+                    $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($term_info->name).' icon" src="'.$term_icon_url.'" /> ' : '';
432 432
 
433
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : '';
434
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>';
433
+                    $count = $show_count ? ' <span class="gd-cptcat-count">('.$term_info->count.')</span>' : '';
434
+                    $cpt_row .= '<h2 class="gd-cptcat-title">'.$term_icon_url.$term_info->name.$count.'</h2>';
435 435
                 } else {
436
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>';
436
+                    $cpt_row .= '<h2 class="gd-cptcat-title">'.__($cpt_info['labels']['name'], 'geodirectory').'</h2>';
437 437
                 }
438 438
                 foreach ($categories as $category) {
439 439
                     $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
440
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
440
+                    $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($category->name).' icon" src="'.$term_icon_url.'" /> ' : '';
441 441
 
442
-                    $term_link = get_term_link( $category, $category->taxonomy );
442
+                    $term_link = get_term_link($category, $category->taxonomy);
443 443
                     /** Filter documented in geodirectory-functions/general_functions.php **/
444
-                    $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
444
+                    $term_link = apply_filters('geodir_category_term_link', $term_link, $category->term_id, $cpt);
445 445
 
446 446
                     $cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
447 447
                     $cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
448
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
449
-                    $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">'  .$term_icon_url . $category->name . $count . '</a></h3>';
450
-                    if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
448
+                    $count = $show_count ? ' <span class="gd-cptcat-count">('.$category->count.')</span>' : '';
449
+                    $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="'.esc_url($term_link).'" title="'.esc_attr($category->name).'">'.$term_icon_url.$category->name.$count.'</a></h3>';
450
+                    if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int) $max_level > 0)) {
451 451
                         $cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
452 452
                     }
453 453
                     $cpt_row .= '</li>';
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
  * @return string Html content.
480 480
  */
481 481
 function geodir_cpt_categories_child_cats($parent_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth = 1) {
482
-    $cat_taxonomy = $cpt . 'category';
482
+    $cat_taxonomy = $cpt.'category';
483 483
 
484 484
     $orderby = 'count';
485 485
     $order = 'DESC';
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
488 488
         $order = 'ASC';
489 489
     }
490 490
 
491
-    if ($max_level != 'all' && $depth > (int)$max_level ) {
491
+    if ($max_level != 'all' && $depth > (int) $max_level) {
492 492
         return '';
493 493
     }
494 494
 
@@ -505,18 +505,18 @@  discard block
 block discarded – undo
505 505
         $child_cats = geodir_sort_terms($child_cats, 'count');
506 506
     }
507 507
 
508
-    $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">';
508
+    $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-'.$depth.'">';
509 509
     $depth++;
510 510
     foreach ($child_cats as $category) {
511 511
         $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
512
-        $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
513
-        $term_link = get_term_link( $category, $category->taxonomy );
512
+        $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($category->name).' icon" src="'.$term_icon_url.'" /> ' : '';
513
+        $term_link = get_term_link($category, $category->taxonomy);
514 514
         /** Filter documented in geodirectory-functions/general_functions.php **/
515
-        $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
516
-        $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
515
+        $term_link = apply_filters('geodir_category_term_link', $term_link, $category->term_id, $cpt);
516
+        $count = $show_count ? ' <span class="gd-cptcat-count">('.$category->count.')</span>' : '';
517 517
 
518 518
         $content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';
519
-        $content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>';
519
+        $content .= '<a href="'.esc_url($term_link).'" title="'.esc_attr($category->name).'">'.$term_icon_url.$category->name.$count.'</a></li>';
520 520
         $content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth);
521 521
     }
522 522
     $content .= '</li></ul>';
Please login to merge, or discard this patch.
Indentation   +424 added lines, -424 removed lines patch added patch discarded remove patch
@@ -13,241 +13,241 @@  discard block
 block discarded – undo
13 13
  */
14 14
 class geodir_cpt_categories_widget extends WP_Widget {
15 15
 
16
-    /**
17
-     * Register the cpt categories with WordPress.
18
-     *
19
-     * @since 1.5.4
20
-     */
21
-    public function __construct() {
22
-        $widget_ops = array('classname' => 'geodir_cpt_categories_widget', 'description' => __('A list of GeoDirectory CPT categories.', 'geodirectory'));
23
-        parent::__construct('geodir_cpt_categories_widget', __('GD > CPT Categories', 'geodirectory'), $widget_ops);
24
-    }
25
-
26
-    /**
27
-     * Front-end display content for cpt categories widget.
28
-     *
29
-     * @since 1.5.4
30
-     * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
31
-     *
32
-     * @param array $args Widget arguments.
33
-     * @param array $instance Saved values from database.
34
-     */
35
-    public function widget($args, $instance) {
36
-        $params = array();
37
-        /**
38
-         * Filter the widget title.
39
-         *
40
-         * @since 1.5.4
41
-         *
42
-         * @param string $title The widget title. Default empty.
43
-         * @param array  $instance An array of the widget's settings.
44
-         * @param mixed  $id_base The widget ID.
45
-         */
46
-        $params['title'] = apply_filters('geodir_cpt_categories_widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
47
-
48
-        /**
49
-         * Filter the widget setting post type.
50
-         *
51
-         * @since 1.5.4
52
-         *
53
-         * @param array $post_type The post types to display categories.
54
-         * @param array $instance An array of the widget's settings.
55
-         * @param mixed $id_base The widget ID.
56
-         */
57
-        $params['post_type'] = apply_filters('geodir_cpt_categories_widget_post_type', empty($instance['post_type']) ? array() : $instance['post_type'], $instance, $this->id_base);
58
-
59
-        /**
60
-         * Filter the widget setting to hide empty categories.
61
-         *
62
-         * @since 1.5.4
63
-         *
64
-         * @param bool  $hide_empty If true then empty category will be not displayed.
65
-         * @param array $instance An array of the widget's settings.
66
-         * @param mixed $id_base The widget ID.
67
-         */
68
-        $params['hide_empty'] = apply_filters('geodir_cpt_categories_widget_hide_empty', empty($instance['hide_empty']) ? 0 : 1, $instance, $this->id_base);
69
-
70
-        /**
71
-         * Filter the widget setting to show/hide category count.
72
-         *
73
-         * @since 1.5.4
74
-         *
75
-         * @param bool  $show_count If true then category count will be displayed.
76
-         * @param array $instance An array of the widget's settings.
77
-         * @param mixed $id_base The widget ID.
78
-         */
79
-        $params['show_count'] = apply_filters('geodir_cpt_categories_widget_show_count', empty($instance['show_count']) ? 0 : 1, $instance, $this->id_base);
80
-
81
-        /**
82
-         * Filter the widget setting to show/hide category icon.
83
-         *
84
-         * @since 1.5.4
85
-         *
86
-         * @param bool  $hide_icon If true then category icon will be not displayed.
87
-         * @param array $instance An array of the widget's settings.
88
-         * @param mixed $id_base The widget ID.
89
-         */
90
-        $params['hide_icon'] = apply_filters('geodir_cpt_categories_widget_hide_icon', empty($instance['hide_icon']) ? 0 : 1, $instance, $this->id_base);
91
-
92
-        /**
93
-         * Filter the widget setting to show CPT inline or not.
94
-         *
95
-         * @since 1.5.4
96
-         *
97
-         * @param bool  $cpt_left If true then CPT will be displayed inline.
98
-         * @param array $instance An array of the widget's settings.
99
-         * @param mixed $id_base The widget ID.
100
-         */
101
-        $params['cpt_left'] = apply_filters('geodir_cpt_categories_widget_cpt_left', empty($instance['cpt_left']) ? 0 : 1, $instance, $this->id_base);
102
-
103
-        /**
104
-         * Filter the widget categories sorting order settings.
105
-         *
106
-         * @since 1.5.4
107
-         *
108
-         * @param string $max_count Widget max no of sub-categories count. Default 'count'.
109
-         * @param array       $instance An array of the widget's settings.
110
-         * @param mixed       $id_base The widget ID.
111
-         */
112
-        $params['sort_by'] = apply_filters('geodir_cpt_categories_widget_sort_by', isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count', $instance, $this->id_base);
113
-
114
-        /**
115
-         * Filter the widget max no of sub-categories count.
116
-         *
117
-         * @since 1.5.4
118
-         *
119
-         * @param bool|string $max_count Widget max no of sub-categories count.
120
-         * @param array       $instance An array of the widget's settings.
121
-         * @param mixed       $id_base The widget ID.
122
-         */
123
-        $params['max_count'] = apply_filters('geodir_cpt_categories_widget_max_count', !isset($instance['max_count']) ? 'all' : strip_tags($instance['max_count']), $instance, $this->id_base);
124
-
125
-        /**
126
-         * Filter the widget max sub-categories depth.
127
-         *
128
-         * @since 1.5.4
129
-         *
130
-         * @param bool|string $max_level Widget max sub-categories depth.
131
-         * @param array       $instance An array of the widget's settings.
132
-         * @param mixed       $id_base The widget ID.
133
-         */
134
-        $params['max_level'] = apply_filters('geodir_cpt_categories_widget_max_level', !isset($instance['max_level']) ? 'all' : strip_tags($instance['max_level']), $instance, $this->id_base);
16
+	/**
17
+	 * Register the cpt categories with WordPress.
18
+	 *
19
+	 * @since 1.5.4
20
+	 */
21
+	public function __construct() {
22
+		$widget_ops = array('classname' => 'geodir_cpt_categories_widget', 'description' => __('A list of GeoDirectory CPT categories.', 'geodirectory'));
23
+		parent::__construct('geodir_cpt_categories_widget', __('GD > CPT Categories', 'geodirectory'), $widget_ops);
24
+	}
25
+
26
+	/**
27
+	 * Front-end display content for cpt categories widget.
28
+	 *
29
+	 * @since 1.5.4
30
+	 * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
31
+	 *
32
+	 * @param array $args Widget arguments.
33
+	 * @param array $instance Saved values from database.
34
+	 */
35
+	public function widget($args, $instance) {
36
+		$params = array();
37
+		/**
38
+		 * Filter the widget title.
39
+		 *
40
+		 * @since 1.5.4
41
+		 *
42
+		 * @param string $title The widget title. Default empty.
43
+		 * @param array  $instance An array of the widget's settings.
44
+		 * @param mixed  $id_base The widget ID.
45
+		 */
46
+		$params['title'] = apply_filters('geodir_cpt_categories_widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
47
+
48
+		/**
49
+		 * Filter the widget setting post type.
50
+		 *
51
+		 * @since 1.5.4
52
+		 *
53
+		 * @param array $post_type The post types to display categories.
54
+		 * @param array $instance An array of the widget's settings.
55
+		 * @param mixed $id_base The widget ID.
56
+		 */
57
+		$params['post_type'] = apply_filters('geodir_cpt_categories_widget_post_type', empty($instance['post_type']) ? array() : $instance['post_type'], $instance, $this->id_base);
58
+
59
+		/**
60
+		 * Filter the widget setting to hide empty categories.
61
+		 *
62
+		 * @since 1.5.4
63
+		 *
64
+		 * @param bool  $hide_empty If true then empty category will be not displayed.
65
+		 * @param array $instance An array of the widget's settings.
66
+		 * @param mixed $id_base The widget ID.
67
+		 */
68
+		$params['hide_empty'] = apply_filters('geodir_cpt_categories_widget_hide_empty', empty($instance['hide_empty']) ? 0 : 1, $instance, $this->id_base);
69
+
70
+		/**
71
+		 * Filter the widget setting to show/hide category count.
72
+		 *
73
+		 * @since 1.5.4
74
+		 *
75
+		 * @param bool  $show_count If true then category count will be displayed.
76
+		 * @param array $instance An array of the widget's settings.
77
+		 * @param mixed $id_base The widget ID.
78
+		 */
79
+		$params['show_count'] = apply_filters('geodir_cpt_categories_widget_show_count', empty($instance['show_count']) ? 0 : 1, $instance, $this->id_base);
80
+
81
+		/**
82
+		 * Filter the widget setting to show/hide category icon.
83
+		 *
84
+		 * @since 1.5.4
85
+		 *
86
+		 * @param bool  $hide_icon If true then category icon will be not displayed.
87
+		 * @param array $instance An array of the widget's settings.
88
+		 * @param mixed $id_base The widget ID.
89
+		 */
90
+		$params['hide_icon'] = apply_filters('geodir_cpt_categories_widget_hide_icon', empty($instance['hide_icon']) ? 0 : 1, $instance, $this->id_base);
91
+
92
+		/**
93
+		 * Filter the widget setting to show CPT inline or not.
94
+		 *
95
+		 * @since 1.5.4
96
+		 *
97
+		 * @param bool  $cpt_left If true then CPT will be displayed inline.
98
+		 * @param array $instance An array of the widget's settings.
99
+		 * @param mixed $id_base The widget ID.
100
+		 */
101
+		$params['cpt_left'] = apply_filters('geodir_cpt_categories_widget_cpt_left', empty($instance['cpt_left']) ? 0 : 1, $instance, $this->id_base);
102
+
103
+		/**
104
+		 * Filter the widget categories sorting order settings.
105
+		 *
106
+		 * @since 1.5.4
107
+		 *
108
+		 * @param string $max_count Widget max no of sub-categories count. Default 'count'.
109
+		 * @param array       $instance An array of the widget's settings.
110
+		 * @param mixed       $id_base The widget ID.
111
+		 */
112
+		$params['sort_by'] = apply_filters('geodir_cpt_categories_widget_sort_by', isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count', $instance, $this->id_base);
113
+
114
+		/**
115
+		 * Filter the widget max no of sub-categories count.
116
+		 *
117
+		 * @since 1.5.4
118
+		 *
119
+		 * @param bool|string $max_count Widget max no of sub-categories count.
120
+		 * @param array       $instance An array of the widget's settings.
121
+		 * @param mixed       $id_base The widget ID.
122
+		 */
123
+		$params['max_count'] = apply_filters('geodir_cpt_categories_widget_max_count', !isset($instance['max_count']) ? 'all' : strip_tags($instance['max_count']), $instance, $this->id_base);
124
+
125
+		/**
126
+		 * Filter the widget max sub-categories depth.
127
+		 *
128
+		 * @since 1.5.4
129
+		 *
130
+		 * @param bool|string $max_level Widget max sub-categories depth.
131
+		 * @param array       $instance An array of the widget's settings.
132
+		 * @param mixed       $id_base The widget ID.
133
+		 */
134
+		$params['max_level'] = apply_filters('geodir_cpt_categories_widget_max_level', !isset($instance['max_level']) ? 'all' : strip_tags($instance['max_level']), $instance, $this->id_base);
135 135
         
136
-        /**
137
-         * Filter the widget setting to disable filter current viewing post type.
138
-         *
139
-         * @since 1.6.6
140
-         *
141
-         * @param bool  $no_cpt_filter If true then it doesn't filter current viewing post type.
142
-         * @param array $instance An array of the widget's settings.
143
-         * @param mixed $id_base The widget ID.
144
-         */
145
-        $params['no_cpt_filter'] = apply_filters('geodir_cpt_categories_widget_no_cpt_filter', empty($instance['no_cpt_filter']) ? 0 : 1, $instance, $this->id_base);
136
+		/**
137
+		 * Filter the widget setting to disable filter current viewing post type.
138
+		 *
139
+		 * @since 1.6.6
140
+		 *
141
+		 * @param bool  $no_cpt_filter If true then it doesn't filter current viewing post type.
142
+		 * @param array $instance An array of the widget's settings.
143
+		 * @param mixed $id_base The widget ID.
144
+		 */
145
+		$params['no_cpt_filter'] = apply_filters('geodir_cpt_categories_widget_no_cpt_filter', empty($instance['no_cpt_filter']) ? 0 : 1, $instance, $this->id_base);
146 146
         
147
-        /**
148
-         * Filter the widget setting to disable current viewing category.
149
-         *
150
-         * @since 1.6.6
151
-         *
152
-         * @param bool  $no_cat_filter If true then it doesn't filter current viewing category.
153
-         * @param array $instance An array of the widget's settings.
154
-         * @param mixed $id_base The widget ID.
155
-         */
156
-        $params['no_cat_filter'] = apply_filters('geodir_cpt_categories_widget_no_cat_filter', empty($instance['no_cat_filter']) ? 0 : 1, $instance, $this->id_base);
157
-
158
-        /**
159
-         * Filter the widget parameters.
160
-         *
161
-         * @since 1.5.4
162
-         *
163
-         * @param array $params The widget parameters.
164
-         * @param array $instance An array of the widget's settings.
165
-         * @param mixed $id_base The widget ID.
166
-         */
167
-        $params = apply_filters('geodir_cpt_categories_widget_params', $params, $instance, $this->id_base);
168
-
169
-        $output = geodir_cpt_categories_output($params);
170
-
171
-        echo $args['before_widget'];
172
-        if ( $params['title'] ) {
173
-            echo '<div class="geodir_list_heading clearfix">';
174
-            echo $args['before_title'] . $params['title'] . $args['after_title'];
175
-            echo '</div>';
176
-        }
177
-        echo '<div class="gd-cptcats-widget">';
178
-        echo $output;
179
-        echo '</div>';
180
-        echo $args['after_widget'];
181
-    }
182
-
183
-    /**
184
-     * Sanitize cpt categories widget values as they are saved.
185
-     *
186
-     * @since 1.5.4
187
-     * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
188
-     *
189
-     * @param array $new_instance Values just sent to be saved.
190
-     * @param array $old_instance Previously saved values from database.
191
-     *
192
-     * @return array Updated safe values to be saved.
193
-     */
194
-    public function update($new_instance, $old_instance) {
195
-        $new_instance['post_type'] = is_array($new_instance['post_type']) && in_array('0', $new_instance['post_type']) ? array('0') : $new_instance['post_type'];
196
-        $instance = $old_instance;
197
-        $instance['title'] = strip_tags($new_instance['title']);
198
-        $instance['post_type'] = isset($new_instance['post_type']) ? $new_instance['post_type'] : array('0');
199
-        $instance['hide_empty'] = !empty($new_instance['hide_empty']) ? 1 : 0;
200
-        $instance['show_count'] = !empty($new_instance['show_count']) ? 1 : 0;
201
-        $instance['hide_icon'] = !empty($new_instance['hide_icon']) ? 1 : 0;
202
-        $instance['cpt_left'] = !empty($new_instance['cpt_left']) ? 1 : 0;
203
-        $instance['sort_by'] = isset($new_instance['sort_by']) && in_array($new_instance['sort_by'], array('az', 'count')) ? $new_instance['sort_by'] : 'count';
204
-        $instance['max_count'] = strip_tags($new_instance['max_count']);
205
-        $instance['max_level'] = strip_tags($new_instance['max_level']);
206
-        $instance['no_cpt_filter'] = !empty($new_instance['no_cpt_filter']) ? 1 : 0;
207
-        $instance['no_cat_filter'] = !empty($new_instance['no_cat_filter']) ? 1 : 0;
208
-
209
-        return $instance;
210
-    }
211
-
212
-    /**
213
-     * Back-end cpt categories settings form.
214
-     *
215
-     * @since 1.5.4
216
-     * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
217
-     *
218
-     * @param array $instance Previously saved values from database.
219
-     */
220
-    public function form($instance) {
221
-        $instance = wp_parse_args( (array)$instance,
222
-            array(
223
-                'title' => '',
224
-                'post_type' => array(), // NULL for all
225
-                'hide_empty' => '',
226
-                'show_count' => '',
227
-                'hide_icon' => '',
228
-                'cpt_left' => '',
229
-                'sort_by' => 'count',
230
-                'max_count' => 'all',
231
-                'max_level' => '1',
232
-                'no_cpt_filter' => '',
233
-                'no_cat_filter' => '',
234
-            )
235
-        );
236
-
237
-        $title = strip_tags($instance['title']);
238
-        $post_type = $instance['post_type'];
239
-        $hide_empty = !empty($instance['hide_empty']) ? true : false;
240
-        $show_count = !empty($instance['show_count']) ? true : false;
241
-        $hide_icon = !empty($instance['hide_icon']) ? true : false;
242
-        $cpt_left = !empty($instance['cpt_left']) ? true : false;
243
-        $max_count = strip_tags($instance['max_count']);
244
-        $max_level = strip_tags($instance['max_level']);
245
-        $sort_by = isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count';
246
-        $no_cpt_filter = !empty($instance['no_cpt_filter']) ? true : false;
247
-        $no_cat_filter = !empty($instance['no_cat_filter']) ? true : false;
248
-
249
-        $post_type_options = geodir_get_posttypes('options');
250
-        ?>
147
+		/**
148
+		 * Filter the widget setting to disable current viewing category.
149
+		 *
150
+		 * @since 1.6.6
151
+		 *
152
+		 * @param bool  $no_cat_filter If true then it doesn't filter current viewing category.
153
+		 * @param array $instance An array of the widget's settings.
154
+		 * @param mixed $id_base The widget ID.
155
+		 */
156
+		$params['no_cat_filter'] = apply_filters('geodir_cpt_categories_widget_no_cat_filter', empty($instance['no_cat_filter']) ? 0 : 1, $instance, $this->id_base);
157
+
158
+		/**
159
+		 * Filter the widget parameters.
160
+		 *
161
+		 * @since 1.5.4
162
+		 *
163
+		 * @param array $params The widget parameters.
164
+		 * @param array $instance An array of the widget's settings.
165
+		 * @param mixed $id_base The widget ID.
166
+		 */
167
+		$params = apply_filters('geodir_cpt_categories_widget_params', $params, $instance, $this->id_base);
168
+
169
+		$output = geodir_cpt_categories_output($params);
170
+
171
+		echo $args['before_widget'];
172
+		if ( $params['title'] ) {
173
+			echo '<div class="geodir_list_heading clearfix">';
174
+			echo $args['before_title'] . $params['title'] . $args['after_title'];
175
+			echo '</div>';
176
+		}
177
+		echo '<div class="gd-cptcats-widget">';
178
+		echo $output;
179
+		echo '</div>';
180
+		echo $args['after_widget'];
181
+	}
182
+
183
+	/**
184
+	 * Sanitize cpt categories widget values as they are saved.
185
+	 *
186
+	 * @since 1.5.4
187
+	 * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
188
+	 *
189
+	 * @param array $new_instance Values just sent to be saved.
190
+	 * @param array $old_instance Previously saved values from database.
191
+	 *
192
+	 * @return array Updated safe values to be saved.
193
+	 */
194
+	public function update($new_instance, $old_instance) {
195
+		$new_instance['post_type'] = is_array($new_instance['post_type']) && in_array('0', $new_instance['post_type']) ? array('0') : $new_instance['post_type'];
196
+		$instance = $old_instance;
197
+		$instance['title'] = strip_tags($new_instance['title']);
198
+		$instance['post_type'] = isset($new_instance['post_type']) ? $new_instance['post_type'] : array('0');
199
+		$instance['hide_empty'] = !empty($new_instance['hide_empty']) ? 1 : 0;
200
+		$instance['show_count'] = !empty($new_instance['show_count']) ? 1 : 0;
201
+		$instance['hide_icon'] = !empty($new_instance['hide_icon']) ? 1 : 0;
202
+		$instance['cpt_left'] = !empty($new_instance['cpt_left']) ? 1 : 0;
203
+		$instance['sort_by'] = isset($new_instance['sort_by']) && in_array($new_instance['sort_by'], array('az', 'count')) ? $new_instance['sort_by'] : 'count';
204
+		$instance['max_count'] = strip_tags($new_instance['max_count']);
205
+		$instance['max_level'] = strip_tags($new_instance['max_level']);
206
+		$instance['no_cpt_filter'] = !empty($new_instance['no_cpt_filter']) ? 1 : 0;
207
+		$instance['no_cat_filter'] = !empty($new_instance['no_cat_filter']) ? 1 : 0;
208
+
209
+		return $instance;
210
+	}
211
+
212
+	/**
213
+	 * Back-end cpt categories settings form.
214
+	 *
215
+	 * @since 1.5.4
216
+	 * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
217
+	 *
218
+	 * @param array $instance Previously saved values from database.
219
+	 */
220
+	public function form($instance) {
221
+		$instance = wp_parse_args( (array)$instance,
222
+			array(
223
+				'title' => '',
224
+				'post_type' => array(), // NULL for all
225
+				'hide_empty' => '',
226
+				'show_count' => '',
227
+				'hide_icon' => '',
228
+				'cpt_left' => '',
229
+				'sort_by' => 'count',
230
+				'max_count' => 'all',
231
+				'max_level' => '1',
232
+				'no_cpt_filter' => '',
233
+				'no_cat_filter' => '',
234
+			)
235
+		);
236
+
237
+		$title = strip_tags($instance['title']);
238
+		$post_type = $instance['post_type'];
239
+		$hide_empty = !empty($instance['hide_empty']) ? true : false;
240
+		$show_count = !empty($instance['show_count']) ? true : false;
241
+		$hide_icon = !empty($instance['hide_icon']) ? true : false;
242
+		$cpt_left = !empty($instance['cpt_left']) ? true : false;
243
+		$max_count = strip_tags($instance['max_count']);
244
+		$max_level = strip_tags($instance['max_level']);
245
+		$sort_by = isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count';
246
+		$no_cpt_filter = !empty($instance['no_cpt_filter']) ? true : false;
247
+		$no_cat_filter = !empty($instance['no_cat_filter']) ? true : false;
248
+
249
+		$post_type_options = geodir_get_posttypes('options');
250
+		?>
251 251
         <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?></label> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
252 252
         <p>
253 253
             <label for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Select CPT:', 'geodirectory'); ?></label>
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
             <label for="<?php echo $this->get_field_id('no_cat_filter'); ?>"><?php _e( 'Don\'t filter for current viewing category', 'geodirectory' ); ?></label>
299 299
         </p>
300 300
     <?php
301
-    }
301
+	}
302 302
 } // class geodir_cpt_categories_widget
303 303
 
304 304
 register_widget('geodir_cpt_categories_widget');
@@ -313,153 +313,153 @@  discard block
 block discarded – undo
313 313
  * @return string CPT categories content.
314 314
  */
315 315
 function geodir_cpt_categories_output($params) {
316
-    $args = wp_parse_args((array)$params,
317
-        array(
318
-            'title' => '',
319
-            'post_type' => array(), // NULL for all
320
-            'hide_empty' => '',
321
-            'show_count' => '',
322
-            'hide_icon' => '',
323
-            'cpt_left' => '',
324
-            'sort_by' => 'count',
325
-            'max_count' => 'all',
326
-            'max_level' => '1',
327
-            'no_cpt_filter' => '',
328
-            'no_cat_filter' => '',
329
-        )
330
-    );
331
-
332
-    $sort_by = isset($args['sort_by']) && in_array($args['sort_by'], array('az', 'count')) ? $args['sort_by'] : 'count';
333
-    $cpt_filter = empty($args['no_cpt_filter']) ? true : false;
334
-    $cat_filter = empty($args['no_cat_filter']) ? true : false;
335
-
336
-    $gd_post_types = geodir_get_posttypes('array');
337
-
338
-    $post_type_arr = !is_array($args['post_type']) ? explode(',', $args['post_type']) : $args['post_type'];
339
-    $current_posttype = geodir_get_current_posttype();
340
-
341
-    $is_listing = false;
342
-    $is_category = false;
343
-    if (geodir_is_page('listing')) {
344
-        $current_posttype = geodir_get_current_posttype();
345
-
346
-        if ($current_posttype != '' && isset($gd_post_types[$current_posttype])) {
347
-            $is_listing = true;
348
-
349
-            if (is_tax()) { // category page
350
-                $current_term_id = get_queried_object_id();
351
-                $current_taxonomy = get_query_var('taxonomy');
352
-                $current_posttype = geodir_get_current_posttype();
353
-
354
-                if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') {
355
-                    $is_category = true;
356
-                }
357
-            }
358
-        }
359
-    }
360
-
361
-    $parent_category = 0;
362
-    if ($is_listing && $cpt_filter) {
363
-        $post_type_arr = array($current_posttype);
364
-    }
365
-
366
-    $post_types = array();
367
-    if (!empty($post_type_arr)) {
368
-        if (in_array('0', $post_type_arr)) {
369
-            $post_types = $gd_post_types;
370
-        } else {
371
-            foreach ($post_type_arr as $cpt) {
372
-                if (isset($gd_post_types[$cpt])) {
373
-                    $post_types[$cpt] = $gd_post_types[$cpt];
374
-                }
375
-            }
376
-        }
377
-    }
378
-
379
-    if (empty($post_type_arr)) {
380
-        $post_types = $gd_post_types;
381
-    }
382
-
383
-    $hide_empty = !empty($args['hide_empty']) ? true : false;
384
-    $max_count = strip_tags($args['max_count']);
385
-    $all_childs = $max_count == 'all' ? true : false;
386
-    $max_count = $max_count > 0 ? (int)$max_count : 0;
387
-    $max_level = strip_tags($args['max_level']);
388
-    $show_count = !empty($args['show_count']) ? true : false;
389
-    $hide_icon = !empty($args['hide_icon']) ? true : false;
390
-    $cpt_left = !empty($args['cpt_left']) ? true : false;
391
-
392
-    if(!$cpt_left){
393
-        $cpt_left = "gd-cpt-flat";
394
-    }else{
395
-        $cpt_left = '';
396
-    }
397
-
398
-    $orderby = 'count';
399
-    $order = 'DESC';
400
-    if ($sort_by == 'az') {
401
-        $orderby = 'name';
402
-        $order = 'ASC';
403
-    }
404
-
405
-    $output = '';
406
-    if (!empty($post_types)) {
407
-        foreach ($post_types as $cpt => $cpt_info) {
408
-            $parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0;
409
-            $cat_taxonomy = $cpt . 'category';
410
-            $categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category));
411
-            if ($hide_empty) {
412
-                $categories = geodir_filter_empty_terms($categories);
413
-            }
414
-            if ($sort_by == 'count') {
415
-                $categories = geodir_sort_terms($categories, 'count');
416
-            }
417
-
418
-            if (!empty($categories)) {
419
-                $term_icons = !$hide_icon ? geodir_get_term_icon() : array();
420
-                $row_class = '';
421
-
422
-                if ($is_listing) {
423
-                    $row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
424
-                }
425
-                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
426
-
427
-                if ($is_category && $cat_filter && $cpt == $current_posttype) {
428
-                    $term_info = get_term($current_term_id, $cat_taxonomy);
429
-
430
-                    $term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : '';
431
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
432
-
433
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : '';
434
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>';
435
-                } else {
436
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>';
437
-                }
438
-                foreach ($categories as $category) {
439
-                    $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
440
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
441
-
442
-                    $term_link = get_term_link( $category, $category->taxonomy );
443
-                    /** Filter documented in geodirectory-functions/general_functions.php **/
444
-                    $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
445
-
446
-                    $cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
447
-                    $cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
448
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
449
-                    $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">'  .$term_icon_url . $category->name . $count . '</a></h3>';
450
-                    if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
451
-                        $cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
452
-                    }
453
-                    $cpt_row .= '</li>';
454
-                    $cpt_row .= '</ul>';
455
-                }
456
-                $cpt_row .= '</div>';
457
-
458
-                $output .= $cpt_row;
459
-            }
460
-        }
461
-    }
462
-    return $output;
316
+	$args = wp_parse_args((array)$params,
317
+		array(
318
+			'title' => '',
319
+			'post_type' => array(), // NULL for all
320
+			'hide_empty' => '',
321
+			'show_count' => '',
322
+			'hide_icon' => '',
323
+			'cpt_left' => '',
324
+			'sort_by' => 'count',
325
+			'max_count' => 'all',
326
+			'max_level' => '1',
327
+			'no_cpt_filter' => '',
328
+			'no_cat_filter' => '',
329
+		)
330
+	);
331
+
332
+	$sort_by = isset($args['sort_by']) && in_array($args['sort_by'], array('az', 'count')) ? $args['sort_by'] : 'count';
333
+	$cpt_filter = empty($args['no_cpt_filter']) ? true : false;
334
+	$cat_filter = empty($args['no_cat_filter']) ? true : false;
335
+
336
+	$gd_post_types = geodir_get_posttypes('array');
337
+
338
+	$post_type_arr = !is_array($args['post_type']) ? explode(',', $args['post_type']) : $args['post_type'];
339
+	$current_posttype = geodir_get_current_posttype();
340
+
341
+	$is_listing = false;
342
+	$is_category = false;
343
+	if (geodir_is_page('listing')) {
344
+		$current_posttype = geodir_get_current_posttype();
345
+
346
+		if ($current_posttype != '' && isset($gd_post_types[$current_posttype])) {
347
+			$is_listing = true;
348
+
349
+			if (is_tax()) { // category page
350
+				$current_term_id = get_queried_object_id();
351
+				$current_taxonomy = get_query_var('taxonomy');
352
+				$current_posttype = geodir_get_current_posttype();
353
+
354
+				if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') {
355
+					$is_category = true;
356
+				}
357
+			}
358
+		}
359
+	}
360
+
361
+	$parent_category = 0;
362
+	if ($is_listing && $cpt_filter) {
363
+		$post_type_arr = array($current_posttype);
364
+	}
365
+
366
+	$post_types = array();
367
+	if (!empty($post_type_arr)) {
368
+		if (in_array('0', $post_type_arr)) {
369
+			$post_types = $gd_post_types;
370
+		} else {
371
+			foreach ($post_type_arr as $cpt) {
372
+				if (isset($gd_post_types[$cpt])) {
373
+					$post_types[$cpt] = $gd_post_types[$cpt];
374
+				}
375
+			}
376
+		}
377
+	}
378
+
379
+	if (empty($post_type_arr)) {
380
+		$post_types = $gd_post_types;
381
+	}
382
+
383
+	$hide_empty = !empty($args['hide_empty']) ? true : false;
384
+	$max_count = strip_tags($args['max_count']);
385
+	$all_childs = $max_count == 'all' ? true : false;
386
+	$max_count = $max_count > 0 ? (int)$max_count : 0;
387
+	$max_level = strip_tags($args['max_level']);
388
+	$show_count = !empty($args['show_count']) ? true : false;
389
+	$hide_icon = !empty($args['hide_icon']) ? true : false;
390
+	$cpt_left = !empty($args['cpt_left']) ? true : false;
391
+
392
+	if(!$cpt_left){
393
+		$cpt_left = "gd-cpt-flat";
394
+	}else{
395
+		$cpt_left = '';
396
+	}
397
+
398
+	$orderby = 'count';
399
+	$order = 'DESC';
400
+	if ($sort_by == 'az') {
401
+		$orderby = 'name';
402
+		$order = 'ASC';
403
+	}
404
+
405
+	$output = '';
406
+	if (!empty($post_types)) {
407
+		foreach ($post_types as $cpt => $cpt_info) {
408
+			$parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0;
409
+			$cat_taxonomy = $cpt . 'category';
410
+			$categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category));
411
+			if ($hide_empty) {
412
+				$categories = geodir_filter_empty_terms($categories);
413
+			}
414
+			if ($sort_by == 'count') {
415
+				$categories = geodir_sort_terms($categories, 'count');
416
+			}
417
+
418
+			if (!empty($categories)) {
419
+				$term_icons = !$hide_icon ? geodir_get_term_icon() : array();
420
+				$row_class = '';
421
+
422
+				if ($is_listing) {
423
+					$row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
424
+				}
425
+				$cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
426
+
427
+				if ($is_category && $cat_filter && $cpt == $current_posttype) {
428
+					$term_info = get_term($current_term_id, $cat_taxonomy);
429
+
430
+					$term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : '';
431
+					$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
432
+
433
+					$count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : '';
434
+					$cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>';
435
+				} else {
436
+					$cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>';
437
+				}
438
+				foreach ($categories as $category) {
439
+					$term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
440
+					$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
441
+
442
+					$term_link = get_term_link( $category, $category->taxonomy );
443
+					/** Filter documented in geodirectory-functions/general_functions.php **/
444
+					$term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
445
+
446
+					$cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
447
+					$cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
448
+					$count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
449
+					$cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">'  .$term_icon_url . $category->name . $count . '</a></h3>';
450
+					if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
451
+						$cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
452
+					}
453
+					$cpt_row .= '</li>';
454
+					$cpt_row .= '</ul>';
455
+				}
456
+				$cpt_row .= '</div>';
457
+
458
+				$output .= $cpt_row;
459
+			}
460
+		}
461
+	}
462
+	return $output;
463 463
 }
464 464
 
465 465
 /**
@@ -479,48 +479,48 @@  discard block
 block discarded – undo
479 479
  * @return string Html content.
480 480
  */
481 481
 function geodir_cpt_categories_child_cats($parent_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth = 1) {
482
-    $cat_taxonomy = $cpt . 'category';
483
-
484
-    $orderby = 'count';
485
-    $order = 'DESC';
486
-    if ($sort_by == 'az') {
487
-        $orderby = 'name';
488
-        $order = 'ASC';
489
-    }
490
-
491
-    if ($max_level != 'all' && $depth > (int)$max_level ) {
492
-        return '';
493
-    }
494
-
495
-    $child_cats = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_id, 'number' => $max_count));
496
-    if ($hide_empty) {
497
-        $child_cats = geodir_filter_empty_terms($child_cats);
498
-    }
499
-
500
-    if (empty($child_cats)) {
501
-        return '';
502
-    }
503
-
504
-    if ($sort_by == 'count') {
505
-        $child_cats = geodir_sort_terms($child_cats, 'count');
506
-    }
507
-
508
-    $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">';
509
-    $depth++;
510
-    foreach ($child_cats as $category) {
511
-        $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
512
-        $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
513
-        $term_link = get_term_link( $category, $category->taxonomy );
514
-        /** Filter documented in geodirectory-functions/general_functions.php **/
515
-        $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
516
-        $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
517
-
518
-        $content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';
519
-        $content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>';
520
-        $content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth);
521
-    }
522
-    $content .= '</li></ul>';
523
-
524
-    return $content;
482
+	$cat_taxonomy = $cpt . 'category';
483
+
484
+	$orderby = 'count';
485
+	$order = 'DESC';
486
+	if ($sort_by == 'az') {
487
+		$orderby = 'name';
488
+		$order = 'ASC';
489
+	}
490
+
491
+	if ($max_level != 'all' && $depth > (int)$max_level ) {
492
+		return '';
493
+	}
494
+
495
+	$child_cats = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_id, 'number' => $max_count));
496
+	if ($hide_empty) {
497
+		$child_cats = geodir_filter_empty_terms($child_cats);
498
+	}
499
+
500
+	if (empty($child_cats)) {
501
+		return '';
502
+	}
503
+
504
+	if ($sort_by == 'count') {
505
+		$child_cats = geodir_sort_terms($child_cats, 'count');
506
+	}
507
+
508
+	$content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">';
509
+	$depth++;
510
+	foreach ($child_cats as $category) {
511
+		$term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
512
+		$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
513
+		$term_link = get_term_link( $category, $category->taxonomy );
514
+		/** Filter documented in geodirectory-functions/general_functions.php **/
515
+		$term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
516
+		$count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
517
+
518
+		$content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';
519
+		$content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>';
520
+		$content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth);
521
+	}
522
+	$content .= '</li></ul>';
523
+
524
+	return $content;
525 525
 }
526 526
 ?>
527 527
\ No newline at end of file
Please login to merge, or discard this patch.
geodirectory-widgets/geodirectory_related_listing_widget.php 3 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
     public function form($instance)
138 138
     {
139 139
         //widgetform in backend
140
-        $instance = wp_parse_args((array)$instance,
140
+        $instance = wp_parse_args((array) $instance,
141 141
             array('title' => '',
142 142
                 'list_sort' => '',
143 143
                 'list_order' => '',
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 
170 170
         ?>
171 171
         <p>
172
-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
172
+            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?>
173 173
 
174 174
                 <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
175 175
                        name="<?php echo $this->get_field_name('title'); ?>" type="text"
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
         </p>
179 179
         <p>
180 180
             <label
181
-                for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory');?>
181
+                for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory'); ?>
182 182
 
183 183
                 <select class="widefat" id="<?php echo $this->get_field_id('list_sort'); ?>"
184 184
                         name="<?php echo $this->get_field_name('list_sort'); ?>">
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
         </p>
209 209
         <p>
210 210
             <label
211
-                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts:', 'geodirectory');?>
211
+                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts:', 'geodirectory'); ?>
212 212
 
213 213
                 <input class="widefat" id="<?php echo $this->get_field_id('post_number'); ?>"
214 214
                        name="<?php echo $this->get_field_name('post_number'); ?>" type="text"
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
         </p>
218 218
         <p>
219 219
             <label for="<?php echo $this->get_field_id('relate_to'); ?>">
220
-                <?php _e('Relate to:', 'geodirectory');?>
220
+                <?php _e('Relate to:', 'geodirectory'); ?>
221 221
                 <select class="widefat" id="<?php echo $this->get_field_id('relate_to'); ?>"
222 222
                         name="<?php echo $this->get_field_name('relate_to'); ?>">
223 223
                     <option <?php if ($relate_to == 'category') {
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
         <p>
233 233
         <p>
234 234
             <label for="<?php echo $this->get_field_id('layout'); ?>">
235
-                <?php _e('Layout:', 'geodirectory');?>
235
+                <?php _e('Layout:', 'geodirectory'); ?>
236 236
                 <select class="widefat" id="<?php echo $this->get_field_id('layout'); ?>"
237 237
                         name="<?php echo $this->get_field_name('layout'); ?>">
238 238
                     <option <?php if ($layout == 'gridview_onehalf') {
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
         </p>
261 261
         <p>
262 262
             <label
263
-                for="<?php echo $this->get_field_id('listing_width'); ?>"><?php _e('Listing width:', 'geodirectory');?>
263
+                for="<?php echo $this->get_field_id('listing_width'); ?>"><?php _e('Listing width:', 'geodirectory'); ?>
264 264
 
265 265
                 <input class="widefat" id="<?php echo $this->get_field_id('listing_width'); ?>"
266 266
                        name="<?php echo $this->get_field_name('listing_width'); ?>" type="text"
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
         </p>
270 270
         <p>
271 271
             <label
272
-                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory');?>
272
+                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory'); ?>
273 273
                 <input class="widefat" id="<?php echo $this->get_field_id('character_count'); ?>"
274 274
                        name="<?php echo $this->get_field_name('character_count'); ?>" type="text"
275 275
                        value="<?php echo esc_attr($character_count); ?>"/>
@@ -277,9 +277,9 @@  discard block
 block discarded – undo
277 277
         </p>
278 278
         <p>
279 279
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
280
-                <?php _e('Enable Location Filter:', 'geodirectory');?>
280
+                <?php _e('Enable Location Filter:', 'geodirectory'); ?>
281 281
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
282
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
282
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"'; ?>
283 283
                        value="1"/>
284 284
             </label>
285 285
         </p>
Please login to merge, or discard this patch.
Indentation   +120 added lines, -120 removed lines patch added patch discarded remove patch
@@ -14,160 +14,160 @@  discard block
 block discarded – undo
14 14
  */
15 15
 class geodir_related_listing_postview extends WP_Widget
16 16
 {
17
-    /**
17
+	/**
18 18
 	 * Register the related listing widget.
19 19
 	 *
20 20
 	 * @since 1.0.0
21
-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
21
+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
22 22
 	 */
23
-    public function __construct() {
24
-        $widget_ops = array('classname' => 'geodir_related_listing_post_view', 'description' => __('GD > Related Listing', 'geodirectory'));
25
-        parent::__construct(
26
-            'post_related_listing', // Base ID
27
-            __('GD > Related Listing', 'geodirectory'), // Name
28
-            $widget_ops// Args
29
-        );
30
-    }
23
+	public function __construct() {
24
+		$widget_ops = array('classname' => 'geodir_related_listing_post_view', 'description' => __('GD > Related Listing', 'geodirectory'));
25
+		parent::__construct(
26
+			'post_related_listing', // Base ID
27
+			__('GD > Related Listing', 'geodirectory'), // Name
28
+			$widget_ops// Args
29
+		);
30
+	}
31 31
 
32 32
 	/**
33 33
 	 * Front-end display content for related listing widget.
34 34
 	 *
35 35
 	 * @since 1.0.0
36
-     * @since 1.5.1 Declare function public.
36
+	 * @since 1.5.1 Declare function public.
37 37
 	 *
38 38
 	 * @param array $args     Widget arguments.
39 39
 	 * @param array $instance Saved values from database.
40 40
 	 */
41
-    public function widget($args, $instance)
42
-    {
41
+	public function widget($args, $instance)
42
+	{
43 43
 
44
-        // prints the widget
45
-        extract($args, EXTR_SKIP);
44
+		// prints the widget
45
+		extract($args, EXTR_SKIP);
46 46
 
47
-        /** This filter is documented in geodirectory_widgets.php */
48
-        $title = empty($instance['title']) ? __('Related Listing', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
47
+		/** This filter is documented in geodirectory_widgets.php */
48
+		$title = empty($instance['title']) ? __('Related Listing', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
49 49
 
50
-        /** This filter is documented in geodirectory-functions/general_functions.php */
50
+		/** This filter is documented in geodirectory-functions/general_functions.php */
51 51
 		$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
52 52
 
53
-        /**
54
-         * Filter the relation type to get related listing.
55
-         *
56
-         * @since 1.0.0
57
-         * @param string $instance['relate_to'] Can be tags or category.
58
-         */
53
+		/**
54
+		 * Filter the relation type to get related listing.
55
+		 *
56
+		 * @since 1.0.0
57
+		 * @param string $instance['relate_to'] Can be tags or category.
58
+		 */
59 59
 		$relate_to = empty($instance['relate_to']) ? 'category' : apply_filters('widget_relate_to', $instance['relate_to']);
60 60
 
61
-        /** This filter is documented in geodirectory-functions/general_functions.php */
61
+		/** This filter is documented in geodirectory-functions/general_functions.php */
62 62
 		$layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
63 63
 
64
-        /** This filter is documented in geodirectory-functions/general_functions.php */
64
+		/** This filter is documented in geodirectory-functions/general_functions.php */
65 65
 		$add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
66 66
 
67
-        /** This filter is documented in geodirectory-functions/general_functions.php */
67
+		/** This filter is documented in geodirectory-functions/general_functions.php */
68 68
 		$listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
69 69
 
70
-        /** This filter is documented in geodirectory-functions/general_functions.php */
70
+		/** This filter is documented in geodirectory-functions/general_functions.php */
71 71
 		$list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
72 72
 
73
-        /** This filter is documented in geodirectory-functions/general_functions.php */
73
+		/** This filter is documented in geodirectory-functions/general_functions.php */
74 74
 		$character_count = empty($instance['character_count']) ? 20 : apply_filters('widget_list_character_count', $instance['character_count']);
75 75
 
76
-        $arr = array(
77
-            'before_title' => $before_title,
78
-            'after_title' => $after_title,
79
-            'title' => $title,
80
-            'post_number' => $post_number,
81
-            'relate_to' => $relate_to,
82
-            'layout' => $layout,
83
-            'add_location_filter' => $add_location_filter,
84
-            'listing_width' => $listing_width,
85
-            'list_sort' => $list_sort,
86
-            'character_count' => $character_count,
87
-            'is_widget' => '1'
88
-        );
89
-
90
-        if ($widget_display = geodir_related_posts_display($arr)) {
91
-
92
-            echo $before_widget;
93
-            echo $widget_display;
94
-            echo $after_widget;
95
-        }
96
-    }
76
+		$arr = array(
77
+			'before_title' => $before_title,
78
+			'after_title' => $after_title,
79
+			'title' => $title,
80
+			'post_number' => $post_number,
81
+			'relate_to' => $relate_to,
82
+			'layout' => $layout,
83
+			'add_location_filter' => $add_location_filter,
84
+			'listing_width' => $listing_width,
85
+			'list_sort' => $list_sort,
86
+			'character_count' => $character_count,
87
+			'is_widget' => '1'
88
+		);
89
+
90
+		if ($widget_display = geodir_related_posts_display($arr)) {
91
+
92
+			echo $before_widget;
93
+			echo $widget_display;
94
+			echo $after_widget;
95
+		}
96
+	}
97 97
 
98 98
 	/**
99 99
 	 * Sanitize related listing widget form values as they are saved.
100 100
 	 *
101 101
 	 * @since 1.0.0
102
-     * @since 1.5.1 Declare function public.
102
+	 * @since 1.5.1 Declare function public.
103 103
 	 *
104 104
 	 * @param array $new_instance Values just sent to be saved.
105 105
 	 * @param array $old_instance Previously saved values from database.
106 106
 	 *
107 107
 	 * @return array Updated safe values to be saved.
108 108
 	 */
109
-    public function update($new_instance, $old_instance)
110
-    {
111
-        //save the widget
112
-        $instance = $old_instance;
113
-
114
-        $instance['title'] = strip_tags($new_instance['title']);
115
-        $instance['post_number'] = strip_tags($new_instance['post_number']);
116
-        $instance['relate_to'] = strip_tags($new_instance['relate_to']);
117
-        $instance['layout'] = strip_tags($new_instance['layout']);
118
-        $instance['listing_width'] = strip_tags($new_instance['listing_width']);
119
-        $instance['list_sort'] = strip_tags($new_instance['list_sort']);
120
-        $instance['character_count'] = $new_instance['character_count'];
121
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
122
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
123
-        else
124
-            $instance['add_location_filter'] = '0';
125
-
126
-        return $instance;
127
-    }
109
+	public function update($new_instance, $old_instance)
110
+	{
111
+		//save the widget
112
+		$instance = $old_instance;
113
+
114
+		$instance['title'] = strip_tags($new_instance['title']);
115
+		$instance['post_number'] = strip_tags($new_instance['post_number']);
116
+		$instance['relate_to'] = strip_tags($new_instance['relate_to']);
117
+		$instance['layout'] = strip_tags($new_instance['layout']);
118
+		$instance['listing_width'] = strip_tags($new_instance['listing_width']);
119
+		$instance['list_sort'] = strip_tags($new_instance['list_sort']);
120
+		$instance['character_count'] = $new_instance['character_count'];
121
+		if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
122
+			$instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
123
+		else
124
+			$instance['add_location_filter'] = '0';
125
+
126
+		return $instance;
127
+	}
128 128
 
129 129
 	/**
130 130
 	 * Back-end related listing widget settings form.
131 131
 	 *
132 132
 	 * @since 1.0.0
133
-     * @since 1.5.1 Declare function public.
133
+	 * @since 1.5.1 Declare function public.
134 134
 	 *
135 135
 	 * @param array $instance Previously saved values from database.
136 136
 	 */
137
-    public function form($instance)
138
-    {
139
-        //widgetform in backend
140
-        $instance = wp_parse_args((array)$instance,
141
-            array('title' => '',
142
-                'list_sort' => '',
143
-                'list_order' => '',
144
-                'post_number' => '5',
145
-                'relate_to' => '',
146
-                'layout' => 'gridview_onehalf',
147
-                'listing_width' => '',
148
-                'add_location_filter' => '1',
149
-                'character_count' => '20')
150
-        );
137
+	public function form($instance)
138
+	{
139
+		//widgetform in backend
140
+		$instance = wp_parse_args((array)$instance,
141
+			array('title' => '',
142
+				'list_sort' => '',
143
+				'list_order' => '',
144
+				'post_number' => '5',
145
+				'relate_to' => '',
146
+				'layout' => 'gridview_onehalf',
147
+				'listing_width' => '',
148
+				'add_location_filter' => '1',
149
+				'character_count' => '20')
150
+		);
151 151
 
152
-        $title = strip_tags($instance['title']);
152
+		$title = strip_tags($instance['title']);
153 153
 
154
-        $list_sort = strip_tags($instance['list_sort']);
154
+		$list_sort = strip_tags($instance['list_sort']);
155 155
 
156
-        $list_order = strip_tags($instance['list_order']);
156
+		$list_order = strip_tags($instance['list_order']);
157 157
 
158
-        $post_number = strip_tags($instance['post_number']);
158
+		$post_number = strip_tags($instance['post_number']);
159 159
 
160
-        $relate_to = strip_tags($instance['relate_to']);
160
+		$relate_to = strip_tags($instance['relate_to']);
161 161
 
162
-        $layout = strip_tags($instance['layout']);
162
+		$layout = strip_tags($instance['layout']);
163 163
 
164
-        $listing_width = strip_tags($instance['listing_width']);
164
+		$listing_width = strip_tags($instance['listing_width']);
165 165
 
166
-        $add_location_filter = strip_tags($instance['add_location_filter']);
166
+		$add_location_filter = strip_tags($instance['add_location_filter']);
167 167
 
168
-        $character_count = $instance['character_count'];
168
+		$character_count = $instance['character_count'];
169 169
 
170
-        ?>
170
+		?>
171 171
         <p>
172 172
             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
173 173
 
@@ -184,24 +184,24 @@  discard block
 block discarded – undo
184 184
                         name="<?php echo $this->get_field_name('list_sort'); ?>">
185 185
 
186 186
                     <option <?php if ($list_sort == 'latest') {
187
-                        echo 'selected="selected"';
188
-                    } ?> value="latest"><?php _e('Latest', 'geodirectory'); ?></option>
187
+						echo 'selected="selected"';
188
+					} ?> value="latest"><?php _e('Latest', 'geodirectory'); ?></option>
189 189
 
190 190
                     <option <?php if ($list_sort == 'featured') {
191
-                        echo 'selected="selected"';
192
-                    } ?> value="featured"><?php _e('Featured', 'geodirectory'); ?></option>
191
+						echo 'selected="selected"';
192
+					} ?> value="featured"><?php _e('Featured', 'geodirectory'); ?></option>
193 193
 
194 194
                     <option <?php if ($list_sort == 'high_review') {
195
-                        echo 'selected="selected"';
196
-                    } ?> value="high_review"><?php _e('Review', 'geodirectory'); ?></option>
195
+						echo 'selected="selected"';
196
+					} ?> value="high_review"><?php _e('Review', 'geodirectory'); ?></option>
197 197
 
198 198
                     <option <?php if ($list_sort == 'high_rating') {
199
-                        echo 'selected="selected"';
200
-                    } ?> value="high_rating"><?php _e('Rating', 'geodirectory'); ?></option>
199
+						echo 'selected="selected"';
200
+					} ?> value="high_rating"><?php _e('Rating', 'geodirectory'); ?></option>
201 201
 
202 202
                     <option <?php if ($list_sort == 'random') {
203
-                        echo 'selected="selected"';
204
-                    } ?> value="random"><?php _e('Random', 'geodirectory'); ?></option>
203
+						echo 'selected="selected"';
204
+					} ?> value="random"><?php _e('Random', 'geodirectory'); ?></option>
205 205
 
206 206
                 </select>
207 207
             </label>
@@ -221,11 +221,11 @@  discard block
 block discarded – undo
221 221
                 <select class="widefat" id="<?php echo $this->get_field_id('relate_to'); ?>"
222 222
                         name="<?php echo $this->get_field_name('relate_to'); ?>">
223 223
                     <option <?php if ($relate_to == 'category') {
224
-                        echo 'selected="selected"';
225
-                    } ?> value="category"><?php _e('Categories', 'geodirectory'); ?></option>
224
+						echo 'selected="selected"';
225
+					} ?> value="category"><?php _e('Categories', 'geodirectory'); ?></option>
226 226
                     <option <?php if ($relate_to == 'tags') {
227
-                        echo 'selected="selected"';
228
-                    } ?> value="tags"><?php _e('Tags', 'geodirectory'); ?></option>
227
+						echo 'selected="selected"';
228
+					} ?> value="tags"><?php _e('Tags', 'geodirectory'); ?></option>
229 229
                 </select>
230 230
             </label>
231 231
         </p>
@@ -236,24 +236,24 @@  discard block
 block discarded – undo
236 236
                 <select class="widefat" id="<?php echo $this->get_field_id('layout'); ?>"
237 237
                         name="<?php echo $this->get_field_name('layout'); ?>">
238 238
                     <option <?php if ($layout == 'gridview_onehalf') {
239
-                        echo 'selected="selected"';
240
-                    } ?>
239
+						echo 'selected="selected"';
240
+					} ?>
241 241
                         value="gridview_onehalf"><?php _e('Grid View (Two Columns)', 'geodirectory'); ?></option>
242 242
                     <option <?php if ($layout == 'gridview_onethird') {
243
-                        echo 'selected="selected"';
244
-                    } ?>
243
+						echo 'selected="selected"';
244
+					} ?>
245 245
                         value="gridview_onethird"><?php _e('Grid View (Three Columns)', 'geodirectory'); ?></option>
246 246
                     <option <?php if ($layout == 'gridview_onefourth') {
247
-                        echo 'selected="selected"';
248
-                    } ?>
247
+						echo 'selected="selected"';
248
+					} ?>
249 249
                         value="gridview_onefourth"><?php _e('Grid View (Four Columns)', 'geodirectory'); ?></option>
250 250
                     <option <?php if ($layout == 'gridview_onefifth') {
251
-                        echo 'selected="selected"';
252
-                    } ?>
251
+						echo 'selected="selected"';
252
+					} ?>
253 253
                         value="gridview_onefifth"><?php _e('Grid View (Five Columns)', 'geodirectory'); ?></option>
254 254
                     <option <?php if ($layout == 'list') {
255
-                        echo 'selected="selected"';
256
-                    } ?> value="list"><?php _e('List view', 'geodirectory'); ?></option>
255
+						echo 'selected="selected"';
256
+					} ?> value="list"><?php _e('List view', 'geodirectory'); ?></option>
257 257
 
258 258
                 </select>
259 259
             </label>
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
         </p>
286 286
 
287 287
     <?php
288
-    }
288
+	}
289 289
 } // class geodir_related_listing_postview
290 290
 
291 291
 register_widget('geodir_related_listing_postview');
292 292
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +9 added lines, -5 removed lines patch added patch discarded remove patch
@@ -118,10 +118,11 @@  discard block
 block discarded – undo
118 118
         $instance['listing_width'] = strip_tags($new_instance['listing_width']);
119 119
         $instance['list_sort'] = strip_tags($new_instance['list_sort']);
120 120
         $instance['character_count'] = $new_instance['character_count'];
121
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
122
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
123
-        else
124
-            $instance['add_location_filter'] = '0';
121
+        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '') {
122
+                    $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
123
+        } else {
124
+                    $instance['add_location_filter'] = '0';
125
+        }
125 126
 
126 127
         return $instance;
127 128
     }
@@ -279,7 +280,10 @@  discard block
 block discarded – undo
279 280
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
280 281
                 <?php _e('Enable Location Filter:', 'geodirectory');?>
281 282
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
282
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
283
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) {
284
+	echo 'checked="checked"';
285
+}
286
+?>
283 287
                        value="1"/>
284 288
             </label>
285 289
         </p>
Please login to merge, or discard this patch.
geodirectory-widgets/home_map_widget.php 3 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -192,8 +192,9 @@
 block discarded – undo
192 192
 
193 193
                     foreach ($map_zoom_level as $level) {
194 194
                         $selected = '';
195
-                        if ($level == $zoom)
196
-                            $selected = 'selected="selected"';
195
+                        if ($level == $zoom) {
196
+                                                    $selected = 'selected="selected"';
197
+                        }
197 198
 
198 199
                         echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';
199 200
 
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
     {
128 128
         //widgetform in backend
129 129
 
130
-        $instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'child_collapse' => '0', 'scrollwheel' => '0'));
130
+        $instance = wp_parse_args((array) $instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'child_collapse' => '0', 'scrollwheel' => '0'));
131 131
         $width = strip_tags($instance['width']);
132 132
         $heigh = strip_tags($instance['heigh']);
133 133
         $maptype = strip_tags($instance['maptype']);
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
                     <option <?php if (isset($maptype) && $maptype == 'HYBRID') {
173 173
                         echo 'selected="selected"';
174 174
                     } ?> value="HYBRID"><?php _e('Hybrid Map', 'geodirectory'); ?></option>
175
-					<option <?php selected($maptype, 'TERRAIN');?> 
175
+					<option <?php selected($maptype, 'TERRAIN'); ?> 
176 176
 							value="TERRAIN"><?php _e('Terrain Map', 'geodirectory'); ?></option>
177 177
                 </select>
178 178
             </label>
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
                         if ($level == $zoom)
195 195
                             $selected = 'selected="selected"';
196 196
 
197
-                        echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';
197
+                        echo '<option '.$selected.' value="'.$level.'">'.$level.'</option>';
198 198
 
199 199
                     } ?>
200 200
 
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
                 :
220 220
                 <input id="<?php echo $this->get_field_id('child_collapse'); ?>"
221 221
                        name="<?php echo $this->get_field_name('child_collapse'); ?>" type="checkbox" value="1"
222
-                       <?php if ($child_collapse){ ?>checked="checked" <?php } ?> />
222
+                       <?php if ($child_collapse) { ?>checked="checked" <?php } ?> />
223 223
             </label>
224 224
         </p>
225 225
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
                 :
230 230
                 <input id="<?php echo $this->get_field_id('scrollwheel'); ?>"
231 231
                        name="<?php echo $this->get_field_name('scrollwheel'); ?>" type="checkbox" value="1"
232
-                       <?php if ($scrollwheel){ ?>checked="checked" <?php } ?> />
232
+                       <?php if ($scrollwheel) { ?>checked="checked" <?php } ?> />
233 233
             </label>
234 234
         </p>
235 235
 
Please login to merge, or discard this patch.
Indentation   +105 added lines, -105 removed lines patch added patch discarded remove patch
@@ -16,127 +16,127 @@  discard block
 block discarded – undo
16 16
  */
17 17
 class geodir_homepage_map extends WP_Widget
18 18
 {
19
-    /**
19
+	/**
20 20
 	 * Register the home page map widget.
21 21
 	 *
22 22
 	 * @since 1.0.0
23
-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
23
+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
24 24
 	 */
25
-    public function __construct() {
26
-        $widget_ops = array('classname' => 'widget Google Map in Home page', 'description' => __('Google Map in Home page. It will show you google map V3 for Home page with category checkbox selection.', 'geodirectory'));
27
-        parent::__construct(
28
-            'geodir_map_v3_home_map', // Base ID
29
-            __('GD > GMap - Home page', 'geodirectory'), // Name
30
-            $widget_ops// Args
31
-        );
32
-    }
25
+	public function __construct() {
26
+		$widget_ops = array('classname' => 'widget Google Map in Home page', 'description' => __('Google Map in Home page. It will show you google map V3 for Home page with category checkbox selection.', 'geodirectory'));
27
+		parent::__construct(
28
+			'geodir_map_v3_home_map', // Base ID
29
+			__('GD > GMap - Home page', 'geodirectory'), // Name
30
+			$widget_ops// Args
31
+		);
32
+	}
33 33
 
34 34
 	/**
35 35
 	 * Front-end display content for home page map widget.
36 36
 	 *
37 37
 	 * @since 1.0.0
38
-     * @since 1.5.1 Declare function public.
38
+	 * @since 1.5.1 Declare function public.
39 39
 	 *
40 40
 	 * @param array $args     Widget arguments.
41 41
 	 * @param array $instance Saved values from database.
42 42
 	 */
43
-    public function widget($args, $instance)
44
-    {
45
-        extract($args, EXTR_SKIP);
46
-        /** This action is documented in geodirectory_shortcodes.php */
47
-        $width = empty($instance['width']) ? '100%' : apply_filters('widget_width', $instance['width']);
48
-        /** This action is documented in geodirectory_shortcodes.php */
49
-        $height = empty($instance['heigh']) ? '425' : apply_filters('widget_heigh', $instance['heigh']);
50
-        /** This action is documented in geodirectory_shortcodes.php */
51
-        $maptype = empty($instance['maptype']) ? 'ROADMAP' : apply_filters('widget_maptype', $instance['maptype']);
52
-        /** This action is documented in geodirectory_shortcodes.php */
53
-        $zoom = empty($instance['zoom']) ? '13' : apply_filters('widget_zoom', $instance['zoom']);
54
-        /** This action is documented in geodirectory_shortcodes.php */
55
-        $autozoom = empty($instance['autozoom']) ? '' : apply_filters('widget_autozoom', $instance['autozoom']);
56
-        /** This action is documented in geodirectory_shortcodes.php */
57
-        $child_collapse = empty($instance['child_collapse']) ? '0' : apply_filters('widget_child_collapse', $instance['child_collapse']);
58
-        /** This action is documented in geodirectory_shortcodes.php */
59
-        $scrollwheel = empty($instance['scrollwheel']) ? '0' : apply_filters('widget_scrollwheel', $instance['scrollwheel']);
43
+	public function widget($args, $instance)
44
+	{
45
+		extract($args, EXTR_SKIP);
46
+		/** This action is documented in geodirectory_shortcodes.php */
47
+		$width = empty($instance['width']) ? '100%' : apply_filters('widget_width', $instance['width']);
48
+		/** This action is documented in geodirectory_shortcodes.php */
49
+		$height = empty($instance['heigh']) ? '425' : apply_filters('widget_heigh', $instance['heigh']);
50
+		/** This action is documented in geodirectory_shortcodes.php */
51
+		$maptype = empty($instance['maptype']) ? 'ROADMAP' : apply_filters('widget_maptype', $instance['maptype']);
52
+		/** This action is documented in geodirectory_shortcodes.php */
53
+		$zoom = empty($instance['zoom']) ? '13' : apply_filters('widget_zoom', $instance['zoom']);
54
+		/** This action is documented in geodirectory_shortcodes.php */
55
+		$autozoom = empty($instance['autozoom']) ? '' : apply_filters('widget_autozoom', $instance['autozoom']);
56
+		/** This action is documented in geodirectory_shortcodes.php */
57
+		$child_collapse = empty($instance['child_collapse']) ? '0' : apply_filters('widget_child_collapse', $instance['child_collapse']);
58
+		/** This action is documented in geodirectory_shortcodes.php */
59
+		$scrollwheel = empty($instance['scrollwheel']) ? '0' : apply_filters('widget_scrollwheel', $instance['scrollwheel']);
60 60
 
61
-        $map_args = array();
62
-        $map_args['map_canvas_name'] = str_replace('-', '_', $args['widget_id']); //'home_map_canvas'.$str ;
63
-        $map_args['width'] = $width;
64
-        $map_args['height'] = $height;
65
-        $map_args['maptype'] = $maptype;
66
-        $map_args['scrollwheel'] = $scrollwheel;
67
-        $map_args['fullscreenControl'] = false;
68
-        $map_args['zoom'] = $zoom;
69
-        $map_args['autozoom'] = $autozoom;
70
-        $map_args['child_collapse'] = $child_collapse;
71
-        $map_args['enable_cat_filters'] = true;
72
-        $map_args['enable_text_search'] = true;
73
-        $map_args['enable_post_type_filters'] = true;
74
-        /** This action is documented in geodirectory_shortcodes.php */
75
-        $map_args['enable_location_filters'] = apply_filters('geodir_home_map_enable_location_filters', false);
76
-        $map_args['enable_jason_on_load'] = false;
77
-        $map_args['enable_marker_cluster'] = false;
78
-        $map_args['enable_map_resize_button'] = true;
79
-        $map_args['map_class_name'] = 'geodir-map-home-page';
61
+		$map_args = array();
62
+		$map_args['map_canvas_name'] = str_replace('-', '_', $args['widget_id']); //'home_map_canvas'.$str ;
63
+		$map_args['width'] = $width;
64
+		$map_args['height'] = $height;
65
+		$map_args['maptype'] = $maptype;
66
+		$map_args['scrollwheel'] = $scrollwheel;
67
+		$map_args['fullscreenControl'] = false;
68
+		$map_args['zoom'] = $zoom;
69
+		$map_args['autozoom'] = $autozoom;
70
+		$map_args['child_collapse'] = $child_collapse;
71
+		$map_args['enable_cat_filters'] = true;
72
+		$map_args['enable_text_search'] = true;
73
+		$map_args['enable_post_type_filters'] = true;
74
+		/** This action is documented in geodirectory_shortcodes.php */
75
+		$map_args['enable_location_filters'] = apply_filters('geodir_home_map_enable_location_filters', false);
76
+		$map_args['enable_jason_on_load'] = false;
77
+		$map_args['enable_marker_cluster'] = false;
78
+		$map_args['enable_map_resize_button'] = true;
79
+		$map_args['map_class_name'] = 'geodir-map-home-page';
80 80
 
81
-        $is_geodir_home_map_widget = true;
82
-        $map_args['is_geodir_home_map_widget'] = $is_geodir_home_map_widget;
81
+		$is_geodir_home_map_widget = true;
82
+		$map_args['is_geodir_home_map_widget'] = $is_geodir_home_map_widget;
83 83
 
84
-        geodir_draw_map($map_args);
84
+		geodir_draw_map($map_args);
85 85
 
86
-        /* home map post type slider */
87
-        if ($is_geodir_home_map_widget) {
88
-            add_action('wp_footer', array($this, 'geodir_home_map_add_script'), 100);
89
-        }
86
+		/* home map post type slider */
87
+		if ($is_geodir_home_map_widget) {
88
+			add_action('wp_footer', array($this, 'geodir_home_map_add_script'), 100);
89
+		}
90 90
 
91
-    }
91
+	}
92 92
 
93 93
 	/**
94 94
 	 * Sanitize home page map widget form values as they are saved.
95 95
 	 *
96 96
 	 * @since 1.0.0
97
-     * @since 1.5.1 Declare function public.
97
+	 * @since 1.5.1 Declare function public.
98 98
 	 *
99 99
 	 * @param array $new_instance Values just sent to be saved.
100 100
 	 * @param array $old_instance Previously saved values from database.
101 101
 	 *
102 102
 	 * @return array Updated safe values to be saved.
103 103
 	 */
104
-    public function update($new_instance, $old_instance)
105
-    {
106
-        //save the widget
107
-        $instance = $old_instance;
108
-        $instance['width'] = strip_tags($new_instance['width']);
109
-        $instance['heigh'] = ($new_instance['heigh']);
110
-        $instance['maptype'] = ($new_instance['maptype']);
111
-        $instance['zoom'] = ($new_instance['zoom']);
112
-        $instance['autozoom'] = isset($new_instance['autozoom']) ? $new_instance['autozoom'] : '';
113
-        $instance['child_collapse'] = isset($new_instance['child_collapse']) ? ($new_instance['child_collapse']) : '';
114
-        $instance['scrollwheel'] = isset($new_instance['scrollwheel']) ? ($new_instance['scrollwheel']) : '';
104
+	public function update($new_instance, $old_instance)
105
+	{
106
+		//save the widget
107
+		$instance = $old_instance;
108
+		$instance['width'] = strip_tags($new_instance['width']);
109
+		$instance['heigh'] = ($new_instance['heigh']);
110
+		$instance['maptype'] = ($new_instance['maptype']);
111
+		$instance['zoom'] = ($new_instance['zoom']);
112
+		$instance['autozoom'] = isset($new_instance['autozoom']) ? $new_instance['autozoom'] : '';
113
+		$instance['child_collapse'] = isset($new_instance['child_collapse']) ? ($new_instance['child_collapse']) : '';
114
+		$instance['scrollwheel'] = isset($new_instance['scrollwheel']) ? ($new_instance['scrollwheel']) : '';
115 115
 
116
-        return $instance;
117
-    }
116
+		return $instance;
117
+	}
118 118
 
119 119
 	/**
120 120
 	 * Back-end home page map widget settings form.
121 121
 	 *
122 122
 	 * @since 1.0.0
123
-     * @since 1.5.1 Declare function public.
123
+	 * @since 1.5.1 Declare function public.
124 124
 	 *
125 125
 	 * @param array $instance Previously saved values from database.
126 126
 	 */
127
-    public function form($instance)
128
-    {
129
-        //widgetform in backend
127
+	public function form($instance)
128
+	{
129
+		//widgetform in backend
130 130
 
131
-        $instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'child_collapse' => '0', 'scrollwheel' => '0'));
132
-        $width = strip_tags($instance['width']);
133
-        $heigh = strip_tags($instance['heigh']);
134
-        $maptype = strip_tags($instance['maptype']);
135
-        $zoom = strip_tags($instance['zoom']);
136
-        $autozoom = strip_tags($instance['autozoom']);
137
-        $child_collapse = strip_tags($instance['child_collapse']);
138
-        $scrollwheel = strip_tags($instance['scrollwheel']);
139
-        ?>
131
+		$instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'child_collapse' => '0', 'scrollwheel' => '0'));
132
+		$width = strip_tags($instance['width']);
133
+		$heigh = strip_tags($instance['heigh']);
134
+		$maptype = strip_tags($instance['maptype']);
135
+		$zoom = strip_tags($instance['zoom']);
136
+		$autozoom = strip_tags($instance['autozoom']);
137
+		$child_collapse = strip_tags($instance['child_collapse']);
138
+		$scrollwheel = strip_tags($instance['scrollwheel']);
139
+		?>
140 140
 
141 141
         <p>
142 142
             <label
@@ -165,14 +165,14 @@  discard block
 block discarded – undo
165 165
                         name="<?php echo $this->get_field_name('maptype'); ?>">
166 166
 
167 167
                     <option <?php if (isset($maptype) && $maptype == 'ROADMAP') {
168
-                        echo 'selected="selected"';
169
-                    } ?> value="ROADMAP"><?php _e('Road Map', 'geodirectory'); ?></option>
168
+						echo 'selected="selected"';
169
+					} ?> value="ROADMAP"><?php _e('Road Map', 'geodirectory'); ?></option>
170 170
                     <option <?php if (isset($maptype) && $maptype == 'SATELLITE') {
171
-                        echo 'selected="selected"';
172
-                    } ?> value="SATELLITE"><?php _e('Satellite Map', 'geodirectory'); ?></option>
171
+						echo 'selected="selected"';
172
+					} ?> value="SATELLITE"><?php _e('Satellite Map', 'geodirectory'); ?></option>
173 173
                     <option <?php if (isset($maptype) && $maptype == 'HYBRID') {
174
-                        echo 'selected="selected"';
175
-                    } ?> value="HYBRID"><?php _e('Hybrid Map', 'geodirectory'); ?></option>
174
+						echo 'selected="selected"';
175
+					} ?> value="HYBRID"><?php _e('Hybrid Map', 'geodirectory'); ?></option>
176 176
 					<option <?php selected($maptype, 'TERRAIN');?> 
177 177
 							value="TERRAIN"><?php _e('Terrain Map', 'geodirectory'); ?></option>
178 178
                 </select>
@@ -180,8 +180,8 @@  discard block
 block discarded – undo
180 180
         </p>
181 181
 
182 182
         <?php
183
-        $map_zoom_level = geodir_map_zoom_level();
184
-        ?>
183
+		$map_zoom_level = geodir_map_zoom_level();
184
+		?>
185 185
 
186 186
         <p>
187 187
             <label
@@ -190,14 +190,14 @@  discard block
 block discarded – undo
190 190
                 <select class="widefat" id="<?php echo $this->get_field_id('zoom'); ?>"
191 191
                         name="<?php echo $this->get_field_name('zoom'); ?>"> <?php
192 192
 
193
-                    foreach ($map_zoom_level as $level) {
194
-                        $selected = '';
195
-                        if ($level == $zoom)
196
-                            $selected = 'selected="selected"';
193
+					foreach ($map_zoom_level as $level) {
194
+						$selected = '';
195
+						if ($level == $zoom)
196
+							$selected = 'selected="selected"';
197 197
 
198
-                        echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';
198
+						echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';
199 199
 
200
-                    } ?>
200
+					} ?>
201 201
 
202 202
                 </select>
203 203
             </label>
@@ -210,8 +210,8 @@  discard block
 block discarded – undo
210 210
                 :
211 211
                 <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('autozoom'); ?>"
212 212
                        name="<?php echo $this->get_field_name('autozoom'); ?>"<?php if ($autozoom) {
213
-                    echo 'checked="checked"';
214
-                } ?> /></label>
213
+					echo 'checked="checked"';
214
+				} ?> /></label>
215 215
         </p>
216 216
 
217 217
         <p>
@@ -235,17 +235,17 @@  discard block
 block discarded – undo
235 235
         </p>
236 236
 
237 237
     <?php
238
-    }
238
+	}
239 239
 
240
-    /**
240
+	/**
241 241
 	 * Adds the javascript in the footer for home page map widget.
242 242
 	 *
243 243
 	 * @since 1.0.0
244
-     * @since 1.5.1 Declare function public.
244
+	 * @since 1.5.1 Declare function public.
245 245
 	 */
246
-    public function geodir_home_map_add_script()
247
-    {
248
-        ?>
246
+	public function geodir_home_map_add_script()
247
+	{
248
+		?>
249 249
         <script type="text/javascript">
250 250
             jQuery(document).ready(function () {
251 251
                 geoDirMapSlide();
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
             }
319 319
         </script>
320 320
     <?php
321
-    }
321
+	}
322 322
 } // class geodir_homepage_map
323 323
 
324 324
 register_widget('geodir_homepage_map');
Please login to merge, or discard this patch.
geodirectory-admin/admin_db_install.php 3 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,12 @@
 block discarded – undo
23 23
 
24 24
         $collate = '';
25 25
         if ($wpdb->has_cap('collation')) {
26
-            if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";
27
-            if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";
26
+            if (!empty($wpdb->charset)) {
27
+            	$collate = "DEFAULT CHARACTER SET $wpdb->charset";
28
+            }
29
+            if (!empty($wpdb->collate)) {
30
+            	$collate .= " COLLATE $wpdb->collate";
31
+            }
28 32
         }
29 33
 
30 34
 		/**
Please login to merge, or discard this patch.
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -32,35 +32,35 @@  discard block
 block discarded – undo
32 32
 		 *
33 33
 		 * @since 1.0.0
34 34
 		 */
35
-		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
35
+		require_once(ABSPATH.'wp-admin/includes/upgrade.php');
36 36
 
37 37
 
38 38
 // rename tables if we need to
39
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {
40
-            $wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");
39
+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_countries'") == 0) {
40
+            $wpdb->query("RENAME TABLE geodir_countries TO ".$wpdb->prefix."geodir_countries");
41 41
         }
42
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {
43
-            $wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");
42
+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_custom_fields'") == 0) {
43
+            $wpdb->query("RENAME TABLE geodir_custom_fields TO ".$wpdb->prefix."geodir_custom_fields");
44 44
         }
45
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {
46
-            $wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");
45
+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_post_icon'") == 0) {
46
+            $wpdb->query("RENAME TABLE geodir_post_icon TO ".$wpdb->prefix."geodir_post_icon");
47 47
         }
48
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {
49
-            $wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");
48
+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_attachments'") == 0) {
49
+            $wpdb->query("RENAME TABLE geodir_attachments TO ".$wpdb->prefix."geodir_attachments");
50 50
         }
51
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {
52
-            $wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");
51
+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_post_review'") == 0) {
52
+            $wpdb->query("RENAME TABLE geodir_post_review TO ".$wpdb->prefix."geodir_post_review");
53 53
         }
54
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {
55
-            $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");
54
+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_custom_sort_fields'") == 0) {
55
+            $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO ".$wpdb->prefix."geodir_custom_sort_fields");
56 56
         }
57
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {
58
-            $wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");
57
+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_gd_place_detail'") == 0) {
58
+            $wpdb->query("RENAME TABLE geodir_gd_place_detail TO ".$wpdb->prefix."geodir_gd_place_detail");
59 59
         }
60 60
 
61 61
 
62 62
         // Table for storing Countries
63
-        $GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " (
63
+        $GEODIR_COUNTRIES_TABLE = "CREATE TABLE ".GEODIR_COUNTRIES_TABLE." (
64 64
 						CountryId smallint AUTO_INCREMENT NOT NULL ,
65 65
 						Country varchar (50) NOT NULL ,
66 66
 						FIPS104 varchar (2) NOT NULL ,
@@ -89,11 +89,11 @@  discard block
 block discarded – undo
89 89
         dbDelta($GEODIR_COUNTRIES_TABLE);
90 90
 
91 91
 
92
-        $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");
92
+        $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM ".GEODIR_COUNTRIES_TABLE."");
93 93
 
94 94
         if ($country_table_empty == 0) {
95 95
 
96
-            $countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES
96
+            $countries_insert = "INSERT INTO ".GEODIR_COUNTRIES_TABLE." (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES
97 97
 	(1, 'Afghanistan', 'AF', 'AF', 'AFG', '4', 'AF', 'Kabul ', 'Asia ', 'Afghan', 'Afghans', 'Afghani ', 'AFA', 26813057, 'Afghanistan', ''),
98 98
 	(2, 'Albania', 'AL', 'AL', 'ALB', '8', 'AL', 'Tirana ', 'Europe ', 'Albanian', 'Albanians', 'Lek ', 'ALL', 3510484, 'Albania', ''),
99 99
 	(3, 'Algeria', 'AG', 'DZ', 'DZA', '12', 'DZ', 'Algiers ', 'Africa ', 'Algerian', 'Algerians', 'Algerian Dinar ', 'DZD', 31736053, 'Algeria', ''),
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 
383 383
         // Table for storing location attribute - these are user defined
384 384
 
385
-        $icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " (
385
+        $icon_table = "CREATE TABLE ".GEODIR_ICON_TABLE." (
386 386
 						id int NOT NULL AUTO_INCREMENT,
387 387
 						post_id int( 10 ) NOT NULL,
388 388
 						post_title varchar(254) NOT NULL,
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
 
404 404
         // Table for storing post custom fields - these are user defined
405 405
 
406
-        $post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " (
406
+        $post_custom_fields = "CREATE TABLE ".GEODIR_CUSTOM_FIELDS_TABLE." (
407 407
 							  id int(11) NOT NULL AUTO_INCREMENT,
408 408
 							  post_type varchar(100) NULL,
409 409
 							  data_type varchar(100) NULL DEFAULT NULL,
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
         dbDelta($post_custom_fields);
449 449
 
450 450
         // Table for storing place attribute - these are user defined
451
-        $post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail (
451
+        $post_detail = "CREATE TABLE ".$plugin_prefix."gd_place_detail (
452 452
 						post_id int(11) NOT NULL,
453 453
 						post_title text NULL DEFAULT NULL,
454 454
 						post_status varchar(20) NULL DEFAULT NULL,
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
 
490 490
         // Table for storing place images - these are user defined
491 491
 
492
-        $attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " (
492
+        $attechment_table = "CREATE TABLE ".GEODIR_ATTACHMENT_TABLE." (
493 493
 						ID int(11) NOT NULL AUTO_INCREMENT,
494 494
 						post_id int(11) NOT NULL,
495 495
 						user_id int(11) DEFAULT NULL,
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
         dbDelta($attechment_table);
517 517
 
518 518
 
519
-        $custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " (
519
+        $custom_sort_fields_table = "CREATE TABLE ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." (
520 520
 			id int(11) NOT NULL AUTO_INCREMENT,
521 521
 			post_type varchar(255) NOT NULL,
522 522
 			data_type varchar(255) NOT NULL,
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
545 545
         dbDelta($custom_sort_fields_table);
546 546
 
547 547
 
548
-            $review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " (
548
+            $review_table = "CREATE TABLE ".GEODIR_REVIEW_TABLE." (
549 549
 			id int(11) NOT NULL AUTO_INCREMENT,
550 550
 			post_id int(11) DEFAULT NULL,
551 551
 			post_title varchar( 255 ) NULL DEFAULT NULL,
Please login to merge, or discard this patch.
Indentation   +155 added lines, -155 removed lines patch added patch discarded remove patch
@@ -6,26 +6,26 @@  discard block
 block discarded – undo
6 6
  * @package GeoDirectory
7 7
  */
8 8
 if (!function_exists('geodir_create_tables')) {
9
-    /**
10
-     * Creates custom db tables for storing GeoDirectory plugin data.
11
-     *
12
-     * @since 1.0.0
13
-     * @package GeoDirectory
14
-     * @global object $wpdb WordPress Database object.
15
-     * @global string $plugin_prefix GeoDirectory plugin table prefix.
16
-     */
17
-    function geodir_create_tables()
18
-    {
19
-
20
-        global $wpdb, $plugin_prefix;
21
-
22
-        $wpdb->hide_errors();
23
-
24
-        $collate = '';
25
-        if ($wpdb->has_cap('collation')) {
26
-            if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";
27
-            if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";
28
-        }
9
+	/**
10
+	 * Creates custom db tables for storing GeoDirectory plugin data.
11
+	 *
12
+	 * @since 1.0.0
13
+	 * @package GeoDirectory
14
+	 * @global object $wpdb WordPress Database object.
15
+	 * @global string $plugin_prefix GeoDirectory plugin table prefix.
16
+	 */
17
+	function geodir_create_tables()
18
+	{
19
+
20
+		global $wpdb, $plugin_prefix;
21
+
22
+		$wpdb->hide_errors();
23
+
24
+		$collate = '';
25
+		if ($wpdb->has_cap('collation')) {
26
+			if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";
27
+			if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";
28
+		}
29 29
 
30 30
 		/**
31 31
 		 * Include any functions needed for upgrades.
@@ -36,31 +36,31 @@  discard block
 block discarded – undo
36 36
 
37 37
 
38 38
 // rename tables if we need to
39
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {
40
-            $wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");
41
-        }
42
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {
43
-            $wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");
44
-        }
45
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {
46
-            $wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");
47
-        }
48
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {
49
-            $wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");
50
-        }
51
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {
52
-            $wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");
53
-        }
54
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {
55
-            $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");
56
-        }
57
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {
58
-            $wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");
59
-        }
60
-
61
-
62
-        // Table for storing Countries
63
-        $GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " (
39
+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {
40
+			$wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");
41
+		}
42
+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {
43
+			$wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");
44
+		}
45
+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {
46
+			$wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");
47
+		}
48
+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {
49
+			$wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");
50
+		}
51
+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {
52
+			$wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");
53
+		}
54
+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {
55
+			$wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");
56
+		}
57
+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {
58
+			$wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");
59
+		}
60
+
61
+
62
+		// Table for storing Countries
63
+		$GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " (
64 64
 						CountryId smallint AUTO_INCREMENT NOT NULL ,
65 65
 						Country varchar (50) NOT NULL ,
66 66
 						FIPS104 varchar (2) NOT NULL ,
@@ -79,21 +79,21 @@  discard block
 block discarded – undo
79 79
 						Comment varchar (255) NULL ,
80 80
 						PRIMARY KEY  (CountryId)) $collate ";
81 81
 
82
-        /**
83
-         * Filter the SQL query that creates/updates the country DB table structure.
84
-         *
85
-         * @since 1.0.0
86
-         * @param string $sql The SQL insert query string.
87
-         */
88
-        $GEODIR_COUNTRIES_TABLE = apply_filters('geodir_before_country_table_create', $GEODIR_COUNTRIES_TABLE);
89
-        dbDelta($GEODIR_COUNTRIES_TABLE);
82
+		/**
83
+		 * Filter the SQL query that creates/updates the country DB table structure.
84
+		 *
85
+		 * @since 1.0.0
86
+		 * @param string $sql The SQL insert query string.
87
+		 */
88
+		$GEODIR_COUNTRIES_TABLE = apply_filters('geodir_before_country_table_create', $GEODIR_COUNTRIES_TABLE);
89
+		dbDelta($GEODIR_COUNTRIES_TABLE);
90 90
 
91 91
 
92
-        $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");
92
+		$country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");
93 93
 
94
-        if ($country_table_empty == 0) {
94
+		if ($country_table_empty == 0) {
95 95
 
96
-            $countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES
96
+			$countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES
97 97
 	(1, 'Afghanistan', 'AF', 'AF', 'AFG', '4', 'AF', 'Kabul ', 'Asia ', 'Afghan', 'Afghans', 'Afghani ', 'AFA', 26813057, 'Afghanistan', ''),
98 98
 	(2, 'Albania', 'AL', 'AL', 'ALB', '8', 'AL', 'Tirana ', 'Europe ', 'Albanian', 'Albanians', 'Lek ', 'ALL', 3510484, 'Albania', ''),
99 99
 	(3, 'Algeria', 'AG', 'DZ', 'DZA', '12', 'DZ', 'Algiers ', 'Africa ', 'Algerian', 'Algerians', 'Algerian Dinar ', 'DZD', 31736053, 'Algeria', ''),
@@ -371,21 +371,21 @@  discard block
 block discarded – undo
371 371
     (281, 'South Sudan', '--', 'SS', '-- ', '--', 'SS', '', '', '', '', 'South Sudanese pound', 'SSP', 12340000, 'South Sudan', ''),
372 372
     (282, 'Isle of Man', '--', 'IM', '-- ', '--', 'IM', '', '', '', '', 'Manx pound', 'IMP', 84497, 'Isle of Man', '')";
373 373
 
374
-            /**
375
-             * Filter the SQL query that inserts the country DB table data.
376
-             *
377
-             * @since 1.0.0
378
-             * @param string $sql The SQL insert query string.
379
-             */
380
-            $countries_insert = apply_filters('geodir_before_country_data_insert', $countries_insert);
381
-            $wpdb->query($countries_insert);
374
+			/**
375
+			 * Filter the SQL query that inserts the country DB table data.
376
+			 *
377
+			 * @since 1.0.0
378
+			 * @param string $sql The SQL insert query string.
379
+			 */
380
+			$countries_insert = apply_filters('geodir_before_country_data_insert', $countries_insert);
381
+			$wpdb->query($countries_insert);
382 382
 
383
-        }
383
+		}
384 384
 
385 385
 
386
-        // Table for storing location attribute - these are user defined
386
+		// Table for storing location attribute - these are user defined
387 387
 
388
-        $icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " (
388
+		$icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " (
389 389
 						id int NOT NULL AUTO_INCREMENT,
390 390
 						post_id int( 10 ) NOT NULL,
391 391
 						post_title varchar(254) NOT NULL,
@@ -394,19 +394,19 @@  discard block
 block discarded – undo
394 394
 						PRIMARY KEY  (id)
395 395
 						) $collate ";
396 396
 
397
-        /**
398
-         * Filter the SQL query that creates/updates the post_icon DB table structure.
399
-         *
400
-         * @since 1.0.0
401
-         * @param string $sql The SQL insert query string.
402
-         */
403
-        $icon_table = apply_filters('geodir_before_icon_table_create', $icon_table);
397
+		/**
398
+		 * Filter the SQL query that creates/updates the post_icon DB table structure.
399
+		 *
400
+		 * @since 1.0.0
401
+		 * @param string $sql The SQL insert query string.
402
+		 */
403
+		$icon_table = apply_filters('geodir_before_icon_table_create', $icon_table);
404 404
 
405
-        dbDelta($icon_table);
405
+		dbDelta($icon_table);
406 406
 
407
-        // Table for storing post custom fields - these are user defined
407
+		// Table for storing post custom fields - these are user defined
408 408
 
409
-        $post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " (
409
+		$post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " (
410 410
 							  id int(11) NOT NULL AUTO_INCREMENT,
411 411
 							  post_type varchar(100) NULL,
412 412
 							  data_type varchar(100) NULL DEFAULT NULL,
@@ -442,18 +442,18 @@  discard block
 block discarded – undo
442 442
 							  PRIMARY KEY  (id)
443 443
 							  ) $collate";
444 444
 
445
-        /**
446
-         * Filter the SQL query that creates/updates the custom_fields DB table structure.
447
-         *
448
-         * @since 1.0.0
449
-         * @param string $sql The SQL insert query string.
450
-         */
451
-        $post_custom_fields = apply_filters('geodir_before_custom_field_table_create', $post_custom_fields);
445
+		/**
446
+		 * Filter the SQL query that creates/updates the custom_fields DB table structure.
447
+		 *
448
+		 * @since 1.0.0
449
+		 * @param string $sql The SQL insert query string.
450
+		 */
451
+		$post_custom_fields = apply_filters('geodir_before_custom_field_table_create', $post_custom_fields);
452 452
 
453
-        dbDelta($post_custom_fields);
453
+		dbDelta($post_custom_fields);
454 454
 
455
-        // Table for storing place attribute - these are user defined
456
-        $post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail (
455
+		// Table for storing place attribute - these are user defined
456
+		$post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail (
457 457
 						post_id int(11) NOT NULL,
458 458
 						post_title text NULL DEFAULT NULL,
459 459
 						post_status varchar(20) NULL DEFAULT NULL,
@@ -482,22 +482,22 @@  discard block
 block discarded – undo
482 482
 						KEY is_featured (is_featured)
483 483
 						) $collate ";
484 484
 
485
-        /**
486
-         * Filter the SQL query that creates/updates the post_detail DB table structure.
487
-         *
488
-         * @since 1.0.0
489
-         * @param string $sql The SQL insert query string.
490
-         */
491
-        $post_detail = apply_filters('geodir_before_post_detail_table_create', $post_detail);
485
+		/**
486
+		 * Filter the SQL query that creates/updates the post_detail DB table structure.
487
+		 *
488
+		 * @since 1.0.0
489
+		 * @param string $sql The SQL insert query string.
490
+		 */
491
+		$post_detail = apply_filters('geodir_before_post_detail_table_create', $post_detail);
492 492
 
493
-        dbDelta($post_detail);
493
+		dbDelta($post_detail);
494 494
 
495
-        // alter post_title
496
-        //$wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_gd_place_detail MODIFY `post_title` text NULL");
495
+		// alter post_title
496
+		//$wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_gd_place_detail MODIFY `post_title` text NULL");
497 497
 
498
-        // Table for storing place images - these are user defined
498
+		// Table for storing place images - these are user defined
499 499
 
500
-        $attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " (
500
+		$attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " (
501 501
 						ID int(11) NOT NULL AUTO_INCREMENT,
502 502
 						post_id int(11) NOT NULL,
503 503
 						user_id int(11) DEFAULT NULL,
@@ -513,18 +513,18 @@  discard block
 block discarded – undo
513 513
 						PRIMARY KEY  (ID)
514 514
 						) $collate ";
515 515
 
516
-        /**
517
-         * Filter the SQL query that creates/updates the attachments DB table structure.
518
-         *
519
-         * @since 1.0.0
520
-         * @param string $sql The SQL insert query string.
521
-         */
522
-        $attechment_table = apply_filters('geodir_before_attachment_table_create', $attechment_table);
516
+		/**
517
+		 * Filter the SQL query that creates/updates the attachments DB table structure.
518
+		 *
519
+		 * @since 1.0.0
520
+		 * @param string $sql The SQL insert query string.
521
+		 */
522
+		$attechment_table = apply_filters('geodir_before_attachment_table_create', $attechment_table);
523 523
 
524
-        dbDelta($attechment_table);
524
+		dbDelta($attechment_table);
525 525
 
526 526
 
527
-        $custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " (
527
+		$custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " (
528 528
 			id int(11) NOT NULL AUTO_INCREMENT,
529 529
 			post_type varchar(255) NOT NULL,
530 530
 			data_type varchar(255) NOT NULL,
@@ -542,18 +542,18 @@  discard block
 block discarded – undo
542 542
 			PRIMARY KEY  (id)
543 543
 			) $collate ";
544 544
 
545
-        /**
546
-         * Filter the SQL query that creates/updates the custom_sort_fields DB table structure.
547
-         *
548
-         * @since 1.0.0
549
-         * @param string $sql The SQL insert query string.
550
-         */
551
-        $custom_sort_fields_table = apply_filters('geodir_before_sort_fields_table_create', $custom_sort_fields_table);
545
+		/**
546
+		 * Filter the SQL query that creates/updates the custom_sort_fields DB table structure.
547
+		 *
548
+		 * @since 1.0.0
549
+		 * @param string $sql The SQL insert query string.
550
+		 */
551
+		$custom_sort_fields_table = apply_filters('geodir_before_sort_fields_table_create', $custom_sort_fields_table);
552 552
 
553
-        dbDelta($custom_sort_fields_table);
553
+		dbDelta($custom_sort_fields_table);
554 554
 
555 555
 
556
-            $review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " (
556
+			$review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " (
557 557
 			id int(11) NOT NULL AUTO_INCREMENT,
558 558
 			post_id int(11) DEFAULT NULL,
559 559
 			post_title varchar( 255 ) NULL DEFAULT NULL,
@@ -577,51 +577,51 @@  discard block
 block discarded – undo
577 577
 			PRIMARY KEY  (id)
578 578
 			) $collate  ";
579 579
 
580
-            /**
581
-             * Filter the SQL query that creates the review DB table structure.
582
-             *
583
-             * @since 1.0.0
584
-             * @param string $sql The SQL insert query string.
585
-             */
586
-            $review_table = apply_filters('geodir_before_review_table_create', $review_table);
587
-            dbDelta($review_table);
580
+			/**
581
+			 * Filter the SQL query that creates the review DB table structure.
582
+			 *
583
+			 * @since 1.0.0
584
+			 * @param string $sql The SQL insert query string.
585
+			 */
586
+			$review_table = apply_filters('geodir_before_review_table_create', $review_table);
587
+			dbDelta($review_table);
588 588
 
589 589
 
590 590
 
591
-        // Alter terms table
592
-        $term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'");
593
-        if (!$term_icon_column) {
594
-            $wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL");
595
-        }
591
+		// Alter terms table
592
+		$term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'");
593
+		if (!$term_icon_column) {
594
+			$wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL");
595
+		}
596 596
 
597
-        //require_once(geodir_plugin_path() . '/upgrade.php');
597
+		//require_once(geodir_plugin_path() . '/upgrade.php');
598 598
 
599 599
 
600
-    }
600
+	}
601 601
 } // END MAIN FUNCTION geodir_tables_install
602 602
 
603 603
 if (!function_exists('geodir_create_default_fields')) {
604
-    /**
605
-     * Inserts default custom fields table data into database.
606
-     *
607
-     * @since 1.0.0
608
-     * @package GeoDirectory
609
-     */
610
-    function geodir_create_default_fields()
611
-    {
612
-
613
-        $fields = geodir_default_custom_fields('gd_place');
614
-
615
-        /**
616
-         * Filter the array of default custom fields DB table data.
617
-         *
618
-         * @since 1.0.0
619
-         * @param string $fields The default custom fields as an array.
620
-         */
621
-        $fields = apply_filters('geodir_before_default_custom_fields_saved', $fields);
622
-        foreach ($fields as $field_index => $field) {
623
-            geodir_custom_field_save($field);
624
-
625
-        }
626
-    }
604
+	/**
605
+	 * Inserts default custom fields table data into database.
606
+	 *
607
+	 * @since 1.0.0
608
+	 * @package GeoDirectory
609
+	 */
610
+	function geodir_create_default_fields()
611
+	{
612
+
613
+		$fields = geodir_default_custom_fields('gd_place');
614
+
615
+		/**
616
+		 * Filter the array of default custom fields DB table data.
617
+		 *
618
+		 * @since 1.0.0
619
+		 * @param string $fields The default custom fields as an array.
620
+		 */
621
+		$fields = apply_filters('geodir_before_default_custom_fields_saved', $fields);
622
+		foreach ($fields as $field_index => $field) {
623
+			geodir_custom_field_save($field);
624
+
625
+		}
626
+	}
627 627
 }
628 628
\ No newline at end of file
Please login to merge, or discard this patch.
geodirectory-admin/option-pages/permalink_settings_array.php 1 patch
Indentation   +178 added lines, -178 removed lines patch added patch discarded remove patch
@@ -16,184 +16,184 @@
 block discarded – undo
16 16
  */
17 17
 $geodir_settings['permalink_settings'] = apply_filters('geodir_permalink_settings', array(
18 18
 
19
-    /* Listing Permalink Settings start */
20
-    array('name' => __('Permalink', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set permalink', 'id' => 'geodir_permalink_settings '),
21
-
22
-
23
-    array('name' => __('Listing Detail Permalink Settings', 'geodirectory'),
24
-        'type' => 'sectionstart',
25
-        'desc' => '',
26
-        'id' => 'geodir_permalink'),
27
-
28
-    array(
29
-        'name' => __('Add location in urls', 'geodirectory'),
30
-        'desc' => __('Add location slug in listing urls', 'geodirectory'),
31
-        'id' => 'geodir_add_location_url',
32
-        'type' => 'checkbox',
33
-        'std' => '1',
34
-        'checkboxgroup' => 'start'
35
-    ),
36
-
37
-    array(
38
-        'name' => __('Add full location in listing urls', 'geodirectory'),
39
-        'desc' => __('Add full location info with country, region and city slug in listing urls', 'geodirectory'),
40
-        'id' => 'geodir_show_location_url',
41
-        'type' => 'radio',
42
-        'value' => 'all',
43
-        'std' => 'all',
44
-        'radiogroup' => ''
45
-    ),
46
-
47
-	array(
48
-        'name' => __('Add country and city slug in listing urls', 'geodirectory'),
49
-        'desc' => __('Add country and city slug in listing urls (/country/city/)', 'geodirectory'),
50
-        'id' => 'geodir_show_location_url',
51
-        'type' => 'radio',
52
-        'std' => 'all',
53
-        'value' => 'country_city',
54
-        'radiogroup' => ''
55
-    ),
56
-	array(
57
-        'name' => __('Add region and city slug in listing urls', 'geodirectory'),
58
-        'desc' => __('Add region and city slug in listing urls (/region/city/)', 'geodirectory'),
59
-        'id' => 'geodir_show_location_url',
60
-        'type' => 'radio',
61
-        'std' => 'all',
62
-        'value' => 'region_city',
63
-        'radiogroup' => ''
64
-    ),
65
-    array(
66
-        'name' => __('Add only city in listing urls', 'geodirectory'),
67
-        'desc' => __('Add city slug in listing urls', 'geodirectory'),
68
-        'id' => 'geodir_show_location_url',
69
-        'type' => 'radio',
70
-        'std' => 'all',
71
-        'value' => 'city',
72
-        'radiogroup' => 'end'
73
-    ),
74
-
75
-
76
-
77
-    array(
78
-        'name' => __('Add category in listing urls', 'geodirectory'),
79
-        'desc' => __('Add requested category slugs in listing urls', 'geodirectory'),
80
-        'id' => 'geodir_add_categories_url',
81
-        'type' => 'checkbox',
82
-        'std' => '1',
83
-    ),
84
-
85
-    array(
86
-        'name' => __('Listing url prefix', 'geodirectory'),
87
-        'desc' => __('Listing prefix to show in url', 'geodirectory'),
88
-        'id' => 'geodir_listing_prefix',
89
-        'type' => 'text',
90
-        'css' => 'min-width:300px;',
91
-        'std' => 'places'
92
-    ),
93
-
94
-    array(
95
-        'name' => __('Location url prefix', 'geodirectory'),
96
-        'desc' => __('Depreciated, now uses the location page slug', 'geodirectory'),
97
-        'id' => 'geodir_location_prefix',
98
-        'type' => 'text',
99
-        'css' => 'min-width:300px;',
100
-        'std' => 'location' // Default value to show home top section
101
-    ),
102
-
103
-    array(
104
-        'name' => __('Location and category url separator', 'geodirectory'),
105
-        'desc' => __('Separator to show between location and category url slugs in listing urls', 'geodirectory'),
106
-        'id' => 'geodir_listingurl_separator',
107
-        'type' => 'text',
108
-        'css' => 'min-width:300px;',
109
-        'std' => 'C' // Default value to show home top section
110
-    ),
111
-
112
-    array(
113
-        'name' => __('Listing detail url separator', 'geodirectory'),
114
-        'desc' => __('Separator to show before listing slug in listing detail urls', 'geodirectory'),
115
-        'id' => 'geodir_detailurl_separator',
116
-        'type' => 'text',
117
-        'css' => 'min-width:300px;',
118
-        'std' => 'info' // Default value to show home top section
119
-    ),
120
-
121
-
122
-    array('type' => 'sectionend', 'id' => 'geodir_permalink'),
123
-
124
-    array('name' => __('GeoDirectory Pages', 'geodirectory'),
125
-        'type' => 'sectionstart',
126
-        'desc' => '',
127
-        'id' => 'geodir_pages'),
128
-
129
-    array(
130
-        'name' => __('GD Home page', 'geodirectory'),
131
-        'desc' => __('Select the page to use for the GD homepage (you must also set this page in Settings>Reading>Front page for it to work)', 'geodirectory'),
132
-        'id' => 'geodir_home_page',
133
-        'type' => 'single_select_page',
134
-        'class' => 'chosen_select'
135
-    ),
136
-
137
-    array(
138
-        'name' => __('Add listing page', 'geodirectory'),
139
-        'desc' => __('Select the page to use for adding listings', 'geodirectory'),
140
-        'id' => 'geodir_add_listing_page',
141
-        'type' => 'single_select_page',
142
-        'class' => 'chosen_select'
143
-    ),
144
-
145
-    array(
146
-        'name' => __('Listing preview page', 'geodirectory'),
147
-        'desc' => __('Select the page to use for listing preview', 'geodirectory'),
148
-        'id' => 'geodir_preview_page',
149
-        'type' => 'single_select_page',
150
-        'class' => 'chosen_select'
151
-    ),
152
-
153
-    array(
154
-        'name' => __('Listing success page', 'geodirectory'),
155
-        'desc' => __('Select the page to use for listing success', 'geodirectory'),
156
-        'id' => 'geodir_success_page',
157
-        'type' => 'single_select_page',
158
-        'class' => 'chosen_select'
159
-    ),
160
-
161
-    array(
162
-        'name' => __('Location page', 'geodirectory'),
163
-        'desc' => __('Select the page to use for locations', 'geodirectory'),
164
-        'id' => 'geodir_location_page',
165
-        'type' => 'single_select_page',
166
-        'class' => 'chosen_select'
167
-    ),
168
-
169
-    array(
170
-        'name' => __('Terms and Conditions page', 'geodirectory'),
171
-        'desc' => __('Select the page to use for Terms and Conditions (if enabled)', 'geodirectory'),
172
-        'id' => 'geodir_term_condition_page',
173
-        'type' => 'single_select_page',
174
-        'class' => 'chosen_select'
175
-    ),
176
-
177
-    array(
178
-        'name' => __('Info page', 'geodirectory'),
179
-        'desc' => __('Select the page to use for Gd general Info', 'geodirectory'),
180
-        'id' => 'geodir_info_page',
181
-        'type' => 'single_select_page',
182
-        'class' => 'chosen_select'
183
-    ),
184
-
185
-    array(
186
-        'name' => __('Login page', 'geodirectory'),
187
-        'desc' => __('Select the page to use for Login / Register', 'geodirectory'),
188
-        'id' => 'geodir_login_page',
189
-        'type' => 'single_select_page',
190
-        'class' => 'chosen_select'
191
-    ),
192
-
193
-
194
-    array('type' => 'sectionend', 'id' => 'geodir_pages'),
195
-
196
-    /* Listing Detail Permalink Settings End */
19
+	/* Listing Permalink Settings start */
20
+	array('name' => __('Permalink', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set permalink', 'id' => 'geodir_permalink_settings '),
21
+
22
+
23
+	array('name' => __('Listing Detail Permalink Settings', 'geodirectory'),
24
+		'type' => 'sectionstart',
25
+		'desc' => '',
26
+		'id' => 'geodir_permalink'),
27
+
28
+	array(
29
+		'name' => __('Add location in urls', 'geodirectory'),
30
+		'desc' => __('Add location slug in listing urls', 'geodirectory'),
31
+		'id' => 'geodir_add_location_url',
32
+		'type' => 'checkbox',
33
+		'std' => '1',
34
+		'checkboxgroup' => 'start'
35
+	),
36
+
37
+	array(
38
+		'name' => __('Add full location in listing urls', 'geodirectory'),
39
+		'desc' => __('Add full location info with country, region and city slug in listing urls', 'geodirectory'),
40
+		'id' => 'geodir_show_location_url',
41
+		'type' => 'radio',
42
+		'value' => 'all',
43
+		'std' => 'all',
44
+		'radiogroup' => ''
45
+	),
46
+
47
+	array(
48
+		'name' => __('Add country and city slug in listing urls', 'geodirectory'),
49
+		'desc' => __('Add country and city slug in listing urls (/country/city/)', 'geodirectory'),
50
+		'id' => 'geodir_show_location_url',
51
+		'type' => 'radio',
52
+		'std' => 'all',
53
+		'value' => 'country_city',
54
+		'radiogroup' => ''
55
+	),
56
+	array(
57
+		'name' => __('Add region and city slug in listing urls', 'geodirectory'),
58
+		'desc' => __('Add region and city slug in listing urls (/region/city/)', 'geodirectory'),
59
+		'id' => 'geodir_show_location_url',
60
+		'type' => 'radio',
61
+		'std' => 'all',
62
+		'value' => 'region_city',
63
+		'radiogroup' => ''
64
+	),
65
+	array(
66
+		'name' => __('Add only city in listing urls', 'geodirectory'),
67
+		'desc' => __('Add city slug in listing urls', 'geodirectory'),
68
+		'id' => 'geodir_show_location_url',
69
+		'type' => 'radio',
70
+		'std' => 'all',
71
+		'value' => 'city',
72
+		'radiogroup' => 'end'
73
+	),
74
+
75
+
76
+
77
+	array(
78
+		'name' => __('Add category in listing urls', 'geodirectory'),
79
+		'desc' => __('Add requested category slugs in listing urls', 'geodirectory'),
80
+		'id' => 'geodir_add_categories_url',
81
+		'type' => 'checkbox',
82
+		'std' => '1',
83
+	),
84
+
85
+	array(
86
+		'name' => __('Listing url prefix', 'geodirectory'),
87
+		'desc' => __('Listing prefix to show in url', 'geodirectory'),
88
+		'id' => 'geodir_listing_prefix',
89
+		'type' => 'text',
90
+		'css' => 'min-width:300px;',
91
+		'std' => 'places'
92
+	),
93
+
94
+	array(
95
+		'name' => __('Location url prefix', 'geodirectory'),
96
+		'desc' => __('Depreciated, now uses the location page slug', 'geodirectory'),
97
+		'id' => 'geodir_location_prefix',
98
+		'type' => 'text',
99
+		'css' => 'min-width:300px;',
100
+		'std' => 'location' // Default value to show home top section
101
+	),
102
+
103
+	array(
104
+		'name' => __('Location and category url separator', 'geodirectory'),
105
+		'desc' => __('Separator to show between location and category url slugs in listing urls', 'geodirectory'),
106
+		'id' => 'geodir_listingurl_separator',
107
+		'type' => 'text',
108
+		'css' => 'min-width:300px;',
109
+		'std' => 'C' // Default value to show home top section
110
+	),
111
+
112
+	array(
113
+		'name' => __('Listing detail url separator', 'geodirectory'),
114
+		'desc' => __('Separator to show before listing slug in listing detail urls', 'geodirectory'),
115
+		'id' => 'geodir_detailurl_separator',
116
+		'type' => 'text',
117
+		'css' => 'min-width:300px;',
118
+		'std' => 'info' // Default value to show home top section
119
+	),
120
+
121
+
122
+	array('type' => 'sectionend', 'id' => 'geodir_permalink'),
123
+
124
+	array('name' => __('GeoDirectory Pages', 'geodirectory'),
125
+		'type' => 'sectionstart',
126
+		'desc' => '',
127
+		'id' => 'geodir_pages'),
128
+
129
+	array(
130
+		'name' => __('GD Home page', 'geodirectory'),
131
+		'desc' => __('Select the page to use for the GD homepage (you must also set this page in Settings>Reading>Front page for it to work)', 'geodirectory'),
132
+		'id' => 'geodir_home_page',
133
+		'type' => 'single_select_page',
134
+		'class' => 'chosen_select'
135
+	),
136
+
137
+	array(
138
+		'name' => __('Add listing page', 'geodirectory'),
139
+		'desc' => __('Select the page to use for adding listings', 'geodirectory'),
140
+		'id' => 'geodir_add_listing_page',
141
+		'type' => 'single_select_page',
142
+		'class' => 'chosen_select'
143
+	),
144
+
145
+	array(
146
+		'name' => __('Listing preview page', 'geodirectory'),
147
+		'desc' => __('Select the page to use for listing preview', 'geodirectory'),
148
+		'id' => 'geodir_preview_page',
149
+		'type' => 'single_select_page',
150
+		'class' => 'chosen_select'
151
+	),
152
+
153
+	array(
154
+		'name' => __('Listing success page', 'geodirectory'),
155
+		'desc' => __('Select the page to use for listing success', 'geodirectory'),
156
+		'id' => 'geodir_success_page',
157
+		'type' => 'single_select_page',
158
+		'class' => 'chosen_select'
159
+	),
160
+
161
+	array(
162
+		'name' => __('Location page', 'geodirectory'),
163
+		'desc' => __('Select the page to use for locations', 'geodirectory'),
164
+		'id' => 'geodir_location_page',
165
+		'type' => 'single_select_page',
166
+		'class' => 'chosen_select'
167
+	),
168
+
169
+	array(
170
+		'name' => __('Terms and Conditions page', 'geodirectory'),
171
+		'desc' => __('Select the page to use for Terms and Conditions (if enabled)', 'geodirectory'),
172
+		'id' => 'geodir_term_condition_page',
173
+		'type' => 'single_select_page',
174
+		'class' => 'chosen_select'
175
+	),
176
+
177
+	array(
178
+		'name' => __('Info page', 'geodirectory'),
179
+		'desc' => __('Select the page to use for Gd general Info', 'geodirectory'),
180
+		'id' => 'geodir_info_page',
181
+		'type' => 'single_select_page',
182
+		'class' => 'chosen_select'
183
+	),
184
+
185
+	array(
186
+		'name' => __('Login page', 'geodirectory'),
187
+		'desc' => __('Select the page to use for Login / Register', 'geodirectory'),
188
+		'id' => 'geodir_login_page',
189
+		'type' => 'single_select_page',
190
+		'class' => 'chosen_select'
191
+	),
192
+
193
+
194
+	array('type' => 'sectionend', 'id' => 'geodir_pages'),
195
+
196
+	/* Listing Detail Permalink Settings End */
197 197
 
198 198
 
199 199
 )); // End Design settings
Please login to merge, or discard this patch.