@@ -13,134 +13,134 @@ discard block |
||
13 | 13 | * @package GeoDirectory |
14 | 14 | */ |
15 | 15 | function geodir_deactivation() { |
16 | - // Update installed variable |
|
17 | - update_option("geodir_installed", 0); |
|
16 | + // Update installed variable |
|
17 | + update_option("geodir_installed", 0); |
|
18 | 18 | |
19 | - // Remove rewrite rules and then recreate rewrite rules. |
|
20 | - flush_rewrite_rules(); |
|
19 | + // Remove rewrite rules and then recreate rewrite rules. |
|
20 | + flush_rewrite_rules(); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | if (!function_exists('geodir_admin_styles')) { |
24 | - /** |
|
25 | - * Enqueue Admin Styles. |
|
26 | - * |
|
27 | - * @since 1.0.0 |
|
28 | - * @package GeoDirectory |
|
29 | - */ |
|
30 | - function geodir_admin_styles() { |
|
31 | - wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION); |
|
32 | - wp_enqueue_style('geodirectory-admin-css'); |
|
24 | + /** |
|
25 | + * Enqueue Admin Styles. |
|
26 | + * |
|
27 | + * @since 1.0.0 |
|
28 | + * @package GeoDirectory |
|
29 | + */ |
|
30 | + function geodir_admin_styles() { |
|
31 | + wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION); |
|
32 | + wp_enqueue_style('geodirectory-admin-css'); |
|
33 | 33 | |
34 | - wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION); |
|
35 | - wp_enqueue_style('geodirectory-frontend-style'); |
|
34 | + wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION); |
|
35 | + wp_enqueue_style('geodirectory-frontend-style'); |
|
36 | 36 | |
37 | - wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION); |
|
38 | - wp_enqueue_style('geodir-chosen-style'); |
|
37 | + wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION); |
|
38 | + wp_enqueue_style('geodir-chosen-style'); |
|
39 | 39 | |
40 | - wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION); |
|
41 | - wp_enqueue_style('geodirectory-jquery-ui-timepicker-css'); |
|
40 | + wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION); |
|
41 | + wp_enqueue_style('geodirectory-jquery-ui-timepicker-css'); |
|
42 | 42 | |
43 | - wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION); |
|
44 | - wp_enqueue_style('geodirectory-jquery-ui-css'); |
|
43 | + wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION); |
|
44 | + wp_enqueue_style('geodirectory-jquery-ui-css'); |
|
45 | 45 | |
46 | - wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION); |
|
47 | - wp_enqueue_style('geodirectory-custom-fields-css'); |
|
46 | + wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION); |
|
47 | + wp_enqueue_style('geodirectory-custom-fields-css'); |
|
48 | 48 | |
49 | - wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION); |
|
50 | - wp_enqueue_style('geodirectory-pluplodar-css'); |
|
49 | + wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION); |
|
50 | + wp_enqueue_style('geodirectory-pluplodar-css'); |
|
51 | 51 | |
52 | - wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION); |
|
53 | - wp_enqueue_style('geodir-rating-style'); |
|
52 | + wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION); |
|
53 | + wp_enqueue_style('geodir-rating-style'); |
|
54 | 54 | |
55 | - wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION); |
|
56 | - wp_enqueue_style('geodir-rtl-style'); |
|
57 | - } |
|
55 | + wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION); |
|
56 | + wp_enqueue_style('geodir-rtl-style'); |
|
57 | + } |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | if (!function_exists('geodir_admin_styles_req')) { |
61 | - /** |
|
62 | - * Loads stylesheets from CDN. |
|
63 | - * |
|
64 | - * @since 1.0.0 |
|
65 | - * @package GeoDirectory |
|
66 | - */ |
|
67 | - function geodir_admin_styles_req() |
|
68 | - { |
|
61 | + /** |
|
62 | + * Loads stylesheets from CDN. |
|
63 | + * |
|
64 | + * @since 1.0.0 |
|
65 | + * @package GeoDirectory |
|
66 | + */ |
|
67 | + function geodir_admin_styles_req() |
|
68 | + { |
|
69 | 69 | |
70 | 70 | // wp_register_script('font-awesome', 'https://use.fontawesome.com/releases/v5.5.0/js/all.js#faload', array('font-awesome-shim'), GEODIRECTORY_VERSION); |
71 | 71 | // wp_register_script('font-awesome-shim', 'https://use.fontawesome.com/releases/v5.5.0/js/v4-shims.js', array(), GEODIRECTORY_VERSION); |
72 | 72 | // wp_enqueue_script( 'font-awesome' ); |
73 | 73 | |
74 | - wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION); |
|
75 | - wp_enqueue_script('geodirectory-admin'); |
|
74 | + wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION); |
|
75 | + wp_enqueue_script('geodirectory-admin'); |
|
76 | 76 | |
77 | - } |
|
77 | + } |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | if (!function_exists('geodir_admin_scripts')) { |
81 | - /** |
|
82 | - * Enqueue Admin Scripts. |
|
83 | - * |
|
84 | - * @since 1.0.0 |
|
85 | - * @package GeoDirectory |
|
86 | - */ |
|
87 | - function geodir_admin_scripts() |
|
88 | - { |
|
89 | - $geodir_map_name = geodir_map_name(); |
|
81 | + /** |
|
82 | + * Enqueue Admin Scripts. |
|
83 | + * |
|
84 | + * @since 1.0.0 |
|
85 | + * @package GeoDirectory |
|
86 | + */ |
|
87 | + function geodir_admin_scripts() |
|
88 | + { |
|
89 | + $geodir_map_name = geodir_map_name(); |
|
90 | 90 | |
91 | - wp_enqueue_script('jquery'); |
|
91 | + wp_enqueue_script('jquery'); |
|
92 | 92 | |
93 | - wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true); |
|
93 | + wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true); |
|
94 | 94 | |
95 | - wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION); |
|
96 | - wp_enqueue_script('chosen'); |
|
95 | + wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION); |
|
96 | + wp_enqueue_script('chosen'); |
|
97 | 97 | |
98 | - wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION); |
|
99 | - wp_enqueue_script('geodirectory-choose-ajax'); |
|
98 | + wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION); |
|
99 | + wp_enqueue_script('geodirectory-choose-ajax'); |
|
100 | 100 | |
101 | - if (isset($_REQUEST['listing_type'])) { |
|
102 | - wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION); |
|
103 | - } |
|
101 | + if (isset($_REQUEST['listing_type'])) { |
|
102 | + wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION); |
|
103 | + } |
|
104 | 104 | |
105 | - wp_enqueue_script('geodirectory-custom-fields-script'); |
|
106 | - $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions'; |
|
105 | + wp_enqueue_script('geodirectory-custom-fields-script'); |
|
106 | + $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions'; |
|
107 | 107 | |
108 | - wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true); |
|
108 | + wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true); |
|
109 | 109 | |
110 | - if (in_array($geodir_map_name, array('auto', 'google'))) { |
|
111 | - $map_lang = "&language=" . geodir_get_map_default_language(); |
|
112 | - $map_key = "&key=" . geodir_get_map_api_key(); |
|
113 | - /** This filter is documented in geodirectory_template_tags.php */ |
|
114 | - $map_extra = apply_filters('geodir_googlemap_script_extra', ''); |
|
115 | - wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL); |
|
110 | + if (in_array($geodir_map_name, array('auto', 'google'))) { |
|
111 | + $map_lang = "&language=" . geodir_get_map_default_language(); |
|
112 | + $map_key = "&key=" . geodir_get_map_api_key(); |
|
113 | + /** This filter is documented in geodirectory_template_tags.php */ |
|
114 | + $map_extra = apply_filters('geodir_googlemap_script_extra', ''); |
|
115 | + wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL); |
|
116 | 116 | |
117 | - // Overlapping Marker Spiderfier |
|
118 | - wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION); |
|
119 | - wp_enqueue_script('geodirectory-g-overlappingmarker-script'); |
|
120 | - } |
|
117 | + // Overlapping Marker Spiderfier |
|
118 | + wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION); |
|
119 | + wp_enqueue_script('geodirectory-g-overlappingmarker-script'); |
|
120 | + } |
|
121 | 121 | |
122 | - if ($geodir_map_name == 'osm') { |
|
123 | - // Leaflet OpenStreetMap |
|
124 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION); |
|
125 | - wp_enqueue_style('geodirectory-leaflet-style'); |
|
122 | + if ($geodir_map_name == 'osm') { |
|
123 | + // Leaflet OpenStreetMap |
|
124 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION); |
|
125 | + wp_enqueue_style('geodirectory-leaflet-style'); |
|
126 | 126 | |
127 | - wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION); |
|
128 | - wp_enqueue_script('geodirectory-leaflet-script'); |
|
127 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION); |
|
128 | + wp_enqueue_script('geodirectory-leaflet-script'); |
|
129 | 129 | |
130 | - wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION); |
|
131 | - wp_enqueue_script('geodirectory-leaflet-geo-script'); |
|
130 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION); |
|
131 | + wp_enqueue_script('geodirectory-leaflet-geo-script'); |
|
132 | 132 | |
133 | - // Overlapping Marker Spiderfier Leaflet |
|
134 | - wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION); |
|
135 | - wp_enqueue_script('geodirectory-o-overlappingmarker-script'); |
|
136 | - } |
|
137 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
133 | + // Overlapping Marker Spiderfier Leaflet |
|
134 | + wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION); |
|
135 | + wp_enqueue_script('geodirectory-o-overlappingmarker-script'); |
|
136 | + } |
|
137 | + wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
138 | 138 | |
139 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true); |
|
140 | - wp_enqueue_script('geodirectory-goMap-script'); |
|
139 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true); |
|
140 | + wp_enqueue_script('geodirectory-goMap-script'); |
|
141 | 141 | |
142 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION); |
|
143 | - wp_enqueue_script('geodirectory-goMap-script'); |
|
142 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION); |
|
143 | + wp_enqueue_script('geodirectory-goMap-script'); |
|
144 | 144 | |
145 | 145 | // font awesome rating script |
146 | 146 | if (get_option('geodir_reviewrating_enable_font_awesome')) { |
@@ -151,167 +151,167 @@ discard block |
||
151 | 151 | wp_enqueue_script('geodir-jRating-js'); |
152 | 152 | } |
153 | 153 | |
154 | - wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION); |
|
155 | - wp_enqueue_script('geodir-on-document-load'); |
|
156 | - |
|
157 | - |
|
158 | - // SCRIPT FOR UPLOAD |
|
159 | - wp_enqueue_script('plupload-all'); |
|
160 | - wp_enqueue_script('jquery-ui-sortable'); |
|
161 | - |
|
162 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION); |
|
163 | - wp_enqueue_script('geodirectory-plupload-script'); |
|
164 | - |
|
165 | - // SCRIPT FOR UPLOAD END |
|
166 | - |
|
167 | - |
|
168 | - // place js config array for plupload |
|
169 | - $plupload_init = array( |
|
170 | - 'runtimes' => 'html5,silverlight,html4', |
|
171 | - 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
172 | - 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
173 | - 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
174 | - 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
175 | - 'multiple_queues' => true, |
|
176 | - 'max_file_size' => geodir_max_upload_size(), |
|
177 | - 'url' => admin_url('admin-ajax.php'), |
|
178 | - 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'), |
|
179 | - 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'), |
|
180 | - 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')), |
|
181 | - 'multipart' => true, |
|
182 | - 'urlstream_upload' => true, |
|
183 | - 'multi_selection' => false, // will be added per uploader |
|
184 | - // additional post data to send to our ajax hook |
|
185 | - 'multipart_params' => array( |
|
186 | - '_ajax_nonce' => "", // will be added per uploader |
|
187 | - 'action' => 'plupload_action', // the ajax action name |
|
188 | - 'imgid' => 0 // will be added per uploader |
|
189 | - ) |
|
190 | - ); |
|
191 | - $base_plupload_config = json_encode($plupload_init); |
|
192 | - |
|
193 | - |
|
194 | - $thumb_img_arr = array(); |
|
195 | - |
|
196 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
197 | - $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
198 | - |
|
199 | - $totImg = ''; |
|
200 | - $image_limit = ''; |
|
201 | - if (!empty($thumb_img_arr)) { |
|
202 | - $totImg = count($thumb_img_arr); |
|
203 | - } |
|
154 | + wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION); |
|
155 | + wp_enqueue_script('geodir-on-document-load'); |
|
156 | + |
|
157 | + |
|
158 | + // SCRIPT FOR UPLOAD |
|
159 | + wp_enqueue_script('plupload-all'); |
|
160 | + wp_enqueue_script('jquery-ui-sortable'); |
|
161 | + |
|
162 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION); |
|
163 | + wp_enqueue_script('geodirectory-plupload-script'); |
|
164 | + |
|
165 | + // SCRIPT FOR UPLOAD END |
|
166 | + |
|
167 | + |
|
168 | + // place js config array for plupload |
|
169 | + $plupload_init = array( |
|
170 | + 'runtimes' => 'html5,silverlight,html4', |
|
171 | + 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
172 | + 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
173 | + 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
174 | + 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
175 | + 'multiple_queues' => true, |
|
176 | + 'max_file_size' => geodir_max_upload_size(), |
|
177 | + 'url' => admin_url('admin-ajax.php'), |
|
178 | + 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'), |
|
179 | + 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'), |
|
180 | + 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')), |
|
181 | + 'multipart' => true, |
|
182 | + 'urlstream_upload' => true, |
|
183 | + 'multi_selection' => false, // will be added per uploader |
|
184 | + // additional post data to send to our ajax hook |
|
185 | + 'multipart_params' => array( |
|
186 | + '_ajax_nonce' => "", // will be added per uploader |
|
187 | + 'action' => 'plupload_action', // the ajax action name |
|
188 | + 'imgid' => 0 // will be added per uploader |
|
189 | + ) |
|
190 | + ); |
|
191 | + $base_plupload_config = json_encode($plupload_init); |
|
192 | + |
|
193 | + |
|
194 | + $thumb_img_arr = array(); |
|
195 | + |
|
196 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
197 | + $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
198 | + |
|
199 | + $totImg = ''; |
|
200 | + $image_limit = ''; |
|
201 | + if (!empty($thumb_img_arr)) { |
|
202 | + $totImg = count($thumb_img_arr); |
|
203 | + } |
|
204 | 204 | |
205 | - $gd_plupload_init = array('base_plupload_config' => $base_plupload_config, |
|
206 | - 'totalImg' => $totImg, |
|
207 | - 'image_limit' => $image_limit, |
|
208 | - 'upload_img_size' => geodir_max_upload_size()); |
|
205 | + $gd_plupload_init = array('base_plupload_config' => $base_plupload_config, |
|
206 | + 'totalImg' => $totImg, |
|
207 | + 'image_limit' => $image_limit, |
|
208 | + 'upload_img_size' => geodir_max_upload_size()); |
|
209 | 209 | |
210 | - wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init); |
|
210 | + wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init); |
|
211 | 211 | |
212 | - $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php'))); |
|
213 | - wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data); |
|
212 | + $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php'))); |
|
213 | + wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data); |
|
214 | 214 | |
215 | 215 | |
216 | - wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION); |
|
217 | - wp_enqueue_script('geodirectory-admin-script'); |
|
216 | + wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION); |
|
217 | + wp_enqueue_script('geodirectory-admin-script'); |
|
218 | 218 | |
219 | - wp_enqueue_style('farbtastic'); |
|
220 | - wp_enqueue_script('farbtastic'); |
|
219 | + wp_enqueue_style('farbtastic'); |
|
220 | + wp_enqueue_script('farbtastic'); |
|
221 | 221 | |
222 | - $screen = get_current_screen(); |
|
223 | - if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) { |
|
224 | - wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js'); |
|
225 | - } |
|
222 | + $screen = get_current_screen(); |
|
223 | + if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) { |
|
224 | + wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js'); |
|
225 | + } |
|
226 | 226 | |
227 | - $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true'))); |
|
228 | - wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data); |
|
227 | + $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true'))); |
|
228 | + wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data); |
|
229 | 229 | |
230 | - } |
|
230 | + } |
|
231 | 231 | } |
232 | 232 | |
233 | 233 | if (!function_exists('geodir_admin_menu')) { |
234 | - /** |
|
235 | - * Admin Menus |
|
236 | - * |
|
237 | - * Sets up the admin menus in wordpress. |
|
238 | - * |
|
239 | - * @since 1.0.0 |
|
240 | - * @package GeoDirectory |
|
241 | - * @global array $menu Menu array. |
|
242 | - * @global object $geodirectory GeoDirectory plugin object. |
|
243 | - */ |
|
244 | - function geodir_admin_menu() |
|
245 | - { |
|
246 | - global $menu, $geodirectory; |
|
234 | + /** |
|
235 | + * Admin Menus |
|
236 | + * |
|
237 | + * Sets up the admin menus in wordpress. |
|
238 | + * |
|
239 | + * @since 1.0.0 |
|
240 | + * @package GeoDirectory |
|
241 | + * @global array $menu Menu array. |
|
242 | + * @global object $geodirectory GeoDirectory plugin object. |
|
243 | + */ |
|
244 | + function geodir_admin_menu() |
|
245 | + { |
|
246 | + global $menu, $geodirectory; |
|
247 | 247 | |
248 | - if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory'); |
|
248 | + if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory'); |
|
249 | 249 | |
250 | - add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984'); |
|
250 | + add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984'); |
|
251 | 251 | |
252 | 252 | |
253 | - } |
|
253 | + } |
|
254 | 254 | } |
255 | 255 | |
256 | 256 | if (!function_exists('geodir_admin_menu_order')) { |
257 | - /** |
|
258 | - * Order admin menus. |
|
259 | - * |
|
260 | - * @since 1.0.0 |
|
261 | - * @package GeoDirectory |
|
262 | - * @param array $menu_order Menu order array. |
|
263 | - * @return array Modified menu order array. |
|
264 | - */ |
|
265 | - function geodir_admin_menu_order($menu_order) |
|
266 | - { |
|
267 | - |
|
268 | - // Initialize our custom order array |
|
269 | - $geodir_menu_order = array(); |
|
270 | - |
|
271 | - // Get the index of our custom separator |
|
272 | - $geodir_separator = array_search('separator-geodirectory', $menu_order); |
|
273 | - |
|
274 | - // Get index of posttype menu |
|
275 | - $post_types = geodir_get_posttypes(); |
|
276 | - |
|
277 | - // Loop through menu order and do some rearranging |
|
278 | - foreach ($menu_order as $index => $item) : |
|
279 | - |
|
280 | - if ((('geodirectory') == $item)) : |
|
281 | - $geodir_menu_order[] = 'separator-geodirectory'; |
|
282 | - if (!empty($post_types)) { |
|
283 | - foreach ($post_types as $post_type) { |
|
284 | - $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
285 | - } |
|
286 | - } |
|
287 | - $geodir_menu_order[] = $item; |
|
257 | + /** |
|
258 | + * Order admin menus. |
|
259 | + * |
|
260 | + * @since 1.0.0 |
|
261 | + * @package GeoDirectory |
|
262 | + * @param array $menu_order Menu order array. |
|
263 | + * @return array Modified menu order array. |
|
264 | + */ |
|
265 | + function geodir_admin_menu_order($menu_order) |
|
266 | + { |
|
288 | 267 | |
289 | - unset($menu_order[$geodir_separator]); |
|
290 | - //unset( $menu_order[$geodir_places] ); |
|
291 | - elseif (!in_array($item, array('separator-geodirectory'))) : |
|
292 | - $geodir_menu_order[] = $item; |
|
293 | - endif; |
|
268 | + // Initialize our custom order array |
|
269 | + $geodir_menu_order = array(); |
|
294 | 270 | |
295 | - endforeach; |
|
271 | + // Get the index of our custom separator |
|
272 | + $geodir_separator = array_search('separator-geodirectory', $menu_order); |
|
296 | 273 | |
297 | - // Return order |
|
298 | - return $geodir_menu_order; |
|
299 | - } |
|
274 | + // Get index of posttype menu |
|
275 | + $post_types = geodir_get_posttypes(); |
|
276 | + |
|
277 | + // Loop through menu order and do some rearranging |
|
278 | + foreach ($menu_order as $index => $item) : |
|
279 | + |
|
280 | + if ((('geodirectory') == $item)) : |
|
281 | + $geodir_menu_order[] = 'separator-geodirectory'; |
|
282 | + if (!empty($post_types)) { |
|
283 | + foreach ($post_types as $post_type) { |
|
284 | + $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
285 | + } |
|
286 | + } |
|
287 | + $geodir_menu_order[] = $item; |
|
288 | + |
|
289 | + unset($menu_order[$geodir_separator]); |
|
290 | + //unset( $menu_order[$geodir_places] ); |
|
291 | + elseif (!in_array($item, array('separator-geodirectory'))) : |
|
292 | + $geodir_menu_order[] = $item; |
|
293 | + endif; |
|
294 | + |
|
295 | + endforeach; |
|
296 | + |
|
297 | + // Return order |
|
298 | + return $geodir_menu_order; |
|
299 | + } |
|
300 | 300 | } |
301 | 301 | |
302 | 302 | if (!function_exists('geodir_admin_custom_menu_order')) { |
303 | - /** |
|
304 | - * Enables custom menu order. |
|
305 | - * |
|
306 | - * @since 1.0.0 |
|
307 | - * @package GeoDirectory |
|
308 | - * @return bool |
|
309 | - */ |
|
310 | - function geodir_admin_custom_menu_order() |
|
311 | - { |
|
312 | - if (!current_user_can('manage_options')) return false; |
|
313 | - return true; |
|
314 | - } |
|
303 | + /** |
|
304 | + * Enables custom menu order. |
|
305 | + * |
|
306 | + * @since 1.0.0 |
|
307 | + * @package GeoDirectory |
|
308 | + * @return bool |
|
309 | + */ |
|
310 | + function geodir_admin_custom_menu_order() |
|
311 | + { |
|
312 | + if (!current_user_can('manage_options')) return false; |
|
313 | + return true; |
|
314 | + } |
|
315 | 315 | } |
316 | 316 | |
317 | 317 | /** |
@@ -322,50 +322,50 @@ discard block |
||
322 | 322 | */ |
323 | 323 | function geodir_before_admin_panel() |
324 | 324 | { |
325 | - if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') { |
|
326 | - echo '<div id="message" class="updated fade"> |
|
325 | + if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') { |
|
326 | + echo '<div id="message" class="updated fade"> |
|
327 | 327 | <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p> |
328 | 328 | <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p> |
329 | 329 | </div>'; |
330 | 330 | |
331 | - } |
|
331 | + } |
|
332 | 332 | |
333 | - if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') { |
|
334 | - switch ($_REQUEST['msg']) { |
|
335 | - case 'success': |
|
336 | - echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>'; |
|
337 | - flush_rewrite_rules(false); |
|
333 | + if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') { |
|
334 | + switch ($_REQUEST['msg']) { |
|
335 | + case 'success': |
|
336 | + echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>'; |
|
337 | + flush_rewrite_rules(false); |
|
338 | 338 | |
339 | - break; |
|
339 | + break; |
|
340 | 340 | case 'fail': |
341 | 341 | $gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : ''; |
342 | 342 | |
343 | 343 | if ($gderr == 21) |
344 | - echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>'; |
|
344 | + echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>'; |
|
345 | 345 | else |
346 | 346 | echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>'; |
347 | - break; |
|
348 | - } |
|
349 | - } |
|
347 | + break; |
|
348 | + } |
|
349 | + } |
|
350 | 350 | |
351 | - $geodir_load_map = get_option('geodir_load_map'); |
|
352 | - $need_map_key = false; |
|
353 | - if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){ |
|
354 | - $need_map_key = true; |
|
355 | - } |
|
351 | + $geodir_load_map = get_option('geodir_load_map'); |
|
352 | + $need_map_key = false; |
|
353 | + if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){ |
|
354 | + $need_map_key = true; |
|
355 | + } |
|
356 | 356 | |
357 | - if (!geodir_get_map_api_key() && $need_map_key) { |
|
358 | - echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>'; |
|
359 | - } |
|
357 | + if (!geodir_get_map_api_key() && $need_map_key) { |
|
358 | + echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>'; |
|
359 | + } |
|
360 | 360 | |
361 | - if (!geodir_is_default_location_set()) { |
|
362 | - echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>'; |
|
361 | + if (!geodir_is_default_location_set()) { |
|
362 | + echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>'; |
|
363 | 363 | |
364 | - } |
|
364 | + } |
|
365 | 365 | |
366 | - if (!function_exists('curl_init')) { |
|
367 | - echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>'; |
|
368 | - } |
|
366 | + if (!function_exists('curl_init')) { |
|
367 | + echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>'; |
|
368 | + } |
|
369 | 369 | |
370 | 370 | |
371 | 371 | |
@@ -382,19 +382,19 @@ discard block |
||
382 | 382 | */ |
383 | 383 | function geodir_handle_option_form_submit($current_tab) |
384 | 384 | { |
385 | - global $geodir_settings; |
|
386 | - if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) { |
|
387 | - /** |
|
388 | - * Contains settings array for current tab. |
|
389 | - * |
|
390 | - * @since 1.0.0 |
|
391 | - * @package GeoDirectory |
|
392 | - */ |
|
393 | - include_once('option-pages/' . $current_tab . '_array.php'); |
|
394 | - } |
|
395 | - if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
|
396 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory')); |
|
397 | - if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory')); |
|
385 | + global $geodir_settings; |
|
386 | + if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) { |
|
387 | + /** |
|
388 | + * Contains settings array for current tab. |
|
389 | + * |
|
390 | + * @since 1.0.0 |
|
391 | + * @package GeoDirectory |
|
392 | + */ |
|
393 | + include_once('option-pages/' . $current_tab . '_array.php'); |
|
394 | + } |
|
395 | + if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
|
396 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory')); |
|
397 | + if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory')); |
|
398 | 398 | |
399 | 399 | /** |
400 | 400 | * Fires before updating geodirectory admin settings. |
@@ -406,38 +406,38 @@ discard block |
||
406 | 406 | */ |
407 | 407 | do_action('geodir_before_update_options', $current_tab, $geodir_settings); |
408 | 408 | |
409 | - if (!empty($geodir_settings[$current_tab])) |
|
410 | - geodir_update_options($geodir_settings[$current_tab]); |
|
409 | + if (!empty($geodir_settings[$current_tab])) |
|
410 | + geodir_update_options($geodir_settings[$current_tab]); |
|
411 | 411 | |
412 | - /** |
|
413 | - * Called after GeoDirectory options settings are updated. |
|
414 | - * |
|
415 | - * @since 1.0.0 |
|
416 | - * @param array $geodir_settings The array of GeoDirectory settings. |
|
417 | - * @see 'geodir_before_update_options' |
|
418 | - */ |
|
419 | - do_action('geodir_update_options', $geodir_settings); |
|
412 | + /** |
|
413 | + * Called after GeoDirectory options settings are updated. |
|
414 | + * |
|
415 | + * @since 1.0.0 |
|
416 | + * @param array $geodir_settings The array of GeoDirectory settings. |
|
417 | + * @see 'geodir_before_update_options' |
|
418 | + */ |
|
419 | + do_action('geodir_update_options', $geodir_settings); |
|
420 | 420 | |
421 | - /** |
|
422 | - * Called after GeoDirectory options settings are updated. |
|
423 | - * |
|
424 | - * Provides tab specific settings. |
|
425 | - * |
|
426 | - * @since 1.0.0 |
|
427 | - * @param string $current_tab The current settings tab name. |
|
428 | - * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
|
429 | - */ |
|
430 | - do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]); |
|
421 | + /** |
|
422 | + * Called after GeoDirectory options settings are updated. |
|
423 | + * |
|
424 | + * Provides tab specific settings. |
|
425 | + * |
|
426 | + * @since 1.0.0 |
|
427 | + * @param string $current_tab The current settings tab name. |
|
428 | + * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
|
429 | + */ |
|
430 | + do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]); |
|
431 | 431 | |
432 | - flush_rewrite_rules(false); |
|
432 | + flush_rewrite_rules(false); |
|
433 | 433 | |
434 | - $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : ''; |
|
434 | + $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : ''; |
|
435 | 435 | |
436 | - $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success'); |
|
436 | + $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success'); |
|
437 | 437 | |
438 | - wp_redirect($redirect_url); |
|
439 | - exit(); |
|
440 | - endif; |
|
438 | + wp_redirect($redirect_url); |
|
439 | + exit(); |
|
440 | + endif; |
|
441 | 441 | |
442 | 442 | |
443 | 443 | } |
@@ -455,144 +455,144 @@ discard block |
||
455 | 455 | * @return bool Returns true if saved. |
456 | 456 | */ |
457 | 457 | function geodir_update_options($options, $dummy = false) { |
458 | - if ((!isset($_POST) || !$_POST) && !$dummy) return false; |
|
458 | + if ((!isset($_POST) || !$_POST) && !$dummy) return false; |
|
459 | 459 | |
460 | - foreach ($options as $value) { |
|
461 | - if ($dummy && isset($value['std'])) |
|
462 | - $_POST[$value['id']] = $value['std']; |
|
460 | + foreach ($options as $value) { |
|
461 | + if ($dummy && isset($value['std'])) |
|
462 | + $_POST[$value['id']] = $value['std']; |
|
463 | 463 | |
464 | 464 | |
465 | - if (isset($value['type']) && $value['type'] == 'checkbox') : |
|
465 | + if (isset($value['type']) && $value['type'] == 'checkbox') : |
|
466 | 466 | |
467 | - if (isset($value['id']) && isset($_POST[$value['id']])) { |
|
468 | - update_option($value['id'], $_POST[$value['id']]); |
|
469 | - } else { |
|
470 | - update_option($value['id'], 0); |
|
471 | - } |
|
467 | + if (isset($value['id']) && isset($_POST[$value['id']])) { |
|
468 | + update_option($value['id'], $_POST[$value['id']]); |
|
469 | + } else { |
|
470 | + update_option($value['id'], 0); |
|
471 | + } |
|
472 | 472 | |
473 | - elseif (isset($value['type']) && $value['type'] == 'image_width') : |
|
473 | + elseif (isset($value['type']) && $value['type'] == 'image_width') : |
|
474 | 474 | |
475 | - if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) { |
|
476 | - update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']); |
|
477 | - update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']); |
|
478 | - if (isset($_POST[$value['id'] . '_crop'])) : |
|
479 | - update_option($value['id'] . '_crop', 1); |
|
480 | - else : |
|
481 | - update_option($value['id'] . '_crop', 0); |
|
482 | - endif; |
|
483 | - } else { |
|
484 | - update_option($value['id'] . '_width', $value['std']); |
|
485 | - update_option($value['id'] . '_height', $value['std']); |
|
486 | - update_option($value['id'] . '_crop', 1); |
|
487 | - } |
|
475 | + if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) { |
|
476 | + update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']); |
|
477 | + update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']); |
|
478 | + if (isset($_POST[$value['id'] . '_crop'])) : |
|
479 | + update_option($value['id'] . '_crop', 1); |
|
480 | + else : |
|
481 | + update_option($value['id'] . '_crop', 0); |
|
482 | + endif; |
|
483 | + } else { |
|
484 | + update_option($value['id'] . '_width', $value['std']); |
|
485 | + update_option($value['id'] . '_height', $value['std']); |
|
486 | + update_option($value['id'] . '_crop', 1); |
|
487 | + } |
|
488 | 488 | |
489 | - elseif (isset($value['type']) && $value['type'] == 'map') : |
|
490 | - $post_types = array(); |
|
491 | - $categories = array(); |
|
489 | + elseif (isset($value['type']) && $value['type'] == 'map') : |
|
490 | + $post_types = array(); |
|
491 | + $categories = array(); |
|
492 | 492 | |
493 | - if (!empty($_POST['home_map_post_types'])) : |
|
494 | - foreach ($_POST['home_map_post_types'] as $post_type) : |
|
495 | - $post_types[] = $post_type; |
|
496 | - endforeach; |
|
497 | - endif; |
|
493 | + if (!empty($_POST['home_map_post_types'])) : |
|
494 | + foreach ($_POST['home_map_post_types'] as $post_type) : |
|
495 | + $post_types[] = $post_type; |
|
496 | + endforeach; |
|
497 | + endif; |
|
498 | 498 | |
499 | - update_option('geodir_exclude_post_type_on_map', $post_types); |
|
499 | + update_option('geodir_exclude_post_type_on_map', $post_types); |
|
500 | 500 | |
501 | - if (!empty($_POST['post_category'])) : |
|
502 | - foreach ($_POST['post_category'] as $texonomy => $cat_arr) : |
|
503 | - $categories[$texonomy] = array(); |
|
504 | - foreach ($cat_arr as $category) : |
|
505 | - $categories[$texonomy][] = $category; |
|
506 | - endforeach; |
|
507 | - $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array(); |
|
508 | - endforeach; |
|
509 | - endif; |
|
510 | - update_option('geodir_exclude_cat_on_map', $categories); |
|
511 | - update_option('geodir_exclude_cat_on_map_upgrade', 1); |
|
512 | - elseif (isset($value['type']) && $value['type'] == 'map_default_settings') : |
|
501 | + if (!empty($_POST['post_category'])) : |
|
502 | + foreach ($_POST['post_category'] as $texonomy => $cat_arr) : |
|
503 | + $categories[$texonomy] = array(); |
|
504 | + foreach ($cat_arr as $category) : |
|
505 | + $categories[$texonomy][] = $category; |
|
506 | + endforeach; |
|
507 | + $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array(); |
|
508 | + endforeach; |
|
509 | + endif; |
|
510 | + update_option('geodir_exclude_cat_on_map', $categories); |
|
511 | + update_option('geodir_exclude_cat_on_map_upgrade', 1); |
|
512 | + elseif (isset($value['type']) && $value['type'] == 'map_default_settings') : |
|
513 | 513 | |
514 | 514 | |
515 | - if (!empty($_POST['geodir_default_map_language'])): |
|
516 | - update_option('geodir_default_map_language', $_POST['geodir_default_map_language']); |
|
517 | - endif; |
|
515 | + if (!empty($_POST['geodir_default_map_language'])): |
|
516 | + update_option('geodir_default_map_language', $_POST['geodir_default_map_language']); |
|
517 | + endif; |
|
518 | 518 | |
519 | 519 | |
520 | - if (!empty($_POST['geodir_default_map_search_pt'])): |
|
521 | - update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']); |
|
522 | - endif; |
|
520 | + if (!empty($_POST['geodir_default_map_search_pt'])): |
|
521 | + update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']); |
|
522 | + endif; |
|
523 | 523 | |
524 | 524 | |
525 | - elseif (isset($value['type']) && $value['type'] == 'file') : |
|
525 | + elseif (isset($value['type']) && $value['type'] == 'file') : |
|
526 | 526 | |
527 | 527 | |
528 | - if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file |
|
528 | + if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file |
|
529 | 529 | |
530 | - if (get_option($value['id'])) { |
|
531 | - $image_name_arr = explode('/', get_option($value['id'])); |
|
532 | - $noimg_name = end($image_name_arr); |
|
533 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
534 | - if (file_exists($img_path)) |
|
535 | - unlink($img_path); |
|
536 | - } |
|
530 | + if (get_option($value['id'])) { |
|
531 | + $image_name_arr = explode('/', get_option($value['id'])); |
|
532 | + $noimg_name = end($image_name_arr); |
|
533 | + $img_path = $uploads['path'] . '/' . $noimg_name; |
|
534 | + if (file_exists($img_path)) |
|
535 | + unlink($img_path); |
|
536 | + } |
|
537 | 537 | |
538 | - update_option($value['id'], ''); |
|
539 | - } |
|
538 | + update_option($value['id'], ''); |
|
539 | + } |
|
540 | 540 | |
541 | - $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : ''; |
|
542 | - $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : ''; |
|
543 | - |
|
544 | - if (!empty($filename)): |
|
545 | - $ext = pathinfo($filename, PATHINFO_EXTENSION); |
|
546 | - $uplaods = array(); |
|
547 | - |
|
548 | - foreach ($uploadedfile as $key => $uplaod): |
|
549 | - if ($key == 'name'): |
|
550 | - $uplaods[$key] = $filename; |
|
551 | - else : |
|
552 | - $uplaods[$key] = $uplaod; |
|
553 | - endif; |
|
554 | - endforeach; |
|
555 | - |
|
556 | - $uploads = wp_upload_dir(); |
|
557 | - |
|
558 | - if (get_option($value['id'])) { |
|
559 | - $image_name_arr = explode('/', get_option($value['id'])); |
|
560 | - $noimg_name = end($image_name_arr); |
|
561 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
562 | - if (file_exists($img_path)) |
|
563 | - unlink($img_path); |
|
564 | - } |
|
541 | + $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : ''; |
|
542 | + $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : ''; |
|
543 | + |
|
544 | + if (!empty($filename)): |
|
545 | + $ext = pathinfo($filename, PATHINFO_EXTENSION); |
|
546 | + $uplaods = array(); |
|
547 | + |
|
548 | + foreach ($uploadedfile as $key => $uplaod): |
|
549 | + if ($key == 'name'): |
|
550 | + $uplaods[$key] = $filename; |
|
551 | + else : |
|
552 | + $uplaods[$key] = $uplaod; |
|
553 | + endif; |
|
554 | + endforeach; |
|
555 | + |
|
556 | + $uploads = wp_upload_dir(); |
|
557 | + |
|
558 | + if (get_option($value['id'])) { |
|
559 | + $image_name_arr = explode('/', get_option($value['id'])); |
|
560 | + $noimg_name = end($image_name_arr); |
|
561 | + $img_path = $uploads['path'] . '/' . $noimg_name; |
|
562 | + if (file_exists($img_path)) |
|
563 | + unlink($img_path); |
|
564 | + } |
|
565 | 565 | |
566 | - $upload_overrides = array('test_form' => false); |
|
567 | - $movefile = wp_handle_upload($uplaods, $upload_overrides); |
|
566 | + $upload_overrides = array('test_form' => false); |
|
567 | + $movefile = wp_handle_upload($uplaods, $upload_overrides); |
|
568 | 568 | |
569 | - update_option($value['id'], $movefile['url']); |
|
569 | + update_option($value['id'], $movefile['url']); |
|
570 | 570 | |
571 | - endif; |
|
571 | + endif; |
|
572 | 572 | |
573 | - if (!get_option($value['id']) && isset($value['value'])): |
|
574 | - update_option($value['id'], $value['value']); |
|
575 | - endif; |
|
573 | + if (!get_option($value['id']) && isset($value['value'])): |
|
574 | + update_option($value['id'], $value['value']); |
|
575 | + endif; |
|
576 | 576 | |
577 | 577 | |
578 | - else : |
|
579 | - // same menu setting per theme. |
|
580 | - if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) { |
|
581 | - $theme = wp_get_theme(); |
|
582 | - update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]); |
|
583 | - } |
|
578 | + else : |
|
579 | + // same menu setting per theme. |
|
580 | + if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) { |
|
581 | + $theme = wp_get_theme(); |
|
582 | + update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]); |
|
583 | + } |
|
584 | 584 | |
585 | - if (isset($value['id']) && isset($_POST[$value['id']])) { |
|
586 | - update_option($value['id'], $_POST[$value['id']]); |
|
587 | - } else { |
|
588 | - delete_option($value['id']); |
|
589 | - } |
|
585 | + if (isset($value['id']) && isset($_POST[$value['id']])) { |
|
586 | + update_option($value['id'], $_POST[$value['id']]); |
|
587 | + } else { |
|
588 | + delete_option($value['id']); |
|
589 | + } |
|
590 | 590 | |
591 | - endif; |
|
592 | - } |
|
593 | - if ($dummy) |
|
594 | - $_POST = array(); |
|
595 | - return true; |
|
591 | + endif; |
|
592 | + } |
|
593 | + if ($dummy) |
|
594 | + $_POST = array(); |
|
595 | + return true; |
|
596 | 596 | |
597 | 597 | } |
598 | 598 | |
@@ -641,33 +641,33 @@ discard block |
||
641 | 641 | function places_custom_fields_tab($tabs) |
642 | 642 | { |
643 | 643 | |
644 | - $geodir_post_types = get_option('geodir_post_types'); |
|
644 | + $geodir_post_types = get_option('geodir_post_types'); |
|
645 | 645 | |
646 | - if (!empty($geodir_post_types)) { |
|
646 | + if (!empty($geodir_post_types)) { |
|
647 | 647 | |
648 | - foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info): |
|
648 | + foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info): |
|
649 | 649 | |
650 | - $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory'); |
|
650 | + $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory'); |
|
651 | 651 | |
652 | - $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
653 | - 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug), |
|
654 | - 'subtabs' => array( |
|
655 | - array('subtab' => 'custom_fields', |
|
656 | - 'label' => __('Custom Fields', 'geodirectory'), |
|
657 | - 'request' => array('listing_type' => $geodir_post_type)), |
|
658 | - array('subtab' => 'sorting_options', |
|
659 | - 'label' => __('Sorting Options', 'geodirectory'), |
|
660 | - 'request' => array('listing_type' => $geodir_post_type)), |
|
661 | - ), |
|
662 | - 'tab_index' => 9, |
|
663 | - 'request' => array('listing_type' => $geodir_post_type) |
|
664 | - ); |
|
652 | + $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
653 | + 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug), |
|
654 | + 'subtabs' => array( |
|
655 | + array('subtab' => 'custom_fields', |
|
656 | + 'label' => __('Custom Fields', 'geodirectory'), |
|
657 | + 'request' => array('listing_type' => $geodir_post_type)), |
|
658 | + array('subtab' => 'sorting_options', |
|
659 | + 'label' => __('Sorting Options', 'geodirectory'), |
|
660 | + 'request' => array('listing_type' => $geodir_post_type)), |
|
661 | + ), |
|
662 | + 'tab_index' => 9, |
|
663 | + 'request' => array('listing_type' => $geodir_post_type) |
|
664 | + ); |
|
665 | 665 | |
666 | - endforeach; |
|
666 | + endforeach; |
|
667 | 667 | |
668 | - } |
|
668 | + } |
|
669 | 669 | |
670 | - return $tabs; |
|
670 | + return $tabs; |
|
671 | 671 | } |
672 | 672 | |
673 | 673 | |
@@ -683,9 +683,9 @@ discard block |
||
683 | 683 | */ |
684 | 684 | function geodir_tools_setting_tab($tabs) |
685 | 685 | { |
686 | - wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
687 | - $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory')); |
|
688 | - return $tabs; |
|
686 | + wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
687 | + $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory')); |
|
688 | + return $tabs; |
|
689 | 689 | } |
690 | 690 | |
691 | 691 | /** |
@@ -700,8 +700,8 @@ discard block |
||
700 | 700 | */ |
701 | 701 | function geodir_compatibility_setting_tab($tabs) |
702 | 702 | { |
703 | - $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory')); |
|
704 | - return $tabs; |
|
703 | + $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory')); |
|
704 | + return $tabs; |
|
705 | 705 | } |
706 | 706 | |
707 | 707 | |
@@ -717,144 +717,144 @@ discard block |
||
717 | 717 | */ |
718 | 718 | function geodir_extend_geodirectory_setting_tab($tabs) |
719 | 719 | { |
720 | - $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fas fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank'); |
|
721 | - return $tabs; |
|
720 | + $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fas fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank'); |
|
721 | + return $tabs; |
|
722 | 722 | } |
723 | 723 | |
724 | 724 | |
725 | 725 | if (!function_exists('geodir_edit_post_columns')) { |
726 | - /** |
|
727 | - * Modify admin post listing page columns. |
|
728 | - * |
|
729 | - * @since 1.0.0 |
|
730 | - * @package GeoDirectory |
|
731 | - * @param array $columns The column array. |
|
732 | - * @return array Altered column array. |
|
733 | - */ |
|
734 | - function geodir_edit_post_columns($columns) |
|
735 | - { |
|
736 | - |
|
737 | - $new_columns = array('location' => __('Location (ID)', 'geodirectory'), |
|
738 | - 'categorys' => __('Categories', 'geodirectory')); |
|
739 | - |
|
740 | - if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist |
|
741 | - { |
|
742 | - $offset = 0; // should we prepend $array with $data? |
|
743 | - $offset = count($columns); // or should we append $array with $data? lets pick this one... |
|
744 | - } |
|
726 | + /** |
|
727 | + * Modify admin post listing page columns. |
|
728 | + * |
|
729 | + * @since 1.0.0 |
|
730 | + * @package GeoDirectory |
|
731 | + * @param array $columns The column array. |
|
732 | + * @return array Altered column array. |
|
733 | + */ |
|
734 | + function geodir_edit_post_columns($columns) |
|
735 | + { |
|
745 | 736 | |
746 | - $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset)); |
|
737 | + $new_columns = array('location' => __('Location (ID)', 'geodirectory'), |
|
738 | + 'categorys' => __('Categories', 'geodirectory')); |
|
747 | 739 | |
748 | - $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory'))); |
|
740 | + if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist |
|
741 | + { |
|
742 | + $offset = 0; // should we prepend $array with $data? |
|
743 | + $offset = count($columns); // or should we append $array with $data? lets pick this one... |
|
744 | + } |
|
749 | 745 | |
750 | - return $columns; |
|
751 | - } |
|
746 | + $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset)); |
|
747 | + |
|
748 | + $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory'))); |
|
749 | + |
|
750 | + return $columns; |
|
751 | + } |
|
752 | 752 | } |
753 | 753 | |
754 | 754 | |
755 | 755 | if (!function_exists('geodir_manage_post_columns')) { |
756 | - /** |
|
757 | - * Adds content to our custom post listing page columns. |
|
758 | - * |
|
759 | - * @since 1.0.0 |
|
760 | - * @package GeoDirectory |
|
761 | - * @global object $wpdb WordPress Database object. |
|
762 | - * @global object $post WordPress Post object. |
|
763 | - * @param string $column The column name. |
|
764 | - * @param int $post_id The post ID. |
|
765 | - */ |
|
766 | - function geodir_manage_post_columns($column, $post_id) |
|
767 | - { |
|
768 | - global $post, $wpdb; |
|
769 | - |
|
770 | - switch ($column): |
|
771 | - /* If displaying the 'city' column. */ |
|
772 | - case 'location' : |
|
773 | - $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true); |
|
774 | - $location = geodir_get_location($location_id); |
|
775 | - /* If no city is found, output a default message. */ |
|
776 | - if (empty($location)) { |
|
777 | - _e('Unknown', 'geodirectory'); |
|
778 | - } else { |
|
779 | - /* If there is a city id, append 'city name' to the text string. */ |
|
780 | - $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : ''; |
|
781 | - echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id); |
|
782 | - } |
|
783 | - break; |
|
784 | - |
|
785 | - /* If displaying the 'expire' column. */ |
|
786 | - case 'expire' : |
|
787 | - $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true); |
|
788 | - $d1 = $expire_date; // get expire_date |
|
789 | - $d2 = date('Y-m-d'); // get current date |
|
790 | - $state = __('days left', 'geodirectory'); |
|
791 | - $date_diff_text = ''; |
|
792 | - $expire_class = 'expire_left'; |
|
793 | - if ($expire_date != 'Never') { |
|
794 | - if (strtotime($d1) < strtotime($d2)) { |
|
795 | - $state = __('days overdue', 'geodirectory'); |
|
796 | - $expire_class = 'expire_over'; |
|
797 | - } |
|
798 | - $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days |
|
799 | - $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>'; |
|
800 | - } |
|
801 | - /* If no expire_date is found, output a default message. */ |
|
802 | - if (empty($expire_date)) |
|
803 | - echo __('Unknown', 'geodirectory'); |
|
804 | - /* If there is a expire_date, append 'days left' to the text string. */ |
|
805 | - else |
|
806 | - echo $expire_date . $date_diff_text; |
|
807 | - break; |
|
808 | - |
|
809 | - /* If displaying the 'categorys' column. */ |
|
810 | - case 'categorys' : |
|
811 | - |
|
812 | - /* Get the categorys for the post. */ |
|
813 | - |
|
814 | - |
|
815 | - $terms = wp_get_object_terms($post_id, get_object_taxonomies($post)); |
|
816 | - |
|
817 | - /* If terms were found. */ |
|
818 | - if (!empty($terms)) { |
|
819 | - $out = array(); |
|
820 | - /* Loop through each term, linking to the 'edit posts' page for the specific term. */ |
|
821 | - foreach ($terms as $term) { |
|
822 | - if (!strstr($term->taxonomy, 'tag')) { |
|
823 | - $out[] = sprintf('<a href="%s">%s</a>', |
|
824 | - esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')), |
|
825 | - esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display')) |
|
826 | - ); |
|
827 | - } |
|
828 | - } |
|
829 | - /* Join the terms, separating them with a comma. */ |
|
830 | - echo(join(', ', $out)); |
|
831 | - } /* If no terms were found, output a default message. */ |
|
832 | - else { |
|
833 | - _e('No Categories', 'geodirectory'); |
|
834 | - } |
|
835 | - break; |
|
756 | + /** |
|
757 | + * Adds content to our custom post listing page columns. |
|
758 | + * |
|
759 | + * @since 1.0.0 |
|
760 | + * @package GeoDirectory |
|
761 | + * @global object $wpdb WordPress Database object. |
|
762 | + * @global object $post WordPress Post object. |
|
763 | + * @param string $column The column name. |
|
764 | + * @param int $post_id The post ID. |
|
765 | + */ |
|
766 | + function geodir_manage_post_columns($column, $post_id) |
|
767 | + { |
|
768 | + global $post, $wpdb; |
|
769 | + |
|
770 | + switch ($column): |
|
771 | + /* If displaying the 'city' column. */ |
|
772 | + case 'location' : |
|
773 | + $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true); |
|
774 | + $location = geodir_get_location($location_id); |
|
775 | + /* If no city is found, output a default message. */ |
|
776 | + if (empty($location)) { |
|
777 | + _e('Unknown', 'geodirectory'); |
|
778 | + } else { |
|
779 | + /* If there is a city id, append 'city name' to the text string. */ |
|
780 | + $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : ''; |
|
781 | + echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id); |
|
782 | + } |
|
783 | + break; |
|
784 | + |
|
785 | + /* If displaying the 'expire' column. */ |
|
786 | + case 'expire' : |
|
787 | + $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true); |
|
788 | + $d1 = $expire_date; // get expire_date |
|
789 | + $d2 = date('Y-m-d'); // get current date |
|
790 | + $state = __('days left', 'geodirectory'); |
|
791 | + $date_diff_text = ''; |
|
792 | + $expire_class = 'expire_left'; |
|
793 | + if ($expire_date != 'Never') { |
|
794 | + if (strtotime($d1) < strtotime($d2)) { |
|
795 | + $state = __('days overdue', 'geodirectory'); |
|
796 | + $expire_class = 'expire_over'; |
|
797 | + } |
|
798 | + $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days |
|
799 | + $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>'; |
|
800 | + } |
|
801 | + /* If no expire_date is found, output a default message. */ |
|
802 | + if (empty($expire_date)) |
|
803 | + echo __('Unknown', 'geodirectory'); |
|
804 | + /* If there is a expire_date, append 'days left' to the text string. */ |
|
805 | + else |
|
806 | + echo $expire_date . $date_diff_text; |
|
807 | + break; |
|
836 | 808 | |
837 | - endswitch; |
|
838 | - } |
|
809 | + /* If displaying the 'categorys' column. */ |
|
810 | + case 'categorys' : |
|
811 | + |
|
812 | + /* Get the categorys for the post. */ |
|
813 | + |
|
814 | + |
|
815 | + $terms = wp_get_object_terms($post_id, get_object_taxonomies($post)); |
|
816 | + |
|
817 | + /* If terms were found. */ |
|
818 | + if (!empty($terms)) { |
|
819 | + $out = array(); |
|
820 | + /* Loop through each term, linking to the 'edit posts' page for the specific term. */ |
|
821 | + foreach ($terms as $term) { |
|
822 | + if (!strstr($term->taxonomy, 'tag')) { |
|
823 | + $out[] = sprintf('<a href="%s">%s</a>', |
|
824 | + esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')), |
|
825 | + esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display')) |
|
826 | + ); |
|
827 | + } |
|
828 | + } |
|
829 | + /* Join the terms, separating them with a comma. */ |
|
830 | + echo(join(', ', $out)); |
|
831 | + } /* If no terms were found, output a default message. */ |
|
832 | + else { |
|
833 | + _e('No Categories', 'geodirectory'); |
|
834 | + } |
|
835 | + break; |
|
836 | + |
|
837 | + endswitch; |
|
838 | + } |
|
839 | 839 | } |
840 | 840 | |
841 | 841 | |
842 | 842 | if (!function_exists('geodir_post_sortable_columns')) { |
843 | - /** |
|
844 | - * Makes admin post listing page columns sortable. |
|
845 | - * |
|
846 | - * @since 1.0.0 |
|
847 | - * @package GeoDirectory |
|
848 | - * @param array $columns The column array. |
|
849 | - * @return array Altered column array. |
|
850 | - */ |
|
851 | - function geodir_post_sortable_columns($columns) |
|
852 | - { |
|
853 | - |
|
854 | - $columns['expire'] = 'expire'; |
|
855 | - |
|
856 | - return $columns; |
|
857 | - } |
|
843 | + /** |
|
844 | + * Makes admin post listing page columns sortable. |
|
845 | + * |
|
846 | + * @since 1.0.0 |
|
847 | + * @package GeoDirectory |
|
848 | + * @param array $columns The column array. |
|
849 | + * @return array Altered column array. |
|
850 | + */ |
|
851 | + function geodir_post_sortable_columns($columns) |
|
852 | + { |
|
853 | + |
|
854 | + $columns['expire'] = 'expire'; |
|
855 | + |
|
856 | + return $columns; |
|
857 | + } |
|
858 | 858 | } |
859 | 859 | |
860 | 860 | /** |
@@ -868,32 +868,32 @@ discard block |
||
868 | 868 | * @param int $post_id The post ID. |
869 | 869 | */ |
870 | 870 | function geodir_post_information_save($post_id, $post) { |
871 | - global $wpdb, $current_user; |
|
871 | + global $wpdb, $current_user; |
|
872 | 872 | |
873 | - if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) { |
|
874 | - return; |
|
875 | - } |
|
873 | + if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) { |
|
874 | + return; |
|
875 | + } |
|
876 | 876 | |
877 | - $geodir_posttypes = geodir_get_posttypes(); |
|
877 | + $geodir_posttypes = geodir_get_posttypes(); |
|
878 | 878 | |
879 | - if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) |
|
880 | - return; |
|
879 | + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) |
|
880 | + return; |
|
881 | 881 | |
882 | - if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) { |
|
883 | - if (isset($_REQUEST['_status'])) |
|
884 | - geodir_change_post_status($post_id, $_REQUEST['_status']); |
|
882 | + if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) { |
|
883 | + if (isset($_REQUEST['_status'])) |
|
884 | + geodir_change_post_status($post_id, $_REQUEST['_status']); |
|
885 | 885 | |
886 | - if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) |
|
887 | - return; |
|
886 | + if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) |
|
887 | + return; |
|
888 | 888 | |
889 | - if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) |
|
890 | - return; |
|
889 | + if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) |
|
890 | + return; |
|
891 | 891 | |
892 | - if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) |
|
893 | - return; |
|
892 | + if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) |
|
893 | + return; |
|
894 | 894 | |
895 | - geodir_save_listing($_REQUEST); |
|
896 | - } |
|
895 | + geodir_save_listing($_REQUEST); |
|
896 | + } |
|
897 | 897 | } |
898 | 898 | |
899 | 899 | /** |
@@ -909,102 +909,102 @@ discard block |
||
909 | 909 | */ |
910 | 910 | function geodir_admin_fields($options) |
911 | 911 | { |
912 | - global $geodirectory; |
|
913 | - |
|
914 | - $first_title = true; |
|
915 | - $tab_id = ''; |
|
916 | - $i = 0; |
|
917 | - foreach ($options as $value) : |
|
918 | - if (!isset($value['name'])) $value['name'] = ''; |
|
919 | - if (!isset($value['class'])) $value['class'] = ''; |
|
920 | - if (!isset($value['css'])) $value['css'] = ''; |
|
921 | - if (!isset($value['std'])) $value['std'] = ''; |
|
922 | - $desc = ''; |
|
923 | - switch ($value['type']) : |
|
924 | - case 'dummy_installer': |
|
925 | - $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place'; |
|
926 | - geodir_autoinstall_admin_header($post_type); |
|
927 | - break; |
|
928 | - case 'title': |
|
929 | - |
|
930 | - if ($i == 0) { |
|
931 | - echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>'; |
|
932 | - echo '<div class="inner_content_tab_main">'; |
|
933 | - } |
|
912 | + global $geodirectory; |
|
913 | + |
|
914 | + $first_title = true; |
|
915 | + $tab_id = ''; |
|
916 | + $i = 0; |
|
917 | + foreach ($options as $value) : |
|
918 | + if (!isset($value['name'])) $value['name'] = ''; |
|
919 | + if (!isset($value['class'])) $value['class'] = ''; |
|
920 | + if (!isset($value['css'])) $value['css'] = ''; |
|
921 | + if (!isset($value['std'])) $value['std'] = ''; |
|
922 | + $desc = ''; |
|
923 | + switch ($value['type']) : |
|
924 | + case 'dummy_installer': |
|
925 | + $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place'; |
|
926 | + geodir_autoinstall_admin_header($post_type); |
|
927 | + break; |
|
928 | + case 'title': |
|
929 | + |
|
930 | + if ($i == 0) { |
|
931 | + echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>'; |
|
932 | + echo '<div class="inner_content_tab_main">'; |
|
933 | + } |
|
934 | 934 | |
935 | - $i++; |
|
935 | + $i++; |
|
936 | 936 | |
937 | - if (isset($value['id']) && $value['id']) |
|
938 | - $tab_id = $value['id']; |
|
937 | + if (isset($value['id']) && $value['id']) |
|
938 | + $tab_id = $value['id']; |
|
939 | 939 | |
940 | - if (isset($value['desc']) && $value['desc']) |
|
941 | - $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
940 | + if (isset($value['desc']) && $value['desc']) |
|
941 | + $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
942 | 942 | |
943 | - if (isset($value['name']) && $value['name']) { |
|
944 | - if ($first_title === true) { |
|
945 | - $first_title = false; |
|
946 | - } else { |
|
947 | - echo '</div>'; |
|
948 | - } |
|
949 | - echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>'; |
|
943 | + if (isset($value['name']) && $value['name']) { |
|
944 | + if ($first_title === true) { |
|
945 | + $first_title = false; |
|
946 | + } else { |
|
947 | + echo '</div>'; |
|
948 | + } |
|
949 | + echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>'; |
|
950 | 950 | |
951 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
952 | - } |
|
951 | + echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
952 | + } |
|
953 | 953 | |
954 | - /** |
|
955 | - * Called after a GeoDirectory settings title is output in the GD settings page. |
|
956 | - * |
|
957 | - * The action is called dynamically geodir_settings_$value['id']. |
|
958 | - * |
|
959 | - * @since 1.0.0 |
|
960 | - */ |
|
961 | - do_action('geodir_settings_' . sanitize_title($value['id'])); |
|
962 | - break; |
|
963 | - |
|
964 | - case 'no_tabs': |
|
965 | - |
|
966 | - echo '<div class="inner_content_tab_main">'; |
|
967 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
968 | - |
|
969 | - break; |
|
970 | - |
|
971 | - case 'sectionstart': |
|
972 | - if (isset($value['desc']) && $value['desc']) |
|
973 | - $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
974 | - if (isset($value['name']) && $value['name']) |
|
975 | - echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
976 | - /** |
|
977 | - * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
|
978 | - * |
|
979 | - * The action is called dynamically geodir_settings_$value['id']_start. |
|
980 | - * |
|
981 | - * @since 1.0.0 |
|
982 | - */ |
|
983 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start'); |
|
984 | - echo '<table class="form-table">' . "\n\n"; |
|
985 | - |
|
986 | - break; |
|
987 | - case 'sectionend': |
|
988 | - /** |
|
989 | - * Called before a GeoDirectory settings sectionend is output in the GD settings page. |
|
990 | - * |
|
991 | - * The action is called dynamically geodir_settings_$value['id']_end. |
|
992 | - * |
|
993 | - * @since 1.0.0 |
|
994 | - */ |
|
995 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end'); |
|
996 | - echo '</table>'; |
|
997 | - /** |
|
998 | - * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
|
999 | - * |
|
1000 | - * The action is called dynamically geodir_settings_$value['id']_end. |
|
1001 | - * |
|
1002 | - * @since 1.0.0 |
|
1003 | - */ |
|
1004 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after'); |
|
1005 | - break; |
|
1006 | - case 'text': |
|
1007 | - ?> |
|
954 | + /** |
|
955 | + * Called after a GeoDirectory settings title is output in the GD settings page. |
|
956 | + * |
|
957 | + * The action is called dynamically geodir_settings_$value['id']. |
|
958 | + * |
|
959 | + * @since 1.0.0 |
|
960 | + */ |
|
961 | + do_action('geodir_settings_' . sanitize_title($value['id'])); |
|
962 | + break; |
|
963 | + |
|
964 | + case 'no_tabs': |
|
965 | + |
|
966 | + echo '<div class="inner_content_tab_main">'; |
|
967 | + echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
968 | + |
|
969 | + break; |
|
970 | + |
|
971 | + case 'sectionstart': |
|
972 | + if (isset($value['desc']) && $value['desc']) |
|
973 | + $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
974 | + if (isset($value['name']) && $value['name']) |
|
975 | + echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
976 | + /** |
|
977 | + * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
|
978 | + * |
|
979 | + * The action is called dynamically geodir_settings_$value['id']_start. |
|
980 | + * |
|
981 | + * @since 1.0.0 |
|
982 | + */ |
|
983 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start'); |
|
984 | + echo '<table class="form-table">' . "\n\n"; |
|
985 | + |
|
986 | + break; |
|
987 | + case 'sectionend': |
|
988 | + /** |
|
989 | + * Called before a GeoDirectory settings sectionend is output in the GD settings page. |
|
990 | + * |
|
991 | + * The action is called dynamically geodir_settings_$value['id']_end. |
|
992 | + * |
|
993 | + * @since 1.0.0 |
|
994 | + */ |
|
995 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end'); |
|
996 | + echo '</table>'; |
|
997 | + /** |
|
998 | + * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
|
999 | + * |
|
1000 | + * The action is called dynamically geodir_settings_$value['id']_end. |
|
1001 | + * |
|
1002 | + * @since 1.0.0 |
|
1003 | + */ |
|
1004 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after'); |
|
1005 | + break; |
|
1006 | + case 'text': |
|
1007 | + ?> |
|
1008 | 1008 | <tr valign="top"> |
1009 | 1009 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
1010 | 1010 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1013,15 +1013,15 @@ discard block |
||
1013 | 1013 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?> |
1014 | 1014 | style=" <?php echo esc_attr($value['css']); ?>" |
1015 | 1015 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) { |
1016 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
1017 | - } else { |
|
1018 | - echo esc_attr($value['std']); |
|
1019 | - } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
1016 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
1017 | + } else { |
|
1018 | + echo esc_attr($value['std']); |
|
1019 | + } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
1020 | 1020 | </tr><?php |
1021 | - break; |
|
1021 | + break; |
|
1022 | 1022 | |
1023 | - case 'map-key': |
|
1024 | - ?> |
|
1023 | + case 'map-key': |
|
1024 | + ?> |
|
1025 | 1025 | <tr valign="top"> |
1026 | 1026 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
1027 | 1027 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1030,18 +1030,18 @@ discard block |
||
1030 | 1030 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?> |
1031 | 1031 | style=" <?php echo esc_attr($value['css']); ?>" |
1032 | 1032 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) { |
1033 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
1034 | - } else { |
|
1035 | - echo esc_attr($value['std']); |
|
1036 | - } ?>"/> |
|
1033 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
1034 | + } else { |
|
1035 | + echo esc_attr($value['std']); |
|
1036 | + } ?>"/> |
|
1037 | 1037 | <?php $gm_api_url = 'https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["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"],null]';?> |
1038 | 1038 | <a id="gd-api-key" onclick='window.open("<?php echo wp_slash($gm_api_url);?>", "newwindow", "width=600, height=400"); return false;' href='<?php echo $gm_api_url;?>' class="button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )','geodirectory');?>" ><?php _e('Generate API Key','geodirectory');?></a> |
1039 | 1039 | <span class="description"><?php echo $value['desc']; ?></span></td> |
1040 | 1040 | </tr><?php |
1041 | - break; |
|
1041 | + break; |
|
1042 | 1042 | |
1043 | - case 'password': |
|
1044 | - ?> |
|
1043 | + case 'password': |
|
1044 | + ?> |
|
1045 | 1045 | <tr valign="top"> |
1046 | 1046 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
1047 | 1047 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1050,42 +1050,42 @@ discard block |
||
1050 | 1050 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?> |
1051 | 1051 | style="<?php echo esc_attr($value['css']); ?>" |
1052 | 1052 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) { |
1053 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
1054 | - } else { |
|
1055 | - echo esc_attr($value['std']); |
|
1056 | - } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
1053 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
1054 | + } else { |
|
1055 | + echo esc_attr($value['std']); |
|
1056 | + } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
1057 | 1057 | </tr><?php |
1058 | - break; |
|
1058 | + break; |
|
1059 | 1059 | |
1060 | - case 'html_content': |
|
1061 | - ?> |
|
1060 | + case 'html_content': |
|
1061 | + ?> |
|
1062 | 1062 | <tr valign="top"> |
1063 | 1063 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
1064 | 1064 | <td class="forminp"><span class="description"><?php echo $value['desc']; ?></span></td> |
1065 | 1065 | </tr><?php |
1066 | - break; |
|
1066 | + break; |
|
1067 | 1067 | |
1068 | - case 'color' : |
|
1069 | - ?> |
|
1068 | + case 'color' : |
|
1069 | + ?> |
|
1070 | 1070 | <tr valign="top"> |
1071 | 1071 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
1072 | 1072 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
1073 | 1073 | id="<?php echo esc_attr($value['id']); ?>" type="text" |
1074 | 1074 | style="<?php echo esc_attr($value['css']); ?>" |
1075 | 1075 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) { |
1076 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
1077 | - } else { |
|
1078 | - echo esc_attr($value['std']); |
|
1079 | - } ?>" class="colorpick"/> <span |
|
1076 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
1077 | + } else { |
|
1078 | + echo esc_attr($value['std']); |
|
1079 | + } ?>" class="colorpick"/> <span |
|
1080 | 1080 | class="description"><?php echo $value['desc']; ?></span> |
1081 | 1081 | |
1082 | 1082 | <div id="colorPickerDiv_<?php echo esc_attr($value['id']); ?>" class="colorpickdiv" |
1083 | 1083 | style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div> |
1084 | 1084 | </td> |
1085 | 1085 | </tr><?php |
1086 | - break; |
|
1087 | - case 'image_width' : |
|
1088 | - ?> |
|
1086 | + break; |
|
1087 | + case 'image_width' : |
|
1088 | + ?> |
|
1089 | 1089 | <tr valign="top"> |
1090 | 1090 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
1091 | 1091 | <td class="forminp"> |
@@ -1107,11 +1107,11 @@ discard block |
||
1107 | 1107 | |
1108 | 1108 | <span class="description"><?php echo $value['desc'] ?></span></td> |
1109 | 1109 | </tr><?php |
1110 | - break; |
|
1111 | - case 'select': |
|
1112 | - $option_value = get_option($value['id']); |
|
1113 | - $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value; |
|
1114 | - ?> |
|
1110 | + break; |
|
1111 | + case 'select': |
|
1112 | + $option_value = get_option($value['id']); |
|
1113 | + $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value; |
|
1114 | + ?> |
|
1115 | 1115 | <tr valign="top"> |
1116 | 1116 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
1117 | 1117 | <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>" |
@@ -1120,33 +1120,33 @@ discard block |
||
1120 | 1120 | class="<?php if (isset($value['class'])) echo $value['class']; ?>" |
1121 | 1121 | option-ajaxchosen="false"> |
1122 | 1122 | <?php |
1123 | - foreach ($value['options'] as $key => $val) { |
|
1124 | - $geodir_select_value = ''; |
|
1125 | - if ($option_value != '') { |
|
1126 | - if ($option_value != '' && $option_value == $key) |
|
1127 | - $geodir_select_value = ' selected="selected" '; |
|
1128 | - } else { |
|
1129 | - if ($value['std'] == $key) |
|
1130 | - $geodir_select_value = ' selected="selected" '; |
|
1131 | - } |
|
1132 | - ?> |
|
1123 | + foreach ($value['options'] as $key => $val) { |
|
1124 | + $geodir_select_value = ''; |
|
1125 | + if ($option_value != '') { |
|
1126 | + if ($option_value != '' && $option_value == $key) |
|
1127 | + $geodir_select_value = ' selected="selected" '; |
|
1128 | + } else { |
|
1129 | + if ($value['std'] == $key) |
|
1130 | + $geodir_select_value = ' selected="selected" '; |
|
1131 | + } |
|
1132 | + ?> |
|
1133 | 1133 | <option |
1134 | 1134 | value="<?php echo esc_attr($key); ?>" <?php echo $geodir_select_value; ?> ><?php echo geodir_utf8_ucfirst($val) ?></option> |
1135 | 1135 | <?php |
1136 | - } |
|
1137 | - ?> |
|
1136 | + } |
|
1137 | + ?> |
|
1138 | 1138 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
1139 | 1139 | </td> |
1140 | 1140 | </tr><?php |
1141 | - break; |
|
1141 | + break; |
|
1142 | 1142 | |
1143 | - case 'multiselect': |
|
1144 | - $option_values = get_option($value['id']); |
|
1145 | - if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) { |
|
1146 | - $option_values = $value['std']; |
|
1147 | - } |
|
1148 | - $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values; |
|
1149 | - ?> |
|
1143 | + case 'multiselect': |
|
1144 | + $option_values = get_option($value['id']); |
|
1145 | + if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) { |
|
1146 | + $option_values = $value['std']; |
|
1147 | + } |
|
1148 | + $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values; |
|
1149 | + ?> |
|
1150 | 1150 | <tr valign="top"> |
1151 | 1151 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
1152 | 1152 | <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]" |
@@ -1156,26 +1156,26 @@ discard block |
||
1156 | 1156 | data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>" |
1157 | 1157 | option-ajaxchosen="false"> |
1158 | 1158 | <?php |
1159 | - foreach ($value['options'] as $key => $val) { |
|
1160 | - if (strpos($key, 'optgroup_start-') === 0) { |
|
1161 | - ?><optgroup label="<?php echo geodir_utf8_ucfirst($val); ?>"><?php |
|
1162 | - } else if (strpos($key, 'optgroup_end-') === 0) { |
|
1163 | - ?></optgroup><?php |
|
1164 | - } else { |
|
1165 | - ?> |
|
1159 | + foreach ($value['options'] as $key => $val) { |
|
1160 | + if (strpos($key, 'optgroup_start-') === 0) { |
|
1161 | + ?><optgroup label="<?php echo geodir_utf8_ucfirst($val); ?>"><?php |
|
1162 | + } else if (strpos($key, 'optgroup_end-') === 0) { |
|
1163 | + ?></optgroup><?php |
|
1164 | + } else { |
|
1165 | + ?> |
|
1166 | 1166 | <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>> |
1167 | 1167 | <?php echo geodir_utf8_ucfirst($val) ?> |
1168 | 1168 | </option> |
1169 | 1169 | <?php |
1170 | - } |
|
1171 | - } |
|
1172 | - ?> |
|
1170 | + } |
|
1171 | + } |
|
1172 | + ?> |
|
1173 | 1173 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
1174 | 1174 | </td> |
1175 | 1175 | </tr><?php |
1176 | - break; |
|
1177 | - case 'file': |
|
1178 | - ?> |
|
1176 | + break; |
|
1177 | + case 'file': |
|
1178 | + ?> |
|
1179 | 1179 | <tr valign="top"> |
1180 | 1180 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
1181 | 1181 | <td class="forminp"> |
@@ -1195,87 +1195,87 @@ discard block |
||
1195 | 1195 | <?php } ?> |
1196 | 1196 | </td> |
1197 | 1197 | </tr><?php |
1198 | - break; |
|
1199 | - case 'map_default_settings' : |
|
1200 | - ?> |
|
1198 | + break; |
|
1199 | + case 'map_default_settings' : |
|
1200 | + ?> |
|
1201 | 1201 | |
1202 | 1202 | <tr valign="top"> |
1203 | 1203 | <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th> |
1204 | 1204 | <td width="60%"> |
1205 | 1205 | <select name="geodir_default_map_language" style="width:60%"> |
1206 | 1206 | <?php |
1207 | - $arr_map_langages = array( |
|
1208 | - 'ar' => __('ARABIC', 'geodirectory'), |
|
1209 | - 'eu' => __('BASQUE', 'geodirectory'), |
|
1210 | - 'bg' => __('BULGARIAN', 'geodirectory'), |
|
1211 | - 'bn' => __('BENGALI', 'geodirectory'), |
|
1212 | - 'ca' => __('CATALAN', 'geodirectory'), |
|
1213 | - 'cs' => __('CZECH', 'geodirectory'), |
|
1214 | - 'da' => __('DANISH', 'geodirectory'), |
|
1215 | - 'de' => __('GERMAN', 'geodirectory'), |
|
1216 | - 'el' => __('GREEK', 'geodirectory'), |
|
1217 | - 'en' => __('ENGLISH', 'geodirectory'), |
|
1218 | - 'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'), |
|
1219 | - 'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'), |
|
1220 | - 'es' => __('SPANISH', 'geodirectory'), |
|
1221 | - 'eu' => __('BASQUE', 'geodirectory'), |
|
1222 | - 'fa' => __('FARSI', 'geodirectory'), |
|
1223 | - 'fi' => __('FINNISH', 'geodirectory'), |
|
1224 | - 'fil' => __('FILIPINO', 'geodirectory'), |
|
1225 | - 'fr' => __('FRENCH', 'geodirectory'), |
|
1226 | - 'gl' => __('GALICIAN', 'geodirectory'), |
|
1227 | - 'gu' => __('GUJARATI', 'geodirectory'), |
|
1228 | - 'hi' => __('HINDI', 'geodirectory'), |
|
1229 | - 'hr' => __('CROATIAN', 'geodirectory'), |
|
1230 | - 'hu' => __('HUNGARIAN', 'geodirectory'), |
|
1231 | - 'id' => __('INDONESIAN', 'geodirectory'), |
|
1232 | - 'it' => __('ITALIAN', 'geodirectory'), |
|
1233 | - 'iw' => __('HEBREW', 'geodirectory'), |
|
1234 | - 'ja' => __('JAPANESE', 'geodirectory'), |
|
1235 | - 'kn' => __('KANNADA', 'geodirectory'), |
|
1236 | - 'ko' => __('KOREAN', 'geodirectory'), |
|
1237 | - 'lt' => __('LITHUANIAN', 'geodirectory'), |
|
1238 | - 'lv' => __('LATVIAN', 'geodirectory'), |
|
1239 | - 'ml' => __('MALAYALAM', 'geodirectory'), |
|
1240 | - 'mr' => __('MARATHI', 'geodirectory'), |
|
1241 | - 'nl' => __('DUTCH', 'geodirectory'), |
|
1242 | - 'no' => __('NORWEGIAN', 'geodirectory'), |
|
1243 | - 'pl' => __('POLISH', 'geodirectory'), |
|
1244 | - 'pt' => __('PORTUGUESE', 'geodirectory'), |
|
1245 | - 'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'), |
|
1246 | - 'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'), |
|
1247 | - 'ro' => __('ROMANIAN', 'geodirectory'), |
|
1248 | - 'ru' => __('RUSSIAN', 'geodirectory'), |
|
1249 | - 'ru' => __('RUSSIAN', 'geodirectory'), |
|
1250 | - 'sk' => __('SLOVAK', 'geodirectory'), |
|
1251 | - 'sl' => __('SLOVENIAN', 'geodirectory'), |
|
1252 | - 'sr' => __('SERBIAN', 'geodirectory'), |
|
1253 | - 'sv' => __(' SWEDISH', 'geodirectory'), |
|
1254 | - 'tl' => __('TAGALOG', 'geodirectory'), |
|
1255 | - 'ta' => __('TAMIL', 'geodirectory'), |
|
1256 | - 'te' => __('TELUGU', 'geodirectory'), |
|
1257 | - 'th' => __('THAI', 'geodirectory'), |
|
1258 | - 'tr' => __('TURKISH', 'geodirectory'), |
|
1259 | - 'uk' => __('UKRAINIAN', 'geodirectory'), |
|
1260 | - 'vi' => __('VIETNAMESE', 'geodirectory'), |
|
1261 | - 'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'), |
|
1262 | - 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'), |
|
1263 | - ); |
|
1264 | - $geodir_default_map_language = get_option('geodir_default_map_language'); |
|
1265 | - if (empty($geodir_default_map_language)) |
|
1266 | - $geodir_default_map_language = 'en'; |
|
1267 | - foreach ($arr_map_langages as $language_key => $language_txt) { |
|
1268 | - if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) |
|
1269 | - $geodir_default_language_selected = "selected='selected'"; |
|
1270 | - else |
|
1271 | - $geodir_default_language_selected = ''; |
|
1272 | - |
|
1273 | - ?> |
|
1207 | + $arr_map_langages = array( |
|
1208 | + 'ar' => __('ARABIC', 'geodirectory'), |
|
1209 | + 'eu' => __('BASQUE', 'geodirectory'), |
|
1210 | + 'bg' => __('BULGARIAN', 'geodirectory'), |
|
1211 | + 'bn' => __('BENGALI', 'geodirectory'), |
|
1212 | + 'ca' => __('CATALAN', 'geodirectory'), |
|
1213 | + 'cs' => __('CZECH', 'geodirectory'), |
|
1214 | + 'da' => __('DANISH', 'geodirectory'), |
|
1215 | + 'de' => __('GERMAN', 'geodirectory'), |
|
1216 | + 'el' => __('GREEK', 'geodirectory'), |
|
1217 | + 'en' => __('ENGLISH', 'geodirectory'), |
|
1218 | + 'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'), |
|
1219 | + 'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'), |
|
1220 | + 'es' => __('SPANISH', 'geodirectory'), |
|
1221 | + 'eu' => __('BASQUE', 'geodirectory'), |
|
1222 | + 'fa' => __('FARSI', 'geodirectory'), |
|
1223 | + 'fi' => __('FINNISH', 'geodirectory'), |
|
1224 | + 'fil' => __('FILIPINO', 'geodirectory'), |
|
1225 | + 'fr' => __('FRENCH', 'geodirectory'), |
|
1226 | + 'gl' => __('GALICIAN', 'geodirectory'), |
|
1227 | + 'gu' => __('GUJARATI', 'geodirectory'), |
|
1228 | + 'hi' => __('HINDI', 'geodirectory'), |
|
1229 | + 'hr' => __('CROATIAN', 'geodirectory'), |
|
1230 | + 'hu' => __('HUNGARIAN', 'geodirectory'), |
|
1231 | + 'id' => __('INDONESIAN', 'geodirectory'), |
|
1232 | + 'it' => __('ITALIAN', 'geodirectory'), |
|
1233 | + 'iw' => __('HEBREW', 'geodirectory'), |
|
1234 | + 'ja' => __('JAPANESE', 'geodirectory'), |
|
1235 | + 'kn' => __('KANNADA', 'geodirectory'), |
|
1236 | + 'ko' => __('KOREAN', 'geodirectory'), |
|
1237 | + 'lt' => __('LITHUANIAN', 'geodirectory'), |
|
1238 | + 'lv' => __('LATVIAN', 'geodirectory'), |
|
1239 | + 'ml' => __('MALAYALAM', 'geodirectory'), |
|
1240 | + 'mr' => __('MARATHI', 'geodirectory'), |
|
1241 | + 'nl' => __('DUTCH', 'geodirectory'), |
|
1242 | + 'no' => __('NORWEGIAN', 'geodirectory'), |
|
1243 | + 'pl' => __('POLISH', 'geodirectory'), |
|
1244 | + 'pt' => __('PORTUGUESE', 'geodirectory'), |
|
1245 | + 'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'), |
|
1246 | + 'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'), |
|
1247 | + 'ro' => __('ROMANIAN', 'geodirectory'), |
|
1248 | + 'ru' => __('RUSSIAN', 'geodirectory'), |
|
1249 | + 'ru' => __('RUSSIAN', 'geodirectory'), |
|
1250 | + 'sk' => __('SLOVAK', 'geodirectory'), |
|
1251 | + 'sl' => __('SLOVENIAN', 'geodirectory'), |
|
1252 | + 'sr' => __('SERBIAN', 'geodirectory'), |
|
1253 | + 'sv' => __(' SWEDISH', 'geodirectory'), |
|
1254 | + 'tl' => __('TAGALOG', 'geodirectory'), |
|
1255 | + 'ta' => __('TAMIL', 'geodirectory'), |
|
1256 | + 'te' => __('TELUGU', 'geodirectory'), |
|
1257 | + 'th' => __('THAI', 'geodirectory'), |
|
1258 | + 'tr' => __('TURKISH', 'geodirectory'), |
|
1259 | + 'uk' => __('UKRAINIAN', 'geodirectory'), |
|
1260 | + 'vi' => __('VIETNAMESE', 'geodirectory'), |
|
1261 | + 'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'), |
|
1262 | + 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'), |
|
1263 | + ); |
|
1264 | + $geodir_default_map_language = get_option('geodir_default_map_language'); |
|
1265 | + if (empty($geodir_default_map_language)) |
|
1266 | + $geodir_default_map_language = 'en'; |
|
1267 | + foreach ($arr_map_langages as $language_key => $language_txt) { |
|
1268 | + if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) |
|
1269 | + $geodir_default_language_selected = "selected='selected'"; |
|
1270 | + else |
|
1271 | + $geodir_default_language_selected = ''; |
|
1272 | + |
|
1273 | + ?> |
|
1274 | 1274 | <option |
1275 | 1275 | value="<?php echo $language_key?>" <?php echo $geodir_default_language_selected; ?>><?php echo $language_txt; ?></option> |
1276 | 1276 | |
1277 | 1277 | <?php } |
1278 | - ?> |
|
1278 | + ?> |
|
1279 | 1279 | </select> |
1280 | 1280 | </td> |
1281 | 1281 | </tr> |
@@ -1286,46 +1286,46 @@ discard block |
||
1286 | 1286 | <td width="60%"> |
1287 | 1287 | <select name="geodir_default_map_search_pt" style="width:60%"> |
1288 | 1288 | <?php |
1289 | - $post_types = geodir_get_posttypes('array'); |
|
1290 | - $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt'); |
|
1291 | - if (empty($geodir_default_map_search_pt)) |
|
1292 | - $geodir_default_map_search_pt = 'gd_place'; |
|
1293 | - if (is_array($post_types)) { |
|
1294 | - foreach ($post_types as $key => $post_types_obj) { |
|
1295 | - if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) |
|
1296 | - $geodir_search_pt_selected = "selected='selected'"; |
|
1297 | - else |
|
1298 | - $geodir_search_pt_selected = ''; |
|
1299 | - |
|
1300 | - ?> |
|
1289 | + $post_types = geodir_get_posttypes('array'); |
|
1290 | + $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt'); |
|
1291 | + if (empty($geodir_default_map_search_pt)) |
|
1292 | + $geodir_default_map_search_pt = 'gd_place'; |
|
1293 | + if (is_array($post_types)) { |
|
1294 | + foreach ($post_types as $key => $post_types_obj) { |
|
1295 | + if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) |
|
1296 | + $geodir_search_pt_selected = "selected='selected'"; |
|
1297 | + else |
|
1298 | + $geodir_search_pt_selected = ''; |
|
1299 | + |
|
1300 | + ?> |
|
1301 | 1301 | <option |
1302 | 1302 | value="<?php echo $key?>" <?php echo $geodir_search_pt_selected; ?>><?php echo __($post_types_obj['labels']['singular_name'], 'geodirectory'); ?></option> |
1303 | 1303 | |
1304 | 1304 | <?php } |
1305 | 1305 | |
1306 | - } |
|
1306 | + } |
|
1307 | 1307 | |
1308 | - ?> |
|
1308 | + ?> |
|
1309 | 1309 | </select> |
1310 | 1310 | </td> |
1311 | 1311 | </tr> |
1312 | 1312 | |
1313 | 1313 | <?php |
1314 | - break; |
|
1314 | + break; |
|
1315 | 1315 | |
1316 | - case 'map': |
|
1317 | - ?> |
|
1316 | + case 'map': |
|
1317 | + ?> |
|
1318 | 1318 | <tr valign="top"> |
1319 | 1319 | <td class="forminp"> |
1320 | 1320 | <?php |
1321 | - global $post_cat, $cat_display; |
|
1322 | - $post_types = geodir_get_posttypes('object'); |
|
1323 | - $cat_display = 'checkbox'; |
|
1324 | - $gd_post_types = get_option('geodir_exclude_post_type_on_map'); |
|
1325 | - $gd_cats = get_option('geodir_exclude_cat_on_map'); |
|
1326 | - $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade'); |
|
1327 | - $count = 1; |
|
1328 | - ?> |
|
1321 | + global $post_cat, $cat_display; |
|
1322 | + $post_types = geodir_get_posttypes('object'); |
|
1323 | + $cat_display = 'checkbox'; |
|
1324 | + $gd_post_types = get_option('geodir_exclude_post_type_on_map'); |
|
1325 | + $gd_cats = get_option('geodir_exclude_cat_on_map'); |
|
1326 | + $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade'); |
|
1327 | + $count = 1; |
|
1328 | + ?> |
|
1329 | 1329 | <table width="70%" class="widefat"> |
1330 | 1330 | <thead> |
1331 | 1331 | <tr> |
@@ -1334,18 +1334,18 @@ discard block |
||
1334 | 1334 | <th><b><?php echo DESIGN_POST_TYPE_CAT; ?></b></th> |
1335 | 1335 | </tr> |
1336 | 1336 | <?php |
1337 | - $gd_categs = $gd_cats; |
|
1338 | - foreach ($post_types as $key => $post_types_obj) : |
|
1339 | - $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : ''; |
|
1340 | - $gd_taxonomy = geodir_get_taxonomies($key); |
|
1341 | - if ($gd_cats_upgrade) { |
|
1342 | - $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : ''; |
|
1343 | - $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array(); |
|
1344 | - $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array(); |
|
1345 | - } |
|
1346 | - $post_cat = implode(',', $gd_cats); |
|
1347 | - $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy); |
|
1348 | - ?> |
|
1337 | + $gd_categs = $gd_cats; |
|
1338 | + foreach ($post_types as $key => $post_types_obj) : |
|
1339 | + $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : ''; |
|
1340 | + $gd_taxonomy = geodir_get_taxonomies($key); |
|
1341 | + if ($gd_cats_upgrade) { |
|
1342 | + $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : ''; |
|
1343 | + $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array(); |
|
1344 | + $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array(); |
|
1345 | + } |
|
1346 | + $post_cat = implode(',', $gd_cats); |
|
1347 | + $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy); |
|
1348 | + ?> |
|
1349 | 1349 | <tr> |
1350 | 1350 | <td valign="top" width="5%"><?php echo $count; ?></td> |
1351 | 1351 | <td valign="top" width="25%" id="td_post_types"><input type="checkbox" |
@@ -1366,19 +1366,19 @@ discard block |
||
1366 | 1366 | </td> |
1367 | 1367 | </tr> |
1368 | 1368 | <?php |
1369 | - break; |
|
1369 | + break; |
|
1370 | 1370 | |
1371 | - case 'checkbox' : |
|
1371 | + case 'checkbox' : |
|
1372 | 1372 | |
1373 | - if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) : |
|
1374 | - ?> |
|
1373 | + if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) : |
|
1374 | + ?> |
|
1375 | 1375 | <tr valign="top"> |
1376 | 1376 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
1377 | 1377 | <td class="forminp"> |
1378 | 1378 | <?php |
1379 | - endif; |
|
1379 | + endif; |
|
1380 | 1380 | |
1381 | - ?> |
|
1381 | + ?> |
|
1382 | 1382 | <fieldset> |
1383 | 1383 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
1384 | 1384 | <label for="<?php echo $value['id'] ?>"> |
@@ -1388,49 +1388,49 @@ discard block |
||
1388 | 1388 | </fieldset> |
1389 | 1389 | <?php |
1390 | 1390 | |
1391 | - if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) : |
|
1392 | - ?> |
|
1391 | + if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) : |
|
1392 | + ?> |
|
1393 | 1393 | </td> |
1394 | 1394 | </tr> |
1395 | 1395 | <?php |
1396 | - endif; |
|
1396 | + endif; |
|
1397 | 1397 | |
1398 | - break; |
|
1398 | + break; |
|
1399 | 1399 | |
1400 | - case 'radio' : |
|
1400 | + case 'radio' : |
|
1401 | 1401 | |
1402 | - if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) : |
|
1403 | - ?> |
|
1402 | + if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) : |
|
1403 | + ?> |
|
1404 | 1404 | <tr valign="top"> |
1405 | 1405 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
1406 | 1406 | <td class="forminp"> |
1407 | 1407 | <?php |
1408 | - endif; |
|
1408 | + endif; |
|
1409 | 1409 | |
1410 | - ?> |
|
1410 | + ?> |
|
1411 | 1411 | <fieldset> |
1412 | 1412 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
1413 | 1413 | <label for="<?php echo $value['id'];?>"> |
1414 | 1414 | <input name="<?php echo esc_attr($value['id']); ?>" |
1415 | 1415 | id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio" |
1416 | 1416 | value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) { |
1417 | - echo 'checked="checked"'; |
|
1418 | - }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> /> |
|
1417 | + echo 'checked="checked"'; |
|
1418 | + }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> /> |
|
1419 | 1419 | <?php echo $value['desc']; ?></label><br> |
1420 | 1420 | </fieldset> |
1421 | 1421 | <?php |
1422 | 1422 | |
1423 | - if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) : |
|
1424 | - ?> |
|
1423 | + if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) : |
|
1424 | + ?> |
|
1425 | 1425 | </td> |
1426 | 1426 | </tr> |
1427 | 1427 | <?php |
1428 | - endif; |
|
1428 | + endif; |
|
1429 | 1429 | |
1430 | - break; |
|
1430 | + break; |
|
1431 | 1431 | |
1432 | - case 'textarea': |
|
1433 | - ?> |
|
1432 | + case 'textarea': |
|
1433 | + ?> |
|
1434 | 1434 | <tr valign="top"> |
1435 | 1435 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
1436 | 1436 | <td class="forminp"> |
@@ -1443,30 +1443,30 @@ discard block |
||
1443 | 1443 | |
1444 | 1444 | </td> |
1445 | 1445 | </tr><?php |
1446 | - break; |
|
1446 | + break; |
|
1447 | 1447 | |
1448 | - case 'editor': |
|
1449 | - ?> |
|
1448 | + case 'editor': |
|
1449 | + ?> |
|
1450 | 1450 | <tr valign="top"> |
1451 | 1451 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
1452 | 1452 | <td class="forminp"><?php |
1453 | - if (get_option($value['id'])) |
|
1454 | - $content = stripslashes(get_option($value['id'])); |
|
1455 | - else |
|
1456 | - $content = $value['std']; |
|
1453 | + if (get_option($value['id'])) |
|
1454 | + $content = stripslashes(get_option($value['id'])); |
|
1455 | + else |
|
1456 | + $content = $value['std']; |
|
1457 | 1457 | |
1458 | - $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); |
|
1458 | + $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); |
|
1459 | 1459 | |
1460 | - wp_editor($content, esc_attr($value['id']), $editor_settings); |
|
1460 | + wp_editor($content, esc_attr($value['id']), $editor_settings); |
|
1461 | 1461 | |
1462 | - ?> <span class="description"><?php echo $value['desc'] ?></span> |
|
1462 | + ?> <span class="description"><?php echo $value['desc'] ?></span> |
|
1463 | 1463 | |
1464 | 1464 | </td> |
1465 | 1465 | </tr><?php |
1466 | - break; |
|
1466 | + break; |
|
1467 | 1467 | |
1468 | - case 'single_select_page' : |
|
1469 | - // WPML |
|
1468 | + case 'single_select_page' : |
|
1469 | + // WPML |
|
1470 | 1470 | $switch_lang = false; |
1471 | 1471 | $disabled = ''; |
1472 | 1472 | if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') { |
@@ -1484,18 +1484,18 @@ discard block |
||
1484 | 1484 | // |
1485 | 1485 | $page_setting = (int)get_option($value['id']); |
1486 | 1486 | |
1487 | - $args = array('name' => $value['id'], |
|
1488 | - 'id' => $value['id'], |
|
1489 | - 'sort_column' => 'menu_order', |
|
1490 | - 'sort_order' => 'ASC', |
|
1491 | - 'show_option_none' => ' ', |
|
1492 | - 'class' => $value['class'], |
|
1493 | - 'echo' => false, |
|
1494 | - 'selected' => $page_setting); |
|
1487 | + $args = array('name' => $value['id'], |
|
1488 | + 'id' => $value['id'], |
|
1489 | + 'sort_column' => 'menu_order', |
|
1490 | + 'sort_order' => 'ASC', |
|
1491 | + 'show_option_none' => ' ', |
|
1492 | + 'class' => $value['class'], |
|
1493 | + 'echo' => false, |
|
1494 | + 'selected' => $page_setting); |
|
1495 | 1495 | |
1496 | - if (isset($value['args'])) $args = wp_parse_args($value['args'], $args); |
|
1496 | + if (isset($value['args'])) $args = wp_parse_args($value['args'], $args); |
|
1497 | 1497 | |
1498 | - ?> |
|
1498 | + ?> |
|
1499 | 1499 | <tr valign="top" class="single_select_page"> |
1500 | 1500 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
1501 | 1501 | <td class="forminp"> |
@@ -1506,17 +1506,17 @@ discard block |
||
1506 | 1506 | if ($switch_lang) { |
1507 | 1507 | $sitepress->switch_lang($switch_lang, true); |
1508 | 1508 | } |
1509 | - break; |
|
1510 | - case 'single_select_country' : |
|
1511 | - $country_setting = (string)get_option($value['id']); |
|
1512 | - if (strstr($country_setting, ':')) : |
|
1513 | - $country = current(explode(':', $country_setting)); |
|
1514 | - $state = end(explode(':', $country_setting)); |
|
1515 | - else : |
|
1516 | - $country = $country_setting; |
|
1517 | - $state = '*'; |
|
1518 | - endif; |
|
1519 | - ?> |
|
1509 | + break; |
|
1510 | + case 'single_select_country' : |
|
1511 | + $country_setting = (string)get_option($value['id']); |
|
1512 | + if (strstr($country_setting, ':')) : |
|
1513 | + $country = current(explode(':', $country_setting)); |
|
1514 | + $state = end(explode(':', $country_setting)); |
|
1515 | + else : |
|
1516 | + $country = $country_setting; |
|
1517 | + $state = '*'; |
|
1518 | + endif; |
|
1519 | + ?> |
|
1520 | 1520 | <tr valign="top"> |
1521 | 1521 | <th scope="rpw" class="titledesc"><?php echo $value['name'] ?></th> |
1522 | 1522 | <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>" |
@@ -1527,12 +1527,12 @@ discard block |
||
1527 | 1527 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
1528 | 1528 | </td> |
1529 | 1529 | </tr><?php |
1530 | - break; |
|
1531 | - case 'multi_select_countries' : |
|
1532 | - $countries = $geodirectory->countries->countries; |
|
1533 | - asort($countries); |
|
1534 | - $selections = (array)get_option($value['id']); |
|
1535 | - ?> |
|
1530 | + break; |
|
1531 | + case 'multi_select_countries' : |
|
1532 | + $countries = $geodirectory->countries->countries; |
|
1533 | + asort($countries); |
|
1534 | + $selections = (array)get_option($value['id']); |
|
1535 | + ?> |
|
1536 | 1536 | <tr valign="top"> |
1537 | 1537 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
1538 | 1538 | <td class="forminp"> |
@@ -1540,21 +1540,21 @@ discard block |
||
1540 | 1540 | data-placeholder="<?php _e('Choose countries…', 'geodirectory'); ?>" |
1541 | 1541 | title="Country" class="chosen_select"> |
1542 | 1542 | <?php |
1543 | - if ($countries) foreach ($countries as $key => $val) : |
|
1544 | - echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
1545 | - endforeach; |
|
1546 | - ?> |
|
1543 | + if ($countries) foreach ($countries as $key => $val) : |
|
1544 | + echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
1545 | + endforeach; |
|
1546 | + ?> |
|
1547 | 1547 | </select> |
1548 | 1548 | </td> |
1549 | 1549 | </tr> |
1550 | 1550 | |
1551 | 1551 | <?php |
1552 | 1552 | |
1553 | - break; |
|
1553 | + break; |
|
1554 | 1554 | |
1555 | - case 'google_analytics' : |
|
1556 | - $selections = (array)get_option($value['id']); |
|
1557 | - ?> |
|
1555 | + case 'google_analytics' : |
|
1556 | + $selections = (array)get_option($value['id']); |
|
1557 | + ?> |
|
1558 | 1558 | <tr valign="top"> |
1559 | 1559 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
1560 | 1560 | <td class="forminp"> |
@@ -1562,62 +1562,62 @@ discard block |
||
1562 | 1562 | |
1563 | 1563 | <?php |
1564 | 1564 | |
1565 | - $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
|
1566 | - $scope = "scope=https://www.googleapis.com/auth/analytics.readonly"; |
|
1567 | - $state = "&state=123";//any string |
|
1568 | - $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback"; |
|
1569 | - $response_type = "&response_type=code"; |
|
1570 | - $client_id = "&client_id=".get_option('geodir_ga_client_id'); |
|
1571 | - $access_type = "&access_type=offline"; |
|
1572 | - $approval_prompt = "&approval_prompt=force"; |
|
1565 | + $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
|
1566 | + $scope = "scope=https://www.googleapis.com/auth/analytics.readonly"; |
|
1567 | + $state = "&state=123";//any string |
|
1568 | + $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback"; |
|
1569 | + $response_type = "&response_type=code"; |
|
1570 | + $client_id = "&client_id=".get_option('geodir_ga_client_id'); |
|
1571 | + $access_type = "&access_type=offline"; |
|
1572 | + $approval_prompt = "&approval_prompt=force"; |
|
1573 | 1573 | |
1574 | - $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt; |
|
1574 | + $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt; |
|
1575 | 1575 | |
1576 | 1576 | |
1577 | - if (get_option('geodir_ga_auth_token')) { |
|
1578 | - ?> |
|
1577 | + if (get_option('geodir_ga_auth_token')) { |
|
1578 | + ?> |
|
1579 | 1579 | <span class="button-primary" |
1580 | 1580 | onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize');?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span> |
1581 | 1581 | <span style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span> |
1582 | 1582 | <?php |
1583 | - global $gd_ga_errors; |
|
1584 | - if(!empty($gd_ga_errors)){ |
|
1585 | - print_r($gd_ga_errors); |
|
1586 | - } |
|
1587 | - } else { |
|
1588 | - ?> |
|
1583 | + global $gd_ga_errors; |
|
1584 | + if(!empty($gd_ga_errors)){ |
|
1585 | + print_r($gd_ga_errors); |
|
1586 | + } |
|
1587 | + } else { |
|
1588 | + ?> |
|
1589 | 1589 | <span class="button-primary" |
1590 | 1590 | onclick="window.open('<?php echo geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory');?></span> |
1591 | 1591 | <?php |
1592 | - } |
|
1593 | - ?> |
|
1592 | + } |
|
1593 | + ?> |
|
1594 | 1594 | </td> |
1595 | 1595 | </tr> |
1596 | 1596 | |
1597 | 1597 | <?php |
1598 | 1598 | |
1599 | 1599 | |
1600 | - break; |
|
1600 | + break; |
|
1601 | 1601 | |
1602 | - case 'field_seperator' : |
|
1602 | + case 'field_seperator' : |
|
1603 | 1603 | |
1604 | - ?> |
|
1604 | + ?> |
|
1605 | 1605 | <tr valign="top"> |
1606 | 1606 | <td colspan="2" class="forminp geodir_line_seperator"></td> |
1607 | 1607 | </tr> |
1608 | 1608 | <?php |
1609 | 1609 | |
1610 | - break; |
|
1610 | + break; |
|
1611 | 1611 | |
1612 | - endswitch; |
|
1612 | + endswitch; |
|
1613 | 1613 | |
1614 | - endforeach; |
|
1614 | + endforeach; |
|
1615 | 1615 | |
1616 | - if ($first_title === false) { |
|
1617 | - echo "</div>"; |
|
1618 | - } |
|
1616 | + if ($first_title === false) { |
|
1617 | + echo "</div>"; |
|
1618 | + } |
|
1619 | 1619 | |
1620 | - ?> |
|
1620 | + ?> |
|
1621 | 1621 | |
1622 | 1622 | <script type="text/javascript"> |
1623 | 1623 | |
@@ -1677,33 +1677,33 @@ discard block |
||
1677 | 1677 | */ |
1678 | 1678 | function geodir_post_info_setting() |
1679 | 1679 | { |
1680 | - global $post, $post_id; |
|
1681 | - |
|
1682 | - $post_type = get_post_type(); |
|
1683 | - |
|
1684 | - $package_info = array(); |
|
1685 | - |
|
1686 | - $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
1687 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename'); |
|
1688 | - echo '<div id="geodir_wrapper">'; |
|
1689 | - /** |
|
1690 | - * Called before the GD custom fields are output in the wp-admin area. |
|
1691 | - * |
|
1692 | - * @since 1.0.0 |
|
1693 | - * @see 'geodir_after_default_field_in_meta_box' |
|
1694 | - */ |
|
1695 | - do_action('geodir_before_default_field_in_meta_box'); |
|
1696 | - //geodir_get_custom_fields_html($package_info->pid,'default',$post_type); |
|
1697 | - // to display all fields in one information box |
|
1698 | - geodir_get_custom_fields_html($package_info->pid, 'all', $post_type); |
|
1699 | - /** |
|
1700 | - * Called after the GD custom fields are output in the wp-admin area. |
|
1701 | - * |
|
1702 | - * @since 1.0.0 |
|
1703 | - * @see 'geodir_before_default_field_in_meta_box' |
|
1704 | - */ |
|
1705 | - do_action('geodir_after_default_field_in_meta_box'); |
|
1706 | - echo '</div>'; |
|
1680 | + global $post, $post_id; |
|
1681 | + |
|
1682 | + $post_type = get_post_type(); |
|
1683 | + |
|
1684 | + $package_info = array(); |
|
1685 | + |
|
1686 | + $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
1687 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename'); |
|
1688 | + echo '<div id="geodir_wrapper">'; |
|
1689 | + /** |
|
1690 | + * Called before the GD custom fields are output in the wp-admin area. |
|
1691 | + * |
|
1692 | + * @since 1.0.0 |
|
1693 | + * @see 'geodir_after_default_field_in_meta_box' |
|
1694 | + */ |
|
1695 | + do_action('geodir_before_default_field_in_meta_box'); |
|
1696 | + //geodir_get_custom_fields_html($package_info->pid,'default',$post_type); |
|
1697 | + // to display all fields in one information box |
|
1698 | + geodir_get_custom_fields_html($package_info->pid, 'all', $post_type); |
|
1699 | + /** |
|
1700 | + * Called after the GD custom fields are output in the wp-admin area. |
|
1701 | + * |
|
1702 | + * @since 1.0.0 |
|
1703 | + * @see 'geodir_before_default_field_in_meta_box' |
|
1704 | + */ |
|
1705 | + do_action('geodir_after_default_field_in_meta_box'); |
|
1706 | + echo '</div>'; |
|
1707 | 1707 | } |
1708 | 1708 | |
1709 | 1709 | /** |
@@ -1716,18 +1716,18 @@ discard block |
||
1716 | 1716 | */ |
1717 | 1717 | function geodir_post_addinfo_setting() |
1718 | 1718 | { |
1719 | - global $post, $post_id; |
|
1719 | + global $post, $post_id; |
|
1720 | 1720 | |
1721 | - $post_type = get_post_type(); |
|
1721 | + $post_type = get_post_type(); |
|
1722 | 1722 | |
1723 | - $package_info = array(); |
|
1723 | + $package_info = array(); |
|
1724 | 1724 | |
1725 | - $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
1725 | + $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
1726 | 1726 | |
1727 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename'); |
|
1728 | - echo '<div id="geodir_wrapper">'; |
|
1729 | - geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type); |
|
1730 | - echo '</div>'; |
|
1727 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename'); |
|
1728 | + echo '<div id="geodir_wrapper">'; |
|
1729 | + geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type); |
|
1730 | + echo '</div>'; |
|
1731 | 1731 | |
1732 | 1732 | } |
1733 | 1733 | |
@@ -1741,60 +1741,60 @@ discard block |
||
1741 | 1741 | */ |
1742 | 1742 | function geodir_post_attachments() |
1743 | 1743 | { |
1744 | - global $post, $post_id; |
|
1744 | + global $post, $post_id; |
|
1745 | 1745 | |
1746 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
|
1746 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
|
1747 | 1747 | |
1748 | - if (geodir_get_featured_image($post_id, 'thumbnail')) { |
|
1749 | - echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>'; |
|
1750 | - geodir_show_featured_image($post_id, 'thumbnail'); |
|
1751 | - } |
|
1748 | + if (geodir_get_featured_image($post_id, 'thumbnail')) { |
|
1749 | + echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>'; |
|
1750 | + geodir_show_featured_image($post_id, 'thumbnail'); |
|
1751 | + } |
|
1752 | 1752 | |
1753 | - $image_limit = 0; |
|
1753 | + $image_limit = 0; |
|
1754 | 1754 | |
1755 | - ?> |
|
1755 | + ?> |
|
1756 | 1756 | |
1757 | 1757 | |
1758 | 1758 | <h5 class="form_title"> |
1759 | 1759 | <?php if ($image_limit != 0 && $image_limit == 1) { |
1760 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>'; |
|
1761 | - } ?> |
|
1760 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>'; |
|
1761 | + } ?> |
|
1762 | 1762 | <?php if ($image_limit != 0 && $image_limit > 1) { |
1763 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>'; |
|
1764 | - } ?> |
|
1763 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>'; |
|
1764 | + } ?> |
|
1765 | 1765 | <?php if ($image_limit == 0) { |
1766 | - echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>'; |
|
1767 | - } ?> |
|
1766 | + echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>'; |
|
1767 | + } ?> |
|
1768 | 1768 | </h5> |
1769 | 1769 | |
1770 | 1770 | |
1771 | 1771 | <?php |
1772 | 1772 | |
1773 | - $curImages = geodir_get_images($post_id); |
|
1774 | - $place_img_array = array(); |
|
1773 | + $curImages = geodir_get_images($post_id); |
|
1774 | + $place_img_array = array(); |
|
1775 | 1775 | |
1776 | - if (!empty($curImages)): |
|
1777 | - foreach ($curImages as $p_img): |
|
1778 | - $place_img_array[] = $p_img->src; |
|
1779 | - endforeach; |
|
1780 | - endif; |
|
1776 | + if (!empty($curImages)): |
|
1777 | + foreach ($curImages as $p_img): |
|
1778 | + $place_img_array[] = $p_img->src; |
|
1779 | + endforeach; |
|
1780 | + endif; |
|
1781 | 1781 | |
1782 | - if (!empty($place_img_array)) |
|
1783 | - $curImages = implode(',', $place_img_array); |
|
1782 | + if (!empty($place_img_array)) |
|
1783 | + $curImages = implode(',', $place_img_array); |
|
1784 | 1784 | |
1785 | 1785 | |
1786 | - // adjust values here |
|
1787 | - $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls |
|
1786 | + // adjust values here |
|
1787 | + $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls |
|
1788 | 1788 | |
1789 | - $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
1789 | + $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
1790 | 1790 | |
1791 | - $multiple = true; // allow multiple files upload |
|
1791 | + $multiple = true; // allow multiple files upload |
|
1792 | 1792 | |
1793 | - $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
1793 | + $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
1794 | 1794 | |
1795 | - $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
1795 | + $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
1796 | 1796 | |
1797 | - ?> |
|
1797 | + ?> |
|
1798 | 1798 | |
1799 | 1799 | <div class="gtd-form_row clearfix" id="<?php echo $id; ?>dropbox" style="border:1px solid #999999;padding:5px;text-align:center;"> |
1800 | 1800 | <input type="hidden" name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="<?php echo $svalue; ?>"/> |
@@ -1836,13 +1836,13 @@ discard block |
||
1836 | 1836 | */ |
1837 | 1837 | function geodir_action_post_updated($post_ID, $post_after, $post_before) |
1838 | 1838 | { |
1839 | - $post_type = get_post_type($post_ID); |
|
1839 | + $post_type = get_post_type($post_ID); |
|
1840 | 1840 | |
1841 | - if (isset($_POST['action']) && $_POST['action'] == 'inline-save') { |
|
1842 | - if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) { |
|
1843 | - geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title); |
|
1844 | - } |
|
1845 | - } |
|
1841 | + if (isset($_POST['action']) && $_POST['action'] == 'inline-save') { |
|
1842 | + if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) { |
|
1843 | + geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title); |
|
1844 | + } |
|
1845 | + } |
|
1846 | 1846 | } |
1847 | 1847 | |
1848 | 1848 | /** |
@@ -1857,39 +1857,39 @@ discard block |
||
1857 | 1857 | */ |
1858 | 1858 | function geodir_notification_add_bcc_option($settings) |
1859 | 1859 | { |
1860 | - if (!empty($settings)) { |
|
1861 | - $new_settings = array(); |
|
1862 | - foreach ($settings as $setting) { |
|
1863 | - if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') { |
|
1864 | - $geodir_bcc_listing_published_yes = array( |
|
1865 | - 'name' => __('Listing published', 'geodirectory'), |
|
1866 | - 'desc' => __('Yes', 'geodirectory'), |
|
1867 | - 'id' => 'geodir_bcc_listing_published', |
|
1868 | - 'std' => 'yes', |
|
1869 | - 'type' => 'radio', |
|
1870 | - 'value' => '1', |
|
1871 | - 'radiogroup' => 'start' |
|
1872 | - ); |
|
1873 | - |
|
1874 | - $geodir_bcc_listing_published_no = array( |
|
1875 | - 'name' => __('Listing published', 'geodirectory'), |
|
1876 | - 'desc' => __('No', 'geodirectory'), |
|
1877 | - 'id' => 'geodir_bcc_listing_published', |
|
1878 | - 'std' => 'yes', |
|
1879 | - 'type' => 'radio', |
|
1880 | - 'value' => '0', |
|
1881 | - 'radiogroup' => 'end' |
|
1882 | - ); |
|
1883 | - |
|
1884 | - $new_settings[] = $geodir_bcc_listing_published_yes; |
|
1885 | - $new_settings[] = $geodir_bcc_listing_published_no; |
|
1886 | - } |
|
1887 | - $new_settings[] = $setting; |
|
1888 | - } |
|
1889 | - $settings = $new_settings; |
|
1890 | - } |
|
1860 | + if (!empty($settings)) { |
|
1861 | + $new_settings = array(); |
|
1862 | + foreach ($settings as $setting) { |
|
1863 | + if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') { |
|
1864 | + $geodir_bcc_listing_published_yes = array( |
|
1865 | + 'name' => __('Listing published', 'geodirectory'), |
|
1866 | + 'desc' => __('Yes', 'geodirectory'), |
|
1867 | + 'id' => 'geodir_bcc_listing_published', |
|
1868 | + 'std' => 'yes', |
|
1869 | + 'type' => 'radio', |
|
1870 | + 'value' => '1', |
|
1871 | + 'radiogroup' => 'start' |
|
1872 | + ); |
|
1873 | + |
|
1874 | + $geodir_bcc_listing_published_no = array( |
|
1875 | + 'name' => __('Listing published', 'geodirectory'), |
|
1876 | + 'desc' => __('No', 'geodirectory'), |
|
1877 | + 'id' => 'geodir_bcc_listing_published', |
|
1878 | + 'std' => 'yes', |
|
1879 | + 'type' => 'radio', |
|
1880 | + 'value' => '0', |
|
1881 | + 'radiogroup' => 'end' |
|
1882 | + ); |
|
1883 | + |
|
1884 | + $new_settings[] = $geodir_bcc_listing_published_yes; |
|
1885 | + $new_settings[] = $geodir_bcc_listing_published_no; |
|
1886 | + } |
|
1887 | + $new_settings[] = $setting; |
|
1888 | + } |
|
1889 | + $settings = $new_settings; |
|
1890 | + } |
|
1891 | 1891 | |
1892 | - return $settings; |
|
1892 | + return $settings; |
|
1893 | 1893 | } |
1894 | 1894 | |
1895 | 1895 | |
@@ -1904,19 +1904,19 @@ discard block |
||
1904 | 1904 | */ |
1905 | 1905 | function get_gd_theme_compat_callback() |
1906 | 1906 | { |
1907 | - global $wpdb; |
|
1908 | - $themes = get_option('gd_theme_compats'); |
|
1909 | - |
|
1910 | - if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) { |
|
1911 | - if (isset($_POST['export'])) { |
|
1912 | - echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']])); |
|
1913 | - } else { |
|
1914 | - echo json_encode($themes[$_POST['theme']]); |
|
1915 | - } |
|
1907 | + global $wpdb; |
|
1908 | + $themes = get_option('gd_theme_compats'); |
|
1916 | 1909 | |
1917 | - } |
|
1910 | + if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) { |
|
1911 | + if (isset($_POST['export'])) { |
|
1912 | + echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']])); |
|
1913 | + } else { |
|
1914 | + echo json_encode($themes[$_POST['theme']]); |
|
1915 | + } |
|
1916 | + |
|
1917 | + } |
|
1918 | 1918 | |
1919 | - die(); |
|
1919 | + die(); |
|
1920 | 1920 | } |
1921 | 1921 | |
1922 | 1922 | add_action('wp_ajax_get_gd_theme_compat_import_callback', 'get_gd_theme_compat_import_callback'); |
@@ -1930,20 +1930,20 @@ discard block |
||
1930 | 1930 | */ |
1931 | 1931 | function get_gd_theme_compat_import_callback() |
1932 | 1932 | { |
1933 | - global $wpdb; |
|
1934 | - $themes = get_option('gd_theme_compats'); |
|
1935 | - if (isset($_POST['theme']) && !empty($_POST['theme'])) { |
|
1936 | - $json = json_decode(stripslashes($_POST['theme']), true); |
|
1937 | - if (!empty($json) && is_array($json)) { |
|
1938 | - $key = sanitize_text_field(key($json)); |
|
1939 | - $themes[$key] = $json[$key]; |
|
1940 | - update_option('gd_theme_compats', $themes); |
|
1941 | - echo $key; |
|
1942 | - die(); |
|
1943 | - } |
|
1944 | - } |
|
1945 | - echo '0'; |
|
1946 | - die(); |
|
1933 | + global $wpdb; |
|
1934 | + $themes = get_option('gd_theme_compats'); |
|
1935 | + if (isset($_POST['theme']) && !empty($_POST['theme'])) { |
|
1936 | + $json = json_decode(stripslashes($_POST['theme']), true); |
|
1937 | + if (!empty($json) && is_array($json)) { |
|
1938 | + $key = sanitize_text_field(key($json)); |
|
1939 | + $themes[$key] = $json[$key]; |
|
1940 | + update_option('gd_theme_compats', $themes); |
|
1941 | + echo $key; |
|
1942 | + die(); |
|
1943 | + } |
|
1944 | + } |
|
1945 | + echo '0'; |
|
1946 | + die(); |
|
1947 | 1947 | } |
1948 | 1948 | |
1949 | 1949 | |
@@ -1956,39 +1956,39 @@ discard block |
||
1956 | 1956 | */ |
1957 | 1957 | function gd_set_theme_compat() |
1958 | 1958 | { |
1959 | - global $wpdb; |
|
1960 | - $theme = wp_get_theme(); |
|
1959 | + global $wpdb; |
|
1960 | + $theme = wp_get_theme(); |
|
1961 | 1961 | |
1962 | - if ($theme->parent()) { |
|
1963 | - $theme_name = str_replace(" ", "_", $theme->parent()->get('Name')); |
|
1964 | - } else { |
|
1965 | - $theme_name = str_replace(" ", "_", $theme->get('Name')); |
|
1966 | - } |
|
1962 | + if ($theme->parent()) { |
|
1963 | + $theme_name = str_replace(" ", "_", $theme->parent()->get('Name')); |
|
1964 | + } else { |
|
1965 | + $theme_name = str_replace(" ", "_", $theme->get('Name')); |
|
1966 | + } |
|
1967 | 1967 | |
1968 | - $theme_compats = get_option('gd_theme_compats'); |
|
1969 | - $current_compat = get_option('gd_theme_compat'); |
|
1970 | - $current_compat = str_replace("_custom", "", $current_compat); |
|
1968 | + $theme_compats = get_option('gd_theme_compats'); |
|
1969 | + $current_compat = get_option('gd_theme_compat'); |
|
1970 | + $current_compat = str_replace("_custom", "", $current_compat); |
|
1971 | 1971 | |
1972 | - if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) { |
|
1973 | - return; |
|
1974 | - }// if already running correct compat then bail |
|
1972 | + if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) { |
|
1973 | + return; |
|
1974 | + }// if already running correct compat then bail |
|
1975 | 1975 | |
1976 | - if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it |
|
1977 | - update_option('gd_theme_compat', $theme_name); |
|
1978 | - update_option('theme_compatibility_setting', $theme_compats[$theme_name]); |
|
1976 | + if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it |
|
1977 | + update_option('gd_theme_compat', $theme_name); |
|
1978 | + update_option('theme_compatibility_setting', $theme_compats[$theme_name]); |
|
1979 | 1979 | |
1980 | - // if there are default options to set then set them |
|
1981 | - if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) { |
|
1980 | + // if there are default options to set then set them |
|
1981 | + if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) { |
|
1982 | 1982 | |
1983 | - foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) { |
|
1984 | - update_option($key, $val); |
|
1985 | - } |
|
1986 | - } |
|
1983 | + foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) { |
|
1984 | + update_option($key, $val); |
|
1985 | + } |
|
1986 | + } |
|
1987 | 1987 | |
1988 | - } else { |
|
1989 | - update_option('gd_theme_compat', ''); |
|
1990 | - update_option('theme_compatibility_setting', ''); |
|
1991 | - } |
|
1988 | + } else { |
|
1989 | + update_option('gd_theme_compat', ''); |
|
1990 | + update_option('theme_compatibility_setting', ''); |
|
1991 | + } |
|
1992 | 1992 | |
1993 | 1993 | |
1994 | 1994 | } |
@@ -2003,9 +2003,9 @@ discard block |
||
2003 | 2003 | */ |
2004 | 2004 | function gd_check_avada_compat() |
2005 | 2005 | { |
2006 | - if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) { |
|
2007 | - add_action('admin_notices', 'gd_avada_compat_warning'); |
|
2008 | - } |
|
2006 | + if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) { |
|
2007 | + add_action('admin_notices', 'gd_avada_compat_warning'); |
|
2008 | + } |
|
2009 | 2009 | } |
2010 | 2010 | |
2011 | 2011 | |
@@ -2018,22 +2018,22 @@ discard block |
||
2018 | 2018 | function gd_avada_compat_warning() |
2019 | 2019 | { |
2020 | 2020 | |
2021 | - /* |
|
2021 | + /* |
|
2022 | 2022 | $msg_type = error |
2023 | 2023 | $msg_type = updated fade |
2024 | 2024 | $msg_type = update-nag |
2025 | 2025 | */ |
2026 | 2026 | |
2027 | - $plugin = 'avada-nag'; |
|
2028 | - $timestamp = 'avada-nag1234'; |
|
2029 | - $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory'); |
|
2030 | - echo '<div id="' . $timestamp . '" class="error">'; |
|
2031 | - echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fas fa-times"></i></span>'; |
|
2032 | - echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > "; |
|
2033 | - echo "<p>$message</p>"; |
|
2034 | - echo "</div>"; |
|
2027 | + $plugin = 'avada-nag'; |
|
2028 | + $timestamp = 'avada-nag1234'; |
|
2029 | + $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory'); |
|
2030 | + echo '<div id="' . $timestamp . '" class="error">'; |
|
2031 | + echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fas fa-times"></i></span>'; |
|
2032 | + echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > "; |
|
2033 | + echo "<p>$message</p>"; |
|
2034 | + echo "</div>"; |
|
2035 | 2035 | |
2036 | - ?> |
|
2036 | + ?> |
|
2037 | 2037 | <script> |
2038 | 2038 | function gdRemoveANotification($plugin, $timestamp) { |
2039 | 2039 | |
@@ -2101,10 +2101,10 @@ discard block |
||
2101 | 2101 | */ |
2102 | 2102 | function geodir_avada_remove_notification() |
2103 | 2103 | { |
2104 | - update_option('avada_nag', TRUE); |
|
2104 | + update_option('avada_nag', TRUE); |
|
2105 | 2105 | |
2106 | - // Always die in functions echoing ajax content |
|
2107 | - die(); |
|
2106 | + // Always die in functions echoing ajax content |
|
2107 | + die(); |
|
2108 | 2108 | } |
2109 | 2109 | |
2110 | 2110 | |
@@ -2126,11 +2126,11 @@ discard block |
||
2126 | 2126 | global $post, $typenow, $current_screen; |
2127 | 2127 | |
2128 | 2128 | $post_type = NULL; |
2129 | - if (isset($_REQUEST['post_type'])) |
|
2129 | + if (isset($_REQUEST['post_type'])) |
|
2130 | 2130 | $post_type = sanitize_key($_REQUEST['post_type']); |
2131 | - elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) |
|
2131 | + elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) |
|
2132 | 2132 | $post_type = get_post_type($_REQUEST['post']); |
2133 | - elseif ($post && isset($post->post_type)) |
|
2133 | + elseif ($post && isset($post->post_type)) |
|
2134 | 2134 | $post_type = $post->post_type; |
2135 | 2135 | elseif ($typenow) |
2136 | 2136 | $post_type = $typenow; |
@@ -2164,7 +2164,7 @@ discard block |
||
2164 | 2164 | // Don't allow same slug url for listing and location |
2165 | 2165 | if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) { |
2166 | 2166 | $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21'); |
2167 | - wp_redirect($redirect_url); |
|
2167 | + wp_redirect($redirect_url); |
|
2168 | 2168 | exit; |
2169 | 2169 | } |
2170 | 2170 | |
@@ -2194,10 +2194,10 @@ discard block |
||
2194 | 2194 | * @package GeoDirectory |
2195 | 2195 | */ |
2196 | 2196 | function geodir_hide_admin_preview_button() { |
2197 | - global $post_type; |
|
2198 | - $post_types = geodir_get_posttypes(); |
|
2199 | - if(in_array($post_type, $post_types)) |
|
2200 | - echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>'; |
|
2197 | + global $post_type; |
|
2198 | + $post_types = geodir_get_posttypes(); |
|
2199 | + if(in_array($post_type, $post_types)) |
|
2200 | + echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>'; |
|
2201 | 2201 | } |
2202 | 2202 | add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' ); |
2203 | 2203 | add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' ); |
@@ -2212,7 +2212,7 @@ discard block |
||
2212 | 2212 | */ |
2213 | 2213 | function geodir_import_export_tab( $tabs ) { |
2214 | 2214 | $tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) ); |
2215 | - return $tabs; |
|
2215 | + return $tabs; |
|
2216 | 2216 | } |
2217 | 2217 | |
2218 | 2218 | /** |
@@ -2227,26 +2227,26 @@ discard block |
||
2227 | 2227 | function geodir_import_export_page() { |
2228 | 2228 | $nonce = wp_create_nonce( 'geodir_import_export_nonce' ); |
2229 | 2229 | $gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv'; |
2230 | - /** |
|
2231 | - * Filter sample category data csv file url. |
|
2232 | - * |
|
2233 | - * @since 1.0.0 |
|
2234 | - * @package GeoDirectory |
|
2235 | - * |
|
2236 | - * @param string $gd_cats_sample_csv Sample category data csv file url. |
|
2237 | - */ |
|
2230 | + /** |
|
2231 | + * Filter sample category data csv file url. |
|
2232 | + * |
|
2233 | + * @since 1.0.0 |
|
2234 | + * @package GeoDirectory |
|
2235 | + * |
|
2236 | + * @param string $gd_cats_sample_csv Sample category data csv file url. |
|
2237 | + */ |
|
2238 | 2238 | $gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv ); |
2239 | 2239 | |
2240 | 2240 | $gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv'; |
2241 | - /** |
|
2242 | - * Filter sample post data csv file url. |
|
2243 | - * |
|
2244 | - * @since 1.0.0 |
|
2245 | - * @package GeoDirectory |
|
2246 | - * |
|
2247 | - * @param string $gd_posts_sample_csv Sample post data csv file url. |
|
2248 | - */ |
|
2249 | - $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
2241 | + /** |
|
2242 | + * Filter sample post data csv file url. |
|
2243 | + * |
|
2244 | + * @since 1.0.0 |
|
2245 | + * @package GeoDirectory |
|
2246 | + * |
|
2247 | + * @param string $gd_posts_sample_csv Sample post data csv file url. |
|
2248 | + */ |
|
2249 | + $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
2250 | 2250 | |
2251 | 2251 | $gd_posttypes = geodir_get_posttypes( 'array' ); |
2252 | 2252 | |
@@ -2269,14 +2269,14 @@ discard block |
||
2269 | 2269 | $gd_chunksize_options[100000] = 100000; |
2270 | 2270 | |
2271 | 2271 | /** |
2272 | - * Filter max entries per export csv file. |
|
2273 | - * |
|
2274 | - * @since 1.5.6 |
|
2275 | - * @package GeoDirectory |
|
2276 | - * |
|
2277 | - * @param string $gd_chunksize_options Entries options. |
|
2278 | - */ |
|
2279 | - $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options ); |
|
2272 | + * Filter max entries per export csv file. |
|
2273 | + * |
|
2274 | + * @since 1.5.6 |
|
2275 | + * @package GeoDirectory |
|
2276 | + * |
|
2277 | + * @param string $gd_chunksize_options Entries options. |
|
2278 | + */ |
|
2279 | + $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options ); |
|
2280 | 2280 | |
2281 | 2281 | $gd_chunksize_option = ''; |
2282 | 2282 | foreach ($gd_chunksize_options as $value => $title) { |
@@ -2293,12 +2293,12 @@ discard block |
||
2293 | 2293 | <div class="gd-content-heading"> |
2294 | 2294 | |
2295 | 2295 | <?php |
2296 | - @ini_set('max_execution_time', 999999); |
|
2297 | - $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
2298 | - @ini_restore('max_execution_time'); |
|
2296 | + @ini_set('max_execution_time', 999999); |
|
2297 | + $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
2298 | + @ini_restore('max_execution_time'); |
|
2299 | 2299 | |
2300 | - if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting |
|
2301 | - ?> |
|
2300 | + if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting |
|
2301 | + ?> |
|
2302 | 2302 | <div id="gd_ie_reqs" class="metabox-holder"> |
2303 | 2303 | <div class="meta-box-sortables ui-sortable"> |
2304 | 2304 | <div class="postbox"> |
@@ -2473,7 +2473,7 @@ discard block |
||
2473 | 2473 | * Called just after the sample CSV download link. |
2474 | 2474 | * |
2475 | 2475 | * @since 1.0.0 |
2476 | - * @package GeoDirectory |
|
2476 | + * @package GeoDirectory |
|
2477 | 2477 | */ |
2478 | 2478 | do_action('geodir_sample_cats_csv_download_link'); |
2479 | 2479 | ?> |
@@ -2558,11 +2558,11 @@ discard block |
||
2558 | 2558 | * |
2559 | 2559 | * Called after the last setting on the GD > Import & Export page. |
2560 | 2560 | * @since 1.4.6 |
2561 | - * @package GeoDirectory |
|
2561 | + * @package GeoDirectory |
|
2562 | 2562 | * |
2563 | 2563 | * @param array $gd_posttypes GD post types. |
2564 | - * @param array $gd_chunksize_options File chunk size options. |
|
2565 | - * @param string $nonce Wordpress security token for GD import & export. |
|
2564 | + * @param array $gd_chunksize_options File chunk size options. |
|
2565 | + * @param string $nonce Wordpress security token for GD import & export. |
|
2566 | 2566 | */ |
2567 | 2567 | do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce ); |
2568 | 2568 | ?> |
@@ -3249,44 +3249,44 @@ discard block |
||
3249 | 3249 | function geodir_init_filesystem() |
3250 | 3250 | { |
3251 | 3251 | |
3252 | - if(!function_exists('get_filesystem_method')){ |
|
3253 | - require_once(ABSPATH."/wp-admin/includes/file.php"); |
|
3254 | - } |
|
3255 | - $access_type = get_filesystem_method(); |
|
3256 | - if ($access_type === 'direct') { |
|
3257 | - /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */ |
|
3258 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
3259 | - |
|
3260 | - /* initialize the API */ |
|
3261 | - if (!WP_Filesystem($creds)) { |
|
3262 | - /* any problems and we exit */ |
|
3263 | - //return '@@@3'; |
|
3264 | - return false; |
|
3265 | - } |
|
3252 | + if(!function_exists('get_filesystem_method')){ |
|
3253 | + require_once(ABSPATH."/wp-admin/includes/file.php"); |
|
3254 | + } |
|
3255 | + $access_type = get_filesystem_method(); |
|
3256 | + if ($access_type === 'direct') { |
|
3257 | + /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */ |
|
3258 | + $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
3259 | + |
|
3260 | + /* initialize the API */ |
|
3261 | + if (!WP_Filesystem($creds)) { |
|
3262 | + /* any problems and we exit */ |
|
3263 | + //return '@@@3'; |
|
3264 | + return false; |
|
3265 | + } |
|
3266 | 3266 | |
3267 | - global $wp_filesystem; |
|
3268 | - return $wp_filesystem; |
|
3269 | - /* do our file manipulations below */ |
|
3270 | - } elseif (defined('FTP_USER')) { |
|
3271 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
3267 | + global $wp_filesystem; |
|
3268 | + return $wp_filesystem; |
|
3269 | + /* do our file manipulations below */ |
|
3270 | + } elseif (defined('FTP_USER')) { |
|
3271 | + $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
3272 | + |
|
3273 | + /* initialize the API */ |
|
3274 | + if (!WP_Filesystem($creds)) { |
|
3275 | + /* any problems and we exit */ |
|
3276 | + //return '@@@33'; |
|
3277 | + return false; |
|
3278 | + } |
|
3272 | 3279 | |
3273 | - /* initialize the API */ |
|
3274 | - if (!WP_Filesystem($creds)) { |
|
3275 | - /* any problems and we exit */ |
|
3276 | - //return '@@@33'; |
|
3277 | - return false; |
|
3278 | - } |
|
3280 | + global $wp_filesystem; |
|
3281 | + //return '@@@1'; |
|
3282 | + return $wp_filesystem; |
|
3279 | 3283 | |
3280 | - global $wp_filesystem; |
|
3281 | - //return '@@@1'; |
|
3282 | - return $wp_filesystem; |
|
3283 | - |
|
3284 | - } else { |
|
3285 | - //return '@@@2'; |
|
3286 | - /* don't have direct write access. Prompt user with our notice */ |
|
3287 | - add_action('admin_notice', 'geodir_filesystem_notice'); |
|
3288 | - return false; |
|
3289 | - } |
|
3284 | + } else { |
|
3285 | + //return '@@@2'; |
|
3286 | + /* don't have direct write access. Prompt user with our notice */ |
|
3287 | + add_action('admin_notice', 'geodir_filesystem_notice'); |
|
3288 | + return false; |
|
3289 | + } |
|
3290 | 3290 | |
3291 | 3291 | } |
3292 | 3292 | |
@@ -3304,10 +3304,10 @@ discard block |
||
3304 | 3304 | */ |
3305 | 3305 | function geodir_filesystem_notice() |
3306 | 3306 | { if ( defined( 'DOING_AJAX' ) ){return;} |
3307 | - $access_type = get_filesystem_method(); |
|
3308 | - if ($access_type === 'direct') { |
|
3309 | - } elseif (!defined('FTP_USER')) { |
|
3310 | - ?> |
|
3307 | + $access_type = get_filesystem_method(); |
|
3308 | + if ($access_type === 'direct') { |
|
3309 | + } elseif (!defined('FTP_USER')) { |
|
3310 | + ?> |
|
3311 | 3311 | <div class="error"> |
3312 | 3312 | <p><?php _e('GeoDirectory does not have access to your filesystem, thing like import/export will not work. Please define your details in wp-config.php as explained here', 'geodirectory'); ?> |
3313 | 3313 | <a target="_blank" href="http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants">http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants</a> |
@@ -3335,1280 +3335,1280 @@ discard block |
||
3335 | 3335 | * @return string Json data. |
3336 | 3336 | */ |
3337 | 3337 | function geodir_ajax_import_export() { |
3338 | - global $wpdb, $plugin_prefix, $current_user, $wp_filesystem; |
|
3338 | + global $wpdb, $plugin_prefix, $current_user, $wp_filesystem; |
|
3339 | 3339 | |
3340 | - error_reporting(0); |
|
3340 | + error_reporting(0); |
|
3341 | 3341 | |
3342 | - $xstart = microtime(true); |
|
3342 | + $xstart = microtime(true); |
|
3343 | 3343 | |
3344 | - // try to set higher limits for import |
|
3345 | - $max_input_time = ini_get('max_input_time'); |
|
3346 | - $max_execution_time = ini_get('max_execution_time'); |
|
3347 | - $memory_limit= ini_get('memory_limit'); |
|
3344 | + // try to set higher limits for import |
|
3345 | + $max_input_time = ini_get('max_input_time'); |
|
3346 | + $max_execution_time = ini_get('max_execution_time'); |
|
3347 | + $memory_limit= ini_get('memory_limit'); |
|
3348 | 3348 | |
3349 | - if(!$max_input_time || $max_input_time<3000){ |
|
3350 | - @ini_set('max_input_time', 3000); |
|
3351 | - } |
|
3349 | + if(!$max_input_time || $max_input_time<3000){ |
|
3350 | + @ini_set('max_input_time', 3000); |
|
3351 | + } |
|
3352 | 3352 | |
3353 | - if(!$max_execution_time || $max_execution_time<3000){ |
|
3354 | - @ini_set('max_execution_time', 3000); |
|
3355 | - } |
|
3353 | + if(!$max_execution_time || $max_execution_time<3000){ |
|
3354 | + @ini_set('max_execution_time', 3000); |
|
3355 | + } |
|
3356 | 3356 | |
3357 | - if($memory_limit && str_replace('M','',$memory_limit)){ |
|
3358 | - if(str_replace('M','',$memory_limit)<256){ |
|
3359 | - @ini_set('memory_limit', '256M'); |
|
3360 | - } |
|
3361 | - } |
|
3357 | + if($memory_limit && str_replace('M','',$memory_limit)){ |
|
3358 | + if(str_replace('M','',$memory_limit)<256){ |
|
3359 | + @ini_set('memory_limit', '256M'); |
|
3360 | + } |
|
3361 | + } |
|
3362 | 3362 | |
3363 | - $json = array(); |
|
3363 | + $json = array(); |
|
3364 | 3364 | |
3365 | - if ( !current_user_can( 'manage_options' ) ) { |
|
3366 | - wp_send_json( $json ); |
|
3367 | - } |
|
3365 | + if ( !current_user_can( 'manage_options' ) ) { |
|
3366 | + wp_send_json( $json ); |
|
3367 | + } |
|
3368 | 3368 | |
3369 | - $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL; |
|
3370 | - $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL; |
|
3371 | - $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false; |
|
3369 | + $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL; |
|
3370 | + $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL; |
|
3371 | + $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false; |
|
3372 | 3372 | |
3373 | - if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) { |
|
3374 | - wp_send_json( $json ); |
|
3375 | - } |
|
3373 | + if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) { |
|
3374 | + wp_send_json( $json ); |
|
3375 | + } |
|
3376 | 3376 | |
3377 | - $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
3378 | - $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
3379 | - $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page; |
|
3380 | - $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1; |
|
3377 | + $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
3378 | + $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
3379 | + $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page; |
|
3380 | + $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1; |
|
3381 | 3381 | |
3382 | - $wp_filesystem = geodir_init_filesystem(); |
|
3383 | - if (!$wp_filesystem) { |
|
3384 | - $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
3385 | - wp_send_json( $json ); |
|
3386 | - } |
|
3382 | + $wp_filesystem = geodir_init_filesystem(); |
|
3383 | + if (!$wp_filesystem) { |
|
3384 | + $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
3385 | + wp_send_json( $json ); |
|
3386 | + } |
|
3387 | 3387 | |
3388 | - if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) { |
|
3389 | - $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' ); |
|
3390 | - wp_send_json( $json ); |
|
3391 | - } |
|
3388 | + if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) { |
|
3389 | + $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' ); |
|
3390 | + wp_send_json( $json ); |
|
3391 | + } |
|
3392 | 3392 | |
3393 | - $csv_file_dir = geodir_path_import_export( false ); |
|
3394 | - if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) { |
|
3395 | - if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) { |
|
3396 | - $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
3397 | - wp_send_json( $json ); |
|
3398 | - } |
|
3399 | - } |
|
3393 | + $csv_file_dir = geodir_path_import_export( false ); |
|
3394 | + if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) { |
|
3395 | + if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) { |
|
3396 | + $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
3397 | + wp_send_json( $json ); |
|
3398 | + } |
|
3399 | + } |
|
3400 | 3400 | |
3401 | - $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active. |
|
3402 | - $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false; |
|
3403 | - |
|
3404 | - switch ( $task ) { |
|
3405 | - case 'export_posts': { |
|
3406 | - // WPML |
|
3407 | - $is_wpml = geodir_is_wpml(); |
|
3408 | - if ($is_wpml) { |
|
3409 | - global $sitepress; |
|
3410 | - $active_lang = ICL_LANGUAGE_CODE; |
|
3401 | + $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active. |
|
3402 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false; |
|
3403 | + |
|
3404 | + switch ( $task ) { |
|
3405 | + case 'export_posts': { |
|
3406 | + // WPML |
|
3407 | + $is_wpml = geodir_is_wpml(); |
|
3408 | + if ($is_wpml) { |
|
3409 | + global $sitepress; |
|
3410 | + $active_lang = ICL_LANGUAGE_CODE; |
|
3411 | 3411 | |
3412 | - $sitepress->switch_lang('all', true); |
|
3413 | - } |
|
3414 | - // WPML |
|
3415 | - if ( $post_type == 'gd_event' ) { |
|
3416 | - add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
3417 | - } |
|
3418 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
3412 | + $sitepress->switch_lang('all', true); |
|
3413 | + } |
|
3414 | + // WPML |
|
3415 | + if ( $post_type == 'gd_event' ) { |
|
3416 | + add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
3417 | + } |
|
3418 | + $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
3419 | 3419 | |
3420 | - $file_name = $post_type . '_' . date( 'dmyHi' ); |
|
3421 | - if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) { |
|
3422 | - $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) ); |
|
3423 | - } |
|
3424 | - $posts_count = geodir_get_posts_count( $post_type ); |
|
3425 | - $file_url_base = geodir_path_import_export() . '/'; |
|
3426 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
3427 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
3428 | - $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv'; |
|
3420 | + $file_name = $post_type . '_' . date( 'dmyHi' ); |
|
3421 | + if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) { |
|
3422 | + $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) ); |
|
3423 | + } |
|
3424 | + $posts_count = geodir_get_posts_count( $post_type ); |
|
3425 | + $file_url_base = geodir_path_import_export() . '/'; |
|
3426 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
3427 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
3428 | + $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv'; |
|
3429 | 3429 | |
3430 | - $chunk_file_paths = array(); |
|
3430 | + $chunk_file_paths = array(); |
|
3431 | 3431 | |
3432 | - if ( isset( $_REQUEST['_c'] ) ) { |
|
3433 | - $json['total'] = $posts_count; |
|
3434 | - // WPML |
|
3435 | - if ($is_wpml) { |
|
3436 | - $sitepress->switch_lang($active_lang, true); |
|
3437 | - } |
|
3438 | - // WPML |
|
3439 | - wp_send_json( $json ); |
|
3440 | - gd_die(); |
|
3441 | - } else if ( isset( $_REQUEST['_st'] ) ) { |
|
3442 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
3443 | - $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0; |
|
3444 | - $percentage = min( $percentage, 100 ); |
|
3432 | + if ( isset( $_REQUEST['_c'] ) ) { |
|
3433 | + $json['total'] = $posts_count; |
|
3434 | + // WPML |
|
3435 | + if ($is_wpml) { |
|
3436 | + $sitepress->switch_lang($active_lang, true); |
|
3437 | + } |
|
3438 | + // WPML |
|
3439 | + wp_send_json( $json ); |
|
3440 | + gd_die(); |
|
3441 | + } else if ( isset( $_REQUEST['_st'] ) ) { |
|
3442 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
3443 | + $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0; |
|
3444 | + $percentage = min( $percentage, 100 ); |
|
3445 | 3445 | |
3446 | - $json['percentage'] = $percentage; |
|
3447 | - // WPML |
|
3448 | - if ($is_wpml) { |
|
3449 | - $sitepress->switch_lang($active_lang, true); |
|
3450 | - } |
|
3451 | - // WPML |
|
3452 | - wp_send_json( $json ); |
|
3453 | - gd_die(); |
|
3454 | - } else { |
|
3455 | - if ( !$posts_count > 0 ) { |
|
3456 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
3457 | - } else { |
|
3458 | - $total_posts = $posts_count; |
|
3459 | - if ($chunk_per_page > $total_posts) { |
|
3460 | - $chunk_per_page = $total_posts; |
|
3461 | - } |
|
3462 | - $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
3446 | + $json['percentage'] = $percentage; |
|
3447 | + // WPML |
|
3448 | + if ($is_wpml) { |
|
3449 | + $sitepress->switch_lang($active_lang, true); |
|
3450 | + } |
|
3451 | + // WPML |
|
3452 | + wp_send_json( $json ); |
|
3453 | + gd_die(); |
|
3454 | + } else { |
|
3455 | + if ( !$posts_count > 0 ) { |
|
3456 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
3457 | + } else { |
|
3458 | + $total_posts = $posts_count; |
|
3459 | + if ($chunk_per_page > $total_posts) { |
|
3460 | + $chunk_per_page = $total_posts; |
|
3461 | + } |
|
3462 | + $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
3463 | 3463 | |
3464 | - $j = $chunk_page_no; |
|
3465 | - $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
3464 | + $j = $chunk_page_no; |
|
3465 | + $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
3466 | 3466 | |
3467 | - $per_page = 500; |
|
3468 | - if ($per_page > $chunk_per_page) { |
|
3469 | - $per_page = $chunk_per_page; |
|
3470 | - } |
|
3471 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
3467 | + $per_page = 500; |
|
3468 | + if ($per_page > $chunk_per_page) { |
|
3469 | + $per_page = $chunk_per_page; |
|
3470 | + } |
|
3471 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
3472 | 3472 | |
3473 | - for ( $i = 0; $i <= $total_pages; $i++ ) { |
|
3474 | - $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page ); |
|
3473 | + for ( $i = 0; $i <= $total_pages; $i++ ) { |
|
3474 | + $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page ); |
|
3475 | 3475 | |
3476 | - $clear = $i == 0 ? true : false; |
|
3477 | - geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
3478 | - } |
|
3476 | + $clear = $i == 0 ? true : false; |
|
3477 | + geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
3478 | + } |
|
3479 | 3479 | |
3480 | - if ( $wp_filesystem->exists( $file_path_temp ) ) { |
|
3481 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
3482 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
3483 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
3484 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
3480 | + if ( $wp_filesystem->exists( $file_path_temp ) ) { |
|
3481 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
3482 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
3483 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
3484 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
3485 | 3485 | |
3486 | - $file_url = $file_url_base . $chunk_file_name; |
|
3487 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2)); |
|
3488 | - } |
|
3486 | + $file_url = $file_url_base . $chunk_file_name; |
|
3487 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2)); |
|
3488 | + } |
|
3489 | 3489 | |
3490 | - if ( !empty($chunk_file_paths) ) { |
|
3491 | - $json['total'] = $posts_count; |
|
3492 | - $json['files'] = $chunk_file_paths; |
|
3493 | - } else { |
|
3494 | - if ($j > 1) { |
|
3495 | - $json['total'] = $posts_count; |
|
3496 | - $json['files'] = array(); |
|
3497 | - } else { |
|
3498 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
3499 | - } |
|
3500 | - } |
|
3501 | - } |
|
3502 | - // WPML |
|
3503 | - if ($is_wpml) { |
|
3504 | - $sitepress->switch_lang($active_lang, true); |
|
3505 | - } |
|
3506 | - // WPML |
|
3507 | - wp_send_json( $json ); |
|
3508 | - } |
|
3509 | - } |
|
3510 | - break; |
|
3511 | - case 'export_cats': { |
|
3512 | - // WPML |
|
3513 | - $is_wpml = geodir_is_wpml(); |
|
3514 | - if ($is_wpml) { |
|
3515 | - global $sitepress; |
|
3516 | - $active_lang = ICL_LANGUAGE_CODE; |
|
3490 | + if ( !empty($chunk_file_paths) ) { |
|
3491 | + $json['total'] = $posts_count; |
|
3492 | + $json['files'] = $chunk_file_paths; |
|
3493 | + } else { |
|
3494 | + if ($j > 1) { |
|
3495 | + $json['total'] = $posts_count; |
|
3496 | + $json['files'] = array(); |
|
3497 | + } else { |
|
3498 | + $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
3499 | + } |
|
3500 | + } |
|
3501 | + } |
|
3502 | + // WPML |
|
3503 | + if ($is_wpml) { |
|
3504 | + $sitepress->switch_lang($active_lang, true); |
|
3505 | + } |
|
3506 | + // WPML |
|
3507 | + wp_send_json( $json ); |
|
3508 | + } |
|
3509 | + } |
|
3510 | + break; |
|
3511 | + case 'export_cats': { |
|
3512 | + // WPML |
|
3513 | + $is_wpml = geodir_is_wpml(); |
|
3514 | + if ($is_wpml) { |
|
3515 | + global $sitepress; |
|
3516 | + $active_lang = ICL_LANGUAGE_CODE; |
|
3517 | 3517 | |
3518 | - $sitepress->switch_lang('all', true); |
|
3519 | - } |
|
3520 | - // WPML |
|
3521 | - $file_name = $post_type . 'category_' . date( 'dmyHi' ); |
|
3518 | + $sitepress->switch_lang('all', true); |
|
3519 | + } |
|
3520 | + // WPML |
|
3521 | + $file_name = $post_type . 'category_' . date( 'dmyHi' ); |
|
3522 | 3522 | |
3523 | - $terms_count = geodir_get_terms_count( $post_type ); |
|
3524 | - $file_url_base = geodir_path_import_export() . '/'; |
|
3525 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
3526 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
3527 | - $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv'; |
|
3523 | + $terms_count = geodir_get_terms_count( $post_type ); |
|
3524 | + $file_url_base = geodir_path_import_export() . '/'; |
|
3525 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
3526 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
3527 | + $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv'; |
|
3528 | 3528 | |
3529 | - $chunk_file_paths = array(); |
|
3529 | + $chunk_file_paths = array(); |
|
3530 | 3530 | |
3531 | - if ( isset( $_REQUEST['_st'] ) ) { |
|
3532 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
3533 | - $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0; |
|
3534 | - $percentage = min( $percentage, 100 ); |
|
3531 | + if ( isset( $_REQUEST['_st'] ) ) { |
|
3532 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
3533 | + $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0; |
|
3534 | + $percentage = min( $percentage, 100 ); |
|
3535 | 3535 | |
3536 | - $json['percentage'] = $percentage; |
|
3537 | - // WPML |
|
3538 | - if ($is_wpml) { |
|
3539 | - $sitepress->switch_lang($active_lang, true); |
|
3540 | - } |
|
3541 | - // WPML |
|
3542 | - wp_send_json( $json ); |
|
3543 | - } else { |
|
3544 | - if ( !$terms_count > 0 ) { |
|
3545 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
3546 | - } else { |
|
3547 | - $total_terms = $terms_count; |
|
3548 | - if ($chunk_per_page > $terms_count) { |
|
3549 | - $chunk_per_page = $terms_count; |
|
3550 | - } |
|
3551 | - $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
3536 | + $json['percentage'] = $percentage; |
|
3537 | + // WPML |
|
3538 | + if ($is_wpml) { |
|
3539 | + $sitepress->switch_lang($active_lang, true); |
|
3540 | + } |
|
3541 | + // WPML |
|
3542 | + wp_send_json( $json ); |
|
3543 | + } else { |
|
3544 | + if ( !$terms_count > 0 ) { |
|
3545 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
3546 | + } else { |
|
3547 | + $total_terms = $terms_count; |
|
3548 | + if ($chunk_per_page > $terms_count) { |
|
3549 | + $chunk_per_page = $terms_count; |
|
3550 | + } |
|
3551 | + $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
3552 | 3552 | |
3553 | - $j = $chunk_page_no; |
|
3554 | - $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
3553 | + $j = $chunk_page_no; |
|
3554 | + $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
3555 | 3555 | |
3556 | - $per_page = 500; |
|
3557 | - if ($per_page > $chunk_per_page) { |
|
3558 | - $per_page = $chunk_per_page; |
|
3559 | - } |
|
3560 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
3556 | + $per_page = 500; |
|
3557 | + if ($per_page > $chunk_per_page) { |
|
3558 | + $per_page = $chunk_per_page; |
|
3559 | + } |
|
3560 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
3561 | 3561 | |
3562 | - for ( $i = 0; $i <= $total_pages; $i++ ) { |
|
3563 | - $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page ); |
|
3562 | + for ( $i = 0; $i <= $total_pages; $i++ ) { |
|
3563 | + $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page ); |
|
3564 | 3564 | |
3565 | - $clear = $i == 0 ? true : false; |
|
3566 | - geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
3567 | - } |
|
3565 | + $clear = $i == 0 ? true : false; |
|
3566 | + geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
3567 | + } |
|
3568 | 3568 | |
3569 | - if ( $wp_filesystem->exists( $file_path_temp ) ) { |
|
3570 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
3571 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
3572 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
3573 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
3569 | + if ( $wp_filesystem->exists( $file_path_temp ) ) { |
|
3570 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
3571 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
3572 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
3573 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
3574 | 3574 | |
3575 | - $file_url = $file_url_base . $chunk_file_name; |
|
3576 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2)); |
|
3577 | - } |
|
3575 | + $file_url = $file_url_base . $chunk_file_name; |
|
3576 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2)); |
|
3577 | + } |
|
3578 | 3578 | |
3579 | - if ( !empty($chunk_file_paths) ) { |
|
3580 | - $json['total'] = $terms_count; |
|
3581 | - $json['files'] = $chunk_file_paths; |
|
3582 | - } else { |
|
3583 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
3584 | - } |
|
3585 | - } |
|
3586 | - // WPML |
|
3587 | - if ($is_wpml) { |
|
3588 | - $sitepress->switch_lang($active_lang, true); |
|
3589 | - } |
|
3590 | - // WPML |
|
3591 | - wp_send_json( $json ); |
|
3592 | - } |
|
3593 | - } |
|
3594 | - break; |
|
3595 | - case 'export_locations': { |
|
3596 | - $file_url_base = geodir_path_import_export() . '/'; |
|
3597 | - $file_name = 'gd_locations_' . date( 'dmyHi' ); |
|
3598 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
3599 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
3600 | - $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv'; |
|
3579 | + if ( !empty($chunk_file_paths) ) { |
|
3580 | + $json['total'] = $terms_count; |
|
3581 | + $json['files'] = $chunk_file_paths; |
|
3582 | + } else { |
|
3583 | + $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
3584 | + } |
|
3585 | + } |
|
3586 | + // WPML |
|
3587 | + if ($is_wpml) { |
|
3588 | + $sitepress->switch_lang($active_lang, true); |
|
3589 | + } |
|
3590 | + // WPML |
|
3591 | + wp_send_json( $json ); |
|
3592 | + } |
|
3593 | + } |
|
3594 | + break; |
|
3595 | + case 'export_locations': { |
|
3596 | + $file_url_base = geodir_path_import_export() . '/'; |
|
3597 | + $file_name = 'gd_locations_' . date( 'dmyHi' ); |
|
3598 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
3599 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
3600 | + $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv'; |
|
3601 | 3601 | |
3602 | - $items_count = (int)geodir_location_imex_count_locations(); |
|
3602 | + $items_count = (int)geodir_location_imex_count_locations(); |
|
3603 | 3603 | |
3604 | - if ( isset( $_REQUEST['_st'] ) ) { |
|
3605 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
3606 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
3607 | - $percentage = min( $percentage, 100 ); |
|
3604 | + if ( isset( $_REQUEST['_st'] ) ) { |
|
3605 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
3606 | + $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
3607 | + $percentage = min( $percentage, 100 ); |
|
3608 | 3608 | |
3609 | - $json['percentage'] = $percentage; |
|
3610 | - wp_send_json( $json ); |
|
3611 | - } else { |
|
3612 | - $chunk_file_paths = array(); |
|
3609 | + $json['percentage'] = $percentage; |
|
3610 | + wp_send_json( $json ); |
|
3611 | + } else { |
|
3612 | + $chunk_file_paths = array(); |
|
3613 | 3613 | |
3614 | - if ( !$items_count > 0 ) { |
|
3615 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
3616 | - } else { |
|
3617 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
3618 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
3614 | + if ( !$items_count > 0 ) { |
|
3615 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
3616 | + } else { |
|
3617 | + $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
3618 | + $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
3619 | 3619 | |
3620 | - $j = $chunk_page_no; |
|
3621 | - $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
3620 | + $j = $chunk_page_no; |
|
3621 | + $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
3622 | 3622 | |
3623 | - $per_page = 500; |
|
3624 | - $per_page = min( $per_page, $chunk_per_page ); |
|
3625 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
3623 | + $per_page = 500; |
|
3624 | + $per_page = min( $per_page, $chunk_per_page ); |
|
3625 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
3626 | 3626 | |
3627 | - for ( $i = 0; $i <= $total_pages; $i++ ) { |
|
3628 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
3627 | + for ( $i = 0; $i <= $total_pages; $i++ ) { |
|
3628 | + $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
3629 | 3629 | |
3630 | - $clear = $i == 0 ? true : false; |
|
3631 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
3632 | - } |
|
3630 | + $clear = $i == 0 ? true : false; |
|
3631 | + geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
3632 | + } |
|
3633 | 3633 | |
3634 | - if ( $wp_filesystem->exists( $file_path_temp ) ) { |
|
3635 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
3636 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
3637 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
3638 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
3634 | + if ( $wp_filesystem->exists( $file_path_temp ) ) { |
|
3635 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
3636 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
3637 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
3638 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
3639 | 3639 | |
3640 | - $file_url = $file_url_base . $chunk_file_name; |
|
3641 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2)); |
|
3642 | - } |
|
3640 | + $file_url = $file_url_base . $chunk_file_name; |
|
3641 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2)); |
|
3642 | + } |
|
3643 | 3643 | |
3644 | - if ( !empty($chunk_file_paths) ) { |
|
3645 | - $json['total'] = $items_count; |
|
3646 | - $json['files'] = $chunk_file_paths; |
|
3647 | - } else { |
|
3648 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
3649 | - } |
|
3650 | - } |
|
3651 | - wp_send_json( $json ); |
|
3652 | - } |
|
3653 | - } |
|
3654 | - break; |
|
3655 | - case 'export_hoods': { |
|
3656 | - $file_url_base = geodir_path_import_export() . '/'; |
|
3657 | - $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' ); |
|
3658 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
3659 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
3660 | - $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv'; |
|
3644 | + if ( !empty($chunk_file_paths) ) { |
|
3645 | + $json['total'] = $items_count; |
|
3646 | + $json['files'] = $chunk_file_paths; |
|
3647 | + } else { |
|
3648 | + $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
3649 | + } |
|
3650 | + } |
|
3651 | + wp_send_json( $json ); |
|
3652 | + } |
|
3653 | + } |
|
3654 | + break; |
|
3655 | + case 'export_hoods': { |
|
3656 | + $file_url_base = geodir_path_import_export() . '/'; |
|
3657 | + $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' ); |
|
3658 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
3659 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
3660 | + $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv'; |
|
3661 | 3661 | |
3662 | - $items_count = (int)geodir_location_imex_count_neighbourhoods(); |
|
3662 | + $items_count = (int)geodir_location_imex_count_neighbourhoods(); |
|
3663 | 3663 | |
3664 | - if ( isset( $_REQUEST['_st'] ) ) { |
|
3665 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
3666 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
3667 | - $percentage = min( $percentage, 100 ); |
|
3664 | + if ( isset( $_REQUEST['_st'] ) ) { |
|
3665 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
3666 | + $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
3667 | + $percentage = min( $percentage, 100 ); |
|
3668 | 3668 | |
3669 | - $json['percentage'] = $percentage; |
|
3670 | - wp_send_json( $json ); |
|
3671 | - } else { |
|
3672 | - $chunk_file_paths = array(); |
|
3669 | + $json['percentage'] = $percentage; |
|
3670 | + wp_send_json( $json ); |
|
3671 | + } else { |
|
3672 | + $chunk_file_paths = array(); |
|
3673 | 3673 | |
3674 | - if ( !$items_count > 0 ) { |
|
3675 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
3676 | - } else { |
|
3677 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
3678 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
3674 | + if ( !$items_count > 0 ) { |
|
3675 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
3676 | + } else { |
|
3677 | + $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
3678 | + $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
3679 | 3679 | |
3680 | - $j = $chunk_page_no; |
|
3681 | - $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
3680 | + $j = $chunk_page_no; |
|
3681 | + $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
3682 | 3682 | |
3683 | - $per_page = 500; |
|
3684 | - $per_page = min( $per_page, $chunk_per_page ); |
|
3685 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
3683 | + $per_page = 500; |
|
3684 | + $per_page = min( $per_page, $chunk_per_page ); |
|
3685 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
3686 | 3686 | |
3687 | - for ( $i = 0; $i <= $total_pages; $i++ ) { |
|
3688 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
3687 | + for ( $i = 0; $i <= $total_pages; $i++ ) { |
|
3688 | + $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
3689 | 3689 | |
3690 | - $clear = $i == 0 ? true : false; |
|
3691 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
3692 | - } |
|
3690 | + $clear = $i == 0 ? true : false; |
|
3691 | + geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
3692 | + } |
|
3693 | 3693 | |
3694 | - if ( $wp_filesystem->exists( $file_path_temp ) ) { |
|
3695 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
3696 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
3697 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
3698 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
3694 | + if ( $wp_filesystem->exists( $file_path_temp ) ) { |
|
3695 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
3696 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
3697 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
3698 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
3699 | 3699 | |
3700 | - $file_url = $file_url_base . $chunk_file_name; |
|
3701 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2)); |
|
3702 | - } |
|
3700 | + $file_url = $file_url_base . $chunk_file_name; |
|
3701 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2)); |
|
3702 | + } |
|
3703 | 3703 | |
3704 | - if ( !empty($chunk_file_paths) ) { |
|
3705 | - $json['total'] = $items_count; |
|
3706 | - $json['files'] = $chunk_file_paths; |
|
3707 | - } else { |
|
3708 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
3709 | - } |
|
3710 | - } |
|
3711 | - wp_send_json( $json ); |
|
3712 | - } |
|
3713 | - } |
|
3714 | - break; |
|
3715 | - case 'prepare_import': |
|
3716 | - case 'import_cat': |
|
3717 | - case 'import_post': |
|
3718 | - case 'import_loc': |
|
3719 | - case 'import_hood': { |
|
3720 | - // WPML |
|
3721 | - $is_wpml = geodir_is_wpml(); |
|
3722 | - if ($is_wpml) { |
|
3723 | - global $sitepress; |
|
3724 | - $active_lang = ICL_LANGUAGE_CODE; |
|
3725 | - } |
|
3726 | - // WPML |
|
3704 | + if ( !empty($chunk_file_paths) ) { |
|
3705 | + $json['total'] = $items_count; |
|
3706 | + $json['files'] = $chunk_file_paths; |
|
3707 | + } else { |
|
3708 | + $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
3709 | + } |
|
3710 | + } |
|
3711 | + wp_send_json( $json ); |
|
3712 | + } |
|
3713 | + } |
|
3714 | + break; |
|
3715 | + case 'prepare_import': |
|
3716 | + case 'import_cat': |
|
3717 | + case 'import_post': |
|
3718 | + case 'import_loc': |
|
3719 | + case 'import_hood': { |
|
3720 | + // WPML |
|
3721 | + $is_wpml = geodir_is_wpml(); |
|
3722 | + if ($is_wpml) { |
|
3723 | + global $sitepress; |
|
3724 | + $active_lang = ICL_LANGUAGE_CODE; |
|
3725 | + } |
|
3726 | + // WPML |
|
3727 | 3727 | |
3728 | - @ini_set( 'auto_detect_line_endings', true ); |
|
3728 | + @ini_set( 'auto_detect_line_endings', true ); |
|
3729 | 3729 | |
3730 | - $uploads = wp_upload_dir(); |
|
3731 | - $uploads_dir = $uploads['path']; |
|
3732 | - $uploads_subdir = $uploads['subdir']; |
|
3730 | + $uploads = wp_upload_dir(); |
|
3731 | + $uploads_dir = $uploads['path']; |
|
3732 | + $uploads_subdir = $uploads['subdir']; |
|
3733 | 3733 | |
3734 | - $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL; |
|
3735 | - $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip'; |
|
3734 | + $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL; |
|
3735 | + $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip'; |
|
3736 | 3736 | |
3737 | - $csv_file_arr = explode( '/', $csv_file ); |
|
3738 | - $csv_filename = end( $csv_file_arr ); |
|
3739 | - $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename; |
|
3737 | + $csv_file_arr = explode( '/', $csv_file ); |
|
3738 | + $csv_filename = end( $csv_file_arr ); |
|
3739 | + $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename; |
|
3740 | 3740 | |
3741 | - $json['file'] = $csv_file; |
|
3742 | - $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
3743 | - $file = array(); |
|
3744 | - |
|
3745 | - if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) { |
|
3746 | - $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename ); |
|
3747 | - |
|
3748 | - if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') { |
|
3749 | - $json['error'] = NULL; |
|
3750 | - |
|
3751 | - $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
|
3752 | - setlocale(LC_ALL, 'en_US.UTF-8'); |
|
3753 | - if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) { |
|
3754 | - while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) { |
|
3755 | - if ( !empty( $data ) ) { |
|
3756 | - $file[] = $data; |
|
3757 | - } |
|
3758 | - } |
|
3759 | - fclose($handle); |
|
3760 | - } |
|
3761 | - setlocale(LC_ALL, $lc_all); |
|
3741 | + $json['file'] = $csv_file; |
|
3742 | + $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
3743 | + $file = array(); |
|
3744 | + |
|
3745 | + if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) { |
|
3746 | + $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename ); |
|
3747 | + |
|
3748 | + if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') { |
|
3749 | + $json['error'] = NULL; |
|
3750 | + |
|
3751 | + $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
|
3752 | + setlocale(LC_ALL, 'en_US.UTF-8'); |
|
3753 | + if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) { |
|
3754 | + while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) { |
|
3755 | + if ( !empty( $data ) ) { |
|
3756 | + $file[] = $data; |
|
3757 | + } |
|
3758 | + } |
|
3759 | + fclose($handle); |
|
3760 | + } |
|
3761 | + setlocale(LC_ALL, $lc_all); |
|
3762 | 3762 | |
3763 | - $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
3763 | + $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
3764 | 3764 | |
3765 | - if (!$json['rows'] > 0) { |
|
3766 | - $json['error'] = __('No data found in csv file.', 'geodirectory'); |
|
3767 | - } |
|
3768 | - } else { |
|
3769 | - wp_send_json( $json ); |
|
3770 | - } |
|
3771 | - } else { |
|
3772 | - wp_send_json( $json ); |
|
3773 | - } |
|
3765 | + if (!$json['rows'] > 0) { |
|
3766 | + $json['error'] = __('No data found in csv file.', 'geodirectory'); |
|
3767 | + } |
|
3768 | + } else { |
|
3769 | + wp_send_json( $json ); |
|
3770 | + } |
|
3771 | + } else { |
|
3772 | + wp_send_json( $json ); |
|
3773 | + } |
|
3774 | 3774 | |
3775 | - if ( $task == 'prepare_import' || !empty( $json['error'] ) ) { |
|
3776 | - wp_send_json( $json ); |
|
3777 | - } |
|
3775 | + if ( $task == 'prepare_import' || !empty( $json['error'] ) ) { |
|
3776 | + wp_send_json( $json ); |
|
3777 | + } |
|
3778 | 3778 | |
3779 | - $total = $json['rows']; |
|
3780 | - $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
3781 | - $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
3779 | + $total = $json['rows']; |
|
3780 | + $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
3781 | + $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
3782 | 3782 | |
3783 | - $count = $limit; |
|
3783 | + $count = $limit; |
|
3784 | 3784 | |
3785 | - if ($count < $total) { |
|
3786 | - $count = $processed + $count; |
|
3787 | - if ($count > $total) { |
|
3788 | - $count = $total; |
|
3789 | - } |
|
3790 | - } else { |
|
3791 | - $count = $total; |
|
3792 | - } |
|
3785 | + if ($count < $total) { |
|
3786 | + $count = $processed + $count; |
|
3787 | + if ($count > $total) { |
|
3788 | + $count = $total; |
|
3789 | + } |
|
3790 | + } else { |
|
3791 | + $count = $total; |
|
3792 | + } |
|
3793 | 3793 | |
3794 | - $created = 0; |
|
3795 | - $updated = 0; |
|
3796 | - $skipped = 0; |
|
3797 | - $invalid = 0; |
|
3798 | - $invalid_addr = 0; |
|
3799 | - $images = 0; |
|
3794 | + $created = 0; |
|
3795 | + $updated = 0; |
|
3796 | + $skipped = 0; |
|
3797 | + $invalid = 0; |
|
3798 | + $invalid_addr = 0; |
|
3799 | + $images = 0; |
|
3800 | 3800 | |
3801 | - $gd_post_info = array(); |
|
3802 | - $countpost = 0; |
|
3801 | + $gd_post_info = array(); |
|
3802 | + $countpost = 0; |
|
3803 | 3803 | |
3804 | - $post_types = geodir_get_posttypes(); |
|
3804 | + $post_types = geodir_get_posttypes(); |
|
3805 | 3805 | |
3806 | - if ( $task == 'import_cat' ) { |
|
3807 | - if (!empty($file)) { |
|
3808 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
3806 | + if ( $task == 'import_cat' ) { |
|
3807 | + if (!empty($file)) { |
|
3808 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
3809 | 3809 | |
3810 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) { |
|
3811 | - $json['error'] = CSV_INVAILD_FILE; |
|
3812 | - wp_send_json( $json ); |
|
3813 | - exit; |
|
3814 | - } |
|
3810 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) { |
|
3811 | + $json['error'] = CSV_INVAILD_FILE; |
|
3812 | + wp_send_json( $json ); |
|
3813 | + exit; |
|
3814 | + } |
|
3815 | 3815 | |
3816 | - $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory'); |
|
3816 | + $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory'); |
|
3817 | 3817 | |
3818 | - for ($i = 1; $i <= $limit; $i++) { |
|
3819 | - $index = $processed + $i; |
|
3818 | + for ($i = 1; $i <= $limit; $i++) { |
|
3819 | + $index = $processed + $i; |
|
3820 | 3820 | |
3821 | - if (isset($file[$index])) { |
|
3822 | - $row = $file[$index]; |
|
3823 | - $row = array_map( 'trim', $row ); |
|
3824 | - //$row = array_map( 'utf8_encode', $row ); |
|
3821 | + if (isset($file[$index])) { |
|
3822 | + $row = $file[$index]; |
|
3823 | + $row = array_map( 'trim', $row ); |
|
3824 | + //$row = array_map( 'utf8_encode', $row ); |
|
3825 | 3825 | |
3826 | - $cat_id = ''; |
|
3827 | - $cat_name = ''; |
|
3828 | - $cat_slug = ''; |
|
3829 | - $cat_posttype = ''; |
|
3830 | - $cat_parent = ''; |
|
3831 | - $cat_description = ''; |
|
3832 | - $cat_schema = ''; |
|
3833 | - $cat_top_description = ''; |
|
3834 | - $cat_image = ''; |
|
3835 | - $cat_icon = ''; |
|
3836 | - $cat_language = ''; |
|
3837 | - $cat_id_original = ''; |
|
3826 | + $cat_id = ''; |
|
3827 | + $cat_name = ''; |
|
3828 | + $cat_slug = ''; |
|
3829 | + $cat_posttype = ''; |
|
3830 | + $cat_parent = ''; |
|
3831 | + $cat_description = ''; |
|
3832 | + $cat_schema = ''; |
|
3833 | + $cat_top_description = ''; |
|
3834 | + $cat_image = ''; |
|
3835 | + $cat_icon = ''; |
|
3836 | + $cat_language = ''; |
|
3837 | + $cat_id_original = ''; |
|
3838 | 3838 | |
3839 | - $c = 0; |
|
3840 | - foreach ($columns as $column ) { |
|
3841 | - if ( $column == 'cat_id' ) { |
|
3842 | - $cat_id = (int)$row[$c]; |
|
3843 | - } else if ( $column == 'cat_name' ) { |
|
3844 | - $cat_name = $row[$c]; |
|
3845 | - } else if ( $column == 'cat_slug' ) { |
|
3846 | - $cat_slug = $row[$c]; |
|
3847 | - } else if ( $column == 'cat_posttype' ) { |
|
3848 | - $cat_posttype = $row[$c]; |
|
3849 | - } else if ( $column == 'cat_parent' ) { |
|
3850 | - $cat_parent = trim($row[$c]); |
|
3851 | - } else if ( $column == 'cat_schema' && $row[$c] != '' ) { |
|
3852 | - $cat_schema = $row[$c]; |
|
3853 | - } else if ( $column == 'cat_description' ) { |
|
3854 | - $cat_description = $row[$c]; |
|
3855 | - } else if ( $column == 'cat_top_description' ) { |
|
3856 | - $cat_top_description = $row[$c]; |
|
3857 | - } else if ( $column == 'cat_image' ) { |
|
3858 | - $cat_image = $row[$c]; |
|
3859 | - } else if ( $column == 'cat_icon' ) { |
|
3860 | - $cat_icon = $row[$c]; |
|
3861 | - } |
|
3862 | - // WPML |
|
3863 | - if ( $is_wpml ) { |
|
3864 | - if ( $column == 'cat_language' ) { |
|
3865 | - $cat_language = geodir_strtolower( trim( $row[$c] ) ); |
|
3866 | - } else if ( $column == 'cat_id_original' ) { |
|
3867 | - $cat_id_original = (int)$row[$c]; |
|
3868 | - } |
|
3869 | - } |
|
3870 | - // WPML |
|
3871 | - $c++; |
|
3872 | - } |
|
3839 | + $c = 0; |
|
3840 | + foreach ($columns as $column ) { |
|
3841 | + if ( $column == 'cat_id' ) { |
|
3842 | + $cat_id = (int)$row[$c]; |
|
3843 | + } else if ( $column == 'cat_name' ) { |
|
3844 | + $cat_name = $row[$c]; |
|
3845 | + } else if ( $column == 'cat_slug' ) { |
|
3846 | + $cat_slug = $row[$c]; |
|
3847 | + } else if ( $column == 'cat_posttype' ) { |
|
3848 | + $cat_posttype = $row[$c]; |
|
3849 | + } else if ( $column == 'cat_parent' ) { |
|
3850 | + $cat_parent = trim($row[$c]); |
|
3851 | + } else if ( $column == 'cat_schema' && $row[$c] != '' ) { |
|
3852 | + $cat_schema = $row[$c]; |
|
3853 | + } else if ( $column == 'cat_description' ) { |
|
3854 | + $cat_description = $row[$c]; |
|
3855 | + } else if ( $column == 'cat_top_description' ) { |
|
3856 | + $cat_top_description = $row[$c]; |
|
3857 | + } else if ( $column == 'cat_image' ) { |
|
3858 | + $cat_image = $row[$c]; |
|
3859 | + } else if ( $column == 'cat_icon' ) { |
|
3860 | + $cat_icon = $row[$c]; |
|
3861 | + } |
|
3862 | + // WPML |
|
3863 | + if ( $is_wpml ) { |
|
3864 | + if ( $column == 'cat_language' ) { |
|
3865 | + $cat_language = geodir_strtolower( trim( $row[$c] ) ); |
|
3866 | + } else if ( $column == 'cat_id_original' ) { |
|
3867 | + $cat_id_original = (int)$row[$c]; |
|
3868 | + } |
|
3869 | + } |
|
3870 | + // WPML |
|
3871 | + $c++; |
|
3872 | + } |
|
3873 | 3873 | |
3874 | - if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) { |
|
3875 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
3874 | + if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) { |
|
3875 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
3876 | 3876 | |
3877 | - $invalid++; |
|
3878 | - continue; |
|
3879 | - } |
|
3877 | + $invalid++; |
|
3878 | + continue; |
|
3879 | + } |
|
3880 | 3880 | |
3881 | - // WPML |
|
3882 | - if ($is_wpml && $cat_language != '') { |
|
3883 | - $sitepress->switch_lang($cat_language, true); |
|
3884 | - } |
|
3885 | - // WPML |
|
3881 | + // WPML |
|
3882 | + if ($is_wpml && $cat_language != '') { |
|
3883 | + $sitepress->switch_lang($cat_language, true); |
|
3884 | + } |
|
3885 | + // WPML |
|
3886 | 3886 | |
3887 | - $term_data = array(); |
|
3888 | - $term_data['name'] = $cat_name; |
|
3889 | - $term_data['slug'] = $cat_slug; |
|
3890 | - $term_data['description'] = $cat_description; |
|
3891 | - $term_data['cat_schema'] = $cat_schema; |
|
3892 | - $term_data['top_description'] = $cat_top_description; |
|
3893 | - $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : ''; |
|
3894 | - $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : ''; |
|
3887 | + $term_data = array(); |
|
3888 | + $term_data['name'] = $cat_name; |
|
3889 | + $term_data['slug'] = $cat_slug; |
|
3890 | + $term_data['description'] = $cat_description; |
|
3891 | + $term_data['cat_schema'] = $cat_schema; |
|
3892 | + $term_data['top_description'] = $cat_top_description; |
|
3893 | + $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : ''; |
|
3894 | + $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : ''; |
|
3895 | 3895 | |
3896 | - //$term_data = array_map( 'utf8_encode', $term_data ); |
|
3896 | + //$term_data = array_map( 'utf8_encode', $term_data ); |
|
3897 | 3897 | |
3898 | - $taxonomy = $cat_posttype . 'category'; |
|
3898 | + $taxonomy = $cat_posttype . 'category'; |
|
3899 | 3899 | |
3900 | - $term_data['taxonomy'] = $taxonomy; |
|
3900 | + $term_data['taxonomy'] = $taxonomy; |
|
3901 | 3901 | |
3902 | - $term_parent_id = 0; |
|
3903 | - if ($cat_parent != "" || (int)$cat_parent > 0) { |
|
3904 | - $term_parent = ''; |
|
3902 | + $term_parent_id = 0; |
|
3903 | + if ($cat_parent != "" || (int)$cat_parent > 0) { |
|
3904 | + $term_parent = ''; |
|
3905 | 3905 | |
3906 | - if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) { |
|
3907 | - // |
|
3908 | - } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) { |
|
3909 | - // |
|
3910 | - } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) { |
|
3911 | - // |
|
3912 | - } else { |
|
3913 | - $term_parent_data = array(); |
|
3914 | - $term_parent_data['name'] = $cat_parent; |
|
3915 | - //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
|
3916 | - $term_parent_data['taxonomy'] = $taxonomy; |
|
3906 | + if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) { |
|
3907 | + // |
|
3908 | + } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) { |
|
3909 | + // |
|
3910 | + } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) { |
|
3911 | + // |
|
3912 | + } else { |
|
3913 | + $term_parent_data = array(); |
|
3914 | + $term_parent_data['name'] = $cat_parent; |
|
3915 | + //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
|
3916 | + $term_parent_data['taxonomy'] = $taxonomy; |
|
3917 | 3917 | |
3918 | - $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
3919 | - } |
|
3918 | + $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
3919 | + } |
|
3920 | 3920 | |
3921 | - if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) { |
|
3922 | - $term_parent_id = (int)$term_parent->term_id; |
|
3923 | - } |
|
3924 | - } |
|
3925 | - $term_data['parent'] = (int)$term_parent_id; |
|
3921 | + if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) { |
|
3922 | + $term_parent_id = (int)$term_parent->term_id; |
|
3923 | + } |
|
3924 | + } |
|
3925 | + $term_data['parent'] = (int)$term_parent_id; |
|
3926 | 3926 | |
3927 | - $term_id = NULL; |
|
3928 | - if ( $import_choice == 'update' ) { |
|
3929 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) { |
|
3930 | - $term_data['term_id'] = $term['term_id']; |
|
3927 | + $term_id = NULL; |
|
3928 | + if ( $import_choice == 'update' ) { |
|
3929 | + if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) { |
|
3930 | + $term_data['term_id'] = $term['term_id']; |
|
3931 | 3931 | |
3932 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) { |
|
3933 | - $updated++; |
|
3934 | - } else { |
|
3935 | - $invalid++; |
|
3936 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
3937 | - } |
|
3938 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) { |
|
3939 | - $term_data['term_id'] = $term['term_id']; |
|
3932 | + if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) { |
|
3933 | + $updated++; |
|
3934 | + } else { |
|
3935 | + $invalid++; |
|
3936 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
3937 | + } |
|
3938 | + } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) { |
|
3939 | + $term_data['term_id'] = $term['term_id']; |
|
3940 | 3940 | |
3941 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) { |
|
3942 | - $updated++; |
|
3943 | - } else { |
|
3944 | - $invalid++; |
|
3945 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
3946 | - } |
|
3947 | - } else { |
|
3948 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) { |
|
3949 | - $created++; |
|
3950 | - } else { |
|
3951 | - $invalid++; |
|
3952 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
3953 | - } |
|
3954 | - } |
|
3955 | - } else if ( $import_choice == 'skip' ) { |
|
3956 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) { |
|
3957 | - $skipped++; |
|
3958 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) { |
|
3959 | - $skipped++; |
|
3960 | - } else { |
|
3961 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) { |
|
3962 | - $created++; |
|
3963 | - } else { |
|
3964 | - $invalid++; |
|
3965 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
3966 | - } |
|
3967 | - } |
|
3968 | - } else { |
|
3969 | - $invalid++; |
|
3970 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
3971 | - } |
|
3941 | + if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) { |
|
3942 | + $updated++; |
|
3943 | + } else { |
|
3944 | + $invalid++; |
|
3945 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
3946 | + } |
|
3947 | + } else { |
|
3948 | + if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) { |
|
3949 | + $created++; |
|
3950 | + } else { |
|
3951 | + $invalid++; |
|
3952 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
3953 | + } |
|
3954 | + } |
|
3955 | + } else if ( $import_choice == 'skip' ) { |
|
3956 | + if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) { |
|
3957 | + $skipped++; |
|
3958 | + } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) { |
|
3959 | + $skipped++; |
|
3960 | + } else { |
|
3961 | + if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) { |
|
3962 | + $created++; |
|
3963 | + } else { |
|
3964 | + $invalid++; |
|
3965 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
3966 | + } |
|
3967 | + } |
|
3968 | + } else { |
|
3969 | + $invalid++; |
|
3970 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
3971 | + } |
|
3972 | 3972 | |
3973 | - if ( $term_id ) { |
|
3974 | - // WPML |
|
3975 | - if ($is_wpml && geodir_wpml_is_taxonomy_translated($taxonomy) && $cat_id_original > 0 && $cat_language != '') { |
|
3976 | - $wpml_element_type = 'tax_' . $taxonomy; |
|
3977 | - $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type ); |
|
3978 | - $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
3979 | - |
|
3980 | - $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type ); |
|
3973 | + if ( $term_id ) { |
|
3974 | + // WPML |
|
3975 | + if ($is_wpml && geodir_wpml_is_taxonomy_translated($taxonomy) && $cat_id_original > 0 && $cat_language != '') { |
|
3976 | + $wpml_element_type = 'tax_' . $taxonomy; |
|
3977 | + $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type ); |
|
3978 | + $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
3979 | + |
|
3980 | + $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type ); |
|
3981 | 3981 | |
3982 | - $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language ); |
|
3983 | - } |
|
3984 | - // WPML |
|
3982 | + $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language ); |
|
3983 | + } |
|
3984 | + // WPML |
|
3985 | 3985 | |
3986 | - if ( isset( $term_data['top_description'] ) ) { |
|
3987 | - geodir_update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype ); |
|
3988 | - } |
|
3986 | + if ( isset( $term_data['top_description'] ) ) { |
|
3987 | + geodir_update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype ); |
|
3988 | + } |
|
3989 | 3989 | |
3990 | - if ( isset( $term_data['cat_schema'] ) ) { |
|
3991 | - geodir_update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype ); |
|
3992 | - } |
|
3990 | + if ( isset( $term_data['cat_schema'] ) ) { |
|
3991 | + geodir_update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype ); |
|
3992 | + } |
|
3993 | 3993 | |
3994 | - $attachment = false; |
|
3995 | - if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) { |
|
3996 | - $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype ); |
|
3997 | - $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
3994 | + $attachment = false; |
|
3995 | + if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) { |
|
3996 | + $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype ); |
|
3997 | + $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
3998 | 3998 | |
3999 | - if ( basename($cat_image) != $term_data['image'] ) { |
|
4000 | - $attachment = true; |
|
4001 | - geodir_update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
4002 | - } |
|
4003 | - } |
|
3999 | + if ( basename($cat_image) != $term_data['image'] ) { |
|
4000 | + $attachment = true; |
|
4001 | + geodir_update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
4002 | + } |
|
4003 | + } |
|
4004 | 4004 | |
4005 | - if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) { |
|
4006 | - $cat_icon = geodir_get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype ); |
|
4007 | - $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
4008 | - |
|
4009 | - if ( basename($cat_icon) != $term_data['icon'] ) { |
|
4010 | - $attachment = true; |
|
4011 | - geodir_update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
4012 | - } |
|
4013 | - } |
|
4005 | + if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) { |
|
4006 | + $cat_icon = geodir_get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype ); |
|
4007 | + $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
4008 | + |
|
4009 | + if ( basename($cat_icon) != $term_data['icon'] ) { |
|
4010 | + $attachment = true; |
|
4011 | + geodir_update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
4012 | + } |
|
4013 | + } |
|
4014 | 4014 | |
4015 | - if ( $attachment ) { |
|
4016 | - $images++; |
|
4017 | - } |
|
4018 | - } |
|
4015 | + if ( $attachment ) { |
|
4016 | + $images++; |
|
4017 | + } |
|
4018 | + } |
|
4019 | 4019 | |
4020 | - // WPML |
|
4021 | - if ($is_wpml && $cat_language != '') { |
|
4022 | - $sitepress->switch_lang($active_lang, true); |
|
4023 | - } |
|
4024 | - // WPML |
|
4025 | - } |
|
4026 | - } |
|
4027 | - } |
|
4020 | + // WPML |
|
4021 | + if ($is_wpml && $cat_language != '') { |
|
4022 | + $sitepress->switch_lang($active_lang, true); |
|
4023 | + } |
|
4024 | + // WPML |
|
4025 | + } |
|
4026 | + } |
|
4027 | + } |
|
4028 | 4028 | |
4029 | - $json = array(); |
|
4030 | - $json['processed'] = $limit; |
|
4031 | - $json['created'] = $created; |
|
4032 | - $json['updated'] = $updated; |
|
4033 | - $json['skipped'] = $skipped; |
|
4034 | - $json['invalid'] = $invalid; |
|
4035 | - $json['images'] = $images; |
|
4029 | + $json = array(); |
|
4030 | + $json['processed'] = $limit; |
|
4031 | + $json['created'] = $created; |
|
4032 | + $json['updated'] = $updated; |
|
4033 | + $json['skipped'] = $skipped; |
|
4034 | + $json['invalid'] = $invalid; |
|
4035 | + $json['images'] = $images; |
|
4036 | 4036 | |
4037 | - wp_send_json( $json ); |
|
4038 | - exit; |
|
4039 | - } else if ( $task == 'import_post' ) { |
|
4040 | - $xtimings['###1'] = microtime(true)-$xstart; |
|
4041 | - //run some stuff to make the import quicker |
|
4042 | - wp_defer_term_counting( true ); |
|
4043 | - wp_defer_comment_counting( true ); |
|
4044 | - $wpdb->query( 'SET autocommit = 0;' ); |
|
4037 | + wp_send_json( $json ); |
|
4038 | + exit; |
|
4039 | + } else if ( $task == 'import_post' ) { |
|
4040 | + $xtimings['###1'] = microtime(true)-$xstart; |
|
4041 | + //run some stuff to make the import quicker |
|
4042 | + wp_defer_term_counting( true ); |
|
4043 | + wp_defer_comment_counting( true ); |
|
4044 | + $wpdb->query( 'SET autocommit = 0;' ); |
|
4045 | 4045 | // |
4046 | 4046 | // remove_all_actions('publish_post'); |
4047 | 4047 | // remove_all_actions('transition_post_status'); |
4048 | 4048 | // remove_all_actions('publish_future_post'); |
4049 | 4049 | |
4050 | - if (!empty($file)) { |
|
4051 | - $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false; |
|
4052 | - $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
|
4053 | - $default_status = 'publish'; |
|
4054 | - $current_date = date_i18n( 'Y-m-d', time() ); |
|
4050 | + if (!empty($file)) { |
|
4051 | + $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false; |
|
4052 | + $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
|
4053 | + $default_status = 'publish'; |
|
4054 | + $current_date = date_i18n( 'Y-m-d', time() ); |
|
4055 | 4055 | |
4056 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
4056 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
4057 | 4057 | |
4058 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) { |
|
4059 | - $json['error'] = CSV_INVAILD_FILE; |
|
4060 | - wp_send_json( $json ); |
|
4061 | - exit; |
|
4062 | - } |
|
4063 | - $xtimings['###2'] = microtime(true)-$xstart; |
|
4064 | - $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory'); |
|
4065 | - $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
4066 | - $processed_actual = 0; |
|
4067 | - for ($i = 1; $i <= $limit; $i++) { |
|
4068 | - $index = $processed + $i; |
|
4069 | - $gd_post = array(); |
|
4058 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) { |
|
4059 | + $json['error'] = CSV_INVAILD_FILE; |
|
4060 | + wp_send_json( $json ); |
|
4061 | + exit; |
|
4062 | + } |
|
4063 | + $xtimings['###2'] = microtime(true)-$xstart; |
|
4064 | + $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory'); |
|
4065 | + $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
4066 | + $processed_actual = 0; |
|
4067 | + for ($i = 1; $i <= $limit; $i++) { |
|
4068 | + $index = $processed + $i; |
|
4069 | + $gd_post = array(); |
|
4070 | 4070 | |
4071 | - if (isset($file[$index])) { |
|
4072 | - $processed_actual++; |
|
4073 | - $row = $file[$index]; |
|
4074 | - $row = array_map( 'trim', $row ); |
|
4075 | - //$row = array_map( 'utf8_encode', $row ); |
|
4076 | - $row = array_map( 'addslashes_gpc', $row ); |
|
4071 | + if (isset($file[$index])) { |
|
4072 | + $processed_actual++; |
|
4073 | + $row = $file[$index]; |
|
4074 | + $row = array_map( 'trim', $row ); |
|
4075 | + //$row = array_map( 'utf8_encode', $row ); |
|
4076 | + $row = array_map( 'addslashes_gpc', $row ); |
|
4077 | 4077 | |
4078 | - $post_id = ''; |
|
4079 | - $post_title = ''; |
|
4080 | - $post_date = ''; |
|
4081 | - $post_author = ''; |
|
4082 | - $post_content = ''; |
|
4083 | - $post_category_arr = array(); |
|
4084 | - $default_category = ''; |
|
4085 | - $post_tags = array(); |
|
4086 | - $post_type = ''; |
|
4087 | - $post_status = ''; |
|
4088 | - $is_featured = 0; |
|
4089 | - $geodir_video = ''; |
|
4090 | - $post_address = ''; |
|
4091 | - $post_city = ''; |
|
4092 | - $post_region = ''; |
|
4093 | - $post_country = ''; |
|
4094 | - $post_zip = ''; |
|
4095 | - $post_latitude = ''; |
|
4096 | - $post_longitude = ''; |
|
4097 | - $post_neighbourhood = ''; |
|
4098 | - $neighbourhood_latitude = ''; |
|
4099 | - $neighbourhood_longitude = ''; |
|
4100 | - $geodir_timing = ''; |
|
4101 | - $geodir_contact = ''; |
|
4102 | - $geodir_email = ''; |
|
4103 | - $geodir_website = ''; |
|
4104 | - $geodir_twitter = ''; |
|
4105 | - $geodir_facebook = ''; |
|
4106 | - $geodir_twitter = ''; |
|
4107 | - $geodir_link_business = null; |
|
4108 | - $post_images = array(); |
|
4078 | + $post_id = ''; |
|
4079 | + $post_title = ''; |
|
4080 | + $post_date = ''; |
|
4081 | + $post_author = ''; |
|
4082 | + $post_content = ''; |
|
4083 | + $post_category_arr = array(); |
|
4084 | + $default_category = ''; |
|
4085 | + $post_tags = array(); |
|
4086 | + $post_type = ''; |
|
4087 | + $post_status = ''; |
|
4088 | + $is_featured = 0; |
|
4089 | + $geodir_video = ''; |
|
4090 | + $post_address = ''; |
|
4091 | + $post_city = ''; |
|
4092 | + $post_region = ''; |
|
4093 | + $post_country = ''; |
|
4094 | + $post_zip = ''; |
|
4095 | + $post_latitude = ''; |
|
4096 | + $post_longitude = ''; |
|
4097 | + $post_neighbourhood = ''; |
|
4098 | + $neighbourhood_latitude = ''; |
|
4099 | + $neighbourhood_longitude = ''; |
|
4100 | + $geodir_timing = ''; |
|
4101 | + $geodir_contact = ''; |
|
4102 | + $geodir_email = ''; |
|
4103 | + $geodir_website = ''; |
|
4104 | + $geodir_twitter = ''; |
|
4105 | + $geodir_facebook = ''; |
|
4106 | + $geodir_twitter = ''; |
|
4107 | + $geodir_link_business = null; |
|
4108 | + $post_images = array(); |
|
4109 | 4109 | |
4110 | - $expire_date = 'Never'; |
|
4110 | + $expire_date = 'Never'; |
|
4111 | 4111 | |
4112 | - $language = ''; |
|
4113 | - $original_post_id = ''; |
|
4112 | + $language = ''; |
|
4113 | + $original_post_id = ''; |
|
4114 | 4114 | |
4115 | - $c = 0; |
|
4116 | - foreach ($columns as $column ) { |
|
4117 | - $gd_post[$column] = $row[$c]; |
|
4115 | + $c = 0; |
|
4116 | + foreach ($columns as $column ) { |
|
4117 | + $gd_post[$column] = $row[$c]; |
|
4118 | 4118 | |
4119 | - if ( $column == 'post_id' ) { |
|
4120 | - $post_id = $row[$c]; |
|
4121 | - } else if ( $column == 'post_title' ) { |
|
4122 | - $post_title = sanitize_text_field($row[$c]); |
|
4123 | - } else if ( $column == 'post_author' ) { |
|
4124 | - $post_author = $row[$c]; |
|
4125 | - } else if ( $column == 'post_date' ) { |
|
4126 | - $post_date = $row[$c]; |
|
4127 | - } else if ( $column == 'post_content' ) { |
|
4128 | - $post_content = $row[$c]; |
|
4129 | - } else if ( $column == 'post_category' && $row[$c] != '' ) { |
|
4130 | - $post_category_arr = explode( ',', $row[$c] ); |
|
4131 | - } else if ( $column == 'default_category' ) { |
|
4132 | - $default_category = wp_kses_normalize_entities($row[$c]); |
|
4133 | - } else if ( $column == 'post_tags' && $row[$c] != '' ) { |
|
4134 | - $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
4135 | - } else if ( $column == 'post_type' ) { |
|
4136 | - $post_type = $row[$c]; |
|
4137 | - } else if ( $column == 'post_status' ) { |
|
4138 | - $post_status = sanitize_key( $row[$c] ); |
|
4139 | - } else if ( $column == 'is_featured' ) { |
|
4140 | - $is_featured = (int)$row[$c]; |
|
4141 | - } else if ( $column == 'geodir_video' ) { |
|
4142 | - $geodir_video = $row[$c]; |
|
4143 | - } else if ( $column == 'post_address' ) { |
|
4144 | - $post_address = sanitize_text_field($row[$c]); |
|
4145 | - } else if ( $column == 'post_city' ) { |
|
4146 | - $post_city = sanitize_text_field($row[$c]); |
|
4147 | - } else if ( $column == 'post_region' ) { |
|
4148 | - $post_region = sanitize_text_field($row[$c]); |
|
4149 | - } else if ( $column == 'post_country' ) { |
|
4150 | - $post_country = sanitize_text_field($row[$c]); |
|
4151 | - } else if ( $column == 'post_zip' ) { |
|
4152 | - $post_zip = sanitize_text_field($row[$c]); |
|
4153 | - } else if ( $column == 'post_latitude' ) { |
|
4154 | - $post_latitude = sanitize_text_field($row[$c]); |
|
4155 | - } else if ( $column == 'post_longitude' ) { |
|
4156 | - $post_longitude = sanitize_text_field($row[$c]); |
|
4157 | - } else if ( $column == 'post_neighbourhood' ) { |
|
4158 | - $post_neighbourhood = sanitize_text_field($row[$c]); |
|
4159 | - unset($gd_post[$column]); |
|
4160 | - } else if ( $column == 'neighbourhood_latitude' ) { |
|
4161 | - $neighbourhood_latitude = sanitize_text_field($row[$c]); |
|
4162 | - } else if ( $column == 'neighbourhood_longitude' ) { |
|
4163 | - $neighbourhood_longitude = sanitize_text_field($row[$c]); |
|
4164 | - } else if ( $column == 'geodir_timing' ) { |
|
4165 | - $geodir_timing = sanitize_text_field($row[$c]); |
|
4166 | - } else if ( $column == 'geodir_contact' ) { |
|
4167 | - $geodir_contact = sanitize_text_field($row[$c]); |
|
4168 | - } else if ( $column == 'geodir_email' ) { |
|
4169 | - $geodir_email = sanitize_email($row[$c]); |
|
4170 | - } else if ( $column == 'geodir_website' ) { |
|
4171 | - $geodir_website = sanitize_text_field($row[$c]); |
|
4172 | - } else if ( $column == 'geodir_twitter' ) { |
|
4173 | - $geodir_twitter = sanitize_text_field($row[$c]); |
|
4174 | - } else if ( $column == 'geodir_facebook' ) { |
|
4175 | - $geodir_facebook = sanitize_text_field($row[$c]); |
|
4176 | - } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) { |
|
4177 | - $post_images[] = $row[$c]; |
|
4178 | - } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) { |
|
4179 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
4180 | - } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) { |
|
4181 | - $row[$c] = str_replace('/', '-', $row[$c]); |
|
4182 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
4183 | - } else if ( strpos( $column, 'linked_' ) === 0 ) { |
|
4184 | - $geodir_link_business = (int)$row[$c]; |
|
4185 | - } |
|
4186 | - // WPML |
|
4187 | - if ($is_wpml) { |
|
4188 | - if ($column == 'language') { |
|
4189 | - $language = geodir_strtolower(trim($row[$c])); |
|
4190 | - } else if ($column == 'original_post_id') { |
|
4191 | - $original_post_id = (int)$row[$c]; |
|
4192 | - } |
|
4193 | - } |
|
4194 | - // WPML |
|
4195 | - $c++; |
|
4196 | - } |
|
4197 | - // listing claimed or not |
|
4198 | - if ($is_claim_active && isset($gd_post['claimed'])) { |
|
4199 | - $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
4200 | - } |
|
4119 | + if ( $column == 'post_id' ) { |
|
4120 | + $post_id = $row[$c]; |
|
4121 | + } else if ( $column == 'post_title' ) { |
|
4122 | + $post_title = sanitize_text_field($row[$c]); |
|
4123 | + } else if ( $column == 'post_author' ) { |
|
4124 | + $post_author = $row[$c]; |
|
4125 | + } else if ( $column == 'post_date' ) { |
|
4126 | + $post_date = $row[$c]; |
|
4127 | + } else if ( $column == 'post_content' ) { |
|
4128 | + $post_content = $row[$c]; |
|
4129 | + } else if ( $column == 'post_category' && $row[$c] != '' ) { |
|
4130 | + $post_category_arr = explode( ',', $row[$c] ); |
|
4131 | + } else if ( $column == 'default_category' ) { |
|
4132 | + $default_category = wp_kses_normalize_entities($row[$c]); |
|
4133 | + } else if ( $column == 'post_tags' && $row[$c] != '' ) { |
|
4134 | + $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
4135 | + } else if ( $column == 'post_type' ) { |
|
4136 | + $post_type = $row[$c]; |
|
4137 | + } else if ( $column == 'post_status' ) { |
|
4138 | + $post_status = sanitize_key( $row[$c] ); |
|
4139 | + } else if ( $column == 'is_featured' ) { |
|
4140 | + $is_featured = (int)$row[$c]; |
|
4141 | + } else if ( $column == 'geodir_video' ) { |
|
4142 | + $geodir_video = $row[$c]; |
|
4143 | + } else if ( $column == 'post_address' ) { |
|
4144 | + $post_address = sanitize_text_field($row[$c]); |
|
4145 | + } else if ( $column == 'post_city' ) { |
|
4146 | + $post_city = sanitize_text_field($row[$c]); |
|
4147 | + } else if ( $column == 'post_region' ) { |
|
4148 | + $post_region = sanitize_text_field($row[$c]); |
|
4149 | + } else if ( $column == 'post_country' ) { |
|
4150 | + $post_country = sanitize_text_field($row[$c]); |
|
4151 | + } else if ( $column == 'post_zip' ) { |
|
4152 | + $post_zip = sanitize_text_field($row[$c]); |
|
4153 | + } else if ( $column == 'post_latitude' ) { |
|
4154 | + $post_latitude = sanitize_text_field($row[$c]); |
|
4155 | + } else if ( $column == 'post_longitude' ) { |
|
4156 | + $post_longitude = sanitize_text_field($row[$c]); |
|
4157 | + } else if ( $column == 'post_neighbourhood' ) { |
|
4158 | + $post_neighbourhood = sanitize_text_field($row[$c]); |
|
4159 | + unset($gd_post[$column]); |
|
4160 | + } else if ( $column == 'neighbourhood_latitude' ) { |
|
4161 | + $neighbourhood_latitude = sanitize_text_field($row[$c]); |
|
4162 | + } else if ( $column == 'neighbourhood_longitude' ) { |
|
4163 | + $neighbourhood_longitude = sanitize_text_field($row[$c]); |
|
4164 | + } else if ( $column == 'geodir_timing' ) { |
|
4165 | + $geodir_timing = sanitize_text_field($row[$c]); |
|
4166 | + } else if ( $column == 'geodir_contact' ) { |
|
4167 | + $geodir_contact = sanitize_text_field($row[$c]); |
|
4168 | + } else if ( $column == 'geodir_email' ) { |
|
4169 | + $geodir_email = sanitize_email($row[$c]); |
|
4170 | + } else if ( $column == 'geodir_website' ) { |
|
4171 | + $geodir_website = sanitize_text_field($row[$c]); |
|
4172 | + } else if ( $column == 'geodir_twitter' ) { |
|
4173 | + $geodir_twitter = sanitize_text_field($row[$c]); |
|
4174 | + } else if ( $column == 'geodir_facebook' ) { |
|
4175 | + $geodir_facebook = sanitize_text_field($row[$c]); |
|
4176 | + } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) { |
|
4177 | + $post_images[] = $row[$c]; |
|
4178 | + } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) { |
|
4179 | + $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
4180 | + } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) { |
|
4181 | + $row[$c] = str_replace('/', '-', $row[$c]); |
|
4182 | + $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
4183 | + } else if ( strpos( $column, 'linked_' ) === 0 ) { |
|
4184 | + $geodir_link_business = (int)$row[$c]; |
|
4185 | + } |
|
4186 | + // WPML |
|
4187 | + if ($is_wpml) { |
|
4188 | + if ($column == 'language') { |
|
4189 | + $language = geodir_strtolower(trim($row[$c])); |
|
4190 | + } else if ($column == 'original_post_id') { |
|
4191 | + $original_post_id = (int)$row[$c]; |
|
4192 | + } |
|
4193 | + } |
|
4194 | + // WPML |
|
4195 | + $c++; |
|
4196 | + } |
|
4197 | + // listing claimed or not |
|
4198 | + if ($is_claim_active && isset($gd_post['claimed'])) { |
|
4199 | + $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
4200 | + } |
|
4201 | 4201 | |
4202 | - // WPML |
|
4203 | - if ($is_wpml && $language != '') { |
|
4204 | - $sitepress->switch_lang($language, true); |
|
4205 | - } |
|
4206 | - // WPML |
|
4202 | + // WPML |
|
4203 | + if ($is_wpml && $language != '') { |
|
4204 | + $sitepress->switch_lang($language, true); |
|
4205 | + } |
|
4206 | + // WPML |
|
4207 | 4207 | |
4208 | - $gd_post['IMAGE'] = $post_images; |
|
4208 | + $gd_post['IMAGE'] = $post_images; |
|
4209 | 4209 | |
4210 | - $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
4211 | - $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
4210 | + $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
4211 | + $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
4212 | 4212 | |
4213 | - $valid = true; |
|
4213 | + $valid = true; |
|
4214 | 4214 | |
4215 | - if ( $post_title == '' || !in_array( $post_type, $post_types ) ) { |
|
4216 | - $invalid++; |
|
4217 | - $valid = false; |
|
4218 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
4219 | - } |
|
4220 | - $xtimings['###3'] = microtime(true)-$xstart; |
|
4221 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
4222 | - if ( $location_allowed ) { |
|
4223 | - $location_result = geodir_get_default_location(); |
|
4224 | - if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) { |
|
4225 | - $invalid_addr++; |
|
4226 | - $valid = false; |
|
4227 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
4228 | - } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) { |
|
4229 | - if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) { |
|
4230 | - $invalid_addr++; |
|
4231 | - $valid = false; |
|
4232 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
4233 | - } else { |
|
4234 | - if (!$location_manager) { |
|
4235 | - $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated. |
|
4236 | - } |
|
4237 | - } |
|
4238 | - } |
|
4239 | - } |
|
4240 | - $xtimings['###4'] = microtime(true)-$xstart; |
|
4241 | - if ( !$valid ) { |
|
4242 | - continue; |
|
4243 | - } |
|
4215 | + if ( $post_title == '' || !in_array( $post_type, $post_types ) ) { |
|
4216 | + $invalid++; |
|
4217 | + $valid = false; |
|
4218 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
4219 | + } |
|
4220 | + $xtimings['###3'] = microtime(true)-$xstart; |
|
4221 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
4222 | + if ( $location_allowed ) { |
|
4223 | + $location_result = geodir_get_default_location(); |
|
4224 | + if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) { |
|
4225 | + $invalid_addr++; |
|
4226 | + $valid = false; |
|
4227 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
4228 | + } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) { |
|
4229 | + if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) { |
|
4230 | + $invalid_addr++; |
|
4231 | + $valid = false; |
|
4232 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
4233 | + } else { |
|
4234 | + if (!$location_manager) { |
|
4235 | + $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated. |
|
4236 | + } |
|
4237 | + } |
|
4238 | + } |
|
4239 | + } |
|
4240 | + $xtimings['###4'] = microtime(true)-$xstart; |
|
4241 | + if ( !$valid ) { |
|
4242 | + continue; |
|
4243 | + } |
|
4244 | 4244 | |
4245 | - $cat_taxonomy = $post_type . 'category'; |
|
4246 | - $tags_taxonomy = $post_type . '_tags'; |
|
4245 | + $cat_taxonomy = $post_type . 'category'; |
|
4246 | + $tags_taxonomy = $post_type . '_tags'; |
|
4247 | 4247 | |
4248 | - if ($default_category != '' && !in_array($default_category, $post_category_arr)) { |
|
4249 | - $post_category_arr = array_merge(array($default_category), $post_category_arr); |
|
4250 | - } |
|
4248 | + if ($default_category != '' && !in_array($default_category, $post_category_arr)) { |
|
4249 | + $post_category_arr = array_merge(array($default_category), $post_category_arr); |
|
4250 | + } |
|
4251 | 4251 | |
4252 | - $post_category = array(); |
|
4253 | - $default_category_id = NULL; |
|
4254 | - if ( !empty( $post_category_arr ) ) { |
|
4255 | - foreach ( $post_category_arr as $value ) { |
|
4256 | - $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
4252 | + $post_category = array(); |
|
4253 | + $default_category_id = NULL; |
|
4254 | + if ( !empty( $post_category_arr ) ) { |
|
4255 | + foreach ( $post_category_arr as $value ) { |
|
4256 | + $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
4257 | 4257 | |
4258 | - if ( $category_name != '' ) { |
|
4259 | - $term_category = array(); |
|
4258 | + if ( $category_name != '' ) { |
|
4259 | + $term_category = array(); |
|
4260 | 4260 | |
4261 | - if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) { |
|
4262 | - $term_category = $term; |
|
4263 | - } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) { |
|
4264 | - $term_category = $term; |
|
4265 | - } else { |
|
4266 | - $term_data = array(); |
|
4267 | - $term_data['name'] = $category_name; |
|
4268 | - $term_data['taxonomy'] = $cat_taxonomy; |
|
4261 | + if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) { |
|
4262 | + $term_category = $term; |
|
4263 | + } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) { |
|
4264 | + $term_category = $term; |
|
4265 | + } else { |
|
4266 | + $term_data = array(); |
|
4267 | + $term_data['name'] = $category_name; |
|
4268 | + $term_data['taxonomy'] = $cat_taxonomy; |
|
4269 | 4269 | |
4270 | - $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
4271 | - if ( $term_id ) { |
|
4272 | - $term_category = get_term( $term_id, $cat_taxonomy ); |
|
4273 | - } |
|
4274 | - } |
|
4270 | + $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
4271 | + if ( $term_id ) { |
|
4272 | + $term_category = get_term( $term_id, $cat_taxonomy ); |
|
4273 | + } |
|
4274 | + } |
|
4275 | 4275 | |
4276 | - if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) { |
|
4277 | - $post_category[] = intval($term_category->term_id); |
|
4276 | + if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) { |
|
4277 | + $post_category[] = intval($term_category->term_id); |
|
4278 | 4278 | |
4279 | - if ($category_name == $default_category) { |
|
4280 | - $default_category_id = intval($term_category->term_id); |
|
4281 | - } |
|
4282 | - } |
|
4283 | - } |
|
4284 | - } |
|
4285 | - } |
|
4286 | - $xtimings['###5'] = microtime(true)-$xstart; |
|
4287 | - $save_post = array(); |
|
4288 | - $save_post['post_title'] = $post_title; |
|
4289 | - if (!empty($post_date)) { |
|
4290 | - $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format. |
|
4279 | + if ($category_name == $default_category) { |
|
4280 | + $default_category_id = intval($term_category->term_id); |
|
4281 | + } |
|
4282 | + } |
|
4283 | + } |
|
4284 | + } |
|
4285 | + } |
|
4286 | + $xtimings['###5'] = microtime(true)-$xstart; |
|
4287 | + $save_post = array(); |
|
4288 | + $save_post['post_title'] = $post_title; |
|
4289 | + if (!empty($post_date)) { |
|
4290 | + $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format. |
|
4291 | 4291 | |
4292 | - $save_post['post_date'] = $post_date; |
|
4293 | - $save_post['post_date_gmt'] = get_gmt_from_date( $post_date ); |
|
4294 | - } |
|
4295 | - $save_post['post_content'] = $post_content; |
|
4296 | - $save_post['post_type'] = $post_type; |
|
4297 | - $save_post['post_author'] = $post_author; |
|
4298 | - $save_post['post_status'] = $post_status; |
|
4299 | - $save_post['post_category'] = $post_category; |
|
4300 | - $save_post['post_tags'] = $post_tags; |
|
4301 | - |
|
4302 | - $saved_post_id = NULL; |
|
4303 | - if ( $import_choice == 'update' ) { |
|
4304 | - $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
4292 | + $save_post['post_date'] = $post_date; |
|
4293 | + $save_post['post_date_gmt'] = get_gmt_from_date( $post_date ); |
|
4294 | + } |
|
4295 | + $save_post['post_content'] = $post_content; |
|
4296 | + $save_post['post_type'] = $post_type; |
|
4297 | + $save_post['post_author'] = $post_author; |
|
4298 | + $save_post['post_status'] = $post_status; |
|
4299 | + $save_post['post_category'] = $post_category; |
|
4300 | + $save_post['post_tags'] = $post_tags; |
|
4301 | + |
|
4302 | + $saved_post_id = NULL; |
|
4303 | + if ( $import_choice == 'update' ) { |
|
4304 | + $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
4305 | 4305 | |
4306 | - if ( $post_id > 0 && get_post( $post_id ) ) { |
|
4307 | - $save_post['ID'] = $post_id; |
|
4306 | + if ( $post_id > 0 && get_post( $post_id ) ) { |
|
4307 | + $save_post['ID'] = $post_id; |
|
4308 | 4308 | |
4309 | - if ( $saved_post_id = wp_update_post( $save_post, true ) ) { |
|
4310 | - if ( is_wp_error( $saved_post_id ) ) { |
|
4311 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
4312 | - $saved_post_id = 0; |
|
4313 | - } else { |
|
4314 | - $saved_post_id = $post_id; |
|
4315 | - $updated++; |
|
4316 | - } |
|
4317 | - } |
|
4318 | - } else { |
|
4319 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) { |
|
4320 | - if ( is_wp_error( $saved_post_id ) ) { |
|
4321 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
4322 | - $saved_post_id = 0; |
|
4323 | - } else { |
|
4324 | - $created++; |
|
4325 | - } |
|
4326 | - } |
|
4327 | - } |
|
4309 | + if ( $saved_post_id = wp_update_post( $save_post, true ) ) { |
|
4310 | + if ( is_wp_error( $saved_post_id ) ) { |
|
4311 | + $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
4312 | + $saved_post_id = 0; |
|
4313 | + } else { |
|
4314 | + $saved_post_id = $post_id; |
|
4315 | + $updated++; |
|
4316 | + } |
|
4317 | + } |
|
4318 | + } else { |
|
4319 | + if ( $saved_post_id = wp_insert_post( $save_post, true ) ) { |
|
4320 | + if ( is_wp_error( $saved_post_id ) ) { |
|
4321 | + $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
4322 | + $saved_post_id = 0; |
|
4323 | + } else { |
|
4324 | + $created++; |
|
4325 | + } |
|
4326 | + } |
|
4327 | + } |
|
4328 | 4328 | |
4329 | - if ( !$saved_post_id > 0 ) { |
|
4330 | - $invalid++; |
|
4331 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
4332 | - } |
|
4333 | - } else if ( $import_choice == 'skip' ) { |
|
4334 | - if ( $post_id > 0 && get_post( $post_id ) ) { |
|
4335 | - $skipped++; |
|
4336 | - } else { |
|
4337 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) { |
|
4338 | - if ( is_wp_error( $saved_post_id ) ) { |
|
4339 | - $invalid++; |
|
4329 | + if ( !$saved_post_id > 0 ) { |
|
4330 | + $invalid++; |
|
4331 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
4332 | + } |
|
4333 | + } else if ( $import_choice == 'skip' ) { |
|
4334 | + if ( $post_id > 0 && get_post( $post_id ) ) { |
|
4335 | + $skipped++; |
|
4336 | + } else { |
|
4337 | + if ( $saved_post_id = wp_insert_post( $save_post, true ) ) { |
|
4338 | + if ( is_wp_error( $saved_post_id ) ) { |
|
4339 | + $invalid++; |
|
4340 | 4340 | |
4341 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
4342 | - $saved_post_id = 0; |
|
4343 | - } else { |
|
4344 | - $created++; |
|
4345 | - } |
|
4346 | - } else { |
|
4347 | - $invalid++; |
|
4341 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
4342 | + $saved_post_id = 0; |
|
4343 | + } else { |
|
4344 | + $created++; |
|
4345 | + } |
|
4346 | + } else { |
|
4347 | + $invalid++; |
|
4348 | 4348 | |
4349 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
4350 | - } |
|
4351 | - } |
|
4352 | - } else { |
|
4353 | - $invalid++; |
|
4349 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
4350 | + } |
|
4351 | + } |
|
4352 | + } else { |
|
4353 | + $invalid++; |
|
4354 | 4354 | |
4355 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
4356 | - } |
|
4357 | - $xtimings['###6'] = microtime(true)-$xstart; |
|
4358 | - if ( (int)$saved_post_id > 0 ) { |
|
4359 | - // WPML |
|
4360 | - if ($is_wpml && geodir_wpml_is_post_type_translated($post_type) && $original_post_id > 0 && $language != '') { |
|
4361 | - $wpml_post_type = 'post_' . $post_type; |
|
4362 | - $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
4363 | - $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
4364 | - |
|
4365 | - $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
4355 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
4356 | + } |
|
4357 | + $xtimings['###6'] = microtime(true)-$xstart; |
|
4358 | + if ( (int)$saved_post_id > 0 ) { |
|
4359 | + // WPML |
|
4360 | + if ($is_wpml && geodir_wpml_is_post_type_translated($post_type) && $original_post_id > 0 && $language != '') { |
|
4361 | + $wpml_post_type = 'post_' . $post_type; |
|
4362 | + $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
4363 | + $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
4364 | + |
|
4365 | + $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
4366 | 4366 | |
4367 | - $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
4368 | - } |
|
4369 | - // WPML |
|
4370 | - $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
4367 | + $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
4368 | + } |
|
4369 | + // WPML |
|
4370 | + $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
4371 | 4371 | |
4372 | - $gd_post['post_id'] = $saved_post_id; |
|
4373 | - $gd_post['ID'] = $saved_post_id; |
|
4374 | - $gd_post['post_tags'] = $post_tags; |
|
4375 | - $gd_post['post_title'] = $post_title; |
|
4376 | - $gd_post['post_status'] = $post_status; |
|
4377 | - $gd_post['submit_time'] = time(); |
|
4378 | - $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
4372 | + $gd_post['post_id'] = $saved_post_id; |
|
4373 | + $gd_post['ID'] = $saved_post_id; |
|
4374 | + $gd_post['post_tags'] = $post_tags; |
|
4375 | + $gd_post['post_title'] = $post_title; |
|
4376 | + $gd_post['post_status'] = $post_status; |
|
4377 | + $gd_post['submit_time'] = time(); |
|
4378 | + $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
4379 | 4379 | |
4380 | - // post location |
|
4381 | - $post_location_id = 0; |
|
4382 | - if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) { |
|
4383 | - $gd_post['post_neighbourhood'] = ''; |
|
4380 | + // post location |
|
4381 | + $post_location_id = 0; |
|
4382 | + if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) { |
|
4383 | + $gd_post['post_neighbourhood'] = ''; |
|
4384 | 4384 | |
4385 | - $post_location_info = array( |
|
4386 | - 'city' => $post_city, |
|
4387 | - 'region' => $post_region, |
|
4388 | - 'country' => $post_country, |
|
4389 | - 'geo_lat' => $post_latitude, |
|
4390 | - 'geo_lng' => $post_longitude |
|
4391 | - ); |
|
4392 | - if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) { |
|
4393 | - $post_location_id = $location_id; |
|
4394 | - } |
|
4385 | + $post_location_info = array( |
|
4386 | + 'city' => $post_city, |
|
4387 | + 'region' => $post_region, |
|
4388 | + 'country' => $post_country, |
|
4389 | + 'geo_lat' => $post_latitude, |
|
4390 | + 'geo_lng' => $post_longitude |
|
4391 | + ); |
|
4392 | + if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) { |
|
4393 | + $post_location_id = $location_id; |
|
4394 | + } |
|
4395 | 4395 | |
4396 | - if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) { |
|
4397 | - $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id); |
|
4396 | + if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) { |
|
4397 | + $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id); |
|
4398 | 4398 | |
4399 | - $hood_data = array(); |
|
4400 | - $hood_data['hood_location_id'] = $post_location_id; |
|
4401 | - $hood_data['hood_name'] = $post_neighbourhood; |
|
4399 | + $hood_data = array(); |
|
4400 | + $hood_data['hood_location_id'] = $post_location_id; |
|
4401 | + $hood_data['hood_name'] = $post_neighbourhood; |
|
4402 | 4402 | |
4403 | - if (!empty($neighbourhood_info)) { |
|
4404 | - $hood_data['hood_id'] = $neighbourhood_info->hood_id; |
|
4405 | - $hood_data['hood_slug'] = $neighbourhood_info->hood_slug; |
|
4403 | + if (!empty($neighbourhood_info)) { |
|
4404 | + $hood_data['hood_id'] = $neighbourhood_info->hood_id; |
|
4405 | + $hood_data['hood_slug'] = $neighbourhood_info->hood_slug; |
|
4406 | 4406 | |
4407 | - if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) { |
|
4408 | - $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
4409 | - $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
4410 | - } |
|
4411 | - } |
|
4407 | + if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) { |
|
4408 | + $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
4409 | + $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
4410 | + } |
|
4411 | + } |
|
4412 | 4412 | |
4413 | - if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) { |
|
4414 | - $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
4415 | - $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
4416 | - } |
|
4413 | + if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) { |
|
4414 | + $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
4415 | + $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
4416 | + } |
|
4417 | 4417 | |
4418 | - $hood_data['hood_latitude'] = $post_latitude; |
|
4419 | - $hood_data['hood_longitude'] = $post_longitude; |
|
4420 | - |
|
4421 | - $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data); |
|
4422 | - if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) { |
|
4423 | - $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug; |
|
4424 | - } |
|
4425 | - } |
|
4426 | - } |
|
4427 | - $gd_post['post_location_id'] = $post_location_id; |
|
4418 | + $hood_data['hood_latitude'] = $post_latitude; |
|
4419 | + $hood_data['hood_longitude'] = $post_longitude; |
|
4420 | + |
|
4421 | + $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data); |
|
4422 | + if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) { |
|
4423 | + $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug; |
|
4424 | + } |
|
4425 | + } |
|
4426 | + } |
|
4427 | + $gd_post['post_location_id'] = $post_location_id; |
|
4428 | 4428 | |
4429 | - if ($geodir_link_business !== null) { |
|
4430 | - $gd_post['geodir_link_business'] = $geodir_link_business > 0 ? $geodir_link_business : ''; |
|
4431 | - } |
|
4429 | + if ($geodir_link_business !== null) { |
|
4430 | + $gd_post['geodir_link_business'] = $geodir_link_business > 0 ? $geodir_link_business : ''; |
|
4431 | + } |
|
4432 | 4432 | |
4433 | - // post package info |
|
4434 | - $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
4435 | - if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) { |
|
4436 | - $package_id = $gd_post_info->package_id; |
|
4437 | - } |
|
4433 | + // post package info |
|
4434 | + $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
4435 | + if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) { |
|
4436 | + $package_id = $gd_post_info->package_id; |
|
4437 | + } |
|
4438 | 4438 | |
4439 | - $package_info = array(); |
|
4440 | - if ($package_id && function_exists('geodir_get_package_info_by_id')) { |
|
4441 | - $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
4439 | + $package_info = array(); |
|
4440 | + if ($package_id && function_exists('geodir_get_package_info_by_id')) { |
|
4441 | + $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
4442 | 4442 | |
4443 | - if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) { |
|
4444 | - $package_info = array(); |
|
4445 | - } |
|
4446 | - } |
|
4443 | + if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) { |
|
4444 | + $package_info = array(); |
|
4445 | + } |
|
4446 | + } |
|
4447 | 4447 | |
4448 | - if (empty($package_info)) { |
|
4449 | - $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
4450 | - } |
|
4448 | + if (empty($package_info)) { |
|
4449 | + $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
4450 | + } |
|
4451 | 4451 | |
4452 | - if (!empty($package_info)) { |
|
4453 | - $package_id = $package_info['pid']; |
|
4452 | + if (!empty($package_info)) { |
|
4453 | + $package_id = $package_info['pid']; |
|
4454 | 4454 | |
4455 | - if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) { |
|
4456 | - $gd_post['expire_date'] = $expire_date; |
|
4457 | - } else { |
|
4458 | - if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) { |
|
4459 | - $gd_post['alive_days'] = (int)$package_info['days']; |
|
4460 | - $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
4461 | - } else { |
|
4462 | - $gd_post['expire_date'] = 'Never'; |
|
4463 | - } |
|
4464 | - } |
|
4455 | + if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) { |
|
4456 | + $gd_post['expire_date'] = $expire_date; |
|
4457 | + } else { |
|
4458 | + if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) { |
|
4459 | + $gd_post['alive_days'] = (int)$package_info['days']; |
|
4460 | + $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
4461 | + } else { |
|
4462 | + $gd_post['expire_date'] = 'Never'; |
|
4463 | + } |
|
4464 | + } |
|
4465 | 4465 | |
4466 | - $gd_post['package_id'] = $package_id; |
|
4467 | - } |
|
4466 | + $gd_post['package_id'] = $package_id; |
|
4467 | + } |
|
4468 | 4468 | |
4469 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
4469 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
4470 | 4470 | |
4471 | - if ($post_type == 'gd_event') { |
|
4472 | - $gd_post = geodir_imex_process_event_data($gd_post); |
|
4473 | - } |
|
4471 | + if ($post_type == 'gd_event') { |
|
4472 | + $gd_post = geodir_imex_process_event_data($gd_post); |
|
4473 | + } |
|
4474 | 4474 | |
4475 | - if (isset($gd_post['post_id'])) { |
|
4476 | - unset($gd_post['post_id']); |
|
4477 | - } |
|
4475 | + if (isset($gd_post['post_id'])) { |
|
4476 | + unset($gd_post['post_id']); |
|
4477 | + } |
|
4478 | 4478 | |
4479 | - // Export franchise fields |
|
4480 | - $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
4481 | - if ($is_franchise_active) { |
|
4482 | - if ( isset( $gd_post['gd_is_franchise'] ) && empty( $gd_post['franchise'] ) ) { |
|
4483 | - if ( absint( $gd_post['gd_is_franchise'] ) != 0 ) { |
|
4484 | - $gd_franchise_lock = array(); |
|
4479 | + // Export franchise fields |
|
4480 | + $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
4481 | + if ($is_franchise_active) { |
|
4482 | + if ( isset( $gd_post['gd_is_franchise'] ) && empty( $gd_post['franchise'] ) ) { |
|
4483 | + if ( absint( $gd_post['gd_is_franchise'] ) != 0 ) { |
|
4484 | + $gd_franchise_lock = array(); |
|
4485 | 4485 | |
4486 | - if ( isset( $gd_post['gd_franchise_lock'] ) ) { |
|
4487 | - $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] ); |
|
4488 | - $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
4489 | - $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
4490 | - } |
|
4486 | + if ( isset( $gd_post['gd_franchise_lock'] ) ) { |
|
4487 | + $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] ); |
|
4488 | + $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
4489 | + $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
4490 | + } |
|
4491 | 4491 | |
4492 | - update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
4493 | - update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
4494 | - } else { |
|
4495 | - if ( function_exists( 'geodir_franchise_remove_franchise' ) ) { |
|
4496 | - geodir_franchise_remove_franchise( $saved_post_id ); |
|
4497 | - } |
|
4498 | - } |
|
4499 | - } else { |
|
4500 | - if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) { |
|
4501 | - geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
4502 | - } |
|
4503 | - } |
|
4504 | - } |
|
4492 | + update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
4493 | + update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
4494 | + } else { |
|
4495 | + if ( function_exists( 'geodir_franchise_remove_franchise' ) ) { |
|
4496 | + geodir_franchise_remove_franchise( $saved_post_id ); |
|
4497 | + } |
|
4498 | + } |
|
4499 | + } else { |
|
4500 | + if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) { |
|
4501 | + geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
4502 | + } |
|
4503 | + } |
|
4504 | + } |
|
4505 | 4505 | |
4506 | - if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) { |
|
4507 | - $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
4508 | - if ($default_category_id) { |
|
4509 | - $save_post['post_default_category'] = $default_category_id; |
|
4510 | - $gd_post['default_category'] = $default_category_id; |
|
4511 | - } |
|
4512 | - $gd_post[$cat_taxonomy] = $save_post['post_category']; |
|
4513 | - } |
|
4514 | - $xtimings['###7'] = microtime(true)-$xstart; |
|
4515 | - // Save post info |
|
4516 | - geodir_save_post_info( $saved_post_id, $gd_post ); |
|
4517 | - $xtimings['###8'] = microtime(true)-$xstart; |
|
4518 | - // post taxonomies |
|
4519 | - if ( !empty( $save_post['post_category'] ) ) { |
|
4520 | - wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
4506 | + if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) { |
|
4507 | + $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
4508 | + if ($default_category_id) { |
|
4509 | + $save_post['post_default_category'] = $default_category_id; |
|
4510 | + $gd_post['default_category'] = $default_category_id; |
|
4511 | + } |
|
4512 | + $gd_post[$cat_taxonomy] = $save_post['post_category']; |
|
4513 | + } |
|
4514 | + $xtimings['###7'] = microtime(true)-$xstart; |
|
4515 | + // Save post info |
|
4516 | + geodir_save_post_info( $saved_post_id, $gd_post ); |
|
4517 | + $xtimings['###8'] = microtime(true)-$xstart; |
|
4518 | + // post taxonomies |
|
4519 | + if ( !empty( $save_post['post_category'] ) ) { |
|
4520 | + wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
4521 | 4521 | |
4522 | - $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
4523 | - if ($default_category_id) { |
|
4524 | - $post_default_category = $default_category_id; |
|
4525 | - } |
|
4526 | - $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
|
4527 | - $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category']; |
|
4528 | - $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : ''; |
|
4522 | + $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
4523 | + if ($default_category_id) { |
|
4524 | + $post_default_category = $default_category_id; |
|
4525 | + } |
|
4526 | + $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
|
4527 | + $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category']; |
|
4528 | + $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : ''; |
|
4529 | 4529 | |
4530 | - if ($post_category_str != '' && $post_default_category) { |
|
4531 | - $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
4532 | - } |
|
4530 | + if ($post_category_str != '' && $post_default_category) { |
|
4531 | + $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
4532 | + } |
|
4533 | 4533 | |
4534 | - $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
|
4534 | + $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
|
4535 | 4535 | |
4536 | - geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
4537 | - } |
|
4538 | - $xtimings['###8.1'] = microtime(true)-$xstart; |
|
4539 | - if ( !empty( $save_post['post_tags'] ) ) { |
|
4540 | - wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
4541 | - } |
|
4542 | - $xtimings['###9'] = microtime(true)-$xstart; |
|
4543 | - // Post images |
|
4544 | - if ( !empty( $post_images ) ) { |
|
4545 | - $post_images = array_unique($post_images); |
|
4536 | + geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
4537 | + } |
|
4538 | + $xtimings['###8.1'] = microtime(true)-$xstart; |
|
4539 | + if ( !empty( $save_post['post_tags'] ) ) { |
|
4540 | + wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
4541 | + } |
|
4542 | + $xtimings['###9'] = microtime(true)-$xstart; |
|
4543 | + // Post images |
|
4544 | + if ( !empty( $post_images ) ) { |
|
4545 | + $post_images = array_unique($post_images); |
|
4546 | 4546 | |
4547 | - $old_post_images_arr = array(); |
|
4548 | - $saved_post_images_arr = array(); |
|
4547 | + $old_post_images_arr = array(); |
|
4548 | + $saved_post_images_arr = array(); |
|
4549 | 4549 | |
4550 | - $order = 1; |
|
4550 | + $order = 1; |
|
4551 | 4551 | |
4552 | - $old_post_images = geodir_get_images( $saved_post_id ); |
|
4553 | - $xtimings['###9.1'] = microtime(true)-$xstart; |
|
4554 | - if (!empty($old_post_images)) { |
|
4555 | - foreach( $old_post_images as $old_post_image ) { |
|
4556 | - if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') { |
|
4557 | - $old_post_images_arr[] = $old_post_image->file; |
|
4558 | - } |
|
4559 | - } |
|
4560 | - } |
|
4552 | + $old_post_images = geodir_get_images( $saved_post_id ); |
|
4553 | + $xtimings['###9.1'] = microtime(true)-$xstart; |
|
4554 | + if (!empty($old_post_images)) { |
|
4555 | + foreach( $old_post_images as $old_post_image ) { |
|
4556 | + if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') { |
|
4557 | + $old_post_images_arr[] = $old_post_image->file; |
|
4558 | + } |
|
4559 | + } |
|
4560 | + } |
|
4561 | 4561 | |
4562 | - foreach ( $post_images as $post_image ) { |
|
4563 | - $image_name = basename( $post_image ); |
|
4564 | - $saved_post_images_arr[] = $image_name; |
|
4562 | + foreach ( $post_images as $post_image ) { |
|
4563 | + $image_name = basename( $post_image ); |
|
4564 | + $saved_post_images_arr[] = $image_name; |
|
4565 | 4565 | |
4566 | - if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) { |
|
4567 | - continue; // Skip if image already exists. |
|
4568 | - } |
|
4566 | + if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) { |
|
4567 | + continue; // Skip if image already exists. |
|
4568 | + } |
|
4569 | 4569 | |
4570 | - $image_name_parts = explode( '.', $image_name ); |
|
4571 | - array_pop( $image_name_parts ); |
|
4572 | - $proper_image_name = implode( '.', $image_name_parts ); |
|
4573 | - $xtimings['###9.2'] = microtime(true)-$xstart; |
|
4574 | - $arr_file_type = wp_check_filetype( $image_name ); |
|
4575 | - $xtimings['###9.3'] = microtime(true)-$xstart; |
|
4576 | - if ( !empty( $arr_file_type ) ) { |
|
4577 | - $uploaded_file_type = $arr_file_type['type']; |
|
4570 | + $image_name_parts = explode( '.', $image_name ); |
|
4571 | + array_pop( $image_name_parts ); |
|
4572 | + $proper_image_name = implode( '.', $image_name_parts ); |
|
4573 | + $xtimings['###9.2'] = microtime(true)-$xstart; |
|
4574 | + $arr_file_type = wp_check_filetype( $image_name ); |
|
4575 | + $xtimings['###9.3'] = microtime(true)-$xstart; |
|
4576 | + if ( !empty( $arr_file_type ) ) { |
|
4577 | + $uploaded_file_type = $arr_file_type['type']; |
|
4578 | 4578 | |
4579 | - $attachment = array(); |
|
4580 | - $attachment['post_id'] = $saved_post_id; |
|
4581 | - $attachment['title'] = $proper_image_name; |
|
4582 | - $attachment['content'] = ''; |
|
4583 | - $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
4584 | - $attachment['mime_type'] = $uploaded_file_type; |
|
4585 | - $attachment['menu_order'] = $order; |
|
4586 | - $attachment['is_featured'] = 0; |
|
4587 | - |
|
4588 | - $attachment_set = ''; |
|
4589 | - foreach ( $attachment as $key => $val ) { |
|
4590 | - if ( $val != '' ) { |
|
4591 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
4592 | - } |
|
4593 | - } |
|
4594 | - $attachment_set = trim( $attachment_set, ", " ); |
|
4579 | + $attachment = array(); |
|
4580 | + $attachment['post_id'] = $saved_post_id; |
|
4581 | + $attachment['title'] = $proper_image_name; |
|
4582 | + $attachment['content'] = ''; |
|
4583 | + $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
4584 | + $attachment['mime_type'] = $uploaded_file_type; |
|
4585 | + $attachment['menu_order'] = $order; |
|
4586 | + $attachment['is_featured'] = 0; |
|
4587 | + |
|
4588 | + $attachment_set = ''; |
|
4589 | + foreach ( $attachment as $key => $val ) { |
|
4590 | + if ( $val != '' ) { |
|
4591 | + $attachment_set .= $key . " = '" . $val . "', "; |
|
4592 | + } |
|
4593 | + } |
|
4594 | + $attachment_set = trim( $attachment_set, ", " ); |
|
4595 | 4595 | |
4596 | - // Add new attachment |
|
4597 | - $xtimings['###9.4'] = microtime(true)-$xstart; |
|
4598 | - $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
4599 | - $xtimings['###9.5'] = microtime(true)-$xstart; |
|
4600 | - $order++; |
|
4601 | - } |
|
4602 | - } |
|
4603 | - |
|
4604 | - $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : ''; |
|
4605 | - // Remove previous attachment |
|
4606 | - $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
4607 | - $xtimings['###9.6'] = microtime(true)-$xstart; |
|
4608 | - if ( !empty( $saved_post_images_arr ) ) { |
|
4609 | - geodir_set_wp_featured_image($saved_post_id); |
|
4610 | - $xtimings['###9.7'] = microtime(true)-$xstart; |
|
4611 | - /* |
|
4596 | + // Add new attachment |
|
4597 | + $xtimings['###9.4'] = microtime(true)-$xstart; |
|
4598 | + $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
4599 | + $xtimings['###9.5'] = microtime(true)-$xstart; |
|
4600 | + $order++; |
|
4601 | + } |
|
4602 | + } |
|
4603 | + |
|
4604 | + $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : ''; |
|
4605 | + // Remove previous attachment |
|
4606 | + $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
4607 | + $xtimings['###9.6'] = microtime(true)-$xstart; |
|
4608 | + if ( !empty( $saved_post_images_arr ) ) { |
|
4609 | + geodir_set_wp_featured_image($saved_post_id); |
|
4610 | + $xtimings['###9.7'] = microtime(true)-$xstart; |
|
4611 | + /* |
|
4612 | 4612 | $menu_order = 1; |
4613 | 4613 | |
4614 | 4614 | foreach ( $saved_post_images_arr as $img_name ) { |
@@ -4621,288 +4621,288 @@ discard block |
||
4621 | 4621 | } |
4622 | 4622 | $menu_order++; |
4623 | 4623 | }*/ |
4624 | - } |
|
4624 | + } |
|
4625 | 4625 | |
4626 | - if ( $order > 1 ) { |
|
4627 | - $images++; |
|
4628 | - } |
|
4629 | - } |
|
4630 | - $xtimings['###10'] = microtime(true)-$xstart; |
|
4631 | - /** This action is documented in geodirectory-functions/post-functions.php */ |
|
4632 | - do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
4633 | - $xtimings['###11'] = microtime(true)-$xstart; |
|
4634 | - if (isset($is_featured)) { |
|
4635 | - geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
|
4636 | - } |
|
4637 | - if (isset($gd_post['alive_days'])) { |
|
4638 | - geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']); |
|
4639 | - } |
|
4640 | - if (isset($gd_post['expire_date'])) { |
|
4641 | - geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
|
4642 | - } |
|
4643 | - $xtimings['###12'] = microtime(true)-$xstart; |
|
4644 | - } |
|
4626 | + if ( $order > 1 ) { |
|
4627 | + $images++; |
|
4628 | + } |
|
4629 | + } |
|
4630 | + $xtimings['###10'] = microtime(true)-$xstart; |
|
4631 | + /** This action is documented in geodirectory-functions/post-functions.php */ |
|
4632 | + do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
4633 | + $xtimings['###11'] = microtime(true)-$xstart; |
|
4634 | + if (isset($is_featured)) { |
|
4635 | + geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
|
4636 | + } |
|
4637 | + if (isset($gd_post['alive_days'])) { |
|
4638 | + geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']); |
|
4639 | + } |
|
4640 | + if (isset($gd_post['expire_date'])) { |
|
4641 | + geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
|
4642 | + } |
|
4643 | + $xtimings['###12'] = microtime(true)-$xstart; |
|
4644 | + } |
|
4645 | 4645 | |
4646 | - // WPML |
|
4647 | - if ($is_wpml && $language != '') { |
|
4648 | - $sitepress->switch_lang($active_lang, true); |
|
4649 | - } |
|
4650 | - // WPML |
|
4651 | - } |
|
4652 | - } |
|
4653 | - } |
|
4646 | + // WPML |
|
4647 | + if ($is_wpml && $language != '') { |
|
4648 | + $sitepress->switch_lang($active_lang, true); |
|
4649 | + } |
|
4650 | + // WPML |
|
4651 | + } |
|
4652 | + } |
|
4653 | + } |
|
4654 | 4654 | |
4655 | - //undo some stuff to make the import quicker |
|
4656 | - wp_defer_term_counting( false ); |
|
4657 | - wp_defer_comment_counting( false ); |
|
4658 | - $wpdb->query( 'COMMIT;' ); |
|
4659 | - $wpdb->query( 'SET autocommit = 1;' ); |
|
4660 | - $xtimings['###13'] = microtime(true)-$xstart; |
|
4661 | - $json = array(); |
|
4662 | - $json['processed'] = $processed_actual; |
|
4663 | - $json['created'] = $created; |
|
4664 | - $json['updated'] = $updated; |
|
4665 | - $json['skipped'] = $skipped; |
|
4666 | - $json['invalid'] = $invalid; |
|
4667 | - $json['invalid_addr'] = $invalid_addr; |
|
4668 | - $json['images'] = $images; |
|
4669 | - $json['timing'] = microtime(true)-$xstart; |
|
4670 | - $json['timings'] = $xtimings; |
|
4655 | + //undo some stuff to make the import quicker |
|
4656 | + wp_defer_term_counting( false ); |
|
4657 | + wp_defer_comment_counting( false ); |
|
4658 | + $wpdb->query( 'COMMIT;' ); |
|
4659 | + $wpdb->query( 'SET autocommit = 1;' ); |
|
4660 | + $xtimings['###13'] = microtime(true)-$xstart; |
|
4661 | + $json = array(); |
|
4662 | + $json['processed'] = $processed_actual; |
|
4663 | + $json['created'] = $created; |
|
4664 | + $json['updated'] = $updated; |
|
4665 | + $json['skipped'] = $skipped; |
|
4666 | + $json['invalid'] = $invalid; |
|
4667 | + $json['invalid_addr'] = $invalid_addr; |
|
4668 | + $json['images'] = $images; |
|
4669 | + $json['timing'] = microtime(true)-$xstart; |
|
4670 | + $json['timings'] = $xtimings; |
|
4671 | 4671 | |
4672 | 4672 | |
4673 | - wp_send_json( $json ); |
|
4674 | - exit; |
|
4675 | - } else if ( $task == 'import_loc' ) { |
|
4676 | - global $gd_post_types; |
|
4677 | - $gd_post_types = $post_types; |
|
4673 | + wp_send_json( $json ); |
|
4674 | + exit; |
|
4675 | + } else if ( $task == 'import_loc' ) { |
|
4676 | + global $gd_post_types; |
|
4677 | + $gd_post_types = $post_types; |
|
4678 | 4678 | |
4679 | - if (!empty($file)) { |
|
4680 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
4679 | + if (!empty($file)) { |
|
4680 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
4681 | 4681 | |
4682 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) { |
|
4683 | - $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory'); |
|
4684 | - wp_send_json( $json ); |
|
4685 | - } |
|
4682 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) { |
|
4683 | + $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory'); |
|
4684 | + wp_send_json( $json ); |
|
4685 | + } |
|
4686 | 4686 | |
4687 | - $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory'); |
|
4688 | - $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
4689 | - for ($i = 1; $i <= $limit; $i++) { |
|
4690 | - $index = $processed + $i; |
|
4687 | + $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory'); |
|
4688 | + $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
4689 | + for ($i = 1; $i <= $limit; $i++) { |
|
4690 | + $index = $processed + $i; |
|
4691 | 4691 | |
4692 | - if (isset($file[$index])) { |
|
4693 | - $row = $file[$index]; |
|
4694 | - $row = array_map( 'trim', $row ); |
|
4695 | - $data = array(); |
|
4692 | + if (isset($file[$index])) { |
|
4693 | + $row = $file[$index]; |
|
4694 | + $row = array_map( 'trim', $row ); |
|
4695 | + $data = array(); |
|
4696 | 4696 | |
4697 | - foreach ($columns as $c => $column ) { |
|
4698 | - if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) { |
|
4699 | - $data[$column] = $row[$c]; |
|
4700 | - } |
|
4701 | - } |
|
4697 | + foreach ($columns as $c => $column ) { |
|
4698 | + if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) { |
|
4699 | + $data[$column] = $row[$c]; |
|
4700 | + } |
|
4701 | + } |
|
4702 | 4702 | |
4703 | - if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) { |
|
4704 | - $invalid++; |
|
4705 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
4706 | - continue; |
|
4707 | - } |
|
4703 | + if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) { |
|
4704 | + $invalid++; |
|
4705 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
4706 | + continue; |
|
4707 | + } |
|
4708 | 4708 | |
4709 | - $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
|
4709 | + $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
|
4710 | 4710 | |
4711 | - if ( $import_choice == 'update' ) { |
|
4712 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) { |
|
4713 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) { |
|
4714 | - $updated++; |
|
4715 | - } else { |
|
4716 | - $invalid++; |
|
4717 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
4718 | - } |
|
4719 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) { |
|
4720 | - $data['location_id'] = (int)$location->location_id; |
|
4711 | + if ( $import_choice == 'update' ) { |
|
4712 | + if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) { |
|
4713 | + if ( $location_id = geodir_location_update_city( $data, true, $location ) ) { |
|
4714 | + $updated++; |
|
4715 | + } else { |
|
4716 | + $invalid++; |
|
4717 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
4718 | + } |
|
4719 | + } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) { |
|
4720 | + $data['location_id'] = (int)$location->location_id; |
|
4721 | 4721 | |
4722 | - if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) { |
|
4723 | - $data['location_id'] = (int)$location->location_id; |
|
4724 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) { |
|
4725 | - $data['location_id'] = (int)$location->location_id; |
|
4726 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) { |
|
4727 | - $data['location_id'] = (int)$location->location_id; |
|
4728 | - } |
|
4722 | + if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) { |
|
4723 | + $data['location_id'] = (int)$location->location_id; |
|
4724 | + } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) { |
|
4725 | + $data['location_id'] = (int)$location->location_id; |
|
4726 | + } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) { |
|
4727 | + $data['location_id'] = (int)$location->location_id; |
|
4728 | + } |
|
4729 | 4729 | |
4730 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) { |
|
4731 | - $updated++; |
|
4732 | - } else { |
|
4733 | - $invalid++; |
|
4734 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
4735 | - } |
|
4736 | - } else { |
|
4737 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) { |
|
4738 | - $created++; |
|
4739 | - } else { |
|
4740 | - $invalid++; |
|
4741 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
4742 | - } |
|
4743 | - } |
|
4744 | - } elseif ( $import_choice == 'skip' ) { |
|
4745 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) { |
|
4746 | - $skipped++; |
|
4747 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) { |
|
4748 | - $skipped++; |
|
4749 | - } else { |
|
4750 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) { |
|
4751 | - $created++; |
|
4752 | - } else { |
|
4753 | - $invalid++; |
|
4754 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
4755 | - } |
|
4756 | - } |
|
4757 | - } else { |
|
4758 | - $invalid++; |
|
4759 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
4760 | - } |
|
4761 | - } |
|
4762 | - } |
|
4763 | - } |
|
4730 | + if ( $location_id = geodir_location_update_city( $data, true, $location ) ) { |
|
4731 | + $updated++; |
|
4732 | + } else { |
|
4733 | + $invalid++; |
|
4734 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
4735 | + } |
|
4736 | + } else { |
|
4737 | + if ( $location_id = geodir_location_insert_city( $data, true ) ) { |
|
4738 | + $created++; |
|
4739 | + } else { |
|
4740 | + $invalid++; |
|
4741 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
4742 | + } |
|
4743 | + } |
|
4744 | + } elseif ( $import_choice == 'skip' ) { |
|
4745 | + if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) { |
|
4746 | + $skipped++; |
|
4747 | + } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) { |
|
4748 | + $skipped++; |
|
4749 | + } else { |
|
4750 | + if ( $location_id = geodir_location_insert_city( $data, true ) ) { |
|
4751 | + $created++; |
|
4752 | + } else { |
|
4753 | + $invalid++; |
|
4754 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
4755 | + } |
|
4756 | + } |
|
4757 | + } else { |
|
4758 | + $invalid++; |
|
4759 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
4760 | + } |
|
4761 | + } |
|
4762 | + } |
|
4763 | + } |
|
4764 | 4764 | |
4765 | - $json = array(); |
|
4766 | - $json['processed'] = $limit; |
|
4767 | - $json['created'] = $created; |
|
4768 | - $json['updated'] = $updated; |
|
4769 | - $json['skipped'] = $skipped; |
|
4770 | - $json['invalid'] = $invalid; |
|
4771 | - $json['images'] = $images; |
|
4765 | + $json = array(); |
|
4766 | + $json['processed'] = $limit; |
|
4767 | + $json['created'] = $created; |
|
4768 | + $json['updated'] = $updated; |
|
4769 | + $json['skipped'] = $skipped; |
|
4770 | + $json['invalid'] = $invalid; |
|
4771 | + $json['images'] = $images; |
|
4772 | 4772 | |
4773 | - wp_send_json( $json ); |
|
4774 | - } else if ( $task == 'import_hood' ) { |
|
4775 | - if (!empty($file)) { |
|
4776 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
4773 | + wp_send_json( $json ); |
|
4774 | + } else if ( $task == 'import_hood' ) { |
|
4775 | + if (!empty($file)) { |
|
4776 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
4777 | 4777 | |
4778 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) { |
|
4779 | - $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory'); |
|
4780 | - wp_send_json( $json ); |
|
4781 | - } |
|
4778 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) { |
|
4779 | + $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory'); |
|
4780 | + wp_send_json( $json ); |
|
4781 | + } |
|
4782 | 4782 | |
4783 | - $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory'); |
|
4784 | - $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ); |
|
4785 | - for ($i = 1; $i <= $limit; $i++) { |
|
4786 | - $index = $processed + $i; |
|
4783 | + $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory'); |
|
4784 | + $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ); |
|
4785 | + for ($i = 1; $i <= $limit; $i++) { |
|
4786 | + $index = $processed + $i; |
|
4787 | 4787 | |
4788 | - if (isset($file[$index])) { |
|
4789 | - $row = $file[$index]; |
|
4790 | - $row = array_map( 'trim', $row ); |
|
4791 | - $data = array(); |
|
4788 | + if (isset($file[$index])) { |
|
4789 | + $row = $file[$index]; |
|
4790 | + $row = array_map( 'trim', $row ); |
|
4791 | + $data = array(); |
|
4792 | 4792 | |
4793 | - foreach ($columns as $c => $column) { |
|
4794 | - if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) { |
|
4795 | - $data[$column] = sanitize_text_field($row[$c]); |
|
4796 | - } |
|
4797 | - } |
|
4793 | + foreach ($columns as $c => $column) { |
|
4794 | + if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) { |
|
4795 | + $data[$column] = sanitize_text_field($row[$c]); |
|
4796 | + } |
|
4797 | + } |
|
4798 | 4798 | |
4799 | - if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) { |
|
4800 | - $invalid++; |
|
4801 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
4802 | - continue; |
|
4803 | - } |
|
4799 | + if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) { |
|
4800 | + $invalid++; |
|
4801 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
4802 | + continue; |
|
4803 | + } |
|
4804 | 4804 | |
4805 | - $location_info = array(); |
|
4806 | - if (!empty($data['location_id']) && (int)$data['location_id'] > 0) { |
|
4807 | - $location_info = geodir_get_location_by_id('', (int)$data['location_id']); |
|
4808 | - } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) { |
|
4809 | - $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region'])); |
|
4810 | - } |
|
4805 | + $location_info = array(); |
|
4806 | + if (!empty($data['location_id']) && (int)$data['location_id'] > 0) { |
|
4807 | + $location_info = geodir_get_location_by_id('', (int)$data['location_id']); |
|
4808 | + } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) { |
|
4809 | + $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region'])); |
|
4810 | + } |
|
4811 | 4811 | |
4812 | - if (empty($location_info)) { |
|
4813 | - $invalid++; |
|
4814 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
4815 | - continue; |
|
4816 | - } |
|
4812 | + if (empty($location_info)) { |
|
4813 | + $invalid++; |
|
4814 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
4815 | + continue; |
|
4816 | + } |
|
4817 | 4817 | |
4818 | - $location_id = $location_info->location_id; |
|
4818 | + $location_id = $location_info->location_id; |
|
4819 | 4819 | |
4820 | - $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0; |
|
4820 | + $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0; |
|
4821 | 4821 | |
4822 | - $hood_data = array(); |
|
4823 | - $hood_data['hood_name'] = $data['neighbourhood_name']; |
|
4824 | - $hood_data['hood_slug'] = $data['neighbourhood_slug']; |
|
4825 | - $hood_data['hood_latitude'] = $data['latitude']; |
|
4826 | - $hood_data['hood_longitude'] = $data['longitude']; |
|
4827 | - $hood_data['hood_location_id'] = $location_id; |
|
4822 | + $hood_data = array(); |
|
4823 | + $hood_data['hood_name'] = $data['neighbourhood_name']; |
|
4824 | + $hood_data['hood_slug'] = $data['neighbourhood_slug']; |
|
4825 | + $hood_data['hood_latitude'] = $data['latitude']; |
|
4826 | + $hood_data['hood_longitude'] = $data['longitude']; |
|
4827 | + $hood_data['hood_location_id'] = $location_id; |
|
4828 | 4828 | |
4829 | - if ( $import_choice == 'update' ) { |
|
4830 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) { |
|
4831 | - $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
4829 | + if ( $import_choice == 'update' ) { |
|
4830 | + if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) { |
|
4831 | + $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
4832 | 4832 | |
4833 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) { |
|
4834 | - $updated++; |
|
4835 | - } else { |
|
4836 | - $invalid++; |
|
4837 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
4838 | - } |
|
4839 | - } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) { |
|
4840 | - $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
4833 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) { |
|
4834 | + $updated++; |
|
4835 | + } else { |
|
4836 | + $invalid++; |
|
4837 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
4838 | + } |
|
4839 | + } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) { |
|
4840 | + $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
4841 | 4841 | |
4842 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) { |
|
4843 | - $updated++; |
|
4844 | - } else { |
|
4845 | - $invalid++; |
|
4846 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
4847 | - } |
|
4848 | - } else { |
|
4849 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) { |
|
4850 | - $created++; |
|
4851 | - } else { |
|
4852 | - $invalid++; |
|
4853 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
4854 | - } |
|
4855 | - } |
|
4856 | - } elseif ( $import_choice == 'skip' ) { |
|
4857 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) { |
|
4858 | - $skipped++; |
|
4859 | - } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) { |
|
4860 | - $skipped++; |
|
4861 | - } else { |
|
4842 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) { |
|
4843 | + $updated++; |
|
4844 | + } else { |
|
4845 | + $invalid++; |
|
4846 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
4847 | + } |
|
4848 | + } else { |
|
4849 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) { |
|
4850 | + $created++; |
|
4851 | + } else { |
|
4852 | + $invalid++; |
|
4853 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
4854 | + } |
|
4855 | + } |
|
4856 | + } elseif ( $import_choice == 'skip' ) { |
|
4857 | + if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) { |
|
4858 | + $skipped++; |
|
4859 | + } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) { |
|
4860 | + $skipped++; |
|
4861 | + } else { |
|
4862 | 4862 | |
4863 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) { |
|
4864 | - $created++; |
|
4865 | - } else { |
|
4866 | - $invalid++; |
|
4867 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
4868 | - } |
|
4869 | - } |
|
4870 | - } else { |
|
4871 | - $invalid++; |
|
4872 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
4873 | - } |
|
4874 | - } |
|
4875 | - } |
|
4876 | - } |
|
4863 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) { |
|
4864 | + $created++; |
|
4865 | + } else { |
|
4866 | + $invalid++; |
|
4867 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
4868 | + } |
|
4869 | + } |
|
4870 | + } else { |
|
4871 | + $invalid++; |
|
4872 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
4873 | + } |
|
4874 | + } |
|
4875 | + } |
|
4876 | + } |
|
4877 | 4877 | |
4878 | - $json = array(); |
|
4879 | - $json['processed'] = $limit; |
|
4880 | - $json['created'] = $created; |
|
4881 | - $json['updated'] = $updated; |
|
4882 | - $json['skipped'] = $skipped; |
|
4883 | - $json['invalid'] = $invalid; |
|
4884 | - $json['images'] = $images; |
|
4878 | + $json = array(); |
|
4879 | + $json['processed'] = $limit; |
|
4880 | + $json['created'] = $created; |
|
4881 | + $json['updated'] = $updated; |
|
4882 | + $json['skipped'] = $skipped; |
|
4883 | + $json['invalid'] = $invalid; |
|
4884 | + $json['images'] = $images; |
|
4885 | 4885 | |
4886 | - wp_send_json( $json ); |
|
4887 | - } |
|
4888 | - } |
|
4889 | - break; |
|
4890 | - case 'import_finish':{ |
|
4891 | - /** |
|
4892 | - * Run an action when an import finishes. |
|
4893 | - * |
|
4894 | - * This action can be used to fire functions after an import ends. |
|
4895 | - * |
|
4896 | - * @since 1.5.3 |
|
4897 | - * @package GeoDirectory |
|
4898 | - */ |
|
4899 | - do_action('geodir_import_finished'); |
|
4900 | - } |
|
4901 | - break; |
|
4886 | + wp_send_json( $json ); |
|
4887 | + } |
|
4888 | + } |
|
4889 | + break; |
|
4890 | + case 'import_finish':{ |
|
4891 | + /** |
|
4892 | + * Run an action when an import finishes. |
|
4893 | + * |
|
4894 | + * This action can be used to fire functions after an import ends. |
|
4895 | + * |
|
4896 | + * @since 1.5.3 |
|
4897 | + * @package GeoDirectory |
|
4898 | + */ |
|
4899 | + do_action('geodir_import_finished'); |
|
4900 | + } |
|
4901 | + break; |
|
4902 | 4902 | |
4903 | - } |
|
4904 | - echo '0'; |
|
4905 | - gd_die(); |
|
4903 | + } |
|
4904 | + echo '0'; |
|
4905 | + gd_die(); |
|
4906 | 4906 | } |
4907 | 4907 | |
4908 | 4908 | /** |
@@ -4946,12 +4946,12 @@ discard block |
||
4946 | 4946 | $args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args ); |
4947 | 4947 | } |
4948 | 4948 | |
4949 | - if( !empty( $term ) ) { |
|
4949 | + if( !empty( $term ) ) { |
|
4950 | 4950 | $result = wp_insert_term( $term, $taxonomy, $args ); |
4951 | - if( !is_wp_error( $result ) ) { |
|
4952 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
4953 | - } |
|
4954 | - } |
|
4951 | + if( !is_wp_error( $result ) ) { |
|
4952 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
4953 | + } |
|
4954 | + } |
|
4955 | 4955 | |
4956 | 4956 | return false; |
4957 | 4957 | } |
@@ -4997,16 +4997,16 @@ discard block |
||
4997 | 4997 | $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
4998 | 4998 | |
4999 | 4999 | if( !is_wp_error( $result ) ) { |
5000 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
5001 | - } |
|
5000 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
5001 | + } |
|
5002 | 5002 | } else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) { |
5003 | 5003 | $term_data['term_id'] = $term_info['term_id']; |
5004 | 5004 | |
5005 | 5005 | $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
5006 | 5006 | |
5007 | 5007 | if( !is_wp_error( $result ) ) { |
5008 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
5009 | - } |
|
5008 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
5009 | + } |
|
5010 | 5010 | } else { |
5011 | 5011 | return geodir_imex_insert_term( $taxonomy, $term_data ); |
5012 | 5012 | } |
@@ -5028,47 +5028,47 @@ discard block |
||
5028 | 5028 | * @return int Posts count. |
5029 | 5029 | */ |
5030 | 5030 | function geodir_get_posts_count( $post_type ) { |
5031 | - global $wpdb, $plugin_prefix; |
|
5031 | + global $wpdb, $plugin_prefix; |
|
5032 | 5032 | |
5033 | - if ( !post_type_exists( $post_type ) ) { |
|
5034 | - return 0; |
|
5035 | - } |
|
5033 | + if ( !post_type_exists( $post_type ) ) { |
|
5034 | + return 0; |
|
5035 | + } |
|
5036 | 5036 | |
5037 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
5037 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
5038 | 5038 | |
5039 | - // Skip listing with statuses trash, auto-draft etc... |
|
5040 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
5041 | - $where_statuses = ''; |
|
5042 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) { |
|
5043 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')"; |
|
5044 | - } |
|
5039 | + // Skip listing with statuses trash, auto-draft etc... |
|
5040 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
5041 | + $where_statuses = ''; |
|
5042 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) { |
|
5043 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')"; |
|
5044 | + } |
|
5045 | 5045 | |
5046 | - /** |
|
5047 | - * Filter the SQL where clause part to filter posts count in import/export. |
|
5048 | - * |
|
5049 | - * @since 1.6.4 |
|
5050 | - * @package GeoDirectory |
|
5051 | - * |
|
5052 | - * @param string $where SQL where clause part. |
|
5053 | - */ |
|
5054 | - $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
5055 | - |
|
5056 | - $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type ); |
|
5057 | - |
|
5058 | - $posts_count = (int)$wpdb->get_var( $query ); |
|
5046 | + /** |
|
5047 | + * Filter the SQL where clause part to filter posts count in import/export. |
|
5048 | + * |
|
5049 | + * @since 1.6.4 |
|
5050 | + * @package GeoDirectory |
|
5051 | + * |
|
5052 | + * @param string $where SQL where clause part. |
|
5053 | + */ |
|
5054 | + $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
5055 | + |
|
5056 | + $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type ); |
|
5057 | + |
|
5058 | + $posts_count = (int)$wpdb->get_var( $query ); |
|
5059 | 5059 | |
5060 | - /** |
|
5061 | - * Modify returned post counts for the current post type. |
|
5062 | - * |
|
5063 | - * @since 1.4.6 |
|
5064 | - * @package GeoDirectory |
|
5065 | - * |
|
5066 | - * @param int $posts_count Post counts. |
|
5067 | - * @param string $post_type Post type. |
|
5068 | - */ |
|
5069 | - $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
5070 | - |
|
5071 | - return $posts_count; |
|
5060 | + /** |
|
5061 | + * Modify returned post counts for the current post type. |
|
5062 | + * |
|
5063 | + * @since 1.4.6 |
|
5064 | + * @package GeoDirectory |
|
5065 | + * |
|
5066 | + * @param int $posts_count Post counts. |
|
5067 | + * @param string $post_type Post type. |
|
5068 | + */ |
|
5069 | + $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
5070 | + |
|
5071 | + return $posts_count; |
|
5072 | 5072 | } |
5073 | 5073 | |
5074 | 5074 | /** |
@@ -5136,7 +5136,7 @@ discard block |
||
5136 | 5136 | } |
5137 | 5137 | $csv_row[] = 'post_status'; |
5138 | 5138 | $csv_row[] = 'is_featured'; |
5139 | - // Export claim listing field |
|
5139 | + // Export claim listing field |
|
5140 | 5140 | if ($is_claim_active) { |
5141 | 5141 | $csv_row[] = 'claimed'; |
5142 | 5142 | } |
@@ -5145,7 +5145,7 @@ discard block |
||
5145 | 5145 | $csv_row[] = 'alive_days'; |
5146 | 5146 | $csv_row[] = 'expire_date'; |
5147 | 5147 | } |
5148 | - $csv_row[] = 'post_date'; |
|
5148 | + $csv_row[] = 'post_date'; |
|
5149 | 5149 | $csv_row[] = 'post_address'; |
5150 | 5150 | $csv_row[] = 'post_city'; |
5151 | 5151 | $csv_row[] = 'post_region'; |
@@ -5153,11 +5153,11 @@ discard block |
||
5153 | 5153 | $csv_row[] = 'post_zip'; |
5154 | 5154 | $csv_row[] = 'post_latitude'; |
5155 | 5155 | $csv_row[] = 'post_longitude'; |
5156 | - if ($neighbourhood_active) { |
|
5157 | - $csv_row[] = 'post_neighbourhood'; |
|
5158 | - $csv_row[] = 'neighbourhood_latitude'; |
|
5159 | - $csv_row[] = 'neighbourhood_longitude'; |
|
5160 | - } |
|
5156 | + if ($neighbourhood_active) { |
|
5157 | + $csv_row[] = 'post_neighbourhood'; |
|
5158 | + $csv_row[] = 'neighbourhood_latitude'; |
|
5159 | + $csv_row[] = 'neighbourhood_longitude'; |
|
5160 | + } |
|
5161 | 5161 | $csv_row[] = 'geodir_timing'; |
5162 | 5162 | $csv_row[] = 'geodir_contact'; |
5163 | 5163 | $csv_row[] = 'geodir_email'; |
@@ -5192,21 +5192,21 @@ discard block |
||
5192 | 5192 | $csv_row[] = 'franchise'; |
5193 | 5193 | } |
5194 | 5194 | |
5195 | - /** |
|
5196 | - * Filter columns field names of gd export listings csv. |
|
5197 | - * |
|
5198 | - * @since 1.6.5 |
|
5199 | - * @package GeoDirectory |
|
5200 | - * |
|
5201 | - * @param array $csv_row Column names being exported in csv. |
|
5202 | - * @param string $post_type The post type. |
|
5203 | - */ |
|
5204 | - $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type); |
|
5195 | + /** |
|
5196 | + * Filter columns field names of gd export listings csv. |
|
5197 | + * |
|
5198 | + * @since 1.6.5 |
|
5199 | + * @package GeoDirectory |
|
5200 | + * |
|
5201 | + * @param array $csv_row Column names being exported in csv. |
|
5202 | + * @param string $post_type The post type. |
|
5203 | + */ |
|
5204 | + $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type); |
|
5205 | 5205 | |
5206 | 5206 | $csv_rows[] = $csv_row; |
5207 | 5207 | |
5208 | 5208 | $images_count = 5; |
5209 | - $xx=0; |
|
5209 | + $xx=0; |
|
5210 | 5210 | foreach ( $posts as $post ) {$xx++; |
5211 | 5211 | $post_id = $post['ID']; |
5212 | 5212 | |
@@ -5337,15 +5337,15 @@ discard block |
||
5337 | 5337 | } |
5338 | 5338 | $csv_row[] = $post_info['post_status']; // post_status |
5339 | 5339 | $csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured |
5340 | - if ($is_claim_active) { |
|
5341 | - $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
5342 | - } |
|
5340 | + if ($is_claim_active) { |
|
5341 | + $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
5342 | + } |
|
5343 | 5343 | if ($is_payment_plugin) { |
5344 | 5344 | $csv_row[] = (int)$post_info['package_id']; // package_id |
5345 | 5345 | $csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days |
5346 | 5346 | $csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date |
5347 | 5347 | } |
5348 | - $csv_row[] = $post_info['post_date']; // post_date |
|
5348 | + $csv_row[] = $post_info['post_date']; // post_date |
|
5349 | 5349 | $csv_row[] = stripslashes($post_info['post_address']); // post_address |
5350 | 5350 | $csv_row[] = stripslashes($post_info['post_city']); // post_city |
5351 | 5351 | $csv_row[] = stripslashes($post_info['post_region']); // post_region |
@@ -5353,21 +5353,21 @@ discard block |
||
5353 | 5353 | $csv_row[] = stripslashes($post_info['post_zip']); // post_zip |
5354 | 5354 | $csv_row[] = $post_info['post_latitude']; // post_latitude |
5355 | 5355 | $csv_row[] = $post_info['post_longitude']; // post_longitude |
5356 | - if ($neighbourhood_active) { |
|
5357 | - $post_neighbourhood = ''; |
|
5358 | - $neighbourhood_latitude = ''; |
|
5359 | - $neighbourhood_longitude = ''; |
|
5360 | - if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) { |
|
5361 | - if (!empty($hood_info)) { |
|
5362 | - $post_neighbourhood = $hood_info->hood_name; |
|
5363 | - $neighbourhood_latitude = $hood_info->hood_latitude; |
|
5364 | - $neighbourhood_longitude = $hood_info->hood_longitude; |
|
5365 | - } |
|
5366 | - } |
|
5367 | - $csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood |
|
5368 | - $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude |
|
5369 | - $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude |
|
5370 | - } |
|
5356 | + if ($neighbourhood_active) { |
|
5357 | + $post_neighbourhood = ''; |
|
5358 | + $neighbourhood_latitude = ''; |
|
5359 | + $neighbourhood_longitude = ''; |
|
5360 | + if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) { |
|
5361 | + if (!empty($hood_info)) { |
|
5362 | + $post_neighbourhood = $hood_info->hood_name; |
|
5363 | + $neighbourhood_latitude = $hood_info->hood_latitude; |
|
5364 | + $neighbourhood_longitude = $hood_info->hood_longitude; |
|
5365 | + } |
|
5366 | + } |
|
5367 | + $csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood |
|
5368 | + $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude |
|
5369 | + $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude |
|
5370 | + } |
|
5371 | 5371 | $csv_row[] = stripslashes($post_info['geodir_timing']); // geodir_timing |
5372 | 5372 | $csv_row[] = stripslashes($post_info['geodir_contact']); // geodir_contact |
5373 | 5373 | $csv_row[] = stripslashes($post_info['geodir_email']); // geodir_email |
@@ -5410,16 +5410,16 @@ discard block |
||
5410 | 5410 | $csv_row[] = (int)$franchise; // franchise id |
5411 | 5411 | } |
5412 | 5412 | |
5413 | - /** |
|
5414 | - * Filter columns values of gd export listings csv file |
|
5415 | - * |
|
5416 | - * @since 1.6.5 |
|
5417 | - * @package GeoDirectory |
|
5418 | - * |
|
5419 | - * @param array $csv_row Field values being exported in csv. |
|
5420 | - * @param array $post_info The post info. |
|
5421 | - */ |
|
5422 | - $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info); |
|
5413 | + /** |
|
5414 | + * Filter columns values of gd export listings csv file |
|
5415 | + * |
|
5416 | + * @since 1.6.5 |
|
5417 | + * @package GeoDirectory |
|
5418 | + * |
|
5419 | + * @param array $csv_row Field values being exported in csv. |
|
5420 | + * @param array $post_info The post info. |
|
5421 | + */ |
|
5422 | + $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info); |
|
5423 | 5423 | |
5424 | 5424 | for ( $c = 0; $c < $images_count; $c++ ) { |
5425 | 5425 | $csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE |
@@ -5452,64 +5452,64 @@ discard block |
||
5452 | 5452 | * @return array Array of posts data. |
5453 | 5453 | */ |
5454 | 5454 | function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) { |
5455 | - global $wpdb, $plugin_prefix; |
|
5455 | + global $wpdb, $plugin_prefix; |
|
5456 | 5456 | |
5457 | - if ( ! post_type_exists( $post_type ) ) |
|
5458 | - return new stdClass; |
|
5457 | + if ( ! post_type_exists( $post_type ) ) |
|
5458 | + return new stdClass; |
|
5459 | 5459 | |
5460 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
5460 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
5461 | 5461 | |
5462 | - $limit = ''; |
|
5463 | - if ( $per_page > 0 && $page_no > 0 ) { |
|
5464 | - $offset = ( $page_no - 1 ) * $per_page; |
|
5462 | + $limit = ''; |
|
5463 | + if ( $per_page > 0 && $page_no > 0 ) { |
|
5464 | + $offset = ( $page_no - 1 ) * $per_page; |
|
5465 | 5465 | |
5466 | - if ( $offset > 0 ) { |
|
5467 | - $limit = " LIMIT " . $offset . "," . $per_page; |
|
5468 | - } else { |
|
5469 | - $limit = " LIMIT " . $per_page; |
|
5470 | - } |
|
5471 | - } |
|
5466 | + if ( $offset > 0 ) { |
|
5467 | + $limit = " LIMIT " . $offset . "," . $per_page; |
|
5468 | + } else { |
|
5469 | + $limit = " LIMIT " . $per_page; |
|
5470 | + } |
|
5471 | + } |
|
5472 | 5472 | |
5473 | - // Skip listing with statuses trash, auto-draft etc... |
|
5474 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
5475 | - $where_statuses = ''; |
|
5476 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) { |
|
5477 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')"; |
|
5478 | - } |
|
5473 | + // Skip listing with statuses trash, auto-draft etc... |
|
5474 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
5475 | + $where_statuses = ''; |
|
5476 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) { |
|
5477 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')"; |
|
5478 | + } |
|
5479 | 5479 | |
5480 | - /** |
|
5481 | - * Filter the SQL where clause part to filter posts in import/export. |
|
5482 | - * |
|
5483 | - * @since 1.6.4 |
|
5484 | - * @package GeoDirectory |
|
5485 | - * |
|
5486 | - * @param string $where SQL where clause part. |
|
5487 | - */ |
|
5488 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
5489 | - |
|
5490 | - $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type ); |
|
5491 | - /** |
|
5492 | - * Modify returned posts SQL query for the current post type. |
|
5493 | - * |
|
5494 | - * @since 1.4.6 |
|
5495 | - * @package GeoDirectory |
|
5496 | - * |
|
5497 | - * @param int $query The SQL query. |
|
5498 | - * @param string $post_type Post type. |
|
5499 | - */ |
|
5500 | - $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
5501 | - $results = (array)$wpdb->get_results( $query, ARRAY_A ); |
|
5502 | - |
|
5503 | - /** |
|
5504 | - * Modify returned post results for the current post type. |
|
5505 | - * |
|
5506 | - * @since 1.4.6 |
|
5507 | - * @package GeoDirectory |
|
5508 | - * |
|
5509 | - * @param object $results An object containing all post ids. |
|
5510 | - * @param string $post_type Post type. |
|
5511 | - */ |
|
5512 | - return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
5480 | + /** |
|
5481 | + * Filter the SQL where clause part to filter posts in import/export. |
|
5482 | + * |
|
5483 | + * @since 1.6.4 |
|
5484 | + * @package GeoDirectory |
|
5485 | + * |
|
5486 | + * @param string $where SQL where clause part. |
|
5487 | + */ |
|
5488 | + $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
5489 | + |
|
5490 | + $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type ); |
|
5491 | + /** |
|
5492 | + * Modify returned posts SQL query for the current post type. |
|
5493 | + * |
|
5494 | + * @since 1.4.6 |
|
5495 | + * @package GeoDirectory |
|
5496 | + * |
|
5497 | + * @param int $query The SQL query. |
|
5498 | + * @param string $post_type Post type. |
|
5499 | + */ |
|
5500 | + $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
5501 | + $results = (array)$wpdb->get_results( $query, ARRAY_A ); |
|
5502 | + |
|
5503 | + /** |
|
5504 | + * Modify returned post results for the current post type. |
|
5505 | + * |
|
5506 | + * @since 1.4.6 |
|
5507 | + * @package GeoDirectory |
|
5508 | + * |
|
5509 | + * @param object $results An object containing all post ids. |
|
5510 | + * @param string $post_type Post type. |
|
5511 | + */ |
|
5512 | + return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
5513 | 5513 | } |
5514 | 5514 | |
5515 | 5515 | /** |
@@ -5528,26 +5528,26 @@ discard block |
||
5528 | 5528 | * @return string The SQL query. |
5529 | 5529 | */ |
5530 | 5530 | function geodir_imex_get_events_query( $query, $post_type ) { |
5531 | - if ( $post_type == 'gd_event' ) { |
|
5532 | - global $wpdb, $plugin_prefix; |
|
5531 | + if ( $post_type == 'gd_event' ) { |
|
5532 | + global $wpdb, $plugin_prefix; |
|
5533 | 5533 | |
5534 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
5535 | - $schedule_table = EVENT_SCHEDULE; |
|
5534 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
5535 | + $schedule_table = EVENT_SCHEDULE; |
|
5536 | 5536 | |
5537 | - // Skip listing with statuses trash, auto-draft etc... |
|
5538 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
5539 | - $where_statuses = ''; |
|
5540 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) { |
|
5541 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')"; |
|
5542 | - } |
|
5537 | + // Skip listing with statuses trash, auto-draft etc... |
|
5538 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
5539 | + $where_statuses = ''; |
|
5540 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) { |
|
5541 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')"; |
|
5542 | + } |
|
5543 | 5543 | |
5544 | - /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
|
5545 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
5544 | + /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
|
5545 | + $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
5546 | 5546 | |
5547 | - $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type ); |
|
5548 | - } |
|
5547 | + $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type ); |
|
5548 | + } |
|
5549 | 5549 | |
5550 | - return $query; |
|
5550 | + return $query; |
|
5551 | 5551 | } |
5552 | 5552 | |
5553 | 5553 | /** |
@@ -5569,36 +5569,36 @@ discard block |
||
5569 | 5569 | * @return int Total terms count. |
5570 | 5570 | */ |
5571 | 5571 | function geodir_get_terms_count( $post_type ) { |
5572 | - $args = array( 'hide_empty' => 0 ); |
|
5572 | + $args = array( 'hide_empty' => 0 ); |
|
5573 | 5573 | |
5574 | - remove_all_filters( 'get_terms' ); |
|
5574 | + remove_all_filters( 'get_terms' ); |
|
5575 | 5575 | |
5576 | - $taxonomy = $post_type . 'category'; |
|
5576 | + $taxonomy = $post_type . 'category'; |
|
5577 | 5577 | |
5578 | - // WPML |
|
5579 | - $is_wpml = geodir_is_wpml(); |
|
5580 | - $active_lang = 'all'; |
|
5581 | - if ( $is_wpml ) { |
|
5582 | - global $sitepress; |
|
5583 | - $active_lang = $sitepress->get_current_language(); |
|
5578 | + // WPML |
|
5579 | + $is_wpml = geodir_is_wpml(); |
|
5580 | + $active_lang = 'all'; |
|
5581 | + if ( $is_wpml ) { |
|
5582 | + global $sitepress; |
|
5583 | + $active_lang = $sitepress->get_current_language(); |
|
5584 | 5584 | |
5585 | - if ( $active_lang != 'all' ) { |
|
5586 | - $sitepress->switch_lang( 'all', true ); |
|
5587 | - } |
|
5588 | - } |
|
5589 | - // WPML |
|
5585 | + if ( $active_lang != 'all' ) { |
|
5586 | + $sitepress->switch_lang( 'all', true ); |
|
5587 | + } |
|
5588 | + } |
|
5589 | + // WPML |
|
5590 | 5590 | |
5591 | - $count_terms = wp_count_terms( $taxonomy, $args ); |
|
5591 | + $count_terms = wp_count_terms( $taxonomy, $args ); |
|
5592 | 5592 | |
5593 | - // WPML |
|
5594 | - if ( $is_wpml && $active_lang !== 'all' ) { |
|
5595 | - global $sitepress; |
|
5596 | - $sitepress->switch_lang( $active_lang, true ); |
|
5597 | - } |
|
5598 | - // WPML |
|
5599 | - $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
5593 | + // WPML |
|
5594 | + if ( $is_wpml && $active_lang !== 'all' ) { |
|
5595 | + global $sitepress; |
|
5596 | + $sitepress->switch_lang( $active_lang, true ); |
|
5597 | + } |
|
5598 | + // WPML |
|
5599 | + $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
5600 | 5600 | |
5601 | - return $count_terms; |
|
5601 | + return $count_terms; |
|
5602 | 5602 | } |
5603 | 5603 | |
5604 | 5604 | /** |
@@ -5637,11 +5637,11 @@ discard block |
||
5637 | 5637 | $csv_row[] = 'cat_posttype'; |
5638 | 5638 | $csv_row[] = 'cat_parent'; |
5639 | 5639 | $csv_row[] = 'cat_schema'; |
5640 | - // WPML |
|
5640 | + // WPML |
|
5641 | 5641 | $is_wpml = geodir_wpml_is_taxonomy_translated( $taxonomy ); |
5642 | 5642 | if ($is_wpml) { |
5643 | 5643 | $csv_row[] = 'cat_language'; |
5644 | - $csv_row[] = 'cat_id_original'; |
|
5644 | + $csv_row[] = 'cat_id_original'; |
|
5645 | 5645 | } |
5646 | 5646 | // WPML |
5647 | 5647 | $csv_row[] = 'cat_description'; |
@@ -5671,10 +5671,10 @@ discard block |
||
5671 | 5671 | $csv_row[] = $post_type; |
5672 | 5672 | $csv_row[] = $cat_parent; |
5673 | 5673 | $csv_row[] = geodir_get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type ); |
5674 | - // WPML |
|
5674 | + // WPML |
|
5675 | 5675 | if ($is_wpml) { |
5676 | 5676 | $csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy ); |
5677 | - $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
5677 | + $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
5678 | 5678 | } |
5679 | 5679 | // WPML |
5680 | 5680 | $csv_row[] = $term->description; |
@@ -6092,43 +6092,43 @@ discard block |
||
6092 | 6092 | * @param string $status Post status. |
6093 | 6093 | */ |
6094 | 6094 | function geodir_create_page($slug, $option, $page_title = '', $page_content = '', $post_parent = 0, $status = 'publish') { |
6095 | - global $wpdb, $current_user; |
|
6096 | - |
|
6097 | - $option_value = get_option($option); |
|
6098 | - |
|
6099 | - if ($option_value > 0) : |
|
6100 | - if (get_post($option_value)) : |
|
6101 | - // Page exists |
|
6102 | - return; |
|
6103 | - endif; |
|
6104 | - endif; |
|
6105 | - |
|
6106 | - $page_found = $wpdb->get_var( |
|
6107 | - $wpdb->prepare( |
|
6108 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
6109 | - array($slug) |
|
6110 | - ) |
|
6111 | - ); |
|
6112 | - |
|
6113 | - if ($page_found) : |
|
6114 | - // Page exists |
|
6115 | - if (!$option_value) update_option($option, $page_found); |
|
6116 | - return; |
|
6117 | - endif; |
|
6118 | - |
|
6119 | - $page_data = array( |
|
6120 | - 'post_status' => $status, |
|
6121 | - 'post_type' => 'page', |
|
6122 | - 'post_author' => $current_user->ID, |
|
6123 | - 'post_name' => $slug, |
|
6124 | - 'post_title' => $page_title, |
|
6125 | - 'post_content' => $page_content, |
|
6126 | - 'post_parent' => $post_parent, |
|
6127 | - 'comment_status' => 'closed' |
|
6128 | - ); |
|
6129 | - $page_id = wp_insert_post($page_data); |
|
6130 | - |
|
6131 | - add_option($option, $page_id); |
|
6095 | + global $wpdb, $current_user; |
|
6096 | + |
|
6097 | + $option_value = get_option($option); |
|
6098 | + |
|
6099 | + if ($option_value > 0) : |
|
6100 | + if (get_post($option_value)) : |
|
6101 | + // Page exists |
|
6102 | + return; |
|
6103 | + endif; |
|
6104 | + endif; |
|
6105 | + |
|
6106 | + $page_found = $wpdb->get_var( |
|
6107 | + $wpdb->prepare( |
|
6108 | + "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
6109 | + array($slug) |
|
6110 | + ) |
|
6111 | + ); |
|
6112 | + |
|
6113 | + if ($page_found) : |
|
6114 | + // Page exists |
|
6115 | + if (!$option_value) update_option($option, $page_found); |
|
6116 | + return; |
|
6117 | + endif; |
|
6118 | + |
|
6119 | + $page_data = array( |
|
6120 | + 'post_status' => $status, |
|
6121 | + 'post_type' => 'page', |
|
6122 | + 'post_author' => $current_user->ID, |
|
6123 | + 'post_name' => $slug, |
|
6124 | + 'post_title' => $page_title, |
|
6125 | + 'post_content' => $page_content, |
|
6126 | + 'post_parent' => $post_parent, |
|
6127 | + 'comment_status' => 'closed' |
|
6128 | + ); |
|
6129 | + $page_id = wp_insert_post($page_data); |
|
6130 | + |
|
6131 | + add_option($option, $page_id); |
|
6132 | 6132 | |
6133 | 6133 | } |
6134 | 6134 | |
@@ -6159,9 +6159,9 @@ discard block |
||
6159 | 6159 | * @package GeoDirectory |
6160 | 6160 | */ |
6161 | 6161 | function geodir_admin_upgrade_notice() { |
6162 | - $class = "error"; |
|
6163 | - $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory"); |
|
6164 | - echo"<div class=\"$class\"> <p>$message</p></div>"; |
|
6162 | + $class = "error"; |
|
6163 | + $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory"); |
|
6164 | + echo"<div class=\"$class\"> <p>$message</p></div>"; |
|
6165 | 6165 | } |
6166 | 6166 | |
6167 | 6167 | /** |
@@ -6174,18 +6174,18 @@ discard block |
||
6174 | 6174 | */ |
6175 | 6175 | function geodire_admin_upgrade_notice( $plugin_data, $r ) |
6176 | 6176 | { |
6177 | - // readme contents |
|
6178 | - $args = array( |
|
6179 | - 'timeout' => 15, |
|
6180 | - 'redirection' => 5 |
|
6181 | - ); |
|
6182 | - $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
|
6183 | - $data = wp_remote_get( $url, $args ); |
|
6177 | + // readme contents |
|
6178 | + $args = array( |
|
6179 | + 'timeout' => 15, |
|
6180 | + 'redirection' => 5 |
|
6181 | + ); |
|
6182 | + $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
|
6183 | + $data = wp_remote_get( $url, $args ); |
|
6184 | 6184 | |
6185 | - if (!is_wp_error($data) && $data['response']['code'] == 200) { |
|
6185 | + if (!is_wp_error($data) && $data['response']['code'] == 200) { |
|
6186 | 6186 | |
6187 | - geodir_in_plugin_update_message($data['body']); |
|
6188 | - } |
|
6187 | + geodir_in_plugin_update_message($data['body']); |
|
6188 | + } |
|
6189 | 6189 | } |
6190 | 6190 | |
6191 | 6191 | |
@@ -6193,28 +6193,28 @@ discard block |
||
6193 | 6193 | * @param string $content http response body |
6194 | 6194 | */ |
6195 | 6195 | function geodir_in_plugin_update_message($content) { |
6196 | - // Output Upgrade Notice |
|
6197 | - $matches = null; |
|
6198 | - $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
6199 | - $upgrade_notice = ''; |
|
6200 | - if ( preg_match( $regexp, $content, $matches ) ) { |
|
6201 | - if(empty($matches)){return;} |
|
6202 | - |
|
6203 | - $version = trim( $matches[1] ); |
|
6204 | - if($version && $version>GEODIRECTORY_VERSION){ |
|
6205 | - |
|
6206 | - |
|
6207 | - $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) ); |
|
6208 | - if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) { |
|
6209 | - $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
|
6210 | - foreach ( $notices as $index => $line ) { |
|
6211 | - $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) ); |
|
6212 | - } |
|
6213 | - $upgrade_notice .= '</div> '; |
|
6214 | - } |
|
6215 | - } |
|
6216 | - } |
|
6217 | - echo $upgrade_notice; |
|
6196 | + // Output Upgrade Notice |
|
6197 | + $matches = null; |
|
6198 | + $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
6199 | + $upgrade_notice = ''; |
|
6200 | + if ( preg_match( $regexp, $content, $matches ) ) { |
|
6201 | + if(empty($matches)){return;} |
|
6202 | + |
|
6203 | + $version = trim( $matches[1] ); |
|
6204 | + if($version && $version>GEODIRECTORY_VERSION){ |
|
6205 | + |
|
6206 | + |
|
6207 | + $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) ); |
|
6208 | + if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) { |
|
6209 | + $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
|
6210 | + foreach ( $notices as $index => $line ) { |
|
6211 | + $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) ); |
|
6212 | + } |
|
6213 | + $upgrade_notice .= '</div> '; |
|
6214 | + } |
|
6215 | + } |
|
6216 | + } |
|
6217 | + echo $upgrade_notice; |
|
6218 | 6218 | } |
6219 | 6219 | |
6220 | 6220 | /** |
@@ -6247,19 +6247,19 @@ discard block |
||
6247 | 6247 | * @param array Listing statuses to be skipped. |
6248 | 6248 | */ |
6249 | 6249 | function geodir_imex_export_skip_statuses() { |
6250 | - $statuses = array( 'trash', 'auto-draft' ); |
|
6250 | + $statuses = array( 'trash', 'auto-draft' ); |
|
6251 | 6251 | |
6252 | - /** |
|
6253 | - * Filter the statuses to skip during GD export listings. |
|
6254 | - * |
|
6255 | - * @since 1.6.0 |
|
6256 | - * @package GeoDirectory |
|
6257 | - * |
|
6258 | - * @param array $statuses Listing statuses to be skipped. |
|
6259 | - */ |
|
6260 | - $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
6252 | + /** |
|
6253 | + * Filter the statuses to skip during GD export listings. |
|
6254 | + * |
|
6255 | + * @since 1.6.0 |
|
6256 | + * @package GeoDirectory |
|
6257 | + * |
|
6258 | + * @param array $statuses Listing statuses to be skipped. |
|
6259 | + */ |
|
6260 | + $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
6261 | 6261 | |
6262 | - return $statuses; |
|
6262 | + return $statuses; |
|
6263 | 6263 | } |
6264 | 6264 | |
6265 | 6265 | /** |
@@ -6275,42 +6275,42 @@ discard block |
||
6275 | 6275 | * @global string $typenow Current post type. |
6276 | 6276 | */ |
6277 | 6277 | function geodir_admin_dequeue_scripts() { |
6278 | - global $typenow; |
|
6278 | + global $typenow; |
|
6279 | 6279 | |
6280 | - // EDD |
|
6281 | - if (wp_script_is('jquery-chosen', 'enqueued')) { |
|
6282 | - wp_dequeue_script('jquery-chosen'); |
|
6283 | - } |
|
6280 | + // EDD |
|
6281 | + if (wp_script_is('jquery-chosen', 'enqueued')) { |
|
6282 | + wp_dequeue_script('jquery-chosen'); |
|
6283 | + } |
|
6284 | 6284 | |
6285 | - // Ultimate Addons for Visual Composer |
|
6286 | - if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) { |
|
6287 | - wp_dequeue_script('ultimate-vc-backend-script'); |
|
6288 | - } |
|
6285 | + // Ultimate Addons for Visual Composer |
|
6286 | + if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) { |
|
6287 | + wp_dequeue_script('ultimate-vc-backend-script'); |
|
6288 | + } |
|
6289 | 6289 | |
6290 | - // VC editor conflicts |
|
6291 | - if (class_exists('Vc_Role_Access_Controller') && wp_script_is('dfd_vc_damin_scripts', 'enqueued')) { |
|
6292 | - wp_dequeue_script('dfd_vc_damin_scripts'); |
|
6293 | - } |
|
6290 | + // VC editor conflicts |
|
6291 | + if (class_exists('Vc_Role_Access_Controller') && wp_script_is('dfd_vc_damin_scripts', 'enqueued')) { |
|
6292 | + wp_dequeue_script('dfd_vc_damin_scripts'); |
|
6293 | + } |
|
6294 | 6294 | |
6295 | - // Ultimate chosen |
|
6296 | - if (wp_script_is('ultimate-chosen-script', 'enqueued')) { |
|
6297 | - wp_dequeue_script('ultimate-chosen-script'); |
|
6298 | - } |
|
6295 | + // Ultimate chosen |
|
6296 | + if (wp_script_is('ultimate-chosen-script', 'enqueued')) { |
|
6297 | + wp_dequeue_script('ultimate-chosen-script'); |
|
6298 | + } |
|
6299 | 6299 | |
6300 | - // Crum composer choosen |
|
6301 | - if (wp_script_is('crum-composer-choosen', 'enqueued')) { |
|
6302 | - wp_dequeue_script('crum-composer-choosen'); |
|
6303 | - } |
|
6300 | + // Crum composer choosen |
|
6301 | + if (wp_script_is('crum-composer-choosen', 'enqueued')) { |
|
6302 | + wp_dequeue_script('crum-composer-choosen'); |
|
6303 | + } |
|
6304 | 6304 | |
6305 | - // Fix conflict Fusion Builder jquery chosen with GD jquery chosen. |
|
6306 | - if (class_exists('FusionBuilder') && wp_script_is('fusion_builder_chosen_js', 'enqueued')) { |
|
6307 | - wp_dequeue_script('fusion_builder_chosen_js'); |
|
6308 | - } |
|
6305 | + // Fix conflict Fusion Builder jquery chosen with GD jquery chosen. |
|
6306 | + if (class_exists('FusionBuilder') && wp_script_is('fusion_builder_chosen_js', 'enqueued')) { |
|
6307 | + wp_dequeue_script('fusion_builder_chosen_js'); |
|
6308 | + } |
|
6309 | 6309 | |
6310 | - // Fix conflicts timepicker & setting date value. |
|
6311 | - if (class_exists('acf') && wp_script_is('acf-timepicker', 'enqueued')) { |
|
6312 | - wp_dequeue_script('acf-timepicker'); |
|
6313 | - } |
|
6310 | + // Fix conflicts timepicker & setting date value. |
|
6311 | + if (class_exists('acf') && wp_script_is('acf-timepicker', 'enqueued')) { |
|
6312 | + wp_dequeue_script('acf-timepicker'); |
|
6313 | + } |
|
6314 | 6314 | } |
6315 | 6315 | |
6316 | 6316 | /** |
@@ -6326,48 +6326,48 @@ discard block |
||
6326 | 6326 | * @return string SQL where clause part. |
6327 | 6327 | */ |
6328 | 6328 | function geodir_imex_get_filter_where($where = '', $post_type = '') { |
6329 | - global $wpdb; |
|
6329 | + global $wpdb; |
|
6330 | 6330 | |
6331 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
6331 | + $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
6332 | 6332 | |
6333 | - if ( !empty( $filters ) ) { |
|
6334 | - foreach ( $filters as $field => $value ) { |
|
6335 | - switch ($field) { |
|
6336 | - case 'start_date': |
|
6337 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
6338 | - break; |
|
6339 | - case 'end_date': |
|
6340 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
6341 | - break; |
|
6342 | - } |
|
6343 | - } |
|
6344 | - } |
|
6333 | + if ( !empty( $filters ) ) { |
|
6334 | + foreach ( $filters as $field => $value ) { |
|
6335 | + switch ($field) { |
|
6336 | + case 'start_date': |
|
6337 | + $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
6338 | + break; |
|
6339 | + case 'end_date': |
|
6340 | + $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
6341 | + break; |
|
6342 | + } |
|
6343 | + } |
|
6344 | + } |
|
6345 | 6345 | |
6346 | - return $where; |
|
6346 | + return $where; |
|
6347 | 6347 | } |
6348 | 6348 | add_filter('geodir_get_posts_count', 'geodir_imex_get_filter_where', 10, 2); |
6349 | 6349 | add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2); |
6350 | 6350 | |
6351 | 6351 | |
6352 | 6352 | function geodir_fix_for_primer_theme(){ |
6353 | - if(!defined( 'PRIMER_VERSION' )){return;} |
|
6354 | - global $pagenow; |
|
6353 | + if(!defined( 'PRIMER_VERSION' )){return;} |
|
6354 | + global $pagenow; |
|
6355 | 6355 | |
6356 | - if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){ |
|
6356 | + if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){ |
|
6357 | 6357 | |
6358 | - $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
6358 | + $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
6359 | 6359 | |
6360 | - $post_types = geodir_get_posttypes(); |
|
6361 | - if ($post_type && in_array($post_type, $post_types) ) { |
|
6362 | - global $primer_customizer_layouts; |
|
6363 | - remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
6364 | - } |
|
6365 | - } |
|
6360 | + $post_types = geodir_get_posttypes(); |
|
6361 | + if ($post_type && in_array($post_type, $post_types) ) { |
|
6362 | + global $primer_customizer_layouts; |
|
6363 | + remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
6364 | + } |
|
6365 | + } |
|
6366 | 6366 | |
6367 | 6367 | } |
6368 | 6368 | |
6369 | 6369 | if(is_admin()){ |
6370 | - add_action('add_meta_boxes','geodir_fix_for_primer_theme',0); |
|
6370 | + add_action('add_meta_boxes','geodir_fix_for_primer_theme',0); |
|
6371 | 6371 | } |
6372 | 6372 | |
6373 | 6373 | |
@@ -6500,96 +6500,96 @@ discard block |
||
6500 | 6500 | |
6501 | 6501 | function geodir_ga_activation_url() { |
6502 | 6502 | |
6503 | - return add_query_arg( array( |
|
6504 | - 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"), |
|
6505 | - 'scope' => GEODIR_GA_SCOPE, |
|
6506 | - 'response_type' => 'code', |
|
6507 | - 'redirect_uri' => GEODIR_GA_REDIRECT, |
|
6508 | - 'client_id' => GEODIR_GA_CLIENTID, |
|
6509 | - ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
6503 | + return add_query_arg( array( |
|
6504 | + 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"), |
|
6505 | + 'scope' => GEODIR_GA_SCOPE, |
|
6506 | + 'response_type' => 'code', |
|
6507 | + 'redirect_uri' => GEODIR_GA_REDIRECT, |
|
6508 | + 'client_id' => GEODIR_GA_CLIENTID, |
|
6509 | + ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
6510 | 6510 | |
6511 | - return $url; |
|
6511 | + return $url; |
|
6512 | 6512 | } |
6513 | 6513 | |
6514 | 6514 | function geodir_gd_accounts(){ |
6515 | - $accounts = array(); |
|
6516 | - $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
6517 | - if($useAuth){ |
|
6518 | - try { |
|
6519 | - $accounts = geodir_ga_get_analytics_accounts(); |
|
6520 | - } catch (Exception $e) { |
|
6521 | - geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
6522 | - } |
|
6515 | + $accounts = array(); |
|
6516 | + $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
6517 | + if($useAuth){ |
|
6518 | + try { |
|
6519 | + $accounts = geodir_ga_get_analytics_accounts(); |
|
6520 | + } catch (Exception $e) { |
|
6521 | + geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
6522 | + } |
|
6523 | 6523 | |
6524 | - if(is_array($accounts)){ |
|
6525 | - $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts); |
|
6526 | - }elseif(get_option('geodir_ga_account_id')){ |
|
6527 | - $accounts = array(); |
|
6528 | - $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')'; |
|
6529 | - } |
|
6530 | - } |
|
6531 | - return $accounts; |
|
6524 | + if(is_array($accounts)){ |
|
6525 | + $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts); |
|
6526 | + }elseif(get_option('geodir_ga_account_id')){ |
|
6527 | + $accounts = array(); |
|
6528 | + $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')'; |
|
6529 | + } |
|
6530 | + } |
|
6531 | + return $accounts; |
|
6532 | 6532 | } |
6533 | 6533 | |
6534 | 6534 | function geodir_ga_get_analytics_accounts() |
6535 | 6535 | { |
6536 | - global $gd_ga_errors; |
|
6537 | - $accounts = array(); |
|
6536 | + global $gd_ga_errors; |
|
6537 | + $accounts = array(); |
|
6538 | 6538 | |
6539 | - if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');} |
|
6539 | + if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');} |
|
6540 | 6540 | |
6541 | 6541 | |
6542 | - if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){ |
|
6543 | - return get_option('geodir_gd_uids'); |
|
6544 | - } |
|
6542 | + if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){ |
|
6543 | + return get_option('geodir_gd_uids'); |
|
6544 | + } |
|
6545 | 6545 | |
6546 | - # Create a new Gdata call |
|
6547 | - if ( trim(get_option('geodir_ga_auth_code')) != '' ) |
|
6548 | - $stats = new GDGoogleAnalyticsStats(); |
|
6549 | - else |
|
6550 | - return false; |
|
6546 | + # Create a new Gdata call |
|
6547 | + if ( trim(get_option('geodir_ga_auth_code')) != '' ) |
|
6548 | + $stats = new GDGoogleAnalyticsStats(); |
|
6549 | + else |
|
6550 | + return false; |
|
6551 | 6551 | |
6552 | - # Check if Google sucessfully logged in |
|
6553 | - if ( ! $stats->checkLogin() ) |
|
6554 | - return false; |
|
6552 | + # Check if Google sucessfully logged in |
|
6553 | + if ( ! $stats->checkLogin() ) |
|
6554 | + return false; |
|
6555 | 6555 | |
6556 | - # Get a list of accounts |
|
6557 | - try { |
|
6558 | - $accounts = $stats->getAllProfiles(); |
|
6559 | - } catch (Exception $e) { |
|
6560 | - $gd_ga_errors[] = $e->getMessage(); |
|
6561 | - return false; |
|
6562 | - } |
|
6556 | + # Get a list of accounts |
|
6557 | + try { |
|
6558 | + $accounts = $stats->getAllProfiles(); |
|
6559 | + } catch (Exception $e) { |
|
6560 | + $gd_ga_errors[] = $e->getMessage(); |
|
6561 | + return false; |
|
6562 | + } |
|
6563 | 6563 | |
6564 | 6564 | |
6565 | - natcasesort ($accounts); |
|
6565 | + natcasesort ($accounts); |
|
6566 | 6566 | |
6567 | - # Return the account array if there are accounts |
|
6568 | - if ( count($accounts) > 0 ){ |
|
6569 | - update_option('geodir_gd_uids',$accounts); |
|
6570 | - return $accounts; |
|
6571 | - } |
|
6572 | - else |
|
6573 | - return false; |
|
6567 | + # Return the account array if there are accounts |
|
6568 | + if ( count($accounts) > 0 ){ |
|
6569 | + update_option('geodir_gd_uids',$accounts); |
|
6570 | + return $accounts; |
|
6571 | + } |
|
6572 | + else |
|
6573 | + return false; |
|
6574 | 6574 | } |
6575 | 6575 | |
6576 | 6576 | add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' ); |
6577 | 6577 | function geodir_ga_deauthorize(){ |
6578 | 6578 | |
6579 | - if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) { |
|
6579 | + if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) { |
|
6580 | 6580 | |
6581 | - die( 'Security check' ); |
|
6581 | + die( 'Security check' ); |
|
6582 | 6582 | |
6583 | - } else { |
|
6584 | - update_option('geodir_ga_auth_token',''); |
|
6585 | - update_option('geodir_ga_auth_code',''); |
|
6586 | - update_option('geodir_gd_uids',''); |
|
6583 | + } else { |
|
6584 | + update_option('geodir_ga_auth_token',''); |
|
6585 | + update_option('geodir_ga_auth_code',''); |
|
6586 | + update_option('geodir_gd_uids',''); |
|
6587 | 6587 | |
6588 | 6588 | |
6589 | - echo admin_url('?page=geodirectory&active_tab=google_analytic_settings'); |
|
6590 | - } |
|
6589 | + echo admin_url('?page=geodirectory&active_tab=google_analytic_settings'); |
|
6590 | + } |
|
6591 | 6591 | |
6592 | - die(); |
|
6592 | + die(); |
|
6593 | 6593 | } |
6594 | 6594 | |
6595 | 6595 | |
@@ -6600,14 +6600,14 @@ discard block |
||
6600 | 6600 | * @package GeoDirectory |
6601 | 6601 | */ |
6602 | 6602 | function geodir_post_type_setting_fun() { |
6603 | - $post_type_arr = array(); |
|
6603 | + $post_type_arr = array(); |
|
6604 | 6604 | |
6605 | - $post_types = geodir_get_posttypes('object'); |
|
6605 | + $post_types = geodir_get_posttypes('object'); |
|
6606 | 6606 | |
6607 | - foreach ($post_types as $key => $post_types_obj) { |
|
6608 | - $post_type_arr[$key] = $post_types_obj->labels->singular_name; |
|
6609 | - } |
|
6610 | - return $post_type_arr; |
|
6607 | + foreach ($post_types as $key => $post_types_obj) { |
|
6608 | + $post_type_arr[$key] = $post_types_obj->labels->singular_name; |
|
6609 | + } |
|
6610 | + return $post_type_arr; |
|
6611 | 6611 | } |
6612 | 6612 | |
6613 | 6613 | /** |
@@ -6618,35 +6618,35 @@ discard block |
||
6618 | 6618 | */ |
6619 | 6619 | function geodir_listing_image_size_arr(){ |
6620 | 6620 | |
6621 | - global $_wp_additional_image_sizes; |
|
6622 | - |
|
6623 | - $sizes = array(); |
|
6624 | - |
|
6625 | - foreach ( get_intermediate_image_sizes() as $_size ) { |
|
6626 | - if ( in_array( $_size, array('thumbnail', 'medium', 'medium_large', 'large') ) ) { |
|
6627 | - $sizes[ $_size ]['width'] = get_option( "{$_size}_size_w" ); |
|
6628 | - $sizes[ $_size ]['height'] = get_option( "{$_size}_size_h" ); |
|
6629 | - $sizes[ $_size ]['crop'] = (bool) get_option( "{$_size}_crop" ); |
|
6630 | - } elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) { |
|
6631 | - $sizes[ $_size ] = array( |
|
6632 | - 'width' => $_wp_additional_image_sizes[ $_size ]['width'], |
|
6633 | - 'height' => $_wp_additional_image_sizes[ $_size ]['height'], |
|
6634 | - 'crop' => $_wp_additional_image_sizes[ $_size ]['crop'], |
|
6635 | - ); |
|
6636 | - } |
|
6637 | - } |
|
6621 | + global $_wp_additional_image_sizes; |
|
6622 | + |
|
6623 | + $sizes = array(); |
|
6624 | + |
|
6625 | + foreach ( get_intermediate_image_sizes() as $_size ) { |
|
6626 | + if ( in_array( $_size, array('thumbnail', 'medium', 'medium_large', 'large') ) ) { |
|
6627 | + $sizes[ $_size ]['width'] = get_option( "{$_size}_size_w" ); |
|
6628 | + $sizes[ $_size ]['height'] = get_option( "{$_size}_size_h" ); |
|
6629 | + $sizes[ $_size ]['crop'] = (bool) get_option( "{$_size}_crop" ); |
|
6630 | + } elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) { |
|
6631 | + $sizes[ $_size ] = array( |
|
6632 | + 'width' => $_wp_additional_image_sizes[ $_size ]['width'], |
|
6633 | + 'height' => $_wp_additional_image_sizes[ $_size ]['height'], |
|
6634 | + 'crop' => $_wp_additional_image_sizes[ $_size ]['crop'], |
|
6635 | + ); |
|
6636 | + } |
|
6637 | + } |
|
6638 | 6638 | |
6639 | 6639 | |
6640 | 6640 | |
6641 | - $options = array(); |
|
6641 | + $options = array(); |
|
6642 | 6642 | |
6643 | - $options['default'] = __('GD Default', 'geodirectory'); |
|
6643 | + $options['default'] = __('GD Default', 'geodirectory'); |
|
6644 | 6644 | |
6645 | - if(!empty($sizes)){ |
|
6646 | - foreach($sizes as $key=>$val){ |
|
6647 | - $options[$key] = $key. ' ( '.$val['width'].' x '.$val['height']. ' )'; |
|
6648 | - } |
|
6649 | - } |
|
6645 | + if(!empty($sizes)){ |
|
6646 | + foreach($sizes as $key=>$val){ |
|
6647 | + $options[$key] = $key. ' ( '.$val['width'].' x '.$val['height']. ' )'; |
|
6648 | + } |
|
6649 | + } |
|
6650 | 6650 | |
6651 | - return $options; |
|
6651 | + return $options; |
|
6652 | 6652 | } |
6653 | 6653 | \ No newline at end of file |
@@ -9,10 +9,10 @@ discard block |
||
9 | 9 | */ |
10 | 10 | function geodir_get_current_city_lat() |
11 | 11 | { |
12 | - $location = geodir_get_default_location(); |
|
13 | - $lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484'; |
|
12 | + $location = geodir_get_default_location(); |
|
13 | + $lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484'; |
|
14 | 14 | |
15 | - return $lat; |
|
15 | + return $lat; |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | /** |
@@ -25,9 +25,9 @@ discard block |
||
25 | 25 | */ |
26 | 26 | function geodir_get_current_city_lng() |
27 | 27 | { |
28 | - $location = geodir_get_default_location(); |
|
29 | - $lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786'; |
|
30 | - return $lng; |
|
28 | + $location = geodir_get_default_location(); |
|
29 | + $lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786'; |
|
30 | + return $lng; |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | |
@@ -40,15 +40,15 @@ discard block |
||
40 | 40 | */ |
41 | 41 | function geodir_get_default_location() |
42 | 42 | { |
43 | - /** |
|
44 | - * Filter the default location. |
|
45 | - * |
|
46 | - * @since 1.0.0 |
|
47 | - * @package GeoDirectory |
|
48 | - * |
|
49 | - * @param string $location_result The default location object. |
|
50 | - */ |
|
51 | - return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location')); |
|
43 | + /** |
|
44 | + * Filter the default location. |
|
45 | + * |
|
46 | + * @since 1.0.0 |
|
47 | + * @package GeoDirectory |
|
48 | + * |
|
49 | + * @param string $location_result The default location object. |
|
50 | + */ |
|
51 | + return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location')); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
@@ -60,11 +60,11 @@ discard block |
||
60 | 60 | */ |
61 | 61 | function geodir_is_default_location_set() |
62 | 62 | { |
63 | - $default_location = geodir_get_default_location(); |
|
64 | - if (!empty($default_location)) |
|
65 | - return true; |
|
66 | - else |
|
67 | - return false; |
|
63 | + $default_location = geodir_get_default_location(); |
|
64 | + if (!empty($default_location)) |
|
65 | + return true; |
|
66 | + else |
|
67 | + return false; |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | /** |
@@ -78,15 +78,15 @@ discard block |
||
78 | 78 | function create_location_slug($location_string) |
79 | 79 | { |
80 | 80 | |
81 | - /** |
|
82 | - * Filter the location slug. |
|
83 | - * |
|
84 | - * @since 1.0.0 |
|
85 | - * @package GeoDirectory |
|
86 | - * |
|
87 | - * @param string $location_string Sanitized location string. |
|
88 | - */ |
|
89 | - return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string))); |
|
81 | + /** |
|
82 | + * Filter the location slug. |
|
83 | + * |
|
84 | + * @since 1.0.0 |
|
85 | + * @package GeoDirectory |
|
86 | + * |
|
87 | + * @param string $location_string Sanitized location string. |
|
88 | + */ |
|
89 | + return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string))); |
|
90 | 90 | |
91 | 91 | } |
92 | 92 | |
@@ -100,15 +100,15 @@ discard block |
||
100 | 100 | */ |
101 | 101 | function geodir_get_location($id = '') |
102 | 102 | { |
103 | - /** |
|
104 | - * Filter the location information. |
|
105 | - * |
|
106 | - * @since 1.0.0 |
|
107 | - * @package GeoDirectory |
|
108 | - * |
|
109 | - * @param string $id The location ID. |
|
110 | - */ |
|
111 | - return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id); |
|
103 | + /** |
|
104 | + * Filter the location information. |
|
105 | + * |
|
106 | + * @since 1.0.0 |
|
107 | + * @package GeoDirectory |
|
108 | + * |
|
109 | + * @param string $id The location ID. |
|
110 | + */ |
|
111 | + return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
@@ -122,28 +122,28 @@ discard block |
||
122 | 122 | */ |
123 | 123 | function geodir_get_country_dl($post_country = '', $prefix = '') |
124 | 124 | { |
125 | - global $wpdb; |
|
125 | + global $wpdb; |
|
126 | 126 | |
127 | - $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC"); |
|
127 | + $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC"); |
|
128 | 128 | |
129 | - $ISO2 = array(); |
|
130 | - $countries = array(); |
|
129 | + $ISO2 = array(); |
|
130 | + $countries = array(); |
|
131 | 131 | |
132 | - foreach ($rows as $row) { |
|
133 | - $ISO2[$row->Country] = $row->ISO2; |
|
134 | - $countries[$row->Country] = __($row->Country, 'geodirectory'); |
|
135 | - } |
|
132 | + foreach ($rows as $row) { |
|
133 | + $ISO2[$row->Country] = $row->ISO2; |
|
134 | + $countries[$row->Country] = __($row->Country, 'geodirectory'); |
|
135 | + } |
|
136 | 136 | |
137 | - asort($countries); |
|
137 | + asort($countries); |
|
138 | 138 | |
139 | - $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>'; |
|
140 | - foreach ($countries as $country => $name) { |
|
141 | - $ccode = $ISO2[$country]; |
|
139 | + $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>'; |
|
140 | + foreach ($countries as $country => $name) { |
|
141 | + $ccode = $ISO2[$country]; |
|
142 | 142 | |
143 | - $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>'; |
|
144 | - } |
|
143 | + $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>'; |
|
144 | + } |
|
145 | 145 | |
146 | - echo $out_put; |
|
146 | + echo $out_put; |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | |
@@ -158,40 +158,40 @@ discard block |
||
158 | 158 | function geodir_location_form_submit() |
159 | 159 | { |
160 | 160 | |
161 | - global $wpdb, $plugin_prefix; |
|
162 | - if (isset($_REQUEST['add_location'])) { |
|
161 | + global $wpdb, $plugin_prefix; |
|
162 | + if (isset($_REQUEST['add_location'])) { |
|
163 | 163 | |
164 | - $location_info = array( |
|
165 | - 'city' => $_REQUEST['city'], |
|
166 | - 'region' => $_REQUEST['region'], |
|
167 | - 'country' => $_REQUEST['country'], |
|
168 | - 'geo_lat' => $_REQUEST['latitude'], |
|
169 | - 'geo_lng' => $_REQUEST['longitude'], |
|
170 | - 'is_default' => $_REQUEST['is_default'], |
|
171 | - 'update_city' => $_REQUEST['update_city'] |
|
172 | - ); |
|
164 | + $location_info = array( |
|
165 | + 'city' => $_REQUEST['city'], |
|
166 | + 'region' => $_REQUEST['region'], |
|
167 | + 'country' => $_REQUEST['country'], |
|
168 | + 'geo_lat' => $_REQUEST['latitude'], |
|
169 | + 'geo_lng' => $_REQUEST['longitude'], |
|
170 | + 'is_default' => $_REQUEST['is_default'], |
|
171 | + 'update_city' => $_REQUEST['update_city'] |
|
172 | + ); |
|
173 | 173 | |
174 | - $old_location = geodir_get_default_location(); |
|
174 | + $old_location = geodir_get_default_location(); |
|
175 | 175 | |
176 | - $locationid = geodir_add_new_location($location_info); |
|
176 | + $locationid = geodir_add_new_location($location_info); |
|
177 | 177 | |
178 | - $default_location = geodir_get_location($locationid); |
|
178 | + $default_location = geodir_get_location($locationid); |
|
179 | 179 | |
180 | - //UPDATE AND DELETE LISTING |
|
181 | - $posttype = geodir_get_posttypes(); |
|
182 | - if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') { |
|
180 | + //UPDATE AND DELETE LISTING |
|
181 | + $posttype = geodir_get_posttypes(); |
|
182 | + if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') { |
|
183 | 183 | |
184 | - foreach ($posttype as $posttypeobj) { |
|
185 | - $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location |
|
184 | + foreach ($posttype as $posttypeobj) { |
|
185 | + $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location |
|
186 | 186 | |
187 | - $sql = $wpdb->prepare( |
|
188 | - "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)", |
|
189 | - array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations) |
|
190 | - ); |
|
191 | - $wpdb->query($sql); |
|
192 | - } |
|
193 | - } |
|
194 | - } |
|
187 | + $sql = $wpdb->prepare( |
|
188 | + "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)", |
|
189 | + array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations) |
|
190 | + ); |
|
191 | + $wpdb->query($sql); |
|
192 | + } |
|
193 | + } |
|
194 | + } |
|
195 | 195 | } |
196 | 196 | |
197 | 197 | /** |
@@ -215,37 +215,37 @@ discard block |
||
215 | 215 | */ |
216 | 216 | function geodir_add_new_location($location_info = array()) |
217 | 217 | { |
218 | - global $wpdb; |
|
219 | - |
|
220 | - if (!empty($location_info)) { |
|
221 | - $location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all'; |
|
222 | - $location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all'; |
|
223 | - $location_country = ($location_info['country'] != '') ? geodir_get_normal_country($location_info['country']) : 'all'; |
|
224 | - $location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : ''; |
|
225 | - $location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : ''; |
|
226 | - $is_default = isset($location_info['is_default']) ? $location_info['is_default'] : ''; |
|
227 | - $country_slug = create_location_slug(__($location_country, 'geodirectory')); |
|
228 | - $region_slug = create_location_slug($location_region); |
|
229 | - $city_slug = create_location_slug($location_city); |
|
218 | + global $wpdb; |
|
219 | + |
|
220 | + if (!empty($location_info)) { |
|
221 | + $location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all'; |
|
222 | + $location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all'; |
|
223 | + $location_country = ($location_info['country'] != '') ? geodir_get_normal_country($location_info['country']) : 'all'; |
|
224 | + $location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : ''; |
|
225 | + $location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : ''; |
|
226 | + $is_default = isset($location_info['is_default']) ? $location_info['is_default'] : ''; |
|
227 | + $country_slug = create_location_slug(__($location_country, 'geodirectory')); |
|
228 | + $region_slug = create_location_slug($location_region); |
|
229 | + $city_slug = create_location_slug($location_city); |
|
230 | 230 | |
231 | - /** |
|
232 | - * Filter add new location data. |
|
233 | - * |
|
234 | - * @since 1.0.0 |
|
235 | - */ |
|
236 | - $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0, |
|
237 | - 'country' => $location_country, |
|
238 | - 'region' => $location_region, |
|
239 | - 'city' => $location_city, |
|
240 | - 'country_slug' => $country_slug, |
|
241 | - 'region_slug' => $region_slug, |
|
242 | - 'city_slug' => $city_slug, |
|
243 | - 'city_latitude' => $location_lat, |
|
244 | - 'city_longitude' => $location_lng, |
|
245 | - 'is_default' => $is_default |
|
246 | - )); |
|
247 | - |
|
248 | - /* // Not allowed to create country in DB : 2016-12-09 |
|
231 | + /** |
|
232 | + * Filter add new location data. |
|
233 | + * |
|
234 | + * @since 1.0.0 |
|
235 | + */ |
|
236 | + $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0, |
|
237 | + 'country' => $location_country, |
|
238 | + 'region' => $location_region, |
|
239 | + 'city' => $location_city, |
|
240 | + 'country_slug' => $country_slug, |
|
241 | + 'region_slug' => $region_slug, |
|
242 | + 'city_slug' => $city_slug, |
|
243 | + 'city_latitude' => $location_lat, |
|
244 | + 'city_longitude' => $location_lng, |
|
245 | + 'is_default' => $is_default |
|
246 | + )); |
|
247 | + |
|
248 | + /* // Not allowed to create country in DB : 2016-12-09 |
|
249 | 249 | if ($geodir_location->country) { |
250 | 250 | |
251 | 251 | $get_country = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s", array($geodir_location->country))); |
@@ -259,14 +259,14 @@ discard block |
||
259 | 259 | } |
260 | 260 | */ |
261 | 261 | |
262 | - if ($geodir_location->is_default) |
|
263 | - update_option('geodir_default_location', $geodir_location); |
|
262 | + if ($geodir_location->is_default) |
|
263 | + update_option('geodir_default_location', $geodir_location); |
|
264 | 264 | |
265 | - return $geodir_location->location_id; |
|
265 | + return $geodir_location->location_id; |
|
266 | 266 | |
267 | - } else { |
|
268 | - return false; |
|
269 | - } |
|
267 | + } else { |
|
268 | + return false; |
|
269 | + } |
|
270 | 270 | } |
271 | 271 | |
272 | 272 | /** |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | */ |
281 | 281 | function geodir_random_float($min = 0, $max = 1) |
282 | 282 | { |
283 | - return $min + mt_rand() / mt_getrandmax() * ($max - $min); |
|
283 | + return $min + mt_rand() / mt_getrandmax() * ($max - $min); |
|
284 | 284 | } |
285 | 285 | |
286 | 286 | /** |
@@ -294,20 +294,20 @@ discard block |
||
294 | 294 | */ |
295 | 295 | function geodir_get_address_by_lat_lan($lat, $lng) |
296 | 296 | { |
297 | - $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng);// . "&key=" . geodir_get_map_api_key(); // if we add a key here it will not work if limited to a domain as this is done via curl. |
|
297 | + $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng);// . "&key=" . geodir_get_map_api_key(); // if we add a key here it will not work if limited to a domain as this is done via curl. |
|
298 | 298 | |
299 | - $response = wp_remote_get($url); |
|
300 | - if ( is_wp_error( $response ) ) { |
|
301 | - return false; |
|
302 | - } |
|
299 | + $response = wp_remote_get($url); |
|
300 | + if ( is_wp_error( $response ) ) { |
|
301 | + return false; |
|
302 | + } |
|
303 | 303 | |
304 | - $result = json_decode( wp_remote_retrieve_body( $response ) ); |
|
304 | + $result = json_decode( wp_remote_retrieve_body( $response ) ); |
|
305 | 305 | |
306 | - if(isset($result->results[0]->address_components)){ |
|
307 | - return $result->results[0]->address_components; |
|
308 | - }else{ |
|
309 | - return false; |
|
310 | - } |
|
306 | + if(isset($result->results[0]->address_components)){ |
|
307 | + return $result->results[0]->address_components; |
|
308 | + }else{ |
|
309 | + return false; |
|
310 | + } |
|
311 | 311 | } |
312 | 312 | |
313 | 313 | /** |
@@ -324,71 +324,71 @@ discard block |
||
324 | 324 | */ |
325 | 325 | function geodir_get_current_location_terms($location_array_from = 'session', $gd_post_type = '') |
326 | 326 | { |
327 | - global $wp, $gd_session; |
|
328 | - $location_array = array(); |
|
329 | - if ($location_array_from == 'session') { |
|
330 | - if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') { |
|
331 | - return $location_array; |
|
332 | - } |
|
327 | + global $wp, $gd_session; |
|
328 | + $location_array = array(); |
|
329 | + if ($location_array_from == 'session') { |
|
330 | + if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') { |
|
331 | + return $location_array; |
|
332 | + } |
|
333 | 333 | |
334 | - $country = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : $gd_session->get('gd_country'); |
|
335 | - if ($country != '' && $country) |
|
336 | - $location_array['gd_country'] = urldecode($country); |
|
334 | + $country = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : $gd_session->get('gd_country'); |
|
335 | + if ($country != '' && $country) |
|
336 | + $location_array['gd_country'] = urldecode($country); |
|
337 | 337 | |
338 | - $region = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : $gd_session->get('gd_region'); |
|
339 | - if ($region != '' && $region) |
|
340 | - $location_array['gd_region'] = urldecode($region); |
|
338 | + $region = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : $gd_session->get('gd_region'); |
|
339 | + if ($region != '' && $region) |
|
340 | + $location_array['gd_region'] = urldecode($region); |
|
341 | 341 | |
342 | - $city = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : $gd_session->get('gd_city'); |
|
343 | - if ($city != '' && $city) |
|
344 | - $location_array['gd_city'] = urldecode($city); |
|
345 | - } else { |
|
346 | - if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) { |
|
347 | - return $location_array; |
|
348 | - } |
|
342 | + $city = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : $gd_session->get('gd_city'); |
|
343 | + if ($city != '' && $city) |
|
344 | + $location_array['gd_city'] = urldecode($city); |
|
345 | + } else { |
|
346 | + if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) { |
|
347 | + return $location_array; |
|
348 | + } |
|
349 | 349 | |
350 | - $country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : ''; |
|
350 | + $country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : ''; |
|
351 | 351 | |
352 | - $region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : ''; |
|
352 | + $region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : ''; |
|
353 | 353 | |
354 | - $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : ''; |
|
354 | + $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : ''; |
|
355 | 355 | |
356 | - if ($country != '') |
|
357 | - $location_array['gd_country'] = urldecode($country); |
|
356 | + if ($country != '') |
|
357 | + $location_array['gd_country'] = urldecode($country); |
|
358 | 358 | |
359 | - if ($region != '') |
|
360 | - $location_array['gd_region'] = urldecode($region); |
|
359 | + if ($region != '') |
|
360 | + $location_array['gd_region'] = urldecode($region); |
|
361 | 361 | |
362 | - if ($city != '') |
|
363 | - $location_array['gd_city'] = urldecode($city); |
|
362 | + if ($city != '') |
|
363 | + $location_array['gd_city'] = urldecode($city); |
|
364 | 364 | |
365 | 365 | // Fix category link in ajax popular category widget on change post type |
366 | 366 | if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) { |
367 | 367 | $location_array = geodir_get_current_location_terms('session'); |
368 | 368 | } |
369 | - } |
|
369 | + } |
|
370 | 370 | |
371 | 371 | |
372 | 372 | /** |
373 | 373 | * Filter the location terms. |
374 | 374 | * |
375 | 375 | * @since 1.4.6 |
376 | - * @package GeoDirectory |
|
376 | + * @package GeoDirectory |
|
377 | + * |
|
378 | + * @param array $location_array { |
|
379 | + * Attributes of the location_array. |
|
380 | + * |
|
381 | + * @type string $gd_country The country slug. |
|
382 | + * @type string $gd_region The region slug. |
|
383 | + * @type string $gd_city The city slug. |
|
377 | 384 | * |
378 | - * @param array $location_array { |
|
379 | - * Attributes of the location_array. |
|
380 | - * |
|
381 | - * @type string $gd_country The country slug. |
|
382 | - * @type string $gd_region The region slug. |
|
383 | - * @type string $gd_city The city slug. |
|
384 | - * |
|
385 | - * } |
|
385 | + * } |
|
386 | 386 | * @param string $location_array_from Source type of location terms. Default session. |
387 | 387 | * @param string $gd_post_type WP post type. |
388 | 388 | */ |
389 | 389 | $location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type ); |
390 | 390 | |
391 | - return $location_array; |
|
391 | + return $location_array; |
|
392 | 392 | |
393 | 393 | } |
394 | 394 | |
@@ -401,24 +401,24 @@ discard block |
||
401 | 401 | * @return bool|string |
402 | 402 | */ |
403 | 403 | function geodir_get_location_link($which_location = 'current') { |
404 | - $location_link = get_permalink(geodir_location_page_id()); |
|
405 | - |
|
406 | - if ($which_location == 'base') { |
|
407 | - return $location_link; |
|
408 | - } else { |
|
409 | - $location_terms = geodir_get_current_location_terms(); |
|
410 | - |
|
411 | - if (!empty($location_terms)) { |
|
412 | - if (get_option('permalink_structure') != '') { |
|
413 | - $location_terms = implode("/", $location_terms); |
|
414 | - $location_terms = rtrim($location_terms, '/'); |
|
415 | - $location_link .= $location_terms; |
|
416 | - } else { |
|
417 | - $location_link = geodir_getlink($location_link, $location_terms); |
|
418 | - } |
|
419 | - } |
|
420 | - } |
|
421 | - return $location_link; |
|
404 | + $location_link = get_permalink(geodir_location_page_id()); |
|
405 | + |
|
406 | + if ($which_location == 'base') { |
|
407 | + return $location_link; |
|
408 | + } else { |
|
409 | + $location_terms = geodir_get_current_location_terms(); |
|
410 | + |
|
411 | + if (!empty($location_terms)) { |
|
412 | + if (get_option('permalink_structure') != '') { |
|
413 | + $location_terms = implode("/", $location_terms); |
|
414 | + $location_terms = rtrim($location_terms, '/'); |
|
415 | + $location_link .= $location_terms; |
|
416 | + } else { |
|
417 | + $location_link = geodir_getlink($location_link, $location_terms); |
|
418 | + } |
|
419 | + } |
|
420 | + } |
|
421 | + return $location_link; |
|
422 | 422 | } |
423 | 423 | |
424 | 424 | /** |
@@ -431,30 +431,30 @@ discard block |
||
431 | 431 | * @return array|bool Returns address on success. |
432 | 432 | */ |
433 | 433 | function geodir_get_osm_address_by_lat_lan($lat, $lng) { |
434 | - $url = 'https://nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email'); |
|
434 | + $url = 'https://nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email'); |
|
435 | 435 | |
436 | - $response = wp_remote_get($url); |
|
437 | - if ( is_wp_error( $response ) ) { |
|
438 | - return false; |
|
439 | - } |
|
436 | + $response = wp_remote_get($url); |
|
437 | + if ( is_wp_error( $response ) ) { |
|
438 | + return false; |
|
439 | + } |
|
440 | 440 | |
441 | - $result = json_decode( wp_remote_retrieve_body( $response ) ); |
|
441 | + $result = json_decode( wp_remote_retrieve_body( $response ) ); |
|
442 | 442 | |
443 | - if(!empty($result->address)){ |
|
444 | - $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb'); |
|
445 | - $formatted_address = (array)$result->address; |
|
443 | + if(!empty($result->address)){ |
|
444 | + $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb'); |
|
445 | + $formatted_address = (array)$result->address; |
|
446 | 446 | |
447 | - foreach ( $result->address as $key => $value ) { |
|
448 | - if (!in_array($key, $address_fields)) { |
|
449 | - unset($formatted_address[$key]); |
|
450 | - } |
|
451 | - } |
|
452 | - $result->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : ''; |
|
447 | + foreach ( $result->address as $key => $value ) { |
|
448 | + if (!in_array($key, $address_fields)) { |
|
449 | + unset($formatted_address[$key]); |
|
450 | + } |
|
451 | + } |
|
452 | + $result->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : ''; |
|
453 | 453 | |
454 | - return $result; |
|
455 | - }else{ |
|
456 | - return false; |
|
457 | - } |
|
454 | + return $result; |
|
455 | + }else{ |
|
456 | + return false; |
|
457 | + } |
|
458 | 458 | } |
459 | 459 | |
460 | 460 | /** |
@@ -468,51 +468,51 @@ discard block |
||
468 | 468 | * @return string Returns the country. |
469 | 469 | */ |
470 | 470 | function geodir_get_normal_country($country, $default = '1') { |
471 | - global $wpdb; |
|
472 | - if ($result = geodir_get_country_by_name($country)) { |
|
473 | - return $result; |
|
474 | - } |
|
471 | + global $wpdb; |
|
472 | + if ($result = geodir_get_country_by_name($country)) { |
|
473 | + return $result; |
|
474 | + } |
|
475 | 475 | |
476 | - if (defined('POST_LOCATION_TABLE')) { |
|
477 | - $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country)); |
|
478 | - if (!empty($rows)) { |
|
479 | - foreach ($rows as $row) { |
|
480 | - $translated = __($row->country, 'geodirectory'); |
|
481 | - if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) { |
|
482 | - return $result; |
|
483 | - } |
|
484 | - } |
|
485 | - } |
|
476 | + if (defined('POST_LOCATION_TABLE')) { |
|
477 | + $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country)); |
|
478 | + if (!empty($rows)) { |
|
479 | + foreach ($rows as $row) { |
|
480 | + $translated = __($row->country, 'geodirectory'); |
|
481 | + if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) { |
|
482 | + return $result; |
|
483 | + } |
|
484 | + } |
|
485 | + } |
|
486 | 486 | |
487 | - $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) ); |
|
488 | - if (!empty($rows)) { |
|
489 | - foreach ($rows as $row) { |
|
490 | - $translated = __($row->country, 'geodirectory'); |
|
491 | - if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) { |
|
492 | - return $result; |
|
493 | - } |
|
494 | - } |
|
495 | - } |
|
496 | - } |
|
487 | + $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) ); |
|
488 | + if (!empty($rows)) { |
|
489 | + foreach ($rows as $row) { |
|
490 | + $translated = __($row->country, 'geodirectory'); |
|
491 | + if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) { |
|
492 | + return $result; |
|
493 | + } |
|
494 | + } |
|
495 | + } |
|
496 | + } |
|
497 | 497 | |
498 | - if ( $default === '0' ) { |
|
499 | - return NULL; |
|
500 | - } |
|
498 | + if ( $default === '0' ) { |
|
499 | + return NULL; |
|
500 | + } |
|
501 | 501 | |
502 | - $default_location = geodir_get_default_location(); |
|
503 | - if (!empty($default_location->country) && $result = geodir_get_country_by_name($default_location->country)) { |
|
504 | - return $result; |
|
505 | - } |
|
502 | + $default_location = geodir_get_default_location(); |
|
503 | + if (!empty($default_location->country) && $result = geodir_get_country_by_name($default_location->country)) { |
|
504 | + return $result; |
|
505 | + } |
|
506 | 506 | |
507 | - if (!empty($default_location->country_slug) && $result = geodir_get_country_by_name($default_location->country_slug)) { |
|
508 | - return $result; |
|
509 | - } |
|
507 | + if (!empty($default_location->country_slug) && $result = geodir_get_country_by_name($default_location->country_slug)) { |
|
508 | + return $result; |
|
509 | + } |
|
510 | 510 | |
511 | - if (!empty($default_location->country_ISO2) && $result = geodir_get_country_by_name($default_location->country_ISO2, true)) { |
|
512 | - return $result; |
|
513 | - } |
|
511 | + if (!empty($default_location->country_ISO2) && $result = geodir_get_country_by_name($default_location->country_ISO2, true)) { |
|
512 | + return $result; |
|
513 | + } |
|
514 | 514 | |
515 | - return $country; |
|
515 | + return $country; |
|
516 | 516 | } |
517 | 517 | |
518 | 518 | /** |
@@ -524,16 +524,16 @@ discard block |
||
524 | 524 | * @return string Country ISO2 code. |
525 | 525 | */ |
526 | 526 | function geodir_get_country_iso2($country) { |
527 | - global $wpdb; |
|
527 | + global $wpdb; |
|
528 | 528 | |
529 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) { |
|
530 | - return $result; |
|
531 | - } |
|
532 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) { |
|
533 | - return $result; |
|
534 | - } |
|
529 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) { |
|
530 | + return $result; |
|
531 | + } |
|
532 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) { |
|
533 | + return $result; |
|
534 | + } |
|
535 | 535 | |
536 | - return $country; |
|
536 | + return $country; |
|
537 | 537 | } |
538 | 538 | |
539 | 539 | /** |
@@ -546,16 +546,16 @@ discard block |
||
546 | 546 | * @return string|null Country ISO2 code. |
547 | 547 | */ |
548 | 548 | function geodir_get_country_by_name($country, $iso2 = false) { |
549 | - global $wpdb; |
|
549 | + global $wpdb; |
|
550 | 550 | |
551 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) { |
|
552 | - return $result; |
|
553 | - } |
|
554 | - if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) { |
|
555 | - return $result; |
|
556 | - } |
|
551 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) { |
|
552 | + return $result; |
|
553 | + } |
|
554 | + if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) { |
|
555 | + return $result; |
|
556 | + } |
|
557 | 557 | |
558 | - return NULL; |
|
558 | + return NULL; |
|
559 | 559 | } |
560 | 560 | |
561 | 561 | |
@@ -575,158 +575,158 @@ discard block |
||
575 | 575 | */ |
576 | 576 | function geodir_replace_location_variables($content, $location_array = array(), $sep = NULL, $gd_page = '') { |
577 | 577 | |
578 | - if (empty($content)) { |
|
579 | - return $content; |
|
580 | - } |
|
578 | + if (empty($content)) { |
|
579 | + return $content; |
|
580 | + } |
|
581 | 581 | |
582 | 582 | |
583 | - $location_replace_vars = geodir_location_replace_vars($location_array, $sep, $gd_page); |
|
583 | + $location_replace_vars = geodir_location_replace_vars($location_array, $sep, $gd_page); |
|
584 | 584 | |
585 | - if (!empty($location_replace_vars)) { |
|
586 | - foreach ($location_replace_vars as $search => $replace) { |
|
587 | - if (!empty($search) && strpos($content, $search) !== false) { |
|
588 | - $content = str_replace($search, $replace, $content); |
|
589 | - } |
|
590 | - } |
|
591 | - } |
|
585 | + if (!empty($location_replace_vars)) { |
|
586 | + foreach ($location_replace_vars as $search => $replace) { |
|
587 | + if (!empty($search) && strpos($content, $search) !== false) { |
|
588 | + $content = str_replace($search, $replace, $content); |
|
589 | + } |
|
590 | + } |
|
591 | + } |
|
592 | 592 | |
593 | - return $content; |
|
593 | + return $content; |
|
594 | 594 | } |
595 | 595 | add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables'); |
596 | 596 | |
597 | 597 | |
598 | 598 | function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){ |
599 | 599 | |
600 | - global $wp; |
|
600 | + global $wp; |
|
601 | 601 | |
602 | - $location_manager = defined('GEODIRLOCATION_VERSION') ? true : false; |
|
603 | - |
|
604 | - if (empty($location_array)) { |
|
605 | - $location_array = geodir_get_current_location_terms('query_vars'); |
|
606 | - } |
|
607 | - |
|
608 | - $location_terms = array(); |
|
609 | - $location_terms['gd_neighbourhood'] = !empty($wp->query_vars['gd_neighbourhood']) ? $wp->query_vars['gd_neighbourhood'] : ''; |
|
610 | - $location_terms['gd_city'] = !empty($wp->query_vars['gd_city']) ? $wp->query_vars['gd_city'] : ''; |
|
611 | - $location_terms['gd_region'] = !empty($wp->query_vars['gd_region']) ? $wp->query_vars['gd_region'] : ''; |
|
612 | - $location_terms['gd_country'] = !empty($wp->query_vars['gd_country']) ? $wp->query_vars['gd_country'] : ''; |
|
613 | - |
|
614 | - $location_names = array(); |
|
615 | - foreach ($location_terms as $type => $location) { |
|
616 | - $location_name = $location; |
|
617 | - |
|
618 | - if (!empty($location_name)) { |
|
619 | - if ($location_manager) { |
|
620 | - $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
621 | - $location_name = get_actual_location_name($location_type, $location, true); |
|
622 | - } else { |
|
623 | - $location_name = preg_replace( '/-(\d+)$/', '', $location_name); |
|
624 | - $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
625 | - $location_name = __(geodir_ucwords($location_name), 'geodirectory'); |
|
626 | - } |
|
627 | - } |
|
628 | - |
|
629 | - $location_names[$type] = $location_name; |
|
630 | - } |
|
631 | - |
|
632 | - $location_single = ''; |
|
633 | - foreach ($location_terms as $type => $location) { |
|
634 | - if (!empty($location)) { |
|
635 | - if (!empty($location_names[$type])) { |
|
636 | - $location_single = $location_names[$type]; |
|
637 | - } else { |
|
638 | - if ($location_manager) { |
|
639 | - $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
640 | - $location_single = get_actual_location_name($location_type, $location, true); |
|
641 | - } else { |
|
642 | - $location_name = preg_replace( '/-(\d+)$/', '', $location); |
|
643 | - $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
644 | - $location_single = __(geodir_ucwords($location_name), 'geodirectory'); |
|
645 | - } |
|
646 | - } |
|
647 | - break; |
|
648 | - } |
|
649 | - } |
|
650 | - |
|
651 | - $full_location = array(); |
|
652 | - if (!empty($location_array)) { |
|
653 | - $location_array = array_reverse($location_array); |
|
654 | - |
|
655 | - foreach ($location_array as $type => $location) { |
|
656 | - if (!empty($location_names[$type])) { |
|
657 | - $location_name = $location_names[$type]; |
|
658 | - } else { |
|
659 | - if ($location_manager) { |
|
660 | - $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
661 | - $location_name = get_actual_location_name($location_type, $location, true); |
|
662 | - } else { |
|
663 | - $location_name = preg_replace( '/-(\d+)$/', '', $location); |
|
664 | - $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
665 | - $location_name = __(geodir_ucwords($location_name), 'geodirectory'); |
|
666 | - } |
|
667 | - } |
|
602 | + $location_manager = defined('GEODIRLOCATION_VERSION') ? true : false; |
|
603 | + |
|
604 | + if (empty($location_array)) { |
|
605 | + $location_array = geodir_get_current_location_terms('query_vars'); |
|
606 | + } |
|
607 | + |
|
608 | + $location_terms = array(); |
|
609 | + $location_terms['gd_neighbourhood'] = !empty($wp->query_vars['gd_neighbourhood']) ? $wp->query_vars['gd_neighbourhood'] : ''; |
|
610 | + $location_terms['gd_city'] = !empty($wp->query_vars['gd_city']) ? $wp->query_vars['gd_city'] : ''; |
|
611 | + $location_terms['gd_region'] = !empty($wp->query_vars['gd_region']) ? $wp->query_vars['gd_region'] : ''; |
|
612 | + $location_terms['gd_country'] = !empty($wp->query_vars['gd_country']) ? $wp->query_vars['gd_country'] : ''; |
|
613 | + |
|
614 | + $location_names = array(); |
|
615 | + foreach ($location_terms as $type => $location) { |
|
616 | + $location_name = $location; |
|
617 | + |
|
618 | + if (!empty($location_name)) { |
|
619 | + if ($location_manager) { |
|
620 | + $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
621 | + $location_name = get_actual_location_name($location_type, $location, true); |
|
622 | + } else { |
|
623 | + $location_name = preg_replace( '/-(\d+)$/', '', $location_name); |
|
624 | + $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
625 | + $location_name = __(geodir_ucwords($location_name), 'geodirectory'); |
|
626 | + } |
|
627 | + } |
|
668 | 628 | |
669 | - $full_location[] = $location_name; |
|
670 | - } |
|
629 | + $location_names[$type] = $location_name; |
|
630 | + } |
|
631 | + |
|
632 | + $location_single = ''; |
|
633 | + foreach ($location_terms as $type => $location) { |
|
634 | + if (!empty($location)) { |
|
635 | + if (!empty($location_names[$type])) { |
|
636 | + $location_single = $location_names[$type]; |
|
637 | + } else { |
|
638 | + if ($location_manager) { |
|
639 | + $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
640 | + $location_single = get_actual_location_name($location_type, $location, true); |
|
641 | + } else { |
|
642 | + $location_name = preg_replace( '/-(\d+)$/', '', $location); |
|
643 | + $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
644 | + $location_single = __(geodir_ucwords($location_name), 'geodirectory'); |
|
645 | + } |
|
646 | + } |
|
647 | + break; |
|
648 | + } |
|
649 | + } |
|
650 | + |
|
651 | + $full_location = array(); |
|
652 | + if (!empty($location_array)) { |
|
653 | + $location_array = array_reverse($location_array); |
|
654 | + |
|
655 | + foreach ($location_array as $type => $location) { |
|
656 | + if (!empty($location_names[$type])) { |
|
657 | + $location_name = $location_names[$type]; |
|
658 | + } else { |
|
659 | + if ($location_manager) { |
|
660 | + $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
661 | + $location_name = get_actual_location_name($location_type, $location, true); |
|
662 | + } else { |
|
663 | + $location_name = preg_replace( '/-(\d+)$/', '', $location); |
|
664 | + $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
665 | + $location_name = __(geodir_ucwords($location_name), 'geodirectory'); |
|
666 | + } |
|
667 | + } |
|
668 | + |
|
669 | + $full_location[] = $location_name; |
|
670 | + } |
|
671 | 671 | |
672 | - if (!empty($full_location)) { |
|
673 | - $full_location = array_unique($full_location); |
|
674 | - } |
|
675 | - } |
|
676 | - $full_location = !empty($full_location) ? implode(', ', $full_location): ''; |
|
672 | + if (!empty($full_location)) { |
|
673 | + $full_location = array_unique($full_location); |
|
674 | + } |
|
675 | + } |
|
676 | + $full_location = !empty($full_location) ? implode(', ', $full_location): ''; |
|
677 | 677 | |
678 | - if ( empty( $full_location ) ) { |
|
679 | - /** |
|
680 | - * Filter the text in meta description in full location is empty. |
|
681 | - * |
|
682 | - * @since 1.6.22 |
|
683 | - * |
|
684 | - * @param string $full_location Default: Empty. |
|
685 | - * @param array $location_array The array of location variables. |
|
686 | - * @param string $gd_page The page being filtered. |
|
687 | - * @param string $sep The separator. |
|
688 | - */ |
|
689 | - $full_location = apply_filters( 'geodir_meta_description_location_empty_text', '', $location_array, $gd_page, $sep ); |
|
690 | - } |
|
678 | + if ( empty( $full_location ) ) { |
|
679 | + /** |
|
680 | + * Filter the text in meta description in full location is empty. |
|
681 | + * |
|
682 | + * @since 1.6.22 |
|
683 | + * |
|
684 | + * @param string $full_location Default: Empty. |
|
685 | + * @param array $location_array The array of location variables. |
|
686 | + * @param string $gd_page The page being filtered. |
|
687 | + * @param string $sep The separator. |
|
688 | + */ |
|
689 | + $full_location = apply_filters( 'geodir_meta_description_location_empty_text', '', $location_array, $gd_page, $sep ); |
|
690 | + } |
|
691 | 691 | |
692 | - if ( empty( $location_single ) ) { |
|
693 | - /** |
|
694 | - * Filter the text in meta description in single location is empty. |
|
695 | - * |
|
696 | - * @since 1.6.22 |
|
697 | - * |
|
698 | - * @param string $location_single Default: Empty. |
|
699 | - * @param array $location_array The array of location variables. |
|
700 | - * @param string $gd_page The page being filtered. |
|
701 | - * @param string $sep The separator. |
|
702 | - */ |
|
703 | - $location_single = apply_filters( 'geodir_meta_description_single_location_empty_text', '', $location_array, $gd_page, $sep ); |
|
704 | - } |
|
705 | - |
|
706 | - $location_replace_vars = array(); |
|
707 | - $location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|'; |
|
708 | - $location_replace_vars['%%location%%'] = $full_location; |
|
709 | - $location_replace_vars['%%in_location%%'] = $full_location != '' ? sprintf( _x('in %s','in location', 'geodirectory'), $full_location ) : ''; |
|
710 | - $location_replace_vars['%%location_single%%'] = $location_single; |
|
711 | - $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? sprintf( _x('in %s','in location', 'geodirectory'), $location_single ) : ''; |
|
712 | - |
|
713 | - foreach ($location_names as $type => $name) { |
|
714 | - $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
715 | - |
|
716 | - $location_replace_vars['%%location_' . $location_type . '%%'] = $name; |
|
717 | - $location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? sprintf( _x('in %s','in location', 'geodirectory'), $name ) : ''; |
|
718 | - } |
|
719 | - |
|
720 | - /** |
|
721 | - * Filter the location terms variables to search & replace. |
|
722 | - * |
|
723 | - * @since 1.6.16 |
|
724 | - * @package GeoDirectory |
|
725 | - * |
|
726 | - * @param array $location_replace_vars The array of search & replace variables. |
|
727 | - * @param array $location_array The array of location variables. |
|
728 | - * @param string $gd_page The page being filtered. |
|
729 | - * @param string $sep The separator. |
|
730 | - */ |
|
731 | - return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep ); |
|
692 | + if ( empty( $location_single ) ) { |
|
693 | + /** |
|
694 | + * Filter the text in meta description in single location is empty. |
|
695 | + * |
|
696 | + * @since 1.6.22 |
|
697 | + * |
|
698 | + * @param string $location_single Default: Empty. |
|
699 | + * @param array $location_array The array of location variables. |
|
700 | + * @param string $gd_page The page being filtered. |
|
701 | + * @param string $sep The separator. |
|
702 | + */ |
|
703 | + $location_single = apply_filters( 'geodir_meta_description_single_location_empty_text', '', $location_array, $gd_page, $sep ); |
|
704 | + } |
|
705 | + |
|
706 | + $location_replace_vars = array(); |
|
707 | + $location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|'; |
|
708 | + $location_replace_vars['%%location%%'] = $full_location; |
|
709 | + $location_replace_vars['%%in_location%%'] = $full_location != '' ? sprintf( _x('in %s','in location', 'geodirectory'), $full_location ) : ''; |
|
710 | + $location_replace_vars['%%location_single%%'] = $location_single; |
|
711 | + $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? sprintf( _x('in %s','in location', 'geodirectory'), $location_single ) : ''; |
|
712 | + |
|
713 | + foreach ($location_names as $type => $name) { |
|
714 | + $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
715 | + |
|
716 | + $location_replace_vars['%%location_' . $location_type . '%%'] = $name; |
|
717 | + $location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? sprintf( _x('in %s','in location', 'geodirectory'), $name ) : ''; |
|
718 | + } |
|
719 | + |
|
720 | + /** |
|
721 | + * Filter the location terms variables to search & replace. |
|
722 | + * |
|
723 | + * @since 1.6.16 |
|
724 | + * @package GeoDirectory |
|
725 | + * |
|
726 | + * @param array $location_replace_vars The array of search & replace variables. |
|
727 | + * @param array $location_array The array of location variables. |
|
728 | + * @param string $gd_page The page being filtered. |
|
729 | + * @param string $sep The separator. |
|
730 | + */ |
|
731 | + return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep ); |
|
732 | 732 | } |
733 | 733 | \ No newline at end of file |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | { |
125 | 125 | global $wpdb; |
126 | 126 | |
127 | - $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC"); |
|
127 | + $rows = $wpdb->get_results("SELECT Country,ISO2 FROM ".GEODIR_COUNTRIES_TABLE." ORDER BY Country ASC"); |
|
128 | 128 | |
129 | 129 | $ISO2 = array(); |
130 | 130 | $countries = array(); |
@@ -136,11 +136,11 @@ discard block |
||
136 | 136 | |
137 | 137 | asort($countries); |
138 | 138 | |
139 | - $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>'; |
|
139 | + $out_put = '<option '.selected('', $post_country, false).' value="">'.__('Select Country', 'geodirectory').'</option>'; |
|
140 | 140 | foreach ($countries as $country => $name) { |
141 | 141 | $ccode = $ISO2[$country]; |
142 | 142 | |
143 | - $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>'; |
|
143 | + $out_put .= '<option '.selected($post_country, $country, false).' value="'.esc_attr($country).'" data-country_code="'.$ccode.'">'.$name.'</option>'; |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | echo $out_put; |
@@ -182,10 +182,10 @@ discard block |
||
182 | 182 | if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') { |
183 | 183 | |
184 | 184 | foreach ($posttype as $posttypeobj) { |
185 | - $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location |
|
185 | + $post_locations = '['.$default_location->city_slug.'],['.$default_location->region_slug.'],['.$default_location->country_slug.']'; // set all overall post location |
|
186 | 186 | |
187 | 187 | $sql = $wpdb->prepare( |
188 | - "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)", |
|
188 | + "UPDATE ".$plugin_prefix.$posttypeobj."_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)", |
|
189 | 189 | array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations) |
190 | 190 | ); |
191 | 191 | $wpdb->query($sql); |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | * |
234 | 234 | * @since 1.0.0 |
235 | 235 | */ |
236 | - $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0, |
|
236 | + $geodir_location = (object) apply_filters('geodir_add_new_location', array('location_id' => 0, |
|
237 | 237 | 'country' => $location_country, |
238 | 238 | 'region' => $location_region, |
239 | 239 | 'city' => $location_city, |
@@ -294,18 +294,18 @@ discard block |
||
294 | 294 | */ |
295 | 295 | function geodir_get_address_by_lat_lan($lat, $lng) |
296 | 296 | { |
297 | - $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng);// . "&key=" . geodir_get_map_api_key(); // if we add a key here it will not work if limited to a domain as this is done via curl. |
|
297 | + $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng='.trim($lat).','.trim($lng); // . "&key=" . geodir_get_map_api_key(); // if we add a key here it will not work if limited to a domain as this is done via curl. |
|
298 | 298 | |
299 | 299 | $response = wp_remote_get($url); |
300 | - if ( is_wp_error( $response ) ) { |
|
300 | + if (is_wp_error($response)) { |
|
301 | 301 | return false; |
302 | 302 | } |
303 | 303 | |
304 | - $result = json_decode( wp_remote_retrieve_body( $response ) ); |
|
304 | + $result = json_decode(wp_remote_retrieve_body($response)); |
|
305 | 305 | |
306 | - if(isset($result->results[0]->address_components)){ |
|
306 | + if (isset($result->results[0]->address_components)) { |
|
307 | 307 | return $result->results[0]->address_components; |
308 | - }else{ |
|
308 | + } else { |
|
309 | 309 | return false; |
310 | 310 | } |
311 | 311 | } |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | * @param string $location_array_from Source type of location terms. Default session. |
387 | 387 | * @param string $gd_post_type WP post type. |
388 | 388 | */ |
389 | - $location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type ); |
|
389 | + $location_array = apply_filters('geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type); |
|
390 | 390 | |
391 | 391 | return $location_array; |
392 | 392 | |
@@ -431,20 +431,20 @@ discard block |
||
431 | 431 | * @return array|bool Returns address on success. |
432 | 432 | */ |
433 | 433 | function geodir_get_osm_address_by_lat_lan($lat, $lng) { |
434 | - $url = 'https://nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email'); |
|
434 | + $url = 'https://nominatim.openstreetmap.org/reverse?format=json&lat='.trim($lat).'&lon='.trim($lng).'&zoom=16&addressdetails=1&email='.get_option('admin_email'); |
|
435 | 435 | |
436 | 436 | $response = wp_remote_get($url); |
437 | - if ( is_wp_error( $response ) ) { |
|
437 | + if (is_wp_error($response)) { |
|
438 | 438 | return false; |
439 | 439 | } |
440 | 440 | |
441 | - $result = json_decode( wp_remote_retrieve_body( $response ) ); |
|
441 | + $result = json_decode(wp_remote_retrieve_body($response)); |
|
442 | 442 | |
443 | - if(!empty($result->address)){ |
|
443 | + if (!empty($result->address)) { |
|
444 | 444 | $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb'); |
445 | - $formatted_address = (array)$result->address; |
|
445 | + $formatted_address = (array) $result->address; |
|
446 | 446 | |
447 | - foreach ( $result->address as $key => $value ) { |
|
447 | + foreach ($result->address as $key => $value) { |
|
448 | 448 | if (!in_array($key, $address_fields)) { |
449 | 449 | unset($formatted_address[$key]); |
450 | 450 | } |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | $result->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : ''; |
453 | 453 | |
454 | 454 | return $result; |
455 | - }else{ |
|
455 | + } else { |
|
456 | 456 | return false; |
457 | 457 | } |
458 | 458 | } |
@@ -474,7 +474,7 @@ discard block |
||
474 | 474 | } |
475 | 475 | |
476 | 476 | if (defined('POST_LOCATION_TABLE')) { |
477 | - $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country)); |
|
477 | + $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country NOT LIKE %s ORDER BY location_id ASC", $country)); |
|
478 | 478 | if (!empty($rows)) { |
479 | 479 | foreach ($rows as $row) { |
480 | 480 | $translated = __($row->country, 'geodirectory'); |
@@ -484,7 +484,7 @@ discard block |
||
484 | 484 | } |
485 | 485 | } |
486 | 486 | |
487 | - $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) ); |
|
487 | + $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country)); |
|
488 | 488 | if (!empty($rows)) { |
489 | 489 | foreach ($rows as $row) { |
490 | 490 | $translated = __($row->country, 'geodirectory'); |
@@ -495,7 +495,7 @@ discard block |
||
495 | 495 | } |
496 | 496 | } |
497 | 497 | |
498 | - if ( $default === '0' ) { |
|
498 | + if ($default === '0') { |
|
499 | 499 | return NULL; |
500 | 500 | } |
501 | 501 | |
@@ -526,10 +526,10 @@ discard block |
||
526 | 526 | function geodir_get_country_iso2($country) { |
527 | 527 | global $wpdb; |
528 | 528 | |
529 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) { |
|
529 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) { |
|
530 | 530 | return $result; |
531 | 531 | } |
532 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) { |
|
532 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", geodir_get_normal_country($country)))) { |
|
533 | 533 | return $result; |
534 | 534 | } |
535 | 535 | |
@@ -548,10 +548,10 @@ discard block |
||
548 | 548 | function geodir_get_country_by_name($country, $iso2 = false) { |
549 | 549 | global $wpdb; |
550 | 550 | |
551 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) { |
|
551 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) { |
|
552 | 552 | return $result; |
553 | 553 | } |
554 | - if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) { |
|
554 | + if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE ISO2 LIKE %s", $country))) { |
|
555 | 555 | return $result; |
556 | 556 | } |
557 | 557 | |
@@ -595,7 +595,7 @@ discard block |
||
595 | 595 | add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables'); |
596 | 596 | |
597 | 597 | |
598 | -function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){ |
|
598 | +function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = '') { |
|
599 | 599 | |
600 | 600 | global $wp; |
601 | 601 | |
@@ -620,8 +620,8 @@ discard block |
||
620 | 620 | $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
621 | 621 | $location_name = get_actual_location_name($location_type, $location, true); |
622 | 622 | } else { |
623 | - $location_name = preg_replace( '/-(\d+)$/', '', $location_name); |
|
624 | - $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
623 | + $location_name = preg_replace('/-(\d+)$/', '', $location_name); |
|
624 | + $location_name = preg_replace('/[_-]/', ' ', $location_name); |
|
625 | 625 | $location_name = __(geodir_ucwords($location_name), 'geodirectory'); |
626 | 626 | } |
627 | 627 | } |
@@ -639,8 +639,8 @@ discard block |
||
639 | 639 | $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
640 | 640 | $location_single = get_actual_location_name($location_type, $location, true); |
641 | 641 | } else { |
642 | - $location_name = preg_replace( '/-(\d+)$/', '', $location); |
|
643 | - $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
642 | + $location_name = preg_replace('/-(\d+)$/', '', $location); |
|
643 | + $location_name = preg_replace('/[_-]/', ' ', $location_name); |
|
644 | 644 | $location_single = __(geodir_ucwords($location_name), 'geodirectory'); |
645 | 645 | } |
646 | 646 | } |
@@ -660,8 +660,8 @@ discard block |
||
660 | 660 | $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
661 | 661 | $location_name = get_actual_location_name($location_type, $location, true); |
662 | 662 | } else { |
663 | - $location_name = preg_replace( '/-(\d+)$/', '', $location); |
|
664 | - $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
663 | + $location_name = preg_replace('/-(\d+)$/', '', $location); |
|
664 | + $location_name = preg_replace('/[_-]/', ' ', $location_name); |
|
665 | 665 | $location_name = __(geodir_ucwords($location_name), 'geodirectory'); |
666 | 666 | } |
667 | 667 | } |
@@ -673,9 +673,9 @@ discard block |
||
673 | 673 | $full_location = array_unique($full_location); |
674 | 674 | } |
675 | 675 | } |
676 | - $full_location = !empty($full_location) ? implode(', ', $full_location): ''; |
|
676 | + $full_location = !empty($full_location) ? implode(', ', $full_location) : ''; |
|
677 | 677 | |
678 | - if ( empty( $full_location ) ) { |
|
678 | + if (empty($full_location)) { |
|
679 | 679 | /** |
680 | 680 | * Filter the text in meta description in full location is empty. |
681 | 681 | * |
@@ -686,10 +686,10 @@ discard block |
||
686 | 686 | * @param string $gd_page The page being filtered. |
687 | 687 | * @param string $sep The separator. |
688 | 688 | */ |
689 | - $full_location = apply_filters( 'geodir_meta_description_location_empty_text', '', $location_array, $gd_page, $sep ); |
|
689 | + $full_location = apply_filters('geodir_meta_description_location_empty_text', '', $location_array, $gd_page, $sep); |
|
690 | 690 | } |
691 | 691 | |
692 | - if ( empty( $location_single ) ) { |
|
692 | + if (empty($location_single)) { |
|
693 | 693 | /** |
694 | 694 | * Filter the text in meta description in single location is empty. |
695 | 695 | * |
@@ -700,21 +700,21 @@ discard block |
||
700 | 700 | * @param string $gd_page The page being filtered. |
701 | 701 | * @param string $sep The separator. |
702 | 702 | */ |
703 | - $location_single = apply_filters( 'geodir_meta_description_single_location_empty_text', '', $location_array, $gd_page, $sep ); |
|
703 | + $location_single = apply_filters('geodir_meta_description_single_location_empty_text', '', $location_array, $gd_page, $sep); |
|
704 | 704 | } |
705 | 705 | |
706 | 706 | $location_replace_vars = array(); |
707 | 707 | $location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|'; |
708 | 708 | $location_replace_vars['%%location%%'] = $full_location; |
709 | - $location_replace_vars['%%in_location%%'] = $full_location != '' ? sprintf( _x('in %s','in location', 'geodirectory'), $full_location ) : ''; |
|
709 | + $location_replace_vars['%%in_location%%'] = $full_location != '' ? sprintf(_x('in %s', 'in location', 'geodirectory'), $full_location) : ''; |
|
710 | 710 | $location_replace_vars['%%location_single%%'] = $location_single; |
711 | - $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? sprintf( _x('in %s','in location', 'geodirectory'), $location_single ) : ''; |
|
711 | + $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? sprintf(_x('in %s', 'in location', 'geodirectory'), $location_single) : ''; |
|
712 | 712 | |
713 | 713 | foreach ($location_names as $type => $name) { |
714 | 714 | $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
715 | 715 | |
716 | - $location_replace_vars['%%location_' . $location_type . '%%'] = $name; |
|
717 | - $location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? sprintf( _x('in %s','in location', 'geodirectory'), $name ) : ''; |
|
716 | + $location_replace_vars['%%location_'.$location_type.'%%'] = $name; |
|
717 | + $location_replace_vars['%%in_location_'.$location_type.'%%'] = !empty($name) ? sprintf(_x('in %s', 'in location', 'geodirectory'), $name) : ''; |
|
718 | 718 | } |
719 | 719 | |
720 | 720 | /** |
@@ -728,5 +728,5 @@ discard block |
||
728 | 728 | * @param string $gd_page The page being filtered. |
729 | 729 | * @param string $sep The separator. |
730 | 730 | */ |
731 | - return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep ); |
|
731 | + return apply_filters('geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep); |
|
732 | 732 | } |
733 | 733 | \ No newline at end of file |
@@ -61,11 +61,12 @@ discard block |
||
61 | 61 | function geodir_is_default_location_set() |
62 | 62 | { |
63 | 63 | $default_location = geodir_get_default_location(); |
64 | - if (!empty($default_location)) |
|
65 | - return true; |
|
66 | - else |
|
67 | - return false; |
|
68 | -} |
|
64 | + if (!empty($default_location)) { |
|
65 | + return true; |
|
66 | + } else { |
|
67 | + return false; |
|
68 | + } |
|
69 | + } |
|
69 | 70 | |
70 | 71 | /** |
71 | 72 | * Returns location slug using location string. |
@@ -259,8 +260,9 @@ discard block |
||
259 | 260 | } |
260 | 261 | */ |
261 | 262 | |
262 | - if ($geodir_location->is_default) |
|
263 | - update_option('geodir_default_location', $geodir_location); |
|
263 | + if ($geodir_location->is_default) { |
|
264 | + update_option('geodir_default_location', $geodir_location); |
|
265 | + } |
|
264 | 266 | |
265 | 267 | return $geodir_location->location_id; |
266 | 268 | |
@@ -305,7 +307,7 @@ discard block |
||
305 | 307 | |
306 | 308 | if(isset($result->results[0]->address_components)){ |
307 | 309 | return $result->results[0]->address_components; |
308 | - }else{ |
|
310 | + } else{ |
|
309 | 311 | return false; |
310 | 312 | } |
311 | 313 | } |
@@ -332,16 +334,19 @@ discard block |
||
332 | 334 | } |
333 | 335 | |
334 | 336 | $country = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : $gd_session->get('gd_country'); |
335 | - if ($country != '' && $country) |
|
336 | - $location_array['gd_country'] = urldecode($country); |
|
337 | + if ($country != '' && $country) { |
|
338 | + $location_array['gd_country'] = urldecode($country); |
|
339 | + } |
|
337 | 340 | |
338 | 341 | $region = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : $gd_session->get('gd_region'); |
339 | - if ($region != '' && $region) |
|
340 | - $location_array['gd_region'] = urldecode($region); |
|
342 | + if ($region != '' && $region) { |
|
343 | + $location_array['gd_region'] = urldecode($region); |
|
344 | + } |
|
341 | 345 | |
342 | 346 | $city = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : $gd_session->get('gd_city'); |
343 | - if ($city != '' && $city) |
|
344 | - $location_array['gd_city'] = urldecode($city); |
|
347 | + if ($city != '' && $city) { |
|
348 | + $location_array['gd_city'] = urldecode($city); |
|
349 | + } |
|
345 | 350 | } else { |
346 | 351 | if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) { |
347 | 352 | return $location_array; |
@@ -353,14 +358,17 @@ discard block |
||
353 | 358 | |
354 | 359 | $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : ''; |
355 | 360 | |
356 | - if ($country != '') |
|
357 | - $location_array['gd_country'] = urldecode($country); |
|
361 | + if ($country != '') { |
|
362 | + $location_array['gd_country'] = urldecode($country); |
|
363 | + } |
|
358 | 364 | |
359 | - if ($region != '') |
|
360 | - $location_array['gd_region'] = urldecode($region); |
|
365 | + if ($region != '') { |
|
366 | + $location_array['gd_region'] = urldecode($region); |
|
367 | + } |
|
361 | 368 | |
362 | - if ($city != '') |
|
363 | - $location_array['gd_city'] = urldecode($city); |
|
369 | + if ($city != '') { |
|
370 | + $location_array['gd_city'] = urldecode($city); |
|
371 | + } |
|
364 | 372 | |
365 | 373 | // Fix category link in ajax popular category widget on change post type |
366 | 374 | if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) { |
@@ -452,7 +460,7 @@ discard block |
||
452 | 460 | $result->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : ''; |
453 | 461 | |
454 | 462 | return $result; |
455 | - }else{ |
|
463 | + } else{ |
|
456 | 464 | return false; |
457 | 465 | } |
458 | 466 | } |