@@ -40,8 +40,9 @@ |
||
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 |
@@ -142,7 +142,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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( |
@@ -16,17 +16,17 @@ discard block |
||
16 | 16 | */ |
17 | 17 | function geodir_theme_location_setting_fun() |
18 | 18 | { |
19 | - $post_type_arr = array(); |
|
20 | - $geodir_all_nav_locations = get_registered_nav_menus(); |
|
21 | - $geodir_active_nav_locations = get_nav_menu_locations(); |
|
22 | - if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) { |
|
23 | - foreach ($geodir_active_nav_locations as $key => $theme_location) { |
|
24 | - if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations)) |
|
25 | - $post_type_arr[$key] = $geodir_all_nav_locations[$key]; |
|
26 | - } |
|
27 | - } |
|
28 | - |
|
29 | - return $post_type_arr; |
|
19 | + $post_type_arr = array(); |
|
20 | + $geodir_all_nav_locations = get_registered_nav_menus(); |
|
21 | + $geodir_active_nav_locations = get_nav_menu_locations(); |
|
22 | + if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) { |
|
23 | + foreach ($geodir_active_nav_locations as $key => $theme_location) { |
|
24 | + if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations)) |
|
25 | + $post_type_arr[$key] = $geodir_all_nav_locations[$key]; |
|
26 | + } |
|
27 | + } |
|
28 | + |
|
29 | + return $post_type_arr; |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | /** |
@@ -37,198 +37,198 @@ discard block |
||
37 | 37 | */ |
38 | 38 | $geodir_settings['design_settings'] = apply_filters('geodir_design_settings', array( |
39 | 39 | |
40 | - /* Home Layout Settings start */ |
|
41 | - array('name' => __('Home', 'geodirectory'), 'type' => 'title', 'desc' => 'Setting to set home page layout', 'id' => 'home_page_settings '), |
|
40 | + /* Home Layout Settings start */ |
|
41 | + array('name' => __('Home', 'geodirectory'), 'type' => 'title', 'desc' => 'Setting to set home page layout', 'id' => 'home_page_settings '), |
|
42 | 42 | |
43 | 43 | |
44 | - array('name' => __('Home Top Section Settings', 'geodirectory'), |
|
45 | - 'type' => 'sectionstart', |
|
46 | - 'desc' => '', |
|
47 | - 'id' => 'geodir_home_top_section'), |
|
44 | + array('name' => __('Home Top Section Settings', 'geodirectory'), |
|
45 | + 'type' => 'sectionstart', |
|
46 | + 'desc' => '', |
|
47 | + 'id' => 'geodir_home_top_section'), |
|
48 | 48 | |
49 | - array( |
|
50 | - 'name' => __('Home top section', 'geodirectory'), |
|
51 | - 'desc' => __('Show the top section of home page', 'geodirectory'), |
|
52 | - 'id' => 'geodir_show_home_top_section', |
|
53 | - 'type' => 'checkbox', |
|
54 | - 'std' => '1' // Default value to show home top section |
|
55 | - ), |
|
49 | + array( |
|
50 | + 'name' => __('Home top section', 'geodirectory'), |
|
51 | + 'desc' => __('Show the top section of home page', 'geodirectory'), |
|
52 | + 'id' => 'geodir_show_home_top_section', |
|
53 | + 'type' => 'checkbox', |
|
54 | + 'std' => '1' // Default value to show home top section |
|
55 | + ), |
|
56 | 56 | |
57 | 57 | |
58 | - array('type' => 'sectionend', 'id' => 'geodir_home_top_section'), |
|
58 | + array('type' => 'sectionend', 'id' => 'geodir_home_top_section'), |
|
59 | 59 | |
60 | 60 | |
61 | - array('name' => __('Home Page Layout Settings', 'geodirectory'), |
|
62 | - 'type' => 'sectionstart', |
|
63 | - 'desc' => '', |
|
64 | - 'id' => 'geodir_home_layout'), |
|
61 | + array('name' => __('Home Page Layout Settings', 'geodirectory'), |
|
62 | + 'type' => 'sectionstart', |
|
63 | + 'desc' => '', |
|
64 | + 'id' => 'geodir_home_layout'), |
|
65 | 65 | |
66 | - array( |
|
67 | - 'name' => __('Home right section', 'geodirectory'), |
|
68 | - 'desc' => __('Show the right section of home page', 'geodirectory'), |
|
69 | - 'id' => 'geodir_show_home_right_section', |
|
70 | - 'type' => 'checkbox', |
|
71 | - 'std' => '1' // Default value to show home top section |
|
72 | - ), |
|
66 | + array( |
|
67 | + 'name' => __('Home right section', 'geodirectory'), |
|
68 | + 'desc' => __('Show the right section of home page', 'geodirectory'), |
|
69 | + 'id' => 'geodir_show_home_right_section', |
|
70 | + 'type' => 'checkbox', |
|
71 | + 'std' => '1' // Default value to show home top section |
|
72 | + ), |
|
73 | 73 | |
74 | - array( |
|
75 | - 'name' => __('Width of home right section', 'geodirectory'), |
|
76 | - 'desc' => __('Enter the width of right section of home page in %', 'geodirectory'), |
|
77 | - 'id' => 'geodir_width_home_right_section', |
|
78 | - 'type' => 'text', |
|
79 | - 'css' => 'min-width:300px;', |
|
80 | - 'std' => '30' // Default value to show home top section |
|
81 | - ), |
|
74 | + array( |
|
75 | + 'name' => __('Width of home right section', 'geodirectory'), |
|
76 | + 'desc' => __('Enter the width of right section of home page in %', 'geodirectory'), |
|
77 | + 'id' => 'geodir_width_home_right_section', |
|
78 | + 'type' => 'text', |
|
79 | + 'css' => 'min-width:300px;', |
|
80 | + 'std' => '30' // Default value to show home top section |
|
81 | + ), |
|
82 | 82 | |
83 | - array( |
|
84 | - 'name' => __('Home content section', 'geodirectory'), |
|
85 | - 'desc' => __('Show the content section of home page', 'geodirectory'), |
|
86 | - 'id' => 'geodir_show_home_contant_section', |
|
87 | - 'type' => 'checkbox', |
|
88 | - 'std' => '1' // Default value to show home top section |
|
89 | - ), |
|
83 | + array( |
|
84 | + 'name' => __('Home content section', 'geodirectory'), |
|
85 | + 'desc' => __('Show the content section of home page', 'geodirectory'), |
|
86 | + 'id' => 'geodir_show_home_contant_section', |
|
87 | + 'type' => 'checkbox', |
|
88 | + 'std' => '1' // Default value to show home top section |
|
89 | + ), |
|
90 | 90 | |
91 | - array( |
|
92 | - 'name' => __('Width of home content section', 'geodirectory'), |
|
93 | - 'desc' => __('Enter the width of content section of home page in %', 'geodirectory'), |
|
94 | - 'id' => 'geodir_width_home_contant_section', |
|
95 | - 'type' => 'text', |
|
96 | - 'css' => 'min-width:300px;', |
|
97 | - 'std' => '63' // Default value to show home top section |
|
98 | - ), |
|
91 | + array( |
|
92 | + 'name' => __('Width of home content section', 'geodirectory'), |
|
93 | + 'desc' => __('Enter the width of content section of home page in %', 'geodirectory'), |
|
94 | + 'id' => 'geodir_width_home_contant_section', |
|
95 | + 'type' => 'text', |
|
96 | + 'css' => 'min-width:300px;', |
|
97 | + 'std' => '63' // Default value to show home top section |
|
98 | + ), |
|
99 | 99 | |
100 | - array( |
|
101 | - 'name' => __('Home left section', 'geodirectory'), |
|
102 | - 'desc' => __('Show the left section of home page', 'geodirectory'), |
|
103 | - 'id' => 'geodir_show_home_left_section', |
|
104 | - 'type' => 'checkbox', |
|
105 | - 'std' => '0' // Default value to show home top section |
|
106 | - ), |
|
100 | + array( |
|
101 | + 'name' => __('Home left section', 'geodirectory'), |
|
102 | + 'desc' => __('Show the left section of home page', 'geodirectory'), |
|
103 | + 'id' => 'geodir_show_home_left_section', |
|
104 | + 'type' => 'checkbox', |
|
105 | + 'std' => '0' // Default value to show home top section |
|
106 | + ), |
|
107 | 107 | |
108 | - array( |
|
109 | - 'name' => __('Width of home left section', 'geodirectory'), |
|
110 | - 'desc' => __('Enter the width of left section of home page in %', 'geodirectory'), |
|
111 | - 'id' => 'geodir_width_home_left_section', |
|
112 | - 'type' => 'text', |
|
113 | - 'css' => 'min-width:300px;', |
|
114 | - 'std' => '30' // Default value to show home top section |
|
115 | - ), |
|
108 | + array( |
|
109 | + 'name' => __('Width of home left section', 'geodirectory'), |
|
110 | + 'desc' => __('Enter the width of left section of home page in %', 'geodirectory'), |
|
111 | + 'id' => 'geodir_width_home_left_section', |
|
112 | + 'type' => 'text', |
|
113 | + 'css' => 'min-width:300px;', |
|
114 | + 'std' => '30' // Default value to show home top section |
|
115 | + ), |
|
116 | 116 | |
117 | - array( |
|
118 | - 'name' => __('Home bottom section', 'geodirectory'), |
|
119 | - 'desc' => __('Show the bottom section of home page', 'geodirectory'), |
|
120 | - 'id' => 'geodir_show_home_bottom_section', |
|
121 | - 'type' => 'checkbox', |
|
122 | - 'std' => '0' // Default value to show home top section |
|
123 | - ), |
|
124 | - array( |
|
125 | - 'name' => __('Resize image large size', 'geodirectory'), |
|
126 | - 'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')), |
|
127 | - 'id' => 'geodir_use_wp_media_large_size', |
|
128 | - 'type' => 'checkbox', |
|
129 | - 'std' => '0' |
|
130 | - ), |
|
117 | + array( |
|
118 | + 'name' => __('Home bottom section', 'geodirectory'), |
|
119 | + 'desc' => __('Show the bottom section of home page', 'geodirectory'), |
|
120 | + 'id' => 'geodir_show_home_bottom_section', |
|
121 | + 'type' => 'checkbox', |
|
122 | + 'std' => '0' // Default value to show home top section |
|
123 | + ), |
|
124 | + array( |
|
125 | + 'name' => __('Resize image large size', 'geodirectory'), |
|
126 | + 'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')), |
|
127 | + 'id' => 'geodir_use_wp_media_large_size', |
|
128 | + 'type' => 'checkbox', |
|
129 | + 'std' => '0' |
|
130 | + ), |
|
131 | 131 | |
132 | - array('type' => 'sectionend', 'id' => 'geodir_home_layout'), |
|
132 | + array('type' => 'sectionend', 'id' => 'geodir_home_layout'), |
|
133 | 133 | |
134 | 134 | |
135 | - /* Home Layout Settings end */ |
|
135 | + /* Home Layout Settings end */ |
|
136 | 136 | |
137 | 137 | |
138 | - /* Listing Layout Settings end */ |
|
138 | + /* Listing Layout Settings end */ |
|
139 | 139 | |
140 | - array('name' => __('Listings', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_listing_settings '), |
|
140 | + array('name' => __('Listings', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_listing_settings '), |
|
141 | 141 | |
142 | 142 | |
143 | - array('name' => __('Listing Page Layout Settings', 'geodirectory'), |
|
144 | - 'type' => 'sectionstart', |
|
145 | - 'desc' => '', |
|
146 | - 'id' => 'geodir_listing_layout'), |
|
143 | + array('name' => __('Listing Page Layout Settings', 'geodirectory'), |
|
144 | + 'type' => 'sectionstart', |
|
145 | + 'desc' => '', |
|
146 | + 'id' => 'geodir_listing_layout'), |
|
147 | 147 | |
148 | - array( |
|
149 | - 'name' => __('Listing top section', 'geodirectory'), |
|
150 | - 'desc' => __('Show the top section of listing page', 'geodirectory'), |
|
151 | - 'id' => 'geodir_show_listing_top_section', |
|
152 | - 'type' => 'checkbox', |
|
153 | - 'std' => '1' // Default value to show home top section |
|
154 | - ), |
|
148 | + array( |
|
149 | + 'name' => __('Listing top section', 'geodirectory'), |
|
150 | + 'desc' => __('Show the top section of listing page', 'geodirectory'), |
|
151 | + 'id' => 'geodir_show_listing_top_section', |
|
152 | + 'type' => 'checkbox', |
|
153 | + 'std' => '1' // Default value to show home top section |
|
154 | + ), |
|
155 | 155 | |
156 | - array( |
|
157 | - 'name' => __('Listing right section', 'geodirectory'), |
|
158 | - 'desc' => __('Show the right section of listing page', 'geodirectory'), |
|
159 | - 'id' => 'geodir_show_listing_right_section', |
|
160 | - 'type' => 'checkbox', |
|
161 | - 'std' => '1' // Default value to show home top section |
|
162 | - ), |
|
156 | + array( |
|
157 | + 'name' => __('Listing right section', 'geodirectory'), |
|
158 | + 'desc' => __('Show the right section of listing page', 'geodirectory'), |
|
159 | + 'id' => 'geodir_show_listing_right_section', |
|
160 | + 'type' => 'checkbox', |
|
161 | + 'std' => '1' // Default value to show home top section |
|
162 | + ), |
|
163 | 163 | |
164 | - array( |
|
165 | - 'name' => __('Width of listing right section', 'geodirectory'), |
|
166 | - 'desc' => __('Enter the width of right section of listing page in %', 'geodirectory'), |
|
167 | - 'id' => 'geodir_width_listing_right_section', |
|
168 | - 'type' => 'text', |
|
169 | - 'css' => 'min-width:300px;', |
|
170 | - 'std' => '30' // Default value to show home top section |
|
171 | - ), |
|
164 | + array( |
|
165 | + 'name' => __('Width of listing right section', 'geodirectory'), |
|
166 | + 'desc' => __('Enter the width of right section of listing page in %', 'geodirectory'), |
|
167 | + 'id' => 'geodir_width_listing_right_section', |
|
168 | + 'type' => 'text', |
|
169 | + 'css' => 'min-width:300px;', |
|
170 | + 'std' => '30' // Default value to show home top section |
|
171 | + ), |
|
172 | 172 | |
173 | 173 | |
174 | - array( |
|
175 | - 'name' => __('Listing content section view', 'geodirectory'), |
|
176 | - 'desc' => __('Set the listing view of listing page', 'geodirectory'), |
|
177 | - 'id' => 'geodir_listing_view', |
|
178 | - 'css' => 'min-width:300px;', |
|
179 | - 'std' => 'gridview_onehalf', |
|
180 | - 'type' => 'select', |
|
181 | - 'class' => 'chosen_select', |
|
182 | - 'options' => array_unique(array( |
|
183 | - 'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'), |
|
184 | - 'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'), |
|
185 | - 'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'), |
|
186 | - 'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'), |
|
187 | - 'listview' => __('List view', 'geodirectory'), |
|
188 | - )) |
|
189 | - ), |
|
174 | + array( |
|
175 | + 'name' => __('Listing content section view', 'geodirectory'), |
|
176 | + 'desc' => __('Set the listing view of listing page', 'geodirectory'), |
|
177 | + 'id' => 'geodir_listing_view', |
|
178 | + 'css' => 'min-width:300px;', |
|
179 | + 'std' => 'gridview_onehalf', |
|
180 | + 'type' => 'select', |
|
181 | + 'class' => 'chosen_select', |
|
182 | + 'options' => array_unique(array( |
|
183 | + 'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'), |
|
184 | + 'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'), |
|
185 | + 'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'), |
|
186 | + 'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'), |
|
187 | + 'listview' => __('List view', 'geodirectory'), |
|
188 | + )) |
|
189 | + ), |
|
190 | 190 | |
191 | - array( |
|
192 | - 'name' => __('Width of listing content section', 'geodirectory'), |
|
193 | - 'desc' => __('Enter the width of content section of listing page in %', 'geodirectory'), |
|
194 | - 'id' => 'geodir_width_listing_contant_section', |
|
195 | - 'type' => 'text', |
|
196 | - 'css' => 'min-width:300px;', |
|
197 | - 'std' => '63' // Default value to show home top section |
|
198 | - ), |
|
191 | + array( |
|
192 | + 'name' => __('Width of listing content section', 'geodirectory'), |
|
193 | + 'desc' => __('Enter the width of content section of listing page in %', 'geodirectory'), |
|
194 | + 'id' => 'geodir_width_listing_contant_section', |
|
195 | + 'type' => 'text', |
|
196 | + 'css' => 'min-width:300px;', |
|
197 | + 'std' => '63' // Default value to show home top section |
|
198 | + ), |
|
199 | 199 | |
200 | - array( |
|
201 | - 'name' => __('Listing left section', 'geodirectory'), |
|
202 | - 'desc' => __('Show the left section of listing page', 'geodirectory'), |
|
203 | - 'id' => 'geodir_show_listing_left_section', |
|
204 | - 'type' => 'checkbox', |
|
205 | - 'std' => '0' // Default value to show home top section |
|
206 | - ), |
|
200 | + array( |
|
201 | + 'name' => __('Listing left section', 'geodirectory'), |
|
202 | + 'desc' => __('Show the left section of listing page', 'geodirectory'), |
|
203 | + 'id' => 'geodir_show_listing_left_section', |
|
204 | + 'type' => 'checkbox', |
|
205 | + 'std' => '0' // Default value to show home top section |
|
206 | + ), |
|
207 | 207 | |
208 | - array( |
|
209 | - 'name' => __('Width of listing left section', 'geodirectory'), |
|
210 | - 'desc' => __('Enter the width of left section of listing in %', 'geodirectory'), |
|
211 | - 'id' => 'geodir_width_listing_left_section', |
|
212 | - 'type' => 'text', |
|
213 | - 'css' => 'min-width:300px;', |
|
214 | - 'std' => '30' // Default value to show home top section |
|
215 | - ), |
|
208 | + array( |
|
209 | + 'name' => __('Width of listing left section', 'geodirectory'), |
|
210 | + 'desc' => __('Enter the width of left section of listing in %', 'geodirectory'), |
|
211 | + 'id' => 'geodir_width_listing_left_section', |
|
212 | + 'type' => 'text', |
|
213 | + 'css' => 'min-width:300px;', |
|
214 | + 'std' => '30' // Default value to show home top section |
|
215 | + ), |
|
216 | 216 | |
217 | - array( |
|
218 | - 'name' => __('Listing bottom section', 'geodirectory'), |
|
219 | - 'desc' => __('Show the bottom section of listing page', 'geodirectory'), |
|
220 | - 'id' => 'geodir_show_listing_bottom_section', |
|
221 | - 'type' => 'checkbox', |
|
222 | - 'std' => '0' // Default value to show home top section |
|
223 | - ), |
|
217 | + array( |
|
218 | + 'name' => __('Listing bottom section', 'geodirectory'), |
|
219 | + 'desc' => __('Show the bottom section of listing page', 'geodirectory'), |
|
220 | + 'id' => 'geodir_show_listing_bottom_section', |
|
221 | + 'type' => 'checkbox', |
|
222 | + 'std' => '0' // Default value to show home top section |
|
223 | + ), |
|
224 | 224 | |
225 | - array( |
|
226 | - 'name' => __('Upload listing no image', 'geodirectory'), |
|
227 | - 'desc' => '', |
|
228 | - 'id' => 'geodir_listing_no_img', |
|
229 | - 'type' => 'file', |
|
230 | - 'std' => '0' // Default value to show home top section |
|
231 | - ), |
|
225 | + array( |
|
226 | + 'name' => __('Upload listing no image', 'geodirectory'), |
|
227 | + 'desc' => '', |
|
228 | + 'id' => 'geodir_listing_no_img', |
|
229 | + 'type' => 'file', |
|
230 | + 'std' => '0' // Default value to show home top section |
|
231 | + ), |
|
232 | 232 | |
233 | 233 | array( |
234 | 234 | 'name' => __('Listing image size', 'geodirectory'), |
@@ -241,345 +241,345 @@ discard block |
||
241 | 241 | 'options' => geodir_listing_image_size_arr() |
242 | 242 | ), |
243 | 243 | |
244 | - array( |
|
245 | - 'name' => __('Description word limit', 'geodirectory'), |
|
246 | - 'desc' => '', |
|
247 | - 'id' => 'geodir_desc_word_limit', |
|
248 | - 'type' => 'text', |
|
249 | - 'css' => 'min-width:300px;', |
|
250 | - 'std' => '50' // Default value to show home top section |
|
251 | - ), |
|
244 | + array( |
|
245 | + 'name' => __('Description word limit', 'geodirectory'), |
|
246 | + 'desc' => '', |
|
247 | + 'id' => 'geodir_desc_word_limit', |
|
248 | + 'type' => 'text', |
|
249 | + 'css' => 'min-width:300px;', |
|
250 | + 'std' => '50' // Default value to show home top section |
|
251 | + ), |
|
252 | 252 | |
253 | - array( |
|
254 | - 'name' => __('Hover listing map animation', 'geodirectory'), |
|
255 | - 'desc' => __('Bounce map pin if listing hovered', 'geodirectory'), |
|
256 | - 'id' => 'geodir_listing_hover_bounce_map_pin', |
|
257 | - 'type' => 'checkbox', |
|
258 | - 'std' => '1' // Default value to show home top section |
|
259 | - ), |
|
253 | + array( |
|
254 | + 'name' => __('Hover listing map animation', 'geodirectory'), |
|
255 | + 'desc' => __('Bounce map pin if listing hovered', 'geodirectory'), |
|
256 | + 'id' => 'geodir_listing_hover_bounce_map_pin', |
|
257 | + 'type' => 'checkbox', |
|
258 | + 'std' => '1' // Default value to show home top section |
|
259 | + ), |
|
260 | 260 | |
261 | - array('type' => 'sectionend', 'id' => 'geodir_listing_layout'), |
|
261 | + array('type' => 'sectionend', 'id' => 'geodir_listing_layout'), |
|
262 | 262 | |
263 | 263 | |
264 | - array('name' => __('Listing General Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_listing_gen_settings '), |
|
264 | + array('name' => __('Listing General Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_listing_gen_settings '), |
|
265 | 265 | |
266 | - array( |
|
267 | - 'name' => __('New listing default status', 'geodirectory'), |
|
268 | - 'desc' => __('Select new listing default status.', 'geodirectory'), |
|
269 | - 'tip' => '', |
|
270 | - 'id' => 'geodir_new_post_default_status', |
|
271 | - 'css' => 'min-width:300px;', |
|
272 | - 'std' => 'pending', |
|
273 | - 'type' => 'select', |
|
274 | - 'class' => 'chosen_select', |
|
275 | - 'options' => array_unique(array( |
|
276 | - 'pending' => __('Pending Review', 'geodirectory'), |
|
277 | - 'draft' => __('draft', 'geodirectory'), |
|
278 | - 'publish' => __('publish', 'geodirectory'), |
|
279 | - |
|
280 | - )) |
|
281 | - ), |
|
266 | + array( |
|
267 | + 'name' => __('New listing default status', 'geodirectory'), |
|
268 | + 'desc' => __('Select new listing default status.', 'geodirectory'), |
|
269 | + 'tip' => '', |
|
270 | + 'id' => 'geodir_new_post_default_status', |
|
271 | + 'css' => 'min-width:300px;', |
|
272 | + 'std' => 'pending', |
|
273 | + 'type' => 'select', |
|
274 | + 'class' => 'chosen_select', |
|
275 | + 'options' => array_unique(array( |
|
276 | + 'pending' => __('Pending Review', 'geodirectory'), |
|
277 | + 'draft' => __('draft', 'geodirectory'), |
|
278 | + 'publish' => __('publish', 'geodirectory'), |
|
282 | 279 | |
283 | - array( |
|
284 | - 'name' => __('New listings settings', 'geodirectory'), |
|
285 | - 'desc' => __('Enter number of days a listing will appear new.(enter 0 to disable feature)', 'geodirectory'), |
|
286 | - 'id' => 'geodir_listing_new_days', |
|
287 | - 'type' => 'text', |
|
288 | - 'css' => 'min-width:300px;', |
|
289 | - 'std' => '30' // Default value for the page title - changed in settings |
|
290 | - ), |
|
280 | + )) |
|
281 | + ), |
|
291 | 282 | |
292 | - array('type' => 'sectionend', 'id' => 'geodir_listing_gen_settings'), |
|
283 | + array( |
|
284 | + 'name' => __('New listings settings', 'geodirectory'), |
|
285 | + 'desc' => __('Enter number of days a listing will appear new.(enter 0 to disable feature)', 'geodirectory'), |
|
286 | + 'id' => 'geodir_listing_new_days', |
|
287 | + 'type' => 'text', |
|
288 | + 'css' => 'min-width:300px;', |
|
289 | + 'std' => '30' // Default value for the page title - changed in settings |
|
290 | + ), |
|
293 | 291 | |
292 | + array('type' => 'sectionend', 'id' => 'geodir_listing_gen_settings'), |
|
294 | 293 | |
295 | - array('name' => __('Add Listing Form Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_add_listing_gen_settings'), |
|
296 | 294 | |
297 | - array( |
|
298 | - 'name' => __('Enable "Accept Terms and Conditions"', 'geodirectory'), |
|
299 | - 'desc' => __('Show the "Accept Terms and Conditions" field on add listing.', 'geodirectory'), |
|
300 | - 'id' => 'geodir_accept_term_condition', |
|
301 | - 'type' => 'checkbox', |
|
302 | - 'std' => '1' // Default value to show home top section |
|
303 | - ), |
|
295 | + array('name' => __('Add Listing Form Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_add_listing_gen_settings'), |
|
304 | 296 | |
297 | + array( |
|
298 | + 'name' => __('Enable "Accept Terms and Conditions"', 'geodirectory'), |
|
299 | + 'desc' => __('Show the "Accept Terms and Conditions" field on add listing.', 'geodirectory'), |
|
300 | + 'id' => 'geodir_accept_term_condition', |
|
301 | + 'type' => 'checkbox', |
|
302 | + 'std' => '1' // Default value to show home top section |
|
303 | + ), |
|
305 | 304 | |
306 | - array( |
|
307 | - 'name' => __('Show description field as editor', 'geodirectory'), |
|
308 | - 'desc' => __('Select post types to show advanced editor on add listing page.', 'geodirectory'), |
|
309 | - 'tip' => '', |
|
310 | - 'id' => 'geodir_tiny_editor_on_add_listing', |
|
311 | - 'css' => 'min-width:300px;', |
|
312 | - 'std' => array(), |
|
313 | - 'type' => 'multiselect', |
|
314 | - 'placeholder_text' => __('Select post types', 'geodirectory'), |
|
315 | - 'class' => 'chosen_select', |
|
316 | - 'options' => array_unique(geodir_post_type_setting_fun()) |
|
317 | - ), |
|
318 | 305 | |
319 | - array('type' => 'sectionend', 'id' => 'geodir_add_listing_gen_settings'), |
|
320 | - /* Listing Layout Settings end */ |
|
306 | + array( |
|
307 | + 'name' => __('Show description field as editor', 'geodirectory'), |
|
308 | + 'desc' => __('Select post types to show advanced editor on add listing page.', 'geodirectory'), |
|
309 | + 'tip' => '', |
|
310 | + 'id' => 'geodir_tiny_editor_on_add_listing', |
|
311 | + 'css' => 'min-width:300px;', |
|
312 | + 'std' => array(), |
|
313 | + 'type' => 'multiselect', |
|
314 | + 'placeholder_text' => __('Select post types', 'geodirectory'), |
|
315 | + 'class' => 'chosen_select', |
|
316 | + 'options' => array_unique(geodir_post_type_setting_fun()) |
|
317 | + ), |
|
321 | 318 | |
319 | + array('type' => 'sectionend', 'id' => 'geodir_add_listing_gen_settings'), |
|
320 | + /* Listing Layout Settings end */ |
|
322 | 321 | |
323 | - /* Search Layout Settings end */ |
|
324 | 322 | |
325 | - array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_search_settings '), |
|
323 | + /* Search Layout Settings end */ |
|
326 | 324 | |
325 | + array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_search_settings '), |
|
327 | 326 | |
328 | - array('name' => __('Search Page Layout Settings', 'geodirectory'), |
|
329 | - 'type' => 'sectionstart', |
|
330 | - 'desc' => '', |
|
331 | - 'id' => 'geodir_search_layout'), |
|
332 | 327 | |
333 | - array( |
|
334 | - 'name' => __('Search top section', 'geodirectory'), |
|
335 | - 'desc' => __('Show the top section of search page', 'geodirectory'), |
|
336 | - 'id' => 'geodir_show_search_top_section', |
|
337 | - 'type' => 'checkbox', |
|
338 | - 'std' => '1' // Default value to show home top section |
|
339 | - ), |
|
328 | + array('name' => __('Search Page Layout Settings', 'geodirectory'), |
|
329 | + 'type' => 'sectionstart', |
|
330 | + 'desc' => '', |
|
331 | + 'id' => 'geodir_search_layout'), |
|
340 | 332 | |
341 | - array( |
|
342 | - 'name' => __('Search right section', 'geodirectory'), |
|
343 | - 'desc' => __('Show the right section of search page', 'geodirectory'), |
|
344 | - 'id' => 'geodir_show_search_right_section', |
|
345 | - 'type' => 'checkbox', |
|
346 | - 'std' => '1' // Default value to show home top section |
|
347 | - ), |
|
333 | + array( |
|
334 | + 'name' => __('Search top section', 'geodirectory'), |
|
335 | + 'desc' => __('Show the top section of search page', 'geodirectory'), |
|
336 | + 'id' => 'geodir_show_search_top_section', |
|
337 | + 'type' => 'checkbox', |
|
338 | + 'std' => '1' // Default value to show home top section |
|
339 | + ), |
|
348 | 340 | |
349 | - array( |
|
350 | - 'name' => __('Width of search right section', 'geodirectory'), |
|
351 | - 'desc' => __('Enter the width of right section of search page in %', 'geodirectory'), |
|
352 | - 'id' => 'geodir_width_search_right_section', |
|
353 | - 'type' => 'text', |
|
354 | - 'css' => 'min-width:300px;', |
|
355 | - 'std' => '30' // Default value to show home top section |
|
356 | - ), |
|
341 | + array( |
|
342 | + 'name' => __('Search right section', 'geodirectory'), |
|
343 | + 'desc' => __('Show the right section of search page', 'geodirectory'), |
|
344 | + 'id' => 'geodir_show_search_right_section', |
|
345 | + 'type' => 'checkbox', |
|
346 | + 'std' => '1' // Default value to show home top section |
|
347 | + ), |
|
357 | 348 | |
349 | + array( |
|
350 | + 'name' => __('Width of search right section', 'geodirectory'), |
|
351 | + 'desc' => __('Enter the width of right section of search page in %', 'geodirectory'), |
|
352 | + 'id' => 'geodir_width_search_right_section', |
|
353 | + 'type' => 'text', |
|
354 | + 'css' => 'min-width:300px;', |
|
355 | + 'std' => '30' // Default value to show home top section |
|
356 | + ), |
|
358 | 357 | |
359 | - array( |
|
360 | - 'name' => __('Search content section view', 'geodirectory'), |
|
361 | - 'desc' => __('Set the listing view of search page', 'geodirectory'), |
|
362 | - 'id' => 'geodir_search_view', |
|
363 | - 'css' => 'min-width:300px;', |
|
364 | - 'std' => 'gridview_onehalf', |
|
365 | - 'type' => 'select', |
|
366 | - 'class' => 'chosen_select', |
|
367 | - 'options' => array_unique(array( |
|
368 | - 'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'), |
|
369 | - 'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'), |
|
370 | - 'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'), |
|
371 | - 'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'), |
|
372 | - 'listview' => __('List view', 'geodirectory'), |
|
373 | - )) |
|
374 | - ), |
|
375 | 358 | |
376 | - array( |
|
377 | - 'name' => __('Width of search content section', 'geodirectory'), |
|
378 | - 'desc' => __('Enter the width of content section of search page in %', 'geodirectory'), |
|
379 | - 'id' => 'geodir_width_search_contant_section', |
|
380 | - 'type' => 'text', |
|
381 | - 'css' => 'min-width:300px;', |
|
382 | - 'std' => '63' // Default value to show home top section |
|
383 | - ), |
|
359 | + array( |
|
360 | + 'name' => __('Search content section view', 'geodirectory'), |
|
361 | + 'desc' => __('Set the listing view of search page', 'geodirectory'), |
|
362 | + 'id' => 'geodir_search_view', |
|
363 | + 'css' => 'min-width:300px;', |
|
364 | + 'std' => 'gridview_onehalf', |
|
365 | + 'type' => 'select', |
|
366 | + 'class' => 'chosen_select', |
|
367 | + 'options' => array_unique(array( |
|
368 | + 'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'), |
|
369 | + 'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'), |
|
370 | + 'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'), |
|
371 | + 'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'), |
|
372 | + 'listview' => __('List view', 'geodirectory'), |
|
373 | + )) |
|
374 | + ), |
|
384 | 375 | |
385 | - array( |
|
386 | - 'name' => __('Search left section', 'geodirectory'), |
|
387 | - 'desc' => __('Show the left section of search page', 'geodirectory'), |
|
388 | - 'id' => 'geodir_show_search_left_section', |
|
389 | - 'type' => 'checkbox', |
|
390 | - 'std' => '0' // Default value to show home top section |
|
391 | - ), |
|
376 | + array( |
|
377 | + 'name' => __('Width of search content section', 'geodirectory'), |
|
378 | + 'desc' => __('Enter the width of content section of search page in %', 'geodirectory'), |
|
379 | + 'id' => 'geodir_width_search_contant_section', |
|
380 | + 'type' => 'text', |
|
381 | + 'css' => 'min-width:300px;', |
|
382 | + 'std' => '63' // Default value to show home top section |
|
383 | + ), |
|
392 | 384 | |
393 | - array( |
|
394 | - 'name' => __('Width of search left section', 'geodirectory'), |
|
395 | - 'desc' => __('Enter the width of left section of search in %', 'geodirectory'), |
|
396 | - 'id' => 'geodir_width_search_left_section', |
|
397 | - 'type' => 'text', |
|
398 | - 'css' => 'min-width:300px;', |
|
399 | - 'std' => '30' // Default value to show home top section |
|
400 | - ), |
|
385 | + array( |
|
386 | + 'name' => __('Search left section', 'geodirectory'), |
|
387 | + 'desc' => __('Show the left section of search page', 'geodirectory'), |
|
388 | + 'id' => 'geodir_show_search_left_section', |
|
389 | + 'type' => 'checkbox', |
|
390 | + 'std' => '0' // Default value to show home top section |
|
391 | + ), |
|
401 | 392 | |
402 | - array( |
|
403 | - 'name' => __('Search bottom section', 'geodirectory'), |
|
404 | - 'desc' => __('Show the bottom section of search page', 'geodirectory'), |
|
405 | - 'id' => 'geodir_show_search_bottom_section', |
|
406 | - 'type' => 'checkbox', |
|
407 | - 'std' => '0' // Default value to show home top section |
|
408 | - ), |
|
393 | + array( |
|
394 | + 'name' => __('Width of search left section', 'geodirectory'), |
|
395 | + 'desc' => __('Enter the width of left section of search in %', 'geodirectory'), |
|
396 | + 'id' => 'geodir_width_search_left_section', |
|
397 | + 'type' => 'text', |
|
398 | + 'css' => 'min-width:300px;', |
|
399 | + 'std' => '30' // Default value to show home top section |
|
400 | + ), |
|
401 | + |
|
402 | + array( |
|
403 | + 'name' => __('Search bottom section', 'geodirectory'), |
|
404 | + 'desc' => __('Show the bottom section of search page', 'geodirectory'), |
|
405 | + 'id' => 'geodir_show_search_bottom_section', |
|
406 | + 'type' => 'checkbox', |
|
407 | + 'std' => '0' // Default value to show home top section |
|
408 | + ), |
|
409 | 409 | |
410 | 410 | array( |
411 | - 'name' => __('Show advanced pagination details', 'geodirectory'), |
|
412 | - 'desc' => __('This will add extra pagination info like "Showing listings x-y of z" after/before pagination.', 'geodirectory'), |
|
413 | - 'id' => 'geodir_pagination_advance_info', |
|
414 | - 'css' => 'min-width:300px;', |
|
415 | - 'std' => '', |
|
416 | - 'type' => 'select', |
|
417 | - 'class' => 'chosen_select', |
|
418 | - 'options' => array( |
|
411 | + 'name' => __('Show advanced pagination details', 'geodirectory'), |
|
412 | + 'desc' => __('This will add extra pagination info like "Showing listings x-y of z" after/before pagination.', 'geodirectory'), |
|
413 | + 'id' => 'geodir_pagination_advance_info', |
|
414 | + 'css' => 'min-width:300px;', |
|
415 | + 'std' => '', |
|
416 | + 'type' => 'select', |
|
417 | + 'class' => 'chosen_select', |
|
418 | + 'options' => array( |
|
419 | 419 | '' => __('Never Display', 'geodirectory'), |
420 | 420 | 'after' => __('After Pagination', 'geodirectory'), |
421 | 421 | 'before' => __('Before Pagination', 'geodirectory') |
422 | 422 | ) |
423 | - ), |
|
423 | + ), |
|
424 | 424 | |
425 | - array('type' => 'sectionend', 'id' => 'geodir_search_layout'), |
|
425 | + array('type' => 'sectionend', 'id' => 'geodir_search_layout'), |
|
426 | 426 | |
427 | 427 | |
428 | - array('name' => __('Search form settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_search_form_default_text_settings'), |
|
428 | + array('name' => __('Search form settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_search_form_default_text_settings'), |
|
429 | 429 | |
430 | - array( |
|
431 | - 'name' => __('Use old non-styled form', 'geodirectory'), |
|
432 | - 'desc' => __('Will show the old type form (not recommended unless you had added your own styles)', 'geodirectory'), |
|
433 | - 'id' => 'geodir_show_search_old_search_from', |
|
434 | - 'type' => 'checkbox', |
|
435 | - 'std' => '0' // Default value to show |
|
436 | - ), |
|
430 | + array( |
|
431 | + 'name' => __('Use old non-styled form', 'geodirectory'), |
|
432 | + 'desc' => __('Will show the old type form (not recommended unless you had added your own styles)', 'geodirectory'), |
|
433 | + 'id' => 'geodir_show_search_old_search_from', |
|
434 | + 'type' => 'checkbox', |
|
435 | + 'std' => '0' // Default value to show |
|
436 | + ), |
|
437 | 437 | |
438 | - array( |
|
439 | - 'name' => __('Search field default value', 'geodirectory'), |
|
440 | - 'desc' => __('Show the search text box \'placeholder\' value on search form.', 'geodirectory'), |
|
441 | - 'id' => 'geodir_search_field_default_text', |
|
442 | - 'type' => 'text', |
|
443 | - 'css' => 'min-width:300px;', |
|
444 | - 'std' => 'Search for' // show on the listing page. |
|
445 | - ), |
|
438 | + array( |
|
439 | + 'name' => __('Search field default value', 'geodirectory'), |
|
440 | + 'desc' => __('Show the search text box \'placeholder\' value on search form.', 'geodirectory'), |
|
441 | + 'id' => 'geodir_search_field_default_text', |
|
442 | + 'type' => 'text', |
|
443 | + 'css' => 'min-width:300px;', |
|
444 | + 'std' => 'Search for' // show on the listing page. |
|
445 | + ), |
|
446 | 446 | |
447 | - array( |
|
448 | - 'name' => __('Near field default value', 'geodirectory'), |
|
449 | - 'desc' => __('Show the near text box \'placeholder\' value on search form.', 'geodirectory'), |
|
450 | - 'id' => 'geodir_near_field_default_text', |
|
451 | - 'type' => 'text', |
|
452 | - 'css' => 'min-width:300px;', |
|
453 | - 'std' => 'Near' // show on the listing page. |
|
454 | - ), |
|
447 | + array( |
|
448 | + 'name' => __('Near field default value', 'geodirectory'), |
|
449 | + 'desc' => __('Show the near text box \'placeholder\' value on search form.', 'geodirectory'), |
|
450 | + 'id' => 'geodir_near_field_default_text', |
|
451 | + 'type' => 'text', |
|
452 | + 'css' => 'min-width:300px;', |
|
453 | + 'std' => 'Near' // show on the listing page. |
|
454 | + ), |
|
455 | 455 | |
456 | - array( |
|
457 | - 'name' => __('Search button label', 'geodirectory'), |
|
458 | - 'desc' => __('Show the search button label on search form.', 'geodirectory'), |
|
459 | - 'id' => 'geodir_search_button_label', |
|
460 | - 'type' => 'text', |
|
461 | - 'css' => 'min-width:300px;', |
|
462 | - 'std' => 'Search' // show on the listing page. |
|
463 | - ), |
|
456 | + array( |
|
457 | + 'name' => __('Search button label', 'geodirectory'), |
|
458 | + 'desc' => __('Show the search button label on search form.', 'geodirectory'), |
|
459 | + 'id' => 'geodir_search_button_label', |
|
460 | + 'type' => 'text', |
|
461 | + 'css' => 'min-width:300px;', |
|
462 | + 'std' => 'Search' // show on the listing page. |
|
463 | + ), |
|
464 | 464 | |
465 | - array('type' => 'sectionend', 'id' => 'geodir_search_form_default_text_settings'), |
|
465 | + array('type' => 'sectionend', 'id' => 'geodir_search_form_default_text_settings'), |
|
466 | 466 | |
467 | - /* Listing Layout Settings end */ |
|
467 | + /* Listing Layout Settings end */ |
|
468 | 468 | |
469 | 469 | |
470 | - /* Detail Layout Settings end */ |
|
470 | + /* Detail Layout Settings end */ |
|
471 | 471 | |
472 | - array('name' => __('Detail', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_detail_settings '), |
|
472 | + array('name' => __('Detail', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_detail_settings '), |
|
473 | 473 | |
474 | - array('name' => __('Detail/Single Page Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_settings '), |
|
474 | + array('name' => __('Detail/Single Page Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_settings '), |
|
475 | 475 | |
476 | - array( |
|
477 | - 'name' => __('Detail top section', 'geodirectory'), |
|
478 | - 'desc' => __('Show the top section of listing page', 'geodirectory'), |
|
479 | - 'id' => 'geodir_show_detail_top_section', |
|
480 | - 'type' => 'checkbox', |
|
481 | - 'std' => '1' // Default value to show home top section |
|
482 | - ), |
|
476 | + array( |
|
477 | + 'name' => __('Detail top section', 'geodirectory'), |
|
478 | + 'desc' => __('Show the top section of listing page', 'geodirectory'), |
|
479 | + 'id' => 'geodir_show_detail_top_section', |
|
480 | + 'type' => 'checkbox', |
|
481 | + 'std' => '1' // Default value to show home top section |
|
482 | + ), |
|
483 | 483 | |
484 | - array( |
|
485 | - 'name' => __('Detail bottom section', 'geodirectory'), |
|
486 | - 'desc' => __('Show the bottom section of listing page', 'geodirectory'), |
|
487 | - 'id' => 'geodir_show_detail_bottom_section', |
|
488 | - 'type' => 'checkbox', |
|
489 | - 'std' => '1' // Default value to show home top section |
|
490 | - ), |
|
491 | - array( |
|
492 | - 'name' => __('Detail sidebar section on left side', 'geodirectory'), |
|
493 | - 'desc' => __('Display detail sidebar section on left side of the detail page', 'geodirectory'), |
|
494 | - 'id' => 'geodir_detail_sidebar_left_section', |
|
495 | - 'type' => 'checkbox', |
|
496 | - 'std' => '0' |
|
497 | - ), |
|
498 | - array( |
|
499 | - 'name' => __('Disable GD modal', 'geodirectory'), |
|
500 | - 'desc' => __('Disable GD modal that displays slideshow images in popup', 'geodirectory'), |
|
501 | - 'id' => 'geodir_disable_gb_modal', |
|
502 | - 'type' => 'checkbox', |
|
503 | - 'std' => '0' |
|
504 | - ), |
|
505 | - array( |
|
506 | - 'name' => __('Disable Tweet, Fb Like, Google+ buttons section', 'geodirectory'), |
|
507 | - 'desc' => __('Disable Tweet, Fb Like, Google+ buttons section that displays on Detail page sidebar', 'geodirectory'), |
|
508 | - 'id' => 'geodir_disable_tfg_buttons_section', |
|
509 | - 'type' => 'checkbox', |
|
510 | - 'std' => '0' |
|
511 | - ), |
|
512 | - array( |
|
513 | - 'name' => __('Disable Google Analytics section', 'geodirectory'), |
|
514 | - 'desc' => __('Disable Google Analytics section that displays on Detail page sidebar', 'geodirectory'), |
|
515 | - 'id' => 'geodir_disable_google_analytics_section', |
|
516 | - 'type' => 'checkbox', |
|
517 | - 'std' => '0' |
|
518 | - ), |
|
519 | - array( |
|
520 | - 'name' => __('Disable User Links section', 'geodirectory'), |
|
521 | - 'desc' => __('Disable User Links section (Edit post, Favorite etc..) that displays on Detail page sidebar', 'geodirectory'), |
|
522 | - 'id' => 'geodir_disable_user_links_section', |
|
523 | - 'type' => 'checkbox', |
|
524 | - 'std' => '0' |
|
525 | - ), |
|
526 | - array( |
|
527 | - 'name' => __('Disable Rating Info section', 'geodirectory'), |
|
528 | - 'desc' => __('Disable Rating Info section that displays on Detail page sidebar', 'geodirectory'), |
|
529 | - 'id' => 'geodir_disable_rating_info_section', |
|
530 | - 'type' => 'checkbox', |
|
531 | - 'std' => '0' |
|
532 | - ), |
|
533 | - array( |
|
534 | - 'name' => __('Disable Listing Info section', 'geodirectory'), |
|
535 | - 'desc' => __('Disable Listing Info section that displays on Detail page sidebar', 'geodirectory'), |
|
536 | - 'id' => 'geodir_disable_listing_info_section', |
|
537 | - 'type' => 'checkbox', |
|
538 | - 'std' => '0' |
|
539 | - ), |
|
484 | + array( |
|
485 | + 'name' => __('Detail bottom section', 'geodirectory'), |
|
486 | + 'desc' => __('Show the bottom section of listing page', 'geodirectory'), |
|
487 | + 'id' => 'geodir_show_detail_bottom_section', |
|
488 | + 'type' => 'checkbox', |
|
489 | + 'std' => '1' // Default value to show home top section |
|
490 | + ), |
|
491 | + array( |
|
492 | + 'name' => __('Detail sidebar section on left side', 'geodirectory'), |
|
493 | + 'desc' => __('Display detail sidebar section on left side of the detail page', 'geodirectory'), |
|
494 | + 'id' => 'geodir_detail_sidebar_left_section', |
|
495 | + 'type' => 'checkbox', |
|
496 | + 'std' => '0' |
|
497 | + ), |
|
498 | + array( |
|
499 | + 'name' => __('Disable GD modal', 'geodirectory'), |
|
500 | + 'desc' => __('Disable GD modal that displays slideshow images in popup', 'geodirectory'), |
|
501 | + 'id' => 'geodir_disable_gb_modal', |
|
502 | + 'type' => 'checkbox', |
|
503 | + 'std' => '0' |
|
504 | + ), |
|
505 | + array( |
|
506 | + 'name' => __('Disable Tweet, Fb Like, Google+ buttons section', 'geodirectory'), |
|
507 | + 'desc' => __('Disable Tweet, Fb Like, Google+ buttons section that displays on Detail page sidebar', 'geodirectory'), |
|
508 | + 'id' => 'geodir_disable_tfg_buttons_section', |
|
509 | + 'type' => 'checkbox', |
|
510 | + 'std' => '0' |
|
511 | + ), |
|
512 | + array( |
|
513 | + 'name' => __('Disable Google Analytics section', 'geodirectory'), |
|
514 | + 'desc' => __('Disable Google Analytics section that displays on Detail page sidebar', 'geodirectory'), |
|
515 | + 'id' => 'geodir_disable_google_analytics_section', |
|
516 | + 'type' => 'checkbox', |
|
517 | + 'std' => '0' |
|
518 | + ), |
|
519 | + array( |
|
520 | + 'name' => __('Disable User Links section', 'geodirectory'), |
|
521 | + 'desc' => __('Disable User Links section (Edit post, Favorite etc..) that displays on Detail page sidebar', 'geodirectory'), |
|
522 | + 'id' => 'geodir_disable_user_links_section', |
|
523 | + 'type' => 'checkbox', |
|
524 | + 'std' => '0' |
|
525 | + ), |
|
526 | + array( |
|
527 | + 'name' => __('Disable Rating Info section', 'geodirectory'), |
|
528 | + 'desc' => __('Disable Rating Info section that displays on Detail page sidebar', 'geodirectory'), |
|
529 | + 'id' => 'geodir_disable_rating_info_section', |
|
530 | + 'type' => 'checkbox', |
|
531 | + 'std' => '0' |
|
532 | + ), |
|
533 | + array( |
|
534 | + 'name' => __('Disable Listing Info section', 'geodirectory'), |
|
535 | + 'desc' => __('Disable Listing Info section that displays on Detail page sidebar', 'geodirectory'), |
|
536 | + 'id' => 'geodir_disable_listing_info_section', |
|
537 | + 'type' => 'checkbox', |
|
538 | + 'std' => '0' |
|
539 | + ), |
|
540 | 540 | |
541 | - array('type' => 'sectionend', 'id' => 'detail_page_settings'), |
|
541 | + array('type' => 'sectionend', 'id' => 'detail_page_settings'), |
|
542 | 542 | |
543 | 543 | |
544 | - /* ---------- DETAIL PAGE TAB SETTING START*/ |
|
544 | + /* ---------- DETAIL PAGE TAB SETTING START*/ |
|
545 | 545 | |
546 | - array('name' => __('Detail Page Tab Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_detail_page_tab_settings '), |
|
546 | + array('name' => __('Detail Page Tab Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_detail_page_tab_settings '), |
|
547 | 547 | |
548 | - array( |
|
549 | - 'name' => __('Exclude selected tabs from detail page', 'geodirectory'), |
|
550 | - 'desc' => __('Select tabs to exclude from the list of all appearing tabs on detail page.', 'geodirectory'), |
|
551 | - 'tip' => '', |
|
552 | - 'id' => 'geodir_detail_page_tabs_excluded', |
|
553 | - 'css' => 'min-width:300px;', |
|
554 | - 'std' => geodir_get_posttypes(), |
|
555 | - 'type' => 'multiselect', |
|
556 | - 'placeholder_text' => __('Select tabs', 'geodirectory'), |
|
557 | - 'class' => 'chosen_select', |
|
558 | - 'options' => array_unique(geodir_detail_page_tabs_key_value_array()) |
|
559 | - ), |
|
548 | + array( |
|
549 | + 'name' => __('Exclude selected tabs from detail page', 'geodirectory'), |
|
550 | + 'desc' => __('Select tabs to exclude from the list of all appearing tabs on detail page.', 'geodirectory'), |
|
551 | + 'tip' => '', |
|
552 | + 'id' => 'geodir_detail_page_tabs_excluded', |
|
553 | + 'css' => 'min-width:300px;', |
|
554 | + 'std' => geodir_get_posttypes(), |
|
555 | + 'type' => 'multiselect', |
|
556 | + 'placeholder_text' => __('Select tabs', 'geodirectory'), |
|
557 | + 'class' => 'chosen_select', |
|
558 | + 'options' => array_unique(geodir_detail_page_tabs_key_value_array()) |
|
559 | + ), |
|
560 | 560 | |
561 | - array( |
|
562 | - 'name' => __('Show as list', 'geodirectory'), |
|
563 | - 'desc' => __('Show as list instead of tabs', 'geodirectory'), |
|
564 | - 'id' => 'geodir_disable_tabs', |
|
565 | - 'type' => 'checkbox', |
|
566 | - 'std' => '0' |
|
567 | - ), |
|
561 | + array( |
|
562 | + 'name' => __('Show as list', 'geodirectory'), |
|
563 | + 'desc' => __('Show as list instead of tabs', 'geodirectory'), |
|
564 | + 'id' => 'geodir_disable_tabs', |
|
565 | + 'type' => 'checkbox', |
|
566 | + 'std' => '0' |
|
567 | + ), |
|
568 | 568 | |
569 | - array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'), |
|
570 | - /* ---------- DETAIL PAGE TAB SETTING END*/ |
|
569 | + array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'), |
|
570 | + /* ---------- DETAIL PAGE TAB SETTING END*/ |
|
571 | 571 | |
572 | - /* START DEFAULT STAR IMAGE*/ |
|
573 | - array('name' => __('Default Rating Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_rating_settings '), |
|
572 | + /* START DEFAULT STAR IMAGE*/ |
|
573 | + array('name' => __('Default Rating Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_rating_settings '), |
|
574 | 574 | |
575 | - array( |
|
576 | - 'name' => __('Upload default rating star icon', 'geodirectory'), |
|
577 | - 'desc' => '', |
|
578 | - 'id' => 'geodir_default_rating_star_icon', |
|
579 | - 'type' => 'file', |
|
580 | - 'std' => '0', |
|
581 | - 'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section |
|
582 | - ), |
|
575 | + array( |
|
576 | + 'name' => __('Upload default rating star icon', 'geodirectory'), |
|
577 | + 'desc' => '', |
|
578 | + 'id' => 'geodir_default_rating_star_icon', |
|
579 | + 'type' => 'file', |
|
580 | + 'std' => '0', |
|
581 | + 'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section |
|
582 | + ), |
|
583 | 583 | array( |
584 | 584 | 'name' => __('Enable Font Awesome', 'geodirectory'), |
585 | 585 | 'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory' ), |
@@ -595,369 +595,369 @@ discard block |
||
595 | 595 | 'std' => '#757575' |
596 | 596 | ), |
597 | 597 | |
598 | - array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'), |
|
598 | + array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'), |
|
599 | 599 | |
600 | - /* END DEFAULT STAR IMAGE*/ |
|
600 | + /* END DEFAULT STAR IMAGE*/ |
|
601 | 601 | |
602 | - /* Detail related post settings start */ |
|
602 | + /* Detail related post settings start */ |
|
603 | 603 | |
604 | - array('name' => __('Related Post Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_related_post_settings '), |
|
604 | + array('name' => __('Related Post Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_related_post_settings '), |
|
605 | 605 | |
606 | - array( |
|
607 | - 'name' => __('Show related post listing on', 'geodirectory'), |
|
608 | - 'desc' => __('Select the post types to display related listing on detail page.', 'geodirectory'), |
|
609 | - 'tip' => '', |
|
610 | - 'id' => 'geodir_add_related_listing_posttypes', |
|
611 | - 'css' => 'min-width:300px;', |
|
612 | - 'std' => geodir_get_posttypes(), |
|
613 | - 'type' => 'multiselect', |
|
614 | - 'placeholder_text' => __('Select post types', 'geodirectory'), |
|
615 | - 'class' => 'chosen_select', |
|
616 | - 'options' => array_unique(geodir_post_type_setting_fun()) |
|
617 | - ), |
|
606 | + array( |
|
607 | + 'name' => __('Show related post listing on', 'geodirectory'), |
|
608 | + 'desc' => __('Select the post types to display related listing on detail page.', 'geodirectory'), |
|
609 | + 'tip' => '', |
|
610 | + 'id' => 'geodir_add_related_listing_posttypes', |
|
611 | + 'css' => 'min-width:300px;', |
|
612 | + 'std' => geodir_get_posttypes(), |
|
613 | + 'type' => 'multiselect', |
|
614 | + 'placeholder_text' => __('Select post types', 'geodirectory'), |
|
615 | + 'class' => 'chosen_select', |
|
616 | + 'options' => array_unique(geodir_post_type_setting_fun()) |
|
617 | + ), |
|
618 | 618 | |
619 | - array( |
|
620 | - 'name' => __('Relate to', 'geodirectory'), |
|
621 | - 'desc' => __('Set the relation between current post to related posts.', 'geodirectory'), |
|
622 | - 'id' => 'geodir_related_post_relate_to', |
|
623 | - 'css' => 'min-width:300px;', |
|
624 | - 'std' => 'category', |
|
625 | - 'type' => 'select', |
|
626 | - 'class' => 'chosen_select', |
|
627 | - 'options' => array_unique(array( |
|
628 | - 'category' => __('Categories', 'geodirectory'), |
|
629 | - 'tags' => __('Tags', 'geodirectory'), |
|
630 | - )) |
|
631 | - ), |
|
619 | + array( |
|
620 | + 'name' => __('Relate to', 'geodirectory'), |
|
621 | + 'desc' => __('Set the relation between current post to related posts.', 'geodirectory'), |
|
622 | + 'id' => 'geodir_related_post_relate_to', |
|
623 | + 'css' => 'min-width:300px;', |
|
624 | + 'std' => 'category', |
|
625 | + 'type' => 'select', |
|
626 | + 'class' => 'chosen_select', |
|
627 | + 'options' => array_unique(array( |
|
628 | + 'category' => __('Categories', 'geodirectory'), |
|
629 | + 'tags' => __('Tags', 'geodirectory'), |
|
630 | + )) |
|
631 | + ), |
|
632 | 632 | |
633 | - array( |
|
634 | - 'name' => __('Layout', 'geodirectory'), |
|
635 | - 'desc' => __('Set the listing view of relate post on detail page', 'geodirectory'), |
|
636 | - 'id' => 'geodir_related_post_listing_view', |
|
637 | - 'css' => 'min-width:300px;', |
|
638 | - 'std' => 'gridview_onehalf', |
|
639 | - 'type' => 'select', |
|
640 | - 'class' => 'chosen_select', |
|
641 | - 'options' => array_unique(array( |
|
642 | - 'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'), |
|
643 | - 'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'), |
|
644 | - 'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'), |
|
645 | - 'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'), |
|
646 | - 'listview' => __('List view', 'geodirectory'), |
|
647 | - )) |
|
648 | - ), |
|
633 | + array( |
|
634 | + 'name' => __('Layout', 'geodirectory'), |
|
635 | + 'desc' => __('Set the listing view of relate post on detail page', 'geodirectory'), |
|
636 | + 'id' => 'geodir_related_post_listing_view', |
|
637 | + 'css' => 'min-width:300px;', |
|
638 | + 'std' => 'gridview_onehalf', |
|
639 | + 'type' => 'select', |
|
640 | + 'class' => 'chosen_select', |
|
641 | + 'options' => array_unique(array( |
|
642 | + 'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'), |
|
643 | + 'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'), |
|
644 | + 'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'), |
|
645 | + 'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'), |
|
646 | + 'listview' => __('List view', 'geodirectory'), |
|
647 | + )) |
|
648 | + ), |
|
649 | 649 | |
650 | - array( |
|
651 | - 'name' => __('Sort by', 'geodirectory'), |
|
652 | - 'desc' => __('Set the related post listing sort by view', 'geodirectory'), |
|
653 | - 'id' => 'geodir_related_post_sortby', |
|
654 | - 'css' => 'min-width:300px;', |
|
655 | - 'std' => 'latest', |
|
656 | - 'type' => 'select', |
|
657 | - 'class' => 'chosen_select', |
|
658 | - 'options' => array_unique(array( |
|
659 | - 'latest' => __('Latest', 'geodirectory'), |
|
660 | - 'featured' => __('Featured', 'geodirectory'), |
|
661 | - 'high_review' => __('Review', 'geodirectory'), |
|
662 | - 'high_rating' => __('Rating', 'geodirectory'), |
|
663 | - 'random' => __('Random', 'geodirectory'), |
|
664 | - 'nearest' => __('Nearest', 'geodirectory'), |
|
665 | - )) |
|
666 | - ), |
|
650 | + array( |
|
651 | + 'name' => __('Sort by', 'geodirectory'), |
|
652 | + 'desc' => __('Set the related post listing sort by view', 'geodirectory'), |
|
653 | + 'id' => 'geodir_related_post_sortby', |
|
654 | + 'css' => 'min-width:300px;', |
|
655 | + 'std' => 'latest', |
|
656 | + 'type' => 'select', |
|
657 | + 'class' => 'chosen_select', |
|
658 | + 'options' => array_unique(array( |
|
659 | + 'latest' => __('Latest', 'geodirectory'), |
|
660 | + 'featured' => __('Featured', 'geodirectory'), |
|
661 | + 'high_review' => __('Review', 'geodirectory'), |
|
662 | + 'high_rating' => __('Rating', 'geodirectory'), |
|
663 | + 'random' => __('Random', 'geodirectory'), |
|
664 | + 'nearest' => __('Nearest', 'geodirectory'), |
|
665 | + )) |
|
666 | + ), |
|
667 | 667 | |
668 | - array( |
|
669 | - 'name' => __('Number of posts:', 'geodirectory'), |
|
670 | - 'desc' => __('Enter number of posts to display on related posts listing', 'geodirectory'), |
|
671 | - 'id' => 'geodir_related_post_count', |
|
672 | - 'type' => 'text', |
|
673 | - 'css' => 'min-width:300px;', |
|
674 | - 'std' => '5' // Default value to show home top section |
|
675 | - ), |
|
668 | + array( |
|
669 | + 'name' => __('Number of posts:', 'geodirectory'), |
|
670 | + 'desc' => __('Enter number of posts to display on related posts listing', 'geodirectory'), |
|
671 | + 'id' => 'geodir_related_post_count', |
|
672 | + 'type' => 'text', |
|
673 | + 'css' => 'min-width:300px;', |
|
674 | + 'std' => '5' // Default value to show home top section |
|
675 | + ), |
|
676 | 676 | |
677 | - array( |
|
678 | - 'name' => __('Post excerpt', 'geodirectory'), |
|
679 | - 'desc' => __('Post content excerpt character count', 'geodirectory'), |
|
680 | - 'id' => 'geodir_related_post_excerpt', |
|
681 | - 'type' => 'text', |
|
682 | - 'css' => 'min-width:300px;', |
|
683 | - 'std' => '20' // Default value to show home top section |
|
684 | - ), |
|
677 | + array( |
|
678 | + 'name' => __('Post excerpt', 'geodirectory'), |
|
679 | + 'desc' => __('Post content excerpt character count', 'geodirectory'), |
|
680 | + 'id' => 'geodir_related_post_excerpt', |
|
681 | + 'type' => 'text', |
|
682 | + 'css' => 'min-width:300px;', |
|
683 | + 'std' => '20' // Default value to show home top section |
|
684 | + ), |
|
685 | 685 | |
686 | 686 | |
687 | - array('type' => 'sectionend', 'id' => 'detail_page_related_post_settings'), |
|
688 | - /* Detail Layout Settings end */ |
|
687 | + array('type' => 'sectionend', 'id' => 'detail_page_related_post_settings'), |
|
688 | + /* Detail Layout Settings end */ |
|
689 | 689 | |
690 | - /* Author Layout Settings Start */ |
|
690 | + /* Author Layout Settings Start */ |
|
691 | 691 | |
692 | - array('name' => __('Author', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_author_settings '), |
|
692 | + array('name' => __('Author', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_author_settings '), |
|
693 | 693 | |
694 | 694 | |
695 | - array('name' => __('Author Page Layout Settings', 'geodirectory'), |
|
696 | - 'type' => 'sectionstart', |
|
697 | - 'desc' => '', |
|
698 | - 'id' => 'geodir_author_layout'), |
|
695 | + array('name' => __('Author Page Layout Settings', 'geodirectory'), |
|
696 | + 'type' => 'sectionstart', |
|
697 | + 'desc' => '', |
|
698 | + 'id' => 'geodir_author_layout'), |
|
699 | 699 | |
700 | - array( |
|
701 | - 'name' => __('Author top section', 'geodirectory'), |
|
702 | - 'desc' => __('Show the top section of author page', 'geodirectory'), |
|
703 | - 'id' => 'geodir_show_author_top_section', |
|
704 | - 'type' => 'checkbox', |
|
705 | - 'std' => '1' // Default value to show home top section |
|
706 | - ), |
|
700 | + array( |
|
701 | + 'name' => __('Author top section', 'geodirectory'), |
|
702 | + 'desc' => __('Show the top section of author page', 'geodirectory'), |
|
703 | + 'id' => 'geodir_show_author_top_section', |
|
704 | + 'type' => 'checkbox', |
|
705 | + 'std' => '1' // Default value to show home top section |
|
706 | + ), |
|
707 | 707 | |
708 | - array( |
|
709 | - 'name' => __('Author right section', 'geodirectory'), |
|
710 | - 'desc' => __('Show the right section of author page', 'geodirectory'), |
|
711 | - 'id' => 'geodir_show_author_right_section', |
|
712 | - 'type' => 'checkbox', |
|
713 | - 'std' => '1' // Default value to show home top section |
|
714 | - ), |
|
708 | + array( |
|
709 | + 'name' => __('Author right section', 'geodirectory'), |
|
710 | + 'desc' => __('Show the right section of author page', 'geodirectory'), |
|
711 | + 'id' => 'geodir_show_author_right_section', |
|
712 | + 'type' => 'checkbox', |
|
713 | + 'std' => '1' // Default value to show home top section |
|
714 | + ), |
|
715 | 715 | |
716 | - array( |
|
717 | - 'name' => __('Width of author right section', 'geodirectory'), |
|
718 | - 'desc' => __('Enter the width of right section of author page in %', 'geodirectory'), |
|
719 | - 'id' => 'geodir_width_author_right_section', |
|
720 | - 'type' => 'text', |
|
721 | - 'css' => 'min-width:300px;', |
|
722 | - 'std' => '30' // Default value to show home top section |
|
723 | - ), |
|
716 | + array( |
|
717 | + 'name' => __('Width of author right section', 'geodirectory'), |
|
718 | + 'desc' => __('Enter the width of right section of author page in %', 'geodirectory'), |
|
719 | + 'id' => 'geodir_width_author_right_section', |
|
720 | + 'type' => 'text', |
|
721 | + 'css' => 'min-width:300px;', |
|
722 | + 'std' => '30' // Default value to show home top section |
|
723 | + ), |
|
724 | 724 | |
725 | - array( |
|
726 | - 'name' => __('Author content section view', 'geodirectory'), |
|
727 | - 'desc' => __('Set the listing view of author page', 'geodirectory'), |
|
728 | - 'id' => 'geodir_author_view', |
|
729 | - 'css' => 'min-width:300px;', |
|
730 | - 'std' => 'gridview_onehalf', |
|
731 | - 'type' => 'select', |
|
732 | - 'class' => 'chosen_select', |
|
733 | - 'options' => array_unique(array( |
|
734 | - 'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'), |
|
735 | - 'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'), |
|
736 | - 'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'), |
|
737 | - 'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'), |
|
738 | - 'listview' => __('List view', 'geodirectory'), |
|
739 | - )) |
|
740 | - ), |
|
725 | + array( |
|
726 | + 'name' => __('Author content section view', 'geodirectory'), |
|
727 | + 'desc' => __('Set the listing view of author page', 'geodirectory'), |
|
728 | + 'id' => 'geodir_author_view', |
|
729 | + 'css' => 'min-width:300px;', |
|
730 | + 'std' => 'gridview_onehalf', |
|
731 | + 'type' => 'select', |
|
732 | + 'class' => 'chosen_select', |
|
733 | + 'options' => array_unique(array( |
|
734 | + 'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'), |
|
735 | + 'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'), |
|
736 | + 'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'), |
|
737 | + 'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'), |
|
738 | + 'listview' => __('List view', 'geodirectory'), |
|
739 | + )) |
|
740 | + ), |
|
741 | 741 | |
742 | - array( |
|
743 | - 'name' => __('Width of author content section', 'geodirectory'), |
|
744 | - 'desc' => __('Enter the width of content section of author page in %', 'geodirectory'), |
|
745 | - 'id' => 'geodir_width_author_contant_section', |
|
746 | - 'type' => 'text', |
|
747 | - 'css' => 'min-width:300px;', |
|
748 | - 'std' => '63' // Default value to show home top section |
|
749 | - ), |
|
742 | + array( |
|
743 | + 'name' => __('Width of author content section', 'geodirectory'), |
|
744 | + 'desc' => __('Enter the width of content section of author page in %', 'geodirectory'), |
|
745 | + 'id' => 'geodir_width_author_contant_section', |
|
746 | + 'type' => 'text', |
|
747 | + 'css' => 'min-width:300px;', |
|
748 | + 'std' => '63' // Default value to show home top section |
|
749 | + ), |
|
750 | 750 | |
751 | - array( |
|
752 | - 'name' => __('Author left section', 'geodirectory'), |
|
753 | - 'desc' => __('Show the left section of author page', 'geodirectory'), |
|
754 | - 'id' => 'geodir_show_author_left_section', |
|
755 | - 'type' => 'checkbox', |
|
756 | - 'std' => '0' // Default value to show home top section |
|
757 | - ), |
|
751 | + array( |
|
752 | + 'name' => __('Author left section', 'geodirectory'), |
|
753 | + 'desc' => __('Show the left section of author page', 'geodirectory'), |
|
754 | + 'id' => 'geodir_show_author_left_section', |
|
755 | + 'type' => 'checkbox', |
|
756 | + 'std' => '0' // Default value to show home top section |
|
757 | + ), |
|
758 | 758 | |
759 | - array( |
|
760 | - 'name' => __('Width of author left section', 'geodirectory'), |
|
761 | - 'desc' => __('Enter the width of left section of home page in %', 'geodirectory'), |
|
762 | - 'id' => 'geodir_width_author_left_section', |
|
763 | - 'type' => 'text', |
|
764 | - 'css' => 'min-width:300px;', |
|
765 | - 'std' => '30' // Default value to show home top section |
|
766 | - ), |
|
759 | + array( |
|
760 | + 'name' => __('Width of author left section', 'geodirectory'), |
|
761 | + 'desc' => __('Enter the width of left section of home page in %', 'geodirectory'), |
|
762 | + 'id' => 'geodir_width_author_left_section', |
|
763 | + 'type' => 'text', |
|
764 | + 'css' => 'min-width:300px;', |
|
765 | + 'std' => '30' // Default value to show home top section |
|
766 | + ), |
|
767 | 767 | |
768 | - array( |
|
769 | - 'name' => __('Author bottom section', 'geodirectory'), |
|
770 | - 'desc' => __('Show the bottom section of author page', 'geodirectory'), |
|
771 | - 'id' => 'geodir_show_author_bottom_section', |
|
772 | - 'type' => 'checkbox', |
|
773 | - 'std' => '0' // Default value to show home top section |
|
774 | - ), |
|
768 | + array( |
|
769 | + 'name' => __('Author bottom section', 'geodirectory'), |
|
770 | + 'desc' => __('Show the bottom section of author page', 'geodirectory'), |
|
771 | + 'id' => 'geodir_show_author_bottom_section', |
|
772 | + 'type' => 'checkbox', |
|
773 | + 'std' => '0' // Default value to show home top section |
|
774 | + ), |
|
775 | 775 | |
776 | 776 | |
777 | - array( |
|
778 | - 'name' => __('Description word limit', 'geodirectory'), |
|
779 | - 'desc' => '', |
|
780 | - 'id' => 'geodir_author_desc_word_limit', |
|
781 | - 'type' => 'text', |
|
782 | - 'css' => 'min-width:300px;', |
|
783 | - 'std' => '50' // Default value to show home top section |
|
784 | - ), |
|
777 | + array( |
|
778 | + 'name' => __('Description word limit', 'geodirectory'), |
|
779 | + 'desc' => '', |
|
780 | + 'id' => 'geodir_author_desc_word_limit', |
|
781 | + 'type' => 'text', |
|
782 | + 'css' => 'min-width:300px;', |
|
783 | + 'std' => '50' // Default value to show home top section |
|
784 | + ), |
|
785 | 785 | |
786 | - array('type' => 'sectionend', 'id' => 'geodir_author_layout'), |
|
787 | - /* Author Layout Settings end */ |
|
786 | + array('type' => 'sectionend', 'id' => 'geodir_author_layout'), |
|
787 | + /* Author Layout Settings end */ |
|
788 | 788 | |
789 | 789 | |
790 | - /* Post Type Navigation Settings Start */ |
|
791 | - array('name' => __('Navigation', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_navigation_settings'), |
|
790 | + /* Post Type Navigation Settings Start */ |
|
791 | + array('name' => __('Navigation', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_navigation_settings'), |
|
792 | 792 | |
793 | 793 | |
794 | - /* Post Type Navigation Settings Start */ |
|
794 | + /* Post Type Navigation Settings Start */ |
|
795 | 795 | |
796 | - array('name' => __('Navigation Locations', 'geodirectory'), |
|
797 | - 'type' => 'sectionstart', |
|
798 | - 'desc' => '', |
|
799 | - 'id' => 'geodir_navigation_locations'), |
|
796 | + array('name' => __('Navigation Locations', 'geodirectory'), |
|
797 | + 'type' => 'sectionstart', |
|
798 | + 'desc' => '', |
|
799 | + 'id' => 'geodir_navigation_locations'), |
|
800 | 800 | |
801 | - array( |
|
802 | - 'name' => __('Show geodirectory navigation in selected menu locations', 'geodirectory'), |
|
803 | - 'desc' => '', |
|
804 | - 'tip' => '', |
|
805 | - 'id' => 'geodir_theme_location_nav', |
|
806 | - 'css' => 'min-width:300px;', |
|
807 | - 'std' => array(), |
|
808 | - 'type' => 'multiselect', |
|
809 | - 'placeholder_text' => __('Select menu locations', 'geodirectory'), |
|
810 | - 'class' => 'chosen_select', |
|
811 | - 'options' => array_unique(geodir_theme_location_setting_fun()) |
|
812 | - ), |
|
813 | - array('type' => 'sectionend', 'id' => 'geodir_navigation_options'), |
|
814 | - |
|
815 | - |
|
816 | - array('name' => __('Navigation Settings', 'geodirectory'), |
|
817 | - 'type' => 'sectionstart', |
|
818 | - 'desc' => '', |
|
819 | - 'id' => 'geodir_navigation_options'), |
|
801 | + array( |
|
802 | + 'name' => __('Show geodirectory navigation in selected menu locations', 'geodirectory'), |
|
803 | + 'desc' => '', |
|
804 | + 'tip' => '', |
|
805 | + 'id' => 'geodir_theme_location_nav', |
|
806 | + 'css' => 'min-width:300px;', |
|
807 | + 'std' => array(), |
|
808 | + 'type' => 'multiselect', |
|
809 | + 'placeholder_text' => __('Select menu locations', 'geodirectory'), |
|
810 | + 'class' => 'chosen_select', |
|
811 | + 'options' => array_unique(geodir_theme_location_setting_fun()) |
|
812 | + ), |
|
813 | + array('type' => 'sectionend', 'id' => 'geodir_navigation_options'), |
|
820 | 814 | |
821 | 815 | |
822 | - array( |
|
823 | - 'name' => __('Show add listing navigation in menu', 'geodirectory'), |
|
824 | - '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')), |
|
825 | - 'id' => 'geodir_show_addlisting_nav', |
|
826 | - 'std' => '1', |
|
827 | - 'type' => 'checkbox' |
|
828 | - ), |
|
816 | + array('name' => __('Navigation Settings', 'geodirectory'), |
|
817 | + 'type' => 'sectionstart', |
|
818 | + 'desc' => '', |
|
819 | + 'id' => 'geodir_navigation_options'), |
|
829 | 820 | |
830 | - array( |
|
831 | - 'name' => __('Show listings navigation in menu', 'geodirectory'), |
|
832 | - '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')), |
|
833 | - 'id' => 'geodir_show_listing_nav', |
|
834 | - 'std' => '1', |
|
835 | - 'type' => 'checkbox' |
|
836 | - ), |
|
837 | 821 | |
838 | - array('type' => 'sectionend', 'id' => 'geodir_navigation_options'), |
|
822 | + array( |
|
823 | + 'name' => __('Show add listing navigation in menu', 'geodirectory'), |
|
824 | + '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')), |
|
825 | + 'id' => 'geodir_show_addlisting_nav', |
|
826 | + 'std' => '1', |
|
827 | + 'type' => 'checkbox' |
|
828 | + ), |
|
839 | 829 | |
830 | + array( |
|
831 | + 'name' => __('Show listings navigation in menu', 'geodirectory'), |
|
832 | + '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')), |
|
833 | + 'id' => 'geodir_show_listing_nav', |
|
834 | + 'std' => '1', |
|
835 | + 'type' => 'checkbox' |
|
836 | + ), |
|
840 | 837 | |
841 | - array('name' => __('Post Type Navigation Settings', 'geodirectory'), |
|
842 | - 'type' => 'sectionstart', |
|
843 | - 'desc' => '', |
|
844 | - 'id' => 'geodir_post_type_navigation_layout'), |
|
845 | - array( |
|
846 | - 'name' => __('Show listing link in main navigation', 'geodirectory'), |
|
847 | - 'desc' => '', |
|
848 | - 'tip' => '', |
|
849 | - 'id' => 'geodir_add_posttype_in_main_nav', |
|
850 | - 'css' => 'min-width:300px;', |
|
851 | - 'std' => array(), |
|
852 | - 'type' => 'multiselect', |
|
853 | - 'placeholder_text' => __('Select post types', 'geodirectory'), |
|
854 | - 'class' => 'chosen_select', |
|
855 | - 'options' => array_unique(geodir_post_type_setting_fun()) |
|
856 | - ), |
|
838 | + array('type' => 'sectionend', 'id' => 'geodir_navigation_options'), |
|
857 | 839 | |
858 | - array( |
|
859 | - 'name' => __('Show listing link in listing navigation', 'geodirectory'), |
|
860 | - 'desc' => '', |
|
861 | - 'tip' => '', |
|
862 | - 'id' => 'geodir_add_posttype_in_listing_nav', |
|
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 | - ), |
|
870 | 840 | |
871 | - array( |
|
872 | - 'name' => __('Allow post type to add from frontend', 'geodirectory'), |
|
873 | - 'desc' => '', |
|
874 | - 'tip' => '', |
|
875 | - 'id' => 'geodir_allow_posttype_frontend', |
|
876 | - 'css' => 'min-width:300px;', |
|
877 | - 'std' => geodir_get_posttypes(), |
|
878 | - 'type' => 'multiselect', |
|
879 | - 'placeholder_text' => __('Select post types', 'geodirectory'), |
|
880 | - 'class' => 'chosen_select', |
|
881 | - 'options' => array_unique(geodir_post_type_setting_fun()) |
|
882 | - ), |
|
841 | + array('name' => __('Post Type Navigation Settings', 'geodirectory'), |
|
842 | + 'type' => 'sectionstart', |
|
843 | + 'desc' => '', |
|
844 | + 'id' => 'geodir_post_type_navigation_layout'), |
|
845 | + array( |
|
846 | + 'name' => __('Show listing link in main navigation', 'geodirectory'), |
|
847 | + 'desc' => '', |
|
848 | + 'tip' => '', |
|
849 | + 'id' => 'geodir_add_posttype_in_main_nav', |
|
850 | + 'css' => 'min-width:300px;', |
|
851 | + 'std' => array(), |
|
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 main navigation', 'geodirectory'), |
|
886 | - 'desc' => '', |
|
887 | - 'tip' => '', |
|
888 | - 'id' => 'geodir_add_listing_link_main_nav', |
|
889 | - 'css' => 'min-width:300px;', |
|
890 | - 'std' => array(), |
|
891 | - 'type' => 'multiselect', |
|
892 | - 'placeholder_text' => __('Select post types', 'geodirectory'), |
|
893 | - 'class' => 'chosen_select', |
|
894 | - 'options' => array_unique(geodir_post_type_setting_fun()) |
|
895 | - ), |
|
858 | + array( |
|
859 | + 'name' => __('Show listing link in listing navigation', 'geodirectory'), |
|
860 | + 'desc' => '', |
|
861 | + 'tip' => '', |
|
862 | + 'id' => 'geodir_add_posttype_in_listing_nav', |
|
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 | + ), |
|
896 | 870 | |
897 | - array( |
|
898 | - 'name' => __('Show add listing link in add listing navigation', 'geodirectory'), |
|
899 | - 'desc' => '', |
|
900 | - 'tip' => '', |
|
901 | - 'id' => 'geodir_add_listing_link_add_listing_nav', |
|
902 | - 'css' => 'min-width:300px;', |
|
903 | - 'std' => geodir_get_posttypes(), |
|
904 | - 'type' => 'multiselect', |
|
905 | - 'class' => 'chosen_select', |
|
906 | - 'options' => array_unique(geodir_post_type_setting_fun()) |
|
907 | - ), |
|
871 | + array( |
|
872 | + 'name' => __('Allow post type to add from frontend', 'geodirectory'), |
|
873 | + 'desc' => '', |
|
874 | + 'tip' => '', |
|
875 | + 'id' => 'geodir_allow_posttype_frontend', |
|
876 | + 'css' => 'min-width:300px;', |
|
877 | + 'std' => geodir_get_posttypes(), |
|
878 | + 'type' => 'multiselect', |
|
879 | + 'placeholder_text' => __('Select post types', 'geodirectory'), |
|
880 | + 'class' => 'chosen_select', |
|
881 | + 'options' => array_unique(geodir_post_type_setting_fun()) |
|
882 | + ), |
|
883 | + |
|
884 | + array( |
|
885 | + 'name' => __('Show add listing link in main navigation', 'geodirectory'), |
|
886 | + 'desc' => '', |
|
887 | + 'tip' => '', |
|
888 | + 'id' => 'geodir_add_listing_link_main_nav', |
|
889 | + 'css' => 'min-width:300px;', |
|
890 | + 'std' => array(), |
|
891 | + 'type' => 'multiselect', |
|
892 | + 'placeholder_text' => __('Select post types', 'geodirectory'), |
|
893 | + 'class' => 'chosen_select', |
|
894 | + 'options' => array_unique(geodir_post_type_setting_fun()) |
|
895 | + ), |
|
896 | + |
|
897 | + array( |
|
898 | + 'name' => __('Show add listing link in add listing navigation', 'geodirectory'), |
|
899 | + 'desc' => '', |
|
900 | + 'tip' => '', |
|
901 | + 'id' => 'geodir_add_listing_link_add_listing_nav', |
|
902 | + 'css' => 'min-width:300px;', |
|
903 | + 'std' => geodir_get_posttypes(), |
|
904 | + 'type' => 'multiselect', |
|
905 | + 'class' => 'chosen_select', |
|
906 | + 'options' => array_unique(geodir_post_type_setting_fun()) |
|
907 | + ), |
|
908 | 908 | |
909 | - array('type' => 'sectionend', 'id' => 'geodir_post_type_navigation_layout'), |
|
909 | + array('type' => 'sectionend', 'id' => 'geodir_post_type_navigation_layout'), |
|
910 | 910 | |
911 | 911 | |
912 | - array('name' => __('User Dashboard Post Type Navigation Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_user_dashboard_post_type '), |
|
912 | + array('name' => __('User Dashboard Post Type Navigation Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_user_dashboard_post_type '), |
|
913 | 913 | |
914 | 914 | |
915 | - array( |
|
916 | - 'name' => __('Show add listing link in user dashboard', 'geodirectory'), |
|
917 | - 'desc' => '', |
|
918 | - 'tip' => '', |
|
919 | - 'id' => 'geodir_add_listing_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 | - ), |
|
915 | + array( |
|
916 | + 'name' => __('Show add listing link in user dashboard', 'geodirectory'), |
|
917 | + 'desc' => '', |
|
918 | + 'tip' => '', |
|
919 | + 'id' => 'geodir_add_listing_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 | 927 | |
928 | - array( |
|
929 | - 'name' => __('Show favorite link in user dashboard', 'geodirectory'), |
|
930 | - 'desc' => __('Option will not appear if user does not have a favorite of that post type', 'geodirectory'), |
|
931 | - 'tip' => '', |
|
932 | - 'id' => 'geodir_favorite_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 | - ), |
|
928 | + array( |
|
929 | + 'name' => __('Show favorite link in user dashboard', 'geodirectory'), |
|
930 | + 'desc' => __('Option will not appear if user does not have a favorite of that post type', 'geodirectory'), |
|
931 | + 'tip' => '', |
|
932 | + 'id' => 'geodir_favorite_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 | 940 | |
941 | - array( |
|
942 | - 'name' => __('Show listing link in user dashboard', 'geodirectory'), |
|
943 | - 'desc' => __('Option will not appear if user does not have his/her own listing of that post type', 'geodirectory'), |
|
944 | - 'tip' => '', |
|
945 | - 'id' => 'geodir_listing_link_user_dashboard', |
|
946 | - 'css' => 'min-width:300px;', |
|
947 | - 'std' => geodir_get_posttypes(), |
|
948 | - 'type' => 'multiselect', |
|
949 | - 'placeholder_text' => __('Select post types', 'geodirectory'), |
|
950 | - 'class' => 'chosen_select', |
|
951 | - 'options' => array_unique(geodir_post_type_setting_fun()) |
|
952 | - ), |
|
953 | - |
|
954 | - array('type' => 'sectionend', 'id' => 'geodir_user_dashboard_post_type'), |
|
955 | - /* Post Type Navigation Settings End */ |
|
956 | - |
|
957 | - /* Script Settings Start */ |
|
958 | - array('name' => __('Scripts', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_script_settings '), |
|
959 | - |
|
960 | - /* |
|
941 | + array( |
|
942 | + 'name' => __('Show listing link in user dashboard', 'geodirectory'), |
|
943 | + 'desc' => __('Option will not appear if user does not have his/her own listing of that post type', 'geodirectory'), |
|
944 | + 'tip' => '', |
|
945 | + 'id' => 'geodir_listing_link_user_dashboard', |
|
946 | + 'css' => 'min-width:300px;', |
|
947 | + 'std' => geodir_get_posttypes(), |
|
948 | + 'type' => 'multiselect', |
|
949 | + 'placeholder_text' => __('Select post types', 'geodirectory'), |
|
950 | + 'class' => 'chosen_select', |
|
951 | + 'options' => array_unique(geodir_post_type_setting_fun()) |
|
952 | + ), |
|
953 | + |
|
954 | + array('type' => 'sectionend', 'id' => 'geodir_user_dashboard_post_type'), |
|
955 | + /* Post Type Navigation Settings End */ |
|
956 | + |
|
957 | + /* Script Settings Start */ |
|
958 | + array('name' => __('Scripts', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_script_settings '), |
|
959 | + |
|
960 | + /* |
|
961 | 961 | array( 'name' => __( 'Add/Remove Scripts', 'geodirectory' ), |
962 | 962 | 'type' => 'sectionstart', |
963 | 963 | 'desc' => '', |
@@ -983,190 +983,190 @@ discard block |
||
983 | 983 | |
984 | 984 | */ |
985 | 985 | |
986 | - array('name' => __('GD Lazy Load Images', 'geodirectory'), |
|
987 | - 'type' => 'sectionstart', |
|
988 | - 'desc' => '', |
|
989 | - 'id' => 'geodir_gdll_settings'), |
|
986 | + array('name' => __('GD Lazy Load Images', 'geodirectory'), |
|
987 | + 'type' => 'sectionstart', |
|
988 | + 'desc' => '', |
|
989 | + 'id' => 'geodir_gdll_settings'), |
|
990 | 990 | |
991 | - array( |
|
992 | - 'name' => __('Enable lazy load images?', 'geodirectory'), |
|
993 | - 'desc' => __('GD images will be loaded only when visible on the page', 'geodirectory'), |
|
994 | - 'id' => 'geodir_lazy_load', |
|
995 | - 'type' => 'checkbox', |
|
996 | - 'std' => '1' // Default value to show home top section |
|
997 | - ), |
|
998 | - array('type' => 'sectionend', 'id' => 'geodir_gdll_settings'), |
|
991 | + array( |
|
992 | + 'name' => __('Enable lazy load images?', 'geodirectory'), |
|
993 | + 'desc' => __('GD images will be loaded only when visible on the page', 'geodirectory'), |
|
994 | + 'id' => 'geodir_lazy_load', |
|
995 | + 'type' => 'checkbox', |
|
996 | + 'std' => '1' // Default value to show home top section |
|
997 | + ), |
|
998 | + array('type' => 'sectionend', 'id' => 'geodir_gdll_settings'), |
|
999 | 999 | |
1000 | 1000 | |
1001 | - array('name' => __('Script Settings', 'geodirectory'), |
|
1002 | - 'type' => 'sectionstart', |
|
1003 | - 'desc' => '', |
|
1004 | - 'id' => 'geodir_script_settings'), |
|
1001 | + array('name' => __('Script Settings', 'geodirectory'), |
|
1002 | + 'type' => 'sectionstart', |
|
1003 | + 'desc' => '', |
|
1004 | + 'id' => 'geodir_script_settings'), |
|
1005 | 1005 | |
1006 | - array( |
|
1007 | - 'name' => __('Custom style css code', 'geodirectory'), |
|
1008 | - 'desc' => '', |
|
1009 | - 'id' => 'geodir_coustem_css', |
|
1010 | - 'type' => 'textarea', |
|
1011 | - 'css' => 'min-width:300px;', |
|
1012 | - 'std' => '' // Default value for the page title - changed in settings |
|
1013 | - ), |
|
1006 | + array( |
|
1007 | + 'name' => __('Custom style css code', 'geodirectory'), |
|
1008 | + 'desc' => '', |
|
1009 | + 'id' => 'geodir_coustem_css', |
|
1010 | + 'type' => 'textarea', |
|
1011 | + 'css' => 'min-width:300px;', |
|
1012 | + 'std' => '' // Default value for the page title - changed in settings |
|
1013 | + ), |
|
1014 | 1014 | |
1015 | - array( |
|
1016 | - 'name' => __('Header script code', 'geodirectory'), |
|
1017 | - 'desc' => '', |
|
1018 | - 'id' => 'geodir_header_scripts', |
|
1019 | - 'type' => 'textarea', |
|
1020 | - 'css' => 'min-width:300px;', |
|
1021 | - 'std' => '' // Default value for the page title - changed in settings |
|
1022 | - ), |
|
1015 | + array( |
|
1016 | + 'name' => __('Header script code', 'geodirectory'), |
|
1017 | + 'desc' => '', |
|
1018 | + 'id' => 'geodir_header_scripts', |
|
1019 | + 'type' => 'textarea', |
|
1020 | + 'css' => 'min-width:300px;', |
|
1021 | + 'std' => '' // Default value for the page title - changed in settings |
|
1022 | + ), |
|
1023 | 1023 | |
1024 | - array( |
|
1025 | - 'name' => __('Footer script code', 'geodirectory'), |
|
1026 | - 'desc' => '', |
|
1027 | - 'id' => 'geodir_footer_scripts', |
|
1028 | - 'type' => 'textarea', |
|
1029 | - 'css' => 'min-width:300px;', |
|
1030 | - 'std' => '' // Default value for the page title - changed in settings |
|
1031 | - ), |
|
1024 | + array( |
|
1025 | + 'name' => __('Footer script code', 'geodirectory'), |
|
1026 | + 'desc' => '', |
|
1027 | + 'id' => 'geodir_footer_scripts', |
|
1028 | + 'type' => 'textarea', |
|
1029 | + 'css' => 'min-width:300px;', |
|
1030 | + 'std' => '' // Default value for the page title - changed in settings |
|
1031 | + ), |
|
1032 | 1032 | |
1033 | - array('type' => 'sectionend', 'id' => 'geodir_script_settings'), |
|
1034 | - /* Script Settings End */ |
|
1033 | + array('type' => 'sectionend', 'id' => 'geodir_script_settings'), |
|
1034 | + /* Script Settings End */ |
|
1035 | 1035 | |
1036 | - /* Map Settings Start */ |
|
1037 | - array('name' => __('Map', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_map_settings '), |
|
1036 | + /* Map Settings Start */ |
|
1037 | + array('name' => __('Map', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_map_settings '), |
|
1038 | 1038 | |
1039 | 1039 | |
1040 | - // Google API key |
|
1041 | - array( |
|
1042 | - 'name' => __('Google Maps API KEY', 'geodirectory'), |
|
1043 | - 'type' => 'sectionstart', |
|
1044 | - 'desc' => '', |
|
1045 | - 'id' => 'geodir_google_api_key' |
|
1046 | - ), |
|
1047 | - array( |
|
1048 | - 'name' => __('Google Maps API KEY', 'geodirectory'), |
|
1049 | - 'desc' => sprintf( |
|
1050 | - __('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'), |
|
1051 | - '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/' ), |
|
1052 | - 'tip' => '', |
|
1053 | - 'id' => 'geodir_google_api_key', |
|
1054 | - 'css' => 'min-width:300px;', |
|
1055 | - 'std' => '', |
|
1056 | - 'type' => 'map-key', |
|
1057 | - ), |
|
1058 | - array( |
|
1059 | - 'type' => 'sectionend', |
|
1060 | - 'id' => 'geodir_google_api_key' |
|
1061 | - ), |
|
1040 | + // Google API key |
|
1041 | + array( |
|
1042 | + 'name' => __('Google Maps API KEY', 'geodirectory'), |
|
1043 | + 'type' => 'sectionstart', |
|
1044 | + 'desc' => '', |
|
1045 | + 'id' => 'geodir_google_api_key' |
|
1046 | + ), |
|
1047 | + array( |
|
1048 | + 'name' => __('Google Maps API KEY', 'geodirectory'), |
|
1049 | + 'desc' => sprintf( |
|
1050 | + __('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'), |
|
1051 | + '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/' ), |
|
1052 | + 'tip' => '', |
|
1053 | + 'id' => 'geodir_google_api_key', |
|
1054 | + 'css' => 'min-width:300px;', |
|
1055 | + 'std' => '', |
|
1056 | + 'type' => 'map-key', |
|
1057 | + ), |
|
1058 | + array( |
|
1059 | + 'type' => 'sectionend', |
|
1060 | + 'id' => 'geodir_google_api_key' |
|
1061 | + ), |
|
1062 | 1062 | |
1063 | - /* Untick the category by default on home map */ |
|
1064 | - array( |
|
1065 | - 'name' => __('Home Map Settings', 'geodirectory'), |
|
1066 | - 'type' => 'sectionstart', |
|
1067 | - 'desc' => '', |
|
1068 | - 'id' => 'geodir_home_map_section' |
|
1069 | - ), |
|
1070 | - array( |
|
1071 | - 'name' => __('Select category to untick by default on map', 'geodirectory'), |
|
1072 | - 'desc' => __('Select category to untick by default on the home map.', 'geodirectory'), |
|
1073 | - 'tip' => '', |
|
1074 | - 'id' => 'geodir_home_map_untick', |
|
1075 | - 'css' => 'min-width:300px;', |
|
1076 | - 'std' => '', |
|
1077 | - 'type' => 'multiselect', |
|
1078 | - 'placeholder_text' => __('Select category', 'geodirectory'), |
|
1079 | - 'class' => 'chosen_select', |
|
1080 | - 'options' => geodir_home_map_cats_key_value_array() |
|
1081 | - ), |
|
1082 | - array( |
|
1083 | - 'type' => 'sectionend', |
|
1084 | - 'id' => 'geodir_home_map_section' |
|
1085 | - ), |
|
1063 | + /* Untick the category by default on home map */ |
|
1064 | + array( |
|
1065 | + 'name' => __('Home Map Settings', 'geodirectory'), |
|
1066 | + 'type' => 'sectionstart', |
|
1067 | + 'desc' => '', |
|
1068 | + 'id' => 'geodir_home_map_section' |
|
1069 | + ), |
|
1070 | + array( |
|
1071 | + 'name' => __('Select category to untick by default on map', 'geodirectory'), |
|
1072 | + 'desc' => __('Select category to untick by default on the home map.', 'geodirectory'), |
|
1073 | + 'tip' => '', |
|
1074 | + 'id' => 'geodir_home_map_untick', |
|
1075 | + 'css' => 'min-width:300px;', |
|
1076 | + 'std' => '', |
|
1077 | + 'type' => 'multiselect', |
|
1078 | + 'placeholder_text' => __('Select category', 'geodirectory'), |
|
1079 | + 'class' => 'chosen_select', |
|
1080 | + 'options' => geodir_home_map_cats_key_value_array() |
|
1081 | + ), |
|
1082 | + array( |
|
1083 | + 'type' => 'sectionend', |
|
1084 | + 'id' => 'geodir_home_map_section' |
|
1085 | + ), |
|
1086 | 1086 | |
1087 | - array( |
|
1088 | - 'name' => __('Add Listing Map Settings', 'geodirectory'), |
|
1089 | - 'type' => 'sectionstart', |
|
1090 | - 'desc' => '', |
|
1091 | - 'id' => 'geodir_add_listing_map_section' |
|
1092 | - ), |
|
1093 | - array( |
|
1094 | - 'name' => __('Disable mouse scroll on details page map tab', 'geodirectory'), |
|
1095 | - 'desc' => __('Stops the mouse scroll zooming the map (home and listings settings set from widget)', 'geodirectory'), |
|
1096 | - 'id' => 'geodir_add_listing_mouse_scroll', |
|
1097 | - 'type' => 'checkbox', |
|
1098 | - 'std' => '0' // Default value to show home top section |
|
1099 | - ), |
|
1100 | - array( |
|
1101 | - 'type' => 'sectionend', |
|
1102 | - 'id' => 'geodir_add_listing_map_section' |
|
1103 | - ), |
|
1087 | + array( |
|
1088 | + 'name' => __('Add Listing Map Settings', 'geodirectory'), |
|
1089 | + 'type' => 'sectionstart', |
|
1090 | + 'desc' => '', |
|
1091 | + 'id' => 'geodir_add_listing_map_section' |
|
1092 | + ), |
|
1093 | + array( |
|
1094 | + 'name' => __('Disable mouse scroll on details page map tab', 'geodirectory'), |
|
1095 | + 'desc' => __('Stops the mouse scroll zooming the map (home and listings settings set from widget)', 'geodirectory'), |
|
1096 | + 'id' => 'geodir_add_listing_mouse_scroll', |
|
1097 | + 'type' => 'checkbox', |
|
1098 | + 'std' => '0' // Default value to show home top section |
|
1099 | + ), |
|
1100 | + array( |
|
1101 | + 'type' => 'sectionend', |
|
1102 | + 'id' => 'geodir_add_listing_map_section' |
|
1103 | + ), |
|
1104 | 1104 | |
1105 | 1105 | |
1106 | - array('name' => __('Default map settings', 'geodirectory'), |
|
1107 | - 'type' => 'sectionstart', |
|
1108 | - 'desc' => '', |
|
1109 | - 'id' => 'geodir_map_default_settings'), |
|
1106 | + array('name' => __('Default map settings', 'geodirectory'), |
|
1107 | + 'type' => 'sectionstart', |
|
1108 | + 'desc' => '', |
|
1109 | + 'id' => 'geodir_map_default_settings'), |
|
1110 | 1110 | |
1111 | - array( |
|
1112 | - 'name' => '', |
|
1113 | - 'desc' => '', |
|
1114 | - 'id' => 'map_default_settings', |
|
1115 | - 'type' => 'map_default_settings', |
|
1116 | - 'css' => 'min-width:300px;', |
|
1117 | - 'std' => '' // Default value for the page title - changed in settings |
|
1118 | - ), |
|
1111 | + array( |
|
1112 | + 'name' => '', |
|
1113 | + 'desc' => '', |
|
1114 | + 'id' => 'map_default_settings', |
|
1115 | + 'type' => 'map_default_settings', |
|
1116 | + 'css' => 'min-width:300px;', |
|
1117 | + 'std' => '' // Default value for the page title - changed in settings |
|
1118 | + ), |
|
1119 | 1119 | |
1120 | - array( |
|
1121 | - 'name' => __('Upload map default marker icon', 'geodirectory'), |
|
1122 | - 'desc' => '', |
|
1123 | - 'id' => 'geodir_default_marker_icon', |
|
1124 | - 'type' => 'file', |
|
1125 | - 'std' => '0', |
|
1126 | - 'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section |
|
1127 | - ), |
|
1128 | - // add option that allows enable/disable map dragging to phone devices |
|
1129 | - array( |
|
1130 | - 'name' => __('Show button control on map to enable/disable dragging', 'geodirectory'), |
|
1131 | - 'desc' => __('If checked, it displays button control to enable/disable dragging on google maps for phone devices', 'geodirectory'), |
|
1132 | - 'id' => 'geodir_map_onoff_dragging', |
|
1133 | - 'type' => 'checkbox', |
|
1134 | - 'std' => '0' // Default value to show home top section |
|
1135 | - ), |
|
1136 | - array( |
|
1137 | - 'name' => __('Select Maps API', 'geodirectory'), |
|
1138 | - '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'), |
|
1139 | - 'tip' => '', |
|
1140 | - 'id' => 'geodir_load_map', |
|
1141 | - 'css' => 'min-width:300px;', |
|
1142 | - 'std' => 'auto', |
|
1143 | - 'type' => 'select', |
|
1144 | - 'placeholder_text' => __('Select Map', 'geodirectory'), |
|
1145 | - 'options' => array( |
|
1146 | - 'auto' => __('Load Automatic', 'geodirectory'), |
|
1147 | - 'google' => __('Load Google Maps API', 'geodirectory'), |
|
1148 | - 'osm' => __('Load OpenStreetMap API', 'geodirectory'), |
|
1149 | - 'none' => __('Disable Maps', 'geodirectory') |
|
1150 | - ) |
|
1151 | - ), |
|
1152 | - |
|
1153 | - array('type' => 'sectionend', 'id' => 'geodir_map_default_settings'), |
|
1154 | - |
|
1155 | - array('name' => __('Show / hide post type and category on map', 'geodirectory'), |
|
1156 | - 'type' => 'sectionstart', |
|
1157 | - 'desc' => '', |
|
1158 | - 'id' => 'geodir_map_settings'), |
|
1120 | + array( |
|
1121 | + 'name' => __('Upload map default marker icon', 'geodirectory'), |
|
1122 | + 'desc' => '', |
|
1123 | + 'id' => 'geodir_default_marker_icon', |
|
1124 | + 'type' => 'file', |
|
1125 | + 'std' => '0', |
|
1126 | + 'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section |
|
1127 | + ), |
|
1128 | + // add option that allows enable/disable map dragging to phone devices |
|
1129 | + array( |
|
1130 | + 'name' => __('Show button control on map to enable/disable dragging', 'geodirectory'), |
|
1131 | + 'desc' => __('If checked, it displays button control to enable/disable dragging on google maps for phone devices', 'geodirectory'), |
|
1132 | + 'id' => 'geodir_map_onoff_dragging', |
|
1133 | + 'type' => 'checkbox', |
|
1134 | + 'std' => '0' // Default value to show home top section |
|
1135 | + ), |
|
1136 | + array( |
|
1137 | + 'name' => __('Select Maps API', 'geodirectory'), |
|
1138 | + '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'), |
|
1139 | + 'tip' => '', |
|
1140 | + 'id' => 'geodir_load_map', |
|
1141 | + 'css' => 'min-width:300px;', |
|
1142 | + 'std' => 'auto', |
|
1143 | + 'type' => 'select', |
|
1144 | + 'placeholder_text' => __('Select Map', 'geodirectory'), |
|
1145 | + 'options' => array( |
|
1146 | + 'auto' => __('Load Automatic', 'geodirectory'), |
|
1147 | + 'google' => __('Load Google Maps API', 'geodirectory'), |
|
1148 | + 'osm' => __('Load OpenStreetMap API', 'geodirectory'), |
|
1149 | + 'none' => __('Disable Maps', 'geodirectory') |
|
1150 | + ) |
|
1151 | + ), |
|
1159 | 1152 | |
1160 | - array( |
|
1161 | - 'name' => __('Select Map Category', 'geodirectory'), |
|
1162 | - 'desc' => '', |
|
1163 | - 'id' => 'geodir_map_settings', |
|
1164 | - 'type' => 'map', |
|
1165 | - 'css' => 'min-width:300px;', |
|
1166 | - 'std' => '' // Default value for the page title - changed in settings |
|
1167 | - ), |
|
1153 | + array('type' => 'sectionend', 'id' => 'geodir_map_default_settings'), |
|
1154 | + |
|
1155 | + array('name' => __('Show / hide post type and category on map', 'geodirectory'), |
|
1156 | + 'type' => 'sectionstart', |
|
1157 | + 'desc' => '', |
|
1158 | + 'id' => 'geodir_map_settings'), |
|
1159 | + |
|
1160 | + array( |
|
1161 | + 'name' => __('Select Map Category', 'geodirectory'), |
|
1162 | + 'desc' => '', |
|
1163 | + 'id' => 'geodir_map_settings', |
|
1164 | + 'type' => 'map', |
|
1165 | + 'css' => 'min-width:300px;', |
|
1166 | + 'std' => '' // Default value for the page title - changed in settings |
|
1167 | + ), |
|
1168 | 1168 | |
1169 | - array('type' => 'sectionend', 'id' => 'geodir_map_settings'), |
|
1169 | + array('type' => 'sectionend', 'id' => 'geodir_map_settings'), |
|
1170 | 1170 | |
1171 | 1171 | |
1172 | 1172 | |
@@ -1187,6 +1187,6 @@ discard block |
||
1187 | 1187 | 'type' => 'sectionend', |
1188 | 1188 | 'id' => 'geodir_map_cache_section' |
1189 | 1189 | ), |
1190 | - /* Map Settings End */ |
|
1190 | + /* Map Settings End */ |
|
1191 | 1191 | |
1192 | 1192 | )); // End Design settings |
@@ -106,24 +106,30 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -13,29 +13,29 @@ discard block |
||
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 | /** |
@@ -46,45 +46,45 @@ discard block |
||
46 | 46 | * @global array $wp_post_types List of post types. |
47 | 47 | */ |
48 | 48 | function geodir_register_post_types() { |
49 | - global $wp_post_types; |
|
49 | + global $wp_post_types; |
|
50 | 50 | |
51 | - /** |
|
52 | - * Get available custom posttypes and taxonomies and register them. |
|
53 | - */ |
|
54 | - _x('places', 'URL slug', 'geodirectory'); |
|
55 | - |
|
56 | - $post_types = array(); |
|
57 | - $post_types = get_option('geodir_post_types'); |
|
58 | - |
|
59 | - // Register each post type if array of data is returned |
|
60 | - if (is_array($post_types)): |
|
61 | - |
|
62 | - foreach ($post_types as $post_type => $args): |
|
63 | - |
|
64 | - if (!empty($args['rewrite']['slug'])) { |
|
65 | - $args['rewrite']['slug'] = _x($args['rewrite']['slug'], 'URL slug', 'geodirectory'); |
|
66 | - } |
|
67 | - $args = stripslashes_deep($args); |
|
68 | - |
|
69 | - if (!empty($args['labels'])) { |
|
70 | - foreach ($args['labels'] as $key => $val) { |
|
71 | - $args['labels'][$key] = __($val, 'geodirectory');// allow translation |
|
72 | - } |
|
73 | - } |
|
74 | - |
|
75 | - /** |
|
76 | - * Filter post type args. |
|
77 | - * |
|
78 | - * @since 1.0.0 |
|
79 | - * @param string $args Post type args. |
|
80 | - * @param string $post_type The post type. |
|
81 | - */ |
|
82 | - $args = apply_filters('geodir_post_type_args', $args, $post_type); |
|
83 | - |
|
84 | - $post_type = register_post_type($post_type, $args); |
|
85 | - |
|
86 | - endforeach; |
|
87 | - endif; |
|
51 | + /** |
|
52 | + * Get available custom posttypes and taxonomies and register them. |
|
53 | + */ |
|
54 | + _x('places', 'URL slug', 'geodirectory'); |
|
55 | + |
|
56 | + $post_types = array(); |
|
57 | + $post_types = get_option('geodir_post_types'); |
|
58 | + |
|
59 | + // Register each post type if array of data is returned |
|
60 | + if (is_array($post_types)): |
|
61 | + |
|
62 | + foreach ($post_types as $post_type => $args): |
|
63 | + |
|
64 | + if (!empty($args['rewrite']['slug'])) { |
|
65 | + $args['rewrite']['slug'] = _x($args['rewrite']['slug'], 'URL slug', 'geodirectory'); |
|
66 | + } |
|
67 | + $args = stripslashes_deep($args); |
|
68 | + |
|
69 | + if (!empty($args['labels'])) { |
|
70 | + foreach ($args['labels'] as $key => $val) { |
|
71 | + $args['labels'][$key] = __($val, 'geodirectory');// allow translation |
|
72 | + } |
|
73 | + } |
|
74 | + |
|
75 | + /** |
|
76 | + * Filter post type args. |
|
77 | + * |
|
78 | + * @since 1.0.0 |
|
79 | + * @param string $args Post type args. |
|
80 | + * @param string $post_type The post type. |
|
81 | + */ |
|
82 | + $args = apply_filters('geodir_post_type_args', $args, $post_type); |
|
83 | + |
|
84 | + $post_type = register_post_type($post_type, $args); |
|
85 | + |
|
86 | + endforeach; |
|
87 | + endif; |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | /** |
@@ -98,72 +98,72 @@ discard block |
||
98 | 98 | */ |
99 | 99 | function geodir_post_type_args_modify($args, $post_type) |
100 | 100 | { |
101 | - $geodir_location_prefix = isset($_REQUEST['geodir_location_prefix']) ? trim($_REQUEST['geodir_location_prefix']) : get_option('geodir_location_prefix'); |
|
101 | + $geodir_location_prefix = isset($_REQUEST['geodir_location_prefix']) ? trim($_REQUEST['geodir_location_prefix']) : get_option('geodir_location_prefix'); |
|
102 | 102 | if (isset($_REQUEST['geodir_listing_prefix']) && $_REQUEST['geodir_listing_prefix'] != '' && geodir_strtolower($_REQUEST['geodir_listing_prefix']) != geodir_strtolower($geodir_location_prefix)) { |
103 | 103 | |
104 | - $listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix'])); |
|
104 | + $listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix'])); |
|
105 | 105 | |
106 | - if ($post_type == 'gd_place') { |
|
107 | - if (array_key_exists('has_archive', $args)) |
|
108 | - $args['has_archive'] = $listing_slug; |
|
106 | + if ($post_type == 'gd_place') { |
|
107 | + if (array_key_exists('has_archive', $args)) |
|
108 | + $args['has_archive'] = $listing_slug; |
|
109 | 109 | |
110 | - if (array_key_exists('rewrite', $args)) { |
|
111 | - if (array_key_exists('slug', $args['rewrite'])) |
|
112 | - $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%'; |
|
113 | - } |
|
110 | + if (array_key_exists('rewrite', $args)) { |
|
111 | + if (array_key_exists('slug', $args['rewrite'])) |
|
112 | + $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%'; |
|
113 | + } |
|
114 | 114 | |
115 | - $geodir_post_types = get_option('geodir_post_types'); |
|
115 | + $geodir_post_types = get_option('geodir_post_types'); |
|
116 | 116 | |
117 | - if (array_key_exists($post_type, $geodir_post_types)) { |
|
117 | + if (array_key_exists($post_type, $geodir_post_types)) { |
|
118 | 118 | |
119 | - if (array_key_exists('has_archive', $geodir_post_types[$post_type])) |
|
120 | - $geodir_post_types[$post_type]['has_archive'] = $listing_slug; |
|
119 | + if (array_key_exists('has_archive', $geodir_post_types[$post_type])) |
|
120 | + $geodir_post_types[$post_type]['has_archive'] = $listing_slug; |
|
121 | 121 | |
122 | - if (array_key_exists('rewrite', $geodir_post_types[$post_type])) |
|
123 | - if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite'])) |
|
124 | - $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%'; |
|
122 | + if (array_key_exists('rewrite', $geodir_post_types[$post_type])) |
|
123 | + if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite'])) |
|
124 | + $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%'; |
|
125 | 125 | |
126 | - update_option('geodir_post_types', $geodir_post_types); |
|
126 | + update_option('geodir_post_types', $geodir_post_types); |
|
127 | 127 | |
128 | - } |
|
128 | + } |
|
129 | 129 | |
130 | - $geodir_post_types = get_option('geodir_post_types'); |
|
130 | + $geodir_post_types = get_option('geodir_post_types'); |
|
131 | 131 | |
132 | - /* --- update taxonomies (category) --- */ |
|
132 | + /* --- update taxonomies (category) --- */ |
|
133 | 133 | |
134 | - $geodir_taxonomies = get_option('geodir_taxonomies'); |
|
134 | + $geodir_taxonomies = get_option('geodir_taxonomies'); |
|
135 | 135 | |
136 | - if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) { |
|
137 | - $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug; |
|
136 | + if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) { |
|
137 | + $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug; |
|
138 | 138 | |
139 | - if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category'])) |
|
140 | - if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args'])) |
|
141 | - if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite'])) |
|
142 | - $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug; |
|
139 | + if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category'])) |
|
140 | + if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args'])) |
|
141 | + if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite'])) |
|
142 | + $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug; |
|
143 | 143 | |
144 | - update_option('geodir_taxonomies', $geodir_taxonomies); |
|
144 | + update_option('geodir_taxonomies', $geodir_taxonomies); |
|
145 | 145 | |
146 | - } |
|
146 | + } |
|
147 | 147 | |
148 | - /* --- update taxonomies (tags) --- */ |
|
149 | - $geodir_taxonomies_tag = get_option('geodir_taxonomies'); |
|
150 | - if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) { |
|
151 | - $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags'; |
|
148 | + /* --- update taxonomies (tags) --- */ |
|
149 | + $geodir_taxonomies_tag = get_option('geodir_taxonomies'); |
|
150 | + if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) { |
|
151 | + $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags'; |
|
152 | 152 | |
153 | - if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags'])) |
|
154 | - if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args'])) |
|
155 | - if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite'])) |
|
156 | - $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags'; |
|
153 | + if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags'])) |
|
154 | + if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args'])) |
|
155 | + if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite'])) |
|
156 | + $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags'; |
|
157 | 157 | |
158 | - update_option('geodir_taxonomies', $geodir_taxonomies_tag); |
|
158 | + update_option('geodir_taxonomies', $geodir_taxonomies_tag); |
|
159 | 159 | |
160 | - } |
|
160 | + } |
|
161 | 161 | |
162 | - } |
|
162 | + } |
|
163 | 163 | |
164 | - } |
|
164 | + } |
|
165 | 165 | |
166 | - return $args; |
|
166 | + return $args; |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | /** |
@@ -176,8 +176,8 @@ discard block |
||
176 | 176 | */ |
177 | 177 | function geodir_flush_rewrite_rules() |
178 | 178 | { |
179 | - global $wp_rewrite; |
|
180 | - $wp_rewrite->flush_rules(false); |
|
179 | + global $wp_rewrite; |
|
180 | + $wp_rewrite->flush_rules(false); |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | /** |
@@ -192,35 +192,35 @@ discard block |
||
192 | 192 | * @return array Rewrite rules. |
193 | 193 | */ |
194 | 194 | function geodir_listing_rewrite_rules($rules) { |
195 | - $newrules = array(); |
|
196 | - $taxonomies = get_option('geodir_taxonomies'); |
|
197 | - $detail_url_seprator = get_option('geodir_detailurl_separator'); |
|
195 | + $newrules = array(); |
|
196 | + $taxonomies = get_option('geodir_taxonomies'); |
|
197 | + $detail_url_seprator = get_option('geodir_detailurl_separator'); |
|
198 | 198 | |
199 | 199 | // create rules for post listing |
200 | - if (is_array($taxonomies)): |
|
201 | - foreach ($taxonomies as $taxonomy => $args): |
|
202 | - $post_type = $args['object_type']; |
|
203 | - $listing_slug = $args['listing_slug']; |
|
204 | - |
|
205 | - if (strpos($taxonomy, 'tags')) { |
|
206 | - $newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]'; |
|
207 | - $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]'; |
|
208 | - } else { |
|
209 | - // use this loop to add paging for details page comments paging |
|
210 | - $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]'; |
|
211 | - } |
|
212 | - endforeach; |
|
213 | - endif; |
|
214 | - |
|
215 | - // create rules for location listing |
|
216 | - $location_page = get_option('geodir_location_page'); |
|
200 | + if (is_array($taxonomies)): |
|
201 | + foreach ($taxonomies as $taxonomy => $args): |
|
202 | + $post_type = $args['object_type']; |
|
203 | + $listing_slug = $args['listing_slug']; |
|
204 | + |
|
205 | + if (strpos($taxonomy, 'tags')) { |
|
206 | + $newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]'; |
|
207 | + $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]'; |
|
208 | + } else { |
|
209 | + // use this loop to add paging for details page comments paging |
|
210 | + $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]'; |
|
211 | + } |
|
212 | + endforeach; |
|
213 | + endif; |
|
214 | + |
|
215 | + // create rules for location listing |
|
216 | + $location_page = get_option('geodir_location_page'); |
|
217 | 217 | |
218 | - if($location_page) { |
|
219 | - global $wpdb; |
|
220 | - $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page)); |
|
221 | - } |
|
222 | - if (!isset($location_prefix)) |
|
223 | - $location_prefix = 'location'; |
|
218 | + if($location_page) { |
|
219 | + global $wpdb; |
|
220 | + $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page)); |
|
221 | + } |
|
222 | + if (!isset($location_prefix)) |
|
223 | + $location_prefix = 'location'; |
|
224 | 224 | |
225 | 225 | $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active. |
226 | 226 | if ($location_manager) { |
@@ -264,12 +264,12 @@ discard block |
||
264 | 264 | $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]'; |
265 | 265 | } |
266 | 266 | |
267 | - if ($location_page && geodir_is_wpml()) { |
|
268 | - foreach(icl_get_languages('skip_missing=N') as $lang){ |
|
269 | - $alt_page_id = ''; |
|
270 | - $alt_page_id = geodir_wpml_object_id($location_page, 'page', false,$lang['language_code']); |
|
271 | - if($alt_page_id){ |
|
272 | - $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id)); |
|
267 | + if ($location_page && geodir_is_wpml()) { |
|
268 | + foreach(icl_get_languages('skip_missing=N') as $lang){ |
|
269 | + $alt_page_id = ''; |
|
270 | + $alt_page_id = geodir_wpml_object_id($location_page, 'page', false,$lang['language_code']); |
|
271 | + if($alt_page_id){ |
|
272 | + $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id)); |
|
273 | 273 | |
274 | 274 | if ($location_manager && ($hide_country_part || $hide_region_part)) { |
275 | 275 | $matches2 = ''; |
@@ -305,14 +305,14 @@ discard block |
||
305 | 305 | $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]'; |
306 | 306 | $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]'; |
307 | 307 | } |
308 | - } |
|
309 | - } |
|
310 | - } |
|
308 | + } |
|
309 | + } |
|
310 | + } |
|
311 | 311 | |
312 | - $newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page; |
|
312 | + $newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page; |
|
313 | 313 | |
314 | - $rules = array_merge($newrules, $rules); |
|
315 | - return $rules; |
|
314 | + $rules = array_merge($newrules, $rules); |
|
315 | + return $rules; |
|
316 | 316 | } |
317 | 317 | |
318 | 318 | /** |
@@ -327,18 +327,18 @@ discard block |
||
327 | 327 | */ |
328 | 328 | function geodir_htaccess_contents($rules) |
329 | 329 | { |
330 | - global $wpdb; |
|
331 | - $location_prefix = get_option('geodir_location_prefix'); |
|
332 | - // if location page slug changed then add redirect |
|
333 | - if ($location_prefix == 'location') { |
|
334 | - return $rules; |
|
335 | - } |
|
336 | - $my_content = <<<EOD |
|
330 | + global $wpdb; |
|
331 | + $location_prefix = get_option('geodir_location_prefix'); |
|
332 | + // if location page slug changed then add redirect |
|
333 | + if ($location_prefix == 'location') { |
|
334 | + return $rules; |
|
335 | + } |
|
336 | + $my_content = <<<EOD |
|
337 | 337 | \n# BEGIN GeoDirectory Rules |
338 | 338 | #Redirect 301 /location/ /$location_prefix/ |
339 | 339 | # END GeoDirectory Rules\n\n |
340 | 340 | EOD; |
341 | - return $my_content . $rules; |
|
341 | + return $my_content . $rules; |
|
342 | 342 | } |
343 | 343 | //add_filter('mod_rewrite_rules', 'geodir_htaccess_contents'); |
344 | 344 | |
@@ -352,10 +352,10 @@ discard block |
||
352 | 352 | */ |
353 | 353 | function geodir_add_location_var($public_query_vars) |
354 | 354 | { |
355 | - $public_query_vars[] = 'gd_country'; |
|
356 | - $public_query_vars[] = 'gd_region'; |
|
357 | - $public_query_vars[] = 'gd_city'; |
|
358 | - return $public_query_vars; |
|
355 | + $public_query_vars[] = 'gd_country'; |
|
356 | + $public_query_vars[] = 'gd_region'; |
|
357 | + $public_query_vars[] = 'gd_city'; |
|
358 | + return $public_query_vars; |
|
359 | 359 | } |
360 | 360 | |
361 | 361 | /** |
@@ -368,8 +368,8 @@ discard block |
||
368 | 368 | */ |
369 | 369 | function geodir_add_geodir_page_var($public_query_vars) |
370 | 370 | { |
371 | - $public_query_vars[] = 'gd_is_geodir_page'; |
|
372 | - return $public_query_vars; |
|
371 | + $public_query_vars[] = 'gd_is_geodir_page'; |
|
372 | + return $public_query_vars; |
|
373 | 373 | } |
374 | 374 | |
375 | 375 | /** |
@@ -381,20 +381,20 @@ discard block |
||
381 | 381 | */ |
382 | 382 | function geodir_add_page_id_in_query_var() |
383 | 383 | { |
384 | - global $wp_query; |
|
384 | + global $wp_query; |
|
385 | 385 | |
386 | - $page_id = $wp_query->get_queried_object_id(); |
|
386 | + $page_id = $wp_query->get_queried_object_id(); |
|
387 | 387 | |
388 | - if (!get_query_var('page_id') && !is_archive()) { |
|
389 | - // fix for WP tags conflict with enfold theme |
|
390 | - $theme_name = geodir_strtolower(wp_get_theme()); |
|
391 | - if (!geodir_is_geodir_page() && strpos($theme_name, 'enfold') !== false) { |
|
392 | - return $wp_query; |
|
393 | - } |
|
394 | - $wp_query->set('page_id', $page_id); |
|
395 | - } |
|
388 | + if (!get_query_var('page_id') && !is_archive()) { |
|
389 | + // fix for WP tags conflict with enfold theme |
|
390 | + $theme_name = geodir_strtolower(wp_get_theme()); |
|
391 | + if (!geodir_is_geodir_page() && strpos($theme_name, 'enfold') !== false) { |
|
392 | + return $wp_query; |
|
393 | + } |
|
394 | + $wp_query->set('page_id', $page_id); |
|
395 | + } |
|
396 | 396 | |
397 | - return $wp_query; |
|
397 | + return $wp_query; |
|
398 | 398 | } |
399 | 399 | |
400 | 400 | /** |
@@ -409,23 +409,23 @@ discard block |
||
409 | 409 | function geodir_set_location_var_in_session_in_core($wp) { |
410 | 410 | global $gd_session; |
411 | 411 | |
412 | - // Fix for WPML removing page_id query var: |
|
413 | - if (isset($wp->query_vars['page']) && !isset($wp->query_vars['page_id']) && isset($wp->query_vars['pagename']) && !is_home()) { |
|
414 | - global $wpdb; |
|
412 | + // Fix for WPML removing page_id query var: |
|
413 | + if (isset($wp->query_vars['page']) && !isset($wp->query_vars['page_id']) && isset($wp->query_vars['pagename']) && !is_home()) { |
|
414 | + global $wpdb; |
|
415 | 415 | |
416 | - $page_for_posts = get_option('page_for_posts'); |
|
417 | - $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'])); |
|
416 | + $page_for_posts = get_option('page_for_posts'); |
|
417 | + $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 | 418 | |
419 | - if (geodir_is_wpml()) { |
|
420 | - $real_page_id = geodir_wpml_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE); |
|
421 | - } |
|
422 | - if ($real_page_id && $real_page_id!=$page_for_posts) { |
|
423 | - $wp->query_vars['page_id'] = $real_page_id; |
|
424 | - } |
|
425 | - } |
|
419 | + if (geodir_is_wpml()) { |
|
420 | + $real_page_id = geodir_wpml_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE); |
|
421 | + } |
|
422 | + if ($real_page_id && $real_page_id!=$page_for_posts) { |
|
423 | + $wp->query_vars['page_id'] = $real_page_id; |
|
424 | + } |
|
425 | + } |
|
426 | 426 | // Query Vars will have page_id parameter |
427 | 427 | // check if query var has page_id and that page id is location page |
428 | - geodir_set_is_geodir_page($wp); |
|
428 | + geodir_set_is_geodir_page($wp); |
|
429 | 429 | // if is GD homepage set the page ID |
430 | 430 | if (geodir_is_page('home')) { |
431 | 431 | $wp->query_vars['page_id'] = get_option('page_on_front'); |
@@ -434,118 +434,118 @@ discard block |
||
434 | 434 | // The location url format (all or country_city or region_city or city). |
435 | 435 | $geodir_show_location_url = get_option('geodir_show_location_url'); |
436 | 436 | |
437 | - if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id()) { |
|
438 | - $gd_country = ''; |
|
439 | - $gd_region = ''; |
|
440 | - $gd_city = ''; |
|
441 | - if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') |
|
442 | - $gd_country = urldecode($wp->query_vars['gd_country']); |
|
443 | - |
|
444 | - if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') |
|
445 | - $gd_region = urldecode($wp->query_vars['gd_region']); |
|
446 | - |
|
447 | - if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') |
|
448 | - $gd_city = urldecode($wp->query_vars['gd_city']); |
|
449 | - |
|
450 | - if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) { |
|
451 | - $default_location = geodir_get_default_location(); |
|
452 | - |
|
453 | - if (get_option('geodir_add_location_url')) { |
|
454 | - if ($geodir_show_location_url != 'all') { |
|
455 | - if ($gd_region == '') { |
|
456 | - if ($gd_ses_region = $gd_session->get('gd_region')) |
|
457 | - $gd_region = $gd_ses_region; |
|
458 | - else |
|
459 | - $gd_region = $default_location->region_slug; |
|
460 | - } |
|
461 | - |
|
462 | - if ($gd_city == '') { |
|
463 | - if ($gd_ses_city = $gd_session->get('gd_city')) |
|
464 | - $gd_city = $gd_ses_city; |
|
465 | - else |
|
466 | - $gd_city = $default_location->city_slug; |
|
467 | - |
|
468 | - $base_location_link = geodir_get_location_link('base'); |
|
469 | - wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city); |
|
470 | - exit(); |
|
471 | - } |
|
472 | - } |
|
473 | - } |
|
474 | - |
|
475 | - $args = array( |
|
476 | - 'what' => 'city', |
|
477 | - 'city_val' => $gd_city, |
|
478 | - 'region_val' => $gd_region, |
|
479 | - 'country_val' => $gd_country, |
|
480 | - 'country_column_name' => 'country_slug', |
|
481 | - 'region_column_name' => 'region_slug', |
|
482 | - 'city_column_name' => 'city_slug', |
|
483 | - 'location_link_part' => false, |
|
484 | - 'compare_operator' => '' |
|
485 | - ); |
|
486 | - |
|
487 | - $location_array = function_exists('geodir_get_location_array') ? geodir_get_location_array($args) : array(); |
|
488 | - if (!empty($location_array)) { |
|
489 | - $gd_session->set('gd_multi_location', 1); |
|
490 | - $gd_session->set('gd_country', $gd_country); |
|
491 | - $gd_session->set('gd_region', $gd_region); |
|
492 | - $gd_session->set('gd_city', $gd_city); |
|
437 | + if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id()) { |
|
438 | + $gd_country = ''; |
|
439 | + $gd_region = ''; |
|
440 | + $gd_city = ''; |
|
441 | + if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') |
|
442 | + $gd_country = urldecode($wp->query_vars['gd_country']); |
|
443 | + |
|
444 | + if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') |
|
445 | + $gd_region = urldecode($wp->query_vars['gd_region']); |
|
446 | + |
|
447 | + if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') |
|
448 | + $gd_city = urldecode($wp->query_vars['gd_city']); |
|
449 | + |
|
450 | + if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) { |
|
451 | + $default_location = geodir_get_default_location(); |
|
452 | + |
|
453 | + if (get_option('geodir_add_location_url')) { |
|
454 | + if ($geodir_show_location_url != 'all') { |
|
455 | + if ($gd_region == '') { |
|
456 | + if ($gd_ses_region = $gd_session->get('gd_region')) |
|
457 | + $gd_region = $gd_ses_region; |
|
458 | + else |
|
459 | + $gd_region = $default_location->region_slug; |
|
460 | + } |
|
461 | + |
|
462 | + if ($gd_city == '') { |
|
463 | + if ($gd_ses_city = $gd_session->get('gd_city')) |
|
464 | + $gd_city = $gd_ses_city; |
|
465 | + else |
|
466 | + $gd_city = $default_location->city_slug; |
|
467 | + |
|
468 | + $base_location_link = geodir_get_location_link('base'); |
|
469 | + wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city); |
|
470 | + exit(); |
|
471 | + } |
|
472 | + } |
|
473 | + } |
|
474 | + |
|
475 | + $args = array( |
|
476 | + 'what' => 'city', |
|
477 | + 'city_val' => $gd_city, |
|
478 | + 'region_val' => $gd_region, |
|
479 | + 'country_val' => $gd_country, |
|
480 | + 'country_column_name' => 'country_slug', |
|
481 | + 'region_column_name' => 'region_slug', |
|
482 | + 'city_column_name' => 'city_slug', |
|
483 | + 'location_link_part' => false, |
|
484 | + 'compare_operator' => '' |
|
485 | + ); |
|
486 | + |
|
487 | + $location_array = function_exists('geodir_get_location_array') ? geodir_get_location_array($args) : array(); |
|
488 | + if (!empty($location_array)) { |
|
489 | + $gd_session->set('gd_multi_location', 1); |
|
490 | + $gd_session->set('gd_country', $gd_country); |
|
491 | + $gd_session->set('gd_region', $gd_region); |
|
492 | + $gd_session->set('gd_city', $gd_city); |
|
493 | 493 | |
494 | 494 | $wp->query_vars['gd_country'] = $gd_country; |
495 | - $wp->query_vars['gd_region'] = $gd_region; |
|
496 | - $wp->query_vars['gd_city'] = $gd_city; |
|
497 | - } else { |
|
498 | - $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country')); |
|
499 | - } |
|
500 | - } else { |
|
501 | - $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country')); |
|
502 | - } |
|
503 | - |
|
504 | - } else if (isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') { |
|
505 | - if (!is_admin()) { |
|
506 | - $requested_post_type = $wp->query_vars['post_type']; |
|
507 | - // check if this post type is geodirectory post types |
|
508 | - $post_type_array = geodir_get_posttypes(); |
|
495 | + $wp->query_vars['gd_region'] = $gd_region; |
|
496 | + $wp->query_vars['gd_city'] = $gd_city; |
|
497 | + } else { |
|
498 | + $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country')); |
|
499 | + } |
|
500 | + } else { |
|
501 | + $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country')); |
|
502 | + } |
|
503 | + |
|
504 | + } else if (isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') { |
|
505 | + if (!is_admin()) { |
|
506 | + $requested_post_type = $wp->query_vars['post_type']; |
|
507 | + // check if this post type is geodirectory post types |
|
508 | + $post_type_array = geodir_get_posttypes(); |
|
509 | 509 | |
510 | 510 | if (in_array($requested_post_type, $post_type_array)) { |
511 | - // now u can apply geodirectory related manipulation. |
|
512 | - } |
|
513 | - } |
|
514 | - } else { |
|
515 | - // check if a geodirectory taxonomy is set |
|
516 | - $gd_country = ''; |
|
517 | - $gd_region = ''; |
|
518 | - $gd_city = ''; |
|
511 | + // now u can apply geodirectory related manipulation. |
|
512 | + } |
|
513 | + } |
|
514 | + } else { |
|
515 | + // check if a geodirectory taxonomy is set |
|
516 | + $gd_country = ''; |
|
517 | + $gd_region = ''; |
|
518 | + $gd_city = ''; |
|
519 | 519 | |
520 | 520 | $is_geodir_taxonomy = false; |
521 | - $is_geodir_taxonomy_term = false; // the last term is real geodirectory taxonomy term or not |
|
522 | - $is_geodir_location_found = false; |
|
521 | + $is_geodir_taxonomy_term = false; // the last term is real geodirectory taxonomy term or not |
|
522 | + $is_geodir_location_found = false; |
|
523 | 523 | |
524 | 524 | $geodir_taxonomy = ''; |
525 | - $geodir_post_type = ''; |
|
526 | - $geodir_term = ''; |
|
527 | - $geodir_set_location_session = true; |
|
528 | - $geodir_taxonomis = geodir_get_taxonomies('', true); |
|
529 | - |
|
530 | - if(!empty($geodir_taxonomis)){ |
|
531 | - foreach ($geodir_taxonomis as $taxonomy) { |
|
532 | - if (array_key_exists($taxonomy, $wp->query_vars)) { |
|
533 | - $is_geodir_taxonomy = true; |
|
534 | - $geodir_taxonomy = $taxonomy; |
|
535 | - $geodir_post_type = str_replace('category', '', $taxonomy); |
|
536 | - $geodir_post_type = str_replace('_tags', '', $geodir_post_type); |
|
537 | - $geodir_term = $wp->query_vars[$geodir_taxonomy]; |
|
538 | - break; |
|
539 | - } |
|
540 | - } |
|
541 | - } |
|
542 | - |
|
543 | - // now get an array of all terms seperated by '/' |
|
544 | - $geodir_terms = explode('/', $geodir_term); |
|
545 | - $geodir_last_term = end($geodir_terms); |
|
546 | - |
|
547 | - if ($is_geodir_taxonomy) { // do all these only when it is a geodirectory taxonomy |
|
548 | - $wp->query_vars['post_type'] = $geodir_post_type; |
|
525 | + $geodir_post_type = ''; |
|
526 | + $geodir_term = ''; |
|
527 | + $geodir_set_location_session = true; |
|
528 | + $geodir_taxonomis = geodir_get_taxonomies('', true); |
|
529 | + |
|
530 | + if(!empty($geodir_taxonomis)){ |
|
531 | + foreach ($geodir_taxonomis as $taxonomy) { |
|
532 | + if (array_key_exists($taxonomy, $wp->query_vars)) { |
|
533 | + $is_geodir_taxonomy = true; |
|
534 | + $geodir_taxonomy = $taxonomy; |
|
535 | + $geodir_post_type = str_replace('category', '', $taxonomy); |
|
536 | + $geodir_post_type = str_replace('_tags', '', $geodir_post_type); |
|
537 | + $geodir_term = $wp->query_vars[$geodir_taxonomy]; |
|
538 | + break; |
|
539 | + } |
|
540 | + } |
|
541 | + } |
|
542 | + |
|
543 | + // now get an array of all terms seperated by '/' |
|
544 | + $geodir_terms = explode('/', $geodir_term); |
|
545 | + $geodir_last_term = end($geodir_terms); |
|
546 | + |
|
547 | + if ($is_geodir_taxonomy) { // do all these only when it is a geodirectory taxonomy |
|
548 | + $wp->query_vars['post_type'] = $geodir_post_type; |
|
549 | 549 | |
550 | 550 | // now check if last term is a post of geodirectory post types |
551 | 551 | $geodir_post = get_posts(array( |
@@ -594,196 +594,196 @@ discard block |
||
594 | 594 | //return ; |
595 | 595 | } |
596 | 596 | |
597 | - $geodir_location_terms = ''; |
|
598 | - // if last term is not a post then check if last term is a term of the specific texonomy or not |
|
599 | - if (geodir_term_exists($geodir_last_term, $geodir_taxonomy)) { |
|
600 | - $is_geodir_taxonomy_term = true; |
|
597 | + $geodir_location_terms = ''; |
|
598 | + // if last term is not a post then check if last term is a term of the specific texonomy or not |
|
599 | + if (geodir_term_exists($geodir_last_term, $geodir_taxonomy)) { |
|
600 | + $is_geodir_taxonomy_term = true; |
|
601 | 601 | |
602 | - $geodir_set_location_session = false; |
|
603 | - } |
|
602 | + $geodir_set_location_session = false; |
|
603 | + } |
|
604 | 604 | |
605 | 605 | |
606 | - // now check if there is location parts in the url or not |
|
607 | - if (get_option('geodir_add_location_url')) { |
|
606 | + // now check if there is location parts in the url or not |
|
607 | + if (get_option('geodir_add_location_url')) { |
|
608 | 608 | $default_location = geodir_get_default_location(); |
609 | 609 | |
610 | 610 | if ($geodir_show_location_url == 'all') { |
611 | - if (count($geodir_terms) >= 3) { |
|
612 | - $gd_country = urldecode($geodir_terms[0]); |
|
613 | - $gd_region = urldecode($geodir_terms[1]); |
|
614 | - $gd_city = urldecode($geodir_terms[2]); |
|
615 | - } else if (count($geodir_terms) >= 2) { |
|
616 | - $gd_country = urldecode($geodir_terms[0]); |
|
617 | - $gd_region = urldecode($geodir_terms[1]); |
|
618 | - } else if (count($geodir_terms) >= 1) { |
|
619 | - $gd_country = urldecode($geodir_terms[0]); |
|
620 | - } |
|
621 | - |
|
622 | - if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && |
|
623 | - geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && |
|
624 | - geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city) |
|
625 | - ) |
|
626 | - $is_geodir_location_found = true; |
|
627 | - |
|
628 | - // if location has not been found for country , region and city then search for country and region only |
|
629 | - |
|
630 | - if (!$is_geodir_location_found) { |
|
631 | - $gd_city = ''; |
|
632 | - if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && |
|
633 | - geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) |
|
634 | - ) |
|
635 | - $is_geodir_location_found = true; |
|
636 | - |
|
637 | - } |
|
638 | - |
|
639 | - // if location has not been found for country , region then search for country only |
|
640 | - if (!$is_geodir_location_found) { |
|
641 | - $gd_city = ''; |
|
642 | - $gd_region = ''; |
|
643 | - if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) |
|
644 | - $is_geodir_location_found = true; |
|
645 | - } |
|
646 | - } else if ($geodir_show_location_url == 'country_city') { |
|
647 | - if (count($geodir_terms) >= 2) { |
|
648 | - $gd_country = urldecode($geodir_terms[0]); |
|
649 | - $gd_city = urldecode($geodir_terms[1]); |
|
650 | - } else if (count($geodir_terms) >= 1) { |
|
651 | - $gd_country = urldecode($geodir_terms[0]); |
|
652 | - } |
|
653 | - |
|
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; |
|
656 | - |
|
657 | - // if location has not been found for country and city then search for country only |
|
658 | - if (!$is_geodir_location_found) { |
|
659 | - $gd_city = ''; |
|
611 | + if (count($geodir_terms) >= 3) { |
|
612 | + $gd_country = urldecode($geodir_terms[0]); |
|
613 | + $gd_region = urldecode($geodir_terms[1]); |
|
614 | + $gd_city = urldecode($geodir_terms[2]); |
|
615 | + } else if (count($geodir_terms) >= 2) { |
|
616 | + $gd_country = urldecode($geodir_terms[0]); |
|
617 | + $gd_region = urldecode($geodir_terms[1]); |
|
618 | + } else if (count($geodir_terms) >= 1) { |
|
619 | + $gd_country = urldecode($geodir_terms[0]); |
|
620 | + } |
|
621 | + |
|
622 | + if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && |
|
623 | + geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && |
|
624 | + geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city) |
|
625 | + ) |
|
626 | + $is_geodir_location_found = true; |
|
627 | + |
|
628 | + // if location has not been found for country , region and city then search for country and region only |
|
629 | + |
|
630 | + if (!$is_geodir_location_found) { |
|
631 | + $gd_city = ''; |
|
632 | + if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && |
|
633 | + geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) |
|
634 | + ) |
|
635 | + $is_geodir_location_found = true; |
|
636 | + |
|
637 | + } |
|
638 | + |
|
639 | + // if location has not been found for country , region then search for country only |
|
640 | + if (!$is_geodir_location_found) { |
|
641 | + $gd_city = ''; |
|
642 | + $gd_region = ''; |
|
643 | + if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) |
|
644 | + $is_geodir_location_found = true; |
|
645 | + } |
|
646 | + } else if ($geodir_show_location_url == 'country_city') { |
|
647 | + if (count($geodir_terms) >= 2) { |
|
648 | + $gd_country = urldecode($geodir_terms[0]); |
|
649 | + $gd_city = urldecode($geodir_terms[1]); |
|
650 | + } else if (count($geodir_terms) >= 1) { |
|
651 | + $gd_country = urldecode($geodir_terms[0]); |
|
652 | + } |
|
653 | + |
|
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; |
|
656 | + |
|
657 | + // if location has not been found for country and city then search for country only |
|
658 | + if (!$is_geodir_location_found) { |
|
659 | + $gd_city = ''; |
|
660 | 660 | |
661 | 661 | if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) |
662 | - $is_geodir_location_found = true; |
|
663 | - } |
|
664 | - } else if ($geodir_show_location_url == 'region_city') { |
|
665 | - if (count($geodir_terms) >= 2) { |
|
666 | - $gd_region = urldecode($geodir_terms[0]); |
|
667 | - $gd_city = urldecode($geodir_terms[1]); |
|
668 | - } else if (count($geodir_terms) >= 1) { |
|
669 | - $gd_region = urldecode($geodir_terms[0]); |
|
670 | - } |
|
671 | - |
|
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; |
|
674 | - |
|
675 | - // if location has not been found for region and city then search for region only |
|
676 | - if (!$is_geodir_location_found) { |
|
677 | - $gd_city = ''; |
|
662 | + $is_geodir_location_found = true; |
|
663 | + } |
|
664 | + } else if ($geodir_show_location_url == 'region_city') { |
|
665 | + if (count($geodir_terms) >= 2) { |
|
666 | + $gd_region = urldecode($geodir_terms[0]); |
|
667 | + $gd_city = urldecode($geodir_terms[1]); |
|
668 | + } else if (count($geodir_terms) >= 1) { |
|
669 | + $gd_region = urldecode($geodir_terms[0]); |
|
670 | + } |
|
671 | + |
|
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; |
|
674 | + |
|
675 | + // if location has not been found for region and city then search for region only |
|
676 | + if (!$is_geodir_location_found) { |
|
677 | + $gd_city = ''; |
|
678 | 678 | |
679 | 679 | if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)) |
680 | - $is_geodir_location_found = true; |
|
681 | - } |
|
682 | - } else { |
|
683 | - $gd_city = $geodir_terms[0]; |
|
684 | - |
|
685 | - if (geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) { |
|
686 | - $is_geodir_location_found = true; |
|
687 | - $gd_region = $default_location->region_slug; |
|
688 | - $gd_country = $default_location->country_slug; |
|
689 | - } |
|
690 | - } |
|
691 | - // if location still not found then clear location related session variables |
|
692 | - if ($is_geodir_location_found && $geodir_set_location_session) { |
|
693 | - $gd_session->set('gd_multi_location', 1); |
|
694 | - $gd_session->set('gd_country', $gd_country); |
|
695 | - $gd_session->set('gd_region', $gd_region); |
|
696 | - $gd_session->set('gd_city', $gd_city); |
|
697 | - } |
|
698 | - |
|
699 | - if ($geodir_show_location_url == 'all') { |
|
680 | + $is_geodir_location_found = true; |
|
681 | + } |
|
682 | + } else { |
|
683 | + $gd_city = $geodir_terms[0]; |
|
684 | + |
|
685 | + if (geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) { |
|
686 | + $is_geodir_location_found = true; |
|
687 | + $gd_region = $default_location->region_slug; |
|
688 | + $gd_country = $default_location->country_slug; |
|
689 | + } |
|
690 | + } |
|
691 | + // if location still not found then clear location related session variables |
|
692 | + if ($is_geodir_location_found && $geodir_set_location_session) { |
|
693 | + $gd_session->set('gd_multi_location', 1); |
|
694 | + $gd_session->set('gd_country', $gd_country); |
|
695 | + $gd_session->set('gd_region', $gd_region); |
|
696 | + $gd_session->set('gd_city', $gd_city); |
|
697 | + } |
|
698 | + |
|
699 | + if ($geodir_show_location_url == 'all') { |
|
700 | 700 | } else if ($geodir_show_location_url == 'country_city') { |
701 | 701 | $gd_region = ''; |
702 | 702 | } else if ($geodir_show_location_url == 'region_city') { |
703 | 703 | $gd_country = ''; |
704 | 704 | } else { |
705 | 705 | $gd_country = ''; |
706 | - $gd_region = ''; |
|
706 | + $gd_region = ''; |
|
707 | + } |
|
708 | + |
|
709 | + if ($is_geodir_location_found) { |
|
710 | + $wp->query_vars['gd_country'] = $gd_country; |
|
711 | + $wp->query_vars['gd_region'] = $gd_region; |
|
712 | + $wp->query_vars['gd_city'] = $gd_city; |
|
713 | + } else { |
|
714 | + $gd_country = ''; |
|
715 | + $gd_region = ''; |
|
716 | + $gd_city = ''; |
|
707 | 717 | } |
718 | + } |
|
719 | + |
|
720 | + $wp->query_vars[$geodir_taxonomy] = $geodir_term; |
|
721 | + // 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); |
|
724 | + |
|
725 | + if ($gd_region != '') |
|
726 | + $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
727 | + |
|
728 | + if ($gd_city != '') |
|
729 | + $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
708 | 730 | |
709 | - if ($is_geodir_location_found) { |
|
710 | - $wp->query_vars['gd_country'] = $gd_country; |
|
711 | - $wp->query_vars['gd_region'] = $gd_region; |
|
712 | - $wp->query_vars['gd_city'] = $gd_city; |
|
713 | - } else { |
|
714 | - $gd_country = ''; |
|
715 | - $gd_region = ''; |
|
716 | - $gd_city = ''; |
|
717 | - } |
|
718 | - } |
|
719 | - |
|
720 | - $wp->query_vars[$geodir_taxonomy] = $geodir_term; |
|
721 | - // 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); |
|
724 | - |
|
725 | - if ($gd_region != '') |
|
726 | - $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
727 | - |
|
728 | - if ($gd_city != '') |
|
729 | - $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
730 | - |
|
731 | - |
|
732 | - $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]); |
|
733 | - $wp->query_vars[$geodir_taxonomy] = str_replace('//', '', $wp->query_vars[$geodir_taxonomy]); |
|
734 | - |
|
735 | - $wp->query_vars[$geodir_taxonomy] = trim($wp->query_vars[$geodir_taxonomy], '/'); |
|
736 | - |
|
737 | - if ($wp->query_vars[$geodir_taxonomy] == '') { |
|
738 | - unset($wp->query_vars[$geodir_taxonomy]); |
|
739 | - } else { |
|
740 | - if (!$is_geodir_taxonomy_term) { |
|
741 | - foreach ($wp->query_vars as $key => $vars) { |
|
742 | - unset($wp->query_vars[$key]); |
|
743 | - } |
|
744 | - $wp->query_vars['error'] = '404'; |
|
745 | - } |
|
746 | - } |
|
747 | - } |
|
748 | - } |
|
731 | + |
|
732 | + $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]); |
|
733 | + $wp->query_vars[$geodir_taxonomy] = str_replace('//', '', $wp->query_vars[$geodir_taxonomy]); |
|
734 | + |
|
735 | + $wp->query_vars[$geodir_taxonomy] = trim($wp->query_vars[$geodir_taxonomy], '/'); |
|
736 | + |
|
737 | + if ($wp->query_vars[$geodir_taxonomy] == '') { |
|
738 | + unset($wp->query_vars[$geodir_taxonomy]); |
|
739 | + } else { |
|
740 | + if (!$is_geodir_taxonomy_term) { |
|
741 | + foreach ($wp->query_vars as $key => $vars) { |
|
742 | + unset($wp->query_vars[$key]); |
|
743 | + } |
|
744 | + $wp->query_vars['error'] = '404'; |
|
745 | + } |
|
746 | + } |
|
747 | + } |
|
748 | + } |
|
749 | 749 | |
750 | 750 | // Unset location session if gd page and location not set. |
751 | 751 | if (isset($wp->query_vars['gd_is_geodir_page']) && !isset($wp->query_vars['gd_country'])) { |
752 | 752 | $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country')); |
753 | 753 | } |
754 | 754 | |
755 | - if ($gd_session->get('gd_multi_location') == 1) { |
|
756 | - $wp->query_vars['gd_country'] = $gd_session->get('gd_country'); |
|
757 | - $wp->query_vars['gd_region'] = $gd_session->get('gd_region'); |
|
758 | - $wp->query_vars['gd_city'] = $gd_session->get('gd_city'); |
|
759 | - } |
|
755 | + if ($gd_session->get('gd_multi_location') == 1) { |
|
756 | + $wp->query_vars['gd_country'] = $gd_session->get('gd_country'); |
|
757 | + $wp->query_vars['gd_region'] = $gd_session->get('gd_region'); |
|
758 | + $wp->query_vars['gd_city'] = $gd_session->get('gd_city'); |
|
759 | + } |
|
760 | 760 | |
761 | - // now check if there is location parts in the url or not |
|
762 | - if (get_option('geodir_add_location_url')) { |
|
761 | + // now check if there is location parts in the url or not |
|
762 | + if (get_option('geodir_add_location_url')) { |
|
763 | 763 | if ($geodir_show_location_url == 'all') { |
764 | 764 | } else if ($geodir_show_location_url == 'country_city') { |
765 | 765 | if (isset($wp->query_vars['gd_region'])) |
766 | - $wp->query_vars['gd_region'] = ''; |
|
766 | + $wp->query_vars['gd_region'] = ''; |
|
767 | 767 | } else if ($geodir_show_location_url == 'region_city') { |
768 | 768 | if (isset($wp->query_vars['gd_country'])) |
769 | - $wp->query_vars['gd_country'] = ''; |
|
769 | + $wp->query_vars['gd_country'] = ''; |
|
770 | 770 | } else { |
771 | 771 | if (isset($wp->query_vars['gd_country'])) |
772 | - $wp->query_vars['gd_country'] = ''; |
|
772 | + $wp->query_vars['gd_country'] = ''; |
|
773 | 773 | |
774 | - if (isset($wp->query_vars['gd_region'])) |
|
775 | - $wp->query_vars['gd_region'] = ''; |
|
774 | + if (isset($wp->query_vars['gd_region'])) |
|
775 | + $wp->query_vars['gd_region'] = ''; |
|
776 | 776 | } |
777 | - } else { |
|
778 | - if (isset($wp->query_vars['gd_country'])) |
|
779 | - $wp->query_vars['gd_country'] = ''; |
|
777 | + } else { |
|
778 | + if (isset($wp->query_vars['gd_country'])) |
|
779 | + $wp->query_vars['gd_country'] = ''; |
|
780 | 780 | |
781 | - if (isset($wp->query_vars['gd_region'])) |
|
782 | - $wp->query_vars['gd_region'] = ''; |
|
781 | + if (isset($wp->query_vars['gd_region'])) |
|
782 | + $wp->query_vars['gd_region'] = ''; |
|
783 | 783 | |
784 | - if (isset($wp->query_vars['gd_city'])) |
|
785 | - $wp->query_vars['gd_city'] = ''; |
|
786 | - } |
|
784 | + if (isset($wp->query_vars['gd_city'])) |
|
785 | + $wp->query_vars['gd_city'] = ''; |
|
786 | + } |
|
787 | 787 | } |
788 | 788 | |
789 | 789 | /** |
@@ -797,24 +797,24 @@ discard block |
||
797 | 797 | */ |
798 | 798 | function geodir_custom_post_status() |
799 | 799 | { |
800 | - // Virtual Page Status |
|
801 | - register_post_status('virtual', array( |
|
802 | - 'label' => _x('Virtual', 'page', 'geodirectory'), |
|
803 | - 'public' => true, |
|
804 | - 'exclude_from_search' => true, |
|
805 | - 'show_in_admin_all_list' => true, |
|
806 | - 'show_in_admin_status_list' => true, |
|
807 | - 'label_count' => _n_noop('Virtual <span class="count">(%s)</span>', 'Virtual <span class="count">(%s)</span>', 'geodirectory'), |
|
808 | - )); |
|
809 | - |
|
810 | - /** |
|
811 | - * Called after we register the custom post status 'Virtual'. |
|
812 | - * |
|
813 | - * Can be use to add more post statuses. |
|
814 | - * |
|
815 | - * @since 1.0.0 |
|
816 | - */ |
|
817 | - do_action('geodir_custom_post_status'); |
|
800 | + // Virtual Page Status |
|
801 | + register_post_status('virtual', array( |
|
802 | + 'label' => _x('Virtual', 'page', 'geodirectory'), |
|
803 | + 'public' => true, |
|
804 | + 'exclude_from_search' => true, |
|
805 | + 'show_in_admin_all_list' => true, |
|
806 | + 'show_in_admin_status_list' => true, |
|
807 | + 'label_count' => _n_noop('Virtual <span class="count">(%s)</span>', 'Virtual <span class="count">(%s)</span>', 'geodirectory'), |
|
808 | + )); |
|
809 | + |
|
810 | + /** |
|
811 | + * Called after we register the custom post status 'Virtual'. |
|
812 | + * |
|
813 | + * Can be use to add more post statuses. |
|
814 | + * |
|
815 | + * @since 1.0.0 |
|
816 | + */ |
|
817 | + do_action('geodir_custom_post_status'); |
|
818 | 818 | } |
819 | 819 | |
820 | 820 | /** |
@@ -829,7 +829,7 @@ discard block |
||
829 | 829 | */ |
830 | 830 | function geodir_get_term_link($termlink, $term, $taxonomy) |
831 | 831 | { |
832 | - return geodir_term_link($termlink, $term, $taxonomy); // taxonomy_functions.php |
|
832 | + return geodir_term_link($termlink, $term, $taxonomy); // taxonomy_functions.php |
|
833 | 833 | } |
834 | 834 | |
835 | 835 | /** |
@@ -843,7 +843,7 @@ discard block |
||
843 | 843 | */ |
844 | 844 | function geodir_get_posttype_link($link, $post_type) |
845 | 845 | { |
846 | - return geodir_posttype_link($link, $post_type); // taxonomy_functions.php |
|
846 | + return geodir_posttype_link($link, $post_type); // taxonomy_functions.php |
|
847 | 847 | } |
848 | 848 | |
849 | 849 | /** |
@@ -858,13 +858,13 @@ discard block |
||
858 | 858 | */ |
859 | 859 | function exclude_from_wp_list_pages($exclude_array) |
860 | 860 | { |
861 | - $pages_ids = array(); |
|
862 | - $pages_array = get_posts(array('post_type' => 'page', 'post_status' => 'virtual')); |
|
863 | - foreach ($pages_array as $page) { |
|
864 | - $pages_ids[] = $page->ID; |
|
865 | - } |
|
866 | - $exclude_array = $exclude_array + $pages_ids; |
|
867 | - return $exclude_array; |
|
861 | + $pages_ids = array(); |
|
862 | + $pages_array = get_posts(array('post_type' => 'page', 'post_status' => 'virtual')); |
|
863 | + foreach ($pages_array as $page) { |
|
864 | + $pages_ids[] = $page->ID; |
|
865 | + } |
|
866 | + $exclude_array = $exclude_array + $pages_ids; |
|
867 | + return $exclude_array; |
|
868 | 868 | } |
869 | 869 | |
870 | 870 | /** |
@@ -877,8 +877,8 @@ discard block |
||
877 | 877 | */ |
878 | 878 | function geodir_exclude_page($query) |
879 | 879 | { |
880 | - add_filter('posts_where', 'geodir_exclude_page_where', 100); |
|
881 | - return $query; |
|
880 | + add_filter('posts_where', 'geodir_exclude_page_where', 100); |
|
881 | + return $query; |
|
882 | 882 | } |
883 | 883 | |
884 | 884 | /** |
@@ -893,11 +893,11 @@ discard block |
||
893 | 893 | */ |
894 | 894 | function geodir_exclude_page_where($where) |
895 | 895 | { |
896 | - global $wpdb; |
|
897 | - if (is_admin()) |
|
898 | - $where .= " AND $wpdb->posts.post_status != 'virtual'"; |
|
896 | + global $wpdb; |
|
897 | + if (is_admin()) |
|
898 | + $where .= " AND $wpdb->posts.post_status != 'virtual'"; |
|
899 | 899 | |
900 | - return $where; |
|
900 | + return $where; |
|
901 | 901 | } |
902 | 902 | |
903 | 903 | /** |
@@ -912,21 +912,21 @@ discard block |
||
912 | 912 | * @return mixed The taxonomy option value. |
913 | 913 | */ |
914 | 914 | function geodir_wpseo_taxonomy_meta( $value, $option = '' ) { |
915 | - global $wp_query; |
|
915 | + global $wp_query; |
|
916 | 916 | |
917 | - if ( !empty( $value ) && ( is_category() || is_tax() ) ) { |
|
918 | - $term = $wp_query->get_queried_object(); |
|
917 | + if ( !empty( $value ) && ( is_category() || is_tax() ) ) { |
|
918 | + $term = $wp_query->get_queried_object(); |
|
919 | 919 | |
920 | - 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() ) ) { |
|
921 | - $image = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) ); |
|
920 | + 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() ) ) { |
|
921 | + $image = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) ); |
|
922 | 922 | |
923 | - if ( !empty( $image['src'] ) ) { |
|
924 | - $value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src']; |
|
925 | - $value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src']; |
|
926 | - } |
|
927 | - } |
|
928 | - } |
|
929 | - return $value; |
|
923 | + if ( !empty( $image['src'] ) ) { |
|
924 | + $value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src']; |
|
925 | + $value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src']; |
|
926 | + } |
|
927 | + } |
|
928 | + } |
|
929 | + return $value; |
|
930 | 930 | } |
931 | 931 | add_filter( 'option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2 ); |
932 | 932 | |
@@ -937,24 +937,24 @@ discard block |
||
937 | 937 | * |
938 | 938 | */ |
939 | 939 | function geodir_affiliate_wp_rewrite_fix() { |
940 | - if ( !class_exists( 'Affiliate_WP' ) ) { |
|
941 | - return; |
|
942 | - } |
|
943 | - |
|
944 | - $gd_post_types = geodir_get_posttypes( 'array' ); |
|
945 | - |
|
946 | - if ( !empty( $gd_post_types ) ) { |
|
947 | - $ref = affiliate_wp()->tracking->get_referral_var(); |
|
948 | - if ( empty( $ref ) ) { |
|
949 | - return; |
|
950 | - } |
|
951 | - |
|
952 | - foreach ( $gd_post_types as $key => $post_type ) { |
|
953 | - if ( !empty( $key ) && !empty( $post_type['rewrite']['slug'] ) ) { |
|
954 | - add_rewrite_rule( $post_type['rewrite']['slug'] . '/' . $ref . '(/(.*))?/page/([0-9]{1,})/?$', 'index.php?post_type=' . $key . '&' . $ref . '=$matches[1]&paged=$matches[3]', 'top'); |
|
955 | - add_rewrite_rule( $post_type['rewrite']['slug'] . '/' . $ref . '(/(.*))?/?$', 'index.php?post_type=' . $key . '&' . $ref . '=$matches[1]', 'top'); |
|
956 | - } |
|
957 | - } |
|
958 | - } |
|
940 | + if ( !class_exists( 'Affiliate_WP' ) ) { |
|
941 | + return; |
|
942 | + } |
|
943 | + |
|
944 | + $gd_post_types = geodir_get_posttypes( 'array' ); |
|
945 | + |
|
946 | + if ( !empty( $gd_post_types ) ) { |
|
947 | + $ref = affiliate_wp()->tracking->get_referral_var(); |
|
948 | + if ( empty( $ref ) ) { |
|
949 | + return; |
|
950 | + } |
|
951 | + |
|
952 | + foreach ( $gd_post_types as $key => $post_type ) { |
|
953 | + if ( !empty( $key ) && !empty( $post_type['rewrite']['slug'] ) ) { |
|
954 | + add_rewrite_rule( $post_type['rewrite']['slug'] . '/' . $ref . '(/(.*))?/page/([0-9]{1,})/?$', 'index.php?post_type=' . $key . '&' . $ref . '=$matches[1]&paged=$matches[3]', 'top'); |
|
955 | + add_rewrite_rule( $post_type['rewrite']['slug'] . '/' . $ref . '(/(.*))?/?$', 'index.php?post_type=' . $key . '&' . $ref . '=$matches[1]', 'top'); |
|
956 | + } |
|
957 | + } |
|
958 | + } |
|
959 | 959 | } |
960 | 960 | add_action( 'init', 'geodir_affiliate_wp_rewrite_fix', 99999 ); |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | |
69 | 69 | if (!empty($args['labels'])) { |
70 | 70 | foreach ($args['labels'] as $key => $val) { |
71 | - $args['labels'][$key] = __($val, 'geodirectory');// allow translation |
|
71 | + $args['labels'][$key] = __($val, 'geodirectory'); // allow translation |
|
72 | 72 | } |
73 | 73 | } |
74 | 74 | |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | |
110 | 110 | if (array_key_exists('rewrite', $args)) { |
111 | 111 | if (array_key_exists('slug', $args['rewrite'])) |
112 | - $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%'; |
|
112 | + $args['rewrite']['slug'] = $listing_slug; // . '/%gd_taxonomy%'; |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | $geodir_post_types = get_option('geodir_post_types'); |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | |
122 | 122 | if (array_key_exists('rewrite', $geodir_post_types[$post_type])) |
123 | 123 | if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite'])) |
124 | - $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%'; |
|
124 | + $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug; // . '/%gd_taxonomy%'; |
|
125 | 125 | |
126 | 126 | update_option('geodir_post_types', $geodir_post_types); |
127 | 127 | |
@@ -133,13 +133,13 @@ discard block |
||
133 | 133 | |
134 | 134 | $geodir_taxonomies = get_option('geodir_taxonomies'); |
135 | 135 | |
136 | - if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) { |
|
137 | - $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug; |
|
136 | + if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type.'category'])) { |
|
137 | + $geodir_taxonomies[$post_type.'category']['listing_slug'] = $listing_slug; |
|
138 | 138 | |
139 | - if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category'])) |
|
140 | - if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args'])) |
|
141 | - if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite'])) |
|
142 | - $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug; |
|
139 | + if (array_key_exists('args', $geodir_taxonomies[$post_type.'category'])) |
|
140 | + if (array_key_exists('rewrite', $geodir_taxonomies[$post_type.'category']['args'])) |
|
141 | + if (array_key_exists('slug', $geodir_taxonomies[$post_type.'category']['args']['rewrite'])) |
|
142 | + $geodir_taxonomies[$post_type.'category']['args']['rewrite']['slug'] = $listing_slug; |
|
143 | 143 | |
144 | 144 | update_option('geodir_taxonomies', $geodir_taxonomies); |
145 | 145 | |
@@ -147,13 +147,13 @@ discard block |
||
147 | 147 | |
148 | 148 | /* --- update taxonomies (tags) --- */ |
149 | 149 | $geodir_taxonomies_tag = get_option('geodir_taxonomies'); |
150 | - if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) { |
|
151 | - $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags'; |
|
150 | + if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type.'_tags'])) { |
|
151 | + $geodir_taxonomies_tag[$post_type.'_tags']['listing_slug'] = $listing_slug.'/tags'; |
|
152 | 152 | |
153 | - if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags'])) |
|
154 | - if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args'])) |
|
155 | - if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite'])) |
|
156 | - $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags'; |
|
153 | + if (array_key_exists('args', $geodir_taxonomies_tag[$post_type.'_tags'])) |
|
154 | + if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type.'_tags']['args'])) |
|
155 | + if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type.'_tags']['args']['rewrite'])) |
|
156 | + $geodir_taxonomies_tag[$post_type.'_tags']['args']['rewrite']['slug'] = $listing_slug.'/tags'; |
|
157 | 157 | |
158 | 158 | update_option('geodir_taxonomies', $geodir_taxonomies_tag); |
159 | 159 | |
@@ -203,11 +203,11 @@ discard block |
||
203 | 203 | $listing_slug = $args['listing_slug']; |
204 | 204 | |
205 | 205 | if (strpos($taxonomy, 'tags')) { |
206 | - $newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]'; |
|
207 | - $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]'; |
|
206 | + $newrules[$listing_slug.'/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?'.$taxonomy.'=$matches[1]&paged=$matches[2]'; |
|
207 | + $newrules[$listing_slug.'/(.+?)/?$'] = 'index.php?'.$taxonomy.'=$matches[1]'; |
|
208 | 208 | } else { |
209 | 209 | // use this loop to add paging for details page comments paging |
210 | - $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]'; |
|
210 | + $newrules[str_replace("/tags", "", $listing_slug).'/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?'.$taxonomy.'=$matches[1]&cpage=$matches[2]'; |
|
211 | 211 | } |
212 | 212 | endforeach; |
213 | 213 | endif; |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | // create rules for location listing |
216 | 216 | $location_page = get_option('geodir_location_page'); |
217 | 217 | |
218 | - if($location_page) { |
|
218 | + if ($location_page) { |
|
219 | 219 | global $wpdb; |
220 | 220 | $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page)); |
221 | 221 | } |
@@ -245,30 +245,30 @@ discard block |
||
245 | 245 | |
246 | 246 | if ($matches2) { |
247 | 247 | if ($neighbourhood_active) { |
248 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]'; |
|
248 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]&gd_neighbourhood=$matches[3]'; |
|
249 | 249 | } |
250 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]'; |
|
250 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]'; |
|
251 | 251 | } else { |
252 | 252 | if ($neighbourhood_active) { |
253 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]'; |
|
253 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&gd_neighbourhood=$matches[2]'; |
|
254 | 254 | } |
255 | 255 | } |
256 | 256 | |
257 | - $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]'; |
|
257 | + $newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]'; |
|
258 | 258 | } else { // country/region/city |
259 | 259 | if ($neighbourhood_active) { |
260 | - $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]'; |
|
260 | + $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]'; |
|
261 | 261 | } |
262 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]'; |
|
263 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]'; |
|
264 | - $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]'; |
|
262 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]'; |
|
263 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]'; |
|
264 | + $newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]'; |
|
265 | 265 | } |
266 | 266 | |
267 | 267 | if ($location_page && geodir_is_wpml()) { |
268 | - foreach(icl_get_languages('skip_missing=N') as $lang){ |
|
268 | + foreach (icl_get_languages('skip_missing=N') as $lang) { |
|
269 | 269 | $alt_page_id = ''; |
270 | - $alt_page_id = geodir_wpml_object_id($location_page, 'page', false,$lang['language_code']); |
|
271 | - if($alt_page_id){ |
|
270 | + $alt_page_id = geodir_wpml_object_id($location_page, 'page', false, $lang['language_code']); |
|
271 | + if ($alt_page_id) { |
|
272 | 272 | $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id)); |
273 | 273 | |
274 | 274 | if ($location_manager && ($hide_country_part || $hide_region_part)) { |
@@ -287,29 +287,29 @@ discard block |
||
287 | 287 | |
288 | 288 | if ($matches2) { |
289 | 289 | if ($neighbourhood_active) { |
290 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]'; |
|
290 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]&gd_neighbourhood=$matches[3]'; |
|
291 | 291 | } |
292 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]'; |
|
292 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]'; |
|
293 | 293 | } else { |
294 | 294 | if ($neighbourhood_active) { |
295 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]'; |
|
295 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&gd_neighbourhood=$matches[2]'; |
|
296 | 296 | } |
297 | 297 | } |
298 | 298 | |
299 | - $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]'; |
|
299 | + $newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]'; |
|
300 | 300 | } else { // country/region/city |
301 | 301 | if ($neighbourhood_active) { |
302 | - $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]'; |
|
302 | + $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]'; |
|
303 | 303 | } |
304 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]'; |
|
305 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]'; |
|
306 | - $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]'; |
|
304 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]'; |
|
305 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]'; |
|
306 | + $newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]'; |
|
307 | 307 | } |
308 | 308 | } |
309 | 309 | } |
310 | 310 | } |
311 | 311 | |
312 | - $newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page; |
|
312 | + $newrules[$location_prefix.'/?$'] = 'index.php?page_id='.$location_page; |
|
313 | 313 | |
314 | 314 | $rules = array_merge($newrules, $rules); |
315 | 315 | return $rules; |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | #Redirect 301 /location/ /$location_prefix/ |
339 | 339 | # END GeoDirectory Rules\n\n |
340 | 340 | EOD; |
341 | - return $my_content . $rules; |
|
341 | + return $my_content.$rules; |
|
342 | 342 | } |
343 | 343 | //add_filter('mod_rewrite_rules', 'geodir_htaccess_contents'); |
344 | 344 | |
@@ -414,12 +414,12 @@ discard block |
||
414 | 414 | global $wpdb; |
415 | 415 | |
416 | 416 | $page_for_posts = get_option('page_for_posts'); |
417 | - $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'])); |
|
417 | + $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 | 418 | |
419 | 419 | if (geodir_is_wpml()) { |
420 | 420 | $real_page_id = geodir_wpml_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE); |
421 | 421 | } |
422 | - if ($real_page_id && $real_page_id!=$page_for_posts) { |
|
422 | + if ($real_page_id && $real_page_id != $page_for_posts) { |
|
423 | 423 | $wp->query_vars['page_id'] = $real_page_id; |
424 | 424 | } |
425 | 425 | } |
@@ -466,7 +466,7 @@ discard block |
||
466 | 466 | $gd_city = $default_location->city_slug; |
467 | 467 | |
468 | 468 | $base_location_link = geodir_get_location_link('base'); |
469 | - wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city); |
|
469 | + wp_redirect($base_location_link.'/'.$gd_country.'/'.$gd_region.'/'.$gd_city); |
|
470 | 470 | exit(); |
471 | 471 | } |
472 | 472 | } |
@@ -527,7 +527,7 @@ discard block |
||
527 | 527 | $geodir_set_location_session = true; |
528 | 528 | $geodir_taxonomis = geodir_get_taxonomies('', true); |
529 | 529 | |
530 | - if(!empty($geodir_taxonomis)){ |
|
530 | + if (!empty($geodir_taxonomis)) { |
|
531 | 531 | foreach ($geodir_taxonomis as $taxonomy) { |
532 | 532 | if (array_key_exists($taxonomy, $wp->query_vars)) { |
533 | 533 | $is_geodir_taxonomy = true; |
@@ -584,7 +584,7 @@ discard block |
||
584 | 584 | } |
585 | 585 | |
586 | 586 | |
587 | - $geodir_term = str_replace('/' . $geodir_last_term, '', $geodir_term, $post_title_replace_count); |
|
587 | + $geodir_term = str_replace('/'.$geodir_last_term, '', $geodir_term, $post_title_replace_count); |
|
588 | 588 | if (!$post_title_replace_count) |
589 | 589 | $geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count); |
590 | 590 | $geodir_terms = explode('/', $geodir_term); |
@@ -661,7 +661,7 @@ discard block |
||
661 | 661 | if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) |
662 | 662 | $is_geodir_location_found = true; |
663 | 663 | } |
664 | - } else if ($geodir_show_location_url == 'region_city') { |
|
664 | + } else if ($geodir_show_location_url == 'region_city') { |
|
665 | 665 | if (count($geodir_terms) >= 2) { |
666 | 666 | $gd_region = urldecode($geodir_terms[0]); |
667 | 667 | $gd_city = urldecode($geodir_terms[1]); |
@@ -720,13 +720,13 @@ discard block |
||
720 | 720 | $wp->query_vars[$geodir_taxonomy] = $geodir_term; |
721 | 721 | // eliminate location related terms from taxonomy term |
722 | 722 | if ($gd_country != '') |
723 | - $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
723 | + $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_country).'/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
724 | 724 | |
725 | 725 | if ($gd_region != '') |
726 | - $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
726 | + $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_region).'/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
727 | 727 | |
728 | 728 | if ($gd_city != '') |
729 | - $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
729 | + $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_city).'/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
730 | 730 | |
731 | 731 | |
732 | 732 | $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]); |
@@ -911,16 +911,16 @@ discard block |
||
911 | 911 | * @param string $option Option name. |
912 | 912 | * @return mixed The taxonomy option value. |
913 | 913 | */ |
914 | -function geodir_wpseo_taxonomy_meta( $value, $option = '' ) { |
|
914 | +function geodir_wpseo_taxonomy_meta($value, $option = '') { |
|
915 | 915 | global $wp_query; |
916 | 916 | |
917 | - if ( !empty( $value ) && ( is_category() || is_tax() ) ) { |
|
917 | + if (!empty($value) && (is_category() || is_tax())) { |
|
918 | 918 | $term = $wp_query->get_queried_object(); |
919 | 919 | |
920 | - 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() ) ) { |
|
921 | - $image = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) ); |
|
920 | + 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())) { |
|
921 | + $image = geodir_get_default_catimage($term->term_id, str_replace('category', '', $term->taxonomy)); |
|
922 | 922 | |
923 | - if ( !empty( $image['src'] ) ) { |
|
923 | + if (!empty($image['src'])) { |
|
924 | 924 | $value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src']; |
925 | 925 | $value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src']; |
926 | 926 | } |
@@ -928,7 +928,7 @@ discard block |
||
928 | 928 | } |
929 | 929 | return $value; |
930 | 930 | } |
931 | -add_filter( 'option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2 ); |
|
931 | +add_filter('option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2); |
|
932 | 932 | |
933 | 933 | /** |
934 | 934 | * Fix affiliate links for GeoDirectory CPTs listing pages. |
@@ -937,24 +937,24 @@ discard block |
||
937 | 937 | * |
938 | 938 | */ |
939 | 939 | function geodir_affiliate_wp_rewrite_fix() { |
940 | - if ( !class_exists( 'Affiliate_WP' ) ) { |
|
940 | + if (!class_exists('Affiliate_WP')) { |
|
941 | 941 | return; |
942 | 942 | } |
943 | 943 | |
944 | - $gd_post_types = geodir_get_posttypes( 'array' ); |
|
944 | + $gd_post_types = geodir_get_posttypes('array'); |
|
945 | 945 | |
946 | - if ( !empty( $gd_post_types ) ) { |
|
946 | + if (!empty($gd_post_types)) { |
|
947 | 947 | $ref = affiliate_wp()->tracking->get_referral_var(); |
948 | - if ( empty( $ref ) ) { |
|
948 | + if (empty($ref)) { |
|
949 | 949 | return; |
950 | 950 | } |
951 | 951 | |
952 | - foreach ( $gd_post_types as $key => $post_type ) { |
|
953 | - if ( !empty( $key ) && !empty( $post_type['rewrite']['slug'] ) ) { |
|
954 | - add_rewrite_rule( $post_type['rewrite']['slug'] . '/' . $ref . '(/(.*))?/page/([0-9]{1,})/?$', 'index.php?post_type=' . $key . '&' . $ref . '=$matches[1]&paged=$matches[3]', 'top'); |
|
955 | - add_rewrite_rule( $post_type['rewrite']['slug'] . '/' . $ref . '(/(.*))?/?$', 'index.php?post_type=' . $key . '&' . $ref . '=$matches[1]', 'top'); |
|
952 | + foreach ($gd_post_types as $key => $post_type) { |
|
953 | + if (!empty($key) && !empty($post_type['rewrite']['slug'])) { |
|
954 | + add_rewrite_rule($post_type['rewrite']['slug'].'/'.$ref.'(/(.*))?/page/([0-9]{1,})/?$', 'index.php?post_type='.$key.'&'.$ref.'=$matches[1]&paged=$matches[3]', 'top'); |
|
955 | + add_rewrite_rule($post_type['rewrite']['slug'].'/'.$ref.'(/(.*))?/?$', 'index.php?post_type='.$key.'&'.$ref.'=$matches[1]', 'top'); |
|
956 | 956 | } |
957 | 957 | } |
958 | 958 | } |
959 | 959 | } |
960 | -add_action( 'init', 'geodir_affiliate_wp_rewrite_fix', 99999 ); |
|
960 | +add_action('init', 'geodir_affiliate_wp_rewrite_fix', 99999); |
@@ -16,8 +16,9 @@ |
||
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"> |
@@ -17,7 +17,7 @@ discard block |
||
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 |
||
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">“%2$s”</span>', '%1$s Reviews <span>on</span> <span class="r-title"> “%2$s”</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">“%2$s”</span>', '%1$s Reviews <span>on</span> <span class="r-title"> “%2$s”</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 |
||
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') . ' <span class="required">*</span></label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true" required></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') . ' <span class="required">*</span></label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true" required></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 |
@@ -99,8 +99,8 @@ |
||
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') . ' <span class="required">*</span></label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true" required></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').' <span class="required">*</span></label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true" required></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 | ?> |
@@ -61,10 +61,11 @@ |
||
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(); |
@@ -15,9 +15,9 @@ discard block |
||
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 |
||
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 |
||
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> |
@@ -15,9 +15,9 @@ discard block |
||
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 |
||
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 |
||
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(); |
@@ -353,7 +353,7 @@ |
||
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 |
@@ -169,9 +169,9 @@ discard block |
||
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 |
||
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 |
||
252 | 252 | <p> |
253 | 253 | <label for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Select CPT:', 'geodirectory'); ?></label> |
254 | 254 | <select name="<?php echo $this->get_field_name('post_type'); ?>[]" id="<?php echo $this->get_field_id('post_type'); ?>" class="widefat" multiple="multiple"> |
255 | - <option value="0" <?php selected( (empty($post_type) || (is_array($post_type) && in_array('0', $post_type))), true ); ?>><?php _e('All', 'geodirectory'); ?></option> |
|
255 | + <option value="0" <?php selected((empty($post_type) || (is_array($post_type) && in_array('0', $post_type))), true); ?>><?php _e('All', 'geodirectory'); ?></option> |
|
256 | 256 | <?php foreach ($post_type_options as $name => $title) { ?> |
257 | - <option value="<?php echo $name;?>" <?php selected( is_array($post_type) && in_array($name, $post_type), true ); ?>><?php echo $title; ?></option> |
|
257 | + <option value="<?php echo $name; ?>" <?php selected(is_array($post_type) && in_array($name, $post_type), true); ?>><?php echo $title; ?></option> |
|
258 | 258 | <?php } ?> |
259 | 259 | </select> |
260 | 260 | </p> |
261 | - <p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_empty'); ?>" name="<?php echo $this->get_field_name('hide_empty'); ?>"<?php checked( $hide_empty ); ?> value="1" /> |
|
262 | - <label for="<?php echo $this->get_field_id('hide_empty'); ?>"><?php _e( 'Hide empty categories', 'geodirectory' ); ?></label><br /> |
|
263 | - <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('show_count'); ?>" name="<?php echo $this->get_field_name('show_count'); ?>"<?php checked( $show_count ); ?> value="1" /> |
|
264 | - <label for="<?php echo $this->get_field_id('show_count'); ?>"><?php _e( 'Show category count' ); ?></label> <small><?php _e( '( Enabling will slow down page loading for big directories. )', 'geodirectory' ); ?></small><br /> |
|
265 | - <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_icon'); ?>" name="<?php echo $this->get_field_name('hide_icon'); ?>"<?php checked( $hide_icon ); ?> value="1" /> |
|
266 | - <label for="<?php echo $this->get_field_id('hide_icon'); ?>"><?php _e( 'Hide category icon', 'geodirectory' ); ?></label><br /> |
|
267 | - <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('cpt_left'); ?>" name="<?php echo $this->get_field_name('cpt_left'); ?>"<?php checked( $cpt_left ); ?> value="1" /> |
|
268 | - <label for="<?php echo $this->get_field_id('cpt_left'); ?>"><?php _e( 'Show CPT on same line', 'geodirectory' ); ?></label> |
|
261 | + <p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_empty'); ?>" name="<?php echo $this->get_field_name('hide_empty'); ?>"<?php checked($hide_empty); ?> value="1" /> |
|
262 | + <label for="<?php echo $this->get_field_id('hide_empty'); ?>"><?php _e('Hide empty categories', 'geodirectory'); ?></label><br /> |
|
263 | + <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('show_count'); ?>" name="<?php echo $this->get_field_name('show_count'); ?>"<?php checked($show_count); ?> value="1" /> |
|
264 | + <label for="<?php echo $this->get_field_id('show_count'); ?>"><?php _e('Show category count'); ?></label> <small><?php _e('( Enabling will slow down page loading for big directories. )', 'geodirectory'); ?></small><br /> |
|
265 | + <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_icon'); ?>" name="<?php echo $this->get_field_name('hide_icon'); ?>"<?php checked($hide_icon); ?> value="1" /> |
|
266 | + <label for="<?php echo $this->get_field_id('hide_icon'); ?>"><?php _e('Hide category icon', 'geodirectory'); ?></label><br /> |
|
267 | + <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('cpt_left'); ?>" name="<?php echo $this->get_field_name('cpt_left'); ?>"<?php checked($cpt_left); ?> value="1" /> |
|
268 | + <label for="<?php echo $this->get_field_id('cpt_left'); ?>"><?php _e('Show CPT on same line', 'geodirectory'); ?></label> |
|
269 | 269 | <p> |
270 | 270 | <label for="<?php echo $this->get_field_id('sort_by'); ?>"><?php _e('Sort by:', 'geodirectory'); ?></label> |
271 | 271 | <select name="<?php echo $this->get_field_name('sort_by'); ?>" id="<?php echo $this->get_field_id('sort_by'); ?>" class="widefat"> |
272 | - <option value="az" <?php selected( $sort_by, 'az' ); ?>><?php _e('A-Z', 'geodirectory'); ?></option> |
|
273 | - <option value="count" <?php selected( $sort_by, 'count' ); ?>><?php _e('Count', 'geodirectory'); ?></option> |
|
272 | + <option value="az" <?php selected($sort_by, 'az'); ?>><?php _e('A-Z', 'geodirectory'); ?></option> |
|
273 | + <option value="count" <?php selected($sort_by, 'count'); ?>><?php _e('Count', 'geodirectory'); ?></option> |
|
274 | 274 | </select> |
275 | 275 | </p> |
276 | 276 | <p> |
277 | 277 | <label for="<?php echo $this->get_field_id('max_count'); ?>"><?php _e('Max no of sub-categories:', 'geodirectory'); ?></label> |
278 | 278 | <select name="<?php echo $this->get_field_name('max_count'); ?>" id="<?php echo $this->get_field_id('max_count'); ?>" class="widefat"> |
279 | - <option value="all" <?php selected( $max_count, 'all' ); ?>><?php _e('All', 'geodirectory'); ?></option> |
|
279 | + <option value="all" <?php selected($max_count, 'all'); ?>><?php _e('All', 'geodirectory'); ?></option> |
|
280 | 280 | <?php for ($n = 10; $n >= 0; $n--) { ?> |
281 | - <option value="<?php echo $n;?>" <?php selected( $max_count, $n ); ?>><?php echo $n; ?></option> |
|
281 | + <option value="<?php echo $n; ?>" <?php selected($max_count, $n); ?>><?php echo $n; ?></option> |
|
282 | 282 | <?php } ?> |
283 | 283 | </select> |
284 | 284 | </p> |
285 | 285 | <p> |
286 | 286 | <label for="<?php echo $this->get_field_id('max_level'); ?>"><?php _e('Show max sub-categories depth:', 'geodirectory'); ?></label> |
287 | 287 | <select name="<?php echo $this->get_field_name('max_level'); ?>" id="<?php echo $this->get_field_id('max_level'); ?>" class="widefat"> |
288 | - <option value="all" <?php selected( $max_level, 'all' ); ?>><?php _e('All', 'geodirectory'); ?></option> |
|
288 | + <option value="all" <?php selected($max_level, 'all'); ?>><?php _e('All', 'geodirectory'); ?></option> |
|
289 | 289 | <?php for ($n = 0; $n <= 10; $n++) { ?> |
290 | - <option value="<?php echo $n;?>" <?php selected( $max_level, $n ); ?>><?php echo $n; ?></option> |
|
290 | + <option value="<?php echo $n; ?>" <?php selected($max_level, $n); ?>><?php echo $n; ?></option> |
|
291 | 291 | <?php } ?> |
292 | 292 | </select> |
293 | 293 | </p> |
294 | 294 | <p> |
295 | - <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cpt_filter'); ?>" name="<?php echo $this->get_field_name('no_cpt_filter'); ?>"<?php checked( $no_cpt_filter ); ?> value="1" /> |
|
296 | - <label for="<?php echo $this->get_field_id('no_cpt_filter'); ?>"><?php _e( 'Don\'t filter for current viewing post type', 'geodirectory' ); ?></label> |
|
297 | - <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cat_filter'); ?>" name="<?php echo $this->get_field_name('no_cat_filter'); ?>"<?php checked( $no_cat_filter ); ?> value="1" /> |
|
298 | - <label for="<?php echo $this->get_field_id('no_cat_filter'); ?>"><?php _e( 'Don\'t filter for current viewing category', 'geodirectory' ); ?></label> |
|
295 | + <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cpt_filter'); ?>" name="<?php echo $this->get_field_name('no_cpt_filter'); ?>"<?php checked($no_cpt_filter); ?> value="1" /> |
|
296 | + <label for="<?php echo $this->get_field_id('no_cpt_filter'); ?>"><?php _e('Don\'t filter for current viewing post type', 'geodirectory'); ?></label> |
|
297 | + <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cat_filter'); ?>" name="<?php echo $this->get_field_name('no_cat_filter'); ?>"<?php checked($no_cat_filter); ?> value="1" /> |
|
298 | + <label for="<?php echo $this->get_field_id('no_cat_filter'); ?>"><?php _e('Don\'t filter for current viewing category', 'geodirectory'); ?></label> |
|
299 | 299 | </p> |
300 | 300 | <?php |
301 | 301 | } |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | |
323 | 323 | $gd_use_query_vars = geodir_is_page('detail') ? true : false; |
324 | 324 | |
325 | - $args = wp_parse_args((array)$params, |
|
325 | + $args = wp_parse_args((array) $params, |
|
326 | 326 | array( |
327 | 327 | 'title' => '', |
328 | 328 | 'post_type' => array(), // NULL for all |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | if ($current_posttype != '' && isset($gd_post_types[$current_posttype])) { |
360 | 360 | if ($is_detail_page) { |
361 | 361 | $is_detail = true; |
362 | - $post_ID = is_object($post) && !empty($post->ID) ? (int)$post->ID : 0; |
|
362 | + $post_ID = is_object($post) && !empty($post->ID) ? (int) $post->ID : 0; |
|
363 | 363 | } else { |
364 | 364 | $is_listing = true; |
365 | 365 | if (is_tax()) { // category page |
@@ -367,7 +367,7 @@ discard block |
||
367 | 367 | $current_taxonomy = get_query_var('taxonomy'); |
368 | 368 | $current_posttype = geodir_get_current_posttype(); |
369 | 369 | |
370 | - if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') { |
|
370 | + if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype.'category') { |
|
371 | 371 | $is_category = true; |
372 | 372 | } |
373 | 373 | } |
@@ -400,15 +400,15 @@ discard block |
||
400 | 400 | $hide_empty = !empty($args['hide_empty']) ? true : false; |
401 | 401 | $max_count = strip_tags($args['max_count']); |
402 | 402 | $all_childs = $max_count == 'all' ? true : false; |
403 | - $max_count = $max_count > 0 ? (int)$max_count : 0; |
|
403 | + $max_count = $max_count > 0 ? (int) $max_count : 0; |
|
404 | 404 | $max_level = strip_tags($args['max_level']); |
405 | 405 | $show_count = !empty($args['show_count']) ? true : false; |
406 | 406 | $hide_icon = !empty($args['hide_icon']) ? true : false; |
407 | 407 | $cpt_left = !empty($args['cpt_left']) ? true : false; |
408 | 408 | |
409 | - if(!$cpt_left){ |
|
409 | + if (!$cpt_left) { |
|
410 | 410 | $cpt_left = "gd-cpt-flat"; |
411 | - }else{ |
|
411 | + } else { |
|
412 | 412 | $cpt_left = ''; |
413 | 413 | } |
414 | 414 | |
@@ -423,7 +423,7 @@ discard block |
||
423 | 423 | if (!empty($post_types)) { |
424 | 424 | foreach ($post_types as $cpt => $cpt_info) { |
425 | 425 | $parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0; |
426 | - $cat_taxonomy = $cpt . 'category'; |
|
426 | + $cat_taxonomy = $cpt.'category'; |
|
427 | 427 | $skip_childs = false; |
428 | 428 | if ($cat_filter && $cpt == $current_posttype && $is_detail && $post_ID) { |
429 | 429 | $skip_childs = true; |
@@ -446,32 +446,32 @@ discard block |
||
446 | 446 | if ($is_listing) { |
447 | 447 | $row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing'; |
448 | 448 | } |
449 | - $cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">'; |
|
449 | + $cpt_row = '<div class="gd-cptcat-row gd-cptcat-'.$cpt.$row_class.' '.$cpt_left.'">'; |
|
450 | 450 | |
451 | 451 | if ($is_category && $cat_filter && $cpt == $current_posttype) { |
452 | 452 | $term_info = get_term($current_term_id, $cat_taxonomy); |
453 | 453 | |
454 | 454 | $term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : ''; |
455 | - $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : ''; |
|
455 | + $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($term_info->name).' icon" src="'.$term_icon_url.'" /> ' : ''; |
|
456 | 456 | |
457 | - $count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : ''; |
|
458 | - $cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>'; |
|
457 | + $count = $show_count ? ' <span class="gd-cptcat-count">('.$term_info->count.')</span>' : ''; |
|
458 | + $cpt_row .= '<h2 class="gd-cptcat-title">'.$term_icon_url.$term_info->name.$count.'</h2>'; |
|
459 | 459 | } else { |
460 | - $cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>'; |
|
460 | + $cpt_row .= '<h2 class="gd-cptcat-title">'.__($cpt_info['labels']['name'], 'geodirectory').'</h2>'; |
|
461 | 461 | } |
462 | 462 | foreach ($categories as $category) { |
463 | 463 | $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : ''; |
464 | - $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : ''; |
|
464 | + $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($category->name).' icon" src="'.$term_icon_url.'" /> ' : ''; |
|
465 | 465 | |
466 | - $term_link = get_term_link( $category, $category->taxonomy ); |
|
466 | + $term_link = get_term_link($category, $category->taxonomy); |
|
467 | 467 | /** Filter documented in geodirectory-functions/general_functions.php **/ |
468 | - $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt ); |
|
468 | + $term_link = apply_filters('geodir_category_term_link', $term_link, $category->term_id, $cpt); |
|
469 | 469 | |
470 | 470 | $cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent '.$cpt_left.'">'; |
471 | 471 | $cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">'; |
472 | - $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : ''; |
|
473 | - $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' .$term_icon_url . $category->name . $count . '</a></h3>'; |
|
474 | - if (!$skip_childs && ($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) { |
|
472 | + $count = $show_count ? ' <span class="gd-cptcat-count">('.$category->count.')</span>' : ''; |
|
473 | + $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="'.esc_url($term_link).'" title="'.esc_attr($category->name).'">'.$term_icon_url.$category->name.$count.'</a></h3>'; |
|
474 | + if (!$skip_childs && ($all_childs || $max_count > 0) && ($max_level == 'all' || (int) $max_level > 0)) { |
|
475 | 475 | $cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons); |
476 | 476 | } |
477 | 477 | $cpt_row .= '</li>'; |
@@ -506,7 +506,7 @@ discard block |
||
506 | 506 | * @return string Html content. |
507 | 507 | */ |
508 | 508 | function geodir_cpt_categories_child_cats($parent_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth = 1) { |
509 | - $cat_taxonomy = $cpt . 'category'; |
|
509 | + $cat_taxonomy = $cpt.'category'; |
|
510 | 510 | |
511 | 511 | $orderby = 'count'; |
512 | 512 | $order = 'DESC'; |
@@ -515,7 +515,7 @@ discard block |
||
515 | 515 | $order = 'ASC'; |
516 | 516 | } |
517 | 517 | |
518 | - if ($max_level != 'all' && $depth > (int)$max_level ) { |
|
518 | + if ($max_level != 'all' && $depth > (int) $max_level) { |
|
519 | 519 | return ''; |
520 | 520 | } |
521 | 521 | |
@@ -532,18 +532,18 @@ discard block |
||
532 | 532 | $child_cats = geodir_sort_terms($child_cats, 'count'); |
533 | 533 | } |
534 | 534 | |
535 | - $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">'; |
|
535 | + $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-'.$depth.'">'; |
|
536 | 536 | $depth++; |
537 | 537 | foreach ($child_cats as $category) { |
538 | 538 | $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : ''; |
539 | - $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : ''; |
|
540 | - $term_link = get_term_link( $category, $category->taxonomy ); |
|
539 | + $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($category->name).' icon" src="'.$term_icon_url.'" /> ' : ''; |
|
540 | + $term_link = get_term_link($category, $category->taxonomy); |
|
541 | 541 | /** Filter documented in geodirectory-functions/general_functions.php **/ |
542 | - $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt ); |
|
543 | - $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : ''; |
|
542 | + $term_link = apply_filters('geodir_category_term_link', $term_link, $category->term_id, $cpt); |
|
543 | + $count = $show_count ? ' <span class="gd-cptcat-count">('.$category->count.')</span>' : ''; |
|
544 | 544 | |
545 | 545 | $content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">'; |
546 | - $content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>'; |
|
546 | + $content .= '<a href="'.esc_url($term_link).'" title="'.esc_attr($category->name).'">'.$term_icon_url.$category->name.$count.'</a></li>'; |
|
547 | 547 | $content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth); |
548 | 548 | } |
549 | 549 | $content .= '</li></ul>'; |
@@ -13,241 +13,241 @@ discard block |
||
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 |
||
298 | 298 | <label for="<?php echo $this->get_field_id('no_cat_filter'); ?>"><?php _e( 'Don\'t filter for current viewing category', 'geodirectory' ); ?></label> |
299 | 299 | </p> |
300 | 300 | <?php |
301 | - } |
|
301 | + } |
|
302 | 302 | } // class geodir_cpt_categories_widget |
303 | 303 | |
304 | 304 | register_widget('geodir_cpt_categories_widget'); |
@@ -316,179 +316,179 @@ discard block |
||
316 | 316 | * @return string CPT categories content. |
317 | 317 | */ |
318 | 318 | function geodir_cpt_categories_output($params) { |
319 | - global $post, $gd_use_query_vars; |
|
319 | + global $post, $gd_use_query_vars; |
|
320 | 320 | |
321 | - $old_gd_use_query_vars = $gd_use_query_vars; |
|
321 | + $old_gd_use_query_vars = $gd_use_query_vars; |
|
322 | 322 | |
323 | - $gd_use_query_vars = geodir_is_page('detail') ? true : false; |
|
323 | + $gd_use_query_vars = geodir_is_page('detail') ? true : false; |
|
324 | 324 | |
325 | - $args = wp_parse_args((array)$params, |
|
326 | - array( |
|
327 | - 'title' => '', |
|
328 | - 'post_type' => array(), // NULL for all |
|
329 | - 'hide_empty' => '', |
|
330 | - 'show_count' => '', |
|
331 | - 'hide_icon' => '', |
|
332 | - 'cpt_left' => '', |
|
333 | - 'sort_by' => 'count', |
|
334 | - 'max_count' => 'all', |
|
335 | - 'max_level' => '1', |
|
336 | - 'no_cpt_filter' => '', |
|
337 | - 'no_cat_filter' => '', |
|
338 | - ) |
|
339 | - ); |
|
340 | - |
|
341 | - $sort_by = isset($args['sort_by']) && in_array($args['sort_by'], array('az', 'count')) ? $args['sort_by'] : 'count'; |
|
342 | - $cpt_filter = empty($args['no_cpt_filter']) ? true : false; |
|
343 | - $cat_filter = empty($args['no_cat_filter']) ? true : false; |
|
344 | - |
|
345 | - $gd_post_types = geodir_get_posttypes('array'); |
|
346 | - |
|
347 | - $post_type_arr = !is_array($args['post_type']) ? explode(',', $args['post_type']) : $args['post_type']; |
|
348 | - $current_posttype = geodir_get_current_posttype(); |
|
349 | - |
|
350 | - $is_listing = false; |
|
351 | - $is_detail = false; |
|
352 | - $is_category = false; |
|
353 | - $post_ID = 0; |
|
354 | - $is_listing_page = geodir_is_page('listing'); |
|
355 | - $is_detail_page = geodir_is_page('detail'); |
|
356 | - if ($is_listing_page || $is_detail_page) { |
|
357 | - $current_posttype = geodir_get_current_posttype(); |
|
358 | - |
|
359 | - if ($current_posttype != '' && isset($gd_post_types[$current_posttype])) { |
|
360 | - if ($is_detail_page) { |
|
361 | - $is_detail = true; |
|
362 | - $post_ID = is_object($post) && !empty($post->ID) ? (int)$post->ID : 0; |
|
363 | - } else { |
|
364 | - $is_listing = true; |
|
365 | - if (is_tax()) { // category page |
|
366 | - $current_term_id = get_queried_object_id(); |
|
367 | - $current_taxonomy = get_query_var('taxonomy'); |
|
368 | - $current_posttype = geodir_get_current_posttype(); |
|
369 | - |
|
370 | - if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') { |
|
371 | - $is_category = true; |
|
372 | - } |
|
373 | - } |
|
374 | - } |
|
375 | - } |
|
376 | - } |
|
377 | - |
|
378 | - $parent_category = 0; |
|
379 | - if (($is_listing || $is_detail) && $cpt_filter) { |
|
380 | - $post_type_arr = array($current_posttype); |
|
381 | - } |
|
382 | - |
|
383 | - $post_types = array(); |
|
384 | - if (!empty($post_type_arr)) { |
|
385 | - if (in_array('0', $post_type_arr)) { |
|
386 | - $post_types = $gd_post_types; |
|
387 | - } else { |
|
388 | - foreach ($post_type_arr as $cpt) { |
|
389 | - if (isset($gd_post_types[$cpt])) { |
|
390 | - $post_types[$cpt] = $gd_post_types[$cpt]; |
|
391 | - } |
|
392 | - } |
|
393 | - } |
|
394 | - } |
|
395 | - |
|
396 | - if (empty($post_type_arr)) { |
|
397 | - $post_types = $gd_post_types; |
|
398 | - } |
|
399 | - |
|
400 | - $hide_empty = !empty($args['hide_empty']) ? true : false; |
|
401 | - $max_count = strip_tags($args['max_count']); |
|
402 | - $all_childs = $max_count == 'all' ? true : false; |
|
403 | - $max_count = $max_count > 0 ? (int)$max_count : 0; |
|
404 | - $max_level = strip_tags($args['max_level']); |
|
405 | - $show_count = !empty($args['show_count']) ? true : false; |
|
406 | - $hide_icon = !empty($args['hide_icon']) ? true : false; |
|
407 | - $cpt_left = !empty($args['cpt_left']) ? true : false; |
|
408 | - |
|
409 | - if(!$cpt_left){ |
|
410 | - $cpt_left = "gd-cpt-flat"; |
|
411 | - }else{ |
|
412 | - $cpt_left = ''; |
|
413 | - } |
|
414 | - |
|
415 | - $orderby = 'count'; |
|
416 | - $order = 'DESC'; |
|
417 | - if ($sort_by == 'az') { |
|
418 | - $orderby = 'name'; |
|
419 | - $order = 'ASC'; |
|
420 | - } |
|
421 | - |
|
422 | - $output = ''; |
|
423 | - if (!empty($post_types)) { |
|
424 | - foreach ($post_types as $cpt => $cpt_info) { |
|
425 | - $parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0; |
|
426 | - $cat_taxonomy = $cpt . 'category'; |
|
427 | - $skip_childs = false; |
|
428 | - if ($cat_filter && $cpt == $current_posttype && $is_detail && $post_ID) { |
|
429 | - $skip_childs = true; |
|
430 | - $categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'object_ids' => $post_ID)); |
|
431 | - } else { |
|
432 | - $categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category)); |
|
433 | - } |
|
434 | - |
|
435 | - if ($hide_empty) { |
|
436 | - $categories = geodir_filter_empty_terms($categories); |
|
437 | - } |
|
438 | - if ($sort_by == 'count') { |
|
439 | - $categories = geodir_sort_terms($categories, 'count'); |
|
440 | - } |
|
325 | + $args = wp_parse_args((array)$params, |
|
326 | + array( |
|
327 | + 'title' => '', |
|
328 | + 'post_type' => array(), // NULL for all |
|
329 | + 'hide_empty' => '', |
|
330 | + 'show_count' => '', |
|
331 | + 'hide_icon' => '', |
|
332 | + 'cpt_left' => '', |
|
333 | + 'sort_by' => 'count', |
|
334 | + 'max_count' => 'all', |
|
335 | + 'max_level' => '1', |
|
336 | + 'no_cpt_filter' => '', |
|
337 | + 'no_cat_filter' => '', |
|
338 | + ) |
|
339 | + ); |
|
340 | + |
|
341 | + $sort_by = isset($args['sort_by']) && in_array($args['sort_by'], array('az', 'count')) ? $args['sort_by'] : 'count'; |
|
342 | + $cpt_filter = empty($args['no_cpt_filter']) ? true : false; |
|
343 | + $cat_filter = empty($args['no_cat_filter']) ? true : false; |
|
344 | + |
|
345 | + $gd_post_types = geodir_get_posttypes('array'); |
|
346 | + |
|
347 | + $post_type_arr = !is_array($args['post_type']) ? explode(',', $args['post_type']) : $args['post_type']; |
|
348 | + $current_posttype = geodir_get_current_posttype(); |
|
349 | + |
|
350 | + $is_listing = false; |
|
351 | + $is_detail = false; |
|
352 | + $is_category = false; |
|
353 | + $post_ID = 0; |
|
354 | + $is_listing_page = geodir_is_page('listing'); |
|
355 | + $is_detail_page = geodir_is_page('detail'); |
|
356 | + if ($is_listing_page || $is_detail_page) { |
|
357 | + $current_posttype = geodir_get_current_posttype(); |
|
358 | + |
|
359 | + if ($current_posttype != '' && isset($gd_post_types[$current_posttype])) { |
|
360 | + if ($is_detail_page) { |
|
361 | + $is_detail = true; |
|
362 | + $post_ID = is_object($post) && !empty($post->ID) ? (int)$post->ID : 0; |
|
363 | + } else { |
|
364 | + $is_listing = true; |
|
365 | + if (is_tax()) { // category page |
|
366 | + $current_term_id = get_queried_object_id(); |
|
367 | + $current_taxonomy = get_query_var('taxonomy'); |
|
368 | + $current_posttype = geodir_get_current_posttype(); |
|
369 | + |
|
370 | + if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') { |
|
371 | + $is_category = true; |
|
372 | + } |
|
373 | + } |
|
374 | + } |
|
375 | + } |
|
376 | + } |
|
377 | + |
|
378 | + $parent_category = 0; |
|
379 | + if (($is_listing || $is_detail) && $cpt_filter) { |
|
380 | + $post_type_arr = array($current_posttype); |
|
381 | + } |
|
382 | + |
|
383 | + $post_types = array(); |
|
384 | + if (!empty($post_type_arr)) { |
|
385 | + if (in_array('0', $post_type_arr)) { |
|
386 | + $post_types = $gd_post_types; |
|
387 | + } else { |
|
388 | + foreach ($post_type_arr as $cpt) { |
|
389 | + if (isset($gd_post_types[$cpt])) { |
|
390 | + $post_types[$cpt] = $gd_post_types[$cpt]; |
|
391 | + } |
|
392 | + } |
|
393 | + } |
|
394 | + } |
|
395 | + |
|
396 | + if (empty($post_type_arr)) { |
|
397 | + $post_types = $gd_post_types; |
|
398 | + } |
|
399 | + |
|
400 | + $hide_empty = !empty($args['hide_empty']) ? true : false; |
|
401 | + $max_count = strip_tags($args['max_count']); |
|
402 | + $all_childs = $max_count == 'all' ? true : false; |
|
403 | + $max_count = $max_count > 0 ? (int)$max_count : 0; |
|
404 | + $max_level = strip_tags($args['max_level']); |
|
405 | + $show_count = !empty($args['show_count']) ? true : false; |
|
406 | + $hide_icon = !empty($args['hide_icon']) ? true : false; |
|
407 | + $cpt_left = !empty($args['cpt_left']) ? true : false; |
|
408 | + |
|
409 | + if(!$cpt_left){ |
|
410 | + $cpt_left = "gd-cpt-flat"; |
|
411 | + }else{ |
|
412 | + $cpt_left = ''; |
|
413 | + } |
|
414 | + |
|
415 | + $orderby = 'count'; |
|
416 | + $order = 'DESC'; |
|
417 | + if ($sort_by == 'az') { |
|
418 | + $orderby = 'name'; |
|
419 | + $order = 'ASC'; |
|
420 | + } |
|
421 | + |
|
422 | + $output = ''; |
|
423 | + if (!empty($post_types)) { |
|
424 | + foreach ($post_types as $cpt => $cpt_info) { |
|
425 | + $parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0; |
|
426 | + $cat_taxonomy = $cpt . 'category'; |
|
427 | + $skip_childs = false; |
|
428 | + if ($cat_filter && $cpt == $current_posttype && $is_detail && $post_ID) { |
|
429 | + $skip_childs = true; |
|
430 | + $categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'object_ids' => $post_ID)); |
|
431 | + } else { |
|
432 | + $categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category)); |
|
433 | + } |
|
434 | + |
|
435 | + if ($hide_empty) { |
|
436 | + $categories = geodir_filter_empty_terms($categories); |
|
437 | + } |
|
438 | + if ($sort_by == 'count') { |
|
439 | + $categories = geodir_sort_terms($categories, 'count'); |
|
440 | + } |
|
441 | 441 | |
442 | - $categories = apply_filters('geodir_custom_sort_cpt_terms', $categories); |
|
443 | - |
|
444 | - if (!empty($categories)) { |
|
445 | - $term_icons = !$hide_icon ? geodir_get_term_icon() : array(); |
|
446 | - $row_class = ''; |
|
447 | - |
|
448 | - if ($is_listing) { |
|
449 | - $row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing'; |
|
450 | - } |
|
451 | - $cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">'; |
|
452 | - |
|
453 | - if ($is_category && $cat_filter && $cpt == $current_posttype) { |
|
454 | - $term_info = get_term($current_term_id, $cat_taxonomy); |
|
455 | - |
|
456 | - $term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : ''; |
|
457 | - $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : ''; |
|
458 | - |
|
459 | - $count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : ''; |
|
460 | - $cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>'; |
|
461 | - } else { |
|
462 | - $cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>'; |
|
463 | - } |
|
464 | - foreach ($categories as $category) { |
|
465 | - $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : ''; |
|
466 | - $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : ''; |
|
467 | - |
|
468 | - $term_link = get_term_link( $category, $category->taxonomy ); |
|
469 | - /** Filter documented in geodirectory-functions/general_functions.php **/ |
|
470 | - $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt ); |
|
471 | - |
|
472 | - $cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent '.$cpt_left.'">'; |
|
473 | - $cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">'; |
|
474 | - $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : ''; |
|
475 | - $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' .$term_icon_url . $category->name . $count . '</a></h3>'; |
|
476 | - if (!$skip_childs && ($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) { |
|
477 | - $cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons); |
|
478 | - } |
|
479 | - $cpt_row .= '</li>'; |
|
480 | - $cpt_row .= '</ul>'; |
|
481 | - } |
|
482 | - $cpt_row .= '</div>'; |
|
483 | - |
|
484 | - $output .= $cpt_row; |
|
485 | - } |
|
486 | - } |
|
487 | - } |
|
442 | + $categories = apply_filters('geodir_custom_sort_cpt_terms', $categories); |
|
443 | + |
|
444 | + if (!empty($categories)) { |
|
445 | + $term_icons = !$hide_icon ? geodir_get_term_icon() : array(); |
|
446 | + $row_class = ''; |
|
447 | + |
|
448 | + if ($is_listing) { |
|
449 | + $row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing'; |
|
450 | + } |
|
451 | + $cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">'; |
|
452 | + |
|
453 | + if ($is_category && $cat_filter && $cpt == $current_posttype) { |
|
454 | + $term_info = get_term($current_term_id, $cat_taxonomy); |
|
455 | + |
|
456 | + $term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : ''; |
|
457 | + $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : ''; |
|
458 | + |
|
459 | + $count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : ''; |
|
460 | + $cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>'; |
|
461 | + } else { |
|
462 | + $cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>'; |
|
463 | + } |
|
464 | + foreach ($categories as $category) { |
|
465 | + $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : ''; |
|
466 | + $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : ''; |
|
467 | + |
|
468 | + $term_link = get_term_link( $category, $category->taxonomy ); |
|
469 | + /** Filter documented in geodirectory-functions/general_functions.php **/ |
|
470 | + $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt ); |
|
471 | + |
|
472 | + $cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent '.$cpt_left.'">'; |
|
473 | + $cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">'; |
|
474 | + $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : ''; |
|
475 | + $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' .$term_icon_url . $category->name . $count . '</a></h3>'; |
|
476 | + if (!$skip_childs && ($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) { |
|
477 | + $cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons); |
|
478 | + } |
|
479 | + $cpt_row .= '</li>'; |
|
480 | + $cpt_row .= '</ul>'; |
|
481 | + } |
|
482 | + $cpt_row .= '</div>'; |
|
483 | + |
|
484 | + $output .= $cpt_row; |
|
485 | + } |
|
486 | + } |
|
487 | + } |
|
488 | 488 | |
489 | - $gd_use_query_vars = $old_gd_use_query_vars; |
|
489 | + $gd_use_query_vars = $old_gd_use_query_vars; |
|
490 | 490 | |
491 | - return $output; |
|
491 | + return $output; |
|
492 | 492 | } |
493 | 493 | |
494 | 494 | /** |
@@ -508,48 +508,48 @@ discard block |
||
508 | 508 | * @return string Html content. |
509 | 509 | */ |
510 | 510 | function geodir_cpt_categories_child_cats($parent_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth = 1) { |
511 | - $cat_taxonomy = $cpt . 'category'; |
|
512 | - |
|
513 | - $orderby = 'count'; |
|
514 | - $order = 'DESC'; |
|
515 | - if ($sort_by == 'az') { |
|
516 | - $orderby = 'name'; |
|
517 | - $order = 'ASC'; |
|
518 | - } |
|
519 | - |
|
520 | - if ($max_level != 'all' && $depth > (int)$max_level ) { |
|
521 | - return ''; |
|
522 | - } |
|
523 | - |
|
524 | - $child_cats = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_id, 'number' => $max_count)); |
|
525 | - if ($hide_empty) { |
|
526 | - $child_cats = geodir_filter_empty_terms($child_cats); |
|
527 | - } |
|
528 | - |
|
529 | - if (empty($child_cats)) { |
|
530 | - return ''; |
|
531 | - } |
|
532 | - |
|
533 | - if ($sort_by == 'count') { |
|
534 | - $child_cats = geodir_sort_terms($child_cats, 'count'); |
|
535 | - } |
|
536 | - |
|
537 | - $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">'; |
|
538 | - $depth++; |
|
539 | - foreach ($child_cats as $category) { |
|
540 | - $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : ''; |
|
541 | - $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : ''; |
|
542 | - $term_link = get_term_link( $category, $category->taxonomy ); |
|
543 | - /** Filter documented in geodirectory-functions/general_functions.php **/ |
|
544 | - $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt ); |
|
545 | - $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : ''; |
|
546 | - |
|
547 | - $content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">'; |
|
548 | - $content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>'; |
|
549 | - $content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth); |
|
550 | - } |
|
551 | - $content .= '</li></ul>'; |
|
552 | - |
|
553 | - return $content; |
|
511 | + $cat_taxonomy = $cpt . 'category'; |
|
512 | + |
|
513 | + $orderby = 'count'; |
|
514 | + $order = 'DESC'; |
|
515 | + if ($sort_by == 'az') { |
|
516 | + $orderby = 'name'; |
|
517 | + $order = 'ASC'; |
|
518 | + } |
|
519 | + |
|
520 | + if ($max_level != 'all' && $depth > (int)$max_level ) { |
|
521 | + return ''; |
|
522 | + } |
|
523 | + |
|
524 | + $child_cats = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_id, 'number' => $max_count)); |
|
525 | + if ($hide_empty) { |
|
526 | + $child_cats = geodir_filter_empty_terms($child_cats); |
|
527 | + } |
|
528 | + |
|
529 | + if (empty($child_cats)) { |
|
530 | + return ''; |
|
531 | + } |
|
532 | + |
|
533 | + if ($sort_by == 'count') { |
|
534 | + $child_cats = geodir_sort_terms($child_cats, 'count'); |
|
535 | + } |
|
536 | + |
|
537 | + $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">'; |
|
538 | + $depth++; |
|
539 | + foreach ($child_cats as $category) { |
|
540 | + $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : ''; |
|
541 | + $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : ''; |
|
542 | + $term_link = get_term_link( $category, $category->taxonomy ); |
|
543 | + /** Filter documented in geodirectory-functions/general_functions.php **/ |
|
544 | + $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt ); |
|
545 | + $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : ''; |
|
546 | + |
|
547 | + $content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">'; |
|
548 | + $content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>'; |
|
549 | + $content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth); |
|
550 | + } |
|
551 | + $content .= '</li></ul>'; |
|
552 | + |
|
553 | + return $content; |
|
554 | 554 | } |
555 | 555 | ?> |
556 | 556 | \ No newline at end of file |
@@ -192,8 +192,9 @@ |
||
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 |
@@ -127,7 +127,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -16,127 +16,127 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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'); |
@@ -23,8 +23,12 @@ |
||
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 | /** |
@@ -32,35 +32,35 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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, |
@@ -6,33 +6,33 @@ discard block |
||
6 | 6 | * @package GeoDirectory |
7 | 7 | */ |
8 | 8 | if (!function_exists('geodir_create_tables')) { |
9 | - /** |
|
10 | - * Creates custom db tables for storing GeoDirectory plugin data. |
|
11 | - * |
|
12 | - * @since 1.0.0 |
|
13 | - * @package GeoDirectory |
|
14 | - * @global object $wpdb WordPress Database object. |
|
15 | - * @global string $plugin_prefix GeoDirectory plugin table prefix. |
|
16 | - */ |
|
17 | - function geodir_create_tables() |
|
18 | - { |
|
19 | - |
|
20 | - global $wpdb, $plugin_prefix; |
|
21 | - |
|
22 | - $wpdb->hide_errors(); |
|
23 | - |
|
24 | - /* |
|
9 | + /** |
|
10 | + * Creates custom db tables for storing GeoDirectory plugin data. |
|
11 | + * |
|
12 | + * @since 1.0.0 |
|
13 | + * @package GeoDirectory |
|
14 | + * @global object $wpdb WordPress Database object. |
|
15 | + * @global string $plugin_prefix GeoDirectory plugin table prefix. |
|
16 | + */ |
|
17 | + function geodir_create_tables() |
|
18 | + { |
|
19 | + |
|
20 | + global $wpdb, $plugin_prefix; |
|
21 | + |
|
22 | + $wpdb->hide_errors(); |
|
23 | + |
|
24 | + /* |
|
25 | 25 | * Indexes have a maximum size of 767 bytes. Historically, we haven't need to be concerned about that. |
26 | 26 | * As of 4.2, however, we moved to utf8mb4, which uses 4 bytes per character. This means that an index which |
27 | 27 | * used to have room for floor(767/3) = 255 characters, now only has room for floor(767/4) = 191 characters. |
28 | 28 | */ |
29 | - $max_index_length = 191; |
|
29 | + $max_index_length = 191; |
|
30 | 30 | |
31 | - $collate = ''; |
|
32 | - if ($wpdb->has_cap('collation')) { |
|
33 | - if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset"; |
|
34 | - if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate"; |
|
35 | - } |
|
31 | + $collate = ''; |
|
32 | + if ($wpdb->has_cap('collation')) { |
|
33 | + if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset"; |
|
34 | + if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate"; |
|
35 | + } |
|
36 | 36 | |
37 | 37 | /** |
38 | 38 | * Include any functions needed for upgrades. |
@@ -43,31 +43,31 @@ discard block |
||
43 | 43 | |
44 | 44 | |
45 | 45 | // rename tables if we need to |
46 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) { |
|
47 | - $wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries"); |
|
48 | - } |
|
49 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) { |
|
50 | - $wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields"); |
|
51 | - } |
|
52 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) { |
|
53 | - $wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon"); |
|
54 | - } |
|
55 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) { |
|
56 | - $wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments"); |
|
57 | - } |
|
58 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) { |
|
59 | - $wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review"); |
|
60 | - } |
|
61 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) { |
|
62 | - $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields"); |
|
63 | - } |
|
64 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) { |
|
65 | - $wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail"); |
|
66 | - } |
|
67 | - |
|
68 | - |
|
69 | - // Table for storing Countries |
|
70 | - $GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " ( |
|
46 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) { |
|
47 | + $wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries"); |
|
48 | + } |
|
49 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) { |
|
50 | + $wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields"); |
|
51 | + } |
|
52 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) { |
|
53 | + $wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon"); |
|
54 | + } |
|
55 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) { |
|
56 | + $wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments"); |
|
57 | + } |
|
58 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) { |
|
59 | + $wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review"); |
|
60 | + } |
|
61 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) { |
|
62 | + $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields"); |
|
63 | + } |
|
64 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) { |
|
65 | + $wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail"); |
|
66 | + } |
|
67 | + |
|
68 | + |
|
69 | + // Table for storing Countries |
|
70 | + $GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " ( |
|
71 | 71 | CountryId smallint AUTO_INCREMENT NOT NULL , |
72 | 72 | Country varchar (50) NOT NULL , |
73 | 73 | FIPS104 varchar (2) NOT NULL , |
@@ -86,21 +86,21 @@ discard block |
||
86 | 86 | Comment varchar (255) NULL , |
87 | 87 | PRIMARY KEY (CountryId)) $collate "; |
88 | 88 | |
89 | - /** |
|
90 | - * Filter the SQL query that creates/updates the country DB table structure. |
|
91 | - * |
|
92 | - * @since 1.0.0 |
|
93 | - * @param string $sql The SQL insert query string. |
|
94 | - */ |
|
95 | - $GEODIR_COUNTRIES_TABLE = apply_filters('geodir_before_country_table_create', $GEODIR_COUNTRIES_TABLE); |
|
96 | - dbDelta($GEODIR_COUNTRIES_TABLE); |
|
89 | + /** |
|
90 | + * Filter the SQL query that creates/updates the country DB table structure. |
|
91 | + * |
|
92 | + * @since 1.0.0 |
|
93 | + * @param string $sql The SQL insert query string. |
|
94 | + */ |
|
95 | + $GEODIR_COUNTRIES_TABLE = apply_filters('geodir_before_country_table_create', $GEODIR_COUNTRIES_TABLE); |
|
96 | + dbDelta($GEODIR_COUNTRIES_TABLE); |
|
97 | 97 | |
98 | 98 | |
99 | - $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . ""); |
|
99 | + $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . ""); |
|
100 | 100 | |
101 | - if ($country_table_empty == 0) { |
|
101 | + if ($country_table_empty == 0) { |
|
102 | 102 | |
103 | - $countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES |
|
103 | + $countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES |
|
104 | 104 | (1, 'Afghanistan', 'AF', 'AF', 'AFG', '4', 'AF', 'Kabul ', 'Asia ', 'Afghan', 'Afghans', 'Afghani ', 'AFA', 26813057, 'Afghanistan', ''), |
105 | 105 | (2, 'Albania', 'AL', 'AL', 'ALB', '8', 'AL', 'Tirana ', 'Europe ', 'Albanian', 'Albanians', 'Lek ', 'ALL', 3510484, 'Albania', ''), |
106 | 106 | (3, 'Algeria', 'AG', 'DZ', 'DZA', '12', 'DZ', 'Algiers ', 'Africa ', 'Algerian', 'Algerians', 'Algerian Dinar ', 'DZD', 31736053, 'Algeria', ''), |
@@ -376,21 +376,21 @@ discard block |
||
376 | 376 | (281, 'South Sudan', '--', 'SS', '-- ', '--', 'SS', '', '', '', '', 'South Sudanese pound', 'SSP', 12340000, 'South Sudan', ''), |
377 | 377 | (282, 'Isle of Man', '--', 'IM', '-- ', '--', 'IM', '', '', '', '', 'Manx pound', 'IMP', 84497, 'Isle of Man', '')"; |
378 | 378 | |
379 | - /** |
|
380 | - * Filter the SQL query that inserts the country DB table data. |
|
381 | - * |
|
382 | - * @since 1.0.0 |
|
383 | - * @param string $sql The SQL insert query string. |
|
384 | - */ |
|
385 | - $countries_insert = apply_filters('geodir_before_country_data_insert', $countries_insert); |
|
386 | - $wpdb->query($countries_insert); |
|
379 | + /** |
|
380 | + * Filter the SQL query that inserts the country DB table data. |
|
381 | + * |
|
382 | + * @since 1.0.0 |
|
383 | + * @param string $sql The SQL insert query string. |
|
384 | + */ |
|
385 | + $countries_insert = apply_filters('geodir_before_country_data_insert', $countries_insert); |
|
386 | + $wpdb->query($countries_insert); |
|
387 | 387 | |
388 | - } |
|
388 | + } |
|
389 | 389 | |
390 | 390 | |
391 | - // Table for storing location attribute - these are user defined |
|
391 | + // Table for storing location attribute - these are user defined |
|
392 | 392 | |
393 | - $icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " ( |
|
393 | + $icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " ( |
|
394 | 394 | id int NOT NULL AUTO_INCREMENT, |
395 | 395 | post_id int( 10 ) NOT NULL, |
396 | 396 | post_title varchar(254) NOT NULL, |
@@ -399,19 +399,19 @@ discard block |
||
399 | 399 | PRIMARY KEY (id) |
400 | 400 | ) $collate "; |
401 | 401 | |
402 | - /** |
|
403 | - * Filter the SQL query that creates/updates the post_icon DB table structure. |
|
404 | - * |
|
405 | - * @since 1.0.0 |
|
406 | - * @param string $sql The SQL insert query string. |
|
407 | - */ |
|
408 | - $icon_table = apply_filters('geodir_before_icon_table_create', $icon_table); |
|
402 | + /** |
|
403 | + * Filter the SQL query that creates/updates the post_icon DB table structure. |
|
404 | + * |
|
405 | + * @since 1.0.0 |
|
406 | + * @param string $sql The SQL insert query string. |
|
407 | + */ |
|
408 | + $icon_table = apply_filters('geodir_before_icon_table_create', $icon_table); |
|
409 | 409 | |
410 | - dbDelta($icon_table); |
|
410 | + dbDelta($icon_table); |
|
411 | 411 | |
412 | - // Table for storing post custom fields - these are user defined |
|
412 | + // Table for storing post custom fields - these are user defined |
|
413 | 413 | |
414 | - $post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " ( |
|
414 | + $post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " ( |
|
415 | 415 | id int(11) NOT NULL AUTO_INCREMENT, |
416 | 416 | post_type varchar(100) NULL, |
417 | 417 | data_type varchar(100) NULL DEFAULT NULL, |
@@ -447,18 +447,18 @@ discard block |
||
447 | 447 | PRIMARY KEY (id) |
448 | 448 | ) $collate"; |
449 | 449 | |
450 | - /** |
|
451 | - * Filter the SQL query that creates/updates the custom_fields DB table structure. |
|
452 | - * |
|
453 | - * @since 1.0.0 |
|
454 | - * @param string $sql The SQL insert query string. |
|
455 | - */ |
|
456 | - $post_custom_fields = apply_filters('geodir_before_custom_field_table_create', $post_custom_fields); |
|
450 | + /** |
|
451 | + * Filter the SQL query that creates/updates the custom_fields DB table structure. |
|
452 | + * |
|
453 | + * @since 1.0.0 |
|
454 | + * @param string $sql The SQL insert query string. |
|
455 | + */ |
|
456 | + $post_custom_fields = apply_filters('geodir_before_custom_field_table_create', $post_custom_fields); |
|
457 | 457 | |
458 | - dbDelta($post_custom_fields); |
|
458 | + dbDelta($post_custom_fields); |
|
459 | 459 | |
460 | - // Table for storing place attribute - these are user defined |
|
461 | - $post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail ( |
|
460 | + // Table for storing place attribute - these are user defined |
|
461 | + $post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail ( |
|
462 | 462 | post_id int(11) NOT NULL, |
463 | 463 | post_title text NULL DEFAULT NULL, |
464 | 464 | post_status varchar(20) NULL DEFAULT NULL, |
@@ -487,22 +487,22 @@ discard block |
||
487 | 487 | KEY is_featured (is_featured) |
488 | 488 | ) $collate "; |
489 | 489 | |
490 | - /** |
|
491 | - * Filter the SQL query that creates/updates the post_detail DB table structure. |
|
492 | - * |
|
493 | - * @since 1.0.0 |
|
494 | - * @param string $sql The SQL insert query string. |
|
495 | - */ |
|
496 | - $post_detail = apply_filters('geodir_before_post_detail_table_create', $post_detail); |
|
490 | + /** |
|
491 | + * Filter the SQL query that creates/updates the post_detail DB table structure. |
|
492 | + * |
|
493 | + * @since 1.0.0 |
|
494 | + * @param string $sql The SQL insert query string. |
|
495 | + */ |
|
496 | + $post_detail = apply_filters('geodir_before_post_detail_table_create', $post_detail); |
|
497 | 497 | |
498 | - dbDelta($post_detail); |
|
498 | + dbDelta($post_detail); |
|
499 | 499 | |
500 | - // alter post_title |
|
501 | - //$wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_gd_place_detail MODIFY `post_title` text NULL"); |
|
500 | + // alter post_title |
|
501 | + //$wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_gd_place_detail MODIFY `post_title` text NULL"); |
|
502 | 502 | |
503 | - // Table for storing place images - these are user defined |
|
503 | + // Table for storing place images - these are user defined |
|
504 | 504 | |
505 | - $attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " ( |
|
505 | + $attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " ( |
|
506 | 506 | ID int(11) NOT NULL AUTO_INCREMENT, |
507 | 507 | post_id int(11) NOT NULL, |
508 | 508 | user_id int(11) DEFAULT NULL, |
@@ -518,18 +518,18 @@ discard block |
||
518 | 518 | PRIMARY KEY (ID) |
519 | 519 | ) $collate "; |
520 | 520 | |
521 | - /** |
|
522 | - * Filter the SQL query that creates/updates the attachments DB table structure. |
|
523 | - * |
|
524 | - * @since 1.0.0 |
|
525 | - * @param string $sql The SQL insert query string. |
|
526 | - */ |
|
527 | - $attechment_table = apply_filters('geodir_before_attachment_table_create', $attechment_table); |
|
521 | + /** |
|
522 | + * Filter the SQL query that creates/updates the attachments DB table structure. |
|
523 | + * |
|
524 | + * @since 1.0.0 |
|
525 | + * @param string $sql The SQL insert query string. |
|
526 | + */ |
|
527 | + $attechment_table = apply_filters('geodir_before_attachment_table_create', $attechment_table); |
|
528 | 528 | |
529 | - dbDelta($attechment_table); |
|
529 | + dbDelta($attechment_table); |
|
530 | 530 | |
531 | 531 | |
532 | - $custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " ( |
|
532 | + $custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " ( |
|
533 | 533 | id int(11) NOT NULL AUTO_INCREMENT, |
534 | 534 | post_type varchar(255) NOT NULL, |
535 | 535 | data_type varchar(255) NOT NULL, |
@@ -547,18 +547,18 @@ discard block |
||
547 | 547 | PRIMARY KEY (id) |
548 | 548 | ) $collate "; |
549 | 549 | |
550 | - /** |
|
551 | - * Filter the SQL query that creates/updates the custom_sort_fields DB table structure. |
|
552 | - * |
|
553 | - * @since 1.0.0 |
|
554 | - * @param string $sql The SQL insert query string. |
|
555 | - */ |
|
556 | - $custom_sort_fields_table = apply_filters('geodir_before_sort_fields_table_create', $custom_sort_fields_table); |
|
550 | + /** |
|
551 | + * Filter the SQL query that creates/updates the custom_sort_fields DB table structure. |
|
552 | + * |
|
553 | + * @since 1.0.0 |
|
554 | + * @param string $sql The SQL insert query string. |
|
555 | + */ |
|
556 | + $custom_sort_fields_table = apply_filters('geodir_before_sort_fields_table_create', $custom_sort_fields_table); |
|
557 | 557 | |
558 | - dbDelta($custom_sort_fields_table); |
|
558 | + dbDelta($custom_sort_fields_table); |
|
559 | 559 | |
560 | 560 | |
561 | - $review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " ( |
|
561 | + $review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " ( |
|
562 | 562 | id int(11) NOT NULL AUTO_INCREMENT, |
563 | 563 | post_id int(11) DEFAULT NULL, |
564 | 564 | post_title varchar( 255 ) NULL DEFAULT NULL, |
@@ -582,51 +582,51 @@ discard block |
||
582 | 582 | PRIMARY KEY (id) |
583 | 583 | ) $collate "; |
584 | 584 | |
585 | - /** |
|
586 | - * Filter the SQL query that creates the review DB table structure. |
|
587 | - * |
|
588 | - * @since 1.0.0 |
|
589 | - * @param string $sql The SQL insert query string. |
|
590 | - */ |
|
591 | - $review_table = apply_filters('geodir_before_review_table_create', $review_table); |
|
592 | - dbDelta($review_table); |
|
585 | + /** |
|
586 | + * Filter the SQL query that creates the review DB table structure. |
|
587 | + * |
|
588 | + * @since 1.0.0 |
|
589 | + * @param string $sql The SQL insert query string. |
|
590 | + */ |
|
591 | + $review_table = apply_filters('geodir_before_review_table_create', $review_table); |
|
592 | + dbDelta($review_table); |
|
593 | 593 | |
594 | 594 | |
595 | 595 | |
596 | - // Alter terms table |
|
597 | - $term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'"); |
|
598 | - if (!$term_icon_column) { |
|
599 | - $wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL"); |
|
600 | - } |
|
596 | + // Alter terms table |
|
597 | + $term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'"); |
|
598 | + if (!$term_icon_column) { |
|
599 | + $wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL"); |
|
600 | + } |
|
601 | 601 | |
602 | - //require_once(geodir_plugin_path() . '/upgrade.php'); |
|
602 | + //require_once(geodir_plugin_path() . '/upgrade.php'); |
|
603 | 603 | |
604 | 604 | |
605 | - } |
|
605 | + } |
|
606 | 606 | } // END MAIN FUNCTION geodir_tables_install |
607 | 607 | |
608 | 608 | if (!function_exists('geodir_create_default_fields')) { |
609 | - /** |
|
610 | - * Inserts default custom fields table data into database. |
|
611 | - * |
|
612 | - * @since 1.0.0 |
|
613 | - * @package GeoDirectory |
|
614 | - */ |
|
615 | - function geodir_create_default_fields() |
|
616 | - { |
|
617 | - |
|
618 | - $fields = geodir_default_custom_fields('gd_place'); |
|
619 | - |
|
620 | - /** |
|
621 | - * Filter the array of default custom fields DB table data. |
|
622 | - * |
|
623 | - * @since 1.0.0 |
|
624 | - * @param string $fields The default custom fields as an array. |
|
625 | - */ |
|
626 | - $fields = apply_filters('geodir_before_default_custom_fields_saved', $fields); |
|
627 | - foreach ($fields as $field_index => $field) { |
|
628 | - geodir_custom_field_save($field); |
|
609 | + /** |
|
610 | + * Inserts default custom fields table data into database. |
|
611 | + * |
|
612 | + * @since 1.0.0 |
|
613 | + * @package GeoDirectory |
|
614 | + */ |
|
615 | + function geodir_create_default_fields() |
|
616 | + { |
|
617 | + |
|
618 | + $fields = geodir_default_custom_fields('gd_place'); |
|
619 | + |
|
620 | + /** |
|
621 | + * Filter the array of default custom fields DB table data. |
|
622 | + * |
|
623 | + * @since 1.0.0 |
|
624 | + * @param string $fields The default custom fields as an array. |
|
625 | + */ |
|
626 | + $fields = apply_filters('geodir_before_default_custom_fields_saved', $fields); |
|
627 | + foreach ($fields as $field_index => $field) { |
|
628 | + geodir_custom_field_save($field); |
|
629 | 629 | |
630 | - } |
|
631 | - } |
|
630 | + } |
|
631 | + } |
|
632 | 632 | } |
633 | 633 | \ No newline at end of file |
@@ -16,184 +16,184 @@ |
||
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 |
@@ -126,8 +126,10 @@ |
||
126 | 126 | $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>"; |
127 | 127 | if (preg_match_all("/$regexp/siU", $crums, $matches)) { |
128 | 128 | return $matches[0]; |
129 | - } else return ''; |
|
130 | -} |
|
129 | + } else { |
|
130 | + return ''; |
|
131 | + } |
|
132 | + } |
|
131 | 133 | |
132 | 134 | |
133 | 135 | /** |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | foreach ($bits as $bit) { |
187 | 187 | $pieces .= $bit; |
188 | 188 | } |
189 | - $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>"; |
|
189 | + $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">'.$pieces."</div>"; |
|
190 | 190 | if (isset($last) && $last) { |
191 | 191 | $items['last'] = $last; |
192 | 192 | } |
@@ -197,9 +197,9 @@ discard block |
||
197 | 197 | |
198 | 198 | } |
199 | 199 | |
200 | -add_filter('geodir_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1); |
|
201 | -add_filter('geodir_location_switcher_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1); |
|
202 | -function gd_multinews_mobile_menu_caret($html){ |
|
200 | +add_filter('geodir_menu_after_sub_ul', 'gd_multinews_mobile_menu_caret', 10, 1); |
|
201 | +add_filter('geodir_location_switcher_menu_after_sub_ul', 'gd_multinews_mobile_menu_caret', 10, 1); |
|
202 | +function gd_multinews_mobile_menu_caret($html) { |
|
203 | 203 | $html .= '<i class="responsive-caret"></i>'; |
204 | 204 | return $html; |
205 | 205 |
@@ -16,36 +16,36 @@ discard block |
||
16 | 16 | */ |
17 | 17 | function multi_news_action_calls() |
18 | 18 | { |
19 | - // REMOVE BREADCRUMB |
|
20 | - remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
21 | - remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
22 | - remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
23 | - remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
24 | - remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
25 | - remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
26 | - |
|
27 | - //ADD BREADCRUMS |
|
28 | - add_action('geodir_detail_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
29 | - add_action('geodir_listings_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
30 | - add_action('geodir_author_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
31 | - add_action('geodir_search_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
32 | - //add_action('geodir_home_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
33 | - add_action('geodir_location_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
34 | - |
|
35 | - |
|
36 | - // fix breadcrums |
|
37 | - add_filter('breadcrumbs_plus_items', 'gd_breadcrumbs_plus_items', 1); |
|
38 | - |
|
39 | - // REMOVE PAGE TITLES |
|
40 | - remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
41 | - // remove_action( 'geodir_add_listing_page_title', 'geodir_action_add_listing_page_title',10); |
|
42 | - remove_action('geodir_details_main_content', 'geodir_action_page_title', 20); |
|
43 | - remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
44 | - remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
45 | - |
|
46 | - |
|
47 | - add_action('geodir_wrapper_content_open', 'gd_mn_extra_wrap', 30, 1); |
|
48 | - add_action('geodir_wrapper_content_close', 'gd_mn_extra_wrap_end', 3, 1); |
|
19 | + // REMOVE BREADCRUMB |
|
20 | + remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
21 | + remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
22 | + remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
23 | + remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
24 | + remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
25 | + remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
26 | + |
|
27 | + //ADD BREADCRUMS |
|
28 | + add_action('geodir_detail_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
29 | + add_action('geodir_listings_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
30 | + add_action('geodir_author_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
31 | + add_action('geodir_search_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
32 | + //add_action('geodir_home_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
33 | + add_action('geodir_location_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
34 | + |
|
35 | + |
|
36 | + // fix breadcrums |
|
37 | + add_filter('breadcrumbs_plus_items', 'gd_breadcrumbs_plus_items', 1); |
|
38 | + |
|
39 | + // REMOVE PAGE TITLES |
|
40 | + remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
41 | + // remove_action( 'geodir_add_listing_page_title', 'geodir_action_add_listing_page_title',10); |
|
42 | + remove_action('geodir_details_main_content', 'geodir_action_page_title', 20); |
|
43 | + remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
44 | + remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
45 | + |
|
46 | + |
|
47 | + add_action('geodir_wrapper_content_open', 'gd_mn_extra_wrap', 30, 1); |
|
48 | + add_action('geodir_wrapper_content_close', 'gd_mn_extra_wrap_end', 3, 1); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
@@ -57,11 +57,11 @@ discard block |
||
57 | 57 | */ |
58 | 58 | function gd_mn_extra_wrap($page) |
59 | 59 | { |
60 | - if ($page == 'add-listing-page') { |
|
61 | - echo '<div class="site-content page-wrap">'; |
|
62 | - } elseif ($page == 'signup-page') { |
|
63 | - echo '</div><div class="section full-width-section" style="float: left;width:100%;">'; |
|
64 | - } |
|
60 | + if ($page == 'add-listing-page') { |
|
61 | + echo '<div class="site-content page-wrap">'; |
|
62 | + } elseif ($page == 'signup-page') { |
|
63 | + echo '</div><div class="section full-width-section" style="float: left;width:100%;">'; |
|
64 | + } |
|
65 | 65 | |
66 | 66 | } |
67 | 67 | |
@@ -75,9 +75,9 @@ discard block |
||
75 | 75 | */ |
76 | 76 | function gd_mn_extra_wrap_end($page) |
77 | 77 | { |
78 | - if ($page == 'add-listing-page') { |
|
79 | - echo '</div>'; |
|
80 | - } |
|
78 | + if ($page == 'add-listing-page') { |
|
79 | + echo '</div>'; |
|
80 | + } |
|
81 | 81 | |
82 | 82 | } |
83 | 83 | |
@@ -91,13 +91,13 @@ discard block |
||
91 | 91 | function gd_mn_replace_breadcrums() |
92 | 92 | { |
93 | 93 | |
94 | - if (mom_option('breadcrumb') != 0) { ?> |
|
94 | + if (mom_option('breadcrumb') != 0) { ?> |
|
95 | 95 | <?php if (mom_option('cats_bread')) { |
96 | - $cclass = ''; |
|
97 | - if (mom_option('cat_slider') == false) { |
|
98 | - $cclass = 'post-crumbs '; |
|
99 | - } |
|
100 | - ?> |
|
96 | + $cclass = ''; |
|
97 | + if (mom_option('cat_slider') == false) { |
|
98 | + $cclass = 'post-crumbs '; |
|
99 | + } |
|
100 | + ?> |
|
101 | 101 | <div class="<?php echo $cclass; ?>entry-crumbs" xmlns:v="http://rdf.data-vocabulary.org/#"> |
102 | 102 | |
103 | 103 | <?php mom_breadcrumb(); ?> |
@@ -119,14 +119,14 @@ discard block |
||
119 | 119 | */ |
120 | 120 | function gd_get_breadcrum_links() |
121 | 121 | { |
122 | - ob_start(); |
|
123 | - geodir_breadcrumb(); |
|
124 | - $crums = ob_get_contents(); |
|
125 | - ob_get_clean(); |
|
126 | - $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>"; |
|
127 | - if (preg_match_all("/$regexp/siU", $crums, $matches)) { |
|
128 | - return $matches[0]; |
|
129 | - } else return ''; |
|
122 | + ob_start(); |
|
123 | + geodir_breadcrumb(); |
|
124 | + $crums = ob_get_contents(); |
|
125 | + ob_get_clean(); |
|
126 | + $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>"; |
|
127 | + if (preg_match_all("/$regexp/siU", $crums, $matches)) { |
|
128 | + return $matches[0]; |
|
129 | + } else return ''; |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | |
@@ -140,30 +140,30 @@ discard block |
||
140 | 140 | */ |
141 | 141 | function gd_breadcrumbs_plus_items($items) |
142 | 142 | { //print_r($items);exit; |
143 | - $bits = array(); |
|
144 | - $pieces = gd_get_breadcrum_links(); |
|
145 | - //unset($pieces[0]); |
|
146 | - $bits = $pieces; |
|
143 | + $bits = array(); |
|
144 | + $pieces = gd_get_breadcrum_links(); |
|
145 | + //unset($pieces[0]); |
|
146 | + $bits = $pieces; |
|
147 | 147 | |
148 | - $title = $items['last']; |
|
149 | - if (is_page_geodir_home() || geodir_is_page('location') || geodir_is_page('home')) { |
|
148 | + $title = $items['last']; |
|
149 | + if (is_page_geodir_home() || geodir_is_page('location') || geodir_is_page('home')) { |
|
150 | 150 | |
151 | - } elseif (geodir_is_page('listing')) { |
|
151 | + } elseif (geodir_is_page('listing')) { |
|
152 | 152 | |
153 | - } elseif (geodir_is_page('detail')) { |
|
154 | - ob_start(); |
|
155 | - geodir_action_page_title(); |
|
156 | - $title = ob_get_contents(); |
|
157 | - ob_end_clean(); |
|
158 | - } elseif (geodir_is_page('search')) { |
|
159 | - } elseif (geodir_is_page('author')) { |
|
160 | - } |
|
153 | + } elseif (geodir_is_page('detail')) { |
|
154 | + ob_start(); |
|
155 | + geodir_action_page_title(); |
|
156 | + $title = ob_get_contents(); |
|
157 | + ob_end_clean(); |
|
158 | + } elseif (geodir_is_page('search')) { |
|
159 | + } elseif (geodir_is_page('author')) { |
|
160 | + } |
|
161 | 161 | |
162 | - $title = strip_tags($title); |
|
163 | - $items = gd_breadcrumbs_plus_items_add($items, $bits, $title); |
|
162 | + $title = strip_tags($title); |
|
163 | + $items = gd_breadcrumbs_plus_items_add($items, $bits, $title); |
|
164 | 164 | |
165 | 165 | |
166 | - return $items; |
|
166 | + return $items; |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | |
@@ -179,28 +179,28 @@ discard block |
||
179 | 179 | */ |
180 | 180 | function gd_breadcrumbs_plus_items_add($items, $bits, $last) |
181 | 181 | { |
182 | - //$pieces = explode("</div>", $items[0]); |
|
183 | - if (is_array($bits)) { |
|
184 | - $items = array(); |
|
185 | - $pieces = ''; |
|
186 | - foreach ($bits as $bit) { |
|
187 | - $pieces .= $bit; |
|
188 | - } |
|
189 | - $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>"; |
|
190 | - if (isset($last) && $last) { |
|
191 | - $items['last'] = $last; |
|
192 | - } |
|
193 | - } |
|
194 | - |
|
195 | - //print_r($items); |
|
196 | - return $items; |
|
182 | + //$pieces = explode("</div>", $items[0]); |
|
183 | + if (is_array($bits)) { |
|
184 | + $items = array(); |
|
185 | + $pieces = ''; |
|
186 | + foreach ($bits as $bit) { |
|
187 | + $pieces .= $bit; |
|
188 | + } |
|
189 | + $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>"; |
|
190 | + if (isset($last) && $last) { |
|
191 | + $items['last'] = $last; |
|
192 | + } |
|
193 | + } |
|
194 | + |
|
195 | + //print_r($items); |
|
196 | + return $items; |
|
197 | 197 | |
198 | 198 | } |
199 | 199 | |
200 | 200 | add_filter('geodir_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1); |
201 | 201 | add_filter('geodir_location_switcher_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1); |
202 | 202 | function gd_multinews_mobile_menu_caret($html){ |
203 | - $html .= '<i class="responsive-caret"></i>'; |
|
204 | - return $html; |
|
203 | + $html .= '<i class="responsive-caret"></i>'; |
|
204 | + return $html; |
|
205 | 205 | |
206 | 206 | } |