|
@@ -28,31 +28,31 @@ discard block |
|
|
block discarded – undo |
|
28
|
28
|
* @package GeoDirectory
|
|
29
|
29
|
*/
|
|
30
|
30
|
function geodir_admin_styles() {
|
|
31
|
|
- wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
|
31
|
+ wp_register_style('geodirectory-admin-css', geodir_plugin_url().'/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
32
|
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);
|
|
|
34
|
+ wp_register_style('geodirectory-frontend-style', geodir_plugin_url().'/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
35
|
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);
|
|
|
37
|
+ wp_register_style('geodir-chosen-style', geodir_plugin_url().'/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
38
|
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);
|
|
|
40
|
+ wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url().'/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
41
|
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);
|
|
|
43
|
+ wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url().'/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
44
|
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);
|
|
|
46
|
+ wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url().'/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
47
|
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);
|
|
|
49
|
+ wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url().'/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
50
|
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);
|
|
|
52
|
+ wp_register_style('geodir-rating-style', geodir_plugin_url().'/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
53
|
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);
|
|
|
55
|
+ wp_register_style('geodir-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
56
|
56
|
wp_enqueue_style('geodir-rtl-style');
|
|
57
|
57
|
}
|
|
58
|
58
|
}
|
|
@@ -70,7 +70,7 @@ discard block |
|
|
block discarded – undo |
|
70
|
70
|
wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
|
71
|
71
|
wp_enqueue_style('font-awesome');
|
|
72
|
72
|
|
|
73
|
|
- wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
|
73
|
+ wp_register_script('geodirectory-admin', geodir_plugin_url().'/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
74
|
74
|
wp_enqueue_script('geodirectory-admin');
|
|
75
|
75
|
|
|
76
|
76
|
}
|
|
@@ -89,60 +89,60 @@ discard block |
|
|
block discarded – undo |
|
89
|
89
|
|
|
90
|
90
|
wp_enqueue_script('jquery');
|
|
91
|
91
|
|
|
92
|
|
- 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);
|
|
|
92
|
+ 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
|
93
|
|
|
94
|
|
- wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
|
94
|
+ wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
95
|
95
|
wp_enqueue_script('chosen');
|
|
96
|
96
|
|
|
97
|
|
- wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
|
97
|
+ wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
98
|
98
|
wp_enqueue_script('geodirectory-choose-ajax');
|
|
99
|
99
|
|
|
100
|
100
|
if (isset($_REQUEST['listing_type'])) {
|
|
101
|
|
- wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
|
|
|
101
|
+ wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url().'/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
|
|
102
|
102
|
}
|
|
103
|
103
|
|
|
104
|
104
|
wp_enqueue_script('geodirectory-custom-fields-script');
|
|
105
|
|
- $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';
|
|
|
105
|
+ $plugin_path = geodir_plugin_url().'/geodirectory-functions/cat-meta-functions';
|
|
106
|
106
|
|
|
107
|
|
- wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);
|
|
|
107
|
+ wp_enqueue_script('tax-meta-clss', $plugin_path.'/js/tax-meta-clss.js', array('jquery'), null, true);
|
|
108
|
108
|
|
|
109
|
109
|
if (in_array($geodir_map_name, array('auto', 'google'))) {
|
|
110
|
|
- $map_lang = "&language=" . geodir_get_map_default_language();
|
|
111
|
|
- $map_key = "&key=" . geodir_get_map_api_key();
|
|
|
110
|
+ $map_lang = "&language=".geodir_get_map_default_language();
|
|
|
111
|
+ $map_key = "&key=".geodir_get_map_api_key();
|
|
112
|
112
|
/** This filter is documented in geodirectory_template_tags.php */
|
|
113
|
113
|
$map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
|
114
|
|
- wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
|
|
|
114
|
+ wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);
|
|
115
|
115
|
}
|
|
116
|
116
|
|
|
117
|
117
|
if ($geodir_map_name == 'osm') {
|
|
118
|
118
|
// Leaflet OpenStreetMap
|
|
119
|
|
- wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
|
119
|
+ wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
120
|
120
|
wp_enqueue_style('geodirectory-leaflet-style');
|
|
121
|
121
|
|
|
122
|
|
- wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
|
122
|
+ wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
123
|
123
|
wp_enqueue_script('geodirectory-leaflet-script');
|
|
124
|
124
|
|
|
125
|
|
- wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
|
125
|
+ wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
126
|
126
|
wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
127
|
127
|
}
|
|
128
|
|
- wp_enqueue_script( 'jquery-ui-autocomplete' );
|
|
|
128
|
+ wp_enqueue_script('jquery-ui-autocomplete');
|
|
129
|
129
|
|
|
130
|
|
- wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
|
130
|
+ wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
131
|
131
|
wp_enqueue_script('geodirectory-goMap-script');
|
|
132
|
132
|
|
|
133
|
|
- wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
|
133
|
+ wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
134
|
134
|
wp_enqueue_script('geodirectory-goMap-script');
|
|
135
|
135
|
|
|
136
|
136
|
// font awesome rating script
|
|
137
|
137
|
if (get_option('geodir_reviewrating_enable_font_awesome')) {
|
|
138
|
|
- wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);
|
|
|
138
|
+ wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);
|
|
139
|
139
|
wp_enqueue_script('geodir-barrating-js');
|
|
140
|
140
|
} else { // default rating script
|
|
141
|
|
- wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);
|
|
|
141
|
+ wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);
|
|
142
|
142
|
wp_enqueue_script('geodir-jRating-js');
|
|
143
|
143
|
}
|
|
144
|
144
|
|
|
145
|
|
- wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
|
145
|
+ wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
146
|
146
|
wp_enqueue_script('geodir-on-document-load');
|
|
147
|
147
|
|
|
148
|
148
|
|
|
@@ -150,7 +150,7 @@ discard block |
|
|
block discarded – undo |
|
150
|
150
|
wp_enqueue_script('plupload-all');
|
|
151
|
151
|
wp_enqueue_script('jquery-ui-sortable');
|
|
152
|
152
|
|
|
153
|
|
- wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
|
153
|
+ wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
154
|
154
|
wp_enqueue_script('geodirectory-plupload-script');
|
|
155
|
155
|
|
|
156
|
156
|
// SCRIPT FOR UPLOAD END
|
|
@@ -204,7 +204,7 @@ discard block |
|
|
block discarded – undo |
|
204
|
204
|
wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
|
|
205
|
205
|
|
|
206
|
206
|
|
|
207
|
|
- wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
|
207
|
+ wp_register_script('geodirectory-admin-script', geodir_plugin_url().'/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
208
|
208
|
wp_enqueue_script('geodirectory-admin-script');
|
|
209
|
209
|
|
|
210
|
210
|
wp_enqueue_style('farbtastic');
|
|
@@ -212,10 +212,10 @@ discard block |
|
|
block discarded – undo |
|
212
|
212
|
|
|
213
|
213
|
$screen = get_current_screen();
|
|
214
|
214
|
if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
|
|
215
|
|
- wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
|
|
|
215
|
+ wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation_admin.js');
|
|
216
|
216
|
}
|
|
217
|
217
|
|
|
218
|
|
- $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
|
|
|
218
|
+ $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl').'?geodir_ajax=true')));
|
|
219
|
219
|
wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
|
|
220
|
220
|
|
|
221
|
221
|
}
|
|
@@ -238,7 +238,7 @@ discard block |
|
|
block discarded – undo |
|
238
|
238
|
|
|
239
|
239
|
if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
|
|
240
|
240
|
|
|
241
|
|
- add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
|
241
|
+ add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url().'/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
242
|
242
|
|
|
243
|
243
|
|
|
244
|
244
|
}
|
|
@@ -272,7 +272,7 @@ discard block |
|
|
block discarded – undo |
|
272
|
272
|
$geodir_menu_order[] = 'separator-geodirectory';
|
|
273
|
273
|
if (!empty($post_types)) {
|
|
274
|
274
|
foreach ($post_types as $post_type) {
|
|
275
|
|
- $geodir_menu_order[] = 'edit.php?post_type=' . $post_type;
|
|
|
275
|
+ $geodir_menu_order[] = 'edit.php?post_type='.$post_type;
|
|
276
|
276
|
}
|
|
277
|
277
|
}
|
|
278
|
278
|
$geodir_menu_order[] = $item;
|
|
@@ -315,8 +315,8 @@ discard block |
|
|
block discarded – undo |
|
315
|
315
|
{
|
|
316
|
316
|
if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
|
|
317
|
317
|
echo '<div id="message" class="updated fade">
|
|
318
|
|
- <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>
|
|
319
|
|
- <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>
|
|
|
318
|
+ <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>
|
|
|
319
|
+ <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory').'</strong></p>
|
|
320
|
320
|
</div>';
|
|
321
|
321
|
|
|
322
|
322
|
}
|
|
@@ -324,7 +324,7 @@ discard block |
|
|
block discarded – undo |
|
324
|
324
|
if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
|
|
325
|
325
|
switch ($_REQUEST['msg']) {
|
|
326
|
326
|
case 'success':
|
|
327
|
|
- echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
|
|
|
327
|
+ echo '<div id="message" class="updated fade"><p><strong>'.__('Your settings have been saved.', 'geodirectory').'</strong></p></div>';
|
|
328
|
328
|
flush_rewrite_rules(false);
|
|
329
|
329
|
|
|
330
|
330
|
break;
|
|
@@ -332,30 +332,30 @@ discard block |
|
|
block discarded – undo |
|
332
|
332
|
$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';
|
|
333
|
333
|
|
|
334
|
334
|
if ($gderr == 21)
|
|
335
|
|
- 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>';
|
|
|
335
|
+ 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>';
|
|
336
|
336
|
else
|
|
337
|
|
- echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
|
|
|
337
|
+ echo '<div id="message" class="error fade"><p><strong>'.__('Error: Your settings have not been saved, please try again.', 'geodirectory').'</strong></p></div>';
|
|
338
|
338
|
break;
|
|
339
|
339
|
}
|
|
340
|
340
|
}
|
|
341
|
341
|
|
|
342
|
342
|
$geodir_load_map = get_option('geodir_load_map');
|
|
343
|
343
|
$need_map_key = false;
|
|
344
|
|
- if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
|
|
|
344
|
+ if ($geodir_load_map == '' || $geodir_load_map == 'google' || $geodir_load_map == 'auto') {
|
|
345
|
345
|
$need_map_key = true;
|
|
346
|
346
|
}
|
|
347
|
347
|
|
|
348
|
348
|
if (!geodir_get_map_api_key() && $need_map_key) {
|
|
349
|
|
- 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>';
|
|
|
349
|
+ 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>';
|
|
350
|
350
|
}
|
|
351
|
351
|
|
|
352
|
352
|
if (!geodir_is_default_location_set()) {
|
|
353
|
|
- 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>';
|
|
|
353
|
+ 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>';
|
|
354
|
354
|
|
|
355
|
355
|
}
|
|
356
|
356
|
|
|
357
|
357
|
if (!function_exists('curl_init')) {
|
|
358
|
|
- 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>';
|
|
|
358
|
+ 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>';
|
|
359
|
359
|
|
|
360
|
360
|
}
|
|
361
|
361
|
|
|
@@ -375,18 +375,18 @@ discard block |
|
|
block discarded – undo |
|
375
|
375
|
function geodir_handle_option_form_submit($current_tab)
|
|
376
|
376
|
{
|
|
377
|
377
|
global $geodir_settings;
|
|
378
|
|
- if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
|
|
|
378
|
+ if (file_exists(dirname(__FILE__).'/option-pages/'.$current_tab.'_array.php')) {
|
|
379
|
379
|
/**
|
|
380
|
380
|
* Contains settings array for current tab.
|
|
381
|
381
|
*
|
|
382
|
382
|
* @since 1.0.0
|
|
383
|
383
|
* @package GeoDirectory
|
|
384
|
384
|
*/
|
|
385
|
|
- include_once('option-pages/' . $current_tab . '_array.php');
|
|
|
385
|
+ include_once('option-pages/'.$current_tab.'_array.php');
|
|
386
|
386
|
}
|
|
387
|
387
|
if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :
|
|
388
|
388
|
if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
389
|
|
- if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
|
389
|
+ if (!wp_verify_nonce($_REQUEST['_wpnonce-'.$current_tab], 'geodir-settings-'.$current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
390
|
390
|
|
|
391
|
391
|
/**
|
|
392
|
392
|
* Fires before updating geodirectory admin settings.
|
|
@@ -419,13 +419,13 @@ discard block |
|
|
block discarded – undo |
|
419
|
419
|
* @param string $current_tab The current settings tab name.
|
|
420
|
420
|
* @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.
|
|
421
|
421
|
*/
|
|
422
|
|
- do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
|
|
|
422
|
+ do_action('geodir_update_options_'.$current_tab, $geodir_settings[$current_tab]);
|
|
423
|
423
|
|
|
424
|
424
|
flush_rewrite_rules(false);
|
|
425
|
425
|
|
|
426
|
426
|
$current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';
|
|
427
|
427
|
|
|
428
|
|
- $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
|
|
|
428
|
+ $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$_REQUEST['active_tab'].'&msg=success');
|
|
429
|
429
|
|
|
430
|
430
|
wp_redirect($redirect_url);
|
|
431
|
431
|
exit();
|
|
@@ -464,18 +464,18 @@ discard block |
|
|
block discarded – undo |
|
464
|
464
|
|
|
465
|
465
|
elseif (isset($value['type']) && $value['type'] == 'image_width') :
|
|
466
|
466
|
|
|
467
|
|
- if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
|
|
468
|
|
- update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);
|
|
469
|
|
- update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);
|
|
470
|
|
- if (isset($_POST[$value['id'] . '_crop'])) :
|
|
471
|
|
- update_option($value['id'] . '_crop', 1);
|
|
|
467
|
+ if (isset($value['id']) && isset($_POST[$value['id'].'_width'])) {
|
|
|
468
|
+ update_option($value['id'].'_width', $_POST[$value['id'].'_width']);
|
|
|
469
|
+ update_option($value['id'].'_height', $_POST[$value['id'].'_height']);
|
|
|
470
|
+ if (isset($_POST[$value['id'].'_crop'])) :
|
|
|
471
|
+ update_option($value['id'].'_crop', 1);
|
|
472
|
472
|
else :
|
|
473
|
|
- update_option($value['id'] . '_crop', 0);
|
|
|
473
|
+ update_option($value['id'].'_crop', 0);
|
|
474
|
474
|
endif;
|
|
475
|
475
|
} else {
|
|
476
|
|
- update_option($value['id'] . '_width', $value['std']);
|
|
477
|
|
- update_option($value['id'] . '_height', $value['std']);
|
|
478
|
|
- update_option($value['id'] . '_crop', 1);
|
|
|
476
|
+ update_option($value['id'].'_width', $value['std']);
|
|
|
477
|
+ update_option($value['id'].'_height', $value['std']);
|
|
|
478
|
+ update_option($value['id'].'_crop', 1);
|
|
479
|
479
|
}
|
|
480
|
480
|
|
|
481
|
481
|
elseif (isset($value['type']) && $value['type'] == 'map') :
|
|
@@ -517,12 +517,12 @@ discard block |
|
|
block discarded – undo |
|
517
|
517
|
elseif (isset($value['type']) && $value['type'] == 'file') :
|
|
518
|
518
|
|
|
519
|
519
|
|
|
520
|
|
- if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
|
|
|
520
|
+ if (isset($_POST[$value['id'].'_remove']) && $_POST[$value['id'].'_remove']) {// if remove is set then remove the file
|
|
521
|
521
|
|
|
522
|
522
|
if (get_option($value['id'])) {
|
|
523
|
523
|
$image_name_arr = explode('/', get_option($value['id']));
|
|
524
|
524
|
$noimg_name = end($image_name_arr);
|
|
525
|
|
- $img_path = $uploads['path'] . '/' . $noimg_name;
|
|
|
525
|
+ $img_path = $uploads['path'].'/'.$noimg_name;
|
|
526
|
526
|
if (file_exists($img_path))
|
|
527
|
527
|
unlink($img_path);
|
|
528
|
528
|
}
|
|
@@ -550,7 +550,7 @@ discard block |
|
|
block discarded – undo |
|
550
|
550
|
if (get_option($value['id'])) {
|
|
551
|
551
|
$image_name_arr = explode('/', get_option($value['id']));
|
|
552
|
552
|
$noimg_name = end($image_name_arr);
|
|
553
|
|
- $img_path = $uploads['path'] . '/' . $noimg_name;
|
|
|
553
|
+ $img_path = $uploads['path'].'/'.$noimg_name;
|
|
554
|
554
|
if (file_exists($img_path))
|
|
555
|
555
|
unlink($img_path);
|
|
556
|
556
|
}
|
|
@@ -571,7 +571,7 @@ discard block |
|
|
block discarded – undo |
|
571
|
571
|
// same menu setting per theme.
|
|
572
|
572
|
if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
|
573
|
573
|
$theme = wp_get_theme();
|
|
574
|
|
- update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
|
|
574
|
+ update_option('geodir_theme_location_nav_'.$theme->name, $_POST[$value['id']]);
|
|
575
|
575
|
}
|
|
576
|
576
|
|
|
577
|
577
|
if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
@@ -641,7 +641,7 @@ discard block |
|
|
block discarded – undo |
|
641
|
641
|
|
|
642
|
642
|
$listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory');
|
|
643
|
643
|
|
|
644
|
|
- $tabs[$geodir_post_type . '_fields_settings'] = array(
|
|
|
644
|
+ $tabs[$geodir_post_type.'_fields_settings'] = array(
|
|
645
|
645
|
'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
|
|
646
|
646
|
'subtabs' => array(
|
|
647
|
647
|
array('subtab' => 'custom_fields',
|
|
@@ -675,7 +675,7 @@ discard block |
|
|
block discarded – undo |
|
675
|
675
|
*/
|
|
676
|
676
|
function geodir_tools_setting_tab($tabs)
|
|
677
|
677
|
{
|
|
678
|
|
- wp_enqueue_script( 'jquery-ui-progressbar' );
|
|
|
678
|
+ wp_enqueue_script('jquery-ui-progressbar');
|
|
679
|
679
|
$tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
|
|
680
|
680
|
return $tabs;
|
|
681
|
681
|
}
|
|
@@ -709,7 +709,7 @@ discard block |
|
|
block discarded – undo |
|
709
|
709
|
*/
|
|
710
|
710
|
function geodir_extend_geodirectory_setting_tab($tabs)
|
|
711
|
711
|
{
|
|
712
|
|
- $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
|
712
|
+ $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory').' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
713
|
713
|
return $tabs;
|
|
714
|
714
|
}
|
|
715
|
715
|
|
|
@@ -769,8 +769,8 @@ discard block |
|
|
block discarded – undo |
|
769
|
769
|
_e('Unknown', 'geodirectory');
|
|
770
|
770
|
} else {
|
|
771
|
771
|
/* If there is a city id, append 'city name' to the text string. */
|
|
772
|
|
- $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
|
|
773
|
|
- echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);
|
|
|
772
|
+ $add_location_id = $location_id > 0 ? ' ('.$location_id.')' : '';
|
|
|
773
|
+ echo(__($location->country, 'geodirectory').'-'.$location->region.'-'.$location->city.$add_location_id);
|
|
774
|
774
|
}
|
|
775
|
775
|
break;
|
|
776
|
776
|
|
|
@@ -788,14 +788,14 @@ discard block |
|
|
block discarded – undo |
|
788
|
788
|
$expire_class = 'expire_over';
|
|
789
|
789
|
}
|
|
790
|
790
|
$date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days
|
|
791
|
|
- $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
|
|
|
791
|
+ $date_diff_text = '<br /><span class="'.$expire_class.'">('.$date_diff.' '.$state.')</span>';
|
|
792
|
792
|
}
|
|
793
|
793
|
/* If no expire_date is found, output a default message. */
|
|
794
|
794
|
if (empty($expire_date))
|
|
795
|
795
|
echo __('Unknown', 'geodirectory');
|
|
796
|
796
|
/* If there is a expire_date, append 'days left' to the text string. */
|
|
797
|
797
|
else
|
|
798
|
|
- echo $expire_date . $date_diff_text;
|
|
|
798
|
+ echo $expire_date.$date_diff_text;
|
|
799
|
799
|
break;
|
|
800
|
800
|
|
|
801
|
801
|
/* If displaying the 'categorys' column. */
|
|
@@ -862,7 +862,7 @@ discard block |
|
|
block discarded – undo |
|
862
|
862
|
function geodir_post_information_save($post_id, $post) {
|
|
863
|
863
|
global $wpdb, $current_user;
|
|
864
|
864
|
|
|
865
|
|
- if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
|
|
|
865
|
+ if (isset($post->post_type) && ($post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post')) {
|
|
866
|
866
|
return;
|
|
867
|
867
|
}
|
|
868
|
868
|
|
|
@@ -930,7 +930,7 @@ discard block |
|
|
block discarded – undo |
|
930
|
930
|
$tab_id = $value['id'];
|
|
931
|
931
|
|
|
932
|
932
|
if (isset($value['desc']) && $value['desc'])
|
|
933
|
|
- $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';
|
|
|
933
|
+ $desc = '<span style=" text-transform:none;">:- '.$value['desc'].'</span>';
|
|
934
|
934
|
|
|
935
|
935
|
if (isset($value['name']) && $value['name']) {
|
|
936
|
936
|
if ($first_title === true) {
|
|
@@ -938,9 +938,9 @@ discard block |
|
|
block discarded – undo |
|
938
|
938
|
} else {
|
|
939
|
939
|
echo '</div>';
|
|
940
|
940
|
}
|
|
941
|
|
- echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';
|
|
|
941
|
+ echo '<dd id="'.trim($tab_id).'" class="geodir_option_tabs" ><a href="javascript:void(0);">'.$value['name'].'</a></dd>';
|
|
942
|
942
|
|
|
943
|
|
- echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';
|
|
|
943
|
+ echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >';
|
|
944
|
944
|
}
|
|
945
|
945
|
|
|
946
|
946
|
/**
|
|
@@ -950,21 +950,21 @@ discard block |
|
|
block discarded – undo |
|
950
|
950
|
*
|
|
951
|
951
|
* @since 1.0.0
|
|
952
|
952
|
*/
|
|
953
|
|
- do_action('geodir_settings_' . sanitize_title($value['id']));
|
|
|
953
|
+ do_action('geodir_settings_'.sanitize_title($value['id']));
|
|
954
|
954
|
break;
|
|
955
|
955
|
|
|
956
|
956
|
case 'no_tabs':
|
|
957
|
957
|
|
|
958
|
958
|
echo '<div class="inner_content_tab_main">';
|
|
959
|
|
- echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';
|
|
|
959
|
+ echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >';
|
|
960
|
960
|
|
|
961
|
961
|
break;
|
|
962
|
962
|
|
|
963
|
963
|
case 'sectionstart':
|
|
964
|
964
|
if (isset($value['desc']) && $value['desc'])
|
|
965
|
|
- $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';
|
|
|
965
|
+ $desc = '<span style=" text-transform:none;"> - '.$value['desc'].'</span>';
|
|
966
|
966
|
if (isset($value['name']) && $value['name'])
|
|
967
|
|
- echo '<h3>' . $value['name'] . $desc . '</h3>';
|
|
|
967
|
+ echo '<h3>'.$value['name'].$desc.'</h3>';
|
|
968
|
968
|
/**
|
|
969
|
969
|
* Called after a GeoDirectory settings sectionstart is output in the GD settings page.
|
|
970
|
970
|
*
|
|
@@ -972,8 +972,8 @@ discard block |
|
|
block discarded – undo |
|
972
|
972
|
*
|
|
973
|
973
|
* @since 1.0.0
|
|
974
|
974
|
*/
|
|
975
|
|
- if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
|
|
976
|
|
- echo '<table class="form-table">' . "\n\n";
|
|
|
975
|
+ if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_start');
|
|
|
976
|
+ echo '<table class="form-table">'."\n\n";
|
|
977
|
977
|
|
|
978
|
978
|
break;
|
|
979
|
979
|
case 'sectionend':
|
|
@@ -984,7 +984,7 @@ discard block |
|
|
block discarded – undo |
|
984
|
984
|
*
|
|
985
|
985
|
* @since 1.0.0
|
|
986
|
986
|
*/
|
|
987
|
|
- if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
|
987
|
+ if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_end');
|
|
988
|
988
|
echo '</table>';
|
|
989
|
989
|
/**
|
|
990
|
990
|
* Called after a GeoDirectory settings sectionend is output in the GD settings page.
|
|
@@ -993,7 +993,7 @@ discard block |
|
|
block discarded – undo |
|
993
|
993
|
*
|
|
994
|
994
|
* @since 1.0.0
|
|
995
|
995
|
*/
|
|
996
|
|
- if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
|
996
|
+ if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_after');
|
|
997
|
997
|
break;
|
|
998
|
998
|
case 'text':
|
|
999
|
999
|
?>
|
|
@@ -1002,7 +1002,7 @@ discard block |
|
|
block discarded – undo |
|
1002
|
1002
|
<td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"
|
|
1003
|
1003
|
id="<?php echo esc_attr($value['id']); ?>"
|
|
1004
|
1004
|
type="<?php echo esc_attr($value['type']); ?>"
|
|
1005
|
|
- <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
|
1005
|
+ <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
1006
|
1006
|
style=" <?php echo esc_attr($value['css']); ?>"
|
|
1007
|
1007
|
value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
|
1008
|
1008
|
echo esc_attr(stripslashes(get_option($value['id'])));
|
|
@@ -1019,14 +1019,14 @@ discard block |
|
|
block discarded – undo |
|
1019
|
1019
|
<td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"
|
|
1020
|
1020
|
id="<?php echo esc_attr($value['id']); ?>"
|
|
1021
|
1021
|
type="<?php echo esc_attr($value['type']); ?>"
|
|
1022
|
|
- <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
|
1022
|
+ <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
1023
|
1023
|
style=" <?php echo esc_attr($value['css']); ?>"
|
|
1024
|
1024
|
value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
|
1025
|
1025
|
echo esc_attr(stripslashes(get_option($value['id'])));
|
|
1026
|
1026
|
} else {
|
|
1027
|
1027
|
echo esc_attr($value['std']);
|
|
1028
|
1028
|
} ?>"/>
|
|
1029
|
|
- <a href='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]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )','geodirectory');?>" ><?php _e('Generate API Key','geodirectory');?></a>
|
|
|
1029
|
+ <a href='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]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )', 'geodirectory'); ?>" ><?php _e('Generate API Key', 'geodirectory'); ?></a>
|
|
1030
|
1030
|
<span class="description"><?php echo $value['desc']; ?></span></td>
|
|
1031
|
1031
|
</tr><?php
|
|
1032
|
1032
|
break;
|
|
@@ -1038,7 +1038,7 @@ discard block |
|
|
block discarded – undo |
|
1038
|
1038
|
<td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"
|
|
1039
|
1039
|
id="<?php echo esc_attr($value['id']); ?>"
|
|
1040
|
1040
|
type="<?php echo esc_attr($value['type']); ?>"
|
|
1041
|
|
- <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
|
1041
|
+ <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
1042
|
1042
|
style="<?php echo esc_attr($value['css']); ?>"
|
|
1043
|
1043
|
value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
|
1044
|
1044
|
echo esc_attr(stripslashes(get_option($value['id'])));
|
|
@@ -1084,17 +1084,17 @@ discard block |
|
|
block discarded – undo |
|
1084
|
1084
|
<?php _e('Width', 'geodirectory'); ?> <input
|
|
1085
|
1085
|
name="<?php echo esc_attr($value['id']); ?>_width"
|
|
1086
|
1086
|
id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3"
|
|
1087
|
|
- value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/>
|
|
|
1087
|
+ value="<?php if ($size = get_option($value['id'].'_width')) echo stripslashes($size); else echo $value['std']; ?>"/>
|
|
1088
|
1088
|
|
|
1089
|
1089
|
<?php _e('Height', 'geodirectory'); ?> <input
|
|
1090
|
1090
|
name="<?php echo esc_attr($value['id']); ?>_height"
|
|
1091
|
1091
|
id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3"
|
|
1092
|
|
- value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/>
|
|
|
1092
|
+ value="<?php if ($size = get_option($value['id'].'_height')) echo stripslashes($size); else echo $value['std']; ?>"/>
|
|
1093
|
1093
|
|
|
1094
|
1094
|
<label><?php _e('Hard Crop', 'geodirectory'); ?> <input
|
|
1095
|
1095
|
name="<?php echo esc_attr($value['id']); ?>_crop"
|
|
1096
|
1096
|
id="<?php echo esc_attr($value['id']); ?>_crop"
|
|
1097
|
|
- type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label>
|
|
|
1097
|
+ type="checkbox" <?php if (get_option($value['id'].'_crop') != '') checked(get_option($value['id'].'_crop'), 1); else checked(1); ?> /></label>
|
|
1098
|
1098
|
|
|
1099
|
1099
|
<span class="description"><?php echo $value['desc'] ?></span></td>
|
|
1100
|
1100
|
</tr><?php
|
|
@@ -1144,7 +1144,7 @@ discard block |
|
|
block discarded – undo |
|
1144
|
1144
|
id="<?php echo esc_attr($value['id']); ?>"
|
|
1145
|
1145
|
style="<?php echo esc_attr($value['css']); ?>"
|
|
1146
|
1146
|
class="<?php if (isset($value['class'])) echo $value['class']; ?>"
|
|
1147
|
|
- data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"
|
|
|
1147
|
+ data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text']; ?>"
|
|
1148
|
1148
|
option-ajaxchosen="false">
|
|
1149
|
1149
|
<?php
|
|
1150
|
1150
|
foreach ($value['options'] as $key => $val) {
|
|
@@ -1155,7 +1155,7 @@ discard block |
|
|
block discarded – undo |
|
1155
|
1155
|
} else {
|
|
1156
|
1156
|
?>
|
|
1157
|
1157
|
<option
|
|
1158
|
|
- value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>><?php echo ucfirst($val) ?></option>
|
|
|
1158
|
+ value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values))); ?>><?php echo ucfirst($val) ?></option>
|
|
1159
|
1159
|
<?php
|
|
1160
|
1160
|
}
|
|
1161
|
1161
|
}
|
|
@@ -1190,7 +1190,7 @@ discard block |
|
|
block discarded – undo |
|
1190
|
1190
|
?>
|
|
1191
|
1191
|
|
|
1192
|
1192
|
<tr valign="top">
|
|
1193
|
|
- <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>
|
|
|
1193
|
+ <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory'); ?></th>
|
|
1194
|
1194
|
<td width="60%">
|
|
1195
|
1195
|
<select name="geodir_default_map_language" style="width:60%">
|
|
1196
|
1196
|
<?php
|
|
@@ -1272,7 +1272,7 @@ discard block |
|
|
block discarded – undo |
|
1272
|
1272
|
|
|
1273
|
1273
|
<tr valign="top">
|
|
1274
|
1274
|
<th class="titledesc"
|
|
1275
|
|
- width="40%"><?php _e('Default post type search on map', 'geodirectory');?></th>
|
|
|
1275
|
+ width="40%"><?php _e('Default post type search on map', 'geodirectory'); ?></th>
|
|
1276
|
1276
|
<td width="60%">
|
|
1277
|
1277
|
<select name="geodir_default_map_search_pt" style="width:60%">
|
|
1278
|
1278
|
<?php
|
|
@@ -1313,7 +1313,7 @@ discard block |
|
|
block discarded – undo |
|
1313
|
1313
|
$cat_display = 'checkbox';
|
|
1314
|
1314
|
$gd_post_types = get_option('geodir_exclude_post_type_on_map');
|
|
1315
|
1315
|
$gd_cats = get_option('geodir_exclude_cat_on_map');
|
|
1316
|
|
- $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
|
|
|
1316
|
+ $gd_cats_upgrade = (int) get_option('geodir_exclude_cat_on_map_upgrade');
|
|
1317
|
1317
|
$count = 1;
|
|
1318
|
1318
|
?>
|
|
1319
|
1319
|
<table width="70%" class="widefat">
|
|
@@ -1342,7 +1342,7 @@ discard block |
|
|
block discarded – undo |
|
1342
|
1342
|
name="home_map_post_types[]"
|
|
1343
|
1343
|
id="<?php echo esc_attr($value['id']); ?>"
|
|
1344
|
1344
|
value="<?php echo $key; ?>"
|
|
1345
|
|
- class="map_post_type" <?php echo $checked;?> />
|
|
|
1345
|
+ class="map_post_type" <?php echo $checked; ?> />
|
|
1346
|
1346
|
<?php echo __($post_types_obj->labels->singular_name, 'geodirectory'); ?></td>
|
|
1347
|
1347
|
<td width="40%">
|
|
1348
|
1348
|
<div class="home_map_category" style="overflow:auto;width:200px;height:100px;"
|
|
@@ -1400,12 +1400,12 @@ discard block |
|
|
block discarded – undo |
|
1400
|
1400
|
?>
|
|
1401
|
1401
|
<fieldset>
|
|
1402
|
1402
|
<legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>
|
|
1403
|
|
- <label for="<?php echo $value['id'];?>">
|
|
|
1403
|
+ <label for="<?php echo $value['id']; ?>">
|
|
1404
|
1404
|
<input name="<?php echo esc_attr($value['id']); ?>"
|
|
1405
|
|
- id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"
|
|
|
1405
|
+ id="<?php echo esc_attr($value['id'].$value['value']); ?>" type="radio"
|
|
1406
|
1406
|
value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {
|
|
1407
|
1407
|
echo 'checked="checked"';
|
|
1408
|
|
- }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
|
1408
|
+ }elseif (get_option($value['id']) == '' && $value['std'] == $value['value']) {echo 'checked="checked"'; } ?> />
|
|
1409
|
1409
|
<?php echo $value['desc']; ?></label><br>
|
|
1410
|
1410
|
</fieldset>
|
|
1411
|
1411
|
<?php
|
|
@@ -1425,9 +1425,9 @@ discard block |
|
|
block discarded – undo |
|
1425
|
1425
|
<th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
|
|
1426
|
1426
|
<td class="forminp">
|
|
1427
|
1427
|
<textarea
|
|
1428
|
|
- <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>"
|
|
|
1428
|
+ <?php if (isset($value['args'])) echo $value['args'].' '; ?>name="<?php echo esc_attr($value['id']); ?>"
|
|
1429
|
1429
|
id="<?php echo esc_attr($value['id']); ?>"
|
|
1430
|
|
- <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
|
1430
|
+ <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
1431
|
1431
|
style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span
|
|
1432
|
1432
|
class="description"><?php echo $value['desc'] ?></span>
|
|
1433
|
1433
|
|
|
@@ -1472,7 +1472,7 @@ discard block |
|
|
block discarded – undo |
|
1472
|
1472
|
}
|
|
1473
|
1473
|
}
|
|
1474
|
1474
|
//
|
|
1475
|
|
- $page_setting = (int)get_option($value['id']);
|
|
|
1475
|
+ $page_setting = (int) get_option($value['id']);
|
|
1476
|
1476
|
|
|
1477
|
1477
|
$args = array('name' => $value['id'],
|
|
1478
|
1478
|
'id' => $value['id'],
|
|
@@ -1489,7 +1489,7 @@ discard block |
|
|
block discarded – undo |
|
1489
|
1489
|
<tr valign="top" class="single_select_page">
|
|
1490
|
1490
|
<th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
|
|
1491
|
1491
|
<td class="forminp">
|
|
1492
|
|
- <?php echo str_replace(' id=', " data-placeholder='" . __('Select a page...', 'geodirectory') . "' style='" . $value['css'] . "' class='" . $value['class'] . "' " . $disabled . " id=", wp_dropdown_pages($args)); ?>
|
|
|
1492
|
+ <?php echo str_replace(' id=', " data-placeholder='".__('Select a page...', 'geodirectory')."' style='".$value['css']."' class='".$value['class']."' ".$disabled." id=", wp_dropdown_pages($args)); ?>
|
|
1493
|
1493
|
<span class="description"><?php echo $value['desc'] ?></span>
|
|
1494
|
1494
|
</td>
|
|
1495
|
1495
|
</tr><?php
|
|
@@ -1498,7 +1498,7 @@ discard block |
|
|
block discarded – undo |
|
1498
|
1498
|
}
|
|
1499
|
1499
|
break;
|
|
1500
|
1500
|
case 'single_select_country' :
|
|
1501
|
|
- $country_setting = (string)get_option($value['id']);
|
|
|
1501
|
+ $country_setting = (string) get_option($value['id']);
|
|
1502
|
1502
|
if (strstr($country_setting, ':')) :
|
|
1503
|
1503
|
$country = current(explode(':', $country_setting));
|
|
1504
|
1504
|
$state = end(explode(':', $country_setting));
|
|
@@ -1521,7 +1521,7 @@ discard block |
|
|
block discarded – undo |
|
1521
|
1521
|
case 'multi_select_countries' :
|
|
1522
|
1522
|
$countries = $geodirectory->countries->countries;
|
|
1523
|
1523
|
asort($countries);
|
|
1524
|
|
- $selections = (array)get_option($value['id']);
|
|
|
1524
|
+ $selections = (array) get_option($value['id']);
|
|
1525
|
1525
|
?>
|
|
1526
|
1526
|
<tr valign="top">
|
|
1527
|
1527
|
<th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
|
|
@@ -1531,7 +1531,7 @@ discard block |
|
|
block discarded – undo |
|
1531
|
1531
|
title="Country" class="chosen_select">
|
|
1532
|
1532
|
<?php
|
|
1533
|
1533
|
if ($countries) foreach ($countries as $key => $val) :
|
|
1534
|
|
- echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';
|
|
|
1534
|
+ echo '<option value="'.$key.'" '.selected(in_array($key, $selections), true, false).'>'.$val.'</option>';
|
|
1535
|
1535
|
endforeach;
|
|
1536
|
1536
|
?>
|
|
1537
|
1537
|
</select>
|
|
@@ -1543,7 +1543,7 @@ discard block |
|
|
block discarded – undo |
|
1543
|
1543
|
break;
|
|
1544
|
1544
|
|
|
1545
|
1545
|
case 'google_analytics' :
|
|
1546
|
|
- $selections = (array)get_option($value['id']);
|
|
|
1546
|
+ $selections = (array) get_option($value['id']);
|
|
1547
|
1547
|
?>
|
|
1548
|
1548
|
<tr valign="top">
|
|
1549
|
1549
|
<th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
|
|
@@ -1554,30 +1554,30 @@ discard block |
|
|
block discarded – undo |
|
1554
|
1554
|
|
|
1555
|
1555
|
$oAuthURL = "https://accounts.google.com/o/oauth2/auth?";
|
|
1556
|
1556
|
$scope = "scope=https://www.googleapis.com/auth/analytics.readonly";
|
|
1557
|
|
- $state = "&state=123";//any string
|
|
1558
|
|
- $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
|
1557
|
+ $state = "&state=123"; //any string
|
|
|
1558
|
+ $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";
|
|
1559
|
1559
|
$response_type = "&response_type=code";
|
|
1560
|
1560
|
$client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
1561
|
1561
|
$access_type = "&access_type=offline";
|
|
1562
|
1562
|
$approval_prompt = "&approval_prompt=force";
|
|
1563
|
1563
|
|
|
1564
|
|
- $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;
|
|
|
1564
|
+ $auth_url = $oAuthURL.$scope.$state.$redirect_uri.$response_type.$client_id.$access_type.$approval_prompt;
|
|
1565
|
1565
|
|
|
1566
|
1566
|
|
|
1567
|
1567
|
if (get_option('geodir_ga_auth_token')) {
|
|
1568
|
1568
|
?>
|
|
1569
|
1569
|
<span class="button-primary"
|
|
1570
|
|
- onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize');?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
|
|
|
1570
|
+ onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize'); ?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
|
|
1571
|
1571
|
<span style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>
|
|
1572
|
1572
|
<?php
|
|
1573
|
1573
|
global $gd_ga_errors;
|
|
1574
|
|
- if(!empty($gd_ga_errors)){
|
|
|
1574
|
+ if (!empty($gd_ga_errors)) {
|
|
1575
|
1575
|
print_r($gd_ga_errors);
|
|
1576
|
1576
|
}
|
|
1577
|
1577
|
} else {
|
|
1578
|
1578
|
?>
|
|
1579
|
1579
|
<span class="button-primary"
|
|
1580
|
|
- 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>
|
|
|
1580
|
+ 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>
|
|
1581
|
1581
|
<?php
|
|
1582
|
1582
|
}
|
|
1583
|
1583
|
?>
|
|
@@ -1648,9 +1648,9 @@ discard block |
|
|
block discarded – undo |
|
1648
|
1648
|
|
|
1649
|
1649
|
<?php if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] != '') { ?>
|
|
1650
|
1650
|
jQuery('.geodir_option_tabs').removeClass('gd-tab-active');
|
|
1651
|
|
- jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').addClass('gd-tab-active');
|
|
|
1651
|
+ jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').addClass('gd-tab-active');
|
|
1652
|
1652
|
jQuery('.gd-content-heading').hide();
|
|
1653
|
|
- jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').show();
|
|
|
1653
|
+ jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').show();
|
|
1654
|
1654
|
<?php } ?>
|
|
1655
|
1655
|
});
|
|
1656
|
1656
|
</script>
|
|
@@ -1736,7 +1736,7 @@ discard block |
|
|
block discarded – undo |
|
1736
|
1736
|
wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');
|
|
1737
|
1737
|
|
|
1738
|
1738
|
if (geodir_get_featured_image($post_id, 'thumbnail')) {
|
|
1739
|
|
- echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
|
|
|
1739
|
+ echo '<h4>'.__('Featured Image', 'geodirectory').'</h4>';
|
|
1740
|
1740
|
geodir_show_featured_image($post_id, 'thumbnail');
|
|
1741
|
1741
|
}
|
|
1742
|
1742
|
|
|
@@ -1747,13 +1747,13 @@ discard block |
|
|
block discarded – undo |
|
1747
|
1747
|
|
|
1748
|
1748
|
<h5 class="form_title">
|
|
1749
|
1749
|
<?php if ($image_limit != 0 && $image_limit == 1) {
|
|
1750
|
|
- echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
|
1750
|
+ echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';
|
|
1751
|
1751
|
} ?>
|
|
1752
|
1752
|
<?php if ($image_limit != 0 && $image_limit > 1) {
|
|
1753
|
|
- echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
|
1753
|
+ echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';
|
|
1754
|
1754
|
} ?>
|
|
1755
|
1755
|
<?php if ($image_limit == 0) {
|
|
1756
|
|
- echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
|
1756
|
+ echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';
|
|
1757
|
1757
|
} ?>
|
|
1758
|
1758
|
</h5>
|
|
1759
|
1759
|
|
|
@@ -1792,10 +1792,10 @@ discard block |
|
|
block discarded – undo |
|
1792
|
1792
|
<div
|
|
1793
|
1793
|
class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"
|
|
1794
|
1794
|
id="<?php echo $id; ?>plupload-upload-ui">
|
|
1795
|
|
- <h4><?php _e('Drop files to upload', 'geodirectory');?></h4>
|
|
|
1795
|
+ <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4>
|
|
1796
|
1796
|
<input id="<?php echo $id; ?>plupload-browse-button" type="button"
|
|
1797
|
1797
|
value="<?php _e('Select Files', 'geodirectory'); ?>" class="button"/>
|
|
1798
|
|
- <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span>
|
|
|
1798
|
+ <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span>
|
|
1799
|
1799
|
<?php if ($width && $height): ?>
|
|
1800
|
1800
|
<span class="plupload-resize"></span>
|
|
1801
|
1801
|
<span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span>
|
|
@@ -1807,7 +1807,7 @@ discard block |
|
|
block discarded – undo |
|
1807
|
1807
|
id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;">
|
|
1808
|
1808
|
</div>
|
|
1809
|
1809
|
<span
|
|
1810
|
|
- id="upload-msg"><?php _e('Please drag & drop the images to rearrange the order', 'geodirectory');?></span>
|
|
|
1810
|
+ id="upload-msg"><?php _e('Please drag & drop the images to rearrange the order', 'geodirectory'); ?></span>
|
|
1811
|
1811
|
<span id="<?php echo $id; ?>upload-error" style="display:none"></span>
|
|
1812
|
1812
|
</div>
|
|
1813
|
1813
|
|
|
@@ -2017,9 +2017,9 @@ discard block |
|
|
block discarded – undo |
|
2017
|
2017
|
$plugin = 'avada-nag';
|
|
2018
|
2018
|
$timestamp = 'avada-nag1234';
|
|
2019
|
2019
|
$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');
|
|
2020
|
|
- echo '<div id="' . $timestamp . '" class="error">';
|
|
2021
|
|
- echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';
|
|
2022
|
|
- echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
|
2020
|
+ echo '<div id="'.$timestamp.'" class="error">';
|
|
|
2021
|
+ echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\''.$plugin.'\',\''.$timestamp.'\');" ><i class="fa fa-times"></i></span>';
|
|
|
2022
|
+ echo "<img class='gd-icon-noti' src='".plugin_dir_url('')."geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
2023
|
2023
|
echo "<p>$message</p>";
|
|
2024
|
2024
|
echo "</div>";
|
|
2025
|
2025
|
|
|
@@ -2152,7 +2152,7 @@ discard block |
|
|
block discarded – undo |
|
2152
|
2152
|
|
|
2153
|
2153
|
// Don't allow same slug url for listing and location
|
|
2154
|
2154
|
if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {
|
|
2155
|
|
- $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');
|
|
|
2155
|
+ $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab.'&msg=fail&gderr=21');
|
|
2156
|
2156
|
wp_redirect($redirect_url);
|
|
2157
|
2157
|
exit;
|
|
2158
|
2158
|
}
|
|
@@ -2164,7 +2164,7 @@ discard block |
|
|
block discarded – undo |
|
2164
|
2164
|
$default_language = $sitepress->get_default_language();
|
|
2165
|
2165
|
|
|
2166
|
2166
|
if ($current_language != 'all' && $current_language != $default_language) {
|
|
2167
|
|
- $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab);
|
|
|
2167
|
+ $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab);
|
|
2168
|
2168
|
wp_redirect($redirect_url);
|
|
2169
|
2169
|
exit;
|
|
2170
|
2170
|
}
|
|
@@ -2185,11 +2185,11 @@ discard block |
|
|
block discarded – undo |
|
2185
|
2185
|
function geodir_hide_admin_preview_button() {
|
|
2186
|
2186
|
global $post_type;
|
|
2187
|
2187
|
$post_types = geodir_get_posttypes();
|
|
2188
|
|
- if(in_array($post_type, $post_types))
|
|
|
2188
|
+ if (in_array($post_type, $post_types))
|
|
2189
|
2189
|
echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
|
2190
|
2190
|
}
|
|
2191
|
|
-add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );
|
|
2192
|
|
-add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );
|
|
|
2191
|
+add_action('admin_head-post-new.php', 'geodir_hide_admin_preview_button');
|
|
|
2192
|
+add_action('admin_head-post.php', 'geodir_hide_admin_preview_button');
|
|
2193
|
2193
|
|
|
2194
|
2194
|
/**
|
|
2195
|
2195
|
* Add the tab in left sidebar menu fro import & export page.
|
|
@@ -2199,8 +2199,8 @@ discard block |
|
|
block discarded – undo |
|
2199
|
2199
|
*
|
|
2200
|
2200
|
* @return array Array of tab data.
|
|
2201
|
2201
|
*/
|
|
2202
|
|
-function geodir_import_export_tab( $tabs ) {
|
|
2203
|
|
- $tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );
|
|
|
2202
|
+function geodir_import_export_tab($tabs) {
|
|
|
2203
|
+ $tabs['import_export'] = array('label' => __('Import & Export', 'geodirectory'));
|
|
2204
|
2204
|
return $tabs;
|
|
2205
|
2205
|
}
|
|
2206
|
2206
|
|
|
@@ -2214,8 +2214,8 @@ discard block |
|
|
block discarded – undo |
|
2214
|
2214
|
* @return string Html content.
|
|
2215
|
2215
|
*/
|
|
2216
|
2216
|
function geodir_import_export_page() {
|
|
2217
|
|
- $nonce = wp_create_nonce( 'geodir_import_export_nonce' );
|
|
2218
|
|
- $gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';
|
|
|
2217
|
+ $nonce = wp_create_nonce('geodir_import_export_nonce');
|
|
|
2218
|
+ $gd_cats_sample_csv = geodir_plugin_url().'/geodirectory-assets/gd_sample_categories.csv';
|
|
2219
|
2219
|
/**
|
|
2220
|
2220
|
* Filter sample category data csv file url.
|
|
2221
|
2221
|
*
|
|
@@ -2224,9 +2224,9 @@ discard block |
|
|
block discarded – undo |
|
2224
|
2224
|
*
|
|
2225
|
2225
|
* @param string $gd_cats_sample_csv Sample category data csv file url.
|
|
2226
|
2226
|
*/
|
|
2227
|
|
- $gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );
|
|
|
2227
|
+ $gd_cats_sample_csv = apply_filters('geodir_export_cats_sample_csv', $gd_cats_sample_csv);
|
|
2228
|
2228
|
|
|
2229
|
|
- $gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';
|
|
|
2229
|
+ $gd_posts_sample_csv = geodir_plugin_url().'/geodirectory-assets/place_listing.csv';
|
|
2230
|
2230
|
/**
|
|
2231
|
2231
|
* Filter sample post data csv file url.
|
|
2232
|
2232
|
*
|
|
@@ -2235,15 +2235,15 @@ discard block |
|
|
block discarded – undo |
|
2235
|
2235
|
*
|
|
2236
|
2236
|
* @param string $gd_posts_sample_csv Sample post data csv file url.
|
|
2237
|
2237
|
*/
|
|
2238
|
|
- $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );
|
|
|
2238
|
+ $gd_posts_sample_csv = apply_filters('geodir_export_posts_sample_csv', $gd_posts_sample_csv);
|
|
2239
|
2239
|
|
|
2240
|
|
- $gd_posttypes = geodir_get_posttypes( 'array' );
|
|
|
2240
|
+ $gd_posttypes = geodir_get_posttypes('array');
|
|
2241
|
2241
|
|
|
2242
|
2242
|
$gd_posttypes_option = '';
|
|
2243
|
|
- foreach ( $gd_posttypes as $gd_posttype => $row ) {
|
|
2244
|
|
- $gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int)geodir_get_terms_count( $gd_posttype ) . '" data-posts="' . (int)geodir_get_posts_count( $gd_posttype ) . '">' . __( $row['labels']['name'], 'geodirectory' ) . '</option>';
|
|
|
2243
|
+ foreach ($gd_posttypes as $gd_posttype => $row) {
|
|
|
2244
|
+ $gd_posttypes_option .= '<option value="'.$gd_posttype.'" data-cats="'.(int) geodir_get_terms_count($gd_posttype).'" data-posts="'.(int) geodir_get_posts_count($gd_posttype).'">'.__($row['labels']['name'], 'geodirectory').'</option>';
|
|
2245
|
2245
|
}
|
|
2246
|
|
- wp_enqueue_script( 'jquery-ui-progressbar' );
|
|
|
2246
|
+ wp_enqueue_script('jquery-ui-progressbar');
|
|
2247
|
2247
|
|
|
2248
|
2248
|
$gd_chunksize_options = array();
|
|
2249
|
2249
|
$gd_chunksize_options[100] = 100;
|
|
@@ -2265,50 +2265,50 @@ discard block |
|
|
block discarded – undo |
|
2265
|
2265
|
*
|
|
2266
|
2266
|
* @param string $gd_chunksize_options Entries options.
|
|
2267
|
2267
|
*/
|
|
2268
|
|
- $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );
|
|
|
2268
|
+ $gd_chunksize_options = apply_filters('geodir_export_csv_chunksize_options', $gd_chunksize_options);
|
|
2269
|
2269
|
|
|
2270
|
2270
|
$gd_chunksize_option = '';
|
|
2271
|
2271
|
foreach ($gd_chunksize_options as $value => $title) {
|
|
2272
|
|
- $gd_chunksize_option .= '<option value="' . $value . '" ' . selected($value, 5000, false) . '>' . $title . '</option>';
|
|
|
2272
|
+ $gd_chunksize_option .= '<option value="'.$value.'" '.selected($value, 5000, false).'>'.$title.'</option>';
|
|
2273
|
2273
|
}
|
|
2274
|
2274
|
|
|
2275
|
2275
|
$uploads = wp_upload_dir();
|
|
2276
|
|
- $upload_dir = wp_sprintf( CSV_TRANSFER_IMG_FOLDER, str_replace( ABSPATH, '', $uploads['path'] ) );
|
|
|
2276
|
+ $upload_dir = wp_sprintf(CSV_TRANSFER_IMG_FOLDER, str_replace(ABSPATH, '', $uploads['path']));
|
|
2277
|
2277
|
?>
|
|
2278
|
2278
|
</form>
|
|
2279
|
2279
|
<div class="inner_content_tab_main gd-import-export">
|
|
2280
|
|
- <h3><?php _e( 'GD Import & Export CSV', 'geodirectory' ) ;?></h3>
|
|
2281
|
|
- <span class="description"><?php _e( 'Import & export csv for GD listings & categories.', 'geodirectory' ) ;?></span>
|
|
|
2280
|
+ <h3><?php _e('GD Import & Export CSV', 'geodirectory'); ?></h3>
|
|
|
2281
|
+ <span class="description"><?php _e('Import & export csv for GD listings & categories.', 'geodirectory'); ?></span>
|
|
2282
|
2282
|
<div class="gd-content-heading">
|
|
2283
|
2283
|
|
|
2284
|
2284
|
<?php
|
|
2285
|
2285
|
ini_set('max_execution_time', 999999);
|
|
2286
|
|
- $ini_max_execution_time_check = @ini_get( 'max_execution_time' );
|
|
|
2286
|
+ $ini_max_execution_time_check = @ini_get('max_execution_time');
|
|
2287
|
2287
|
ini_restore('max_execution_time');
|
|
2288
|
2288
|
|
|
2289
|
|
- if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
|
|
|
2289
|
+ if ($ini_max_execution_time_check != 999999) { // only show these setting to the user if we can't change the ini setting
|
|
2290
|
2290
|
?>
|
|
2291
|
2291
|
<div id="gd_ie_reqs" class="metabox-holder">
|
|
2292
|
2292
|
<div class="meta-box-sortables ui-sortable">
|
|
2293
|
2293
|
<div class="postbox">
|
|
2294
|
|
- <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'PHP Requirements for GD Import & Export CSV', 'geodirectory' );?></span></h3>
|
|
|
2294
|
+ <h3 class="hndle"><span style='vertical-align:top;'><?php echo __('PHP Requirements for GD Import & Export CSV', 'geodirectory'); ?></span></h3>
|
|
2295
|
2295
|
<div class="inside">
|
|
2296
|
|
- <span class="description"><?php echo __( 'Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory' );?></span>
|
|
|
2296
|
+ <span class="description"><?php echo __('Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory'); ?></span>
|
|
2297
|
2297
|
<table class="form-table">
|
|
2298
|
2298
|
<thead>
|
|
2299
|
2299
|
<tr>
|
|
2300
|
|
- <th><?php _e( 'PHP Settings', 'geodirectory' );?></th><th><?php _e( 'Current Value', 'geodirectory' );?></th><th><?php _e( 'Recommended Value', 'geodirectory' );?></th>
|
|
|
2300
|
+ <th><?php _e('PHP Settings', 'geodirectory'); ?></th><th><?php _e('Current Value', 'geodirectory'); ?></th><th><?php _e('Recommended Value', 'geodirectory'); ?></th>
|
|
2301
|
2301
|
</tr>
|
|
2302
|
2302
|
</thead>
|
|
2303
|
2303
|
<tbody>
|
|
2304
|
2304
|
<tr>
|
|
2305
|
|
- <td>max_input_time</td><td><?php echo @ini_get( 'max_input_time' );?></td><td>3000</td>
|
|
|
2305
|
+ <td>max_input_time</td><td><?php echo @ini_get('max_input_time'); ?></td><td>3000</td>
|
|
2306
|
2306
|
</tr>
|
|
2307
|
2307
|
<tr>
|
|
2308
|
|
- <td>max_execution_time</td><td><?php echo @ini_get( 'max_execution_time' );?></td><td>3000</td>
|
|
|
2308
|
+ <td>max_execution_time</td><td><?php echo @ini_get('max_execution_time'); ?></td><td>3000</td>
|
|
2309
|
2309
|
</tr>
|
|
2310
|
2310
|
<tr>
|
|
2311
|
|
- <td>memory_limit</td><td><?php echo @ini_get( 'memory_limit' );?></td><td>256M</td>
|
|
|
2311
|
+ <td>memory_limit</td><td><?php echo @ini_get('memory_limit'); ?></td><td>256M</td>
|
|
2312
|
2312
|
</tr>
|
|
2313
|
2313
|
</tbody>
|
|
2314
|
2314
|
</table>
|
|
@@ -2320,21 +2320,21 @@ discard block |
|
|
block discarded – undo |
|
2320
|
2320
|
<div id="gd_ie_imposts" class="metabox-holder">
|
|
2321
|
2321
|
<div class="meta-box-sortables ui-sortable">
|
|
2322
|
2322
|
<div id="gd_ie_im_posts" class="postbox gd-hndle-pbox">
|
|
2323
|
|
- <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Listings: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
2324
|
|
- <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Import CSV', 'geodirectory' );?></span></h3>
|
|
|
2323
|
+ <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Listings: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
|
2324
|
+ <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Import CSV', 'geodirectory'); ?></span></h3>
|
|
2325
|
2325
|
<div class="inside">
|
|
2326
|
2326
|
<table class="form-table">
|
|
2327
|
2327
|
<tbody>
|
|
2328
|
2328
|
<tr>
|
|
2329
|
2329
|
<td class="gd-imex-box">
|
|
2330
|
2330
|
<div class="gd-im-choices">
|
|
2331
|
|
- <p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e( 'Update listing if post with post_id already exists.', 'geodirectory' );?></label></p>
|
|
2332
|
|
- <p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e( 'Ignore listing if post with post_id already exists.', 'geodirectory' );?></label></p>
|
|
|
2331
|
+ <p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e('Update listing if post with post_id already exists.', 'geodirectory'); ?></label></p>
|
|
|
2332
|
+ <p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e('Ignore listing if post with post_id already exists.', 'geodirectory'); ?></label></p>
|
|
2333
|
2333
|
</div>
|
|
2334
|
2334
|
<div class="plupload-upload-uic hide-if-no-js" id="gd_im_postplupload-upload-ui">
|
|
2335
|
2335
|
<input type="text" readonly="readonly" name="gd_im_post_file" class="gd-imex-file gd_im_post_file" id="gd_im_post" onclick="jQuery('#gd_im_postplupload-browse-button').trigger('click');" />
|
|
2336
|
|
- <input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">
|
|
2337
|
|
- <input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv;?>" />
|
|
|
2336
|
+ <input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">
|
|
|
2337
|
+ <input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv; ?>" />
|
|
2338
|
2338
|
<input type="hidden" id="gd_im_post_allowed_types" data-exts=".csv" value="csv" />
|
|
2339
|
2339
|
<?php
|
|
2340
|
2340
|
/**
|
|
@@ -2344,7 +2344,7 @@ discard block |
|
|
block discarded – undo |
|
2344
|
2344
|
*/
|
|
2345
|
2345
|
do_action('geodir_sample_csv_download_link');
|
|
2346
|
2346
|
?>
|
|
2347
|
|
- <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_postpluploadan' ); ?>"></span>
|
|
|
2347
|
+ <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_postpluploadan'); ?>"></span>
|
|
2348
|
2348
|
<div class="filelist"></div>
|
|
2349
|
2349
|
</div>
|
|
2350
|
2350
|
<span id="gd_im_postupload-error" style="display:none"></span>
|
|
@@ -2362,7 +2362,7 @@ discard block |
|
|
block discarded – undo |
|
2362
|
2362
|
<input type="hidden" id="gd_terminateaction" value="continue"/>
|
|
2363
|
2363
|
</div>
|
|
2364
|
2364
|
<div class="gd-import-progress" id="gd-import-progress" style="display:none">
|
|
2365
|
|
- <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font
|
|
|
2365
|
+ <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font
|
|
2366
|
2366
|
id="gd-import-done">0</font> / <font id="gd-import-total">0</font> ( <font
|
|
2367
|
2367
|
id="gd-import-perc">0%</font> )
|
|
2368
|
2368
|
<div class="gd-fileprogress"></div>
|
|
@@ -2374,10 +2374,10 @@ discard block |
|
|
block discarded – undo |
|
2374
|
2374
|
<div class="gd-imex-btns" style="display:none;">
|
|
2375
|
2375
|
<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>
|
|
2376
|
2376
|
<input onclick="gd_imex_PrepareImport(this, 'post')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />
|
|
2377
|
|
- <input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/>
|
|
2378
|
|
- <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>
|
|
|
2377
|
+ <input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>
|
|
|
2378
|
+ <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>
|
|
2379
|
2379
|
<div id="gd_process_data" style="display:none">
|
|
2380
|
|
- <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>
|
|
|
2380
|
+ <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>
|
|
2381
|
2381
|
</div>
|
|
2382
|
2382
|
</div>
|
|
2383
|
2383
|
</td>
|
|
@@ -2391,30 +2391,30 @@ discard block |
|
|
block discarded – undo |
|
2391
|
2391
|
<div id="gd_ie_excategs" class="metabox-holder">
|
|
2392
|
2392
|
<div class="meta-box-sortables ui-sortable">
|
|
2393
|
2393
|
<div id="gd_ie_ex_posts" class="postbox gd-hndle-pbox">
|
|
2394
|
|
- <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - Listings: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
2395
|
|
- <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Export CSV', 'geodirectory' );?></span></h3>
|
|
|
2394
|
+ <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - Listings: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
|
2395
|
+ <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Export CSV', 'geodirectory'); ?></span></h3>
|
|
2396
|
2396
|
<div class="inside">
|
|
2397
|
2397
|
<table class="form-table">
|
|
2398
|
2398
|
<tbody>
|
|
2399
|
2399
|
<tr>
|
|
2400
|
2400
|
<td class="fld"><label for="gd_post_type">
|
|
2401
|
|
- <?php _e( 'Post Type:', 'geodirectory' );?>
|
|
|
2401
|
+ <?php _e('Post Type:', 'geodirectory'); ?>
|
|
2402
|
2402
|
</label></td>
|
|
2403
|
2403
|
<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px">
|
|
2404
|
|
- <?php echo $gd_posttypes_option;?>
|
|
|
2404
|
+ <?php echo $gd_posttypes_option; ?>
|
|
2405
|
2405
|
</select></td>
|
|
2406
|
2406
|
</tr>
|
|
2407
|
2407
|
<tr>
|
|
2408
|
|
- <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>
|
|
2409
|
|
- <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>
|
|
|
2408
|
+ <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>
|
|
|
2409
|
+ <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>
|
|
2410
|
2410
|
</tr>
|
|
2411
|
2411
|
<tr class="gd-imex-dates">
|
|
2412
|
|
- <td class="fld"><label><?php _e( 'Published Date:', 'geodirectory' );?></label></td>
|
|
2413
|
|
- <td><label><span class="label-responsive"><?php _e( 'Start date:', 'geodirectory' );?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e( 'End date:', 'geodirectory' );?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>
|
|
|
2412
|
+ <td class="fld"><label><?php _e('Published Date:', 'geodirectory'); ?></label></td>
|
|
|
2413
|
+ <td><label><span class="label-responsive"><?php _e('Start date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e('End date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>
|
|
2414
|
2414
|
</tr>
|
|
2415
|
2415
|
<tr>
|
|
2416
|
2416
|
<td class="fld" style="vertical-align:top"><label>
|
|
2417
|
|
- <?php _e( 'Progress:', 'geodirectory' );?>
|
|
|
2417
|
+ <?php _e('Progress:', 'geodirectory'); ?>
|
|
2418
|
2418
|
</label></td>
|
|
2419
|
2419
|
<td><div id='gd_progressbar_box'>
|
|
2420
|
2420
|
<div id="gd_progressbar" class="gd_progressbar">
|
|
@@ -2422,13 +2422,13 @@ discard block |
|
|
block discarded – undo |
|
2422
|
2422
|
</div>
|
|
2423
|
2423
|
</div>
|
|
2424
|
2424
|
<p style="display:inline-block">
|
|
2425
|
|
- <?php _e( 'Elapsed Time:', 'geodirectory' );?>
|
|
|
2425
|
+ <?php _e('Elapsed Time:', 'geodirectory'); ?>
|
|
2426
|
2426
|
</p>
|
|
2427
|
2427
|
|
|
2428
|
2428
|
<p id="gd_timer" class="gd_timer">00:00:00</p></td>
|
|
2429
|
2429
|
</tr>
|
|
2430
|
2430
|
<tr class="gd-ie-actions">
|
|
2431
|
|
- <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">
|
|
|
2431
|
+ <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">
|
|
2432
|
2432
|
</td>
|
|
2433
|
2433
|
<td id="gd_ie_ex_files" class="gd-ie-files"></td>
|
|
2434
|
2434
|
</tr>
|
|
@@ -2441,21 +2441,21 @@ discard block |
|
|
block discarded – undo |
|
2441
|
2441
|
<div id="gd_ie_imcategs" class="metabox-holder">
|
|
2442
|
2442
|
<div class="meta-box-sortables ui-sortable">
|
|
2443
|
2443
|
<div id="gd_ie_imcats" class="postbox gd-hndle-pbox">
|
|
2444
|
|
- <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
2445
|
|
- <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Import CSV', 'geodirectory' );?></span></h3>
|
|
|
2444
|
+ <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
|
2445
|
+ <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Import CSV', 'geodirectory'); ?></span></h3>
|
|
2446
|
2446
|
<div class="inside">
|
|
2447
|
2447
|
<table class="form-table">
|
|
2448
|
2448
|
<tbody>
|
|
2449
|
2449
|
<tr>
|
|
2450
|
2450
|
<td class="gd-imex-box">
|
|
2451
|
2451
|
<div class="gd-im-choices">
|
|
2452
|
|
- <p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e( 'Update item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>
|
|
2453
|
|
- <p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e( 'Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>
|
|
|
2452
|
+ <p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e('Update item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>
|
|
|
2453
|
+ <p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e('Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>
|
|
2454
|
2454
|
</div>
|
|
2455
|
2455
|
<div class="plupload-upload-uic hide-if-no-js" id="gd_im_catplupload-upload-ui">
|
|
2456
|
2456
|
<input type="text" readonly="readonly" name="gd_im_cat_file" class="gd-imex-file gd_im_cat_file" id="gd_im_cat" onclick="jQuery('#gd_im_catplupload-browse-button').trigger('click');" />
|
|
2457
|
|
- <input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">
|
|
2458
|
|
- <input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv;?>" />
|
|
|
2457
|
+ <input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">
|
|
|
2458
|
+ <input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv; ?>" />
|
|
2459
|
2459
|
<input type="hidden" id="gd_im_cat_allowed_types" data-exts=".csv" value="csv" />
|
|
2460
|
2460
|
<?php
|
|
2461
|
2461
|
/**
|
|
@@ -2466,7 +2466,7 @@ discard block |
|
|
block discarded – undo |
|
2466
|
2466
|
*/
|
|
2467
|
2467
|
do_action('geodir_sample_cats_csv_download_link');
|
|
2468
|
2468
|
?>
|
|
2469
|
|
- <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_catpluploadan' ); ?>"></span>
|
|
|
2469
|
+ <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_catpluploadan'); ?>"></span>
|
|
2470
|
2470
|
<div class="filelist"></div>
|
|
2471
|
2471
|
</div>
|
|
2472
|
2472
|
<span id="gd_im_catupload-error" style="display:none"></span>
|
|
@@ -2483,7 +2483,7 @@ discard block |
|
|
block discarded – undo |
|
2483
|
2483
|
<input type="hidden" id="gd_terminateaction" value="continue"/>
|
|
2484
|
2484
|
</div>
|
|
2485
|
2485
|
<div class="gd-import-progress" id="gd-import-progress" style="display:none">
|
|
2486
|
|
- <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font
|
|
|
2486
|
+ <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font
|
|
2487
|
2487
|
id="gd-import-done">0</font> / <font id="gd-import-total">0</font> ( <font
|
|
2488
|
2488
|
id="gd-import-perc">0%</font> )
|
|
2489
|
2489
|
<div class="gd-fileprogress"></div>
|
|
@@ -2495,10 +2495,10 @@ discard block |
|
|
block discarded – undo |
|
2495
|
2495
|
<div class="gd-imex-btns" style="display:none;">
|
|
2496
|
2496
|
<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>
|
|
2497
|
2497
|
<input onclick="gd_imex_PrepareImport(this, 'cat')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />
|
|
2498
|
|
- <input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/>
|
|
2499
|
|
- <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>
|
|
|
2498
|
+ <input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>
|
|
|
2499
|
+ <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>
|
|
2500
|
2500
|
<div id="gd_process_data" style="display:none">
|
|
2501
|
|
- <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>
|
|
|
2501
|
+ <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>
|
|
2502
|
2502
|
</div>
|
|
2503
|
2503
|
</div>
|
|
2504
|
2504
|
</td>
|
|
@@ -2512,26 +2512,26 @@ discard block |
|
|
block discarded – undo |
|
2512
|
2512
|
<div id="gd_ie_excategs" class="metabox-holder">
|
|
2513
|
2513
|
<div class="meta-box-sortables ui-sortable">
|
|
2514
|
2514
|
<div id="gd_ie_ex_cats" class="postbox gd-hndle-pbox">
|
|
2515
|
|
- <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
2516
|
|
- <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Export CSV', 'geodirectory' );?></span></h3>
|
|
|
2515
|
+ <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
|
2516
|
+ <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Export CSV', 'geodirectory'); ?></span></h3>
|
|
2517
|
2517
|
<div class="inside">
|
|
2518
|
2518
|
<table class="form-table">
|
|
2519
|
2519
|
<tbody>
|
|
2520
|
2520
|
<tr>
|
|
2521
|
|
- <td class="fld"><label for="gd_post_type"><?php _e( 'Post Type:', 'geodirectory' );?></label></td>
|
|
2522
|
|
- <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option;?></select></td>
|
|
|
2521
|
+ <td class="fld"><label for="gd_post_type"><?php _e('Post Type:', 'geodirectory'); ?></label></td>
|
|
|
2522
|
+ <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option; ?></select></td>
|
|
2523
|
2523
|
</tr>
|
|
2524
|
2524
|
<tr>
|
|
2525
|
|
- <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>
|
|
2526
|
|
- <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>
|
|
|
2525
|
+ <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>
|
|
|
2526
|
+ <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>
|
|
2527
|
2527
|
</tr>
|
|
2528
|
2528
|
<tr>
|
|
2529
|
|
- <td class="fld" style="vertical-align:top"><label><?php _e( 'Progress:', 'geodirectory' );?></label></td>
|
|
2530
|
|
- <td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e( 'Elapsed Time:', 'geodirectory' );?></p> <p id="gd_timer" class="gd_timer">00:00:00</p></td>
|
|
|
2529
|
+ <td class="fld" style="vertical-align:top"><label><?php _e('Progress:', 'geodirectory'); ?></label></td>
|
|
|
2530
|
+ <td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e('Elapsed Time:', 'geodirectory'); ?></p> <p id="gd_timer" class="gd_timer">00:00:00</p></td>
|
|
2531
|
2531
|
</tr>
|
|
2532
|
2532
|
<tr class="gd-ie-actions">
|
|
2533
|
2533
|
<td style="vertical-align:top">
|
|
2534
|
|
- <input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">
|
|
|
2534
|
+ <input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">
|
|
2535
|
2535
|
</td>
|
|
2536
|
2536
|
<td id="gd_ie_ex_files" class="gd-ie-files"></td>
|
|
2537
|
2537
|
</tr>
|
|
@@ -2553,7 +2553,7 @@ discard block |
|
|
block discarded – undo |
|
2553
|
2553
|
* @param array $gd_chunksize_options File chunk size options.
|
|
2554
|
2554
|
* @param string $nonce Wordpress security token for GD import & export.
|
|
2555
|
2555
|
*/
|
|
2556
|
|
- do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );
|
|
|
2556
|
+ do_action('geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce);
|
|
2557
|
2557
|
?>
|
|
2558
|
2558
|
</div>
|
|
2559
|
2559
|
</div>
|
|
@@ -2572,7 +2572,7 @@ discard block |
|
|
block discarded – undo |
|
2572
|
2572
|
jQuery.ajax({
|
|
2573
|
2573
|
url: ajaxurl,
|
|
2574
|
2574
|
type: "POST",
|
|
2575
|
|
- data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce;?>',
|
|
|
2575
|
+ data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce; ?>',
|
|
2576
|
2576
|
dataType: 'json',
|
|
2577
|
2577
|
cache: false,
|
|
2578
|
2578
|
success: function(data) {
|
|
@@ -2624,7 +2624,7 @@ discard block |
|
|
block discarded – undo |
|
2624
|
2624
|
|
|
2625
|
2625
|
jQuery(cont).find('.filelist .file').remove();
|
|
2626
|
2626
|
|
|
2627
|
|
- jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr( PLZ_SELECT_CSV_FILE );?></p>");
|
|
|
2627
|
+ jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr(PLZ_SELECT_CSV_FILE); ?></p>");
|
|
2628
|
2628
|
jQuery('#gd-import-msg', cont).show();
|
|
2629
|
2629
|
|
|
2630
|
2630
|
return false;
|
|
@@ -2683,7 +2683,7 @@ discard block |
|
|
block discarded – undo |
|
2683
|
2683
|
jQuery.ajax({
|
|
2684
|
2684
|
url: ajaxurl,
|
|
2685
|
2685
|
type: "POST",
|
|
2686
|
|
- data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce;?>',
|
|
|
2686
|
+ data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce; ?>',
|
|
2687
|
2687
|
dataType : 'json',
|
|
2688
|
2688
|
cache: false,
|
|
2689
|
2689
|
success: function (data) {
|
|
@@ -2872,27 +2872,27 @@ discard block |
|
|
block discarded – undo |
|
2872
|
2872
|
|
|
2873
|
2873
|
var gdMsg = '<p></p>';
|
|
2874
|
2874
|
if ( processed > 0 ) {
|
|
2875
|
|
- var msgParse = '<p><?php echo addslashes( sprintf( __( 'Total %s item(s) found.', 'geodirectory' ), '%s' ) );?></p>';
|
|
|
2875
|
+ var msgParse = '<p><?php echo addslashes(sprintf(__('Total %s item(s) found.', 'geodirectory'), '%s')); ?></p>';
|
|
2876
|
2876
|
msgParse = msgParse.replace("%s", processed);
|
|
2877
|
2877
|
gdMsg += msgParse;
|
|
2878
|
2878
|
}
|
|
2879
|
2879
|
|
|
2880
|
2880
|
if ( updated > 0 ) {
|
|
2881
|
|
- var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) updated.', 'geodirectory' ), '%s', '%d' ) );?></p>';
|
|
|
2881
|
+ var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) updated.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
2882
|
2882
|
msgParse = msgParse.replace("%s", updated);
|
|
2883
|
2883
|
msgParse = msgParse.replace("%d", processed);
|
|
2884
|
2884
|
gdMsg += msgParse;
|
|
2885
|
2885
|
}
|
|
2886
|
2886
|
|
|
2887
|
2887
|
if ( created > 0 ) {
|
|
2888
|
|
- var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) added.', 'geodirectory' ), '%s', '%d' ) );?></p>';
|
|
|
2888
|
+ var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) added.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
2889
|
2889
|
msgParse = msgParse.replace("%s", created);
|
|
2890
|
2890
|
msgParse = msgParse.replace("%d", processed);
|
|
2891
|
2891
|
gdMsg += msgParse;
|
|
2892
|
2892
|
}
|
|
2893
|
2893
|
|
|
2894
|
2894
|
if ( skipped > 0 ) {
|
|
2895
|
|
- var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) ignored due to already exists.', 'geodirectory' ), '%s', '%d' ) );?></p>';
|
|
|
2895
|
+ var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) ignored due to already exists.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
2896
|
2896
|
msgParse = msgParse.replace("%s", skipped);
|
|
2897
|
2897
|
msgParse = msgParse.replace("%d", processed);
|
|
2898
|
2898
|
gdMsg += msgParse;
|
|
@@ -2902,17 +2902,17 @@ discard block |
|
|
block discarded – undo |
|
2902
|
2902
|
if (type=='loc') {
|
|
2903
|
2903
|
invalid_addr = invalid;
|
|
2904
|
2904
|
}
|
|
2905
|
|
- var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ), '%s', '%d' ) );?></p>';
|
|
|
2905
|
+ var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
2906
|
2906
|
msgParse = msgParse.replace("%s", invalid_addr);
|
|
2907
|
2907
|
msgParse = msgParse.replace("%d", total);
|
|
2908
|
2908
|
gdMsg += msgParse;
|
|
2909
|
2909
|
}
|
|
2910
|
2910
|
|
|
2911
|
2911
|
if (invalid > 0 && type!='loc') {
|
|
2912
|
|
- var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory' ), '%s', '%d' ) );?></p>';
|
|
|
2912
|
+ var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
2913
|
2913
|
|
|
2914
|
2914
|
if (type=='hood') {
|
|
2915
|
|
- msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ), '%s', '%d' ) );?></p>';
|
|
|
2915
|
+ msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
2916
|
2916
|
}
|
|
2917
|
2917
|
msgParse = msgParse.replace("%s", invalid);
|
|
2918
|
2918
|
msgParse = msgParse.replace("%d", total);
|
|
@@ -2920,7 +2920,7 @@ discard block |
|
|
block discarded – undo |
|
2920
|
2920
|
}
|
|
2921
|
2921
|
|
|
2922
|
2922
|
if (images > 0) {
|
|
2923
|
|
- gdMsg += '<p><?php echo addslashes( $upload_dir );?></p>';
|
|
|
2923
|
+ gdMsg += '<p><?php echo addslashes($upload_dir); ?></p>';
|
|
2924
|
2924
|
}
|
|
2925
|
2925
|
gdMsg += '<p></p>';
|
|
2926
|
2926
|
jQuery('#gd-import-msg', cont).find('#message').removeClass('error').addClass('updated').html(gdMsg);
|
|
@@ -3084,9 +3084,9 @@ discard block |
|
|
block discarded – undo |
|
3084
|
3084
|
if (typeof filters !== 'undefined' && filters && doFilter) {
|
|
3085
|
3085
|
getTotal = true;
|
|
3086
|
3086
|
attach += '&_c=1';
|
|
3087
|
|
- gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Preparing...', 'geodirectory' ) );?>');
|
|
|
3087
|
+ gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Preparing...', 'geodirectory')); ?>');
|
|
3088
|
3088
|
} else {
|
|
3089
|
|
- gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');
|
|
|
3089
|
+ gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
|
|
3090
|
3090
|
}
|
|
3091
|
3091
|
jQuery(el).find('#gd_timer').text('00:00:01');
|
|
3092
|
3092
|
jQuery('#gd_ie_ex_files', el).html('');
|
|
@@ -3095,7 +3095,7 @@ discard block |
|
|
block discarded – undo |
|
3095
|
3095
|
jQuery.ajax({
|
|
3096
|
3096
|
url: ajaxurl,
|
|
3097
|
3097
|
type: "POST",
|
|
3098
|
|
- data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page + attach,
|
|
|
3098
|
+ data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page + attach,
|
|
3099
|
3099
|
dataType : 'json',
|
|
3100
|
3100
|
cache: false,
|
|
3101
|
3101
|
beforeSend: function (jqXHR, settings) {},
|
|
@@ -3120,11 +3120,11 @@ discard block |
|
|
block discarded – undo |
|
3120
|
3120
|
} else {
|
|
3121
|
3121
|
if (pages < page || pages == page) {
|
|
3122
|
3122
|
window.clearInterval(timer_posts);
|
|
3123
|
|
- gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');
|
|
|
3123
|
+ gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');
|
|
3124
|
3124
|
} else {
|
|
3125
|
3125
|
var percentage = Math.round(((page * chunk_size) / total_posts) * 100);
|
|
3126
|
3126
|
percentage = percentage > 100 ? 100 : percentage;
|
|
3127
|
|
- gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');
|
|
|
3127
|
+ gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
|
|
3128
|
3128
|
}
|
|
3129
|
3129
|
if (typeof data.files != 'undefined' && jQuery(data.files).length ) {
|
|
3130
|
3130
|
var obj_files = data.files;
|
|
@@ -3155,7 +3155,7 @@ discard block |
|
|
block discarded – undo |
|
3155
|
3155
|
|
|
3156
|
3156
|
function gd_process_export_cats(el, post_type, total_cats, chunk_size, pages, page) {
|
|
3157
|
3157
|
if (page < 2) {
|
|
3158
|
|
- gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');
|
|
|
3158
|
+ gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
|
|
3159
|
3159
|
jQuery(el).find('#gd_timer').text('00:00:01');
|
|
3160
|
3160
|
jQuery('#gd_ie_ex_files', el).html('');
|
|
3161
|
3161
|
}
|
|
@@ -3163,7 +3163,7 @@ discard block |
|
|
block discarded – undo |
|
3163
|
3163
|
jQuery.ajax({
|
|
3164
|
3164
|
url: ajaxurl,
|
|
3165
|
3165
|
type: "POST",
|
|
3166
|
|
- data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page,
|
|
|
3166
|
+ data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page,
|
|
3167
|
3167
|
dataType : 'json',
|
|
3168
|
3168
|
cache: false,
|
|
3169
|
3169
|
beforeSend: function (jqXHR, settings) {},
|
|
@@ -3177,11 +3177,11 @@ discard block |
|
|
block discarded – undo |
|
3177
|
3177
|
} else {
|
|
3178
|
3178
|
if (pages < page || pages == page) {
|
|
3179
|
3179
|
window.clearInterval(timer_cats);
|
|
3180
|
|
- gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');
|
|
|
3180
|
+ gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');
|
|
3181
|
3181
|
} else {
|
|
3182
|
3182
|
var percentage = Math.round(((page * chunk_size) / total_cats) * 100);
|
|
3183
|
3183
|
percentage = percentage > 100 ? 100 : percentage;
|
|
3184
|
|
- gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e( 'Exporting...', 'geodirectory' );?>');
|
|
|
3184
|
+ gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e('Exporting...', 'geodirectory'); ?>');
|
|
3185
|
3185
|
}
|
|
3186
|
3186
|
if (typeof data.files != 'undefined' && jQuery(data.files).length ) {
|
|
3187
|
3187
|
var obj_files = data.files;
|
|
@@ -3238,13 +3238,13 @@ discard block |
|
|
block discarded – undo |
|
3238
|
3238
|
function geodir_init_filesystem()
|
|
3239
|
3239
|
{
|
|
3240
|
3240
|
|
|
3241
|
|
- if(!function_exists('get_filesystem_method')){
|
|
|
3241
|
+ if (!function_exists('get_filesystem_method')) {
|
|
3242
|
3242
|
require_once(ABSPATH."/wp-admin/includes/file.php");
|
|
3243
|
3243
|
}
|
|
3244
|
3244
|
$access_type = get_filesystem_method();
|
|
3245
|
3245
|
if ($access_type === 'direct') {
|
|
3246
|
3246
|
/* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
|
|
3247
|
|
- $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());
|
|
|
3247
|
+ $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());
|
|
3248
|
3248
|
|
|
3249
|
3249
|
/* initialize the API */
|
|
3250
|
3250
|
if (!WP_Filesystem($creds)) {
|
|
@@ -3257,7 +3257,7 @@ discard block |
|
|
block discarded – undo |
|
3257
|
3257
|
return $wp_filesystem;
|
|
3258
|
3258
|
/* do our file manipulations below */
|
|
3259
|
3259
|
} elseif (defined('FTP_USER')) {
|
|
3260
|
|
- $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());
|
|
|
3260
|
+ $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());
|
|
3261
|
3261
|
|
|
3262
|
3262
|
/* initialize the API */
|
|
3263
|
3263
|
if (!WP_Filesystem($creds)) {
|
|
@@ -3292,7 +3292,7 @@ discard block |
|
|
block discarded – undo |
|
3292
|
3292
|
* @package GeoDirectory
|
|
3293
|
3293
|
*/
|
|
3294
|
3294
|
function geodir_filesystem_notice()
|
|
3295
|
|
-{ if ( defined( 'DOING_AJAX' ) ){return;}
|
|
|
3295
|
+{ if (defined('DOING_AJAX')) {return; }
|
|
3296
|
3296
|
$access_type = get_filesystem_method();
|
|
3297
|
3297
|
if ($access_type === 'direct') {
|
|
3298
|
3298
|
} elseif (!defined('FTP_USER')) {
|
|
@@ -3332,64 +3332,64 @@ discard block |
|
|
block discarded – undo |
|
3332
|
3332
|
// try to set higher limits for import
|
|
3333
|
3333
|
$max_input_time = ini_get('max_input_time');
|
|
3334
|
3334
|
$max_execution_time = ini_get('max_execution_time');
|
|
3335
|
|
- $memory_limit= ini_get('memory_limit');
|
|
|
3335
|
+ $memory_limit = ini_get('memory_limit');
|
|
3336
|
3336
|
|
|
3337
|
|
- if(!$max_input_time || $max_input_time<3000){
|
|
|
3337
|
+ if (!$max_input_time || $max_input_time < 3000) {
|
|
3338
|
3338
|
ini_set('max_input_time', 3000);
|
|
3339
|
3339
|
}
|
|
3340
|
3340
|
|
|
3341
|
|
- if(!$max_execution_time || $max_execution_time<3000){
|
|
|
3341
|
+ if (!$max_execution_time || $max_execution_time < 3000) {
|
|
3342
|
3342
|
ini_set('max_execution_time', 3000);
|
|
3343
|
3343
|
}
|
|
3344
|
3344
|
|
|
3345
|
|
- if($memory_limit && str_replace('M','',$memory_limit)){
|
|
3346
|
|
- if(str_replace('M','',$memory_limit)<256){
|
|
|
3345
|
+ if ($memory_limit && str_replace('M', '', $memory_limit)) {
|
|
|
3346
|
+ if (str_replace('M', '', $memory_limit) < 256) {
|
|
3347
|
3347
|
ini_set('memory_limit', '256M');
|
|
3348
|
3348
|
}
|
|
3349
|
3349
|
}
|
|
3350
|
3350
|
|
|
3351
|
3351
|
$json = array();
|
|
3352
|
3352
|
|
|
3353
|
|
- if ( !current_user_can( 'manage_options' ) ) {
|
|
3354
|
|
- wp_send_json( $json );
|
|
|
3353
|
+ if (!current_user_can('manage_options')) {
|
|
|
3354
|
+ wp_send_json($json);
|
|
3355
|
3355
|
}
|
|
3356
|
3356
|
|
|
3357
|
|
- $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;
|
|
3358
|
|
- $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;
|
|
3359
|
|
- $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;
|
|
|
3357
|
+ $task = isset($_REQUEST['task']) ? $_REQUEST['task'] : NULL;
|
|
|
3358
|
+ $nonce = isset($_REQUEST['_nonce']) ? $_REQUEST['_nonce'] : NULL;
|
|
|
3359
|
+ $stat = isset($_REQUEST['_st']) ? $_REQUEST['_st'] : false;
|
|
3360
|
3360
|
|
|
3361
|
|
- if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
|
|
3362
|
|
- wp_send_json( $json );
|
|
|
3361
|
+ if (!wp_verify_nonce($nonce, 'geodir_import_export_nonce')) {
|
|
|
3362
|
+ wp_send_json($json);
|
|
3363
|
3363
|
}
|
|
3364
|
3364
|
|
|
3365
|
|
- $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;
|
|
3366
|
|
- $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;
|
|
|
3365
|
+ $post_type = isset($_REQUEST['_pt']) ? $_REQUEST['_pt'] : NULL;
|
|
|
3366
|
+ $chunk_per_page = isset($_REQUEST['_n']) ? absint($_REQUEST['_n']) : NULL;
|
|
3367
|
3367
|
$chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;
|
|
3368
|
|
- $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;
|
|
|
3368
|
+ $chunk_page_no = isset($_REQUEST['_p']) ? absint($_REQUEST['_p']) : 1;
|
|
3369
|
3369
|
|
|
3370
|
3370
|
$wp_filesystem = geodir_init_filesystem();
|
|
3371
|
3371
|
if (!$wp_filesystem) {
|
|
3372
|
|
- $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );
|
|
3373
|
|
- wp_send_json( $json );
|
|
|
3372
|
+ $json['error'] = __('Filesystem ERROR: Could not access filesystem.', 'geodirectory');
|
|
|
3373
|
+ wp_send_json($json);
|
|
3374
|
3374
|
}
|
|
3375
|
3375
|
|
|
3376
|
3376
|
if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
|
|
3377
|
|
- $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );
|
|
3378
|
|
- wp_send_json( $json );
|
|
|
3377
|
+ $json['error'] = __('Filesystem ERROR: '.$wp_filesystem->errors->get_error_message(), 'geodirectory');
|
|
|
3378
|
+ wp_send_json($json);
|
|
3379
|
3379
|
}
|
|
3380
|
3380
|
|
|
3381
|
|
- $csv_file_dir = geodir_path_import_export( false );
|
|
3382
|
|
- if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
|
|
3383
|
|
- if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
|
|
3384
|
|
- $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );
|
|
3385
|
|
- wp_send_json( $json );
|
|
|
3381
|
+ $csv_file_dir = geodir_path_import_export(false);
|
|
|
3382
|
+ if (!$wp_filesystem->is_dir($csv_file_dir)) {
|
|
|
3383
|
+ if (!$wp_filesystem->mkdir($csv_file_dir, FS_CHMOD_DIR)) {
|
|
|
3384
|
+ $json['error'] = __('ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory');
|
|
|
3385
|
+ wp_send_json($json);
|
|
3386
|
3386
|
}
|
|
3387
|
3387
|
}
|
|
3388
|
3388
|
|
|
3389
|
3389
|
$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
3390
|
3390
|
$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
3391
|
3391
|
|
|
3392
|
|
- switch ( $task ) {
|
|
|
3392
|
+ switch ($task) {
|
|
3393
|
3393
|
case 'export_posts': {
|
|
3394
|
3394
|
// WPML
|
|
3395
|
3395
|
$is_wpml = geodir_is_wpml();
|
|
@@ -3400,36 +3400,36 @@ discard block |
|
|
block discarded – undo |
|
3400
|
3400
|
$sitepress->switch_lang('all', true);
|
|
3401
|
3401
|
}
|
|
3402
|
3402
|
// WPML
|
|
3403
|
|
- if ( $post_type == 'gd_event' ) {
|
|
3404
|
|
- add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );
|
|
|
3403
|
+ if ($post_type == 'gd_event') {
|
|
|
3404
|
+ add_filter('geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2);
|
|
3405
|
3405
|
}
|
|
3406
|
|
- $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;
|
|
|
3406
|
+ $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;
|
|
3407
|
3407
|
|
|
3408
|
|
- $file_name = $post_type . '_' . date( 'dmyHi' );
|
|
3409
|
|
- if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
|
|
3410
|
|
- $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );
|
|
|
3408
|
+ $file_name = $post_type.'_'.date('dmyHi');
|
|
|
3409
|
+ if ($filters && isset($filters['start_date']) && isset($filters['end_date'])) {
|
|
|
3410
|
+ $file_name = $post_type.'_'.date_i18n('dmy', strtotime($filters['start_date'])).'_'.date_i18n('dmy', strtotime($filters['end_date']));
|
|
3411
|
3411
|
}
|
|
3412
|
|
- $posts_count = geodir_get_posts_count( $post_type );
|
|
3413
|
|
- $file_url_base = geodir_path_import_export() . '/';
|
|
3414
|
|
- $file_url = $file_url_base . $file_name . '.csv';
|
|
3415
|
|
- $file_path = $csv_file_dir . '/' . $file_name . '.csv';
|
|
3416
|
|
- $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';
|
|
|
3412
|
+ $posts_count = geodir_get_posts_count($post_type);
|
|
|
3413
|
+ $file_url_base = geodir_path_import_export().'/';
|
|
|
3414
|
+ $file_url = $file_url_base.$file_name.'.csv';
|
|
|
3415
|
+ $file_path = $csv_file_dir.'/'.$file_name.'.csv';
|
|
|
3416
|
+ $file_path_temp = $csv_file_dir.'/'.$post_type.'_'.$nonce.'.csv';
|
|
3417
|
3417
|
|
|
3418
|
3418
|
$chunk_file_paths = array();
|
|
3419
|
3419
|
|
|
3420
|
|
- if ( isset( $_REQUEST['_c'] ) ) {
|
|
|
3420
|
+ if (isset($_REQUEST['_c'])) {
|
|
3421
|
3421
|
$json['total'] = $posts_count;
|
|
3422
|
3422
|
// WPML
|
|
3423
|
3423
|
if ($is_wpml) {
|
|
3424
|
3424
|
$sitepress->switch_lang($active_lang, true);
|
|
3425
|
3425
|
}
|
|
3426
|
3426
|
// WPML
|
|
3427
|
|
- wp_send_json( $json );
|
|
|
3427
|
+ wp_send_json($json);
|
|
3428
|
3428
|
gd_die();
|
|
3429
|
|
- } else if ( isset( $_REQUEST['_st'] ) ) {
|
|
3430
|
|
- $line_count = (int)geodir_import_export_line_count( $file_path_temp );
|
|
3431
|
|
- $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;
|
|
3432
|
|
- $percentage = min( $percentage, 100 );
|
|
|
3429
|
+ } else if (isset($_REQUEST['_st'])) {
|
|
|
3430
|
+ $line_count = (int) geodir_import_export_line_count($file_path_temp);
|
|
|
3431
|
+ $percentage = count($posts_count) > 0 && $line_count > 0 ? ceil($line_count / $posts_count) * 100 : 0;
|
|
|
3432
|
+ $percentage = min($percentage, 100);
|
|
3433
|
3433
|
|
|
3434
|
3434
|
$json['percentage'] = $percentage;
|
|
3435
|
3435
|
// WPML
|
|
@@ -3437,45 +3437,45 @@ discard block |
|
|
block discarded – undo |
|
3437
|
3437
|
$sitepress->switch_lang($active_lang, true);
|
|
3438
|
3438
|
}
|
|
3439
|
3439
|
// WPML
|
|
3440
|
|
- wp_send_json( $json );
|
|
|
3440
|
+ wp_send_json($json);
|
|
3441
|
3441
|
gd_die();
|
|
3442
|
3442
|
} else {
|
|
3443
|
|
- if ( !$posts_count > 0 ) {
|
|
3444
|
|
- $json['error'] = __( 'No records to export.', 'geodirectory' );
|
|
|
3443
|
+ if (!$posts_count > 0) {
|
|
|
3444
|
+ $json['error'] = __('No records to export.', 'geodirectory');
|
|
3445
|
3445
|
} else {
|
|
3446
|
3446
|
$total_posts = $posts_count;
|
|
3447
|
3447
|
if ($chunk_per_page > $total_posts) {
|
|
3448
|
3448
|
$chunk_per_page = $total_posts;
|
|
3449
|
3449
|
}
|
|
3450
|
|
- $chunk_total_pages = ceil( $total_posts / $chunk_per_page );
|
|
|
3450
|
+ $chunk_total_pages = ceil($total_posts / $chunk_per_page);
|
|
3451
|
3451
|
|
|
3452
|
3452
|
$j = $chunk_page_no;
|
|
3453
|
|
- $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );
|
|
|
3453
|
+ $chunk_save_posts = geodir_imex_get_posts($post_type, $chunk_per_page, $j);
|
|
3454
|
3454
|
|
|
3455
|
3455
|
$per_page = 500;
|
|
3456
|
3456
|
if ($per_page > $chunk_per_page) {
|
|
3457
|
3457
|
$per_page = $chunk_per_page;
|
|
3458
|
3458
|
}
|
|
3459
|
|
- $total_pages = ceil( $chunk_per_page / $per_page );
|
|
|
3459
|
+ $total_pages = ceil($chunk_per_page / $per_page);
|
|
3460
|
3460
|
|
|
3461
|
|
- for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
3462
|
|
- $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );
|
|
|
3461
|
+ for ($i = 0; $i <= $total_pages; $i++) {
|
|
|
3462
|
+ $save_posts = array_slice($chunk_save_posts, ($i * $per_page), $per_page);
|
|
3463
|
3463
|
|
|
3464
|
3464
|
$clear = $i == 0 ? true : false;
|
|
3465
|
|
- geodir_save_csv_data( $file_path_temp, $save_posts, $clear );
|
|
|
3465
|
+ geodir_save_csv_data($file_path_temp, $save_posts, $clear);
|
|
3466
|
3466
|
}
|
|
3467
|
3467
|
|
|
3468
|
|
- if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
3469
|
|
- $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
|
|
3470
|
|
- $chunk_file_name = $file_name . $chunk_page_no . '.csv';
|
|
3471
|
|
- $file_path = $csv_file_dir . '/' . $chunk_file_name;
|
|
3472
|
|
- $wp_filesystem->move( $file_path_temp, $file_path, true );
|
|
|
3468
|
+ if ($wp_filesystem->exists($file_path_temp)) {
|
|
|
3469
|
+ $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';
|
|
|
3470
|
+ $chunk_file_name = $file_name.$chunk_page_no.'.csv';
|
|
|
3471
|
+ $file_path = $csv_file_dir.'/'.$chunk_file_name;
|
|
|
3472
|
+ $wp_filesystem->move($file_path_temp, $file_path, true);
|
|
3473
|
3473
|
|
|
3474
|
|
- $file_url = $file_url_base . $chunk_file_name;
|
|
3475
|
|
- $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
|
3474
|
+ $file_url = $file_url_base.$chunk_file_name;
|
|
|
3475
|
+ $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
3476
|
3476
|
}
|
|
3477
|
3477
|
|
|
3478
|
|
- if ( !empty($chunk_file_paths) ) {
|
|
|
3478
|
+ if (!empty($chunk_file_paths)) {
|
|
3479
|
3479
|
$json['total'] = $posts_count;
|
|
3480
|
3480
|
$json['files'] = $chunk_file_paths;
|
|
3481
|
3481
|
} else {
|
|
@@ -3483,7 +3483,7 @@ discard block |
|
|
block discarded – undo |
|
3483
|
3483
|
$json['total'] = $posts_count;
|
|
3484
|
3484
|
$json['files'] = array();
|
|
3485
|
3485
|
} else {
|
|
3486
|
|
- $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );
|
|
|
3486
|
+ $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');
|
|
3487
|
3487
|
}
|
|
3488
|
3488
|
}
|
|
3489
|
3489
|
}
|
|
@@ -3492,7 +3492,7 @@ discard block |
|
|
block discarded – undo |
|
3492
|
3492
|
$sitepress->switch_lang($active_lang, true);
|
|
3493
|
3493
|
}
|
|
3494
|
3494
|
// WPML
|
|
3495
|
|
- wp_send_json( $json );
|
|
|
3495
|
+ wp_send_json($json);
|
|
3496
|
3496
|
}
|
|
3497
|
3497
|
}
|
|
3498
|
3498
|
break;
|
|
@@ -3506,20 +3506,20 @@ discard block |
|
|
block discarded – undo |
|
3506
|
3506
|
$sitepress->switch_lang('all', true);
|
|
3507
|
3507
|
}
|
|
3508
|
3508
|
// WPML
|
|
3509
|
|
- $file_name = $post_type . 'category_' . date( 'dmyHi' );
|
|
|
3509
|
+ $file_name = $post_type.'category_'.date('dmyHi');
|
|
3510
|
3510
|
|
|
3511
|
|
- $terms_count = geodir_get_terms_count( $post_type );
|
|
3512
|
|
- $file_url_base = geodir_path_import_export() . '/';
|
|
3513
|
|
- $file_url = $file_url_base . $file_name . '.csv';
|
|
3514
|
|
- $file_path = $csv_file_dir . '/' . $file_name . '.csv';
|
|
3515
|
|
- $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';
|
|
|
3511
|
+ $terms_count = geodir_get_terms_count($post_type);
|
|
|
3512
|
+ $file_url_base = geodir_path_import_export().'/';
|
|
|
3513
|
+ $file_url = $file_url_base.$file_name.'.csv';
|
|
|
3514
|
+ $file_path = $csv_file_dir.'/'.$file_name.'.csv';
|
|
|
3515
|
+ $file_path_temp = $csv_file_dir.'/'.$post_type.'category_'.$nonce.'.csv';
|
|
3516
|
3516
|
|
|
3517
|
3517
|
$chunk_file_paths = array();
|
|
3518
|
3518
|
|
|
3519
|
|
- if ( isset( $_REQUEST['_st'] ) ) {
|
|
3520
|
|
- $line_count = (int)geodir_import_export_line_count( $file_path_temp );
|
|
3521
|
|
- $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;
|
|
3522
|
|
- $percentage = min( $percentage, 100 );
|
|
|
3519
|
+ if (isset($_REQUEST['_st'])) {
|
|
|
3520
|
+ $line_count = (int) geodir_import_export_line_count($file_path_temp);
|
|
|
3521
|
+ $percentage = count($terms_count) > 0 && $line_count > 0 ? ceil($line_count / $terms_count) * 100 : 0;
|
|
|
3522
|
+ $percentage = min($percentage, 100);
|
|
3523
|
3523
|
|
|
3524
|
3524
|
$json['percentage'] = $percentage;
|
|
3525
|
3525
|
// WPML
|
|
@@ -3527,48 +3527,48 @@ discard block |
|
|
block discarded – undo |
|
3527
|
3527
|
$sitepress->switch_lang($active_lang, true);
|
|
3528
|
3528
|
}
|
|
3529
|
3529
|
// WPML
|
|
3530
|
|
- wp_send_json( $json );
|
|
|
3530
|
+ wp_send_json($json);
|
|
3531
|
3531
|
} else {
|
|
3532
|
|
- if ( !$terms_count > 0 ) {
|
|
3533
|
|
- $json['error'] = __( 'No records to export.', 'geodirectory' );
|
|
|
3532
|
+ if (!$terms_count > 0) {
|
|
|
3533
|
+ $json['error'] = __('No records to export.', 'geodirectory');
|
|
3534
|
3534
|
} else {
|
|
3535
|
3535
|
$total_terms = $terms_count;
|
|
3536
|
3536
|
if ($chunk_per_page > $terms_count) {
|
|
3537
|
3537
|
$chunk_per_page = $terms_count;
|
|
3538
|
3538
|
}
|
|
3539
|
|
- $chunk_total_pages = ceil( $total_terms / $chunk_per_page );
|
|
|
3539
|
+ $chunk_total_pages = ceil($total_terms / $chunk_per_page);
|
|
3540
|
3540
|
|
|
3541
|
3541
|
$j = $chunk_page_no;
|
|
3542
|
|
- $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );
|
|
|
3542
|
+ $chunk_save_terms = geodir_imex_get_terms($post_type, $chunk_per_page, $j);
|
|
3543
|
3543
|
|
|
3544
|
3544
|
$per_page = 500;
|
|
3545
|
3545
|
if ($per_page > $chunk_per_page) {
|
|
3546
|
3546
|
$per_page = $chunk_per_page;
|
|
3547
|
3547
|
}
|
|
3548
|
|
- $total_pages = ceil( $chunk_per_page / $per_page );
|
|
|
3548
|
+ $total_pages = ceil($chunk_per_page / $per_page);
|
|
3549
|
3549
|
|
|
3550
|
|
- for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
3551
|
|
- $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );
|
|
|
3550
|
+ for ($i = 0; $i <= $total_pages; $i++) {
|
|
|
3551
|
+ $save_terms = array_slice($chunk_save_terms, ($i * $per_page), $per_page);
|
|
3552
|
3552
|
|
|
3553
|
3553
|
$clear = $i == 0 ? true : false;
|
|
3554
|
|
- geodir_save_csv_data( $file_path_temp, $save_terms, $clear );
|
|
|
3554
|
+ geodir_save_csv_data($file_path_temp, $save_terms, $clear);
|
|
3555
|
3555
|
}
|
|
3556
|
3556
|
|
|
3557
|
|
- if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
3558
|
|
- $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
|
|
3559
|
|
- $chunk_file_name = $file_name . $chunk_page_no . '.csv';
|
|
3560
|
|
- $file_path = $csv_file_dir . '/' . $chunk_file_name;
|
|
3561
|
|
- $wp_filesystem->move( $file_path_temp, $file_path, true );
|
|
|
3557
|
+ if ($wp_filesystem->exists($file_path_temp)) {
|
|
|
3558
|
+ $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';
|
|
|
3559
|
+ $chunk_file_name = $file_name.$chunk_page_no.'.csv';
|
|
|
3560
|
+ $file_path = $csv_file_dir.'/'.$chunk_file_name;
|
|
|
3561
|
+ $wp_filesystem->move($file_path_temp, $file_path, true);
|
|
3562
|
3562
|
|
|
3563
|
|
- $file_url = $file_url_base . $chunk_file_name;
|
|
3564
|
|
- $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
|
3563
|
+ $file_url = $file_url_base.$chunk_file_name;
|
|
|
3564
|
+ $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
3565
|
3565
|
}
|
|
3566
|
3566
|
|
|
3567
|
|
- if ( !empty($chunk_file_paths) ) {
|
|
|
3567
|
+ if (!empty($chunk_file_paths)) {
|
|
3568
|
3568
|
$json['total'] = $terms_count;
|
|
3569
|
3569
|
$json['files'] = $chunk_file_paths;
|
|
3570
|
3570
|
} else {
|
|
3571
|
|
- $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );
|
|
|
3571
|
+ $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');
|
|
3572
|
3572
|
}
|
|
3573
|
3573
|
}
|
|
3574
|
3574
|
// WPML
|
|
@@ -3576,127 +3576,127 @@ discard block |
|
|
block discarded – undo |
|
3576
|
3576
|
$sitepress->switch_lang($active_lang, true);
|
|
3577
|
3577
|
}
|
|
3578
|
3578
|
// WPML
|
|
3579
|
|
- wp_send_json( $json );
|
|
|
3579
|
+ wp_send_json($json);
|
|
3580
|
3580
|
}
|
|
3581
|
3581
|
}
|
|
3582
|
3582
|
break;
|
|
3583
|
3583
|
case 'export_locations': {
|
|
3584
|
|
- $file_url_base = geodir_path_import_export() . '/';
|
|
3585
|
|
- $file_name = 'gd_locations_' . date( 'dmyHi' );
|
|
3586
|
|
- $file_url = $file_url_base . $file_name . '.csv';
|
|
3587
|
|
- $file_path = $csv_file_dir . '/' . $file_name . '.csv';
|
|
3588
|
|
- $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';
|
|
|
3584
|
+ $file_url_base = geodir_path_import_export().'/';
|
|
|
3585
|
+ $file_name = 'gd_locations_'.date('dmyHi');
|
|
|
3586
|
+ $file_url = $file_url_base.$file_name.'.csv';
|
|
|
3587
|
+ $file_path = $csv_file_dir.'/'.$file_name.'.csv';
|
|
|
3588
|
+ $file_path_temp = $csv_file_dir.'/gd_locations_'.$nonce.'.csv';
|
|
3589
|
3589
|
|
|
3590
|
|
- $items_count = (int)geodir_location_imex_count_locations();
|
|
|
3590
|
+ $items_count = (int) geodir_location_imex_count_locations();
|
|
3591
|
3591
|
|
|
3592
|
|
- if ( isset( $_REQUEST['_st'] ) ) {
|
|
3593
|
|
- $line_count = (int)geodir_import_export_line_count( $file_path_temp );
|
|
3594
|
|
- $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;
|
|
3595
|
|
- $percentage = min( $percentage, 100 );
|
|
|
3592
|
+ if (isset($_REQUEST['_st'])) {
|
|
|
3593
|
+ $line_count = (int) geodir_import_export_line_count($file_path_temp);
|
|
|
3594
|
+ $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;
|
|
|
3595
|
+ $percentage = min($percentage, 100);
|
|
3596
|
3596
|
|
|
3597
|
3597
|
$json['percentage'] = $percentage;
|
|
3598
|
|
- wp_send_json( $json );
|
|
|
3598
|
+ wp_send_json($json);
|
|
3599
|
3599
|
} else {
|
|
3600
|
3600
|
$chunk_file_paths = array();
|
|
3601
|
3601
|
|
|
3602
|
|
- if ( !$items_count > 0 ) {
|
|
3603
|
|
- $json['error'] = __( 'No records to export.', 'geodirectory' );
|
|
|
3602
|
+ if (!$items_count > 0) {
|
|
|
3603
|
+ $json['error'] = __('No records to export.', 'geodirectory');
|
|
3604
|
3604
|
} else {
|
|
3605
|
|
- $chunk_per_page = min( $chunk_per_page, $items_count );
|
|
3606
|
|
- $chunk_total_pages = ceil( $items_count / $chunk_per_page );
|
|
|
3605
|
+ $chunk_per_page = min($chunk_per_page, $items_count);
|
|
|
3606
|
+ $chunk_total_pages = ceil($items_count / $chunk_per_page);
|
|
3607
|
3607
|
|
|
3608
|
3608
|
$j = $chunk_page_no;
|
|
3609
|
|
- $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );
|
|
|
3609
|
+ $chunk_save_items = geodir_location_imex_locations_data($chunk_per_page, $j);
|
|
3610
|
3610
|
|
|
3611
|
3611
|
$per_page = 500;
|
|
3612
|
|
- $per_page = min( $per_page, $chunk_per_page );
|
|
3613
|
|
- $total_pages = ceil( $chunk_per_page / $per_page );
|
|
|
3612
|
+ $per_page = min($per_page, $chunk_per_page);
|
|
|
3613
|
+ $total_pages = ceil($chunk_per_page / $per_page);
|
|
3614
|
3614
|
|
|
3615
|
|
- for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
3616
|
|
- $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );
|
|
|
3615
|
+ for ($i = 0; $i <= $total_pages; $i++) {
|
|
|
3616
|
+ $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);
|
|
3617
|
3617
|
|
|
3618
|
3618
|
$clear = $i == 0 ? true : false;
|
|
3619
|
|
- geodir_save_csv_data( $file_path_temp, $save_items, $clear );
|
|
|
3619
|
+ geodir_save_csv_data($file_path_temp, $save_items, $clear);
|
|
3620
|
3620
|
}
|
|
3621
|
3621
|
|
|
3622
|
|
- if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
3623
|
|
- $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
|
|
3624
|
|
- $chunk_file_name = $file_name . $chunk_page_no . '.csv';
|
|
3625
|
|
- $file_path = $csv_file_dir . '/' . $chunk_file_name;
|
|
3626
|
|
- $wp_filesystem->move( $file_path_temp, $file_path, true );
|
|
|
3622
|
+ if ($wp_filesystem->exists($file_path_temp)) {
|
|
|
3623
|
+ $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';
|
|
|
3624
|
+ $chunk_file_name = $file_name.$chunk_page_no.'.csv';
|
|
|
3625
|
+ $file_path = $csv_file_dir.'/'.$chunk_file_name;
|
|
|
3626
|
+ $wp_filesystem->move($file_path_temp, $file_path, true);
|
|
3627
|
3627
|
|
|
3628
|
|
- $file_url = $file_url_base . $chunk_file_name;
|
|
3629
|
|
- $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
|
3628
|
+ $file_url = $file_url_base.$chunk_file_name;
|
|
|
3629
|
+ $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
3630
|
3630
|
}
|
|
3631
|
3631
|
|
|
3632
|
|
- if ( !empty($chunk_file_paths) ) {
|
|
|
3632
|
+ if (!empty($chunk_file_paths)) {
|
|
3633
|
3633
|
$json['total'] = $items_count;
|
|
3634
|
3634
|
$json['files'] = $chunk_file_paths;
|
|
3635
|
3635
|
} else {
|
|
3636
|
|
- $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );
|
|
|
3636
|
+ $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');
|
|
3637
|
3637
|
}
|
|
3638
|
3638
|
}
|
|
3639
|
|
- wp_send_json( $json );
|
|
|
3639
|
+ wp_send_json($json);
|
|
3640
|
3640
|
}
|
|
3641
|
3641
|
}
|
|
3642
|
3642
|
break;
|
|
3643
|
3643
|
case 'export_hoods': {
|
|
3644
|
|
- $file_url_base = geodir_path_import_export() . '/';
|
|
3645
|
|
- $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );
|
|
3646
|
|
- $file_url = $file_url_base . $file_name . '.csv';
|
|
3647
|
|
- $file_path = $csv_file_dir . '/' . $file_name . '.csv';
|
|
3648
|
|
- $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';
|
|
|
3644
|
+ $file_url_base = geodir_path_import_export().'/';
|
|
|
3645
|
+ $file_name = 'gd_neighbourhoods_'.date('dmyHi');
|
|
|
3646
|
+ $file_url = $file_url_base.$file_name.'.csv';
|
|
|
3647
|
+ $file_path = $csv_file_dir.'/'.$file_name.'.csv';
|
|
|
3648
|
+ $file_path_temp = $csv_file_dir.'/gd_neighbourhoods_'.$nonce.'.csv';
|
|
3649
|
3649
|
|
|
3650
|
|
- $items_count = (int)geodir_location_imex_count_neighbourhoods();
|
|
|
3650
|
+ $items_count = (int) geodir_location_imex_count_neighbourhoods();
|
|
3651
|
3651
|
|
|
3652
|
|
- if ( isset( $_REQUEST['_st'] ) ) {
|
|
3653
|
|
- $line_count = (int)geodir_import_export_line_count( $file_path_temp );
|
|
3654
|
|
- $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;
|
|
3655
|
|
- $percentage = min( $percentage, 100 );
|
|
|
3652
|
+ if (isset($_REQUEST['_st'])) {
|
|
|
3653
|
+ $line_count = (int) geodir_import_export_line_count($file_path_temp);
|
|
|
3654
|
+ $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;
|
|
|
3655
|
+ $percentage = min($percentage, 100);
|
|
3656
|
3656
|
|
|
3657
|
3657
|
$json['percentage'] = $percentage;
|
|
3658
|
|
- wp_send_json( $json );
|
|
|
3658
|
+ wp_send_json($json);
|
|
3659
|
3659
|
} else {
|
|
3660
|
3660
|
$chunk_file_paths = array();
|
|
3661
|
3661
|
|
|
3662
|
|
- if ( !$items_count > 0 ) {
|
|
3663
|
|
- $json['error'] = __( 'No records to export.', 'geodirectory' );
|
|
|
3662
|
+ if (!$items_count > 0) {
|
|
|
3663
|
+ $json['error'] = __('No records to export.', 'geodirectory');
|
|
3664
|
3664
|
} else {
|
|
3665
|
|
- $chunk_per_page = min( $chunk_per_page, $items_count );
|
|
3666
|
|
- $chunk_total_pages = ceil( $items_count / $chunk_per_page );
|
|
|
3665
|
+ $chunk_per_page = min($chunk_per_page, $items_count);
|
|
|
3666
|
+ $chunk_total_pages = ceil($items_count / $chunk_per_page);
|
|
3667
|
3667
|
|
|
3668
|
3668
|
$j = $chunk_page_no;
|
|
3669
|
|
- $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );
|
|
|
3669
|
+ $chunk_save_items = geodir_location_imex_neighbourhoods_data($chunk_per_page, $j);
|
|
3670
|
3670
|
|
|
3671
|
3671
|
$per_page = 500;
|
|
3672
|
|
- $per_page = min( $per_page, $chunk_per_page );
|
|
3673
|
|
- $total_pages = ceil( $chunk_per_page / $per_page );
|
|
|
3672
|
+ $per_page = min($per_page, $chunk_per_page);
|
|
|
3673
|
+ $total_pages = ceil($chunk_per_page / $per_page);
|
|
3674
|
3674
|
|
|
3675
|
|
- for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
3676
|
|
- $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );
|
|
|
3675
|
+ for ($i = 0; $i <= $total_pages; $i++) {
|
|
|
3676
|
+ $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);
|
|
3677
|
3677
|
|
|
3678
|
3678
|
$clear = $i == 0 ? true : false;
|
|
3679
|
|
- geodir_save_csv_data( $file_path_temp, $save_items, $clear );
|
|
|
3679
|
+ geodir_save_csv_data($file_path_temp, $save_items, $clear);
|
|
3680
|
3680
|
}
|
|
3681
|
3681
|
|
|
3682
|
|
- if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
3683
|
|
- $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
|
|
3684
|
|
- $chunk_file_name = $file_name . $chunk_page_no . '.csv';
|
|
3685
|
|
- $file_path = $csv_file_dir . '/' . $chunk_file_name;
|
|
3686
|
|
- $wp_filesystem->move( $file_path_temp, $file_path, true );
|
|
|
3682
|
+ if ($wp_filesystem->exists($file_path_temp)) {
|
|
|
3683
|
+ $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';
|
|
|
3684
|
+ $chunk_file_name = $file_name.$chunk_page_no.'.csv';
|
|
|
3685
|
+ $file_path = $csv_file_dir.'/'.$chunk_file_name;
|
|
|
3686
|
+ $wp_filesystem->move($file_path_temp, $file_path, true);
|
|
3687
|
3687
|
|
|
3688
|
|
- $file_url = $file_url_base . $chunk_file_name;
|
|
3689
|
|
- $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
|
3688
|
+ $file_url = $file_url_base.$chunk_file_name;
|
|
|
3689
|
+ $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
3690
|
3690
|
}
|
|
3691
|
3691
|
|
|
3692
|
|
- if ( !empty($chunk_file_paths) ) {
|
|
|
3692
|
+ if (!empty($chunk_file_paths)) {
|
|
3693
|
3693
|
$json['total'] = $items_count;
|
|
3694
|
3694
|
$json['files'] = $chunk_file_paths;
|
|
3695
|
3695
|
} else {
|
|
3696
|
|
- $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );
|
|
|
3696
|
+ $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');
|
|
3697
|
3697
|
}
|
|
3698
|
3698
|
}
|
|
3699
|
|
- wp_send_json( $json );
|
|
|
3699
|
+ wp_send_json($json);
|
|
3700
|
3700
|
}
|
|
3701
|
3701
|
}
|
|
3702
|
3702
|
break;
|
|
@@ -3713,25 +3713,25 @@ discard block |
|
|
block discarded – undo |
|
3713
|
3713
|
}
|
|
3714
|
3714
|
// WPML
|
|
3715
|
3715
|
|
|
3716
|
|
- ini_set( 'auto_detect_line_endings', true );
|
|
|
3716
|
+ ini_set('auto_detect_line_endings', true);
|
|
3717
|
3717
|
|
|
3718
|
3718
|
$uploads = wp_upload_dir();
|
|
3719
|
3719
|
$uploads_dir = $uploads['path'];
|
|
3720
|
3720
|
$uploads_subdir = $uploads['subdir'];
|
|
3721
|
3721
|
|
|
3722
|
|
- $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;
|
|
3723
|
|
- $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';
|
|
|
3722
|
+ $csv_file = isset($_POST['_file']) ? $_POST['_file'] : NULL;
|
|
|
3723
|
+ $import_choice = isset($_REQUEST['_ch']) ? $_REQUEST['_ch'] : 'skip';
|
|
3724
|
3724
|
|
|
3725
|
|
- $csv_file_arr = explode( '/', $csv_file );
|
|
3726
|
|
- $csv_filename = end( $csv_file_arr );
|
|
3727
|
|
- $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;
|
|
|
3725
|
+ $csv_file_arr = explode('/', $csv_file);
|
|
|
3726
|
+ $csv_filename = end($csv_file_arr);
|
|
|
3727
|
+ $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$csv_filename;
|
|
3728
|
3728
|
|
|
3729
|
3729
|
$json['file'] = $csv_file;
|
|
3730
|
|
- $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );
|
|
|
3730
|
+ $json['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
|
|
3731
|
3731
|
$file = array();
|
|
3732
|
3732
|
|
|
3733
|
|
- if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
|
|
3734
|
|
- $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );
|
|
|
3733
|
+ if ($csv_file && $wp_filesystem->is_file($target_path) && $wp_filesystem->exists($target_path)) {
|
|
|
3734
|
+ $wp_filetype = wp_check_filetype_and_ext($target_path, $csv_filename);
|
|
3735
|
3735
|
|
|
3736
|
3736
|
if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
3737
|
3737
|
$json['error'] = NULL;
|
|
@@ -3739,9 +3739,9 @@ discard block |
|
|
block discarded – undo |
|
3739
|
3739
|
|
|
3740
|
3740
|
$lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line
|
|
3741
|
3741
|
setlocale(LC_ALL, 'en_US.UTF-8');
|
|
3742
|
|
- if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
|
|
3743
|
|
- while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
|
|
3744
|
|
- if ( !empty( $data ) ) {
|
|
|
3742
|
+ if (($handle = fopen($target_path, "r")) !== FALSE) {
|
|
|
3743
|
+ while (($data = fgetcsv($handle, 100000, ",")) !== FALSE) {
|
|
|
3744
|
+ if (!empty($data)) {
|
|
3745
|
3745
|
$file[] = $data;
|
|
3746
|
3746
|
}
|
|
3747
|
3747
|
}
|
|
@@ -3755,19 +3755,19 @@ discard block |
|
|
block discarded – undo |
|
3755
|
3755
|
$json['error'] = __('No data found in csv file.', 'geodirectory');
|
|
3756
|
3756
|
}
|
|
3757
|
3757
|
} else {
|
|
3758
|
|
- wp_send_json( $json );
|
|
|
3758
|
+ wp_send_json($json);
|
|
3759
|
3759
|
}
|
|
3760
|
3760
|
} else {
|
|
3761
|
|
- wp_send_json( $json );
|
|
|
3761
|
+ wp_send_json($json);
|
|
3762
|
3762
|
}
|
|
3763
|
3763
|
|
|
3764
|
|
- if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
|
|
3765
|
|
- wp_send_json( $json );
|
|
|
3764
|
+ if ($task == 'prepare_import' || !empty($json['error'])) {
|
|
|
3765
|
+ wp_send_json($json);
|
|
3766
|
3766
|
}
|
|
3767
|
3767
|
|
|
3768
|
3768
|
$total = $json['rows'];
|
|
3769
|
|
- $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;
|
|
3770
|
|
- $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;
|
|
|
3769
|
+ $limit = isset($_POST['limit']) ? (int) $_POST['limit'] : 1;
|
|
|
3770
|
+ $processed = isset($_POST['processed']) ? (int) $_POST['processed'] : 0;
|
|
3771
|
3771
|
|
|
3772
|
3772
|
$count = $limit;
|
|
3773
|
3773
|
|
|
@@ -3792,13 +3792,13 @@ discard block |
|
|
block discarded – undo |
|
3792
|
3792
|
|
|
3793
|
3793
|
$post_types = geodir_get_posttypes();
|
|
3794
|
3794
|
|
|
3795
|
|
- if ( $task == 'import_cat' ) {
|
|
|
3795
|
+ if ($task == 'import_cat') {
|
|
3796
|
3796
|
if (!empty($file)) {
|
|
3797
|
3797
|
$columns = isset($file[0]) ? $file[0] : NULL;
|
|
3798
|
3798
|
|
|
3799
|
3799
|
if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
3800
|
3800
|
$json['error'] = CSV_INVAILD_FILE;
|
|
3801
|
|
- wp_send_json( $json );
|
|
|
3801
|
+ wp_send_json($json);
|
|
3802
|
3802
|
exit;
|
|
3803
|
3803
|
}
|
|
3804
|
3804
|
|
|
@@ -3809,7 +3809,7 @@ discard block |
|
|
block discarded – undo |
|
3809
|
3809
|
|
|
3810
|
3810
|
if (isset($file[$index])) {
|
|
3811
|
3811
|
$row = $file[$index];
|
|
3812
|
|
- $row = array_map( 'trim', $row );
|
|
|
3812
|
+ $row = array_map('trim', $row);
|
|
3813
|
3813
|
//$row = array_map( 'utf8_encode', $row );
|
|
3814
|
3814
|
|
|
3815
|
3815
|
$cat_id = '';
|
|
@@ -3826,42 +3826,42 @@ discard block |
|
|
block discarded – undo |
|
3826
|
3826
|
$cat_id_original = '';
|
|
3827
|
3827
|
|
|
3828
|
3828
|
$c = 0;
|
|
3829
|
|
- foreach ($columns as $column ) {
|
|
3830
|
|
- if ( $column == 'cat_id' ) {
|
|
3831
|
|
- $cat_id = (int)$row[$c];
|
|
3832
|
|
- } else if ( $column == 'cat_name' ) {
|
|
|
3829
|
+ foreach ($columns as $column) {
|
|
|
3830
|
+ if ($column == 'cat_id') {
|
|
|
3831
|
+ $cat_id = (int) $row[$c];
|
|
|
3832
|
+ } else if ($column == 'cat_name') {
|
|
3833
|
3833
|
$cat_name = $row[$c];
|
|
3834
|
|
- } else if ( $column == 'cat_slug' ) {
|
|
|
3834
|
+ } else if ($column == 'cat_slug') {
|
|
3835
|
3835
|
$cat_slug = $row[$c];
|
|
3836
|
|
- } else if ( $column == 'cat_posttype' ) {
|
|
|
3836
|
+ } else if ($column == 'cat_posttype') {
|
|
3837
|
3837
|
$cat_posttype = $row[$c];
|
|
3838
|
|
- } else if ( $column == 'cat_parent' ) {
|
|
|
3838
|
+ } else if ($column == 'cat_parent') {
|
|
3839
|
3839
|
$cat_parent = trim($row[$c]);
|
|
3840
|
|
- } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
|
|
|
3840
|
+ } else if ($column == 'cat_schema' && $row[$c] != '') {
|
|
3841
|
3841
|
$cat_schema = $row[$c];
|
|
3842
|
|
- } else if ( $column == 'cat_description' ) {
|
|
|
3842
|
+ } else if ($column == 'cat_description') {
|
|
3843
|
3843
|
$cat_description = $row[$c];
|
|
3844
|
|
- } else if ( $column == 'cat_top_description' ) {
|
|
|
3844
|
+ } else if ($column == 'cat_top_description') {
|
|
3845
|
3845
|
$cat_top_description = $row[$c];
|
|
3846
|
|
- } else if ( $column == 'cat_image' ) {
|
|
|
3846
|
+ } else if ($column == 'cat_image') {
|
|
3847
|
3847
|
$cat_image = $row[$c];
|
|
3848
|
|
- } else if ( $column == 'cat_icon' ) {
|
|
|
3848
|
+ } else if ($column == 'cat_icon') {
|
|
3849
|
3849
|
$cat_icon = $row[$c];
|
|
3850
|
3850
|
}
|
|
3851
|
3851
|
// WPML
|
|
3852
|
|
- if ( $is_wpml ) {
|
|
3853
|
|
- if ( $column == 'cat_language' ) {
|
|
3854
|
|
- $cat_language = geodir_strtolower( trim( $row[$c] ) );
|
|
3855
|
|
- } else if ( $column == 'cat_id_original' ) {
|
|
3856
|
|
- $cat_id_original = (int)$row[$c];
|
|
|
3852
|
+ if ($is_wpml) {
|
|
|
3853
|
+ if ($column == 'cat_language') {
|
|
|
3854
|
+ $cat_language = geodir_strtolower(trim($row[$c]));
|
|
|
3855
|
+ } else if ($column == 'cat_id_original') {
|
|
|
3856
|
+ $cat_id_original = (int) $row[$c];
|
|
3857
|
3857
|
}
|
|
3858
|
3858
|
}
|
|
3859
|
3859
|
// WPML
|
|
3860
|
3860
|
$c++;
|
|
3861
|
3861
|
}
|
|
3862
|
3862
|
|
|
3863
|
|
- if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
|
|
3864
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );
|
|
|
3863
|
+ if ($cat_name == '' || !in_array($cat_posttype, $post_types)) {
|
|
|
3864
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));
|
|
3865
|
3865
|
|
|
3866
|
3866
|
$invalid++;
|
|
3867
|
3867
|
continue;
|
|
@@ -3879,24 +3879,24 @@ discard block |
|
|
block discarded – undo |
|
3879
|
3879
|
$term_data['description'] = $cat_description;
|
|
3880
|
3880
|
$term_data['cat_schema'] = $cat_schema;
|
|
3881
|
3881
|
$term_data['top_description'] = $cat_top_description;
|
|
3882
|
|
- $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';
|
|
3883
|
|
- $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';
|
|
|
3882
|
+ $term_data['image'] = $cat_image != '' ? basename($cat_image) : '';
|
|
|
3883
|
+ $term_data['icon'] = $cat_icon != '' ? basename($cat_icon) : '';
|
|
3884
|
3884
|
|
|
3885
|
3885
|
//$term_data = array_map( 'utf8_encode', $term_data );
|
|
3886
|
3886
|
|
|
3887
|
|
- $taxonomy = $cat_posttype . 'category';
|
|
|
3887
|
+ $taxonomy = $cat_posttype.'category';
|
|
3888
|
3888
|
|
|
3889
|
3889
|
$term_data['taxonomy'] = $taxonomy;
|
|
3890
|
3890
|
|
|
3891
|
3891
|
$term_parent_id = 0;
|
|
3892
|
|
- if ($cat_parent != "" || (int)$cat_parent > 0) {
|
|
|
3892
|
+ if ($cat_parent != "" || (int) $cat_parent > 0) {
|
|
3893
|
3893
|
$term_parent = '';
|
|
3894
|
3894
|
|
|
3895
|
|
- if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
|
|
|
3895
|
+ if ($term_parent = get_term_by('name', $cat_parent, $taxonomy)) {
|
|
3896
|
3896
|
//
|
|
3897
|
|
- } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
|
|
|
3897
|
+ } else if ($term_parent = get_term_by('slug', $cat_parent, $taxonomy)) {
|
|
3898
|
3898
|
//
|
|
3899
|
|
- } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
|
|
|
3899
|
+ } else if ($term_parent = get_term_by('id', $cat_parent, $taxonomy)) {
|
|
3900
|
3900
|
//
|
|
3901
|
3901
|
} else {
|
|
3902
|
3902
|
$term_parent_data = array();
|
|
@@ -3904,104 +3904,104 @@ discard block |
|
|
block discarded – undo |
|
3904
|
3904
|
//$term_parent_data = array_map( 'utf8_encode', $term_parent_data );
|
|
3905
|
3905
|
$term_parent_data['taxonomy'] = $taxonomy;
|
|
3906
|
3906
|
|
|
3907
|
|
- $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );
|
|
|
3907
|
+ $term_parent_id = (int) geodir_imex_insert_term($taxonomy, $term_parent_data);
|
|
3908
|
3908
|
}
|
|
3909
|
3909
|
|
|
3910
|
|
- if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
|
|
3911
|
|
- $term_parent_id = (int)$term_parent->term_id;
|
|
|
3910
|
+ if (!empty($term_parent) && !is_wp_error($term_parent)) {
|
|
|
3911
|
+ $term_parent_id = (int) $term_parent->term_id;
|
|
3912
|
3912
|
}
|
|
3913
|
3913
|
}
|
|
3914
|
|
- $term_data['parent'] = (int)$term_parent_id;
|
|
|
3914
|
+ $term_data['parent'] = (int) $term_parent_id;
|
|
3915
|
3915
|
|
|
3916
|
3916
|
$term_id = NULL;
|
|
3917
|
|
- if ( $import_choice == 'update' ) {
|
|
3918
|
|
- if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
|
3917
|
+ if ($import_choice == 'update') {
|
|
|
3918
|
+ if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {
|
|
3919
|
3919
|
$term_data['term_id'] = $term['term_id'];
|
|
3920
|
3920
|
|
|
3921
|
|
- if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
|
3921
|
+ if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {
|
|
3922
|
3922
|
$updated++;
|
|
3923
|
3923
|
} else {
|
|
3924
|
3924
|
$invalid++;
|
|
3925
|
|
- 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' ) );
|
|
|
3925
|
+ 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'));
|
|
3926
|
3926
|
}
|
|
3927
|
|
- } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
|
3927
|
+ } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {
|
|
3928
|
3928
|
$term_data['term_id'] = $term['term_id'];
|
|
3929
|
3929
|
|
|
3930
|
|
- if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
|
3930
|
+ if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {
|
|
3931
|
3931
|
$updated++;
|
|
3932
|
3932
|
} else {
|
|
3933
|
3933
|
$invalid++;
|
|
3934
|
|
- 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' ) );
|
|
|
3934
|
+ 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'));
|
|
3935
|
3935
|
}
|
|
3936
|
3936
|
} else {
|
|
3937
|
|
- if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
|
3937
|
+ if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {
|
|
3938
|
3938
|
$created++;
|
|
3939
|
3939
|
} else {
|
|
3940
|
3940
|
$invalid++;
|
|
3941
|
|
- 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' ) );
|
|
|
3941
|
+ 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'));
|
|
3942
|
3942
|
}
|
|
3943
|
3943
|
}
|
|
3944
|
|
- } else if ( $import_choice == 'skip' ) {
|
|
3945
|
|
- if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
|
3944
|
+ } else if ($import_choice == 'skip') {
|
|
|
3945
|
+ if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {
|
|
3946
|
3946
|
$skipped++;
|
|
3947
|
|
- } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
|
3947
|
+ } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {
|
|
3948
|
3948
|
$skipped++;
|
|
3949
|
3949
|
} else {
|
|
3950
|
|
- if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
|
3950
|
+ if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {
|
|
3951
|
3951
|
$created++;
|
|
3952
|
3952
|
} else {
|
|
3953
|
3953
|
$invalid++;
|
|
3954
|
|
- 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' ) );
|
|
|
3954
|
+ 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'));
|
|
3955
|
3955
|
}
|
|
3956
|
3956
|
}
|
|
3957
|
3957
|
} else {
|
|
3958
|
3958
|
$invalid++;
|
|
3959
|
|
- 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' ) );
|
|
|
3959
|
+ 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'));
|
|
3960
|
3960
|
}
|
|
3961
|
3961
|
|
|
3962
|
|
- if ( $term_id ) {
|
|
|
3962
|
+ if ($term_id) {
|
|
3963
|
3963
|
// WPML
|
|
3964
|
3964
|
if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {
|
|
3965
|
|
- $wpml_element_type = 'tax_' . $taxonomy;
|
|
3966
|
|
- $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );
|
|
|
3965
|
+ $wpml_element_type = 'tax_'.$taxonomy;
|
|
|
3966
|
+ $source_language = geodir_get_language_for_element($cat_id_original, $wpml_element_type);
|
|
3967
|
3967
|
$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();
|
|
3968
|
3968
|
|
|
3969
|
|
- $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );
|
|
|
3969
|
+ $trid = $sitepress->get_element_trid($cat_id_original, $wpml_element_type);
|
|
3970
|
3970
|
|
|
3971
|
|
- $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );
|
|
|
3971
|
+ $sitepress->set_element_language_details($term_id, $wpml_element_type, $trid, $cat_language, $source_language);
|
|
3972
|
3972
|
}
|
|
3973
|
3973
|
// WPML
|
|
3974
|
3974
|
|
|
3975
|
|
- if ( isset( $term_data['top_description'] ) ) {
|
|
3976
|
|
- update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );
|
|
|
3975
|
+ if (isset($term_data['top_description'])) {
|
|
|
3976
|
+ update_tax_meta($term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype);
|
|
3977
|
3977
|
}
|
|
3978
|
3978
|
|
|
3979
|
|
- if ( isset( $term_data['cat_schema'] ) ) {
|
|
3980
|
|
- update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );
|
|
|
3979
|
+ if (isset($term_data['cat_schema'])) {
|
|
|
3980
|
+ update_tax_meta($term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype);
|
|
3981
|
3981
|
}
|
|
3982
|
3982
|
|
|
3983
|
3983
|
$attachment = false;
|
|
3984
|
|
- if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
|
|
3985
|
|
- $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );
|
|
3986
|
|
- $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';
|
|
|
3984
|
+ if (isset($term_data['image']) && $term_data['image'] != '') {
|
|
|
3985
|
+ $cat_image = geodir_get_default_catimage($term_id, $cat_posttype);
|
|
|
3986
|
+ $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : '';
|
|
3987
|
3987
|
|
|
3988
|
|
- if ( basename($cat_image) != $term_data['image'] ) {
|
|
|
3988
|
+ if (basename($cat_image) != $term_data['image']) {
|
|
3989
|
3989
|
$attachment = true;
|
|
3990
|
|
- update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );
|
|
|
3990
|
+ update_tax_meta($term_id, 'ct_cat_default_img', array('id' => 'image', 'src' => $uploads['url'].'/'.$term_data['image']), $cat_posttype);
|
|
3991
|
3991
|
}
|
|
3992
|
3992
|
}
|
|
3993
|
3993
|
|
|
3994
|
|
- if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
|
|
3995
|
|
- $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );
|
|
3996
|
|
- $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';
|
|
|
3994
|
+ if (isset($term_data['icon']) && $term_data['icon'] != '') {
|
|
|
3995
|
+ $cat_icon = get_tax_meta($term_id, 'ct_cat_icon', false, $cat_posttype);
|
|
|
3996
|
+ $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';
|
|
3997
|
3997
|
|
|
3998
|
|
- if ( basename($cat_icon) != $term_data['icon'] ) {
|
|
|
3998
|
+ if (basename($cat_icon) != $term_data['icon']) {
|
|
3999
|
3999
|
$attachment = true;
|
|
4000
|
|
- update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );
|
|
|
4000
|
+ update_tax_meta($term_id, 'ct_cat_icon', array('id' => 'icon', 'src' => $uploads['url'].'/'.$term_data['icon']), $cat_posttype);
|
|
4001
|
4001
|
}
|
|
4002
|
4002
|
}
|
|
4003
|
4003
|
|
|
4004
|
|
- if ( $attachment ) {
|
|
|
4004
|
+ if ($attachment) {
|
|
4005
|
4005
|
$images++;
|
|
4006
|
4006
|
}
|
|
4007
|
4007
|
}
|
|
@@ -4023,35 +4023,35 @@ discard block |
|
|
block discarded – undo |
|
4023
|
4023
|
$json['invalid'] = $invalid;
|
|
4024
|
4024
|
$json['images'] = $images;
|
|
4025
|
4025
|
|
|
4026
|
|
- wp_send_json( $json );
|
|
|
4026
|
+ wp_send_json($json);
|
|
4027
|
4027
|
exit;
|
|
4028
|
|
- } else if ( $task == 'import_post' ) {
|
|
4029
|
|
- $xtimings['###1'] = microtime(true)-$xstart;
|
|
|
4028
|
+ } else if ($task == 'import_post') {
|
|
|
4029
|
+ $xtimings['###1'] = microtime(true) - $xstart;
|
|
4030
|
4030
|
//run some stuff to make the import quicker
|
|
4031
|
|
- wp_defer_term_counting( true );
|
|
4032
|
|
- wp_defer_comment_counting( true );
|
|
4033
|
|
- $wpdb->query( 'SET autocommit = 0;' );
|
|
|
4031
|
+ wp_defer_term_counting(true);
|
|
|
4032
|
+ wp_defer_comment_counting(true);
|
|
|
4033
|
+ $wpdb->query('SET autocommit = 0;');
|
|
4034
|
4034
|
//
|
|
4035
|
4035
|
// remove_all_actions('publish_post');
|
|
4036
|
4036
|
// remove_all_actions('transition_post_status');
|
|
4037
|
4037
|
// remove_all_actions('publish_future_post');
|
|
4038
|
4038
|
|
|
4039
|
4039
|
if (!empty($file)) {
|
|
4040
|
|
- $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
|
4040
|
+ $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
4041
|
4041
|
$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.
|
|
4042
|
4042
|
$default_status = 'publish';
|
|
4043
|
|
- $current_date = date_i18n( 'Y-m-d', time() );
|
|
|
4043
|
+ $current_date = date_i18n('Y-m-d', time());
|
|
4044
|
4044
|
|
|
4045
|
4045
|
$columns = isset($file[0]) ? $file[0] : NULL;
|
|
4046
|
4046
|
|
|
4047
|
4047
|
if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
4048
|
4048
|
$json['error'] = CSV_INVAILD_FILE;
|
|
4049
|
|
- wp_send_json( $json );
|
|
|
4049
|
+ wp_send_json($json);
|
|
4050
|
4050
|
exit;
|
|
4051
|
4051
|
}
|
|
4052
|
|
- $xtimings['###2'] = microtime(true)-$xstart;
|
|
|
4052
|
+ $xtimings['###2'] = microtime(true) - $xstart;
|
|
4053
|
4053
|
$gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
|
|
4054
|
|
- $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );
|
|
|
4054
|
+ $wp_chars_error = __('(check & remove if any invalid characters used in data)', 'geodirectory');
|
|
4055
|
4055
|
$processed_actual = 0;
|
|
4056
|
4056
|
for ($i = 1; $i <= $limit; $i++) {
|
|
4057
|
4057
|
$index = $processed + $i;
|
|
@@ -4060,9 +4060,9 @@ discard block |
|
|
block discarded – undo |
|
4060
|
4060
|
if (isset($file[$index])) {
|
|
4061
|
4061
|
$processed_actual++;
|
|
4062
|
4062
|
$row = $file[$index];
|
|
4063
|
|
- $row = array_map( 'trim', $row );
|
|
|
4063
|
+ $row = array_map('trim', $row);
|
|
4064
|
4064
|
//$row = array_map( 'utf8_encode', $row );
|
|
4065
|
|
- $row = array_map( 'addslashes_gpc', $row );
|
|
|
4065
|
+ $row = array_map('addslashes_gpc', $row);
|
|
4066
|
4066
|
|
|
4067
|
4067
|
$post_id = '';
|
|
4068
|
4068
|
$post_title = '';
|
|
@@ -4100,80 +4100,80 @@ discard block |
|
|
block discarded – undo |
|
4100
|
4100
|
$original_post_id = '';
|
|
4101
|
4101
|
|
|
4102
|
4102
|
$c = 0;
|
|
4103
|
|
- foreach ($columns as $column ) {
|
|
|
4103
|
+ foreach ($columns as $column) {
|
|
4104
|
4104
|
$gd_post[$column] = $row[$c];
|
|
4105
|
4105
|
|
|
4106
|
|
- if ( $column == 'post_id' ) {
|
|
|
4106
|
+ if ($column == 'post_id') {
|
|
4107
|
4107
|
$post_id = $row[$c];
|
|
4108
|
|
- } else if ( $column == 'post_title' ) {
|
|
|
4108
|
+ } else if ($column == 'post_title') {
|
|
4109
|
4109
|
$post_title = sanitize_text_field($row[$c]);
|
|
4110
|
|
- } else if ( $column == 'post_author' ) {
|
|
|
4110
|
+ } else if ($column == 'post_author') {
|
|
4111
|
4111
|
$post_author = $row[$c];
|
|
4112
|
|
- } else if ( $column == 'post_date' ) {
|
|
|
4112
|
+ } else if ($column == 'post_date') {
|
|
4113
|
4113
|
$post_date = $row[$c];
|
|
4114
|
|
- } else if ( $column == 'post_content' ) {
|
|
|
4114
|
+ } else if ($column == 'post_content') {
|
|
4115
|
4115
|
$post_content = $row[$c];
|
|
4116
|
|
- } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
4117
|
|
- $post_category_arr = explode( ',', $row[$c] );
|
|
4118
|
|
- } else if ( $column == 'default_category' ) {
|
|
|
4116
|
+ } else if ($column == 'post_category' && $row[$c] != '') {
|
|
|
4117
|
+ $post_category_arr = explode(',', $row[$c]);
|
|
|
4118
|
+ } else if ($column == 'default_category') {
|
|
4119
|
4119
|
$default_category = wp_kses_normalize_entities($row[$c]);
|
|
4120
|
|
- } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
4121
|
|
- $post_tags = explode( ',', sanitize_text_field($row[$c]) );
|
|
4122
|
|
- } else if ( $column == 'post_type' ) {
|
|
|
4120
|
+ } else if ($column == 'post_tags' && $row[$c] != '') {
|
|
|
4121
|
+ $post_tags = explode(',', sanitize_text_field($row[$c]));
|
|
|
4122
|
+ } else if ($column == 'post_type') {
|
|
4123
|
4123
|
$post_type = $row[$c];
|
|
4124
|
|
- } else if ( $column == 'post_status' ) {
|
|
4125
|
|
- $post_status = sanitize_key( $row[$c] );
|
|
4126
|
|
- } else if ( $column == 'is_featured' ) {
|
|
4127
|
|
- $is_featured = (int)$row[$c];
|
|
4128
|
|
- } else if ( $column == 'geodir_video' ) {
|
|
|
4124
|
+ } else if ($column == 'post_status') {
|
|
|
4125
|
+ $post_status = sanitize_key($row[$c]);
|
|
|
4126
|
+ } else if ($column == 'is_featured') {
|
|
|
4127
|
+ $is_featured = (int) $row[$c];
|
|
|
4128
|
+ } else if ($column == 'geodir_video') {
|
|
4129
|
4129
|
$geodir_video = $row[$c];
|
|
4130
|
|
- } else if ( $column == 'post_address' ) {
|
|
|
4130
|
+ } else if ($column == 'post_address') {
|
|
4131
|
4131
|
$post_address = sanitize_text_field($row[$c]);
|
|
4132
|
|
- } else if ( $column == 'post_city' ) {
|
|
|
4132
|
+ } else if ($column == 'post_city') {
|
|
4133
|
4133
|
$post_city = sanitize_text_field($row[$c]);
|
|
4134
|
|
- } else if ( $column == 'post_region' ) {
|
|
|
4134
|
+ } else if ($column == 'post_region') {
|
|
4135
|
4135
|
$post_region = sanitize_text_field($row[$c]);
|
|
4136
|
|
- } else if ( $column == 'post_country' ) {
|
|
|
4136
|
+ } else if ($column == 'post_country') {
|
|
4137
|
4137
|
$post_country = sanitize_text_field($row[$c]);
|
|
4138
|
|
- } else if ( $column == 'post_zip' ) {
|
|
|
4138
|
+ } else if ($column == 'post_zip') {
|
|
4139
|
4139
|
$post_zip = sanitize_text_field($row[$c]);
|
|
4140
|
|
- } else if ( $column == 'post_latitude' ) {
|
|
|
4140
|
+ } else if ($column == 'post_latitude') {
|
|
4141
|
4141
|
$post_latitude = sanitize_text_field($row[$c]);
|
|
4142
|
|
- } else if ( $column == 'post_longitude' ) {
|
|
|
4142
|
+ } else if ($column == 'post_longitude') {
|
|
4143
|
4143
|
$post_longitude = sanitize_text_field($row[$c]);
|
|
4144
|
|
- } else if ( $column == 'post_neighbourhood' ) {
|
|
|
4144
|
+ } else if ($column == 'post_neighbourhood') {
|
|
4145
|
4145
|
$post_neighbourhood = sanitize_text_field($row[$c]);
|
|
4146
|
4146
|
unset($gd_post[$column]);
|
|
4147
|
|
- } else if ( $column == 'neighbourhood_latitude' ) {
|
|
|
4147
|
+ } else if ($column == 'neighbourhood_latitude') {
|
|
4148
|
4148
|
$neighbourhood_latitude = sanitize_text_field($row[$c]);
|
|
4149
|
|
- } else if ( $column == 'neighbourhood_longitude' ) {
|
|
|
4149
|
+ } else if ($column == 'neighbourhood_longitude') {
|
|
4150
|
4150
|
$neighbourhood_longitude = sanitize_text_field($row[$c]);
|
|
4151
|
|
- } else if ( $column == 'geodir_timing' ) {
|
|
|
4151
|
+ } else if ($column == 'geodir_timing') {
|
|
4152
|
4152
|
$geodir_timing = sanitize_text_field($row[$c]);
|
|
4153
|
|
- } else if ( $column == 'geodir_contact' ) {
|
|
|
4153
|
+ } else if ($column == 'geodir_contact') {
|
|
4154
|
4154
|
$geodir_contact = sanitize_text_field($row[$c]);
|
|
4155
|
|
- } else if ( $column == 'geodir_email' ) {
|
|
|
4155
|
+ } else if ($column == 'geodir_email') {
|
|
4156
|
4156
|
$geodir_email = sanitize_email($row[$c]);
|
|
4157
|
|
- } else if ( $column == 'geodir_website' ) {
|
|
|
4157
|
+ } else if ($column == 'geodir_website') {
|
|
4158
|
4158
|
$geodir_website = sanitize_text_field($row[$c]);
|
|
4159
|
|
- } else if ( $column == 'geodir_twitter' ) {
|
|
|
4159
|
+ } else if ($column == 'geodir_twitter') {
|
|
4160
|
4160
|
$geodir_twitter = sanitize_text_field($row[$c]);
|
|
4161
|
|
- } else if ( $column == 'geodir_facebook' ) {
|
|
|
4161
|
+ } else if ($column == 'geodir_facebook') {
|
|
4162
|
4162
|
$geodir_facebook = sanitize_text_field($row[$c]);
|
|
4163
|
|
- } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
|
4163
|
+ } else if ($column == 'IMAGE' && !empty($row[$c]) && $row[$c] != '') {
|
|
4164
|
4164
|
$post_images[] = $row[$c];
|
|
4165
|
|
- } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
4166
|
|
- $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );
|
|
4167
|
|
- } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
|
4165
|
+ } else if ($column == 'alive_days' && (int) $row[$c] > 0) {
|
|
|
4166
|
+ $expire_date = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $row[$c].' days'));
|
|
|
4167
|
+ } else if ($column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never') {
|
|
4168
|
4168
|
$row[$c] = str_replace('/', '-', $row[$c]);
|
|
4169
|
|
- $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );
|
|
|
4169
|
+ $expire_date = date_i18n('Y-m-d', strtotime($row[$c]));
|
|
4170
|
4170
|
}
|
|
4171
|
4171
|
// WPML
|
|
4172
|
4172
|
if ($is_wpml) {
|
|
4173
|
4173
|
if ($column == 'language') {
|
|
4174
|
4174
|
$language = geodir_strtolower(trim($row[$c]));
|
|
4175
|
4175
|
} else if ($column == 'original_post_id') {
|
|
4176
|
|
- $original_post_id = (int)$row[$c];
|
|
|
4176
|
+ $original_post_id = (int) $row[$c];
|
|
4177
|
4177
|
}
|
|
4178
|
4178
|
}
|
|
4179
|
4179
|
// WPML
|
|
@@ -4181,7 +4181,7 @@ discard block |
|
|
block discarded – undo |
|
4181
|
4181
|
}
|
|
4182
|
4182
|
// listing claimed or not
|
|
4183
|
4183
|
if ($is_claim_active && isset($gd_post['claimed'])) {
|
|
4184
|
|
- $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;
|
|
|
4184
|
+ $gd_post['claimed'] = (int) $gd_post['claimed'] == 1 ? 1 : 0;
|
|
4185
|
4185
|
}
|
|
4186
|
4186
|
|
|
4187
|
4187
|
// WPML
|
|
@@ -4192,43 +4192,43 @@ discard block |
|
|
block discarded – undo |
|
4192
|
4192
|
|
|
4193
|
4193
|
$gd_post['IMAGE'] = $post_images;
|
|
4194
|
4194
|
|
|
4195
|
|
- $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;
|
|
4196
|
|
- $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;
|
|
|
4195
|
+ $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status;
|
|
|
4196
|
+ $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status;
|
|
4197
|
4197
|
|
|
4198
|
4198
|
$valid = true;
|
|
4199
|
4199
|
|
|
4200
|
|
- if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
|
4200
|
+ if ($post_title == '' || !in_array($post_type, $post_types)) {
|
|
4201
|
4201
|
$invalid++;
|
|
4202
|
4202
|
$valid = false;
|
|
4203
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );
|
|
|
4203
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));
|
|
4204
|
4204
|
}
|
|
4205
|
|
- $xtimings['###3'] = microtime(true)-$xstart;
|
|
4206
|
|
- $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;
|
|
4207
|
|
- if ( $location_allowed ) {
|
|
|
4205
|
+ $xtimings['###3'] = microtime(true) - $xstart;
|
|
|
4206
|
+ $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
|
4207
|
+ if ($location_allowed) {
|
|
4208
|
4208
|
$location_result = geodir_get_default_location();
|
|
4209
|
|
- if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
|
4209
|
+ if ($post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '') {
|
|
4210
|
4210
|
$invalid_addr++;
|
|
4211
|
4211
|
$valid = false;
|
|
4212
|
|
- 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' ) );
|
|
4213
|
|
- } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
4214
|
|
- 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 ) ) ) {
|
|
|
4212
|
+ 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'));
|
|
|
4213
|
+ } else if (!empty($location_result) && $location_result->location_id == 0) {
|
|
|
4214
|
+ 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))) {
|
|
4215
|
4215
|
$invalid_addr++;
|
|
4216
|
4216
|
$valid = false;
|
|
4217
|
|
- 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' ) );
|
|
|
4217
|
+ 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'));
|
|
4218
|
4218
|
} else {
|
|
4219
|
4219
|
if (!$location_manager) {
|
|
4220
|
|
- $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.
|
|
|
4220
|
+ $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.
|
|
4221
|
4221
|
}
|
|
4222
|
4222
|
}
|
|
4223
|
4223
|
}
|
|
4224
|
4224
|
}
|
|
4225
|
|
- $xtimings['###4'] = microtime(true)-$xstart;
|
|
4226
|
|
- if ( !$valid ) {
|
|
|
4225
|
+ $xtimings['###4'] = microtime(true) - $xstart;
|
|
|
4226
|
+ if (!$valid) {
|
|
4227
|
4227
|
continue;
|
|
4228
|
4228
|
}
|
|
4229
|
4229
|
|
|
4230
|
|
- $cat_taxonomy = $post_type . 'category';
|
|
4231
|
|
- $tags_taxonomy = $post_type . '_tags';
|
|
|
4230
|
+ $cat_taxonomy = $post_type.'category';
|
|
|
4231
|
+ $tags_taxonomy = $post_type.'_tags';
|
|
4232
|
4232
|
|
|
4233
|
4233
|
if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
|
4234
|
4234
|
$post_category_arr = array_merge(array($default_category), $post_category_arr);
|
|
@@ -4236,29 +4236,29 @@ discard block |
|
|
block discarded – undo |
|
4236
|
4236
|
|
|
4237
|
4237
|
$post_category = array();
|
|
4238
|
4238
|
$default_category_id = NULL;
|
|
4239
|
|
- if ( !empty( $post_category_arr ) ) {
|
|
4240
|
|
- foreach ( $post_category_arr as $value ) {
|
|
4241
|
|
- $category_name = wp_kses_normalize_entities( trim( $value ) );
|
|
|
4239
|
+ if (!empty($post_category_arr)) {
|
|
|
4240
|
+ foreach ($post_category_arr as $value) {
|
|
|
4241
|
+ $category_name = wp_kses_normalize_entities(trim($value));
|
|
4242
|
4242
|
|
|
4243
|
|
- if ( $category_name != '' ) {
|
|
|
4243
|
+ if ($category_name != '') {
|
|
4244
|
4244
|
$term_category = array();
|
|
4245
|
4245
|
|
|
4246
|
|
- if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
|
4246
|
+ if ($term = get_term_by('name', $category_name, $cat_taxonomy)) {
|
|
4247
|
4247
|
$term_category = $term;
|
|
4248
|
|
- } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
|
4248
|
+ } else if ($term = get_term_by('slug', $category_name, $cat_taxonomy)) {
|
|
4249
|
4249
|
$term_category = $term;
|
|
4250
|
4250
|
} else {
|
|
4251
|
4251
|
$term_data = array();
|
|
4252
|
4252
|
$term_data['name'] = $category_name;
|
|
4253
|
4253
|
$term_data['taxonomy'] = $cat_taxonomy;
|
|
4254
|
4254
|
|
|
4255
|
|
- $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );
|
|
4256
|
|
- if ( $term_id ) {
|
|
4257
|
|
- $term_category = get_term( $term_id, $cat_taxonomy );
|
|
|
4255
|
+ $term_id = geodir_imex_insert_term($cat_taxonomy, $term_data);
|
|
|
4256
|
+ if ($term_id) {
|
|
|
4257
|
+ $term_category = get_term($term_id, $cat_taxonomy);
|
|
4258
|
4258
|
}
|
|
4259
|
4259
|
}
|
|
4260
|
4260
|
|
|
4261
|
|
- if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
|
4261
|
+ if (!empty($term_category) && !is_wp_error($term_category)) {
|
|
4262
|
4262
|
$post_category[] = intval($term_category->term_id);
|
|
4263
|
4263
|
|
|
4264
|
4264
|
if ($category_name == $default_category) {
|
|
@@ -4268,12 +4268,12 @@ discard block |
|
|
block discarded – undo |
|
4268
|
4268
|
}
|
|
4269
|
4269
|
}
|
|
4270
|
4270
|
}
|
|
4271
|
|
- $xtimings['###5'] = microtime(true)-$xstart;
|
|
|
4271
|
+ $xtimings['###5'] = microtime(true) - $xstart;
|
|
4272
|
4272
|
$save_post = array();
|
|
4273
|
4273
|
$save_post['post_title'] = $post_title;
|
|
4274
|
4274
|
if (!empty($post_date)) {
|
|
4275
|
4275
|
$save_post['post_date'] = $post_date;
|
|
4276
|
|
- $save_post['post_date_gmt'] = get_gmt_from_date( $post_date );
|
|
|
4276
|
+ $save_post['post_date_gmt'] = get_gmt_from_date($post_date);
|
|
4277
|
4277
|
}
|
|
4278
|
4278
|
$save_post['post_content'] = $post_content;
|
|
4279
|
4279
|
$save_post['post_type'] = $post_type;
|
|
@@ -4283,15 +4283,15 @@ discard block |
|
|
block discarded – undo |
|
4283
|
4283
|
$save_post['post_tags'] = $post_tags;
|
|
4284
|
4284
|
|
|
4285
|
4285
|
$saved_post_id = NULL;
|
|
4286
|
|
- if ( $import_choice == 'update' ) {
|
|
4287
|
|
- $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );
|
|
|
4286
|
+ if ($import_choice == 'update') {
|
|
|
4287
|
+ $gd_wp_error = __('Unable to add listing, please check the listing data.', 'geodirectory');
|
|
4288
|
4288
|
|
|
4289
|
|
- if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
|
4289
|
+ if ($post_id > 0 && get_post($post_id)) {
|
|
4290
|
4290
|
$save_post['ID'] = $post_id;
|
|
4291
|
4291
|
|
|
4292
|
|
- if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
4293
|
|
- if ( is_wp_error( $saved_post_id ) ) {
|
|
4294
|
|
- $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;
|
|
|
4292
|
+ if ($saved_post_id = wp_update_post($save_post, true)) {
|
|
|
4293
|
+ if (is_wp_error($saved_post_id)) {
|
|
|
4294
|
+ $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;
|
|
4295
|
4295
|
$saved_post_id = 0;
|
|
4296
|
4296
|
} else {
|
|
4297
|
4297
|
$saved_post_id = $post_id;
|
|
@@ -4299,9 +4299,9 @@ discard block |
|
|
block discarded – undo |
|
4299
|
4299
|
}
|
|
4300
|
4300
|
}
|
|
4301
|
4301
|
} else {
|
|
4302
|
|
- if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
4303
|
|
- if ( is_wp_error( $saved_post_id ) ) {
|
|
4304
|
|
- $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;
|
|
|
4302
|
+ if ($saved_post_id = wp_insert_post($save_post, true)) {
|
|
|
4303
|
+ if (is_wp_error($saved_post_id)) {
|
|
|
4304
|
+ $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;
|
|
4305
|
4305
|
$saved_post_id = 0;
|
|
4306
|
4306
|
} else {
|
|
4307
|
4307
|
$created++;
|
|
@@ -4309,19 +4309,19 @@ discard block |
|
|
block discarded – undo |
|
4309
|
4309
|
}
|
|
4310
|
4310
|
}
|
|
4311
|
4311
|
|
|
4312
|
|
- if ( !$saved_post_id > 0 ) {
|
|
|
4312
|
+ if (!$saved_post_id > 0) {
|
|
4313
|
4313
|
$invalid++;
|
|
4314
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );
|
|
|
4314
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_wp_error);
|
|
4315
|
4315
|
}
|
|
4316
|
|
- } else if ( $import_choice == 'skip' ) {
|
|
4317
|
|
- if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
|
4316
|
+ } else if ($import_choice == 'skip') {
|
|
|
4317
|
+ if ($post_id > 0 && get_post($post_id)) {
|
|
4318
|
4318
|
$skipped++;
|
|
4319
|
4319
|
} else {
|
|
4320
|
|
- if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
4321
|
|
- if ( is_wp_error( $saved_post_id ) ) {
|
|
|
4320
|
+ if ($saved_post_id = wp_insert_post($save_post, true)) {
|
|
|
4321
|
+ if (is_wp_error($saved_post_id)) {
|
|
4322
|
4322
|
$invalid++;
|
|
4323
|
4323
|
|
|
4324
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );
|
|
|
4324
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$saved_post_id->get_error_message().' '.$wp_chars_error);
|
|
4325
|
4325
|
$saved_post_id = 0;
|
|
4326
|
4326
|
} else {
|
|
4327
|
4327
|
$created++;
|
|
@@ -4329,28 +4329,28 @@ discard block |
|
|
block discarded – undo |
|
4329
|
4329
|
} else {
|
|
4330
|
4330
|
$invalid++;
|
|
4331
|
4331
|
|
|
4332
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );
|
|
|
4332
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);
|
|
4333
|
4333
|
}
|
|
4334
|
4334
|
}
|
|
4335
|
4335
|
} else {
|
|
4336
|
4336
|
$invalid++;
|
|
4337
|
4337
|
|
|
4338
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );
|
|
|
4338
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);
|
|
4339
|
4339
|
}
|
|
4340
|
|
- $xtimings['###6'] = microtime(true)-$xstart;
|
|
4341
|
|
- if ( (int)$saved_post_id > 0 ) {
|
|
|
4340
|
+ $xtimings['###6'] = microtime(true) - $xstart;
|
|
|
4341
|
+ if ((int) $saved_post_id > 0) {
|
|
4342
|
4342
|
// WPML
|
|
4343
|
4343
|
if ($is_wpml && $original_post_id > 0 && $language != '') {
|
|
4344
|
|
- $wpml_post_type = 'post_' . $post_type;
|
|
4345
|
|
- $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );
|
|
|
4344
|
+ $wpml_post_type = 'post_'.$post_type;
|
|
|
4345
|
+ $source_language = geodir_get_language_for_element($original_post_id, $wpml_post_type);
|
|
4346
|
4346
|
$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();
|
|
4347
|
4347
|
|
|
4348
|
|
- $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );
|
|
|
4348
|
+ $trid = $sitepress->get_element_trid($original_post_id, $wpml_post_type);
|
|
4349
|
4349
|
|
|
4350
|
|
- $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );
|
|
|
4350
|
+ $sitepress->set_element_language_details($saved_post_id, $wpml_post_type, $trid, $language, $source_language);
|
|
4351
|
4351
|
}
|
|
4352
|
4352
|
// WPML
|
|
4353
|
|
- $gd_post_info = geodir_get_post_info( $saved_post_id );
|
|
|
4353
|
+ $gd_post_info = geodir_get_post_info($saved_post_id);
|
|
4354
|
4354
|
|
|
4355
|
4355
|
$gd_post['post_id'] = $saved_post_id;
|
|
4356
|
4356
|
$gd_post['ID'] = $saved_post_id;
|
|
@@ -4362,7 +4362,7 @@ discard block |
|
|
block discarded – undo |
|
4362
|
4362
|
|
|
4363
|
4363
|
// post location
|
|
4364
|
4364
|
$post_location_id = 0;
|
|
4365
|
|
- if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
|
4365
|
+ if ($location_allowed && !empty($location_result) && $location_result->location_id > 0) {
|
|
4366
|
4366
|
$gd_post['post_neighbourhood'] = '';
|
|
4367
|
4367
|
|
|
4368
|
4368
|
$post_location_info = array(
|
|
@@ -4372,7 +4372,7 @@ discard block |
|
|
block discarded – undo |
|
4372
|
4372
|
'geo_lat' => $post_latitude,
|
|
4373
|
4373
|
'geo_lng' => $post_longitude
|
|
4374
|
4374
|
);
|
|
4375
|
|
- if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
|
4375
|
+ if ($location_id = (int) geodir_add_new_location($post_location_info)) {
|
|
4376
|
4376
|
$post_location_id = $location_id;
|
|
4377
|
4377
|
}
|
|
4378
|
4378
|
|
|
@@ -4410,14 +4410,14 @@ discard block |
|
|
block discarded – undo |
|
4410
|
4410
|
$gd_post['post_location_id'] = $post_location_id;
|
|
4411
|
4411
|
|
|
4412
|
4412
|
// post package info
|
|
4413
|
|
- $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;
|
|
|
4413
|
+ $package_id = isset($gd_post['package_id']) && !empty($gd_post['package_id']) ? (int) $gd_post['package_id'] : 0;
|
|
4414
|
4414
|
if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
|
4415
|
4415
|
$package_id = $gd_post_info->package_id;
|
|
4416
|
4416
|
}
|
|
4417
|
4417
|
|
|
4418
|
4418
|
$package_info = array();
|
|
4419
|
4419
|
if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
|
4420
|
|
- $package_info = (array)geodir_get_package_info_by_id($package_id);
|
|
|
4420
|
+ $package_info = (array) geodir_get_package_info_by_id($package_id);
|
|
4421
|
4421
|
|
|
4422
|
4422
|
if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
|
4423
|
4423
|
$package_info = array();
|
|
@@ -4425,18 +4425,18 @@ discard block |
|
|
block discarded – undo |
|
4425
|
4425
|
}
|
|
4426
|
4426
|
|
|
4427
|
4427
|
if (empty($package_info)) {
|
|
4428
|
|
- $package_info = (array)geodir_post_package_info( array(), '', $post_type );
|
|
|
4428
|
+ $package_info = (array) geodir_post_package_info(array(), '', $post_type);
|
|
4429
|
4429
|
}
|
|
4430
|
4430
|
|
|
4431
|
|
- if (!empty($package_info)) {
|
|
|
4431
|
+ if (!empty($package_info)) {
|
|
4432
|
4432
|
$package_id = $package_info['pid'];
|
|
4433
|
4433
|
|
|
4434
|
4434
|
if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
|
4435
|
4435
|
$gd_post['expire_date'] = $expire_date;
|
|
4436
|
4436
|
} else {
|
|
4437
|
|
- if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
4438
|
|
- $gd_post['alive_days'] = (int)$package_info['days'];
|
|
4439
|
|
- $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );
|
|
|
4437
|
+ if (isset($package_info['days']) && (int) $package_info['days'] > 0) {
|
|
|
4438
|
+ $gd_post['alive_days'] = (int) $package_info['days'];
|
|
|
4439
|
+ $gd_post['expire_date'] = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $package_info['days'].' days'));
|
|
4440
|
4440
|
} else {
|
|
4441
|
4441
|
$gd_post['expire_date'] = 'Never';
|
|
4442
|
4442
|
}
|
|
@@ -4445,7 +4445,7 @@ discard block |
|
|
block discarded – undo |
|
4445
|
4445
|
$gd_post['package_id'] = $package_id;
|
|
4446
|
4446
|
}
|
|
4447
|
4447
|
|
|
4448
|
|
- $table = $plugin_prefix . $post_type . '_detail';
|
|
|
4448
|
+ $table = $plugin_prefix.$post_type.'_detail';
|
|
4449
|
4449
|
|
|
4450
|
4450
|
if ($post_type == 'gd_event') {
|
|
4451
|
4451
|
$gd_post = geodir_imex_process_event_data($gd_post);
|
|
@@ -4456,65 +4456,65 @@ discard block |
|
|
block discarded – undo |
|
4456
|
4456
|
}
|
|
4457
|
4457
|
|
|
4458
|
4458
|
// Export franchise fields
|
|
4459
|
|
- $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;
|
|
|
4459
|
+ $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;
|
|
4460
|
4460
|
if ($is_franchise_active) {
|
|
4461
|
|
- if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {
|
|
|
4461
|
+ if (isset($gd_post['gd_is_franchise']) && (int) $gd_post['gd_is_franchise'] == 1) {
|
|
4462
|
4462
|
$gd_franchise_lock = array();
|
|
4463
|
4463
|
|
|
4464
|
|
- if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
4465
|
|
- $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
4466
|
|
- $gd_franchise_lock = trim( $gd_franchise_lock );
|
|
4467
|
|
- $gd_franchise_lock = explode( ",", $gd_franchise_lock );
|
|
|
4464
|
+ if (isset($gd_post['gd_franchise_lock'])) {
|
|
|
4465
|
+ $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock']);
|
|
|
4466
|
+ $gd_franchise_lock = trim($gd_franchise_lock);
|
|
|
4467
|
+ $gd_franchise_lock = explode(",", $gd_franchise_lock);
|
|
4468
|
4468
|
}
|
|
4469
|
4469
|
|
|
4470
|
|
- update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );
|
|
4471
|
|
- update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );
|
|
|
4470
|
+ update_post_meta($saved_post_id, 'gd_is_franchise', 1);
|
|
|
4471
|
+ update_post_meta($saved_post_id, 'gd_franchise_lock', $gd_franchise_lock);
|
|
4472
|
4472
|
} else {
|
|
4473
|
|
- if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
4474
|
|
- geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );
|
|
|
4473
|
+ if (isset($gd_post['franchise']) && (int) $gd_post['franchise'] > 0 && geodir_franchise_check((int) $gd_post['franchise'])) {
|
|
|
4474
|
+ geodir_save_post_meta($saved_post_id, 'franchise', (int) $gd_post['franchise']);
|
|
4475
|
4475
|
}
|
|
4476
|
4476
|
}
|
|
4477
|
4477
|
}
|
|
4478
|
4478
|
|
|
4479
|
4479
|
if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
|
4480
|
|
- $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );
|
|
|
4480
|
+ $save_post['post_category'] = array_unique(array_map('intval', $save_post['post_category']));
|
|
4481
|
4481
|
if ($default_category_id) {
|
|
4482
|
4482
|
$save_post['post_default_category'] = $default_category_id;
|
|
4483
|
4483
|
$gd_post['default_category'] = $default_category_id;
|
|
4484
|
4484
|
}
|
|
4485
|
4485
|
$gd_post[$cat_taxonomy] = $save_post['post_category'];
|
|
4486
|
4486
|
}
|
|
4487
|
|
- $xtimings['###7'] = microtime(true)-$xstart;
|
|
|
4487
|
+ $xtimings['###7'] = microtime(true) - $xstart;
|
|
4488
|
4488
|
// Save post info
|
|
4489
|
|
- geodir_save_post_info( $saved_post_id, $gd_post );
|
|
4490
|
|
- $xtimings['###8'] = microtime(true)-$xstart;
|
|
|
4489
|
+ geodir_save_post_info($saved_post_id, $gd_post);
|
|
|
4490
|
+ $xtimings['###8'] = microtime(true) - $xstart;
|
|
4491
|
4491
|
// post taxonomies
|
|
4492
|
|
- if ( !empty( $save_post['post_category'] ) ) {
|
|
4493
|
|
- wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );
|
|
|
4492
|
+ if (!empty($save_post['post_category'])) {
|
|
|
4493
|
+ wp_set_object_terms($saved_post_id, $save_post['post_category'], $cat_taxonomy);
|
|
4494
|
4494
|
|
|
4495
|
|
- $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';
|
|
|
4495
|
+ $post_default_category = isset($save_post['post_default_category']) ? $save_post['post_default_category'] : '';
|
|
4496
|
4496
|
if ($default_category_id) {
|
|
4497
|
4497
|
$post_default_category = $default_category_id;
|
|
4498
|
4498
|
}
|
|
4499
|
4499
|
$post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);
|
|
4500
|
4500
|
$save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
|
4501
|
|
- $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
|
4501
|
+ $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']).',y:' : '';
|
|
4502
|
4502
|
|
|
4503
|
4503
|
if ($post_category_str != '' && $post_default_category) {
|
|
4504
|
|
- $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);
|
|
|
4504
|
+ $post_category_str = str_replace($post_default_category.',y:', $post_default_category.',y,d:', $post_category_str);
|
|
4505
|
4505
|
}
|
|
4506
|
4506
|
|
|
4507
|
4507
|
$post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';
|
|
4508
|
4508
|
|
|
4509
|
|
- geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );
|
|
|
4509
|
+ geodir_set_postcat_structure($saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str);
|
|
4510
|
4510
|
}
|
|
4511
|
|
- $xtimings['###8.1'] = microtime(true)-$xstart;
|
|
4512
|
|
- if ( !empty( $save_post['post_tags'] ) ) {
|
|
4513
|
|
- wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );
|
|
|
4511
|
+ $xtimings['###8.1'] = microtime(true) - $xstart;
|
|
|
4512
|
+ if (!empty($save_post['post_tags'])) {
|
|
|
4513
|
+ wp_set_object_terms($saved_post_id, $save_post['post_tags'], $tags_taxonomy);
|
|
4514
|
4514
|
}
|
|
4515
|
|
- $xtimings['###9'] = microtime(true)-$xstart;
|
|
|
4515
|
+ $xtimings['###9'] = microtime(true) - $xstart;
|
|
4516
|
4516
|
// Post images
|
|
4517
|
|
- if ( !empty( $post_images ) ) {
|
|
|
4517
|
+ if (!empty($post_images)) {
|
|
4518
|
4518
|
$post_images = array_unique($post_images);
|
|
4519
|
4519
|
|
|
4520
|
4520
|
$old_post_images_arr = array();
|
|
@@ -4522,65 +4522,65 @@ discard block |
|
|
block discarded – undo |
|
4522
|
4522
|
|
|
4523
|
4523
|
$order = 1;
|
|
4524
|
4524
|
|
|
4525
|
|
- $old_post_images = geodir_get_images( $saved_post_id );
|
|
4526
|
|
- $xtimings['###9.1'] = microtime(true)-$xstart;
|
|
|
4525
|
+ $old_post_images = geodir_get_images($saved_post_id);
|
|
|
4526
|
+ $xtimings['###9.1'] = microtime(true) - $xstart;
|
|
4527
|
4527
|
if (!empty($old_post_images)) {
|
|
4528
|
|
- foreach( $old_post_images as $old_post_image ) {
|
|
|
4528
|
+ foreach ($old_post_images as $old_post_image) {
|
|
4529
|
4529
|
if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
|
4530
|
4530
|
$old_post_images_arr[] = $old_post_image->file;
|
|
4531
|
4531
|
}
|
|
4532
|
4532
|
}
|
|
4533
|
4533
|
}
|
|
4534
|
4534
|
|
|
4535
|
|
- foreach ( $post_images as $post_image ) {
|
|
4536
|
|
- $image_name = basename( $post_image );
|
|
|
4535
|
+ foreach ($post_images as $post_image) {
|
|
|
4536
|
+ $image_name = basename($post_image);
|
|
4537
|
4537
|
$saved_post_images_arr[] = $image_name;
|
|
4538
|
4538
|
|
|
4539
|
|
- if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
|
4539
|
+ if (!empty($old_post_images_arr) && in_array($image_name, $old_post_images_arr)) {
|
|
4540
|
4540
|
continue; // Skip if image already exists.
|
|
4541
|
4541
|
}
|
|
4542
|
4542
|
|
|
4543
|
|
- $image_name_parts = explode( '.', $image_name );
|
|
4544
|
|
- array_pop( $image_name_parts );
|
|
4545
|
|
- $proper_image_name = implode( '.', $image_name_parts );
|
|
4546
|
|
- $xtimings['###9.2'] = microtime(true)-$xstart;
|
|
4547
|
|
- $arr_file_type = wp_check_filetype( $image_name );
|
|
4548
|
|
- $xtimings['###9.3'] = microtime(true)-$xstart;
|
|
4549
|
|
- if ( !empty( $arr_file_type ) ) {
|
|
|
4543
|
+ $image_name_parts = explode('.', $image_name);
|
|
|
4544
|
+ array_pop($image_name_parts);
|
|
|
4545
|
+ $proper_image_name = implode('.', $image_name_parts);
|
|
|
4546
|
+ $xtimings['###9.2'] = microtime(true) - $xstart;
|
|
|
4547
|
+ $arr_file_type = wp_check_filetype($image_name);
|
|
|
4548
|
+ $xtimings['###9.3'] = microtime(true) - $xstart;
|
|
|
4549
|
+ if (!empty($arr_file_type)) {
|
|
4550
|
4550
|
$uploaded_file_type = $arr_file_type['type'];
|
|
4551
|
4551
|
|
|
4552
|
4552
|
$attachment = array();
|
|
4553
|
4553
|
$attachment['post_id'] = $saved_post_id;
|
|
4554
|
4554
|
$attachment['title'] = $proper_image_name;
|
|
4555
|
4555
|
$attachment['content'] = '';
|
|
4556
|
|
- $attachment['file'] = $uploads_subdir . '/' . $image_name;
|
|
|
4556
|
+ $attachment['file'] = $uploads_subdir.'/'.$image_name;
|
|
4557
|
4557
|
$attachment['mime_type'] = $uploaded_file_type;
|
|
4558
|
4558
|
$attachment['menu_order'] = $order;
|
|
4559
|
4559
|
$attachment['is_featured'] = 0;
|
|
4560
|
4560
|
|
|
4561
|
4561
|
$attachment_set = '';
|
|
4562
|
|
- foreach ( $attachment as $key => $val ) {
|
|
4563
|
|
- if ( $val != '' ) {
|
|
4564
|
|
- $attachment_set .= $key . " = '" . $val . "', ";
|
|
|
4562
|
+ foreach ($attachment as $key => $val) {
|
|
|
4563
|
+ if ($val != '') {
|
|
|
4564
|
+ $attachment_set .= $key." = '".$val."', ";
|
|
4565
|
4565
|
}
|
|
4566
|
4566
|
}
|
|
4567
|
|
- $attachment_set = trim( $attachment_set, ", " );
|
|
|
4567
|
+ $attachment_set = trim($attachment_set, ", ");
|
|
4568
|
4568
|
|
|
4569
|
4569
|
// Add new attachment
|
|
4570
|
|
- $xtimings['###9.4'] = microtime(true)-$xstart;
|
|
4571
|
|
- $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );
|
|
4572
|
|
- $xtimings['###9.5'] = microtime(true)-$xstart;
|
|
|
4570
|
+ $xtimings['###9.4'] = microtime(true) - $xstart;
|
|
|
4571
|
+ $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
|
|
|
4572
|
+ $xtimings['###9.5'] = microtime(true) - $xstart;
|
|
4573
|
4573
|
$order++;
|
|
4574
|
4574
|
}
|
|
4575
|
4575
|
}
|
|
4576
|
4576
|
|
|
4577
|
|
- $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
|
4577
|
+ $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/".implode("' AND file NOT LIKE '%/", $saved_post_images_arr)."' )" : '';
|
|
4578
|
4578
|
// Remove previous attachment
|
|
4579
|
|
- $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );
|
|
4580
|
|
- $xtimings['###9.6'] = microtime(true)-$xstart;
|
|
4581
|
|
- if ( !empty( $saved_post_images_arr ) ) {
|
|
|
4579
|
+ $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = ".(int) $saved_post_id." ".$saved_post_images_sql);
|
|
|
4580
|
+ $xtimings['###9.6'] = microtime(true) - $xstart;
|
|
|
4581
|
+ if (!empty($saved_post_images_arr)) {
|
|
4582
|
4582
|
geodir_set_wp_featured_image($saved_post_id);
|
|
4583
|
|
- $xtimings['###9.7'] = microtime(true)-$xstart;
|
|
|
4583
|
+ $xtimings['###9.7'] = microtime(true) - $xstart;
|
|
4584
|
4584
|
/*
|
|
4585
|
4585
|
$menu_order = 1;
|
|
4586
|
4586
|
|
|
@@ -4596,14 +4596,14 @@ discard block |
|
|
block discarded – undo |
|
4596
|
4596
|
}*/
|
|
4597
|
4597
|
}
|
|
4598
|
4598
|
|
|
4599
|
|
- if ( $order > 1 ) {
|
|
|
4599
|
+ if ($order > 1) {
|
|
4600
|
4600
|
$images++;
|
|
4601
|
4601
|
}
|
|
4602
|
4602
|
}
|
|
4603
|
|
- $xtimings['###10'] = microtime(true)-$xstart;
|
|
|
4603
|
+ $xtimings['###10'] = microtime(true) - $xstart;
|
|
4604
|
4604
|
/** This action is documented in geodirectory-functions/post-functions.php */
|
|
4605
|
|
- do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );
|
|
4606
|
|
- $xtimings['###11'] = microtime(true)-$xstart;
|
|
|
4605
|
+ do_action('geodir_after_save_listing', $saved_post_id, $gd_post);
|
|
|
4606
|
+ $xtimings['###11'] = microtime(true) - $xstart;
|
|
4607
|
4607
|
if (isset($is_featured)) {
|
|
4608
|
4608
|
geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);
|
|
4609
|
4609
|
}
|
|
@@ -4613,7 +4613,7 @@ discard block |
|
|
block discarded – undo |
|
4613
|
4613
|
if (isset($gd_post['expire_date'])) {
|
|
4614
|
4614
|
geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);
|
|
4615
|
4615
|
}
|
|
4616
|
|
- $xtimings['###12'] = microtime(true)-$xstart;
|
|
|
4616
|
+ $xtimings['###12'] = microtime(true) - $xstart;
|
|
4617
|
4617
|
}
|
|
4618
|
4618
|
|
|
4619
|
4619
|
// WPML
|
|
@@ -4626,11 +4626,11 @@ discard block |
|
|
block discarded – undo |
|
4626
|
4626
|
}
|
|
4627
|
4627
|
|
|
4628
|
4628
|
//undo some stuff to make the import quicker
|
|
4629
|
|
- wp_defer_term_counting( false );
|
|
4630
|
|
- wp_defer_comment_counting( false );
|
|
4631
|
|
- $wpdb->query( 'COMMIT;' );
|
|
4632
|
|
- $wpdb->query( 'SET autocommit = 1;' );
|
|
4633
|
|
- $xtimings['###13'] = microtime(true)-$xstart;
|
|
|
4629
|
+ wp_defer_term_counting(false);
|
|
|
4630
|
+ wp_defer_comment_counting(false);
|
|
|
4631
|
+ $wpdb->query('COMMIT;');
|
|
|
4632
|
+ $wpdb->query('SET autocommit = 1;');
|
|
|
4633
|
+ $xtimings['###13'] = microtime(true) - $xstart;
|
|
4634
|
4634
|
$json = array();
|
|
4635
|
4635
|
$json['processed'] = $processed_actual;
|
|
4636
|
4636
|
$json['created'] = $created;
|
|
@@ -4639,13 +4639,13 @@ discard block |
|
|
block discarded – undo |
|
4639
|
4639
|
$json['invalid'] = $invalid;
|
|
4640
|
4640
|
$json['invalid_addr'] = $invalid_addr;
|
|
4641
|
4641
|
$json['images'] = $images;
|
|
4642
|
|
- $json['timing'] = microtime(true)-$xstart;
|
|
|
4642
|
+ $json['timing'] = microtime(true) - $xstart;
|
|
4643
|
4643
|
$json['timings'] = $xtimings;
|
|
4644
|
4644
|
|
|
4645
|
4645
|
|
|
4646
|
|
- wp_send_json( $json );
|
|
|
4646
|
+ wp_send_json($json);
|
|
4647
|
4647
|
exit;
|
|
4648
|
|
- } else if ( $task == 'import_loc' ) {
|
|
|
4648
|
+ } else if ($task == 'import_loc') {
|
|
4649
|
4649
|
global $gd_post_types;
|
|
4650
|
4650
|
$gd_post_types = $post_types;
|
|
4651
|
4651
|
|
|
@@ -4654,82 +4654,82 @@ discard block |
|
|
block discarded – undo |
|
4654
|
4654
|
|
|
4655
|
4655
|
if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
4656
|
4656
|
$json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
|
|
4657
|
|
- wp_send_json( $json );
|
|
|
4657
|
+ wp_send_json($json);
|
|
4658
|
4658
|
}
|
|
4659
|
4659
|
|
|
4660
|
4660
|
$gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
|
4661
|
|
- $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );
|
|
|
4661
|
+ $gd_error_location = __('Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory');
|
|
4662
|
4662
|
for ($i = 1; $i <= $limit; $i++) {
|
|
4663
|
4663
|
$index = $processed + $i;
|
|
4664
|
4664
|
|
|
4665
|
4665
|
if (isset($file[$index])) {
|
|
4666
|
4666
|
$row = $file[$index];
|
|
4667
|
|
- $row = array_map( 'trim', $row );
|
|
|
4667
|
+ $row = array_map('trim', $row);
|
|
4668
|
4668
|
$data = array();
|
|
4669
|
4669
|
|
|
4670
|
|
- foreach ($columns as $c => $column ) {
|
|
|
4670
|
+ foreach ($columns as $c => $column) {
|
|
4671
|
4671
|
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'))) {
|
|
4672
|
4672
|
$data[$column] = $row[$c];
|
|
4673
|
4673
|
}
|
|
4674
|
4674
|
}
|
|
4675
|
4675
|
|
|
4676
|
|
- if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
|
4676
|
+ if (empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
4677
|
4677
|
$invalid++;
|
|
4678
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
|
|
|
4678
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);
|
|
4679
|
4679
|
continue;
|
|
4680
|
4680
|
}
|
|
4681
|
4681
|
|
|
4682
|
4682
|
$data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;
|
|
4683
|
4683
|
|
|
4684
|
|
- if ( $import_choice == 'update' ) {
|
|
4685
|
|
- if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
4686
|
|
- if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
|
4684
|
+ if ($import_choice == 'update') {
|
|
|
4685
|
+ if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {
|
|
|
4686
|
+ if ($location_id = geodir_location_update_city($data, true, $location)) {
|
|
4687
|
4687
|
$updated++;
|
|
4688
|
4688
|
} else {
|
|
4689
|
4689
|
$invalid++;
|
|
4690
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
|
|
|
4690
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);
|
|
4691
|
4691
|
}
|
|
4692
|
|
- } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
4693
|
|
- $data['location_id'] = (int)$location->location_id;
|
|
|
4692
|
+ } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {
|
|
|
4693
|
+ $data['location_id'] = (int) $location->location_id;
|
|
4694
|
4694
|
|
|
4695
|
|
- if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
4696
|
|
- $data['location_id'] = (int)$location->location_id;
|
|
4697
|
|
- } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
4698
|
|
- $data['location_id'] = (int)$location->location_id;
|
|
4699
|
|
- } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
4700
|
|
- $data['location_id'] = (int)$location->location_id;
|
|
|
4695
|
+ if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region']))) {
|
|
|
4696
|
+ $data['location_id'] = (int) $location->location_id;
|
|
|
4697
|
+ } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'region' => $data['region']))) {
|
|
|
4698
|
+ $data['location_id'] = (int) $location->location_id;
|
|
|
4699
|
+ } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country']))) {
|
|
|
4700
|
+ $data['location_id'] = (int) $location->location_id;
|
|
4701
|
4701
|
}
|
|
4702
|
4702
|
|
|
4703
|
|
- if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
|
4703
|
+ if ($location_id = geodir_location_update_city($data, true, $location)) {
|
|
4704
|
4704
|
$updated++;
|
|
4705
|
4705
|
} else {
|
|
4706
|
4706
|
$invalid++;
|
|
4707
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
|
|
|
4707
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);
|
|
4708
|
4708
|
}
|
|
4709
|
4709
|
} else {
|
|
4710
|
|
- if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
|
4710
|
+ if ($location_id = geodir_location_insert_city($data, true)) {
|
|
4711
|
4711
|
$created++;
|
|
4712
|
4712
|
} else {
|
|
4713
|
4713
|
$invalid++;
|
|
4714
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
|
|
|
4714
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);
|
|
4715
|
4715
|
}
|
|
4716
|
4716
|
}
|
|
4717
|
|
- } elseif ( $import_choice == 'skip' ) {
|
|
4718
|
|
- if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
|
4717
|
+ } elseif ($import_choice == 'skip') {
|
|
|
4718
|
+ if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {
|
|
4719
|
4719
|
$skipped++;
|
|
4720
|
|
- } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
|
4720
|
+ } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {
|
|
4721
|
4721
|
$skipped++;
|
|
4722
|
4722
|
} else {
|
|
4723
|
|
- if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
|
4723
|
+ if ($location_id = geodir_location_insert_city($data, true)) {
|
|
4724
|
4724
|
$created++;
|
|
4725
|
4725
|
} else {
|
|
4726
|
4726
|
$invalid++;
|
|
4727
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
|
|
|
4727
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);
|
|
4728
|
4728
|
}
|
|
4729
|
4729
|
}
|
|
4730
|
4730
|
} else {
|
|
4731
|
4731
|
$invalid++;
|
|
4732
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
|
|
|
4732
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);
|
|
4733
|
4733
|
}
|
|
4734
|
4734
|
}
|
|
4735
|
4735
|
}
|
|
@@ -4743,24 +4743,24 @@ discard block |
|
|
block discarded – undo |
|
4743
|
4743
|
$json['invalid'] = $invalid;
|
|
4744
|
4744
|
$json['images'] = $images;
|
|
4745
|
4745
|
|
|
4746
|
|
- wp_send_json( $json );
|
|
4747
|
|
- } else if ( $task == 'import_hood' ) {
|
|
|
4746
|
+ wp_send_json($json);
|
|
|
4747
|
+ } else if ($task == 'import_hood') {
|
|
4748
|
4748
|
if (!empty($file)) {
|
|
4749
|
4749
|
$columns = isset($file[0]) ? $file[0] : NULL;
|
|
4750
|
4750
|
|
|
4751
|
4751
|
if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
4752
|
4752
|
$json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
|
|
4753
|
|
- wp_send_json( $json );
|
|
|
4753
|
+ wp_send_json($json);
|
|
4754
|
4754
|
}
|
|
4755
|
4755
|
|
|
4756
|
4756
|
$gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
|
4757
|
|
- $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' );
|
|
|
4757
|
+ $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');
|
|
4758
|
4758
|
for ($i = 1; $i <= $limit; $i++) {
|
|
4759
|
4759
|
$index = $processed + $i;
|
|
4760
|
4760
|
|
|
4761
|
4761
|
if (isset($file[$index])) {
|
|
4762
|
4762
|
$row = $file[$index];
|
|
4763
|
|
- $row = array_map( 'trim', $row );
|
|
|
4763
|
+ $row = array_map('trim', $row);
|
|
4764
|
4764
|
$data = array();
|
|
4765
|
4765
|
|
|
4766
|
4766
|
foreach ($columns as $c => $column) {
|
|
@@ -4771,20 +4771,20 @@ discard block |
|
|
block discarded – undo |
|
4771
|
4771
|
|
|
4772
|
4772
|
if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
4773
|
4773
|
$invalid++;
|
|
4774
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
|
|
|
4774
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);
|
|
4775
|
4775
|
continue;
|
|
4776
|
4776
|
}
|
|
4777
|
4777
|
|
|
4778
|
4778
|
$location_info = array();
|
|
4779
|
|
- if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
4780
|
|
- $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
|
4779
|
+ if (!empty($data['location_id']) && (int) $data['location_id'] > 0) {
|
|
|
4780
|
+ $location_info = geodir_get_location_by_id('', (int) $data['location_id']);
|
|
4781
|
4781
|
} else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
|
4782
|
4782
|
$location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
|
4783
|
4783
|
}
|
|
4784
|
4784
|
|
|
4785
|
4785
|
if (empty($location_info)) {
|
|
4786
|
4786
|
$invalid++;
|
|
4787
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
|
|
|
4787
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);
|
|
4788
|
4788
|
continue;
|
|
4789
|
4789
|
}
|
|
4790
|
4790
|
|
|
@@ -4799,35 +4799,35 @@ discard block |
|
|
block discarded – undo |
|
4799
|
4799
|
$hood_data['hood_longitude'] = $data['longitude'];
|
|
4800
|
4800
|
$hood_data['hood_location_id'] = $location_id;
|
|
4801
|
4801
|
|
|
4802
|
|
- if ( $import_choice == 'update' ) {
|
|
4803
|
|
- if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
4804
|
|
- $hood_data['hood_id'] = (int)$data['neighbourhood_id'];
|
|
|
4802
|
+ if ($import_choice == 'update') {
|
|
|
4803
|
+ if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {
|
|
|
4804
|
+ $hood_data['hood_id'] = (int) $data['neighbourhood_id'];
|
|
4805
|
4805
|
|
|
4806
|
4806
|
if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
4807
|
4807
|
$updated++;
|
|
4808
|
4808
|
} else {
|
|
4809
|
4809
|
$invalid++;
|
|
4810
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
|
|
|
4810
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);
|
|
4811
|
4811
|
}
|
|
4812
|
4812
|
} else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
4813
|
|
- $hood_data['hood_id'] = (int)$neighbourhood->hood_id;
|
|
|
4813
|
+ $hood_data['hood_id'] = (int) $neighbourhood->hood_id;
|
|
4814
|
4814
|
|
|
4815
|
4815
|
if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
4816
|
4816
|
$updated++;
|
|
4817
|
4817
|
} else {
|
|
4818
|
4818
|
$invalid++;
|
|
4819
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
|
|
|
4819
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);
|
|
4820
|
4820
|
}
|
|
4821
|
4821
|
} else {
|
|
4822
|
4822
|
if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
4823
|
4823
|
$created++;
|
|
4824
|
4824
|
} else {
|
|
4825
|
4825
|
$invalid++;
|
|
4826
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
|
|
|
4826
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);
|
|
4827
|
4827
|
}
|
|
4828
|
4828
|
}
|
|
4829
|
|
- } elseif ( $import_choice == 'skip' ) {
|
|
4830
|
|
- if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
|
4829
|
+ } elseif ($import_choice == 'skip') {
|
|
|
4830
|
+ if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {
|
|
4831
|
4831
|
$skipped++;
|
|
4832
|
4832
|
} else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
4833
|
4833
|
$skipped++;
|
|
@@ -4837,12 +4837,12 @@ discard block |
|
|
block discarded – undo |
|
4837
|
4837
|
$created++;
|
|
4838
|
4838
|
} else {
|
|
4839
|
4839
|
$invalid++;
|
|
4840
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
|
|
|
4840
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);
|
|
4841
|
4841
|
}
|
|
4842
|
4842
|
}
|
|
4843
|
4843
|
} else {
|
|
4844
|
4844
|
$invalid++;
|
|
4845
|
|
- geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
|
|
|
4845
|
+ geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);
|
|
4846
|
4846
|
}
|
|
4847
|
4847
|
}
|
|
4848
|
4848
|
}
|
|
@@ -4856,7 +4856,7 @@ discard block |
|
|
block discarded – undo |
|
4856
|
4856
|
$json['invalid'] = $invalid;
|
|
4857
|
4857
|
$json['images'] = $images;
|
|
4858
|
4858
|
|
|
4859
|
|
- wp_send_json( $json );
|
|
|
4859
|
+ wp_send_json($json);
|
|
4860
|
4860
|
}
|
|
4861
|
4861
|
}
|
|
4862
|
4862
|
break;
|
|
@@ -4900,29 +4900,29 @@ discard block |
|
|
block discarded – undo |
|
4900
|
4900
|
* }
|
|
4901
|
4901
|
* @return int|bool Term id when success, false when fail.
|
|
4902
|
4902
|
*/
|
|
4903
|
|
-function geodir_imex_insert_term( $taxonomy, $term_data ) {
|
|
4904
|
|
- if ( empty( $taxonomy ) || empty( $term_data ) ) {
|
|
|
4903
|
+function geodir_imex_insert_term($taxonomy, $term_data) {
|
|
|
4904
|
+ if (empty($taxonomy) || empty($term_data)) {
|
|
4905
|
4905
|
return false;
|
|
4906
|
4906
|
}
|
|
4907
|
4907
|
|
|
4908
|
|
- $term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';
|
|
|
4908
|
+ $term = isset($term_data['name']) && !empty($term_data['name']) ? $term_data['name'] : '';
|
|
4909
|
4909
|
$args = array();
|
|
4910
|
|
- $args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';
|
|
4911
|
|
- $args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';
|
|
4912
|
|
- $args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';
|
|
|
4910
|
+ $args['description'] = isset($term_data['description']) ? $term_data['description'] : '';
|
|
|
4911
|
+ $args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';
|
|
|
4912
|
+ $args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';
|
|
4913
|
4913
|
|
|
4914
|
|
- if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {
|
|
4915
|
|
- $term_args = array_merge( $term_data, $args );
|
|
4916
|
|
- $defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
|
|
4917
|
|
- $term_args = wp_parse_args( $term_args, $defaults );
|
|
4918
|
|
- $term_args = sanitize_term( $term_args, $taxonomy, 'db' );
|
|
4919
|
|
- $args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );
|
|
|
4914
|
+ if ((!empty($args['slug']) && term_exists($args['slug'], $taxonomy)) || empty($args['slug'])) {
|
|
|
4915
|
+ $term_args = array_merge($term_data, $args);
|
|
|
4916
|
+ $defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
|
|
|
4917
|
+ $term_args = wp_parse_args($term_args, $defaults);
|
|
|
4918
|
+ $term_args = sanitize_term($term_args, $taxonomy, 'db');
|
|
|
4919
|
+ $args['slug'] = wp_unique_term_slug($args['slug'], (object) $term_args);
|
|
4920
|
4920
|
}
|
|
4921
|
4921
|
|
|
4922
|
|
- if( !empty( $term ) ) {
|
|
4923
|
|
- $result = wp_insert_term( $term, $taxonomy, $args );
|
|
4924
|
|
- if( !is_wp_error( $result ) ) {
|
|
4925
|
|
- return isset( $result['term_id'] ) ? $result['term_id'] : 0;
|
|
|
4922
|
+ if (!empty($term)) {
|
|
|
4923
|
+ $result = wp_insert_term($term, $taxonomy, $args);
|
|
|
4924
|
+ if (!is_wp_error($result)) {
|
|
|
4925
|
+ return isset($result['term_id']) ? $result['term_id'] : 0;
|
|
4926
|
4926
|
}
|
|
4927
|
4927
|
}
|
|
4928
|
4928
|
|
|
@@ -4952,36 +4952,36 @@ discard block |
|
|
block discarded – undo |
|
4952
|
4952
|
* }
|
|
4953
|
4953
|
* @return int|bool Term id when success, false when fail.
|
|
4954
|
4954
|
*/
|
|
4955
|
|
-function geodir_imex_update_term( $taxonomy, $term_data ) {
|
|
4956
|
|
- if ( empty( $taxonomy ) || empty( $term_data ) ) {
|
|
|
4955
|
+function geodir_imex_update_term($taxonomy, $term_data) {
|
|
|
4956
|
+ if (empty($taxonomy) || empty($term_data)) {
|
|
4957
|
4957
|
return false;
|
|
4958
|
4958
|
}
|
|
4959
|
4959
|
|
|
4960
|
|
- $term_id = isset( $term_data['term_id'] ) && !empty( $term_data['term_id'] ) ? $term_data['term_id'] : 0;
|
|
|
4960
|
+ $term_id = isset($term_data['term_id']) && !empty($term_data['term_id']) ? $term_data['term_id'] : 0;
|
|
4961
|
4961
|
|
|
4962
|
4962
|
$args = array();
|
|
4963
|
|
- $args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';
|
|
4964
|
|
- $args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';
|
|
4965
|
|
- $args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';
|
|
|
4963
|
+ $args['description'] = isset($term_data['description']) ? $term_data['description'] : '';
|
|
|
4964
|
+ $args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';
|
|
|
4965
|
+ $args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';
|
|
4966
|
4966
|
|
|
4967
|
|
- if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {
|
|
|
4967
|
+ if ($term_id > 0 && $term_info = (array) get_term($term_id, $taxonomy)) {
|
|
4968
|
4968
|
$term_data['term_id'] = $term_info['term_id'];
|
|
4969
|
4969
|
|
|
4970
|
|
- $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );
|
|
|
4970
|
+ $result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);
|
|
4971
|
4971
|
|
|
4972
|
|
- if( !is_wp_error( $result ) ) {
|
|
4973
|
|
- return isset( $result['term_id'] ) ? $result['term_id'] : 0;
|
|
|
4972
|
+ if (!is_wp_error($result)) {
|
|
|
4973
|
+ return isset($result['term_id']) ? $result['term_id'] : 0;
|
|
4974
|
4974
|
}
|
|
4975
|
|
- } else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
|
4975
|
+ } else if ($term_data['slug'] != '' && $term_info = (array) term_exists($term_data['slug'], $taxonomy)) {
|
|
4976
|
4976
|
$term_data['term_id'] = $term_info['term_id'];
|
|
4977
|
4977
|
|
|
4978
|
|
- $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );
|
|
|
4978
|
+ $result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);
|
|
4979
|
4979
|
|
|
4980
|
|
- if( !is_wp_error( $result ) ) {
|
|
4981
|
|
- return isset( $result['term_id'] ) ? $result['term_id'] : 0;
|
|
|
4980
|
+ if (!is_wp_error($result)) {
|
|
|
4981
|
+ return isset($result['term_id']) ? $result['term_id'] : 0;
|
|
4982
|
4982
|
}
|
|
4983
|
4983
|
} else {
|
|
4984
|
|
- return geodir_imex_insert_term( $taxonomy, $term_data );
|
|
|
4984
|
+ return geodir_imex_insert_term($taxonomy, $term_data);
|
|
4985
|
4985
|
}
|
|
4986
|
4986
|
|
|
4987
|
4987
|
return false;
|
|
@@ -5000,20 +5000,20 @@ discard block |
|
|
block discarded – undo |
|
5000
|
5000
|
* @param string $post_type Post type.
|
|
5001
|
5001
|
* @return int Posts count.
|
|
5002
|
5002
|
*/
|
|
5003
|
|
-function geodir_get_posts_count( $post_type ) {
|
|
|
5003
|
+function geodir_get_posts_count($post_type) {
|
|
5004
|
5004
|
global $wpdb, $plugin_prefix;
|
|
5005
|
5005
|
|
|
5006
|
|
- if ( !post_type_exists( $post_type ) ) {
|
|
|
5006
|
+ if (!post_type_exists($post_type)) {
|
|
5007
|
5007
|
return 0;
|
|
5008
|
5008
|
}
|
|
5009
|
5009
|
|
|
5010
|
|
- $table = $plugin_prefix . $post_type . '_detail';
|
|
|
5010
|
+ $table = $plugin_prefix.$post_type.'_detail';
|
|
5011
|
5011
|
|
|
5012
|
5012
|
// Skip listing with statuses trash, auto-draft etc...
|
|
5013
|
5013
|
$skip_statuses = geodir_imex_export_skip_statuses();
|
|
5014
|
5014
|
$where_statuses = '';
|
|
5015
|
|
- if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
5016
|
|
- $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
|
5015
|
+ if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
|
5016
|
+ $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
5017
|
5017
|
}
|
|
5018
|
5018
|
|
|
5019
|
5019
|
/**
|
|
@@ -5024,11 +5024,11 @@ discard block |
|
|
block discarded – undo |
|
5024
|
5024
|
*
|
|
5025
|
5025
|
* @param string $where SQL where clause part.
|
|
5026
|
5026
|
*/
|
|
5027
|
|
- $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );
|
|
|
5027
|
+ $where_statuses = apply_filters('geodir_get_posts_count', $where_statuses, $post_type);
|
|
5028
|
5028
|
|
|
5029
|
|
- $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 );
|
|
|
5029
|
+ $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);
|
|
5030
|
5030
|
|
|
5031
|
|
- $posts_count = (int)$wpdb->get_var( $query );
|
|
|
5031
|
+ $posts_count = (int) $wpdb->get_var($query);
|
|
5032
|
5032
|
|
|
5033
|
5033
|
/**
|
|
5034
|
5034
|
* Modify returned post counts for the current post type.
|
|
@@ -5039,7 +5039,7 @@ discard block |
|
|
block discarded – undo |
|
5039
|
5039
|
* @param int $posts_count Post counts.
|
|
5040
|
5040
|
* @param string $post_type Post type.
|
|
5041
|
5041
|
*/
|
|
5042
|
|
- $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );
|
|
|
5042
|
+ $posts_count = apply_filters('geodir_imex_count_posts', $posts_count, $post_type);
|
|
5043
|
5043
|
|
|
5044
|
5044
|
return $posts_count;
|
|
5045
|
5045
|
}
|
|
@@ -5061,19 +5061,19 @@ discard block |
|
|
block discarded – undo |
|
5061
|
5061
|
* @param int $page_no Page number. Default 0.
|
|
5062
|
5062
|
* @return array Array of posts data.
|
|
5063
|
5063
|
*/
|
|
5064
|
|
-function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
|
5064
|
+function geodir_imex_get_posts($post_type, $per_page = 0, $page_no = 0) {
|
|
5065
|
5065
|
global $wp_filesystem;
|
|
5066
|
5066
|
|
|
5067
|
|
- $posts = geodir_get_export_posts( $post_type, $per_page, $page_no );
|
|
|
5067
|
+ $posts = geodir_get_export_posts($post_type, $per_page, $page_no);
|
|
5068
|
5068
|
|
|
5069
|
5069
|
$csv_rows = array();
|
|
5070
|
5070
|
|
|
5071
|
|
- if ( !empty( $posts ) ) {
|
|
5072
|
|
- $is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );
|
|
|
5071
|
+ if (!empty($posts)) {
|
|
|
5072
|
+ $is_payment_plugin = is_plugin_active('geodir_payment_manager/geodir_payment_manager.php');
|
|
5073
|
5073
|
$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
5074
|
|
- $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;
|
|
|
5074
|
+ $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
5075
|
5075
|
$neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;
|
|
5076
|
|
- $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
|
5076
|
+ $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
5077
|
5077
|
|
|
5078
|
5078
|
$csv_row = array();
|
|
5079
|
5079
|
$csv_row[] = 'post_id';
|
|
@@ -5084,7 +5084,7 @@ discard block |
|
|
block discarded – undo |
|
5084
|
5084
|
$csv_row[] = 'default_category';
|
|
5085
|
5085
|
$csv_row[] = 'post_tags';
|
|
5086
|
5086
|
$csv_row[] = 'post_type';
|
|
5087
|
|
- if ( $post_type == 'gd_event' ) {
|
|
|
5087
|
+ if ($post_type == 'gd_event') {
|
|
5088
|
5088
|
$csv_row[] = 'event_date';
|
|
5089
|
5089
|
$csv_row[] = 'event_enddate';
|
|
5090
|
5090
|
$csv_row[] = 'starttime';
|
|
@@ -5143,15 +5143,15 @@ discard block |
|
|
block discarded – undo |
|
5143
|
5143
|
}
|
|
5144
|
5144
|
// WPML
|
|
5145
|
5145
|
|
|
5146
|
|
- $custom_fields = geodir_imex_get_custom_fields( $post_type );
|
|
5147
|
|
- if ( !empty( $custom_fields ) ) {
|
|
5148
|
|
- foreach ( $custom_fields as $custom_field ) {
|
|
|
5146
|
+ $custom_fields = geodir_imex_get_custom_fields($post_type);
|
|
|
5147
|
+ if (!empty($custom_fields)) {
|
|
|
5148
|
+ foreach ($custom_fields as $custom_field) {
|
|
5149
|
5149
|
$csv_row[] = $custom_field->htmlvar_name;
|
|
5150
|
5150
|
}
|
|
5151
|
5151
|
}
|
|
5152
|
5152
|
|
|
5153
|
5153
|
// Export franchise fields
|
|
5154
|
|
- $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;
|
|
|
5154
|
+ $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;
|
|
5155
|
5155
|
if ($is_franchise_active) {
|
|
5156
|
5156
|
$csv_row[] = 'gd_is_franchise';
|
|
5157
|
5157
|
$csv_row[] = 'gd_franchise_lock';
|
|
@@ -5172,28 +5172,28 @@ discard block |
|
|
block discarded – undo |
|
5172
|
5172
|
$csv_rows[] = $csv_row;
|
|
5173
|
5173
|
|
|
5174
|
5174
|
$images_count = 5;
|
|
5175
|
|
- $xx=0;
|
|
5176
|
|
- foreach ( $posts as $post ) {$xx++;
|
|
|
5175
|
+ $xx = 0;
|
|
|
5176
|
+ foreach ($posts as $post) {$xx++;
|
|
5177
|
5177
|
$post_id = $post['ID'];
|
|
5178
|
5178
|
|
|
5179
|
|
- $gd_post_info = geodir_get_post_info( $post_id );
|
|
5180
|
|
- $post_info = (array)$gd_post_info;
|
|
|
5179
|
+ $gd_post_info = geodir_get_post_info($post_id);
|
|
|
5180
|
+ $post_info = (array) $gd_post_info;
|
|
5181
|
5181
|
|
|
5182
|
|
- $taxonomy_category = $post_type . 'category';
|
|
5183
|
|
- $taxonomy_tags = $post_type . '_tags';
|
|
|
5182
|
+ $taxonomy_category = $post_type.'category';
|
|
|
5183
|
+ $taxonomy_tags = $post_type.'_tags';
|
|
5184
|
5184
|
|
|
5185
|
5185
|
$post_category = '';
|
|
5186
|
5186
|
$default_category_id = $gd_post_info->default_category;
|
|
5187
|
5187
|
$default_category = '';
|
|
5188
|
5188
|
$post_tags = '';
|
|
5189
|
|
- $terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) );
|
|
|
5189
|
+ $terms = wp_get_post_terms($post_id, array($taxonomy_category, $taxonomy_tags));
|
|
5190
|
5190
|
|
|
5191
|
|
- if ( !empty( $terms ) && !is_wp_error( $terms ) ) {
|
|
|
5191
|
+ if (!empty($terms) && !is_wp_error($terms)) {
|
|
5192
|
5192
|
$post_category = array();
|
|
5193
|
5193
|
$post_tags = array();
|
|
5194
|
5194
|
|
|
5195
|
|
- foreach ( $terms as $term ) {
|
|
5196
|
|
- if ( $term->taxonomy == $taxonomy_category ) {
|
|
|
5195
|
+ foreach ($terms as $term) {
|
|
|
5196
|
+ if ($term->taxonomy == $taxonomy_category) {
|
|
5197
|
5197
|
$post_category[] = $term->name;
|
|
5198
|
5198
|
|
|
5199
|
5199
|
if ($default_category_id == $term->term_id) {
|
|
@@ -5201,7 +5201,7 @@ discard block |
|
|
block discarded – undo |
|
5201
|
5201
|
}
|
|
5202
|
5202
|
}
|
|
5203
|
5203
|
|
|
5204
|
|
- if ( $term->taxonomy == $taxonomy_tags ) {
|
|
|
5204
|
+ if ($term->taxonomy == $taxonomy_tags) {
|
|
5205
|
5205
|
$post_tags[] = $term->name;
|
|
5206
|
5206
|
}
|
|
5207
|
5207
|
}
|
|
@@ -5209,47 +5209,47 @@ discard block |
|
|
block discarded – undo |
|
5209
|
5209
|
if (empty($default_category) && !empty($post_category)) {
|
|
5210
|
5210
|
$default_category = $post_category[0]; // Set first one as default category.
|
|
5211
|
5211
|
}
|
|
5212
|
|
- $post_category = !empty( $post_category ) ? implode( ',', $post_category ) : '';
|
|
5213
|
|
- $post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : '';
|
|
|
5212
|
+ $post_category = !empty($post_category) ? implode(',', $post_category) : '';
|
|
|
5213
|
+ $post_tags = !empty($post_tags) ? implode(',', $post_tags) : '';
|
|
5214
|
5214
|
}
|
|
5215
|
5215
|
|
|
5216
|
5216
|
// Franchise data
|
|
5217
|
|
- if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {
|
|
|
5217
|
+ if ($is_franchise_active && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 && geodir_franchise_check((int) $post_info['franchise'])) {
|
|
5218
|
5218
|
$franchise_id = $post_info['franchise'];
|
|
5219
|
5219
|
$gd_franchise_info = geodir_get_post_info($franchise_id);
|
|
5220
|
5220
|
|
|
5221
|
5221
|
if (geodir_franchise_pkg_is_active($gd_franchise_info)) {
|
|
5222
|
|
- $franchise_info = (array)$gd_franchise_info;
|
|
|
5222
|
+ $franchise_info = (array) $gd_franchise_info;
|
|
5223
|
5223
|
$locked_fields = geodir_franchise_get_locked_fields($franchise_id, true);
|
|
5224
|
5224
|
|
|
5225
|
5225
|
if (!empty($locked_fields)) {
|
|
5226
|
|
- foreach( $locked_fields as $locked_field) {
|
|
|
5226
|
+ foreach ($locked_fields as $locked_field) {
|
|
5227
|
5227
|
if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {
|
|
5228
|
5228
|
$post_info[$locked_field] = $franchise_info[$locked_field];
|
|
5229
|
5229
|
}
|
|
5230
|
5230
|
|
|
5231
|
5231
|
if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {
|
|
5232
|
|
- $franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) );
|
|
|
5232
|
+ $franchise_terms = wp_get_post_terms($franchise_id, array($taxonomy_category, $taxonomy_tags));
|
|
5233
|
5233
|
|
|
5234
|
|
- if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {
|
|
|
5234
|
+ if (!empty($franchise_terms) && !is_wp_error($franchise_terms)) {
|
|
5235
|
5235
|
$franchise_post_category = array();
|
|
5236
|
5236
|
$franchise_post_tags = array();
|
|
5237
|
5237
|
|
|
5238
|
|
- foreach ( $franchise_terms as $franchise_term ) {
|
|
5239
|
|
- if ( $franchise_term->taxonomy == $taxonomy_category ) {
|
|
|
5238
|
+ foreach ($franchise_terms as $franchise_term) {
|
|
|
5239
|
+ if ($franchise_term->taxonomy == $taxonomy_category) {
|
|
5240
|
5240
|
$franchise_post_category[] = $franchise_term->name;
|
|
5241
|
5241
|
}
|
|
5242
|
5242
|
|
|
5243
|
|
- if ( $franchise_term->taxonomy == $taxonomy_tags ) {
|
|
|
5243
|
+ if ($franchise_term->taxonomy == $taxonomy_tags) {
|
|
5244
|
5244
|
$franchise_post_tags[] = $franchise_term->name;
|
|
5245
|
5245
|
}
|
|
5246
|
5246
|
}
|
|
5247
|
5247
|
|
|
5248
|
5248
|
if (in_array($taxonomy_category, $locked_fields)) {
|
|
5249
|
|
- $post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : '';
|
|
|
5249
|
+ $post_category = !empty($franchise_post_category) ? implode(',', $franchise_post_category) : '';
|
|
5250
|
5250
|
}
|
|
5251
|
5251
|
if (in_array('post_tags', $locked_fields)) {
|
|
5252
|
|
- $post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : '';
|
|
|
5252
|
+ $post_tags = !empty($franchise_post_tags) ? implode(',', $franchise_post_tags) : '';
|
|
5253
|
5253
|
}
|
|
5254
|
5254
|
}
|
|
5255
|
5255
|
}
|
|
@@ -5258,18 +5258,18 @@ discard block |
|
|
block discarded – undo |
|
5258
|
5258
|
}
|
|
5259
|
5259
|
}
|
|
5260
|
5260
|
|
|
5261
|
|
- $post_images = geodir_get_images( $post_id );
|
|
|
5261
|
+ $post_images = geodir_get_images($post_id);
|
|
5262
|
5262
|
$current_images = array();
|
|
5263
|
|
- if ( !empty( $post_images ) ) {
|
|
5264
|
|
- foreach ( $post_images as $post_image ) {
|
|
5265
|
|
- $post_image = (array)$post_image;
|
|
5266
|
|
- $image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : '';
|
|
5267
|
|
- if ( $image ) {
|
|
|
5263
|
+ if (!empty($post_images)) {
|
|
|
5264
|
+ foreach ($post_images as $post_image) {
|
|
|
5265
|
+ $post_image = (array) $post_image;
|
|
|
5266
|
+ $image = !empty($post_image) && isset($post_image['path']) && $wp_filesystem->is_file($post_image['path']) && $wp_filesystem->exists($post_image['path']) ? $post_image['src'] : '';
|
|
|
5267
|
+ if ($image) {
|
|
5268
|
5268
|
$current_images[] = $image;
|
|
5269
|
5269
|
}
|
|
5270
|
5270
|
}
|
|
5271
|
5271
|
|
|
5272
|
|
- $images_count = max( $images_count, count( $current_images ) );
|
|
|
5272
|
+ $images_count = max($images_count, count($current_images));
|
|
5273
|
5273
|
}
|
|
5274
|
5274
|
|
|
5275
|
5275
|
$csv_row = array();
|
|
@@ -5281,7 +5281,7 @@ discard block |
|
|
block discarded – undo |
|
5281
|
5281
|
$csv_row[] = $default_category; // default_category
|
|
5282
|
5282
|
$csv_row[] = $post_tags; // post_tags
|
|
5283
|
5283
|
$csv_row[] = $post_type; // post_type
|
|
5284
|
|
- if ( $post_type == 'gd_event' ) {
|
|
|
5284
|
+ if ($post_type == 'gd_event') {
|
|
5285
|
5285
|
$event_data = geodir_imex_get_event_data($post, $gd_post_info);
|
|
5286
|
5286
|
$csv_row[] = $event_data['event_date']; // event_date
|
|
5287
|
5287
|
$csv_row[] = $event_data['event_enddate']; // enddate
|
|
@@ -5302,12 +5302,12 @@ discard block |
|
|
block discarded – undo |
|
5302
|
5302
|
$csv_row[] = $event_data['recurring_end_date']; // repeat_end
|
|
5303
|
5303
|
}
|
|
5304
|
5304
|
$csv_row[] = $post_info['post_status']; // post_status
|
|
5305
|
|
- $csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured
|
|
|
5305
|
+ $csv_row[] = (int) $post_info['is_featured'] == 1 ? 1 : ''; // is_featured
|
|
5306
|
5306
|
if ($is_claim_active) {
|
|
5307
|
|
- $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed
|
|
|
5307
|
+ $csv_row[] = !empty($post_info['claimed']) && (int) $post_info['claimed'] == 1 ? 1 : ''; // claimed
|
|
5308
|
5308
|
}
|
|
5309
|
5309
|
if ($is_payment_plugin) {
|
|
5310
|
|
- $csv_row[] = (int)$post_info['package_id']; // package_id
|
|
|
5310
|
+ $csv_row[] = (int) $post_info['package_id']; // package_id
|
|
5311
|
5311
|
$csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days
|
|
5312
|
5312
|
$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
|
|
5313
|
5313
|
}
|
|
@@ -5344,14 +5344,14 @@ discard block |
|
|
block discarded – undo |
|
5344
|
5344
|
$csv_row[] = stripslashes($post_info['geodir_special_offers']); // geodir_special_offers
|
|
5345
|
5345
|
// WPML
|
|
5346
|
5346
|
if ($is_wpml) {
|
|
5347
|
|
- $csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type );
|
|
5348
|
|
- $csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type );
|
|
|
5347
|
+ $csv_row[] = geodir_get_language_for_element($post_id, 'post_'.$post_type);
|
|
|
5348
|
+ $csv_row[] = geodir_imex_original_post_id($post_id, 'post_'.$post_type);
|
|
5349
|
5349
|
}
|
|
5350
|
5350
|
// WPML
|
|
5351
|
5351
|
|
|
5352
|
|
- if ( !empty( $custom_fields ) ) {
|
|
5353
|
|
- foreach ( $custom_fields as $custom_field ) {
|
|
5354
|
|
- $csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : '';
|
|
|
5352
|
+ if (!empty($custom_fields)) {
|
|
|
5353
|
+ foreach ($custom_fields as $custom_field) {
|
|
|
5354
|
+ $csv_row[] = isset($post_info[$custom_field->htmlvar_name]) ? $post_info[$custom_field->htmlvar_name] : '';
|
|
5355
|
5355
|
}
|
|
5356
|
5356
|
}
|
|
5357
|
5357
|
|
|
@@ -5362,15 +5362,15 @@ discard block |
|
|
block discarded – undo |
|
5362
|
5362
|
$franchise = '';
|
|
5363
|
5363
|
|
|
5364
|
5364
|
if (geodir_franchise_pkg_is_active($gd_post_info)) {
|
|
5365
|
|
- $gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true );
|
|
5366
|
|
- $locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : '';
|
|
|
5365
|
+ $gd_is_franchise = (int) get_post_meta($post_id, 'gd_is_franchise', true);
|
|
|
5366
|
+ $locaked_fields = $gd_is_franchise ? get_post_meta($post_id, 'gd_franchise_lock', true) : '';
|
|
5367
|
5367
|
$locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');
|
|
5368
|
|
- $franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id
|
|
|
5368
|
+ $franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 ? (int) $post_info['franchise'] : 0; // franchise id
|
|
5369
|
5369
|
}
|
|
5370
|
5370
|
|
|
5371
|
|
- $csv_row[] = (int)$gd_is_franchise; // gd_is_franchise
|
|
|
5371
|
+ $csv_row[] = (int) $gd_is_franchise; // gd_is_franchise
|
|
5372
|
5372
|
$csv_row[] = $locaked_fields; // gd_franchise_lock fields
|
|
5373
|
|
- $csv_row[] = (int)$franchise; // franchise id
|
|
|
5373
|
+ $csv_row[] = (int) $franchise; // franchise id
|
|
5374
|
5374
|
}
|
|
5375
|
5375
|
|
|
5376
|
5376
|
/**
|
|
@@ -5384,15 +5384,15 @@ discard block |
|
|
block discarded – undo |
|
5384
|
5384
|
*/
|
|
5385
|
5385
|
$csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
|
5386
|
5386
|
|
|
5387
|
|
- for ( $c = 0; $c < $images_count; $c++ ) {
|
|
5388
|
|
- $csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE
|
|
|
5387
|
+ for ($c = 0; $c < $images_count; $c++) {
|
|
|
5388
|
+ $csv_row[] = isset($current_images[$c]) ? $current_images[$c] : ''; // IMAGE
|
|
5389
|
5389
|
}
|
|
5390
|
5390
|
|
|
5391
|
5391
|
$csv_rows[] = $csv_row;
|
|
5392
|
5392
|
|
|
5393
|
5393
|
}
|
|
5394
|
5394
|
|
|
5395
|
|
- for ( $c = 0; $c < $images_count; $c++ ) {
|
|
|
5395
|
+ for ($c = 0; $c < $images_count; $c++) {
|
|
5396
|
5396
|
$csv_rows[0][] = 'IMAGE';
|
|
5397
|
5397
|
}
|
|
5398
|
5398
|
}
|
|
@@ -5414,30 +5414,30 @@ discard block |
|
|
block discarded – undo |
|
5414
|
5414
|
* @param int $page_no Page number. Default 0.
|
|
5415
|
5415
|
* @return array Array of posts data.
|
|
5416
|
5416
|
*/
|
|
5417
|
|
-function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
|
5417
|
+function geodir_get_export_posts($post_type, $per_page = 0, $page_no = 0) {
|
|
5418
|
5418
|
global $wpdb, $plugin_prefix;
|
|
5419
|
5419
|
|
|
5420
|
|
- if ( ! post_type_exists( $post_type ) )
|
|
|
5420
|
+ if (!post_type_exists($post_type))
|
|
5421
|
5421
|
return new stdClass;
|
|
5422
|
5422
|
|
|
5423
|
|
- $table = $plugin_prefix . $post_type . '_detail';
|
|
|
5423
|
+ $table = $plugin_prefix.$post_type.'_detail';
|
|
5424
|
5424
|
|
|
5425
|
5425
|
$limit = '';
|
|
5426
|
|
- if ( $per_page > 0 && $page_no > 0 ) {
|
|
5427
|
|
- $offset = ( $page_no - 1 ) * $per_page;
|
|
|
5426
|
+ if ($per_page > 0 && $page_no > 0) {
|
|
|
5427
|
+ $offset = ($page_no - 1) * $per_page;
|
|
5428
|
5428
|
|
|
5429
|
|
- if ( $offset > 0 ) {
|
|
5430
|
|
- $limit = " LIMIT " . $offset . "," . $per_page;
|
|
|
5429
|
+ if ($offset > 0) {
|
|
|
5430
|
+ $limit = " LIMIT ".$offset.",".$per_page;
|
|
5431
|
5431
|
} else {
|
|
5432
|
|
- $limit = " LIMIT " . $per_page;
|
|
|
5432
|
+ $limit = " LIMIT ".$per_page;
|
|
5433
|
5433
|
}
|
|
5434
|
5434
|
}
|
|
5435
|
5435
|
|
|
5436
|
5436
|
// Skip listing with statuses trash, auto-draft etc...
|
|
5437
|
5437
|
$skip_statuses = geodir_imex_export_skip_statuses();
|
|
5438
|
5438
|
$where_statuses = '';
|
|
5439
|
|
- if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
5440
|
|
- $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
|
5439
|
+ if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
|
5440
|
+ $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
5441
|
5441
|
}
|
|
5442
|
5442
|
|
|
5443
|
5443
|
/**
|
|
@@ -5448,9 +5448,9 @@ discard block |
|
|
block discarded – undo |
|
5448
|
5448
|
*
|
|
5449
|
5449
|
* @param string $where SQL where clause part.
|
|
5450
|
5450
|
*/
|
|
5451
|
|
- $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );
|
|
|
5451
|
+ $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);
|
|
5452
|
5452
|
|
|
5453
|
|
- $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 );
|
|
|
5453
|
+ $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);
|
|
5454
|
5454
|
/**
|
|
5455
|
5455
|
* Modify returned posts SQL query for the current post type.
|
|
5456
|
5456
|
*
|
|
@@ -5460,8 +5460,8 @@ discard block |
|
|
block discarded – undo |
|
5460
|
5460
|
* @param int $query The SQL query.
|
|
5461
|
5461
|
* @param string $post_type Post type.
|
|
5462
|
5462
|
*/
|
|
5463
|
|
- $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );
|
|
5464
|
|
- $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );
|
|
|
5463
|
+ $query = apply_filters('geodir_imex_export_posts_query', $query, $post_type);
|
|
|
5464
|
+ $results = (array) $wpdb->get_results($wpdb->prepare($query, $post_type), ARRAY_A);
|
|
5465
|
5465
|
|
|
5466
|
5466
|
/**
|
|
5467
|
5467
|
* Modify returned post results for the current post type.
|
|
@@ -5472,7 +5472,7 @@ discard block |
|
|
block discarded – undo |
|
5472
|
5472
|
* @param object $results An object containing all post ids.
|
|
5473
|
5473
|
* @param string $post_type Post type.
|
|
5474
|
5474
|
*/
|
|
5475
|
|
- return apply_filters( 'geodir_export_posts', $results, $post_type );
|
|
|
5475
|
+ return apply_filters('geodir_export_posts', $results, $post_type);
|
|
5476
|
5476
|
}
|
|
5477
|
5477
|
|
|
5478
|
5478
|
/**
|
|
@@ -5490,24 +5490,24 @@ discard block |
|
|
block discarded – undo |
|
5490
|
5490
|
* @param string $post_type Post type.
|
|
5491
|
5491
|
* @return string The SQL query.
|
|
5492
|
5492
|
*/
|
|
5493
|
|
-function geodir_imex_get_events_query( $query, $post_type ) {
|
|
5494
|
|
- if ( $post_type == 'gd_event' ) {
|
|
|
5493
|
+function geodir_imex_get_events_query($query, $post_type) {
|
|
|
5494
|
+ if ($post_type == 'gd_event') {
|
|
5495
|
5495
|
global $wpdb, $plugin_prefix;
|
|
5496
|
5496
|
|
|
5497
|
|
- $table = $plugin_prefix . $post_type . '_detail';
|
|
|
5497
|
+ $table = $plugin_prefix.$post_type.'_detail';
|
|
5498
|
5498
|
$schedule_table = EVENT_SCHEDULE;
|
|
5499
|
5499
|
|
|
5500
|
5500
|
// Skip listing with statuses trash, auto-draft etc...
|
|
5501
|
5501
|
$skip_statuses = geodir_imex_export_skip_statuses();
|
|
5502
|
5502
|
$where_statuses = '';
|
|
5503
|
|
- if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
5504
|
|
- $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
|
5503
|
+ if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
|
5504
|
+ $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
5505
|
5505
|
}
|
|
5506
|
5506
|
|
|
5507
|
5507
|
/** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */
|
|
5508
|
|
- $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );
|
|
|
5508
|
+ $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);
|
|
5509
|
5509
|
|
|
5510
|
|
- $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 );
|
|
|
5510
|
+ $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);
|
|
5511
|
5511
|
}
|
|
5512
|
5512
|
|
|
5513
|
5513
|
return $query;
|
|
@@ -5531,35 +5531,35 @@ discard block |
|
|
block discarded – undo |
|
5531
|
5531
|
* @param string $post_type Post type.
|
|
5532
|
5532
|
* @return int Total terms count.
|
|
5533
|
5533
|
*/
|
|
5534
|
|
-function geodir_get_terms_count( $post_type ) {
|
|
5535
|
|
- $args = array( 'hide_empty' => 0 );
|
|
|
5534
|
+function geodir_get_terms_count($post_type) {
|
|
|
5535
|
+ $args = array('hide_empty' => 0);
|
|
5536
|
5536
|
|
|
5537
|
|
- remove_all_filters( 'get_terms' );
|
|
|
5537
|
+ remove_all_filters('get_terms');
|
|
5538
|
5538
|
|
|
5539
|
|
- $taxonomy = $post_type . 'category';
|
|
|
5539
|
+ $taxonomy = $post_type.'category';
|
|
5540
|
5540
|
|
|
5541
|
5541
|
// WPML
|
|
5542
|
5542
|
$is_wpml = geodir_is_wpml();
|
|
5543
|
5543
|
$active_lang = 'all';
|
|
5544
|
|
- if ( $is_wpml ) {
|
|
|
5544
|
+ if ($is_wpml) {
|
|
5545
|
5545
|
global $sitepress;
|
|
5546
|
5546
|
$active_lang = $sitepress->get_current_language();
|
|
5547
|
5547
|
|
|
5548
|
|
- if ( $active_lang != 'all' ) {
|
|
5549
|
|
- $sitepress->switch_lang( 'all', true );
|
|
|
5548
|
+ if ($active_lang != 'all') {
|
|
|
5549
|
+ $sitepress->switch_lang('all', true);
|
|
5550
|
5550
|
}
|
|
5551
|
5551
|
}
|
|
5552
|
5552
|
// WPML
|
|
5553
|
5553
|
|
|
5554
|
|
- $count_terms = wp_count_terms( $taxonomy, $args );
|
|
|
5554
|
+ $count_terms = wp_count_terms($taxonomy, $args);
|
|
5555
|
5555
|
|
|
5556
|
5556
|
// WPML
|
|
5557
|
|
- if ( $is_wpml && $active_lang !== 'all' ) {
|
|
|
5557
|
+ if ($is_wpml && $active_lang !== 'all') {
|
|
5558
|
5558
|
global $sitepress;
|
|
5559
|
|
- $sitepress->switch_lang( $active_lang, true );
|
|
|
5559
|
+ $sitepress->switch_lang($active_lang, true);
|
|
5560
|
5560
|
}
|
|
5561
|
5561
|
// WPML
|
|
5562
|
|
- $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;
|
|
|
5562
|
+ $count_terms = !is_wp_error($count_terms) ? $count_terms : 0;
|
|
5563
|
5563
|
|
|
5564
|
5564
|
return $count_terms;
|
|
5565
|
5565
|
}
|
|
@@ -5576,23 +5576,23 @@ discard block |
|
|
block discarded – undo |
|
5576
|
5576
|
* @param int $page_no Page number. Default 0.
|
|
5577
|
5577
|
* @return array Array of terms data.
|
|
5578
|
5578
|
*/
|
|
5579
|
|
-function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
5580
|
|
- $args = array( 'hide_empty' => 0, 'orderby' => 'id' );
|
|
|
5579
|
+function geodir_imex_get_terms($post_type, $per_page = 0, $page_no = 0) {
|
|
|
5580
|
+ $args = array('hide_empty' => 0, 'orderby' => 'id');
|
|
5581
|
5581
|
|
|
5582
|
|
- remove_all_filters( 'get_terms' );
|
|
|
5582
|
+ remove_all_filters('get_terms');
|
|
5583
|
5583
|
|
|
5584
|
|
- $taxonomy = $post_type . 'category';
|
|
|
5584
|
+ $taxonomy = $post_type.'category';
|
|
5585
|
5585
|
|
|
5586
|
|
- if ( $per_page > 0 && $page_no > 0 ) {
|
|
5587
|
|
- $args['offset'] = ( $page_no - 1 ) * $per_page;
|
|
|
5586
|
+ if ($per_page > 0 && $page_no > 0) {
|
|
|
5587
|
+ $args['offset'] = ($page_no - 1) * $per_page;
|
|
5588
|
5588
|
$args['number'] = $per_page;
|
|
5589
|
5589
|
}
|
|
5590
|
5590
|
|
|
5591
|
|
- $terms = get_terms( $taxonomy, $args );
|
|
|
5591
|
+ $terms = get_terms($taxonomy, $args);
|
|
5592
|
5592
|
|
|
5593
|
5593
|
$csv_rows = array();
|
|
5594
|
5594
|
|
|
5595
|
|
- if ( !empty( $terms ) ) {
|
|
|
5595
|
+ if (!empty($terms)) {
|
|
5596
|
5596
|
$csv_row = array();
|
|
5597
|
5597
|
$csv_row[] = 'cat_id';
|
|
5598
|
5598
|
$csv_row[] = 'cat_name';
|
|
@@ -5614,16 +5614,16 @@ discard block |
|
|
block discarded – undo |
|
5614
|
5614
|
|
|
5615
|
5615
|
$csv_rows[] = $csv_row;
|
|
5616
|
5616
|
|
|
5617
|
|
- foreach ( $terms as $term ) {
|
|
5618
|
|
- $cat_icon = get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type );
|
|
5619
|
|
- $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';
|
|
|
5617
|
+ foreach ($terms as $term) {
|
|
|
5618
|
+ $cat_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $post_type);
|
|
|
5619
|
+ $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';
|
|
5620
|
5620
|
|
|
5621
|
|
- $cat_image = geodir_get_default_catimage( $term->term_id, $post_type );
|
|
5622
|
|
- $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';
|
|
|
5621
|
+ $cat_image = geodir_get_default_catimage($term->term_id, $post_type);
|
|
|
5622
|
+ $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : '';
|
|
5623
|
5623
|
|
|
5624
|
5624
|
$cat_parent = '';
|
|
5625
|
|
- if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {
|
|
5626
|
|
- $parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy );
|
|
|
5625
|
+ if (isset($term->parent) && (int) $term->parent > 0 && term_exists((int) $term->parent, $taxonomy)) {
|
|
|
5626
|
+ $parent_term = (array) get_term_by('id', (int) $term->parent, $taxonomy);
|
|
5627
|
5627
|
$cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : '';
|
|
5628
|
5628
|
}
|
|
5629
|
5629
|
|
|
@@ -5633,15 +5633,15 @@ discard block |
|
|
block discarded – undo |
|
5633
|
5633
|
$csv_row[] = $term->slug;
|
|
5634
|
5634
|
$csv_row[] = $post_type;
|
|
5635
|
5635
|
$csv_row[] = $cat_parent;
|
|
5636
|
|
- $csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );
|
|
|
5636
|
+ $csv_row[] = get_tax_meta($term->term_id, 'ct_cat_schema', false, $post_type);
|
|
5637
|
5637
|
// WPML
|
|
5638
|
5638
|
if ($is_wpml) {
|
|
5639
|
|
- $csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );
|
|
5640
|
|
- $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );
|
|
|
5639
|
+ $csv_row[] = geodir_get_language_for_element($term->term_id, 'tax_'.$taxonomy);
|
|
|
5640
|
+ $csv_row[] = geodir_imex_original_post_id($term->term_id, 'tax_'.$taxonomy);
|
|
5641
|
5641
|
}
|
|
5642
|
5642
|
// WPML
|
|
5643
|
5643
|
$csv_row[] = $term->description;
|
|
5644
|
|
- $csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );
|
|
|
5644
|
+ $csv_row[] = get_tax_meta($term->term_id, 'ct_cat_top_desc', false, $post_type);
|
|
5645
|
5645
|
$csv_row[] = $cat_image;
|
|
5646
|
5646
|
$csv_row[] = $cat_icon;
|
|
5647
|
5647
|
|
|
@@ -5660,10 +5660,10 @@ discard block |
|
|
block discarded – undo |
|
5660
|
5660
|
* @param bool $relative True for relative path & False for absolute path.
|
|
5661
|
5661
|
* @return string Path to the cache directory.
|
|
5662
|
5662
|
*/
|
|
5663
|
|
-function geodir_path_import_export( $relative = true ) {
|
|
|
5663
|
+function geodir_path_import_export($relative = true) {
|
|
5664
|
5664
|
$upload_dir = wp_upload_dir();
|
|
5665
|
5665
|
|
|
5666
|
|
- return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache';
|
|
|
5666
|
+ return $relative ? $upload_dir['baseurl'].'/cache' : $upload_dir['basedir'].'/cache';
|
|
5667
|
5667
|
}
|
|
5668
|
5668
|
|
|
5669
|
5669
|
/**
|
|
@@ -5679,8 +5679,8 @@ discard block |
|
|
block discarded – undo |
|
5679
|
5679
|
* @param bool $clear If true then it overwrite data otherwise add rows at the end of file.
|
|
5680
|
5680
|
* @return bool true if success otherwise false.
|
|
5681
|
5681
|
*/
|
|
5682
|
|
-function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {
|
|
5683
|
|
- if ( empty( $csv_data ) ) {
|
|
|
5682
|
+function geodir_save_csv_data($file_path, $csv_data = array(), $clear = true) {
|
|
|
5683
|
+ if (empty($csv_data)) {
|
|
5684
|
5684
|
return false;
|
|
5685
|
5685
|
}
|
|
5686
|
5686
|
|
|
@@ -5688,17 +5688,17 @@ discard block |
|
|
block discarded – undo |
|
5688
|
5688
|
|
|
5689
|
5689
|
$mode = $clear ? 'w+' : 'a+';
|
|
5690
|
5690
|
|
|
5691
|
|
- if ( function_exists( 'fputcsv' ) ) {
|
|
5692
|
|
- $file = fopen( $file_path, $mode );
|
|
5693
|
|
- foreach( $csv_data as $csv_row ) {
|
|
|
5691
|
+ if (function_exists('fputcsv')) {
|
|
|
5692
|
+ $file = fopen($file_path, $mode);
|
|
|
5693
|
+ foreach ($csv_data as $csv_row) {
|
|
5694
|
5694
|
//$csv_row = array_map( 'utf8_decode', $csv_row );
|
|
5695
|
|
- $write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' );
|
|
|
5695
|
+ $write_successful = fputcsv($file, $csv_row, ",", $enclosure = '"');
|
|
5696
|
5696
|
}
|
|
5697
|
|
- fclose( $file );
|
|
|
5697
|
+ fclose($file);
|
|
5698
|
5698
|
} else {
|
|
5699
|
|
- foreach( $csv_data as $csv_row ) {
|
|
|
5699
|
+ foreach ($csv_data as $csv_row) {
|
|
5700
|
5700
|
//$csv_row = array_map( 'utf8_decode', $csv_row );
|
|
5701
|
|
- $wp_filesystem->put_contents( $file_path, $csv_row );
|
|
|
5701
|
+ $wp_filesystem->put_contents($file_path, $csv_row);
|
|
5702
|
5702
|
}
|
|
5703
|
5703
|
}
|
|
5704
|
5704
|
|
|
@@ -5716,14 +5716,14 @@ discard block |
|
|
block discarded – undo |
|
5716
|
5716
|
* @param string $file Full path to file.
|
|
5717
|
5717
|
* @return int No of file rows.
|
|
5718
|
5718
|
*/
|
|
5719
|
|
-function geodir_import_export_line_count( $file ) {
|
|
|
5719
|
+function geodir_import_export_line_count($file) {
|
|
5720
|
5720
|
global $wp_filesystem;
|
|
5721
|
5721
|
|
|
5722
|
|
- if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {
|
|
5723
|
|
- $contents = $wp_filesystem->get_contents_array( $file );
|
|
|
5722
|
+ if ($wp_filesystem->is_file($file) && $wp_filesystem->exists($file)) {
|
|
|
5723
|
+ $contents = $wp_filesystem->get_contents_array($file);
|
|
5724
|
5724
|
|
|
5725
|
|
- if ( !empty( $contents ) && is_array( $contents ) ) {
|
|
5726
|
|
- return count( $contents ) - 1;
|
|
|
5725
|
+ if (!empty($contents) && is_array($contents)) {
|
|
|
5726
|
+ return count($contents) - 1;
|
|
5727
|
5727
|
}
|
|
5728
|
5728
|
}
|
|
5729
|
5729
|
|
|
@@ -5740,11 +5740,11 @@ discard block |
|
|
block discarded – undo |
|
5740
|
5740
|
* @param string $post_type The post type.
|
|
5741
|
5741
|
* @return object Queried object.
|
|
5742
|
5742
|
*/
|
|
5743
|
|
-function geodir_imex_get_custom_fields( $post_type ) {
|
|
|
5743
|
+function geodir_imex_get_custom_fields($post_type) {
|
|
5744
|
5744
|
global $wpdb;
|
|
5745
|
5745
|
|
|
5746
|
|
- $sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array( $post_type ) );
|
|
5747
|
|
- $rows = $wpdb->get_results( $sql );
|
|
|
5746
|
+ $sql = $wpdb->prepare("SELECT htmlvar_name FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array($post_type));
|
|
|
5747
|
+ $rows = $wpdb->get_results($sql);
|
|
5748
|
5748
|
|
|
5749
|
5749
|
return $rows;
|
|
5750
|
5750
|
}
|
|
@@ -5760,10 +5760,10 @@ discard block |
|
|
block discarded – undo |
|
5760
|
5760
|
* @return array Event data array.
|
|
5761
|
5761
|
*/
|
|
5762
|
5762
|
function geodir_imex_get_event_data($post, $gd_post_info) {
|
|
5763
|
|
- $event_date = isset( $post['event_date'] ) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $post['event_date'] ) ) : '';
|
|
|
5763
|
+ $event_date = isset($post['event_date']) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($post['event_date'])) : '';
|
|
5764
|
5764
|
$event_enddate = $event_date;
|
|
5765
|
|
- $starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : '';
|
|
5766
|
|
- $endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : '';
|
|
|
5765
|
+ $starttime = isset($post['starttime']) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['starttime'])) : '';
|
|
|
5766
|
+ $endtime = isset($post['endtime']) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['endtime'])) : '';
|
|
5767
|
5767
|
|
|
5768
|
5768
|
$is_recurring_event = '';
|
|
5769
|
5769
|
$event_duration_days = '';
|
|
@@ -5780,15 +5780,15 @@ discard block |
|
|
block discarded – undo |
|
5780
|
5780
|
|
|
5781
|
5781
|
$recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array();
|
|
5782
|
5782
|
if (!empty($recurring_data)) {
|
|
5783
|
|
- $event_date = isset( $recurring_data['event_start'] ) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_start'] ) ) : $event_date;
|
|
5784
|
|
- $event_enddate = isset( $recurring_data['event_end'] ) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_end'] ) ) : $event_date;
|
|
5785
|
|
- $starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime;
|
|
5786
|
|
- $endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime;
|
|
|
5783
|
+ $event_date = isset($recurring_data['event_start']) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_start'])) : $event_date;
|
|
|
5784
|
+ $event_enddate = isset($recurring_data['event_end']) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_end'])) : $event_date;
|
|
|
5785
|
+ $starttime = isset($recurring_data['starttime']) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['starttime'])) : $starttime;
|
|
|
5786
|
+ $endtime = isset($recurring_data['endtime']) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['endtime'])) : $endtime;
|
|
5787
|
5787
|
$is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : '';
|
|
5788
|
5788
|
$different_times = !empty($recurring_data['different_times']) ? true : false;
|
|
5789
|
5789
|
|
|
5790
|
|
- $recurring_pkg = geodir_event_recurring_pkg( $gd_post_info );
|
|
5791
|
|
- $is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true;
|
|
|
5790
|
+ $recurring_pkg = geodir_event_recurring_pkg($gd_post_info);
|
|
|
5791
|
+ $is_recurring = isset($gd_post_info->is_recurring) && (int) $gd_post_info->is_recurring == 0 ? false : true;
|
|
5792
|
5792
|
|
|
5793
|
5793
|
if ($recurring_pkg && $is_recurring) {
|
|
5794
|
5794
|
$recurring_dates = $event_date;
|
|
@@ -5798,13 +5798,13 @@ discard block |
|
|
block discarded – undo |
|
5798
|
5798
|
$recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';
|
|
5799
|
5799
|
|
|
5800
|
5800
|
if (!empty($recurring_data['event_recurring_dates'])) {
|
|
5801
|
|
- $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );
|
|
|
5801
|
+ $event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);
|
|
5802
|
5802
|
|
|
5803
|
5803
|
if (!empty($event_recurring_dates)) {
|
|
5804
|
5804
|
$recurring_dates = array();
|
|
5805
|
5805
|
|
|
5806
|
5806
|
foreach ($event_recurring_dates as $date) {
|
|
5807
|
|
- $recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) );
|
|
|
5807
|
+ $recurring_dates[] = date_i18n('d/m/Y', strtotime($date));
|
|
5808
|
5808
|
}
|
|
5809
|
5809
|
|
|
5810
|
5810
|
$recurring_dates = implode(",", $recurring_dates);
|
|
@@ -5820,7 +5820,7 @@ discard block |
|
|
block discarded – undo |
|
5820
|
5820
|
$times = array();
|
|
5821
|
5821
|
|
|
5822
|
5822
|
foreach ($recurring_data['starttimes'] as $time) {
|
|
5823
|
|
- $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';
|
|
|
5823
|
+ $times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';
|
|
5824
|
5824
|
}
|
|
5825
|
5825
|
|
|
5826
|
5826
|
$event_starttimes = implode(",", $times);
|
|
@@ -5830,7 +5830,7 @@ discard block |
|
|
block discarded – undo |
|
5830
|
5830
|
$times = array();
|
|
5831
|
5831
|
|
|
5832
|
5832
|
foreach ($recurring_data['endtimes'] as $time) {
|
|
5833
|
|
- $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';
|
|
|
5833
|
+ $times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';
|
|
5834
|
5834
|
}
|
|
5835
|
5835
|
|
|
5836
|
5836
|
$event_endtimes = implode(",", $times);
|
|
@@ -5842,8 +5842,8 @@ discard block |
|
|
block discarded – undo |
|
5842
|
5842
|
}
|
|
5843
|
5843
|
}
|
|
5844
|
5844
|
} else {
|
|
5845
|
|
- $event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1;
|
|
5846
|
|
- $recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;
|
|
|
5845
|
+ $event_duration_days = isset($recurring_data['duration_x']) ? (int) $recurring_data['duration_x'] : 1;
|
|
|
5846
|
+ $recurring_interval = !empty($recurring_data['repeat_x']) && (int) $recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;
|
|
5847
|
5847
|
|
|
5848
|
5848
|
if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {
|
|
5849
|
5849
|
$week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');
|
|
@@ -5859,11 +5859,11 @@ discard block |
|
|
block discarded – undo |
|
5859
|
5859
|
}
|
|
5860
|
5860
|
|
|
5861
|
5861
|
$recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;
|
|
5862
|
|
- if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {
|
|
5863
|
|
- $recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['repeat_end'] ) ) : '';
|
|
|
5862
|
+ if (!empty($recurring_data['repeat_end_type']) && (int) $recurring_data['repeat_end_type'] == 1) {
|
|
|
5863
|
+ $recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['repeat_end'])) : '';
|
|
5864
|
5864
|
$max_recurring_count = empty($recurring_end_date) ? 1 : '';
|
|
5865
|
5865
|
} else {
|
|
5866
|
|
- $max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1);
|
|
|
5866
|
+ $max_recurring_count = (!empty($recurring_data['max_repeat']) && (int) $recurring_data['max_repeat'] > 0 ? (int) $recurring_data['max_repeat'] : 1);
|
|
5867
|
5867
|
}
|
|
5868
|
5868
|
}
|
|
5869
|
5869
|
}
|
|
@@ -5927,9 +5927,9 @@ discard block |
|
|
block discarded – undo |
|
5927
|
5927
|
* @return array Event data array.
|
|
5928
|
5928
|
*/
|
|
5929
|
5929
|
function geodir_imex_process_event_data($gd_post) {
|
|
5930
|
|
- $recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post );
|
|
|
5930
|
+ $recurring_pkg = geodir_event_recurring_pkg((object) $gd_post);
|
|
5931
|
5931
|
|
|
5932
|
|
- $is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true;
|
|
|
5932
|
+ $is_recurring = isset($gd_post['is_recurring_event']) && (int) $gd_post['is_recurring_event'] == 0 ? false : true;
|
|
5933
|
5933
|
$event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_imex_get_date_ymd($gd_post['event_date']) : '';
|
|
5934
|
5934
|
$event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_imex_get_date_ymd($gd_post['event_enddate']) : $event_date;
|
|
5935
|
5935
|
$all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false;
|
|
@@ -5976,17 +5976,17 @@ discard block |
|
|
block discarded – undo |
|
5976
|
5976
|
$event_recurring_dates = implode(",", $event_recurring_dates);
|
|
5977
|
5977
|
}
|
|
5978
|
5978
|
} else {
|
|
5979
|
|
- $duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1;
|
|
5980
|
|
- $repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1;
|
|
5981
|
|
- $max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1;
|
|
5982
|
|
- $repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';
|
|
|
5979
|
+ $duration_x = !empty($gd_post['event_duration_days']) ? (int) $gd_post['event_duration_days'] : 1;
|
|
|
5980
|
+ $repeat_x = !empty($gd_post['recurring_interval']) ? (int) $gd_post['recurring_interval'] : 1;
|
|
|
5981
|
+ $max_repeat = !empty($gd_post['max_recurring_count']) ? (int) $gd_post['max_recurring_count'] : 1;
|
|
|
5982
|
+ $repeat_end = !empty($gd_post['recurring_end_date']) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';
|
|
5983
|
5983
|
|
|
5984
|
5984
|
$repeat_end_type = $repeat_end != '' ? 1 : 0;
|
|
5985
|
5985
|
$max_repeat = $repeat_end != '' ? '' : $max_repeat;
|
|
5986
|
5986
|
|
|
5987
|
5987
|
$week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));
|
|
5988
|
5988
|
|
|
5989
|
|
- $a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();
|
|
|
5989
|
+ $a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days']) != '' ? explode(',', trim($gd_post['recurring_week_days'])) : array();
|
|
5990
|
5990
|
$repeat_days = array();
|
|
5991
|
5991
|
if (!empty($a_repeat_days)) {
|
|
5992
|
5992
|
foreach ($a_repeat_days as $repeat_day) {
|
|
@@ -6004,7 +6004,7 @@ discard block |
|
|
block discarded – undo |
|
6004
|
6004
|
$repeat_weeks = array();
|
|
6005
|
6005
|
if (!empty($a_repeat_weeks)) {
|
|
6006
|
6006
|
foreach ($a_repeat_weeks as $repeat_week) {
|
|
6007
|
|
- $repeat_weeks[] = (int)$repeat_week;
|
|
|
6007
|
+ $repeat_weeks[] = (int) $repeat_week;
|
|
6008
|
6008
|
}
|
|
6009
|
6009
|
|
|
6010
|
6010
|
$repeat_weeks = array_unique($repeat_weeks);
|
|
@@ -6068,7 +6068,7 @@ discard block |
|
|
block discarded – undo |
|
6068
|
6068
|
|
|
6069
|
6069
|
$page_found = $wpdb->get_var(
|
|
6070
|
6070
|
$wpdb->prepare(
|
|
6071
|
|
- "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",
|
|
|
6071
|
+ "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;",
|
|
6072
|
6072
|
array($slug)
|
|
6073
|
6073
|
)
|
|
6074
|
6074
|
);
|
|
@@ -6123,7 +6123,7 @@ discard block |
|
|
block discarded – undo |
|
6123
|
6123
|
*/
|
|
6124
|
6124
|
function geodir_admin_upgrade_notice() {
|
|
6125
|
6125
|
$class = "error";
|
|
6126
|
|
- $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
|
6126
|
+ $message = __("Please update core GeoDirectory or some addons may not function correctly.", "geodirectory");
|
|
6127
|
6127
|
echo"<div class=\"$class\"> <p>$message</p></div>";
|
|
6128
|
6128
|
}
|
|
6129
|
6129
|
|
|
@@ -6135,7 +6135,7 @@ discard block |
|
|
block discarded – undo |
|
6135
|
6135
|
* @param (object) $r
|
|
6136
|
6136
|
* @return (string) $output
|
|
6137
|
6137
|
*/
|
|
6138
|
|
-function geodire_admin_upgrade_notice( $plugin_data, $r )
|
|
|
6138
|
+function geodire_admin_upgrade_notice($plugin_data, $r)
|
|
6139
|
6139
|
{
|
|
6140
|
6140
|
// readme contents
|
|
6141
|
6141
|
$args = array(
|
|
@@ -6143,7 +6143,7 @@ discard block |
|
|
block discarded – undo |
|
6143
|
6143
|
'redirection' => 5
|
|
6144
|
6144
|
);
|
|
6145
|
6145
|
$url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";
|
|
6146
|
|
- $data = wp_remote_get( $url, $args );
|
|
|
6146
|
+ $data = wp_remote_get($url, $args);
|
|
6147
|
6147
|
|
|
6148
|
6148
|
if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
|
6149
|
6149
|
|
|
@@ -6158,20 +6158,20 @@ discard block |
|
|
block discarded – undo |
|
6158
|
6158
|
function geodir_in_plugin_update_message($content) {
|
|
6159
|
6159
|
// Output Upgrade Notice
|
|
6160
|
6160
|
$matches = null;
|
|
6161
|
|
- $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';
|
|
|
6161
|
+ $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*'.preg_quote(GEODIRECTORY_VERSION).'\s*=|$)~Uis';
|
|
6162
|
6162
|
$upgrade_notice = '';
|
|
6163
|
|
- if ( preg_match( $regexp, $content, $matches ) ) {
|
|
6164
|
|
- if(empty($matches)){return;}
|
|
|
6163
|
+ if (preg_match($regexp, $content, $matches)) {
|
|
|
6164
|
+ if (empty($matches)) {return; }
|
|
6165
|
6165
|
|
|
6166
|
|
- $version = trim( $matches[1] );
|
|
6167
|
|
- if($version && $version>GEODIRECTORY_VERSION){
|
|
|
6166
|
+ $version = trim($matches[1]);
|
|
|
6167
|
+ if ($version && $version > GEODIRECTORY_VERSION) {
|
|
6168
|
6168
|
|
|
6169
|
6169
|
|
|
6170
|
|
- $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
6171
|
|
- if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
|
6170
|
+ $notices = (array) preg_split('~[\r\n]+~', trim($matches[2]));
|
|
|
6171
|
+ if (version_compare(GEODIRECTORY_VERSION, $version, '<')) {
|
|
6172
|
6172
|
$upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';
|
|
6173
|
|
- foreach ( $notices as $index => $line ) {
|
|
6174
|
|
- $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
|
6173
|
+ foreach ($notices as $index => $line) {
|
|
|
6174
|
+ $upgrade_notice .= wp_kses_post(preg_replace('~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line));
|
|
6175
|
6175
|
}
|
|
6176
|
6176
|
$upgrade_notice .= '</div> ';
|
|
6177
|
6177
|
}
|
|
@@ -6195,7 +6195,7 @@ discard block |
|
|
block discarded – undo |
|
6195
|
6195
|
$default_language = $sitepress->get_default_language();
|
|
6196
|
6196
|
if ($current_language != 'all' && $current_language != $default_language) {
|
|
6197
|
6197
|
?>
|
|
6198
|
|
- <div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory');?></strong></p></div>
|
|
|
6198
|
+ <div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory'); ?></strong></p></div>
|
|
6199
|
6199
|
<?php
|
|
6200
|
6200
|
}
|
|
6201
|
6201
|
}
|
|
@@ -6210,7 +6210,7 @@ discard block |
|
|
block discarded – undo |
|
6210
|
6210
|
* @param array Listing statuses to be skipped.
|
|
6211
|
6211
|
*/
|
|
6212
|
6212
|
function geodir_imex_export_skip_statuses() {
|
|
6213
|
|
- $statuses = array( 'trash', 'auto-draft' );
|
|
|
6213
|
+ $statuses = array('trash', 'auto-draft');
|
|
6214
|
6214
|
|
|
6215
|
6215
|
/**
|
|
6216
|
6216
|
* Filter the statuses to skip during GD export listings.
|
|
@@ -6220,7 +6220,7 @@ discard block |
|
|
block discarded – undo |
|
6220
|
6220
|
*
|
|
6221
|
6221
|
* @param array $statuses Listing statuses to be skipped.
|
|
6222
|
6222
|
*/
|
|
6223
|
|
- $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );
|
|
|
6223
|
+ $statuses = apply_filters('geodir_imex_export_skip_statuses', $statuses);
|
|
6224
|
6224
|
|
|
6225
|
6225
|
return $statuses;
|
|
6226
|
6226
|
}
|
|
@@ -6291,16 +6291,16 @@ discard block |
|
|
block discarded – undo |
|
6291
|
6291
|
function geodir_imex_get_filter_where($where = '', $post_type = '') {
|
|
6292
|
6292
|
global $wpdb;
|
|
6293
|
6293
|
|
|
6294
|
|
- $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;
|
|
|
6294
|
+ $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;
|
|
6295
|
6295
|
|
|
6296
|
|
- if ( !empty( $filters ) ) {
|
|
6297
|
|
- foreach ( $filters as $field => $value ) {
|
|
|
6296
|
+ if (!empty($filters)) {
|
|
|
6297
|
+ foreach ($filters as $field => $value) {
|
|
6298
|
6298
|
switch ($field) {
|
|
6299
|
6299
|
case 'start_date':
|
|
6300
|
|
- $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";
|
|
|
6300
|
+ $where .= " AND `".$wpdb->posts."`.`post_date` >= '".sanitize_text_field($value)." 00:00:00'";
|
|
6301
|
6301
|
break;
|
|
6302
|
6302
|
case 'end_date':
|
|
6303
|
|
- $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";
|
|
|
6303
|
+ $where .= " AND `".$wpdb->posts."`.`post_date` <= '".sanitize_text_field($value)." 23:59:59'";
|
|
6304
|
6304
|
break;
|
|
6305
|
6305
|
}
|
|
6306
|
6306
|
}
|
|
@@ -6312,25 +6312,25 @@ discard block |
|
|
block discarded – undo |
|
6312
|
6312
|
add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);
|
|
6313
|
6313
|
|
|
6314
|
6314
|
|
|
6315
|
|
-function geodir_fix_for_primer_theme(){
|
|
6316
|
|
- if(!defined( 'PRIMER_VERSION' )){return;}
|
|
|
6315
|
+function geodir_fix_for_primer_theme() {
|
|
|
6316
|
+ if (!defined('PRIMER_VERSION')) {return; }
|
|
6317
|
6317
|
global $pagenow;
|
|
6318
|
6318
|
|
|
6319
|
|
- if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
|
6319
|
+ if (('post.php' === $pagenow || 'post-new.php' === $pagenow) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']))) {
|
|
6320
|
6320
|
|
|
6321
|
|
- $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] );
|
|
|
6321
|
+ $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type($_GET['post']);
|
|
6322
|
6322
|
|
|
6323
|
6323
|
$post_types = geodir_get_posttypes();
|
|
6324
|
|
- if ($post_type && in_array($post_type, $post_types) ) {
|
|
|
6324
|
+ if ($post_type && in_array($post_type, $post_types)) {
|
|
6325
|
6325
|
global $primer_customizer_layouts;
|
|
6326
|
|
- remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10);
|
|
|
6326
|
+ remove_action('add_meta_boxes', array($primer_customizer_layouts, 'add_meta_box'), 10);
|
|
6327
|
6327
|
}
|
|
6328
|
6328
|
}
|
|
6329
|
6329
|
|
|
6330
|
6330
|
}
|
|
6331
|
6331
|
|
|
6332
|
|
-if(is_admin()){
|
|
6333
|
|
- add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
|
6332
|
+if (is_admin()) {
|
|
|
6333
|
+ add_action('add_meta_boxes', 'geodir_fix_for_primer_theme', 0);
|
|
6334
|
6334
|
}
|
|
6335
|
6335
|
|
|
6336
|
6336
|
|
|
@@ -6463,32 +6463,32 @@ discard block |
|
|
block discarded – undo |
|
6463
|
6463
|
|
|
6464
|
6464
|
function geodir_ga_activation_url() {
|
|
6465
|
6465
|
|
|
6466
|
|
- return add_query_arg( array(
|
|
|
6466
|
+ return add_query_arg(array(
|
|
6467
|
6467
|
'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
|
6468
|
6468
|
'scope' => GEODIR_GA_SCOPE,
|
|
6469
|
6469
|
'response_type' => 'code',
|
|
6470
|
6470
|
'redirect_uri' => GEODIR_GA_REDIRECT,
|
|
6471
|
6471
|
'client_id' => GEODIR_GA_CLIENTID,
|
|
6472
|
|
- ), 'https://accounts.google.com/o/oauth2/auth' );
|
|
|
6472
|
+ ), 'https://accounts.google.com/o/oauth2/auth');
|
|
6473
|
6473
|
|
|
6474
|
6474
|
return $url;
|
|
6475
|
6475
|
}
|
|
6476
|
6476
|
|
|
6477
|
|
-function geodir_gd_accounts(){
|
|
|
6477
|
+function geodir_gd_accounts() {
|
|
6478
|
6478
|
$accounts = array();
|
|
6479
|
|
- $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true );
|
|
6480
|
|
- if($useAuth){
|
|
|
6479
|
+ $useAuth = (get_option('geodir_ga_auth_code') == '' ? false : true);
|
|
|
6480
|
+ if ($useAuth) {
|
|
6481
|
6481
|
try {
|
|
6482
|
6482
|
$accounts = geodir_ga_get_analytics_accounts();
|
|
6483
|
6483
|
} catch (Exception $e) {
|
|
6484
|
|
- geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) );
|
|
|
6484
|
+ geodir_error_log(wp_sprintf(__('GD Google Analytics API Error(%s) : %s', 'geodirectory'), $e->getCode(), $e->getMessage()));
|
|
6485
|
6485
|
}
|
|
6486
|
6486
|
|
|
6487
|
|
- if(is_array($accounts)){
|
|
6488
|
|
- $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
6489
|
|
- }elseif(get_option('geodir_ga_account_id')){
|
|
|
6487
|
+ if (is_array($accounts)) {
|
|
|
6488
|
+ $accounts = array_merge(array(__('Select Account', 'geodirectory')), $accounts);
|
|
|
6489
|
+ }elseif (get_option('geodir_ga_account_id')) {
|
|
6490
|
6490
|
$accounts = array();
|
|
6491
|
|
- $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
|
6491
|
+ $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required', 'geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
6492
|
6492
|
}
|
|
6493
|
6493
|
}
|
|
6494
|
6494
|
return $accounts;
|
|
@@ -6499,21 +6499,21 @@ discard block |
|
|
block discarded – undo |
|
6499
|
6499
|
global $gd_ga_errors;
|
|
6500
|
6500
|
$accounts = array();
|
|
6501
|
6501
|
|
|
6502
|
|
- if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
|
6502
|
+ if (get_option('geodir_ga_auth_token') === false) {update_option('geodir_ga_auth_token', ''); }
|
|
6503
|
6503
|
|
|
6504
|
6504
|
|
|
6505
|
|
- if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
|
6505
|
+ if (get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])) {
|
|
6506
|
6506
|
return get_option('geodir_gd_uids');
|
|
6507
|
6507
|
}
|
|
6508
|
6508
|
|
|
6509
|
6509
|
# Create a new Gdata call
|
|
6510
|
|
- if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
|
6510
|
+ if (trim(get_option('geodir_ga_auth_code')) != '')
|
|
6511
|
6511
|
$stats = new GDGoogleAnalyticsStats();
|
|
6512
|
6512
|
else
|
|
6513
|
6513
|
return false;
|
|
6514
|
6514
|
|
|
6515
|
6515
|
# Check if Google sucessfully logged in
|
|
6516
|
|
- if ( ! $stats->checkLogin() )
|
|
|
6516
|
+ if (!$stats->checkLogin())
|
|
6517
|
6517
|
return false;
|
|
6518
|
6518
|
|
|
6519
|
6519
|
# Get a list of accounts
|
|
@@ -6525,28 +6525,28 @@ discard block |
|
|
block discarded – undo |
|
6525
|
6525
|
}
|
|
6526
|
6526
|
|
|
6527
|
6527
|
|
|
6528
|
|
- natcasesort ($accounts);
|
|
|
6528
|
+ natcasesort($accounts);
|
|
6529
|
6529
|
|
|
6530
|
6530
|
# Return the account array if there are accounts
|
|
6531
|
|
- if ( count($accounts) > 0 ){
|
|
6532
|
|
- update_option('geodir_gd_uids',$accounts);
|
|
|
6531
|
+ if (count($accounts) > 0) {
|
|
|
6532
|
+ update_option('geodir_gd_uids', $accounts);
|
|
6533
|
6533
|
return $accounts;
|
|
6534
|
6534
|
}
|
|
6535
|
6535
|
else
|
|
6536
|
6536
|
return false;
|
|
6537
|
6537
|
}
|
|
6538
|
6538
|
|
|
6539
|
|
-add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' );
|
|
6540
|
|
-function geodir_ga_deauthorize(){
|
|
|
6539
|
+add_action('wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize');
|
|
|
6540
|
+function geodir_ga_deauthorize() {
|
|
6541
|
6541
|
|
|
6542
|
|
- if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
|
6542
|
+ if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'gd_ga_deauthorize')) {
|
|
6543
|
6543
|
|
|
6544
|
|
- die( 'Security check' );
|
|
|
6544
|
+ die('Security check');
|
|
6545
|
6545
|
|
|
6546
|
6546
|
} else {
|
|
6547
|
|
- update_option('geodir_ga_auth_token','');
|
|
6548
|
|
- update_option('geodir_ga_auth_code','');
|
|
6549
|
|
- update_option('geodir_gd_uids','');
|
|
|
6547
|
+ update_option('geodir_ga_auth_token', '');
|
|
|
6548
|
+ update_option('geodir_ga_auth_code', '');
|
|
|
6549
|
+ update_option('geodir_gd_uids', '');
|
|
6550
|
6550
|
|
|
6551
|
6551
|
|
|
6552
|
6552
|
echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|