GeoDirectory /
geodirectory
@@ -28,31 +28,31 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 = ''; |
@@ -4099,78 +4099,78 @@ discard block |
||
| 4099 | 4099 | $original_post_id = ''; |
| 4100 | 4100 | |
| 4101 | 4101 | $c = 0; |
| 4102 | - foreach ($columns as $column ) {
|
|
| 4102 | + foreach ($columns as $column) {
|
|
| 4103 | 4103 | $gd_post[$column] = $row[$c]; |
| 4104 | 4104 | |
| 4105 | - if ( $column == 'post_id' ) {
|
|
| 4105 | + if ($column == 'post_id') {
|
|
| 4106 | 4106 | $post_id = $row[$c]; |
| 4107 | - } else if ( $column == 'post_title' ) {
|
|
| 4107 | + } else if ($column == 'post_title') {
|
|
| 4108 | 4108 | $post_title = sanitize_text_field($row[$c]); |
| 4109 | - } else if ( $column == 'post_author' ) {
|
|
| 4109 | + } else if ($column == 'post_author') {
|
|
| 4110 | 4110 | $post_author = $row[$c]; |
| 4111 | - } else if ( $column == 'post_content' ) {
|
|
| 4111 | + } else if ($column == 'post_content') {
|
|
| 4112 | 4112 | $post_content = $row[$c]; |
| 4113 | - } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
| 4114 | - $post_category_arr = explode( ',', $row[$c] ); |
|
| 4115 | - } else if ( $column == 'default_category' ) {
|
|
| 4113 | + } else if ($column == 'post_category' && $row[$c] != '') {
|
|
| 4114 | + $post_category_arr = explode(',', $row[$c]);
|
|
| 4115 | + } else if ($column == 'default_category') {
|
|
| 4116 | 4116 | $default_category = wp_kses_normalize_entities($row[$c]); |
| 4117 | - } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
| 4118 | - $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
| 4119 | - } else if ( $column == 'post_type' ) {
|
|
| 4117 | + } else if ($column == 'post_tags' && $row[$c] != '') {
|
|
| 4118 | + $post_tags = explode(',', sanitize_text_field($row[$c]));
|
|
| 4119 | + } else if ($column == 'post_type') {
|
|
| 4120 | 4120 | $post_type = $row[$c]; |
| 4121 | - } else if ( $column == 'post_status' ) {
|
|
| 4122 | - $post_status = sanitize_key( $row[$c] ); |
|
| 4123 | - } else if ( $column == 'is_featured' ) {
|
|
| 4124 | - $is_featured = (int)$row[$c]; |
|
| 4125 | - } else if ( $column == 'geodir_video' ) {
|
|
| 4121 | + } else if ($column == 'post_status') {
|
|
| 4122 | + $post_status = sanitize_key($row[$c]); |
|
| 4123 | + } else if ($column == 'is_featured') {
|
|
| 4124 | + $is_featured = (int) $row[$c]; |
|
| 4125 | + } else if ($column == 'geodir_video') {
|
|
| 4126 | 4126 | $geodir_video = $row[$c]; |
| 4127 | - } else if ( $column == 'post_address' ) {
|
|
| 4127 | + } else if ($column == 'post_address') {
|
|
| 4128 | 4128 | $post_address = sanitize_text_field($row[$c]); |
| 4129 | - } else if ( $column == 'post_city' ) {
|
|
| 4129 | + } else if ($column == 'post_city') {
|
|
| 4130 | 4130 | $post_city = sanitize_text_field($row[$c]); |
| 4131 | - } else if ( $column == 'post_region' ) {
|
|
| 4131 | + } else if ($column == 'post_region') {
|
|
| 4132 | 4132 | $post_region = sanitize_text_field($row[$c]); |
| 4133 | - } else if ( $column == 'post_country' ) {
|
|
| 4133 | + } else if ($column == 'post_country') {
|
|
| 4134 | 4134 | $post_country = sanitize_text_field($row[$c]); |
| 4135 | - } else if ( $column == 'post_zip' ) {
|
|
| 4135 | + } else if ($column == 'post_zip') {
|
|
| 4136 | 4136 | $post_zip = sanitize_text_field($row[$c]); |
| 4137 | - } else if ( $column == 'post_latitude' ) {
|
|
| 4137 | + } else if ($column == 'post_latitude') {
|
|
| 4138 | 4138 | $post_latitude = sanitize_text_field($row[$c]); |
| 4139 | - } else if ( $column == 'post_longitude' ) {
|
|
| 4139 | + } else if ($column == 'post_longitude') {
|
|
| 4140 | 4140 | $post_longitude = sanitize_text_field($row[$c]); |
| 4141 | - } else if ( $column == 'post_neighbourhood' ) {
|
|
| 4141 | + } else if ($column == 'post_neighbourhood') {
|
|
| 4142 | 4142 | $post_neighbourhood = sanitize_text_field($row[$c]); |
| 4143 | 4143 | unset($gd_post[$column]); |
| 4144 | - } else if ( $column == 'neighbourhood_latitude' ) {
|
|
| 4144 | + } else if ($column == 'neighbourhood_latitude') {
|
|
| 4145 | 4145 | $neighbourhood_latitude = sanitize_text_field($row[$c]); |
| 4146 | - } else if ( $column == 'neighbourhood_longitude' ) {
|
|
| 4146 | + } else if ($column == 'neighbourhood_longitude') {
|
|
| 4147 | 4147 | $neighbourhood_longitude = sanitize_text_field($row[$c]); |
| 4148 | - } else if ( $column == 'geodir_timing' ) {
|
|
| 4148 | + } else if ($column == 'geodir_timing') {
|
|
| 4149 | 4149 | $geodir_timing = sanitize_text_field($row[$c]); |
| 4150 | - } else if ( $column == 'geodir_contact' ) {
|
|
| 4150 | + } else if ($column == 'geodir_contact') {
|
|
| 4151 | 4151 | $geodir_contact = sanitize_text_field($row[$c]); |
| 4152 | - } else if ( $column == 'geodir_email' ) {
|
|
| 4152 | + } else if ($column == 'geodir_email') {
|
|
| 4153 | 4153 | $geodir_email = sanitize_email($row[$c]); |
| 4154 | - } else if ( $column == 'geodir_website' ) {
|
|
| 4154 | + } else if ($column == 'geodir_website') {
|
|
| 4155 | 4155 | $geodir_website = sanitize_text_field($row[$c]); |
| 4156 | - } else if ( $column == 'geodir_twitter' ) {
|
|
| 4156 | + } else if ($column == 'geodir_twitter') {
|
|
| 4157 | 4157 | $geodir_twitter = sanitize_text_field($row[$c]); |
| 4158 | - } else if ( $column == 'geodir_facebook' ) {
|
|
| 4158 | + } else if ($column == 'geodir_facebook') {
|
|
| 4159 | 4159 | $geodir_facebook = sanitize_text_field($row[$c]); |
| 4160 | - } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
| 4160 | + } else if ($column == 'IMAGE' && !empty($row[$c]) && $row[$c] != '') {
|
|
| 4161 | 4161 | $post_images[] = $row[$c]; |
| 4162 | - } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
| 4163 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
| 4164 | - } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
| 4162 | + } else if ($column == 'alive_days' && (int) $row[$c] > 0) {
|
|
| 4163 | + $expire_date = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $row[$c].' days'));
|
|
| 4164 | + } else if ($column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never') {
|
|
| 4165 | 4165 | $row[$c] = str_replace('/', '-', $row[$c]);
|
| 4166 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
| 4166 | + $expire_date = date_i18n('Y-m-d', strtotime($row[$c]));
|
|
| 4167 | 4167 | } |
| 4168 | 4168 | // WPML |
| 4169 | 4169 | if ($is_wpml) {
|
| 4170 | 4170 | if ($column == 'language') {
|
| 4171 | 4171 | $language = geodir_strtolower(trim($row[$c])); |
| 4172 | 4172 | } else if ($column == 'original_post_id') {
|
| 4173 | - $original_post_id = (int)$row[$c]; |
|
| 4173 | + $original_post_id = (int) $row[$c]; |
|
| 4174 | 4174 | } |
| 4175 | 4175 | } |
| 4176 | 4176 | // WPML |
@@ -4178,7 +4178,7 @@ discard block |
||
| 4178 | 4178 | } |
| 4179 | 4179 | // listing claimed or not |
| 4180 | 4180 | if ($is_claim_active && isset($gd_post['claimed'])) {
|
| 4181 | - $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4181 | + $gd_post['claimed'] = (int) $gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4182 | 4182 | } |
| 4183 | 4183 | |
| 4184 | 4184 | // WPML |
@@ -4189,43 +4189,43 @@ discard block |
||
| 4189 | 4189 | |
| 4190 | 4190 | $gd_post['IMAGE'] = $post_images; |
| 4191 | 4191 | |
| 4192 | - $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 4193 | - $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 4192 | + $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status; |
|
| 4193 | + $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status; |
|
| 4194 | 4194 | |
| 4195 | 4195 | $valid = true; |
| 4196 | 4196 | |
| 4197 | - if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
| 4197 | + if ($post_title == '' || !in_array($post_type, $post_types)) {
|
|
| 4198 | 4198 | $invalid++; |
| 4199 | 4199 | $valid = false; |
| 4200 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 4200 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));
|
|
| 4201 | 4201 | } |
| 4202 | - $xtimings['###3'] = microtime(true)-$xstart; |
|
| 4203 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 4204 | - if ( $location_allowed ) {
|
|
| 4202 | + $xtimings['###3'] = microtime(true) - $xstart; |
|
| 4203 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
| 4204 | + if ($location_allowed) {
|
|
| 4205 | 4205 | $location_result = geodir_get_default_location(); |
| 4206 | - if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
| 4206 | + if ($post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '') {
|
|
| 4207 | 4207 | $invalid_addr++; |
| 4208 | 4208 | $valid = false; |
| 4209 | - 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' ) ); |
|
| 4210 | - } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
| 4211 | - 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 ) ) ) {
|
|
| 4209 | + 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'));
|
|
| 4210 | + } else if (!empty($location_result) && $location_result->location_id == 0) {
|
|
| 4211 | + 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 | 4212 | $invalid_addr++; |
| 4213 | 4213 | $valid = false; |
| 4214 | - 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' ) ); |
|
| 4214 | + 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'));
|
|
| 4215 | 4215 | } else {
|
| 4216 | 4216 | if (!$location_manager) {
|
| 4217 | - $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. |
|
| 4217 | + $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. |
|
| 4218 | 4218 | } |
| 4219 | 4219 | } |
| 4220 | 4220 | } |
| 4221 | 4221 | } |
| 4222 | - $xtimings['###4'] = microtime(true)-$xstart; |
|
| 4223 | - if ( !$valid ) {
|
|
| 4222 | + $xtimings['###4'] = microtime(true) - $xstart; |
|
| 4223 | + if (!$valid) {
|
|
| 4224 | 4224 | continue; |
| 4225 | 4225 | } |
| 4226 | 4226 | |
| 4227 | - $cat_taxonomy = $post_type . 'category'; |
|
| 4228 | - $tags_taxonomy = $post_type . '_tags'; |
|
| 4227 | + $cat_taxonomy = $post_type.'category'; |
|
| 4228 | + $tags_taxonomy = $post_type.'_tags'; |
|
| 4229 | 4229 | |
| 4230 | 4230 | if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
| 4231 | 4231 | $post_category_arr = array_merge(array($default_category), $post_category_arr); |
@@ -4233,29 +4233,29 @@ discard block |
||
| 4233 | 4233 | |
| 4234 | 4234 | $post_category = array(); |
| 4235 | 4235 | $default_category_id = NULL; |
| 4236 | - if ( !empty( $post_category_arr ) ) {
|
|
| 4237 | - foreach ( $post_category_arr as $value ) {
|
|
| 4238 | - $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
| 4236 | + if (!empty($post_category_arr)) {
|
|
| 4237 | + foreach ($post_category_arr as $value) {
|
|
| 4238 | + $category_name = wp_kses_normalize_entities(trim($value)); |
|
| 4239 | 4239 | |
| 4240 | - if ( $category_name != '' ) {
|
|
| 4240 | + if ($category_name != '') {
|
|
| 4241 | 4241 | $term_category = array(); |
| 4242 | 4242 | |
| 4243 | - if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
| 4243 | + if ($term = get_term_by('name', $category_name, $cat_taxonomy)) {
|
|
| 4244 | 4244 | $term_category = $term; |
| 4245 | - } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
| 4245 | + } else if ($term = get_term_by('slug', $category_name, $cat_taxonomy)) {
|
|
| 4246 | 4246 | $term_category = $term; |
| 4247 | 4247 | } else {
|
| 4248 | 4248 | $term_data = array(); |
| 4249 | 4249 | $term_data['name'] = $category_name; |
| 4250 | 4250 | $term_data['taxonomy'] = $cat_taxonomy; |
| 4251 | 4251 | |
| 4252 | - $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
| 4253 | - if ( $term_id ) {
|
|
| 4254 | - $term_category = get_term( $term_id, $cat_taxonomy ); |
|
| 4252 | + $term_id = geodir_imex_insert_term($cat_taxonomy, $term_data); |
|
| 4253 | + if ($term_id) {
|
|
| 4254 | + $term_category = get_term($term_id, $cat_taxonomy); |
|
| 4255 | 4255 | } |
| 4256 | 4256 | } |
| 4257 | 4257 | |
| 4258 | - if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
| 4258 | + if (!empty($term_category) && !is_wp_error($term_category)) {
|
|
| 4259 | 4259 | $post_category[] = intval($term_category->term_id); |
| 4260 | 4260 | |
| 4261 | 4261 | if ($category_name == $default_category) {
|
@@ -4265,7 +4265,7 @@ discard block |
||
| 4265 | 4265 | } |
| 4266 | 4266 | } |
| 4267 | 4267 | } |
| 4268 | - $xtimings['###5'] = microtime(true)-$xstart; |
|
| 4268 | + $xtimings['###5'] = microtime(true) - $xstart; |
|
| 4269 | 4269 | $save_post = array(); |
| 4270 | 4270 | $save_post['post_title'] = $post_title; |
| 4271 | 4271 | $save_post['post_content'] = $post_content; |
@@ -4276,15 +4276,15 @@ discard block |
||
| 4276 | 4276 | $save_post['post_tags'] = $post_tags; |
| 4277 | 4277 | |
| 4278 | 4278 | $saved_post_id = NULL; |
| 4279 | - if ( $import_choice == 'update' ) {
|
|
| 4280 | - $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
| 4279 | + if ($import_choice == 'update') {
|
|
| 4280 | + $gd_wp_error = __('Unable to add listing, please check the listing data.', 'geodirectory');
|
|
| 4281 | 4281 | |
| 4282 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4282 | + if ($post_id > 0 && get_post($post_id)) {
|
|
| 4283 | 4283 | $save_post['ID'] = $post_id; |
| 4284 | 4284 | |
| 4285 | - if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
| 4286 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4287 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4285 | + if ($saved_post_id = wp_update_post($save_post, true)) {
|
|
| 4286 | + if (is_wp_error($saved_post_id)) {
|
|
| 4287 | + $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error; |
|
| 4288 | 4288 | $saved_post_id = 0; |
| 4289 | 4289 | } else {
|
| 4290 | 4290 | $saved_post_id = $post_id; |
@@ -4292,9 +4292,9 @@ discard block |
||
| 4292 | 4292 | } |
| 4293 | 4293 | } |
| 4294 | 4294 | } else {
|
| 4295 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4296 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4297 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4295 | + if ($saved_post_id = wp_insert_post($save_post, true)) {
|
|
| 4296 | + if (is_wp_error($saved_post_id)) {
|
|
| 4297 | + $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error; |
|
| 4298 | 4298 | $saved_post_id = 0; |
| 4299 | 4299 | } else {
|
| 4300 | 4300 | $created++; |
@@ -4302,19 +4302,19 @@ discard block |
||
| 4302 | 4302 | } |
| 4303 | 4303 | } |
| 4304 | 4304 | |
| 4305 | - if ( !$saved_post_id > 0 ) {
|
|
| 4305 | + if (!$saved_post_id > 0) {
|
|
| 4306 | 4306 | $invalid++; |
| 4307 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
| 4307 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_wp_error); |
|
| 4308 | 4308 | } |
| 4309 | - } else if ( $import_choice == 'skip' ) {
|
|
| 4310 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4309 | + } else if ($import_choice == 'skip') {
|
|
| 4310 | + if ($post_id > 0 && get_post($post_id)) {
|
|
| 4311 | 4311 | $skipped++; |
| 4312 | 4312 | } else {
|
| 4313 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4314 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4313 | + if ($saved_post_id = wp_insert_post($save_post, true)) {
|
|
| 4314 | + if (is_wp_error($saved_post_id)) {
|
|
| 4315 | 4315 | $invalid++; |
| 4316 | 4316 | |
| 4317 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
| 4317 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$saved_post_id->get_error_message().' '.$wp_chars_error); |
|
| 4318 | 4318 | $saved_post_id = 0; |
| 4319 | 4319 | } else {
|
| 4320 | 4320 | $created++; |
@@ -4322,28 +4322,28 @@ discard block |
||
| 4322 | 4322 | } else {
|
| 4323 | 4323 | $invalid++; |
| 4324 | 4324 | |
| 4325 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4325 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error); |
|
| 4326 | 4326 | } |
| 4327 | 4327 | } |
| 4328 | 4328 | } else {
|
| 4329 | 4329 | $invalid++; |
| 4330 | 4330 | |
| 4331 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4331 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error); |
|
| 4332 | 4332 | } |
| 4333 | - $xtimings['###6'] = microtime(true)-$xstart; |
|
| 4334 | - if ( (int)$saved_post_id > 0 ) {
|
|
| 4333 | + $xtimings['###6'] = microtime(true) - $xstart; |
|
| 4334 | + if ((int) $saved_post_id > 0) {
|
|
| 4335 | 4335 | // WPML |
| 4336 | 4336 | if ($is_wpml && $original_post_id > 0 && $language != '') {
|
| 4337 | - $wpml_post_type = 'post_' . $post_type; |
|
| 4338 | - $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
| 4337 | + $wpml_post_type = 'post_'.$post_type; |
|
| 4338 | + $source_language = geodir_get_language_for_element($original_post_id, $wpml_post_type); |
|
| 4339 | 4339 | $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
| 4340 | 4340 | |
| 4341 | - $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
| 4341 | + $trid = $sitepress->get_element_trid($original_post_id, $wpml_post_type); |
|
| 4342 | 4342 | |
| 4343 | - $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
| 4343 | + $sitepress->set_element_language_details($saved_post_id, $wpml_post_type, $trid, $language, $source_language); |
|
| 4344 | 4344 | } |
| 4345 | 4345 | // WPML |
| 4346 | - $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
| 4346 | + $gd_post_info = geodir_get_post_info($saved_post_id); |
|
| 4347 | 4347 | |
| 4348 | 4348 | $gd_post['post_id'] = $saved_post_id; |
| 4349 | 4349 | $gd_post['ID'] = $saved_post_id; |
@@ -4355,7 +4355,7 @@ discard block |
||
| 4355 | 4355 | |
| 4356 | 4356 | // post location |
| 4357 | 4357 | $post_location_id = 0; |
| 4358 | - if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
| 4358 | + if ($location_allowed && !empty($location_result) && $location_result->location_id > 0) {
|
|
| 4359 | 4359 | $gd_post['post_neighbourhood'] = ''; |
| 4360 | 4360 | |
| 4361 | 4361 | $post_location_info = array( |
@@ -4365,7 +4365,7 @@ discard block |
||
| 4365 | 4365 | 'geo_lat' => $post_latitude, |
| 4366 | 4366 | 'geo_lng' => $post_longitude |
| 4367 | 4367 | ); |
| 4368 | - if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
| 4368 | + if ($location_id = (int) geodir_add_new_location($post_location_info)) {
|
|
| 4369 | 4369 | $post_location_id = $location_id; |
| 4370 | 4370 | } |
| 4371 | 4371 | |
@@ -4403,14 +4403,14 @@ discard block |
||
| 4403 | 4403 | $gd_post['post_location_id'] = $post_location_id; |
| 4404 | 4404 | |
| 4405 | 4405 | // post package info |
| 4406 | - $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
| 4406 | + $package_id = isset($gd_post['package_id']) && !empty($gd_post['package_id']) ? (int) $gd_post['package_id'] : 0; |
|
| 4407 | 4407 | if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
| 4408 | 4408 | $package_id = $gd_post_info->package_id; |
| 4409 | 4409 | } |
| 4410 | 4410 | |
| 4411 | 4411 | $package_info = array(); |
| 4412 | 4412 | if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
| 4413 | - $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
| 4413 | + $package_info = (array) geodir_get_package_info_by_id($package_id); |
|
| 4414 | 4414 | |
| 4415 | 4415 | if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
| 4416 | 4416 | $package_info = array(); |
@@ -4418,18 +4418,18 @@ discard block |
||
| 4418 | 4418 | } |
| 4419 | 4419 | |
| 4420 | 4420 | if (empty($package_info)) {
|
| 4421 | - $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
| 4421 | + $package_info = (array) geodir_post_package_info(array(), '', $post_type); |
|
| 4422 | 4422 | } |
| 4423 | 4423 | |
| 4424 | - if (!empty($package_info)) {
|
|
| 4424 | + if (!empty($package_info)) {
|
|
| 4425 | 4425 | $package_id = $package_info['pid']; |
| 4426 | 4426 | |
| 4427 | 4427 | if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
| 4428 | 4428 | $gd_post['expire_date'] = $expire_date; |
| 4429 | 4429 | } else {
|
| 4430 | - if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
| 4431 | - $gd_post['alive_days'] = (int)$package_info['days']; |
|
| 4432 | - $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
| 4430 | + if (isset($package_info['days']) && (int) $package_info['days'] > 0) {
|
|
| 4431 | + $gd_post['alive_days'] = (int) $package_info['days']; |
|
| 4432 | + $gd_post['expire_date'] = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $package_info['days'].' days'));
|
|
| 4433 | 4433 | } else {
|
| 4434 | 4434 | $gd_post['expire_date'] = 'Never'; |
| 4435 | 4435 | } |
@@ -4438,7 +4438,7 @@ discard block |
||
| 4438 | 4438 | $gd_post['package_id'] = $package_id; |
| 4439 | 4439 | } |
| 4440 | 4440 | |
| 4441 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 4441 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 4442 | 4442 | |
| 4443 | 4443 | if ($post_type == 'gd_event') {
|
| 4444 | 4444 | $gd_post = geodir_imex_process_event_data($gd_post); |
@@ -4449,65 +4449,65 @@ discard block |
||
| 4449 | 4449 | } |
| 4450 | 4450 | |
| 4451 | 4451 | // Export franchise fields |
| 4452 | - $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 4452 | + $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;
|
|
| 4453 | 4453 | if ($is_franchise_active) {
|
| 4454 | - if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {
|
|
| 4454 | + if (isset($gd_post['gd_is_franchise']) && (int) $gd_post['gd_is_franchise'] == 1) {
|
|
| 4455 | 4455 | $gd_franchise_lock = array(); |
| 4456 | 4456 | |
| 4457 | - if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
| 4458 | - $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
| 4459 | - $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
| 4460 | - $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
| 4457 | + if (isset($gd_post['gd_franchise_lock'])) {
|
|
| 4458 | + $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock']);
|
|
| 4459 | + $gd_franchise_lock = trim($gd_franchise_lock); |
|
| 4460 | + $gd_franchise_lock = explode(",", $gd_franchise_lock);
|
|
| 4461 | 4461 | } |
| 4462 | 4462 | |
| 4463 | - update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
| 4464 | - update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
| 4463 | + update_post_meta($saved_post_id, 'gd_is_franchise', 1); |
|
| 4464 | + update_post_meta($saved_post_id, 'gd_franchise_lock', $gd_franchise_lock); |
|
| 4465 | 4465 | } else {
|
| 4466 | - if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
| 4467 | - geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
| 4466 | + if (isset($gd_post['franchise']) && (int) $gd_post['franchise'] > 0 && geodir_franchise_check((int) $gd_post['franchise'])) {
|
|
| 4467 | + geodir_save_post_meta($saved_post_id, 'franchise', (int) $gd_post['franchise']); |
|
| 4468 | 4468 | } |
| 4469 | 4469 | } |
| 4470 | 4470 | } |
| 4471 | 4471 | |
| 4472 | 4472 | if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
| 4473 | - $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
| 4473 | + $save_post['post_category'] = array_unique(array_map('intval', $save_post['post_category']));
|
|
| 4474 | 4474 | if ($default_category_id) {
|
| 4475 | 4475 | $save_post['post_default_category'] = $default_category_id; |
| 4476 | 4476 | $gd_post['default_category'] = $default_category_id; |
| 4477 | 4477 | } |
| 4478 | 4478 | $gd_post[$cat_taxonomy] = $save_post['post_category']; |
| 4479 | 4479 | } |
| 4480 | - $xtimings['###7'] = microtime(true)-$xstart; |
|
| 4480 | + $xtimings['###7'] = microtime(true) - $xstart; |
|
| 4481 | 4481 | // Save post info |
| 4482 | - geodir_save_post_info( $saved_post_id, $gd_post ); |
|
| 4483 | - $xtimings['###8'] = microtime(true)-$xstart; |
|
| 4482 | + geodir_save_post_info($saved_post_id, $gd_post); |
|
| 4483 | + $xtimings['###8'] = microtime(true) - $xstart; |
|
| 4484 | 4484 | // post taxonomies |
| 4485 | - if ( !empty( $save_post['post_category'] ) ) {
|
|
| 4486 | - wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
| 4485 | + if (!empty($save_post['post_category'])) {
|
|
| 4486 | + wp_set_object_terms($saved_post_id, $save_post['post_category'], $cat_taxonomy); |
|
| 4487 | 4487 | |
| 4488 | - $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
| 4488 | + $post_default_category = isset($save_post['post_default_category']) ? $save_post['post_default_category'] : ''; |
|
| 4489 | 4489 | if ($default_category_id) {
|
| 4490 | 4490 | $post_default_category = $default_category_id; |
| 4491 | 4491 | } |
| 4492 | 4492 | $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
| 4493 | 4493 | $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
| 4494 | - $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
| 4494 | + $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']).',y:' : '';
|
|
| 4495 | 4495 | |
| 4496 | 4496 | if ($post_category_str != '' && $post_default_category) {
|
| 4497 | - $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
| 4497 | + $post_category_str = str_replace($post_default_category.',y:', $post_default_category.',y,d:', $post_category_str); |
|
| 4498 | 4498 | } |
| 4499 | 4499 | |
| 4500 | 4500 | $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
| 4501 | 4501 | |
| 4502 | - geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
| 4502 | + geodir_set_postcat_structure($saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str); |
|
| 4503 | 4503 | } |
| 4504 | - $xtimings['###8.1'] = microtime(true)-$xstart; |
|
| 4505 | - if ( !empty( $save_post['post_tags'] ) ) {
|
|
| 4506 | - wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
| 4504 | + $xtimings['###8.1'] = microtime(true) - $xstart; |
|
| 4505 | + if (!empty($save_post['post_tags'])) {
|
|
| 4506 | + wp_set_object_terms($saved_post_id, $save_post['post_tags'], $tags_taxonomy); |
|
| 4507 | 4507 | } |
| 4508 | - $xtimings['###9'] = microtime(true)-$xstart; |
|
| 4508 | + $xtimings['###9'] = microtime(true) - $xstart; |
|
| 4509 | 4509 | // Post images |
| 4510 | - if ( !empty( $post_images ) ) {
|
|
| 4510 | + if (!empty($post_images)) {
|
|
| 4511 | 4511 | $post_images = array_unique($post_images); |
| 4512 | 4512 | |
| 4513 | 4513 | $old_post_images_arr = array(); |
@@ -4515,65 +4515,65 @@ discard block |
||
| 4515 | 4515 | |
| 4516 | 4516 | $order = 1; |
| 4517 | 4517 | |
| 4518 | - $old_post_images = geodir_get_images( $saved_post_id ); |
|
| 4519 | - $xtimings['###9.1'] = microtime(true)-$xstart; |
|
| 4518 | + $old_post_images = geodir_get_images($saved_post_id); |
|
| 4519 | + $xtimings['###9.1'] = microtime(true) - $xstart; |
|
| 4520 | 4520 | if (!empty($old_post_images)) {
|
| 4521 | - foreach( $old_post_images as $old_post_image ) {
|
|
| 4521 | + foreach ($old_post_images as $old_post_image) {
|
|
| 4522 | 4522 | if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
| 4523 | 4523 | $old_post_images_arr[] = $old_post_image->file; |
| 4524 | 4524 | } |
| 4525 | 4525 | } |
| 4526 | 4526 | } |
| 4527 | 4527 | |
| 4528 | - foreach ( $post_images as $post_image ) {
|
|
| 4529 | - $image_name = basename( $post_image ); |
|
| 4528 | + foreach ($post_images as $post_image) {
|
|
| 4529 | + $image_name = basename($post_image); |
|
| 4530 | 4530 | $saved_post_images_arr[] = $image_name; |
| 4531 | 4531 | |
| 4532 | - if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
| 4532 | + if (!empty($old_post_images_arr) && in_array($image_name, $old_post_images_arr)) {
|
|
| 4533 | 4533 | continue; // Skip if image already exists. |
| 4534 | 4534 | } |
| 4535 | 4535 | |
| 4536 | - $image_name_parts = explode( '.', $image_name ); |
|
| 4537 | - array_pop( $image_name_parts ); |
|
| 4538 | - $proper_image_name = implode( '.', $image_name_parts ); |
|
| 4539 | - $xtimings['###9.2'] = microtime(true)-$xstart; |
|
| 4540 | - $arr_file_type = wp_check_filetype( $image_name ); |
|
| 4541 | - $xtimings['###9.3'] = microtime(true)-$xstart; |
|
| 4542 | - if ( !empty( $arr_file_type ) ) {
|
|
| 4536 | + $image_name_parts = explode('.', $image_name);
|
|
| 4537 | + array_pop($image_name_parts); |
|
| 4538 | + $proper_image_name = implode('.', $image_name_parts);
|
|
| 4539 | + $xtimings['###9.2'] = microtime(true) - $xstart; |
|
| 4540 | + $arr_file_type = wp_check_filetype($image_name); |
|
| 4541 | + $xtimings['###9.3'] = microtime(true) - $xstart; |
|
| 4542 | + if (!empty($arr_file_type)) {
|
|
| 4543 | 4543 | $uploaded_file_type = $arr_file_type['type']; |
| 4544 | 4544 | |
| 4545 | 4545 | $attachment = array(); |
| 4546 | 4546 | $attachment['post_id'] = $saved_post_id; |
| 4547 | 4547 | $attachment['title'] = $proper_image_name; |
| 4548 | 4548 | $attachment['content'] = ''; |
| 4549 | - $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
| 4549 | + $attachment['file'] = $uploads_subdir.'/'.$image_name; |
|
| 4550 | 4550 | $attachment['mime_type'] = $uploaded_file_type; |
| 4551 | 4551 | $attachment['menu_order'] = $order; |
| 4552 | 4552 | $attachment['is_featured'] = 0; |
| 4553 | 4553 | |
| 4554 | 4554 | $attachment_set = ''; |
| 4555 | - foreach ( $attachment as $key => $val ) {
|
|
| 4556 | - if ( $val != '' ) {
|
|
| 4557 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 4555 | + foreach ($attachment as $key => $val) {
|
|
| 4556 | + if ($val != '') {
|
|
| 4557 | + $attachment_set .= $key." = '".$val."', "; |
|
| 4558 | 4558 | } |
| 4559 | 4559 | } |
| 4560 | - $attachment_set = trim( $attachment_set, ", " ); |
|
| 4560 | + $attachment_set = trim($attachment_set, ", "); |
|
| 4561 | 4561 | |
| 4562 | 4562 | // Add new attachment |
| 4563 | - $xtimings['###9.4'] = microtime(true)-$xstart; |
|
| 4564 | - $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
| 4565 | - $xtimings['###9.5'] = microtime(true)-$xstart; |
|
| 4563 | + $xtimings['###9.4'] = microtime(true) - $xstart; |
|
| 4564 | + $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
|
|
| 4565 | + $xtimings['###9.5'] = microtime(true) - $xstart; |
|
| 4566 | 4566 | $order++; |
| 4567 | 4567 | } |
| 4568 | 4568 | } |
| 4569 | 4569 | |
| 4570 | - $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
| 4570 | + $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/".implode("' AND file NOT LIKE '%/", $saved_post_images_arr)."' )" : '';
|
|
| 4571 | 4571 | // Remove previous attachment |
| 4572 | - $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
| 4573 | - $xtimings['###9.6'] = microtime(true)-$xstart; |
|
| 4574 | - if ( !empty( $saved_post_images_arr ) ) {
|
|
| 4572 | + $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = ".(int) $saved_post_id." ".$saved_post_images_sql);
|
|
| 4573 | + $xtimings['###9.6'] = microtime(true) - $xstart; |
|
| 4574 | + if (!empty($saved_post_images_arr)) {
|
|
| 4575 | 4575 | geodir_set_wp_featured_image($saved_post_id); |
| 4576 | - $xtimings['###9.7'] = microtime(true)-$xstart; |
|
| 4576 | + $xtimings['###9.7'] = microtime(true) - $xstart; |
|
| 4577 | 4577 | /* |
| 4578 | 4578 | $menu_order = 1; |
| 4579 | 4579 | |
@@ -4589,14 +4589,14 @@ discard block |
||
| 4589 | 4589 | }*/ |
| 4590 | 4590 | } |
| 4591 | 4591 | |
| 4592 | - if ( $order > 1 ) {
|
|
| 4592 | + if ($order > 1) {
|
|
| 4593 | 4593 | $images++; |
| 4594 | 4594 | } |
| 4595 | 4595 | } |
| 4596 | - $xtimings['###10'] = microtime(true)-$xstart; |
|
| 4596 | + $xtimings['###10'] = microtime(true) - $xstart; |
|
| 4597 | 4597 | /** This action is documented in geodirectory-functions/post-functions.php */ |
| 4598 | - do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
| 4599 | - $xtimings['###11'] = microtime(true)-$xstart; |
|
| 4598 | + do_action('geodir_after_save_listing', $saved_post_id, $gd_post);
|
|
| 4599 | + $xtimings['###11'] = microtime(true) - $xstart; |
|
| 4600 | 4600 | if (isset($is_featured)) {
|
| 4601 | 4601 | geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
| 4602 | 4602 | } |
@@ -4606,7 +4606,7 @@ discard block |
||
| 4606 | 4606 | if (isset($gd_post['expire_date'])) {
|
| 4607 | 4607 | geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
| 4608 | 4608 | } |
| 4609 | - $xtimings['###12'] = microtime(true)-$xstart; |
|
| 4609 | + $xtimings['###12'] = microtime(true) - $xstart; |
|
| 4610 | 4610 | } |
| 4611 | 4611 | |
| 4612 | 4612 | // WPML |
@@ -4619,11 +4619,11 @@ discard block |
||
| 4619 | 4619 | } |
| 4620 | 4620 | |
| 4621 | 4621 | //undo some stuff to make the import quicker |
| 4622 | - wp_defer_term_counting( false ); |
|
| 4623 | - wp_defer_comment_counting( false ); |
|
| 4624 | - $wpdb->query( 'COMMIT;' ); |
|
| 4625 | - $wpdb->query( 'SET autocommit = 1;' ); |
|
| 4626 | - $xtimings['###13'] = microtime(true)-$xstart; |
|
| 4622 | + wp_defer_term_counting(false); |
|
| 4623 | + wp_defer_comment_counting(false); |
|
| 4624 | + $wpdb->query('COMMIT;');
|
|
| 4625 | + $wpdb->query('SET autocommit = 1;');
|
|
| 4626 | + $xtimings['###13'] = microtime(true) - $xstart; |
|
| 4627 | 4627 | $json = array(); |
| 4628 | 4628 | $json['processed'] = $processed_actual; |
| 4629 | 4629 | $json['created'] = $created; |
@@ -4632,13 +4632,13 @@ discard block |
||
| 4632 | 4632 | $json['invalid'] = $invalid; |
| 4633 | 4633 | $json['invalid_addr'] = $invalid_addr; |
| 4634 | 4634 | $json['images'] = $images; |
| 4635 | - $json['timing'] = microtime(true)-$xstart; |
|
| 4635 | + $json['timing'] = microtime(true) - $xstart; |
|
| 4636 | 4636 | $json['timings'] = $xtimings; |
| 4637 | 4637 | |
| 4638 | 4638 | |
| 4639 | - wp_send_json( $json ); |
|
| 4639 | + wp_send_json($json); |
|
| 4640 | 4640 | exit; |
| 4641 | - } else if ( $task == 'import_loc' ) {
|
|
| 4641 | + } else if ($task == 'import_loc') {
|
|
| 4642 | 4642 | global $gd_post_types; |
| 4643 | 4643 | $gd_post_types = $post_types; |
| 4644 | 4644 | |
@@ -4647,82 +4647,82 @@ discard block |
||
| 4647 | 4647 | |
| 4648 | 4648 | if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
| 4649 | 4649 | $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
|
| 4650 | - wp_send_json( $json ); |
|
| 4650 | + wp_send_json($json); |
|
| 4651 | 4651 | } |
| 4652 | 4652 | |
| 4653 | 4653 | $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
| 4654 | - $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
| 4654 | + $gd_error_location = __('Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory');
|
|
| 4655 | 4655 | for ($i = 1; $i <= $limit; $i++) {
|
| 4656 | 4656 | $index = $processed + $i; |
| 4657 | 4657 | |
| 4658 | 4658 | if (isset($file[$index])) {
|
| 4659 | 4659 | $row = $file[$index]; |
| 4660 | - $row = array_map( 'trim', $row ); |
|
| 4660 | + $row = array_map('trim', $row);
|
|
| 4661 | 4661 | $data = array(); |
| 4662 | 4662 | |
| 4663 | - foreach ($columns as $c => $column ) {
|
|
| 4663 | + foreach ($columns as $c => $column) {
|
|
| 4664 | 4664 | 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'))) {
|
| 4665 | 4665 | $data[$column] = $row[$c]; |
| 4666 | 4666 | } |
| 4667 | 4667 | } |
| 4668 | 4668 | |
| 4669 | - if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
| 4669 | + if (empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
| 4670 | 4670 | $invalid++; |
| 4671 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4671 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4672 | 4672 | continue; |
| 4673 | 4673 | } |
| 4674 | 4674 | |
| 4675 | 4675 | $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
| 4676 | 4676 | |
| 4677 | - if ( $import_choice == 'update' ) {
|
|
| 4678 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4679 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4677 | + if ($import_choice == 'update') {
|
|
| 4678 | + if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {
|
|
| 4679 | + if ($location_id = geodir_location_update_city($data, true, $location)) {
|
|
| 4680 | 4680 | $updated++; |
| 4681 | 4681 | } else {
|
| 4682 | 4682 | $invalid++; |
| 4683 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4683 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4684 | 4684 | } |
| 4685 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4686 | - $data['location_id'] = (int)$location->location_id; |
|
| 4685 | + } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {
|
|
| 4686 | + $data['location_id'] = (int) $location->location_id; |
|
| 4687 | 4687 | |
| 4688 | - if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
| 4689 | - $data['location_id'] = (int)$location->location_id; |
|
| 4690 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
| 4691 | - $data['location_id'] = (int)$location->location_id; |
|
| 4692 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
| 4693 | - $data['location_id'] = (int)$location->location_id; |
|
| 4688 | + if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region']))) {
|
|
| 4689 | + $data['location_id'] = (int) $location->location_id; |
|
| 4690 | + } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'region' => $data['region']))) {
|
|
| 4691 | + $data['location_id'] = (int) $location->location_id; |
|
| 4692 | + } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country']))) {
|
|
| 4693 | + $data['location_id'] = (int) $location->location_id; |
|
| 4694 | 4694 | } |
| 4695 | 4695 | |
| 4696 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4696 | + if ($location_id = geodir_location_update_city($data, true, $location)) {
|
|
| 4697 | 4697 | $updated++; |
| 4698 | 4698 | } else {
|
| 4699 | 4699 | $invalid++; |
| 4700 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4700 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4701 | 4701 | } |
| 4702 | 4702 | } else {
|
| 4703 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4703 | + if ($location_id = geodir_location_insert_city($data, true)) {
|
|
| 4704 | 4704 | $created++; |
| 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 | } |
| 4710 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4711 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4710 | + } elseif ($import_choice == 'skip') {
|
|
| 4711 | + if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {
|
|
| 4712 | 4712 | $skipped++; |
| 4713 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4713 | + } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {
|
|
| 4714 | 4714 | $skipped++; |
| 4715 | 4715 | } else {
|
| 4716 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4716 | + if ($location_id = geodir_location_insert_city($data, true)) {
|
|
| 4717 | 4717 | $created++; |
| 4718 | 4718 | } else {
|
| 4719 | 4719 | $invalid++; |
| 4720 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4720 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4721 | 4721 | } |
| 4722 | 4722 | } |
| 4723 | 4723 | } else {
|
| 4724 | 4724 | $invalid++; |
| 4725 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4725 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4726 | 4726 | } |
| 4727 | 4727 | } |
| 4728 | 4728 | } |
@@ -4736,24 +4736,24 @@ discard block |
||
| 4736 | 4736 | $json['invalid'] = $invalid; |
| 4737 | 4737 | $json['images'] = $images; |
| 4738 | 4738 | |
| 4739 | - wp_send_json( $json ); |
|
| 4740 | - } else if ( $task == 'import_hood' ) {
|
|
| 4739 | + wp_send_json($json); |
|
| 4740 | + } else if ($task == 'import_hood') {
|
|
| 4741 | 4741 | if (!empty($file)) {
|
| 4742 | 4742 | $columns = isset($file[0]) ? $file[0] : NULL; |
| 4743 | 4743 | |
| 4744 | 4744 | if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
| 4745 | 4745 | $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
|
| 4746 | - wp_send_json( $json ); |
|
| 4746 | + wp_send_json($json); |
|
| 4747 | 4747 | } |
| 4748 | 4748 | |
| 4749 | 4749 | $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
| 4750 | - $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' ); |
|
| 4750 | + $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');
|
|
| 4751 | 4751 | for ($i = 1; $i <= $limit; $i++) {
|
| 4752 | 4752 | $index = $processed + $i; |
| 4753 | 4753 | |
| 4754 | 4754 | if (isset($file[$index])) {
|
| 4755 | 4755 | $row = $file[$index]; |
| 4756 | - $row = array_map( 'trim', $row ); |
|
| 4756 | + $row = array_map('trim', $row);
|
|
| 4757 | 4757 | $data = array(); |
| 4758 | 4758 | |
| 4759 | 4759 | foreach ($columns as $c => $column) {
|
@@ -4764,20 +4764,20 @@ discard block |
||
| 4764 | 4764 | |
| 4765 | 4765 | if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
| 4766 | 4766 | $invalid++; |
| 4767 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4767 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4768 | 4768 | continue; |
| 4769 | 4769 | } |
| 4770 | 4770 | |
| 4771 | 4771 | $location_info = array(); |
| 4772 | - if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
| 4773 | - $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
| 4772 | + if (!empty($data['location_id']) && (int) $data['location_id'] > 0) {
|
|
| 4773 | + $location_info = geodir_get_location_by_id('', (int) $data['location_id']);
|
|
| 4774 | 4774 | } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
| 4775 | 4775 | $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
| 4776 | 4776 | } |
| 4777 | 4777 | |
| 4778 | 4778 | if (empty($location_info)) {
|
| 4779 | 4779 | $invalid++; |
| 4780 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4780 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4781 | 4781 | continue; |
| 4782 | 4782 | } |
| 4783 | 4783 | |
@@ -4792,35 +4792,35 @@ discard block |
||
| 4792 | 4792 | $hood_data['hood_longitude'] = $data['longitude']; |
| 4793 | 4793 | $hood_data['hood_location_id'] = $location_id; |
| 4794 | 4794 | |
| 4795 | - if ( $import_choice == 'update' ) {
|
|
| 4796 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4797 | - $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
| 4795 | + if ($import_choice == 'update') {
|
|
| 4796 | + if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {
|
|
| 4797 | + $hood_data['hood_id'] = (int) $data['neighbourhood_id']; |
|
| 4798 | 4798 | |
| 4799 | 4799 | if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
| 4800 | 4800 | $updated++; |
| 4801 | 4801 | } else {
|
| 4802 | 4802 | $invalid++; |
| 4803 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4803 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4804 | 4804 | } |
| 4805 | 4805 | } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
| 4806 | - $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
| 4806 | + $hood_data['hood_id'] = (int) $neighbourhood->hood_id; |
|
| 4807 | 4807 | |
| 4808 | 4808 | if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
| 4809 | 4809 | $updated++; |
| 4810 | 4810 | } else {
|
| 4811 | 4811 | $invalid++; |
| 4812 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4812 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4813 | 4813 | } |
| 4814 | 4814 | } else {
|
| 4815 | 4815 | if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
| 4816 | 4816 | $created++; |
| 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 | } |
| 4822 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4823 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4822 | + } elseif ($import_choice == 'skip') {
|
|
| 4823 | + if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {
|
|
| 4824 | 4824 | $skipped++; |
| 4825 | 4825 | } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
| 4826 | 4826 | $skipped++; |
@@ -4830,12 +4830,12 @@ discard block |
||
| 4830 | 4830 | $created++; |
| 4831 | 4831 | } else {
|
| 4832 | 4832 | $invalid++; |
| 4833 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4833 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4834 | 4834 | } |
| 4835 | 4835 | } |
| 4836 | 4836 | } else {
|
| 4837 | 4837 | $invalid++; |
| 4838 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4838 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4839 | 4839 | } |
| 4840 | 4840 | } |
| 4841 | 4841 | } |
@@ -4849,7 +4849,7 @@ discard block |
||
| 4849 | 4849 | $json['invalid'] = $invalid; |
| 4850 | 4850 | $json['images'] = $images; |
| 4851 | 4851 | |
| 4852 | - wp_send_json( $json ); |
|
| 4852 | + wp_send_json($json); |
|
| 4853 | 4853 | } |
| 4854 | 4854 | } |
| 4855 | 4855 | break; |
@@ -4893,29 +4893,29 @@ discard block |
||
| 4893 | 4893 | * } |
| 4894 | 4894 | * @return int|bool Term id when success, false when fail. |
| 4895 | 4895 | */ |
| 4896 | -function geodir_imex_insert_term( $taxonomy, $term_data ) {
|
|
| 4897 | - if ( empty( $taxonomy ) || empty( $term_data ) ) {
|
|
| 4896 | +function geodir_imex_insert_term($taxonomy, $term_data) {
|
|
| 4897 | + if (empty($taxonomy) || empty($term_data)) {
|
|
| 4898 | 4898 | return false; |
| 4899 | 4899 | } |
| 4900 | 4900 | |
| 4901 | - $term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : ''; |
|
| 4901 | + $term = isset($term_data['name']) && !empty($term_data['name']) ? $term_data['name'] : ''; |
|
| 4902 | 4902 | $args = array(); |
| 4903 | - $args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : ''; |
|
| 4904 | - $args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : ''; |
|
| 4905 | - $args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : ''; |
|
| 4903 | + $args['description'] = isset($term_data['description']) ? $term_data['description'] : ''; |
|
| 4904 | + $args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : ''; |
|
| 4905 | + $args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : ''; |
|
| 4906 | 4906 | |
| 4907 | - if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {
|
|
| 4908 | - $term_args = array_merge( $term_data, $args ); |
|
| 4909 | - $defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => ''); |
|
| 4910 | - $term_args = wp_parse_args( $term_args, $defaults ); |
|
| 4911 | - $term_args = sanitize_term( $term_args, $taxonomy, 'db' ); |
|
| 4912 | - $args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args ); |
|
| 4907 | + if ((!empty($args['slug']) && term_exists($args['slug'], $taxonomy)) || empty($args['slug'])) {
|
|
| 4908 | + $term_args = array_merge($term_data, $args); |
|
| 4909 | + $defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
|
|
| 4910 | + $term_args = wp_parse_args($term_args, $defaults); |
|
| 4911 | + $term_args = sanitize_term($term_args, $taxonomy, 'db'); |
|
| 4912 | + $args['slug'] = wp_unique_term_slug($args['slug'], (object) $term_args); |
|
| 4913 | 4913 | } |
| 4914 | 4914 | |
| 4915 | - if( !empty( $term ) ) {
|
|
| 4916 | - $result = wp_insert_term( $term, $taxonomy, $args ); |
|
| 4917 | - if( !is_wp_error( $result ) ) {
|
|
| 4918 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4915 | + if (!empty($term)) {
|
|
| 4916 | + $result = wp_insert_term($term, $taxonomy, $args); |
|
| 4917 | + if (!is_wp_error($result)) {
|
|
| 4918 | + return isset($result['term_id']) ? $result['term_id'] : 0; |
|
| 4919 | 4919 | } |
| 4920 | 4920 | } |
| 4921 | 4921 | |
@@ -4945,36 +4945,36 @@ discard block |
||
| 4945 | 4945 | * } |
| 4946 | 4946 | * @return int|bool Term id when success, false when fail. |
| 4947 | 4947 | */ |
| 4948 | -function geodir_imex_update_term( $taxonomy, $term_data ) {
|
|
| 4949 | - if ( empty( $taxonomy ) || empty( $term_data ) ) {
|
|
| 4948 | +function geodir_imex_update_term($taxonomy, $term_data) {
|
|
| 4949 | + if (empty($taxonomy) || empty($term_data)) {
|
|
| 4950 | 4950 | return false; |
| 4951 | 4951 | } |
| 4952 | 4952 | |
| 4953 | - $term_id = isset( $term_data['term_id'] ) && !empty( $term_data['term_id'] ) ? $term_data['term_id'] : 0; |
|
| 4953 | + $term_id = isset($term_data['term_id']) && !empty($term_data['term_id']) ? $term_data['term_id'] : 0; |
|
| 4954 | 4954 | |
| 4955 | 4955 | $args = array(); |
| 4956 | - $args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : ''; |
|
| 4957 | - $args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : ''; |
|
| 4958 | - $args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : ''; |
|
| 4956 | + $args['description'] = isset($term_data['description']) ? $term_data['description'] : ''; |
|
| 4957 | + $args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : ''; |
|
| 4958 | + $args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : ''; |
|
| 4959 | 4959 | |
| 4960 | - if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {
|
|
| 4960 | + if ($term_id > 0 && $term_info = (array) get_term($term_id, $taxonomy)) {
|
|
| 4961 | 4961 | $term_data['term_id'] = $term_info['term_id']; |
| 4962 | 4962 | |
| 4963 | - $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
|
| 4963 | + $result = wp_update_term($term_data['term_id'], $taxonomy, $term_data); |
|
| 4964 | 4964 | |
| 4965 | - if( !is_wp_error( $result ) ) {
|
|
| 4966 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4965 | + if (!is_wp_error($result)) {
|
|
| 4966 | + return isset($result['term_id']) ? $result['term_id'] : 0; |
|
| 4967 | 4967 | } |
| 4968 | - } else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 4968 | + } else if ($term_data['slug'] != '' && $term_info = (array) term_exists($term_data['slug'], $taxonomy)) {
|
|
| 4969 | 4969 | $term_data['term_id'] = $term_info['term_id']; |
| 4970 | 4970 | |
| 4971 | - $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
|
| 4971 | + $result = wp_update_term($term_data['term_id'], $taxonomy, $term_data); |
|
| 4972 | 4972 | |
| 4973 | - if( !is_wp_error( $result ) ) {
|
|
| 4974 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4973 | + if (!is_wp_error($result)) {
|
|
| 4974 | + return isset($result['term_id']) ? $result['term_id'] : 0; |
|
| 4975 | 4975 | } |
| 4976 | 4976 | } else {
|
| 4977 | - return geodir_imex_insert_term( $taxonomy, $term_data ); |
|
| 4977 | + return geodir_imex_insert_term($taxonomy, $term_data); |
|
| 4978 | 4978 | } |
| 4979 | 4979 | |
| 4980 | 4980 | return false; |
@@ -4993,20 +4993,20 @@ discard block |
||
| 4993 | 4993 | * @param string $post_type Post type. |
| 4994 | 4994 | * @return int Posts count. |
| 4995 | 4995 | */ |
| 4996 | -function geodir_get_posts_count( $post_type ) {
|
|
| 4996 | +function geodir_get_posts_count($post_type) {
|
|
| 4997 | 4997 | global $wpdb, $plugin_prefix; |
| 4998 | 4998 | |
| 4999 | - if ( !post_type_exists( $post_type ) ) {
|
|
| 4999 | + if (!post_type_exists($post_type)) {
|
|
| 5000 | 5000 | return 0; |
| 5001 | 5001 | } |
| 5002 | 5002 | |
| 5003 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5003 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 5004 | 5004 | |
| 5005 | 5005 | // Skip listing with statuses trash, auto-draft etc... |
| 5006 | 5006 | $skip_statuses = geodir_imex_export_skip_statuses(); |
| 5007 | 5007 | $where_statuses = ''; |
| 5008 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5009 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5008 | + if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
| 5009 | + $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
| 5010 | 5010 | } |
| 5011 | 5011 | |
| 5012 | 5012 | /** |
@@ -5017,11 +5017,11 @@ discard block |
||
| 5017 | 5017 | * |
| 5018 | 5018 | * @param string $where SQL where clause part. |
| 5019 | 5019 | */ |
| 5020 | - $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
| 5020 | + $where_statuses = apply_filters('geodir_get_posts_count', $where_statuses, $post_type);
|
|
| 5021 | 5021 | |
| 5022 | - $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 );
|
|
| 5022 | + $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);
|
|
| 5023 | 5023 | |
| 5024 | - $posts_count = (int)$wpdb->get_var( $query ); |
|
| 5024 | + $posts_count = (int) $wpdb->get_var($query); |
|
| 5025 | 5025 | |
| 5026 | 5026 | /** |
| 5027 | 5027 | * Modify returned post counts for the current post type. |
@@ -5032,7 +5032,7 @@ discard block |
||
| 5032 | 5032 | * @param int $posts_count Post counts. |
| 5033 | 5033 | * @param string $post_type Post type. |
| 5034 | 5034 | */ |
| 5035 | - $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
| 5035 | + $posts_count = apply_filters('geodir_imex_count_posts', $posts_count, $post_type);
|
|
| 5036 | 5036 | |
| 5037 | 5037 | return $posts_count; |
| 5038 | 5038 | } |
@@ -5054,19 +5054,19 @@ discard block |
||
| 5054 | 5054 | * @param int $page_no Page number. Default 0. |
| 5055 | 5055 | * @return array Array of posts data. |
| 5056 | 5056 | */ |
| 5057 | -function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
| 5057 | +function geodir_imex_get_posts($post_type, $per_page = 0, $page_no = 0) {
|
|
| 5058 | 5058 | global $wp_filesystem; |
| 5059 | 5059 | |
| 5060 | - $posts = geodir_get_export_posts( $post_type, $per_page, $page_no ); |
|
| 5060 | + $posts = geodir_get_export_posts($post_type, $per_page, $page_no); |
|
| 5061 | 5061 | |
| 5062 | 5062 | $csv_rows = array(); |
| 5063 | 5063 | |
| 5064 | - if ( !empty( $posts ) ) {
|
|
| 5065 | - $is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' ); |
|
| 5064 | + if (!empty($posts)) {
|
|
| 5065 | + $is_payment_plugin = is_plugin_active('geodir_payment_manager/geodir_payment_manager.php');
|
|
| 5066 | 5066 | $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
| 5067 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 5067 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
| 5068 | 5068 | $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;
|
| 5069 | - $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 5069 | + $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 5070 | 5070 | |
| 5071 | 5071 | $csv_row = array(); |
| 5072 | 5072 | $csv_row[] = 'post_id'; |
@@ -5077,7 +5077,7 @@ discard block |
||
| 5077 | 5077 | $csv_row[] = 'default_category'; |
| 5078 | 5078 | $csv_row[] = 'post_tags'; |
| 5079 | 5079 | $csv_row[] = 'post_type'; |
| 5080 | - if ( $post_type == 'gd_event' ) {
|
|
| 5080 | + if ($post_type == 'gd_event') {
|
|
| 5081 | 5081 | $csv_row[] = 'event_date'; |
| 5082 | 5082 | $csv_row[] = 'event_enddate'; |
| 5083 | 5083 | $csv_row[] = 'starttime'; |
@@ -5136,15 +5136,15 @@ discard block |
||
| 5136 | 5136 | } |
| 5137 | 5137 | // WPML |
| 5138 | 5138 | |
| 5139 | - $custom_fields = geodir_imex_get_custom_fields( $post_type ); |
|
| 5140 | - if ( !empty( $custom_fields ) ) {
|
|
| 5141 | - foreach ( $custom_fields as $custom_field ) {
|
|
| 5139 | + $custom_fields = geodir_imex_get_custom_fields($post_type); |
|
| 5140 | + if (!empty($custom_fields)) {
|
|
| 5141 | + foreach ($custom_fields as $custom_field) {
|
|
| 5142 | 5142 | $csv_row[] = $custom_field->htmlvar_name; |
| 5143 | 5143 | } |
| 5144 | 5144 | } |
| 5145 | 5145 | |
| 5146 | 5146 | // Export franchise fields |
| 5147 | - $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 5147 | + $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;
|
|
| 5148 | 5148 | if ($is_franchise_active) {
|
| 5149 | 5149 | $csv_row[] = 'gd_is_franchise'; |
| 5150 | 5150 | $csv_row[] = 'gd_franchise_lock'; |
@@ -5165,28 +5165,28 @@ discard block |
||
| 5165 | 5165 | $csv_rows[] = $csv_row; |
| 5166 | 5166 | |
| 5167 | 5167 | $images_count = 5; |
| 5168 | - $xx=0; |
|
| 5169 | - foreach ( $posts as $post ) {$xx++;
|
|
| 5168 | + $xx = 0; |
|
| 5169 | + foreach ($posts as $post) {$xx++;
|
|
| 5170 | 5170 | $post_id = $post['ID']; |
| 5171 | 5171 | |
| 5172 | - $gd_post_info = geodir_get_post_info( $post_id ); |
|
| 5173 | - $post_info = (array)$gd_post_info; |
|
| 5172 | + $gd_post_info = geodir_get_post_info($post_id); |
|
| 5173 | + $post_info = (array) $gd_post_info; |
|
| 5174 | 5174 | |
| 5175 | - $taxonomy_category = $post_type . 'category'; |
|
| 5176 | - $taxonomy_tags = $post_type . '_tags'; |
|
| 5175 | + $taxonomy_category = $post_type.'category'; |
|
| 5176 | + $taxonomy_tags = $post_type.'_tags'; |
|
| 5177 | 5177 | |
| 5178 | 5178 | $post_category = ''; |
| 5179 | 5179 | $default_category_id = $gd_post_info->default_category; |
| 5180 | 5180 | $default_category = ''; |
| 5181 | 5181 | $post_tags = ''; |
| 5182 | - $terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) ); |
|
| 5182 | + $terms = wp_get_post_terms($post_id, array($taxonomy_category, $taxonomy_tags)); |
|
| 5183 | 5183 | |
| 5184 | - if ( !empty( $terms ) && !is_wp_error( $terms ) ) {
|
|
| 5184 | + if (!empty($terms) && !is_wp_error($terms)) {
|
|
| 5185 | 5185 | $post_category = array(); |
| 5186 | 5186 | $post_tags = array(); |
| 5187 | 5187 | |
| 5188 | - foreach ( $terms as $term ) {
|
|
| 5189 | - if ( $term->taxonomy == $taxonomy_category ) {
|
|
| 5188 | + foreach ($terms as $term) {
|
|
| 5189 | + if ($term->taxonomy == $taxonomy_category) {
|
|
| 5190 | 5190 | $post_category[] = $term->name; |
| 5191 | 5191 | |
| 5192 | 5192 | if ($default_category_id == $term->term_id) {
|
@@ -5194,7 +5194,7 @@ discard block |
||
| 5194 | 5194 | } |
| 5195 | 5195 | } |
| 5196 | 5196 | |
| 5197 | - if ( $term->taxonomy == $taxonomy_tags ) {
|
|
| 5197 | + if ($term->taxonomy == $taxonomy_tags) {
|
|
| 5198 | 5198 | $post_tags[] = $term->name; |
| 5199 | 5199 | } |
| 5200 | 5200 | } |
@@ -5202,47 +5202,47 @@ discard block |
||
| 5202 | 5202 | if (empty($default_category) && !empty($post_category)) {
|
| 5203 | 5203 | $default_category = $post_category[0]; // Set first one as default category. |
| 5204 | 5204 | } |
| 5205 | - $post_category = !empty( $post_category ) ? implode( ',', $post_category ) : ''; |
|
| 5206 | - $post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : ''; |
|
| 5205 | + $post_category = !empty($post_category) ? implode(',', $post_category) : '';
|
|
| 5206 | + $post_tags = !empty($post_tags) ? implode(',', $post_tags) : '';
|
|
| 5207 | 5207 | } |
| 5208 | 5208 | |
| 5209 | 5209 | // Franchise data |
| 5210 | - if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {
|
|
| 5210 | + if ($is_franchise_active && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 && geodir_franchise_check((int) $post_info['franchise'])) {
|
|
| 5211 | 5211 | $franchise_id = $post_info['franchise']; |
| 5212 | 5212 | $gd_franchise_info = geodir_get_post_info($franchise_id); |
| 5213 | 5213 | |
| 5214 | 5214 | if (geodir_franchise_pkg_is_active($gd_franchise_info)) {
|
| 5215 | - $franchise_info = (array)$gd_franchise_info; |
|
| 5215 | + $franchise_info = (array) $gd_franchise_info; |
|
| 5216 | 5216 | $locked_fields = geodir_franchise_get_locked_fields($franchise_id, true); |
| 5217 | 5217 | |
| 5218 | 5218 | if (!empty($locked_fields)) {
|
| 5219 | - foreach( $locked_fields as $locked_field) {
|
|
| 5219 | + foreach ($locked_fields as $locked_field) {
|
|
| 5220 | 5220 | if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {
|
| 5221 | 5221 | $post_info[$locked_field] = $franchise_info[$locked_field]; |
| 5222 | 5222 | } |
| 5223 | 5223 | |
| 5224 | 5224 | if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {
|
| 5225 | - $franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) ); |
|
| 5225 | + $franchise_terms = wp_get_post_terms($franchise_id, array($taxonomy_category, $taxonomy_tags)); |
|
| 5226 | 5226 | |
| 5227 | - if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {
|
|
| 5227 | + if (!empty($franchise_terms) && !is_wp_error($franchise_terms)) {
|
|
| 5228 | 5228 | $franchise_post_category = array(); |
| 5229 | 5229 | $franchise_post_tags = array(); |
| 5230 | 5230 | |
| 5231 | - foreach ( $franchise_terms as $franchise_term ) {
|
|
| 5232 | - if ( $franchise_term->taxonomy == $taxonomy_category ) {
|
|
| 5231 | + foreach ($franchise_terms as $franchise_term) {
|
|
| 5232 | + if ($franchise_term->taxonomy == $taxonomy_category) {
|
|
| 5233 | 5233 | $franchise_post_category[] = $franchise_term->name; |
| 5234 | 5234 | } |
| 5235 | 5235 | |
| 5236 | - if ( $franchise_term->taxonomy == $taxonomy_tags ) {
|
|
| 5236 | + if ($franchise_term->taxonomy == $taxonomy_tags) {
|
|
| 5237 | 5237 | $franchise_post_tags[] = $franchise_term->name; |
| 5238 | 5238 | } |
| 5239 | 5239 | } |
| 5240 | 5240 | |
| 5241 | 5241 | if (in_array($taxonomy_category, $locked_fields)) {
|
| 5242 | - $post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : ''; |
|
| 5242 | + $post_category = !empty($franchise_post_category) ? implode(',', $franchise_post_category) : '';
|
|
| 5243 | 5243 | } |
| 5244 | 5244 | if (in_array('post_tags', $locked_fields)) {
|
| 5245 | - $post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : ''; |
|
| 5245 | + $post_tags = !empty($franchise_post_tags) ? implode(',', $franchise_post_tags) : '';
|
|
| 5246 | 5246 | } |
| 5247 | 5247 | } |
| 5248 | 5248 | } |
@@ -5251,18 +5251,18 @@ discard block |
||
| 5251 | 5251 | } |
| 5252 | 5252 | } |
| 5253 | 5253 | |
| 5254 | - $post_images = geodir_get_images( $post_id ); |
|
| 5254 | + $post_images = geodir_get_images($post_id); |
|
| 5255 | 5255 | $current_images = array(); |
| 5256 | - if ( !empty( $post_images ) ) {
|
|
| 5257 | - foreach ( $post_images as $post_image ) {
|
|
| 5258 | - $post_image = (array)$post_image; |
|
| 5259 | - $image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : ''; |
|
| 5260 | - if ( $image ) {
|
|
| 5256 | + if (!empty($post_images)) {
|
|
| 5257 | + foreach ($post_images as $post_image) {
|
|
| 5258 | + $post_image = (array) $post_image; |
|
| 5259 | + $image = !empty($post_image) && isset($post_image['path']) && $wp_filesystem->is_file($post_image['path']) && $wp_filesystem->exists($post_image['path']) ? $post_image['src'] : ''; |
|
| 5260 | + if ($image) {
|
|
| 5261 | 5261 | $current_images[] = $image; |
| 5262 | 5262 | } |
| 5263 | 5263 | } |
| 5264 | 5264 | |
| 5265 | - $images_count = max( $images_count, count( $current_images ) ); |
|
| 5265 | + $images_count = max($images_count, count($current_images)); |
|
| 5266 | 5266 | } |
| 5267 | 5267 | |
| 5268 | 5268 | $csv_row = array(); |
@@ -5274,7 +5274,7 @@ discard block |
||
| 5274 | 5274 | $csv_row[] = $default_category; // default_category |
| 5275 | 5275 | $csv_row[] = $post_tags; // post_tags |
| 5276 | 5276 | $csv_row[] = $post_type; // post_type |
| 5277 | - if ( $post_type == 'gd_event' ) {
|
|
| 5277 | + if ($post_type == 'gd_event') {
|
|
| 5278 | 5278 | $event_data = geodir_imex_get_event_data($post, $gd_post_info); |
| 5279 | 5279 | $csv_row[] = $event_data['event_date']; // event_date |
| 5280 | 5280 | $csv_row[] = $event_data['event_enddate']; // enddate |
@@ -5295,12 +5295,12 @@ discard block |
||
| 5295 | 5295 | $csv_row[] = $event_data['recurring_end_date']; // repeat_end |
| 5296 | 5296 | } |
| 5297 | 5297 | $csv_row[] = $post_info['post_status']; // post_status |
| 5298 | - $csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured |
|
| 5298 | + $csv_row[] = (int) $post_info['is_featured'] == 1 ? 1 : ''; // is_featured |
|
| 5299 | 5299 | if ($is_claim_active) {
|
| 5300 | - $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5300 | + $csv_row[] = !empty($post_info['claimed']) && (int) $post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5301 | 5301 | } |
| 5302 | 5302 | if ($is_payment_plugin) {
|
| 5303 | - $csv_row[] = (int)$post_info['package_id']; // package_id |
|
| 5303 | + $csv_row[] = (int) $post_info['package_id']; // package_id |
|
| 5304 | 5304 | $csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days |
| 5305 | 5305 | $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
|
| 5306 | 5306 | } |
@@ -5337,14 +5337,14 @@ discard block |
||
| 5337 | 5337 | $csv_row[] = stripslashes($post_info['geodir_special_offers']); // geodir_special_offers |
| 5338 | 5338 | // WPML |
| 5339 | 5339 | if ($is_wpml) {
|
| 5340 | - $csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type ); |
|
| 5341 | - $csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type ); |
|
| 5340 | + $csv_row[] = geodir_get_language_for_element($post_id, 'post_'.$post_type); |
|
| 5341 | + $csv_row[] = geodir_imex_original_post_id($post_id, 'post_'.$post_type); |
|
| 5342 | 5342 | } |
| 5343 | 5343 | // WPML |
| 5344 | 5344 | |
| 5345 | - if ( !empty( $custom_fields ) ) {
|
|
| 5346 | - foreach ( $custom_fields as $custom_field ) {
|
|
| 5347 | - $csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : ''; |
|
| 5345 | + if (!empty($custom_fields)) {
|
|
| 5346 | + foreach ($custom_fields as $custom_field) {
|
|
| 5347 | + $csv_row[] = isset($post_info[$custom_field->htmlvar_name]) ? $post_info[$custom_field->htmlvar_name] : ''; |
|
| 5348 | 5348 | } |
| 5349 | 5349 | } |
| 5350 | 5350 | |
@@ -5355,15 +5355,15 @@ discard block |
||
| 5355 | 5355 | $franchise = ''; |
| 5356 | 5356 | |
| 5357 | 5357 | if (geodir_franchise_pkg_is_active($gd_post_info)) {
|
| 5358 | - $gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true ); |
|
| 5359 | - $locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : ''; |
|
| 5358 | + $gd_is_franchise = (int) get_post_meta($post_id, 'gd_is_franchise', true); |
|
| 5359 | + $locaked_fields = $gd_is_franchise ? get_post_meta($post_id, 'gd_franchise_lock', true) : ''; |
|
| 5360 | 5360 | $locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');
|
| 5361 | - $franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id |
|
| 5361 | + $franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 ? (int) $post_info['franchise'] : 0; // franchise id |
|
| 5362 | 5362 | } |
| 5363 | 5363 | |
| 5364 | - $csv_row[] = (int)$gd_is_franchise; // gd_is_franchise |
|
| 5364 | + $csv_row[] = (int) $gd_is_franchise; // gd_is_franchise |
|
| 5365 | 5365 | $csv_row[] = $locaked_fields; // gd_franchise_lock fields |
| 5366 | - $csv_row[] = (int)$franchise; // franchise id |
|
| 5366 | + $csv_row[] = (int) $franchise; // franchise id |
|
| 5367 | 5367 | } |
| 5368 | 5368 | |
| 5369 | 5369 | /** |
@@ -5377,15 +5377,15 @@ discard block |
||
| 5377 | 5377 | */ |
| 5378 | 5378 | $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
| 5379 | 5379 | |
| 5380 | - for ( $c = 0; $c < $images_count; $c++ ) {
|
|
| 5381 | - $csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE |
|
| 5380 | + for ($c = 0; $c < $images_count; $c++) {
|
|
| 5381 | + $csv_row[] = isset($current_images[$c]) ? $current_images[$c] : ''; // IMAGE |
|
| 5382 | 5382 | } |
| 5383 | 5383 | |
| 5384 | 5384 | $csv_rows[] = $csv_row; |
| 5385 | 5385 | |
| 5386 | 5386 | } |
| 5387 | 5387 | |
| 5388 | - for ( $c = 0; $c < $images_count; $c++ ) {
|
|
| 5388 | + for ($c = 0; $c < $images_count; $c++) {
|
|
| 5389 | 5389 | $csv_rows[0][] = 'IMAGE'; |
| 5390 | 5390 | } |
| 5391 | 5391 | } |
@@ -5407,30 +5407,30 @@ discard block |
||
| 5407 | 5407 | * @param int $page_no Page number. Default 0. |
| 5408 | 5408 | * @return array Array of posts data. |
| 5409 | 5409 | */ |
| 5410 | -function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
| 5410 | +function geodir_get_export_posts($post_type, $per_page = 0, $page_no = 0) {
|
|
| 5411 | 5411 | global $wpdb, $plugin_prefix; |
| 5412 | 5412 | |
| 5413 | - if ( ! post_type_exists( $post_type ) ) |
|
| 5413 | + if (!post_type_exists($post_type)) |
|
| 5414 | 5414 | return new stdClass; |
| 5415 | 5415 | |
| 5416 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5416 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 5417 | 5417 | |
| 5418 | 5418 | $limit = ''; |
| 5419 | - if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5420 | - $offset = ( $page_no - 1 ) * $per_page; |
|
| 5419 | + if ($per_page > 0 && $page_no > 0) {
|
|
| 5420 | + $offset = ($page_no - 1) * $per_page; |
|
| 5421 | 5421 | |
| 5422 | - if ( $offset > 0 ) {
|
|
| 5423 | - $limit = " LIMIT " . $offset . "," . $per_page; |
|
| 5422 | + if ($offset > 0) {
|
|
| 5423 | + $limit = " LIMIT ".$offset.",".$per_page; |
|
| 5424 | 5424 | } else {
|
| 5425 | - $limit = " LIMIT " . $per_page; |
|
| 5425 | + $limit = " LIMIT ".$per_page; |
|
| 5426 | 5426 | } |
| 5427 | 5427 | } |
| 5428 | 5428 | |
| 5429 | 5429 | // Skip listing with statuses trash, auto-draft etc... |
| 5430 | 5430 | $skip_statuses = geodir_imex_export_skip_statuses(); |
| 5431 | 5431 | $where_statuses = ''; |
| 5432 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5433 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5432 | + if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
| 5433 | + $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
| 5434 | 5434 | } |
| 5435 | 5435 | |
| 5436 | 5436 | /** |
@@ -5441,9 +5441,9 @@ discard block |
||
| 5441 | 5441 | * |
| 5442 | 5442 | * @param string $where SQL where clause part. |
| 5443 | 5443 | */ |
| 5444 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5444 | + $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);
|
|
| 5445 | 5445 | |
| 5446 | - $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 );
|
|
| 5446 | + $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);
|
|
| 5447 | 5447 | /** |
| 5448 | 5448 | * Modify returned posts SQL query for the current post type. |
| 5449 | 5449 | * |
@@ -5453,8 +5453,8 @@ discard block |
||
| 5453 | 5453 | * @param int $query The SQL query. |
| 5454 | 5454 | * @param string $post_type Post type. |
| 5455 | 5455 | */ |
| 5456 | - $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
| 5457 | - $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A ); |
|
| 5456 | + $query = apply_filters('geodir_imex_export_posts_query', $query, $post_type);
|
|
| 5457 | + $results = (array) $wpdb->get_results($wpdb->prepare($query, $post_type), ARRAY_A); |
|
| 5458 | 5458 | |
| 5459 | 5459 | /** |
| 5460 | 5460 | * Modify returned post results for the current post type. |
@@ -5465,7 +5465,7 @@ discard block |
||
| 5465 | 5465 | * @param object $results An object containing all post ids. |
| 5466 | 5466 | * @param string $post_type Post type. |
| 5467 | 5467 | */ |
| 5468 | - return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
| 5468 | + return apply_filters('geodir_export_posts', $results, $post_type);
|
|
| 5469 | 5469 | } |
| 5470 | 5470 | |
| 5471 | 5471 | /** |
@@ -5483,24 +5483,24 @@ discard block |
||
| 5483 | 5483 | * @param string $post_type Post type. |
| 5484 | 5484 | * @return string The SQL query. |
| 5485 | 5485 | */ |
| 5486 | -function geodir_imex_get_events_query( $query, $post_type ) {
|
|
| 5487 | - if ( $post_type == 'gd_event' ) {
|
|
| 5486 | +function geodir_imex_get_events_query($query, $post_type) {
|
|
| 5487 | + if ($post_type == 'gd_event') {
|
|
| 5488 | 5488 | global $wpdb, $plugin_prefix; |
| 5489 | 5489 | |
| 5490 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5490 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 5491 | 5491 | $schedule_table = EVENT_SCHEDULE; |
| 5492 | 5492 | |
| 5493 | 5493 | // Skip listing with statuses trash, auto-draft etc... |
| 5494 | 5494 | $skip_statuses = geodir_imex_export_skip_statuses(); |
| 5495 | 5495 | $where_statuses = ''; |
| 5496 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5497 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5496 | + if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
| 5497 | + $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
| 5498 | 5498 | } |
| 5499 | 5499 | |
| 5500 | 5500 | /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
| 5501 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5501 | + $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);
|
|
| 5502 | 5502 | |
| 5503 | - $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 );
|
|
| 5503 | + $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);
|
|
| 5504 | 5504 | } |
| 5505 | 5505 | |
| 5506 | 5506 | return $query; |
@@ -5524,35 +5524,35 @@ discard block |
||
| 5524 | 5524 | * @param string $post_type Post type. |
| 5525 | 5525 | * @return int Total terms count. |
| 5526 | 5526 | */ |
| 5527 | -function geodir_get_terms_count( $post_type ) {
|
|
| 5528 | - $args = array( 'hide_empty' => 0 ); |
|
| 5527 | +function geodir_get_terms_count($post_type) {
|
|
| 5528 | + $args = array('hide_empty' => 0);
|
|
| 5529 | 5529 | |
| 5530 | - remove_all_filters( 'get_terms' ); |
|
| 5530 | + remove_all_filters('get_terms');
|
|
| 5531 | 5531 | |
| 5532 | - $taxonomy = $post_type . 'category'; |
|
| 5532 | + $taxonomy = $post_type.'category'; |
|
| 5533 | 5533 | |
| 5534 | 5534 | // WPML |
| 5535 | 5535 | $is_wpml = geodir_is_wpml(); |
| 5536 | 5536 | $active_lang = 'all'; |
| 5537 | - if ( $is_wpml ) {
|
|
| 5537 | + if ($is_wpml) {
|
|
| 5538 | 5538 | global $sitepress; |
| 5539 | 5539 | $active_lang = $sitepress->get_current_language(); |
| 5540 | 5540 | |
| 5541 | - if ( $active_lang != 'all' ) {
|
|
| 5542 | - $sitepress->switch_lang( 'all', true ); |
|
| 5541 | + if ($active_lang != 'all') {
|
|
| 5542 | + $sitepress->switch_lang('all', true);
|
|
| 5543 | 5543 | } |
| 5544 | 5544 | } |
| 5545 | 5545 | // WPML |
| 5546 | 5546 | |
| 5547 | - $count_terms = wp_count_terms( $taxonomy, $args ); |
|
| 5547 | + $count_terms = wp_count_terms($taxonomy, $args); |
|
| 5548 | 5548 | |
| 5549 | 5549 | // WPML |
| 5550 | - if ( $is_wpml && $active_lang !== 'all' ) {
|
|
| 5550 | + if ($is_wpml && $active_lang !== 'all') {
|
|
| 5551 | 5551 | global $sitepress; |
| 5552 | - $sitepress->switch_lang( $active_lang, true ); |
|
| 5552 | + $sitepress->switch_lang($active_lang, true); |
|
| 5553 | 5553 | } |
| 5554 | 5554 | // WPML |
| 5555 | - $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
| 5555 | + $count_terms = !is_wp_error($count_terms) ? $count_terms : 0; |
|
| 5556 | 5556 | |
| 5557 | 5557 | return $count_terms; |
| 5558 | 5558 | } |
@@ -5569,23 +5569,23 @@ discard block |
||
| 5569 | 5569 | * @param int $page_no Page number. Default 0. |
| 5570 | 5570 | * @return array Array of terms data. |
| 5571 | 5571 | */ |
| 5572 | -function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
| 5573 | - $args = array( 'hide_empty' => 0, 'orderby' => 'id' ); |
|
| 5572 | +function geodir_imex_get_terms($post_type, $per_page = 0, $page_no = 0) {
|
|
| 5573 | + $args = array('hide_empty' => 0, 'orderby' => 'id');
|
|
| 5574 | 5574 | |
| 5575 | - remove_all_filters( 'get_terms' ); |
|
| 5575 | + remove_all_filters('get_terms');
|
|
| 5576 | 5576 | |
| 5577 | - $taxonomy = $post_type . 'category'; |
|
| 5577 | + $taxonomy = $post_type.'category'; |
|
| 5578 | 5578 | |
| 5579 | - if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5580 | - $args['offset'] = ( $page_no - 1 ) * $per_page; |
|
| 5579 | + if ($per_page > 0 && $page_no > 0) {
|
|
| 5580 | + $args['offset'] = ($page_no - 1) * $per_page; |
|
| 5581 | 5581 | $args['number'] = $per_page; |
| 5582 | 5582 | } |
| 5583 | 5583 | |
| 5584 | - $terms = get_terms( $taxonomy, $args ); |
|
| 5584 | + $terms = get_terms($taxonomy, $args); |
|
| 5585 | 5585 | |
| 5586 | 5586 | $csv_rows = array(); |
| 5587 | 5587 | |
| 5588 | - if ( !empty( $terms ) ) {
|
|
| 5588 | + if (!empty($terms)) {
|
|
| 5589 | 5589 | $csv_row = array(); |
| 5590 | 5590 | $csv_row[] = 'cat_id'; |
| 5591 | 5591 | $csv_row[] = 'cat_name'; |
@@ -5607,16 +5607,16 @@ discard block |
||
| 5607 | 5607 | |
| 5608 | 5608 | $csv_rows[] = $csv_row; |
| 5609 | 5609 | |
| 5610 | - foreach ( $terms as $term ) {
|
|
| 5611 | - $cat_icon = get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type ); |
|
| 5612 | - $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 5610 | + foreach ($terms as $term) {
|
|
| 5611 | + $cat_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $post_type); |
|
| 5612 | + $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : ''; |
|
| 5613 | 5613 | |
| 5614 | - $cat_image = geodir_get_default_catimage( $term->term_id, $post_type ); |
|
| 5615 | - $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 5614 | + $cat_image = geodir_get_default_catimage($term->term_id, $post_type); |
|
| 5615 | + $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : ''; |
|
| 5616 | 5616 | |
| 5617 | 5617 | $cat_parent = ''; |
| 5618 | - if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {
|
|
| 5619 | - $parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy ); |
|
| 5618 | + if (isset($term->parent) && (int) $term->parent > 0 && term_exists((int) $term->parent, $taxonomy)) {
|
|
| 5619 | + $parent_term = (array) get_term_by('id', (int) $term->parent, $taxonomy);
|
|
| 5620 | 5620 | $cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : ''; |
| 5621 | 5621 | } |
| 5622 | 5622 | |
@@ -5626,15 +5626,15 @@ discard block |
||
| 5626 | 5626 | $csv_row[] = $term->slug; |
| 5627 | 5627 | $csv_row[] = $post_type; |
| 5628 | 5628 | $csv_row[] = $cat_parent; |
| 5629 | - $csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type ); |
|
| 5629 | + $csv_row[] = get_tax_meta($term->term_id, 'ct_cat_schema', false, $post_type); |
|
| 5630 | 5630 | // WPML |
| 5631 | 5631 | if ($is_wpml) {
|
| 5632 | - $csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5633 | - $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5632 | + $csv_row[] = geodir_get_language_for_element($term->term_id, 'tax_'.$taxonomy); |
|
| 5633 | + $csv_row[] = geodir_imex_original_post_id($term->term_id, 'tax_'.$taxonomy); |
|
| 5634 | 5634 | } |
| 5635 | 5635 | // WPML |
| 5636 | 5636 | $csv_row[] = $term->description; |
| 5637 | - $csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type ); |
|
| 5637 | + $csv_row[] = get_tax_meta($term->term_id, 'ct_cat_top_desc', false, $post_type); |
|
| 5638 | 5638 | $csv_row[] = $cat_image; |
| 5639 | 5639 | $csv_row[] = $cat_icon; |
| 5640 | 5640 | |
@@ -5653,10 +5653,10 @@ discard block |
||
| 5653 | 5653 | * @param bool $relative True for relative path & False for absolute path. |
| 5654 | 5654 | * @return string Path to the cache directory. |
| 5655 | 5655 | */ |
| 5656 | -function geodir_path_import_export( $relative = true ) {
|
|
| 5656 | +function geodir_path_import_export($relative = true) {
|
|
| 5657 | 5657 | $upload_dir = wp_upload_dir(); |
| 5658 | 5658 | |
| 5659 | - return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache'; |
|
| 5659 | + return $relative ? $upload_dir['baseurl'].'/cache' : $upload_dir['basedir'].'/cache'; |
|
| 5660 | 5660 | } |
| 5661 | 5661 | |
| 5662 | 5662 | /** |
@@ -5672,8 +5672,8 @@ discard block |
||
| 5672 | 5672 | * @param bool $clear If true then it overwrite data otherwise add rows at the end of file. |
| 5673 | 5673 | * @return bool true if success otherwise false. |
| 5674 | 5674 | */ |
| 5675 | -function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {
|
|
| 5676 | - if ( empty( $csv_data ) ) {
|
|
| 5675 | +function geodir_save_csv_data($file_path, $csv_data = array(), $clear = true) {
|
|
| 5676 | + if (empty($csv_data)) {
|
|
| 5677 | 5677 | return false; |
| 5678 | 5678 | } |
| 5679 | 5679 | |
@@ -5681,17 +5681,17 @@ discard block |
||
| 5681 | 5681 | |
| 5682 | 5682 | $mode = $clear ? 'w+' : 'a+'; |
| 5683 | 5683 | |
| 5684 | - if ( function_exists( 'fputcsv' ) ) {
|
|
| 5685 | - $file = fopen( $file_path, $mode ); |
|
| 5686 | - foreach( $csv_data as $csv_row ) {
|
|
| 5684 | + if (function_exists('fputcsv')) {
|
|
| 5685 | + $file = fopen($file_path, $mode); |
|
| 5686 | + foreach ($csv_data as $csv_row) {
|
|
| 5687 | 5687 | //$csv_row = array_map( 'utf8_decode', $csv_row ); |
| 5688 | - $write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' ); |
|
| 5688 | + $write_successful = fputcsv($file, $csv_row, ",", $enclosure = '"'); |
|
| 5689 | 5689 | } |
| 5690 | - fclose( $file ); |
|
| 5690 | + fclose($file); |
|
| 5691 | 5691 | } else {
|
| 5692 | - foreach( $csv_data as $csv_row ) {
|
|
| 5692 | + foreach ($csv_data as $csv_row) {
|
|
| 5693 | 5693 | //$csv_row = array_map( 'utf8_decode', $csv_row ); |
| 5694 | - $wp_filesystem->put_contents( $file_path, $csv_row ); |
|
| 5694 | + $wp_filesystem->put_contents($file_path, $csv_row); |
|
| 5695 | 5695 | } |
| 5696 | 5696 | } |
| 5697 | 5697 | |
@@ -5709,14 +5709,14 @@ discard block |
||
| 5709 | 5709 | * @param string $file Full path to file. |
| 5710 | 5710 | * @return int No of file rows. |
| 5711 | 5711 | */ |
| 5712 | -function geodir_import_export_line_count( $file ) {
|
|
| 5712 | +function geodir_import_export_line_count($file) {
|
|
| 5713 | 5713 | global $wp_filesystem; |
| 5714 | 5714 | |
| 5715 | - if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {
|
|
| 5716 | - $contents = $wp_filesystem->get_contents_array( $file ); |
|
| 5715 | + if ($wp_filesystem->is_file($file) && $wp_filesystem->exists($file)) {
|
|
| 5716 | + $contents = $wp_filesystem->get_contents_array($file); |
|
| 5717 | 5717 | |
| 5718 | - if ( !empty( $contents ) && is_array( $contents ) ) {
|
|
| 5719 | - return count( $contents ) - 1; |
|
| 5718 | + if (!empty($contents) && is_array($contents)) {
|
|
| 5719 | + return count($contents) - 1; |
|
| 5720 | 5720 | } |
| 5721 | 5721 | } |
| 5722 | 5722 | |
@@ -5733,11 +5733,11 @@ discard block |
||
| 5733 | 5733 | * @param string $post_type The post type. |
| 5734 | 5734 | * @return object Queried object. |
| 5735 | 5735 | */ |
| 5736 | -function geodir_imex_get_custom_fields( $post_type ) {
|
|
| 5736 | +function geodir_imex_get_custom_fields($post_type) {
|
|
| 5737 | 5737 | global $wpdb; |
| 5738 | 5738 | |
| 5739 | - $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 ) );
|
|
| 5740 | - $rows = $wpdb->get_results( $sql ); |
|
| 5739 | + $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));
|
|
| 5740 | + $rows = $wpdb->get_results($sql); |
|
| 5741 | 5741 | |
| 5742 | 5742 | return $rows; |
| 5743 | 5743 | } |
@@ -5753,10 +5753,10 @@ discard block |
||
| 5753 | 5753 | * @return array Event data array. |
| 5754 | 5754 | */ |
| 5755 | 5755 | function geodir_imex_get_event_data($post, $gd_post_info) {
|
| 5756 | - $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'] ) ) : ''; |
|
| 5756 | + $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'])) : '';
|
|
| 5757 | 5757 | $event_enddate = $event_date; |
| 5758 | - $starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : ''; |
|
| 5759 | - $endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : ''; |
|
| 5758 | + $starttime = isset($post['starttime']) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['starttime'])) : '';
|
|
| 5759 | + $endtime = isset($post['endtime']) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['endtime'])) : '';
|
|
| 5760 | 5760 | |
| 5761 | 5761 | $is_recurring_event = ''; |
| 5762 | 5762 | $event_duration_days = ''; |
@@ -5773,15 +5773,15 @@ discard block |
||
| 5773 | 5773 | |
| 5774 | 5774 | $recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array(); |
| 5775 | 5775 | if (!empty($recurring_data)) {
|
| 5776 | - $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; |
|
| 5777 | - $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; |
|
| 5778 | - $starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime; |
|
| 5779 | - $endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime; |
|
| 5776 | + $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;
|
|
| 5777 | + $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;
|
|
| 5778 | + $starttime = isset($recurring_data['starttime']) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['starttime'])) : $starttime;
|
|
| 5779 | + $endtime = isset($recurring_data['endtime']) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['endtime'])) : $endtime;
|
|
| 5780 | 5780 | $is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : ''; |
| 5781 | 5781 | $different_times = !empty($recurring_data['different_times']) ? true : false; |
| 5782 | 5782 | |
| 5783 | - $recurring_pkg = geodir_event_recurring_pkg( $gd_post_info ); |
|
| 5784 | - $is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true; |
|
| 5783 | + $recurring_pkg = geodir_event_recurring_pkg($gd_post_info); |
|
| 5784 | + $is_recurring = isset($gd_post_info->is_recurring) && (int) $gd_post_info->is_recurring == 0 ? false : true; |
|
| 5785 | 5785 | |
| 5786 | 5786 | if ($recurring_pkg && $is_recurring) {
|
| 5787 | 5787 | $recurring_dates = $event_date; |
@@ -5791,13 +5791,13 @@ discard block |
||
| 5791 | 5791 | $recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';
|
| 5792 | 5792 | |
| 5793 | 5793 | if (!empty($recurring_data['event_recurring_dates'])) {
|
| 5794 | - $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] ); |
|
| 5794 | + $event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);
|
|
| 5795 | 5795 | |
| 5796 | 5796 | if (!empty($event_recurring_dates)) {
|
| 5797 | 5797 | $recurring_dates = array(); |
| 5798 | 5798 | |
| 5799 | 5799 | foreach ($event_recurring_dates as $date) {
|
| 5800 | - $recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) ); |
|
| 5800 | + $recurring_dates[] = date_i18n('d/m/Y', strtotime($date));
|
|
| 5801 | 5801 | } |
| 5802 | 5802 | |
| 5803 | 5803 | $recurring_dates = implode(",", $recurring_dates);
|
@@ -5813,7 +5813,7 @@ discard block |
||
| 5813 | 5813 | $times = array(); |
| 5814 | 5814 | |
| 5815 | 5815 | foreach ($recurring_data['starttimes'] as $time) {
|
| 5816 | - $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00'; |
|
| 5816 | + $times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';
|
|
| 5817 | 5817 | } |
| 5818 | 5818 | |
| 5819 | 5819 | $event_starttimes = implode(",", $times);
|
@@ -5823,7 +5823,7 @@ discard block |
||
| 5823 | 5823 | $times = array(); |
| 5824 | 5824 | |
| 5825 | 5825 | foreach ($recurring_data['endtimes'] as $time) {
|
| 5826 | - $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00'; |
|
| 5826 | + $times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';
|
|
| 5827 | 5827 | } |
| 5828 | 5828 | |
| 5829 | 5829 | $event_endtimes = implode(",", $times);
|
@@ -5835,8 +5835,8 @@ discard block |
||
| 5835 | 5835 | } |
| 5836 | 5836 | } |
| 5837 | 5837 | } else {
|
| 5838 | - $event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1; |
|
| 5839 | - $recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1; |
|
| 5838 | + $event_duration_days = isset($recurring_data['duration_x']) ? (int) $recurring_data['duration_x'] : 1; |
|
| 5839 | + $recurring_interval = !empty($recurring_data['repeat_x']) && (int) $recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1; |
|
| 5840 | 5840 | |
| 5841 | 5841 | if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {
|
| 5842 | 5842 | $week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');
|
@@ -5852,11 +5852,11 @@ discard block |
||
| 5852 | 5852 | } |
| 5853 | 5853 | |
| 5854 | 5854 | $recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;
|
| 5855 | - if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {
|
|
| 5856 | - $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'] ) ) : ''; |
|
| 5855 | + if (!empty($recurring_data['repeat_end_type']) && (int) $recurring_data['repeat_end_type'] == 1) {
|
|
| 5856 | + $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'])) : '';
|
|
| 5857 | 5857 | $max_recurring_count = empty($recurring_end_date) ? 1 : ''; |
| 5858 | 5858 | } else {
|
| 5859 | - $max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1); |
|
| 5859 | + $max_recurring_count = (!empty($recurring_data['max_repeat']) && (int) $recurring_data['max_repeat'] > 0 ? (int) $recurring_data['max_repeat'] : 1); |
|
| 5860 | 5860 | } |
| 5861 | 5861 | } |
| 5862 | 5862 | } |
@@ -5920,9 +5920,9 @@ discard block |
||
| 5920 | 5920 | * @return array Event data array. |
| 5921 | 5921 | */ |
| 5922 | 5922 | function geodir_imex_process_event_data($gd_post) {
|
| 5923 | - $recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post ); |
|
| 5923 | + $recurring_pkg = geodir_event_recurring_pkg((object) $gd_post); |
|
| 5924 | 5924 | |
| 5925 | - $is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true; |
|
| 5925 | + $is_recurring = isset($gd_post['is_recurring_event']) && (int) $gd_post['is_recurring_event'] == 0 ? false : true; |
|
| 5926 | 5926 | $event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_imex_get_date_ymd($gd_post['event_date']) : ''; |
| 5927 | 5927 | $event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_imex_get_date_ymd($gd_post['event_enddate']) : $event_date; |
| 5928 | 5928 | $all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false; |
@@ -5969,17 +5969,17 @@ discard block |
||
| 5969 | 5969 | $event_recurring_dates = implode(",", $event_recurring_dates);
|
| 5970 | 5970 | } |
| 5971 | 5971 | } else {
|
| 5972 | - $duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1; |
|
| 5973 | - $repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1; |
|
| 5974 | - $max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1; |
|
| 5975 | - $repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : ''; |
|
| 5972 | + $duration_x = !empty($gd_post['event_duration_days']) ? (int) $gd_post['event_duration_days'] : 1; |
|
| 5973 | + $repeat_x = !empty($gd_post['recurring_interval']) ? (int) $gd_post['recurring_interval'] : 1; |
|
| 5974 | + $max_repeat = !empty($gd_post['max_recurring_count']) ? (int) $gd_post['max_recurring_count'] : 1; |
|
| 5975 | + $repeat_end = !empty($gd_post['recurring_end_date']) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : ''; |
|
| 5976 | 5976 | |
| 5977 | 5977 | $repeat_end_type = $repeat_end != '' ? 1 : 0; |
| 5978 | 5978 | $max_repeat = $repeat_end != '' ? '' : $max_repeat; |
| 5979 | 5979 | |
| 5980 | 5980 | $week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));
|
| 5981 | 5981 | |
| 5982 | - $a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();
|
|
| 5982 | + $a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days']) != '' ? explode(',', trim($gd_post['recurring_week_days'])) : array();
|
|
| 5983 | 5983 | $repeat_days = array(); |
| 5984 | 5984 | if (!empty($a_repeat_days)) {
|
| 5985 | 5985 | foreach ($a_repeat_days as $repeat_day) {
|
@@ -5997,7 +5997,7 @@ discard block |
||
| 5997 | 5997 | $repeat_weeks = array(); |
| 5998 | 5998 | if (!empty($a_repeat_weeks)) {
|
| 5999 | 5999 | foreach ($a_repeat_weeks as $repeat_week) {
|
| 6000 | - $repeat_weeks[] = (int)$repeat_week; |
|
| 6000 | + $repeat_weeks[] = (int) $repeat_week; |
|
| 6001 | 6001 | } |
| 6002 | 6002 | |
| 6003 | 6003 | $repeat_weeks = array_unique($repeat_weeks); |
@@ -6061,7 +6061,7 @@ discard block |
||
| 6061 | 6061 | |
| 6062 | 6062 | $page_found = $wpdb->get_var( |
| 6063 | 6063 | $wpdb->prepare( |
| 6064 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 6064 | + "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;", |
|
| 6065 | 6065 | array($slug) |
| 6066 | 6066 | ) |
| 6067 | 6067 | ); |
@@ -6116,7 +6116,7 @@ discard block |
||
| 6116 | 6116 | */ |
| 6117 | 6117 | function geodir_admin_upgrade_notice() {
|
| 6118 | 6118 | $class = "error"; |
| 6119 | - $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
| 6119 | + $message = __("Please update core GeoDirectory or some addons may not function correctly.", "geodirectory");
|
|
| 6120 | 6120 | echo"<div class=\"$class\"> <p>$message</p></div>"; |
| 6121 | 6121 | } |
| 6122 | 6122 | |
@@ -6128,7 +6128,7 @@ discard block |
||
| 6128 | 6128 | * @param (object) $r |
| 6129 | 6129 | * @return (string) $output |
| 6130 | 6130 | */ |
| 6131 | -function geodire_admin_upgrade_notice( $plugin_data, $r ) |
|
| 6131 | +function geodire_admin_upgrade_notice($plugin_data, $r) |
|
| 6132 | 6132 | {
|
| 6133 | 6133 | // readme contents |
| 6134 | 6134 | $args = array( |
@@ -6136,7 +6136,7 @@ discard block |
||
| 6136 | 6136 | 'redirection' => 5 |
| 6137 | 6137 | ); |
| 6138 | 6138 | $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
| 6139 | - $data = wp_remote_get( $url, $args ); |
|
| 6139 | + $data = wp_remote_get($url, $args); |
|
| 6140 | 6140 | |
| 6141 | 6141 | if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
| 6142 | 6142 | |
@@ -6151,20 +6151,20 @@ discard block |
||
| 6151 | 6151 | function geodir_in_plugin_update_message($content) {
|
| 6152 | 6152 | // Output Upgrade Notice |
| 6153 | 6153 | $matches = null; |
| 6154 | - $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
| 6154 | + $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*'.preg_quote(GEODIRECTORY_VERSION).'\s*=|$)~Uis'; |
|
| 6155 | 6155 | $upgrade_notice = ''; |
| 6156 | - if ( preg_match( $regexp, $content, $matches ) ) {
|
|
| 6157 | - if(empty($matches)){return;}
|
|
| 6156 | + if (preg_match($regexp, $content, $matches)) {
|
|
| 6157 | + if (empty($matches)) {return; }
|
|
| 6158 | 6158 | |
| 6159 | - $version = trim( $matches[1] ); |
|
| 6160 | - if($version && $version>GEODIRECTORY_VERSION){
|
|
| 6159 | + $version = trim($matches[1]); |
|
| 6160 | + if ($version && $version > GEODIRECTORY_VERSION) {
|
|
| 6161 | 6161 | |
| 6162 | 6162 | |
| 6163 | - $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
| 6164 | - if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
| 6163 | + $notices = (array) preg_split('~[\r\n]+~', trim($matches[2]));
|
|
| 6164 | + if (version_compare(GEODIRECTORY_VERSION, $version, '<')) {
|
|
| 6165 | 6165 | $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
| 6166 | - foreach ( $notices as $index => $line ) {
|
|
| 6167 | - $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
| 6166 | + foreach ($notices as $index => $line) {
|
|
| 6167 | + $upgrade_notice .= wp_kses_post(preg_replace('~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line));
|
|
| 6168 | 6168 | } |
| 6169 | 6169 | $upgrade_notice .= '</div> '; |
| 6170 | 6170 | } |
@@ -6188,7 +6188,7 @@ discard block |
||
| 6188 | 6188 | $default_language = $sitepress->get_default_language(); |
| 6189 | 6189 | if ($current_language != 'all' && $current_language != $default_language) {
|
| 6190 | 6190 | ?> |
| 6191 | - <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>
|
|
| 6191 | + <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>
|
|
| 6192 | 6192 | <?php |
| 6193 | 6193 | } |
| 6194 | 6194 | } |
@@ -6203,7 +6203,7 @@ discard block |
||
| 6203 | 6203 | * @param array Listing statuses to be skipped. |
| 6204 | 6204 | */ |
| 6205 | 6205 | function geodir_imex_export_skip_statuses() {
|
| 6206 | - $statuses = array( 'trash', 'auto-draft' ); |
|
| 6206 | + $statuses = array('trash', 'auto-draft');
|
|
| 6207 | 6207 | |
| 6208 | 6208 | /** |
| 6209 | 6209 | * Filter the statuses to skip during GD export listings. |
@@ -6213,7 +6213,7 @@ discard block |
||
| 6213 | 6213 | * |
| 6214 | 6214 | * @param array $statuses Listing statuses to be skipped. |
| 6215 | 6215 | */ |
| 6216 | - $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
| 6216 | + $statuses = apply_filters('geodir_imex_export_skip_statuses', $statuses);
|
|
| 6217 | 6217 | |
| 6218 | 6218 | return $statuses; |
| 6219 | 6219 | } |
@@ -6279,16 +6279,16 @@ discard block |
||
| 6279 | 6279 | function geodir_imex_get_filter_where($where = '', $post_type = '') {
|
| 6280 | 6280 | global $wpdb; |
| 6281 | 6281 | |
| 6282 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6282 | + $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6283 | 6283 | |
| 6284 | - if ( !empty( $filters ) ) {
|
|
| 6285 | - foreach ( $filters as $field => $value ) {
|
|
| 6284 | + if (!empty($filters)) {
|
|
| 6285 | + foreach ($filters as $field => $value) {
|
|
| 6286 | 6286 | switch ($field) {
|
| 6287 | 6287 | case 'start_date': |
| 6288 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
| 6288 | + $where .= " AND `".$wpdb->posts."`.`post_date` >= '".sanitize_text_field($value)." 00:00:00'"; |
|
| 6289 | 6289 | break; |
| 6290 | 6290 | case 'end_date': |
| 6291 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
| 6291 | + $where .= " AND `".$wpdb->posts."`.`post_date` <= '".sanitize_text_field($value)." 23:59:59'"; |
|
| 6292 | 6292 | break; |
| 6293 | 6293 | } |
| 6294 | 6294 | } |
@@ -6300,25 +6300,25 @@ discard block |
||
| 6300 | 6300 | add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);
|
| 6301 | 6301 | |
| 6302 | 6302 | |
| 6303 | -function geodir_fix_for_primer_theme(){
|
|
| 6304 | - if(!defined( 'PRIMER_VERSION' )){return;}
|
|
| 6303 | +function geodir_fix_for_primer_theme() {
|
|
| 6304 | + if (!defined('PRIMER_VERSION')) {return; }
|
|
| 6305 | 6305 | global $pagenow; |
| 6306 | 6306 | |
| 6307 | - if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
| 6307 | + if (('post.php' === $pagenow || 'post-new.php' === $pagenow) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']))) {
|
|
| 6308 | 6308 | |
| 6309 | - $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
| 6309 | + $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type($_GET['post']); |
|
| 6310 | 6310 | |
| 6311 | 6311 | $post_types = geodir_get_posttypes(); |
| 6312 | - if ($post_type && in_array($post_type, $post_types) ) {
|
|
| 6312 | + if ($post_type && in_array($post_type, $post_types)) {
|
|
| 6313 | 6313 | global $primer_customizer_layouts; |
| 6314 | - remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
| 6314 | + remove_action('add_meta_boxes', array($primer_customizer_layouts, 'add_meta_box'), 10);
|
|
| 6315 | 6315 | } |
| 6316 | 6316 | } |
| 6317 | 6317 | |
| 6318 | 6318 | } |
| 6319 | 6319 | |
| 6320 | -if(is_admin()){
|
|
| 6321 | - add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
| 6320 | +if (is_admin()) {
|
|
| 6321 | + add_action('add_meta_boxes', 'geodir_fix_for_primer_theme', 0);
|
|
| 6322 | 6322 | } |
| 6323 | 6323 | |
| 6324 | 6324 | |
@@ -6451,32 +6451,32 @@ discard block |
||
| 6451 | 6451 | |
| 6452 | 6452 | function geodir_ga_activation_url() {
|
| 6453 | 6453 | |
| 6454 | - return add_query_arg( array( |
|
| 6454 | + return add_query_arg(array( |
|
| 6455 | 6455 | 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
| 6456 | 6456 | 'scope' => GEODIR_GA_SCOPE, |
| 6457 | 6457 | 'response_type' => 'code', |
| 6458 | 6458 | 'redirect_uri' => GEODIR_GA_REDIRECT, |
| 6459 | 6459 | 'client_id' => GEODIR_GA_CLIENTID, |
| 6460 | - ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
| 6460 | + ), 'https://accounts.google.com/o/oauth2/auth'); |
|
| 6461 | 6461 | |
| 6462 | 6462 | return $url; |
| 6463 | 6463 | } |
| 6464 | 6464 | |
| 6465 | -function geodir_gd_accounts(){
|
|
| 6465 | +function geodir_gd_accounts() {
|
|
| 6466 | 6466 | $accounts = array(); |
| 6467 | - $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
| 6468 | - if($useAuth){
|
|
| 6467 | + $useAuth = (get_option('geodir_ga_auth_code') == '' ? false : true);
|
|
| 6468 | + if ($useAuth) {
|
|
| 6469 | 6469 | try {
|
| 6470 | 6470 | $accounts = geodir_ga_get_analytics_accounts(); |
| 6471 | 6471 | } catch (Exception $e) {
|
| 6472 | - geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 6472 | + geodir_error_log(wp_sprintf(__('GD Google Analytics API Error(%s) : %s', 'geodirectory'), $e->getCode(), $e->getMessage()));
|
|
| 6473 | 6473 | } |
| 6474 | 6474 | |
| 6475 | - if(is_array($accounts)){
|
|
| 6476 | - $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
| 6477 | - }elseif(get_option('geodir_ga_account_id')){
|
|
| 6475 | + if (is_array($accounts)) {
|
|
| 6476 | + $accounts = array_merge(array(__('Select Account', 'geodirectory')), $accounts);
|
|
| 6477 | + }elseif (get_option('geodir_ga_account_id')) {
|
|
| 6478 | 6478 | $accounts = array(); |
| 6479 | - $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6479 | + $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required', 'geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6480 | 6480 | } |
| 6481 | 6481 | } |
| 6482 | 6482 | return $accounts; |
@@ -6487,21 +6487,21 @@ discard block |
||
| 6487 | 6487 | global $gd_ga_errors; |
| 6488 | 6488 | $accounts = array(); |
| 6489 | 6489 | |
| 6490 | - if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
| 6490 | + if (get_option('geodir_ga_auth_token') === false) {update_option('geodir_ga_auth_token', ''); }
|
|
| 6491 | 6491 | |
| 6492 | 6492 | |
| 6493 | - if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
| 6493 | + if (get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])) {
|
|
| 6494 | 6494 | return get_option('geodir_gd_uids');
|
| 6495 | 6495 | } |
| 6496 | 6496 | |
| 6497 | 6497 | # Create a new Gdata call |
| 6498 | - if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6498 | + if (trim(get_option('geodir_ga_auth_code')) != '')
|
|
| 6499 | 6499 | $stats = new GDGoogleAnalyticsStats(); |
| 6500 | 6500 | else |
| 6501 | 6501 | return false; |
| 6502 | 6502 | |
| 6503 | 6503 | # Check if Google sucessfully logged in |
| 6504 | - if ( ! $stats->checkLogin() ) |
|
| 6504 | + if (!$stats->checkLogin()) |
|
| 6505 | 6505 | return false; |
| 6506 | 6506 | |
| 6507 | 6507 | # Get a list of accounts |
@@ -6513,28 +6513,28 @@ discard block |
||
| 6513 | 6513 | } |
| 6514 | 6514 | |
| 6515 | 6515 | |
| 6516 | - natcasesort ($accounts); |
|
| 6516 | + natcasesort($accounts); |
|
| 6517 | 6517 | |
| 6518 | 6518 | # Return the account array if there are accounts |
| 6519 | - if ( count($accounts) > 0 ){
|
|
| 6520 | - update_option('geodir_gd_uids',$accounts);
|
|
| 6519 | + if (count($accounts) > 0) {
|
|
| 6520 | + update_option('geodir_gd_uids', $accounts);
|
|
| 6521 | 6521 | return $accounts; |
| 6522 | 6522 | } |
| 6523 | 6523 | else |
| 6524 | 6524 | return false; |
| 6525 | 6525 | } |
| 6526 | 6526 | |
| 6527 | -add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' ); |
|
| 6528 | -function geodir_ga_deauthorize(){
|
|
| 6527 | +add_action('wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize');
|
|
| 6528 | +function geodir_ga_deauthorize() {
|
|
| 6529 | 6529 | |
| 6530 | - if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
| 6530 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'gd_ga_deauthorize')) {
|
|
| 6531 | 6531 | |
| 6532 | - die( 'Security check' ); |
|
| 6532 | + die('Security check');
|
|
| 6533 | 6533 | |
| 6534 | 6534 | } else {
|
| 6535 | - update_option('geodir_ga_auth_token','');
|
|
| 6536 | - update_option('geodir_ga_auth_code','');
|
|
| 6537 | - update_option('geodir_gd_uids','');
|
|
| 6535 | + update_option('geodir_ga_auth_token', '');
|
|
| 6536 | + update_option('geodir_ga_auth_code', '');
|
|
| 6537 | + update_option('geodir_gd_uids', '');
|
|
| 6538 | 6538 | |
| 6539 | 6539 | |
| 6540 | 6540 | echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|
@@ -184,8 +184,9 @@ discard block |
||
| 184 | 184 | |
| 185 | 185 | $thumb_img_arr = array(); |
| 186 | 186 | |
| 187 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 188 | - $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 187 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { |
|
| 188 | + $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 189 | + } |
|
| 189 | 190 | |
| 190 | 191 | $totImg = ''; |
| 191 | 192 | $image_limit = ''; |
@@ -236,7 +237,9 @@ discard block |
||
| 236 | 237 | {
|
| 237 | 238 | global $menu, $geodirectory; |
| 238 | 239 | |
| 239 | - if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
|
|
| 240 | + if (current_user_can('manage_options')) { |
|
| 241 | + $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory'); |
|
| 242 | + } |
|
| 240 | 243 | |
| 241 | 244 | add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
|
| 242 | 245 | |
@@ -300,7 +303,9 @@ discard block |
||
| 300 | 303 | */ |
| 301 | 304 | function geodir_admin_custom_menu_order() |
| 302 | 305 | {
|
| 303 | - if (!current_user_can('manage_options')) return false;
|
|
| 306 | + if (!current_user_can('manage_options')) { |
|
| 307 | + return false; |
|
| 308 | + } |
|
| 304 | 309 | return true; |
| 305 | 310 | } |
| 306 | 311 | } |
@@ -331,10 +336,11 @@ discard block |
||
| 331 | 336 | case 'fail': |
| 332 | 337 | $gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : ''; |
| 333 | 338 | |
| 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>';
|
|
| 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>';
|
|
| 339 | + if ($gderr == 21) { |
|
| 340 | + 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>'; |
|
| 341 | + } else { |
|
| 342 | + echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>'; |
|
| 343 | + } |
|
| 338 | 344 | break; |
| 339 | 345 | } |
| 340 | 346 | } |
@@ -385,8 +391,12 @@ discard block |
||
| 385 | 391 | include_once('option-pages/' . $current_tab . '_array.php');
|
| 386 | 392 | } |
| 387 | 393 | if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
| 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'));
|
|
| 394 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) { |
|
| 395 | + die(__('Action failed. Please refresh the page and retry.', 'geodirectory')); |
|
| 396 | + } |
|
| 397 | + if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) { |
|
| 398 | + die(__('Action failed. Please refresh the page and retry.', 'geodirectory')); |
|
| 399 | + } |
|
| 390 | 400 | |
| 391 | 401 | /** |
| 392 | 402 | * Fires before updating geodirectory admin settings. |
@@ -398,8 +408,9 @@ discard block |
||
| 398 | 408 | */ |
| 399 | 409 | do_action('geodir_before_update_options', $current_tab, $geodir_settings);
|
| 400 | 410 | |
| 401 | - if (!empty($geodir_settings[$current_tab])) |
|
| 402 | - geodir_update_options($geodir_settings[$current_tab]); |
|
| 411 | + if (!empty($geodir_settings[$current_tab])) { |
|
| 412 | + geodir_update_options($geodir_settings[$current_tab]); |
|
| 413 | + } |
|
| 403 | 414 | |
| 404 | 415 | /** |
| 405 | 416 | * Called after GeoDirectory options settings are updated. |
@@ -447,11 +458,14 @@ discard block |
||
| 447 | 458 | * @return bool Returns true if saved. |
| 448 | 459 | */ |
| 449 | 460 | function geodir_update_options($options, $dummy = false) {
|
| 450 | - if ((!isset($_POST) || !$_POST) && !$dummy) return false; |
|
| 461 | + if ((!isset($_POST) || !$_POST) && !$dummy) { |
|
| 462 | + return false; |
|
| 463 | + } |
|
| 451 | 464 | |
| 452 | 465 | foreach ($options as $value) {
|
| 453 | - if ($dummy && isset($value['std'])) |
|
| 454 | - $_POST[$value['id']] = $value['std']; |
|
| 466 | + if ($dummy && isset($value['std'])) { |
|
| 467 | + $_POST[$value['id']] = $value['std']; |
|
| 468 | + } |
|
| 455 | 469 | |
| 456 | 470 | |
| 457 | 471 | if (isset($value['type']) && $value['type'] == 'checkbox') : |
@@ -460,25 +474,23 @@ discard block |
||
| 460 | 474 | update_option($value['id'], $_POST[$value['id']]); |
| 461 | 475 | } else {
|
| 462 | 476 | update_option($value['id'], 0); |
| 463 | - } |
|
| 464 | - |
|
| 465 | - elseif (isset($value['type']) && $value['type'] == 'image_width') : |
|
| 477 | + } elseif (isset($value['type']) && $value['type'] == 'image_width') : |
|
| 466 | 478 | |
| 467 | 479 | if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
|
| 468 | 480 | update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']); |
| 469 | 481 | update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']); |
| 470 | 482 | if (isset($_POST[$value['id'] . '_crop'])) : |
| 471 | 483 | update_option($value['id'] . '_crop', 1); |
| 472 | - else : |
|
| 473 | - update_option($value['id'] . '_crop', 0); |
|
| 484 | + else { |
|
| 485 | + : |
|
| 486 | + update_option($value['id'] . '_crop', 0); |
|
| 487 | + } |
|
| 474 | 488 | endif; |
| 475 | 489 | } else {
|
| 476 | 490 | update_option($value['id'] . '_width', $value['std']); |
| 477 | 491 | update_option($value['id'] . '_height', $value['std']); |
| 478 | 492 | update_option($value['id'] . '_crop', 1); |
| 479 | - } |
|
| 480 | - |
|
| 481 | - elseif (isset($value['type']) && $value['type'] == 'map') : |
|
| 493 | + } elseif (isset($value['type']) && $value['type'] == 'map') : |
|
| 482 | 494 | $post_types = array(); |
| 483 | 495 | $categories = array(); |
| 484 | 496 | |
@@ -523,8 +535,9 @@ discard block |
||
| 523 | 535 | $image_name_arr = explode('/', get_option($value['id']));
|
| 524 | 536 | $noimg_name = end($image_name_arr); |
| 525 | 537 | $img_path = $uploads['path'] . '/' . $noimg_name; |
| 526 | - if (file_exists($img_path)) |
|
| 527 | - unlink($img_path); |
|
| 538 | + if (file_exists($img_path)) { |
|
| 539 | + unlink($img_path); |
|
| 540 | + } |
|
| 528 | 541 | } |
| 529 | 542 | |
| 530 | 543 | update_option($value['id'], ''); |
@@ -540,8 +553,10 @@ discard block |
||
| 540 | 553 | foreach ($uploadedfile as $key => $uplaod): |
| 541 | 554 | if ($key == 'name'): |
| 542 | 555 | $uplaods[$key] = $filename; |
| 543 | - else : |
|
| 544 | - $uplaods[$key] = $uplaod; |
|
| 556 | + else { |
|
| 557 | + : |
|
| 558 | + $uplaods[$key] = $uplaod; |
|
| 559 | + } |
|
| 545 | 560 | endif; |
| 546 | 561 | endforeach; |
| 547 | 562 | |
@@ -551,8 +566,9 @@ discard block |
||
| 551 | 566 | $image_name_arr = explode('/', get_option($value['id']));
|
| 552 | 567 | $noimg_name = end($image_name_arr); |
| 553 | 568 | $img_path = $uploads['path'] . '/' . $noimg_name; |
| 554 | - if (file_exists($img_path)) |
|
| 555 | - unlink($img_path); |
|
| 569 | + if (file_exists($img_path)) { |
|
| 570 | + unlink($img_path); |
|
| 571 | + } |
|
| 556 | 572 | } |
| 557 | 573 | |
| 558 | 574 | $upload_overrides = array('test_form' => false);
|
@@ -567,10 +583,12 @@ discard block |
||
| 567 | 583 | endif; |
| 568 | 584 | |
| 569 | 585 | |
| 570 | - else : |
|
| 586 | + else { |
|
| 587 | + : |
|
| 571 | 588 | // same menu setting per theme. |
| 572 | 589 | if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
| 573 | - $theme = wp_get_theme(); |
|
| 590 | + $theme = wp_get_theme(); |
|
| 591 | + } |
|
| 574 | 592 | update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
| 575 | 593 | } |
| 576 | 594 | |
@@ -582,8 +600,9 @@ discard block |
||
| 582 | 600 | |
| 583 | 601 | endif; |
| 584 | 602 | } |
| 585 | - if ($dummy) |
|
| 586 | - $_POST = array(); |
|
| 603 | + if ($dummy) { |
|
| 604 | + $_POST = array(); |
|
| 605 | + } |
|
| 587 | 606 | return true; |
| 588 | 607 | |
| 589 | 608 | } |
@@ -729,9 +748,12 @@ discard block |
||
| 729 | 748 | $new_columns = array('location' => __('Location (ID)', 'geodirectory'),
|
| 730 | 749 | 'categorys' => __('Categories', 'geodirectory'));
|
| 731 | 750 | |
| 732 | - if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist
|
|
| 751 | + if (($offset = array_search('author', array_keys($columns))) === false) { |
|
| 752 | + // if the key doesn't exist |
|
| 733 | 753 | {
|
| 734 | - $offset = 0; // should we prepend $array with $data? |
|
| 754 | + $offset = 0; |
|
| 755 | + } |
|
| 756 | + // should we prepend $array with $data? |
|
| 735 | 757 | $offset = count($columns); // or should we append $array with $data? lets pick this one... |
| 736 | 758 | } |
| 737 | 759 | |
@@ -791,11 +813,13 @@ discard block |
||
| 791 | 813 | $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
|
| 792 | 814 | } |
| 793 | 815 | /* If no expire_date is found, output a default message. */ |
| 794 | - if (empty($expire_date)) |
|
| 795 | - echo __('Unknown', 'geodirectory');
|
|
| 816 | + if (empty($expire_date)) { |
|
| 817 | + echo __('Unknown', 'geodirectory'); |
|
| 818 | + } |
|
| 796 | 819 | /* If there is a expire_date, append 'days left' to the text string. */ |
| 797 | - else |
|
| 798 | - echo $expire_date . $date_diff_text; |
|
| 820 | + else { |
|
| 821 | + echo $expire_date . $date_diff_text; |
|
| 822 | + } |
|
| 799 | 823 | break; |
| 800 | 824 | |
| 801 | 825 | /* If displaying the 'categorys' column. */ |
@@ -868,21 +892,26 @@ discard block |
||
| 868 | 892 | |
| 869 | 893 | $geodir_posttypes = geodir_get_posttypes(); |
| 870 | 894 | |
| 871 | - if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
|
|
| 872 | - return; |
|
| 895 | + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) { |
|
| 896 | + return; |
|
| 897 | + } |
|
| 873 | 898 | |
| 874 | 899 | if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
|
| 875 | - if (isset($_REQUEST['_status'])) |
|
| 876 | - geodir_change_post_status($post_id, $_REQUEST['_status']); |
|
| 900 | + if (isset($_REQUEST['_status'])) { |
|
| 901 | + geodir_change_post_status($post_id, $_REQUEST['_status']); |
|
| 902 | + } |
|
| 877 | 903 | |
| 878 | - if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) |
|
| 879 | - return; |
|
| 904 | + if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) { |
|
| 905 | + return; |
|
| 906 | + } |
|
| 880 | 907 | |
| 881 | - if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) |
|
| 882 | - return; |
|
| 908 | + if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) { |
|
| 909 | + return; |
|
| 910 | + } |
|
| 883 | 911 | |
| 884 | - if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) |
|
| 885 | - return; |
|
| 912 | + if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) { |
|
| 913 | + return; |
|
| 914 | + } |
|
| 886 | 915 | |
| 887 | 916 | geodir_save_listing($_REQUEST); |
| 888 | 917 | } |
@@ -907,10 +936,18 @@ discard block |
||
| 907 | 936 | $tab_id = ''; |
| 908 | 937 | $i = 0; |
| 909 | 938 | foreach ($options as $value) : |
| 910 | - if (!isset($value['name'])) $value['name'] = ''; |
|
| 911 | - if (!isset($value['class'])) $value['class'] = ''; |
|
| 912 | - if (!isset($value['css'])) $value['css'] = ''; |
|
| 913 | - if (!isset($value['std'])) $value['std'] = ''; |
|
| 939 | + if (!isset($value['name'])) { |
|
| 940 | + $value['name'] = ''; |
|
| 941 | + } |
|
| 942 | + if (!isset($value['class'])) { |
|
| 943 | + $value['class'] = ''; |
|
| 944 | + } |
|
| 945 | + if (!isset($value['css'])) { |
|
| 946 | + $value['css'] = ''; |
|
| 947 | + } |
|
| 948 | + if (!isset($value['std'])) { |
|
| 949 | + $value['std'] = ''; |
|
| 950 | + } |
|
| 914 | 951 | $desc = ''; |
| 915 | 952 | switch ($value['type']) : |
| 916 | 953 | case 'dummy_installer': |
@@ -926,11 +963,13 @@ discard block |
||
| 926 | 963 | |
| 927 | 964 | $i++; |
| 928 | 965 | |
| 929 | - if (isset($value['id']) && $value['id']) |
|
| 930 | - $tab_id = $value['id']; |
|
| 966 | + if (isset($value['id']) && $value['id']) { |
|
| 967 | + $tab_id = $value['id']; |
|
| 968 | + } |
|
| 931 | 969 | |
| 932 | - if (isset($value['desc']) && $value['desc']) |
|
| 933 | - $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 970 | + if (isset($value['desc']) && $value['desc']) { |
|
| 971 | + $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 972 | + } |
|
| 934 | 973 | |
| 935 | 974 | if (isset($value['name']) && $value['name']) {
|
| 936 | 975 | if ($first_title === true) {
|
@@ -961,10 +1000,12 @@ discard block |
||
| 961 | 1000 | break; |
| 962 | 1001 | |
| 963 | 1002 | case 'sectionstart': |
| 964 | - if (isset($value['desc']) && $value['desc']) |
|
| 965 | - $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 966 | - if (isset($value['name']) && $value['name']) |
|
| 967 | - echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 1003 | + if (isset($value['desc']) && $value['desc']) { |
|
| 1004 | + $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 1005 | + } |
|
| 1006 | + if (isset($value['name']) && $value['name']) { |
|
| 1007 | + echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 1008 | + } |
|
| 968 | 1009 | /** |
| 969 | 1010 | * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
| 970 | 1011 | * |
@@ -972,7 +1013,9 @@ discard block |
||
| 972 | 1013 | * |
| 973 | 1014 | * @since 1.0.0 |
| 974 | 1015 | */ |
| 975 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
|
|
| 1016 | + if (isset($value['id']) && $value['id']) { |
|
| 1017 | + do_action('geodir_settings_' . sanitize_title($value['id']) . '_start'); |
|
| 1018 | + } |
|
| 976 | 1019 | echo '<table class="form-table">' . "\n\n"; |
| 977 | 1020 | |
| 978 | 1021 | break; |
@@ -984,7 +1027,9 @@ discard block |
||
| 984 | 1027 | * |
| 985 | 1028 | * @since 1.0.0 |
| 986 | 1029 | */ |
| 987 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
| 1030 | + if (isset($value['id']) && $value['id']) { |
|
| 1031 | + do_action('geodir_settings_' . sanitize_title($value['id']) . '_end'); |
|
| 1032 | + } |
|
| 988 | 1033 | echo '</table>'; |
| 989 | 1034 | /** |
| 990 | 1035 | * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
@@ -993,7 +1038,9 @@ discard block |
||
| 993 | 1038 | * |
| 994 | 1039 | * @since 1.0.0 |
| 995 | 1040 | */ |
| 996 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
| 1041 | + if (isset($value['id']) && $value['id']) { |
|
| 1042 | + do_action('geodir_settings_' . sanitize_title($value['id']) . '_after'); |
|
| 1043 | + } |
|
| 997 | 1044 | break; |
| 998 | 1045 | case 'text': |
| 999 | 1046 | ?> |
@@ -1084,17 +1131,32 @@ discard block |
||
| 1084 | 1131 | <?php _e('Width', 'geodirectory'); ?> <input
|
| 1085 | 1132 | name="<?php echo esc_attr($value['id']); ?>_width" |
| 1086 | 1133 | 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']; ?>"/> |
|
| 1134 | + value="<?php if ($size = get_option($value['id'] . '_width')) { |
|
| 1135 | + echo stripslashes($size); |
|
| 1136 | +} else { |
|
| 1137 | + echo $value['std']; |
|
| 1138 | +} |
|
| 1139 | +?>"/> |
|
| 1088 | 1140 | |
| 1089 | 1141 | <?php _e('Height', 'geodirectory'); ?> <input
|
| 1090 | 1142 | name="<?php echo esc_attr($value['id']); ?>_height" |
| 1091 | 1143 | 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']; ?>"/> |
|
| 1144 | + value="<?php if ($size = get_option($value['id'] . '_height')) { |
|
| 1145 | + echo stripslashes($size); |
|
| 1146 | +} else { |
|
| 1147 | + echo $value['std']; |
|
| 1148 | +} |
|
| 1149 | +?>"/> |
|
| 1093 | 1150 | |
| 1094 | 1151 | <label><?php _e('Hard Crop', 'geodirectory'); ?> <input
|
| 1095 | 1152 | name="<?php echo esc_attr($value['id']); ?>_crop" |
| 1096 | 1153 | 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> |
|
| 1154 | + type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') { |
|
| 1155 | + checked(get_option($value['id'] . '_crop'), 1); |
|
| 1156 | +} else { |
|
| 1157 | + checked(1); |
|
| 1158 | +} |
|
| 1159 | +?> /></label> |
|
| 1098 | 1160 | |
| 1099 | 1161 | <span class="description"><?php echo $value['desc'] ?></span></td> |
| 1100 | 1162 | </tr><?php |
@@ -1108,17 +1170,22 @@ discard block |
||
| 1108 | 1170 | <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>" |
| 1109 | 1171 | id="<?php echo esc_attr($value['id']); ?>" |
| 1110 | 1172 | style="<?php echo esc_attr($value['css']); ?>" |
| 1111 | - class="<?php if (isset($value['class'])) echo $value['class']; ?>" |
|
| 1173 | + class="<?php if (isset($value['class'])) { |
|
| 1174 | + echo $value['class']; |
|
| 1175 | +} |
|
| 1176 | +?>" |
|
| 1112 | 1177 | option-ajaxchosen="false"> |
| 1113 | 1178 | <?php |
| 1114 | 1179 | foreach ($value['options'] as $key => $val) {
|
| 1115 | 1180 | $geodir_select_value = ''; |
| 1116 | 1181 | if ($option_value != '') {
|
| 1117 | - if ($option_value != '' && $option_value == $key) |
|
| 1118 | - $geodir_select_value = ' selected="selected" '; |
|
| 1182 | + if ($option_value != '' && $option_value == $key) { |
|
| 1183 | + $geodir_select_value = ' selected="selected" '; |
|
| 1184 | + } |
|
| 1119 | 1185 | } else {
|
| 1120 | - if ($value['std'] == $key) |
|
| 1121 | - $geodir_select_value = ' selected="selected" '; |
|
| 1186 | + if ($value['std'] == $key) { |
|
| 1187 | + $geodir_select_value = ' selected="selected" '; |
|
| 1188 | + } |
|
| 1122 | 1189 | } |
| 1123 | 1190 | ?> |
| 1124 | 1191 | <option |
@@ -1143,8 +1210,14 @@ discard block |
||
| 1143 | 1210 | <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]" |
| 1144 | 1211 | id="<?php echo esc_attr($value['id']); ?>" |
| 1145 | 1212 | style="<?php echo esc_attr($value['css']); ?>" |
| 1146 | - class="<?php if (isset($value['class'])) echo $value['class']; ?>" |
|
| 1147 | - data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>" |
|
| 1213 | + class="<?php if (isset($value['class'])) { |
|
| 1214 | + echo $value['class']; |
|
| 1215 | +} |
|
| 1216 | +?>" |
|
| 1217 | + data-placeholder="<?php if (isset($value['placeholder_text'])) { |
|
| 1218 | + echo $value['placeholder_text']; |
|
| 1219 | +} |
|
| 1220 | +?>" |
|
| 1148 | 1221 | option-ajaxchosen="false"> |
| 1149 | 1222 | <?php |
| 1150 | 1223 | foreach ($value['options'] as $key => $val) {
|
@@ -1171,7 +1244,10 @@ discard block |
||
| 1171 | 1244 | <td class="forminp"> |
| 1172 | 1245 | <input type="file" name="<?php echo esc_attr($value['id']); ?>" |
| 1173 | 1246 | id="<?php echo esc_attr($value['id']); ?>" style="<?php echo esc_attr($value['css']); ?>" |
| 1174 | - class="<?php if (isset($value['class'])) echo $value['class']; ?>"/> |
|
| 1247 | + class="<?php if (isset($value['class'])) { |
|
| 1248 | + echo $value['class']; |
|
| 1249 | +} |
|
| 1250 | +?>"/> |
|
| 1175 | 1251 | <?php if (get_option($value['id'])) { ?>
|
| 1176 | 1252 | <input type="hidden" name="<?php echo esc_attr($value['id']); ?>_remove" |
| 1177 | 1253 | id="<?php echo esc_attr($value['id']); ?>_remove" value="0"> |
@@ -1252,13 +1328,15 @@ discard block |
||
| 1252 | 1328 | 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),
|
| 1253 | 1329 | ); |
| 1254 | 1330 | $geodir_default_map_language = get_option('geodir_default_map_language');
|
| 1255 | - if (empty($geodir_default_map_language)) |
|
| 1256 | - $geodir_default_map_language = 'en'; |
|
| 1331 | + if (empty($geodir_default_map_language)) { |
|
| 1332 | + $geodir_default_map_language = 'en'; |
|
| 1333 | + } |
|
| 1257 | 1334 | foreach ($arr_map_langages as $language_key => $language_txt) {
|
| 1258 | - if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) |
|
| 1259 | - $geodir_default_language_selected = "selected='selected'"; |
|
| 1260 | - else |
|
| 1261 | - $geodir_default_language_selected = ''; |
|
| 1335 | + if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) { |
|
| 1336 | + $geodir_default_language_selected = "selected='selected'"; |
|
| 1337 | + } else { |
|
| 1338 | + $geodir_default_language_selected = ''; |
|
| 1339 | + } |
|
| 1262 | 1340 | |
| 1263 | 1341 | ?> |
| 1264 | 1342 | <option |
@@ -1278,14 +1356,16 @@ discard block |
||
| 1278 | 1356 | <?php |
| 1279 | 1357 | $post_types = geodir_get_posttypes('array');
|
| 1280 | 1358 | $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');
|
| 1281 | - if (empty($geodir_default_map_search_pt)) |
|
| 1282 | - $geodir_default_map_search_pt = 'gd_place'; |
|
| 1359 | + if (empty($geodir_default_map_search_pt)) { |
|
| 1360 | + $geodir_default_map_search_pt = 'gd_place'; |
|
| 1361 | + } |
|
| 1283 | 1362 | if (is_array($post_types)) {
|
| 1284 | 1363 | foreach ($post_types as $key => $post_types_obj) {
|
| 1285 | - if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) |
|
| 1286 | - $geodir_search_pt_selected = "selected='selected'"; |
|
| 1287 | - else |
|
| 1288 | - $geodir_search_pt_selected = ''; |
|
| 1364 | + if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) { |
|
| 1365 | + $geodir_search_pt_selected = "selected='selected'"; |
|
| 1366 | + } else { |
|
| 1367 | + $geodir_search_pt_selected = ''; |
|
| 1368 | + } |
|
| 1289 | 1369 | |
| 1290 | 1370 | ?> |
| 1291 | 1371 | <option |
@@ -1405,7 +1485,7 @@ discard block |
||
| 1405 | 1485 | id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio" |
| 1406 | 1486 | value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {
|
| 1407 | 1487 | echo 'checked="checked"'; |
| 1408 | - }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
| 1488 | + } elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
| 1409 | 1489 | <?php echo $value['desc']; ?></label><br> |
| 1410 | 1490 | </fieldset> |
| 1411 | 1491 | <?php |
@@ -1425,10 +1505,18 @@ discard block |
||
| 1425 | 1505 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1426 | 1506 | <td class="forminp"> |
| 1427 | 1507 | <textarea |
| 1428 | - <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>" |
|
| 1508 | + <?php if (isset($value['args'])) { |
|
| 1509 | + echo $value['args'] . ' '; |
|
| 1510 | +} |
|
| 1511 | +?>name="<?php echo esc_attr($value['id']); ?>" |
|
| 1429 | 1512 | id="<?php echo esc_attr($value['id']); ?>" |
| 1430 | 1513 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
| 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 |
|
| 1514 | + style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) { |
|
| 1515 | + echo esc_textarea(stripslashes(get_option($value['id']))); |
|
| 1516 | +} else { |
|
| 1517 | + echo esc_textarea($value['std']); |
|
| 1518 | +} |
|
| 1519 | +?></textarea><span |
|
| 1432 | 1520 | class="description"><?php echo $value['desc'] ?></span> |
| 1433 | 1521 | |
| 1434 | 1522 | </td> |
@@ -1440,10 +1528,11 @@ discard block |
||
| 1440 | 1528 | <tr valign="top"> |
| 1441 | 1529 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1442 | 1530 | <td class="forminp"><?php |
| 1443 | - if (get_option($value['id'])) |
|
| 1444 | - $content = stripslashes(get_option($value['id'])); |
|
| 1445 | - else |
|
| 1446 | - $content = $value['std']; |
|
| 1531 | + if (get_option($value['id'])) { |
|
| 1532 | + $content = stripslashes(get_option($value['id'])); |
|
| 1533 | + } else { |
|
| 1534 | + $content = $value['std']; |
|
| 1535 | + } |
|
| 1447 | 1536 | |
| 1448 | 1537 | $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
| 1449 | 1538 | |
@@ -1483,7 +1572,9 @@ discard block |
||
| 1483 | 1572 | 'echo' => false, |
| 1484 | 1573 | 'selected' => $page_setting); |
| 1485 | 1574 | |
| 1486 | - if (isset($value['args'])) $args = wp_parse_args($value['args'], $args); |
|
| 1575 | + if (isset($value['args'])) { |
|
| 1576 | + $args = wp_parse_args($value['args'], $args); |
|
| 1577 | + } |
|
| 1487 | 1578 | |
| 1488 | 1579 | ?> |
| 1489 | 1580 | <tr valign="top" class="single_select_page"> |
@@ -1502,8 +1593,10 @@ discard block |
||
| 1502 | 1593 | if (strstr($country_setting, ':')) : |
| 1503 | 1594 | $country = current(explode(':', $country_setting));
|
| 1504 | 1595 | $state = end(explode(':', $country_setting));
|
| 1505 | - else : |
|
| 1506 | - $country = $country_setting; |
|
| 1596 | + else { |
|
| 1597 | + : |
|
| 1598 | + $country = $country_setting; |
|
| 1599 | + } |
|
| 1507 | 1600 | $state = '*'; |
| 1508 | 1601 | endif; |
| 1509 | 1602 | ?> |
@@ -1530,8 +1623,10 @@ discard block |
||
| 1530 | 1623 | data-placeholder="<?php _e('Choose countries…', 'geodirectory'); ?>"
|
| 1531 | 1624 | title="Country" class="chosen_select"> |
| 1532 | 1625 | <?php |
| 1533 | - if ($countries) foreach ($countries as $key => $val) : |
|
| 1534 | - echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1626 | + if ($countries) { |
|
| 1627 | + foreach ($countries as $key => $val) : |
|
| 1628 | + echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1629 | + } |
|
| 1535 | 1630 | endforeach; |
| 1536 | 1631 | ?> |
| 1537 | 1632 | </select> |
@@ -1769,8 +1864,9 @@ discard block |
||
| 1769 | 1864 | endforeach; |
| 1770 | 1865 | endif; |
| 1771 | 1866 | |
| 1772 | - if (!empty($place_img_array)) |
|
| 1773 | - $curImages = implode(',', $place_img_array);
|
|
| 1867 | + if (!empty($place_img_array)) { |
|
| 1868 | + $curImages = implode(',', $place_img_array); |
|
| 1869 | + } |
|
| 1774 | 1870 | |
| 1775 | 1871 | |
| 1776 | 1872 | // adjust values here |
@@ -2116,16 +2212,17 @@ discard block |
||
| 2116 | 2212 | global $post, $typenow, $current_screen; |
| 2117 | 2213 | |
| 2118 | 2214 | $post_type = NULL; |
| 2119 | - if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) |
|
| 2120 | - $post_type = get_post_type($_REQUEST['post']); |
|
| 2121 | - elseif ($post && isset($post->post_type)) |
|
| 2122 | - $post_type = $post->post_type; |
|
| 2123 | - elseif ($typenow) |
|
| 2124 | - $post_type = $typenow; |
|
| 2125 | - elseif ($current_screen && isset($current_screen->post_type)) |
|
| 2126 | - $post_type = $current_screen->post_type; |
|
| 2127 | - elseif (isset($_REQUEST['post_type'])) |
|
| 2128 | - $post_type = sanitize_key($_REQUEST['post_type']); |
|
| 2215 | + if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) { |
|
| 2216 | + $post_type = get_post_type($_REQUEST['post']); |
|
| 2217 | + } elseif ($post && isset($post->post_type)) { |
|
| 2218 | + $post_type = $post->post_type; |
|
| 2219 | + } elseif ($typenow) { |
|
| 2220 | + $post_type = $typenow; |
|
| 2221 | + } elseif ($current_screen && isset($current_screen->post_type)) { |
|
| 2222 | + $post_type = $current_screen->post_type; |
|
| 2223 | + } elseif (isset($_REQUEST['post_type'])) { |
|
| 2224 | + $post_type = sanitize_key($_REQUEST['post_type']); |
|
| 2225 | + } |
|
| 2129 | 2226 | |
| 2130 | 2227 | |
| 2131 | 2228 | return $post_type; |
@@ -2185,9 +2282,10 @@ discard block |
||
| 2185 | 2282 | function geodir_hide_admin_preview_button() {
|
| 2186 | 2283 | global $post_type; |
| 2187 | 2284 | $post_types = geodir_get_posttypes(); |
| 2188 | - if(in_array($post_type, $post_types)) |
|
| 2189 | - echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
|
| 2190 | -} |
|
| 2285 | + if(in_array($post_type, $post_types)) { |
|
| 2286 | + echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>'; |
|
| 2287 | + } |
|
| 2288 | + } |
|
| 2191 | 2289 | add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' ); |
| 2192 | 2290 | add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' ); |
| 2193 | 2291 | |
@@ -5410,8 +5508,9 @@ discard block |
||
| 5410 | 5508 | function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
| 5411 | 5509 | global $wpdb, $plugin_prefix; |
| 5412 | 5510 | |
| 5413 | - if ( ! post_type_exists( $post_type ) ) |
|
| 5414 | - return new stdClass; |
|
| 5511 | + if ( ! post_type_exists( $post_type ) ) { |
|
| 5512 | + return new stdClass; |
|
| 5513 | + } |
|
| 5415 | 5514 | |
| 5416 | 5515 | $table = $plugin_prefix . $post_type . '_detail'; |
| 5417 | 5516 | |
@@ -6068,7 +6167,9 @@ discard block |
||
| 6068 | 6167 | |
| 6069 | 6168 | if ($page_found) : |
| 6070 | 6169 | // Page exists |
| 6071 | - if (!$option_value) update_option($option, $page_found); |
|
| 6170 | + if (!$option_value) { |
|
| 6171 | + update_option($option, $page_found); |
|
| 6172 | + } |
|
| 6072 | 6173 | return; |
| 6073 | 6174 | endif; |
| 6074 | 6175 | |
@@ -6474,7 +6575,7 @@ discard block |
||
| 6474 | 6575 | |
| 6475 | 6576 | if(is_array($accounts)){
|
| 6476 | 6577 | $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
| 6477 | - }elseif(get_option('geodir_ga_account_id')){
|
|
| 6578 | + } elseif(get_option('geodir_ga_account_id')){
|
|
| 6478 | 6579 | $accounts = array(); |
| 6479 | 6580 | $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
| 6480 | 6581 | } |
@@ -6495,14 +6596,16 @@ discard block |
||
| 6495 | 6596 | } |
| 6496 | 6597 | |
| 6497 | 6598 | # Create a new Gdata call |
| 6498 | - if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6499 | - $stats = new GDGoogleAnalyticsStats(); |
|
| 6500 | - else |
|
| 6501 | - return false; |
|
| 6599 | + if ( trim(get_option('geodir_ga_auth_code')) != '' ) { |
|
| 6600 | + $stats = new GDGoogleAnalyticsStats(); |
|
| 6601 | + } else { |
|
| 6602 | + return false; |
|
| 6603 | + } |
|
| 6502 | 6604 | |
| 6503 | 6605 | # Check if Google sucessfully logged in |
| 6504 | - if ( ! $stats->checkLogin() ) |
|
| 6505 | - return false; |
|
| 6606 | + if ( ! $stats->checkLogin() ) { |
|
| 6607 | + return false; |
|
| 6608 | + } |
|
| 6506 | 6609 | |
| 6507 | 6610 | # Get a list of accounts |
| 6508 | 6611 | try {
|
@@ -6519,10 +6622,10 @@ discard block |
||
| 6519 | 6622 | if ( count($accounts) > 0 ){
|
| 6520 | 6623 | update_option('geodir_gd_uids',$accounts);
|
| 6521 | 6624 | return $accounts; |
| 6625 | + } else { |
|
| 6626 | + return false; |
|
| 6627 | + } |
|
| 6522 | 6628 | } |
| 6523 | - else |
|
| 6524 | - return false; |
|
| 6525 | -} |
|
| 6526 | 6629 | |
| 6527 | 6630 | add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' ); |
| 6528 | 6631 | function geodir_ga_deauthorize(){
|
@@ -13,125 +13,125 @@ discard block |
||
| 13 | 13 | * @package GeoDirectory |
| 14 | 14 | */ |
| 15 | 15 | function geodir_deactivation() {
|
| 16 | - // Update installed variable |
|
| 17 | - update_option("geodir_installed", 0);
|
|
| 16 | + // Update installed variable |
|
| 17 | + update_option("geodir_installed", 0);
|
|
| 18 | 18 | |
| 19 | - // Remove rewrite rules and then recreate rewrite rules. |
|
| 20 | - flush_rewrite_rules(); |
|
| 19 | + // Remove rewrite rules and then recreate rewrite rules. |
|
| 20 | + flush_rewrite_rules(); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | if (!function_exists('geodir_admin_styles')) {
|
| 24 | - /** |
|
| 25 | - * Enqueue Admin Styles. |
|
| 26 | - * |
|
| 27 | - * @since 1.0.0 |
|
| 28 | - * @package GeoDirectory |
|
| 29 | - */ |
|
| 30 | - function geodir_admin_styles() {
|
|
| 31 | - wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
| 32 | - wp_enqueue_style('geodirectory-admin-css');
|
|
| 24 | + /** |
|
| 25 | + * Enqueue Admin Styles. |
|
| 26 | + * |
|
| 27 | + * @since 1.0.0 |
|
| 28 | + * @package GeoDirectory |
|
| 29 | + */ |
|
| 30 | + function geodir_admin_styles() {
|
|
| 31 | + wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
| 32 | + wp_enqueue_style('geodirectory-admin-css');
|
|
| 33 | 33 | |
| 34 | - wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
| 35 | - wp_enqueue_style('geodirectory-frontend-style');
|
|
| 34 | + wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
| 35 | + wp_enqueue_style('geodirectory-frontend-style');
|
|
| 36 | 36 | |
| 37 | - wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
| 38 | - wp_enqueue_style('geodir-chosen-style');
|
|
| 37 | + wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
| 38 | + wp_enqueue_style('geodir-chosen-style');
|
|
| 39 | 39 | |
| 40 | - wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
| 41 | - wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
|
|
| 40 | + wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
| 41 | + wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
|
|
| 42 | 42 | |
| 43 | - wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
| 44 | - wp_enqueue_style('geodirectory-jquery-ui-css');
|
|
| 43 | + wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
| 44 | + wp_enqueue_style('geodirectory-jquery-ui-css');
|
|
| 45 | 45 | |
| 46 | - wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
| 47 | - wp_enqueue_style('geodirectory-custom-fields-css');
|
|
| 46 | + wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
| 47 | + wp_enqueue_style('geodirectory-custom-fields-css');
|
|
| 48 | 48 | |
| 49 | - wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
| 50 | - wp_enqueue_style('geodirectory-pluplodar-css');
|
|
| 49 | + wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
| 50 | + wp_enqueue_style('geodirectory-pluplodar-css');
|
|
| 51 | 51 | |
| 52 | - wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
| 53 | - wp_enqueue_style('geodir-rating-style');
|
|
| 52 | + wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
| 53 | + wp_enqueue_style('geodir-rating-style');
|
|
| 54 | 54 | |
| 55 | - wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
| 56 | - wp_enqueue_style('geodir-rtl-style');
|
|
| 57 | - } |
|
| 55 | + wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
| 56 | + wp_enqueue_style('geodir-rtl-style');
|
|
| 57 | + } |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | if (!function_exists('geodir_admin_styles_req')) {
|
| 61 | - /** |
|
| 62 | - * Loads stylesheets from CDN. |
|
| 63 | - * |
|
| 64 | - * @since 1.0.0 |
|
| 65 | - * @package GeoDirectory |
|
| 66 | - */ |
|
| 67 | - function geodir_admin_styles_req() |
|
| 68 | - {
|
|
| 61 | + /** |
|
| 62 | + * Loads stylesheets from CDN. |
|
| 63 | + * |
|
| 64 | + * @since 1.0.0 |
|
| 65 | + * @package GeoDirectory |
|
| 66 | + */ |
|
| 67 | + function geodir_admin_styles_req() |
|
| 68 | + {
|
|
| 69 | 69 | |
| 70 | - wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
|
| 71 | - wp_enqueue_style('font-awesome');
|
|
| 70 | + wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
|
| 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);
|
|
| 74 | - wp_enqueue_script('geodirectory-admin');
|
|
| 73 | + wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 74 | + wp_enqueue_script('geodirectory-admin');
|
|
| 75 | 75 | |
| 76 | - } |
|
| 76 | + } |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | if (!function_exists('geodir_admin_scripts')) {
|
| 80 | - /** |
|
| 81 | - * Enqueue Admin Scripts. |
|
| 82 | - * |
|
| 83 | - * @since 1.0.0 |
|
| 84 | - * @package GeoDirectory |
|
| 85 | - */ |
|
| 86 | - function geodir_admin_scripts() |
|
| 87 | - {
|
|
| 88 | - $geodir_map_name = geodir_map_name(); |
|
| 80 | + /** |
|
| 81 | + * Enqueue Admin Scripts. |
|
| 82 | + * |
|
| 83 | + * @since 1.0.0 |
|
| 84 | + * @package GeoDirectory |
|
| 85 | + */ |
|
| 86 | + function geodir_admin_scripts() |
|
| 87 | + {
|
|
| 88 | + $geodir_map_name = geodir_map_name(); |
|
| 89 | 89 | |
| 90 | - wp_enqueue_script('jquery');
|
|
| 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);
|
|
| 95 | - wp_enqueue_script('chosen');
|
|
| 94 | + wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 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);
|
|
| 98 | - wp_enqueue_script('geodirectory-choose-ajax');
|
|
| 97 | + wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
| 98 | + wp_enqueue_script('geodirectory-choose-ajax');
|
|
| 99 | 99 | |
| 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);
|
|
| 102 | - } |
|
| 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);
|
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - wp_enqueue_script('geodirectory-custom-fields-script');
|
|
| 105 | - $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions'; |
|
| 104 | + wp_enqueue_script('geodirectory-custom-fields-script');
|
|
| 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 | - 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(); |
|
| 112 | - /** This filter is documented in geodirectory_template_tags.php */ |
|
| 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);
|
|
| 115 | - } |
|
| 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(); |
|
| 112 | + /** This filter is documented in geodirectory_template_tags.php */ |
|
| 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);
|
|
| 115 | + } |
|
| 116 | 116 | |
| 117 | - if ($geodir_map_name == 'osm') {
|
|
| 118 | - // Leaflet OpenStreetMap |
|
| 119 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 120 | - wp_enqueue_style('geodirectory-leaflet-style');
|
|
| 117 | + if ($geodir_map_name == 'osm') {
|
|
| 118 | + // Leaflet OpenStreetMap |
|
| 119 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 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);
|
|
| 123 | - wp_enqueue_script('geodirectory-leaflet-script');
|
|
| 122 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 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);
|
|
| 126 | - wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
| 127 | - } |
|
| 128 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 125 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 126 | + wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
| 127 | + } |
|
| 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);
|
|
| 131 | - wp_enqueue_script('geodirectory-goMap-script');
|
|
| 130 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 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);
|
|
| 134 | - wp_enqueue_script('geodirectory-goMap-script');
|
|
| 133 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 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')) {
|
@@ -142,167 +142,167 @@ discard block |
||
| 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);
|
|
| 146 | - wp_enqueue_script('geodir-on-document-load');
|
|
| 147 | - |
|
| 148 | - |
|
| 149 | - // SCRIPT FOR UPLOAD |
|
| 150 | - wp_enqueue_script('plupload-all');
|
|
| 151 | - wp_enqueue_script('jquery-ui-sortable');
|
|
| 152 | - |
|
| 153 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 154 | - wp_enqueue_script('geodirectory-plupload-script');
|
|
| 155 | - |
|
| 156 | - // SCRIPT FOR UPLOAD END |
|
| 157 | - |
|
| 158 | - |
|
| 159 | - // place js config array for plupload |
|
| 160 | - $plupload_init = array( |
|
| 161 | - 'runtimes' => 'html5,silverlight,flash,html4', |
|
| 162 | - 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
| 163 | - 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
| 164 | - 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
| 165 | - 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
| 166 | - 'multiple_queues' => true, |
|
| 167 | - 'max_file_size' => geodir_max_upload_size(), |
|
| 168 | - 'url' => admin_url('admin-ajax.php'),
|
|
| 169 | - 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
|
| 170 | - 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
|
| 171 | - 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
|
|
| 172 | - 'multipart' => true, |
|
| 173 | - 'urlstream_upload' => true, |
|
| 174 | - 'multi_selection' => false, // will be added per uploader |
|
| 175 | - // additional post data to send to our ajax hook |
|
| 176 | - 'multipart_params' => array( |
|
| 177 | - '_ajax_nonce' => "", // will be added per uploader |
|
| 178 | - 'action' => 'plupload_action', // the ajax action name |
|
| 179 | - 'imgid' => 0 // will be added per uploader |
|
| 180 | - ) |
|
| 181 | - ); |
|
| 182 | - $base_plupload_config = json_encode($plupload_init); |
|
| 183 | - |
|
| 184 | - |
|
| 185 | - $thumb_img_arr = array(); |
|
| 186 | - |
|
| 187 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 188 | - $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 189 | - |
|
| 190 | - $totImg = ''; |
|
| 191 | - $image_limit = ''; |
|
| 192 | - if (!empty($thumb_img_arr)) {
|
|
| 193 | - $totImg = count($thumb_img_arr); |
|
| 194 | - } |
|
| 145 | + wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 146 | + wp_enqueue_script('geodir-on-document-load');
|
|
| 147 | + |
|
| 148 | + |
|
| 149 | + // SCRIPT FOR UPLOAD |
|
| 150 | + wp_enqueue_script('plupload-all');
|
|
| 151 | + wp_enqueue_script('jquery-ui-sortable');
|
|
| 152 | + |
|
| 153 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 154 | + wp_enqueue_script('geodirectory-plupload-script');
|
|
| 155 | + |
|
| 156 | + // SCRIPT FOR UPLOAD END |
|
| 157 | + |
|
| 158 | + |
|
| 159 | + // place js config array for plupload |
|
| 160 | + $plupload_init = array( |
|
| 161 | + 'runtimes' => 'html5,silverlight,flash,html4', |
|
| 162 | + 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
| 163 | + 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
| 164 | + 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
| 165 | + 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
| 166 | + 'multiple_queues' => true, |
|
| 167 | + 'max_file_size' => geodir_max_upload_size(), |
|
| 168 | + 'url' => admin_url('admin-ajax.php'),
|
|
| 169 | + 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
|
| 170 | + 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
|
| 171 | + 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
|
|
| 172 | + 'multipart' => true, |
|
| 173 | + 'urlstream_upload' => true, |
|
| 174 | + 'multi_selection' => false, // will be added per uploader |
|
| 175 | + // additional post data to send to our ajax hook |
|
| 176 | + 'multipart_params' => array( |
|
| 177 | + '_ajax_nonce' => "", // will be added per uploader |
|
| 178 | + 'action' => 'plupload_action', // the ajax action name |
|
| 179 | + 'imgid' => 0 // will be added per uploader |
|
| 180 | + ) |
|
| 181 | + ); |
|
| 182 | + $base_plupload_config = json_encode($plupload_init); |
|
| 183 | + |
|
| 184 | + |
|
| 185 | + $thumb_img_arr = array(); |
|
| 186 | + |
|
| 187 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 188 | + $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 189 | + |
|
| 190 | + $totImg = ''; |
|
| 191 | + $image_limit = ''; |
|
| 192 | + if (!empty($thumb_img_arr)) {
|
|
| 193 | + $totImg = count($thumb_img_arr); |
|
| 194 | + } |
|
| 195 | 195 | |
| 196 | - $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
|
|
| 197 | - 'totalImg' => $totImg, |
|
| 198 | - 'image_limit' => $image_limit, |
|
| 199 | - 'upload_img_size' => geodir_max_upload_size()); |
|
| 196 | + $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
|
|
| 197 | + 'totalImg' => $totImg, |
|
| 198 | + 'image_limit' => $image_limit, |
|
| 199 | + 'upload_img_size' => geodir_max_upload_size()); |
|
| 200 | 200 | |
| 201 | - wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
|
| 201 | + wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
|
| 202 | 202 | |
| 203 | - $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));
|
|
| 204 | - wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
|
|
| 203 | + $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));
|
|
| 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);
|
|
| 208 | - wp_enqueue_script('geodirectory-admin-script');
|
|
| 207 | + wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 208 | + wp_enqueue_script('geodirectory-admin-script');
|
|
| 209 | 209 | |
| 210 | - wp_enqueue_style('farbtastic');
|
|
| 211 | - wp_enqueue_script('farbtastic');
|
|
| 210 | + wp_enqueue_style('farbtastic');
|
|
| 211 | + wp_enqueue_script('farbtastic');
|
|
| 212 | 212 | |
| 213 | - $screen = get_current_screen(); |
|
| 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');
|
|
| 216 | - } |
|
| 213 | + $screen = get_current_screen(); |
|
| 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');
|
|
| 216 | + } |
|
| 217 | 217 | |
| 218 | - $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
|
|
| 219 | - wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
|
|
| 218 | + $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
|
|
| 219 | + wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
|
|
| 220 | 220 | |
| 221 | - } |
|
| 221 | + } |
|
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | if (!function_exists('geodir_admin_menu')) {
|
| 225 | - /** |
|
| 226 | - * Admin Menus |
|
| 227 | - * |
|
| 228 | - * Sets up the admin menus in wordpress. |
|
| 229 | - * |
|
| 230 | - * @since 1.0.0 |
|
| 231 | - * @package GeoDirectory |
|
| 232 | - * @global array $menu Menu array. |
|
| 233 | - * @global object $geodirectory GeoDirectory plugin object. |
|
| 234 | - */ |
|
| 235 | - function geodir_admin_menu() |
|
| 236 | - {
|
|
| 237 | - global $menu, $geodirectory; |
|
| 225 | + /** |
|
| 226 | + * Admin Menus |
|
| 227 | + * |
|
| 228 | + * Sets up the admin menus in wordpress. |
|
| 229 | + * |
|
| 230 | + * @since 1.0.0 |
|
| 231 | + * @package GeoDirectory |
|
| 232 | + * @global array $menu Menu array. |
|
| 233 | + * @global object $geodirectory GeoDirectory plugin object. |
|
| 234 | + */ |
|
| 235 | + function geodir_admin_menu() |
|
| 236 | + {
|
|
| 237 | + global $menu, $geodirectory; |
|
| 238 | 238 | |
| 239 | - if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
|
|
| 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 | + } |
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | if (!function_exists('geodir_admin_menu_order')) {
|
| 248 | - /** |
|
| 249 | - * Order admin menus. |
|
| 250 | - * |
|
| 251 | - * @since 1.0.0 |
|
| 252 | - * @package GeoDirectory |
|
| 253 | - * @param array $menu_order Menu order array. |
|
| 254 | - * @return array Modified menu order array. |
|
| 255 | - */ |
|
| 256 | - function geodir_admin_menu_order($menu_order) |
|
| 257 | - {
|
|
| 258 | - |
|
| 259 | - // Initialize our custom order array |
|
| 260 | - $geodir_menu_order = array(); |
|
| 261 | - |
|
| 262 | - // Get the index of our custom separator |
|
| 263 | - $geodir_separator = array_search('separator-geodirectory', $menu_order);
|
|
| 264 | - |
|
| 265 | - // Get index of posttype menu |
|
| 266 | - $post_types = geodir_get_posttypes(); |
|
| 267 | - |
|
| 268 | - // Loop through menu order and do some rearranging |
|
| 269 | - foreach ($menu_order as $index => $item) : |
|
| 270 | - |
|
| 271 | - if ((('geodirectory') == $item)) :
|
|
| 272 | - $geodir_menu_order[] = 'separator-geodirectory'; |
|
| 273 | - if (!empty($post_types)) {
|
|
| 274 | - foreach ($post_types as $post_type) {
|
|
| 275 | - $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
| 276 | - } |
|
| 277 | - } |
|
| 278 | - $geodir_menu_order[] = $item; |
|
| 248 | + /** |
|
| 249 | + * Order admin menus. |
|
| 250 | + * |
|
| 251 | + * @since 1.0.0 |
|
| 252 | + * @package GeoDirectory |
|
| 253 | + * @param array $menu_order Menu order array. |
|
| 254 | + * @return array Modified menu order array. |
|
| 255 | + */ |
|
| 256 | + function geodir_admin_menu_order($menu_order) |
|
| 257 | + {
|
|
| 279 | 258 | |
| 280 | - unset($menu_order[$geodir_separator]); |
|
| 281 | - //unset( $menu_order[$geodir_places] ); |
|
| 282 | - elseif (!in_array($item, array('separator-geodirectory'))) :
|
|
| 283 | - $geodir_menu_order[] = $item; |
|
| 284 | - endif; |
|
| 259 | + // Initialize our custom order array |
|
| 260 | + $geodir_menu_order = array(); |
|
| 285 | 261 | |
| 286 | - endforeach; |
|
| 262 | + // Get the index of our custom separator |
|
| 263 | + $geodir_separator = array_search('separator-geodirectory', $menu_order);
|
|
| 287 | 264 | |
| 288 | - // Return order |
|
| 289 | - return $geodir_menu_order; |
|
| 290 | - } |
|
| 265 | + // Get index of posttype menu |
|
| 266 | + $post_types = geodir_get_posttypes(); |
|
| 267 | + |
|
| 268 | + // Loop through menu order and do some rearranging |
|
| 269 | + foreach ($menu_order as $index => $item) : |
|
| 270 | + |
|
| 271 | + if ((('geodirectory') == $item)) :
|
|
| 272 | + $geodir_menu_order[] = 'separator-geodirectory'; |
|
| 273 | + if (!empty($post_types)) {
|
|
| 274 | + foreach ($post_types as $post_type) {
|
|
| 275 | + $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
| 276 | + } |
|
| 277 | + } |
|
| 278 | + $geodir_menu_order[] = $item; |
|
| 279 | + |
|
| 280 | + unset($menu_order[$geodir_separator]); |
|
| 281 | + //unset( $menu_order[$geodir_places] ); |
|
| 282 | + elseif (!in_array($item, array('separator-geodirectory'))) :
|
|
| 283 | + $geodir_menu_order[] = $item; |
|
| 284 | + endif; |
|
| 285 | + |
|
| 286 | + endforeach; |
|
| 287 | + |
|
| 288 | + // Return order |
|
| 289 | + return $geodir_menu_order; |
|
| 290 | + } |
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | if (!function_exists('geodir_admin_custom_menu_order')) {
|
| 294 | - /** |
|
| 295 | - * Enables custom menu order. |
|
| 296 | - * |
|
| 297 | - * @since 1.0.0 |
|
| 298 | - * @package GeoDirectory |
|
| 299 | - * @return bool |
|
| 300 | - */ |
|
| 301 | - function geodir_admin_custom_menu_order() |
|
| 302 | - {
|
|
| 303 | - if (!current_user_can('manage_options')) return false;
|
|
| 304 | - return true; |
|
| 305 | - } |
|
| 294 | + /** |
|
| 295 | + * Enables custom menu order. |
|
| 296 | + * |
|
| 297 | + * @since 1.0.0 |
|
| 298 | + * @package GeoDirectory |
|
| 299 | + * @return bool |
|
| 300 | + */ |
|
| 301 | + function geodir_admin_custom_menu_order() |
|
| 302 | + {
|
|
| 303 | + if (!current_user_can('manage_options')) return false;
|
|
| 304 | + return true; |
|
| 305 | + } |
|
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | /** |
@@ -313,51 +313,51 @@ discard block |
||
| 313 | 313 | */ |
| 314 | 314 | function geodir_before_admin_panel() |
| 315 | 315 | {
|
| 316 | - if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
|
|
| 317 | - echo '<div id="message" class="updated fade"> |
|
| 316 | + if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
|
|
| 317 | + echo '<div id="message" class="updated fade"> |
|
| 318 | 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 | 319 | <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>
|
| 320 | 320 | </div>'; |
| 321 | 321 | |
| 322 | - } |
|
| 322 | + } |
|
| 323 | 323 | |
| 324 | - if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
|
|
| 325 | - switch ($_REQUEST['msg']) {
|
|
| 326 | - case 'success': |
|
| 327 | - echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
|
|
| 328 | - flush_rewrite_rules(false); |
|
| 324 | + if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
|
|
| 325 | + switch ($_REQUEST['msg']) {
|
|
| 326 | + case 'success': |
|
| 327 | + echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
|
|
| 328 | + flush_rewrite_rules(false); |
|
| 329 | 329 | |
| 330 | - break; |
|
| 330 | + break; |
|
| 331 | 331 | case 'fail': |
| 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 | 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 | - break; |
|
| 339 | - } |
|
| 340 | - } |
|
| 338 | + break; |
|
| 339 | + } |
|
| 340 | + } |
|
| 341 | 341 | |
| 342 | - $geodir_load_map = get_option('geodir_load_map');
|
|
| 343 | - $need_map_key = false; |
|
| 344 | - if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
|
|
| 345 | - $need_map_key = true; |
|
| 346 | - } |
|
| 342 | + $geodir_load_map = get_option('geodir_load_map');
|
|
| 343 | + $need_map_key = false; |
|
| 344 | + if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
|
|
| 345 | + $need_map_key = true; |
|
| 346 | + } |
|
| 347 | 347 | |
| 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>';
|
|
| 350 | - } |
|
| 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>';
|
|
| 350 | + } |
|
| 351 | 351 | |
| 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>';
|
|
| 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>';
|
|
| 354 | 354 | |
| 355 | - } |
|
| 355 | + } |
|
| 356 | 356 | |
| 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>';
|
|
| 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>';
|
|
| 359 | 359 | |
| 360 | - } |
|
| 360 | + } |
|
| 361 | 361 | |
| 362 | 362 | |
| 363 | 363 | |
@@ -374,19 +374,19 @@ discard block |
||
| 374 | 374 | */ |
| 375 | 375 | function geodir_handle_option_form_submit($current_tab) |
| 376 | 376 | {
|
| 377 | - global $geodir_settings; |
|
| 378 | - if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
|
|
| 379 | - /** |
|
| 380 | - * Contains settings array for current tab. |
|
| 381 | - * |
|
| 382 | - * @since 1.0.0 |
|
| 383 | - * @package GeoDirectory |
|
| 384 | - */ |
|
| 385 | - include_once('option-pages/' . $current_tab . '_array.php');
|
|
| 386 | - } |
|
| 387 | - if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
|
| 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'));
|
|
| 377 | + global $geodir_settings; |
|
| 378 | + if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
|
|
| 379 | + /** |
|
| 380 | + * Contains settings array for current tab. |
|
| 381 | + * |
|
| 382 | + * @since 1.0.0 |
|
| 383 | + * @package GeoDirectory |
|
| 384 | + */ |
|
| 385 | + include_once('option-pages/' . $current_tab . '_array.php');
|
|
| 386 | + } |
|
| 387 | + if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
|
| 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'));
|
|
| 390 | 390 | |
| 391 | 391 | /** |
| 392 | 392 | * Fires before updating geodirectory admin settings. |
@@ -398,38 +398,38 @@ discard block |
||
| 398 | 398 | */ |
| 399 | 399 | do_action('geodir_before_update_options', $current_tab, $geodir_settings);
|
| 400 | 400 | |
| 401 | - if (!empty($geodir_settings[$current_tab])) |
|
| 402 | - geodir_update_options($geodir_settings[$current_tab]); |
|
| 401 | + if (!empty($geodir_settings[$current_tab])) |
|
| 402 | + geodir_update_options($geodir_settings[$current_tab]); |
|
| 403 | 403 | |
| 404 | - /** |
|
| 405 | - * Called after GeoDirectory options settings are updated. |
|
| 406 | - * |
|
| 407 | - * @since 1.0.0 |
|
| 408 | - * @param array $geodir_settings The array of GeoDirectory settings. |
|
| 409 | - * @see 'geodir_before_update_options' |
|
| 410 | - */ |
|
| 411 | - do_action('geodir_update_options', $geodir_settings);
|
|
| 404 | + /** |
|
| 405 | + * Called after GeoDirectory options settings are updated. |
|
| 406 | + * |
|
| 407 | + * @since 1.0.0 |
|
| 408 | + * @param array $geodir_settings The array of GeoDirectory settings. |
|
| 409 | + * @see 'geodir_before_update_options' |
|
| 410 | + */ |
|
| 411 | + do_action('geodir_update_options', $geodir_settings);
|
|
| 412 | 412 | |
| 413 | - /** |
|
| 414 | - * Called after GeoDirectory options settings are updated. |
|
| 415 | - * |
|
| 416 | - * Provides tab specific settings. |
|
| 417 | - * |
|
| 418 | - * @since 1.0.0 |
|
| 419 | - * @param string $current_tab The current settings tab name. |
|
| 420 | - * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
|
| 421 | - */ |
|
| 422 | - do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
|
|
| 413 | + /** |
|
| 414 | + * Called after GeoDirectory options settings are updated. |
|
| 415 | + * |
|
| 416 | + * Provides tab specific settings. |
|
| 417 | + * |
|
| 418 | + * @since 1.0.0 |
|
| 419 | + * @param string $current_tab The current settings tab name. |
|
| 420 | + * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
|
| 421 | + */ |
|
| 422 | + do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
|
|
| 423 | 423 | |
| 424 | - flush_rewrite_rules(false); |
|
| 424 | + flush_rewrite_rules(false); |
|
| 425 | 425 | |
| 426 | - $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : ''; |
|
| 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 | - wp_redirect($redirect_url); |
|
| 431 | - exit(); |
|
| 432 | - endif; |
|
| 430 | + wp_redirect($redirect_url); |
|
| 431 | + exit(); |
|
| 432 | + endif; |
|
| 433 | 433 | |
| 434 | 434 | |
| 435 | 435 | } |
@@ -447,144 +447,144 @@ discard block |
||
| 447 | 447 | * @return bool Returns true if saved. |
| 448 | 448 | */ |
| 449 | 449 | function geodir_update_options($options, $dummy = false) {
|
| 450 | - if ((!isset($_POST) || !$_POST) && !$dummy) return false; |
|
| 450 | + if ((!isset($_POST) || !$_POST) && !$dummy) return false; |
|
| 451 | 451 | |
| 452 | - foreach ($options as $value) {
|
|
| 453 | - if ($dummy && isset($value['std'])) |
|
| 454 | - $_POST[$value['id']] = $value['std']; |
|
| 452 | + foreach ($options as $value) {
|
|
| 453 | + if ($dummy && isset($value['std'])) |
|
| 454 | + $_POST[$value['id']] = $value['std']; |
|
| 455 | 455 | |
| 456 | 456 | |
| 457 | - if (isset($value['type']) && $value['type'] == 'checkbox') : |
|
| 457 | + if (isset($value['type']) && $value['type'] == 'checkbox') : |
|
| 458 | 458 | |
| 459 | - if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 460 | - update_option($value['id'], $_POST[$value['id']]); |
|
| 461 | - } else {
|
|
| 462 | - update_option($value['id'], 0); |
|
| 463 | - } |
|
| 459 | + if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 460 | + update_option($value['id'], $_POST[$value['id']]); |
|
| 461 | + } else {
|
|
| 462 | + update_option($value['id'], 0); |
|
| 463 | + } |
|
| 464 | 464 | |
| 465 | - elseif (isset($value['type']) && $value['type'] == 'image_width') : |
|
| 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); |
|
| 472 | - else : |
|
| 473 | - update_option($value['id'] . '_crop', 0); |
|
| 474 | - endif; |
|
| 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); |
|
| 479 | - } |
|
| 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 | + else : |
|
| 473 | + update_option($value['id'] . '_crop', 0); |
|
| 474 | + endif; |
|
| 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); |
|
| 479 | + } |
|
| 480 | 480 | |
| 481 | - elseif (isset($value['type']) && $value['type'] == 'map') : |
|
| 482 | - $post_types = array(); |
|
| 483 | - $categories = array(); |
|
| 481 | + elseif (isset($value['type']) && $value['type'] == 'map') : |
|
| 482 | + $post_types = array(); |
|
| 483 | + $categories = array(); |
|
| 484 | 484 | |
| 485 | - if (!empty($_POST['home_map_post_types'])) : |
|
| 486 | - foreach ($_POST['home_map_post_types'] as $post_type) : |
|
| 487 | - $post_types[] = $post_type; |
|
| 488 | - endforeach; |
|
| 489 | - endif; |
|
| 485 | + if (!empty($_POST['home_map_post_types'])) : |
|
| 486 | + foreach ($_POST['home_map_post_types'] as $post_type) : |
|
| 487 | + $post_types[] = $post_type; |
|
| 488 | + endforeach; |
|
| 489 | + endif; |
|
| 490 | 490 | |
| 491 | - update_option('geodir_exclude_post_type_on_map', $post_types);
|
|
| 491 | + update_option('geodir_exclude_post_type_on_map', $post_types);
|
|
| 492 | 492 | |
| 493 | - if (!empty($_POST['post_category'])) : |
|
| 494 | - foreach ($_POST['post_category'] as $texonomy => $cat_arr) : |
|
| 495 | - $categories[$texonomy] = array(); |
|
| 496 | - foreach ($cat_arr as $category) : |
|
| 497 | - $categories[$texonomy][] = $category; |
|
| 498 | - endforeach; |
|
| 499 | - $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array(); |
|
| 500 | - endforeach; |
|
| 501 | - endif; |
|
| 502 | - update_option('geodir_exclude_cat_on_map', $categories);
|
|
| 503 | - update_option('geodir_exclude_cat_on_map_upgrade', 1);
|
|
| 504 | - elseif (isset($value['type']) && $value['type'] == 'map_default_settings') : |
|
| 493 | + if (!empty($_POST['post_category'])) : |
|
| 494 | + foreach ($_POST['post_category'] as $texonomy => $cat_arr) : |
|
| 495 | + $categories[$texonomy] = array(); |
|
| 496 | + foreach ($cat_arr as $category) : |
|
| 497 | + $categories[$texonomy][] = $category; |
|
| 498 | + endforeach; |
|
| 499 | + $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array(); |
|
| 500 | + endforeach; |
|
| 501 | + endif; |
|
| 502 | + update_option('geodir_exclude_cat_on_map', $categories);
|
|
| 503 | + update_option('geodir_exclude_cat_on_map_upgrade', 1);
|
|
| 504 | + elseif (isset($value['type']) && $value['type'] == 'map_default_settings') : |
|
| 505 | 505 | |
| 506 | 506 | |
| 507 | - if (!empty($_POST['geodir_default_map_language'])): |
|
| 508 | - update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);
|
|
| 509 | - endif; |
|
| 507 | + if (!empty($_POST['geodir_default_map_language'])): |
|
| 508 | + update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);
|
|
| 509 | + endif; |
|
| 510 | 510 | |
| 511 | 511 | |
| 512 | - if (!empty($_POST['geodir_default_map_search_pt'])): |
|
| 513 | - update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);
|
|
| 514 | - endif; |
|
| 512 | + if (!empty($_POST['geodir_default_map_search_pt'])): |
|
| 513 | + update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);
|
|
| 514 | + endif; |
|
| 515 | 515 | |
| 516 | 516 | |
| 517 | - elseif (isset($value['type']) && $value['type'] == 'file') : |
|
| 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 | - if (get_option($value['id'])) {
|
|
| 523 | - $image_name_arr = explode('/', get_option($value['id']));
|
|
| 524 | - $noimg_name = end($image_name_arr); |
|
| 525 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 526 | - if (file_exists($img_path)) |
|
| 527 | - unlink($img_path); |
|
| 528 | - } |
|
| 522 | + if (get_option($value['id'])) {
|
|
| 523 | + $image_name_arr = explode('/', get_option($value['id']));
|
|
| 524 | + $noimg_name = end($image_name_arr); |
|
| 525 | + $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 526 | + if (file_exists($img_path)) |
|
| 527 | + unlink($img_path); |
|
| 528 | + } |
|
| 529 | 529 | |
| 530 | - update_option($value['id'], ''); |
|
| 531 | - } |
|
| 530 | + update_option($value['id'], ''); |
|
| 531 | + } |
|
| 532 | 532 | |
| 533 | - $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : ''; |
|
| 534 | - $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : ''; |
|
| 535 | - |
|
| 536 | - if (!empty($filename)): |
|
| 537 | - $ext = pathinfo($filename, PATHINFO_EXTENSION); |
|
| 538 | - $uplaods = array(); |
|
| 539 | - |
|
| 540 | - foreach ($uploadedfile as $key => $uplaod): |
|
| 541 | - if ($key == 'name'): |
|
| 542 | - $uplaods[$key] = $filename; |
|
| 543 | - else : |
|
| 544 | - $uplaods[$key] = $uplaod; |
|
| 545 | - endif; |
|
| 546 | - endforeach; |
|
| 547 | - |
|
| 548 | - $uploads = wp_upload_dir(); |
|
| 549 | - |
|
| 550 | - if (get_option($value['id'])) {
|
|
| 551 | - $image_name_arr = explode('/', get_option($value['id']));
|
|
| 552 | - $noimg_name = end($image_name_arr); |
|
| 553 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 554 | - if (file_exists($img_path)) |
|
| 555 | - unlink($img_path); |
|
| 556 | - } |
|
| 533 | + $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : ''; |
|
| 534 | + $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : ''; |
|
| 535 | + |
|
| 536 | + if (!empty($filename)): |
|
| 537 | + $ext = pathinfo($filename, PATHINFO_EXTENSION); |
|
| 538 | + $uplaods = array(); |
|
| 539 | + |
|
| 540 | + foreach ($uploadedfile as $key => $uplaod): |
|
| 541 | + if ($key == 'name'): |
|
| 542 | + $uplaods[$key] = $filename; |
|
| 543 | + else : |
|
| 544 | + $uplaods[$key] = $uplaod; |
|
| 545 | + endif; |
|
| 546 | + endforeach; |
|
| 547 | + |
|
| 548 | + $uploads = wp_upload_dir(); |
|
| 549 | + |
|
| 550 | + if (get_option($value['id'])) {
|
|
| 551 | + $image_name_arr = explode('/', get_option($value['id']));
|
|
| 552 | + $noimg_name = end($image_name_arr); |
|
| 553 | + $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 554 | + if (file_exists($img_path)) |
|
| 555 | + unlink($img_path); |
|
| 556 | + } |
|
| 557 | 557 | |
| 558 | - $upload_overrides = array('test_form' => false);
|
|
| 559 | - $movefile = wp_handle_upload($uplaods, $upload_overrides); |
|
| 558 | + $upload_overrides = array('test_form' => false);
|
|
| 559 | + $movefile = wp_handle_upload($uplaods, $upload_overrides); |
|
| 560 | 560 | |
| 561 | - update_option($value['id'], $movefile['url']); |
|
| 561 | + update_option($value['id'], $movefile['url']); |
|
| 562 | 562 | |
| 563 | - endif; |
|
| 563 | + endif; |
|
| 564 | 564 | |
| 565 | - if (!get_option($value['id']) && isset($value['value'])): |
|
| 566 | - update_option($value['id'], $value['value']); |
|
| 567 | - endif; |
|
| 565 | + if (!get_option($value['id']) && isset($value['value'])): |
|
| 566 | + update_option($value['id'], $value['value']); |
|
| 567 | + endif; |
|
| 568 | 568 | |
| 569 | 569 | |
| 570 | - else : |
|
| 571 | - // same menu setting per theme. |
|
| 572 | - if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
|
| 573 | - $theme = wp_get_theme(); |
|
| 574 | - update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
|
| 575 | - } |
|
| 570 | + else : |
|
| 571 | + // same menu setting per theme. |
|
| 572 | + if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
|
| 573 | + $theme = wp_get_theme(); |
|
| 574 | + update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
|
| 575 | + } |
|
| 576 | 576 | |
| 577 | - if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 578 | - update_option($value['id'], $_POST[$value['id']]); |
|
| 579 | - } else {
|
|
| 580 | - delete_option($value['id']); |
|
| 581 | - } |
|
| 577 | + if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 578 | + update_option($value['id'], $_POST[$value['id']]); |
|
| 579 | + } else {
|
|
| 580 | + delete_option($value['id']); |
|
| 581 | + } |
|
| 582 | 582 | |
| 583 | - endif; |
|
| 584 | - } |
|
| 585 | - if ($dummy) |
|
| 586 | - $_POST = array(); |
|
| 587 | - return true; |
|
| 583 | + endif; |
|
| 584 | + } |
|
| 585 | + if ($dummy) |
|
| 586 | + $_POST = array(); |
|
| 587 | + return true; |
|
| 588 | 588 | |
| 589 | 589 | } |
| 590 | 590 | |
@@ -633,33 +633,33 @@ discard block |
||
| 633 | 633 | function places_custom_fields_tab($tabs) |
| 634 | 634 | {
|
| 635 | 635 | |
| 636 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 636 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 637 | 637 | |
| 638 | - if (!empty($geodir_post_types)) {
|
|
| 638 | + if (!empty($geodir_post_types)) {
|
|
| 639 | 639 | |
| 640 | - foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info): |
|
| 640 | + foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info): |
|
| 641 | 641 | |
| 642 | - $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory'); |
|
| 642 | + $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory'); |
|
| 643 | 643 | |
| 644 | - $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
| 645 | - 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
|
|
| 646 | - 'subtabs' => array( |
|
| 647 | - array('subtab' => 'custom_fields',
|
|
| 648 | - 'label' => __('Custom Fields', 'geodirectory'),
|
|
| 649 | - 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 650 | - array('subtab' => 'sorting_options',
|
|
| 651 | - 'label' => __('Sorting Options', 'geodirectory'),
|
|
| 652 | - 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 653 | - ), |
|
| 654 | - 'tab_index' => 9, |
|
| 655 | - 'request' => array('listing_type' => $geodir_post_type)
|
|
| 656 | - ); |
|
| 644 | + $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
| 645 | + 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
|
|
| 646 | + 'subtabs' => array( |
|
| 647 | + array('subtab' => 'custom_fields',
|
|
| 648 | + 'label' => __('Custom Fields', 'geodirectory'),
|
|
| 649 | + 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 650 | + array('subtab' => 'sorting_options',
|
|
| 651 | + 'label' => __('Sorting Options', 'geodirectory'),
|
|
| 652 | + 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 653 | + ), |
|
| 654 | + 'tab_index' => 9, |
|
| 655 | + 'request' => array('listing_type' => $geodir_post_type)
|
|
| 656 | + ); |
|
| 657 | 657 | |
| 658 | - endforeach; |
|
| 658 | + endforeach; |
|
| 659 | 659 | |
| 660 | - } |
|
| 660 | + } |
|
| 661 | 661 | |
| 662 | - return $tabs; |
|
| 662 | + return $tabs; |
|
| 663 | 663 | } |
| 664 | 664 | |
| 665 | 665 | |
@@ -675,9 +675,9 @@ discard block |
||
| 675 | 675 | */ |
| 676 | 676 | function geodir_tools_setting_tab($tabs) |
| 677 | 677 | {
|
| 678 | - wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 679 | - $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
|
|
| 680 | - return $tabs; |
|
| 678 | + wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 679 | + $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
|
|
| 680 | + return $tabs; |
|
| 681 | 681 | } |
| 682 | 682 | |
| 683 | 683 | /** |
@@ -692,8 +692,8 @@ discard block |
||
| 692 | 692 | */ |
| 693 | 693 | function geodir_compatibility_setting_tab($tabs) |
| 694 | 694 | {
|
| 695 | - $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));
|
|
| 696 | - return $tabs; |
|
| 695 | + $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));
|
|
| 696 | + return $tabs; |
|
| 697 | 697 | } |
| 698 | 698 | |
| 699 | 699 | |
@@ -709,144 +709,144 @@ discard block |
||
| 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');
|
|
| 713 | - return $tabs; |
|
| 712 | + $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 713 | + return $tabs; |
|
| 714 | 714 | } |
| 715 | 715 | |
| 716 | 716 | |
| 717 | 717 | if (!function_exists('geodir_edit_post_columns')) {
|
| 718 | - /** |
|
| 719 | - * Modify admin post listing page columns. |
|
| 720 | - * |
|
| 721 | - * @since 1.0.0 |
|
| 722 | - * @package GeoDirectory |
|
| 723 | - * @param array $columns The column array. |
|
| 724 | - * @return array Altered column array. |
|
| 725 | - */ |
|
| 726 | - function geodir_edit_post_columns($columns) |
|
| 727 | - {
|
|
| 728 | - |
|
| 729 | - $new_columns = array('location' => __('Location (ID)', 'geodirectory'),
|
|
| 730 | - 'categorys' => __('Categories', 'geodirectory'));
|
|
| 731 | - |
|
| 732 | - if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist
|
|
| 733 | - {
|
|
| 734 | - $offset = 0; // should we prepend $array with $data? |
|
| 735 | - $offset = count($columns); // or should we append $array with $data? lets pick this one... |
|
| 736 | - } |
|
| 718 | + /** |
|
| 719 | + * Modify admin post listing page columns. |
|
| 720 | + * |
|
| 721 | + * @since 1.0.0 |
|
| 722 | + * @package GeoDirectory |
|
| 723 | + * @param array $columns The column array. |
|
| 724 | + * @return array Altered column array. |
|
| 725 | + */ |
|
| 726 | + function geodir_edit_post_columns($columns) |
|
| 727 | + {
|
|
| 737 | 728 | |
| 738 | - $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset)); |
|
| 729 | + $new_columns = array('location' => __('Location (ID)', 'geodirectory'),
|
|
| 730 | + 'categorys' => __('Categories', 'geodirectory'));
|
|
| 739 | 731 | |
| 740 | - $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));
|
|
| 732 | + if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist
|
|
| 733 | + {
|
|
| 734 | + $offset = 0; // should we prepend $array with $data? |
|
| 735 | + $offset = count($columns); // or should we append $array with $data? lets pick this one... |
|
| 736 | + } |
|
| 741 | 737 | |
| 742 | - return $columns; |
|
| 743 | - } |
|
| 738 | + $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset)); |
|
| 739 | + |
|
| 740 | + $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));
|
|
| 741 | + |
|
| 742 | + return $columns; |
|
| 743 | + } |
|
| 744 | 744 | } |
| 745 | 745 | |
| 746 | 746 | |
| 747 | 747 | if (!function_exists('geodir_manage_post_columns')) {
|
| 748 | - /** |
|
| 749 | - * Adds content to our custom post listing page columns. |
|
| 750 | - * |
|
| 751 | - * @since 1.0.0 |
|
| 752 | - * @package GeoDirectory |
|
| 753 | - * @global object $wpdb WordPress Database object. |
|
| 754 | - * @global object $post WordPress Post object. |
|
| 755 | - * @param string $column The column name. |
|
| 756 | - * @param int $post_id The post ID. |
|
| 757 | - */ |
|
| 758 | - function geodir_manage_post_columns($column, $post_id) |
|
| 759 | - {
|
|
| 760 | - global $post, $wpdb; |
|
| 761 | - |
|
| 762 | - switch ($column): |
|
| 763 | - /* If displaying the 'city' column. */ |
|
| 764 | - case 'location' : |
|
| 765 | - $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true); |
|
| 766 | - $location = geodir_get_location($location_id); |
|
| 767 | - /* If no city is found, output a default message. */ |
|
| 768 | - if (empty($location)) {
|
|
| 769 | - _e('Unknown', 'geodirectory');
|
|
| 770 | - } else {
|
|
| 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); |
|
| 774 | - } |
|
| 775 | - break; |
|
| 776 | - |
|
| 777 | - /* If displaying the 'expire' column. */ |
|
| 778 | - case 'expire' : |
|
| 779 | - $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true); |
|
| 780 | - $d1 = $expire_date; // get expire_date |
|
| 781 | - $d2 = date('Y-m-d'); // get current date
|
|
| 782 | - $state = __('days left', 'geodirectory');
|
|
| 783 | - $date_diff_text = ''; |
|
| 784 | - $expire_class = 'expire_left'; |
|
| 785 | - if ($expire_date != 'Never') {
|
|
| 786 | - if (strtotime($d1) < strtotime($d2)) {
|
|
| 787 | - $state = __('days overdue', 'geodirectory');
|
|
| 788 | - $expire_class = 'expire_over'; |
|
| 789 | - } |
|
| 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>';
|
|
| 792 | - } |
|
| 793 | - /* If no expire_date is found, output a default message. */ |
|
| 794 | - if (empty($expire_date)) |
|
| 795 | - echo __('Unknown', 'geodirectory');
|
|
| 796 | - /* If there is a expire_date, append 'days left' to the text string. */ |
|
| 797 | - else |
|
| 798 | - echo $expire_date . $date_diff_text; |
|
| 799 | - break; |
|
| 800 | - |
|
| 801 | - /* If displaying the 'categorys' column. */ |
|
| 802 | - case 'categorys' : |
|
| 803 | - |
|
| 804 | - /* Get the categorys for the post. */ |
|
| 805 | - |
|
| 806 | - |
|
| 807 | - $terms = wp_get_object_terms($post_id, get_object_taxonomies($post)); |
|
| 808 | - |
|
| 809 | - /* If terms were found. */ |
|
| 810 | - if (!empty($terms)) {
|
|
| 811 | - $out = array(); |
|
| 812 | - /* Loop through each term, linking to the 'edit posts' page for the specific term. */ |
|
| 813 | - foreach ($terms as $term) {
|
|
| 814 | - if (!strstr($term->taxonomy, 'tag')) {
|
|
| 815 | - $out[] = sprintf('<a href="%s">%s</a>',
|
|
| 816 | - esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),
|
|
| 817 | - esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))
|
|
| 818 | - ); |
|
| 819 | - } |
|
| 820 | - } |
|
| 821 | - /* Join the terms, separating them with a comma. */ |
|
| 822 | - echo(join(', ', $out));
|
|
| 823 | - } /* If no terms were found, output a default message. */ |
|
| 824 | - else {
|
|
| 825 | - _e('No Categories', 'geodirectory');
|
|
| 826 | - } |
|
| 827 | - break; |
|
| 748 | + /** |
|
| 749 | + * Adds content to our custom post listing page columns. |
|
| 750 | + * |
|
| 751 | + * @since 1.0.0 |
|
| 752 | + * @package GeoDirectory |
|
| 753 | + * @global object $wpdb WordPress Database object. |
|
| 754 | + * @global object $post WordPress Post object. |
|
| 755 | + * @param string $column The column name. |
|
| 756 | + * @param int $post_id The post ID. |
|
| 757 | + */ |
|
| 758 | + function geodir_manage_post_columns($column, $post_id) |
|
| 759 | + {
|
|
| 760 | + global $post, $wpdb; |
|
| 761 | + |
|
| 762 | + switch ($column): |
|
| 763 | + /* If displaying the 'city' column. */ |
|
| 764 | + case 'location' : |
|
| 765 | + $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true); |
|
| 766 | + $location = geodir_get_location($location_id); |
|
| 767 | + /* If no city is found, output a default message. */ |
|
| 768 | + if (empty($location)) {
|
|
| 769 | + _e('Unknown', 'geodirectory');
|
|
| 770 | + } else {
|
|
| 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); |
|
| 774 | + } |
|
| 775 | + break; |
|
| 776 | + |
|
| 777 | + /* If displaying the 'expire' column. */ |
|
| 778 | + case 'expire' : |
|
| 779 | + $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true); |
|
| 780 | + $d1 = $expire_date; // get expire_date |
|
| 781 | + $d2 = date('Y-m-d'); // get current date
|
|
| 782 | + $state = __('days left', 'geodirectory');
|
|
| 783 | + $date_diff_text = ''; |
|
| 784 | + $expire_class = 'expire_left'; |
|
| 785 | + if ($expire_date != 'Never') {
|
|
| 786 | + if (strtotime($d1) < strtotime($d2)) {
|
|
| 787 | + $state = __('days overdue', 'geodirectory');
|
|
| 788 | + $expire_class = 'expire_over'; |
|
| 789 | + } |
|
| 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>';
|
|
| 792 | + } |
|
| 793 | + /* If no expire_date is found, output a default message. */ |
|
| 794 | + if (empty($expire_date)) |
|
| 795 | + echo __('Unknown', 'geodirectory');
|
|
| 796 | + /* If there is a expire_date, append 'days left' to the text string. */ |
|
| 797 | + else |
|
| 798 | + echo $expire_date . $date_diff_text; |
|
| 799 | + break; |
|
| 828 | 800 | |
| 829 | - endswitch; |
|
| 830 | - } |
|
| 801 | + /* If displaying the 'categorys' column. */ |
|
| 802 | + case 'categorys' : |
|
| 803 | + |
|
| 804 | + /* Get the categorys for the post. */ |
|
| 805 | + |
|
| 806 | + |
|
| 807 | + $terms = wp_get_object_terms($post_id, get_object_taxonomies($post)); |
|
| 808 | + |
|
| 809 | + /* If terms were found. */ |
|
| 810 | + if (!empty($terms)) {
|
|
| 811 | + $out = array(); |
|
| 812 | + /* Loop through each term, linking to the 'edit posts' page for the specific term. */ |
|
| 813 | + foreach ($terms as $term) {
|
|
| 814 | + if (!strstr($term->taxonomy, 'tag')) {
|
|
| 815 | + $out[] = sprintf('<a href="%s">%s</a>',
|
|
| 816 | + esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),
|
|
| 817 | + esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))
|
|
| 818 | + ); |
|
| 819 | + } |
|
| 820 | + } |
|
| 821 | + /* Join the terms, separating them with a comma. */ |
|
| 822 | + echo(join(', ', $out));
|
|
| 823 | + } /* If no terms were found, output a default message. */ |
|
| 824 | + else {
|
|
| 825 | + _e('No Categories', 'geodirectory');
|
|
| 826 | + } |
|
| 827 | + break; |
|
| 828 | + |
|
| 829 | + endswitch; |
|
| 830 | + } |
|
| 831 | 831 | } |
| 832 | 832 | |
| 833 | 833 | |
| 834 | 834 | if (!function_exists('geodir_post_sortable_columns')) {
|
| 835 | - /** |
|
| 836 | - * Makes admin post listing page columns sortable. |
|
| 837 | - * |
|
| 838 | - * @since 1.0.0 |
|
| 839 | - * @package GeoDirectory |
|
| 840 | - * @param array $columns The column array. |
|
| 841 | - * @return array Altered column array. |
|
| 842 | - */ |
|
| 843 | - function geodir_post_sortable_columns($columns) |
|
| 844 | - {
|
|
| 845 | - |
|
| 846 | - $columns['expire'] = 'expire'; |
|
| 847 | - |
|
| 848 | - return $columns; |
|
| 849 | - } |
|
| 835 | + /** |
|
| 836 | + * Makes admin post listing page columns sortable. |
|
| 837 | + * |
|
| 838 | + * @since 1.0.0 |
|
| 839 | + * @package GeoDirectory |
|
| 840 | + * @param array $columns The column array. |
|
| 841 | + * @return array Altered column array. |
|
| 842 | + */ |
|
| 843 | + function geodir_post_sortable_columns($columns) |
|
| 844 | + {
|
|
| 845 | + |
|
| 846 | + $columns['expire'] = 'expire'; |
|
| 847 | + |
|
| 848 | + return $columns; |
|
| 849 | + } |
|
| 850 | 850 | } |
| 851 | 851 | |
| 852 | 852 | /** |
@@ -860,32 +860,32 @@ discard block |
||
| 860 | 860 | * @param int $post_id The post ID. |
| 861 | 861 | */ |
| 862 | 862 | function geodir_post_information_save($post_id, $post) {
|
| 863 | - global $wpdb, $current_user; |
|
| 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')) {
|
|
| 866 | - return; |
|
| 867 | - } |
|
| 865 | + if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
|
|
| 866 | + return; |
|
| 867 | + } |
|
| 868 | 868 | |
| 869 | - $geodir_posttypes = geodir_get_posttypes(); |
|
| 869 | + $geodir_posttypes = geodir_get_posttypes(); |
|
| 870 | 870 | |
| 871 | - if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
|
|
| 872 | - return; |
|
| 871 | + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
|
|
| 872 | + return; |
|
| 873 | 873 | |
| 874 | - if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 875 | - if (isset($_REQUEST['_status'])) |
|
| 876 | - geodir_change_post_status($post_id, $_REQUEST['_status']); |
|
| 874 | + if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 875 | + if (isset($_REQUEST['_status'])) |
|
| 876 | + geodir_change_post_status($post_id, $_REQUEST['_status']); |
|
| 877 | 877 | |
| 878 | - if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) |
|
| 879 | - return; |
|
| 878 | + if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) |
|
| 879 | + return; |
|
| 880 | 880 | |
| 881 | - if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) |
|
| 882 | - return; |
|
| 881 | + if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) |
|
| 882 | + return; |
|
| 883 | 883 | |
| 884 | - if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) |
|
| 885 | - return; |
|
| 884 | + if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) |
|
| 885 | + return; |
|
| 886 | 886 | |
| 887 | - geodir_save_listing($_REQUEST); |
|
| 888 | - } |
|
| 887 | + geodir_save_listing($_REQUEST); |
|
| 888 | + } |
|
| 889 | 889 | } |
| 890 | 890 | |
| 891 | 891 | /** |
@@ -901,102 +901,102 @@ discard block |
||
| 901 | 901 | */ |
| 902 | 902 | function geodir_admin_fields($options) |
| 903 | 903 | {
|
| 904 | - global $geodirectory; |
|
| 905 | - |
|
| 906 | - $first_title = true; |
|
| 907 | - $tab_id = ''; |
|
| 908 | - $i = 0; |
|
| 909 | - foreach ($options as $value) : |
|
| 910 | - if (!isset($value['name'])) $value['name'] = ''; |
|
| 911 | - if (!isset($value['class'])) $value['class'] = ''; |
|
| 912 | - if (!isset($value['css'])) $value['css'] = ''; |
|
| 913 | - if (!isset($value['std'])) $value['std'] = ''; |
|
| 914 | - $desc = ''; |
|
| 915 | - switch ($value['type']) : |
|
| 916 | - case 'dummy_installer': |
|
| 917 | - $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place'; |
|
| 918 | - geodir_autoinstall_admin_header($post_type); |
|
| 919 | - break; |
|
| 920 | - case 'title': |
|
| 921 | - |
|
| 922 | - if ($i == 0) {
|
|
| 923 | - echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>'; |
|
| 924 | - echo '<div class="inner_content_tab_main">'; |
|
| 925 | - } |
|
| 904 | + global $geodirectory; |
|
| 905 | + |
|
| 906 | + $first_title = true; |
|
| 907 | + $tab_id = ''; |
|
| 908 | + $i = 0; |
|
| 909 | + foreach ($options as $value) : |
|
| 910 | + if (!isset($value['name'])) $value['name'] = ''; |
|
| 911 | + if (!isset($value['class'])) $value['class'] = ''; |
|
| 912 | + if (!isset($value['css'])) $value['css'] = ''; |
|
| 913 | + if (!isset($value['std'])) $value['std'] = ''; |
|
| 914 | + $desc = ''; |
|
| 915 | + switch ($value['type']) : |
|
| 916 | + case 'dummy_installer': |
|
| 917 | + $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place'; |
|
| 918 | + geodir_autoinstall_admin_header($post_type); |
|
| 919 | + break; |
|
| 920 | + case 'title': |
|
| 921 | + |
|
| 922 | + if ($i == 0) {
|
|
| 923 | + echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>'; |
|
| 924 | + echo '<div class="inner_content_tab_main">'; |
|
| 925 | + } |
|
| 926 | 926 | |
| 927 | - $i++; |
|
| 927 | + $i++; |
|
| 928 | 928 | |
| 929 | - if (isset($value['id']) && $value['id']) |
|
| 930 | - $tab_id = $value['id']; |
|
| 929 | + if (isset($value['id']) && $value['id']) |
|
| 930 | + $tab_id = $value['id']; |
|
| 931 | 931 | |
| 932 | - if (isset($value['desc']) && $value['desc']) |
|
| 933 | - $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 932 | + if (isset($value['desc']) && $value['desc']) |
|
| 933 | + $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 934 | 934 | |
| 935 | - if (isset($value['name']) && $value['name']) {
|
|
| 936 | - if ($first_title === true) {
|
|
| 937 | - $first_title = false; |
|
| 938 | - } else {
|
|
| 939 | - echo '</div>'; |
|
| 940 | - } |
|
| 941 | - echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>'; |
|
| 935 | + if (isset($value['name']) && $value['name']) {
|
|
| 936 | + if ($first_title === true) {
|
|
| 937 | + $first_title = false; |
|
| 938 | + } else {
|
|
| 939 | + echo '</div>'; |
|
| 940 | + } |
|
| 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;" >'; |
|
| 944 | - } |
|
| 943 | + echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 944 | + } |
|
| 945 | 945 | |
| 946 | - /** |
|
| 947 | - * Called after a GeoDirectory settings title is output in the GD settings page. |
|
| 948 | - * |
|
| 949 | - * The action is called dynamically geodir_settings_$value['id']. |
|
| 950 | - * |
|
| 951 | - * @since 1.0.0 |
|
| 952 | - */ |
|
| 953 | - do_action('geodir_settings_' . sanitize_title($value['id']));
|
|
| 954 | - break; |
|
| 955 | - |
|
| 956 | - case 'no_tabs': |
|
| 957 | - |
|
| 958 | - echo '<div class="inner_content_tab_main">'; |
|
| 959 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 960 | - |
|
| 961 | - break; |
|
| 962 | - |
|
| 963 | - case 'sectionstart': |
|
| 964 | - if (isset($value['desc']) && $value['desc']) |
|
| 965 | - $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 966 | - if (isset($value['name']) && $value['name']) |
|
| 967 | - echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 968 | - /** |
|
| 969 | - * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
|
| 970 | - * |
|
| 971 | - * The action is called dynamically geodir_settings_$value['id']_start. |
|
| 972 | - * |
|
| 973 | - * @since 1.0.0 |
|
| 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"; |
|
| 977 | - |
|
| 978 | - break; |
|
| 979 | - case 'sectionend': |
|
| 980 | - /** |
|
| 981 | - * Called before a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 982 | - * |
|
| 983 | - * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 984 | - * |
|
| 985 | - * @since 1.0.0 |
|
| 986 | - */ |
|
| 987 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
| 988 | - echo '</table>'; |
|
| 989 | - /** |
|
| 990 | - * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 991 | - * |
|
| 992 | - * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 993 | - * |
|
| 994 | - * @since 1.0.0 |
|
| 995 | - */ |
|
| 996 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
| 997 | - break; |
|
| 998 | - case 'text': |
|
| 999 | - ?> |
|
| 946 | + /** |
|
| 947 | + * Called after a GeoDirectory settings title is output in the GD settings page. |
|
| 948 | + * |
|
| 949 | + * The action is called dynamically geodir_settings_$value['id']. |
|
| 950 | + * |
|
| 951 | + * @since 1.0.0 |
|
| 952 | + */ |
|
| 953 | + do_action('geodir_settings_' . sanitize_title($value['id']));
|
|
| 954 | + break; |
|
| 955 | + |
|
| 956 | + case 'no_tabs': |
|
| 957 | + |
|
| 958 | + echo '<div class="inner_content_tab_main">'; |
|
| 959 | + echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 960 | + |
|
| 961 | + break; |
|
| 962 | + |
|
| 963 | + case 'sectionstart': |
|
| 964 | + if (isset($value['desc']) && $value['desc']) |
|
| 965 | + $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 966 | + if (isset($value['name']) && $value['name']) |
|
| 967 | + echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 968 | + /** |
|
| 969 | + * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
|
| 970 | + * |
|
| 971 | + * The action is called dynamically geodir_settings_$value['id']_start. |
|
| 972 | + * |
|
| 973 | + * @since 1.0.0 |
|
| 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"; |
|
| 977 | + |
|
| 978 | + break; |
|
| 979 | + case 'sectionend': |
|
| 980 | + /** |
|
| 981 | + * Called before a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 982 | + * |
|
| 983 | + * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 984 | + * |
|
| 985 | + * @since 1.0.0 |
|
| 986 | + */ |
|
| 987 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
| 988 | + echo '</table>'; |
|
| 989 | + /** |
|
| 990 | + * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 991 | + * |
|
| 992 | + * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 993 | + * |
|
| 994 | + * @since 1.0.0 |
|
| 995 | + */ |
|
| 996 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
| 997 | + break; |
|
| 998 | + case 'text': |
|
| 999 | + ?> |
|
| 1000 | 1000 | <tr valign="top"> |
| 1001 | 1001 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1002 | 1002 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1005,15 +1005,15 @@ discard block |
||
| 1005 | 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 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1009 | - } else {
|
|
| 1010 | - echo esc_attr($value['std']); |
|
| 1011 | - } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1008 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1009 | + } else {
|
|
| 1010 | + echo esc_attr($value['std']); |
|
| 1011 | + } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1012 | 1012 | </tr><?php |
| 1013 | - break; |
|
| 1013 | + break; |
|
| 1014 | 1014 | |
| 1015 | - case 'map-key': |
|
| 1016 | - ?> |
|
| 1015 | + case 'map-key': |
|
| 1016 | + ?> |
|
| 1017 | 1017 | <tr valign="top"> |
| 1018 | 1018 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1019 | 1019 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1022,17 +1022,17 @@ discard block |
||
| 1022 | 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 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1026 | - } else {
|
|
| 1027 | - echo esc_attr($value['std']); |
|
| 1028 | - } ?>"/> |
|
| 1025 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1026 | + } else {
|
|
| 1027 | + echo esc_attr($value['std']); |
|
| 1028 | + } ?>"/> |
|
| 1029 | 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 | - break; |
|
| 1032 | + break; |
|
| 1033 | 1033 | |
| 1034 | - case 'password': |
|
| 1035 | - ?> |
|
| 1034 | + case 'password': |
|
| 1035 | + ?> |
|
| 1036 | 1036 | <tr valign="top"> |
| 1037 | 1037 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1038 | 1038 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1041,42 +1041,42 @@ discard block |
||
| 1041 | 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 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1045 | - } else {
|
|
| 1046 | - echo esc_attr($value['std']); |
|
| 1047 | - } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1044 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1045 | + } else {
|
|
| 1046 | + echo esc_attr($value['std']); |
|
| 1047 | + } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1048 | 1048 | </tr><?php |
| 1049 | - break; |
|
| 1049 | + break; |
|
| 1050 | 1050 | |
| 1051 | - case 'html_content': |
|
| 1052 | - ?> |
|
| 1051 | + case 'html_content': |
|
| 1052 | + ?> |
|
| 1053 | 1053 | <tr valign="top"> |
| 1054 | 1054 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1055 | 1055 | <td class="forminp"><span class="description"><?php echo $value['desc']; ?></span></td> |
| 1056 | 1056 | </tr><?php |
| 1057 | - break; |
|
| 1057 | + break; |
|
| 1058 | 1058 | |
| 1059 | - case 'color' : |
|
| 1060 | - ?> |
|
| 1059 | + case 'color' : |
|
| 1060 | + ?> |
|
| 1061 | 1061 | <tr valign="top"> |
| 1062 | 1062 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1063 | 1063 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
| 1064 | 1064 | id="<?php echo esc_attr($value['id']); ?>" type="text" |
| 1065 | 1065 | style="<?php echo esc_attr($value['css']); ?>" |
| 1066 | 1066 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1067 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1068 | - } else {
|
|
| 1069 | - echo esc_attr($value['std']); |
|
| 1070 | - } ?>" class="colorpick"/> <span |
|
| 1067 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1068 | + } else {
|
|
| 1069 | + echo esc_attr($value['std']); |
|
| 1070 | + } ?>" class="colorpick"/> <span |
|
| 1071 | 1071 | class="description"><?php echo $value['desc']; ?></span> |
| 1072 | 1072 | |
| 1073 | 1073 | <div id="colorPickerDiv_<?php echo esc_attr($value['id']); ?>" class="colorpickdiv" |
| 1074 | 1074 | style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div> |
| 1075 | 1075 | </td> |
| 1076 | 1076 | </tr><?php |
| 1077 | - break; |
|
| 1078 | - case 'image_width' : |
|
| 1079 | - ?> |
|
| 1077 | + break; |
|
| 1078 | + case 'image_width' : |
|
| 1079 | + ?> |
|
| 1080 | 1080 | <tr valign="top"> |
| 1081 | 1081 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1082 | 1082 | <td class="forminp"> |
@@ -1098,11 +1098,11 @@ discard block |
||
| 1098 | 1098 | |
| 1099 | 1099 | <span class="description"><?php echo $value['desc'] ?></span></td> |
| 1100 | 1100 | </tr><?php |
| 1101 | - break; |
|
| 1102 | - case 'select': |
|
| 1103 | - $option_value = get_option($value['id']); |
|
| 1104 | - $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value; |
|
| 1105 | - ?> |
|
| 1101 | + break; |
|
| 1102 | + case 'select': |
|
| 1103 | + $option_value = get_option($value['id']); |
|
| 1104 | + $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value; |
|
| 1105 | + ?> |
|
| 1106 | 1106 | <tr valign="top"> |
| 1107 | 1107 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1108 | 1108 | <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>" |
@@ -1111,33 +1111,33 @@ discard block |
||
| 1111 | 1111 | class="<?php if (isset($value['class'])) echo $value['class']; ?>" |
| 1112 | 1112 | option-ajaxchosen="false"> |
| 1113 | 1113 | <?php |
| 1114 | - foreach ($value['options'] as $key => $val) {
|
|
| 1115 | - $geodir_select_value = ''; |
|
| 1116 | - if ($option_value != '') {
|
|
| 1117 | - if ($option_value != '' && $option_value == $key) |
|
| 1118 | - $geodir_select_value = ' selected="selected" '; |
|
| 1119 | - } else {
|
|
| 1120 | - if ($value['std'] == $key) |
|
| 1121 | - $geodir_select_value = ' selected="selected" '; |
|
| 1122 | - } |
|
| 1123 | - ?> |
|
| 1114 | + foreach ($value['options'] as $key => $val) {
|
|
| 1115 | + $geodir_select_value = ''; |
|
| 1116 | + if ($option_value != '') {
|
|
| 1117 | + if ($option_value != '' && $option_value == $key) |
|
| 1118 | + $geodir_select_value = ' selected="selected" '; |
|
| 1119 | + } else {
|
|
| 1120 | + if ($value['std'] == $key) |
|
| 1121 | + $geodir_select_value = ' selected="selected" '; |
|
| 1122 | + } |
|
| 1123 | + ?> |
|
| 1124 | 1124 | <option |
| 1125 | 1125 | value="<?php echo esc_attr($key); ?>" <?php echo $geodir_select_value; ?> ><?php echo ucfirst($val) ?></option> |
| 1126 | 1126 | <?php |
| 1127 | - } |
|
| 1128 | - ?> |
|
| 1127 | + } |
|
| 1128 | + ?> |
|
| 1129 | 1129 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1130 | 1130 | </td> |
| 1131 | 1131 | </tr><?php |
| 1132 | - break; |
|
| 1132 | + break; |
|
| 1133 | 1133 | |
| 1134 | - case 'multiselect': |
|
| 1135 | - $option_values = get_option($value['id']); |
|
| 1136 | - if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {
|
|
| 1137 | - $option_values = $value['std']; |
|
| 1138 | - } |
|
| 1139 | - $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values; |
|
| 1140 | - ?> |
|
| 1134 | + case 'multiselect': |
|
| 1135 | + $option_values = get_option($value['id']); |
|
| 1136 | + if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {
|
|
| 1137 | + $option_values = $value['std']; |
|
| 1138 | + } |
|
| 1139 | + $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values; |
|
| 1140 | + ?> |
|
| 1141 | 1141 | <tr valign="top"> |
| 1142 | 1142 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1143 | 1143 | <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]" |
@@ -1147,25 +1147,25 @@ discard block |
||
| 1147 | 1147 | data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>" |
| 1148 | 1148 | option-ajaxchosen="false"> |
| 1149 | 1149 | <?php |
| 1150 | - foreach ($value['options'] as $key => $val) {
|
|
| 1151 | - if (strpos($key, 'optgroup_start-') === 0) {
|
|
| 1152 | - ?><optgroup label="<?php echo ucfirst($val); ?>"><?php |
|
| 1153 | - } else if (strpos($key, 'optgroup_end-') === 0) {
|
|
| 1154 | - ?></optgroup><?php |
|
| 1155 | - } else {
|
|
| 1156 | - ?> |
|
| 1150 | + foreach ($value['options'] as $key => $val) {
|
|
| 1151 | + if (strpos($key, 'optgroup_start-') === 0) {
|
|
| 1152 | + ?><optgroup label="<?php echo ucfirst($val); ?>"><?php |
|
| 1153 | + } else if (strpos($key, 'optgroup_end-') === 0) {
|
|
| 1154 | + ?></optgroup><?php |
|
| 1155 | + } else {
|
|
| 1156 | + ?> |
|
| 1157 | 1157 | <option |
| 1158 | 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 | - } |
|
| 1161 | - } |
|
| 1162 | - ?> |
|
| 1160 | + } |
|
| 1161 | + } |
|
| 1162 | + ?> |
|
| 1163 | 1163 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1164 | 1164 | </td> |
| 1165 | 1165 | </tr><?php |
| 1166 | - break; |
|
| 1167 | - case 'file': |
|
| 1168 | - ?> |
|
| 1166 | + break; |
|
| 1167 | + case 'file': |
|
| 1168 | + ?> |
|
| 1169 | 1169 | <tr valign="top"> |
| 1170 | 1170 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1171 | 1171 | <td class="forminp"> |
@@ -1185,87 +1185,87 @@ discard block |
||
| 1185 | 1185 | <?php } ?> |
| 1186 | 1186 | </td> |
| 1187 | 1187 | </tr><?php |
| 1188 | - break; |
|
| 1189 | - case 'map_default_settings' : |
|
| 1190 | - ?> |
|
| 1188 | + break; |
|
| 1189 | + case 'map_default_settings' : |
|
| 1190 | + ?> |
|
| 1191 | 1191 | |
| 1192 | 1192 | <tr valign="top"> |
| 1193 | 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 |
| 1197 | - $arr_map_langages = array( |
|
| 1198 | - 'ar' => __('ARABIC', 'geodirectory'),
|
|
| 1199 | - 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1200 | - 'bg' => __('BULGARIAN', 'geodirectory'),
|
|
| 1201 | - 'bn' => __('BENGALI', 'geodirectory'),
|
|
| 1202 | - 'ca' => __('CATALAN', 'geodirectory'),
|
|
| 1203 | - 'cs' => __('CZECH', 'geodirectory'),
|
|
| 1204 | - 'da' => __('DANISH', 'geodirectory'),
|
|
| 1205 | - 'de' => __('GERMAN', 'geodirectory'),
|
|
| 1206 | - 'el' => __('GREEK', 'geodirectory'),
|
|
| 1207 | - 'en' => __('ENGLISH', 'geodirectory'),
|
|
| 1208 | - 'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),
|
|
| 1209 | - 'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),
|
|
| 1210 | - 'es' => __('SPANISH', 'geodirectory'),
|
|
| 1211 | - 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1212 | - 'fa' => __('FARSI', 'geodirectory'),
|
|
| 1213 | - 'fi' => __('FINNISH', 'geodirectory'),
|
|
| 1214 | - 'fil' => __('FILIPINO', 'geodirectory'),
|
|
| 1215 | - 'fr' => __('FRENCH', 'geodirectory'),
|
|
| 1216 | - 'gl' => __('GALICIAN', 'geodirectory'),
|
|
| 1217 | - 'gu' => __('GUJARATI', 'geodirectory'),
|
|
| 1218 | - 'hi' => __('HINDI', 'geodirectory'),
|
|
| 1219 | - 'hr' => __('CROATIAN', 'geodirectory'),
|
|
| 1220 | - 'hu' => __('HUNGARIAN', 'geodirectory'),
|
|
| 1221 | - 'id' => __('INDONESIAN', 'geodirectory'),
|
|
| 1222 | - 'it' => __('ITALIAN', 'geodirectory'),
|
|
| 1223 | - 'iw' => __('HEBREW', 'geodirectory'),
|
|
| 1224 | - 'ja' => __('JAPANESE', 'geodirectory'),
|
|
| 1225 | - 'kn' => __('KANNADA', 'geodirectory'),
|
|
| 1226 | - 'ko' => __('KOREAN', 'geodirectory'),
|
|
| 1227 | - 'lt' => __('LITHUANIAN', 'geodirectory'),
|
|
| 1228 | - 'lv' => __('LATVIAN', 'geodirectory'),
|
|
| 1229 | - 'ml' => __('MALAYALAM', 'geodirectory'),
|
|
| 1230 | - 'mr' => __('MARATHI', 'geodirectory'),
|
|
| 1231 | - 'nl' => __('DUTCH', 'geodirectory'),
|
|
| 1232 | - 'no' => __('NORWEGIAN', 'geodirectory'),
|
|
| 1233 | - 'pl' => __('POLISH', 'geodirectory'),
|
|
| 1234 | - 'pt' => __('PORTUGUESE', 'geodirectory'),
|
|
| 1235 | - 'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),
|
|
| 1236 | - 'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),
|
|
| 1237 | - 'ro' => __('ROMANIAN', 'geodirectory'),
|
|
| 1238 | - 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1239 | - 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1240 | - 'sk' => __('SLOVAK', 'geodirectory'),
|
|
| 1241 | - 'sl' => __('SLOVENIAN', 'geodirectory'),
|
|
| 1242 | - 'sr' => __('SERBIAN', 'geodirectory'),
|
|
| 1243 | - 'sv' => __(' SWEDISH', 'geodirectory'),
|
|
| 1244 | - 'tl' => __('TAGALOG', 'geodirectory'),
|
|
| 1245 | - 'ta' => __('TAMIL', 'geodirectory'),
|
|
| 1246 | - 'te' => __('TELUGU', 'geodirectory'),
|
|
| 1247 | - 'th' => __('THAI', 'geodirectory'),
|
|
| 1248 | - 'tr' => __('TURKISH', 'geodirectory'),
|
|
| 1249 | - 'uk' => __('UKRAINIAN', 'geodirectory'),
|
|
| 1250 | - 'vi' => __('VIETNAMESE', 'geodirectory'),
|
|
| 1251 | - 'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),
|
|
| 1252 | - 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),
|
|
| 1253 | - ); |
|
| 1254 | - $geodir_default_map_language = get_option('geodir_default_map_language');
|
|
| 1255 | - if (empty($geodir_default_map_language)) |
|
| 1256 | - $geodir_default_map_language = 'en'; |
|
| 1257 | - foreach ($arr_map_langages as $language_key => $language_txt) {
|
|
| 1258 | - if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) |
|
| 1259 | - $geodir_default_language_selected = "selected='selected'"; |
|
| 1260 | - else |
|
| 1261 | - $geodir_default_language_selected = ''; |
|
| 1262 | - |
|
| 1263 | - ?> |
|
| 1197 | + $arr_map_langages = array( |
|
| 1198 | + 'ar' => __('ARABIC', 'geodirectory'),
|
|
| 1199 | + 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1200 | + 'bg' => __('BULGARIAN', 'geodirectory'),
|
|
| 1201 | + 'bn' => __('BENGALI', 'geodirectory'),
|
|
| 1202 | + 'ca' => __('CATALAN', 'geodirectory'),
|
|
| 1203 | + 'cs' => __('CZECH', 'geodirectory'),
|
|
| 1204 | + 'da' => __('DANISH', 'geodirectory'),
|
|
| 1205 | + 'de' => __('GERMAN', 'geodirectory'),
|
|
| 1206 | + 'el' => __('GREEK', 'geodirectory'),
|
|
| 1207 | + 'en' => __('ENGLISH', 'geodirectory'),
|
|
| 1208 | + 'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),
|
|
| 1209 | + 'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),
|
|
| 1210 | + 'es' => __('SPANISH', 'geodirectory'),
|
|
| 1211 | + 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1212 | + 'fa' => __('FARSI', 'geodirectory'),
|
|
| 1213 | + 'fi' => __('FINNISH', 'geodirectory'),
|
|
| 1214 | + 'fil' => __('FILIPINO', 'geodirectory'),
|
|
| 1215 | + 'fr' => __('FRENCH', 'geodirectory'),
|
|
| 1216 | + 'gl' => __('GALICIAN', 'geodirectory'),
|
|
| 1217 | + 'gu' => __('GUJARATI', 'geodirectory'),
|
|
| 1218 | + 'hi' => __('HINDI', 'geodirectory'),
|
|
| 1219 | + 'hr' => __('CROATIAN', 'geodirectory'),
|
|
| 1220 | + 'hu' => __('HUNGARIAN', 'geodirectory'),
|
|
| 1221 | + 'id' => __('INDONESIAN', 'geodirectory'),
|
|
| 1222 | + 'it' => __('ITALIAN', 'geodirectory'),
|
|
| 1223 | + 'iw' => __('HEBREW', 'geodirectory'),
|
|
| 1224 | + 'ja' => __('JAPANESE', 'geodirectory'),
|
|
| 1225 | + 'kn' => __('KANNADA', 'geodirectory'),
|
|
| 1226 | + 'ko' => __('KOREAN', 'geodirectory'),
|
|
| 1227 | + 'lt' => __('LITHUANIAN', 'geodirectory'),
|
|
| 1228 | + 'lv' => __('LATVIAN', 'geodirectory'),
|
|
| 1229 | + 'ml' => __('MALAYALAM', 'geodirectory'),
|
|
| 1230 | + 'mr' => __('MARATHI', 'geodirectory'),
|
|
| 1231 | + 'nl' => __('DUTCH', 'geodirectory'),
|
|
| 1232 | + 'no' => __('NORWEGIAN', 'geodirectory'),
|
|
| 1233 | + 'pl' => __('POLISH', 'geodirectory'),
|
|
| 1234 | + 'pt' => __('PORTUGUESE', 'geodirectory'),
|
|
| 1235 | + 'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),
|
|
| 1236 | + 'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),
|
|
| 1237 | + 'ro' => __('ROMANIAN', 'geodirectory'),
|
|
| 1238 | + 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1239 | + 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1240 | + 'sk' => __('SLOVAK', 'geodirectory'),
|
|
| 1241 | + 'sl' => __('SLOVENIAN', 'geodirectory'),
|
|
| 1242 | + 'sr' => __('SERBIAN', 'geodirectory'),
|
|
| 1243 | + 'sv' => __(' SWEDISH', 'geodirectory'),
|
|
| 1244 | + 'tl' => __('TAGALOG', 'geodirectory'),
|
|
| 1245 | + 'ta' => __('TAMIL', 'geodirectory'),
|
|
| 1246 | + 'te' => __('TELUGU', 'geodirectory'),
|
|
| 1247 | + 'th' => __('THAI', 'geodirectory'),
|
|
| 1248 | + 'tr' => __('TURKISH', 'geodirectory'),
|
|
| 1249 | + 'uk' => __('UKRAINIAN', 'geodirectory'),
|
|
| 1250 | + 'vi' => __('VIETNAMESE', 'geodirectory'),
|
|
| 1251 | + 'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),
|
|
| 1252 | + 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),
|
|
| 1253 | + ); |
|
| 1254 | + $geodir_default_map_language = get_option('geodir_default_map_language');
|
|
| 1255 | + if (empty($geodir_default_map_language)) |
|
| 1256 | + $geodir_default_map_language = 'en'; |
|
| 1257 | + foreach ($arr_map_langages as $language_key => $language_txt) {
|
|
| 1258 | + if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) |
|
| 1259 | + $geodir_default_language_selected = "selected='selected'"; |
|
| 1260 | + else |
|
| 1261 | + $geodir_default_language_selected = ''; |
|
| 1262 | + |
|
| 1263 | + ?> |
|
| 1264 | 1264 | <option |
| 1265 | 1265 | value="<?php echo $language_key?>" <?php echo $geodir_default_language_selected; ?>><?php echo $language_txt; ?></option> |
| 1266 | 1266 | |
| 1267 | 1267 | <?php } |
| 1268 | - ?> |
|
| 1268 | + ?> |
|
| 1269 | 1269 | </select> |
| 1270 | 1270 | </td> |
| 1271 | 1271 | </tr> |
@@ -1276,46 +1276,46 @@ discard block |
||
| 1276 | 1276 | <td width="60%"> |
| 1277 | 1277 | <select name="geodir_default_map_search_pt" style="width:60%"> |
| 1278 | 1278 | <?php |
| 1279 | - $post_types = geodir_get_posttypes('array');
|
|
| 1280 | - $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');
|
|
| 1281 | - if (empty($geodir_default_map_search_pt)) |
|
| 1282 | - $geodir_default_map_search_pt = 'gd_place'; |
|
| 1283 | - if (is_array($post_types)) {
|
|
| 1284 | - foreach ($post_types as $key => $post_types_obj) {
|
|
| 1285 | - if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) |
|
| 1286 | - $geodir_search_pt_selected = "selected='selected'"; |
|
| 1287 | - else |
|
| 1288 | - $geodir_search_pt_selected = ''; |
|
| 1289 | - |
|
| 1290 | - ?> |
|
| 1279 | + $post_types = geodir_get_posttypes('array');
|
|
| 1280 | + $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');
|
|
| 1281 | + if (empty($geodir_default_map_search_pt)) |
|
| 1282 | + $geodir_default_map_search_pt = 'gd_place'; |
|
| 1283 | + if (is_array($post_types)) {
|
|
| 1284 | + foreach ($post_types as $key => $post_types_obj) {
|
|
| 1285 | + if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) |
|
| 1286 | + $geodir_search_pt_selected = "selected='selected'"; |
|
| 1287 | + else |
|
| 1288 | + $geodir_search_pt_selected = ''; |
|
| 1289 | + |
|
| 1290 | + ?> |
|
| 1291 | 1291 | <option |
| 1292 | 1292 | value="<?php echo $key?>" <?php echo $geodir_search_pt_selected; ?>><?php echo __($post_types_obj['labels']['singular_name'], 'geodirectory'); ?></option> |
| 1293 | 1293 | |
| 1294 | 1294 | <?php } |
| 1295 | 1295 | |
| 1296 | - } |
|
| 1296 | + } |
|
| 1297 | 1297 | |
| 1298 | - ?> |
|
| 1298 | + ?> |
|
| 1299 | 1299 | </select> |
| 1300 | 1300 | </td> |
| 1301 | 1301 | </tr> |
| 1302 | 1302 | |
| 1303 | 1303 | <?php |
| 1304 | - break; |
|
| 1304 | + break; |
|
| 1305 | 1305 | |
| 1306 | - case 'map': |
|
| 1307 | - ?> |
|
| 1306 | + case 'map': |
|
| 1307 | + ?> |
|
| 1308 | 1308 | <tr valign="top"> |
| 1309 | 1309 | <td class="forminp"> |
| 1310 | 1310 | <?php |
| 1311 | - global $post_cat, $cat_display; |
|
| 1312 | - $post_types = geodir_get_posttypes('object');
|
|
| 1313 | - $cat_display = 'checkbox'; |
|
| 1314 | - $gd_post_types = get_option('geodir_exclude_post_type_on_map');
|
|
| 1315 | - $gd_cats = get_option('geodir_exclude_cat_on_map');
|
|
| 1316 | - $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1317 | - $count = 1; |
|
| 1318 | - ?> |
|
| 1311 | + global $post_cat, $cat_display; |
|
| 1312 | + $post_types = geodir_get_posttypes('object');
|
|
| 1313 | + $cat_display = 'checkbox'; |
|
| 1314 | + $gd_post_types = get_option('geodir_exclude_post_type_on_map');
|
|
| 1315 | + $gd_cats = get_option('geodir_exclude_cat_on_map');
|
|
| 1316 | + $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1317 | + $count = 1; |
|
| 1318 | + ?> |
|
| 1319 | 1319 | <table width="70%" class="widefat"> |
| 1320 | 1320 | <thead> |
| 1321 | 1321 | <tr> |
@@ -1324,18 +1324,18 @@ discard block |
||
| 1324 | 1324 | <th><b><?php echo DESIGN_POST_TYPE_CAT; ?></b></th> |
| 1325 | 1325 | </tr> |
| 1326 | 1326 | <?php |
| 1327 | - $gd_categs = $gd_cats; |
|
| 1328 | - foreach ($post_types as $key => $post_types_obj) : |
|
| 1329 | - $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : ''; |
|
| 1330 | - $gd_taxonomy = geodir_get_taxonomies($key); |
|
| 1331 | - if ($gd_cats_upgrade) {
|
|
| 1332 | - $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : ''; |
|
| 1333 | - $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array(); |
|
| 1334 | - $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array(); |
|
| 1335 | - } |
|
| 1336 | - $post_cat = implode(',', $gd_cats);
|
|
| 1337 | - $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy); |
|
| 1338 | - ?> |
|
| 1327 | + $gd_categs = $gd_cats; |
|
| 1328 | + foreach ($post_types as $key => $post_types_obj) : |
|
| 1329 | + $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : ''; |
|
| 1330 | + $gd_taxonomy = geodir_get_taxonomies($key); |
|
| 1331 | + if ($gd_cats_upgrade) {
|
|
| 1332 | + $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : ''; |
|
| 1333 | + $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array(); |
|
| 1334 | + $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array(); |
|
| 1335 | + } |
|
| 1336 | + $post_cat = implode(',', $gd_cats);
|
|
| 1337 | + $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy); |
|
| 1338 | + ?> |
|
| 1339 | 1339 | <tr> |
| 1340 | 1340 | <td valign="top" width="5%"><?php echo $count; ?></td> |
| 1341 | 1341 | <td valign="top" width="25%" id="td_post_types"><input type="checkbox" |
@@ -1356,19 +1356,19 @@ discard block |
||
| 1356 | 1356 | </td> |
| 1357 | 1357 | </tr> |
| 1358 | 1358 | <?php |
| 1359 | - break; |
|
| 1359 | + break; |
|
| 1360 | 1360 | |
| 1361 | - case 'checkbox' : |
|
| 1361 | + case 'checkbox' : |
|
| 1362 | 1362 | |
| 1363 | - if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) : |
|
| 1364 | - ?> |
|
| 1363 | + if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) : |
|
| 1364 | + ?> |
|
| 1365 | 1365 | <tr valign="top"> |
| 1366 | 1366 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1367 | 1367 | <td class="forminp"> |
| 1368 | 1368 | <?php |
| 1369 | - endif; |
|
| 1369 | + endif; |
|
| 1370 | 1370 | |
| 1371 | - ?> |
|
| 1371 | + ?> |
|
| 1372 | 1372 | <fieldset> |
| 1373 | 1373 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
| 1374 | 1374 | <label for="<?php echo $value['id'] ?>"> |
@@ -1378,49 +1378,49 @@ discard block |
||
| 1378 | 1378 | </fieldset> |
| 1379 | 1379 | <?php |
| 1380 | 1380 | |
| 1381 | - if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) : |
|
| 1382 | - ?> |
|
| 1381 | + if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) : |
|
| 1382 | + ?> |
|
| 1383 | 1383 | </td> |
| 1384 | 1384 | </tr> |
| 1385 | 1385 | <?php |
| 1386 | - endif; |
|
| 1386 | + endif; |
|
| 1387 | 1387 | |
| 1388 | - break; |
|
| 1388 | + break; |
|
| 1389 | 1389 | |
| 1390 | - case 'radio' : |
|
| 1390 | + case 'radio' : |
|
| 1391 | 1391 | |
| 1392 | - if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) : |
|
| 1393 | - ?> |
|
| 1392 | + if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) : |
|
| 1393 | + ?> |
|
| 1394 | 1394 | <tr valign="top"> |
| 1395 | 1395 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1396 | 1396 | <td class="forminp"> |
| 1397 | 1397 | <?php |
| 1398 | - endif; |
|
| 1398 | + endif; |
|
| 1399 | 1399 | |
| 1400 | - ?> |
|
| 1400 | + ?> |
|
| 1401 | 1401 | <fieldset> |
| 1402 | 1402 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
| 1403 | 1403 | <label for="<?php echo $value['id'];?>"> |
| 1404 | 1404 | <input name="<?php echo esc_attr($value['id']); ?>" |
| 1405 | 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 | - echo 'checked="checked"'; |
|
| 1408 | - }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
| 1407 | + 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 |
| 1412 | 1412 | |
| 1413 | - if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) : |
|
| 1414 | - ?> |
|
| 1413 | + if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) : |
|
| 1414 | + ?> |
|
| 1415 | 1415 | </td> |
| 1416 | 1416 | </tr> |
| 1417 | 1417 | <?php |
| 1418 | - endif; |
|
| 1418 | + endif; |
|
| 1419 | 1419 | |
| 1420 | - break; |
|
| 1420 | + break; |
|
| 1421 | 1421 | |
| 1422 | - case 'textarea': |
|
| 1423 | - ?> |
|
| 1422 | + case 'textarea': |
|
| 1423 | + ?> |
|
| 1424 | 1424 | <tr valign="top"> |
| 1425 | 1425 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1426 | 1426 | <td class="forminp"> |
@@ -1433,30 +1433,30 @@ discard block |
||
| 1433 | 1433 | |
| 1434 | 1434 | </td> |
| 1435 | 1435 | </tr><?php |
| 1436 | - break; |
|
| 1436 | + break; |
|
| 1437 | 1437 | |
| 1438 | - case 'editor': |
|
| 1439 | - ?> |
|
| 1438 | + case 'editor': |
|
| 1439 | + ?> |
|
| 1440 | 1440 | <tr valign="top"> |
| 1441 | 1441 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1442 | 1442 | <td class="forminp"><?php |
| 1443 | - if (get_option($value['id'])) |
|
| 1444 | - $content = stripslashes(get_option($value['id'])); |
|
| 1445 | - else |
|
| 1446 | - $content = $value['std']; |
|
| 1443 | + if (get_option($value['id'])) |
|
| 1444 | + $content = stripslashes(get_option($value['id'])); |
|
| 1445 | + else |
|
| 1446 | + $content = $value['std']; |
|
| 1447 | 1447 | |
| 1448 | - $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
|
| 1448 | + $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
|
| 1449 | 1449 | |
| 1450 | - wp_editor($content, esc_attr($value['id']), $editor_settings); |
|
| 1450 | + wp_editor($content, esc_attr($value['id']), $editor_settings); |
|
| 1451 | 1451 | |
| 1452 | - ?> <span class="description"><?php echo $value['desc'] ?></span> |
|
| 1452 | + ?> <span class="description"><?php echo $value['desc'] ?></span> |
|
| 1453 | 1453 | |
| 1454 | 1454 | </td> |
| 1455 | 1455 | </tr><?php |
| 1456 | - break; |
|
| 1456 | + break; |
|
| 1457 | 1457 | |
| 1458 | - case 'single_select_page' : |
|
| 1459 | - // WPML |
|
| 1458 | + case 'single_select_page' : |
|
| 1459 | + // WPML |
|
| 1460 | 1460 | $switch_lang = false; |
| 1461 | 1461 | $disabled = ''; |
| 1462 | 1462 | if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {
|
@@ -1474,18 +1474,18 @@ discard block |
||
| 1474 | 1474 | // |
| 1475 | 1475 | $page_setting = (int)get_option($value['id']); |
| 1476 | 1476 | |
| 1477 | - $args = array('name' => $value['id'],
|
|
| 1478 | - 'id' => $value['id'], |
|
| 1479 | - 'sort_column' => 'menu_order', |
|
| 1480 | - 'sort_order' => 'ASC', |
|
| 1481 | - 'show_option_none' => ' ', |
|
| 1482 | - 'class' => $value['class'], |
|
| 1483 | - 'echo' => false, |
|
| 1484 | - 'selected' => $page_setting); |
|
| 1477 | + $args = array('name' => $value['id'],
|
|
| 1478 | + 'id' => $value['id'], |
|
| 1479 | + 'sort_column' => 'menu_order', |
|
| 1480 | + 'sort_order' => 'ASC', |
|
| 1481 | + 'show_option_none' => ' ', |
|
| 1482 | + 'class' => $value['class'], |
|
| 1483 | + 'echo' => false, |
|
| 1484 | + 'selected' => $page_setting); |
|
| 1485 | 1485 | |
| 1486 | - if (isset($value['args'])) $args = wp_parse_args($value['args'], $args); |
|
| 1486 | + if (isset($value['args'])) $args = wp_parse_args($value['args'], $args); |
|
| 1487 | 1487 | |
| 1488 | - ?> |
|
| 1488 | + ?> |
|
| 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"> |
@@ -1496,17 +1496,17 @@ discard block |
||
| 1496 | 1496 | if ($switch_lang) {
|
| 1497 | 1497 | $sitepress->switch_lang($switch_lang, true); |
| 1498 | 1498 | } |
| 1499 | - break; |
|
| 1500 | - case 'single_select_country' : |
|
| 1501 | - $country_setting = (string)get_option($value['id']); |
|
| 1502 | - if (strstr($country_setting, ':')) : |
|
| 1503 | - $country = current(explode(':', $country_setting));
|
|
| 1504 | - $state = end(explode(':', $country_setting));
|
|
| 1505 | - else : |
|
| 1506 | - $country = $country_setting; |
|
| 1507 | - $state = '*'; |
|
| 1508 | - endif; |
|
| 1509 | - ?> |
|
| 1499 | + break; |
|
| 1500 | + case 'single_select_country' : |
|
| 1501 | + $country_setting = (string)get_option($value['id']); |
|
| 1502 | + if (strstr($country_setting, ':')) : |
|
| 1503 | + $country = current(explode(':', $country_setting));
|
|
| 1504 | + $state = end(explode(':', $country_setting));
|
|
| 1505 | + else : |
|
| 1506 | + $country = $country_setting; |
|
| 1507 | + $state = '*'; |
|
| 1508 | + endif; |
|
| 1509 | + ?> |
|
| 1510 | 1510 | <tr valign="top"> |
| 1511 | 1511 | <th scope="rpw" class="titledesc"><?php echo $value['name'] ?></th> |
| 1512 | 1512 | <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>" |
@@ -1517,12 +1517,12 @@ discard block |
||
| 1517 | 1517 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1518 | 1518 | </td> |
| 1519 | 1519 | </tr><?php |
| 1520 | - break; |
|
| 1521 | - case 'multi_select_countries' : |
|
| 1522 | - $countries = $geodirectory->countries->countries; |
|
| 1523 | - asort($countries); |
|
| 1524 | - $selections = (array)get_option($value['id']); |
|
| 1525 | - ?> |
|
| 1520 | + break; |
|
| 1521 | + case 'multi_select_countries' : |
|
| 1522 | + $countries = $geodirectory->countries->countries; |
|
| 1523 | + asort($countries); |
|
| 1524 | + $selections = (array)get_option($value['id']); |
|
| 1525 | + ?> |
|
| 1526 | 1526 | <tr valign="top"> |
| 1527 | 1527 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1528 | 1528 | <td class="forminp"> |
@@ -1530,21 +1530,21 @@ discard block |
||
| 1530 | 1530 | data-placeholder="<?php _e('Choose countries…', 'geodirectory'); ?>"
|
| 1531 | 1531 | title="Country" class="chosen_select"> |
| 1532 | 1532 | <?php |
| 1533 | - if ($countries) foreach ($countries as $key => $val) : |
|
| 1534 | - echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1535 | - endforeach; |
|
| 1536 | - ?> |
|
| 1533 | + if ($countries) foreach ($countries as $key => $val) : |
|
| 1534 | + echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1535 | + endforeach; |
|
| 1536 | + ?> |
|
| 1537 | 1537 | </select> |
| 1538 | 1538 | </td> |
| 1539 | 1539 | </tr> |
| 1540 | 1540 | |
| 1541 | 1541 | <?php |
| 1542 | 1542 | |
| 1543 | - break; |
|
| 1543 | + break; |
|
| 1544 | 1544 | |
| 1545 | - case 'google_analytics' : |
|
| 1546 | - $selections = (array)get_option($value['id']); |
|
| 1547 | - ?> |
|
| 1545 | + case 'google_analytics' : |
|
| 1546 | + $selections = (array)get_option($value['id']); |
|
| 1547 | + ?> |
|
| 1548 | 1548 | <tr valign="top"> |
| 1549 | 1549 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1550 | 1550 | <td class="forminp"> |
@@ -1552,62 +1552,62 @@ discard block |
||
| 1552 | 1552 | |
| 1553 | 1553 | <?php |
| 1554 | 1554 | |
| 1555 | - $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
|
| 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";
|
|
| 1559 | - $response_type = "&response_type=code"; |
|
| 1560 | - $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 1561 | - $access_type = "&access_type=offline"; |
|
| 1562 | - $approval_prompt = "&approval_prompt=force"; |
|
| 1555 | + $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
|
| 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";
|
|
| 1559 | + $response_type = "&response_type=code"; |
|
| 1560 | + $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 1561 | + $access_type = "&access_type=offline"; |
|
| 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 | - if (get_option('geodir_ga_auth_token')) {
|
|
| 1568 | - ?> |
|
| 1567 | + if (get_option('geodir_ga_auth_token')) {
|
|
| 1568 | + ?> |
|
| 1569 | 1569 | <span class="button-primary" |
| 1570 | 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 | - global $gd_ga_errors; |
|
| 1574 | - if(!empty($gd_ga_errors)){
|
|
| 1575 | - print_r($gd_ga_errors); |
|
| 1576 | - } |
|
| 1577 | - } else {
|
|
| 1578 | - ?> |
|
| 1573 | + global $gd_ga_errors; |
|
| 1574 | + if(!empty($gd_ga_errors)){
|
|
| 1575 | + print_r($gd_ga_errors); |
|
| 1576 | + } |
|
| 1577 | + } else {
|
|
| 1578 | + ?> |
|
| 1579 | 1579 | <span class="button-primary" |
| 1580 | 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 | - } |
|
| 1583 | - ?> |
|
| 1582 | + } |
|
| 1583 | + ?> |
|
| 1584 | 1584 | </td> |
| 1585 | 1585 | </tr> |
| 1586 | 1586 | |
| 1587 | 1587 | <?php |
| 1588 | 1588 | |
| 1589 | 1589 | |
| 1590 | - break; |
|
| 1590 | + break; |
|
| 1591 | 1591 | |
| 1592 | - case 'field_seperator' : |
|
| 1592 | + case 'field_seperator' : |
|
| 1593 | 1593 | |
| 1594 | - ?> |
|
| 1594 | + ?> |
|
| 1595 | 1595 | <tr valign="top"> |
| 1596 | 1596 | <td colspan="2" class="forminp geodir_line_seperator"></td> |
| 1597 | 1597 | </tr> |
| 1598 | 1598 | <?php |
| 1599 | 1599 | |
| 1600 | - break; |
|
| 1600 | + break; |
|
| 1601 | 1601 | |
| 1602 | - endswitch; |
|
| 1602 | + endswitch; |
|
| 1603 | 1603 | |
| 1604 | - endforeach; |
|
| 1604 | + endforeach; |
|
| 1605 | 1605 | |
| 1606 | - if ($first_title === false) {
|
|
| 1607 | - echo "</div>"; |
|
| 1608 | - } |
|
| 1606 | + if ($first_title === false) {
|
|
| 1607 | + echo "</div>"; |
|
| 1608 | + } |
|
| 1609 | 1609 | |
| 1610 | - ?> |
|
| 1610 | + ?> |
|
| 1611 | 1611 | |
| 1612 | 1612 | <script type="text/javascript"> |
| 1613 | 1613 | |
@@ -1667,33 +1667,33 @@ discard block |
||
| 1667 | 1667 | */ |
| 1668 | 1668 | function geodir_post_info_setting() |
| 1669 | 1669 | {
|
| 1670 | - global $post, $post_id; |
|
| 1671 | - |
|
| 1672 | - $post_type = get_post_type(); |
|
| 1673 | - |
|
| 1674 | - $package_info = array(); |
|
| 1675 | - |
|
| 1676 | - $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1677 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename'); |
|
| 1678 | - echo '<div id="geodir_wrapper">'; |
|
| 1679 | - /** |
|
| 1680 | - * Called before the GD custom fields are output in the wp-admin area. |
|
| 1681 | - * |
|
| 1682 | - * @since 1.0.0 |
|
| 1683 | - * @see 'geodir_after_default_field_in_meta_box' |
|
| 1684 | - */ |
|
| 1685 | - do_action('geodir_before_default_field_in_meta_box');
|
|
| 1686 | - //geodir_get_custom_fields_html($package_info->pid,'default',$post_type); |
|
| 1687 | - // to display all fields in one information box |
|
| 1688 | - geodir_get_custom_fields_html($package_info->pid, 'all', $post_type); |
|
| 1689 | - /** |
|
| 1690 | - * Called after the GD custom fields are output in the wp-admin area. |
|
| 1691 | - * |
|
| 1692 | - * @since 1.0.0 |
|
| 1693 | - * @see 'geodir_before_default_field_in_meta_box' |
|
| 1694 | - */ |
|
| 1695 | - do_action('geodir_after_default_field_in_meta_box');
|
|
| 1696 | - echo '</div>'; |
|
| 1670 | + global $post, $post_id; |
|
| 1671 | + |
|
| 1672 | + $post_type = get_post_type(); |
|
| 1673 | + |
|
| 1674 | + $package_info = array(); |
|
| 1675 | + |
|
| 1676 | + $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1677 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename'); |
|
| 1678 | + echo '<div id="geodir_wrapper">'; |
|
| 1679 | + /** |
|
| 1680 | + * Called before the GD custom fields are output in the wp-admin area. |
|
| 1681 | + * |
|
| 1682 | + * @since 1.0.0 |
|
| 1683 | + * @see 'geodir_after_default_field_in_meta_box' |
|
| 1684 | + */ |
|
| 1685 | + do_action('geodir_before_default_field_in_meta_box');
|
|
| 1686 | + //geodir_get_custom_fields_html($package_info->pid,'default',$post_type); |
|
| 1687 | + // to display all fields in one information box |
|
| 1688 | + geodir_get_custom_fields_html($package_info->pid, 'all', $post_type); |
|
| 1689 | + /** |
|
| 1690 | + * Called after the GD custom fields are output in the wp-admin area. |
|
| 1691 | + * |
|
| 1692 | + * @since 1.0.0 |
|
| 1693 | + * @see 'geodir_before_default_field_in_meta_box' |
|
| 1694 | + */ |
|
| 1695 | + do_action('geodir_after_default_field_in_meta_box');
|
|
| 1696 | + echo '</div>'; |
|
| 1697 | 1697 | } |
| 1698 | 1698 | |
| 1699 | 1699 | /** |
@@ -1706,18 +1706,18 @@ discard block |
||
| 1706 | 1706 | */ |
| 1707 | 1707 | function geodir_post_addinfo_setting() |
| 1708 | 1708 | {
|
| 1709 | - global $post, $post_id; |
|
| 1709 | + global $post, $post_id; |
|
| 1710 | 1710 | |
| 1711 | - $post_type = get_post_type(); |
|
| 1711 | + $post_type = get_post_type(); |
|
| 1712 | 1712 | |
| 1713 | - $package_info = array(); |
|
| 1713 | + $package_info = array(); |
|
| 1714 | 1714 | |
| 1715 | - $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1715 | + $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1716 | 1716 | |
| 1717 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename'); |
|
| 1718 | - echo '<div id="geodir_wrapper">'; |
|
| 1719 | - geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type); |
|
| 1720 | - echo '</div>'; |
|
| 1717 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename'); |
|
| 1718 | + echo '<div id="geodir_wrapper">'; |
|
| 1719 | + geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type); |
|
| 1720 | + echo '</div>'; |
|
| 1721 | 1721 | |
| 1722 | 1722 | } |
| 1723 | 1723 | |
@@ -1731,60 +1731,60 @@ discard block |
||
| 1731 | 1731 | */ |
| 1732 | 1732 | function geodir_post_attachments() |
| 1733 | 1733 | {
|
| 1734 | - global $post, $post_id; |
|
| 1734 | + global $post, $post_id; |
|
| 1735 | 1735 | |
| 1736 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
|
| 1736 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
|
| 1737 | 1737 | |
| 1738 | - if (geodir_get_featured_image($post_id, 'thumbnail')) {
|
|
| 1739 | - echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
|
|
| 1740 | - geodir_show_featured_image($post_id, 'thumbnail'); |
|
| 1741 | - } |
|
| 1738 | + if (geodir_get_featured_image($post_id, 'thumbnail')) {
|
|
| 1739 | + echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
|
|
| 1740 | + geodir_show_featured_image($post_id, 'thumbnail'); |
|
| 1741 | + } |
|
| 1742 | 1742 | |
| 1743 | - $image_limit = 0; |
|
| 1743 | + $image_limit = 0; |
|
| 1744 | 1744 | |
| 1745 | - ?> |
|
| 1745 | + ?> |
|
| 1746 | 1746 | |
| 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>';
|
|
| 1751 | - } ?> |
|
| 1750 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 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>';
|
|
| 1754 | - } ?> |
|
| 1753 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 1754 | + } ?> |
|
| 1755 | 1755 | <?php if ($image_limit == 0) {
|
| 1756 | - echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 1757 | - } ?> |
|
| 1756 | + echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 1757 | + } ?> |
|
| 1758 | 1758 | </h5> |
| 1759 | 1759 | |
| 1760 | 1760 | |
| 1761 | 1761 | <?php |
| 1762 | 1762 | |
| 1763 | - $curImages = geodir_get_images($post_id); |
|
| 1764 | - $place_img_array = array(); |
|
| 1763 | + $curImages = geodir_get_images($post_id); |
|
| 1764 | + $place_img_array = array(); |
|
| 1765 | 1765 | |
| 1766 | - if (!empty($curImages)): |
|
| 1767 | - foreach ($curImages as $p_img): |
|
| 1768 | - $place_img_array[] = $p_img->src; |
|
| 1769 | - endforeach; |
|
| 1770 | - endif; |
|
| 1766 | + if (!empty($curImages)): |
|
| 1767 | + foreach ($curImages as $p_img): |
|
| 1768 | + $place_img_array[] = $p_img->src; |
|
| 1769 | + endforeach; |
|
| 1770 | + endif; |
|
| 1771 | 1771 | |
| 1772 | - if (!empty($place_img_array)) |
|
| 1773 | - $curImages = implode(',', $place_img_array);
|
|
| 1772 | + if (!empty($place_img_array)) |
|
| 1773 | + $curImages = implode(',', $place_img_array);
|
|
| 1774 | 1774 | |
| 1775 | 1775 | |
| 1776 | - // adjust values here |
|
| 1777 | - $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls |
|
| 1776 | + // adjust values here |
|
| 1777 | + $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls |
|
| 1778 | 1778 | |
| 1779 | - $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
| 1779 | + $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
| 1780 | 1780 | |
| 1781 | - $multiple = true; // allow multiple files upload |
|
| 1781 | + $multiple = true; // allow multiple files upload |
|
| 1782 | 1782 | |
| 1783 | - $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
| 1783 | + $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
| 1784 | 1784 | |
| 1785 | - $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
| 1785 | + $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
| 1786 | 1786 | |
| 1787 | - ?> |
|
| 1787 | + ?> |
|
| 1788 | 1788 | |
| 1789 | 1789 | <div class="gtd-form_row clearfix" id="<?php echo $id; ?>dropbox" style="border:1px solid #999999;padding:5px;text-align:center;"> |
| 1790 | 1790 | <input type="hidden" name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="<?php echo $svalue; ?>"/> |
@@ -1826,13 +1826,13 @@ discard block |
||
| 1826 | 1826 | */ |
| 1827 | 1827 | function geodir_action_post_updated($post_ID, $post_after, $post_before) |
| 1828 | 1828 | {
|
| 1829 | - $post_type = get_post_type($post_ID); |
|
| 1829 | + $post_type = get_post_type($post_ID); |
|
| 1830 | 1830 | |
| 1831 | - if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1832 | - if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {
|
|
| 1833 | - geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title); |
|
| 1834 | - } |
|
| 1835 | - } |
|
| 1831 | + if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1832 | + if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {
|
|
| 1833 | + geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title); |
|
| 1834 | + } |
|
| 1835 | + } |
|
| 1836 | 1836 | } |
| 1837 | 1837 | |
| 1838 | 1838 | /** |
@@ -1847,39 +1847,39 @@ discard block |
||
| 1847 | 1847 | */ |
| 1848 | 1848 | function geodir_notification_add_bcc_option($settings) |
| 1849 | 1849 | {
|
| 1850 | - if (!empty($settings)) {
|
|
| 1851 | - $new_settings = array(); |
|
| 1852 | - foreach ($settings as $setting) {
|
|
| 1853 | - if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {
|
|
| 1854 | - $geodir_bcc_listing_published_yes = array( |
|
| 1855 | - 'name' => __('Listing published', 'geodirectory'),
|
|
| 1856 | - 'desc' => __('Yes', 'geodirectory'),
|
|
| 1857 | - 'id' => 'geodir_bcc_listing_published', |
|
| 1858 | - 'std' => 'yes', |
|
| 1859 | - 'type' => 'radio', |
|
| 1860 | - 'value' => '1', |
|
| 1861 | - 'radiogroup' => 'start' |
|
| 1862 | - ); |
|
| 1863 | - |
|
| 1864 | - $geodir_bcc_listing_published_no = array( |
|
| 1865 | - 'name' => __('Listing published', 'geodirectory'),
|
|
| 1866 | - 'desc' => __('No', 'geodirectory'),
|
|
| 1867 | - 'id' => 'geodir_bcc_listing_published', |
|
| 1868 | - 'std' => 'yes', |
|
| 1869 | - 'type' => 'radio', |
|
| 1870 | - 'value' => '0', |
|
| 1871 | - 'radiogroup' => 'end' |
|
| 1872 | - ); |
|
| 1873 | - |
|
| 1874 | - $new_settings[] = $geodir_bcc_listing_published_yes; |
|
| 1875 | - $new_settings[] = $geodir_bcc_listing_published_no; |
|
| 1876 | - } |
|
| 1877 | - $new_settings[] = $setting; |
|
| 1878 | - } |
|
| 1879 | - $settings = $new_settings; |
|
| 1880 | - } |
|
| 1850 | + if (!empty($settings)) {
|
|
| 1851 | + $new_settings = array(); |
|
| 1852 | + foreach ($settings as $setting) {
|
|
| 1853 | + if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {
|
|
| 1854 | + $geodir_bcc_listing_published_yes = array( |
|
| 1855 | + 'name' => __('Listing published', 'geodirectory'),
|
|
| 1856 | + 'desc' => __('Yes', 'geodirectory'),
|
|
| 1857 | + 'id' => 'geodir_bcc_listing_published', |
|
| 1858 | + 'std' => 'yes', |
|
| 1859 | + 'type' => 'radio', |
|
| 1860 | + 'value' => '1', |
|
| 1861 | + 'radiogroup' => 'start' |
|
| 1862 | + ); |
|
| 1863 | + |
|
| 1864 | + $geodir_bcc_listing_published_no = array( |
|
| 1865 | + 'name' => __('Listing published', 'geodirectory'),
|
|
| 1866 | + 'desc' => __('No', 'geodirectory'),
|
|
| 1867 | + 'id' => 'geodir_bcc_listing_published', |
|
| 1868 | + 'std' => 'yes', |
|
| 1869 | + 'type' => 'radio', |
|
| 1870 | + 'value' => '0', |
|
| 1871 | + 'radiogroup' => 'end' |
|
| 1872 | + ); |
|
| 1873 | + |
|
| 1874 | + $new_settings[] = $geodir_bcc_listing_published_yes; |
|
| 1875 | + $new_settings[] = $geodir_bcc_listing_published_no; |
|
| 1876 | + } |
|
| 1877 | + $new_settings[] = $setting; |
|
| 1878 | + } |
|
| 1879 | + $settings = $new_settings; |
|
| 1880 | + } |
|
| 1881 | 1881 | |
| 1882 | - return $settings; |
|
| 1882 | + return $settings; |
|
| 1883 | 1883 | } |
| 1884 | 1884 | |
| 1885 | 1885 | |
@@ -1894,19 +1894,19 @@ discard block |
||
| 1894 | 1894 | */ |
| 1895 | 1895 | function get_gd_theme_compat_callback() |
| 1896 | 1896 | {
|
| 1897 | - global $wpdb; |
|
| 1898 | - $themes = get_option('gd_theme_compats');
|
|
| 1899 | - |
|
| 1900 | - if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {
|
|
| 1901 | - if (isset($_POST['export'])) {
|
|
| 1902 | - echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']])); |
|
| 1903 | - } else {
|
|
| 1904 | - echo json_encode($themes[$_POST['theme']]); |
|
| 1905 | - } |
|
| 1897 | + global $wpdb; |
|
| 1898 | + $themes = get_option('gd_theme_compats');
|
|
| 1906 | 1899 | |
| 1907 | - } |
|
| 1900 | + if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {
|
|
| 1901 | + if (isset($_POST['export'])) {
|
|
| 1902 | + echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']])); |
|
| 1903 | + } else {
|
|
| 1904 | + echo json_encode($themes[$_POST['theme']]); |
|
| 1905 | + } |
|
| 1906 | + |
|
| 1907 | + } |
|
| 1908 | 1908 | |
| 1909 | - die(); |
|
| 1909 | + die(); |
|
| 1910 | 1910 | } |
| 1911 | 1911 | |
| 1912 | 1912 | add_action('wp_ajax_get_gd_theme_compat_import_callback', 'get_gd_theme_compat_import_callback');
|
@@ -1920,20 +1920,20 @@ discard block |
||
| 1920 | 1920 | */ |
| 1921 | 1921 | function get_gd_theme_compat_import_callback() |
| 1922 | 1922 | {
|
| 1923 | - global $wpdb; |
|
| 1924 | - $themes = get_option('gd_theme_compats');
|
|
| 1925 | - if (isset($_POST['theme']) && !empty($_POST['theme'])) {
|
|
| 1926 | - $json = json_decode(stripslashes($_POST['theme']), true); |
|
| 1927 | - if (!empty($json) && is_array($json)) {
|
|
| 1928 | - $key = sanitize_text_field(key($json)); |
|
| 1929 | - $themes[$key] = $json[$key]; |
|
| 1930 | - update_option('gd_theme_compats', $themes);
|
|
| 1931 | - echo $key; |
|
| 1932 | - die(); |
|
| 1933 | - } |
|
| 1934 | - } |
|
| 1935 | - echo '0'; |
|
| 1936 | - die(); |
|
| 1923 | + global $wpdb; |
|
| 1924 | + $themes = get_option('gd_theme_compats');
|
|
| 1925 | + if (isset($_POST['theme']) && !empty($_POST['theme'])) {
|
|
| 1926 | + $json = json_decode(stripslashes($_POST['theme']), true); |
|
| 1927 | + if (!empty($json) && is_array($json)) {
|
|
| 1928 | + $key = sanitize_text_field(key($json)); |
|
| 1929 | + $themes[$key] = $json[$key]; |
|
| 1930 | + update_option('gd_theme_compats', $themes);
|
|
| 1931 | + echo $key; |
|
| 1932 | + die(); |
|
| 1933 | + } |
|
| 1934 | + } |
|
| 1935 | + echo '0'; |
|
| 1936 | + die(); |
|
| 1937 | 1937 | } |
| 1938 | 1938 | |
| 1939 | 1939 | |
@@ -1946,39 +1946,39 @@ discard block |
||
| 1946 | 1946 | */ |
| 1947 | 1947 | function gd_set_theme_compat() |
| 1948 | 1948 | {
|
| 1949 | - global $wpdb; |
|
| 1950 | - $theme = wp_get_theme(); |
|
| 1949 | + global $wpdb; |
|
| 1950 | + $theme = wp_get_theme(); |
|
| 1951 | 1951 | |
| 1952 | - if ($theme->parent()) {
|
|
| 1953 | - $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));
|
|
| 1954 | - } else {
|
|
| 1955 | - $theme_name = str_replace(" ", "_", $theme->get('Name'));
|
|
| 1956 | - } |
|
| 1952 | + if ($theme->parent()) {
|
|
| 1953 | + $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));
|
|
| 1954 | + } else {
|
|
| 1955 | + $theme_name = str_replace(" ", "_", $theme->get('Name'));
|
|
| 1956 | + } |
|
| 1957 | 1957 | |
| 1958 | - $theme_compats = get_option('gd_theme_compats');
|
|
| 1959 | - $current_compat = get_option('gd_theme_compat');
|
|
| 1960 | - $current_compat = str_replace("_custom", "", $current_compat);
|
|
| 1958 | + $theme_compats = get_option('gd_theme_compats');
|
|
| 1959 | + $current_compat = get_option('gd_theme_compat');
|
|
| 1960 | + $current_compat = str_replace("_custom", "", $current_compat);
|
|
| 1961 | 1961 | |
| 1962 | - if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) {
|
|
| 1963 | - return; |
|
| 1964 | - }// if already running correct compat then bail |
|
| 1962 | + if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) {
|
|
| 1963 | + return; |
|
| 1964 | + }// if already running correct compat then bail |
|
| 1965 | 1965 | |
| 1966 | - if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it
|
|
| 1967 | - update_option('gd_theme_compat', $theme_name);
|
|
| 1968 | - update_option('theme_compatibility_setting', $theme_compats[$theme_name]);
|
|
| 1966 | + if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it
|
|
| 1967 | + update_option('gd_theme_compat', $theme_name);
|
|
| 1968 | + update_option('theme_compatibility_setting', $theme_compats[$theme_name]);
|
|
| 1969 | 1969 | |
| 1970 | - // if there are default options to set then set them |
|
| 1971 | - if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {
|
|
| 1970 | + // if there are default options to set then set them |
|
| 1971 | + if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {
|
|
| 1972 | 1972 | |
| 1973 | - foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {
|
|
| 1974 | - update_option($key, $val); |
|
| 1975 | - } |
|
| 1976 | - } |
|
| 1973 | + foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {
|
|
| 1974 | + update_option($key, $val); |
|
| 1975 | + } |
|
| 1976 | + } |
|
| 1977 | 1977 | |
| 1978 | - } else {
|
|
| 1979 | - update_option('gd_theme_compat', '');
|
|
| 1980 | - update_option('theme_compatibility_setting', '');
|
|
| 1981 | - } |
|
| 1978 | + } else {
|
|
| 1979 | + update_option('gd_theme_compat', '');
|
|
| 1980 | + update_option('theme_compatibility_setting', '');
|
|
| 1981 | + } |
|
| 1982 | 1982 | |
| 1983 | 1983 | |
| 1984 | 1984 | } |
@@ -1993,9 +1993,9 @@ discard block |
||
| 1993 | 1993 | */ |
| 1994 | 1994 | function gd_check_avada_compat() |
| 1995 | 1995 | {
|
| 1996 | - if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {
|
|
| 1997 | - add_action('admin_notices', 'gd_avada_compat_warning');
|
|
| 1998 | - } |
|
| 1996 | + if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {
|
|
| 1997 | + add_action('admin_notices', 'gd_avada_compat_warning');
|
|
| 1998 | + } |
|
| 1999 | 1999 | } |
| 2000 | 2000 | |
| 2001 | 2001 | |
@@ -2008,22 +2008,22 @@ discard block |
||
| 2008 | 2008 | function gd_avada_compat_warning() |
| 2009 | 2009 | {
|
| 2010 | 2010 | |
| 2011 | - /* |
|
| 2011 | + /* |
|
| 2012 | 2012 | $msg_type = error |
| 2013 | 2013 | $msg_type = updated fade |
| 2014 | 2014 | $msg_type = update-nag |
| 2015 | 2015 | */ |
| 2016 | 2016 | |
| 2017 | - $plugin = 'avada-nag'; |
|
| 2018 | - $timestamp = 'avada-nag1234'; |
|
| 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' > ";
|
|
| 2023 | - echo "<p>$message</p>"; |
|
| 2024 | - echo "</div>"; |
|
| 2017 | + $plugin = 'avada-nag'; |
|
| 2018 | + $timestamp = 'avada-nag1234'; |
|
| 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' > ";
|
|
| 2023 | + echo "<p>$message</p>"; |
|
| 2024 | + echo "</div>"; |
|
| 2025 | 2025 | |
| 2026 | - ?> |
|
| 2026 | + ?> |
|
| 2027 | 2027 | <script> |
| 2028 | 2028 | function gdRemoveANotification($plugin, $timestamp) {
|
| 2029 | 2029 | |
@@ -2091,10 +2091,10 @@ discard block |
||
| 2091 | 2091 | */ |
| 2092 | 2092 | function geodir_avada_remove_notification() |
| 2093 | 2093 | {
|
| 2094 | - update_option('avada_nag', TRUE);
|
|
| 2094 | + update_option('avada_nag', TRUE);
|
|
| 2095 | 2095 | |
| 2096 | - // Always die in functions echoing ajax content |
|
| 2097 | - die(); |
|
| 2096 | + // Always die in functions echoing ajax content |
|
| 2097 | + die(); |
|
| 2098 | 2098 | } |
| 2099 | 2099 | |
| 2100 | 2100 | |
@@ -2116,9 +2116,9 @@ discard block |
||
| 2116 | 2116 | global $post, $typenow, $current_screen; |
| 2117 | 2117 | |
| 2118 | 2118 | $post_type = NULL; |
| 2119 | - if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) |
|
| 2119 | + if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) |
|
| 2120 | 2120 | $post_type = get_post_type($_REQUEST['post']); |
| 2121 | - elseif ($post && isset($post->post_type)) |
|
| 2121 | + elseif ($post && isset($post->post_type)) |
|
| 2122 | 2122 | $post_type = $post->post_type; |
| 2123 | 2123 | elseif ($typenow) |
| 2124 | 2124 | $post_type = $typenow; |
@@ -2153,7 +2153,7 @@ discard block |
||
| 2153 | 2153 | // Don't allow same slug url for listing and location |
| 2154 | 2154 | if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {
|
| 2155 | 2155 | $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');
|
| 2156 | - wp_redirect($redirect_url); |
|
| 2156 | + wp_redirect($redirect_url); |
|
| 2157 | 2157 | exit; |
| 2158 | 2158 | } |
| 2159 | 2159 | |
@@ -2183,10 +2183,10 @@ discard block |
||
| 2183 | 2183 | * @package GeoDirectory |
| 2184 | 2184 | */ |
| 2185 | 2185 | function geodir_hide_admin_preview_button() {
|
| 2186 | - global $post_type; |
|
| 2187 | - $post_types = geodir_get_posttypes(); |
|
| 2188 | - if(in_array($post_type, $post_types)) |
|
| 2189 | - echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
|
| 2186 | + global $post_type; |
|
| 2187 | + $post_types = geodir_get_posttypes(); |
|
| 2188 | + if(in_array($post_type, $post_types)) |
|
| 2189 | + echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
|
| 2190 | 2190 | } |
| 2191 | 2191 | add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' ); |
| 2192 | 2192 | add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' ); |
@@ -2201,7 +2201,7 @@ discard block |
||
| 2201 | 2201 | */ |
| 2202 | 2202 | function geodir_import_export_tab( $tabs ) {
|
| 2203 | 2203 | $tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) ); |
| 2204 | - return $tabs; |
|
| 2204 | + return $tabs; |
|
| 2205 | 2205 | } |
| 2206 | 2206 | |
| 2207 | 2207 | /** |
@@ -2216,26 +2216,26 @@ discard block |
||
| 2216 | 2216 | function geodir_import_export_page() {
|
| 2217 | 2217 | $nonce = wp_create_nonce( 'geodir_import_export_nonce' ); |
| 2218 | 2218 | $gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv'; |
| 2219 | - /** |
|
| 2220 | - * Filter sample category data csv file url. |
|
| 2221 | - * |
|
| 2222 | - * @since 1.0.0 |
|
| 2223 | - * @package GeoDirectory |
|
| 2224 | - * |
|
| 2225 | - * @param string $gd_cats_sample_csv Sample category data csv file url. |
|
| 2226 | - */ |
|
| 2219 | + /** |
|
| 2220 | + * Filter sample category data csv file url. |
|
| 2221 | + * |
|
| 2222 | + * @since 1.0.0 |
|
| 2223 | + * @package GeoDirectory |
|
| 2224 | + * |
|
| 2225 | + * @param string $gd_cats_sample_csv Sample category data csv file url. |
|
| 2226 | + */ |
|
| 2227 | 2227 | $gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv ); |
| 2228 | 2228 | |
| 2229 | 2229 | $gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv'; |
| 2230 | - /** |
|
| 2231 | - * Filter sample post data csv file url. |
|
| 2232 | - * |
|
| 2233 | - * @since 1.0.0 |
|
| 2234 | - * @package GeoDirectory |
|
| 2235 | - * |
|
| 2236 | - * @param string $gd_posts_sample_csv Sample post data csv file url. |
|
| 2237 | - */ |
|
| 2238 | - $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
| 2230 | + /** |
|
| 2231 | + * Filter sample post data csv file url. |
|
| 2232 | + * |
|
| 2233 | + * @since 1.0.0 |
|
| 2234 | + * @package GeoDirectory |
|
| 2235 | + * |
|
| 2236 | + * @param string $gd_posts_sample_csv Sample post data csv file url. |
|
| 2237 | + */ |
|
| 2238 | + $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
| 2239 | 2239 | |
| 2240 | 2240 | $gd_posttypes = geodir_get_posttypes( 'array' ); |
| 2241 | 2241 | |
@@ -2258,14 +2258,14 @@ discard block |
||
| 2258 | 2258 | $gd_chunksize_options[100000] = 100000; |
| 2259 | 2259 | |
| 2260 | 2260 | /** |
| 2261 | - * Filter max entries per export csv file. |
|
| 2262 | - * |
|
| 2263 | - * @since 1.5.6 |
|
| 2264 | - * @package GeoDirectory |
|
| 2265 | - * |
|
| 2266 | - * @param string $gd_chunksize_options Entries options. |
|
| 2267 | - */ |
|
| 2268 | - $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options ); |
|
| 2261 | + * Filter max entries per export csv file. |
|
| 2262 | + * |
|
| 2263 | + * @since 1.5.6 |
|
| 2264 | + * @package GeoDirectory |
|
| 2265 | + * |
|
| 2266 | + * @param string $gd_chunksize_options Entries options. |
|
| 2267 | + */ |
|
| 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) {
|
@@ -2282,12 +2282,12 @@ discard block |
||
| 2282 | 2282 | <div class="gd-content-heading"> |
| 2283 | 2283 | |
| 2284 | 2284 | <?php |
| 2285 | - ini_set('max_execution_time', 999999);
|
|
| 2286 | - $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
| 2287 | - ini_restore('max_execution_time');
|
|
| 2285 | + ini_set('max_execution_time', 999999);
|
|
| 2286 | + $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
| 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
|
|
| 2290 | - ?> |
|
| 2289 | + if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
|
|
| 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"> |
@@ -2462,7 +2462,7 @@ discard block |
||
| 2462 | 2462 | * Called just after the sample CSV download link. |
| 2463 | 2463 | * |
| 2464 | 2464 | * @since 1.0.0 |
| 2465 | - * @package GeoDirectory |
|
| 2465 | + * @package GeoDirectory |
|
| 2466 | 2466 | */ |
| 2467 | 2467 | do_action('geodir_sample_cats_csv_download_link');
|
| 2468 | 2468 | ?> |
@@ -2547,11 +2547,11 @@ discard block |
||
| 2547 | 2547 | * |
| 2548 | 2548 | * Called after the last setting on the GD > Import & Export page. |
| 2549 | 2549 | * @since 1.4.6 |
| 2550 | - * @package GeoDirectory |
|
| 2550 | + * @package GeoDirectory |
|
| 2551 | 2551 | * |
| 2552 | 2552 | * @param array $gd_posttypes GD post types. |
| 2553 | - * @param array $gd_chunksize_options File chunk size options. |
|
| 2554 | - * @param string $nonce Wordpress security token for GD import & export. |
|
| 2553 | + * @param array $gd_chunksize_options File chunk size options. |
|
| 2554 | + * @param string $nonce Wordpress security token for GD import & export. |
|
| 2555 | 2555 | */ |
| 2556 | 2556 | do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce ); |
| 2557 | 2557 | ?> |
@@ -3238,44 +3238,44 @@ discard block |
||
| 3238 | 3238 | function geodir_init_filesystem() |
| 3239 | 3239 | {
|
| 3240 | 3240 | |
| 3241 | - if(!function_exists('get_filesystem_method')){
|
|
| 3242 | - require_once(ABSPATH."/wp-admin/includes/file.php"); |
|
| 3243 | - } |
|
| 3244 | - $access_type = get_filesystem_method(); |
|
| 3245 | - if ($access_type === 'direct') {
|
|
| 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()); |
|
| 3248 | - |
|
| 3249 | - /* initialize the API */ |
|
| 3250 | - if (!WP_Filesystem($creds)) {
|
|
| 3251 | - /* any problems and we exit */ |
|
| 3252 | - //return '@@@3'; |
|
| 3253 | - return false; |
|
| 3254 | - } |
|
| 3241 | + if(!function_exists('get_filesystem_method')){
|
|
| 3242 | + require_once(ABSPATH."/wp-admin/includes/file.php"); |
|
| 3243 | + } |
|
| 3244 | + $access_type = get_filesystem_method(); |
|
| 3245 | + if ($access_type === 'direct') {
|
|
| 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()); |
|
| 3248 | + |
|
| 3249 | + /* initialize the API */ |
|
| 3250 | + if (!WP_Filesystem($creds)) {
|
|
| 3251 | + /* any problems and we exit */ |
|
| 3252 | + //return '@@@3'; |
|
| 3253 | + return false; |
|
| 3254 | + } |
|
| 3255 | 3255 | |
| 3256 | - global $wp_filesystem; |
|
| 3257 | - return $wp_filesystem; |
|
| 3258 | - /* do our file manipulations below */ |
|
| 3259 | - } elseif (defined('FTP_USER')) {
|
|
| 3260 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3256 | + global $wp_filesystem; |
|
| 3257 | + return $wp_filesystem; |
|
| 3258 | + /* do our file manipulations below */ |
|
| 3259 | + } elseif (defined('FTP_USER')) {
|
|
| 3260 | + $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3261 | + |
|
| 3262 | + /* initialize the API */ |
|
| 3263 | + if (!WP_Filesystem($creds)) {
|
|
| 3264 | + /* any problems and we exit */ |
|
| 3265 | + //return '@@@33'; |
|
| 3266 | + return false; |
|
| 3267 | + } |
|
| 3261 | 3268 | |
| 3262 | - /* initialize the API */ |
|
| 3263 | - if (!WP_Filesystem($creds)) {
|
|
| 3264 | - /* any problems and we exit */ |
|
| 3265 | - //return '@@@33'; |
|
| 3266 | - return false; |
|
| 3267 | - } |
|
| 3269 | + global $wp_filesystem; |
|
| 3270 | + //return '@@@1'; |
|
| 3271 | + return $wp_filesystem; |
|
| 3268 | 3272 | |
| 3269 | - global $wp_filesystem; |
|
| 3270 | - //return '@@@1'; |
|
| 3271 | - return $wp_filesystem; |
|
| 3272 | - |
|
| 3273 | - } else {
|
|
| 3274 | - //return '@@@2'; |
|
| 3275 | - /* don't have direct write access. Prompt user with our notice */ |
|
| 3276 | - add_action('admin_notice', 'geodir_filesystem_notice');
|
|
| 3277 | - return false; |
|
| 3278 | - } |
|
| 3273 | + } else {
|
|
| 3274 | + //return '@@@2'; |
|
| 3275 | + /* don't have direct write access. Prompt user with our notice */ |
|
| 3276 | + add_action('admin_notice', 'geodir_filesystem_notice');
|
|
| 3277 | + return false; |
|
| 3278 | + } |
|
| 3279 | 3279 | |
| 3280 | 3280 | } |
| 3281 | 3281 | |
@@ -3293,10 +3293,10 @@ discard block |
||
| 3293 | 3293 | */ |
| 3294 | 3294 | function geodir_filesystem_notice() |
| 3295 | 3295 | { if ( defined( 'DOING_AJAX' ) ){return;}
|
| 3296 | - $access_type = get_filesystem_method(); |
|
| 3297 | - if ($access_type === 'direct') {
|
|
| 3298 | - } elseif (!defined('FTP_USER')) {
|
|
| 3299 | - ?> |
|
| 3296 | + $access_type = get_filesystem_method(); |
|
| 3297 | + if ($access_type === 'direct') {
|
|
| 3298 | + } elseif (!defined('FTP_USER')) {
|
|
| 3299 | + ?> |
|
| 3300 | 3300 | <div class="error"> |
| 3301 | 3301 | <p><?php _e('GeoDirectory does not have access to your filesystem, thing like import/export will not work. Please define your details in wp-config.php as explained here', 'geodirectory'); ?>
|
| 3302 | 3302 | <a target="_blank" href="http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants">http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants</a> |
@@ -3323,1258 +3323,1258 @@ discard block |
||
| 3323 | 3323 | * @return string Json data. |
| 3324 | 3324 | */ |
| 3325 | 3325 | function geodir_ajax_import_export() {
|
| 3326 | - global $wpdb, $plugin_prefix, $current_user, $wp_filesystem; |
|
| 3326 | + global $wpdb, $plugin_prefix, $current_user, $wp_filesystem; |
|
| 3327 | 3327 | |
| 3328 | - error_reporting(0); |
|
| 3328 | + error_reporting(0); |
|
| 3329 | 3329 | |
| 3330 | - $xstart = microtime(true); |
|
| 3330 | + $xstart = microtime(true); |
|
| 3331 | 3331 | |
| 3332 | - // try to set higher limits for import |
|
| 3333 | - $max_input_time = ini_get('max_input_time');
|
|
| 3334 | - $max_execution_time = ini_get('max_execution_time');
|
|
| 3335 | - $memory_limit= ini_get('memory_limit');
|
|
| 3332 | + // try to set higher limits for import |
|
| 3333 | + $max_input_time = ini_get('max_input_time');
|
|
| 3334 | + $max_execution_time = ini_get('max_execution_time');
|
|
| 3335 | + $memory_limit= ini_get('memory_limit');
|
|
| 3336 | 3336 | |
| 3337 | - if(!$max_input_time || $max_input_time<3000){
|
|
| 3338 | - ini_set('max_input_time', 3000);
|
|
| 3339 | - } |
|
| 3337 | + if(!$max_input_time || $max_input_time<3000){
|
|
| 3338 | + ini_set('max_input_time', 3000);
|
|
| 3339 | + } |
|
| 3340 | 3340 | |
| 3341 | - if(!$max_execution_time || $max_execution_time<3000){
|
|
| 3342 | - ini_set('max_execution_time', 3000);
|
|
| 3343 | - } |
|
| 3341 | + if(!$max_execution_time || $max_execution_time<3000){
|
|
| 3342 | + ini_set('max_execution_time', 3000);
|
|
| 3343 | + } |
|
| 3344 | 3344 | |
| 3345 | - if($memory_limit && str_replace('M','',$memory_limit)){
|
|
| 3346 | - if(str_replace('M','',$memory_limit)<256){
|
|
| 3347 | - ini_set('memory_limit', '256M');
|
|
| 3348 | - } |
|
| 3349 | - } |
|
| 3345 | + if($memory_limit && str_replace('M','',$memory_limit)){
|
|
| 3346 | + if(str_replace('M','',$memory_limit)<256){
|
|
| 3347 | + ini_set('memory_limit', '256M');
|
|
| 3348 | + } |
|
| 3349 | + } |
|
| 3350 | 3350 | |
| 3351 | - $json = array(); |
|
| 3351 | + $json = array(); |
|
| 3352 | 3352 | |
| 3353 | - if ( !current_user_can( 'manage_options' ) ) {
|
|
| 3354 | - wp_send_json( $json ); |
|
| 3355 | - } |
|
| 3353 | + if ( !current_user_can( 'manage_options' ) ) {
|
|
| 3354 | + wp_send_json( $json ); |
|
| 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 ); |
|
| 3363 | - } |
|
| 3361 | + if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
|
|
| 3362 | + wp_send_json( $json ); |
|
| 3363 | + } |
|
| 3364 | 3364 | |
| 3365 | - $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
| 3366 | - $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
| 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; |
|
| 3365 | + $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
| 3366 | + $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
| 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; |
|
| 3369 | 3369 | |
| 3370 | - $wp_filesystem = geodir_init_filesystem(); |
|
| 3371 | - if (!$wp_filesystem) {
|
|
| 3372 | - $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
| 3373 | - wp_send_json( $json ); |
|
| 3374 | - } |
|
| 3370 | + $wp_filesystem = geodir_init_filesystem(); |
|
| 3371 | + if (!$wp_filesystem) {
|
|
| 3372 | + $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
| 3373 | + wp_send_json( $json ); |
|
| 3374 | + } |
|
| 3375 | 3375 | |
| 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 ); |
|
| 3379 | - } |
|
| 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 ); |
|
| 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 ); |
|
| 3386 | - } |
|
| 3387 | - } |
|
| 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 | + } |
|
| 3387 | + } |
|
| 3388 | 3388 | |
| 3389 | - $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
| 3390 | - $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 3391 | - |
|
| 3392 | - switch ( $task ) {
|
|
| 3393 | - case 'export_posts': {
|
|
| 3394 | - // WPML |
|
| 3395 | - $is_wpml = geodir_is_wpml(); |
|
| 3396 | - if ($is_wpml) {
|
|
| 3397 | - global $sitepress; |
|
| 3398 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3389 | + $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
| 3390 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 3391 | + |
|
| 3392 | + switch ( $task ) {
|
|
| 3393 | + case 'export_posts': {
|
|
| 3394 | + // WPML |
|
| 3395 | + $is_wpml = geodir_is_wpml(); |
|
| 3396 | + if ($is_wpml) {
|
|
| 3397 | + global $sitepress; |
|
| 3398 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3399 | 3399 | |
| 3400 | - $sitepress->switch_lang('all', true);
|
|
| 3401 | - } |
|
| 3402 | - // WPML |
|
| 3403 | - if ( $post_type == 'gd_event' ) {
|
|
| 3404 | - add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
| 3405 | - } |
|
| 3406 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3400 | + $sitepress->switch_lang('all', true);
|
|
| 3401 | + } |
|
| 3402 | + // WPML |
|
| 3403 | + if ( $post_type == 'gd_event' ) {
|
|
| 3404 | + add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
| 3405 | + } |
|
| 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'] ) ); |
|
| 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'; |
|
| 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 | + } |
|
| 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 | - $chunk_file_paths = array(); |
|
| 3418 | + $chunk_file_paths = array(); |
|
| 3419 | 3419 | |
| 3420 | - if ( isset( $_REQUEST['_c'] ) ) {
|
|
| 3421 | - $json['total'] = $posts_count; |
|
| 3422 | - // WPML |
|
| 3423 | - if ($is_wpml) {
|
|
| 3424 | - $sitepress->switch_lang($active_lang, true); |
|
| 3425 | - } |
|
| 3426 | - // WPML |
|
| 3427 | - wp_send_json( $json ); |
|
| 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 ); |
|
| 3420 | + if ( isset( $_REQUEST['_c'] ) ) {
|
|
| 3421 | + $json['total'] = $posts_count; |
|
| 3422 | + // WPML |
|
| 3423 | + if ($is_wpml) {
|
|
| 3424 | + $sitepress->switch_lang($active_lang, true); |
|
| 3425 | + } |
|
| 3426 | + // WPML |
|
| 3427 | + wp_send_json( $json ); |
|
| 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 ); |
|
| 3433 | 3433 | |
| 3434 | - $json['percentage'] = $percentage; |
|
| 3435 | - // WPML |
|
| 3436 | - if ($is_wpml) {
|
|
| 3437 | - $sitepress->switch_lang($active_lang, true); |
|
| 3438 | - } |
|
| 3439 | - // WPML |
|
| 3440 | - wp_send_json( $json ); |
|
| 3441 | - gd_die(); |
|
| 3442 | - } else {
|
|
| 3443 | - if ( !$posts_count > 0 ) {
|
|
| 3444 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3445 | - } else {
|
|
| 3446 | - $total_posts = $posts_count; |
|
| 3447 | - if ($chunk_per_page > $total_posts) {
|
|
| 3448 | - $chunk_per_page = $total_posts; |
|
| 3449 | - } |
|
| 3450 | - $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
| 3434 | + $json['percentage'] = $percentage; |
|
| 3435 | + // WPML |
|
| 3436 | + if ($is_wpml) {
|
|
| 3437 | + $sitepress->switch_lang($active_lang, true); |
|
| 3438 | + } |
|
| 3439 | + // WPML |
|
| 3440 | + wp_send_json( $json ); |
|
| 3441 | + gd_die(); |
|
| 3442 | + } else {
|
|
| 3443 | + if ( !$posts_count > 0 ) {
|
|
| 3444 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3445 | + } else {
|
|
| 3446 | + $total_posts = $posts_count; |
|
| 3447 | + if ($chunk_per_page > $total_posts) {
|
|
| 3448 | + $chunk_per_page = $total_posts; |
|
| 3449 | + } |
|
| 3450 | + $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
| 3451 | 3451 | |
| 3452 | - $j = $chunk_page_no; |
|
| 3453 | - $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
| 3452 | + $j = $chunk_page_no; |
|
| 3453 | + $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
| 3454 | 3454 | |
| 3455 | - $per_page = 500; |
|
| 3456 | - if ($per_page > $chunk_per_page) {
|
|
| 3457 | - $per_page = $chunk_per_page; |
|
| 3458 | - } |
|
| 3459 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3455 | + $per_page = 500; |
|
| 3456 | + if ($per_page > $chunk_per_page) {
|
|
| 3457 | + $per_page = $chunk_per_page; |
|
| 3458 | + } |
|
| 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 | - $clear = $i == 0 ? true : false; |
|
| 3465 | - geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
| 3466 | - } |
|
| 3464 | + $clear = $i == 0 ? true : false; |
|
| 3465 | + geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
| 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));
|
|
| 3476 | - } |
|
| 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 | + } |
|
| 3477 | 3477 | |
| 3478 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3479 | - $json['total'] = $posts_count; |
|
| 3480 | - $json['files'] = $chunk_file_paths; |
|
| 3481 | - } else {
|
|
| 3482 | - if ($j > 1) {
|
|
| 3483 | - $json['total'] = $posts_count; |
|
| 3484 | - $json['files'] = array(); |
|
| 3485 | - } else {
|
|
| 3486 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3487 | - } |
|
| 3488 | - } |
|
| 3489 | - } |
|
| 3490 | - // WPML |
|
| 3491 | - if ($is_wpml) {
|
|
| 3492 | - $sitepress->switch_lang($active_lang, true); |
|
| 3493 | - } |
|
| 3494 | - // WPML |
|
| 3495 | - wp_send_json( $json ); |
|
| 3496 | - } |
|
| 3497 | - } |
|
| 3498 | - break; |
|
| 3499 | - case 'export_cats': {
|
|
| 3500 | - // WPML |
|
| 3501 | - $is_wpml = geodir_is_wpml(); |
|
| 3502 | - if ($is_wpml) {
|
|
| 3503 | - global $sitepress; |
|
| 3504 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3478 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3479 | + $json['total'] = $posts_count; |
|
| 3480 | + $json['files'] = $chunk_file_paths; |
|
| 3481 | + } else {
|
|
| 3482 | + if ($j > 1) {
|
|
| 3483 | + $json['total'] = $posts_count; |
|
| 3484 | + $json['files'] = array(); |
|
| 3485 | + } else {
|
|
| 3486 | + $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3487 | + } |
|
| 3488 | + } |
|
| 3489 | + } |
|
| 3490 | + // WPML |
|
| 3491 | + if ($is_wpml) {
|
|
| 3492 | + $sitepress->switch_lang($active_lang, true); |
|
| 3493 | + } |
|
| 3494 | + // WPML |
|
| 3495 | + wp_send_json( $json ); |
|
| 3496 | + } |
|
| 3497 | + } |
|
| 3498 | + break; |
|
| 3499 | + case 'export_cats': {
|
|
| 3500 | + // WPML |
|
| 3501 | + $is_wpml = geodir_is_wpml(); |
|
| 3502 | + if ($is_wpml) {
|
|
| 3503 | + global $sitepress; |
|
| 3504 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3505 | 3505 | |
| 3506 | - $sitepress->switch_lang('all', true);
|
|
| 3507 | - } |
|
| 3508 | - // WPML |
|
| 3509 | - $file_name = $post_type . 'category_' . date( 'dmyHi' ); |
|
| 3506 | + $sitepress->switch_lang('all', true);
|
|
| 3507 | + } |
|
| 3508 | + // WPML |
|
| 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 | - $chunk_file_paths = array(); |
|
| 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 | - $json['percentage'] = $percentage; |
|
| 3525 | - // WPML |
|
| 3526 | - if ($is_wpml) {
|
|
| 3527 | - $sitepress->switch_lang($active_lang, true); |
|
| 3528 | - } |
|
| 3529 | - // WPML |
|
| 3530 | - wp_send_json( $json ); |
|
| 3531 | - } else {
|
|
| 3532 | - if ( !$terms_count > 0 ) {
|
|
| 3533 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3534 | - } else {
|
|
| 3535 | - $total_terms = $terms_count; |
|
| 3536 | - if ($chunk_per_page > $terms_count) {
|
|
| 3537 | - $chunk_per_page = $terms_count; |
|
| 3538 | - } |
|
| 3539 | - $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
| 3524 | + $json['percentage'] = $percentage; |
|
| 3525 | + // WPML |
|
| 3526 | + if ($is_wpml) {
|
|
| 3527 | + $sitepress->switch_lang($active_lang, true); |
|
| 3528 | + } |
|
| 3529 | + // WPML |
|
| 3530 | + wp_send_json( $json ); |
|
| 3531 | + } else {
|
|
| 3532 | + if ( !$terms_count > 0 ) {
|
|
| 3533 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3534 | + } else {
|
|
| 3535 | + $total_terms = $terms_count; |
|
| 3536 | + if ($chunk_per_page > $terms_count) {
|
|
| 3537 | + $chunk_per_page = $terms_count; |
|
| 3538 | + } |
|
| 3539 | + $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
| 3540 | 3540 | |
| 3541 | - $j = $chunk_page_no; |
|
| 3542 | - $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
| 3541 | + $j = $chunk_page_no; |
|
| 3542 | + $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
| 3543 | 3543 | |
| 3544 | - $per_page = 500; |
|
| 3545 | - if ($per_page > $chunk_per_page) {
|
|
| 3546 | - $per_page = $chunk_per_page; |
|
| 3547 | - } |
|
| 3548 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3544 | + $per_page = 500; |
|
| 3545 | + if ($per_page > $chunk_per_page) {
|
|
| 3546 | + $per_page = $chunk_per_page; |
|
| 3547 | + } |
|
| 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 | - $clear = $i == 0 ? true : false; |
|
| 3554 | - geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
| 3555 | - } |
|
| 3553 | + $clear = $i == 0 ? true : false; |
|
| 3554 | + geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
| 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));
|
|
| 3565 | - } |
|
| 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 | + } |
|
| 3566 | 3566 | |
| 3567 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3568 | - $json['total'] = $terms_count; |
|
| 3569 | - $json['files'] = $chunk_file_paths; |
|
| 3570 | - } else {
|
|
| 3571 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3572 | - } |
|
| 3573 | - } |
|
| 3574 | - // WPML |
|
| 3575 | - if ($is_wpml) {
|
|
| 3576 | - $sitepress->switch_lang($active_lang, true); |
|
| 3577 | - } |
|
| 3578 | - // WPML |
|
| 3579 | - wp_send_json( $json ); |
|
| 3580 | - } |
|
| 3581 | - } |
|
| 3582 | - break; |
|
| 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'; |
|
| 3567 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3568 | + $json['total'] = $terms_count; |
|
| 3569 | + $json['files'] = $chunk_file_paths; |
|
| 3570 | + } else {
|
|
| 3571 | + $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3572 | + } |
|
| 3573 | + } |
|
| 3574 | + // WPML |
|
| 3575 | + if ($is_wpml) {
|
|
| 3576 | + $sitepress->switch_lang($active_lang, true); |
|
| 3577 | + } |
|
| 3578 | + // WPML |
|
| 3579 | + wp_send_json( $json ); |
|
| 3580 | + } |
|
| 3581 | + } |
|
| 3582 | + break; |
|
| 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'; |
|
| 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 | - $json['percentage'] = $percentage; |
|
| 3598 | - wp_send_json( $json ); |
|
| 3599 | - } else {
|
|
| 3600 | - $chunk_file_paths = array(); |
|
| 3597 | + $json['percentage'] = $percentage; |
|
| 3598 | + wp_send_json( $json ); |
|
| 3599 | + } else {
|
|
| 3600 | + $chunk_file_paths = array(); |
|
| 3601 | 3601 | |
| 3602 | - if ( !$items_count > 0 ) {
|
|
| 3603 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3604 | - } else {
|
|
| 3605 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3606 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3602 | + if ( !$items_count > 0 ) {
|
|
| 3603 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3604 | + } else {
|
|
| 3605 | + $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3606 | + $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3607 | 3607 | |
| 3608 | - $j = $chunk_page_no; |
|
| 3609 | - $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
| 3608 | + $j = $chunk_page_no; |
|
| 3609 | + $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
| 3610 | 3610 | |
| 3611 | - $per_page = 500; |
|
| 3612 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3613 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3611 | + $per_page = 500; |
|
| 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 | - $clear = $i == 0 ? true : false; |
|
| 3619 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3620 | - } |
|
| 3618 | + $clear = $i == 0 ? true : false; |
|
| 3619 | + geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 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));
|
|
| 3630 | - } |
|
| 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 | + } |
|
| 3631 | 3631 | |
| 3632 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3633 | - $json['total'] = $items_count; |
|
| 3634 | - $json['files'] = $chunk_file_paths; |
|
| 3635 | - } else {
|
|
| 3636 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3637 | - } |
|
| 3638 | - } |
|
| 3639 | - wp_send_json( $json ); |
|
| 3640 | - } |
|
| 3641 | - } |
|
| 3642 | - break; |
|
| 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'; |
|
| 3632 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3633 | + $json['total'] = $items_count; |
|
| 3634 | + $json['files'] = $chunk_file_paths; |
|
| 3635 | + } else {
|
|
| 3636 | + $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3637 | + } |
|
| 3638 | + } |
|
| 3639 | + wp_send_json( $json ); |
|
| 3640 | + } |
|
| 3641 | + } |
|
| 3642 | + break; |
|
| 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'; |
|
| 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 | - $json['percentage'] = $percentage; |
|
| 3658 | - wp_send_json( $json ); |
|
| 3659 | - } else {
|
|
| 3660 | - $chunk_file_paths = array(); |
|
| 3657 | + $json['percentage'] = $percentage; |
|
| 3658 | + wp_send_json( $json ); |
|
| 3659 | + } else {
|
|
| 3660 | + $chunk_file_paths = array(); |
|
| 3661 | 3661 | |
| 3662 | - if ( !$items_count > 0 ) {
|
|
| 3663 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3664 | - } else {
|
|
| 3665 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3666 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3662 | + if ( !$items_count > 0 ) {
|
|
| 3663 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3664 | + } else {
|
|
| 3665 | + $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3666 | + $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3667 | 3667 | |
| 3668 | - $j = $chunk_page_no; |
|
| 3669 | - $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
| 3668 | + $j = $chunk_page_no; |
|
| 3669 | + $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
| 3670 | 3670 | |
| 3671 | - $per_page = 500; |
|
| 3672 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3673 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3671 | + $per_page = 500; |
|
| 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 | - $clear = $i == 0 ? true : false; |
|
| 3679 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3680 | - } |
|
| 3678 | + $clear = $i == 0 ? true : false; |
|
| 3679 | + geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 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));
|
|
| 3690 | - } |
|
| 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 | + } |
|
| 3691 | 3691 | |
| 3692 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3693 | - $json['total'] = $items_count; |
|
| 3694 | - $json['files'] = $chunk_file_paths; |
|
| 3695 | - } else {
|
|
| 3696 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3697 | - } |
|
| 3698 | - } |
|
| 3699 | - wp_send_json( $json ); |
|
| 3700 | - } |
|
| 3701 | - } |
|
| 3702 | - break; |
|
| 3703 | - case 'prepare_import': |
|
| 3704 | - case 'import_cat': |
|
| 3705 | - case 'import_post': |
|
| 3706 | - case 'import_loc': |
|
| 3707 | - case 'import_hood': {
|
|
| 3708 | - // WPML |
|
| 3709 | - $is_wpml = geodir_is_wpml(); |
|
| 3710 | - if ($is_wpml) {
|
|
| 3711 | - global $sitepress; |
|
| 3712 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3713 | - } |
|
| 3714 | - // WPML |
|
| 3692 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3693 | + $json['total'] = $items_count; |
|
| 3694 | + $json['files'] = $chunk_file_paths; |
|
| 3695 | + } else {
|
|
| 3696 | + $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3697 | + } |
|
| 3698 | + } |
|
| 3699 | + wp_send_json( $json ); |
|
| 3700 | + } |
|
| 3701 | + } |
|
| 3702 | + break; |
|
| 3703 | + case 'prepare_import': |
|
| 3704 | + case 'import_cat': |
|
| 3705 | + case 'import_post': |
|
| 3706 | + case 'import_loc': |
|
| 3707 | + case 'import_hood': {
|
|
| 3708 | + // WPML |
|
| 3709 | + $is_wpml = geodir_is_wpml(); |
|
| 3710 | + if ($is_wpml) {
|
|
| 3711 | + global $sitepress; |
|
| 3712 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3713 | + } |
|
| 3714 | + // WPML |
|
| 3715 | 3715 | |
| 3716 | - ini_set( 'auto_detect_line_endings', true ); |
|
| 3716 | + ini_set( 'auto_detect_line_endings', true ); |
|
| 3717 | 3717 | |
| 3718 | - $uploads = wp_upload_dir(); |
|
| 3719 | - $uploads_dir = $uploads['path']; |
|
| 3720 | - $uploads_subdir = $uploads['subdir']; |
|
| 3718 | + $uploads = wp_upload_dir(); |
|
| 3719 | + $uploads_dir = $uploads['path']; |
|
| 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 | - $json['file'] = $csv_file; |
|
| 3730 | - $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
| 3731 | - $file = array(); |
|
| 3729 | + $json['file'] = $csv_file; |
|
| 3730 | + $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
| 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 | - if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 3737 | - $json['error'] = NULL; |
|
| 3738 | - $json['rows'] = 0; |
|
| 3736 | + if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 3737 | + $json['error'] = NULL; |
|
| 3738 | + $json['rows'] = 0; |
|
| 3739 | 3739 | |
| 3740 | - $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
|
| 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 ) ) {
|
|
| 3745 | - $file[] = $data; |
|
| 3746 | - } |
|
| 3747 | - } |
|
| 3748 | - fclose($handle); |
|
| 3749 | - } |
|
| 3750 | - setlocale(LC_ALL, $lc_all); |
|
| 3740 | + $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
|
| 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 ) ) {
|
|
| 3745 | + $file[] = $data; |
|
| 3746 | + } |
|
| 3747 | + } |
|
| 3748 | + fclose($handle); |
|
| 3749 | + } |
|
| 3750 | + setlocale(LC_ALL, $lc_all); |
|
| 3751 | 3751 | |
| 3752 | - $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 3752 | + $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 3753 | 3753 | |
| 3754 | - if (!$json['rows'] > 0) {
|
|
| 3755 | - $json['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 3756 | - } |
|
| 3757 | - } else {
|
|
| 3758 | - wp_send_json( $json ); |
|
| 3759 | - } |
|
| 3760 | - } else {
|
|
| 3761 | - wp_send_json( $json ); |
|
| 3762 | - } |
|
| 3754 | + if (!$json['rows'] > 0) {
|
|
| 3755 | + $json['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 3756 | + } |
|
| 3757 | + } else {
|
|
| 3758 | + wp_send_json( $json ); |
|
| 3759 | + } |
|
| 3760 | + } else {
|
|
| 3761 | + wp_send_json( $json ); |
|
| 3762 | + } |
|
| 3763 | 3763 | |
| 3764 | - if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
|
|
| 3765 | - wp_send_json( $json ); |
|
| 3766 | - } |
|
| 3764 | + if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
|
|
| 3765 | + wp_send_json( $json ); |
|
| 3766 | + } |
|
| 3767 | 3767 | |
| 3768 | - $total = $json['rows']; |
|
| 3769 | - $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
| 3770 | - $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
| 3768 | + $total = $json['rows']; |
|
| 3769 | + $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
| 3770 | + $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
| 3771 | 3771 | |
| 3772 | - $count = $limit; |
|
| 3772 | + $count = $limit; |
|
| 3773 | 3773 | |
| 3774 | - if ($count < $total) {
|
|
| 3775 | - $count = $processed + $count; |
|
| 3776 | - if ($count > $total) {
|
|
| 3777 | - $count = $total; |
|
| 3778 | - } |
|
| 3779 | - } else {
|
|
| 3780 | - $count = $total; |
|
| 3781 | - } |
|
| 3774 | + if ($count < $total) {
|
|
| 3775 | + $count = $processed + $count; |
|
| 3776 | + if ($count > $total) {
|
|
| 3777 | + $count = $total; |
|
| 3778 | + } |
|
| 3779 | + } else {
|
|
| 3780 | + $count = $total; |
|
| 3781 | + } |
|
| 3782 | 3782 | |
| 3783 | - $created = 0; |
|
| 3784 | - $updated = 0; |
|
| 3785 | - $skipped = 0; |
|
| 3786 | - $invalid = 0; |
|
| 3787 | - $invalid_addr = 0; |
|
| 3788 | - $images = 0; |
|
| 3783 | + $created = 0; |
|
| 3784 | + $updated = 0; |
|
| 3785 | + $skipped = 0; |
|
| 3786 | + $invalid = 0; |
|
| 3787 | + $invalid_addr = 0; |
|
| 3788 | + $images = 0; |
|
| 3789 | 3789 | |
| 3790 | - $gd_post_info = array(); |
|
| 3791 | - $countpost = 0; |
|
| 3790 | + $gd_post_info = array(); |
|
| 3791 | + $countpost = 0; |
|
| 3792 | 3792 | |
| 3793 | - $post_types = geodir_get_posttypes(); |
|
| 3793 | + $post_types = geodir_get_posttypes(); |
|
| 3794 | 3794 | |
| 3795 | - if ( $task == 'import_cat' ) {
|
|
| 3796 | - if (!empty($file)) {
|
|
| 3797 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 3795 | + if ( $task == 'import_cat' ) {
|
|
| 3796 | + if (!empty($file)) {
|
|
| 3797 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 3798 | 3798 | |
| 3799 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 3800 | - $json['error'] = CSV_INVAILD_FILE; |
|
| 3801 | - wp_send_json( $json ); |
|
| 3802 | - exit; |
|
| 3803 | - } |
|
| 3799 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 3800 | + $json['error'] = CSV_INVAILD_FILE; |
|
| 3801 | + wp_send_json( $json ); |
|
| 3802 | + exit; |
|
| 3803 | + } |
|
| 3804 | 3804 | |
| 3805 | - $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');
|
|
| 3805 | + $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');
|
|
| 3806 | 3806 | |
| 3807 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 3808 | - $index = $processed + $i; |
|
| 3807 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 3808 | + $index = $processed + $i; |
|
| 3809 | 3809 | |
| 3810 | - if (isset($file[$index])) {
|
|
| 3811 | - $row = $file[$index]; |
|
| 3812 | - $row = array_map( 'trim', $row ); |
|
| 3813 | - //$row = array_map( 'utf8_encode', $row ); |
|
| 3810 | + if (isset($file[$index])) {
|
|
| 3811 | + $row = $file[$index]; |
|
| 3812 | + $row = array_map( 'trim', $row ); |
|
| 3813 | + //$row = array_map( 'utf8_encode', $row ); |
|
| 3814 | 3814 | |
| 3815 | - $cat_id = ''; |
|
| 3816 | - $cat_name = ''; |
|
| 3817 | - $cat_slug = ''; |
|
| 3818 | - $cat_posttype = ''; |
|
| 3819 | - $cat_parent = ''; |
|
| 3820 | - $cat_description = ''; |
|
| 3821 | - $cat_schema = ''; |
|
| 3822 | - $cat_top_description = ''; |
|
| 3823 | - $cat_image = ''; |
|
| 3824 | - $cat_icon = ''; |
|
| 3825 | - $cat_language = ''; |
|
| 3826 | - $cat_id_original = ''; |
|
| 3815 | + $cat_id = ''; |
|
| 3816 | + $cat_name = ''; |
|
| 3817 | + $cat_slug = ''; |
|
| 3818 | + $cat_posttype = ''; |
|
| 3819 | + $cat_parent = ''; |
|
| 3820 | + $cat_description = ''; |
|
| 3821 | + $cat_schema = ''; |
|
| 3822 | + $cat_top_description = ''; |
|
| 3823 | + $cat_image = ''; |
|
| 3824 | + $cat_icon = ''; |
|
| 3825 | + $cat_language = ''; |
|
| 3826 | + $cat_id_original = ''; |
|
| 3827 | 3827 | |
| 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' ) {
|
|
| 3833 | - $cat_name = $row[$c]; |
|
| 3834 | - } else if ( $column == 'cat_slug' ) {
|
|
| 3835 | - $cat_slug = $row[$c]; |
|
| 3836 | - } else if ( $column == 'cat_posttype' ) {
|
|
| 3837 | - $cat_posttype = $row[$c]; |
|
| 3838 | - } else if ( $column == 'cat_parent' ) {
|
|
| 3839 | - $cat_parent = trim($row[$c]); |
|
| 3840 | - } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
|
|
| 3841 | - $cat_schema = $row[$c]; |
|
| 3842 | - } else if ( $column == 'cat_description' ) {
|
|
| 3843 | - $cat_description = $row[$c]; |
|
| 3844 | - } else if ( $column == 'cat_top_description' ) {
|
|
| 3845 | - $cat_top_description = $row[$c]; |
|
| 3846 | - } else if ( $column == 'cat_image' ) {
|
|
| 3847 | - $cat_image = $row[$c]; |
|
| 3848 | - } else if ( $column == 'cat_icon' ) {
|
|
| 3849 | - $cat_icon = $row[$c]; |
|
| 3850 | - } |
|
| 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]; |
|
| 3857 | - } |
|
| 3858 | - } |
|
| 3859 | - // WPML |
|
| 3860 | - $c++; |
|
| 3861 | - } |
|
| 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' ) {
|
|
| 3833 | + $cat_name = $row[$c]; |
|
| 3834 | + } else if ( $column == 'cat_slug' ) {
|
|
| 3835 | + $cat_slug = $row[$c]; |
|
| 3836 | + } else if ( $column == 'cat_posttype' ) {
|
|
| 3837 | + $cat_posttype = $row[$c]; |
|
| 3838 | + } else if ( $column == 'cat_parent' ) {
|
|
| 3839 | + $cat_parent = trim($row[$c]); |
|
| 3840 | + } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
|
|
| 3841 | + $cat_schema = $row[$c]; |
|
| 3842 | + } else if ( $column == 'cat_description' ) {
|
|
| 3843 | + $cat_description = $row[$c]; |
|
| 3844 | + } else if ( $column == 'cat_top_description' ) {
|
|
| 3845 | + $cat_top_description = $row[$c]; |
|
| 3846 | + } else if ( $column == 'cat_image' ) {
|
|
| 3847 | + $cat_image = $row[$c]; |
|
| 3848 | + } else if ( $column == 'cat_icon' ) {
|
|
| 3849 | + $cat_icon = $row[$c]; |
|
| 3850 | + } |
|
| 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]; |
|
| 3857 | + } |
|
| 3858 | + } |
|
| 3859 | + // WPML |
|
| 3860 | + $c++; |
|
| 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 | - $invalid++; |
|
| 3867 | - continue; |
|
| 3868 | - } |
|
| 3866 | + $invalid++; |
|
| 3867 | + continue; |
|
| 3868 | + } |
|
| 3869 | 3869 | |
| 3870 | - // WPML |
|
| 3871 | - if ($is_wpml && $cat_language != '') {
|
|
| 3872 | - $sitepress->switch_lang($cat_language, true); |
|
| 3873 | - } |
|
| 3874 | - // WPML |
|
| 3870 | + // WPML |
|
| 3871 | + if ($is_wpml && $cat_language != '') {
|
|
| 3872 | + $sitepress->switch_lang($cat_language, true); |
|
| 3873 | + } |
|
| 3874 | + // WPML |
|
| 3875 | 3875 | |
| 3876 | - $term_data = array(); |
|
| 3877 | - $term_data['name'] = $cat_name; |
|
| 3878 | - $term_data['slug'] = $cat_slug; |
|
| 3879 | - $term_data['description'] = $cat_description; |
|
| 3880 | - $term_data['cat_schema'] = $cat_schema; |
|
| 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 ) : ''; |
|
| 3876 | + $term_data = array(); |
|
| 3877 | + $term_data['name'] = $cat_name; |
|
| 3878 | + $term_data['slug'] = $cat_slug; |
|
| 3879 | + $term_data['description'] = $cat_description; |
|
| 3880 | + $term_data['cat_schema'] = $cat_schema; |
|
| 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 ) : ''; |
|
| 3884 | 3884 | |
| 3885 | - //$term_data = array_map( 'utf8_encode', $term_data ); |
|
| 3885 | + //$term_data = array_map( 'utf8_encode', $term_data ); |
|
| 3886 | 3886 | |
| 3887 | - $taxonomy = $cat_posttype . 'category'; |
|
| 3887 | + $taxonomy = $cat_posttype . 'category'; |
|
| 3888 | 3888 | |
| 3889 | - $term_data['taxonomy'] = $taxonomy; |
|
| 3889 | + $term_data['taxonomy'] = $taxonomy; |
|
| 3890 | 3890 | |
| 3891 | - $term_parent_id = 0; |
|
| 3892 | - if ($cat_parent != "" || (int)$cat_parent > 0) {
|
|
| 3893 | - $term_parent = ''; |
|
| 3891 | + $term_parent_id = 0; |
|
| 3892 | + if ($cat_parent != "" || (int)$cat_parent > 0) {
|
|
| 3893 | + $term_parent = ''; |
|
| 3894 | 3894 | |
| 3895 | - if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
|
|
| 3896 | - // |
|
| 3897 | - } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
|
|
| 3898 | - // |
|
| 3899 | - } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
|
|
| 3900 | - // |
|
| 3901 | - } else {
|
|
| 3902 | - $term_parent_data = array(); |
|
| 3903 | - $term_parent_data['name'] = $cat_parent; |
|
| 3904 | - //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
|
| 3905 | - $term_parent_data['taxonomy'] = $taxonomy; |
|
| 3895 | + if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
|
|
| 3896 | + // |
|
| 3897 | + } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
|
|
| 3898 | + // |
|
| 3899 | + } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
|
|
| 3900 | + // |
|
| 3901 | + } else {
|
|
| 3902 | + $term_parent_data = array(); |
|
| 3903 | + $term_parent_data['name'] = $cat_parent; |
|
| 3904 | + //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
|
| 3905 | + $term_parent_data['taxonomy'] = $taxonomy; |
|
| 3906 | 3906 | |
| 3907 | - $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
| 3908 | - } |
|
| 3907 | + $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
| 3908 | + } |
|
| 3909 | 3909 | |
| 3910 | - if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
|
|
| 3911 | - $term_parent_id = (int)$term_parent->term_id; |
|
| 3912 | - } |
|
| 3913 | - } |
|
| 3914 | - $term_data['parent'] = (int)$term_parent_id; |
|
| 3910 | + if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
|
|
| 3911 | + $term_parent_id = (int)$term_parent->term_id; |
|
| 3912 | + } |
|
| 3913 | + } |
|
| 3914 | + $term_data['parent'] = (int)$term_parent_id; |
|
| 3915 | 3915 | |
| 3916 | - $term_id = NULL; |
|
| 3917 | - if ( $import_choice == 'update' ) {
|
|
| 3918 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3919 | - $term_data['term_id'] = $term['term_id']; |
|
| 3916 | + $term_id = NULL; |
|
| 3917 | + if ( $import_choice == 'update' ) {
|
|
| 3918 | + if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3919 | + $term_data['term_id'] = $term['term_id']; |
|
| 3920 | 3920 | |
| 3921 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3922 | - $updated++; |
|
| 3923 | - } else {
|
|
| 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' ) ); |
|
| 3926 | - } |
|
| 3927 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3928 | - $term_data['term_id'] = $term['term_id']; |
|
| 3921 | + if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3922 | + $updated++; |
|
| 3923 | + } else {
|
|
| 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' ) ); |
|
| 3926 | + } |
|
| 3927 | + } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3928 | + $term_data['term_id'] = $term['term_id']; |
|
| 3929 | 3929 | |
| 3930 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3931 | - $updated++; |
|
| 3932 | - } else {
|
|
| 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' ) ); |
|
| 3935 | - } |
|
| 3936 | - } else {
|
|
| 3937 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3938 | - $created++; |
|
| 3939 | - } else {
|
|
| 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' ) ); |
|
| 3942 | - } |
|
| 3943 | - } |
|
| 3944 | - } else if ( $import_choice == 'skip' ) {
|
|
| 3945 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3946 | - $skipped++; |
|
| 3947 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3948 | - $skipped++; |
|
| 3949 | - } else {
|
|
| 3950 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3951 | - $created++; |
|
| 3952 | - } else {
|
|
| 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' ) ); |
|
| 3955 | - } |
|
| 3956 | - } |
|
| 3957 | - } else {
|
|
| 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' ) ); |
|
| 3960 | - } |
|
| 3930 | + if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3931 | + $updated++; |
|
| 3932 | + } else {
|
|
| 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' ) ); |
|
| 3935 | + } |
|
| 3936 | + } else {
|
|
| 3937 | + if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3938 | + $created++; |
|
| 3939 | + } else {
|
|
| 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' ) ); |
|
| 3942 | + } |
|
| 3943 | + } |
|
| 3944 | + } else if ( $import_choice == 'skip' ) {
|
|
| 3945 | + if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3946 | + $skipped++; |
|
| 3947 | + } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3948 | + $skipped++; |
|
| 3949 | + } else {
|
|
| 3950 | + if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3951 | + $created++; |
|
| 3952 | + } else {
|
|
| 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' ) ); |
|
| 3955 | + } |
|
| 3956 | + } |
|
| 3957 | + } else {
|
|
| 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' ) ); |
|
| 3960 | + } |
|
| 3961 | 3961 | |
| 3962 | - if ( $term_id ) {
|
|
| 3963 | - // WPML |
|
| 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 ); |
|
| 3967 | - $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 3968 | - |
|
| 3969 | - $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type ); |
|
| 3962 | + if ( $term_id ) {
|
|
| 3963 | + // WPML |
|
| 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 ); |
|
| 3967 | + $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 3968 | + |
|
| 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 ); |
|
| 3972 | - } |
|
| 3973 | - // WPML |
|
| 3971 | + $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language ); |
|
| 3972 | + } |
|
| 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 ); |
|
| 3977 | - } |
|
| 3975 | + if ( isset( $term_data['top_description'] ) ) {
|
|
| 3976 | + update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype ); |
|
| 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 ); |
|
| 3981 | - } |
|
| 3979 | + if ( isset( $term_data['cat_schema'] ) ) {
|
|
| 3980 | + update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype ); |
|
| 3981 | + } |
|
| 3982 | 3982 | |
| 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'] : ''; |
|
| 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'] : ''; |
|
| 3987 | 3987 | |
| 3988 | - if ( basename($cat_image) != $term_data['image'] ) {
|
|
| 3989 | - $attachment = true; |
|
| 3990 | - update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
| 3991 | - } |
|
| 3992 | - } |
|
| 3988 | + if ( basename($cat_image) != $term_data['image'] ) {
|
|
| 3989 | + $attachment = true; |
|
| 3990 | + update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
| 3991 | + } |
|
| 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'] : ''; |
|
| 3997 | - |
|
| 3998 | - if ( basename($cat_icon) != $term_data['icon'] ) {
|
|
| 3999 | - $attachment = true; |
|
| 4000 | - update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
| 4001 | - } |
|
| 4002 | - } |
|
| 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 | + |
|
| 3998 | + if ( basename($cat_icon) != $term_data['icon'] ) {
|
|
| 3999 | + $attachment = true; |
|
| 4000 | + update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
| 4001 | + } |
|
| 4002 | + } |
|
| 4003 | 4003 | |
| 4004 | - if ( $attachment ) {
|
|
| 4005 | - $images++; |
|
| 4006 | - } |
|
| 4007 | - } |
|
| 4004 | + if ( $attachment ) {
|
|
| 4005 | + $images++; |
|
| 4006 | + } |
|
| 4007 | + } |
|
| 4008 | 4008 | |
| 4009 | - // WPML |
|
| 4010 | - if ($is_wpml && $cat_language != '') {
|
|
| 4011 | - $sitepress->switch_lang($active_lang, true); |
|
| 4012 | - } |
|
| 4013 | - // WPML |
|
| 4014 | - } |
|
| 4015 | - } |
|
| 4016 | - } |
|
| 4009 | + // WPML |
|
| 4010 | + if ($is_wpml && $cat_language != '') {
|
|
| 4011 | + $sitepress->switch_lang($active_lang, true); |
|
| 4012 | + } |
|
| 4013 | + // WPML |
|
| 4014 | + } |
|
| 4015 | + } |
|
| 4016 | + } |
|
| 4017 | 4017 | |
| 4018 | - $json = array(); |
|
| 4019 | - $json['processed'] = $limit; |
|
| 4020 | - $json['created'] = $created; |
|
| 4021 | - $json['updated'] = $updated; |
|
| 4022 | - $json['skipped'] = $skipped; |
|
| 4023 | - $json['invalid'] = $invalid; |
|
| 4024 | - $json['images'] = $images; |
|
| 4018 | + $json = array(); |
|
| 4019 | + $json['processed'] = $limit; |
|
| 4020 | + $json['created'] = $created; |
|
| 4021 | + $json['updated'] = $updated; |
|
| 4022 | + $json['skipped'] = $skipped; |
|
| 4023 | + $json['invalid'] = $invalid; |
|
| 4024 | + $json['images'] = $images; |
|
| 4025 | 4025 | |
| 4026 | - wp_send_json( $json ); |
|
| 4027 | - exit; |
|
| 4028 | - } else if ( $task == 'import_post' ) {
|
|
| 4029 | - $xtimings['###1'] = microtime(true)-$xstart; |
|
| 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;' ); |
|
| 4026 | + wp_send_json( $json ); |
|
| 4027 | + exit; |
|
| 4028 | + } else if ( $task == 'import_post' ) {
|
|
| 4029 | + $xtimings['###1'] = microtime(true)-$xstart; |
|
| 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;' ); |
|
| 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 | - 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;
|
|
| 4041 | - $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
|
| 4042 | - $default_status = 'publish'; |
|
| 4043 | - $current_date = date_i18n( 'Y-m-d', time() ); |
|
| 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;
|
|
| 4041 | + $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
|
| 4042 | + $default_status = 'publish'; |
|
| 4043 | + $current_date = date_i18n( 'Y-m-d', time() ); |
|
| 4044 | 4044 | |
| 4045 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4045 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4046 | 4046 | |
| 4047 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4048 | - $json['error'] = CSV_INVAILD_FILE; |
|
| 4049 | - wp_send_json( $json ); |
|
| 4050 | - exit; |
|
| 4051 | - } |
|
| 4052 | - $xtimings['###2'] = microtime(true)-$xstart; |
|
| 4053 | - $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
|
|
| 4054 | - $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
| 4055 | - $processed_actual = 0; |
|
| 4056 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4057 | - $index = $processed + $i; |
|
| 4058 | - $gd_post = array(); |
|
| 4047 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4048 | + $json['error'] = CSV_INVAILD_FILE; |
|
| 4049 | + wp_send_json( $json ); |
|
| 4050 | + exit; |
|
| 4051 | + } |
|
| 4052 | + $xtimings['###2'] = microtime(true)-$xstart; |
|
| 4053 | + $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
|
|
| 4054 | + $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
| 4055 | + $processed_actual = 0; |
|
| 4056 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4057 | + $index = $processed + $i; |
|
| 4058 | + $gd_post = array(); |
|
| 4059 | 4059 | |
| 4060 | - if (isset($file[$index])) {
|
|
| 4061 | - $processed_actual++; |
|
| 4062 | - $row = $file[$index]; |
|
| 4063 | - $row = array_map( 'trim', $row ); |
|
| 4064 | - //$row = array_map( 'utf8_encode', $row ); |
|
| 4065 | - $row = array_map( 'addslashes_gpc', $row ); |
|
| 4060 | + if (isset($file[$index])) {
|
|
| 4061 | + $processed_actual++; |
|
| 4062 | + $row = $file[$index]; |
|
| 4063 | + $row = array_map( 'trim', $row ); |
|
| 4064 | + //$row = array_map( 'utf8_encode', $row ); |
|
| 4065 | + $row = array_map( 'addslashes_gpc', $row ); |
|
| 4066 | 4066 | |
| 4067 | - $post_id = ''; |
|
| 4068 | - $post_title = ''; |
|
| 4069 | - $post_author = ''; |
|
| 4070 | - $post_content = ''; |
|
| 4071 | - $post_category_arr = array(); |
|
| 4072 | - $default_category = ''; |
|
| 4073 | - $post_tags = array(); |
|
| 4074 | - $post_type = ''; |
|
| 4075 | - $post_status = ''; |
|
| 4076 | - $geodir_video = ''; |
|
| 4077 | - $post_address = ''; |
|
| 4078 | - $post_city = ''; |
|
| 4079 | - $post_region = ''; |
|
| 4080 | - $post_country = ''; |
|
| 4081 | - $post_zip = ''; |
|
| 4082 | - $post_latitude = ''; |
|
| 4083 | - $post_longitude = ''; |
|
| 4084 | - $post_neighbourhood = ''; |
|
| 4085 | - $neighbourhood_latitude = ''; |
|
| 4086 | - $neighbourhood_longitude = ''; |
|
| 4087 | - $geodir_timing = ''; |
|
| 4088 | - $geodir_contact = ''; |
|
| 4089 | - $geodir_email = ''; |
|
| 4090 | - $geodir_website = ''; |
|
| 4091 | - $geodir_twitter = ''; |
|
| 4092 | - $geodir_facebook = ''; |
|
| 4093 | - $geodir_twitter = ''; |
|
| 4094 | - $post_images = array(); |
|
| 4067 | + $post_id = ''; |
|
| 4068 | + $post_title = ''; |
|
| 4069 | + $post_author = ''; |
|
| 4070 | + $post_content = ''; |
|
| 4071 | + $post_category_arr = array(); |
|
| 4072 | + $default_category = ''; |
|
| 4073 | + $post_tags = array(); |
|
| 4074 | + $post_type = ''; |
|
| 4075 | + $post_status = ''; |
|
| 4076 | + $geodir_video = ''; |
|
| 4077 | + $post_address = ''; |
|
| 4078 | + $post_city = ''; |
|
| 4079 | + $post_region = ''; |
|
| 4080 | + $post_country = ''; |
|
| 4081 | + $post_zip = ''; |
|
| 4082 | + $post_latitude = ''; |
|
| 4083 | + $post_longitude = ''; |
|
| 4084 | + $post_neighbourhood = ''; |
|
| 4085 | + $neighbourhood_latitude = ''; |
|
| 4086 | + $neighbourhood_longitude = ''; |
|
| 4087 | + $geodir_timing = ''; |
|
| 4088 | + $geodir_contact = ''; |
|
| 4089 | + $geodir_email = ''; |
|
| 4090 | + $geodir_website = ''; |
|
| 4091 | + $geodir_twitter = ''; |
|
| 4092 | + $geodir_facebook = ''; |
|
| 4093 | + $geodir_twitter = ''; |
|
| 4094 | + $post_images = array(); |
|
| 4095 | 4095 | |
| 4096 | - $expire_date = 'Never'; |
|
| 4096 | + $expire_date = 'Never'; |
|
| 4097 | 4097 | |
| 4098 | - $language = ''; |
|
| 4099 | - $original_post_id = ''; |
|
| 4098 | + $language = ''; |
|
| 4099 | + $original_post_id = ''; |
|
| 4100 | 4100 | |
| 4101 | - $c = 0; |
|
| 4102 | - foreach ($columns as $column ) {
|
|
| 4103 | - $gd_post[$column] = $row[$c]; |
|
| 4101 | + $c = 0; |
|
| 4102 | + foreach ($columns as $column ) {
|
|
| 4103 | + $gd_post[$column] = $row[$c]; |
|
| 4104 | 4104 | |
| 4105 | - if ( $column == 'post_id' ) {
|
|
| 4106 | - $post_id = $row[$c]; |
|
| 4107 | - } else if ( $column == 'post_title' ) {
|
|
| 4108 | - $post_title = sanitize_text_field($row[$c]); |
|
| 4109 | - } else if ( $column == 'post_author' ) {
|
|
| 4110 | - $post_author = $row[$c]; |
|
| 4111 | - } else if ( $column == 'post_content' ) {
|
|
| 4112 | - $post_content = $row[$c]; |
|
| 4113 | - } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
| 4114 | - $post_category_arr = explode( ',', $row[$c] ); |
|
| 4115 | - } else if ( $column == 'default_category' ) {
|
|
| 4116 | - $default_category = wp_kses_normalize_entities($row[$c]); |
|
| 4117 | - } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
| 4118 | - $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
| 4119 | - } else if ( $column == 'post_type' ) {
|
|
| 4120 | - $post_type = $row[$c]; |
|
| 4121 | - } else if ( $column == 'post_status' ) {
|
|
| 4122 | - $post_status = sanitize_key( $row[$c] ); |
|
| 4123 | - } else if ( $column == 'is_featured' ) {
|
|
| 4124 | - $is_featured = (int)$row[$c]; |
|
| 4125 | - } else if ( $column == 'geodir_video' ) {
|
|
| 4126 | - $geodir_video = $row[$c]; |
|
| 4127 | - } else if ( $column == 'post_address' ) {
|
|
| 4128 | - $post_address = sanitize_text_field($row[$c]); |
|
| 4129 | - } else if ( $column == 'post_city' ) {
|
|
| 4130 | - $post_city = sanitize_text_field($row[$c]); |
|
| 4131 | - } else if ( $column == 'post_region' ) {
|
|
| 4132 | - $post_region = sanitize_text_field($row[$c]); |
|
| 4133 | - } else if ( $column == 'post_country' ) {
|
|
| 4134 | - $post_country = sanitize_text_field($row[$c]); |
|
| 4135 | - } else if ( $column == 'post_zip' ) {
|
|
| 4136 | - $post_zip = sanitize_text_field($row[$c]); |
|
| 4137 | - } else if ( $column == 'post_latitude' ) {
|
|
| 4138 | - $post_latitude = sanitize_text_field($row[$c]); |
|
| 4139 | - } else if ( $column == 'post_longitude' ) {
|
|
| 4140 | - $post_longitude = sanitize_text_field($row[$c]); |
|
| 4141 | - } else if ( $column == 'post_neighbourhood' ) {
|
|
| 4142 | - $post_neighbourhood = sanitize_text_field($row[$c]); |
|
| 4143 | - unset($gd_post[$column]); |
|
| 4144 | - } else if ( $column == 'neighbourhood_latitude' ) {
|
|
| 4145 | - $neighbourhood_latitude = sanitize_text_field($row[$c]); |
|
| 4146 | - } else if ( $column == 'neighbourhood_longitude' ) {
|
|
| 4147 | - $neighbourhood_longitude = sanitize_text_field($row[$c]); |
|
| 4148 | - } else if ( $column == 'geodir_timing' ) {
|
|
| 4149 | - $geodir_timing = sanitize_text_field($row[$c]); |
|
| 4150 | - } else if ( $column == 'geodir_contact' ) {
|
|
| 4151 | - $geodir_contact = sanitize_text_field($row[$c]); |
|
| 4152 | - } else if ( $column == 'geodir_email' ) {
|
|
| 4153 | - $geodir_email = sanitize_email($row[$c]); |
|
| 4154 | - } else if ( $column == 'geodir_website' ) {
|
|
| 4155 | - $geodir_website = sanitize_text_field($row[$c]); |
|
| 4156 | - } else if ( $column == 'geodir_twitter' ) {
|
|
| 4157 | - $geodir_twitter = sanitize_text_field($row[$c]); |
|
| 4158 | - } else if ( $column == 'geodir_facebook' ) {
|
|
| 4159 | - $geodir_facebook = sanitize_text_field($row[$c]); |
|
| 4160 | - } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
| 4161 | - $post_images[] = $row[$c]; |
|
| 4162 | - } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
| 4163 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
| 4164 | - } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
| 4165 | - $row[$c] = str_replace('/', '-', $row[$c]);
|
|
| 4166 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
| 4167 | - } |
|
| 4168 | - // WPML |
|
| 4169 | - if ($is_wpml) {
|
|
| 4170 | - if ($column == 'language') {
|
|
| 4171 | - $language = geodir_strtolower(trim($row[$c])); |
|
| 4172 | - } else if ($column == 'original_post_id') {
|
|
| 4173 | - $original_post_id = (int)$row[$c]; |
|
| 4174 | - } |
|
| 4175 | - } |
|
| 4176 | - // WPML |
|
| 4177 | - $c++; |
|
| 4178 | - } |
|
| 4179 | - // listing claimed or not |
|
| 4180 | - if ($is_claim_active && isset($gd_post['claimed'])) {
|
|
| 4181 | - $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4182 | - } |
|
| 4105 | + if ( $column == 'post_id' ) {
|
|
| 4106 | + $post_id = $row[$c]; |
|
| 4107 | + } else if ( $column == 'post_title' ) {
|
|
| 4108 | + $post_title = sanitize_text_field($row[$c]); |
|
| 4109 | + } else if ( $column == 'post_author' ) {
|
|
| 4110 | + $post_author = $row[$c]; |
|
| 4111 | + } else if ( $column == 'post_content' ) {
|
|
| 4112 | + $post_content = $row[$c]; |
|
| 4113 | + } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
| 4114 | + $post_category_arr = explode( ',', $row[$c] ); |
|
| 4115 | + } else if ( $column == 'default_category' ) {
|
|
| 4116 | + $default_category = wp_kses_normalize_entities($row[$c]); |
|
| 4117 | + } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
| 4118 | + $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
| 4119 | + } else if ( $column == 'post_type' ) {
|
|
| 4120 | + $post_type = $row[$c]; |
|
| 4121 | + } else if ( $column == 'post_status' ) {
|
|
| 4122 | + $post_status = sanitize_key( $row[$c] ); |
|
| 4123 | + } else if ( $column == 'is_featured' ) {
|
|
| 4124 | + $is_featured = (int)$row[$c]; |
|
| 4125 | + } else if ( $column == 'geodir_video' ) {
|
|
| 4126 | + $geodir_video = $row[$c]; |
|
| 4127 | + } else if ( $column == 'post_address' ) {
|
|
| 4128 | + $post_address = sanitize_text_field($row[$c]); |
|
| 4129 | + } else if ( $column == 'post_city' ) {
|
|
| 4130 | + $post_city = sanitize_text_field($row[$c]); |
|
| 4131 | + } else if ( $column == 'post_region' ) {
|
|
| 4132 | + $post_region = sanitize_text_field($row[$c]); |
|
| 4133 | + } else if ( $column == 'post_country' ) {
|
|
| 4134 | + $post_country = sanitize_text_field($row[$c]); |
|
| 4135 | + } else if ( $column == 'post_zip' ) {
|
|
| 4136 | + $post_zip = sanitize_text_field($row[$c]); |
|
| 4137 | + } else if ( $column == 'post_latitude' ) {
|
|
| 4138 | + $post_latitude = sanitize_text_field($row[$c]); |
|
| 4139 | + } else if ( $column == 'post_longitude' ) {
|
|
| 4140 | + $post_longitude = sanitize_text_field($row[$c]); |
|
| 4141 | + } else if ( $column == 'post_neighbourhood' ) {
|
|
| 4142 | + $post_neighbourhood = sanitize_text_field($row[$c]); |
|
| 4143 | + unset($gd_post[$column]); |
|
| 4144 | + } else if ( $column == 'neighbourhood_latitude' ) {
|
|
| 4145 | + $neighbourhood_latitude = sanitize_text_field($row[$c]); |
|
| 4146 | + } else if ( $column == 'neighbourhood_longitude' ) {
|
|
| 4147 | + $neighbourhood_longitude = sanitize_text_field($row[$c]); |
|
| 4148 | + } else if ( $column == 'geodir_timing' ) {
|
|
| 4149 | + $geodir_timing = sanitize_text_field($row[$c]); |
|
| 4150 | + } else if ( $column == 'geodir_contact' ) {
|
|
| 4151 | + $geodir_contact = sanitize_text_field($row[$c]); |
|
| 4152 | + } else if ( $column == 'geodir_email' ) {
|
|
| 4153 | + $geodir_email = sanitize_email($row[$c]); |
|
| 4154 | + } else if ( $column == 'geodir_website' ) {
|
|
| 4155 | + $geodir_website = sanitize_text_field($row[$c]); |
|
| 4156 | + } else if ( $column == 'geodir_twitter' ) {
|
|
| 4157 | + $geodir_twitter = sanitize_text_field($row[$c]); |
|
| 4158 | + } else if ( $column == 'geodir_facebook' ) {
|
|
| 4159 | + $geodir_facebook = sanitize_text_field($row[$c]); |
|
| 4160 | + } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
| 4161 | + $post_images[] = $row[$c]; |
|
| 4162 | + } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
| 4163 | + $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
| 4164 | + } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
| 4165 | + $row[$c] = str_replace('/', '-', $row[$c]);
|
|
| 4166 | + $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
| 4167 | + } |
|
| 4168 | + // WPML |
|
| 4169 | + if ($is_wpml) {
|
|
| 4170 | + if ($column == 'language') {
|
|
| 4171 | + $language = geodir_strtolower(trim($row[$c])); |
|
| 4172 | + } else if ($column == 'original_post_id') {
|
|
| 4173 | + $original_post_id = (int)$row[$c]; |
|
| 4174 | + } |
|
| 4175 | + } |
|
| 4176 | + // WPML |
|
| 4177 | + $c++; |
|
| 4178 | + } |
|
| 4179 | + // listing claimed or not |
|
| 4180 | + if ($is_claim_active && isset($gd_post['claimed'])) {
|
|
| 4181 | + $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4182 | + } |
|
| 4183 | 4183 | |
| 4184 | - // WPML |
|
| 4185 | - if ($is_wpml && $language != '') {
|
|
| 4186 | - $sitepress->switch_lang($language, true); |
|
| 4187 | - } |
|
| 4188 | - // WPML |
|
| 4184 | + // WPML |
|
| 4185 | + if ($is_wpml && $language != '') {
|
|
| 4186 | + $sitepress->switch_lang($language, true); |
|
| 4187 | + } |
|
| 4188 | + // WPML |
|
| 4189 | 4189 | |
| 4190 | - $gd_post['IMAGE'] = $post_images; |
|
| 4190 | + $gd_post['IMAGE'] = $post_images; |
|
| 4191 | 4191 | |
| 4192 | - $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 4193 | - $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 4192 | + $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 4193 | + $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 4194 | 4194 | |
| 4195 | - $valid = true; |
|
| 4195 | + $valid = true; |
|
| 4196 | 4196 | |
| 4197 | - if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
| 4198 | - $invalid++; |
|
| 4199 | - $valid = false; |
|
| 4200 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 4201 | - } |
|
| 4202 | - $xtimings['###3'] = microtime(true)-$xstart; |
|
| 4203 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 4204 | - if ( $location_allowed ) {
|
|
| 4205 | - $location_result = geodir_get_default_location(); |
|
| 4206 | - if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
| 4207 | - $invalid_addr++; |
|
| 4208 | - $valid = false; |
|
| 4209 | - 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' ) ); |
|
| 4210 | - } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
| 4211 | - 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 | - $invalid_addr++; |
|
| 4213 | - $valid = false; |
|
| 4214 | - 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' ) ); |
|
| 4215 | - } else {
|
|
| 4216 | - if (!$location_manager) {
|
|
| 4217 | - $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. |
|
| 4218 | - } |
|
| 4219 | - } |
|
| 4220 | - } |
|
| 4221 | - } |
|
| 4222 | - $xtimings['###4'] = microtime(true)-$xstart; |
|
| 4223 | - if ( !$valid ) {
|
|
| 4224 | - continue; |
|
| 4225 | - } |
|
| 4197 | + if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
| 4198 | + $invalid++; |
|
| 4199 | + $valid = false; |
|
| 4200 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 4201 | + } |
|
| 4202 | + $xtimings['###3'] = microtime(true)-$xstart; |
|
| 4203 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 4204 | + if ( $location_allowed ) {
|
|
| 4205 | + $location_result = geodir_get_default_location(); |
|
| 4206 | + if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
| 4207 | + $invalid_addr++; |
|
| 4208 | + $valid = false; |
|
| 4209 | + 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' ) ); |
|
| 4210 | + } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
| 4211 | + 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 | + $invalid_addr++; |
|
| 4213 | + $valid = false; |
|
| 4214 | + 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' ) ); |
|
| 4215 | + } else {
|
|
| 4216 | + if (!$location_manager) {
|
|
| 4217 | + $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. |
|
| 4218 | + } |
|
| 4219 | + } |
|
| 4220 | + } |
|
| 4221 | + } |
|
| 4222 | + $xtimings['###4'] = microtime(true)-$xstart; |
|
| 4223 | + if ( !$valid ) {
|
|
| 4224 | + continue; |
|
| 4225 | + } |
|
| 4226 | 4226 | |
| 4227 | - $cat_taxonomy = $post_type . 'category'; |
|
| 4228 | - $tags_taxonomy = $post_type . '_tags'; |
|
| 4227 | + $cat_taxonomy = $post_type . 'category'; |
|
| 4228 | + $tags_taxonomy = $post_type . '_tags'; |
|
| 4229 | 4229 | |
| 4230 | - if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
|
| 4231 | - $post_category_arr = array_merge(array($default_category), $post_category_arr); |
|
| 4232 | - } |
|
| 4230 | + if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
|
| 4231 | + $post_category_arr = array_merge(array($default_category), $post_category_arr); |
|
| 4232 | + } |
|
| 4233 | 4233 | |
| 4234 | - $post_category = array(); |
|
| 4235 | - $default_category_id = NULL; |
|
| 4236 | - if ( !empty( $post_category_arr ) ) {
|
|
| 4237 | - foreach ( $post_category_arr as $value ) {
|
|
| 4238 | - $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
| 4234 | + $post_category = array(); |
|
| 4235 | + $default_category_id = NULL; |
|
| 4236 | + if ( !empty( $post_category_arr ) ) {
|
|
| 4237 | + foreach ( $post_category_arr as $value ) {
|
|
| 4238 | + $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
| 4239 | 4239 | |
| 4240 | - if ( $category_name != '' ) {
|
|
| 4241 | - $term_category = array(); |
|
| 4240 | + if ( $category_name != '' ) {
|
|
| 4241 | + $term_category = array(); |
|
| 4242 | 4242 | |
| 4243 | - if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
| 4244 | - $term_category = $term; |
|
| 4245 | - } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
| 4246 | - $term_category = $term; |
|
| 4247 | - } else {
|
|
| 4248 | - $term_data = array(); |
|
| 4249 | - $term_data['name'] = $category_name; |
|
| 4250 | - $term_data['taxonomy'] = $cat_taxonomy; |
|
| 4243 | + if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
| 4244 | + $term_category = $term; |
|
| 4245 | + } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
| 4246 | + $term_category = $term; |
|
| 4247 | + } else {
|
|
| 4248 | + $term_data = array(); |
|
| 4249 | + $term_data['name'] = $category_name; |
|
| 4250 | + $term_data['taxonomy'] = $cat_taxonomy; |
|
| 4251 | 4251 | |
| 4252 | - $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
| 4253 | - if ( $term_id ) {
|
|
| 4254 | - $term_category = get_term( $term_id, $cat_taxonomy ); |
|
| 4255 | - } |
|
| 4256 | - } |
|
| 4252 | + $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
| 4253 | + if ( $term_id ) {
|
|
| 4254 | + $term_category = get_term( $term_id, $cat_taxonomy ); |
|
| 4255 | + } |
|
| 4256 | + } |
|
| 4257 | 4257 | |
| 4258 | - if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
| 4259 | - $post_category[] = intval($term_category->term_id); |
|
| 4258 | + if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
| 4259 | + $post_category[] = intval($term_category->term_id); |
|
| 4260 | 4260 | |
| 4261 | - if ($category_name == $default_category) {
|
|
| 4262 | - $default_category_id = intval($term_category->term_id); |
|
| 4263 | - } |
|
| 4264 | - } |
|
| 4265 | - } |
|
| 4266 | - } |
|
| 4267 | - } |
|
| 4268 | - $xtimings['###5'] = microtime(true)-$xstart; |
|
| 4269 | - $save_post = array(); |
|
| 4270 | - $save_post['post_title'] = $post_title; |
|
| 4271 | - $save_post['post_content'] = $post_content; |
|
| 4272 | - $save_post['post_type'] = $post_type; |
|
| 4273 | - $save_post['post_author'] = $post_author; |
|
| 4274 | - $save_post['post_status'] = $post_status; |
|
| 4275 | - $save_post['post_category'] = $post_category; |
|
| 4276 | - $save_post['post_tags'] = $post_tags; |
|
| 4277 | - |
|
| 4278 | - $saved_post_id = NULL; |
|
| 4279 | - if ( $import_choice == 'update' ) {
|
|
| 4280 | - $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
| 4261 | + if ($category_name == $default_category) {
|
|
| 4262 | + $default_category_id = intval($term_category->term_id); |
|
| 4263 | + } |
|
| 4264 | + } |
|
| 4265 | + } |
|
| 4266 | + } |
|
| 4267 | + } |
|
| 4268 | + $xtimings['###5'] = microtime(true)-$xstart; |
|
| 4269 | + $save_post = array(); |
|
| 4270 | + $save_post['post_title'] = $post_title; |
|
| 4271 | + $save_post['post_content'] = $post_content; |
|
| 4272 | + $save_post['post_type'] = $post_type; |
|
| 4273 | + $save_post['post_author'] = $post_author; |
|
| 4274 | + $save_post['post_status'] = $post_status; |
|
| 4275 | + $save_post['post_category'] = $post_category; |
|
| 4276 | + $save_post['post_tags'] = $post_tags; |
|
| 4277 | + |
|
| 4278 | + $saved_post_id = NULL; |
|
| 4279 | + if ( $import_choice == 'update' ) {
|
|
| 4280 | + $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
| 4281 | 4281 | |
| 4282 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4283 | - $save_post['ID'] = $post_id; |
|
| 4282 | + if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4283 | + $save_post['ID'] = $post_id; |
|
| 4284 | 4284 | |
| 4285 | - if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
| 4286 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4287 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4288 | - $saved_post_id = 0; |
|
| 4289 | - } else {
|
|
| 4290 | - $saved_post_id = $post_id; |
|
| 4291 | - $updated++; |
|
| 4292 | - } |
|
| 4293 | - } |
|
| 4294 | - } else {
|
|
| 4295 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4296 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4297 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4298 | - $saved_post_id = 0; |
|
| 4299 | - } else {
|
|
| 4300 | - $created++; |
|
| 4301 | - } |
|
| 4302 | - } |
|
| 4303 | - } |
|
| 4285 | + if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
| 4286 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4287 | + $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4288 | + $saved_post_id = 0; |
|
| 4289 | + } else {
|
|
| 4290 | + $saved_post_id = $post_id; |
|
| 4291 | + $updated++; |
|
| 4292 | + } |
|
| 4293 | + } |
|
| 4294 | + } else {
|
|
| 4295 | + if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4296 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4297 | + $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4298 | + $saved_post_id = 0; |
|
| 4299 | + } else {
|
|
| 4300 | + $created++; |
|
| 4301 | + } |
|
| 4302 | + } |
|
| 4303 | + } |
|
| 4304 | 4304 | |
| 4305 | - if ( !$saved_post_id > 0 ) {
|
|
| 4306 | - $invalid++; |
|
| 4307 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
| 4308 | - } |
|
| 4309 | - } else if ( $import_choice == 'skip' ) {
|
|
| 4310 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4311 | - $skipped++; |
|
| 4312 | - } else {
|
|
| 4313 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4314 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4315 | - $invalid++; |
|
| 4305 | + if ( !$saved_post_id > 0 ) {
|
|
| 4306 | + $invalid++; |
|
| 4307 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
| 4308 | + } |
|
| 4309 | + } else if ( $import_choice == 'skip' ) {
|
|
| 4310 | + if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4311 | + $skipped++; |
|
| 4312 | + } else {
|
|
| 4313 | + if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4314 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4315 | + $invalid++; |
|
| 4316 | 4316 | |
| 4317 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
| 4318 | - $saved_post_id = 0; |
|
| 4319 | - } else {
|
|
| 4320 | - $created++; |
|
| 4321 | - } |
|
| 4322 | - } else {
|
|
| 4323 | - $invalid++; |
|
| 4317 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
| 4318 | + $saved_post_id = 0; |
|
| 4319 | + } else {
|
|
| 4320 | + $created++; |
|
| 4321 | + } |
|
| 4322 | + } else {
|
|
| 4323 | + $invalid++; |
|
| 4324 | 4324 | |
| 4325 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4326 | - } |
|
| 4327 | - } |
|
| 4328 | - } else {
|
|
| 4329 | - $invalid++; |
|
| 4325 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4326 | + } |
|
| 4327 | + } |
|
| 4328 | + } else {
|
|
| 4329 | + $invalid++; |
|
| 4330 | 4330 | |
| 4331 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4332 | - } |
|
| 4333 | - $xtimings['###6'] = microtime(true)-$xstart; |
|
| 4334 | - if ( (int)$saved_post_id > 0 ) {
|
|
| 4335 | - // WPML |
|
| 4336 | - if ($is_wpml && $original_post_id > 0 && $language != '') {
|
|
| 4337 | - $wpml_post_type = 'post_' . $post_type; |
|
| 4338 | - $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
| 4339 | - $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 4340 | - |
|
| 4341 | - $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
| 4331 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4332 | + } |
|
| 4333 | + $xtimings['###6'] = microtime(true)-$xstart; |
|
| 4334 | + if ( (int)$saved_post_id > 0 ) {
|
|
| 4335 | + // WPML |
|
| 4336 | + if ($is_wpml && $original_post_id > 0 && $language != '') {
|
|
| 4337 | + $wpml_post_type = 'post_' . $post_type; |
|
| 4338 | + $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
| 4339 | + $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 4340 | + |
|
| 4341 | + $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
| 4342 | 4342 | |
| 4343 | - $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
| 4344 | - } |
|
| 4345 | - // WPML |
|
| 4346 | - $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
| 4343 | + $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
| 4344 | + } |
|
| 4345 | + // WPML |
|
| 4346 | + $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
| 4347 | 4347 | |
| 4348 | - $gd_post['post_id'] = $saved_post_id; |
|
| 4349 | - $gd_post['ID'] = $saved_post_id; |
|
| 4350 | - $gd_post['post_tags'] = $post_tags; |
|
| 4351 | - $gd_post['post_title'] = $post_title; |
|
| 4352 | - $gd_post['post_status'] = $post_status; |
|
| 4353 | - $gd_post['submit_time'] = time(); |
|
| 4354 | - $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 4348 | + $gd_post['post_id'] = $saved_post_id; |
|
| 4349 | + $gd_post['ID'] = $saved_post_id; |
|
| 4350 | + $gd_post['post_tags'] = $post_tags; |
|
| 4351 | + $gd_post['post_title'] = $post_title; |
|
| 4352 | + $gd_post['post_status'] = $post_status; |
|
| 4353 | + $gd_post['submit_time'] = time(); |
|
| 4354 | + $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 4355 | 4355 | |
| 4356 | - // post location |
|
| 4357 | - $post_location_id = 0; |
|
| 4358 | - if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
| 4359 | - $gd_post['post_neighbourhood'] = ''; |
|
| 4356 | + // post location |
|
| 4357 | + $post_location_id = 0; |
|
| 4358 | + if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
| 4359 | + $gd_post['post_neighbourhood'] = ''; |
|
| 4360 | 4360 | |
| 4361 | - $post_location_info = array( |
|
| 4362 | - 'city' => $post_city, |
|
| 4363 | - 'region' => $post_region, |
|
| 4364 | - 'country' => $post_country, |
|
| 4365 | - 'geo_lat' => $post_latitude, |
|
| 4366 | - 'geo_lng' => $post_longitude |
|
| 4367 | - ); |
|
| 4368 | - if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
| 4369 | - $post_location_id = $location_id; |
|
| 4370 | - } |
|
| 4361 | + $post_location_info = array( |
|
| 4362 | + 'city' => $post_city, |
|
| 4363 | + 'region' => $post_region, |
|
| 4364 | + 'country' => $post_country, |
|
| 4365 | + 'geo_lat' => $post_latitude, |
|
| 4366 | + 'geo_lng' => $post_longitude |
|
| 4367 | + ); |
|
| 4368 | + if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
| 4369 | + $post_location_id = $location_id; |
|
| 4370 | + } |
|
| 4371 | 4371 | |
| 4372 | - if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {
|
|
| 4373 | - $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id); |
|
| 4372 | + if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {
|
|
| 4373 | + $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id); |
|
| 4374 | 4374 | |
| 4375 | - $hood_data = array(); |
|
| 4376 | - $hood_data['hood_location_id'] = $post_location_id; |
|
| 4377 | - $hood_data['hood_name'] = $post_neighbourhood; |
|
| 4375 | + $hood_data = array(); |
|
| 4376 | + $hood_data['hood_location_id'] = $post_location_id; |
|
| 4377 | + $hood_data['hood_name'] = $post_neighbourhood; |
|
| 4378 | 4378 | |
| 4379 | - if (!empty($neighbourhood_info)) {
|
|
| 4380 | - $hood_data['hood_id'] = $neighbourhood_info->hood_id; |
|
| 4381 | - $hood_data['hood_slug'] = $neighbourhood_info->hood_slug; |
|
| 4379 | + if (!empty($neighbourhood_info)) {
|
|
| 4380 | + $hood_data['hood_id'] = $neighbourhood_info->hood_id; |
|
| 4381 | + $hood_data['hood_slug'] = $neighbourhood_info->hood_slug; |
|
| 4382 | 4382 | |
| 4383 | - if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4384 | - $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4385 | - $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4386 | - } |
|
| 4387 | - } |
|
| 4383 | + if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4384 | + $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4385 | + $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4386 | + } |
|
| 4387 | + } |
|
| 4388 | 4388 | |
| 4389 | - if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4390 | - $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4391 | - $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4392 | - } |
|
| 4389 | + if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4390 | + $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4391 | + $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4392 | + } |
|
| 4393 | 4393 | |
| 4394 | - $hood_data['hood_latitude'] = $post_latitude; |
|
| 4395 | - $hood_data['hood_longitude'] = $post_longitude; |
|
| 4396 | - |
|
| 4397 | - $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data); |
|
| 4398 | - if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {
|
|
| 4399 | - $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug; |
|
| 4400 | - } |
|
| 4401 | - } |
|
| 4402 | - } |
|
| 4403 | - $gd_post['post_location_id'] = $post_location_id; |
|
| 4394 | + $hood_data['hood_latitude'] = $post_latitude; |
|
| 4395 | + $hood_data['hood_longitude'] = $post_longitude; |
|
| 4396 | + |
|
| 4397 | + $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data); |
|
| 4398 | + if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {
|
|
| 4399 | + $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug; |
|
| 4400 | + } |
|
| 4401 | + } |
|
| 4402 | + } |
|
| 4403 | + $gd_post['post_location_id'] = $post_location_id; |
|
| 4404 | 4404 | |
| 4405 | - // post package info |
|
| 4406 | - $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
| 4407 | - if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
|
| 4408 | - $package_id = $gd_post_info->package_id; |
|
| 4409 | - } |
|
| 4405 | + // post package info |
|
| 4406 | + $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
| 4407 | + if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
|
| 4408 | + $package_id = $gd_post_info->package_id; |
|
| 4409 | + } |
|
| 4410 | 4410 | |
| 4411 | - $package_info = array(); |
|
| 4412 | - if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
|
| 4413 | - $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
| 4411 | + $package_info = array(); |
|
| 4412 | + if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
|
| 4413 | + $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
| 4414 | 4414 | |
| 4415 | - if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
|
| 4416 | - $package_info = array(); |
|
| 4417 | - } |
|
| 4418 | - } |
|
| 4415 | + if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
|
| 4416 | + $package_info = array(); |
|
| 4417 | + } |
|
| 4418 | + } |
|
| 4419 | 4419 | |
| 4420 | - if (empty($package_info)) {
|
|
| 4421 | - $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
| 4422 | - } |
|
| 4420 | + if (empty($package_info)) {
|
|
| 4421 | + $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
| 4422 | + } |
|
| 4423 | 4423 | |
| 4424 | - if (!empty($package_info)) {
|
|
| 4425 | - $package_id = $package_info['pid']; |
|
| 4424 | + if (!empty($package_info)) {
|
|
| 4425 | + $package_id = $package_info['pid']; |
|
| 4426 | 4426 | |
| 4427 | - if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
|
| 4428 | - $gd_post['expire_date'] = $expire_date; |
|
| 4429 | - } else {
|
|
| 4430 | - if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
| 4431 | - $gd_post['alive_days'] = (int)$package_info['days']; |
|
| 4432 | - $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
| 4433 | - } else {
|
|
| 4434 | - $gd_post['expire_date'] = 'Never'; |
|
| 4435 | - } |
|
| 4436 | - } |
|
| 4427 | + if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
|
| 4428 | + $gd_post['expire_date'] = $expire_date; |
|
| 4429 | + } else {
|
|
| 4430 | + if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
| 4431 | + $gd_post['alive_days'] = (int)$package_info['days']; |
|
| 4432 | + $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
| 4433 | + } else {
|
|
| 4434 | + $gd_post['expire_date'] = 'Never'; |
|
| 4435 | + } |
|
| 4436 | + } |
|
| 4437 | 4437 | |
| 4438 | - $gd_post['package_id'] = $package_id; |
|
| 4439 | - } |
|
| 4438 | + $gd_post['package_id'] = $package_id; |
|
| 4439 | + } |
|
| 4440 | 4440 | |
| 4441 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 4441 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 4442 | 4442 | |
| 4443 | - if ($post_type == 'gd_event') {
|
|
| 4444 | - $gd_post = geodir_imex_process_event_data($gd_post); |
|
| 4445 | - } |
|
| 4443 | + if ($post_type == 'gd_event') {
|
|
| 4444 | + $gd_post = geodir_imex_process_event_data($gd_post); |
|
| 4445 | + } |
|
| 4446 | 4446 | |
| 4447 | - if (isset($gd_post['post_id'])) {
|
|
| 4448 | - unset($gd_post['post_id']); |
|
| 4449 | - } |
|
| 4447 | + if (isset($gd_post['post_id'])) {
|
|
| 4448 | + unset($gd_post['post_id']); |
|
| 4449 | + } |
|
| 4450 | 4450 | |
| 4451 | - // Export franchise fields |
|
| 4452 | - $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 4453 | - if ($is_franchise_active) {
|
|
| 4454 | - if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {
|
|
| 4455 | - $gd_franchise_lock = array(); |
|
| 4451 | + // Export franchise fields |
|
| 4452 | + $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 4453 | + if ($is_franchise_active) {
|
|
| 4454 | + if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {
|
|
| 4455 | + $gd_franchise_lock = array(); |
|
| 4456 | 4456 | |
| 4457 | - if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
| 4458 | - $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
| 4459 | - $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
| 4460 | - $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
| 4461 | - } |
|
| 4457 | + if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
| 4458 | + $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
| 4459 | + $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
| 4460 | + $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
| 4461 | + } |
|
| 4462 | 4462 | |
| 4463 | - update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
| 4464 | - update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
| 4465 | - } else {
|
|
| 4466 | - if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
| 4467 | - geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
| 4468 | - } |
|
| 4469 | - } |
|
| 4470 | - } |
|
| 4463 | + update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
| 4464 | + update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
| 4465 | + } else {
|
|
| 4466 | + if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
| 4467 | + geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
| 4468 | + } |
|
| 4469 | + } |
|
| 4470 | + } |
|
| 4471 | 4471 | |
| 4472 | - if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
|
| 4473 | - $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
| 4474 | - if ($default_category_id) {
|
|
| 4475 | - $save_post['post_default_category'] = $default_category_id; |
|
| 4476 | - $gd_post['default_category'] = $default_category_id; |
|
| 4477 | - } |
|
| 4478 | - $gd_post[$cat_taxonomy] = $save_post['post_category']; |
|
| 4479 | - } |
|
| 4480 | - $xtimings['###7'] = microtime(true)-$xstart; |
|
| 4481 | - // Save post info |
|
| 4482 | - geodir_save_post_info( $saved_post_id, $gd_post ); |
|
| 4483 | - $xtimings['###8'] = microtime(true)-$xstart; |
|
| 4484 | - // post taxonomies |
|
| 4485 | - if ( !empty( $save_post['post_category'] ) ) {
|
|
| 4486 | - wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
| 4472 | + if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
|
| 4473 | + $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
| 4474 | + if ($default_category_id) {
|
|
| 4475 | + $save_post['post_default_category'] = $default_category_id; |
|
| 4476 | + $gd_post['default_category'] = $default_category_id; |
|
| 4477 | + } |
|
| 4478 | + $gd_post[$cat_taxonomy] = $save_post['post_category']; |
|
| 4479 | + } |
|
| 4480 | + $xtimings['###7'] = microtime(true)-$xstart; |
|
| 4481 | + // Save post info |
|
| 4482 | + geodir_save_post_info( $saved_post_id, $gd_post ); |
|
| 4483 | + $xtimings['###8'] = microtime(true)-$xstart; |
|
| 4484 | + // post taxonomies |
|
| 4485 | + if ( !empty( $save_post['post_category'] ) ) {
|
|
| 4486 | + wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
| 4487 | 4487 | |
| 4488 | - $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
| 4489 | - if ($default_category_id) {
|
|
| 4490 | - $post_default_category = $default_category_id; |
|
| 4491 | - } |
|
| 4492 | - $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
|
| 4493 | - $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
|
| 4494 | - $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
| 4488 | + $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
| 4489 | + if ($default_category_id) {
|
|
| 4490 | + $post_default_category = $default_category_id; |
|
| 4491 | + } |
|
| 4492 | + $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
|
| 4493 | + $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
|
| 4494 | + $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
| 4495 | 4495 | |
| 4496 | - if ($post_category_str != '' && $post_default_category) {
|
|
| 4497 | - $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
| 4498 | - } |
|
| 4496 | + if ($post_category_str != '' && $post_default_category) {
|
|
| 4497 | + $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
| 4498 | + } |
|
| 4499 | 4499 | |
| 4500 | - $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
|
| 4500 | + $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
|
| 4501 | 4501 | |
| 4502 | - geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
| 4503 | - } |
|
| 4504 | - $xtimings['###8.1'] = microtime(true)-$xstart; |
|
| 4505 | - if ( !empty( $save_post['post_tags'] ) ) {
|
|
| 4506 | - wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
| 4507 | - } |
|
| 4508 | - $xtimings['###9'] = microtime(true)-$xstart; |
|
| 4509 | - // Post images |
|
| 4510 | - if ( !empty( $post_images ) ) {
|
|
| 4511 | - $post_images = array_unique($post_images); |
|
| 4502 | + geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
| 4503 | + } |
|
| 4504 | + $xtimings['###8.1'] = microtime(true)-$xstart; |
|
| 4505 | + if ( !empty( $save_post['post_tags'] ) ) {
|
|
| 4506 | + wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
| 4507 | + } |
|
| 4508 | + $xtimings['###9'] = microtime(true)-$xstart; |
|
| 4509 | + // Post images |
|
| 4510 | + if ( !empty( $post_images ) ) {
|
|
| 4511 | + $post_images = array_unique($post_images); |
|
| 4512 | 4512 | |
| 4513 | - $old_post_images_arr = array(); |
|
| 4514 | - $saved_post_images_arr = array(); |
|
| 4513 | + $old_post_images_arr = array(); |
|
| 4514 | + $saved_post_images_arr = array(); |
|
| 4515 | 4515 | |
| 4516 | - $order = 1; |
|
| 4516 | + $order = 1; |
|
| 4517 | 4517 | |
| 4518 | - $old_post_images = geodir_get_images( $saved_post_id ); |
|
| 4519 | - $xtimings['###9.1'] = microtime(true)-$xstart; |
|
| 4520 | - if (!empty($old_post_images)) {
|
|
| 4521 | - foreach( $old_post_images as $old_post_image ) {
|
|
| 4522 | - if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
|
| 4523 | - $old_post_images_arr[] = $old_post_image->file; |
|
| 4524 | - } |
|
| 4525 | - } |
|
| 4526 | - } |
|
| 4518 | + $old_post_images = geodir_get_images( $saved_post_id ); |
|
| 4519 | + $xtimings['###9.1'] = microtime(true)-$xstart; |
|
| 4520 | + if (!empty($old_post_images)) {
|
|
| 4521 | + foreach( $old_post_images as $old_post_image ) {
|
|
| 4522 | + if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
|
| 4523 | + $old_post_images_arr[] = $old_post_image->file; |
|
| 4524 | + } |
|
| 4525 | + } |
|
| 4526 | + } |
|
| 4527 | 4527 | |
| 4528 | - foreach ( $post_images as $post_image ) {
|
|
| 4529 | - $image_name = basename( $post_image ); |
|
| 4530 | - $saved_post_images_arr[] = $image_name; |
|
| 4528 | + foreach ( $post_images as $post_image ) {
|
|
| 4529 | + $image_name = basename( $post_image ); |
|
| 4530 | + $saved_post_images_arr[] = $image_name; |
|
| 4531 | 4531 | |
| 4532 | - if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
| 4533 | - continue; // Skip if image already exists. |
|
| 4534 | - } |
|
| 4532 | + if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
| 4533 | + continue; // Skip if image already exists. |
|
| 4534 | + } |
|
| 4535 | 4535 | |
| 4536 | - $image_name_parts = explode( '.', $image_name ); |
|
| 4537 | - array_pop( $image_name_parts ); |
|
| 4538 | - $proper_image_name = implode( '.', $image_name_parts ); |
|
| 4539 | - $xtimings['###9.2'] = microtime(true)-$xstart; |
|
| 4540 | - $arr_file_type = wp_check_filetype( $image_name ); |
|
| 4541 | - $xtimings['###9.3'] = microtime(true)-$xstart; |
|
| 4542 | - if ( !empty( $arr_file_type ) ) {
|
|
| 4543 | - $uploaded_file_type = $arr_file_type['type']; |
|
| 4536 | + $image_name_parts = explode( '.', $image_name ); |
|
| 4537 | + array_pop( $image_name_parts ); |
|
| 4538 | + $proper_image_name = implode( '.', $image_name_parts ); |
|
| 4539 | + $xtimings['###9.2'] = microtime(true)-$xstart; |
|
| 4540 | + $arr_file_type = wp_check_filetype( $image_name ); |
|
| 4541 | + $xtimings['###9.3'] = microtime(true)-$xstart; |
|
| 4542 | + if ( !empty( $arr_file_type ) ) {
|
|
| 4543 | + $uploaded_file_type = $arr_file_type['type']; |
|
| 4544 | 4544 | |
| 4545 | - $attachment = array(); |
|
| 4546 | - $attachment['post_id'] = $saved_post_id; |
|
| 4547 | - $attachment['title'] = $proper_image_name; |
|
| 4548 | - $attachment['content'] = ''; |
|
| 4549 | - $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
| 4550 | - $attachment['mime_type'] = $uploaded_file_type; |
|
| 4551 | - $attachment['menu_order'] = $order; |
|
| 4552 | - $attachment['is_featured'] = 0; |
|
| 4553 | - |
|
| 4554 | - $attachment_set = ''; |
|
| 4555 | - foreach ( $attachment as $key => $val ) {
|
|
| 4556 | - if ( $val != '' ) {
|
|
| 4557 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 4558 | - } |
|
| 4559 | - } |
|
| 4560 | - $attachment_set = trim( $attachment_set, ", " ); |
|
| 4545 | + $attachment = array(); |
|
| 4546 | + $attachment['post_id'] = $saved_post_id; |
|
| 4547 | + $attachment['title'] = $proper_image_name; |
|
| 4548 | + $attachment['content'] = ''; |
|
| 4549 | + $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
| 4550 | + $attachment['mime_type'] = $uploaded_file_type; |
|
| 4551 | + $attachment['menu_order'] = $order; |
|
| 4552 | + $attachment['is_featured'] = 0; |
|
| 4553 | + |
|
| 4554 | + $attachment_set = ''; |
|
| 4555 | + foreach ( $attachment as $key => $val ) {
|
|
| 4556 | + if ( $val != '' ) {
|
|
| 4557 | + $attachment_set .= $key . " = '" . $val . "', "; |
|
| 4558 | + } |
|
| 4559 | + } |
|
| 4560 | + $attachment_set = trim( $attachment_set, ", " ); |
|
| 4561 | 4561 | |
| 4562 | - // Add new attachment |
|
| 4563 | - $xtimings['###9.4'] = microtime(true)-$xstart; |
|
| 4564 | - $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
| 4565 | - $xtimings['###9.5'] = microtime(true)-$xstart; |
|
| 4566 | - $order++; |
|
| 4567 | - } |
|
| 4568 | - } |
|
| 4569 | - |
|
| 4570 | - $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
| 4571 | - // Remove previous attachment |
|
| 4572 | - $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
| 4573 | - $xtimings['###9.6'] = microtime(true)-$xstart; |
|
| 4574 | - if ( !empty( $saved_post_images_arr ) ) {
|
|
| 4575 | - geodir_set_wp_featured_image($saved_post_id); |
|
| 4576 | - $xtimings['###9.7'] = microtime(true)-$xstart; |
|
| 4577 | - /* |
|
| 4562 | + // Add new attachment |
|
| 4563 | + $xtimings['###9.4'] = microtime(true)-$xstart; |
|
| 4564 | + $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
| 4565 | + $xtimings['###9.5'] = microtime(true)-$xstart; |
|
| 4566 | + $order++; |
|
| 4567 | + } |
|
| 4568 | + } |
|
| 4569 | + |
|
| 4570 | + $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
| 4571 | + // Remove previous attachment |
|
| 4572 | + $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
| 4573 | + $xtimings['###9.6'] = microtime(true)-$xstart; |
|
| 4574 | + if ( !empty( $saved_post_images_arr ) ) {
|
|
| 4575 | + geodir_set_wp_featured_image($saved_post_id); |
|
| 4576 | + $xtimings['###9.7'] = microtime(true)-$xstart; |
|
| 4577 | + /* |
|
| 4578 | 4578 | $menu_order = 1; |
| 4579 | 4579 | |
| 4580 | 4580 | foreach ( $saved_post_images_arr as $img_name ) {
|
@@ -4587,288 +4587,288 @@ discard block |
||
| 4587 | 4587 | } |
| 4588 | 4588 | $menu_order++; |
| 4589 | 4589 | }*/ |
| 4590 | - } |
|
| 4590 | + } |
|
| 4591 | 4591 | |
| 4592 | - if ( $order > 1 ) {
|
|
| 4593 | - $images++; |
|
| 4594 | - } |
|
| 4595 | - } |
|
| 4596 | - $xtimings['###10'] = microtime(true)-$xstart; |
|
| 4597 | - /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 4598 | - do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
| 4599 | - $xtimings['###11'] = microtime(true)-$xstart; |
|
| 4600 | - if (isset($is_featured)) {
|
|
| 4601 | - geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
|
| 4602 | - } |
|
| 4603 | - if (isset($gd_post['alive_days'])) {
|
|
| 4604 | - geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']); |
|
| 4605 | - } |
|
| 4606 | - if (isset($gd_post['expire_date'])) {
|
|
| 4607 | - geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
|
| 4608 | - } |
|
| 4609 | - $xtimings['###12'] = microtime(true)-$xstart; |
|
| 4610 | - } |
|
| 4592 | + if ( $order > 1 ) {
|
|
| 4593 | + $images++; |
|
| 4594 | + } |
|
| 4595 | + } |
|
| 4596 | + $xtimings['###10'] = microtime(true)-$xstart; |
|
| 4597 | + /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 4598 | + do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
| 4599 | + $xtimings['###11'] = microtime(true)-$xstart; |
|
| 4600 | + if (isset($is_featured)) {
|
|
| 4601 | + geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
|
| 4602 | + } |
|
| 4603 | + if (isset($gd_post['alive_days'])) {
|
|
| 4604 | + geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']); |
|
| 4605 | + } |
|
| 4606 | + if (isset($gd_post['expire_date'])) {
|
|
| 4607 | + geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
|
| 4608 | + } |
|
| 4609 | + $xtimings['###12'] = microtime(true)-$xstart; |
|
| 4610 | + } |
|
| 4611 | 4611 | |
| 4612 | - // WPML |
|
| 4613 | - if ($is_wpml && $language != '') {
|
|
| 4614 | - $sitepress->switch_lang($active_lang, true); |
|
| 4615 | - } |
|
| 4616 | - // WPML |
|
| 4617 | - } |
|
| 4618 | - } |
|
| 4619 | - } |
|
| 4612 | + // WPML |
|
| 4613 | + if ($is_wpml && $language != '') {
|
|
| 4614 | + $sitepress->switch_lang($active_lang, true); |
|
| 4615 | + } |
|
| 4616 | + // WPML |
|
| 4617 | + } |
|
| 4618 | + } |
|
| 4619 | + } |
|
| 4620 | 4620 | |
| 4621 | - //undo some stuff to make the import quicker |
|
| 4622 | - wp_defer_term_counting( false ); |
|
| 4623 | - wp_defer_comment_counting( false ); |
|
| 4624 | - $wpdb->query( 'COMMIT;' ); |
|
| 4625 | - $wpdb->query( 'SET autocommit = 1;' ); |
|
| 4626 | - $xtimings['###13'] = microtime(true)-$xstart; |
|
| 4627 | - $json = array(); |
|
| 4628 | - $json['processed'] = $processed_actual; |
|
| 4629 | - $json['created'] = $created; |
|
| 4630 | - $json['updated'] = $updated; |
|
| 4631 | - $json['skipped'] = $skipped; |
|
| 4632 | - $json['invalid'] = $invalid; |
|
| 4633 | - $json['invalid_addr'] = $invalid_addr; |
|
| 4634 | - $json['images'] = $images; |
|
| 4635 | - $json['timing'] = microtime(true)-$xstart; |
|
| 4636 | - $json['timings'] = $xtimings; |
|
| 4621 | + //undo some stuff to make the import quicker |
|
| 4622 | + wp_defer_term_counting( false ); |
|
| 4623 | + wp_defer_comment_counting( false ); |
|
| 4624 | + $wpdb->query( 'COMMIT;' ); |
|
| 4625 | + $wpdb->query( 'SET autocommit = 1;' ); |
|
| 4626 | + $xtimings['###13'] = microtime(true)-$xstart; |
|
| 4627 | + $json = array(); |
|
| 4628 | + $json['processed'] = $processed_actual; |
|
| 4629 | + $json['created'] = $created; |
|
| 4630 | + $json['updated'] = $updated; |
|
| 4631 | + $json['skipped'] = $skipped; |
|
| 4632 | + $json['invalid'] = $invalid; |
|
| 4633 | + $json['invalid_addr'] = $invalid_addr; |
|
| 4634 | + $json['images'] = $images; |
|
| 4635 | + $json['timing'] = microtime(true)-$xstart; |
|
| 4636 | + $json['timings'] = $xtimings; |
|
| 4637 | 4637 | |
| 4638 | 4638 | |
| 4639 | - wp_send_json( $json ); |
|
| 4640 | - exit; |
|
| 4641 | - } else if ( $task == 'import_loc' ) {
|
|
| 4642 | - global $gd_post_types; |
|
| 4643 | - $gd_post_types = $post_types; |
|
| 4639 | + wp_send_json( $json ); |
|
| 4640 | + exit; |
|
| 4641 | + } else if ( $task == 'import_loc' ) {
|
|
| 4642 | + global $gd_post_types; |
|
| 4643 | + $gd_post_types = $post_types; |
|
| 4644 | 4644 | |
| 4645 | - if (!empty($file)) {
|
|
| 4646 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4645 | + if (!empty($file)) {
|
|
| 4646 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4647 | 4647 | |
| 4648 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4649 | - $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
|
|
| 4650 | - wp_send_json( $json ); |
|
| 4651 | - } |
|
| 4648 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4649 | + $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
|
|
| 4650 | + wp_send_json( $json ); |
|
| 4651 | + } |
|
| 4652 | 4652 | |
| 4653 | - $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
|
| 4654 | - $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
| 4655 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4656 | - $index = $processed + $i; |
|
| 4653 | + $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
|
| 4654 | + $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
| 4655 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4656 | + $index = $processed + $i; |
|
| 4657 | 4657 | |
| 4658 | - if (isset($file[$index])) {
|
|
| 4659 | - $row = $file[$index]; |
|
| 4660 | - $row = array_map( 'trim', $row ); |
|
| 4661 | - $data = array(); |
|
| 4658 | + if (isset($file[$index])) {
|
|
| 4659 | + $row = $file[$index]; |
|
| 4660 | + $row = array_map( 'trim', $row ); |
|
| 4661 | + $data = array(); |
|
| 4662 | 4662 | |
| 4663 | - foreach ($columns as $c => $column ) {
|
|
| 4664 | - 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'))) {
|
|
| 4665 | - $data[$column] = $row[$c]; |
|
| 4666 | - } |
|
| 4667 | - } |
|
| 4663 | + foreach ($columns as $c => $column ) {
|
|
| 4664 | + 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'))) {
|
|
| 4665 | + $data[$column] = $row[$c]; |
|
| 4666 | + } |
|
| 4667 | + } |
|
| 4668 | 4668 | |
| 4669 | - if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
| 4670 | - $invalid++; |
|
| 4671 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4672 | - continue; |
|
| 4673 | - } |
|
| 4669 | + if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
| 4670 | + $invalid++; |
|
| 4671 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4672 | + continue; |
|
| 4673 | + } |
|
| 4674 | 4674 | |
| 4675 | - $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
|
| 4675 | + $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
|
| 4676 | 4676 | |
| 4677 | - if ( $import_choice == 'update' ) {
|
|
| 4678 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4679 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4680 | - $updated++; |
|
| 4681 | - } else {
|
|
| 4682 | - $invalid++; |
|
| 4683 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4684 | - } |
|
| 4685 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4686 | - $data['location_id'] = (int)$location->location_id; |
|
| 4677 | + if ( $import_choice == 'update' ) {
|
|
| 4678 | + if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4679 | + if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4680 | + $updated++; |
|
| 4681 | + } else {
|
|
| 4682 | + $invalid++; |
|
| 4683 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4684 | + } |
|
| 4685 | + } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4686 | + $data['location_id'] = (int)$location->location_id; |
|
| 4687 | 4687 | |
| 4688 | - if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
| 4689 | - $data['location_id'] = (int)$location->location_id; |
|
| 4690 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
| 4691 | - $data['location_id'] = (int)$location->location_id; |
|
| 4692 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
| 4693 | - $data['location_id'] = (int)$location->location_id; |
|
| 4694 | - } |
|
| 4688 | + if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
| 4689 | + $data['location_id'] = (int)$location->location_id; |
|
| 4690 | + } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
| 4691 | + $data['location_id'] = (int)$location->location_id; |
|
| 4692 | + } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
| 4693 | + $data['location_id'] = (int)$location->location_id; |
|
| 4694 | + } |
|
| 4695 | 4695 | |
| 4696 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4697 | - $updated++; |
|
| 4698 | - } else {
|
|
| 4699 | - $invalid++; |
|
| 4700 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4701 | - } |
|
| 4702 | - } else {
|
|
| 4703 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4704 | - $created++; |
|
| 4705 | - } else {
|
|
| 4706 | - $invalid++; |
|
| 4707 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4708 | - } |
|
| 4709 | - } |
|
| 4710 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4711 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4712 | - $skipped++; |
|
| 4713 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4714 | - $skipped++; |
|
| 4715 | - } else {
|
|
| 4716 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4717 | - $created++; |
|
| 4718 | - } else {
|
|
| 4719 | - $invalid++; |
|
| 4720 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4721 | - } |
|
| 4722 | - } |
|
| 4723 | - } else {
|
|
| 4724 | - $invalid++; |
|
| 4725 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4726 | - } |
|
| 4727 | - } |
|
| 4728 | - } |
|
| 4729 | - } |
|
| 4696 | + if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4697 | + $updated++; |
|
| 4698 | + } else {
|
|
| 4699 | + $invalid++; |
|
| 4700 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4701 | + } |
|
| 4702 | + } else {
|
|
| 4703 | + if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4704 | + $created++; |
|
| 4705 | + } else {
|
|
| 4706 | + $invalid++; |
|
| 4707 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4708 | + } |
|
| 4709 | + } |
|
| 4710 | + } elseif ( $import_choice == 'skip' ) {
|
|
| 4711 | + if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4712 | + $skipped++; |
|
| 4713 | + } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4714 | + $skipped++; |
|
| 4715 | + } else {
|
|
| 4716 | + if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4717 | + $created++; |
|
| 4718 | + } else {
|
|
| 4719 | + $invalid++; |
|
| 4720 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4721 | + } |
|
| 4722 | + } |
|
| 4723 | + } else {
|
|
| 4724 | + $invalid++; |
|
| 4725 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4726 | + } |
|
| 4727 | + } |
|
| 4728 | + } |
|
| 4729 | + } |
|
| 4730 | 4730 | |
| 4731 | - $json = array(); |
|
| 4732 | - $json['processed'] = $limit; |
|
| 4733 | - $json['created'] = $created; |
|
| 4734 | - $json['updated'] = $updated; |
|
| 4735 | - $json['skipped'] = $skipped; |
|
| 4736 | - $json['invalid'] = $invalid; |
|
| 4737 | - $json['images'] = $images; |
|
| 4731 | + $json = array(); |
|
| 4732 | + $json['processed'] = $limit; |
|
| 4733 | + $json['created'] = $created; |
|
| 4734 | + $json['updated'] = $updated; |
|
| 4735 | + $json['skipped'] = $skipped; |
|
| 4736 | + $json['invalid'] = $invalid; |
|
| 4737 | + $json['images'] = $images; |
|
| 4738 | 4738 | |
| 4739 | - wp_send_json( $json ); |
|
| 4740 | - } else if ( $task == 'import_hood' ) {
|
|
| 4741 | - if (!empty($file)) {
|
|
| 4742 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4739 | + wp_send_json( $json ); |
|
| 4740 | + } else if ( $task == 'import_hood' ) {
|
|
| 4741 | + if (!empty($file)) {
|
|
| 4742 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4743 | 4743 | |
| 4744 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4745 | - $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
|
|
| 4746 | - wp_send_json( $json ); |
|
| 4747 | - } |
|
| 4744 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4745 | + $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
|
|
| 4746 | + wp_send_json( $json ); |
|
| 4747 | + } |
|
| 4748 | 4748 | |
| 4749 | - $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
|
| 4750 | - $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' ); |
|
| 4751 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4752 | - $index = $processed + $i; |
|
| 4749 | + $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
|
| 4750 | + $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' ); |
|
| 4751 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4752 | + $index = $processed + $i; |
|
| 4753 | 4753 | |
| 4754 | - if (isset($file[$index])) {
|
|
| 4755 | - $row = $file[$index]; |
|
| 4756 | - $row = array_map( 'trim', $row ); |
|
| 4757 | - $data = array(); |
|
| 4754 | + if (isset($file[$index])) {
|
|
| 4755 | + $row = $file[$index]; |
|
| 4756 | + $row = array_map( 'trim', $row ); |
|
| 4757 | + $data = array(); |
|
| 4758 | 4758 | |
| 4759 | - foreach ($columns as $c => $column) {
|
|
| 4760 | - if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {
|
|
| 4761 | - $data[$column] = sanitize_text_field($row[$c]); |
|
| 4762 | - } |
|
| 4763 | - } |
|
| 4759 | + foreach ($columns as $c => $column) {
|
|
| 4760 | + if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {
|
|
| 4761 | + $data[$column] = sanitize_text_field($row[$c]); |
|
| 4762 | + } |
|
| 4763 | + } |
|
| 4764 | 4764 | |
| 4765 | - if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
| 4766 | - $invalid++; |
|
| 4767 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4768 | - continue; |
|
| 4769 | - } |
|
| 4765 | + if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
| 4766 | + $invalid++; |
|
| 4767 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4768 | + continue; |
|
| 4769 | + } |
|
| 4770 | 4770 | |
| 4771 | - $location_info = array(); |
|
| 4772 | - if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
| 4773 | - $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
| 4774 | - } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
|
| 4775 | - $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
|
| 4776 | - } |
|
| 4771 | + $location_info = array(); |
|
| 4772 | + if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
| 4773 | + $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
| 4774 | + } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
|
| 4775 | + $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
|
| 4776 | + } |
|
| 4777 | 4777 | |
| 4778 | - if (empty($location_info)) {
|
|
| 4779 | - $invalid++; |
|
| 4780 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4781 | - continue; |
|
| 4782 | - } |
|
| 4778 | + if (empty($location_info)) {
|
|
| 4779 | + $invalid++; |
|
| 4780 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4781 | + continue; |
|
| 4782 | + } |
|
| 4783 | 4783 | |
| 4784 | - $location_id = $location_info->location_id; |
|
| 4784 | + $location_id = $location_info->location_id; |
|
| 4785 | 4785 | |
| 4786 | - $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0; |
|
| 4786 | + $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0; |
|
| 4787 | 4787 | |
| 4788 | - $hood_data = array(); |
|
| 4789 | - $hood_data['hood_name'] = $data['neighbourhood_name']; |
|
| 4790 | - $hood_data['hood_slug'] = $data['neighbourhood_slug']; |
|
| 4791 | - $hood_data['hood_latitude'] = $data['latitude']; |
|
| 4792 | - $hood_data['hood_longitude'] = $data['longitude']; |
|
| 4793 | - $hood_data['hood_location_id'] = $location_id; |
|
| 4788 | + $hood_data = array(); |
|
| 4789 | + $hood_data['hood_name'] = $data['neighbourhood_name']; |
|
| 4790 | + $hood_data['hood_slug'] = $data['neighbourhood_slug']; |
|
| 4791 | + $hood_data['hood_latitude'] = $data['latitude']; |
|
| 4792 | + $hood_data['hood_longitude'] = $data['longitude']; |
|
| 4793 | + $hood_data['hood_location_id'] = $location_id; |
|
| 4794 | 4794 | |
| 4795 | - if ( $import_choice == 'update' ) {
|
|
| 4796 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4797 | - $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
| 4795 | + if ( $import_choice == 'update' ) {
|
|
| 4796 | + if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4797 | + $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
| 4798 | 4798 | |
| 4799 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4800 | - $updated++; |
|
| 4801 | - } else {
|
|
| 4802 | - $invalid++; |
|
| 4803 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4804 | - } |
|
| 4805 | - } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4806 | - $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
| 4799 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4800 | + $updated++; |
|
| 4801 | + } else {
|
|
| 4802 | + $invalid++; |
|
| 4803 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4804 | + } |
|
| 4805 | + } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4806 | + $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
| 4807 | 4807 | |
| 4808 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4809 | - $updated++; |
|
| 4810 | - } else {
|
|
| 4811 | - $invalid++; |
|
| 4812 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4813 | - } |
|
| 4814 | - } else {
|
|
| 4815 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4816 | - $created++; |
|
| 4817 | - } else {
|
|
| 4818 | - $invalid++; |
|
| 4819 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4820 | - } |
|
| 4821 | - } |
|
| 4822 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4823 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4824 | - $skipped++; |
|
| 4825 | - } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4826 | - $skipped++; |
|
| 4827 | - } else {
|
|
| 4808 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4809 | + $updated++; |
|
| 4810 | + } else {
|
|
| 4811 | + $invalid++; |
|
| 4812 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4813 | + } |
|
| 4814 | + } else {
|
|
| 4815 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4816 | + $created++; |
|
| 4817 | + } else {
|
|
| 4818 | + $invalid++; |
|
| 4819 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4820 | + } |
|
| 4821 | + } |
|
| 4822 | + } elseif ( $import_choice == 'skip' ) {
|
|
| 4823 | + if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4824 | + $skipped++; |
|
| 4825 | + } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4826 | + $skipped++; |
|
| 4827 | + } else {
|
|
| 4828 | 4828 | |
| 4829 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4830 | - $created++; |
|
| 4831 | - } else {
|
|
| 4832 | - $invalid++; |
|
| 4833 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4834 | - } |
|
| 4835 | - } |
|
| 4836 | - } else {
|
|
| 4837 | - $invalid++; |
|
| 4838 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4839 | - } |
|
| 4840 | - } |
|
| 4841 | - } |
|
| 4842 | - } |
|
| 4829 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4830 | + $created++; |
|
| 4831 | + } else {
|
|
| 4832 | + $invalid++; |
|
| 4833 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4834 | + } |
|
| 4835 | + } |
|
| 4836 | + } else {
|
|
| 4837 | + $invalid++; |
|
| 4838 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4839 | + } |
|
| 4840 | + } |
|
| 4841 | + } |
|
| 4842 | + } |
|
| 4843 | 4843 | |
| 4844 | - $json = array(); |
|
| 4845 | - $json['processed'] = $limit; |
|
| 4846 | - $json['created'] = $created; |
|
| 4847 | - $json['updated'] = $updated; |
|
| 4848 | - $json['skipped'] = $skipped; |
|
| 4849 | - $json['invalid'] = $invalid; |
|
| 4850 | - $json['images'] = $images; |
|
| 4844 | + $json = array(); |
|
| 4845 | + $json['processed'] = $limit; |
|
| 4846 | + $json['created'] = $created; |
|
| 4847 | + $json['updated'] = $updated; |
|
| 4848 | + $json['skipped'] = $skipped; |
|
| 4849 | + $json['invalid'] = $invalid; |
|
| 4850 | + $json['images'] = $images; |
|
| 4851 | 4851 | |
| 4852 | - wp_send_json( $json ); |
|
| 4853 | - } |
|
| 4854 | - } |
|
| 4855 | - break; |
|
| 4856 | - case 'import_finish':{
|
|
| 4857 | - /** |
|
| 4858 | - * Run an action when an import finishes. |
|
| 4859 | - * |
|
| 4860 | - * This action can be used to fire functions after an import ends. |
|
| 4861 | - * |
|
| 4862 | - * @since 1.5.3 |
|
| 4863 | - * @package GeoDirectory |
|
| 4864 | - */ |
|
| 4865 | - do_action('geodir_import_finished');
|
|
| 4866 | - } |
|
| 4867 | - break; |
|
| 4852 | + wp_send_json( $json ); |
|
| 4853 | + } |
|
| 4854 | + } |
|
| 4855 | + break; |
|
| 4856 | + case 'import_finish':{
|
|
| 4857 | + /** |
|
| 4858 | + * Run an action when an import finishes. |
|
| 4859 | + * |
|
| 4860 | + * This action can be used to fire functions after an import ends. |
|
| 4861 | + * |
|
| 4862 | + * @since 1.5.3 |
|
| 4863 | + * @package GeoDirectory |
|
| 4864 | + */ |
|
| 4865 | + do_action('geodir_import_finished');
|
|
| 4866 | + } |
|
| 4867 | + break; |
|
| 4868 | 4868 | |
| 4869 | - } |
|
| 4870 | - echo '0'; |
|
| 4871 | - gd_die(); |
|
| 4869 | + } |
|
| 4870 | + echo '0'; |
|
| 4871 | + gd_die(); |
|
| 4872 | 4872 | } |
| 4873 | 4873 | |
| 4874 | 4874 | /** |
@@ -4912,12 +4912,12 @@ discard block |
||
| 4912 | 4912 | $args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args ); |
| 4913 | 4913 | } |
| 4914 | 4914 | |
| 4915 | - if( !empty( $term ) ) {
|
|
| 4915 | + if( !empty( $term ) ) {
|
|
| 4916 | 4916 | $result = wp_insert_term( $term, $taxonomy, $args ); |
| 4917 | - if( !is_wp_error( $result ) ) {
|
|
| 4918 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4919 | - } |
|
| 4920 | - } |
|
| 4917 | + if( !is_wp_error( $result ) ) {
|
|
| 4918 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4919 | + } |
|
| 4920 | + } |
|
| 4921 | 4921 | |
| 4922 | 4922 | return false; |
| 4923 | 4923 | } |
@@ -4963,16 +4963,16 @@ discard block |
||
| 4963 | 4963 | $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
| 4964 | 4964 | |
| 4965 | 4965 | if( !is_wp_error( $result ) ) {
|
| 4966 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4967 | - } |
|
| 4966 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4967 | + } |
|
| 4968 | 4968 | } else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
| 4969 | 4969 | $term_data['term_id'] = $term_info['term_id']; |
| 4970 | 4970 | |
| 4971 | 4971 | $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
| 4972 | 4972 | |
| 4973 | 4973 | if( !is_wp_error( $result ) ) {
|
| 4974 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4975 | - } |
|
| 4974 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4975 | + } |
|
| 4976 | 4976 | } else {
|
| 4977 | 4977 | return geodir_imex_insert_term( $taxonomy, $term_data ); |
| 4978 | 4978 | } |
@@ -4994,47 +4994,47 @@ discard block |
||
| 4994 | 4994 | * @return int Posts count. |
| 4995 | 4995 | */ |
| 4996 | 4996 | function geodir_get_posts_count( $post_type ) {
|
| 4997 | - global $wpdb, $plugin_prefix; |
|
| 4997 | + global $wpdb, $plugin_prefix; |
|
| 4998 | 4998 | |
| 4999 | - if ( !post_type_exists( $post_type ) ) {
|
|
| 5000 | - return 0; |
|
| 5001 | - } |
|
| 4999 | + if ( !post_type_exists( $post_type ) ) {
|
|
| 5000 | + return 0; |
|
| 5001 | + } |
|
| 5002 | 5002 | |
| 5003 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5003 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5004 | 5004 | |
| 5005 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5006 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5007 | - $where_statuses = ''; |
|
| 5008 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5009 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5010 | - } |
|
| 5005 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5006 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5007 | + $where_statuses = ''; |
|
| 5008 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5009 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5010 | + } |
|
| 5011 | 5011 | |
| 5012 | - /** |
|
| 5013 | - * Filter the SQL where clause part to filter posts count in import/export. |
|
| 5014 | - * |
|
| 5015 | - * @since 1.6.4 |
|
| 5016 | - * @package GeoDirectory |
|
| 5017 | - * |
|
| 5018 | - * @param string $where SQL where clause part. |
|
| 5019 | - */ |
|
| 5020 | - $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
| 5021 | - |
|
| 5022 | - $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 );
|
|
| 5023 | - |
|
| 5024 | - $posts_count = (int)$wpdb->get_var( $query ); |
|
| 5012 | + /** |
|
| 5013 | + * Filter the SQL where clause part to filter posts count in import/export. |
|
| 5014 | + * |
|
| 5015 | + * @since 1.6.4 |
|
| 5016 | + * @package GeoDirectory |
|
| 5017 | + * |
|
| 5018 | + * @param string $where SQL where clause part. |
|
| 5019 | + */ |
|
| 5020 | + $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
| 5021 | + |
|
| 5022 | + $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 );
|
|
| 5023 | + |
|
| 5024 | + $posts_count = (int)$wpdb->get_var( $query ); |
|
| 5025 | 5025 | |
| 5026 | - /** |
|
| 5027 | - * Modify returned post counts for the current post type. |
|
| 5028 | - * |
|
| 5029 | - * @since 1.4.6 |
|
| 5030 | - * @package GeoDirectory |
|
| 5031 | - * |
|
| 5032 | - * @param int $posts_count Post counts. |
|
| 5033 | - * @param string $post_type Post type. |
|
| 5034 | - */ |
|
| 5035 | - $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
| 5036 | - |
|
| 5037 | - return $posts_count; |
|
| 5026 | + /** |
|
| 5027 | + * Modify returned post counts for the current post type. |
|
| 5028 | + * |
|
| 5029 | + * @since 1.4.6 |
|
| 5030 | + * @package GeoDirectory |
|
| 5031 | + * |
|
| 5032 | + * @param int $posts_count Post counts. |
|
| 5033 | + * @param string $post_type Post type. |
|
| 5034 | + */ |
|
| 5035 | + $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
| 5036 | + |
|
| 5037 | + return $posts_count; |
|
| 5038 | 5038 | } |
| 5039 | 5039 | |
| 5040 | 5040 | /** |
@@ -5063,10 +5063,10 @@ discard block |
||
| 5063 | 5063 | |
| 5064 | 5064 | if ( !empty( $posts ) ) {
|
| 5065 | 5065 | $is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' ); |
| 5066 | - $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
| 5067 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 5068 | - $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;
|
|
| 5069 | - $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 5066 | + $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
| 5067 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 5068 | + $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;
|
|
| 5069 | + $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 5070 | 5070 | |
| 5071 | 5071 | $csv_row = array(); |
| 5072 | 5072 | $csv_row[] = 'post_id'; |
@@ -5098,7 +5098,7 @@ discard block |
||
| 5098 | 5098 | } |
| 5099 | 5099 | $csv_row[] = 'post_status'; |
| 5100 | 5100 | $csv_row[] = 'is_featured'; |
| 5101 | - // Export claim listing field |
|
| 5101 | + // Export claim listing field |
|
| 5102 | 5102 | if ($is_claim_active) {
|
| 5103 | 5103 | $csv_row[] = 'claimed'; |
| 5104 | 5104 | } |
@@ -5107,7 +5107,7 @@ discard block |
||
| 5107 | 5107 | $csv_row[] = 'alive_days'; |
| 5108 | 5108 | $csv_row[] = 'expire_date'; |
| 5109 | 5109 | } |
| 5110 | - $csv_row[] = 'post_date'; |
|
| 5110 | + $csv_row[] = 'post_date'; |
|
| 5111 | 5111 | $csv_row[] = 'post_address'; |
| 5112 | 5112 | $csv_row[] = 'post_city'; |
| 5113 | 5113 | $csv_row[] = 'post_region'; |
@@ -5115,11 +5115,11 @@ discard block |
||
| 5115 | 5115 | $csv_row[] = 'post_zip'; |
| 5116 | 5116 | $csv_row[] = 'post_latitude'; |
| 5117 | 5117 | $csv_row[] = 'post_longitude'; |
| 5118 | - if ($neighbourhood_active) {
|
|
| 5119 | - $csv_row[] = 'post_neighbourhood'; |
|
| 5120 | - $csv_row[] = 'neighbourhood_latitude'; |
|
| 5121 | - $csv_row[] = 'neighbourhood_longitude'; |
|
| 5122 | - } |
|
| 5118 | + if ($neighbourhood_active) {
|
|
| 5119 | + $csv_row[] = 'post_neighbourhood'; |
|
| 5120 | + $csv_row[] = 'neighbourhood_latitude'; |
|
| 5121 | + $csv_row[] = 'neighbourhood_longitude'; |
|
| 5122 | + } |
|
| 5123 | 5123 | $csv_row[] = 'geodir_timing'; |
| 5124 | 5124 | $csv_row[] = 'geodir_contact'; |
| 5125 | 5125 | $csv_row[] = 'geodir_email'; |
@@ -5151,21 +5151,21 @@ discard block |
||
| 5151 | 5151 | $csv_row[] = 'franchise'; |
| 5152 | 5152 | } |
| 5153 | 5153 | |
| 5154 | - /** |
|
| 5155 | - * Filter columns field names of gd export listings csv. |
|
| 5156 | - * |
|
| 5157 | - * @since 1.6.5 |
|
| 5158 | - * @package GeoDirectory |
|
| 5159 | - * |
|
| 5160 | - * @param array $csv_row Column names being exported in csv. |
|
| 5161 | - * @param string $post_type The post type. |
|
| 5162 | - */ |
|
| 5163 | - $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);
|
|
| 5154 | + /** |
|
| 5155 | + * Filter columns field names of gd export listings csv. |
|
| 5156 | + * |
|
| 5157 | + * @since 1.6.5 |
|
| 5158 | + * @package GeoDirectory |
|
| 5159 | + * |
|
| 5160 | + * @param array $csv_row Column names being exported in csv. |
|
| 5161 | + * @param string $post_type The post type. |
|
| 5162 | + */ |
|
| 5163 | + $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);
|
|
| 5164 | 5164 | |
| 5165 | 5165 | $csv_rows[] = $csv_row; |
| 5166 | 5166 | |
| 5167 | 5167 | $images_count = 5; |
| 5168 | - $xx=0; |
|
| 5168 | + $xx=0; |
|
| 5169 | 5169 | foreach ( $posts as $post ) {$xx++;
|
| 5170 | 5170 | $post_id = $post['ID']; |
| 5171 | 5171 | |
@@ -5296,15 +5296,15 @@ discard block |
||
| 5296 | 5296 | } |
| 5297 | 5297 | $csv_row[] = $post_info['post_status']; // post_status |
| 5298 | 5298 | $csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured |
| 5299 | - if ($is_claim_active) {
|
|
| 5300 | - $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5301 | - } |
|
| 5299 | + if ($is_claim_active) {
|
|
| 5300 | + $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5301 | + } |
|
| 5302 | 5302 | if ($is_payment_plugin) {
|
| 5303 | 5303 | $csv_row[] = (int)$post_info['package_id']; // package_id |
| 5304 | 5304 | $csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days |
| 5305 | 5305 | $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
|
| 5306 | 5306 | } |
| 5307 | - $csv_row[] = $post_info['post_date']; // post_date |
|
| 5307 | + $csv_row[] = $post_info['post_date']; // post_date |
|
| 5308 | 5308 | $csv_row[] = stripslashes($post_info['post_address']); // post_address |
| 5309 | 5309 | $csv_row[] = stripslashes($post_info['post_city']); // post_city |
| 5310 | 5310 | $csv_row[] = stripslashes($post_info['post_region']); // post_region |
@@ -5312,21 +5312,21 @@ discard block |
||
| 5312 | 5312 | $csv_row[] = stripslashes($post_info['post_zip']); // post_zip |
| 5313 | 5313 | $csv_row[] = $post_info['post_latitude']; // post_latitude |
| 5314 | 5314 | $csv_row[] = $post_info['post_longitude']; // post_longitude |
| 5315 | - if ($neighbourhood_active) {
|
|
| 5316 | - $post_neighbourhood = ''; |
|
| 5317 | - $neighbourhood_latitude = ''; |
|
| 5318 | - $neighbourhood_longitude = ''; |
|
| 5319 | - if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {
|
|
| 5320 | - if (!empty($hood_info)) {
|
|
| 5321 | - $post_neighbourhood = $hood_info->hood_name; |
|
| 5322 | - $neighbourhood_latitude = $hood_info->hood_latitude; |
|
| 5323 | - $neighbourhood_longitude = $hood_info->hood_longitude; |
|
| 5324 | - } |
|
| 5325 | - } |
|
| 5326 | - $csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood |
|
| 5327 | - $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude |
|
| 5328 | - $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude |
|
| 5329 | - } |
|
| 5315 | + if ($neighbourhood_active) {
|
|
| 5316 | + $post_neighbourhood = ''; |
|
| 5317 | + $neighbourhood_latitude = ''; |
|
| 5318 | + $neighbourhood_longitude = ''; |
|
| 5319 | + if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {
|
|
| 5320 | + if (!empty($hood_info)) {
|
|
| 5321 | + $post_neighbourhood = $hood_info->hood_name; |
|
| 5322 | + $neighbourhood_latitude = $hood_info->hood_latitude; |
|
| 5323 | + $neighbourhood_longitude = $hood_info->hood_longitude; |
|
| 5324 | + } |
|
| 5325 | + } |
|
| 5326 | + $csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood |
|
| 5327 | + $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude |
|
| 5328 | + $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude |
|
| 5329 | + } |
|
| 5330 | 5330 | $csv_row[] = stripslashes($post_info['geodir_timing']); // geodir_timing |
| 5331 | 5331 | $csv_row[] = stripslashes($post_info['geodir_contact']); // geodir_contact |
| 5332 | 5332 | $csv_row[] = stripslashes($post_info['geodir_email']); // geodir_email |
@@ -5366,16 +5366,16 @@ discard block |
||
| 5366 | 5366 | $csv_row[] = (int)$franchise; // franchise id |
| 5367 | 5367 | } |
| 5368 | 5368 | |
| 5369 | - /** |
|
| 5370 | - * Filter columns values of gd export listings csv file |
|
| 5371 | - * |
|
| 5372 | - * @since 1.6.5 |
|
| 5373 | - * @package GeoDirectory |
|
| 5374 | - * |
|
| 5375 | - * @param array $csv_row Field values being exported in csv. |
|
| 5376 | - * @param array $post_info The post info. |
|
| 5377 | - */ |
|
| 5378 | - $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
|
| 5369 | + /** |
|
| 5370 | + * Filter columns values of gd export listings csv file |
|
| 5371 | + * |
|
| 5372 | + * @since 1.6.5 |
|
| 5373 | + * @package GeoDirectory |
|
| 5374 | + * |
|
| 5375 | + * @param array $csv_row Field values being exported in csv. |
|
| 5376 | + * @param array $post_info The post info. |
|
| 5377 | + */ |
|
| 5378 | + $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
|
| 5379 | 5379 | |
| 5380 | 5380 | for ( $c = 0; $c < $images_count; $c++ ) {
|
| 5381 | 5381 | $csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE |
@@ -5408,64 +5408,64 @@ discard block |
||
| 5408 | 5408 | * @return array Array of posts data. |
| 5409 | 5409 | */ |
| 5410 | 5410 | function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
| 5411 | - global $wpdb, $plugin_prefix; |
|
| 5411 | + global $wpdb, $plugin_prefix; |
|
| 5412 | 5412 | |
| 5413 | - if ( ! post_type_exists( $post_type ) ) |
|
| 5414 | - return new stdClass; |
|
| 5413 | + if ( ! post_type_exists( $post_type ) ) |
|
| 5414 | + return new stdClass; |
|
| 5415 | 5415 | |
| 5416 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5416 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5417 | 5417 | |
| 5418 | - $limit = ''; |
|
| 5419 | - if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5420 | - $offset = ( $page_no - 1 ) * $per_page; |
|
| 5418 | + $limit = ''; |
|
| 5419 | + if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5420 | + $offset = ( $page_no - 1 ) * $per_page; |
|
| 5421 | 5421 | |
| 5422 | - if ( $offset > 0 ) {
|
|
| 5423 | - $limit = " LIMIT " . $offset . "," . $per_page; |
|
| 5424 | - } else {
|
|
| 5425 | - $limit = " LIMIT " . $per_page; |
|
| 5426 | - } |
|
| 5427 | - } |
|
| 5422 | + if ( $offset > 0 ) {
|
|
| 5423 | + $limit = " LIMIT " . $offset . "," . $per_page; |
|
| 5424 | + } else {
|
|
| 5425 | + $limit = " LIMIT " . $per_page; |
|
| 5426 | + } |
|
| 5427 | + } |
|
| 5428 | 5428 | |
| 5429 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5430 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5431 | - $where_statuses = ''; |
|
| 5432 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5433 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5434 | - } |
|
| 5429 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5430 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5431 | + $where_statuses = ''; |
|
| 5432 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5433 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5434 | + } |
|
| 5435 | 5435 | |
| 5436 | - /** |
|
| 5437 | - * Filter the SQL where clause part to filter posts in import/export. |
|
| 5438 | - * |
|
| 5439 | - * @since 1.6.4 |
|
| 5440 | - * @package GeoDirectory |
|
| 5441 | - * |
|
| 5442 | - * @param string $where SQL where clause part. |
|
| 5443 | - */ |
|
| 5444 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5445 | - |
|
| 5446 | - $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 );
|
|
| 5447 | - /** |
|
| 5448 | - * Modify returned posts SQL query for the current post type. |
|
| 5449 | - * |
|
| 5450 | - * @since 1.4.6 |
|
| 5451 | - * @package GeoDirectory |
|
| 5452 | - * |
|
| 5453 | - * @param int $query The SQL query. |
|
| 5454 | - * @param string $post_type Post type. |
|
| 5455 | - */ |
|
| 5456 | - $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
| 5457 | - $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A ); |
|
| 5458 | - |
|
| 5459 | - /** |
|
| 5460 | - * Modify returned post results for the current post type. |
|
| 5461 | - * |
|
| 5462 | - * @since 1.4.6 |
|
| 5463 | - * @package GeoDirectory |
|
| 5464 | - * |
|
| 5465 | - * @param object $results An object containing all post ids. |
|
| 5466 | - * @param string $post_type Post type. |
|
| 5467 | - */ |
|
| 5468 | - return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
| 5436 | + /** |
|
| 5437 | + * Filter the SQL where clause part to filter posts in import/export. |
|
| 5438 | + * |
|
| 5439 | + * @since 1.6.4 |
|
| 5440 | + * @package GeoDirectory |
|
| 5441 | + * |
|
| 5442 | + * @param string $where SQL where clause part. |
|
| 5443 | + */ |
|
| 5444 | + $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5445 | + |
|
| 5446 | + $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 );
|
|
| 5447 | + /** |
|
| 5448 | + * Modify returned posts SQL query for the current post type. |
|
| 5449 | + * |
|
| 5450 | + * @since 1.4.6 |
|
| 5451 | + * @package GeoDirectory |
|
| 5452 | + * |
|
| 5453 | + * @param int $query The SQL query. |
|
| 5454 | + * @param string $post_type Post type. |
|
| 5455 | + */ |
|
| 5456 | + $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
| 5457 | + $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A ); |
|
| 5458 | + |
|
| 5459 | + /** |
|
| 5460 | + * Modify returned post results for the current post type. |
|
| 5461 | + * |
|
| 5462 | + * @since 1.4.6 |
|
| 5463 | + * @package GeoDirectory |
|
| 5464 | + * |
|
| 5465 | + * @param object $results An object containing all post ids. |
|
| 5466 | + * @param string $post_type Post type. |
|
| 5467 | + */ |
|
| 5468 | + return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
| 5469 | 5469 | } |
| 5470 | 5470 | |
| 5471 | 5471 | /** |
@@ -5484,26 +5484,26 @@ discard block |
||
| 5484 | 5484 | * @return string The SQL query. |
| 5485 | 5485 | */ |
| 5486 | 5486 | function geodir_imex_get_events_query( $query, $post_type ) {
|
| 5487 | - if ( $post_type == 'gd_event' ) {
|
|
| 5488 | - global $wpdb, $plugin_prefix; |
|
| 5487 | + if ( $post_type == 'gd_event' ) {
|
|
| 5488 | + global $wpdb, $plugin_prefix; |
|
| 5489 | 5489 | |
| 5490 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5491 | - $schedule_table = EVENT_SCHEDULE; |
|
| 5490 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5491 | + $schedule_table = EVENT_SCHEDULE; |
|
| 5492 | 5492 | |
| 5493 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5494 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5495 | - $where_statuses = ''; |
|
| 5496 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5497 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5498 | - } |
|
| 5493 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5494 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5495 | + $where_statuses = ''; |
|
| 5496 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5497 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5498 | + } |
|
| 5499 | 5499 | |
| 5500 | - /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
|
| 5501 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5500 | + /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
|
| 5501 | + $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5502 | 5502 | |
| 5503 | - $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 );
|
|
| 5504 | - } |
|
| 5503 | + $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 );
|
|
| 5504 | + } |
|
| 5505 | 5505 | |
| 5506 | - return $query; |
|
| 5506 | + return $query; |
|
| 5507 | 5507 | } |
| 5508 | 5508 | |
| 5509 | 5509 | /** |
@@ -5525,36 +5525,36 @@ discard block |
||
| 5525 | 5525 | * @return int Total terms count. |
| 5526 | 5526 | */ |
| 5527 | 5527 | function geodir_get_terms_count( $post_type ) {
|
| 5528 | - $args = array( 'hide_empty' => 0 ); |
|
| 5528 | + $args = array( 'hide_empty' => 0 ); |
|
| 5529 | 5529 | |
| 5530 | - remove_all_filters( 'get_terms' ); |
|
| 5530 | + remove_all_filters( 'get_terms' ); |
|
| 5531 | 5531 | |
| 5532 | - $taxonomy = $post_type . 'category'; |
|
| 5532 | + $taxonomy = $post_type . 'category'; |
|
| 5533 | 5533 | |
| 5534 | - // WPML |
|
| 5535 | - $is_wpml = geodir_is_wpml(); |
|
| 5536 | - $active_lang = 'all'; |
|
| 5537 | - if ( $is_wpml ) {
|
|
| 5538 | - global $sitepress; |
|
| 5539 | - $active_lang = $sitepress->get_current_language(); |
|
| 5534 | + // WPML |
|
| 5535 | + $is_wpml = geodir_is_wpml(); |
|
| 5536 | + $active_lang = 'all'; |
|
| 5537 | + if ( $is_wpml ) {
|
|
| 5538 | + global $sitepress; |
|
| 5539 | + $active_lang = $sitepress->get_current_language(); |
|
| 5540 | 5540 | |
| 5541 | - if ( $active_lang != 'all' ) {
|
|
| 5542 | - $sitepress->switch_lang( 'all', true ); |
|
| 5543 | - } |
|
| 5544 | - } |
|
| 5545 | - // WPML |
|
| 5541 | + if ( $active_lang != 'all' ) {
|
|
| 5542 | + $sitepress->switch_lang( 'all', true ); |
|
| 5543 | + } |
|
| 5544 | + } |
|
| 5545 | + // WPML |
|
| 5546 | 5546 | |
| 5547 | - $count_terms = wp_count_terms( $taxonomy, $args ); |
|
| 5547 | + $count_terms = wp_count_terms( $taxonomy, $args ); |
|
| 5548 | 5548 | |
| 5549 | - // WPML |
|
| 5550 | - if ( $is_wpml && $active_lang !== 'all' ) {
|
|
| 5551 | - global $sitepress; |
|
| 5552 | - $sitepress->switch_lang( $active_lang, true ); |
|
| 5553 | - } |
|
| 5554 | - // WPML |
|
| 5555 | - $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
| 5549 | + // WPML |
|
| 5550 | + if ( $is_wpml && $active_lang !== 'all' ) {
|
|
| 5551 | + global $sitepress; |
|
| 5552 | + $sitepress->switch_lang( $active_lang, true ); |
|
| 5553 | + } |
|
| 5554 | + // WPML |
|
| 5555 | + $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
| 5556 | 5556 | |
| 5557 | - return $count_terms; |
|
| 5557 | + return $count_terms; |
|
| 5558 | 5558 | } |
| 5559 | 5559 | |
| 5560 | 5560 | /** |
@@ -5593,11 +5593,11 @@ discard block |
||
| 5593 | 5593 | $csv_row[] = 'cat_posttype'; |
| 5594 | 5594 | $csv_row[] = 'cat_parent'; |
| 5595 | 5595 | $csv_row[] = 'cat_schema'; |
| 5596 | - // WPML |
|
| 5596 | + // WPML |
|
| 5597 | 5597 | $is_wpml = geodir_is_wpml(); |
| 5598 | 5598 | if ($is_wpml) {
|
| 5599 | 5599 | $csv_row[] = 'cat_language'; |
| 5600 | - $csv_row[] = 'cat_id_original'; |
|
| 5600 | + $csv_row[] = 'cat_id_original'; |
|
| 5601 | 5601 | } |
| 5602 | 5602 | // WPML |
| 5603 | 5603 | $csv_row[] = 'cat_description'; |
@@ -5627,10 +5627,10 @@ discard block |
||
| 5627 | 5627 | $csv_row[] = $post_type; |
| 5628 | 5628 | $csv_row[] = $cat_parent; |
| 5629 | 5629 | $csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type ); |
| 5630 | - // WPML |
|
| 5630 | + // WPML |
|
| 5631 | 5631 | if ($is_wpml) {
|
| 5632 | 5632 | $csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy ); |
| 5633 | - $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5633 | + $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5634 | 5634 | } |
| 5635 | 5635 | // WPML |
| 5636 | 5636 | $csv_row[] = $term->description; |
@@ -6048,43 +6048,43 @@ discard block |
||
| 6048 | 6048 | * @param string $status Post status. |
| 6049 | 6049 | */ |
| 6050 | 6050 | function geodir_create_page($slug, $option, $page_title = '', $page_content = '', $post_parent = 0, $status = 'publish') {
|
| 6051 | - global $wpdb, $current_user; |
|
| 6052 | - |
|
| 6053 | - $option_value = get_option($option); |
|
| 6054 | - |
|
| 6055 | - if ($option_value > 0) : |
|
| 6056 | - if (get_post($option_value)) : |
|
| 6057 | - // Page exists |
|
| 6058 | - return; |
|
| 6059 | - endif; |
|
| 6060 | - endif; |
|
| 6061 | - |
|
| 6062 | - $page_found = $wpdb->get_var( |
|
| 6063 | - $wpdb->prepare( |
|
| 6064 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 6065 | - array($slug) |
|
| 6066 | - ) |
|
| 6067 | - ); |
|
| 6068 | - |
|
| 6069 | - if ($page_found) : |
|
| 6070 | - // Page exists |
|
| 6071 | - if (!$option_value) update_option($option, $page_found); |
|
| 6072 | - return; |
|
| 6073 | - endif; |
|
| 6074 | - |
|
| 6075 | - $page_data = array( |
|
| 6076 | - 'post_status' => $status, |
|
| 6077 | - 'post_type' => 'page', |
|
| 6078 | - 'post_author' => $current_user->ID, |
|
| 6079 | - 'post_name' => $slug, |
|
| 6080 | - 'post_title' => $page_title, |
|
| 6081 | - 'post_content' => $page_content, |
|
| 6082 | - 'post_parent' => $post_parent, |
|
| 6083 | - 'comment_status' => 'closed' |
|
| 6084 | - ); |
|
| 6085 | - $page_id = wp_insert_post($page_data); |
|
| 6086 | - |
|
| 6087 | - add_option($option, $page_id); |
|
| 6051 | + global $wpdb, $current_user; |
|
| 6052 | + |
|
| 6053 | + $option_value = get_option($option); |
|
| 6054 | + |
|
| 6055 | + if ($option_value > 0) : |
|
| 6056 | + if (get_post($option_value)) : |
|
| 6057 | + // Page exists |
|
| 6058 | + return; |
|
| 6059 | + endif; |
|
| 6060 | + endif; |
|
| 6061 | + |
|
| 6062 | + $page_found = $wpdb->get_var( |
|
| 6063 | + $wpdb->prepare( |
|
| 6064 | + "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 6065 | + array($slug) |
|
| 6066 | + ) |
|
| 6067 | + ); |
|
| 6068 | + |
|
| 6069 | + if ($page_found) : |
|
| 6070 | + // Page exists |
|
| 6071 | + if (!$option_value) update_option($option, $page_found); |
|
| 6072 | + return; |
|
| 6073 | + endif; |
|
| 6074 | + |
|
| 6075 | + $page_data = array( |
|
| 6076 | + 'post_status' => $status, |
|
| 6077 | + 'post_type' => 'page', |
|
| 6078 | + 'post_author' => $current_user->ID, |
|
| 6079 | + 'post_name' => $slug, |
|
| 6080 | + 'post_title' => $page_title, |
|
| 6081 | + 'post_content' => $page_content, |
|
| 6082 | + 'post_parent' => $post_parent, |
|
| 6083 | + 'comment_status' => 'closed' |
|
| 6084 | + ); |
|
| 6085 | + $page_id = wp_insert_post($page_data); |
|
| 6086 | + |
|
| 6087 | + add_option($option, $page_id); |
|
| 6088 | 6088 | |
| 6089 | 6089 | } |
| 6090 | 6090 | |
@@ -6115,9 +6115,9 @@ discard block |
||
| 6115 | 6115 | * @package GeoDirectory |
| 6116 | 6116 | */ |
| 6117 | 6117 | function geodir_admin_upgrade_notice() {
|
| 6118 | - $class = "error"; |
|
| 6119 | - $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
| 6120 | - echo"<div class=\"$class\"> <p>$message</p></div>"; |
|
| 6118 | + $class = "error"; |
|
| 6119 | + $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
| 6120 | + echo"<div class=\"$class\"> <p>$message</p></div>"; |
|
| 6121 | 6121 | } |
| 6122 | 6122 | |
| 6123 | 6123 | /** |
@@ -6130,18 +6130,18 @@ discard block |
||
| 6130 | 6130 | */ |
| 6131 | 6131 | function geodire_admin_upgrade_notice( $plugin_data, $r ) |
| 6132 | 6132 | {
|
| 6133 | - // readme contents |
|
| 6134 | - $args = array( |
|
| 6135 | - 'timeout' => 15, |
|
| 6136 | - 'redirection' => 5 |
|
| 6137 | - ); |
|
| 6138 | - $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
|
| 6139 | - $data = wp_remote_get( $url, $args ); |
|
| 6133 | + // readme contents |
|
| 6134 | + $args = array( |
|
| 6135 | + 'timeout' => 15, |
|
| 6136 | + 'redirection' => 5 |
|
| 6137 | + ); |
|
| 6138 | + $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
|
| 6139 | + $data = wp_remote_get( $url, $args ); |
|
| 6140 | 6140 | |
| 6141 | - if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
|
| 6141 | + if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
|
| 6142 | 6142 | |
| 6143 | - geodir_in_plugin_update_message($data['body']); |
|
| 6144 | - } |
|
| 6143 | + geodir_in_plugin_update_message($data['body']); |
|
| 6144 | + } |
|
| 6145 | 6145 | } |
| 6146 | 6146 | |
| 6147 | 6147 | |
@@ -6149,28 +6149,28 @@ discard block |
||
| 6149 | 6149 | * @param string $content http response body |
| 6150 | 6150 | */ |
| 6151 | 6151 | function geodir_in_plugin_update_message($content) {
|
| 6152 | - // Output Upgrade Notice |
|
| 6153 | - $matches = null; |
|
| 6154 | - $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
| 6155 | - $upgrade_notice = ''; |
|
| 6156 | - if ( preg_match( $regexp, $content, $matches ) ) {
|
|
| 6157 | - if(empty($matches)){return;}
|
|
| 6158 | - |
|
| 6159 | - $version = trim( $matches[1] ); |
|
| 6160 | - if($version && $version>GEODIRECTORY_VERSION){
|
|
| 6161 | - |
|
| 6162 | - |
|
| 6163 | - $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
| 6164 | - if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
| 6165 | - $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
|
| 6166 | - foreach ( $notices as $index => $line ) {
|
|
| 6167 | - $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
| 6168 | - } |
|
| 6169 | - $upgrade_notice .= '</div> '; |
|
| 6170 | - } |
|
| 6171 | - } |
|
| 6172 | - } |
|
| 6173 | - echo $upgrade_notice; |
|
| 6152 | + // Output Upgrade Notice |
|
| 6153 | + $matches = null; |
|
| 6154 | + $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
| 6155 | + $upgrade_notice = ''; |
|
| 6156 | + if ( preg_match( $regexp, $content, $matches ) ) {
|
|
| 6157 | + if(empty($matches)){return;}
|
|
| 6158 | + |
|
| 6159 | + $version = trim( $matches[1] ); |
|
| 6160 | + if($version && $version>GEODIRECTORY_VERSION){
|
|
| 6161 | + |
|
| 6162 | + |
|
| 6163 | + $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
| 6164 | + if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
| 6165 | + $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
|
| 6166 | + foreach ( $notices as $index => $line ) {
|
|
| 6167 | + $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
| 6168 | + } |
|
| 6169 | + $upgrade_notice .= '</div> '; |
|
| 6170 | + } |
|
| 6171 | + } |
|
| 6172 | + } |
|
| 6173 | + echo $upgrade_notice; |
|
| 6174 | 6174 | } |
| 6175 | 6175 | |
| 6176 | 6176 | /** |
@@ -6203,19 +6203,19 @@ discard block |
||
| 6203 | 6203 | * @param array Listing statuses to be skipped. |
| 6204 | 6204 | */ |
| 6205 | 6205 | function geodir_imex_export_skip_statuses() {
|
| 6206 | - $statuses = array( 'trash', 'auto-draft' ); |
|
| 6206 | + $statuses = array( 'trash', 'auto-draft' ); |
|
| 6207 | 6207 | |
| 6208 | - /** |
|
| 6209 | - * Filter the statuses to skip during GD export listings. |
|
| 6210 | - * |
|
| 6211 | - * @since 1.6.0 |
|
| 6212 | - * @package GeoDirectory |
|
| 6213 | - * |
|
| 6214 | - * @param array $statuses Listing statuses to be skipped. |
|
| 6215 | - */ |
|
| 6216 | - $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
| 6208 | + /** |
|
| 6209 | + * Filter the statuses to skip during GD export listings. |
|
| 6210 | + * |
|
| 6211 | + * @since 1.6.0 |
|
| 6212 | + * @package GeoDirectory |
|
| 6213 | + * |
|
| 6214 | + * @param array $statuses Listing statuses to be skipped. |
|
| 6215 | + */ |
|
| 6216 | + $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
| 6217 | 6217 | |
| 6218 | - return $statuses; |
|
| 6218 | + return $statuses; |
|
| 6219 | 6219 | } |
| 6220 | 6220 | |
| 6221 | 6221 | /** |
@@ -6231,37 +6231,37 @@ discard block |
||
| 6231 | 6231 | * @global string $typenow Current post type. |
| 6232 | 6232 | */ |
| 6233 | 6233 | function geodir_admin_dequeue_scripts() {
|
| 6234 | - global $typenow; |
|
| 6234 | + global $typenow; |
|
| 6235 | 6235 | |
| 6236 | - // EDD |
|
| 6237 | - if (wp_script_is('jquery-chosen', 'enqueued')) {
|
|
| 6238 | - wp_dequeue_script('jquery-chosen');
|
|
| 6239 | - } |
|
| 6236 | + // EDD |
|
| 6237 | + if (wp_script_is('jquery-chosen', 'enqueued')) {
|
|
| 6238 | + wp_dequeue_script('jquery-chosen');
|
|
| 6239 | + } |
|
| 6240 | 6240 | |
| 6241 | - // Ultimate Addons for Visual Composer |
|
| 6242 | - if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {
|
|
| 6243 | - wp_dequeue_script('ultimate-vc-backend-script');
|
|
| 6244 | - } |
|
| 6241 | + // Ultimate Addons for Visual Composer |
|
| 6242 | + if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {
|
|
| 6243 | + wp_dequeue_script('ultimate-vc-backend-script');
|
|
| 6244 | + } |
|
| 6245 | 6245 | |
| 6246 | - // VC editor conflicts |
|
| 6247 | - if (class_exists('Vc_Role_Access_Controller') && wp_script_is('dfd_vc_damin_scripts', 'enqueued')) {
|
|
| 6248 | - wp_dequeue_script('dfd_vc_damin_scripts');
|
|
| 6249 | - } |
|
| 6246 | + // VC editor conflicts |
|
| 6247 | + if (class_exists('Vc_Role_Access_Controller') && wp_script_is('dfd_vc_damin_scripts', 'enqueued')) {
|
|
| 6248 | + wp_dequeue_script('dfd_vc_damin_scripts');
|
|
| 6249 | + } |
|
| 6250 | 6250 | |
| 6251 | - // Ultimate chosen |
|
| 6252 | - if (wp_script_is('ultimate-chosen-script', 'enqueued')) {
|
|
| 6253 | - wp_dequeue_script('ultimate-chosen-script');
|
|
| 6254 | - } |
|
| 6251 | + // Ultimate chosen |
|
| 6252 | + if (wp_script_is('ultimate-chosen-script', 'enqueued')) {
|
|
| 6253 | + wp_dequeue_script('ultimate-chosen-script');
|
|
| 6254 | + } |
|
| 6255 | 6255 | |
| 6256 | - // Crum composer choosen |
|
| 6257 | - if (wp_script_is('crum-composer-choosen', 'enqueued')) {
|
|
| 6258 | - wp_dequeue_script('crum-composer-choosen');
|
|
| 6259 | - } |
|
| 6256 | + // Crum composer choosen |
|
| 6257 | + if (wp_script_is('crum-composer-choosen', 'enqueued')) {
|
|
| 6258 | + wp_dequeue_script('crum-composer-choosen');
|
|
| 6259 | + } |
|
| 6260 | 6260 | |
| 6261 | - // Fix conflict Fusion Builder jquery chosen with GD jquery chosen. |
|
| 6262 | - if (class_exists('FusionBuilder') && wp_script_is('fusion_builder_chosen_js', 'enqueued')) {
|
|
| 6263 | - wp_dequeue_script('fusion_builder_chosen_js');
|
|
| 6264 | - } |
|
| 6261 | + // Fix conflict Fusion Builder jquery chosen with GD jquery chosen. |
|
| 6262 | + if (class_exists('FusionBuilder') && wp_script_is('fusion_builder_chosen_js', 'enqueued')) {
|
|
| 6263 | + wp_dequeue_script('fusion_builder_chosen_js');
|
|
| 6264 | + } |
|
| 6265 | 6265 | } |
| 6266 | 6266 | |
| 6267 | 6267 | /** |
@@ -6277,48 +6277,48 @@ discard block |
||
| 6277 | 6277 | * @return string SQL where clause part. |
| 6278 | 6278 | */ |
| 6279 | 6279 | function geodir_imex_get_filter_where($where = '', $post_type = '') {
|
| 6280 | - global $wpdb; |
|
| 6280 | + global $wpdb; |
|
| 6281 | 6281 | |
| 6282 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6282 | + $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6283 | 6283 | |
| 6284 | - if ( !empty( $filters ) ) {
|
|
| 6285 | - foreach ( $filters as $field => $value ) {
|
|
| 6286 | - switch ($field) {
|
|
| 6287 | - case 'start_date': |
|
| 6288 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
| 6289 | - break; |
|
| 6290 | - case 'end_date': |
|
| 6291 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
| 6292 | - break; |
|
| 6293 | - } |
|
| 6294 | - } |
|
| 6295 | - } |
|
| 6284 | + if ( !empty( $filters ) ) {
|
|
| 6285 | + foreach ( $filters as $field => $value ) {
|
|
| 6286 | + switch ($field) {
|
|
| 6287 | + case 'start_date': |
|
| 6288 | + $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
| 6289 | + break; |
|
| 6290 | + case 'end_date': |
|
| 6291 | + $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
| 6292 | + break; |
|
| 6293 | + } |
|
| 6294 | + } |
|
| 6295 | + } |
|
| 6296 | 6296 | |
| 6297 | - return $where; |
|
| 6297 | + return $where; |
|
| 6298 | 6298 | } |
| 6299 | 6299 | add_filter('geodir_get_posts_count', 'geodir_imex_get_filter_where', 10, 2);
|
| 6300 | 6300 | add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);
|
| 6301 | 6301 | |
| 6302 | 6302 | |
| 6303 | 6303 | function geodir_fix_for_primer_theme(){
|
| 6304 | - if(!defined( 'PRIMER_VERSION' )){return;}
|
|
| 6305 | - global $pagenow; |
|
| 6304 | + if(!defined( 'PRIMER_VERSION' )){return;}
|
|
| 6305 | + global $pagenow; |
|
| 6306 | 6306 | |
| 6307 | - if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
| 6307 | + if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
| 6308 | 6308 | |
| 6309 | - $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
| 6309 | + $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
| 6310 | 6310 | |
| 6311 | - $post_types = geodir_get_posttypes(); |
|
| 6312 | - if ($post_type && in_array($post_type, $post_types) ) {
|
|
| 6313 | - global $primer_customizer_layouts; |
|
| 6314 | - remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
| 6315 | - } |
|
| 6316 | - } |
|
| 6311 | + $post_types = geodir_get_posttypes(); |
|
| 6312 | + if ($post_type && in_array($post_type, $post_types) ) {
|
|
| 6313 | + global $primer_customizer_layouts; |
|
| 6314 | + remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
| 6315 | + } |
|
| 6316 | + } |
|
| 6317 | 6317 | |
| 6318 | 6318 | } |
| 6319 | 6319 | |
| 6320 | 6320 | if(is_admin()){
|
| 6321 | - add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
| 6321 | + add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
| 6322 | 6322 | } |
| 6323 | 6323 | |
| 6324 | 6324 | |
@@ -6451,96 +6451,96 @@ discard block |
||
| 6451 | 6451 | |
| 6452 | 6452 | function geodir_ga_activation_url() {
|
| 6453 | 6453 | |
| 6454 | - return add_query_arg( array( |
|
| 6455 | - 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
|
| 6456 | - 'scope' => GEODIR_GA_SCOPE, |
|
| 6457 | - 'response_type' => 'code', |
|
| 6458 | - 'redirect_uri' => GEODIR_GA_REDIRECT, |
|
| 6459 | - 'client_id' => GEODIR_GA_CLIENTID, |
|
| 6460 | - ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
| 6454 | + return add_query_arg( array( |
|
| 6455 | + 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
|
| 6456 | + 'scope' => GEODIR_GA_SCOPE, |
|
| 6457 | + 'response_type' => 'code', |
|
| 6458 | + 'redirect_uri' => GEODIR_GA_REDIRECT, |
|
| 6459 | + 'client_id' => GEODIR_GA_CLIENTID, |
|
| 6460 | + ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
| 6461 | 6461 | |
| 6462 | - return $url; |
|
| 6462 | + return $url; |
|
| 6463 | 6463 | } |
| 6464 | 6464 | |
| 6465 | 6465 | function geodir_gd_accounts(){
|
| 6466 | - $accounts = array(); |
|
| 6467 | - $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
| 6468 | - if($useAuth){
|
|
| 6469 | - try {
|
|
| 6470 | - $accounts = geodir_ga_get_analytics_accounts(); |
|
| 6471 | - } catch (Exception $e) {
|
|
| 6472 | - geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 6473 | - } |
|
| 6466 | + $accounts = array(); |
|
| 6467 | + $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
| 6468 | + if($useAuth){
|
|
| 6469 | + try {
|
|
| 6470 | + $accounts = geodir_ga_get_analytics_accounts(); |
|
| 6471 | + } catch (Exception $e) {
|
|
| 6472 | + geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 6473 | + } |
|
| 6474 | 6474 | |
| 6475 | - if(is_array($accounts)){
|
|
| 6476 | - $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
| 6477 | - }elseif(get_option('geodir_ga_account_id')){
|
|
| 6478 | - $accounts = array(); |
|
| 6479 | - $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6480 | - } |
|
| 6481 | - } |
|
| 6482 | - return $accounts; |
|
| 6475 | + if(is_array($accounts)){
|
|
| 6476 | + $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
| 6477 | + }elseif(get_option('geodir_ga_account_id')){
|
|
| 6478 | + $accounts = array(); |
|
| 6479 | + $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6480 | + } |
|
| 6481 | + } |
|
| 6482 | + return $accounts; |
|
| 6483 | 6483 | } |
| 6484 | 6484 | |
| 6485 | 6485 | function geodir_ga_get_analytics_accounts() |
| 6486 | 6486 | {
|
| 6487 | - global $gd_ga_errors; |
|
| 6488 | - $accounts = array(); |
|
| 6487 | + global $gd_ga_errors; |
|
| 6488 | + $accounts = array(); |
|
| 6489 | 6489 | |
| 6490 | - if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
| 6490 | + if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
| 6491 | 6491 | |
| 6492 | 6492 | |
| 6493 | - if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
| 6494 | - return get_option('geodir_gd_uids');
|
|
| 6495 | - } |
|
| 6493 | + if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
| 6494 | + return get_option('geodir_gd_uids');
|
|
| 6495 | + } |
|
| 6496 | 6496 | |
| 6497 | - # Create a new Gdata call |
|
| 6498 | - if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6499 | - $stats = new GDGoogleAnalyticsStats(); |
|
| 6500 | - else |
|
| 6501 | - return false; |
|
| 6497 | + # Create a new Gdata call |
|
| 6498 | + if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6499 | + $stats = new GDGoogleAnalyticsStats(); |
|
| 6500 | + else |
|
| 6501 | + return false; |
|
| 6502 | 6502 | |
| 6503 | - # Check if Google sucessfully logged in |
|
| 6504 | - if ( ! $stats->checkLogin() ) |
|
| 6505 | - return false; |
|
| 6503 | + # Check if Google sucessfully logged in |
|
| 6504 | + if ( ! $stats->checkLogin() ) |
|
| 6505 | + return false; |
|
| 6506 | 6506 | |
| 6507 | - # Get a list of accounts |
|
| 6508 | - try {
|
|
| 6509 | - $accounts = $stats->getAllProfiles(); |
|
| 6510 | - } catch (Exception $e) {
|
|
| 6511 | - $gd_ga_errors[] = $e->getMessage(); |
|
| 6512 | - return false; |
|
| 6513 | - } |
|
| 6507 | + # Get a list of accounts |
|
| 6508 | + try {
|
|
| 6509 | + $accounts = $stats->getAllProfiles(); |
|
| 6510 | + } catch (Exception $e) {
|
|
| 6511 | + $gd_ga_errors[] = $e->getMessage(); |
|
| 6512 | + return false; |
|
| 6513 | + } |
|
| 6514 | 6514 | |
| 6515 | 6515 | |
| 6516 | - natcasesort ($accounts); |
|
| 6516 | + natcasesort ($accounts); |
|
| 6517 | 6517 | |
| 6518 | - # Return the account array if there are accounts |
|
| 6519 | - if ( count($accounts) > 0 ){
|
|
| 6520 | - update_option('geodir_gd_uids',$accounts);
|
|
| 6521 | - return $accounts; |
|
| 6522 | - } |
|
| 6523 | - else |
|
| 6524 | - return false; |
|
| 6518 | + # Return the account array if there are accounts |
|
| 6519 | + if ( count($accounts) > 0 ){
|
|
| 6520 | + update_option('geodir_gd_uids',$accounts);
|
|
| 6521 | + return $accounts; |
|
| 6522 | + } |
|
| 6523 | + else |
|
| 6524 | + return false; |
|
| 6525 | 6525 | } |
| 6526 | 6526 | |
| 6527 | 6527 | add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' ); |
| 6528 | 6528 | function geodir_ga_deauthorize(){
|
| 6529 | 6529 | |
| 6530 | - if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
| 6530 | + if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
| 6531 | 6531 | |
| 6532 | - die( 'Security check' ); |
|
| 6532 | + die( 'Security check' ); |
|
| 6533 | 6533 | |
| 6534 | - } else {
|
|
| 6535 | - update_option('geodir_ga_auth_token','');
|
|
| 6536 | - update_option('geodir_ga_auth_code','');
|
|
| 6537 | - update_option('geodir_gd_uids','');
|
|
| 6534 | + } else {
|
|
| 6535 | + update_option('geodir_ga_auth_token','');
|
|
| 6536 | + update_option('geodir_ga_auth_code','');
|
|
| 6537 | + update_option('geodir_gd_uids','');
|
|
| 6538 | 6538 | |
| 6539 | 6539 | |
| 6540 | - echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|
|
| 6541 | - } |
|
| 6540 | + echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|
|
| 6541 | + } |
|
| 6542 | 6542 | |
| 6543 | - die(); |
|
| 6543 | + die(); |
|
| 6544 | 6544 | } |
| 6545 | 6545 | |
| 6546 | 6546 | |
@@ -6551,12 +6551,12 @@ discard block |
||
| 6551 | 6551 | * @package GeoDirectory |
| 6552 | 6552 | */ |
| 6553 | 6553 | function geodir_post_type_setting_fun() {
|
| 6554 | - $post_type_arr = array(); |
|
| 6554 | + $post_type_arr = array(); |
|
| 6555 | 6555 | |
| 6556 | - $post_types = geodir_get_posttypes('object');
|
|
| 6556 | + $post_types = geodir_get_posttypes('object');
|
|
| 6557 | 6557 | |
| 6558 | - foreach ($post_types as $key => $post_types_obj) {
|
|
| 6559 | - $post_type_arr[$key] = $post_types_obj->labels->singular_name; |
|
| 6560 | - } |
|
| 6561 | - return $post_type_arr; |
|
| 6558 | + foreach ($post_types as $key => $post_types_obj) {
|
|
| 6559 | + $post_type_arr[$key] = $post_types_obj->labels->singular_name; |
|
| 6560 | + } |
|
| 6561 | + return $post_type_arr; |
|
| 6562 | 6562 | } |
| 6563 | 6563 | \ No newline at end of file |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | 18 | if (!class_exists('Google_Client')) { |
| 19 | - require_once dirname(__FILE__) . '/../autoload.php'; |
|
| 19 | + require_once dirname(__FILE__).'/../autoload.php'; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | 18 | if (!class_exists('Google_Client')) { |
| 19 | - require_once dirname(__FILE__) . '/../autoload.php'; |
|
| 19 | + require_once dirname(__FILE__).'/../autoload.php'; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -13,26 +13,26 @@ discard block |
||
| 13 | 13 | global $wp_query, $current_term, $query; |
| 14 | 14 | |
| 15 | 15 | if (function_exists('geodir_location_geo_home_link')) {
|
| 16 | - remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 16 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | if (defined('ICL_LANGUAGE_CODE') && defined('DOING_AJAX') && DOING_AJAX){
|
| 20 | - $search_url = icl_get_home_url(); |
|
| 20 | + $search_url = icl_get_home_url(); |
|
| 21 | 21 | } else {
|
| 22 | - $search_url = get_home_url(); |
|
| 22 | + $search_url = get_home_url(); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | $search_url = trailingslashit($search_url); |
| 26 | 26 | |
| 27 | 27 | if (function_exists('geodir_location_geo_home_link')) {
|
| 28 | - add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 28 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
|
| 32 | 32 | $form_class = 'geodir-listing-search'; |
| 33 | 33 | |
| 34 | 34 | if($new_style){
|
| 35 | - $form_class .= ' gd-search-bar-style'; |
|
| 35 | + $form_class .= ' gd-search-bar-style'; |
|
| 36 | 36 | } |
| 37 | 37 | ?> |
| 38 | 38 | <form class="<?php |
@@ -49,56 +49,56 @@ discard block |
||
| 49 | 49 | <div class="geodir-loc-bar"> |
| 50 | 50 | |
| 51 | 51 | <?php |
| 52 | - /** |
|
| 53 | - * Called inside the search form but before any of the fields. |
|
| 54 | - * |
|
| 55 | - * @since 1.0.0 |
|
| 56 | - */ |
|
| 57 | - do_action('geodir_before_search_form') ?>
|
|
| 52 | + /** |
|
| 53 | + * Called inside the search form but before any of the fields. |
|
| 54 | + * |
|
| 55 | + * @since 1.0.0 |
|
| 56 | + */ |
|
| 57 | + do_action('geodir_before_search_form') ?>
|
|
| 58 | 58 | |
| 59 | 59 | <div class="clearfix geodir-loc-bar-in"> |
| 60 | 60 | <div class="geodir-search"> |
| 61 | 61 | |
| 62 | 62 | <?php |
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * Adds the input fields to the search form. |
|
| 66 | - * |
|
| 67 | - * @since 1.6.9 |
|
| 68 | - */ |
|
| 69 | - do_action('geodir_search_form_inputs');
|
|
| 64 | + /** |
|
| 65 | + * Adds the input fields to the search form. |
|
| 66 | + * |
|
| 67 | + * @since 1.6.9 |
|
| 68 | + */ |
|
| 69 | + do_action('geodir_search_form_inputs');
|
|
| 70 | 70 | |
| 71 | 71 | |
| 72 | 72 | |
| 73 | - /** |
|
| 74 | - * Called on the GD search form just before the search button. |
|
| 75 | - * |
|
| 76 | - * @since 1.0.0 |
|
| 77 | - */ |
|
| 78 | - do_action('geodir_before_search_button');
|
|
| 73 | + /** |
|
| 74 | + * Called on the GD search form just before the search button. |
|
| 75 | + * |
|
| 76 | + * @since 1.0.0 |
|
| 77 | + */ |
|
| 78 | + do_action('geodir_before_search_button');
|
|
| 79 | 79 | |
| 80 | 80 | |
| 81 | - /** |
|
| 82 | - * Called on the GD search form just after the search button. |
|
| 83 | - * |
|
| 84 | - * @since 1.0.0 |
|
| 85 | - */ |
|
| 86 | - do_action('geodir_after_search_button');
|
|
| 81 | + /** |
|
| 82 | + * Called on the GD search form just after the search button. |
|
| 83 | + * |
|
| 84 | + * @since 1.0.0 |
|
| 85 | + */ |
|
| 86 | + do_action('geodir_after_search_button');
|
|
| 87 | 87 | |
| 88 | 88 | |
| 89 | - ?> |
|
| 89 | + ?> |
|
| 90 | 90 | </div> |
| 91 | 91 | |
| 92 | 92 | |
| 93 | 93 | </div> |
| 94 | 94 | |
| 95 | 95 | <?php |
| 96 | - /** |
|
| 97 | - * Called inside the search form but after all the input fields. |
|
| 98 | - * |
|
| 99 | - * @since 1.0.0 |
|
| 100 | - */ |
|
| 101 | - do_action('geodir_after_search_form') ?>
|
|
| 96 | + /** |
|
| 97 | + * Called inside the search form but after all the input fields. |
|
| 98 | + * |
|
| 99 | + * @since 1.0.0 |
|
| 100 | + */ |
|
| 101 | + do_action('geodir_after_search_form') ?>
|
|
| 102 | 102 | |
| 103 | 103 | |
| 104 | 104 | </div> |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | -if (defined('ICL_LANGUAGE_CODE') && defined('DOING_AJAX') && DOING_AJAX){
|
|
| 19 | +if (defined('ICL_LANGUAGE_CODE') && defined('DOING_AJAX') && DOING_AJAX) {
|
|
| 20 | 20 | $search_url = icl_get_home_url(); |
| 21 | 21 | } else {
|
| 22 | 22 | $search_url = get_home_url(); |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
|
| 32 | 32 | $form_class = 'geodir-listing-search'; |
| 33 | 33 | |
| 34 | -if($new_style){
|
|
| 34 | +if ($new_style) {
|
|
| 35 | 35 | $form_class .= ' gd-search-bar-style'; |
| 36 | 36 | } |
| 37 | 37 | ?> |
@@ -278,8 +278,9 @@ discard block |
||
| 278 | 278 | |
| 279 | 279 | $post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : ''; |
| 280 | 280 | |
| 281 | - if (!empty($comment_info)) |
|
| 282 | - $status = $comment_info->comment_approved; |
|
| 281 | + if (!empty($comment_info)) { |
|
| 282 | + $status = $comment_info->comment_approved; |
|
| 283 | + } |
|
| 283 | 284 | |
| 284 | 285 | if ($status == 'approve' || $status == 1) {
|
| 285 | 286 | $status = 1; |
@@ -418,12 +419,14 @@ discard block |
||
| 418 | 419 | } |
| 419 | 420 | } else {
|
| 420 | 421 | $rating = 0; |
| 421 | - if (!empty($comment)) |
|
| 422 | - $rating = geodir_get_commentoverall($comment->comment_ID); |
|
| 422 | + if (!empty($comment)) { |
|
| 423 | + $rating = geodir_get_commentoverall($comment->comment_ID); |
|
| 424 | + } |
|
| 423 | 425 | if ($rating != 0 && !is_admin()) {
|
| 424 | 426 | return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';
|
| 425 | - } else |
|
| 426 | - return $content; |
|
| 427 | + } else { |
|
| 428 | + return $content; |
|
| 429 | + } |
|
| 427 | 430 | } |
| 428 | 431 | } |
| 429 | 432 | |
@@ -512,11 +515,12 @@ discard block |
||
| 512 | 515 | $post_ratings = get_post_meta($post_id, 'overall_rating'); |
| 513 | 516 | } |
| 514 | 517 | |
| 515 | - if ($post_ratings) |
|
| 516 | - return $post_ratings; |
|
| 517 | - else |
|
| 518 | - return false; |
|
| 519 | -} |
|
| 518 | + if ($post_ratings) { |
|
| 519 | + return $post_ratings; |
|
| 520 | + } else { |
|
| 521 | + return false; |
|
| 522 | + } |
|
| 523 | + } |
|
| 520 | 524 | |
| 521 | 525 | |
| 522 | 526 | /** |
@@ -541,11 +545,12 @@ discard block |
||
| 541 | 545 | ) |
| 542 | 546 | ); |
| 543 | 547 | |
| 544 | - if (!empty($reatings)) |
|
| 545 | - return $reatings; |
|
| 546 | - else |
|
| 547 | - return false; |
|
| 548 | -} |
|
| 548 | + if (!empty($reatings)) { |
|
| 549 | + return $reatings; |
|
| 550 | + } else { |
|
| 551 | + return false; |
|
| 552 | + } |
|
| 553 | + } |
|
| 549 | 554 | |
| 550 | 555 | /** |
| 551 | 556 | * Get review total of a Post. |
@@ -569,11 +574,12 @@ discard block |
||
| 569 | 574 | ) |
| 570 | 575 | ); |
| 571 | 576 | |
| 572 | - if (!empty($results)) |
|
| 573 | - return $results; |
|
| 574 | - else |
|
| 575 | - return false; |
|
| 576 | -} |
|
| 577 | + if (!empty($results)) { |
|
| 578 | + return $results; |
|
| 579 | + } else { |
|
| 580 | + return false; |
|
| 581 | + } |
|
| 582 | + } |
|
| 577 | 583 | |
| 578 | 584 | /** |
| 579 | 585 | * Get review count by user ID. |
@@ -596,11 +602,12 @@ discard block |
||
| 596 | 602 | ) |
| 597 | 603 | ); |
| 598 | 604 | |
| 599 | - if (!empty($results)) |
|
| 600 | - return $results; |
|
| 601 | - else |
|
| 602 | - return false; |
|
| 603 | -} |
|
| 605 | + if (!empty($results)) { |
|
| 606 | + return $results; |
|
| 607 | + } else { |
|
| 608 | + return false; |
|
| 609 | + } |
|
| 610 | + } |
|
| 604 | 611 | |
| 605 | 612 | /** |
| 606 | 613 | * Get average overall rating of a Post. |
@@ -634,11 +641,12 @@ discard block |
||
| 634 | 641 | ) |
| 635 | 642 | ); |
| 636 | 643 | |
| 637 | - if (!empty($results)) |
|
| 638 | - return $results; |
|
| 639 | - else |
|
| 640 | - return false; |
|
| 641 | -} |
|
| 644 | + if (!empty($results)) { |
|
| 645 | + return $results; |
|
| 646 | + } else { |
|
| 647 | + return false; |
|
| 648 | + } |
|
| 649 | + } |
|
| 642 | 650 | |
| 643 | 651 | /** |
| 644 | 652 | * Get review count of a Post. |
@@ -662,11 +670,12 @@ discard block |
||
| 662 | 670 | ) |
| 663 | 671 | ); |
| 664 | 672 | |
| 665 | - if (!empty($results)) |
|
| 666 | - return $results; |
|
| 667 | - else |
|
| 668 | - return false; |
|
| 669 | -} |
|
| 673 | + if (!empty($results)) { |
|
| 674 | + return $results; |
|
| 675 | + } else { |
|
| 676 | + return false; |
|
| 677 | + } |
|
| 678 | + } |
|
| 670 | 679 | |
| 671 | 680 | /** |
| 672 | 681 | * Get comments count of a Post. |
@@ -692,11 +701,12 @@ discard block |
||
| 692 | 701 | ); |
| 693 | 702 | |
| 694 | 703 | |
| 695 | - if (!empty($results)) |
|
| 696 | - return $results; |
|
| 697 | - else |
|
| 698 | - return false; |
|
| 699 | -} |
|
| 704 | + if (!empty($results)) { |
|
| 705 | + return $results; |
|
| 706 | + } else { |
|
| 707 | + return false; |
|
| 708 | + } |
|
| 709 | + } |
|
| 700 | 710 | |
| 701 | 711 | /** |
| 702 | 712 | * Get overall rating of a comment. |
@@ -720,11 +730,12 @@ discard block |
||
| 720 | 730 | ) |
| 721 | 731 | ); |
| 722 | 732 | |
| 723 | - if ($reatings) |
|
| 724 | - return $reatings; |
|
| 725 | - else |
|
| 726 | - return false; |
|
| 727 | -} |
|
| 733 | + if ($reatings) { |
|
| 734 | + return $reatings; |
|
| 735 | + } else { |
|
| 736 | + return false; |
|
| 737 | + } |
|
| 738 | + } |
|
| 728 | 739 | |
| 729 | 740 | /** |
| 730 | 741 | * Returns average overall rating of a Post. Depreciated since ver 1.3.6. |
@@ -970,8 +981,9 @@ discard block |
||
| 970 | 981 | $active_tabs = get_option('geodir_detail_page_tabs_excluded');
|
| 971 | 982 | |
| 972 | 983 | $is_display = true; |
| 973 | - if (!empty($active_tabs) && in_array('reviews', $active_tabs))
|
|
| 974 | - $is_display = false; |
|
| 984 | + if (!empty($active_tabs) && in_array('reviews', $active_tabs)) { |
|
| 985 | + $is_display = false; |
|
| 986 | + } |
|
| 975 | 987 | |
| 976 | 988 | /** |
| 977 | 989 | * Filter to change display value. |
@@ -67,10 +67,10 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | function geodir_comment_rating_meta($comment) {
|
| 69 | 69 | $post_type = get_post_type($comment->comment_post_ID); |
| 70 | - if (in_array($post_type, (array)geodir_get_posttypes()) && (int)$comment->comment_parent == 0 && !(!empty($post_type) && geodir_cpt_has_rating_disabled($post_type))) {
|
|
| 70 | + if (in_array($post_type, (array) geodir_get_posttypes()) && (int) $comment->comment_parent == 0 && !(!empty($post_type) && geodir_cpt_has_rating_disabled($post_type))) {
|
|
| 71 | 71 | $rating = geodir_get_commentoverall($comment->comment_ID); |
| 72 | 72 | |
| 73 | - if ((int)get_option('geodir_reviewrating_enable_font_awesome') == 1) {
|
|
| 73 | + if ((int) get_option('geodir_reviewrating_enable_font_awesome') == 1) {
|
|
| 74 | 74 | $star_texts = array(); |
| 75 | 75 | $star_texts[] = __('Terrible', 'geodirectory');
|
| 76 | 76 | $star_texts[] = __('Poor', 'geodirectory');
|
@@ -81,13 +81,13 @@ discard block |
||
| 81 | 81 | echo geodir_font_awesome_rating_form_html('', $star_texts, $rating);
|
| 82 | 82 | } else {
|
| 83 | 83 | if ($rating) {
|
| 84 | - echo '<div class="gd_rating" data-average="' . $rating . '" data-id="5">'; |
|
| 84 | + echo '<div class="gd_rating" data-average="'.$rating.'" data-id="5">'; |
|
| 85 | 85 | |
| 86 | 86 | } else {
|
| 87 | 87 | echo '<div class="gd_rating" data-average="0" data-id="5"></div>'; |
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | - echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="' . $rating . '" />'; |
|
| 90 | + echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="'.$rating.'" />'; |
|
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | 93 | |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | function geodir_comment_replaylink($link) |
| 139 | 139 | {
|
| 140 | 140 | |
| 141 | - $link = '<div class="gd_comment_replaylink">' . $link . '</div>'; |
|
| 141 | + $link = '<div class="gd_comment_replaylink">'.$link.'</div>'; |
|
| 142 | 142 | |
| 143 | 143 | return $link; |
| 144 | 144 | } |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | function geodir_cancle_replaylink($link) |
| 156 | 156 | {
|
| 157 | 157 | |
| 158 | - $link = '<span class="gd-cancel-replaylink">' . $link . '</span>'; |
|
| 158 | + $link = '<span class="gd-cancel-replaylink">'.$link.'</span>'; |
|
| 159 | 159 | |
| 160 | 160 | return $link; |
| 161 | 161 | } |
@@ -195,10 +195,10 @@ discard block |
||
| 195 | 195 | if (isset($_REQUEST['geodir_overallrating'])) {
|
| 196 | 196 | $overall_rating = $_REQUEST['geodir_overallrating']; |
| 197 | 197 | |
| 198 | - if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {
|
|
| 198 | + if (isset($comment_info->comment_parent) && (int) $comment_info->comment_parent == 0) {
|
|
| 199 | 199 | $overall_rating = $overall_rating > 0 ? $overall_rating : '0'; |
| 200 | 200 | |
| 201 | - $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET
|
|
| 201 | + $sqlqry = $wpdb->prepare("INSERT INTO ".GEODIR_REVIEW_TABLE." SET
|
|
| 202 | 202 | post_id = %d, |
| 203 | 203 | post_type = %s, |
| 204 | 204 | post_title = %s, |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | |
| 286 | 286 | $post_type = get_post_type($post_id); |
| 287 | 287 | |
| 288 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 288 | + $detail_table = $plugin_prefix.$post_type.'_detail'; |
|
| 289 | 289 | |
| 290 | 290 | if ($comment_id) {
|
| 291 | 291 | |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | |
| 294 | 294 | if (isset($old_rating)) {
|
| 295 | 295 | |
| 296 | - $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET
|
|
| 296 | + $sqlqry = $wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET
|
|
| 297 | 297 | overall_rating = %f, |
| 298 | 298 | status = %s, |
| 299 | 299 | comment_content = %s |
@@ -335,18 +335,18 @@ discard block |
||
| 335 | 335 | |
| 336 | 336 | $post_type = get_post_type($post_id); |
| 337 | 337 | |
| 338 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 338 | + $detail_table = $plugin_prefix.$post_type.'_detail'; |
|
| 339 | 339 | |
| 340 | 340 | if (isset($_REQUEST['geodir_overallrating'])) {
|
| 341 | 341 | |
| 342 | 342 | $overall_rating = $_REQUEST['geodir_overallrating']; |
| 343 | 343 | |
| 344 | - if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {
|
|
| 344 | + if (isset($comment_info->comment_parent) && (int) $comment_info->comment_parent == 0) {
|
|
| 345 | 345 | $overall_rating = $overall_rating > 0 ? $overall_rating : '0'; |
| 346 | 346 | |
| 347 | 347 | if (isset($old_rating)) {
|
| 348 | 348 | |
| 349 | - $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET
|
|
| 349 | + $sqlqry = $wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET
|
|
| 350 | 350 | overall_rating = %f, |
| 351 | 351 | status = %s, |
| 352 | 352 | comment_content = %s |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | |
| 385 | 385 | $wpdb->query( |
| 386 | 386 | $wpdb->prepare( |
| 387 | - "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d", |
|
| 387 | + "DELETE FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d", |
|
| 388 | 388 | array($comment_id) |
| 389 | 389 | ) |
| 390 | 390 | ); |
@@ -403,9 +403,9 @@ discard block |
||
| 403 | 403 | * @return string The comment content. |
| 404 | 404 | */ |
| 405 | 405 | function geodir_wrap_comment_text($content, $comment = '') {
|
| 406 | - if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int)$comment->comment_post_ID)) {
|
|
| 406 | + if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int) $comment->comment_post_ID)) {
|
|
| 407 | 407 | if (!is_admin()) {
|
| 408 | - return '<div class="description">' . $content . '</div>'; |
|
| 408 | + return '<div class="description">'.$content.'</div>'; |
|
| 409 | 409 | } else {
|
| 410 | 410 | return $content; |
| 411 | 411 | } |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | if (!empty($comment)) |
| 415 | 415 | $rating = geodir_get_commentoverall($comment->comment_ID); |
| 416 | 416 | if ($rating != 0 && !is_admin()) {
|
| 417 | - return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';
|
|
| 417 | + return '<div><div class="gd-rating-text">'.__('Overall Rating', 'geodirectory').': <div class="rating">'.$rating.'</div></div>'.geodir_get_rating_stars($rating, $comment->comment_ID).'</div><div class="description">'.$content.'</div>';
|
|
| 418 | 418 | } else |
| 419 | 419 | return $content; |
| 420 | 420 | } |
@@ -438,18 +438,18 @@ discard block |
||
| 438 | 438 | if (!$post_type) {
|
| 439 | 439 | $post_type = get_post_type($post_id); |
| 440 | 440 | } |
| 441 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 441 | + $detail_table = $plugin_prefix.$post_type.'_detail'; |
|
| 442 | 442 | $post_newrating = geodir_get_post_rating($post_id, 1); |
| 443 | 443 | $post_newrating_count = geodir_get_review_count_total($post_id); |
| 444 | 444 | |
| 445 | 445 | |
| 446 | 446 | //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ; |
| 447 | 447 | |
| 448 | - if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {
|
|
| 448 | + if ($wpdb->get_var("SHOW TABLES LIKE '".$detail_table."'") == $detail_table) {
|
|
| 449 | 449 | |
| 450 | 450 | $wpdb->query( |
| 451 | 451 | $wpdb->prepare( |
| 452 | - "UPDATE " . $detail_table . " SET |
|
| 452 | + "UPDATE ".$detail_table." SET |
|
| 453 | 453 | overall_rating = %f, |
| 454 | 454 | rating_count = %f |
| 455 | 455 | where post_id = %d", |
@@ -468,7 +468,7 @@ discard block |
||
| 468 | 468 | * @package GeoDirectory |
| 469 | 469 | * @param int $post_id The post ID. |
| 470 | 470 | */ |
| 471 | - do_action('geodir_update_postrating',$post_id);
|
|
| 471 | + do_action('geodir_update_postrating', $post_id);
|
|
| 472 | 472 | |
| 473 | 473 | } |
| 474 | 474 | |
@@ -489,13 +489,13 @@ discard block |
||
| 489 | 489 | global $wpdb, $plugin_prefix; |
| 490 | 490 | |
| 491 | 491 | $post_type = get_post_type($post_id); |
| 492 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 492 | + $detail_table = $plugin_prefix.$post_type.'_detail'; |
|
| 493 | 493 | |
| 494 | - if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {
|
|
| 494 | + if ($wpdb->get_var("SHOW TABLES LIKE '".$detail_table."'") == $detail_table) {
|
|
| 495 | 495 | |
| 496 | 496 | $post_ratings = $wpdb->get_var( |
| 497 | 497 | $wpdb->prepare( |
| 498 | - "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d", |
|
| 498 | + "SELECT overall_rating FROM ".$detail_table." WHERE post_id = %d", |
|
| 499 | 499 | array($post_id) |
| 500 | 500 | ) |
| 501 | 501 | ); |
@@ -529,7 +529,7 @@ discard block |
||
| 529 | 529 | |
| 530 | 530 | $reatings = $wpdb->get_row( |
| 531 | 531 | $wpdb->prepare( |
| 532 | - "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d", |
|
| 532 | + "SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id = %d", |
|
| 533 | 533 | array($comment_id) |
| 534 | 534 | ) |
| 535 | 535 | ); |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | |
| 558 | 558 | $results = $wpdb->get_var( |
| 559 | 559 | $wpdb->prepare( |
| 560 | - "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 560 | + "SELECT SUM(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 561 | 561 | array($post_id) |
| 562 | 562 | ) |
| 563 | 563 | ); |
@@ -584,7 +584,7 @@ discard block |
||
| 584 | 584 | global $wpdb; |
| 585 | 585 | $results = $wpdb->get_var( |
| 586 | 586 | $wpdb->prepare( |
| 587 | - "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0", |
|
| 587 | + "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE user_id = %d AND status=1 AND overall_rating>0", |
|
| 588 | 588 | array($user_id) |
| 589 | 589 | ) |
| 590 | 590 | ); |
@@ -622,7 +622,7 @@ discard block |
||
| 622 | 622 | |
| 623 | 623 | $results = $wpdb->get_var( |
| 624 | 624 | $wpdb->prepare( |
| 625 | - "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 625 | + "SELECT COALESCE(avg(overall_rating),0) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 626 | 626 | array($post_id) |
| 627 | 627 | ) |
| 628 | 628 | ); |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | |
| 651 | 651 | $results = $wpdb->get_var( |
| 652 | 652 | $wpdb->prepare( |
| 653 | - "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 653 | + "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 654 | 654 | array($post_id) |
| 655 | 655 | ) |
| 656 | 656 | ); |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | |
| 680 | 680 | $results = $wpdb->get_var( |
| 681 | 681 | $wpdb->prepare( |
| 682 | - "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 682 | + "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 683 | 683 | array($post_id) |
| 684 | 684 | ) |
| 685 | 685 | ); |
@@ -708,7 +708,7 @@ discard block |
||
| 708 | 708 | |
| 709 | 709 | $reatings = $wpdb->get_var( |
| 710 | 710 | $wpdb->prepare( |
| 711 | - "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d", |
|
| 711 | + "SELECT overall_rating FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id = %d", |
|
| 712 | 712 | array($comment_id) |
| 713 | 713 | ) |
| 714 | 714 | ); |
@@ -762,7 +762,7 @@ discard block |
||
| 762 | 762 | |
| 763 | 763 | $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available
|
| 764 | 764 | if (!$template) {
|
| 765 | - $template = dirname(__FILE__) . '/reviews.php'; |
|
| 765 | + $template = dirname(__FILE__).'/reviews.php'; |
|
| 766 | 766 | } |
| 767 | 767 | return $template; |
| 768 | 768 | } |
@@ -834,7 +834,7 @@ discard block |
||
| 834 | 834 | printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',
|
| 835 | 835 | get_comment_author_link(), |
| 836 | 836 | // If current post author is also comment author, make it known visually. |
| 837 | - ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''
|
|
| 837 | + ($comment->user_id === $post->post_author) ? '<span>'.__('Post author', 'geodirectory').'</span>' : ''
|
|
| 838 | 838 | ); |
| 839 | 839 | echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>"; |
| 840 | 840 | printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',
|
@@ -892,7 +892,7 @@ discard block |
||
| 892 | 892 | global $post; |
| 893 | 893 | $post_types = geodir_get_posttypes(); |
| 894 | 894 | |
| 895 | - if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int)$post_id)) {
|
|
| 895 | + if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int) $post_id)) {
|
|
| 896 | 896 | $review_count = geodir_get_review_count_total($post_id); |
| 897 | 897 | return $review_count; |
| 898 | 898 | |
@@ -925,29 +925,29 @@ discard block |
||
| 925 | 925 | */ |
| 926 | 926 | function geodir_get_rating_stars($rating, $post_id, $small = false) |
| 927 | 927 | {
|
| 928 | - if (!empty($post_id) && geodir_cpt_has_rating_disabled((int)$post_id)) {
|
|
| 928 | + if (!empty($post_id) && geodir_cpt_has_rating_disabled((int) $post_id)) {
|
|
| 929 | 929 | return NULL; |
| 930 | 930 | } |
| 931 | 931 | $a_rating = $rating / 5 * 100; |
| 932 | 932 | |
| 933 | 933 | if ($small) {
|
| 934 | - $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>'; |
|
| 934 | + $r_html = '<div class="rating"><div class="gd_rating_map" data-average="'.$rating.'" data-id="'.$post_id.'"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: '.$a_rating.'%;"></div><div class="geodir_Star_small"></div></div></div>'; |
|
| 935 | 935 | } else {
|
| 936 | 936 | if (function_exists('geodir_reviewrating_draw_overall_rating')) {
|
| 937 | 937 | // Show rating stars from review rating manager |
| 938 | 938 | $r_html = geodir_reviewrating_draw_overall_rating($rating); |
| 939 | 939 | } else {
|
| 940 | - $rating_img = '<img alt="rating icon" src="' . get_option('geodir_default_rating_star_icon') . '" />';
|
|
| 940 | + $rating_img = '<img alt="rating icon" src="'.get_option('geodir_default_rating_star_icon').'" />';
|
|
| 941 | 941 | |
| 942 | 942 | /* fix rating star for safari */ |
| 943 | 943 | $star_width = 23 * 5; |
| 944 | 944 | |
| 945 | 945 | if ($star_width > 0) {
|
| 946 | - $attach_style = 'max-width:' . $star_width . 'px'; |
|
| 946 | + $attach_style = 'max-width:'.$star_width.'px'; |
|
| 947 | 947 | } else {
|
| 948 | 948 | $attach_style = ''; |
| 949 | 949 | } |
| 950 | - $r_html = '<div class="geodir-rating" style="' . $attach_style . '"><div class="gd_rating_show" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingAverage" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star">' . $rating_img . $rating_img . $rating_img . $rating_img . $rating_img . '</div></div></div>'; |
|
| 950 | + $r_html = '<div class="geodir-rating" style="'.$attach_style.'"><div class="gd_rating_show" data-average="'.$rating.'" data-id="'.$post_id.'"><div class="geodir_RatingAverage" style="width: '.$a_rating.'%;"></div><div class="geodir_Star">'.$rating_img.$rating_img.$rating_img.$rating_img.$rating_img.'</div></div></div>'; |
|
| 951 | 951 | } |
| 952 | 952 | } |
| 953 | 953 | return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);
|
@@ -987,10 +987,10 @@ discard block |
||
| 987 | 987 | /* |
| 988 | 988 | * If Disqus plugin is active, do some fixes to show on blogs but no on GD post types |
| 989 | 989 | */ |
| 990 | -if(function_exists('dsq_can_replace')) {
|
|
| 990 | +if (function_exists('dsq_can_replace')) {
|
|
| 991 | 991 | remove_filter('comments_template', 'dsq_comments_template');
|
| 992 | 992 | add_filter('comments_template', 'dsq_comments_template', 100);
|
| 993 | - add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);
|
|
| 993 | + add_filter('pre_option_disqus_active', 'geodir_option_disqus_active', 10, 1);
|
|
| 994 | 994 | } |
| 995 | 995 | |
| 996 | 996 | |
@@ -1003,11 +1003,11 @@ discard block |
||
| 1003 | 1003 | * @param string $disqus_active Hook called before DB call for option so this is empty. |
| 1004 | 1004 | * @return string `1` if active `0` if disabled. |
| 1005 | 1005 | */ |
| 1006 | -function geodir_option_disqus_active($disqus_active){
|
|
| 1006 | +function geodir_option_disqus_active($disqus_active) {
|
|
| 1007 | 1007 | global $post; |
| 1008 | 1008 | $all_postypes = geodir_get_posttypes(); |
| 1009 | 1009 | |
| 1010 | - if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){
|
|
| 1010 | + if (isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
|
|
| 1011 | 1011 | $disqus_active = '0'; |
| 1012 | 1012 | } |
| 1013 | 1013 | |
@@ -31,13 +31,13 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | function geodir_comment_meta_row_action($a) |
| 33 | 33 | {
|
| 34 | - global $comment; |
|
| 34 | + global $comment; |
|
| 35 | 35 | |
| 36 | - $rating = geodir_get_commentoverall($comment->comment_ID); |
|
| 37 | - if ($rating != 0) {
|
|
| 38 | - echo geodir_get_rating_stars($rating, $comment->comment_ID); |
|
| 39 | - } |
|
| 40 | - return $a; |
|
| 36 | + $rating = geodir_get_commentoverall($comment->comment_ID); |
|
| 37 | + if ($rating != 0) {
|
|
| 38 | + echo geodir_get_rating_stars($rating, $comment->comment_ID); |
|
| 39 | + } |
|
| 40 | + return $a; |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | add_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');
|
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | function geodir_comment_add_meta_box($comment) |
| 54 | 54 | {
|
| 55 | - add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high');
|
|
| 55 | + add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high');
|
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | * @param object $comment The comment object. |
| 67 | 67 | */ |
| 68 | 68 | function geodir_comment_rating_meta($comment) {
|
| 69 | - $post_type = get_post_type($comment->comment_post_ID); |
|
| 69 | + $post_type = get_post_type($comment->comment_post_ID); |
|
| 70 | 70 | if (in_array($post_type, (array)geodir_get_posttypes()) && (int)$comment->comment_parent == 0 && !(!empty($post_type) && geodir_cpt_has_rating_disabled($post_type))) {
|
| 71 | 71 | $rating = geodir_get_commentoverall($comment->comment_ID); |
| 72 | 72 | |
@@ -106,24 +106,24 @@ discard block |
||
| 106 | 106 | * @global object $post The post object. |
| 107 | 107 | */ |
| 108 | 108 | function geodir_comment_rating_fields() {
|
| 109 | - global $post; |
|
| 109 | + global $post; |
|
| 110 | 110 | |
| 111 | - $post_types = geodir_get_posttypes(); |
|
| 111 | + $post_types = geodir_get_posttypes(); |
|
| 112 | 112 | |
| 113 | - if (!empty($post->post_type) && in_array($post->post_type, $post_types) && !(!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type))) {
|
|
| 114 | - $star_texts = array(); |
|
| 115 | - $star_texts[] = __('Terrible', 'geodirectory');
|
|
| 116 | - $star_texts[] = __('Poor', 'geodirectory');
|
|
| 117 | - $star_texts[] = __('Average', 'geodirectory');
|
|
| 118 | - $star_texts[] = __('Very Good', 'geodirectory');
|
|
| 119 | - $star_texts[] = __('Excellent', 'geodirectory');
|
|
| 113 | + if (!empty($post->post_type) && in_array($post->post_type, $post_types) && !(!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type))) {
|
|
| 114 | + $star_texts = array(); |
|
| 115 | + $star_texts[] = __('Terrible', 'geodirectory');
|
|
| 116 | + $star_texts[] = __('Poor', 'geodirectory');
|
|
| 117 | + $star_texts[] = __('Average', 'geodirectory');
|
|
| 118 | + $star_texts[] = __('Very Good', 'geodirectory');
|
|
| 119 | + $star_texts[] = __('Excellent', 'geodirectory');
|
|
| 120 | 120 | |
| 121 | - $gd_rating_html = apply_filters('gd_rating_form_html', '<div class="gd_rating" data-average="0" data-id="5"></div>', $star_texts);
|
|
| 122 | - echo $gd_rating_html; |
|
| 123 | - ?> |
|
| 121 | + $gd_rating_html = apply_filters('gd_rating_form_html', '<div class="gd_rating" data-average="0" data-id="5"></div>', $star_texts);
|
|
| 122 | + echo $gd_rating_html; |
|
| 123 | + ?> |
|
| 124 | 124 | <input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="0"/> |
| 125 | 125 | <?php |
| 126 | - } |
|
| 126 | + } |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | add_filter('comment_reply_link', 'geodir_comment_replaylink');
|
@@ -138,9 +138,9 @@ discard block |
||
| 138 | 138 | function geodir_comment_replaylink($link) |
| 139 | 139 | {
|
| 140 | 140 | |
| 141 | - $link = '<div class="gd_comment_replaylink">' . $link . '</div>'; |
|
| 141 | + $link = '<div class="gd_comment_replaylink">' . $link . '</div>'; |
|
| 142 | 142 | |
| 143 | - return $link; |
|
| 143 | + return $link; |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | add_filter('cancel_comment_reply_link', 'geodir_cancle_replaylink');
|
@@ -155,9 +155,9 @@ discard block |
||
| 155 | 155 | function geodir_cancle_replaylink($link) |
| 156 | 156 | {
|
| 157 | 157 | |
| 158 | - $link = '<span class="gd-cancel-replaylink">' . $link . '</span>'; |
|
| 158 | + $link = '<span class="gd-cancel-replaylink">' . $link . '</span>'; |
|
| 159 | 159 | |
| 160 | - return $link; |
|
| 160 | + return $link; |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | add_action('comment_post', 'geodir_save_rating');
|
@@ -173,32 +173,32 @@ discard block |
||
| 173 | 173 | */ |
| 174 | 174 | function geodir_save_rating($comment = 0) |
| 175 | 175 | {
|
| 176 | - global $wpdb, $user_ID, $plugin_prefix; |
|
| 176 | + global $wpdb, $user_ID, $plugin_prefix; |
|
| 177 | 177 | |
| 178 | - $comment_info = get_comment($comment); |
|
| 178 | + $comment_info = get_comment($comment); |
|
| 179 | 179 | |
| 180 | - $post_id = $comment_info->comment_post_ID; |
|
| 181 | - $status = $comment_info->comment_approved; |
|
| 182 | - $rating_ip = getenv("REMOTE_ADDR");
|
|
| 180 | + $post_id = $comment_info->comment_post_ID; |
|
| 181 | + $status = $comment_info->comment_approved; |
|
| 182 | + $rating_ip = getenv("REMOTE_ADDR");
|
|
| 183 | 183 | |
| 184 | - $post = geodir_get_post_info($post_id); |
|
| 185 | - if (empty($post)) {
|
|
| 186 | - return; |
|
| 187 | - } |
|
| 188 | - |
|
| 189 | - if ($post->post_status == 'publish') {
|
|
| 190 | - $post_status = '1'; |
|
| 191 | - } else {
|
|
| 192 | - $post_status = '0'; |
|
| 193 | - } |
|
| 184 | + $post = geodir_get_post_info($post_id); |
|
| 185 | + if (empty($post)) {
|
|
| 186 | + return; |
|
| 187 | + } |
|
| 188 | + |
|
| 189 | + if ($post->post_status == 'publish') {
|
|
| 190 | + $post_status = '1'; |
|
| 191 | + } else {
|
|
| 192 | + $post_status = '0'; |
|
| 193 | + } |
|
| 194 | 194 | |
| 195 | - if (isset($_REQUEST['geodir_overallrating'])) {
|
|
| 196 | - $overall_rating = $_REQUEST['geodir_overallrating']; |
|
| 195 | + if (isset($_REQUEST['geodir_overallrating'])) {
|
|
| 196 | + $overall_rating = $_REQUEST['geodir_overallrating']; |
|
| 197 | 197 | |
| 198 | 198 | if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {
|
| 199 | - $overall_rating = $overall_rating > 0 ? $overall_rating : '0'; |
|
| 199 | + $overall_rating = $overall_rating > 0 ? $overall_rating : '0'; |
|
| 200 | 200 | |
| 201 | - $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET
|
|
| 201 | + $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET
|
|
| 202 | 202 | post_id = %d, |
| 203 | 203 | post_type = %s, |
| 204 | 204 | post_title = %s, |
@@ -216,35 +216,35 @@ discard block |
||
| 216 | 216 | post_latitude = %s, |
| 217 | 217 | comment_content = %s |
| 218 | 218 | ", |
| 219 | - array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content)
|
|
| 220 | - ); |
|
| 221 | - |
|
| 222 | - $wpdb->query($sqlqry); |
|
| 223 | - |
|
| 224 | - /** |
|
| 225 | - * Called after saving the comment. |
|
| 226 | - * |
|
| 227 | - * @since 1.0.0 |
|
| 228 | - * @package GeoDirectory |
|
| 229 | - * @param array $_REQUEST {
|
|
| 230 | - * Attributes of the $_REQUEST variable. |
|
| 231 | - * |
|
| 232 | - * @type string $geodir_overallrating Overall rating. |
|
| 233 | - * @type string $comment Comment text. |
|
| 234 | - * @type string $submit Submit button text. |
|
| 235 | - * @type string $comment_post_ID Comment post ID. |
|
| 236 | - * @type string $comment_parent Comment Parent ID. |
|
| 237 | - * @type string $_wp_unfiltered_html_comment Unfiltered html comment string. |
|
| 238 | - * |
|
| 239 | - * } |
|
| 240 | - */ |
|
| 241 | - do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post');
|
|
| 242 | - |
|
| 243 | - if ($status) {
|
|
| 244 | - geodir_update_postrating($post_id); |
|
| 245 | - } |
|
| 246 | - } |
|
| 247 | - } |
|
| 219 | + array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content)
|
|
| 220 | + ); |
|
| 221 | + |
|
| 222 | + $wpdb->query($sqlqry); |
|
| 223 | + |
|
| 224 | + /** |
|
| 225 | + * Called after saving the comment. |
|
| 226 | + * |
|
| 227 | + * @since 1.0.0 |
|
| 228 | + * @package GeoDirectory |
|
| 229 | + * @param array $_REQUEST {
|
|
| 230 | + * Attributes of the $_REQUEST variable. |
|
| 231 | + * |
|
| 232 | + * @type string $geodir_overallrating Overall rating. |
|
| 233 | + * @type string $comment Comment text. |
|
| 234 | + * @type string $submit Submit button text. |
|
| 235 | + * @type string $comment_post_ID Comment post ID. |
|
| 236 | + * @type string $comment_parent Comment Parent ID. |
|
| 237 | + * @type string $_wp_unfiltered_html_comment Unfiltered html comment string. |
|
| 238 | + * |
|
| 239 | + * } |
|
| 240 | + */ |
|
| 241 | + do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post');
|
|
| 242 | + |
|
| 243 | + if ($status) {
|
|
| 244 | + geodir_update_postrating($post_id); |
|
| 245 | + } |
|
| 246 | + } |
|
| 247 | + } |
|
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | |
@@ -262,51 +262,51 @@ discard block |
||
| 262 | 262 | */ |
| 263 | 263 | function geodir_update_rating_status_change($comment_id, $status) |
| 264 | 264 | {
|
| 265 | - if ($status == 'delete') {
|
|
| 266 | - return; |
|
| 267 | - } |
|
| 268 | - global $wpdb, $plugin_prefix, $user_ID; |
|
| 265 | + if ($status == 'delete') {
|
|
| 266 | + return; |
|
| 267 | + } |
|
| 268 | + global $wpdb, $plugin_prefix, $user_ID; |
|
| 269 | 269 | |
| 270 | - $comment_info = get_comment($comment_id); |
|
| 270 | + $comment_info = get_comment($comment_id); |
|
| 271 | 271 | |
| 272 | - $post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : ''; |
|
| 272 | + $post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : ''; |
|
| 273 | 273 | |
| 274 | - if (!empty($comment_info)) |
|
| 275 | - $status = $comment_info->comment_approved; |
|
| 274 | + if (!empty($comment_info)) |
|
| 275 | + $status = $comment_info->comment_approved; |
|
| 276 | 276 | |
| 277 | - if ($status == 'approve' || $status == 1) {
|
|
| 278 | - $status = 1; |
|
| 279 | - } else {
|
|
| 280 | - $status = 0; |
|
| 281 | - } |
|
| 277 | + if ($status == 'approve' || $status == 1) {
|
|
| 278 | + $status = 1; |
|
| 279 | + } else {
|
|
| 280 | + $status = 0; |
|
| 281 | + } |
|
| 282 | 282 | |
| 283 | - $comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : ''; |
|
| 284 | - $old_rating = geodir_get_commentoverall($comment_info_ID); |
|
| 283 | + $comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : ''; |
|
| 284 | + $old_rating = geodir_get_commentoverall($comment_info_ID); |
|
| 285 | 285 | |
| 286 | - $post_type = get_post_type($post_id); |
|
| 286 | + $post_type = get_post_type($post_id); |
|
| 287 | 287 | |
| 288 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 288 | + $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 289 | 289 | |
| 290 | - if ($comment_id) {
|
|
| 290 | + if ($comment_id) {
|
|
| 291 | 291 | |
| 292 | - $overall_rating = $old_rating; |
|
| 292 | + $overall_rating = $old_rating; |
|
| 293 | 293 | |
| 294 | - if (isset($old_rating)) {
|
|
| 294 | + if (isset($old_rating)) {
|
|
| 295 | 295 | |
| 296 | - $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET
|
|
| 296 | + $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET
|
|
| 297 | 297 | overall_rating = %f, |
| 298 | 298 | status = %s, |
| 299 | 299 | comment_content = %s |
| 300 | 300 | WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id)); |
| 301 | 301 | |
| 302 | - $wpdb->query($sqlqry); |
|
| 302 | + $wpdb->query($sqlqry); |
|
| 303 | 303 | |
| 304 | - //update rating |
|
| 305 | - geodir_update_postrating($post_id, $post_type); |
|
| 304 | + //update rating |
|
| 305 | + geodir_update_postrating($post_id, $post_type); |
|
| 306 | 306 | |
| 307 | - } |
|
| 307 | + } |
|
| 308 | 308 | |
| 309 | - } |
|
| 309 | + } |
|
| 310 | 310 | |
| 311 | 311 | } |
| 312 | 312 | |
@@ -325,41 +325,41 @@ discard block |
||
| 325 | 325 | function geodir_update_rating($comment_id = 0) |
| 326 | 326 | {
|
| 327 | 327 | |
| 328 | - global $wpdb, $plugin_prefix, $user_ID; |
|
| 328 | + global $wpdb, $plugin_prefix, $user_ID; |
|
| 329 | 329 | |
| 330 | - $comment_info = get_comment($comment_id); |
|
| 330 | + $comment_info = get_comment($comment_id); |
|
| 331 | 331 | |
| 332 | - $post_id = $comment_info->comment_post_ID; |
|
| 333 | - $status = $comment_info->comment_approved; |
|
| 334 | - $old_rating = geodir_get_commentoverall($comment_info->comment_ID); |
|
| 332 | + $post_id = $comment_info->comment_post_ID; |
|
| 333 | + $status = $comment_info->comment_approved; |
|
| 334 | + $old_rating = geodir_get_commentoverall($comment_info->comment_ID); |
|
| 335 | 335 | |
| 336 | - $post_type = get_post_type($post_id); |
|
| 336 | + $post_type = get_post_type($post_id); |
|
| 337 | 337 | |
| 338 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 338 | + $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 339 | 339 | |
| 340 | - if (isset($_REQUEST['geodir_overallrating'])) {
|
|
| 340 | + if (isset($_REQUEST['geodir_overallrating'])) {
|
|
| 341 | 341 | |
| 342 | - $overall_rating = $_REQUEST['geodir_overallrating']; |
|
| 342 | + $overall_rating = $_REQUEST['geodir_overallrating']; |
|
| 343 | 343 | |
| 344 | - if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {
|
|
| 345 | - $overall_rating = $overall_rating > 0 ? $overall_rating : '0'; |
|
| 344 | + if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {
|
|
| 345 | + $overall_rating = $overall_rating > 0 ? $overall_rating : '0'; |
|
| 346 | 346 | |
| 347 | - if (isset($old_rating)) {
|
|
| 347 | + if (isset($old_rating)) {
|
|
| 348 | 348 | |
| 349 | - $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET
|
|
| 349 | + $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET
|
|
| 350 | 350 | overall_rating = %f, |
| 351 | 351 | status = %s, |
| 352 | 352 | comment_content = %s |
| 353 | 353 | WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id)); |
| 354 | 354 | |
| 355 | - $wpdb->query($sqlqry); |
|
| 355 | + $wpdb->query($sqlqry); |
|
| 356 | 356 | |
| 357 | - //update rating |
|
| 358 | - geodir_update_postrating($post_id, $post_type); |
|
| 357 | + //update rating |
|
| 358 | + geodir_update_postrating($post_id, $post_type); |
|
| 359 | 359 | |
| 360 | - } |
|
| 361 | - } |
|
| 362 | - } |
|
| 360 | + } |
|
| 361 | + } |
|
| 362 | + } |
|
| 363 | 363 | |
| 364 | 364 | |
| 365 | 365 | } |
@@ -375,19 +375,19 @@ discard block |
||
| 375 | 375 | */ |
| 376 | 376 | function geodir_comment_delete_comment($comment_id) |
| 377 | 377 | {
|
| 378 | - global $wpdb; |
|
| 378 | + global $wpdb; |
|
| 379 | 379 | |
| 380 | - $review_info = geodir_get_review($comment_id); |
|
| 381 | - if ($review_info) {
|
|
| 382 | - geodir_update_postrating($review_info->post_id); |
|
| 383 | - } |
|
| 380 | + $review_info = geodir_get_review($comment_id); |
|
| 381 | + if ($review_info) {
|
|
| 382 | + geodir_update_postrating($review_info->post_id); |
|
| 383 | + } |
|
| 384 | 384 | |
| 385 | - $wpdb->query( |
|
| 386 | - $wpdb->prepare( |
|
| 387 | - "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d", |
|
| 388 | - array($comment_id) |
|
| 389 | - ) |
|
| 390 | - ); |
|
| 385 | + $wpdb->query( |
|
| 386 | + $wpdb->prepare( |
|
| 387 | + "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d", |
|
| 388 | + array($comment_id) |
|
| 389 | + ) |
|
| 390 | + ); |
|
| 391 | 391 | |
| 392 | 392 | } |
| 393 | 393 | |
@@ -403,21 +403,21 @@ discard block |
||
| 403 | 403 | * @return string The comment content. |
| 404 | 404 | */ |
| 405 | 405 | function geodir_wrap_comment_text($content, $comment = '') {
|
| 406 | - if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int)$comment->comment_post_ID)) {
|
|
| 407 | - if (!is_admin()) {
|
|
| 408 | - return '<div class="description">' . $content . '</div>'; |
|
| 409 | - } else {
|
|
| 410 | - return $content; |
|
| 411 | - } |
|
| 412 | - } else {
|
|
| 413 | - $rating = 0; |
|
| 414 | - if (!empty($comment)) |
|
| 415 | - $rating = geodir_get_commentoverall($comment->comment_ID); |
|
| 416 | - if ($rating != 0 && !is_admin()) {
|
|
| 417 | - return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';
|
|
| 418 | - } else |
|
| 419 | - return $content; |
|
| 420 | - } |
|
| 406 | + if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int)$comment->comment_post_ID)) {
|
|
| 407 | + if (!is_admin()) {
|
|
| 408 | + return '<div class="description">' . $content . '</div>'; |
|
| 409 | + } else {
|
|
| 410 | + return $content; |
|
| 411 | + } |
|
| 412 | + } else {
|
|
| 413 | + $rating = 0; |
|
| 414 | + if (!empty($comment)) |
|
| 415 | + $rating = geodir_get_commentoverall($comment->comment_ID); |
|
| 416 | + if ($rating != 0 && !is_admin()) {
|
|
| 417 | + return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';
|
|
| 418 | + } else |
|
| 419 | + return $content; |
|
| 420 | + } |
|
| 421 | 421 | } |
| 422 | 422 | |
| 423 | 423 | |
@@ -434,41 +434,41 @@ discard block |
||
| 434 | 434 | */ |
| 435 | 435 | function geodir_update_postrating($post_id = 0, $post_type = '', $delete = false) |
| 436 | 436 | {
|
| 437 | - global $wpdb, $plugin_prefix, $comment; |
|
| 438 | - if (!$post_type) {
|
|
| 439 | - $post_type = get_post_type($post_id); |
|
| 440 | - } |
|
| 441 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 442 | - $post_newrating = geodir_get_post_rating($post_id, 1); |
|
| 443 | - $post_newrating_count = geodir_get_review_count_total($post_id); |
|
| 437 | + global $wpdb, $plugin_prefix, $comment; |
|
| 438 | + if (!$post_type) {
|
|
| 439 | + $post_type = get_post_type($post_id); |
|
| 440 | + } |
|
| 441 | + $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 442 | + $post_newrating = geodir_get_post_rating($post_id, 1); |
|
| 443 | + $post_newrating_count = geodir_get_review_count_total($post_id); |
|
| 444 | 444 | |
| 445 | 445 | |
| 446 | - //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ; |
|
| 446 | + //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ; |
|
| 447 | 447 | |
| 448 | - if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {
|
|
| 448 | + if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {
|
|
| 449 | 449 | |
| 450 | - $wpdb->query( |
|
| 451 | - $wpdb->prepare( |
|
| 452 | - "UPDATE " . $detail_table . " SET |
|
| 450 | + $wpdb->query( |
|
| 451 | + $wpdb->prepare( |
|
| 452 | + "UPDATE " . $detail_table . " SET |
|
| 453 | 453 | overall_rating = %f, |
| 454 | 454 | rating_count = %f |
| 455 | 455 | where post_id = %d", |
| 456 | - array($post_newrating, $post_newrating_count, $post_id) |
|
| 457 | - ) |
|
| 458 | - ); |
|
| 459 | - |
|
| 460 | - update_post_meta($post_id, 'overall_rating', $post_newrating); |
|
| 461 | - update_post_meta($post_id, 'rating_count', $post_newrating_count); |
|
| 462 | - } |
|
| 463 | - /** |
|
| 464 | - * Called after Updating post overall rating and rating count. |
|
| 465 | - * |
|
| 466 | - * @since 1.0.0 |
|
| 467 | - * @since 1.4.3 Added `$post_id` param. |
|
| 468 | - * @package GeoDirectory |
|
| 469 | - * @param int $post_id The post ID. |
|
| 470 | - */ |
|
| 471 | - do_action('geodir_update_postrating',$post_id);
|
|
| 456 | + array($post_newrating, $post_newrating_count, $post_id) |
|
| 457 | + ) |
|
| 458 | + ); |
|
| 459 | + |
|
| 460 | + update_post_meta($post_id, 'overall_rating', $post_newrating); |
|
| 461 | + update_post_meta($post_id, 'rating_count', $post_newrating_count); |
|
| 462 | + } |
|
| 463 | + /** |
|
| 464 | + * Called after Updating post overall rating and rating count. |
|
| 465 | + * |
|
| 466 | + * @since 1.0.0 |
|
| 467 | + * @since 1.4.3 Added `$post_id` param. |
|
| 468 | + * @package GeoDirectory |
|
| 469 | + * @param int $post_id The post ID. |
|
| 470 | + */ |
|
| 471 | + do_action('geodir_update_postrating',$post_id);
|
|
| 472 | 472 | |
| 473 | 473 | } |
| 474 | 474 | |
@@ -486,29 +486,29 @@ discard block |
||
| 486 | 486 | */ |
| 487 | 487 | function geodir_get_postoverall($post_id = 0) |
| 488 | 488 | {
|
| 489 | - global $wpdb, $plugin_prefix; |
|
| 489 | + global $wpdb, $plugin_prefix; |
|
| 490 | 490 | |
| 491 | - $post_type = get_post_type($post_id); |
|
| 492 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 491 | + $post_type = get_post_type($post_id); |
|
| 492 | + $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 493 | 493 | |
| 494 | - if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {
|
|
| 494 | + if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {
|
|
| 495 | 495 | |
| 496 | - $post_ratings = $wpdb->get_var( |
|
| 497 | - $wpdb->prepare( |
|
| 498 | - "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d", |
|
| 499 | - array($post_id) |
|
| 500 | - ) |
|
| 501 | - ); |
|
| 496 | + $post_ratings = $wpdb->get_var( |
|
| 497 | + $wpdb->prepare( |
|
| 498 | + "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d", |
|
| 499 | + array($post_id) |
|
| 500 | + ) |
|
| 501 | + ); |
|
| 502 | 502 | |
| 503 | 503 | |
| 504 | - } else {
|
|
| 505 | - $post_ratings = get_post_meta($post_id, 'overall_rating'); |
|
| 506 | - } |
|
| 504 | + } else {
|
|
| 505 | + $post_ratings = get_post_meta($post_id, 'overall_rating'); |
|
| 506 | + } |
|
| 507 | 507 | |
| 508 | - if ($post_ratings) |
|
| 509 | - return $post_ratings; |
|
| 510 | - else |
|
| 511 | - return false; |
|
| 508 | + if ($post_ratings) |
|
| 509 | + return $post_ratings; |
|
| 510 | + else |
|
| 511 | + return false; |
|
| 512 | 512 | } |
| 513 | 513 | |
| 514 | 514 | |
@@ -525,19 +525,19 @@ discard block |
||
| 525 | 525 | */ |
| 526 | 526 | function geodir_get_review($comment_id = 0) |
| 527 | 527 | {
|
| 528 | - global $wpdb; |
|
| 529 | - |
|
| 530 | - $reatings = $wpdb->get_row( |
|
| 531 | - $wpdb->prepare( |
|
| 532 | - "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d", |
|
| 533 | - array($comment_id) |
|
| 534 | - ) |
|
| 535 | - ); |
|
| 536 | - |
|
| 537 | - if (!empty($reatings)) |
|
| 538 | - return $reatings; |
|
| 539 | - else |
|
| 540 | - return false; |
|
| 528 | + global $wpdb; |
|
| 529 | + |
|
| 530 | + $reatings = $wpdb->get_row( |
|
| 531 | + $wpdb->prepare( |
|
| 532 | + "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d", |
|
| 533 | + array($comment_id) |
|
| 534 | + ) |
|
| 535 | + ); |
|
| 536 | + |
|
| 537 | + if (!empty($reatings)) |
|
| 538 | + return $reatings; |
|
| 539 | + else |
|
| 540 | + return false; |
|
| 541 | 541 | } |
| 542 | 542 | |
| 543 | 543 | /** |
@@ -553,19 +553,19 @@ discard block |
||
| 553 | 553 | */ |
| 554 | 554 | function geodir_get_review_total($post_id = 0) |
| 555 | 555 | {
|
| 556 | - global $wpdb; |
|
| 557 | - |
|
| 558 | - $results = $wpdb->get_var( |
|
| 559 | - $wpdb->prepare( |
|
| 560 | - "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 561 | - array($post_id) |
|
| 562 | - ) |
|
| 563 | - ); |
|
| 564 | - |
|
| 565 | - if (!empty($results)) |
|
| 566 | - return $results; |
|
| 567 | - else |
|
| 568 | - return false; |
|
| 556 | + global $wpdb; |
|
| 557 | + |
|
| 558 | + $results = $wpdb->get_var( |
|
| 559 | + $wpdb->prepare( |
|
| 560 | + "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 561 | + array($post_id) |
|
| 562 | + ) |
|
| 563 | + ); |
|
| 564 | + |
|
| 565 | + if (!empty($results)) |
|
| 566 | + return $results; |
|
| 567 | + else |
|
| 568 | + return false; |
|
| 569 | 569 | } |
| 570 | 570 | |
| 571 | 571 | /** |
@@ -581,18 +581,18 @@ discard block |
||
| 581 | 581 | */ |
| 582 | 582 | function geodir_get_review_count_by_user_id($user_id = 0) |
| 583 | 583 | {
|
| 584 | - global $wpdb; |
|
| 585 | - $results = $wpdb->get_var( |
|
| 586 | - $wpdb->prepare( |
|
| 587 | - "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0", |
|
| 588 | - array($user_id) |
|
| 589 | - ) |
|
| 590 | - ); |
|
| 591 | - |
|
| 592 | - if (!empty($results)) |
|
| 593 | - return $results; |
|
| 594 | - else |
|
| 595 | - return false; |
|
| 584 | + global $wpdb; |
|
| 585 | + $results = $wpdb->get_var( |
|
| 586 | + $wpdb->prepare( |
|
| 587 | + "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0", |
|
| 588 | + array($user_id) |
|
| 589 | + ) |
|
| 590 | + ); |
|
| 591 | + |
|
| 592 | + if (!empty($results)) |
|
| 593 | + return $results; |
|
| 594 | + else |
|
| 595 | + return false; |
|
| 596 | 596 | } |
| 597 | 597 | |
| 598 | 598 | /** |
@@ -610,27 +610,27 @@ discard block |
||
| 610 | 610 | */ |
| 611 | 611 | function geodir_get_post_rating($post_id = 0, $force_query = 0) |
| 612 | 612 | {
|
| 613 | - global $wpdb, $post; |
|
| 614 | - |
|
| 615 | - if (isset($post->ID) && $post->ID == $post_id && !$force_query) {
|
|
| 616 | - if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) {
|
|
| 617 | - return $post->overall_rating; |
|
| 618 | - } else {
|
|
| 619 | - return 0; |
|
| 620 | - } |
|
| 621 | - } |
|
| 622 | - |
|
| 623 | - $results = $wpdb->get_var( |
|
| 624 | - $wpdb->prepare( |
|
| 625 | - "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 626 | - array($post_id) |
|
| 627 | - ) |
|
| 628 | - ); |
|
| 629 | - |
|
| 630 | - if (!empty($results)) |
|
| 631 | - return $results; |
|
| 632 | - else |
|
| 633 | - return false; |
|
| 613 | + global $wpdb, $post; |
|
| 614 | + |
|
| 615 | + if (isset($post->ID) && $post->ID == $post_id && !$force_query) {
|
|
| 616 | + if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) {
|
|
| 617 | + return $post->overall_rating; |
|
| 618 | + } else {
|
|
| 619 | + return 0; |
|
| 620 | + } |
|
| 621 | + } |
|
| 622 | + |
|
| 623 | + $results = $wpdb->get_var( |
|
| 624 | + $wpdb->prepare( |
|
| 625 | + "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 626 | + array($post_id) |
|
| 627 | + ) |
|
| 628 | + ); |
|
| 629 | + |
|
| 630 | + if (!empty($results)) |
|
| 631 | + return $results; |
|
| 632 | + else |
|
| 633 | + return false; |
|
| 634 | 634 | } |
| 635 | 635 | |
| 636 | 636 | /** |
@@ -646,19 +646,19 @@ discard block |
||
| 646 | 646 | */ |
| 647 | 647 | function geodir_get_review_count_total($post_id = 0) |
| 648 | 648 | {
|
| 649 | - global $wpdb; |
|
| 650 | - |
|
| 651 | - $results = $wpdb->get_var( |
|
| 652 | - $wpdb->prepare( |
|
| 653 | - "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 654 | - array($post_id) |
|
| 655 | - ) |
|
| 656 | - ); |
|
| 657 | - |
|
| 658 | - if (!empty($results)) |
|
| 659 | - return $results; |
|
| 660 | - else |
|
| 661 | - return false; |
|
| 649 | + global $wpdb; |
|
| 650 | + |
|
| 651 | + $results = $wpdb->get_var( |
|
| 652 | + $wpdb->prepare( |
|
| 653 | + "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 654 | + array($post_id) |
|
| 655 | + ) |
|
| 656 | + ); |
|
| 657 | + |
|
| 658 | + if (!empty($results)) |
|
| 659 | + return $results; |
|
| 660 | + else |
|
| 661 | + return false; |
|
| 662 | 662 | } |
| 663 | 663 | |
| 664 | 664 | /** |
@@ -675,20 +675,20 @@ discard block |
||
| 675 | 675 | */ |
| 676 | 676 | function geodir_get_comments_number($post_id = 0) |
| 677 | 677 | {
|
| 678 | - global $wpdb; |
|
| 678 | + global $wpdb; |
|
| 679 | 679 | |
| 680 | - $results = $wpdb->get_var( |
|
| 681 | - $wpdb->prepare( |
|
| 682 | - "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 683 | - array($post_id) |
|
| 684 | - ) |
|
| 685 | - ); |
|
| 680 | + $results = $wpdb->get_var( |
|
| 681 | + $wpdb->prepare( |
|
| 682 | + "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 683 | + array($post_id) |
|
| 684 | + ) |
|
| 685 | + ); |
|
| 686 | 686 | |
| 687 | 687 | |
| 688 | - if (!empty($results)) |
|
| 689 | - return $results; |
|
| 690 | - else |
|
| 691 | - return false; |
|
| 688 | + if (!empty($results)) |
|
| 689 | + return $results; |
|
| 690 | + else |
|
| 691 | + return false; |
|
| 692 | 692 | } |
| 693 | 693 | |
| 694 | 694 | /** |
@@ -704,19 +704,19 @@ discard block |
||
| 704 | 704 | */ |
| 705 | 705 | function geodir_get_commentoverall($comment_id = 0) |
| 706 | 706 | {
|
| 707 | - global $wpdb; |
|
| 708 | - |
|
| 709 | - $reatings = $wpdb->get_var( |
|
| 710 | - $wpdb->prepare( |
|
| 711 | - "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d", |
|
| 712 | - array($comment_id) |
|
| 713 | - ) |
|
| 714 | - ); |
|
| 715 | - |
|
| 716 | - if ($reatings) |
|
| 717 | - return $reatings; |
|
| 718 | - else |
|
| 719 | - return false; |
|
| 707 | + global $wpdb; |
|
| 708 | + |
|
| 709 | + $reatings = $wpdb->get_var( |
|
| 710 | + $wpdb->prepare( |
|
| 711 | + "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d", |
|
| 712 | + array($comment_id) |
|
| 713 | + ) |
|
| 714 | + ); |
|
| 715 | + |
|
| 716 | + if ($reatings) |
|
| 717 | + return $reatings; |
|
| 718 | + else |
|
| 719 | + return false; |
|
| 720 | 720 | } |
| 721 | 721 | |
| 722 | 722 | /** |
@@ -730,7 +730,7 @@ discard block |
||
| 730 | 730 | */ |
| 731 | 731 | function geodir_get_commentoverall_number($post_id = 0) |
| 732 | 732 | {
|
| 733 | - return geodir_get_post_rating($post_id); |
|
| 733 | + return geodir_get_post_rating($post_id); |
|
| 734 | 734 | } |
| 735 | 735 | |
| 736 | 736 | |
@@ -748,102 +748,102 @@ discard block |
||
| 748 | 748 | */ |
| 749 | 749 | function geodir_comment_template($comment_template) |
| 750 | 750 | {
|
| 751 | - global $post; |
|
| 751 | + global $post; |
|
| 752 | 752 | |
| 753 | - $post_types = geodir_get_posttypes(); |
|
| 753 | + $post_types = geodir_get_posttypes(); |
|
| 754 | 754 | |
| 755 | - if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) {
|
|
| 756 | - return; |
|
| 757 | - } |
|
| 758 | - if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business
|
|
| 759 | - if (geodir_cpt_has_rating_disabled($post->post_type)) {
|
|
| 760 | - return $comment_template; |
|
| 761 | - } |
|
| 755 | + if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) {
|
|
| 756 | + return; |
|
| 757 | + } |
|
| 758 | + if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business
|
|
| 759 | + if (geodir_cpt_has_rating_disabled($post->post_type)) {
|
|
| 760 | + return $comment_template; |
|
| 761 | + } |
|
| 762 | 762 | |
| 763 | - $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available
|
|
| 764 | - if (!$template) {
|
|
| 765 | - $template = dirname(__FILE__) . '/reviews.php'; |
|
| 766 | - } |
|
| 767 | - return $template; |
|
| 768 | - } |
|
| 763 | + $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available
|
|
| 764 | + if (!$template) {
|
|
| 765 | + $template = dirname(__FILE__) . '/reviews.php'; |
|
| 766 | + } |
|
| 767 | + return $template; |
|
| 768 | + } |
|
| 769 | 769 | } |
| 770 | 770 | |
| 771 | 771 | add_filter("comments_template", "geodir_comment_template");
|
| 772 | 772 | |
| 773 | 773 | |
| 774 | 774 | if (!function_exists('geodir_comment')) {
|
| 775 | - /** |
|
| 776 | - * Comment HTML markup. |
|
| 777 | - * |
|
| 778 | - * @since 1.0.0 |
|
| 779 | - * @package GeoDirectory |
|
| 780 | - * @global object $post The current post object. |
|
| 781 | - * @param object $comment The comment object. |
|
| 782 | - * @param string|array $args {
|
|
| 783 | - * Optional. Formatting options. |
|
| 784 | - * |
|
| 785 | - * @type object $walker Instance of a Walker class to list comments. Default null. |
|
| 786 | - * @type int $max_depth The maximum comments depth. Default empty. |
|
| 787 | - * @type string $style The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'. |
|
| 788 | - * @type string $callback Callback function to use. Default null. |
|
| 789 | - * @type string $end-callback Callback function to use at the end. Default null. |
|
| 790 | - * @type string $type Type of comments to list. |
|
| 791 | - * Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'. |
|
| 792 | - * @type int $page Page ID to list comments for. Default empty. |
|
| 793 | - * @type int $per_page Number of comments to list per page. Default empty. |
|
| 794 | - * @type int $avatar_size Height and width dimensions of the avatar size. Default 32. |
|
| 795 | - * @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'. |
|
| 796 | - * @type bool $reverse_children Whether to reverse child comments in the list. Default null. |
|
| 797 | - * @type string $format How to format the comments list. |
|
| 798 | - * Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'. |
|
| 799 | - * @type bool $short_ping Whether to output short pings. Default false. |
|
| 800 | - * @type bool $echo Whether to echo the output or return it. Default true. |
|
| 801 | - * } |
|
| 802 | - * @param int $depth Depth of comment. |
|
| 803 | - */ |
|
| 804 | - function geodir_comment($comment, $args, $depth) |
|
| 805 | - {
|
|
| 806 | - $GLOBALS['comment'] = $comment; |
|
| 807 | - switch ($comment->comment_type) : |
|
| 808 | - case 'pingback' : |
|
| 809 | - case 'trackback' : |
|
| 810 | - // Display trackbacks differently than normal comments. |
|
| 811 | - ?> |
|
| 775 | + /** |
|
| 776 | + * Comment HTML markup. |
|
| 777 | + * |
|
| 778 | + * @since 1.0.0 |
|
| 779 | + * @package GeoDirectory |
|
| 780 | + * @global object $post The current post object. |
|
| 781 | + * @param object $comment The comment object. |
|
| 782 | + * @param string|array $args {
|
|
| 783 | + * Optional. Formatting options. |
|
| 784 | + * |
|
| 785 | + * @type object $walker Instance of a Walker class to list comments. Default null. |
|
| 786 | + * @type int $max_depth The maximum comments depth. Default empty. |
|
| 787 | + * @type string $style The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'. |
|
| 788 | + * @type string $callback Callback function to use. Default null. |
|
| 789 | + * @type string $end-callback Callback function to use at the end. Default null. |
|
| 790 | + * @type string $type Type of comments to list. |
|
| 791 | + * Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'. |
|
| 792 | + * @type int $page Page ID to list comments for. Default empty. |
|
| 793 | + * @type int $per_page Number of comments to list per page. Default empty. |
|
| 794 | + * @type int $avatar_size Height and width dimensions of the avatar size. Default 32. |
|
| 795 | + * @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'. |
|
| 796 | + * @type bool $reverse_children Whether to reverse child comments in the list. Default null. |
|
| 797 | + * @type string $format How to format the comments list. |
|
| 798 | + * Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'. |
|
| 799 | + * @type bool $short_ping Whether to output short pings. Default false. |
|
| 800 | + * @type bool $echo Whether to echo the output or return it. Default true. |
|
| 801 | + * } |
|
| 802 | + * @param int $depth Depth of comment. |
|
| 803 | + */ |
|
| 804 | + function geodir_comment($comment, $args, $depth) |
|
| 805 | + {
|
|
| 806 | + $GLOBALS['comment'] = $comment; |
|
| 807 | + switch ($comment->comment_type) : |
|
| 808 | + case 'pingback' : |
|
| 809 | + case 'trackback' : |
|
| 810 | + // Display trackbacks differently than normal comments. |
|
| 811 | + ?> |
|
| 812 | 812 | <li <?php comment_class('geodir-comment'); ?> id="comment-<?php comment_ID(); ?>">
|
| 813 | 813 | <p><?php _e('Pingback:', 'geodirectory'); ?> <?php comment_author_link(); ?> <?php edit_comment_link(__('(Edit)', 'geodirectory'), '<span class="edit-link">', '</span>'); ?></p>
|
| 814 | 814 | <?php |
| 815 | - break; |
|
| 816 | - default : |
|
| 817 | - // Proceed with normal comments. |
|
| 818 | - global $post; |
|
| 819 | - ?> |
|
| 815 | + break; |
|
| 816 | + default : |
|
| 817 | + // Proceed with normal comments. |
|
| 818 | + global $post; |
|
| 819 | + ?> |
|
| 820 | 820 | <li <?php comment_class('geodir-comment'); ?> id="li-comment-<?php comment_ID(); ?>">
|
| 821 | 821 | <article id="comment-<?php comment_ID(); ?>" class="comment"> |
| 822 | 822 | <header class="comment-meta comment-author vcard"> |
| 823 | 823 | <?php |
| 824 | - /** |
|
| 825 | - * Filter to modify comment avatar size |
|
| 826 | - * |
|
| 827 | - * You can use this filter to change comment avatar size. |
|
| 828 | - * |
|
| 829 | - * @since 1.0.0 |
|
| 830 | - * @package GeoDirectory |
|
| 831 | - */ |
|
| 832 | - $avatar_size = apply_filters('geodir_comment_avatar_size', 44);
|
|
| 833 | - echo get_avatar($comment, $avatar_size); |
|
| 834 | - printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',
|
|
| 835 | - get_comment_author_link(), |
|
| 836 | - // If current post author is also comment author, make it known visually. |
|
| 837 | - ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''
|
|
| 838 | - ); |
|
| 839 | - echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>"; |
|
| 840 | - printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',
|
|
| 841 | - esc_url(get_comment_link($comment->comment_ID)), |
|
| 842 | - get_comment_time('c'),
|
|
| 843 | - /* translators: 1: date, 2: time */ |
|
| 844 | - sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time())
|
|
| 845 | - ); |
|
| 846 | - ?> |
|
| 824 | + /** |
|
| 825 | + * Filter to modify comment avatar size |
|
| 826 | + * |
|
| 827 | + * You can use this filter to change comment avatar size. |
|
| 828 | + * |
|
| 829 | + * @since 1.0.0 |
|
| 830 | + * @package GeoDirectory |
|
| 831 | + */ |
|
| 832 | + $avatar_size = apply_filters('geodir_comment_avatar_size', 44);
|
|
| 833 | + echo get_avatar($comment, $avatar_size); |
|
| 834 | + printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',
|
|
| 835 | + get_comment_author_link(), |
|
| 836 | + // If current post author is also comment author, make it known visually. |
|
| 837 | + ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''
|
|
| 838 | + ); |
|
| 839 | + echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>"; |
|
| 840 | + printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',
|
|
| 841 | + esc_url(get_comment_link($comment->comment_ID)), |
|
| 842 | + get_comment_time('c'),
|
|
| 843 | + /* translators: 1: date, 2: time */ |
|
| 844 | + sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time())
|
|
| 845 | + ); |
|
| 846 | + ?> |
|
| 847 | 847 | </header> |
| 848 | 848 | <!-- .comment-meta --> |
| 849 | 849 | |
@@ -867,47 +867,47 @@ discard block |
||
| 867 | 867 | </article> |
| 868 | 868 | <!-- #comment-## --> |
| 869 | 869 | <?php |
| 870 | - break; |
|
| 871 | - endswitch; // end comment_type check |
|
| 872 | - } |
|
| 870 | + break; |
|
| 871 | + endswitch; // end comment_type check |
|
| 872 | + } |
|
| 873 | 873 | } |
| 874 | 874 | |
| 875 | 875 | |
| 876 | 876 | add_filter('get_comments_number', 'geodir_fix_comment_count', 10, 2);
|
| 877 | 877 | if (!function_exists('geodir_fix_comment_count')) {
|
| 878 | - /** |
|
| 879 | - * Fix comment count by not listing replies as reviews |
|
| 880 | - * |
|
| 881 | - * @since 1.0.0 |
|
| 882 | - * @package GeoDirectory |
|
| 883 | - * @global object $post The current post object. |
|
| 884 | - * @param int $count The comment count. |
|
| 885 | - * @param int $post_id The post ID. |
|
| 886 | - * @todo $post is unreachable since the function return the count before that variable. |
|
| 887 | - * @return bool|null|string The comment count. |
|
| 888 | - */ |
|
| 889 | - function geodir_fix_comment_count($count, $post_id) |
|
| 890 | - {
|
|
| 891 | - if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {
|
|
| 892 | - global $post; |
|
| 893 | - $post_types = geodir_get_posttypes(); |
|
| 894 | - |
|
| 895 | - if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int)$post_id)) {
|
|
| 896 | - $review_count = geodir_get_review_count_total($post_id); |
|
| 897 | - return $review_count; |
|
| 898 | - |
|
| 899 | - if ($post && isset($post->rating_count)) {
|
|
| 900 | - return $post->rating_count; |
|
| 901 | - } else {
|
|
| 902 | - return geodir_get_comments_number($post_id); |
|
| 903 | - } |
|
| 904 | - } else {
|
|
| 905 | - return $count; |
|
| 906 | - } |
|
| 907 | - } else {
|
|
| 908 | - return $count; |
|
| 909 | - } |
|
| 910 | - } |
|
| 878 | + /** |
|
| 879 | + * Fix comment count by not listing replies as reviews |
|
| 880 | + * |
|
| 881 | + * @since 1.0.0 |
|
| 882 | + * @package GeoDirectory |
|
| 883 | + * @global object $post The current post object. |
|
| 884 | + * @param int $count The comment count. |
|
| 885 | + * @param int $post_id The post ID. |
|
| 886 | + * @todo $post is unreachable since the function return the count before that variable. |
|
| 887 | + * @return bool|null|string The comment count. |
|
| 888 | + */ |
|
| 889 | + function geodir_fix_comment_count($count, $post_id) |
|
| 890 | + {
|
|
| 891 | + if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {
|
|
| 892 | + global $post; |
|
| 893 | + $post_types = geodir_get_posttypes(); |
|
| 894 | + |
|
| 895 | + if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int)$post_id)) {
|
|
| 896 | + $review_count = geodir_get_review_count_total($post_id); |
|
| 897 | + return $review_count; |
|
| 898 | + |
|
| 899 | + if ($post && isset($post->rating_count)) {
|
|
| 900 | + return $post->rating_count; |
|
| 901 | + } else {
|
|
| 902 | + return geodir_get_comments_number($post_id); |
|
| 903 | + } |
|
| 904 | + } else {
|
|
| 905 | + return $count; |
|
| 906 | + } |
|
| 907 | + } else {
|
|
| 908 | + return $count; |
|
| 909 | + } |
|
| 910 | + } |
|
| 911 | 911 | } |
| 912 | 912 | |
| 913 | 913 | /** |
@@ -925,14 +925,14 @@ discard block |
||
| 925 | 925 | */ |
| 926 | 926 | function geodir_get_rating_stars($rating, $post_id, $small = false) |
| 927 | 927 | {
|
| 928 | - if (!empty($post_id) && geodir_cpt_has_rating_disabled((int)$post_id)) {
|
|
| 929 | - return NULL; |
|
| 930 | - } |
|
| 931 | - $a_rating = $rating / 5 * 100; |
|
| 932 | - |
|
| 933 | - if ($small) {
|
|
| 934 | - $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>'; |
|
| 935 | - } else {
|
|
| 928 | + if (!empty($post_id) && geodir_cpt_has_rating_disabled((int)$post_id)) {
|
|
| 929 | + return NULL; |
|
| 930 | + } |
|
| 931 | + $a_rating = $rating / 5 * 100; |
|
| 932 | + |
|
| 933 | + if ($small) {
|
|
| 934 | + $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>'; |
|
| 935 | + } else {
|
|
| 936 | 936 | if (function_exists('geodir_reviewrating_draw_overall_rating')) {
|
| 937 | 937 | // Show rating stars from review rating manager |
| 938 | 938 | $r_html = geodir_reviewrating_draw_overall_rating($rating); |
@@ -949,8 +949,8 @@ discard block |
||
| 949 | 949 | } |
| 950 | 950 | $r_html = '<div class="geodir-rating" style="' . $attach_style . '"><div class="gd_rating_show" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingAverage" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star">' . $rating_img . $rating_img . $rating_img . $rating_img . $rating_img . '</div></div></div>'; |
| 951 | 951 | } |
| 952 | - } |
|
| 953 | - return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);
|
|
| 952 | + } |
|
| 953 | + return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);
|
|
| 954 | 954 | } |
| 955 | 955 | |
| 956 | 956 | /** |
@@ -964,23 +964,23 @@ discard block |
||
| 964 | 964 | function geodir_is_reviews_show($pageview = '') |
| 965 | 965 | {
|
| 966 | 966 | |
| 967 | - $active_tabs = get_option('geodir_detail_page_tabs_excluded');
|
|
| 968 | - |
|
| 969 | - $is_display = true; |
|
| 970 | - if (!empty($active_tabs) && in_array('reviews', $active_tabs))
|
|
| 971 | - $is_display = false; |
|
| 972 | - |
|
| 973 | - /** |
|
| 974 | - * Filter to change display value. |
|
| 975 | - * |
|
| 976 | - * You can use this filter to change the is_display value. |
|
| 977 | - * |
|
| 978 | - * @since 1.0.0 |
|
| 979 | - * @package GeoDirectory |
|
| 980 | - * @param bool $is_display Display ratings when set to true. |
|
| 981 | - * @param string $pageview The view template. Ex: listview, gridview etc. |
|
| 982 | - */ |
|
| 983 | - return apply_filters('geodir_is_reviews_show', $is_display, $pageview);
|
|
| 967 | + $active_tabs = get_option('geodir_detail_page_tabs_excluded');
|
|
| 968 | + |
|
| 969 | + $is_display = true; |
|
| 970 | + if (!empty($active_tabs) && in_array('reviews', $active_tabs))
|
|
| 971 | + $is_display = false; |
|
| 972 | + |
|
| 973 | + /** |
|
| 974 | + * Filter to change display value. |
|
| 975 | + * |
|
| 976 | + * You can use this filter to change the is_display value. |
|
| 977 | + * |
|
| 978 | + * @since 1.0.0 |
|
| 979 | + * @package GeoDirectory |
|
| 980 | + * @param bool $is_display Display ratings when set to true. |
|
| 981 | + * @param string $pageview The view template. Ex: listview, gridview etc. |
|
| 982 | + */ |
|
| 983 | + return apply_filters('geodir_is_reviews_show', $is_display, $pageview);
|
|
| 984 | 984 | } |
| 985 | 985 | |
| 986 | 986 | |
@@ -988,9 +988,9 @@ discard block |
||
| 988 | 988 | * If Disqus plugin is active, do some fixes to show on blogs but no on GD post types |
| 989 | 989 | */ |
| 990 | 990 | if(function_exists('dsq_can_replace')) {
|
| 991 | - remove_filter('comments_template', 'dsq_comments_template');
|
|
| 992 | - add_filter('comments_template', 'dsq_comments_template', 100);
|
|
| 993 | - add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);
|
|
| 991 | + remove_filter('comments_template', 'dsq_comments_template');
|
|
| 992 | + add_filter('comments_template', 'dsq_comments_template', 100);
|
|
| 993 | + add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);
|
|
| 994 | 994 | } |
| 995 | 995 | |
| 996 | 996 | |
@@ -1004,14 +1004,14 @@ discard block |
||
| 1004 | 1004 | * @return string `1` if active `0` if disabled. |
| 1005 | 1005 | */ |
| 1006 | 1006 | function geodir_option_disqus_active($disqus_active){
|
| 1007 | - global $post; |
|
| 1008 | - $all_postypes = geodir_get_posttypes(); |
|
| 1007 | + global $post; |
|
| 1008 | + $all_postypes = geodir_get_posttypes(); |
|
| 1009 | 1009 | |
| 1010 | - if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){
|
|
| 1011 | - $disqus_active = '0'; |
|
| 1012 | - } |
|
| 1010 | + if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){
|
|
| 1011 | + $disqus_active = '0'; |
|
| 1012 | + } |
|
| 1013 | 1013 | |
| 1014 | - return $disqus_active; |
|
| 1014 | + return $disqus_active; |
|
| 1015 | 1015 | } |
| 1016 | 1016 | |
| 1017 | 1017 | /** |
@@ -1025,22 +1025,22 @@ discard block |
||
| 1025 | 1025 | * @return array Modified tabs array. |
| 1026 | 1026 | */ |
| 1027 | 1027 | function geodir_detail_reviews_tab_title($tabs_arr) {
|
| 1028 | - $post_type = geodir_get_current_posttype(); |
|
| 1028 | + $post_type = geodir_get_current_posttype(); |
|
| 1029 | 1029 | |
| 1030 | - if (!empty($tabs_arr) && !empty($tabs_arr['reviews']) && isset($tabs_arr['reviews']['heading_text']) && $post_type != '' && geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 1031 | - $label_reviews = __('Comments', 'geodirectory');
|
|
| 1030 | + if (!empty($tabs_arr) && !empty($tabs_arr['reviews']) && isset($tabs_arr['reviews']['heading_text']) && $post_type != '' && geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 1031 | + $label_reviews = __('Comments', 'geodirectory');
|
|
| 1032 | 1032 | |
| 1033 | - if (defined('GEODIR_CP_VERSION')) {
|
|
| 1034 | - $post_types = geodir_get_posttypes('array');
|
|
| 1033 | + if (defined('GEODIR_CP_VERSION')) {
|
|
| 1034 | + $post_types = geodir_get_posttypes('array');
|
|
| 1035 | 1035 | |
| 1036 | - if (!empty($post_types[$post_type]['labels']['label_reviews'])) {
|
|
| 1037 | - $label_reviews = stripslashes(__($post_types[$post_type]['labels']['label_reviews'], 'geodirectory')); |
|
| 1038 | - } |
|
| 1039 | - } |
|
| 1036 | + if (!empty($post_types[$post_type]['labels']['label_reviews'])) {
|
|
| 1037 | + $label_reviews = stripslashes(__($post_types[$post_type]['labels']['label_reviews'], 'geodirectory')); |
|
| 1038 | + } |
|
| 1039 | + } |
|
| 1040 | 1040 | |
| 1041 | - $tabs_arr['reviews']['heading_text'] = $label_reviews; |
|
| 1042 | - } |
|
| 1041 | + $tabs_arr['reviews']['heading_text'] = $label_reviews; |
|
| 1042 | + } |
|
| 1043 | 1043 | |
| 1044 | - return $tabs_arr; |
|
| 1044 | + return $tabs_arr; |
|
| 1045 | 1045 | } |
| 1046 | 1046 | add_filter('geodir_detail_page_tab_list_extend', 'geodir_detail_reviews_tab_title', 1000, 1); |
| 1047 | 1047 | \ No newline at end of file |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | function geodir_core_dequeue_script() |
| 24 | 24 | {
|
| 25 | - wp_dequeue_script('flexslider');
|
|
| 25 | + wp_dequeue_script('flexslider');
|
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | add_action('wp_print_scripts', 'geodir_core_dequeue_script', 100);
|
@@ -35,168 +35,168 @@ discard block |
||
| 35 | 35 | */ |
| 36 | 36 | function geodir_templates_scripts() |
| 37 | 37 | {
|
| 38 | - $is_detail_page = false; |
|
| 39 | - $geodir_map_name = geodir_map_name(); |
|
| 38 | + $is_detail_page = false; |
|
| 39 | + $geodir_map_name = geodir_map_name(); |
|
| 40 | 40 | |
| 41 | - if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
|
|
| 42 | - $is_detail_page = true; |
|
| 43 | - } |
|
| 44 | - |
|
| 45 | - wp_enqueue_script('jquery');
|
|
| 46 | - |
|
| 47 | - wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 48 | - wp_enqueue_script('geodirectory-script');
|
|
| 41 | + if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
|
|
| 42 | + $is_detail_page = true; |
|
| 43 | + } |
|
| 49 | 44 | |
| 50 | - $geodir_vars_data = array( |
|
| 51 | - 'siteurl' => get_option('siteurl'),
|
|
| 52 | - 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 53 | - 'geodir_lazy_load' => get_option('geodir_lazy_load',1),
|
|
| 54 | - 'geodir_ajax_url' => geodir_get_ajax_url(), |
|
| 55 | - 'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
|
|
| 56 | - 'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue |
|
| 57 | - ); |
|
| 45 | + wp_enqueue_script('jquery');
|
|
| 46 | + |
|
| 47 | + wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 48 | + wp_enqueue_script('geodirectory-script');
|
|
| 49 | + |
|
| 50 | + $geodir_vars_data = array( |
|
| 51 | + 'siteurl' => get_option('siteurl'),
|
|
| 52 | + 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 53 | + 'geodir_lazy_load' => get_option('geodir_lazy_load',1),
|
|
| 54 | + 'geodir_ajax_url' => geodir_get_ajax_url(), |
|
| 55 | + 'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
|
|
| 56 | + 'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue |
|
| 57 | + ); |
|
| 58 | + |
|
| 59 | + /** |
|
| 60 | + * Filter the `geodir_var` data array that outputs the wp_localize_script() translations and variables. |
|
| 61 | + * |
|
| 62 | + * This is used by addons to add JS translatable variables. |
|
| 63 | + * |
|
| 64 | + * @since 1.4.4 |
|
| 65 | + * @param array $geodir_vars_data {
|
|
| 66 | + * geodir var data used by addons to add JS translatable variables. |
|
| 67 | + * |
|
| 68 | + * @type string $siteurl Site url. |
|
| 69 | + * @type string $geodir_plugin_url Geodirectory core plugin url. |
|
| 70 | + * @type string $geodir_ajax_url Geodirectory plugin ajax url. |
|
| 71 | + * @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?. |
|
| 72 | + * @type int $is_rtl Checks if current locale is RTL. |
|
| 73 | + * |
|
| 74 | + * } |
|
| 75 | + */ |
|
| 76 | + $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
|
|
| 77 | + |
|
| 78 | + wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
|
|
| 79 | + |
|
| 80 | + wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 81 | + if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
|
|
| 82 | + |
|
| 83 | + wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 84 | + wp_enqueue_script('geodirectory-lightbox-jquery');
|
|
| 85 | + |
|
| 86 | + wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 87 | + if ($is_detail_page) {
|
|
| 88 | + wp_enqueue_script('geodirectory-jquery-simplemodal');
|
|
| 89 | + } |
|
| 58 | 90 | |
| 59 | - /** |
|
| 60 | - * Filter the `geodir_var` data array that outputs the wp_localize_script() translations and variables. |
|
| 61 | - * |
|
| 62 | - * This is used by addons to add JS translatable variables. |
|
| 63 | - * |
|
| 64 | - * @since 1.4.4 |
|
| 65 | - * @param array $geodir_vars_data {
|
|
| 66 | - * geodir var data used by addons to add JS translatable variables. |
|
| 67 | - * |
|
| 68 | - * @type string $siteurl Site url. |
|
| 69 | - * @type string $geodir_plugin_url Geodirectory core plugin url. |
|
| 70 | - * @type string $geodir_ajax_url Geodirectory plugin ajax url. |
|
| 71 | - * @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?. |
|
| 72 | - * @type int $is_rtl Checks if current locale is RTL. |
|
| 73 | - * |
|
| 74 | - * } |
|
| 75 | - */ |
|
| 76 | - $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
|
|
| 77 | - |
|
| 78 | - wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
|
|
| 79 | - |
|
| 80 | - wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 81 | - if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
|
|
| 82 | - |
|
| 83 | - wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 84 | - wp_enqueue_script('geodirectory-lightbox-jquery');
|
|
| 85 | - |
|
| 86 | - wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 87 | - if ($is_detail_page) {
|
|
| 88 | - wp_enqueue_script('geodirectory-jquery-simplemodal');
|
|
| 89 | - } |
|
| 90 | - |
|
| 91 | - if (in_array($geodir_map_name, array('auto', 'google'))) {
|
|
| 92 | - $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 93 | - $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 94 | - /** |
|
| 95 | - * Filter the variables that are added to the end of the google maps script call. |
|
| 96 | - * |
|
| 97 | - * This i used to change things like google maps language etc. |
|
| 98 | - * |
|
| 99 | - * @since 1.0.0 |
|
| 100 | - * @param string $var The string to filter, default is empty string. |
|
| 101 | - */ |
|
| 102 | - $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
|
| 103 | - wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
|
|
| 104 | - } |
|
| 91 | + if (in_array($geodir_map_name, array('auto', 'google'))) {
|
|
| 92 | + $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 93 | + $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 94 | + /** |
|
| 95 | + * Filter the variables that are added to the end of the google maps script call. |
|
| 96 | + * |
|
| 97 | + * This i used to change things like google maps language etc. |
|
| 98 | + * |
|
| 99 | + * @since 1.0.0 |
|
| 100 | + * @param string $var The string to filter, default is empty string. |
|
| 101 | + */ |
|
| 102 | + $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
|
| 103 | + wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
|
|
| 104 | + } |
|
| 105 | 105 | |
| 106 | - if ($geodir_map_name == 'osm') {
|
|
| 107 | - // Leaflet OpenStreetMap |
|
| 108 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 109 | - wp_enqueue_style('geodirectory-leaflet-style');
|
|
| 106 | + if ($geodir_map_name == 'osm') {
|
|
| 107 | + // Leaflet OpenStreetMap |
|
| 108 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 109 | + wp_enqueue_style('geodirectory-leaflet-style');
|
|
| 110 | 110 | |
| 111 | - wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 112 | - wp_enqueue_script('geodirectory-leaflet-script');
|
|
| 111 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 112 | + wp_enqueue_script('geodirectory-leaflet-script');
|
|
| 113 | 113 | |
| 114 | - wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);
|
|
| 115 | - wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
| 114 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);
|
|
| 115 | + wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
| 116 | 116 | |
| 117 | - if ($is_detail_page) {
|
|
| 118 | - wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
|
|
| 119 | - wp_enqueue_style('geodirectory-leaflet-routing-style');
|
|
| 117 | + if ($is_detail_page) {
|
|
| 118 | + wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
|
|
| 119 | + wp_enqueue_style('geodirectory-leaflet-routing-style');
|
|
| 120 | 120 | |
| 121 | - wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);
|
|
| 122 | - wp_enqueue_script('geodirectory-leaflet-routing-script');
|
|
| 123 | - } |
|
| 124 | - } |
|
| 125 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 121 | + wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);
|
|
| 122 | + wp_enqueue_script('geodirectory-leaflet-routing-script');
|
|
| 123 | + } |
|
| 124 | + } |
|
| 125 | + wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 126 | 126 | |
| 127 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 128 | - wp_enqueue_script('geodirectory-goMap-script');
|
|
| 129 | - |
|
| 130 | - |
|
| 131 | - wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 132 | - wp_enqueue_script('chosen');
|
|
| 133 | - |
|
| 134 | - wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 135 | - wp_enqueue_script('geodirectory-choose-ajax');
|
|
| 136 | - |
|
| 137 | - wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
|
|
| 138 | - |
|
| 139 | - if (is_page() && geodir_is_page('add-listing')) {
|
|
| 140 | - // SCRIPT FOR UPLOAD |
|
| 141 | - wp_enqueue_script('plupload-all');
|
|
| 142 | - wp_enqueue_script('jquery-ui-sortable');
|
|
| 143 | - |
|
| 144 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
|
|
| 145 | - wp_enqueue_script('geodirectory-plupload-script');
|
|
| 146 | - // SCRIPT FOR UPLOAD END |
|
| 147 | - |
|
| 148 | - // check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls |
|
| 149 | - if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 150 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 151 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 152 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 153 | - } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 154 | - $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 155 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 156 | - $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 157 | - } else {
|
|
| 158 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 159 | - } |
|
| 127 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 128 | + wp_enqueue_script('geodirectory-goMap-script');
|
|
| 129 | + |
|
| 130 | + |
|
| 131 | + wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 132 | + wp_enqueue_script('chosen');
|
|
| 133 | + |
|
| 134 | + wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 135 | + wp_enqueue_script('geodirectory-choose-ajax');
|
|
| 136 | + |
|
| 137 | + wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
|
|
| 138 | + |
|
| 139 | + if (is_page() && geodir_is_page('add-listing')) {
|
|
| 140 | + // SCRIPT FOR UPLOAD |
|
| 141 | + wp_enqueue_script('plupload-all');
|
|
| 142 | + wp_enqueue_script('jquery-ui-sortable');
|
|
| 143 | + |
|
| 144 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
|
|
| 145 | + wp_enqueue_script('geodirectory-plupload-script');
|
|
| 146 | + // SCRIPT FOR UPLOAD END |
|
| 147 | + |
|
| 148 | + // check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls |
|
| 149 | + if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 150 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 151 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 152 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 153 | + } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 154 | + $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 155 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 156 | + $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 157 | + } else {
|
|
| 158 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 159 | + } |
|
| 160 | 160 | |
| 161 | - // place js config array for plupload |
|
| 162 | - $plupload_init = array( |
|
| 163 | - 'runtimes' => 'html5,silverlight,flash,browserplus,gears,html4', |
|
| 164 | - 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
| 165 | - 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
| 166 | - 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
| 167 | - 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
| 168 | - 'multiple_queues' => true, |
|
| 169 | - 'max_file_size' => geodir_max_upload_size(), |
|
| 170 | - 'url' => $ajax_url, |
|
| 171 | - 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
|
| 172 | - 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
|
| 173 | - 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
|
|
| 174 | - 'multipart' => true, |
|
| 175 | - 'urlstream_upload' => true, |
|
| 176 | - 'multi_selection' => false, // will be added per uploader |
|
| 177 | - // additional post data to send to our ajax hook |
|
| 178 | - 'multipart_params' => array( |
|
| 179 | - '_ajax_nonce' => "", // will be added per uploader |
|
| 180 | - 'action' => 'plupload_action', // the ajax action name |
|
| 181 | - 'imgid' => 0 // will be added per uploader |
|
| 182 | - ) |
|
| 183 | - ); |
|
| 184 | - $base_plupload_config = json_encode($plupload_init); |
|
| 185 | - |
|
| 186 | - $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
|
|
| 187 | - 'upload_img_size' => geodir_max_upload_size()); |
|
| 188 | - |
|
| 189 | - wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
|
| 190 | - |
|
| 191 | - wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
|
|
| 192 | - } // End if for add place page |
|
| 193 | - |
|
| 194 | - wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 195 | - if ($is_detail_page) {
|
|
| 161 | + // place js config array for plupload |
|
| 162 | + $plupload_init = array( |
|
| 163 | + 'runtimes' => 'html5,silverlight,flash,browserplus,gears,html4', |
|
| 164 | + 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
| 165 | + 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
| 166 | + 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
| 167 | + 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
| 168 | + 'multiple_queues' => true, |
|
| 169 | + 'max_file_size' => geodir_max_upload_size(), |
|
| 170 | + 'url' => $ajax_url, |
|
| 171 | + 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
|
| 172 | + 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
|
| 173 | + 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
|
|
| 174 | + 'multipart' => true, |
|
| 175 | + 'urlstream_upload' => true, |
|
| 176 | + 'multi_selection' => false, // will be added per uploader |
|
| 177 | + // additional post data to send to our ajax hook |
|
| 178 | + 'multipart_params' => array( |
|
| 179 | + '_ajax_nonce' => "", // will be added per uploader |
|
| 180 | + 'action' => 'plupload_action', // the ajax action name |
|
| 181 | + 'imgid' => 0 // will be added per uploader |
|
| 182 | + ) |
|
| 183 | + ); |
|
| 184 | + $base_plupload_config = json_encode($plupload_init); |
|
| 185 | + |
|
| 186 | + $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
|
|
| 187 | + 'upload_img_size' => geodir_max_upload_size()); |
|
| 188 | + |
|
| 189 | + wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
|
| 190 | + |
|
| 191 | + wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
|
|
| 192 | + } // End if for add place page |
|
| 193 | + |
|
| 194 | + wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 195 | + if ($is_detail_page) {
|
|
| 196 | 196 | wp_enqueue_script('geodirectory-post-custom-js');
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | - // font awesome rating script |
|
| 199 | + // font awesome rating script |
|
| 200 | 200 | if (get_option('geodir_reviewrating_enable_font_awesome')) {
|
| 201 | 201 | wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
|
| 202 | 202 | wp_enqueue_script('geodir-barrating-js');
|
@@ -205,11 +205,11 @@ discard block |
||
| 205 | 205 | wp_enqueue_script('geodir-jRating-js');
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | - wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 209 | - wp_enqueue_script('geodir-on-document-load');
|
|
| 208 | + wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 209 | + wp_enqueue_script('geodir-on-document-load');
|
|
| 210 | 210 | |
| 211 | - wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 212 | - wp_enqueue_script('google-geometa');
|
|
| 211 | + wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 212 | + wp_enqueue_script('google-geometa');
|
|
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | /** |
@@ -223,8 +223,8 @@ discard block |
||
| 223 | 223 | */ |
| 224 | 224 | function geodir_header_scripts() |
| 225 | 225 | {
|
| 226 | - echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
|
|
| 227 | - echo stripslashes(get_option('geodir_header_scripts'));
|
|
| 226 | + echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
|
|
| 227 | + echo stripslashes(get_option('geodir_header_scripts'));
|
|
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | /** |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | */ |
| 238 | 238 | function geodir_google_analytics_tracking_code() |
| 239 | 239 | {
|
| 240 | - if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
|
|
| 240 | + if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
|
|
| 241 | 241 | |
| 242 | 242 | <script> |
| 243 | 243 | (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
@@ -252,9 +252,9 @@ discard block |
||
| 252 | 252 | </script> |
| 253 | 253 | |
| 254 | 254 | <?php |
| 255 | - }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
|
|
| 256 | - echo stripslashes(get_option('geodir_ga_tracking_code'));
|
|
| 257 | - } |
|
| 255 | + }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
|
|
| 256 | + echo stripslashes(get_option('geodir_ga_tracking_code'));
|
|
| 257 | + } |
|
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | /** |
@@ -268,16 +268,16 @@ discard block |
||
| 268 | 268 | function geodir_footer_scripts() |
| 269 | 269 | {
|
| 270 | 270 | |
| 271 | - echo stripslashes(get_option('geodir_footer_scripts'));
|
|
| 271 | + echo stripslashes(get_option('geodir_footer_scripts'));
|
|
| 272 | 272 | |
| 273 | - /* |
|
| 273 | + /* |
|
| 274 | 274 | * Apple suck and can't/won't fix bugs: https://bugs.webkit.org/show_bug.cgi?id=136041 |
| 275 | 275 | * |
| 276 | 276 | * Flexbox wont wrap on ios for search form items |
| 277 | 277 | */ |
| 278 | - if (preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
|
|
| 279 | - echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
|
|
| 280 | - } |
|
| 278 | + if (preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
|
|
| 279 | + echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
|
|
| 280 | + } |
|
| 281 | 281 | } |
| 282 | 282 | |
| 283 | 283 | |
@@ -291,12 +291,12 @@ discard block |
||
| 291 | 291 | */ |
| 292 | 292 | function geodir_add_async_forscript($url) |
| 293 | 293 | {
|
| 294 | - if (strpos($url, '#asyncload')===false) |
|
| 295 | - return $url; |
|
| 296 | - else if (is_admin()) |
|
| 297 | - return str_replace('#asyncload', '', $url);
|
|
| 298 | - else |
|
| 299 | - return str_replace('#asyncload', '', $url)."' async='async";
|
|
| 294 | + if (strpos($url, '#asyncload')===false) |
|
| 295 | + return $url; |
|
| 296 | + else if (is_admin()) |
|
| 297 | + return str_replace('#asyncload', '', $url);
|
|
| 298 | + else |
|
| 299 | + return str_replace('#asyncload', '', $url)."' async='async";
|
|
| 300 | 300 | } |
| 301 | 301 | add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);
|
| 302 | 302 | |
@@ -309,17 +309,17 @@ discard block |
||
| 309 | 309 | function geodir_templates_styles() |
| 310 | 310 | {
|
| 311 | 311 | |
| 312 | - wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 313 | - wp_enqueue_style('geodir-core-scss');
|
|
| 314 | - wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
|
|
| 312 | + wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 313 | + wp_enqueue_style('geodir-core-scss');
|
|
| 314 | + wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
|
|
| 315 | 315 | |
| 316 | - if(is_rtl()){
|
|
| 317 | - wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 318 | - wp_enqueue_style('geodirectory-frontend-rtl-style');
|
|
| 319 | - } |
|
| 316 | + if(is_rtl()){
|
|
| 317 | + wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 318 | + wp_enqueue_style('geodirectory-frontend-rtl-style');
|
|
| 319 | + } |
|
| 320 | 320 | |
| 321 | - wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
|
| 322 | - wp_enqueue_style('font-awesome');
|
|
| 321 | + wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
|
| 322 | + wp_enqueue_style('font-awesome');
|
|
| 323 | 323 | |
| 324 | 324 | |
| 325 | 325 | } |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | */ |
| 334 | 334 | function geodir_get_sidebar() |
| 335 | 335 | {
|
| 336 | - get_sidebar('geodirectory');
|
|
| 336 | + get_sidebar('geodirectory');
|
|
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | /** |
@@ -352,122 +352,122 @@ discard block |
||
| 352 | 352 | * @param bool $always_show Do you want to show the pagination always? Default: false. |
| 353 | 353 | */ |
| 354 | 354 | function geodir_pagination($before = '', $after = '', $prelabel = '', $nxtlabel = '', $pages_to_show = 5, $always_show = false) {
|
| 355 | - global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id; |
|
| 355 | + global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id; |
|
| 356 | 356 | |
| 357 | - if (empty($prelabel)) {
|
|
| 358 | - $prelabel = '<strong>«</strong>'; |
|
| 359 | - } |
|
| 357 | + if (empty($prelabel)) {
|
|
| 358 | + $prelabel = '<strong>«</strong>'; |
|
| 359 | + } |
|
| 360 | 360 | |
| 361 | - if (empty($nxtlabel)) {
|
|
| 362 | - $nxtlabel = '<strong>»</strong>'; |
|
| 363 | - } |
|
| 361 | + if (empty($nxtlabel)) {
|
|
| 362 | + $nxtlabel = '<strong>»</strong>'; |
|
| 363 | + } |
|
| 364 | 364 | |
| 365 | - $half_pages_to_show = round($pages_to_show / 2); |
|
| 365 | + $half_pages_to_show = round($pages_to_show / 2); |
|
| 366 | 366 | |
| 367 | - if (geodir_is_page('home')) // dont apply default pagination for geodirectory home page.
|
|
| 368 | - return; |
|
| 367 | + if (geodir_is_page('home')) // dont apply default pagination for geodirectory home page.
|
|
| 368 | + return; |
|
| 369 | 369 | |
| 370 | - if (!is_single()) {
|
|
| 371 | - if (function_exists('geodir_location_geo_home_link')) {
|
|
| 372 | - remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 373 | - } |
|
| 374 | - $numposts = $wp_query->found_posts; |
|
| 370 | + if (!is_single()) {
|
|
| 371 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 372 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 373 | + } |
|
| 374 | + $numposts = $wp_query->found_posts; |
|
| 375 | 375 | |
| 376 | - $max_page = ceil($numposts / $posts_per_page); |
|
| 376 | + $max_page = ceil($numposts / $posts_per_page); |
|
| 377 | 377 | |
| 378 | - if (empty($paged)) {
|
|
| 379 | - $paged = 1; |
|
| 380 | - } |
|
| 378 | + if (empty($paged)) {
|
|
| 379 | + $paged = 1; |
|
| 380 | + } |
|
| 381 | 381 | |
| 382 | - $post_type = geodir_get_current_posttype(); |
|
| 383 | - $listing_type_name = get_post_type_plural_label($post_type); |
|
| 384 | - if (geodir_is_page('listing') || geodir_is_page('search')) {
|
|
| 385 | - $term = array(); |
|
| 382 | + $post_type = geodir_get_current_posttype(); |
|
| 383 | + $listing_type_name = get_post_type_plural_label($post_type); |
|
| 384 | + if (geodir_is_page('listing') || geodir_is_page('search')) {
|
|
| 385 | + $term = array(); |
|
| 386 | 386 | |
| 387 | - if (is_tax()) {
|
|
| 388 | - $term_id = get_queried_object_id(); |
|
| 389 | - $taxonomy = get_query_var('taxonomy');
|
|
| 387 | + if (is_tax()) {
|
|
| 388 | + $term_id = get_queried_object_id(); |
|
| 389 | + $taxonomy = get_query_var('taxonomy');
|
|
| 390 | 390 | |
| 391 | - if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
|
|
| 392 | - $term = get_term($term_id, $post_type . 'category'); |
|
| 393 | - } |
|
| 394 | - } |
|
| 391 | + if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
|
|
| 392 | + $term = get_term($term_id, $post_type . 'category'); |
|
| 393 | + } |
|
| 394 | + } |
|
| 395 | 395 | |
| 396 | - if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
|
|
| 397 | - $taxonomy_search = $_REQUEST['s' . $post_type . 'category']; |
|
| 396 | + if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
|
|
| 397 | + $taxonomy_search = $_REQUEST['s' . $post_type . 'category']; |
|
| 398 | 398 | |
| 399 | - if (!is_array($taxonomy_search)) {
|
|
| 400 | - $term = get_term((int)$taxonomy_search, $post_type . 'category'); |
|
| 401 | - } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
|
|
| 402 | - $term = get_term((int)$taxonomy_search[0], $post_type . 'category'); |
|
| 403 | - } |
|
| 404 | - } |
|
| 399 | + if (!is_array($taxonomy_search)) {
|
|
| 400 | + $term = get_term((int)$taxonomy_search, $post_type . 'category'); |
|
| 401 | + } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
|
|
| 402 | + $term = get_term((int)$taxonomy_search[0], $post_type . 'category'); |
|
| 403 | + } |
|
| 404 | + } |
|
| 405 | 405 | |
| 406 | - if (!empty($term) && !is_wp_error($term)) {
|
|
| 407 | - $listing_type_name = $term->name; |
|
| 408 | - } |
|
| 409 | - } |
|
| 406 | + if (!empty($term) && !is_wp_error($term)) {
|
|
| 407 | + $listing_type_name = $term->name; |
|
| 408 | + } |
|
| 409 | + } |
|
| 410 | 410 | |
| 411 | - if ($max_page > 1 || $always_show) {
|
|
| 412 | - // Extra pagination info |
|
| 413 | - $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
|
|
| 414 | - $start_no = ( $paged - 1 ) * $posts_per_page + 1; |
|
| 415 | - $end_no = min($paged * $posts_per_page, $numposts); |
|
| 411 | + if ($max_page > 1 || $always_show) {
|
|
| 412 | + // Extra pagination info |
|
| 413 | + $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
|
|
| 414 | + $start_no = ( $paged - 1 ) * $posts_per_page + 1; |
|
| 415 | + $end_no = min($paged * $posts_per_page, $numposts); |
|
| 416 | 416 | |
| 417 | - if ($geodir_pagination_more_info != '') {
|
|
| 418 | - if ($listing_type_name) {
|
|
| 419 | - $listing_type_name = __($listing_type_name, 'geodirectory'); |
|
| 420 | - $pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);
|
|
| 421 | - } else {
|
|
| 422 | - $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
|
|
| 423 | - } |
|
| 424 | - $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>'; |
|
| 425 | - /** |
|
| 426 | - * Adds an extra pagination info above/under pagination. |
|
| 427 | - * |
|
| 428 | - * @since 1.5.9 |
|
| 429 | - * |
|
| 430 | - * @param string $pagination_info Extra pagination info content. |
|
| 431 | - * @param string $listing_type_name Listing results type. |
|
| 432 | - * @param string $start_no First result number. |
|
| 433 | - * @param string $end_no Last result number. |
|
| 434 | - * @param string $numposts Total number of listings. |
|
| 435 | - * @param string $post_type The post type. |
|
| 436 | - */ |
|
| 437 | - $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
|
|
| 417 | + if ($geodir_pagination_more_info != '') {
|
|
| 418 | + if ($listing_type_name) {
|
|
| 419 | + $listing_type_name = __($listing_type_name, 'geodirectory'); |
|
| 420 | + $pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);
|
|
| 421 | + } else {
|
|
| 422 | + $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
|
|
| 423 | + } |
|
| 424 | + $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>'; |
|
| 425 | + /** |
|
| 426 | + * Adds an extra pagination info above/under pagination. |
|
| 427 | + * |
|
| 428 | + * @since 1.5.9 |
|
| 429 | + * |
|
| 430 | + * @param string $pagination_info Extra pagination info content. |
|
| 431 | + * @param string $listing_type_name Listing results type. |
|
| 432 | + * @param string $start_no First result number. |
|
| 433 | + * @param string $end_no Last result number. |
|
| 434 | + * @param string $numposts Total number of listings. |
|
| 435 | + * @param string $post_type The post type. |
|
| 436 | + */ |
|
| 437 | + $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
|
|
| 438 | 438 | |
| 439 | - if ($geodir_pagination_more_info == 'before') {
|
|
| 440 | - $before = $before . $pagination_info; |
|
| 441 | - } else if ($geodir_pagination_more_info == 'after') {
|
|
| 442 | - $after = $pagination_info . $after; |
|
| 443 | - } |
|
| 444 | - } |
|
| 439 | + if ($geodir_pagination_more_info == 'before') {
|
|
| 440 | + $before = $before . $pagination_info; |
|
| 441 | + } else if ($geodir_pagination_more_info == 'after') {
|
|
| 442 | + $after = $pagination_info . $after; |
|
| 443 | + } |
|
| 444 | + } |
|
| 445 | 445 | |
| 446 | - echo "$before <div class='Navi gd-navi'>"; |
|
| 447 | - if ($paged >= ($pages_to_show - 1)) {
|
|
| 448 | - echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link()) . '">«</a>';
|
|
| 449 | - } |
|
| 450 | - previous_posts_link($prelabel); |
|
| 451 | - for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
|
|
| 452 | - if ($i >= 1 && $i <= $max_page) {
|
|
| 453 | - if ($i == $paged) {
|
|
| 454 | - echo "<strong class='on'>$i</strong>"; |
|
| 455 | - } else {
|
|
| 456 | - echo ' <a href="' . str_replace('&paged', '&paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
|
|
| 457 | - } |
|
| 458 | - } |
|
| 459 | - } |
|
| 460 | - next_posts_link($nxtlabel, $max_page); |
|
| 461 | - if (($paged + $half_pages_to_show) < ($max_page)) {
|
|
| 462 | - echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link($max_page)) . '">»</a>';
|
|
| 463 | - } |
|
| 464 | - echo "</div> $after"; |
|
| 465 | - } |
|
| 446 | + echo "$before <div class='Navi gd-navi'>"; |
|
| 447 | + if ($paged >= ($pages_to_show - 1)) {
|
|
| 448 | + echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link()) . '">«</a>';
|
|
| 449 | + } |
|
| 450 | + previous_posts_link($prelabel); |
|
| 451 | + for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
|
|
| 452 | + if ($i >= 1 && $i <= $max_page) {
|
|
| 453 | + if ($i == $paged) {
|
|
| 454 | + echo "<strong class='on'>$i</strong>"; |
|
| 455 | + } else {
|
|
| 456 | + echo ' <a href="' . str_replace('&paged', '&paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
|
|
| 457 | + } |
|
| 458 | + } |
|
| 459 | + } |
|
| 460 | + next_posts_link($nxtlabel, $max_page); |
|
| 461 | + if (($paged + $half_pages_to_show) < ($max_page)) {
|
|
| 462 | + echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link($max_page)) . '">»</a>';
|
|
| 463 | + } |
|
| 464 | + echo "</div> $after"; |
|
| 465 | + } |
|
| 466 | 466 | |
| 467 | - if (function_exists('geodir_location_geo_home_link')) {
|
|
| 468 | - add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 469 | - } |
|
| 470 | - } |
|
| 467 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 468 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 469 | + } |
|
| 470 | + } |
|
| 471 | 471 | } |
| 472 | 472 | |
| 473 | 473 | /** |
@@ -478,20 +478,20 @@ discard block |
||
| 478 | 478 | */ |
| 479 | 479 | function geodir_listingsearch_scripts() |
| 480 | 480 | {
|
| 481 | - if (get_option('gd_search_dist') != '') {
|
|
| 482 | - $dist = get_option('gd_search_dist');
|
|
| 483 | - } else {
|
|
| 484 | - $dist = 500; |
|
| 485 | - } |
|
| 486 | - $dist_dif = 1000; |
|
| 487 | - |
|
| 488 | - if ($dist <= 5000) $dist_dif = 500; |
|
| 489 | - if ($dist <= 1000) $dist_dif = 100; |
|
| 490 | - if ($dist <= 500) $dist_dif = 50; |
|
| 491 | - if ($dist <= 100) $dist_dif = 10; |
|
| 492 | - if ($dist <= 50) $dist_dif = 5; |
|
| 493 | - |
|
| 494 | - ?> |
|
| 481 | + if (get_option('gd_search_dist') != '') {
|
|
| 482 | + $dist = get_option('gd_search_dist');
|
|
| 483 | + } else {
|
|
| 484 | + $dist = 500; |
|
| 485 | + } |
|
| 486 | + $dist_dif = 1000; |
|
| 487 | + |
|
| 488 | + if ($dist <= 5000) $dist_dif = 500; |
|
| 489 | + if ($dist <= 1000) $dist_dif = 100; |
|
| 490 | + if ($dist <= 500) $dist_dif = 50; |
|
| 491 | + if ($dist <= 100) $dist_dif = 10; |
|
| 492 | + if ($dist <= 50) $dist_dif = 5; |
|
| 493 | + |
|
| 494 | + ?> |
|
| 495 | 495 | <script type="text/javascript"> |
| 496 | 496 | |
| 497 | 497 | jQuery(function ($) {
|
@@ -549,20 +549,20 @@ discard block |
||
| 549 | 549 | * @package GeoDirectory |
| 550 | 550 | */ |
| 551 | 551 | function geodir_add_sharelocation_scripts() {
|
| 552 | - $default_search_for_text = SEARCH_FOR_TEXT; |
|
| 553 | - if (get_option('geodir_search_field_default_text'))
|
|
| 554 | - $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
|
|
| 552 | + $default_search_for_text = SEARCH_FOR_TEXT; |
|
| 553 | + if (get_option('geodir_search_field_default_text'))
|
|
| 554 | + $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
|
|
| 555 | 555 | |
| 556 | - $default_near_text = NEAR_TEXT; |
|
| 557 | - if (get_option('geodir_near_field_default_text'))
|
|
| 558 | - $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
|
|
| 556 | + $default_near_text = NEAR_TEXT; |
|
| 557 | + if (get_option('geodir_near_field_default_text'))
|
|
| 558 | + $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
|
|
| 559 | 559 | |
| 560 | - $search_location = geodir_get_default_location(); |
|
| 560 | + $search_location = geodir_get_default_location(); |
|
| 561 | 561 | |
| 562 | - $default_search_for_text = addslashes(stripslashes($default_search_for_text)); |
|
| 563 | - $default_near_text = addslashes(stripslashes($default_near_text)); |
|
| 564 | - $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : ''; |
|
| 565 | - ?> |
|
| 562 | + $default_search_for_text = addslashes(stripslashes($default_search_for_text)); |
|
| 563 | + $default_near_text = addslashes(stripslashes($default_near_text)); |
|
| 564 | + $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : ''; |
|
| 565 | + ?> |
|
| 566 | 566 | <script type="text/javascript"> |
| 567 | 567 | var default_location = '<?php echo $city ;?>'; |
| 568 | 568 | var latlng; |
@@ -643,14 +643,14 @@ discard block |
||
| 643 | 643 | initialise2(); |
| 644 | 644 | } else {
|
| 645 | 645 | <?php |
| 646 | - $near_add = get_option('geodir_search_near_addition');
|
|
| 647 | - /** |
|
| 648 | - * Adds any extra info to the near search box query when trying to geolocate it via google api. |
|
| 649 | - * |
|
| 650 | - * @since 1.0.0 |
|
| 651 | - */ |
|
| 652 | - $near_add2 = apply_filters('geodir_search_near_addition', '');
|
|
| 653 | - ?> |
|
| 646 | + $near_add = get_option('geodir_search_near_addition');
|
|
| 647 | + /** |
|
| 648 | + * Adds any extra info to the near search box query when trying to geolocate it via google api. |
|
| 649 | + * |
|
| 650 | + * @since 1.0.0 |
|
| 651 | + */ |
|
| 652 | + $near_add2 = apply_filters('geodir_search_near_addition', '');
|
|
| 653 | + ?> |
|
| 654 | 654 | if (window.gdMaps === 'google') {
|
| 655 | 655 | Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},
|
| 656 | 656 | function (results, status) {
|
@@ -753,30 +753,30 @@ discard block |
||
| 753 | 753 | */ |
| 754 | 754 | function geodir_show_badges_on_image($which, $post, $link) |
| 755 | 755 | {
|
| 756 | - $return = ''; |
|
| 757 | - switch ($which) {
|
|
| 758 | - case 'featured': |
|
| 759 | - /** |
|
| 760 | - * Filter the featured image badge html that appears in the listings pages over the thumbnail. |
|
| 761 | - * |
|
| 762 | - * @since 1.0.0 |
|
| 763 | - * @param object $post The post object. |
|
| 764 | - * @param string $link The link to the post. |
|
| 765 | - */ |
|
| 766 | - $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img"> </span></a>',$post,$link);
|
|
| 767 | - break; |
|
| 768 | - case 'new' : |
|
| 769 | - /** |
|
| 770 | - * Filter the new image badge html that appears in the listings pages over the thumbnail. |
|
| 771 | - * |
|
| 772 | - * @since 1.0.0 |
|
| 773 | - * @param object $post The post object. |
|
| 774 | - * @param string $link The link to the post. |
|
| 775 | - */ |
|
| 776 | - $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing"> </span></a>',$post,$link);
|
|
| 777 | - break; |
|
| 778 | - |
|
| 779 | - } |
|
| 756 | + $return = ''; |
|
| 757 | + switch ($which) {
|
|
| 758 | + case 'featured': |
|
| 759 | + /** |
|
| 760 | + * Filter the featured image badge html that appears in the listings pages over the thumbnail. |
|
| 761 | + * |
|
| 762 | + * @since 1.0.0 |
|
| 763 | + * @param object $post The post object. |
|
| 764 | + * @param string $link The link to the post. |
|
| 765 | + */ |
|
| 766 | + $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img"> </span></a>',$post,$link);
|
|
| 767 | + break; |
|
| 768 | + case 'new' : |
|
| 769 | + /** |
|
| 770 | + * Filter the new image badge html that appears in the listings pages over the thumbnail. |
|
| 771 | + * |
|
| 772 | + * @since 1.0.0 |
|
| 773 | + * @param object $post The post object. |
|
| 774 | + * @param string $link The link to the post. |
|
| 775 | + */ |
|
| 776 | + $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing"> </span></a>',$post,$link);
|
|
| 777 | + break; |
|
| 778 | + |
|
| 779 | + } |
|
| 780 | 780 | |
| 781 | - return $return; |
|
| 781 | + return $return; |
|
| 782 | 782 | } |
@@ -38,21 +38,21 @@ discard block |
||
| 38 | 38 | $is_detail_page = false; |
| 39 | 39 | $geodir_map_name = geodir_map_name(); |
| 40 | 40 | |
| 41 | - if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
|
|
| 41 | + if ((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview'))) {
|
|
| 42 | 42 | $is_detail_page = true; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | wp_enqueue_script('jquery');
|
| 46 | 46 | |
| 47 | - wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 47 | + wp_register_script('geodirectory-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 48 | 48 | wp_enqueue_script('geodirectory-script');
|
| 49 | 49 | |
| 50 | 50 | $geodir_vars_data = array( |
| 51 | 51 | 'siteurl' => get_option('siteurl'),
|
| 52 | 52 | 'geodir_plugin_url' => geodir_plugin_url(), |
| 53 | - 'geodir_lazy_load' => get_option('geodir_lazy_load',1),
|
|
| 53 | + 'geodir_lazy_load' => get_option('geodir_lazy_load', 1),
|
|
| 54 | 54 | 'geodir_ajax_url' => geodir_get_ajax_url(), |
| 55 | - 'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
|
|
| 55 | + 'geodir_gd_modal' => (int) get_option('geodir_disable_gb_modal'),
|
|
| 56 | 56 | 'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue |
| 57 | 57 | ); |
| 58 | 58 | |
@@ -73,24 +73,24 @@ discard block |
||
| 73 | 73 | * |
| 74 | 74 | * } |
| 75 | 75 | */ |
| 76 | - $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
|
|
| 76 | + $geodir_vars_data = apply_filters('geodir_vars_data', $geodir_vars_data);
|
|
| 77 | 77 | |
| 78 | 78 | wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
|
| 79 | 79 | |
| 80 | - wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 81 | - if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
|
|
| 80 | + wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 81 | + if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-flexslider-js'); }
|
|
| 82 | 82 | |
| 83 | - wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 83 | + wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url().'/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 84 | 84 | wp_enqueue_script('geodirectory-lightbox-jquery');
|
| 85 | 85 | |
| 86 | - wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 86 | + wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url().'/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 87 | 87 | if ($is_detail_page) {
|
| 88 | 88 | wp_enqueue_script('geodirectory-jquery-simplemodal');
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | if (in_array($geodir_map_name, array('auto', 'google'))) {
|
| 92 | - $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 93 | - $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 92 | + $map_lang = "&language=".geodir_get_map_default_language(); |
|
| 93 | + $map_key = "&key=".geodir_get_map_api_key(); |
|
| 94 | 94 | /** |
| 95 | 95 | * Filter the variables that are added to the end of the google maps script call. |
| 96 | 96 | * |
@@ -100,48 +100,48 @@ discard block |
||
| 100 | 100 | * @param string $var The string to filter, default is empty string. |
| 101 | 101 | */ |
| 102 | 102 | $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
| 103 | - wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
|
|
| 103 | + wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);
|
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | if ($geodir_map_name == 'osm') {
|
| 107 | 107 | // Leaflet OpenStreetMap |
| 108 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 108 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 109 | 109 | wp_enqueue_style('geodirectory-leaflet-style');
|
| 110 | 110 | |
| 111 | - wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 111 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 112 | 112 | wp_enqueue_script('geodirectory-leaflet-script');
|
| 113 | 113 | |
| 114 | - wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);
|
|
| 114 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);
|
|
| 115 | 115 | wp_enqueue_script('geodirectory-leaflet-geo-script');
|
| 116 | 116 | |
| 117 | 117 | if ($is_detail_page) {
|
| 118 | - wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
|
|
| 118 | + wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
|
|
| 119 | 119 | wp_enqueue_style('geodirectory-leaflet-routing-style');
|
| 120 | 120 | |
| 121 | - wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);
|
|
| 121 | + wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);
|
|
| 122 | 122 | wp_enqueue_script('geodirectory-leaflet-routing-script');
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 125 | + wp_enqueue_script('jquery-ui-autocomplete');
|
|
| 126 | 126 | |
| 127 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 127 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 128 | 128 | wp_enqueue_script('geodirectory-goMap-script');
|
| 129 | 129 | |
| 130 | 130 | |
| 131 | - wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 131 | + wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 132 | 132 | wp_enqueue_script('chosen');
|
| 133 | 133 | |
| 134 | - wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 134 | + wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 135 | 135 | wp_enqueue_script('geodirectory-choose-ajax');
|
| 136 | 136 | |
| 137 | - wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
|
|
| 137 | + wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
|
|
| 138 | 138 | |
| 139 | 139 | if (is_page() && geodir_is_page('add-listing')) {
|
| 140 | 140 | // SCRIPT FOR UPLOAD |
| 141 | 141 | wp_enqueue_script('plupload-all');
|
| 142 | 142 | wp_enqueue_script('jquery-ui-sortable');
|
| 143 | 143 | |
| 144 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
|
|
| 144 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 145 | 145 | wp_enqueue_script('geodirectory-plupload-script');
|
| 146 | 146 | // SCRIPT FOR UPLOAD END |
| 147 | 147 | |
@@ -188,27 +188,27 @@ discard block |
||
| 188 | 188 | |
| 189 | 189 | wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
| 190 | 190 | |
| 191 | - wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
|
|
| 191 | + wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation.min.js#asyncload');
|
|
| 192 | 192 | } // End if for add place page |
| 193 | 193 | |
| 194 | - wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 194 | + wp_register_script('geodirectory-post-custom-js', geodir_plugin_url().'/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 195 | 195 | if ($is_detail_page) {
|
| 196 | 196 | wp_enqueue_script('geodirectory-post-custom-js');
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | // font awesome rating script |
| 200 | 200 | if (get_option('geodir_reviewrating_enable_font_awesome')) {
|
| 201 | - wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 201 | + wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 202 | 202 | wp_enqueue_script('geodir-barrating-js');
|
| 203 | 203 | } else { // default rating script
|
| 204 | - wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 204 | + wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 205 | 205 | wp_enqueue_script('geodir-jRating-js');
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | - wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 208 | + wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 209 | 209 | wp_enqueue_script('geodir-on-document-load');
|
| 210 | 210 | |
| 211 | - wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 211 | + wp_register_script('google-geometa', geodir_plugin_url().'/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 212 | 212 | wp_enqueue_script('google-geometa');
|
| 213 | 213 | } |
| 214 | 214 | |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | */ |
| 224 | 224 | function geodir_header_scripts() |
| 225 | 225 | {
|
| 226 | - echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
|
|
| 226 | + echo '<style>'.stripslashes(get_option('geodir_coustem_css')).'</style>';
|
|
| 227 | 227 | echo stripslashes(get_option('geodir_header_scripts'));
|
| 228 | 228 | } |
| 229 | 229 | |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | */ |
| 238 | 238 | function geodir_google_analytics_tracking_code() |
| 239 | 239 | {
|
| 240 | - if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
|
|
| 240 | + if (get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')) {?>
|
|
| 241 | 241 | |
| 242 | 242 | <script> |
| 243 | 243 | (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
@@ -245,14 +245,14 @@ discard block |
||
| 245 | 245 | m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
| 246 | 246 | })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); |
| 247 | 247 | |
| 248 | - ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id'));?>', 'auto');
|
|
| 249 | - <?php if(get_option('geodir_ga_anonymize_ip')){echo "ga('set', 'anonymizeIP', true);";}?>
|
|
| 248 | + ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id')); ?>', 'auto');
|
|
| 249 | + <?php if (get_option('geodir_ga_anonymize_ip')) {echo "ga('set', 'anonymizeIP', true);"; }?>
|
|
| 250 | 250 | ga('send', 'pageview');
|
| 251 | 251 | |
| 252 | 252 | </script> |
| 253 | 253 | |
| 254 | 254 | <?php |
| 255 | - }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
|
|
| 255 | + }elseif (get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')) {
|
|
| 256 | 256 | echo stripslashes(get_option('geodir_ga_tracking_code'));
|
| 257 | 257 | } |
| 258 | 258 | } |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | * |
| 276 | 276 | * Flexbox wont wrap on ios for search form items |
| 277 | 277 | */ |
| 278 | - if (preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
|
|
| 278 | + if (preg_match('/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'])) {
|
|
| 279 | 279 | echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
|
| 280 | 280 | } |
| 281 | 281 | } |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | */ |
| 292 | 292 | function geodir_add_async_forscript($url) |
| 293 | 293 | {
|
| 294 | - if (strpos($url, '#asyncload')===false) |
|
| 294 | + if (strpos($url, '#asyncload') === false) |
|
| 295 | 295 | return $url; |
| 296 | 296 | else if (is_admin()) |
| 297 | 297 | return str_replace('#asyncload', '', $url);
|
@@ -309,12 +309,12 @@ discard block |
||
| 309 | 309 | function geodir_templates_styles() |
| 310 | 310 | {
|
| 311 | 311 | |
| 312 | - wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 312 | + wp_register_style('geodir-core-scss', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 313 | 313 | wp_enqueue_style('geodir-core-scss');
|
| 314 | - wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
|
|
| 314 | + wp_register_style('geodir-core-scss-footer', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
|
|
| 315 | 315 | |
| 316 | - if(is_rtl()){
|
|
| 317 | - wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 316 | + if (is_rtl()) {
|
|
| 317 | + wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 318 | 318 | wp_enqueue_style('geodirectory-frontend-rtl-style');
|
| 319 | 319 | } |
| 320 | 320 | |
@@ -388,18 +388,18 @@ discard block |
||
| 388 | 388 | $term_id = get_queried_object_id(); |
| 389 | 389 | $taxonomy = get_query_var('taxonomy');
|
| 390 | 390 | |
| 391 | - if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
|
|
| 392 | - $term = get_term($term_id, $post_type . 'category'); |
|
| 391 | + if ($term_id && $post_type && get_query_var('taxonomy') == $post_type.'category') {
|
|
| 392 | + $term = get_term($term_id, $post_type.'category'); |
|
| 393 | 393 | } |
| 394 | 394 | } |
| 395 | 395 | |
| 396 | - if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
|
|
| 397 | - $taxonomy_search = $_REQUEST['s' . $post_type . 'category']; |
|
| 396 | + if (geodir_is_page('search') && !empty($_REQUEST['s'.$post_type.'category'])) {
|
|
| 397 | + $taxonomy_search = $_REQUEST['s'.$post_type.'category']; |
|
| 398 | 398 | |
| 399 | 399 | if (!is_array($taxonomy_search)) {
|
| 400 | - $term = get_term((int)$taxonomy_search, $post_type . 'category'); |
|
| 401 | - } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
|
|
| 402 | - $term = get_term((int)$taxonomy_search[0], $post_type . 'category'); |
|
| 400 | + $term = get_term((int) $taxonomy_search, $post_type.'category'); |
|
| 401 | + } else if (is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
|
|
| 402 | + $term = get_term((int) $taxonomy_search[0], $post_type.'category'); |
|
| 403 | 403 | } |
| 404 | 404 | } |
| 405 | 405 | |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | if ($max_page > 1 || $always_show) {
|
| 412 | 412 | // Extra pagination info |
| 413 | 413 | $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
|
| 414 | - $start_no = ( $paged - 1 ) * $posts_per_page + 1; |
|
| 414 | + $start_no = ($paged - 1) * $posts_per_page + 1; |
|
| 415 | 415 | $end_no = min($paged * $posts_per_page, $numposts); |
| 416 | 416 | |
| 417 | 417 | if ($geodir_pagination_more_info != '') {
|
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | } else {
|
| 422 | 422 | $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
|
| 423 | 423 | } |
| 424 | - $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>'; |
|
| 424 | + $pagination_info = '<div class="gd-pagination-details">'.$pegination_desc.'</div>'; |
|
| 425 | 425 | /** |
| 426 | 426 | * Adds an extra pagination info above/under pagination. |
| 427 | 427 | * |
@@ -437,15 +437,15 @@ discard block |
||
| 437 | 437 | $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
|
| 438 | 438 | |
| 439 | 439 | if ($geodir_pagination_more_info == 'before') {
|
| 440 | - $before = $before . $pagination_info; |
|
| 440 | + $before = $before.$pagination_info; |
|
| 441 | 441 | } else if ($geodir_pagination_more_info == 'after') {
|
| 442 | - $after = $pagination_info . $after; |
|
| 442 | + $after = $pagination_info.$after; |
|
| 443 | 443 | } |
| 444 | 444 | } |
| 445 | 445 | |
| 446 | 446 | echo "$before <div class='Navi gd-navi'>"; |
| 447 | 447 | if ($paged >= ($pages_to_show - 1)) {
|
| 448 | - echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link()) . '">«</a>';
|
|
| 448 | + echo '<a href="'.str_replace('&paged', '&paged', get_pagenum_link()).'">«</a>';
|
|
| 449 | 449 | } |
| 450 | 450 | previous_posts_link($prelabel); |
| 451 | 451 | for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
|
@@ -453,13 +453,13 @@ discard block |
||
| 453 | 453 | if ($i == $paged) {
|
| 454 | 454 | echo "<strong class='on'>$i</strong>"; |
| 455 | 455 | } else {
|
| 456 | - echo ' <a href="' . str_replace('&paged', '&paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
|
|
| 456 | + echo ' <a href="'.str_replace('&paged', '&paged', get_pagenum_link($i)).'">'.$i.'</a> ';
|
|
| 457 | 457 | } |
| 458 | 458 | } |
| 459 | 459 | } |
| 460 | 460 | next_posts_link($nxtlabel, $max_page); |
| 461 | 461 | if (($paged + $half_pages_to_show) < ($max_page)) {
|
| 462 | - echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link($max_page)) . '">»</a>';
|
|
| 462 | + echo '<a href="'.str_replace('&paged', '&paged', get_pagenum_link($max_page)).'">»</a>';
|
|
| 463 | 463 | } |
| 464 | 464 | echo "</div> $after"; |
| 465 | 465 | } |
@@ -497,7 +497,7 @@ discard block |
||
| 497 | 497 | jQuery(function ($) {
|
| 498 | 498 | $("#distance_slider").slider({
|
| 499 | 499 | range: true, |
| 500 | - values: [0, <?php echo ($_REQUEST['sdist']!='') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>], |
|
| 500 | + values: [0, <?php echo ($_REQUEST['sdist'] != '') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>], |
|
| 501 | 501 | min: 0, |
| 502 | 502 | max: <?php echo $dist; ?>, |
| 503 | 503 | step: <?php echo $dist_dif; ?>, |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : ''; |
| 565 | 565 | ?> |
| 566 | 566 | <script type="text/javascript"> |
| 567 | - var default_location = '<?php echo $city ;?>'; |
|
| 567 | + var default_location = '<?php echo $city; ?>'; |
|
| 568 | 568 | var latlng; |
| 569 | 569 | var address; |
| 570 | 570 | var dist = 0; |
@@ -580,7 +580,7 @@ discard block |
||
| 580 | 580 | var $form = jQuery(this).closest('form');
|
| 581 | 581 | |
| 582 | 582 | if (jQuery("#sdist input[type='radio']:checked").length != 0) dist = jQuery("#sdist input[type='radio']:checked").val();
|
| 583 | - if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text;?>') jQuery('.search_text', $form).val(s);
|
|
| 583 | + if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text; ?>') jQuery('.search_text', $form).val(s);
|
|
| 584 | 584 | |
| 585 | 585 | // Disable location based search for disabled location post type. |
| 586 | 586 | if (jQuery('.search_by_post', $form).val() != '' && typeof gd_cpt_no_location == 'function') {
|
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | } |
| 595 | 595 | } |
| 596 | 596 | |
| 597 | - if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text;?>')) {
|
|
| 597 | + if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text; ?>')) {
|
|
| 598 | 598 | geodir_setsearch($form); |
| 599 | 599 | } else {
|
| 600 | 600 | jQuery(".snear", $form).val('');
|
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | }); |
| 613 | 613 | |
| 614 | 614 | function geodir_setsearch($form) {
|
| 615 | - if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text;?>')) jQuery(".snear", $form).val(default_location);
|
|
| 615 | + if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text; ?>')) jQuery(".snear", $form).val(default_location);
|
|
| 616 | 616 | geocodeAddress($form); |
| 617 | 617 | } |
| 618 | 618 | |
@@ -631,15 +631,15 @@ discard block |
||
| 631 | 631 | // Call the geocode function |
| 632 | 632 | Sgeocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null; |
| 633 | 633 | |
| 634 | - if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != '' ) || jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {
|
|
| 635 | - if (jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {
|
|
| 634 | + if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != '' ) || jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {
|
|
| 635 | + if (jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {
|
|
| 636 | 636 | jQuery(".snear", $form).val('');
|
| 637 | 637 | } |
| 638 | 638 | jQuery($form).submit(); |
| 639 | 639 | } else {
|
| 640 | 640 | var address = jQuery(".snear", $form).val();
|
| 641 | 641 | |
| 642 | - if (jQuery('.snear', $form).val() == '<?php echo $default_near_text;?>') {
|
|
| 642 | + if (jQuery('.snear', $form).val() == '<?php echo $default_near_text; ?>') {
|
|
| 643 | 643 | initialise2(); |
| 644 | 644 | } else {
|
| 645 | 645 | <?php |
@@ -652,12 +652,12 @@ discard block |
||
| 652 | 652 | $near_add2 = apply_filters('geodir_search_near_addition', '');
|
| 653 | 653 | ?> |
| 654 | 654 | if (window.gdMaps === 'google') {
|
| 655 | - Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},
|
|
| 655 | + Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", '.$near_add.'"' : '').$near_add2; ?>},
|
|
| 656 | 656 | function (results, status) {
|
| 657 | 657 | if (status == google.maps.GeocoderStatus.OK) {
|
| 658 | 658 | updateSearchPosition(results[0].geometry.location, $form); |
| 659 | 659 | } else {
|
| 660 | - alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory');?>" + status);
|
|
| 660 | + alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory'); ?>" + status);
|
|
| 661 | 661 | } |
| 662 | 662 | }); |
| 663 | 663 | } else if (window.gdMaps === 'osm') {
|
@@ -666,7 +666,7 @@ discard block |
||
| 666 | 666 | if (typeof geo !== 'undefined' && geo.lat && geo.lon) {
|
| 667 | 667 | updateSearchPosition(geo, $form); |
| 668 | 668 | } else {
|
| 669 | - alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory');?>");
|
|
| 669 | + alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory'); ?>");
|
|
| 670 | 670 | } |
| 671 | 671 | }); |
| 672 | 672 | } else {
|
@@ -712,19 +712,19 @@ discard block |
||
| 712 | 712 | var msg; |
| 713 | 713 | switch (err.code) {
|
| 714 | 714 | case err.UNKNOWN_ERROR: |
| 715 | - msg = "<?php _e('Unable to find your location','geodirectory');?>";
|
|
| 715 | + msg = "<?php _e('Unable to find your location', 'geodirectory'); ?>";
|
|
| 716 | 716 | break; |
| 717 | 717 | case err.PERMISSION_DENINED: |
| 718 | - msg = "<?php _e('Permission denied in finding your location','geodirectory');?>";
|
|
| 718 | + msg = "<?php _e('Permission denied in finding your location', 'geodirectory'); ?>";
|
|
| 719 | 719 | break; |
| 720 | 720 | case err.POSITION_UNAVAILABLE: |
| 721 | - msg = "<?php _e('Your location is currently unknown','geodirectory');?>";
|
|
| 721 | + msg = "<?php _e('Your location is currently unknown', 'geodirectory'); ?>";
|
|
| 722 | 722 | break; |
| 723 | 723 | case err.BREAK: |
| 724 | - msg = "<?php _e('Attempt to find location took too long','geodirectory');?>";
|
|
| 724 | + msg = "<?php _e('Attempt to find location took too long', 'geodirectory'); ?>";
|
|
| 725 | 725 | break; |
| 726 | 726 | default: |
| 727 | - msg = "<?php _e('Location detection not supported in browser','geodirectory');?>";
|
|
| 727 | + msg = "<?php _e('Location detection not supported in browser', 'geodirectory'); ?>";
|
|
| 728 | 728 | } |
| 729 | 729 | jQuery('#info').html(msg);
|
| 730 | 730 | } |
@@ -763,7 +763,7 @@ discard block |
||
| 763 | 763 | * @param object $post The post object. |
| 764 | 764 | * @param string $link The link to the post. |
| 765 | 765 | */ |
| 766 | - $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img"> </span></a>',$post,$link);
|
|
| 766 | + $return = apply_filters('geodir_featured_badge_on_image', '<a href="'.$link.'"><span class="geodir_featured_img"> </span></a>', $post, $link);
|
|
| 767 | 767 | break; |
| 768 | 768 | case 'new' : |
| 769 | 769 | /** |
@@ -773,7 +773,7 @@ discard block |
||
| 773 | 773 | * @param object $post The post object. |
| 774 | 774 | * @param string $link The link to the post. |
| 775 | 775 | */ |
| 776 | - $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing"> </span></a>',$post,$link);
|
|
| 776 | + $return = apply_filters('geodir_new_badge_on_image', '<a href="'.$link.'"><span class="geodir_new_listing"> </span></a>', $post, $link);
|
|
| 777 | 777 | break; |
| 778 | 778 | |
| 779 | 779 | } |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | </script> |
| 253 | 253 | |
| 254 | 254 | <?php |
| 255 | - }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
|
|
| 255 | + } elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
|
|
| 256 | 256 | echo stripslashes(get_option('geodir_ga_tracking_code'));
|
| 257 | 257 | } |
| 258 | 258 | } |
@@ -291,13 +291,14 @@ discard block |
||
| 291 | 291 | */ |
| 292 | 292 | function geodir_add_async_forscript($url) |
| 293 | 293 | {
|
| 294 | - if (strpos($url, '#asyncload')===false) |
|
| 295 | - return $url; |
|
| 296 | - else if (is_admin()) |
|
| 297 | - return str_replace('#asyncload', '', $url);
|
|
| 298 | - else |
|
| 299 | - return str_replace('#asyncload', '', $url)."' async='async";
|
|
| 300 | -} |
|
| 294 | + if (strpos($url, '#asyncload')===false) { |
|
| 295 | + return $url; |
|
| 296 | + } else if (is_admin()) { |
|
| 297 | + return str_replace('#asyncload', '', $url); |
|
| 298 | + } else { |
|
| 299 | + return str_replace('#asyncload', '', $url)."' async='async"; |
|
| 300 | + } |
|
| 301 | + } |
|
| 301 | 302 | add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);
|
| 302 | 303 | |
| 303 | 304 | /** |
@@ -364,8 +365,10 @@ discard block |
||
| 364 | 365 | |
| 365 | 366 | $half_pages_to_show = round($pages_to_show / 2); |
| 366 | 367 | |
| 367 | - if (geodir_is_page('home')) // dont apply default pagination for geodirectory home page.
|
|
| 368 | - return; |
|
| 368 | + if (geodir_is_page('home')) { |
|
| 369 | + // dont apply default pagination for geodirectory home page. |
|
| 370 | + return; |
|
| 371 | + } |
|
| 369 | 372 | |
| 370 | 373 | if (!is_single()) {
|
| 371 | 374 | if (function_exists('geodir_location_geo_home_link')) {
|
@@ -485,11 +488,21 @@ discard block |
||
| 485 | 488 | } |
| 486 | 489 | $dist_dif = 1000; |
| 487 | 490 | |
| 488 | - if ($dist <= 5000) $dist_dif = 500; |
|
| 489 | - if ($dist <= 1000) $dist_dif = 100; |
|
| 490 | - if ($dist <= 500) $dist_dif = 50; |
|
| 491 | - if ($dist <= 100) $dist_dif = 10; |
|
| 492 | - if ($dist <= 50) $dist_dif = 5; |
|
| 491 | + if ($dist <= 5000) { |
|
| 492 | + $dist_dif = 500; |
|
| 493 | + } |
|
| 494 | + if ($dist <= 1000) { |
|
| 495 | + $dist_dif = 100; |
|
| 496 | + } |
|
| 497 | + if ($dist <= 500) { |
|
| 498 | + $dist_dif = 50; |
|
| 499 | + } |
|
| 500 | + if ($dist <= 100) { |
|
| 501 | + $dist_dif = 10; |
|
| 502 | + } |
|
| 503 | + if ($dist <= 50) { |
|
| 504 | + $dist_dif = 5; |
|
| 505 | + } |
|
| 493 | 506 | |
| 494 | 507 | ?> |
| 495 | 508 | <script type="text/javascript"> |
@@ -550,12 +563,14 @@ discard block |
||
| 550 | 563 | */ |
| 551 | 564 | function geodir_add_sharelocation_scripts() {
|
| 552 | 565 | $default_search_for_text = SEARCH_FOR_TEXT; |
| 553 | - if (get_option('geodir_search_field_default_text'))
|
|
| 554 | - $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
|
|
| 566 | + if (get_option('geodir_search_field_default_text')) { |
|
| 567 | + $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory'); |
|
| 568 | + } |
|
| 555 | 569 | |
| 556 | 570 | $default_near_text = NEAR_TEXT; |
| 557 | - if (get_option('geodir_near_field_default_text'))
|
|
| 558 | - $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
|
|
| 571 | + if (get_option('geodir_near_field_default_text')) { |
|
| 572 | + $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory'); |
|
| 573 | + } |
|
| 559 | 574 | |
| 560 | 575 | $search_location = geodir_get_default_location(); |
| 561 | 576 | |
@@ -13,28 +13,28 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | function geodir_user_favourite_listing_count($user_id=false) |
| 15 | 15 | { |
| 16 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 16 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 17 | 17 | |
| 18 | - if(!$user_id){$user_id = $current_user->ID;} |
|
| 19 | - if(!$user_id){return array();} |
|
| 18 | + if(!$user_id){$user_id = $current_user->ID;} |
|
| 19 | + if(!$user_id){return array();} |
|
| 20 | 20 | |
| 21 | - $user_favorites = get_user_meta($user_id, 'gd_user_favourite_post', true); |
|
| 22 | - $all_posts = get_option('geodir_favorite_link_user_dashboard'); |
|
| 21 | + $user_favorites = get_user_meta($user_id, 'gd_user_favourite_post', true); |
|
| 22 | + $all_posts = get_option('geodir_favorite_link_user_dashboard'); |
|
| 23 | 23 | |
| 24 | - $user_listing = array(); |
|
| 25 | - if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) { |
|
| 26 | - $user_favorites = "'" . implode("','", $user_favorites) . "'"; |
|
| 24 | + $user_listing = array(); |
|
| 25 | + if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) { |
|
| 26 | + $user_favorites = "'" . implode("','", $user_favorites) . "'"; |
|
| 27 | 27 | |
| 28 | - foreach ($all_posts as $ptype) { |
|
| 29 | - $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")"); |
|
| 28 | + foreach ($all_posts as $ptype) { |
|
| 29 | + $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")"); |
|
| 30 | 30 | |
| 31 | - if ($total_posts > 0) { |
|
| 32 | - $user_listing[$ptype] = $total_posts; |
|
| 33 | - } |
|
| 34 | - } |
|
| 35 | - } |
|
| 31 | + if ($total_posts > 0) { |
|
| 32 | + $user_listing[$ptype] = $total_posts; |
|
| 33 | + } |
|
| 34 | + } |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - return $user_listing; |
|
| 37 | + return $user_listing; |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
@@ -47,51 +47,51 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | |
| 49 | 49 | function geodir_user_show_favourites($user_id='',$output_type='select'){ |
| 50 | - // My Favourites in Dashboard |
|
| 51 | - $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard'); |
|
| 52 | - $user_favourite = geodir_user_favourite_listing_count($user_id); |
|
| 53 | - |
|
| 54 | - if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) { |
|
| 55 | - $favourite_links = ''; |
|
| 56 | - $post_types = geodir_get_posttypes('object'); |
|
| 57 | - |
|
| 58 | - $author_link = get_author_posts_url($user_id); |
|
| 59 | - $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false); |
|
| 60 | - |
|
| 61 | - foreach ($post_types as $key => $postobj) { |
|
| 62 | - if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) { |
|
| 63 | - $name = $postobj->labels->name; |
|
| 64 | - $post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false); |
|
| 65 | - |
|
| 66 | - $selected = ''; |
|
| 67 | - |
|
| 68 | - if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) { |
|
| 69 | - $selected = 'selected="selected"'; |
|
| 70 | - } |
|
| 71 | - /** |
|
| 72 | - * Filter favorite listing link. |
|
| 73 | - * |
|
| 74 | - * @since 1.0.0 |
|
| 75 | - * @param string $post_type_link Favorite listing link. |
|
| 76 | - * @param string $key Favorite listing array key. |
|
| 77 | - * @param int $current_user->ID Current user ID. |
|
| 78 | - */ |
|
| 79 | - $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id); |
|
| 80 | - |
|
| 81 | - if($output_type=='select'){ |
|
| 82 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
|
| 83 | - }elseif($output_type=='link'){ |
|
| 84 | - $favourite_links[] = '<a href="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
|
| 85 | - } |
|
| 86 | - |
|
| 87 | - |
|
| 88 | - } |
|
| 89 | - } |
|
| 90 | - |
|
| 91 | - if ($favourite_links != '') { |
|
| 92 | - $user = get_user_by( 'ID', $user_id ); |
|
| 93 | - if($output_type=='select') { |
|
| 94 | - ?> |
|
| 50 | + // My Favourites in Dashboard |
|
| 51 | + $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard'); |
|
| 52 | + $user_favourite = geodir_user_favourite_listing_count($user_id); |
|
| 53 | + |
|
| 54 | + if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) { |
|
| 55 | + $favourite_links = ''; |
|
| 56 | + $post_types = geodir_get_posttypes('object'); |
|
| 57 | + |
|
| 58 | + $author_link = get_author_posts_url($user_id); |
|
| 59 | + $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false); |
|
| 60 | + |
|
| 61 | + foreach ($post_types as $key => $postobj) { |
|
| 62 | + if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) { |
|
| 63 | + $name = $postobj->labels->name; |
|
| 64 | + $post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false); |
|
| 65 | + |
|
| 66 | + $selected = ''; |
|
| 67 | + |
|
| 68 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) { |
|
| 69 | + $selected = 'selected="selected"'; |
|
| 70 | + } |
|
| 71 | + /** |
|
| 72 | + * Filter favorite listing link. |
|
| 73 | + * |
|
| 74 | + * @since 1.0.0 |
|
| 75 | + * @param string $post_type_link Favorite listing link. |
|
| 76 | + * @param string $key Favorite listing array key. |
|
| 77 | + * @param int $current_user->ID Current user ID. |
|
| 78 | + */ |
|
| 79 | + $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id); |
|
| 80 | + |
|
| 81 | + if($output_type=='select'){ |
|
| 82 | + $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
|
| 83 | + }elseif($output_type=='link'){ |
|
| 84 | + $favourite_links[] = '<a href="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
|
| 85 | + } |
|
| 86 | + |
|
| 87 | + |
|
| 88 | + } |
|
| 89 | + } |
|
| 90 | + |
|
| 91 | + if ($favourite_links != '') { |
|
| 92 | + $user = get_user_by( 'ID', $user_id ); |
|
| 93 | + if($output_type=='select') { |
|
| 94 | + ?> |
|
| 95 | 95 | <li> |
| 96 | 96 | <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" |
| 97 | 97 | option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" |
@@ -102,62 +102,62 @@ discard block |
||
| 102 | 102 | </select> |
| 103 | 103 | </li> |
| 104 | 104 | <?php |
| 105 | - }elseif($output_type=='link'){ |
|
| 106 | - if(!empty($favourite_links)){ |
|
| 107 | - echo implode(" | ",$favourite_links); |
|
| 108 | - } |
|
| 109 | - |
|
| 110 | - } |
|
| 111 | - } |
|
| 112 | - } |
|
| 105 | + }elseif($output_type=='link'){ |
|
| 106 | + if(!empty($favourite_links)){ |
|
| 107 | + echo implode(" | ",$favourite_links); |
|
| 108 | + } |
|
| 109 | + |
|
| 110 | + } |
|
| 111 | + } |
|
| 112 | + } |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | |
| 116 | 116 | |
| 117 | 117 | function geodir_user_show_listings($user_id='',$output_type='select'){ |
| 118 | 118 | |
| 119 | - $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard'); |
|
| 120 | - $user_listing = geodir_user_post_listing_count($user_id); |
|
| 121 | - |
|
| 122 | - if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) { |
|
| 123 | - $listing_links = ''; |
|
| 124 | - |
|
| 125 | - $post_types = geodir_get_posttypes('object'); |
|
| 126 | - |
|
| 127 | - $author_link = get_author_posts_url($user_id); |
|
| 128 | - $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false); |
|
| 129 | - |
|
| 130 | - foreach ($post_types as $key => $postobj) { |
|
| 131 | - if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) { |
|
| 132 | - $name = $postobj->labels->name; |
|
| 133 | - $listing_link = geodir_getlink($author_link, array('stype' => $key), false); |
|
| 134 | - |
|
| 135 | - $selected = ''; |
|
| 136 | - if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) { |
|
| 137 | - $selected = 'selected="selected"'; |
|
| 138 | - } |
|
| 139 | - |
|
| 140 | - /** |
|
| 141 | - * Filter my listing link. |
|
| 142 | - * |
|
| 143 | - * @since 1.0.0 |
|
| 144 | - * @param string $listing_link My listing link. |
|
| 145 | - * @param string $key My listing array key. |
|
| 146 | - * @param int $current_user->ID Current user ID. |
|
| 147 | - */ |
|
| 148 | - $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id); |
|
| 149 | - if($output_type=='select') { |
|
| 150 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
|
| 151 | - }elseif($output_type=='link'){ |
|
| 152 | - $listing_links[] = '<a href="' .$listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
|
| 153 | - } |
|
| 154 | - } |
|
| 155 | - } |
|
| 156 | - |
|
| 157 | - if ($listing_links != '') { |
|
| 158 | - $user = get_user_by( 'ID', $user_id ); |
|
| 159 | - if($output_type=='select') { |
|
| 160 | - ?> |
|
| 119 | + $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard'); |
|
| 120 | + $user_listing = geodir_user_post_listing_count($user_id); |
|
| 121 | + |
|
| 122 | + if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) { |
|
| 123 | + $listing_links = ''; |
|
| 124 | + |
|
| 125 | + $post_types = geodir_get_posttypes('object'); |
|
| 126 | + |
|
| 127 | + $author_link = get_author_posts_url($user_id); |
|
| 128 | + $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false); |
|
| 129 | + |
|
| 130 | + foreach ($post_types as $key => $postobj) { |
|
| 131 | + if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) { |
|
| 132 | + $name = $postobj->labels->name; |
|
| 133 | + $listing_link = geodir_getlink($author_link, array('stype' => $key), false); |
|
| 134 | + |
|
| 135 | + $selected = ''; |
|
| 136 | + if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) { |
|
| 137 | + $selected = 'selected="selected"'; |
|
| 138 | + } |
|
| 139 | + |
|
| 140 | + /** |
|
| 141 | + * Filter my listing link. |
|
| 142 | + * |
|
| 143 | + * @since 1.0.0 |
|
| 144 | + * @param string $listing_link My listing link. |
|
| 145 | + * @param string $key My listing array key. |
|
| 146 | + * @param int $current_user->ID Current user ID. |
|
| 147 | + */ |
|
| 148 | + $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id); |
|
| 149 | + if($output_type=='select') { |
|
| 150 | + $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
|
| 151 | + }elseif($output_type=='link'){ |
|
| 152 | + $listing_links[] = '<a href="' .$listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
|
| 153 | + } |
|
| 154 | + } |
|
| 155 | + } |
|
| 156 | + |
|
| 157 | + if ($listing_links != '') { |
|
| 158 | + $user = get_user_by( 'ID', $user_id ); |
|
| 159 | + if($output_type=='select') { |
|
| 160 | + ?> |
|
| 161 | 161 | <li> |
| 162 | 162 | <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" |
| 163 | 163 | option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" |
@@ -168,13 +168,13 @@ discard block |
||
| 168 | 168 | </select> |
| 169 | 169 | </li> |
| 170 | 170 | <?php |
| 171 | - }elseif($output_type=='link'){ |
|
| 172 | - if(!empty($listing_links )){ |
|
| 173 | - echo implode(" | ",$listing_links ); |
|
| 174 | - } |
|
| 175 | - |
|
| 176 | - } |
|
| 177 | - } |
|
| 178 | - } |
|
| 171 | + }elseif($output_type=='link'){ |
|
| 172 | + if(!empty($listing_links )){ |
|
| 173 | + echo implode(" | ",$listing_links ); |
|
| 174 | + } |
|
| 175 | + |
|
| 176 | + } |
|
| 177 | + } |
|
| 178 | + } |
|
| 179 | 179 | |
| 180 | 180 | } |
@@ -11,22 +11,22 @@ discard block |
||
| 11 | 11 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 12 | 12 | * @return array User listing count for each post type. |
| 13 | 13 | */ |
| 14 | -function geodir_user_favourite_listing_count($user_id=false) |
|
| 14 | +function geodir_user_favourite_listing_count($user_id = false) |
|
| 15 | 15 | { |
| 16 | 16 | global $wpdb, $plugin_prefix, $current_user; |
| 17 | 17 | |
| 18 | - if(!$user_id){$user_id = $current_user->ID;} |
|
| 19 | - if(!$user_id){return array();} |
|
| 18 | + if (!$user_id) {$user_id = $current_user->ID; } |
|
| 19 | + if (!$user_id) {return array(); } |
|
| 20 | 20 | |
| 21 | 21 | $user_favorites = get_user_meta($user_id, 'gd_user_favourite_post', true); |
| 22 | 22 | $all_posts = get_option('geodir_favorite_link_user_dashboard'); |
| 23 | 23 | |
| 24 | 24 | $user_listing = array(); |
| 25 | 25 | if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) { |
| 26 | - $user_favorites = "'" . implode("','", $user_favorites) . "'"; |
|
| 26 | + $user_favorites = "'".implode("','", $user_favorites)."'"; |
|
| 27 | 27 | |
| 28 | 28 | foreach ($all_posts as $ptype) { |
| 29 | - $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")"); |
|
| 29 | + $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE post_type='".$ptype."' AND post_status = 'publish' AND ID IN (".$user_favorites.")"); |
|
| 30 | 30 | |
| 31 | 31 | if ($total_posts > 0) { |
| 32 | 32 | $user_listing[$ptype] = $total_posts; |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | * @package GeoDirectory |
| 47 | 47 | */ |
| 48 | 48 | |
| 49 | -function geodir_user_show_favourites($user_id='',$output_type='select'){ |
|
| 49 | +function geodir_user_show_favourites($user_id = '', $output_type = 'select') { |
|
| 50 | 50 | // My Favourites in Dashboard |
| 51 | 51 | $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard'); |
| 52 | 52 | $user_favourite = geodir_user_favourite_listing_count($user_id); |
@@ -78,10 +78,10 @@ discard block |
||
| 78 | 78 | */ |
| 79 | 79 | $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id); |
| 80 | 80 | |
| 81 | - if($output_type=='select'){ |
|
| 82 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
|
| 83 | - }elseif($output_type=='link'){ |
|
| 84 | - $favourite_links[] = '<a href="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
|
| 81 | + if ($output_type == 'select') { |
|
| 82 | + $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; |
|
| 83 | + }elseif ($output_type == 'link') { |
|
| 84 | + $favourite_links[] = '<a href="'.$post_type_link.'">'.__(ucfirst($name), 'geodirectory').'</a>'; |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | |
@@ -89,8 +89,8 @@ discard block |
||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | if ($favourite_links != '') { |
| 92 | - $user = get_user_by( 'ID', $user_id ); |
|
| 93 | - if($output_type=='select') { |
|
| 92 | + $user = get_user_by('ID', $user_id); |
|
| 93 | + if ($output_type == 'select') { |
|
| 94 | 94 | ?> |
| 95 | 95 | <li> |
| 96 | 96 | <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" |
@@ -102,9 +102,9 @@ discard block |
||
| 102 | 102 | </select> |
| 103 | 103 | </li> |
| 104 | 104 | <?php |
| 105 | - }elseif($output_type=='link'){ |
|
| 106 | - if(!empty($favourite_links)){ |
|
| 107 | - echo implode(" | ",$favourite_links); |
|
| 105 | + }elseif ($output_type == 'link') { |
|
| 106 | + if (!empty($favourite_links)) { |
|
| 107 | + echo implode(" | ", $favourite_links); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | |
| 115 | 115 | |
| 116 | 116 | |
| 117 | -function geodir_user_show_listings($user_id='',$output_type='select'){ |
|
| 117 | +function geodir_user_show_listings($user_id = '', $output_type = 'select') { |
|
| 118 | 118 | |
| 119 | 119 | $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard'); |
| 120 | 120 | $user_listing = geodir_user_post_listing_count($user_id); |
@@ -146,17 +146,17 @@ discard block |
||
| 146 | 146 | * @param int $current_user->ID Current user ID. |
| 147 | 147 | */ |
| 148 | 148 | $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id); |
| 149 | - if($output_type=='select') { |
|
| 150 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
|
| 151 | - }elseif($output_type=='link'){ |
|
| 152 | - $listing_links[] = '<a href="' .$listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
|
| 149 | + if ($output_type == 'select') { |
|
| 150 | + $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; |
|
| 151 | + }elseif ($output_type == 'link') { |
|
| 152 | + $listing_links[] = '<a href="'.$listing_link.'">'.__(ucfirst($name), 'geodirectory').'</a>'; |
|
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | if ($listing_links != '') { |
| 158 | - $user = get_user_by( 'ID', $user_id ); |
|
| 159 | - if($output_type=='select') { |
|
| 158 | + $user = get_user_by('ID', $user_id); |
|
| 159 | + if ($output_type == 'select') { |
|
| 160 | 160 | ?> |
| 161 | 161 | <li> |
| 162 | 162 | <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" |
@@ -168,9 +168,9 @@ discard block |
||
| 168 | 168 | </select> |
| 169 | 169 | </li> |
| 170 | 170 | <?php |
| 171 | - }elseif($output_type=='link'){ |
|
| 172 | - if(!empty($listing_links )){ |
|
| 173 | - echo implode(" | ",$listing_links ); |
|
| 171 | + }elseif ($output_type == 'link') { |
|
| 172 | + if (!empty($listing_links)) { |
|
| 173 | + echo implode(" | ", $listing_links); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | } |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | if($output_type=='select'){ |
| 82 | 82 | $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
| 83 | - }elseif($output_type=='link'){ |
|
| 83 | + } elseif($output_type=='link'){ |
|
| 84 | 84 | $favourite_links[] = '<a href="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
| 85 | 85 | } |
| 86 | 86 | |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | </select> |
| 103 | 103 | </li> |
| 104 | 104 | <?php |
| 105 | - }elseif($output_type=='link'){ |
|
| 105 | + } elseif($output_type=='link'){ |
|
| 106 | 106 | if(!empty($favourite_links)){ |
| 107 | 107 | echo implode(" | ",$favourite_links); |
| 108 | 108 | } |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id); |
| 149 | 149 | if($output_type=='select') { |
| 150 | 150 | $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
| 151 | - }elseif($output_type=='link'){ |
|
| 151 | + } elseif($output_type=='link'){ |
|
| 152 | 152 | $listing_links[] = '<a href="' .$listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
| 153 | 153 | } |
| 154 | 154 | } |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | </select> |
| 169 | 169 | </li> |
| 170 | 170 | <?php |
| 171 | - }elseif($output_type=='link'){ |
|
| 171 | + } elseif($output_type=='link'){ |
|
| 172 | 172 | if(!empty($listing_links )){ |
| 173 | 173 | echo implode(" | ",$listing_links ); |
| 174 | 174 | } |
@@ -33,265 +33,265 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | function geodir_add_nav_menu_items() |
| 35 | 35 | {
|
| 36 | - $items = ''; |
|
| 37 | - // apply filter to add more navigations // -Filter-Location-Manager |
|
| 38 | - |
|
| 39 | - if (get_option('geodir_show_listing_nav')) {
|
|
| 40 | - |
|
| 41 | - $menu_class = ''; |
|
| 42 | - if (geodir_is_page('listing'))
|
|
| 43 | - $menu_class = 'current-menu-item'; |
|
| 44 | - |
|
| 45 | - |
|
| 46 | - //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION |
|
| 47 | - $post_types = geodir_get_posttypes('object');
|
|
| 48 | - $show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');
|
|
| 49 | - if (!empty($post_types)) {
|
|
| 50 | - foreach ($post_types as $post_type => $args) {
|
|
| 51 | - if (!empty($show_post_type_main_nav)) {
|
|
| 52 | - if (in_array($post_type, $show_post_type_main_nav)) {
|
|
| 53 | - if (get_post_type_archive_link($post_type)) {
|
|
| 54 | - $menu_class = ''; |
|
| 55 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 56 | - $menu_class = 'current-menu-item'; |
|
| 57 | - /** |
|
| 58 | - * Filter the menu li class. |
|
| 59 | - * |
|
| 60 | - * @since 1.0.0 |
|
| 61 | - * @param string $menu_class The menu HTML class. |
|
| 62 | - */ |
|
| 63 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 64 | - /** |
|
| 65 | - * Filter the menu a class. |
|
| 66 | - * |
|
| 67 | - * @since 1.0.0 |
|
| 68 | - */ |
|
| 69 | - $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 70 | - $items .= '<li class="' . $li_class . '"> |
|
| 36 | + $items = ''; |
|
| 37 | + // apply filter to add more navigations // -Filter-Location-Manager |
|
| 38 | + |
|
| 39 | + if (get_option('geodir_show_listing_nav')) {
|
|
| 40 | + |
|
| 41 | + $menu_class = ''; |
|
| 42 | + if (geodir_is_page('listing'))
|
|
| 43 | + $menu_class = 'current-menu-item'; |
|
| 44 | + |
|
| 45 | + |
|
| 46 | + //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION |
|
| 47 | + $post_types = geodir_get_posttypes('object');
|
|
| 48 | + $show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');
|
|
| 49 | + if (!empty($post_types)) {
|
|
| 50 | + foreach ($post_types as $post_type => $args) {
|
|
| 51 | + if (!empty($show_post_type_main_nav)) {
|
|
| 52 | + if (in_array($post_type, $show_post_type_main_nav)) {
|
|
| 53 | + if (get_post_type_archive_link($post_type)) {
|
|
| 54 | + $menu_class = ''; |
|
| 55 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 56 | + $menu_class = 'current-menu-item'; |
|
| 57 | + /** |
|
| 58 | + * Filter the menu li class. |
|
| 59 | + * |
|
| 60 | + * @since 1.0.0 |
|
| 61 | + * @param string $menu_class The menu HTML class. |
|
| 62 | + */ |
|
| 63 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 64 | + /** |
|
| 65 | + * Filter the menu a class. |
|
| 66 | + * |
|
| 67 | + * @since 1.0.0 |
|
| 68 | + */ |
|
| 69 | + $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 70 | + $items .= '<li class="' . $li_class . '"> |
|
| 71 | 71 | <a href="' . get_post_type_archive_link($post_type) . '" class="' . $a_class . '"> |
| 72 | 72 | ' . __(ucfirst($args->labels->name),'geodirectory') . ' |
| 73 | 73 | </a> |
| 74 | 74 | </li>'; |
| 75 | - } |
|
| 76 | - } |
|
| 77 | - } |
|
| 78 | - } |
|
| 79 | - } |
|
| 80 | - //END LISTING OF POST TYPE IN MAIN NAVIGATION |
|
| 81 | - |
|
| 82 | - $view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');
|
|
| 83 | - $is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false; |
|
| 84 | - if ($is_listing_sub_meny_exists) {
|
|
| 85 | - /** |
|
| 86 | - * Filter the menu li class. |
|
| 87 | - * |
|
| 88 | - * @since 1.0.0 |
|
| 89 | - * @param string $menu_class The menu HTML class. |
|
| 90 | - */ |
|
| 91 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);
|
|
| 92 | - /** |
|
| 93 | - * Filter the sub menu li class. |
|
| 94 | - * |
|
| 95 | - * @since 1.0.0 |
|
| 96 | - * @param string $menu_class The menu HTML class. |
|
| 97 | - */ |
|
| 98 | - $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 99 | - /** |
|
| 100 | - * Filter the sub menu ul class. |
|
| 101 | - * |
|
| 102 | - * @since 1.0.0 |
|
| 103 | - */ |
|
| 104 | - $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
|
|
| 105 | - /** |
|
| 106 | - * Filter the menu a class. |
|
| 107 | - * |
|
| 108 | - * @since 1.0.0 |
|
| 109 | - */ |
|
| 110 | - $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 111 | - /** |
|
| 112 | - * Filter the sub menu a class. |
|
| 113 | - * |
|
| 114 | - * @since 1.0.0 |
|
| 115 | - */ |
|
| 116 | - $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
|
| 117 | - $items .= '<li class="' . $li_class . '"> |
|
| 75 | + } |
|
| 76 | + } |
|
| 77 | + } |
|
| 78 | + } |
|
| 79 | + } |
|
| 80 | + //END LISTING OF POST TYPE IN MAIN NAVIGATION |
|
| 81 | + |
|
| 82 | + $view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');
|
|
| 83 | + $is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false; |
|
| 84 | + if ($is_listing_sub_meny_exists) {
|
|
| 85 | + /** |
|
| 86 | + * Filter the menu li class. |
|
| 87 | + * |
|
| 88 | + * @since 1.0.0 |
|
| 89 | + * @param string $menu_class The menu HTML class. |
|
| 90 | + */ |
|
| 91 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);
|
|
| 92 | + /** |
|
| 93 | + * Filter the sub menu li class. |
|
| 94 | + * |
|
| 95 | + * @since 1.0.0 |
|
| 96 | + * @param string $menu_class The menu HTML class. |
|
| 97 | + */ |
|
| 98 | + $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 99 | + /** |
|
| 100 | + * Filter the sub menu ul class. |
|
| 101 | + * |
|
| 102 | + * @since 1.0.0 |
|
| 103 | + */ |
|
| 104 | + $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
|
|
| 105 | + /** |
|
| 106 | + * Filter the menu a class. |
|
| 107 | + * |
|
| 108 | + * @since 1.0.0 |
|
| 109 | + */ |
|
| 110 | + $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 111 | + /** |
|
| 112 | + * Filter the sub menu a class. |
|
| 113 | + * |
|
| 114 | + * @since 1.0.0 |
|
| 115 | + */ |
|
| 116 | + $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
|
| 117 | + $items .= '<li class="' . $li_class . '"> |
|
| 118 | 118 | <a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>
|
| 119 | 119 | <ul class="' . $sub_ul_class . '">'; |
| 120 | - $post_types = geodir_get_posttypes('object');
|
|
| 120 | + $post_types = geodir_get_posttypes('object');
|
|
| 121 | 121 | |
| 122 | - $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');
|
|
| 122 | + $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');
|
|
| 123 | 123 | |
| 124 | - if (!empty($post_types)) {
|
|
| 125 | - global $geodir_add_location_url; |
|
| 126 | - $geodir_add_location_url = true; |
|
| 127 | - foreach ($post_types as $post_type => $args) {
|
|
| 128 | - if (!empty($show_listing_post_types)) {
|
|
| 129 | - if (in_array($post_type, $show_listing_post_types)) {
|
|
| 130 | - if (get_post_type_archive_link($post_type)) {
|
|
| 124 | + if (!empty($post_types)) {
|
|
| 125 | + global $geodir_add_location_url; |
|
| 126 | + $geodir_add_location_url = true; |
|
| 127 | + foreach ($post_types as $post_type => $args) {
|
|
| 128 | + if (!empty($show_listing_post_types)) {
|
|
| 129 | + if (in_array($post_type, $show_listing_post_types)) {
|
|
| 130 | + if (get_post_type_archive_link($post_type)) {
|
|
| 131 | 131 | |
| 132 | - $menu_class = ''; |
|
| 133 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 134 | - $menu_class = 'current-menu-item'; |
|
| 132 | + $menu_class = ''; |
|
| 133 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 134 | + $menu_class = 'current-menu-item'; |
|
| 135 | 135 | |
| 136 | - $items .= '<li class="' . $sub_li_class . '"> |
|
| 136 | + $items .= '<li class="' . $sub_li_class . '"> |
|
| 137 | 137 | <a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '"> |
| 138 | 138 | ' . __(ucfirst($args->labels->name),'geodirectory') . ' |
| 139 | 139 | </a> |
| 140 | 140 | </li>'; |
| 141 | - } |
|
| 142 | - } |
|
| 143 | - } |
|
| 144 | - } |
|
| 145 | - $geodir_add_location_url = NULL; |
|
| 146 | - } |
|
| 141 | + } |
|
| 142 | + } |
|
| 143 | + } |
|
| 144 | + } |
|
| 145 | + $geodir_add_location_url = NULL; |
|
| 146 | + } |
|
| 147 | 147 | |
| 148 | - $items .= ' </ul> '; |
|
| 149 | - /** |
|
| 150 | - * Filter called after the sub menu closing ul tag for dynamic added menu items. |
|
| 151 | - * |
|
| 152 | - * @since 1.5.9 |
|
| 153 | - */ |
|
| 154 | - $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 155 | - $items .= '</li>'; |
|
| 156 | - } |
|
| 157 | - } |
|
| 158 | - |
|
| 159 | - if (get_option('geodir_show_addlisting_nav')) {
|
|
| 160 | - |
|
| 161 | - $menu_class = ''; |
|
| 162 | - if (geodir_is_page('add-listing'))
|
|
| 163 | - $menu_class = 'current-menu-item'; |
|
| 164 | - |
|
| 165 | - //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION |
|
| 166 | - $post_types = geodir_get_posttypes('object');
|
|
| 167 | - $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');
|
|
| 168 | - $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 169 | - |
|
| 170 | - if (!empty($post_types)) {
|
|
| 171 | - foreach ($post_types as $post_type => $args) {
|
|
| 172 | - if (!empty($geodir_allow_posttype_frontend)) {
|
|
| 173 | - if (in_array($post_type, $geodir_allow_posttype_frontend)) {
|
|
| 174 | - if (!empty($show_add_listing_post_types_main_nav)) {
|
|
| 175 | - if (in_array($post_type, $show_add_listing_post_types_main_nav)) {
|
|
| 176 | - if (geodir_get_addlisting_link($post_type)) {
|
|
| 177 | - |
|
| 178 | - $menu_class = ''; |
|
| 179 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 180 | - $menu_class = 'current-menu-item'; |
|
| 181 | - /** |
|
| 182 | - * Filter the menu li class. |
|
| 183 | - * |
|
| 184 | - * @since 1.0.0 |
|
| 185 | - * @param string $menu_class The menu HTML class. |
|
| 186 | - */ |
|
| 187 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 188 | - /** |
|
| 189 | - * Filter the menu a class. |
|
| 190 | - * |
|
| 191 | - * @since 1.0.0 |
|
| 192 | - */ |
|
| 193 | - $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 194 | - $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
|
| 195 | - $items .= '<li class="' . $li_class . '"> |
|
| 148 | + $items .= ' </ul> '; |
|
| 149 | + /** |
|
| 150 | + * Filter called after the sub menu closing ul tag for dynamic added menu items. |
|
| 151 | + * |
|
| 152 | + * @since 1.5.9 |
|
| 153 | + */ |
|
| 154 | + $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 155 | + $items .= '</li>'; |
|
| 156 | + } |
|
| 157 | + } |
|
| 158 | + |
|
| 159 | + if (get_option('geodir_show_addlisting_nav')) {
|
|
| 160 | + |
|
| 161 | + $menu_class = ''; |
|
| 162 | + if (geodir_is_page('add-listing'))
|
|
| 163 | + $menu_class = 'current-menu-item'; |
|
| 164 | + |
|
| 165 | + //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION |
|
| 166 | + $post_types = geodir_get_posttypes('object');
|
|
| 167 | + $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');
|
|
| 168 | + $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 169 | + |
|
| 170 | + if (!empty($post_types)) {
|
|
| 171 | + foreach ($post_types as $post_type => $args) {
|
|
| 172 | + if (!empty($geodir_allow_posttype_frontend)) {
|
|
| 173 | + if (in_array($post_type, $geodir_allow_posttype_frontend)) {
|
|
| 174 | + if (!empty($show_add_listing_post_types_main_nav)) {
|
|
| 175 | + if (in_array($post_type, $show_add_listing_post_types_main_nav)) {
|
|
| 176 | + if (geodir_get_addlisting_link($post_type)) {
|
|
| 177 | + |
|
| 178 | + $menu_class = ''; |
|
| 179 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 180 | + $menu_class = 'current-menu-item'; |
|
| 181 | + /** |
|
| 182 | + * Filter the menu li class. |
|
| 183 | + * |
|
| 184 | + * @since 1.0.0 |
|
| 185 | + * @param string $menu_class The menu HTML class. |
|
| 186 | + */ |
|
| 187 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 188 | + /** |
|
| 189 | + * Filter the menu a class. |
|
| 190 | + * |
|
| 191 | + * @since 1.0.0 |
|
| 192 | + */ |
|
| 193 | + $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 194 | + $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
|
| 195 | + $items .= '<li class="' . $li_class . '"> |
|
| 196 | 196 | <a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $a_class . '"> |
| 197 | 197 | ' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '
|
| 198 | 198 | </a> |
| 199 | 199 | </li>'; |
| 200 | - } |
|
| 201 | - } |
|
| 202 | - } |
|
| 203 | - } |
|
| 204 | - } |
|
| 205 | - } |
|
| 206 | - } |
|
| 207 | - //END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION |
|
| 208 | - } |
|
| 209 | - |
|
| 210 | - $view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');
|
|
| 211 | - $is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false; |
|
| 212 | - if ($is_add_listing_sub_meny_exists) {
|
|
| 213 | - |
|
| 214 | - if (get_option('geodir_show_addlisting_nav')) {
|
|
| 215 | - /** |
|
| 216 | - * Filter the menu li class. |
|
| 217 | - * |
|
| 218 | - * @since 1.0.0 |
|
| 219 | - * @param string $menu_class The menu HTML class. |
|
| 220 | - */ |
|
| 221 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);
|
|
| 222 | - /** |
|
| 223 | - * Filter the sub menu li class. |
|
| 224 | - * |
|
| 225 | - * @since 1.0.0 |
|
| 226 | - * @param string $menu_class The menu HTML class. |
|
| 227 | - */ |
|
| 228 | - $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 229 | - /** |
|
| 230 | - * Filter the sub menu ul class. |
|
| 231 | - * |
|
| 232 | - * @since 1.0.0 |
|
| 233 | - */ |
|
| 234 | - $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
|
|
| 235 | - /** |
|
| 236 | - * Filter the menu a class. |
|
| 237 | - * |
|
| 238 | - * @since 1.0.0 |
|
| 239 | - */ |
|
| 240 | - $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 241 | - /** |
|
| 242 | - * Filter the sub menu a class. |
|
| 243 | - * |
|
| 244 | - * @since 1.0.0 |
|
| 245 | - */ |
|
| 246 | - $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
|
| 247 | - $items .= '<li class="' . $li_class . '"> |
|
| 200 | + } |
|
| 201 | + } |
|
| 202 | + } |
|
| 203 | + } |
|
| 204 | + } |
|
| 205 | + } |
|
| 206 | + } |
|
| 207 | + //END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION |
|
| 208 | + } |
|
| 209 | + |
|
| 210 | + $view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');
|
|
| 211 | + $is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false; |
|
| 212 | + if ($is_add_listing_sub_meny_exists) {
|
|
| 213 | + |
|
| 214 | + if (get_option('geodir_show_addlisting_nav')) {
|
|
| 215 | + /** |
|
| 216 | + * Filter the menu li class. |
|
| 217 | + * |
|
| 218 | + * @since 1.0.0 |
|
| 219 | + * @param string $menu_class The menu HTML class. |
|
| 220 | + */ |
|
| 221 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);
|
|
| 222 | + /** |
|
| 223 | + * Filter the sub menu li class. |
|
| 224 | + * |
|
| 225 | + * @since 1.0.0 |
|
| 226 | + * @param string $menu_class The menu HTML class. |
|
| 227 | + */ |
|
| 228 | + $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 229 | + /** |
|
| 230 | + * Filter the sub menu ul class. |
|
| 231 | + * |
|
| 232 | + * @since 1.0.0 |
|
| 233 | + */ |
|
| 234 | + $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
|
|
| 235 | + /** |
|
| 236 | + * Filter the menu a class. |
|
| 237 | + * |
|
| 238 | + * @since 1.0.0 |
|
| 239 | + */ |
|
| 240 | + $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 241 | + /** |
|
| 242 | + * Filter the sub menu a class. |
|
| 243 | + * |
|
| 244 | + * @since 1.0.0 |
|
| 245 | + */ |
|
| 246 | + $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
|
| 247 | + $items .= '<li class="' . $li_class . '"> |
|
| 248 | 248 | <a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>
|
| 249 | 249 | <ul class="' . $sub_ul_class . '">'; |
| 250 | 250 | |
| 251 | - $post_types = geodir_get_posttypes('object');
|
|
| 252 | - |
|
| 253 | - $show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');
|
|
| 254 | - |
|
| 255 | - if (!empty($post_types)) {
|
|
| 256 | - foreach ($post_types as $post_type => $args) {
|
|
| 257 | - if (!empty($geodir_allow_posttype_frontend)) {
|
|
| 258 | - if (in_array($post_type, $geodir_allow_posttype_frontend)) {
|
|
| 259 | - if (!empty($show_add_listing_post_types)) {
|
|
| 260 | - if (in_array($post_type, $show_add_listing_post_types)) {
|
|
| 261 | - if (geodir_get_addlisting_link($post_type)) {
|
|
| 262 | - |
|
| 263 | - $menu_class = ''; |
|
| 264 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 265 | - $menu_class = 'current-menu-item'; |
|
| 266 | - /** |
|
| 267 | - * Filter the menu li class. |
|
| 268 | - * |
|
| 269 | - * @since 1.0.0 |
|
| 270 | - * @param string $menu_class The menu HTML class. |
|
| 271 | - */ |
|
| 272 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 273 | - $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
|
| 274 | - $items .= '<li class="' . $li_class . '"> |
|
| 251 | + $post_types = geodir_get_posttypes('object');
|
|
| 252 | + |
|
| 253 | + $show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');
|
|
| 254 | + |
|
| 255 | + if (!empty($post_types)) {
|
|
| 256 | + foreach ($post_types as $post_type => $args) {
|
|
| 257 | + if (!empty($geodir_allow_posttype_frontend)) {
|
|
| 258 | + if (in_array($post_type, $geodir_allow_posttype_frontend)) {
|
|
| 259 | + if (!empty($show_add_listing_post_types)) {
|
|
| 260 | + if (in_array($post_type, $show_add_listing_post_types)) {
|
|
| 261 | + if (geodir_get_addlisting_link($post_type)) {
|
|
| 262 | + |
|
| 263 | + $menu_class = ''; |
|
| 264 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 265 | + $menu_class = 'current-menu-item'; |
|
| 266 | + /** |
|
| 267 | + * Filter the menu li class. |
|
| 268 | + * |
|
| 269 | + * @since 1.0.0 |
|
| 270 | + * @param string $menu_class The menu HTML class. |
|
| 271 | + */ |
|
| 272 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 273 | + $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
|
| 274 | + $items .= '<li class="' . $li_class . '"> |
|
| 275 | 275 | <a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $sub_a_class . '"> |
| 276 | 276 | ' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '
|
| 277 | 277 | </a> |
| 278 | 278 | </li>'; |
| 279 | - } |
|
| 280 | - } |
|
| 281 | - } |
|
| 282 | - } |
|
| 283 | - } |
|
| 284 | - } |
|
| 285 | - } |
|
| 279 | + } |
|
| 280 | + } |
|
| 281 | + } |
|
| 282 | + } |
|
| 283 | + } |
|
| 284 | + } |
|
| 285 | + } |
|
| 286 | 286 | |
| 287 | - $items .= ' </ul> '; |
|
| 288 | - $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 289 | - $items .= '</li>'; |
|
| 287 | + $items .= ' </ul> '; |
|
| 288 | + $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 289 | + $items .= '</li>'; |
|
| 290 | 290 | |
| 291 | - } |
|
| 292 | - } |
|
| 293 | - // apply filter to add more navigations // -Filter-Location-Manager |
|
| 294 | - return $items; |
|
| 291 | + } |
|
| 292 | + } |
|
| 293 | + // apply filter to add more navigations // -Filter-Location-Manager |
|
| 294 | + return $items; |
|
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | |
@@ -309,20 +309,20 @@ discard block |
||
| 309 | 309 | */ |
| 310 | 310 | function geodir_pagemenu_items($menu, $args) |
| 311 | 311 | {
|
| 312 | - $locations = get_nav_menu_locations(); |
|
| 313 | - $geodir_theme_location = get_option('geodir_theme_location_nav');
|
|
| 314 | - $geodir_theme_location_nav = array(); |
|
| 315 | - if (empty($locations) && empty($geodir_theme_location)) {
|
|
| 316 | - $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 317 | - $geodir_theme_location_nav[] = $args['theme_location']; |
|
| 318 | - update_option('geodir_theme_location_nav', $geodir_theme_location_nav);
|
|
| 319 | - } |
|
| 320 | - //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet. |
|
| 312 | + $locations = get_nav_menu_locations(); |
|
| 313 | + $geodir_theme_location = get_option('geodir_theme_location_nav');
|
|
| 314 | + $geodir_theme_location_nav = array(); |
|
| 315 | + if (empty($locations) && empty($geodir_theme_location)) {
|
|
| 316 | + $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 317 | + $geodir_theme_location_nav[] = $args['theme_location']; |
|
| 318 | + update_option('geodir_theme_location_nav', $geodir_theme_location_nav);
|
|
| 319 | + } |
|
| 320 | + //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet. |
|
| 321 | 321 | // $menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);
|
| 322 | - else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) |
|
| 323 | - $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 322 | + else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) |
|
| 323 | + $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 324 | 324 | |
| 325 | - return $menu; |
|
| 325 | + return $menu; |
|
| 326 | 326 | |
| 327 | 327 | } |
| 328 | 328 | |
@@ -342,18 +342,18 @@ discard block |
||
| 342 | 342 | function geodir_menu_items($items, $args) |
| 343 | 343 | {
|
| 344 | 344 | |
| 345 | - $location = $args->theme_location; |
|
| 345 | + $location = $args->theme_location; |
|
| 346 | 346 | |
| 347 | - $geodir_theme_location = get_option('geodir_theme_location_nav');
|
|
| 347 | + $geodir_theme_location = get_option('geodir_theme_location_nav');
|
|
| 348 | 348 | |
| 349 | - if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {
|
|
| 349 | + if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {
|
|
| 350 | 350 | |
| 351 | - $items = $items . geodir_add_nav_menu_items(); |
|
| 352 | - return $items; |
|
| 351 | + $items = $items . geodir_add_nav_menu_items(); |
|
| 352 | + return $items; |
|
| 353 | 353 | |
| 354 | - } else {
|
|
| 355 | - return $items; |
|
| 356 | - } |
|
| 354 | + } else {
|
|
| 355 | + return $items; |
|
| 356 | + } |
|
| 357 | 357 | } |
| 358 | 358 | |
| 359 | 359 | /** |
@@ -368,25 +368,25 @@ discard block |
||
| 368 | 368 | */ |
| 369 | 369 | function geodir_get_category_all_array() |
| 370 | 370 | {
|
| 371 | - global $wpdb; |
|
| 372 | - $return_array = array(); |
|
| 373 | - |
|
| 374 | - $taxonomies = geodir_get_taxonomies(); |
|
| 375 | - $taxonomies = implode("','", $taxonomies);
|
|
| 376 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 377 | - |
|
| 378 | - $pn_categories = $wpdb->get_results( |
|
| 379 | - $wpdb->prepare( |
|
| 380 | - "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy, $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name", |
|
| 381 | - array($wpdb->terms . term_id) |
|
| 382 | - ) |
|
| 383 | - ); |
|
| 384 | - |
|
| 385 | - foreach ($pn_categories as $pn_categories_obj) {
|
|
| 386 | - $return_array[] = array("id" => $pn_categories_obj->cat_ID,
|
|
| 387 | - "title" => $pn_categories_obj->name,); |
|
| 388 | - } |
|
| 389 | - return $return_array; |
|
| 371 | + global $wpdb; |
|
| 372 | + $return_array = array(); |
|
| 373 | + |
|
| 374 | + $taxonomies = geodir_get_taxonomies(); |
|
| 375 | + $taxonomies = implode("','", $taxonomies);
|
|
| 376 | + $taxonomies = "'" . $taxonomies . "'"; |
|
| 377 | + |
|
| 378 | + $pn_categories = $wpdb->get_results( |
|
| 379 | + $wpdb->prepare( |
|
| 380 | + "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy, $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name", |
|
| 381 | + array($wpdb->terms . term_id) |
|
| 382 | + ) |
|
| 383 | + ); |
|
| 384 | + |
|
| 385 | + foreach ($pn_categories as $pn_categories_obj) {
|
|
| 386 | + $return_array[] = array("id" => $pn_categories_obj->cat_ID,
|
|
| 387 | + "title" => $pn_categories_obj->name,); |
|
| 388 | + } |
|
| 389 | + return $return_array; |
|
| 390 | 390 | } |
| 391 | 391 | |
| 392 | 392 | |
@@ -401,41 +401,41 @@ discard block |
||
| 401 | 401 | */ |
| 402 | 402 | function geodir_get_current_posttype() |
| 403 | 403 | {
|
| 404 | - global $wp_query, $geodir_post_type; |
|
| 404 | + global $wp_query, $geodir_post_type; |
|
| 405 | 405 | |
| 406 | - $geodir_post_type = get_query_var('post_type');
|
|
| 406 | + $geodir_post_type = get_query_var('post_type');
|
|
| 407 | 407 | |
| 408 | - if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
|
|
| 409 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 410 | - $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 411 | - elseif (isset($_REQUEST['listing_type'])) |
|
| 412 | - $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 413 | - } |
|
| 408 | + if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
|
|
| 409 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 410 | + $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 411 | + elseif (isset($_REQUEST['listing_type'])) |
|
| 412 | + $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 413 | + } |
|
| 414 | 414 | |
| 415 | - if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
|
|
| 416 | - $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 415 | + if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
|
|
| 416 | + $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 417 | 417 | |
| 418 | - if (is_tax()) |
|
| 419 | - $geodir_post_type = geodir_get_taxonomy_posttype(); |
|
| 418 | + if (is_tax()) |
|
| 419 | + $geodir_post_type = geodir_get_taxonomy_posttype(); |
|
| 420 | 420 | |
| 421 | 421 | |
| 422 | - $all_postypes = geodir_get_posttypes(); |
|
| 423 | - $all_postypes = stripslashes_deep($all_postypes); |
|
| 422 | + $all_postypes = geodir_get_posttypes(); |
|
| 423 | + $all_postypes = stripslashes_deep($all_postypes); |
|
| 424 | 424 | |
| 425 | - if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) |
|
| 426 | - $geodir_post_type = ''; |
|
| 425 | + if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) |
|
| 426 | + $geodir_post_type = ''; |
|
| 427 | 427 | |
| 428 | - if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){
|
|
| 429 | - $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 430 | - } |
|
| 428 | + if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){
|
|
| 429 | + $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 430 | + } |
|
| 431 | 431 | |
| 432 | 432 | |
| 433 | - /** |
|
| 434 | - * Filter the default CPT return. |
|
| 435 | - * |
|
| 436 | - * @since 1.6.9 |
|
| 437 | - */ |
|
| 438 | - return apply_filters('geodir_get_current_posttype',$geodir_post_type);
|
|
| 433 | + /** |
|
| 434 | + * Filter the default CPT return. |
|
| 435 | + * |
|
| 436 | + * @since 1.6.9 |
|
| 437 | + */ |
|
| 438 | + return apply_filters('geodir_get_current_posttype',$geodir_post_type);
|
|
| 439 | 439 | } |
| 440 | 440 | |
| 441 | 441 | /** |
@@ -449,22 +449,22 @@ discard block |
||
| 449 | 449 | */ |
| 450 | 450 | function geodir_get_default_posttype() |
| 451 | 451 | {
|
| 452 | - $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) ); |
|
| 453 | - |
|
| 454 | - $stype = false; |
|
| 455 | - foreach ( $post_types as $post_type => $info ) {
|
|
| 456 | - global $wpdb; |
|
| 457 | - $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) ); |
|
| 458 | - if ( $has_posts ) {
|
|
| 459 | - $stype = $post_type; break; |
|
| 460 | - } |
|
| 461 | - } |
|
| 462 | - |
|
| 463 | - if(!$stype){
|
|
| 464 | - $stype = 'gd_place'; |
|
| 465 | - } |
|
| 466 | - |
|
| 467 | - return $stype; |
|
| 452 | + $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) ); |
|
| 453 | + |
|
| 454 | + $stype = false; |
|
| 455 | + foreach ( $post_types as $post_type => $info ) {
|
|
| 456 | + global $wpdb; |
|
| 457 | + $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) ); |
|
| 458 | + if ( $has_posts ) {
|
|
| 459 | + $stype = $post_type; break; |
|
| 460 | + } |
|
| 461 | + } |
|
| 462 | + |
|
| 463 | + if(!$stype){
|
|
| 464 | + $stype = 'gd_place'; |
|
| 465 | + } |
|
| 466 | + |
|
| 467 | + return $stype; |
|
| 468 | 468 | } |
| 469 | 469 | |
| 470 | 470 | /** |
@@ -478,21 +478,21 @@ discard block |
||
| 478 | 478 | */ |
| 479 | 479 | function geodir_get_posttypes($output = 'names') |
| 480 | 480 | {
|
| 481 | - $post_types = array(); |
|
| 482 | - $post_types = get_option('geodir_post_types');
|
|
| 483 | - $post_types = stripslashes_deep($post_types); |
|
| 484 | - if (!empty($post_types)) {
|
|
| 485 | - switch ($output): |
|
| 486 | - case 'object': |
|
| 487 | - case 'Object': |
|
| 488 | - $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types; |
|
| 489 | - break; |
|
| 490 | - case 'array': |
|
| 491 | - case 'Array': |
|
| 492 | - $post_types = (array)$post_types; |
|
| 493 | - break; |
|
| 481 | + $post_types = array(); |
|
| 482 | + $post_types = get_option('geodir_post_types');
|
|
| 483 | + $post_types = stripslashes_deep($post_types); |
|
| 484 | + if (!empty($post_types)) {
|
|
| 485 | + switch ($output): |
|
| 486 | + case 'object': |
|
| 487 | + case 'Object': |
|
| 488 | + $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types; |
|
| 489 | + break; |
|
| 490 | + case 'array': |
|
| 491 | + case 'Array': |
|
| 492 | + $post_types = (array)$post_types; |
|
| 493 | + break; |
|
| 494 | 494 | case 'options': |
| 495 | - $post_types = (array)$post_types; |
|
| 495 | + $post_types = (array)$post_types; |
|
| 496 | 496 | |
| 497 | 497 | $options = array(); |
| 498 | 498 | if (!empty($post_types)) {
|
@@ -501,17 +501,17 @@ discard block |
||
| 501 | 501 | } |
| 502 | 502 | } |
| 503 | 503 | $post_types = $options; |
| 504 | - break; |
|
| 505 | - default: |
|
| 506 | - $post_types = array_keys($post_types); |
|
| 507 | - break; |
|
| 508 | - endswitch; |
|
| 509 | - } |
|
| 510 | - |
|
| 511 | - if (!empty($post_types)) |
|
| 512 | - return $post_types; |
|
| 513 | - else |
|
| 514 | - return array(); |
|
| 504 | + break; |
|
| 505 | + default: |
|
| 506 | + $post_types = array_keys($post_types); |
|
| 507 | + break; |
|
| 508 | + endswitch; |
|
| 509 | + } |
|
| 510 | + |
|
| 511 | + if (!empty($post_types)) |
|
| 512 | + return $post_types; |
|
| 513 | + else |
|
| 514 | + return array(); |
|
| 515 | 515 | } |
| 516 | 516 | |
| 517 | 517 | /** |
@@ -524,108 +524,108 @@ discard block |
||
| 524 | 524 | */ |
| 525 | 525 | function geodir_get_posttype_info($post_type = '') |
| 526 | 526 | {
|
| 527 | - $post_types = array(); |
|
| 528 | - $post_types = get_option('geodir_post_types');
|
|
| 529 | - $post_types = stripslashes_deep($post_types); |
|
| 530 | - if (!empty($post_types) && $post_type != '') {
|
|
| 531 | - return $post_types[$post_type]; |
|
| 532 | - } else |
|
| 533 | - return false; |
|
| 527 | + $post_types = array(); |
|
| 528 | + $post_types = get_option('geodir_post_types');
|
|
| 529 | + $post_types = stripslashes_deep($post_types); |
|
| 530 | + if (!empty($post_types) && $post_type != '') {
|
|
| 531 | + return $post_types[$post_type]; |
|
| 532 | + } else |
|
| 533 | + return false; |
|
| 534 | 534 | } |
| 535 | 535 | |
| 536 | 536 | if (!function_exists('geodir_get_taxonomies')) {
|
| 537 | - /** |
|
| 538 | - * Get all custom taxonomies. |
|
| 539 | - * |
|
| 540 | - * @since 1.0.0 |
|
| 541 | - * @package GeoDirectory |
|
| 542 | - * @param string $post_type The post type. |
|
| 543 | - * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 544 | - * @return array|bool Taxonomies on success. false on failure. |
|
| 545 | - */ |
|
| 546 | - function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false) |
|
| 547 | - {
|
|
| 537 | + /** |
|
| 538 | + * Get all custom taxonomies. |
|
| 539 | + * |
|
| 540 | + * @since 1.0.0 |
|
| 541 | + * @package GeoDirectory |
|
| 542 | + * @param string $post_type The post type. |
|
| 543 | + * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 544 | + * @return array|bool Taxonomies on success. false on failure. |
|
| 545 | + */ |
|
| 546 | + function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false) |
|
| 547 | + {
|
|
| 548 | 548 | |
| 549 | - $taxonomies = array(); |
|
| 550 | - $gd_taxonomies = array(); |
|
| 549 | + $taxonomies = array(); |
|
| 550 | + $gd_taxonomies = array(); |
|
| 551 | 551 | |
| 552 | - if ($taxonomies = get_option('geodir_taxonomies')) {
|
|
| 552 | + if ($taxonomies = get_option('geodir_taxonomies')) {
|
|
| 553 | 553 | |
| 554 | 554 | |
| 555 | - $gd_taxonomies = array_keys($taxonomies); |
|
| 555 | + $gd_taxonomies = array_keys($taxonomies); |
|
| 556 | 556 | |
| 557 | 557 | |
| 558 | - if ($post_type != '') |
|
| 559 | - $gd_taxonomies = array(); |
|
| 558 | + if ($post_type != '') |
|
| 559 | + $gd_taxonomies = array(); |
|
| 560 | 560 | |
| 561 | - $i = 0; |
|
| 562 | - foreach ($taxonomies as $taxonomy => $args) {
|
|
| 561 | + $i = 0; |
|
| 562 | + foreach ($taxonomies as $taxonomy => $args) {
|
|
| 563 | 563 | |
| 564 | - if ($post_type != '' && $args['object_type'] == $post_type) |
|
| 565 | - $gd_taxonomies[] = $taxonomy; |
|
| 564 | + if ($post_type != '' && $args['object_type'] == $post_type) |
|
| 565 | + $gd_taxonomies[] = $taxonomy; |
|
| 566 | 566 | |
| 567 | - if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {
|
|
| 568 | - if (array_search($taxonomy, $gd_taxonomies) !== false) |
|
| 569 | - unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]); |
|
| 570 | - } |
|
| 567 | + if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {
|
|
| 568 | + if (array_search($taxonomy, $gd_taxonomies) !== false) |
|
| 569 | + unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]); |
|
| 570 | + } |
|
| 571 | 571 | |
| 572 | - } |
|
| 572 | + } |
|
| 573 | 573 | |
| 574 | - $gd_taxonomies = array_values($gd_taxonomies); |
|
| 575 | - } |
|
| 576 | - |
|
| 577 | - /** |
|
| 578 | - * Filter the taxonomies. |
|
| 579 | - * |
|
| 580 | - * @since 1.0.0 |
|
| 581 | - * @param array $gd_taxonomies The taxonomy array. |
|
| 582 | - */ |
|
| 583 | - $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);
|
|
| 584 | - |
|
| 585 | - if (!empty($taxonomies)) {
|
|
| 586 | - return $taxonomies; |
|
| 587 | - } else {
|
|
| 588 | - return false; |
|
| 589 | - } |
|
| 590 | - } |
|
| 574 | + $gd_taxonomies = array_values($gd_taxonomies); |
|
| 575 | + } |
|
| 576 | + |
|
| 577 | + /** |
|
| 578 | + * Filter the taxonomies. |
|
| 579 | + * |
|
| 580 | + * @since 1.0.0 |
|
| 581 | + * @param array $gd_taxonomies The taxonomy array. |
|
| 582 | + */ |
|
| 583 | + $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);
|
|
| 584 | + |
|
| 585 | + if (!empty($taxonomies)) {
|
|
| 586 | + return $taxonomies; |
|
| 587 | + } else {
|
|
| 588 | + return false; |
|
| 589 | + } |
|
| 590 | + } |
|
| 591 | 591 | } |
| 592 | 592 | |
| 593 | 593 | if (!function_exists(' geodir_get_categories_dl')) {
|
| 594 | - /** |
|
| 595 | - * Get categories dropdown HTML. |
|
| 596 | - * |
|
| 597 | - * @since 1.0.0 |
|
| 598 | - * @package GeoDirectory |
|
| 599 | - * @param string $post_type The post type. |
|
| 600 | - * @param string $selected The selected value. |
|
| 601 | - * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 602 | - * @param bool $echo Prints the HTML when set to true. Default: true. |
|
| 603 | - * @return void|string Dropdown HTML. |
|
| 604 | - */ |
|
| 605 | - function geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true) |
|
| 606 | - {
|
|
| 607 | - |
|
| 608 | - $html = ''; |
|
| 609 | - $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies); |
|
| 610 | - |
|
| 611 | - $categories = get_terms($taxonomies); |
|
| 612 | - |
|
| 613 | - $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
|
|
| 614 | - |
|
| 615 | - foreach ($categories as $category_obj) {
|
|
| 616 | - $select_opt = ''; |
|
| 617 | - if ($selected == $category_obj->term_id) {
|
|
| 618 | - $select_opt = 'selected="selected"'; |
|
| 619 | - } |
|
| 620 | - $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">' |
|
| 621 | - . ucfirst($category_obj->name) . '</option>'; |
|
| 622 | - } |
|
| 623 | - |
|
| 624 | - if ($echo) |
|
| 625 | - echo $html; |
|
| 626 | - else |
|
| 627 | - return $html; |
|
| 628 | - } |
|
| 594 | + /** |
|
| 595 | + * Get categories dropdown HTML. |
|
| 596 | + * |
|
| 597 | + * @since 1.0.0 |
|
| 598 | + * @package GeoDirectory |
|
| 599 | + * @param string $post_type The post type. |
|
| 600 | + * @param string $selected The selected value. |
|
| 601 | + * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 602 | + * @param bool $echo Prints the HTML when set to true. Default: true. |
|
| 603 | + * @return void|string Dropdown HTML. |
|
| 604 | + */ |
|
| 605 | + function geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true) |
|
| 606 | + {
|
|
| 607 | + |
|
| 608 | + $html = ''; |
|
| 609 | + $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies); |
|
| 610 | + |
|
| 611 | + $categories = get_terms($taxonomies); |
|
| 612 | + |
|
| 613 | + $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
|
|
| 614 | + |
|
| 615 | + foreach ($categories as $category_obj) {
|
|
| 616 | + $select_opt = ''; |
|
| 617 | + if ($selected == $category_obj->term_id) {
|
|
| 618 | + $select_opt = 'selected="selected"'; |
|
| 619 | + } |
|
| 620 | + $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">' |
|
| 621 | + . ucfirst($category_obj->name) . '</option>'; |
|
| 622 | + } |
|
| 623 | + |
|
| 624 | + if ($echo) |
|
| 625 | + echo $html; |
|
| 626 | + else |
|
| 627 | + return $html; |
|
| 628 | + } |
|
| 629 | 629 | } |
| 630 | 630 | |
| 631 | 631 | |
@@ -640,28 +640,28 @@ discard block |
||
| 640 | 640 | function geodir_get_listing_slug($object_type = '') |
| 641 | 641 | {
|
| 642 | 642 | |
| 643 | - $listing_slug = ''; |
|
| 643 | + $listing_slug = ''; |
|
| 644 | 644 | |
| 645 | - $post_types = get_option('geodir_post_types');
|
|
| 646 | - $taxonomies = get_option('geodir_taxonomies');
|
|
| 645 | + $post_types = get_option('geodir_post_types');
|
|
| 646 | + $taxonomies = get_option('geodir_taxonomies');
|
|
| 647 | 647 | |
| 648 | 648 | |
| 649 | - if ($object_type != '') {
|
|
| 650 | - if (!empty($post_types) && array_key_exists($object_type, $post_types)) {
|
|
| 649 | + if ($object_type != '') {
|
|
| 650 | + if (!empty($post_types) && array_key_exists($object_type, $post_types)) {
|
|
| 651 | 651 | |
| 652 | - $object_info = $post_types[$object_type]; |
|
| 653 | - $listing_slug = $object_info['listing_slug']; |
|
| 654 | - } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {
|
|
| 655 | - $object_info = $taxonomies[$object_type]; |
|
| 656 | - $listing_slug = $object_info['listing_slug']; |
|
| 657 | - } |
|
| 652 | + $object_info = $post_types[$object_type]; |
|
| 653 | + $listing_slug = $object_info['listing_slug']; |
|
| 654 | + } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {
|
|
| 655 | + $object_info = $taxonomies[$object_type]; |
|
| 656 | + $listing_slug = $object_info['listing_slug']; |
|
| 657 | + } |
|
| 658 | 658 | |
| 659 | - } |
|
| 659 | + } |
|
| 660 | 660 | |
| 661 | - if (!empty($listing_slug)) |
|
| 662 | - return $listing_slug; |
|
| 663 | - else |
|
| 664 | - return false; |
|
| 661 | + if (!empty($listing_slug)) |
|
| 662 | + return $listing_slug; |
|
| 663 | + else |
|
| 664 | + return false; |
|
| 665 | 665 | } |
| 666 | 666 | |
| 667 | 667 | |
@@ -676,212 +676,212 @@ discard block |
||
| 676 | 676 | */ |
| 677 | 677 | function geodir_get_taxonomy_posttype($taxonomy = '') |
| 678 | 678 | {
|
| 679 | - global $wp_query; |
|
| 680 | - |
|
| 681 | - $post_type = array(); |
|
| 682 | - $taxonomies = array(); |
|
| 683 | - |
|
| 684 | - if (!empty($taxonomy)) {
|
|
| 685 | - $taxonomies[] = $taxonomy; |
|
| 686 | - } elseif (isset($wp_query->tax_query->queries)) {
|
|
| 687 | - $tax_arr = $wp_query->tax_query->queries; |
|
| 688 | - //if tax query has 'relation' set then it will break wp_list_pluck so we remove it |
|
| 689 | - if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
|
|
| 690 | - $taxonomies = wp_list_pluck($tax_arr, 'taxonomy'); |
|
| 691 | - } |
|
| 692 | - |
|
| 693 | - if (!empty($taxonomies)) {
|
|
| 694 | - foreach (geodir_get_posttypes() as $pt) {
|
|
| 695 | - $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt); |
|
| 696 | - if (array_intersect($taxonomies, $object_taxonomies)) |
|
| 697 | - $post_type[] = $pt; |
|
| 698 | - } |
|
| 699 | - } |
|
| 700 | - |
|
| 701 | - if (!empty($post_type)) |
|
| 702 | - return $post_type[0]; |
|
| 703 | - else |
|
| 704 | - return false; |
|
| 679 | + global $wp_query; |
|
| 680 | + |
|
| 681 | + $post_type = array(); |
|
| 682 | + $taxonomies = array(); |
|
| 683 | + |
|
| 684 | + if (!empty($taxonomy)) {
|
|
| 685 | + $taxonomies[] = $taxonomy; |
|
| 686 | + } elseif (isset($wp_query->tax_query->queries)) {
|
|
| 687 | + $tax_arr = $wp_query->tax_query->queries; |
|
| 688 | + //if tax query has 'relation' set then it will break wp_list_pluck so we remove it |
|
| 689 | + if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
|
|
| 690 | + $taxonomies = wp_list_pluck($tax_arr, 'taxonomy'); |
|
| 691 | + } |
|
| 692 | + |
|
| 693 | + if (!empty($taxonomies)) {
|
|
| 694 | + foreach (geodir_get_posttypes() as $pt) {
|
|
| 695 | + $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt); |
|
| 696 | + if (array_intersect($taxonomies, $object_taxonomies)) |
|
| 697 | + $post_type[] = $pt; |
|
| 698 | + } |
|
| 699 | + } |
|
| 700 | + |
|
| 701 | + if (!empty($post_type)) |
|
| 702 | + return $post_type[0]; |
|
| 703 | + else |
|
| 704 | + return false; |
|
| 705 | 705 | } |
| 706 | 706 | |
| 707 | 707 | if (!function_exists('geodir_custom_taxonomy_walker')) {
|
| 708 | - /** |
|
| 709 | - * Custom taxonomy walker function. |
|
| 710 | - * |
|
| 711 | - * @since 1.0.0 |
|
| 712 | - * @package GeoDirectory |
|
| 713 | - * @param string $cat_taxonomy The taxonomy name. |
|
| 714 | - * @param int $cat_parent The parent term ID. |
|
| 715 | - * @param bool $hide_empty Hide empty taxonomies? Default: false. |
|
| 716 | - * @param int $pading CSS padding in pixels. |
|
| 717 | - * @return string|void taxonomy HTML. |
|
| 718 | - */ |
|
| 719 | - function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0) |
|
| 720 | - {
|
|
| 721 | - global $cat_display, $post_cat, $exclude_cats; |
|
| 722 | - |
|
| 723 | - $search_terms = trim($post_cat, ","); |
|
| 724 | - |
|
| 725 | - $search_terms = explode(",", $search_terms);
|
|
| 726 | - |
|
| 727 | - $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));
|
|
| 728 | - |
|
| 729 | - $display = ''; |
|
| 730 | - $onchange = ''; |
|
| 731 | - $term_check = ''; |
|
| 732 | - $main_list_class = ''; |
|
| 733 | - $out = ''; |
|
| 734 | - //If there are terms, start displaying |
|
| 735 | - if (count($cat_terms) > 0) {
|
|
| 736 | - //Displaying as a list |
|
| 737 | - $p = $pading * 20; |
|
| 738 | - $pading++; |
|
| 739 | - |
|
| 740 | - |
|
| 741 | - if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
|
|
| 742 | - if ($cat_parent == 0) {
|
|
| 743 | - $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display; |
|
| 744 | - $main_list_class = 'class="main_list_selecter"'; |
|
| 745 | - } else {
|
|
| 746 | - //$display = 'display:none'; |
|
| 747 | - $list_class = 'sub_list gd-sub-cats-list'; |
|
| 748 | - } |
|
| 749 | - } |
|
| 708 | + /** |
|
| 709 | + * Custom taxonomy walker function. |
|
| 710 | + * |
|
| 711 | + * @since 1.0.0 |
|
| 712 | + * @package GeoDirectory |
|
| 713 | + * @param string $cat_taxonomy The taxonomy name. |
|
| 714 | + * @param int $cat_parent The parent term ID. |
|
| 715 | + * @param bool $hide_empty Hide empty taxonomies? Default: false. |
|
| 716 | + * @param int $pading CSS padding in pixels. |
|
| 717 | + * @return string|void taxonomy HTML. |
|
| 718 | + */ |
|
| 719 | + function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0) |
|
| 720 | + {
|
|
| 721 | + global $cat_display, $post_cat, $exclude_cats; |
|
| 722 | + |
|
| 723 | + $search_terms = trim($post_cat, ","); |
|
| 724 | + |
|
| 725 | + $search_terms = explode(",", $search_terms);
|
|
| 726 | + |
|
| 727 | + $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));
|
|
| 728 | + |
|
| 729 | + $display = ''; |
|
| 730 | + $onchange = ''; |
|
| 731 | + $term_check = ''; |
|
| 732 | + $main_list_class = ''; |
|
| 733 | + $out = ''; |
|
| 734 | + //If there are terms, start displaying |
|
| 735 | + if (count($cat_terms) > 0) {
|
|
| 736 | + //Displaying as a list |
|
| 737 | + $p = $pading * 20; |
|
| 738 | + $pading++; |
|
| 739 | + |
|
| 740 | + |
|
| 741 | + if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
|
|
| 742 | + if ($cat_parent == 0) {
|
|
| 743 | + $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display; |
|
| 744 | + $main_list_class = 'class="main_list_selecter"'; |
|
| 745 | + } else {
|
|
| 746 | + //$display = 'display:none'; |
|
| 747 | + $list_class = 'sub_list gd-sub-cats-list'; |
|
| 748 | + } |
|
| 749 | + } |
|
| 750 | 750 | |
| 751 | - if ($cat_display == 'checkbox' || $cat_display == 'radio') {
|
|
| 752 | - $p = 0; |
|
| 753 | - $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 754 | - } |
|
| 751 | + if ($cat_display == 'checkbox' || $cat_display == 'radio') {
|
|
| 752 | + $p = 0; |
|
| 753 | + $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 754 | + } |
|
| 755 | 755 | |
| 756 | - foreach ($cat_terms as $cat_term) {
|
|
| 756 | + foreach ($cat_terms as $cat_term) {
|
|
| 757 | 757 | |
| 758 | - $checked = ''; |
|
| 758 | + $checked = ''; |
|
| 759 | 759 | |
| 760 | - if (in_array($cat_term->term_id, $search_terms)) {
|
|
| 761 | - if ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 762 | - $checked = 'selected="selected"'; |
|
| 763 | - else |
|
| 764 | - $checked = 'checked="checked"'; |
|
| 765 | - } |
|
| 760 | + if (in_array($cat_term->term_id, $search_terms)) {
|
|
| 761 | + if ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 762 | + $checked = 'selected="selected"'; |
|
| 763 | + else |
|
| 764 | + $checked = 'checked="checked"'; |
|
| 765 | + } |
|
| 766 | 766 | |
| 767 | - if ($cat_display == 'radio') |
|
| 768 | - $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 769 | - elseif ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 770 | - $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>'; |
|
| 767 | + if ($cat_display == 'radio') |
|
| 768 | + $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 769 | + elseif ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 770 | + $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>'; |
|
| 771 | 771 | |
| 772 | - else {
|
|
| 773 | - $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 774 | - } |
|
| 772 | + else {
|
|
| 773 | + $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 774 | + } |
|
| 775 | 775 | |
| 776 | - // Call recurson to print sub cats |
|
| 777 | - $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading); |
|
| 776 | + // Call recurson to print sub cats |
|
| 777 | + $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading); |
|
| 778 | 778 | |
| 779 | - } |
|
| 779 | + } |
|
| 780 | 780 | |
| 781 | - if ($cat_display == 'checkbox' || $cat_display == 'radio') |
|
| 782 | - $out .= '</div>'; |
|
| 781 | + if ($cat_display == 'checkbox' || $cat_display == 'radio') |
|
| 782 | + $out .= '</div>'; |
|
| 783 | 783 | |
| 784 | - return $out; |
|
| 785 | - } |
|
| 786 | - return; |
|
| 787 | - } |
|
| 784 | + return $out; |
|
| 785 | + } |
|
| 786 | + return; |
|
| 787 | + } |
|
| 788 | 788 | } |
| 789 | 789 | |
| 790 | 790 | if (!function_exists('geodir_custom_taxonomy_walker2')) {
|
| 791 | - /** |
|
| 792 | - * Custom taxonomy walker function. |
|
| 793 | - * |
|
| 794 | - * @since 1.0.0 |
|
| 795 | - * @package GeoDirectory |
|
| 796 | - * @global object $post WordPress Post object. |
|
| 797 | - * @global object $gd_session GeoDirectory Session object. |
|
| 798 | - * @param string $cat_taxonomy The taxonomy name. |
|
| 799 | - * @param string $cat_limit Number of categories to display. |
|
| 800 | - */ |
|
| 801 | - function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '') |
|
| 802 | - {
|
|
| 803 | - $post_category = ''; |
|
| 804 | - $post_category_str = ''; |
|
| 805 | - global $exclude_cats, $gd_session; |
|
| 806 | - |
|
| 807 | - $cat_exclude = ''; |
|
| 808 | - if (is_array($exclude_cats) && !empty($exclude_cats)) |
|
| 809 | - $cat_exclude = serialize($exclude_cats); |
|
| 810 | - |
|
| 811 | - if (isset($_REQUEST['backandedit'])) {
|
|
| 812 | - $post = (object)$gd_session->get('listing');
|
|
| 813 | - |
|
| 814 | - if (!is_array($post->post_category[$cat_taxonomy])) |
|
| 815 | - $post_category = $post->post_category[$cat_taxonomy]; |
|
| 816 | - |
|
| 817 | - $post_categories = $post->post_category_str; |
|
| 818 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) |
|
| 819 | - $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 820 | - |
|
| 821 | - } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
|
|
| 822 | - global $post; |
|
| 823 | - |
|
| 824 | - $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true); |
|
| 825 | - if (empty($post_category) && isset($post->{$cat_taxonomy})) {
|
|
| 826 | - $post_category = $post->{$cat_taxonomy};
|
|
| 827 | - } |
|
| 791 | + /** |
|
| 792 | + * Custom taxonomy walker function. |
|
| 793 | + * |
|
| 794 | + * @since 1.0.0 |
|
| 795 | + * @package GeoDirectory |
|
| 796 | + * @global object $post WordPress Post object. |
|
| 797 | + * @global object $gd_session GeoDirectory Session object. |
|
| 798 | + * @param string $cat_taxonomy The taxonomy name. |
|
| 799 | + * @param string $cat_limit Number of categories to display. |
|
| 800 | + */ |
|
| 801 | + function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '') |
|
| 802 | + {
|
|
| 803 | + $post_category = ''; |
|
| 804 | + $post_category_str = ''; |
|
| 805 | + global $exclude_cats, $gd_session; |
|
| 806 | + |
|
| 807 | + $cat_exclude = ''; |
|
| 808 | + if (is_array($exclude_cats) && !empty($exclude_cats)) |
|
| 809 | + $cat_exclude = serialize($exclude_cats); |
|
| 810 | + |
|
| 811 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 812 | + $post = (object)$gd_session->get('listing');
|
|
| 813 | + |
|
| 814 | + if (!is_array($post->post_category[$cat_taxonomy])) |
|
| 815 | + $post_category = $post->post_category[$cat_taxonomy]; |
|
| 816 | + |
|
| 817 | + $post_categories = $post->post_category_str; |
|
| 818 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) |
|
| 819 | + $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 820 | + |
|
| 821 | + } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
|
|
| 822 | + global $post; |
|
| 823 | + |
|
| 824 | + $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true); |
|
| 825 | + if (empty($post_category) && isset($post->{$cat_taxonomy})) {
|
|
| 826 | + $post_category = $post->{$cat_taxonomy};
|
|
| 827 | + } |
|
| 828 | 828 | |
| 829 | - $post_categories = get_post_meta($post->ID, 'post_categories', true); |
|
| 829 | + $post_categories = get_post_meta($post->ID, 'post_categories', true); |
|
| 830 | 830 | |
| 831 | - if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 832 | - foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {
|
|
| 833 | - if (is_numeric($cat_part)) {
|
|
| 834 | - $cat_part_arr[] = $cat_part; |
|
| 835 | - } |
|
| 836 | - } |
|
| 837 | - if (is_array($cat_part_arr)) {
|
|
| 838 | - $post_category = implode(',', $cat_part_arr);
|
|
| 839 | - } |
|
| 840 | - } |
|
| 831 | + if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 832 | + foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {
|
|
| 833 | + if (is_numeric($cat_part)) {
|
|
| 834 | + $cat_part_arr[] = $cat_part; |
|
| 835 | + } |
|
| 836 | + } |
|
| 837 | + if (is_array($cat_part_arr)) {
|
|
| 838 | + $post_category = implode(',', $cat_part_arr);
|
|
| 839 | + } |
|
| 840 | + } |
|
| 841 | 841 | |
| 842 | - if (!empty($post_category)) {
|
|
| 843 | - $cat1 = array_filter(explode(',', $post_category));
|
|
| 844 | - $post_category = ',' . implode(',', $cat1) . ',';
|
|
| 842 | + if (!empty($post_category)) {
|
|
| 843 | + $cat1 = array_filter(explode(',', $post_category));
|
|
| 844 | + $post_category = ',' . implode(',', $cat1) . ',';
|
|
| 845 | 845 | |
| 846 | - } |
|
| 846 | + } |
|
| 847 | 847 | |
| 848 | - if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {
|
|
| 848 | + if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {
|
|
| 849 | 849 | |
| 850 | - $post_category_upd = explode(',', $post_category);
|
|
| 851 | - $post_category_change = ''; |
|
| 852 | - foreach ($post_category_upd as $cat) {
|
|
| 850 | + $post_category_upd = explode(',', $post_category);
|
|
| 851 | + $post_category_change = ''; |
|
| 852 | + foreach ($post_category_upd as $cat) {
|
|
| 853 | 853 | |
| 854 | - if (!in_array($cat, $exclude_cats) && $cat != '') {
|
|
| 855 | - $post_category_change .= ',' . $cat; |
|
| 856 | - } |
|
| 857 | - } |
|
| 858 | - $post_category = $post_category_change; |
|
| 859 | - } |
|
| 854 | + if (!in_array($cat, $exclude_cats) && $cat != '') {
|
|
| 855 | + $post_category_change .= ',' . $cat; |
|
| 856 | + } |
|
| 857 | + } |
|
| 858 | + $post_category = $post_category_change; |
|
| 859 | + } |
|
| 860 | 860 | |
| 861 | 861 | |
| 862 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 863 | - $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 864 | - } |
|
| 865 | - } |
|
| 862 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 863 | + $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 864 | + } |
|
| 865 | + } |
|
| 866 | 866 | |
| 867 | - echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']" />'; |
|
| 867 | + echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']" />'; |
|
| 868 | 868 | |
| 869 | - echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']" />'; |
|
| 869 | + echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']" />'; |
|
| 870 | 870 | |
| 871 | - echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']" />'; |
|
| 871 | + echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']" />'; |
|
| 872 | 872 | |
| 873 | 873 | |
| 874 | - ?> |
|
| 874 | + ?> |
|
| 875 | 875 | <div class="cat_sublist"> |
| 876 | 876 | <?php |
| 877 | 877 | |
| 878 | - $post_id = isset($post->ID) ? $post->ID : ''; |
|
| 878 | + $post_id = isset($post->ID) ? $post->ID : ''; |
|
| 879 | 879 | |
| 880 | - if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 880 | + if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 881 | 881 | |
| 882 | - geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories); |
|
| 883 | - } |
|
| 884 | - ?> |
|
| 882 | + geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories); |
|
| 883 | + } |
|
| 884 | + ?> |
|
| 885 | 885 | </div> |
| 886 | 886 | <script type="text/javascript"> |
| 887 | 887 | |
@@ -1004,22 +1004,22 @@ discard block |
||
| 1004 | 1004 | |
| 1005 | 1005 | </script> |
| 1006 | 1006 | <?php |
| 1007 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 1008 | - $post_cat_str = $post_categories[$cat_taxonomy]; |
|
| 1009 | - $post_cat_array = explode("#", $post_cat_str);
|
|
| 1010 | - if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) |
|
| 1011 | - $style = "display:none;"; |
|
| 1012 | - } |
|
| 1013 | - ?> |
|
| 1007 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 1008 | + $post_cat_str = $post_categories[$cat_taxonomy]; |
|
| 1009 | + $post_cat_array = explode("#", $post_cat_str);
|
|
| 1010 | + if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) |
|
| 1011 | + $style = "display:none;"; |
|
| 1012 | + } |
|
| 1013 | + ?> |
|
| 1014 | 1014 | <div class="main_cat_list" style=" <?php if (isset($style)) {
|
| 1015 | - echo $style; |
|
| 1016 | - }?> "> |
|
| 1015 | + echo $style; |
|
| 1016 | + }?> "> |
|
| 1017 | 1017 | <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list |
| 1018 | - ?> |
|
| 1018 | + ?> |
|
| 1019 | 1019 | </div> |
| 1020 | 1020 | <?php |
| 1021 | 1021 | |
| 1022 | - } |
|
| 1022 | + } |
|
| 1023 | 1023 | } |
| 1024 | 1024 | |
| 1025 | 1025 | /** |
@@ -1036,23 +1036,23 @@ discard block |
||
| 1036 | 1036 | */ |
| 1037 | 1037 | function geodir_addpost_categories_html($request_taxonomy, $parrent, $selected = false, $main_selected = true, $default = false, $exclude = '') |
| 1038 | 1038 | {
|
| 1039 | - global $exclude_cats; |
|
| 1039 | + global $exclude_cats; |
|
| 1040 | 1040 | |
| 1041 | - if ($exclude != '') {
|
|
| 1042 | - $exclude_cats = maybe_unserialize(base64_decode($exclude)); |
|
| 1041 | + if ($exclude != '') {
|
|
| 1042 | + $exclude_cats = maybe_unserialize(base64_decode($exclude)); |
|
| 1043 | 1043 | |
| 1044 | - if(is_array( $exclude_cats)){
|
|
| 1045 | - $exclude_cats = array_map( 'intval', $exclude_cats ); |
|
| 1046 | - }else{
|
|
| 1047 | - $exclude_cats = intval($exclude_cats); |
|
| 1048 | - } |
|
| 1044 | + if(is_array( $exclude_cats)){
|
|
| 1045 | + $exclude_cats = array_map( 'intval', $exclude_cats ); |
|
| 1046 | + }else{
|
|
| 1047 | + $exclude_cats = intval($exclude_cats); |
|
| 1048 | + } |
|
| 1049 | 1049 | |
| 1050 | - } |
|
| 1050 | + } |
|
| 1051 | 1051 | |
| 1052 | - if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) || |
|
| 1053 | - (!is_array($exclude_cats) || empty($exclude_cats)) |
|
| 1054 | - ) {
|
|
| 1055 | - ?> |
|
| 1052 | + if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) || |
|
| 1053 | + (!is_array($exclude_cats) || empty($exclude_cats)) |
|
| 1054 | + ) {
|
|
| 1055 | + ?> |
|
| 1056 | 1056 | |
| 1057 | 1057 | <?php $main_cat = get_term($parrent, $request_taxonomy); ?> |
| 1058 | 1058 | |
@@ -1081,8 +1081,8 @@ discard block |
||
| 1081 | 1081 | |
| 1082 | 1082 | <br/> |
| 1083 | 1083 | <?php |
| 1084 | - $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1085 | - if (!empty($cat_terms)) { ?>
|
|
| 1084 | + $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1085 | + if (!empty($cat_terms)) { ?>
|
|
| 1086 | 1086 | <span> <?php printf(__('Add listing in category', 'geodirectory')); ?></span>
|
| 1087 | 1087 | <?php geodir_get_catlist($request_taxonomy, $parrent, $selected) ?> |
| 1088 | 1088 | <?php } ?> |
@@ -1104,53 +1104,53 @@ discard block |
||
| 1104 | 1104 | function geodir_editpost_categories_html($request_taxonomy, $request_postid, $post_categories) |
| 1105 | 1105 | {
|
| 1106 | 1106 | |
| 1107 | - if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {
|
|
| 1108 | - $post_cat_str = $post_categories[$request_taxonomy]; |
|
| 1109 | - $post_cat_array = explode("#", $post_cat_str);
|
|
| 1110 | - if (is_array($post_cat_array)) {
|
|
| 1111 | - $post_cat_array = array_unique( $post_cat_array ); |
|
| 1107 | + if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {
|
|
| 1108 | + $post_cat_str = $post_categories[$request_taxonomy]; |
|
| 1109 | + $post_cat_array = explode("#", $post_cat_str);
|
|
| 1110 | + if (is_array($post_cat_array)) {
|
|
| 1111 | + $post_cat_array = array_unique( $post_cat_array ); |
|
| 1112 | 1112 | |
| 1113 | 1113 | foreach ($post_cat_array as $post_cat_html) {
|
| 1114 | 1114 | |
| 1115 | - $post_cat_info = explode(":", $post_cat_html);
|
|
| 1116 | - $post_maincat_str = $post_cat_info[0]; |
|
| 1115 | + $post_cat_info = explode(":", $post_cat_html);
|
|
| 1116 | + $post_maincat_str = $post_cat_info[0]; |
|
| 1117 | 1117 | |
| 1118 | - if (!empty($post_maincat_str)) {
|
|
| 1119 | - $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1120 | - $post_maincat_id = $post_maincat_info[0]; |
|
| 1121 | - ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1122 | - (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1123 | - } |
|
| 1124 | - $post_sub_catid = ''; |
|
| 1125 | - if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1126 | - $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1127 | - } |
|
| 1118 | + if (!empty($post_maincat_str)) {
|
|
| 1119 | + $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1120 | + $post_maincat_id = $post_maincat_info[0]; |
|
| 1121 | + ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1122 | + (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1123 | + } |
|
| 1124 | + $post_sub_catid = ''; |
|
| 1125 | + if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1126 | + $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1127 | + } |
|
| 1128 | 1128 | |
| 1129 | - geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1129 | + geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1130 | 1130 | |
| 1131 | - } |
|
| 1132 | - } else {
|
|
| 1131 | + } |
|
| 1132 | + } else {
|
|
| 1133 | 1133 | |
| 1134 | - $post_cat_info = explode(":", $post_cat_str);
|
|
| 1135 | - $post_maincat_str = $post_cat_info[0]; |
|
| 1134 | + $post_cat_info = explode(":", $post_cat_str);
|
|
| 1135 | + $post_maincat_str = $post_cat_info[0]; |
|
| 1136 | 1136 | |
| 1137 | - $post_sub_catid = ''; |
|
| 1137 | + $post_sub_catid = ''; |
|
| 1138 | 1138 | |
| 1139 | - if (!empty($post_maincat_str)) {
|
|
| 1140 | - $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1141 | - $post_maincat_id = $post_maincat_info[0]; |
|
| 1142 | - ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1143 | - (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1144 | - } |
|
| 1139 | + if (!empty($post_maincat_str)) {
|
|
| 1140 | + $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1141 | + $post_maincat_id = $post_maincat_info[0]; |
|
| 1142 | + ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1143 | + (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1144 | + } |
|
| 1145 | 1145 | |
| 1146 | - if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1147 | - $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1148 | - } |
|
| 1146 | + if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1147 | + $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1148 | + } |
|
| 1149 | 1149 | |
| 1150 | - geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1150 | + geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1151 | 1151 | |
| 1152 | - } |
|
| 1153 | - } |
|
| 1152 | + } |
|
| 1153 | + } |
|
| 1154 | 1154 | } |
| 1155 | 1155 | |
| 1156 | 1156 | /** |
@@ -1164,35 +1164,35 @@ discard block |
||
| 1164 | 1164 | */ |
| 1165 | 1165 | function geodir_get_catlist($cat_taxonomy, $parrent = 0, $selected = false) |
| 1166 | 1166 | {
|
| 1167 | - global $exclude_cats; |
|
| 1167 | + global $exclude_cats; |
|
| 1168 | 1168 | |
| 1169 | - $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1169 | + $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1170 | 1170 | |
| 1171 | - if (!empty($cat_terms)) {
|
|
| 1172 | - $onchange = ''; |
|
| 1173 | - $onchange = ' onchange="show_subcatlist(this.value, this)" '; |
|
| 1171 | + if (!empty($cat_terms)) {
|
|
| 1172 | + $onchange = ''; |
|
| 1173 | + $onchange = ' onchange="show_subcatlist(this.value, this)" '; |
|
| 1174 | 1174 | |
| 1175 | - $option_selected = ''; |
|
| 1176 | - if (!$selected) |
|
| 1177 | - $option_slected = ' selected="selected" '; |
|
| 1175 | + $option_selected = ''; |
|
| 1176 | + if (!$selected) |
|
| 1177 | + $option_slected = ' selected="selected" '; |
|
| 1178 | 1178 | |
| 1179 | - echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >'; |
|
| 1179 | + echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >'; |
|
| 1180 | 1180 | |
| 1181 | - echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
|
|
| 1181 | + echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
|
|
| 1182 | 1182 | |
| 1183 | - foreach ($cat_terms as $cat_term) {
|
|
| 1184 | - $option_selected = ''; |
|
| 1185 | - if ($selected == $cat_term->term_id) |
|
| 1186 | - $option_selected = ' selected="selected" '; |
|
| 1183 | + foreach ($cat_terms as $cat_term) {
|
|
| 1184 | + $option_selected = ''; |
|
| 1185 | + if ($selected == $cat_term->term_id) |
|
| 1186 | + $option_selected = ' selected="selected" '; |
|
| 1187 | 1187 | |
| 1188 | - // Count child terms |
|
| 1189 | - $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) ); |
|
| 1190 | - $has_child = !empty( $child_terms ) ? 't' : 'f'; |
|
| 1188 | + // Count child terms |
|
| 1189 | + $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) ); |
|
| 1190 | + $has_child = !empty( $child_terms ) ? 't' : 'f'; |
|
| 1191 | 1191 | |
| 1192 | - echo '<option ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . ucfirst($cat_term->name) . '</option>'; |
|
| 1193 | - } |
|
| 1194 | - echo '</select>'; |
|
| 1195 | - } |
|
| 1192 | + echo '<option ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . ucfirst($cat_term->name) . '</option>'; |
|
| 1193 | + } |
|
| 1194 | + echo '</select>'; |
|
| 1195 | + } |
|
| 1196 | 1196 | } |
| 1197 | 1197 | |
| 1198 | 1198 | /** |
@@ -1208,28 +1208,28 @@ discard block |
||
| 1208 | 1208 | */ |
| 1209 | 1209 | function geodir_custom_update_messages($messages) |
| 1210 | 1210 | {
|
| 1211 | - global $post, $post_ID; |
|
| 1212 | - |
|
| 1213 | - $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');
|
|
| 1214 | - |
|
| 1215 | - foreach ($post_types as $post_type => $post_object) {
|
|
| 1216 | - |
|
| 1217 | - $messages[$post_type] = array( |
|
| 1218 | - 0 => '', // Unused. Messages start at index 1. |
|
| 1219 | - 1 => sprintf(__('%s updated. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1220 | - 2 => __('Custom field updated.', 'geodirectory'),
|
|
| 1221 | - 3 => __('Custom field deleted.', 'geodirectory'),
|
|
| 1222 | - 4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1223 | - 5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,
|
|
| 1224 | - 6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1225 | - 7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1226 | - 8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
|
|
| 1227 | - 9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1228 | - 10 => sprintf(__('%s draft updated. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
|
|
| 1229 | - ); |
|
| 1230 | - } |
|
| 1231 | - |
|
| 1232 | - return $messages; |
|
| 1211 | + global $post, $post_ID; |
|
| 1212 | + |
|
| 1213 | + $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');
|
|
| 1214 | + |
|
| 1215 | + foreach ($post_types as $post_type => $post_object) {
|
|
| 1216 | + |
|
| 1217 | + $messages[$post_type] = array( |
|
| 1218 | + 0 => '', // Unused. Messages start at index 1. |
|
| 1219 | + 1 => sprintf(__('%s updated. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1220 | + 2 => __('Custom field updated.', 'geodirectory'),
|
|
| 1221 | + 3 => __('Custom field deleted.', 'geodirectory'),
|
|
| 1222 | + 4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1223 | + 5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,
|
|
| 1224 | + 6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1225 | + 7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1226 | + 8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
|
|
| 1227 | + 9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1228 | + 10 => sprintf(__('%s draft updated. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
|
|
| 1229 | + ); |
|
| 1230 | + } |
|
| 1231 | + |
|
| 1232 | + return $messages; |
|
| 1233 | 1233 | } |
| 1234 | 1234 | |
| 1235 | 1235 | |
@@ -1244,182 +1244,182 @@ discard block |
||
| 1244 | 1244 | function geodir_register_defaults() |
| 1245 | 1245 | {
|
| 1246 | 1246 | |
| 1247 | - global $wpdb; |
|
| 1248 | - |
|
| 1249 | - $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico'; |
|
| 1250 | - |
|
| 1251 | - if (!$listing_slug = get_option('geodir_listing_prefix'))
|
|
| 1252 | - $listing_slug = 'places'; |
|
| 1253 | - |
|
| 1254 | - /** |
|
| 1255 | - * Taxonomies |
|
| 1256 | - **/ |
|
| 1257 | - //if ( ! taxonomy_exists('gd_place_tags') )
|
|
| 1258 | - {
|
|
| 1259 | - |
|
| 1260 | - $gd_placetags = array(); |
|
| 1261 | - $gd_placetags['object_type'] = 'gd_place'; |
|
| 1262 | - $gd_placetags['listing_slug'] = $listing_slug . '/tags'; |
|
| 1263 | - $gd_placetags['args'] = array( |
|
| 1264 | - 'public' => true, |
|
| 1265 | - 'hierarchical' => false, |
|
| 1266 | - 'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
|
|
| 1267 | - 'query_var' => true, |
|
| 1268 | - |
|
| 1269 | - 'labels' => array( |
|
| 1270 | - 'name' => __('Place Tags', 'geodirectory'),
|
|
| 1271 | - 'singular_name' => __('Place Tag', 'geodirectory'),
|
|
| 1272 | - 'search_items' => __('Search Place Tags', 'geodirectory'),
|
|
| 1273 | - 'popular_items' => __('Popular Place Tags', 'geodirectory'),
|
|
| 1274 | - 'all_items' => __('All Place Tags', 'geodirectory'),
|
|
| 1275 | - 'edit_item' => __('Edit Place Tag', 'geodirectory'),
|
|
| 1276 | - 'update_item' => __('Update Place Tag', 'geodirectory'),
|
|
| 1277 | - 'add_new_item' => __('Add New Place Tag', 'geodirectory'),
|
|
| 1278 | - 'new_item_name' => __('New Place Tag Name', 'geodirectory'),
|
|
| 1279 | - 'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),
|
|
| 1280 | - 'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),
|
|
| 1281 | - 'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),
|
|
| 1282 | - ), |
|
| 1283 | - ); |
|
| 1284 | - |
|
| 1285 | - |
|
| 1286 | - $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1287 | - $geodir_taxonomies['gd_place_tags'] = $gd_placetags; |
|
| 1288 | - update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1289 | - |
|
| 1290 | - |
|
| 1291 | - // Update post types and delete tmp options |
|
| 1292 | - flush_rewrite_rules(); |
|
| 1293 | - |
|
| 1294 | - } |
|
| 1295 | - |
|
| 1296 | - //if ( ! taxonomy_exists('gd_placecategory') )
|
|
| 1297 | - {
|
|
| 1298 | - |
|
| 1299 | - $gd_placecategory = array(); |
|
| 1300 | - $gd_placecategory['object_type'] = 'gd_place'; |
|
| 1301 | - $gd_placecategory['listing_slug'] = $listing_slug; |
|
| 1302 | - $gd_placecategory['args'] = array( |
|
| 1303 | - 'public' => true, |
|
| 1304 | - 'hierarchical' => true, |
|
| 1305 | - 'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),
|
|
| 1306 | - 'query_var' => true, |
|
| 1307 | - 'labels' => array( |
|
| 1308 | - 'name' => __('Place Categories', 'geodirectory'),
|
|
| 1309 | - 'singular_name' => __('Place Category', 'geodirectory'),
|
|
| 1310 | - 'search_items' => __('Search Place Categories', 'geodirectory'),
|
|
| 1311 | - 'popular_items' => __('Popular Place Categories', 'geodirectory'),
|
|
| 1312 | - 'all_items' => __('All Place Categories', 'geodirectory'),
|
|
| 1313 | - 'edit_item' => __('Edit Place Category', 'geodirectory'),
|
|
| 1314 | - 'update_item' => __('Update Place Category', 'geodirectory'),
|
|
| 1315 | - 'add_new_item' => __('Add New Place Category', 'geodirectory'),
|
|
| 1316 | - 'new_item_name' => __('New Place Category', 'geodirectory'),
|
|
| 1317 | - 'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),
|
|
| 1318 | - ), |
|
| 1319 | - ); |
|
| 1320 | - |
|
| 1321 | - |
|
| 1322 | - $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1323 | - $geodir_taxonomies['gd_placecategory'] = $gd_placecategory; |
|
| 1324 | - update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1325 | - |
|
| 1326 | - |
|
| 1327 | - flush_rewrite_rules(); |
|
| 1328 | - } |
|
| 1329 | - |
|
| 1330 | - /** |
|
| 1331 | - * Post Types |
|
| 1332 | - **/ |
|
| 1333 | - |
|
| 1334 | - //if ( ! post_type_exists('gd_place') )
|
|
| 1335 | - {
|
|
| 1336 | - |
|
| 1337 | - $labels = array( |
|
| 1338 | - 'name' => __('Places', 'geodirectory'),
|
|
| 1339 | - 'singular_name' => __('Place', 'geodirectory'),
|
|
| 1340 | - 'add_new' => __('Add New', 'geodirectory'),
|
|
| 1341 | - 'add_new_item' => __('Add New Place', 'geodirectory'),
|
|
| 1342 | - 'edit_item' => __('Edit Place', 'geodirectory'),
|
|
| 1343 | - 'new_item' => __('New Place', 'geodirectory'),
|
|
| 1344 | - 'view_item' => __('View Place', 'geodirectory'),
|
|
| 1345 | - 'search_items' => __('Search Places', 'geodirectory'),
|
|
| 1346 | - 'not_found' => __('No Place Found', 'geodirectory'),
|
|
| 1347 | - 'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));
|
|
| 1348 | - |
|
| 1349 | - $place_default = array( |
|
| 1350 | - 'labels' => $labels, |
|
| 1351 | - 'can_export' => true, |
|
| 1352 | - 'capability_type' => 'post', |
|
| 1353 | - 'description' => 'Place post type.', |
|
| 1354 | - 'has_archive' => $listing_slug, |
|
| 1355 | - 'hierarchical' => false, |
|
| 1356 | - 'map_meta_cap' => true, |
|
| 1357 | - 'menu_icon' => $menu_icon, |
|
| 1358 | - 'public' => true, |
|
| 1359 | - 'query_var' => true, |
|
| 1360 | - 'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
|
|
| 1361 | - 'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
|
|
| 1362 | - 'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
|
|
| 1363 | - |
|
| 1364 | - //Update custom post types |
|
| 1365 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 1366 | - $geodir_post_types['gd_place'] = $place_default; |
|
| 1367 | - update_option('geodir_post_types', $geodir_post_types);
|
|
| 1368 | - |
|
| 1369 | - // Update post types and delete tmp options |
|
| 1370 | - flush_rewrite_rules(); |
|
| 1371 | - } |
|
| 1372 | - |
|
| 1373 | - |
|
| 1374 | - geodir_register_taxonomies(); |
|
| 1375 | - geodir_register_post_types(); |
|
| 1376 | - |
|
| 1377 | - //die; |
|
| 1247 | + global $wpdb; |
|
| 1248 | + |
|
| 1249 | + $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico'; |
|
| 1250 | + |
|
| 1251 | + if (!$listing_slug = get_option('geodir_listing_prefix'))
|
|
| 1252 | + $listing_slug = 'places'; |
|
| 1253 | + |
|
| 1254 | + /** |
|
| 1255 | + * Taxonomies |
|
| 1256 | + **/ |
|
| 1257 | + //if ( ! taxonomy_exists('gd_place_tags') )
|
|
| 1258 | + {
|
|
| 1259 | + |
|
| 1260 | + $gd_placetags = array(); |
|
| 1261 | + $gd_placetags['object_type'] = 'gd_place'; |
|
| 1262 | + $gd_placetags['listing_slug'] = $listing_slug . '/tags'; |
|
| 1263 | + $gd_placetags['args'] = array( |
|
| 1264 | + 'public' => true, |
|
| 1265 | + 'hierarchical' => false, |
|
| 1266 | + 'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
|
|
| 1267 | + 'query_var' => true, |
|
| 1268 | + |
|
| 1269 | + 'labels' => array( |
|
| 1270 | + 'name' => __('Place Tags', 'geodirectory'),
|
|
| 1271 | + 'singular_name' => __('Place Tag', 'geodirectory'),
|
|
| 1272 | + 'search_items' => __('Search Place Tags', 'geodirectory'),
|
|
| 1273 | + 'popular_items' => __('Popular Place Tags', 'geodirectory'),
|
|
| 1274 | + 'all_items' => __('All Place Tags', 'geodirectory'),
|
|
| 1275 | + 'edit_item' => __('Edit Place Tag', 'geodirectory'),
|
|
| 1276 | + 'update_item' => __('Update Place Tag', 'geodirectory'),
|
|
| 1277 | + 'add_new_item' => __('Add New Place Tag', 'geodirectory'),
|
|
| 1278 | + 'new_item_name' => __('New Place Tag Name', 'geodirectory'),
|
|
| 1279 | + 'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),
|
|
| 1280 | + 'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),
|
|
| 1281 | + 'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),
|
|
| 1282 | + ), |
|
| 1283 | + ); |
|
| 1284 | + |
|
| 1285 | + |
|
| 1286 | + $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1287 | + $geodir_taxonomies['gd_place_tags'] = $gd_placetags; |
|
| 1288 | + update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1289 | + |
|
| 1290 | + |
|
| 1291 | + // Update post types and delete tmp options |
|
| 1292 | + flush_rewrite_rules(); |
|
| 1293 | + |
|
| 1294 | + } |
|
| 1295 | + |
|
| 1296 | + //if ( ! taxonomy_exists('gd_placecategory') )
|
|
| 1297 | + {
|
|
| 1298 | + |
|
| 1299 | + $gd_placecategory = array(); |
|
| 1300 | + $gd_placecategory['object_type'] = 'gd_place'; |
|
| 1301 | + $gd_placecategory['listing_slug'] = $listing_slug; |
|
| 1302 | + $gd_placecategory['args'] = array( |
|
| 1303 | + 'public' => true, |
|
| 1304 | + 'hierarchical' => true, |
|
| 1305 | + 'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),
|
|
| 1306 | + 'query_var' => true, |
|
| 1307 | + 'labels' => array( |
|
| 1308 | + 'name' => __('Place Categories', 'geodirectory'),
|
|
| 1309 | + 'singular_name' => __('Place Category', 'geodirectory'),
|
|
| 1310 | + 'search_items' => __('Search Place Categories', 'geodirectory'),
|
|
| 1311 | + 'popular_items' => __('Popular Place Categories', 'geodirectory'),
|
|
| 1312 | + 'all_items' => __('All Place Categories', 'geodirectory'),
|
|
| 1313 | + 'edit_item' => __('Edit Place Category', 'geodirectory'),
|
|
| 1314 | + 'update_item' => __('Update Place Category', 'geodirectory'),
|
|
| 1315 | + 'add_new_item' => __('Add New Place Category', 'geodirectory'),
|
|
| 1316 | + 'new_item_name' => __('New Place Category', 'geodirectory'),
|
|
| 1317 | + 'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),
|
|
| 1318 | + ), |
|
| 1319 | + ); |
|
| 1320 | + |
|
| 1321 | + |
|
| 1322 | + $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1323 | + $geodir_taxonomies['gd_placecategory'] = $gd_placecategory; |
|
| 1324 | + update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1325 | + |
|
| 1326 | + |
|
| 1327 | + flush_rewrite_rules(); |
|
| 1328 | + } |
|
| 1329 | + |
|
| 1330 | + /** |
|
| 1331 | + * Post Types |
|
| 1332 | + **/ |
|
| 1333 | + |
|
| 1334 | + //if ( ! post_type_exists('gd_place') )
|
|
| 1335 | + {
|
|
| 1336 | + |
|
| 1337 | + $labels = array( |
|
| 1338 | + 'name' => __('Places', 'geodirectory'),
|
|
| 1339 | + 'singular_name' => __('Place', 'geodirectory'),
|
|
| 1340 | + 'add_new' => __('Add New', 'geodirectory'),
|
|
| 1341 | + 'add_new_item' => __('Add New Place', 'geodirectory'),
|
|
| 1342 | + 'edit_item' => __('Edit Place', 'geodirectory'),
|
|
| 1343 | + 'new_item' => __('New Place', 'geodirectory'),
|
|
| 1344 | + 'view_item' => __('View Place', 'geodirectory'),
|
|
| 1345 | + 'search_items' => __('Search Places', 'geodirectory'),
|
|
| 1346 | + 'not_found' => __('No Place Found', 'geodirectory'),
|
|
| 1347 | + 'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));
|
|
| 1348 | + |
|
| 1349 | + $place_default = array( |
|
| 1350 | + 'labels' => $labels, |
|
| 1351 | + 'can_export' => true, |
|
| 1352 | + 'capability_type' => 'post', |
|
| 1353 | + 'description' => 'Place post type.', |
|
| 1354 | + 'has_archive' => $listing_slug, |
|
| 1355 | + 'hierarchical' => false, |
|
| 1356 | + 'map_meta_cap' => true, |
|
| 1357 | + 'menu_icon' => $menu_icon, |
|
| 1358 | + 'public' => true, |
|
| 1359 | + 'query_var' => true, |
|
| 1360 | + 'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
|
|
| 1361 | + 'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
|
|
| 1362 | + 'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
|
|
| 1363 | + |
|
| 1364 | + //Update custom post types |
|
| 1365 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 1366 | + $geodir_post_types['gd_place'] = $place_default; |
|
| 1367 | + update_option('geodir_post_types', $geodir_post_types);
|
|
| 1368 | + |
|
| 1369 | + // Update post types and delete tmp options |
|
| 1370 | + flush_rewrite_rules(); |
|
| 1371 | + } |
|
| 1372 | + |
|
| 1373 | + |
|
| 1374 | + geodir_register_taxonomies(); |
|
| 1375 | + geodir_register_post_types(); |
|
| 1376 | + |
|
| 1377 | + //die; |
|
| 1378 | 1378 | |
| 1379 | 1379 | } |
| 1380 | 1380 | |
| 1381 | 1381 | $gd_wpml_get_languages = ""; |
| 1382 | 1382 | function gd_wpml_get_lang_from_url($url) {
|
| 1383 | - global $sitepress, $gd_wpml_get_languages; |
|
| 1383 | + global $sitepress, $gd_wpml_get_languages; |
|
| 1384 | 1384 | |
| 1385 | - if (geodir_is_wpml()) {
|
|
| 1386 | - return $sitepress->get_language_from_url($url); |
|
| 1387 | - } |
|
| 1385 | + if (geodir_is_wpml()) {
|
|
| 1386 | + return $sitepress->get_language_from_url($url); |
|
| 1387 | + } |
|
| 1388 | 1388 | |
| 1389 | - if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {
|
|
| 1390 | - return $_REQUEST['lang']; |
|
| 1391 | - } |
|
| 1389 | + if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {
|
|
| 1390 | + return $_REQUEST['lang']; |
|
| 1391 | + } |
|
| 1392 | 1392 | |
| 1393 | - $url = str_replace(array("http://","https://"),"",$url);
|
|
| 1393 | + $url = str_replace(array("http://","https://"),"",$url);
|
|
| 1394 | 1394 | |
| 1395 | - // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
|
|
| 1396 | - $site_url = str_replace(array("http://","https://"),"",site_url());
|
|
| 1395 | + // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
|
|
| 1396 | + $site_url = str_replace(array("http://","https://"),"",site_url());
|
|
| 1397 | 1397 | |
| 1398 | - $url = str_replace($site_url,"",$url); |
|
| 1398 | + $url = str_replace($site_url,"",$url); |
|
| 1399 | 1399 | |
| 1400 | - $segments = explode('/', trim($url, '/'));
|
|
| 1400 | + $segments = explode('/', trim($url, '/'));
|
|
| 1401 | 1401 | |
| 1402 | - if ($gd_wpml_get_languages) {
|
|
| 1403 | - $langs = $gd_wpml_get_languages; |
|
| 1404 | - } else {
|
|
| 1405 | - $gd_wpml_get_languages = $sitepress->get_active_languages(); |
|
| 1406 | - } |
|
| 1402 | + if ($gd_wpml_get_languages) {
|
|
| 1403 | + $langs = $gd_wpml_get_languages; |
|
| 1404 | + } else {
|
|
| 1405 | + $gd_wpml_get_languages = $sitepress->get_active_languages(); |
|
| 1406 | + } |
|
| 1407 | 1407 | |
| 1408 | - if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {
|
|
| 1409 | - return $segments[0]; |
|
| 1410 | - } |
|
| 1408 | + if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {
|
|
| 1409 | + return $segments[0]; |
|
| 1410 | + } |
|
| 1411 | 1411 | |
| 1412 | - return false; |
|
| 1412 | + return false; |
|
| 1413 | 1413 | } |
| 1414 | 1414 | |
| 1415 | 1415 | function gd_wpml_slug_translation_turned_on($post_type) {
|
| 1416 | 1416 | |
| 1417 | - global $sitepress; |
|
| 1418 | - $settings = $sitepress->get_settings(); |
|
| 1419 | - return isset($settings['posts_slug_translation']['types'][$post_type]) |
|
| 1420 | - && $settings['posts_slug_translation']['types'][$post_type] |
|
| 1421 | - && isset($settings['posts_slug_translation']['on']) |
|
| 1422 | - && $settings['posts_slug_translation']['on']; |
|
| 1417 | + global $sitepress; |
|
| 1418 | + $settings = $sitepress->get_settings(); |
|
| 1419 | + return isset($settings['posts_slug_translation']['types'][$post_type]) |
|
| 1420 | + && $settings['posts_slug_translation']['types'][$post_type] |
|
| 1421 | + && isset($settings['posts_slug_translation']['on']) |
|
| 1422 | + && $settings['posts_slug_translation']['on']; |
|
| 1423 | 1423 | } |
| 1424 | 1424 | |
| 1425 | 1425 | |
@@ -1446,150 +1446,150 @@ discard block |
||
| 1446 | 1446 | */ |
| 1447 | 1447 | function geodir_listing_permalink_structure($post_link, $post_obj, $leavename, $sample) |
| 1448 | 1448 | {
|
| 1449 | - //echo $post_link."<br />".$sample ; |
|
| 1449 | + //echo $post_link."<br />".$sample ; |
|
| 1450 | 1450 | |
| 1451 | 1451 | |
| 1452 | - global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache; |
|
| 1453 | - if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {
|
|
| 1454 | - } elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {
|
|
| 1455 | - return $post_link; |
|
| 1456 | - } else {
|
|
| 1457 | - $orig_post = $post; |
|
| 1458 | - $post = $post_obj; |
|
| 1459 | - } |
|
| 1452 | + global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache; |
|
| 1453 | + if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {
|
|
| 1454 | + } elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {
|
|
| 1455 | + return $post_link; |
|
| 1456 | + } else {
|
|
| 1457 | + $orig_post = $post; |
|
| 1458 | + $post = $post_obj; |
|
| 1459 | + } |
|
| 1460 | 1460 | |
| 1461 | - if (in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 1461 | + if (in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 1462 | 1462 | |
| 1463 | 1463 | |
| 1464 | - $post_types = get_option('geodir_post_types');
|
|
| 1465 | - $slug = $post_types[$post->post_type]['rewrite']['slug']; |
|
| 1464 | + $post_types = get_option('geodir_post_types');
|
|
| 1465 | + $slug = $post_types[$post->post_type]['rewrite']['slug']; |
|
| 1466 | 1466 | |
| 1467 | - // Alter the CPT slug if WPML is set to do so |
|
| 1468 | - if(function_exists('icl_object_id')){
|
|
| 1469 | - if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
|
|
| 1467 | + // Alter the CPT slug if WPML is set to do so |
|
| 1468 | + if(function_exists('icl_object_id')){
|
|
| 1469 | + if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
|
|
| 1470 | 1470 | |
| 1471 | - $org_slug = $slug; |
|
| 1472 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1473 | - $slug, |
|
| 1474 | - 'WordPress', |
|
| 1475 | - 'URL slug: ' . $slug, |
|
| 1476 | - $language_code); |
|
| 1471 | + $org_slug = $slug; |
|
| 1472 | + $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1473 | + $slug, |
|
| 1474 | + 'WordPress', |
|
| 1475 | + 'URL slug: ' . $slug, |
|
| 1476 | + $language_code); |
|
| 1477 | 1477 | |
| 1478 | - if(!$slug){$slug = $org_slug;}
|
|
| 1478 | + if(!$slug){$slug = $org_slug;}
|
|
| 1479 | 1479 | |
| 1480 | - } |
|
| 1481 | - } |
|
| 1480 | + } |
|
| 1481 | + } |
|
| 1482 | 1482 | |
| 1483 | - if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1484 | - remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 1485 | - } |
|
| 1483 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1484 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 1485 | + } |
|
| 1486 | 1486 | |
| 1487 | - // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz. |
|
| 1488 | - $site_url = trailingslashit(get_bloginfo('url'));
|
|
| 1487 | + // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz. |
|
| 1488 | + $site_url = trailingslashit(get_bloginfo('url'));
|
|
| 1489 | 1489 | |
| 1490 | - if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1491 | - add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 1492 | - } |
|
| 1493 | - |
|
| 1494 | - $fix_url = strpos($post_link, $site_url) === 0 ? true : false; |
|
| 1495 | - if ($fix_url) {
|
|
| 1496 | - $post_link = str_replace($site_url, '', $post_link); |
|
| 1497 | - } |
|
| 1498 | - |
|
| 1499 | - $post_link = trailingslashit( |
|
| 1500 | - preg_replace( "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 ) |
|
| 1501 | - ); |
|
| 1502 | - |
|
| 1503 | - if ($fix_url) {
|
|
| 1504 | - $post_link = $site_url . $post_link; |
|
| 1505 | - } |
|
| 1506 | - |
|
| 1507 | - if (isset($comment_post_cache[$post->ID])) {
|
|
| 1508 | - $post = $comment_post_cache[$post->ID]; |
|
| 1509 | - } |
|
| 1510 | - if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {
|
|
| 1511 | - $post_id = $post->ID; |
|
| 1512 | - if (isset($orig_post)) {
|
|
| 1513 | - $post = $orig_post; |
|
| 1514 | - } |
|
| 1515 | - return $gd_permalink_cache[$post_id]; |
|
| 1516 | - } |
|
| 1490 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1491 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 1492 | + } |
|
| 1493 | + |
|
| 1494 | + $fix_url = strpos($post_link, $site_url) === 0 ? true : false; |
|
| 1495 | + if ($fix_url) {
|
|
| 1496 | + $post_link = str_replace($site_url, '', $post_link); |
|
| 1497 | + } |
|
| 1517 | 1498 | |
| 1518 | - if (!isset($post->post_locations)) {
|
|
| 1519 | - $post_type = $post->post_type; |
|
| 1520 | - $ID = $post->ID; |
|
| 1521 | - $post2 = $wpdb->get_row( |
|
| 1522 | - $wpdb->prepare( |
|
| 1523 | - "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1524 | - array($post->ID) |
|
| 1525 | - ) |
|
| 1526 | - ); |
|
| 1499 | + $post_link = trailingslashit( |
|
| 1500 | + preg_replace( "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 ) |
|
| 1501 | + ); |
|
| 1527 | 1502 | |
| 1528 | - $post = (object)array_merge((array)$post, (array)$post2); |
|
| 1503 | + if ($fix_url) {
|
|
| 1504 | + $post_link = $site_url . $post_link; |
|
| 1505 | + } |
|
| 1529 | 1506 | |
| 1530 | - $comment_post_cache[$post->ID] = $post; |
|
| 1531 | - } |
|
| 1507 | + if (isset($comment_post_cache[$post->ID])) {
|
|
| 1508 | + $post = $comment_post_cache[$post->ID]; |
|
| 1509 | + } |
|
| 1510 | + if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {
|
|
| 1511 | + $post_id = $post->ID; |
|
| 1512 | + if (isset($orig_post)) {
|
|
| 1513 | + $post = $orig_post; |
|
| 1514 | + } |
|
| 1515 | + return $gd_permalink_cache[$post_id]; |
|
| 1516 | + } |
|
| 1532 | 1517 | |
| 1518 | + if (!isset($post->post_locations)) {
|
|
| 1519 | + $post_type = $post->post_type; |
|
| 1520 | + $ID = $post->ID; |
|
| 1521 | + $post2 = $wpdb->get_row( |
|
| 1522 | + $wpdb->prepare( |
|
| 1523 | + "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1524 | + array($post->ID) |
|
| 1525 | + ) |
|
| 1526 | + ); |
|
| 1533 | 1527 | |
| 1528 | + $post = (object)array_merge((array)$post, (array)$post2); |
|
| 1534 | 1529 | |
| 1535 | - if (false !== strpos($post_link, '%gd_taxonomy%')) {
|
|
| 1530 | + $comment_post_cache[$post->ID] = $post; |
|
| 1531 | + } |
|
| 1536 | 1532 | |
| 1537 | - if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
|
|
| 1538 | - $location_request = ''; |
|
| 1539 | 1533 | |
| 1540 | 1534 | |
| 1541 | - if (!empty($post->post_locations)) {
|
|
| 1542 | - $geodir_arr_locations = explode(',', $post->post_locations);
|
|
| 1543 | - if (count($geodir_arr_locations) == 3) {
|
|
| 1544 | - $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1545 | - $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1546 | - $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1547 | - $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1548 | - $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1549 | - $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1535 | + if (false !== strpos($post_link, '%gd_taxonomy%')) {
|
|
| 1550 | 1536 | |
| 1551 | - $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1552 | - 'region_slug' => $post->region_slug, |
|
| 1553 | - 'city_slug' => $post->city_slug |
|
| 1554 | - ); |
|
| 1537 | + if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
|
|
| 1538 | + $location_request = ''; |
|
| 1555 | 1539 | |
| 1556 | - } else |
|
| 1557 | - $post_location = geodir_get_location(); |
|
| 1558 | 1540 | |
| 1541 | + if (!empty($post->post_locations)) {
|
|
| 1542 | + $geodir_arr_locations = explode(',', $post->post_locations);
|
|
| 1543 | + if (count($geodir_arr_locations) == 3) {
|
|
| 1544 | + $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1545 | + $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1546 | + $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1547 | + $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1548 | + $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1549 | + $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1559 | 1550 | |
| 1560 | - } else {
|
|
| 1551 | + $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1552 | + 'region_slug' => $post->region_slug, |
|
| 1553 | + 'city_slug' => $post->city_slug |
|
| 1554 | + ); |
|
| 1561 | 1555 | |
| 1562 | - $post_location_sql = $wpdb->get_results( |
|
| 1563 | - $wpdb->prepare( |
|
| 1564 | - "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1565 | - array($post->ID) |
|
| 1566 | - ) |
|
| 1567 | - ); |
|
| 1568 | - |
|
| 1569 | - if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {
|
|
| 1570 | - |
|
| 1571 | - $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);
|
|
| 1572 | - if (count($geodir_arr_locations) == 3) {
|
|
| 1573 | - $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1574 | - $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1575 | - $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1576 | - $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1577 | - $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1578 | - $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1579 | - |
|
| 1580 | - $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1581 | - 'region_slug' => $post->region_slug, |
|
| 1582 | - 'city_slug' => $post->city_slug |
|
| 1583 | - ); |
|
| 1556 | + } else |
|
| 1557 | + $post_location = geodir_get_location(); |
|
| 1584 | 1558 | |
| 1585 | - } |
|
| 1586 | - } else |
|
| 1587 | - $post_location = geodir_get_location(); |
|
| 1588 | - } |
|
| 1589 | 1559 | |
| 1560 | + } else {
|
|
| 1561 | + |
|
| 1562 | + $post_location_sql = $wpdb->get_results( |
|
| 1563 | + $wpdb->prepare( |
|
| 1564 | + "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1565 | + array($post->ID) |
|
| 1566 | + ) |
|
| 1567 | + ); |
|
| 1568 | + |
|
| 1569 | + if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {
|
|
| 1570 | + |
|
| 1571 | + $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);
|
|
| 1572 | + if (count($geodir_arr_locations) == 3) {
|
|
| 1573 | + $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1574 | + $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1575 | + $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1576 | + $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1577 | + $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1578 | + $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1579 | + |
|
| 1580 | + $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1581 | + 'region_slug' => $post->region_slug, |
|
| 1582 | + 'city_slug' => $post->city_slug |
|
| 1583 | + ); |
|
| 1584 | + |
|
| 1585 | + } |
|
| 1586 | + } else |
|
| 1587 | + $post_location = geodir_get_location(); |
|
| 1588 | + } |
|
| 1590 | 1589 | |
| 1591 | - if (!empty($post_location)) {
|
|
| 1592 | - $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : ''; |
|
| 1590 | + |
|
| 1591 | + if (!empty($post_location)) {
|
|
| 1592 | + $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : ''; |
|
| 1593 | 1593 | $region_slug = isset($post_location->region_slug) ? $post_location->region_slug : ''; |
| 1594 | 1594 | $city_slug = isset($post_location->city_slug) ? $post_location->city_slug : ''; |
| 1595 | 1595 | |
@@ -1607,84 +1607,84 @@ discard block |
||
| 1607 | 1607 | $location_slug[] = $city_slug; |
| 1608 | 1608 | |
| 1609 | 1609 | $location_request .= implode('/', $location_slug) . '/';
|
| 1610 | - } |
|
| 1611 | - } |
|
| 1610 | + } |
|
| 1611 | + } |
|
| 1612 | 1612 | |
| 1613 | - if (get_option('geodir_add_categories_url')) {
|
|
| 1613 | + if (get_option('geodir_add_categories_url')) {
|
|
| 1614 | 1614 | |
| 1615 | - $term_request = ''; |
|
| 1616 | - $taxonomies = geodir_get_taxonomies($post->post_type); |
|
| 1615 | + $term_request = ''; |
|
| 1616 | + $taxonomies = geodir_get_taxonomies($post->post_type); |
|
| 1617 | 1617 | |
| 1618 | - $taxonomies = end($taxonomies); |
|
| 1618 | + $taxonomies = end($taxonomies); |
|
| 1619 | 1619 | |
| 1620 | - if (!empty($post->default_category)) {
|
|
| 1621 | - $post_terms = $post->default_category; |
|
| 1622 | - } else {
|
|
| 1623 | - $post_terms = ''; |
|
| 1620 | + if (!empty($post->default_category)) {
|
|
| 1621 | + $post_terms = $post->default_category; |
|
| 1622 | + } else {
|
|
| 1623 | + $post_terms = ''; |
|
| 1624 | 1624 | |
| 1625 | - if (isset($post->{$taxonomies})) {
|
|
| 1626 | - $post_terms = explode(",", trim($post->{$taxonomies}, ","));
|
|
| 1627 | - $post_terms = $post_terms[0]; |
|
| 1628 | - } |
|
| 1625 | + if (isset($post->{$taxonomies})) {
|
|
| 1626 | + $post_terms = explode(",", trim($post->{$taxonomies}, ","));
|
|
| 1627 | + $post_terms = $post_terms[0]; |
|
| 1628 | + } |
|
| 1629 | 1629 | |
| 1630 | - if (!$post_terms) |
|
| 1631 | - $post_terms = geodir_get_post_meta($post->ID, 'default_category', true); |
|
| 1630 | + if (!$post_terms) |
|
| 1631 | + $post_terms = geodir_get_post_meta($post->ID, 'default_category', true); |
|
| 1632 | 1632 | |
| 1633 | - if (!$post_terms) {
|
|
| 1634 | - $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true); |
|
| 1633 | + if (!$post_terms) {
|
|
| 1634 | + $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true); |
|
| 1635 | 1635 | |
| 1636 | - if ($post_terms) {
|
|
| 1637 | - $post_terms = explode(",", trim($post_terms, ","));
|
|
| 1638 | - $post_terms = $post_terms[0]; |
|
| 1639 | - } |
|
| 1640 | - } |
|
| 1641 | - } |
|
| 1636 | + if ($post_terms) {
|
|
| 1637 | + $post_terms = explode(",", trim($post_terms, ","));
|
|
| 1638 | + $post_terms = $post_terms[0]; |
|
| 1639 | + } |
|
| 1640 | + } |
|
| 1641 | + } |
|
| 1642 | 1642 | |
| 1643 | - $term = get_term_by('id', $post_terms, $taxonomies);
|
|
| 1643 | + $term = get_term_by('id', $post_terms, $taxonomies);
|
|
| 1644 | 1644 | |
| 1645 | - if (!empty($term)) |
|
| 1646 | - $term_request = $term->slug; |
|
| 1647 | - //$term_request = $term->slug.'/'; |
|
| 1648 | - } |
|
| 1645 | + if (!empty($term)) |
|
| 1646 | + $term_request = $term->slug; |
|
| 1647 | + //$term_request = $term->slug.'/'; |
|
| 1648 | + } |
|
| 1649 | 1649 | |
| 1650 | - $request_term = ''; |
|
| 1651 | - $listingurl_separator = ''; |
|
| 1652 | - //$detailurl_separator = get_option('geodir_detailurl_separator');
|
|
| 1653 | - $detailurl_separator = ''; |
|
| 1654 | - if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {
|
|
| 1655 | - $request_term = $location_request; |
|
| 1656 | - //$listingurl_separator = get_option('geodir_listingurl_separator');
|
|
| 1657 | - //$request_term .= $listingurl_separator.'/'.$term_request; |
|
| 1658 | - $request_term .= $term_request; |
|
| 1650 | + $request_term = ''; |
|
| 1651 | + $listingurl_separator = ''; |
|
| 1652 | + //$detailurl_separator = get_option('geodir_detailurl_separator');
|
|
| 1653 | + $detailurl_separator = ''; |
|
| 1654 | + if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {
|
|
| 1655 | + $request_term = $location_request; |
|
| 1656 | + //$listingurl_separator = get_option('geodir_listingurl_separator');
|
|
| 1657 | + //$request_term .= $listingurl_separator.'/'.$term_request; |
|
| 1658 | + $request_term .= $term_request; |
|
| 1659 | 1659 | |
| 1660 | - } else {
|
|
| 1661 | - if (isset($location_request) && $location_request != '') $request_term = $location_request; |
|
| 1660 | + } else {
|
|
| 1661 | + if (isset($location_request) && $location_request != '') $request_term = $location_request; |
|
| 1662 | 1662 | |
| 1663 | - if (isset($term_request) && $term_request != '') $request_term .= $term_request; |
|
| 1664 | - } |
|
| 1665 | - $request_term = trim($request_term, '/'); |
|
| 1663 | + if (isset($term_request) && $term_request != '') $request_term .= $term_request; |
|
| 1664 | + } |
|
| 1665 | + $request_term = trim($request_term, '/'); |
|
| 1666 | 1666 | |
| 1667 | - // Fix with WPML the location terms added twice when CPT slug is translated. |
|
| 1668 | - if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {
|
|
| 1669 | - $post_link = str_replace('%gd_taxonomy%/', '', $post_link);
|
|
| 1670 | - } |
|
| 1667 | + // Fix with WPML the location terms added twice when CPT slug is translated. |
|
| 1668 | + if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {
|
|
| 1669 | + $post_link = str_replace('%gd_taxonomy%/', '', $post_link);
|
|
| 1670 | + } |
|
| 1671 | 1671 | |
| 1672 | - if (!empty($request_term)) |
|
| 1673 | - $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1674 | - else |
|
| 1675 | - $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1676 | - //echo $post_link ; |
|
| 1677 | - } |
|
| 1678 | - // temp cache the permalink |
|
| 1679 | - if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {
|
|
| 1680 | - $gd_permalink_cache[$post->ID] = $post_link; |
|
| 1681 | - } |
|
| 1682 | - } |
|
| 1683 | - if (isset($orig_post)) {
|
|
| 1684 | - $post = $orig_post; |
|
| 1685 | - } |
|
| 1686 | - |
|
| 1687 | - return $post_link; |
|
| 1672 | + if (!empty($request_term)) |
|
| 1673 | + $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1674 | + else |
|
| 1675 | + $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1676 | + //echo $post_link ; |
|
| 1677 | + } |
|
| 1678 | + // temp cache the permalink |
|
| 1679 | + if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {
|
|
| 1680 | + $gd_permalink_cache[$post->ID] = $post_link; |
|
| 1681 | + } |
|
| 1682 | + } |
|
| 1683 | + if (isset($orig_post)) {
|
|
| 1684 | + $post = $orig_post; |
|
| 1685 | + } |
|
| 1686 | + |
|
| 1687 | + return $post_link; |
|
| 1688 | 1688 | } |
| 1689 | 1689 | |
| 1690 | 1690 | /** |
@@ -1700,99 +1700,99 @@ discard block |
||
| 1700 | 1700 | * @return string The term link. |
| 1701 | 1701 | */ |
| 1702 | 1702 | function geodir_term_link($termlink, $term, $taxonomy) {
|
| 1703 | - $geodir_taxonomies = geodir_get_taxonomies('', true);
|
|
| 1703 | + $geodir_taxonomies = geodir_get_taxonomies('', true);
|
|
| 1704 | 1704 | |
| 1705 | - if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {
|
|
| 1706 | - global $geodir_add_location_url, $gd_session; |
|
| 1707 | - $include_location = false; |
|
| 1708 | - $request_term = array(); |
|
| 1709 | - $add_location_url = get_option('geodir_add_location_url');
|
|
| 1710 | - $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1705 | + if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {
|
|
| 1706 | + global $geodir_add_location_url, $gd_session; |
|
| 1707 | + $include_location = false; |
|
| 1708 | + $request_term = array(); |
|
| 1709 | + $add_location_url = get_option('geodir_add_location_url');
|
|
| 1710 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1711 | 1711 | |
| 1712 | - $listing_slug = geodir_get_listing_slug($taxonomy); |
|
| 1712 | + $listing_slug = geodir_get_listing_slug($taxonomy); |
|
| 1713 | 1713 | |
| 1714 | - if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {
|
|
| 1715 | - if ($geodir_add_location_url && $add_location_url) {
|
|
| 1716 | - $include_location = true; |
|
| 1717 | - } |
|
| 1718 | - } elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {
|
|
| 1719 | - $include_location = true; |
|
| 1720 | - } elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {
|
|
| 1721 | - $include_location = true; |
|
| 1722 | - } |
|
| 1723 | - |
|
| 1724 | - if ($include_location) {
|
|
| 1725 | - global $post; |
|
| 1714 | + if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {
|
|
| 1715 | + if ($geodir_add_location_url && $add_location_url) {
|
|
| 1716 | + $include_location = true; |
|
| 1717 | + } |
|
| 1718 | + } elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {
|
|
| 1719 | + $include_location = true; |
|
| 1720 | + } elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {
|
|
| 1721 | + $include_location = true; |
|
| 1722 | + } |
|
| 1723 | + |
|
| 1724 | + if ($include_location) {
|
|
| 1725 | + global $post; |
|
| 1726 | 1726 | |
| 1727 | - $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1727 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1728 | 1728 | |
| 1729 | - if (geodir_is_page('detail') && isset($post->country_slug)) {
|
|
| 1730 | - $location_terms = array( |
|
| 1731 | - 'gd_country' => $post->country_slug, |
|
| 1732 | - 'gd_region' => $post->region_slug, |
|
| 1733 | - 'gd_city' => $post->city_slug |
|
| 1734 | - ); |
|
| 1729 | + if (geodir_is_page('detail') && isset($post->country_slug)) {
|
|
| 1730 | + $location_terms = array( |
|
| 1731 | + 'gd_country' => $post->country_slug, |
|
| 1732 | + 'gd_region' => $post->region_slug, |
|
| 1733 | + 'gd_city' => $post->city_slug |
|
| 1734 | + ); |
|
| 1735 | 1735 | |
| 1736 | - if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1737 | - $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
|
| 1738 | - } |
|
| 1739 | - } else {
|
|
| 1740 | - $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1741 | - } |
|
| 1736 | + if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1737 | + $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
|
| 1738 | + } |
|
| 1739 | + } else {
|
|
| 1740 | + $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1741 | + } |
|
| 1742 | 1742 | |
| 1743 | - $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1744 | - $location_terms = geodir_remove_location_terms($location_terms); |
|
| 1743 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1744 | + $location_terms = geodir_remove_location_terms($location_terms); |
|
| 1745 | 1745 | |
| 1746 | - if (!empty($location_terms)) {
|
|
| 1747 | - $url_separator = ''; |
|
| 1746 | + if (!empty($location_terms)) {
|
|
| 1747 | + $url_separator = ''; |
|
| 1748 | 1748 | |
| 1749 | - if (get_option('permalink_structure') != '') {
|
|
| 1750 | - $old_listing_slug = '/' . $listing_slug . '/'; |
|
| 1751 | - $request_term = implode("/", $location_terms);
|
|
| 1752 | - $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/'; |
|
| 1749 | + if (get_option('permalink_structure') != '') {
|
|
| 1750 | + $old_listing_slug = '/' . $listing_slug . '/'; |
|
| 1751 | + $request_term = implode("/", $location_terms);
|
|
| 1752 | + $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/'; |
|
| 1753 | 1753 | |
| 1754 | - $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug)); |
|
| 1755 | - } else {
|
|
| 1756 | - $termlink = geodir_getlink($termlink, $request_term); |
|
| 1757 | - } |
|
| 1758 | - } |
|
| 1759 | - } |
|
| 1754 | + $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug)); |
|
| 1755 | + } else {
|
|
| 1756 | + $termlink = geodir_getlink($termlink, $request_term); |
|
| 1757 | + } |
|
| 1758 | + } |
|
| 1759 | + } |
|
| 1760 | 1760 | |
| 1761 | - // Alter the CPT slug is WPML is set to do so |
|
| 1762 | - /* we can replace this with the below function |
|
| 1761 | + // Alter the CPT slug is WPML is set to do so |
|
| 1762 | + /* we can replace this with the below function |
|
| 1763 | 1763 | if(function_exists('icl_object_id')){
|
| 1764 | 1764 | global $sitepress; |
| 1765 | 1765 | $post_type = str_replace("category","",$taxonomy);
|
| 1766 | 1766 | $termlink = $sitepress->post_type_archive_link_filter( $termlink, $post_type); |
| 1767 | 1767 | }*/ |
| 1768 | 1768 | |
| 1769 | - // Alter the CPT slug if WPML is set to do so |
|
| 1770 | - if (function_exists('icl_object_id')) {
|
|
| 1771 | - $post_types = get_option('geodir_post_types');
|
|
| 1772 | - $post_type = str_replace("category","",$taxonomy);
|
|
| 1773 | - $post_type = str_replace("_tags","",$post_type);
|
|
| 1774 | - $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1775 | - if (gd_wpml_slug_translation_turned_on($post_type)) {
|
|
| 1776 | - global $sitepress; |
|
| 1777 | - $default_lang = $sitepress->get_default_language(); |
|
| 1778 | - $language_code = gd_wpml_get_lang_from_url($termlink); |
|
| 1779 | - if (!$language_code ) {
|
|
| 1780 | - $language_code = $default_lang; |
|
| 1781 | - } |
|
| 1769 | + // Alter the CPT slug if WPML is set to do so |
|
| 1770 | + if (function_exists('icl_object_id')) {
|
|
| 1771 | + $post_types = get_option('geodir_post_types');
|
|
| 1772 | + $post_type = str_replace("category","",$taxonomy);
|
|
| 1773 | + $post_type = str_replace("_tags","",$post_type);
|
|
| 1774 | + $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1775 | + if (gd_wpml_slug_translation_turned_on($post_type)) {
|
|
| 1776 | + global $sitepress; |
|
| 1777 | + $default_lang = $sitepress->get_default_language(); |
|
| 1778 | + $language_code = gd_wpml_get_lang_from_url($termlink); |
|
| 1779 | + if (!$language_code ) {
|
|
| 1780 | + $language_code = $default_lang; |
|
| 1781 | + } |
|
| 1782 | 1782 | |
| 1783 | - $org_slug = $slug; |
|
| 1784 | - $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);
|
|
| 1783 | + $org_slug = $slug; |
|
| 1784 | + $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);
|
|
| 1785 | 1785 | |
| 1786 | - if (!$slug) {
|
|
| 1787 | - $slug = $org_slug; |
|
| 1788 | - } |
|
| 1786 | + if (!$slug) {
|
|
| 1787 | + $slug = $org_slug; |
|
| 1788 | + } |
|
| 1789 | 1789 | |
| 1790 | - $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug ,$termlink, 1));
|
|
| 1791 | - } |
|
| 1792 | - } |
|
| 1793 | - } |
|
| 1790 | + $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug ,$termlink, 1));
|
|
| 1791 | + } |
|
| 1792 | + } |
|
| 1793 | + } |
|
| 1794 | 1794 | |
| 1795 | - return $termlink; |
|
| 1795 | + return $termlink; |
|
| 1796 | 1796 | } |
| 1797 | 1797 | |
| 1798 | 1798 | /** |
@@ -1818,14 +1818,14 @@ discard block |
||
| 1818 | 1818 | if (in_array($post_type, geodir_get_posttypes())) {
|
| 1819 | 1819 | if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {
|
| 1820 | 1820 | if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {
|
| 1821 | - $location_terms = array( |
|
| 1822 | - 'gd_country' => $post->country_slug, |
|
| 1823 | - 'gd_region' => $post->region_slug, |
|
| 1824 | - 'gd_city' => $post->city_slug |
|
| 1825 | - ); |
|
| 1826 | - } else {
|
|
| 1827 | - $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1828 | - } |
|
| 1821 | + $location_terms = array( |
|
| 1822 | + 'gd_country' => $post->country_slug, |
|
| 1823 | + 'gd_region' => $post->region_slug, |
|
| 1824 | + 'gd_city' => $post->city_slug |
|
| 1825 | + ); |
|
| 1826 | + } else {
|
|
| 1827 | + $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1828 | + } |
|
| 1829 | 1829 | |
| 1830 | 1830 | $location_terms = geodir_remove_location_terms($location_terms); |
| 1831 | 1831 | |
@@ -1857,17 +1857,17 @@ discard block |
||
| 1857 | 1857 | * @return void|string Label. |
| 1858 | 1858 | */ |
| 1859 | 1859 | function get_post_type_singular_label($post_type, $echo = false, $translate = false) {
|
| 1860 | - $obj_post_type = get_post_type_object($post_type); |
|
| 1861 | - if (!is_object($obj_post_type)) {
|
|
| 1862 | - return; |
|
| 1863 | - } |
|
| 1860 | + $obj_post_type = get_post_type_object($post_type); |
|
| 1861 | + if (!is_object($obj_post_type)) {
|
|
| 1862 | + return; |
|
| 1863 | + } |
|
| 1864 | 1864 | |
| 1865 | - $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name; |
|
| 1865 | + $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name; |
|
| 1866 | 1866 | |
| 1867 | - if ($echo) |
|
| 1868 | - echo $label; |
|
| 1869 | - else |
|
| 1870 | - return $label; |
|
| 1867 | + if ($echo) |
|
| 1868 | + echo $label; |
|
| 1869 | + else |
|
| 1870 | + return $label; |
|
| 1871 | 1871 | } |
| 1872 | 1872 | |
| 1873 | 1873 | /** |
@@ -1882,19 +1882,19 @@ discard block |
||
| 1882 | 1882 | * @return void|string Label. |
| 1883 | 1883 | */ |
| 1884 | 1884 | function get_post_type_plural_label($post_type, $echo = false, $translate = false) {
|
| 1885 | - $all_postypes = geodir_get_posttypes(); |
|
| 1885 | + $all_postypes = geodir_get_posttypes(); |
|
| 1886 | 1886 | |
| 1887 | - if (!in_array($post_type, $all_postypes)) |
|
| 1888 | - return false; |
|
| 1887 | + if (!in_array($post_type, $all_postypes)) |
|
| 1888 | + return false; |
|
| 1889 | 1889 | |
| 1890 | - $obj_post_type = get_post_type_object($post_type); |
|
| 1890 | + $obj_post_type = get_post_type_object($post_type); |
|
| 1891 | 1891 | |
| 1892 | - $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name; |
|
| 1892 | + $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name; |
|
| 1893 | 1893 | |
| 1894 | - if ($echo) |
|
| 1895 | - echo $label; |
|
| 1896 | - else |
|
| 1897 | - return $label; |
|
| 1894 | + if ($echo) |
|
| 1895 | + echo $label; |
|
| 1896 | + else |
|
| 1897 | + return $label; |
|
| 1898 | 1898 | } |
| 1899 | 1899 | |
| 1900 | 1900 | /** |
@@ -1912,51 +1912,51 @@ discard block |
||
| 1912 | 1912 | */ |
| 1913 | 1913 | function geodir_term_exists($term, $taxonomy = '', $parent = 0) |
| 1914 | 1914 | {
|
| 1915 | - global $wpdb; |
|
| 1916 | - |
|
| 1917 | - $select = "SELECT term_id FROM $wpdb->terms as t WHERE "; |
|
| 1918 | - $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE "; |
|
| 1919 | - |
|
| 1920 | - if (is_int($term)) {
|
|
| 1921 | - if (0 == $term) |
|
| 1922 | - return 0; |
|
| 1923 | - $where = 't.term_id = %d'; |
|
| 1924 | - if (!empty($taxonomy)) |
|
| 1925 | - return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1926 | - else |
|
| 1927 | - return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1928 | - } |
|
| 1915 | + global $wpdb; |
|
| 1916 | + |
|
| 1917 | + $select = "SELECT term_id FROM $wpdb->terms as t WHERE "; |
|
| 1918 | + $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE "; |
|
| 1919 | + |
|
| 1920 | + if (is_int($term)) {
|
|
| 1921 | + if (0 == $term) |
|
| 1922 | + return 0; |
|
| 1923 | + $where = 't.term_id = %d'; |
|
| 1924 | + if (!empty($taxonomy)) |
|
| 1925 | + return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1926 | + else |
|
| 1927 | + return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1928 | + } |
|
| 1929 | 1929 | |
| 1930 | - $term = trim(wp_unslash($term)); |
|
| 1930 | + $term = trim(wp_unslash($term)); |
|
| 1931 | 1931 | |
| 1932 | - if ('' === $slug = sanitize_title($term))
|
|
| 1933 | - return 0; |
|
| 1932 | + if ('' === $slug = sanitize_title($term))
|
|
| 1933 | + return 0; |
|
| 1934 | 1934 | |
| 1935 | - $where = 't.slug = %s'; |
|
| 1935 | + $where = 't.slug = %s'; |
|
| 1936 | 1936 | |
| 1937 | - $where_fields = array($slug); |
|
| 1938 | - if (!empty($taxonomy)) {
|
|
| 1939 | - $parent = (int)$parent; |
|
| 1940 | - if ($parent > 0) {
|
|
| 1941 | - $where_fields[] = $parent; |
|
| 1942 | - $else_where_fields[] = $parent; |
|
| 1943 | - $where .= ' AND tt.parent = %d'; |
|
| 1937 | + $where_fields = array($slug); |
|
| 1938 | + if (!empty($taxonomy)) {
|
|
| 1939 | + $parent = (int)$parent; |
|
| 1940 | + if ($parent > 0) {
|
|
| 1941 | + $where_fields[] = $parent; |
|
| 1942 | + $else_where_fields[] = $parent; |
|
| 1943 | + $where .= ' AND tt.parent = %d'; |
|
| 1944 | 1944 | |
| 1945 | - } |
|
| 1945 | + } |
|
| 1946 | 1946 | |
| 1947 | - $where_fields[] = $taxonomy; |
|
| 1947 | + $where_fields[] = $taxonomy; |
|
| 1948 | 1948 | |
| 1949 | 1949 | |
| 1950 | - if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))
|
|
| 1951 | - return $result; |
|
| 1950 | + if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))
|
|
| 1951 | + return $result; |
|
| 1952 | 1952 | |
| 1953 | - return false; |
|
| 1954 | - } |
|
| 1953 | + return false; |
|
| 1954 | + } |
|
| 1955 | 1955 | |
| 1956 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
|
|
| 1957 | - return $result; |
|
| 1956 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
|
|
| 1957 | + return $result; |
|
| 1958 | 1958 | |
| 1959 | - return false; |
|
| 1959 | + return false; |
|
| 1960 | 1960 | } |
| 1961 | 1961 | |
| 1962 | 1962 | /** |
@@ -1968,7 +1968,7 @@ discard block |
||
| 1968 | 1968 | function geodir_get_term_icon_rebuild() |
| 1969 | 1969 | {
|
| 1970 | 1970 | |
| 1971 | - update_option('gd_term_icons', '');
|
|
| 1971 | + update_option('gd_term_icons', '');
|
|
| 1972 | 1972 | |
| 1973 | 1973 | } |
| 1974 | 1974 | |
@@ -1986,61 +1986,61 @@ discard block |
||
| 1986 | 1986 | */ |
| 1987 | 1987 | function geodir_get_term_icon($term_id = false, $rebuild = false) |
| 1988 | 1988 | {
|
| 1989 | - global $wpdb; |
|
| 1990 | - if (!$rebuild) {
|
|
| 1991 | - $terms_icons = get_option('gd_term_icons');
|
|
| 1992 | - } else {
|
|
| 1993 | - $terms_icons = array(); |
|
| 1994 | - } |
|
| 1995 | - |
|
| 1996 | - if (empty($terms_icons)) {
|
|
| 1997 | - $terms_icons = array(); |
|
| 1998 | - $default_icon_url = get_option('geodir_default_marker_icon');
|
|
| 1999 | - $taxonomy = geodir_get_taxonomies(); |
|
| 2000 | - $post_types = geodir_get_posttypes(); |
|
| 2001 | - $tax_arr = array(); |
|
| 2002 | - foreach ($post_types as $post_type) {
|
|
| 2003 | - $tax_arr[] = "'" . $post_type . "category'"; |
|
| 2004 | - } |
|
| 2005 | - $tax_c = implode(',', $tax_arr);
|
|
| 2006 | - $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
|
|
| 2007 | - //$terms = get_terms( $taxonomy ); |
|
| 2008 | - |
|
| 2009 | - if($terms) {
|
|
| 2010 | - foreach ($terms as $term) {
|
|
| 2011 | - $post_type = str_replace("category", "", $term->taxonomy);
|
|
| 2012 | - $a_terms[$post_type][] = $term; |
|
| 1989 | + global $wpdb; |
|
| 1990 | + if (!$rebuild) {
|
|
| 1991 | + $terms_icons = get_option('gd_term_icons');
|
|
| 1992 | + } else {
|
|
| 1993 | + $terms_icons = array(); |
|
| 1994 | + } |
|
| 2013 | 1995 | |
| 2014 | - } |
|
| 2015 | - } |
|
| 1996 | + if (empty($terms_icons)) {
|
|
| 1997 | + $terms_icons = array(); |
|
| 1998 | + $default_icon_url = get_option('geodir_default_marker_icon');
|
|
| 1999 | + $taxonomy = geodir_get_taxonomies(); |
|
| 2000 | + $post_types = geodir_get_posttypes(); |
|
| 2001 | + $tax_arr = array(); |
|
| 2002 | + foreach ($post_types as $post_type) {
|
|
| 2003 | + $tax_arr[] = "'" . $post_type . "category'"; |
|
| 2004 | + } |
|
| 2005 | + $tax_c = implode(',', $tax_arr);
|
|
| 2006 | + $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
|
|
| 2007 | + //$terms = get_terms( $taxonomy ); |
|
| 2016 | 2008 | |
| 2017 | - if($a_terms) {
|
|
| 2018 | - foreach ($a_terms as $pt => $t2) {
|
|
| 2009 | + if($terms) {
|
|
| 2010 | + foreach ($terms as $term) {
|
|
| 2011 | + $post_type = str_replace("category", "", $term->taxonomy);
|
|
| 2012 | + $a_terms[$post_type][] = $term; |
|
| 2019 | 2013 | |
| 2020 | - foreach ($t2 as $term) {
|
|
| 2021 | - $term_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt); |
|
| 2022 | - if ($term_icon) {
|
|
| 2023 | - $term_icon_url = $term_icon["src"]; |
|
| 2024 | - } else {
|
|
| 2025 | - $term_icon_url = $default_icon_url; |
|
| 2026 | - } |
|
| 2027 | - $terms_icons[$term->term_id] = $term_icon_url; |
|
| 2028 | - } |
|
| 2029 | - } |
|
| 2030 | - } |
|
| 2014 | + } |
|
| 2015 | + } |
|
| 2031 | 2016 | |
| 2032 | - update_option('gd_term_icons', $terms_icons);
|
|
| 2033 | - } |
|
| 2017 | + if($a_terms) {
|
|
| 2018 | + foreach ($a_terms as $pt => $t2) {
|
|
| 2034 | 2019 | |
| 2035 | - if ($term_id && isset($terms_icons[$term_id])) {
|
|
| 2036 | - return $terms_icons[$term_id]; |
|
| 2037 | - } elseif ($term_id && !isset($terms_icons[$term_id])) {
|
|
| 2038 | - return get_option('geodir_default_marker_icon');
|
|
| 2039 | - } |
|
| 2020 | + foreach ($t2 as $term) {
|
|
| 2021 | + $term_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt); |
|
| 2022 | + if ($term_icon) {
|
|
| 2023 | + $term_icon_url = $term_icon["src"]; |
|
| 2024 | + } else {
|
|
| 2025 | + $term_icon_url = $default_icon_url; |
|
| 2026 | + } |
|
| 2027 | + $terms_icons[$term->term_id] = $term_icon_url; |
|
| 2028 | + } |
|
| 2029 | + } |
|
| 2030 | + } |
|
| 2031 | + |
|
| 2032 | + update_option('gd_term_icons', $terms_icons);
|
|
| 2033 | + } |
|
| 2040 | 2034 | |
| 2041 | - if (is_ssl()) {
|
|
| 2042 | - $terms_icons = str_replace("http:","https:",$terms_icons );
|
|
| 2043 | - } |
|
| 2035 | + if ($term_id && isset($terms_icons[$term_id])) {
|
|
| 2036 | + return $terms_icons[$term_id]; |
|
| 2037 | + } elseif ($term_id && !isset($terms_icons[$term_id])) {
|
|
| 2038 | + return get_option('geodir_default_marker_icon');
|
|
| 2039 | + } |
|
| 2040 | + |
|
| 2041 | + if (is_ssl()) {
|
|
| 2042 | + $terms_icons = str_replace("http:","https:",$terms_icons );
|
|
| 2043 | + } |
|
| 2044 | 2044 | |
| 2045 | - return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
|
|
| 2045 | + return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
|
|
| 2046 | 2046 | } |
| 2047 | 2047 | \ No newline at end of file |
@@ -60,16 +60,16 @@ discard block |
||
| 60 | 60 | * @since 1.0.0 |
| 61 | 61 | * @param string $menu_class The menu HTML class. |
| 62 | 62 | */ |
| 63 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 63 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);
|
|
| 64 | 64 | /** |
| 65 | 65 | * Filter the menu a class. |
| 66 | 66 | * |
| 67 | 67 | * @since 1.0.0 |
| 68 | 68 | */ |
| 69 | 69 | $a_class = apply_filters('geodir_menu_a_class', '');
|
| 70 | - $items .= '<li class="' . $li_class . '"> |
|
| 71 | - <a href="' . get_post_type_archive_link($post_type) . '" class="' . $a_class . '"> |
|
| 72 | - ' . __(ucfirst($args->labels->name),'geodirectory') . ' |
|
| 70 | + $items .= '<li class="'.$li_class.'"> |
|
| 71 | + <a href="' . get_post_type_archive_link($post_type).'" class="'.$a_class.'"> |
|
| 72 | + ' . __(ucfirst($args->labels->name), 'geodirectory').' |
|
| 73 | 73 | </a> |
| 74 | 74 | </li>'; |
| 75 | 75 | } |
@@ -88,14 +88,14 @@ discard block |
||
| 88 | 88 | * @since 1.0.0 |
| 89 | 89 | * @param string $menu_class The menu HTML class. |
| 90 | 90 | */ |
| 91 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);
|
|
| 91 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings '.$menu_class);
|
|
| 92 | 92 | /** |
| 93 | 93 | * Filter the sub menu li class. |
| 94 | 94 | * |
| 95 | 95 | * @since 1.0.0 |
| 96 | 96 | * @param string $menu_class The menu HTML class. |
| 97 | 97 | */ |
| 98 | - $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 98 | + $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);
|
|
| 99 | 99 | /** |
| 100 | 100 | * Filter the sub menu ul class. |
| 101 | 101 | * |
@@ -114,9 +114,9 @@ discard block |
||
| 114 | 114 | * @since 1.0.0 |
| 115 | 115 | */ |
| 116 | 116 | $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
| 117 | - $items .= '<li class="' . $li_class . '"> |
|
| 118 | - <a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>
|
|
| 119 | - <ul class="' . $sub_ul_class . '">'; |
|
| 117 | + $items .= '<li class="'.$li_class.'"> |
|
| 118 | + <a href="#" class="' . $a_class.'">'.__('Listing', 'geodirectory').'</a>
|
|
| 119 | + <ul class="' . $sub_ul_class.'">'; |
|
| 120 | 120 | $post_types = geodir_get_posttypes('object');
|
| 121 | 121 | |
| 122 | 122 | $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');
|
@@ -133,9 +133,9 @@ discard block |
||
| 133 | 133 | if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
| 134 | 134 | $menu_class = 'current-menu-item'; |
| 135 | 135 | |
| 136 | - $items .= '<li class="' . $sub_li_class . '"> |
|
| 137 | - <a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '"> |
|
| 138 | - ' . __(ucfirst($args->labels->name),'geodirectory') . ' |
|
| 136 | + $items .= '<li class="'.$sub_li_class.'"> |
|
| 137 | + <a href="' . get_post_type_archive_link($post_type).'" class="'.$sub_a_class.'"> |
|
| 138 | + ' . __(ucfirst($args->labels->name), 'geodirectory').' |
|
| 139 | 139 | </a> |
| 140 | 140 | </li>'; |
| 141 | 141 | } |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | * |
| 152 | 152 | * @since 1.5.9 |
| 153 | 153 | */ |
| 154 | - $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 154 | + $items .= apply_filters('geodir_menu_after_sub_ul', '');
|
|
| 155 | 155 | $items .= '</li>'; |
| 156 | 156 | } |
| 157 | 157 | } |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | * @since 1.0.0 |
| 185 | 185 | * @param string $menu_class The menu HTML class. |
| 186 | 186 | */ |
| 187 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 187 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);
|
|
| 188 | 188 | /** |
| 189 | 189 | * Filter the menu a class. |
| 190 | 190 | * |
@@ -192,9 +192,9 @@ discard block |
||
| 192 | 192 | */ |
| 193 | 193 | $a_class = apply_filters('geodir_menu_a_class', '');
|
| 194 | 194 | $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
| 195 | - $items .= '<li class="' . $li_class . '"> |
|
| 196 | - <a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $a_class . '"> |
|
| 197 | - ' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '
|
|
| 195 | + $items .= '<li class="'.$li_class.'"> |
|
| 196 | + <a href="' . geodir_get_addlisting_link($post_type).'" class="'.$a_class.'"> |
|
| 197 | + ' . sprintf(__('Add %s', 'geodirectory'), $cpt_name).'
|
|
| 198 | 198 | </a> |
| 199 | 199 | </li>'; |
| 200 | 200 | } |
@@ -218,14 +218,14 @@ discard block |
||
| 218 | 218 | * @since 1.0.0 |
| 219 | 219 | * @param string $menu_class The menu HTML class. |
| 220 | 220 | */ |
| 221 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);
|
|
| 221 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing '.$menu_class);
|
|
| 222 | 222 | /** |
| 223 | 223 | * Filter the sub menu li class. |
| 224 | 224 | * |
| 225 | 225 | * @since 1.0.0 |
| 226 | 226 | * @param string $menu_class The menu HTML class. |
| 227 | 227 | */ |
| 228 | - $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 228 | + $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);
|
|
| 229 | 229 | /** |
| 230 | 230 | * Filter the sub menu ul class. |
| 231 | 231 | * |
@@ -244,9 +244,9 @@ discard block |
||
| 244 | 244 | * @since 1.0.0 |
| 245 | 245 | */ |
| 246 | 246 | $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
| 247 | - $items .= '<li class="' . $li_class . '"> |
|
| 248 | - <a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>
|
|
| 249 | - <ul class="' . $sub_ul_class . '">'; |
|
| 247 | + $items .= '<li class="'.$li_class.'"> |
|
| 248 | + <a href="#" class="' . $a_class.'">'.__('Add Listing', 'geodirectory').'</a>
|
|
| 249 | + <ul class="' . $sub_ul_class.'">'; |
|
| 250 | 250 | |
| 251 | 251 | $post_types = geodir_get_posttypes('object');
|
| 252 | 252 | |
@@ -269,11 +269,11 @@ discard block |
||
| 269 | 269 | * @since 1.0.0 |
| 270 | 270 | * @param string $menu_class The menu HTML class. |
| 271 | 271 | */ |
| 272 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 272 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);
|
|
| 273 | 273 | $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
| 274 | - $items .= '<li class="' . $li_class . '"> |
|
| 275 | - <a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $sub_a_class . '"> |
|
| 276 | - ' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '
|
|
| 274 | + $items .= '<li class="'.$li_class.'"> |
|
| 275 | + <a href="' . geodir_get_addlisting_link($post_type).'" class="'.$sub_a_class.'"> |
|
| 276 | + ' . sprintf(__('Add %s', 'geodirectory'), $cpt_name).'
|
|
| 277 | 277 | </a> |
| 278 | 278 | </li>'; |
| 279 | 279 | } |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | $items .= ' </ul> '; |
| 288 | - $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 288 | + $items .= apply_filters('geodir_menu_after_sub_ul', '');
|
|
| 289 | 289 | $items .= '</li>'; |
| 290 | 290 | |
| 291 | 291 | } |
@@ -313,14 +313,14 @@ discard block |
||
| 313 | 313 | $geodir_theme_location = get_option('geodir_theme_location_nav');
|
| 314 | 314 | $geodir_theme_location_nav = array(); |
| 315 | 315 | if (empty($locations) && empty($geodir_theme_location)) {
|
| 316 | - $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 316 | + $menu = str_replace("</ul></div>", geodir_add_nav_menu_items()."</ul></div>", $menu);
|
|
| 317 | 317 | $geodir_theme_location_nav[] = $args['theme_location']; |
| 318 | 318 | update_option('geodir_theme_location_nav', $geodir_theme_location_nav);
|
| 319 | 319 | } |
| 320 | 320 | //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet. |
| 321 | 321 | // $menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);
|
| 322 | 322 | else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) |
| 323 | - $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 323 | + $menu = str_replace("</ul></div>", geodir_add_nav_menu_items()."</ul></div>", $menu);
|
|
| 324 | 324 | |
| 325 | 325 | return $menu; |
| 326 | 326 | |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | |
| 349 | 349 | if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {
|
| 350 | 350 | |
| 351 | - $items = $items . geodir_add_nav_menu_items(); |
|
| 351 | + $items = $items.geodir_add_nav_menu_items(); |
|
| 352 | 352 | return $items; |
| 353 | 353 | |
| 354 | 354 | } else {
|
@@ -373,12 +373,12 @@ discard block |
||
| 373 | 373 | |
| 374 | 374 | $taxonomies = geodir_get_taxonomies(); |
| 375 | 375 | $taxonomies = implode("','", $taxonomies);
|
| 376 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 376 | + $taxonomies = "'".$taxonomies."'"; |
|
| 377 | 377 | |
| 378 | 378 | $pn_categories = $wpdb->get_results( |
| 379 | 379 | $wpdb->prepare( |
| 380 | 380 | "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy, $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name", |
| 381 | - array($wpdb->terms . term_id) |
|
| 381 | + array($wpdb->terms.term_id) |
|
| 382 | 382 | ) |
| 383 | 383 | ); |
| 384 | 384 | |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | |
| 408 | 408 | if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
|
| 409 | 409 | if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
| 410 | - $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 410 | + $geodir_post_type = get_post_type((int) $_REQUEST['pid']); |
|
| 411 | 411 | elseif (isset($_REQUEST['listing_type'])) |
| 412 | 412 | $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
| 413 | 413 | } |
@@ -425,7 +425,7 @@ discard block |
||
| 425 | 425 | if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) |
| 426 | 426 | $geodir_post_type = ''; |
| 427 | 427 | |
| 428 | - if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){
|
|
| 428 | + if (defined('DOING_AJAX') && isset($_REQUEST['stype'])) {
|
|
| 429 | 429 | $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
| 430 | 430 | } |
| 431 | 431 | |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | * |
| 436 | 436 | * @since 1.6.9 |
| 437 | 437 | */ |
| 438 | - return apply_filters('geodir_get_current_posttype',$geodir_post_type);
|
|
| 438 | + return apply_filters('geodir_get_current_posttype', $geodir_post_type);
|
|
| 439 | 439 | } |
| 440 | 440 | |
| 441 | 441 | /** |
@@ -449,18 +449,18 @@ discard block |
||
| 449 | 449 | */ |
| 450 | 450 | function geodir_get_default_posttype() |
| 451 | 451 | {
|
| 452 | - $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) ); |
|
| 452 | + $post_types = apply_filters('geodir_get_default_posttype', geodir_get_posttypes('object'));
|
|
| 453 | 453 | |
| 454 | 454 | $stype = false; |
| 455 | - foreach ( $post_types as $post_type => $info ) {
|
|
| 455 | + foreach ($post_types as $post_type => $info) {
|
|
| 456 | 456 | global $wpdb; |
| 457 | - $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) ); |
|
| 458 | - if ( $has_posts ) {
|
|
| 457 | + $has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));
|
|
| 458 | + if ($has_posts) {
|
|
| 459 | 459 | $stype = $post_type; break; |
| 460 | 460 | } |
| 461 | 461 | } |
| 462 | 462 | |
| 463 | - if(!$stype){
|
|
| 463 | + if (!$stype) {
|
|
| 464 | 464 | $stype = 'gd_place'; |
| 465 | 465 | } |
| 466 | 466 | |
@@ -485,14 +485,14 @@ discard block |
||
| 485 | 485 | switch ($output): |
| 486 | 486 | case 'object': |
| 487 | 487 | case 'Object': |
| 488 | - $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types; |
|
| 488 | + $post_types = json_decode(json_encode($post_types), FALSE); //(object)$post_types; |
|
| 489 | 489 | break; |
| 490 | 490 | case 'array': |
| 491 | 491 | case 'Array': |
| 492 | - $post_types = (array)$post_types; |
|
| 492 | + $post_types = (array) $post_types; |
|
| 493 | 493 | break; |
| 494 | 494 | case 'options': |
| 495 | - $post_types = (array)$post_types; |
|
| 495 | + $post_types = (array) $post_types; |
|
| 496 | 496 | |
| 497 | 497 | $options = array(); |
| 498 | 498 | if (!empty($post_types)) {
|
@@ -610,15 +610,15 @@ discard block |
||
| 610 | 610 | |
| 611 | 611 | $categories = get_terms($taxonomies); |
| 612 | 612 | |
| 613 | - $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
|
|
| 613 | + $html .= '<option value="0">'.__('All', 'geodirectory').'</option>';
|
|
| 614 | 614 | |
| 615 | 615 | foreach ($categories as $category_obj) {
|
| 616 | 616 | $select_opt = ''; |
| 617 | 617 | if ($selected == $category_obj->term_id) {
|
| 618 | 618 | $select_opt = 'selected="selected"'; |
| 619 | 619 | } |
| 620 | - $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">' |
|
| 621 | - . ucfirst($category_obj->name) . '</option>'; |
|
| 620 | + $html .= '<option '.$select_opt.' value="'.$category_obj->term_id.'">' |
|
| 621 | + . ucfirst($category_obj->name).'</option>'; |
|
| 622 | 622 | } |
| 623 | 623 | |
| 624 | 624 | if ($echo) |
@@ -686,7 +686,7 @@ discard block |
||
| 686 | 686 | } elseif (isset($wp_query->tax_query->queries)) {
|
| 687 | 687 | $tax_arr = $wp_query->tax_query->queries; |
| 688 | 688 | //if tax query has 'relation' set then it will break wp_list_pluck so we remove it |
| 689 | - if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
|
|
| 689 | + if (isset($tax_arr['relation'])) {unset($tax_arr['relation']); }
|
|
| 690 | 690 | $taxonomies = wp_list_pluck($tax_arr, 'taxonomy'); |
| 691 | 691 | } |
| 692 | 692 | |
@@ -740,7 +740,7 @@ discard block |
||
| 740 | 740 | |
| 741 | 741 | if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
|
| 742 | 742 | if ($cat_parent == 0) {
|
| 743 | - $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display; |
|
| 743 | + $list_class = 'main_list gd-parent-cats-list gd-cats-display-'.$cat_display; |
|
| 744 | 744 | $main_list_class = 'class="main_list_selecter"'; |
| 745 | 745 | } else {
|
| 746 | 746 | //$display = 'display:none'; |
@@ -750,7 +750,7 @@ discard block |
||
| 750 | 750 | |
| 751 | 751 | if ($cat_display == 'checkbox' || $cat_display == 'radio') {
|
| 752 | 752 | $p = 0; |
| 753 | - $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 753 | + $out = '<div class="'.$list_class.' gd-cat-row-'.$cat_parent.'" style="margin-left:'.$p.'px;'.$display.';">'; |
|
| 754 | 754 | } |
| 755 | 755 | |
| 756 | 756 | foreach ($cat_terms as $cat_term) {
|
@@ -765,12 +765,12 @@ discard block |
||
| 765 | 765 | } |
| 766 | 766 | |
| 767 | 767 | if ($cat_display == 'radio') |
| 768 | - $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 768 | + $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category['.$cat_term->taxonomy.'][]" '.$main_list_class.' alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' id="gd-cat-'.$cat_term->term_id.'" >'.$term_check.ucfirst($cat_term->name).'</span>'; |
|
| 769 | 769 | elseif ($cat_display == 'select' || $cat_display == 'multiselect') |
| 770 | - $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>'; |
|
| 770 | + $out .= '<option '.$main_list_class.' style="margin-left:'.$p.'px;" alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' >'.$term_check.ucfirst($cat_term->name).'</option>'; |
|
| 771 | 771 | |
| 772 | 772 | else {
|
| 773 | - $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 773 | + $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category['.$cat_term->taxonomy.'][]" '.$main_list_class.' alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' id="gd-cat-'.$cat_term->term_id.'" >'.$term_check.ucfirst($cat_term->name).'</span>'; |
|
| 774 | 774 | } |
| 775 | 775 | |
| 776 | 776 | // Call recurson to print sub cats |
@@ -809,7 +809,7 @@ discard block |
||
| 809 | 809 | $cat_exclude = serialize($exclude_cats); |
| 810 | 810 | |
| 811 | 811 | if (isset($_REQUEST['backandedit'])) {
|
| 812 | - $post = (object)$gd_session->get('listing');
|
|
| 812 | + $post = (object) $gd_session->get('listing');
|
|
| 813 | 813 | |
| 814 | 814 | if (!is_array($post->post_category[$cat_taxonomy])) |
| 815 | 815 | $post_category = $post->post_category[$cat_taxonomy]; |
@@ -841,7 +841,7 @@ discard block |
||
| 841 | 841 | |
| 842 | 842 | if (!empty($post_category)) {
|
| 843 | 843 | $cat1 = array_filter(explode(',', $post_category));
|
| 844 | - $post_category = ',' . implode(',', $cat1) . ',';
|
|
| 844 | + $post_category = ','.implode(',', $cat1).',';
|
|
| 845 | 845 | |
| 846 | 846 | } |
| 847 | 847 | |
@@ -852,7 +852,7 @@ discard block |
||
| 852 | 852 | foreach ($post_category_upd as $cat) {
|
| 853 | 853 | |
| 854 | 854 | if (!in_array($cat, $exclude_cats) && $cat != '') {
|
| 855 | - $post_category_change .= ',' . $cat; |
|
| 855 | + $post_category_change .= ','.$cat; |
|
| 856 | 856 | } |
| 857 | 857 | } |
| 858 | 858 | $post_category = $post_category_change; |
@@ -864,11 +864,11 @@ discard block |
||
| 864 | 864 | } |
| 865 | 865 | } |
| 866 | 866 | |
| 867 | - echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']" />'; |
|
| 867 | + echo '<input type="hidden" id="cat_limit" value="'.$cat_limit.'" name="cat_limit['.$cat_taxonomy.']" />'; |
|
| 868 | 868 | |
| 869 | - echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']" />'; |
|
| 869 | + echo '<input type="hidden" id="post_category" value="'.$post_category.'" name="post_category['.$cat_taxonomy.']" />'; |
|
| 870 | 870 | |
| 871 | - echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']" />'; |
|
| 871 | + echo '<input type="hidden" id="post_category_str" value="'.$post_category_str.'" name="post_category_str['.$cat_taxonomy.']" />'; |
|
| 872 | 872 | |
| 873 | 873 | |
| 874 | 874 | ?> |
@@ -887,14 +887,14 @@ discard block |
||
| 887 | 887 | |
| 888 | 888 | function show_subcatlist(main_cat, catObj) {
|
| 889 | 889 | if (main_cat != '') {
|
| 890 | - var url = '<?php echo geodir_get_ajax_url();?>'; |
|
| 891 | - var cat_taxonomy = '<?php echo $cat_taxonomy;?>'; |
|
| 892 | - var cat_exclude = '<?php echo base64_encode($cat_exclude);?>'; |
|
| 890 | + var url = '<?php echo geodir_get_ajax_url(); ?>'; |
|
| 891 | + var cat_taxonomy = '<?php echo $cat_taxonomy; ?>'; |
|
| 892 | + var cat_exclude = '<?php echo base64_encode($cat_exclude); ?>'; |
|
| 893 | 893 | var cat_limit = jQuery('#' + cat_taxonomy).find('#cat_limit').val();
|
| 894 | - <?php if ((int)$cat_limit > 0) { ?>
|
|
| 894 | + <?php if ((int) $cat_limit > 0) { ?>
|
|
| 895 | 895 | var selected = parseInt(jQuery('#' + cat_taxonomy).find('.cat_sublist > div.post_catlist_item').length);
|
| 896 | 896 | if (cat_limit != '' && selected > 0 && selected >= cat_limit && cat_limit != 0) {
|
| 897 | - alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int)$cat_limit));?>");
|
|
| 897 | + alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int) $cat_limit)); ?>");
|
|
| 898 | 898 | return false; |
| 899 | 899 | } |
| 900 | 900 | <?php } ?> |
@@ -933,7 +933,7 @@ discard block |
||
| 933 | 933 | } |
| 934 | 934 | |
| 935 | 935 | function update_listing_cat(el) {
|
| 936 | - var cat_taxonomy = '<?php echo $cat_taxonomy;?>'; |
|
| 936 | + var cat_taxonomy = '<?php echo $cat_taxonomy; ?>'; |
|
| 937 | 937 | var cat_ids = ''; |
| 938 | 938 | var main_cat = ''; |
| 939 | 939 | var sub_cat = ''; |
@@ -1014,7 +1014,7 @@ discard block |
||
| 1014 | 1014 | <div class="main_cat_list" style=" <?php if (isset($style)) {
|
| 1015 | 1015 | echo $style; |
| 1016 | 1016 | }?> "> |
| 1017 | - <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list |
|
| 1017 | + <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list |
|
| 1018 | 1018 | ?> |
| 1019 | 1019 | </div> |
| 1020 | 1020 | <?php |
@@ -1041,9 +1041,9 @@ discard block |
||
| 1041 | 1041 | if ($exclude != '') {
|
| 1042 | 1042 | $exclude_cats = maybe_unserialize(base64_decode($exclude)); |
| 1043 | 1043 | |
| 1044 | - if(is_array( $exclude_cats)){
|
|
| 1045 | - $exclude_cats = array_map( 'intval', $exclude_cats ); |
|
| 1046 | - }else{
|
|
| 1044 | + if (is_array($exclude_cats)) {
|
|
| 1045 | + $exclude_cats = array_map('intval', $exclude_cats);
|
|
| 1046 | + } else {
|
|
| 1047 | 1047 | $exclude_cats = intval($exclude_cats); |
| 1048 | 1048 | } |
| 1049 | 1049 | |
@@ -1057,25 +1057,25 @@ discard block |
||
| 1057 | 1057 | <?php $main_cat = get_term($parrent, $request_taxonomy); ?> |
| 1058 | 1058 | |
| 1059 | 1059 | <div class="post_catlist_item" style="border:1px solid #CCCCCC; margin:5px auto; padding:5px;"> |
| 1060 | - <img alt="move icon" src="<?php echo geodir_plugin_url() . '/geodirectory-assets/images/move.png';?>" |
|
| 1060 | + <img alt="move icon" src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png'; ?>" |
|
| 1061 | 1061 | onclick="jQuery(this).closest('div').remove();update_listing_cat(this);" align="right"/>
|
| 1062 | 1062 | <?php /* ?> |
| 1063 | 1063 | <img src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png';?>" onclick="jQuery(this).closest('div').remove();show_subcatlist();" align="right" />
|
| 1064 | 1064 | <?php */ ?> |
| 1065 | 1065 | |
| 1066 | - <input type="checkbox" value="<?php echo $main_cat->term_id;?>" class="listing_main_cat" |
|
| 1066 | + <input type="checkbox" value="<?php echo $main_cat->term_id; ?>" class="listing_main_cat" |
|
| 1067 | 1067 | onchange="if(jQuery(this).is(':checked')){jQuery(this).closest('div').find('.post_default_category').prop('checked',false).show();}else{jQuery(this).closest('div').find('.post_default_category').prop('checked',false).hide();};update_listing_cat()"
|
| 1068 | 1068 | checked="checked" disabled="disabled"/> |
| 1069 | 1069 | <span> |
| 1070 | - <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name));?>
|
|
| 1070 | + <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>
|
|
| 1071 | 1071 | </span> |
| 1072 | 1072 | <br/> |
| 1073 | 1073 | |
| 1074 | 1074 | <div class="post_default_category"> |
| 1075 | - <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id;?>" |
|
| 1076 | - onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" ';?> /> |
|
| 1075 | + <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id; ?>" |
|
| 1076 | + onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" '; ?> /> |
|
| 1077 | 1077 | <span> |
| 1078 | - <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name));?>
|
|
| 1078 | + <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>
|
|
| 1079 | 1079 | </span> |
| 1080 | 1080 | </div> |
| 1081 | 1081 | |
@@ -1108,7 +1108,7 @@ discard block |
||
| 1108 | 1108 | $post_cat_str = $post_categories[$request_taxonomy]; |
| 1109 | 1109 | $post_cat_array = explode("#", $post_cat_str);
|
| 1110 | 1110 | if (is_array($post_cat_array)) {
|
| 1111 | - $post_cat_array = array_unique( $post_cat_array ); |
|
| 1111 | + $post_cat_array = array_unique($post_cat_array); |
|
| 1112 | 1112 | |
| 1113 | 1113 | foreach ($post_cat_array as $post_cat_html) {
|
| 1114 | 1114 | |
@@ -1123,7 +1123,7 @@ discard block |
||
| 1123 | 1123 | } |
| 1124 | 1124 | $post_sub_catid = ''; |
| 1125 | 1125 | if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
| 1126 | - $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1126 | + $post_sub_catid = (int) $post_cat_info[1]; |
|
| 1127 | 1127 | } |
| 1128 | 1128 | |
| 1129 | 1129 | geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
@@ -1144,7 +1144,7 @@ discard block |
||
| 1144 | 1144 | } |
| 1145 | 1145 | |
| 1146 | 1146 | if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
| 1147 | - $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1147 | + $post_sub_catid = (int) $post_cat_info[1]; |
|
| 1148 | 1148 | } |
| 1149 | 1149 | |
| 1150 | 1150 | geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
@@ -1176,9 +1176,9 @@ discard block |
||
| 1176 | 1176 | if (!$selected) |
| 1177 | 1177 | $option_slected = ' selected="selected" '; |
| 1178 | 1178 | |
| 1179 | - echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >'; |
|
| 1179 | + echo '<select field_type="select" id="'.sanitize_text_field($cat_taxonomy).'" class="chosen_select" '.$onchange.' option-ajaxChosen="false" >'; |
|
| 1180 | 1180 | |
| 1181 | - echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
|
|
| 1181 | + echo '<option value="" '.$option_selected.' >'.__('Select Category', 'geodirectory').'</option>';
|
|
| 1182 | 1182 | |
| 1183 | 1183 | foreach ($cat_terms as $cat_term) {
|
| 1184 | 1184 | $option_selected = ''; |
@@ -1186,10 +1186,10 @@ discard block |
||
| 1186 | 1186 | $option_selected = ' selected="selected" '; |
| 1187 | 1187 | |
| 1188 | 1188 | // Count child terms |
| 1189 | - $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) ); |
|
| 1190 | - $has_child = !empty( $child_terms ) ? 't' : 'f'; |
|
| 1189 | + $child_terms = get_terms($cat_taxonomy, array('parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1));
|
|
| 1190 | + $has_child = !empty($child_terms) ? 't' : 'f'; |
|
| 1191 | 1191 | |
| 1192 | - echo '<option ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . ucfirst($cat_term->name) . '</option>'; |
|
| 1192 | + echo '<option '.$option_selected.' alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" _hc="'.$has_child.'" >'.ucfirst($cat_term->name).'</option>'; |
|
| 1193 | 1193 | } |
| 1194 | 1194 | echo '</select>'; |
| 1195 | 1195 | } |
@@ -1220,7 +1220,7 @@ discard block |
||
| 1220 | 1220 | 2 => __('Custom field updated.', 'geodirectory'),
|
| 1221 | 1221 | 3 => __('Custom field deleted.', 'geodirectory'),
|
| 1222 | 1222 | 4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
|
| 1223 | - 5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,
|
|
| 1223 | + 5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int) $_GET['revision'], false)) : false,
|
|
| 1224 | 1224 | 6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
| 1225 | 1225 | 7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
|
| 1226 | 1226 | 8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
|
@@ -1246,7 +1246,7 @@ discard block |
||
| 1246 | 1246 | |
| 1247 | 1247 | global $wpdb; |
| 1248 | 1248 | |
| 1249 | - $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico'; |
|
| 1249 | + $menu_icon = geodir_plugin_url().'/geodirectory-assets/images/favicon.ico'; |
|
| 1250 | 1250 | |
| 1251 | 1251 | if (!$listing_slug = get_option('geodir_listing_prefix'))
|
| 1252 | 1252 | $listing_slug = 'places'; |
@@ -1259,11 +1259,11 @@ discard block |
||
| 1259 | 1259 | |
| 1260 | 1260 | $gd_placetags = array(); |
| 1261 | 1261 | $gd_placetags['object_type'] = 'gd_place'; |
| 1262 | - $gd_placetags['listing_slug'] = $listing_slug . '/tags'; |
|
| 1262 | + $gd_placetags['listing_slug'] = $listing_slug.'/tags'; |
|
| 1263 | 1263 | $gd_placetags['args'] = array( |
| 1264 | 1264 | 'public' => true, |
| 1265 | 1265 | 'hierarchical' => false, |
| 1266 | - 'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
|
|
| 1266 | + 'rewrite' => array('slug' => $listing_slug.'/tags', 'with_front' => false, 'hierarchical' => true),
|
|
| 1267 | 1267 | 'query_var' => true, |
| 1268 | 1268 | |
| 1269 | 1269 | 'labels' => array( |
@@ -1357,7 +1357,7 @@ discard block |
||
| 1357 | 1357 | 'menu_icon' => $menu_icon, |
| 1358 | 1358 | 'public' => true, |
| 1359 | 1359 | 'query_var' => true, |
| 1360 | - 'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
|
|
| 1360 | + 'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
|
|
| 1361 | 1361 | 'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
|
| 1362 | 1362 | 'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
|
| 1363 | 1363 | |
@@ -1390,12 +1390,12 @@ discard block |
||
| 1390 | 1390 | return $_REQUEST['lang']; |
| 1391 | 1391 | } |
| 1392 | 1392 | |
| 1393 | - $url = str_replace(array("http://","https://"),"",$url);
|
|
| 1393 | + $url = str_replace(array("http://", "https://"), "", $url);
|
|
| 1394 | 1394 | |
| 1395 | 1395 | // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
|
| 1396 | - $site_url = str_replace(array("http://","https://"),"",site_url());
|
|
| 1396 | + $site_url = str_replace(array("http://", "https://"), "", site_url());
|
|
| 1397 | 1397 | |
| 1398 | - $url = str_replace($site_url,"",$url); |
|
| 1398 | + $url = str_replace($site_url, "", $url); |
|
| 1399 | 1399 | |
| 1400 | 1400 | $segments = explode('/', trim($url, '/'));
|
| 1401 | 1401 | |
@@ -1465,17 +1465,17 @@ discard block |
||
| 1465 | 1465 | $slug = $post_types[$post->post_type]['rewrite']['slug']; |
| 1466 | 1466 | |
| 1467 | 1467 | // Alter the CPT slug if WPML is set to do so |
| 1468 | - if(function_exists('icl_object_id')){
|
|
| 1469 | - if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
|
|
| 1468 | + if (function_exists('icl_object_id')) {
|
|
| 1469 | + if (gd_wpml_slug_translation_turned_on($post->post_type) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
|
|
| 1470 | 1470 | |
| 1471 | 1471 | $org_slug = $slug; |
| 1472 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1472 | + $slug = apply_filters('wpml_translate_single_string',
|
|
| 1473 | 1473 | $slug, |
| 1474 | 1474 | 'WordPress', |
| 1475 | - 'URL slug: ' . $slug, |
|
| 1475 | + 'URL slug: '.$slug, |
|
| 1476 | 1476 | $language_code); |
| 1477 | 1477 | |
| 1478 | - if(!$slug){$slug = $org_slug;}
|
|
| 1478 | + if (!$slug) {$slug = $org_slug; }
|
|
| 1479 | 1479 | |
| 1480 | 1480 | } |
| 1481 | 1481 | } |
@@ -1497,11 +1497,11 @@ discard block |
||
| 1497 | 1497 | } |
| 1498 | 1498 | |
| 1499 | 1499 | $post_link = trailingslashit( |
| 1500 | - preg_replace( "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 ) |
|
| 1500 | + preg_replace("/".preg_quote($slug, "/")."/", $slug."/%gd_taxonomy%", $post_link, 1)
|
|
| 1501 | 1501 | ); |
| 1502 | 1502 | |
| 1503 | 1503 | if ($fix_url) {
|
| 1504 | - $post_link = $site_url . $post_link; |
|
| 1504 | + $post_link = $site_url.$post_link; |
|
| 1505 | 1505 | } |
| 1506 | 1506 | |
| 1507 | 1507 | if (isset($comment_post_cache[$post->ID])) {
|
@@ -1520,12 +1520,12 @@ discard block |
||
| 1520 | 1520 | $ID = $post->ID; |
| 1521 | 1521 | $post2 = $wpdb->get_row( |
| 1522 | 1522 | $wpdb->prepare( |
| 1523 | - "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1523 | + "SELECT * from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ", |
|
| 1524 | 1524 | array($post->ID) |
| 1525 | 1525 | ) |
| 1526 | 1526 | ); |
| 1527 | 1527 | |
| 1528 | - $post = (object)array_merge((array)$post, (array)$post2); |
|
| 1528 | + $post = (object) array_merge((array) $post, (array) $post2); |
|
| 1529 | 1529 | |
| 1530 | 1530 | $comment_post_cache[$post->ID] = $post; |
| 1531 | 1531 | } |
@@ -1534,7 +1534,7 @@ discard block |
||
| 1534 | 1534 | |
| 1535 | 1535 | if (false !== strpos($post_link, '%gd_taxonomy%')) {
|
| 1536 | 1536 | |
| 1537 | - if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
|
|
| 1537 | + if (apply_filters("geodir_add_location_url_to_url", get_option('geodir_add_location_url'), $post->post_type, $post)) {
|
|
| 1538 | 1538 | $location_request = ''; |
| 1539 | 1539 | |
| 1540 | 1540 | |
@@ -1548,7 +1548,7 @@ discard block |
||
| 1548 | 1548 | $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
| 1549 | 1549 | $post->country_slug = str_replace(']', '', $post->country_slug);
|
| 1550 | 1550 | |
| 1551 | - $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1551 | + $post_location = (object) array('country_slug' => $post->country_slug,
|
|
| 1552 | 1552 | 'region_slug' => $post->region_slug, |
| 1553 | 1553 | 'city_slug' => $post->city_slug |
| 1554 | 1554 | ); |
@@ -1561,7 +1561,7 @@ discard block |
||
| 1561 | 1561 | |
| 1562 | 1562 | $post_location_sql = $wpdb->get_results( |
| 1563 | 1563 | $wpdb->prepare( |
| 1564 | - "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1564 | + "SELECT post_locations from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ", |
|
| 1565 | 1565 | array($post->ID) |
| 1566 | 1566 | ) |
| 1567 | 1567 | ); |
@@ -1577,7 +1577,7 @@ discard block |
||
| 1577 | 1577 | $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
| 1578 | 1578 | $post->country_slug = str_replace(']', '', $post->country_slug);
|
| 1579 | 1579 | |
| 1580 | - $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1580 | + $post_location = (object) array('country_slug' => $post->country_slug,
|
|
| 1581 | 1581 | 'region_slug' => $post->region_slug, |
| 1582 | 1582 | 'city_slug' => $post->city_slug |
| 1583 | 1583 | ); |
@@ -1606,7 +1606,7 @@ discard block |
||
| 1606 | 1606 | } |
| 1607 | 1607 | $location_slug[] = $city_slug; |
| 1608 | 1608 | |
| 1609 | - $location_request .= implode('/', $location_slug) . '/';
|
|
| 1609 | + $location_request .= implode('/', $location_slug).'/';
|
|
| 1610 | 1610 | } |
| 1611 | 1611 | } |
| 1612 | 1612 | |
@@ -1665,14 +1665,14 @@ discard block |
||
| 1665 | 1665 | $request_term = trim($request_term, '/'); |
| 1666 | 1666 | |
| 1667 | 1667 | // Fix with WPML the location terms added twice when CPT slug is translated. |
| 1668 | - if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {
|
|
| 1668 | + if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/'.$request_term.$detailurl_separator) !== false) {
|
|
| 1669 | 1669 | $post_link = str_replace('%gd_taxonomy%/', '', $post_link);
|
| 1670 | 1670 | } |
| 1671 | 1671 | |
| 1672 | 1672 | if (!empty($request_term)) |
| 1673 | - $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1673 | + $post_link = str_replace('%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);
|
|
| 1674 | 1674 | else |
| 1675 | - $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1675 | + $post_link = str_replace('/%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);
|
|
| 1676 | 1676 | //echo $post_link ; |
| 1677 | 1677 | } |
| 1678 | 1678 | // temp cache the permalink |
@@ -1747,9 +1747,9 @@ discard block |
||
| 1747 | 1747 | $url_separator = ''; |
| 1748 | 1748 | |
| 1749 | 1749 | if (get_option('permalink_structure') != '') {
|
| 1750 | - $old_listing_slug = '/' . $listing_slug . '/'; |
|
| 1750 | + $old_listing_slug = '/'.$listing_slug.'/'; |
|
| 1751 | 1751 | $request_term = implode("/", $location_terms);
|
| 1752 | - $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/'; |
|
| 1752 | + $new_listing_slug = '/'.$listing_slug.'/'.$request_term.'/'; |
|
| 1753 | 1753 | |
| 1754 | 1754 | $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug)); |
| 1755 | 1755 | } else {
|
@@ -1769,25 +1769,25 @@ discard block |
||
| 1769 | 1769 | // Alter the CPT slug if WPML is set to do so |
| 1770 | 1770 | if (function_exists('icl_object_id')) {
|
| 1771 | 1771 | $post_types = get_option('geodir_post_types');
|
| 1772 | - $post_type = str_replace("category","",$taxonomy);
|
|
| 1773 | - $post_type = str_replace("_tags","",$post_type);
|
|
| 1772 | + $post_type = str_replace("category", "", $taxonomy);
|
|
| 1773 | + $post_type = str_replace("_tags", "", $post_type);
|
|
| 1774 | 1774 | $slug = $post_types[$post_type]['rewrite']['slug']; |
| 1775 | 1775 | if (gd_wpml_slug_translation_turned_on($post_type)) {
|
| 1776 | 1776 | global $sitepress; |
| 1777 | 1777 | $default_lang = $sitepress->get_default_language(); |
| 1778 | 1778 | $language_code = gd_wpml_get_lang_from_url($termlink); |
| 1779 | - if (!$language_code ) {
|
|
| 1780 | - $language_code = $default_lang; |
|
| 1779 | + if (!$language_code) {
|
|
| 1780 | + $language_code = $default_lang; |
|
| 1781 | 1781 | } |
| 1782 | 1782 | |
| 1783 | 1783 | $org_slug = $slug; |
| 1784 | - $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);
|
|
| 1784 | + $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: '.$slug, $language_code);
|
|
| 1785 | 1785 | |
| 1786 | 1786 | if (!$slug) {
|
| 1787 | 1787 | $slug = $org_slug; |
| 1788 | 1788 | } |
| 1789 | 1789 | |
| 1790 | - $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug ,$termlink, 1));
|
|
| 1790 | + $termlink = trailingslashit(preg_replace("/".preg_quote($org_slug, "/")."/", $slug, $termlink, 1));
|
|
| 1791 | 1791 | } |
| 1792 | 1792 | } |
| 1793 | 1793 | } |
@@ -1817,7 +1817,7 @@ discard block |
||
| 1817 | 1817 | |
| 1818 | 1818 | if (in_array($post_type, geodir_get_posttypes())) {
|
| 1819 | 1819 | if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {
|
| 1820 | - if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {
|
|
| 1820 | + if (geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {
|
|
| 1821 | 1821 | $location_terms = array( |
| 1822 | 1822 | 'gd_country' => $post->country_slug, |
| 1823 | 1823 | 'gd_region' => $post->region_slug, |
@@ -1834,7 +1834,7 @@ discard block |
||
| 1834 | 1834 | $location_terms = implode("/", $location_terms);
|
| 1835 | 1835 | $location_terms = rtrim($location_terms, '/'); |
| 1836 | 1836 | |
| 1837 | - $link .= urldecode($location_terms) . '/'; |
|
| 1837 | + $link .= urldecode($location_terms).'/'; |
|
| 1838 | 1838 | } else {
|
| 1839 | 1839 | $link = geodir_getlink($link, $location_terms); |
| 1840 | 1840 | } |
@@ -1922,9 +1922,9 @@ discard block |
||
| 1922 | 1922 | return 0; |
| 1923 | 1923 | $where = 't.term_id = %d'; |
| 1924 | 1924 | if (!empty($taxonomy)) |
| 1925 | - return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1925 | + return $wpdb->get_row($wpdb->prepare($tax_select.$where." AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1926 | 1926 | else |
| 1927 | - return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1927 | + return $wpdb->get_var($wpdb->prepare($select.$where, $term)); |
|
| 1928 | 1928 | } |
| 1929 | 1929 | |
| 1930 | 1930 | $term = trim(wp_unslash($term)); |
@@ -1936,7 +1936,7 @@ discard block |
||
| 1936 | 1936 | |
| 1937 | 1937 | $where_fields = array($slug); |
| 1938 | 1938 | if (!empty($taxonomy)) {
|
| 1939 | - $parent = (int)$parent; |
|
| 1939 | + $parent = (int) $parent; |
|
| 1940 | 1940 | if ($parent > 0) {
|
| 1941 | 1941 | $where_fields[] = $parent; |
| 1942 | 1942 | $else_where_fields[] = $parent; |
@@ -2000,13 +2000,13 @@ discard block |
||
| 2000 | 2000 | $post_types = geodir_get_posttypes(); |
| 2001 | 2001 | $tax_arr = array(); |
| 2002 | 2002 | foreach ($post_types as $post_type) {
|
| 2003 | - $tax_arr[] = "'" . $post_type . "category'"; |
|
| 2003 | + $tax_arr[] = "'".$post_type."category'"; |
|
| 2004 | 2004 | } |
| 2005 | 2005 | $tax_c = implode(',', $tax_arr);
|
| 2006 | 2006 | $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
|
| 2007 | 2007 | //$terms = get_terms( $taxonomy ); |
| 2008 | 2008 | |
| 2009 | - if($terms) {
|
|
| 2009 | + if ($terms) {
|
|
| 2010 | 2010 | foreach ($terms as $term) {
|
| 2011 | 2011 | $post_type = str_replace("category", "", $term->taxonomy);
|
| 2012 | 2012 | $a_terms[$post_type][] = $term; |
@@ -2014,7 +2014,7 @@ discard block |
||
| 2014 | 2014 | } |
| 2015 | 2015 | } |
| 2016 | 2016 | |
| 2017 | - if($a_terms) {
|
|
| 2017 | + if ($a_terms) {
|
|
| 2018 | 2018 | foreach ($a_terms as $pt => $t2) {
|
| 2019 | 2019 | |
| 2020 | 2020 | foreach ($t2 as $term) {
|
@@ -2039,7 +2039,7 @@ discard block |
||
| 2039 | 2039 | } |
| 2040 | 2040 | |
| 2041 | 2041 | if (is_ssl()) {
|
| 2042 | - $terms_icons = str_replace("http:","https:",$terms_icons );
|
|
| 2042 | + $terms_icons = str_replace("http:", "https:", $terms_icons);
|
|
| 2043 | 2043 | } |
| 2044 | 2044 | |
| 2045 | 2045 | return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
|
@@ -39,8 +39,9 @@ discard block |
||
| 39 | 39 | if (get_option('geodir_show_listing_nav')) {
|
| 40 | 40 | |
| 41 | 41 | $menu_class = ''; |
| 42 | - if (geodir_is_page('listing'))
|
|
| 43 | - $menu_class = 'current-menu-item'; |
|
| 42 | + if (geodir_is_page('listing')) { |
|
| 43 | + $menu_class = 'current-menu-item'; |
|
| 44 | + } |
|
| 44 | 45 | |
| 45 | 46 | |
| 46 | 47 | //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION |
@@ -52,8 +53,9 @@ discard block |
||
| 52 | 53 | if (in_array($post_type, $show_post_type_main_nav)) {
|
| 53 | 54 | if (get_post_type_archive_link($post_type)) {
|
| 54 | 55 | $menu_class = ''; |
| 55 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 56 | - $menu_class = 'current-menu-item'; |
|
| 56 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing')) { |
|
| 57 | + $menu_class = 'current-menu-item'; |
|
| 58 | + } |
|
| 57 | 59 | /** |
| 58 | 60 | * Filter the menu li class. |
| 59 | 61 | * |
@@ -130,8 +132,9 @@ discard block |
||
| 130 | 132 | if (get_post_type_archive_link($post_type)) {
|
| 131 | 133 | |
| 132 | 134 | $menu_class = ''; |
| 133 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 134 | - $menu_class = 'current-menu-item'; |
|
| 135 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing')) { |
|
| 136 | + $menu_class = 'current-menu-item'; |
|
| 137 | + } |
|
| 135 | 138 | |
| 136 | 139 | $items .= '<li class="' . $sub_li_class . '"> |
| 137 | 140 | <a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '"> |
@@ -159,8 +162,9 @@ discard block |
||
| 159 | 162 | if (get_option('geodir_show_addlisting_nav')) {
|
| 160 | 163 | |
| 161 | 164 | $menu_class = ''; |
| 162 | - if (geodir_is_page('add-listing'))
|
|
| 163 | - $menu_class = 'current-menu-item'; |
|
| 165 | + if (geodir_is_page('add-listing')) { |
|
| 166 | + $menu_class = 'current-menu-item'; |
|
| 167 | + } |
|
| 164 | 168 | |
| 165 | 169 | //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION |
| 166 | 170 | $post_types = geodir_get_posttypes('object');
|
@@ -176,8 +180,9 @@ discard block |
||
| 176 | 180 | if (geodir_get_addlisting_link($post_type)) {
|
| 177 | 181 | |
| 178 | 182 | $menu_class = ''; |
| 179 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 180 | - $menu_class = 'current-menu-item'; |
|
| 183 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing')) { |
|
| 184 | + $menu_class = 'current-menu-item'; |
|
| 185 | + } |
|
| 181 | 186 | /** |
| 182 | 187 | * Filter the menu li class. |
| 183 | 188 | * |
@@ -261,8 +266,9 @@ discard block |
||
| 261 | 266 | if (geodir_get_addlisting_link($post_type)) {
|
| 262 | 267 | |
| 263 | 268 | $menu_class = ''; |
| 264 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 265 | - $menu_class = 'current-menu-item'; |
|
| 269 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing')) { |
|
| 270 | + $menu_class = 'current-menu-item'; |
|
| 271 | + } |
|
| 266 | 272 | /** |
| 267 | 273 | * Filter the menu li class. |
| 268 | 274 | * |
@@ -319,8 +325,9 @@ discard block |
||
| 319 | 325 | } |
| 320 | 326 | //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet. |
| 321 | 327 | // $menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);
|
| 322 | - else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) |
|
| 323 | - $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 328 | + else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) { |
|
| 329 | + $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu); |
|
| 330 | + } |
|
| 324 | 331 | |
| 325 | 332 | return $menu; |
| 326 | 333 | |
@@ -406,24 +413,28 @@ discard block |
||
| 406 | 413 | $geodir_post_type = get_query_var('post_type');
|
| 407 | 414 | |
| 408 | 415 | if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
|
| 409 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 410 | - $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 411 | - elseif (isset($_REQUEST['listing_type'])) |
|
| 412 | - $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 416 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { |
|
| 417 | + $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 418 | + } elseif (isset($_REQUEST['listing_type'])) { |
|
| 419 | + $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 420 | + } |
|
| 413 | 421 | } |
| 414 | 422 | |
| 415 | - if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
|
|
| 416 | - $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 423 | + if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype'])) { |
|
| 424 | + $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 425 | + } |
|
| 417 | 426 | |
| 418 | - if (is_tax()) |
|
| 419 | - $geodir_post_type = geodir_get_taxonomy_posttype(); |
|
| 427 | + if (is_tax()) { |
|
| 428 | + $geodir_post_type = geodir_get_taxonomy_posttype(); |
|
| 429 | + } |
|
| 420 | 430 | |
| 421 | 431 | |
| 422 | 432 | $all_postypes = geodir_get_posttypes(); |
| 423 | 433 | $all_postypes = stripslashes_deep($all_postypes); |
| 424 | 434 | |
| 425 | - if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) |
|
| 426 | - $geodir_post_type = ''; |
|
| 435 | + if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) { |
|
| 436 | + $geodir_post_type = ''; |
|
| 437 | + } |
|
| 427 | 438 | |
| 428 | 439 | if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){
|
| 429 | 440 | $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
@@ -508,11 +519,12 @@ discard block |
||
| 508 | 519 | endswitch; |
| 509 | 520 | } |
| 510 | 521 | |
| 511 | - if (!empty($post_types)) |
|
| 512 | - return $post_types; |
|
| 513 | - else |
|
| 514 | - return array(); |
|
| 515 | -} |
|
| 522 | + if (!empty($post_types)) { |
|
| 523 | + return $post_types; |
|
| 524 | + } else { |
|
| 525 | + return array(); |
|
| 526 | + } |
|
| 527 | + } |
|
| 516 | 528 | |
| 517 | 529 | /** |
| 518 | 530 | * Get Custom Post Type info. |
@@ -529,9 +541,10 @@ discard block |
||
| 529 | 541 | $post_types = stripslashes_deep($post_types); |
| 530 | 542 | if (!empty($post_types) && $post_type != '') {
|
| 531 | 543 | return $post_types[$post_type]; |
| 532 | - } else |
|
| 533 | - return false; |
|
| 534 | -} |
|
| 544 | + } else { |
|
| 545 | + return false; |
|
| 546 | + } |
|
| 547 | + } |
|
| 535 | 548 | |
| 536 | 549 | if (!function_exists('geodir_get_taxonomies')) {
|
| 537 | 550 | /** |
@@ -555,18 +568,21 @@ discard block |
||
| 555 | 568 | $gd_taxonomies = array_keys($taxonomies); |
| 556 | 569 | |
| 557 | 570 | |
| 558 | - if ($post_type != '') |
|
| 559 | - $gd_taxonomies = array(); |
|
| 571 | + if ($post_type != '') { |
|
| 572 | + $gd_taxonomies = array(); |
|
| 573 | + } |
|
| 560 | 574 | |
| 561 | 575 | $i = 0; |
| 562 | 576 | foreach ($taxonomies as $taxonomy => $args) {
|
| 563 | 577 | |
| 564 | - if ($post_type != '' && $args['object_type'] == $post_type) |
|
| 565 | - $gd_taxonomies[] = $taxonomy; |
|
| 578 | + if ($post_type != '' && $args['object_type'] == $post_type) { |
|
| 579 | + $gd_taxonomies[] = $taxonomy; |
|
| 580 | + } |
|
| 566 | 581 | |
| 567 | 582 | if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {
|
| 568 | - if (array_search($taxonomy, $gd_taxonomies) !== false) |
|
| 569 | - unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]); |
|
| 583 | + if (array_search($taxonomy, $gd_taxonomies) !== false) { |
|
| 584 | + unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]); |
|
| 585 | + } |
|
| 570 | 586 | } |
| 571 | 587 | |
| 572 | 588 | } |
@@ -621,10 +637,11 @@ discard block |
||
| 621 | 637 | . ucfirst($category_obj->name) . '</option>'; |
| 622 | 638 | } |
| 623 | 639 | |
| 624 | - if ($echo) |
|
| 625 | - echo $html; |
|
| 626 | - else |
|
| 627 | - return $html; |
|
| 640 | + if ($echo) { |
|
| 641 | + echo $html; |
|
| 642 | + } else { |
|
| 643 | + return $html; |
|
| 644 | + } |
|
| 628 | 645 | } |
| 629 | 646 | } |
| 630 | 647 | |
@@ -658,11 +675,12 @@ discard block |
||
| 658 | 675 | |
| 659 | 676 | } |
| 660 | 677 | |
| 661 | - if (!empty($listing_slug)) |
|
| 662 | - return $listing_slug; |
|
| 663 | - else |
|
| 664 | - return false; |
|
| 665 | -} |
|
| 678 | + if (!empty($listing_slug)) { |
|
| 679 | + return $listing_slug; |
|
| 680 | + } else { |
|
| 681 | + return false; |
|
| 682 | + } |
|
| 683 | + } |
|
| 666 | 684 | |
| 667 | 685 | |
| 668 | 686 | /** |
@@ -693,16 +711,18 @@ discard block |
||
| 693 | 711 | if (!empty($taxonomies)) {
|
| 694 | 712 | foreach (geodir_get_posttypes() as $pt) {
|
| 695 | 713 | $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt); |
| 696 | - if (array_intersect($taxonomies, $object_taxonomies)) |
|
| 697 | - $post_type[] = $pt; |
|
| 714 | + if (array_intersect($taxonomies, $object_taxonomies)) { |
|
| 715 | + $post_type[] = $pt; |
|
| 716 | + } |
|
| 698 | 717 | } |
| 699 | 718 | } |
| 700 | 719 | |
| 701 | - if (!empty($post_type)) |
|
| 702 | - return $post_type[0]; |
|
| 703 | - else |
|
| 704 | - return false; |
|
| 705 | -} |
|
| 720 | + if (!empty($post_type)) { |
|
| 721 | + return $post_type[0]; |
|
| 722 | + } else { |
|
| 723 | + return false; |
|
| 724 | + } |
|
| 725 | + } |
|
| 706 | 726 | |
| 707 | 727 | if (!function_exists('geodir_custom_taxonomy_walker')) {
|
| 708 | 728 | /** |
@@ -758,18 +778,18 @@ discard block |
||
| 758 | 778 | $checked = ''; |
| 759 | 779 | |
| 760 | 780 | if (in_array($cat_term->term_id, $search_terms)) {
|
| 761 | - if ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 762 | - $checked = 'selected="selected"'; |
|
| 763 | - else |
|
| 764 | - $checked = 'checked="checked"'; |
|
| 781 | + if ($cat_display == 'select' || $cat_display == 'multiselect') { |
|
| 782 | + $checked = 'selected="selected"'; |
|
| 783 | + } else { |
|
| 784 | + $checked = 'checked="checked"'; |
|
| 785 | + } |
|
| 765 | 786 | } |
| 766 | 787 | |
| 767 | - if ($cat_display == 'radio') |
|
| 768 | - $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 769 | - elseif ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 770 | - $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>'; |
|
| 771 | - |
|
| 772 | - else {
|
|
| 788 | + if ($cat_display == 'radio') { |
|
| 789 | + $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 790 | + } elseif ($cat_display == 'select' || $cat_display == 'multiselect') { |
|
| 791 | + $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>'; |
|
| 792 | + } else {
|
|
| 773 | 793 | $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
| 774 | 794 | } |
| 775 | 795 | |
@@ -778,8 +798,9 @@ discard block |
||
| 778 | 798 | |
| 779 | 799 | } |
| 780 | 800 | |
| 781 | - if ($cat_display == 'checkbox' || $cat_display == 'radio') |
|
| 782 | - $out .= '</div>'; |
|
| 801 | + if ($cat_display == 'checkbox' || $cat_display == 'radio') { |
|
| 802 | + $out .= '</div>'; |
|
| 803 | + } |
|
| 783 | 804 | |
| 784 | 805 | return $out; |
| 785 | 806 | } |
@@ -805,18 +826,21 @@ discard block |
||
| 805 | 826 | global $exclude_cats, $gd_session; |
| 806 | 827 | |
| 807 | 828 | $cat_exclude = ''; |
| 808 | - if (is_array($exclude_cats) && !empty($exclude_cats)) |
|
| 809 | - $cat_exclude = serialize($exclude_cats); |
|
| 829 | + if (is_array($exclude_cats) && !empty($exclude_cats)) { |
|
| 830 | + $cat_exclude = serialize($exclude_cats); |
|
| 831 | + } |
|
| 810 | 832 | |
| 811 | 833 | if (isset($_REQUEST['backandedit'])) {
|
| 812 | 834 | $post = (object)$gd_session->get('listing');
|
| 813 | 835 | |
| 814 | - if (!is_array($post->post_category[$cat_taxonomy])) |
|
| 815 | - $post_category = $post->post_category[$cat_taxonomy]; |
|
| 836 | + if (!is_array($post->post_category[$cat_taxonomy])) { |
|
| 837 | + $post_category = $post->post_category[$cat_taxonomy]; |
|
| 838 | + } |
|
| 816 | 839 | |
| 817 | 840 | $post_categories = $post->post_category_str; |
| 818 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) |
|
| 819 | - $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 841 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) { |
|
| 842 | + $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 843 | + } |
|
| 820 | 844 | |
| 821 | 845 | } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
|
| 822 | 846 | global $post; |
@@ -1007,8 +1031,9 @@ discard block |
||
| 1007 | 1031 | if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
| 1008 | 1032 | $post_cat_str = $post_categories[$cat_taxonomy]; |
| 1009 | 1033 | $post_cat_array = explode("#", $post_cat_str);
|
| 1010 | - if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) |
|
| 1011 | - $style = "display:none;"; |
|
| 1034 | + if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) { |
|
| 1035 | + $style = "display:none;"; |
|
| 1036 | + } |
|
| 1012 | 1037 | } |
| 1013 | 1038 | ?> |
| 1014 | 1039 | <div class="main_cat_list" style=" <?php if (isset($style)) {
|
@@ -1043,7 +1068,7 @@ discard block |
||
| 1043 | 1068 | |
| 1044 | 1069 | if(is_array( $exclude_cats)){
|
| 1045 | 1070 | $exclude_cats = array_map( 'intval', $exclude_cats ); |
| 1046 | - }else{
|
|
| 1071 | + } else{
|
|
| 1047 | 1072 | $exclude_cats = intval($exclude_cats); |
| 1048 | 1073 | } |
| 1049 | 1074 | |
@@ -1073,7 +1098,10 @@ discard block |
||
| 1073 | 1098 | |
| 1074 | 1099 | <div class="post_default_category"> |
| 1075 | 1100 | <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id;?>" |
| 1076 | - onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" ';?> /> |
|
| 1101 | + onchange="update_listing_cat()" <?php if ($default) { |
|
| 1102 | + echo ' checked="checked" '; |
|
| 1103 | +} |
|
| 1104 | +?> /> |
|
| 1077 | 1105 | <span> |
| 1078 | 1106 | <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name));?>
|
| 1079 | 1107 | </span> |
@@ -1173,8 +1201,9 @@ discard block |
||
| 1173 | 1201 | $onchange = ' onchange="show_subcatlist(this.value, this)" '; |
| 1174 | 1202 | |
| 1175 | 1203 | $option_selected = ''; |
| 1176 | - if (!$selected) |
|
| 1177 | - $option_slected = ' selected="selected" '; |
|
| 1204 | + if (!$selected) { |
|
| 1205 | + $option_slected = ' selected="selected" '; |
|
| 1206 | + } |
|
| 1178 | 1207 | |
| 1179 | 1208 | echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >'; |
| 1180 | 1209 | |
@@ -1182,8 +1211,9 @@ discard block |
||
| 1182 | 1211 | |
| 1183 | 1212 | foreach ($cat_terms as $cat_term) {
|
| 1184 | 1213 | $option_selected = ''; |
| 1185 | - if ($selected == $cat_term->term_id) |
|
| 1186 | - $option_selected = ' selected="selected" '; |
|
| 1214 | + if ($selected == $cat_term->term_id) { |
|
| 1215 | + $option_selected = ' selected="selected" '; |
|
| 1216 | + } |
|
| 1187 | 1217 | |
| 1188 | 1218 | // Count child terms |
| 1189 | 1219 | $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) ); |
@@ -1248,8 +1278,9 @@ discard block |
||
| 1248 | 1278 | |
| 1249 | 1279 | $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico'; |
| 1250 | 1280 | |
| 1251 | - if (!$listing_slug = get_option('geodir_listing_prefix'))
|
|
| 1252 | - $listing_slug = 'places'; |
|
| 1281 | + if (!$listing_slug = get_option('geodir_listing_prefix')) { |
|
| 1282 | + $listing_slug = 'places'; |
|
| 1283 | + } |
|
| 1253 | 1284 | |
| 1254 | 1285 | /** |
| 1255 | 1286 | * Taxonomies |
@@ -1553,8 +1584,9 @@ discard block |
||
| 1553 | 1584 | 'city_slug' => $post->city_slug |
| 1554 | 1585 | ); |
| 1555 | 1586 | |
| 1556 | - } else |
|
| 1557 | - $post_location = geodir_get_location(); |
|
| 1587 | + } else { |
|
| 1588 | + $post_location = geodir_get_location(); |
|
| 1589 | + } |
|
| 1558 | 1590 | |
| 1559 | 1591 | |
| 1560 | 1592 | } else {
|
@@ -1583,8 +1615,9 @@ discard block |
||
| 1583 | 1615 | ); |
| 1584 | 1616 | |
| 1585 | 1617 | } |
| 1586 | - } else |
|
| 1587 | - $post_location = geodir_get_location(); |
|
| 1618 | + } else { |
|
| 1619 | + $post_location = geodir_get_location(); |
|
| 1620 | + } |
|
| 1588 | 1621 | } |
| 1589 | 1622 | |
| 1590 | 1623 | |
@@ -1627,8 +1660,9 @@ discard block |
||
| 1627 | 1660 | $post_terms = $post_terms[0]; |
| 1628 | 1661 | } |
| 1629 | 1662 | |
| 1630 | - if (!$post_terms) |
|
| 1631 | - $post_terms = geodir_get_post_meta($post->ID, 'default_category', true); |
|
| 1663 | + if (!$post_terms) { |
|
| 1664 | + $post_terms = geodir_get_post_meta($post->ID, 'default_category', true); |
|
| 1665 | + } |
|
| 1632 | 1666 | |
| 1633 | 1667 | if (!$post_terms) {
|
| 1634 | 1668 | $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true); |
@@ -1642,8 +1676,9 @@ discard block |
||
| 1642 | 1676 | |
| 1643 | 1677 | $term = get_term_by('id', $post_terms, $taxonomies);
|
| 1644 | 1678 | |
| 1645 | - if (!empty($term)) |
|
| 1646 | - $term_request = $term->slug; |
|
| 1679 | + if (!empty($term)) { |
|
| 1680 | + $term_request = $term->slug; |
|
| 1681 | + } |
|
| 1647 | 1682 | //$term_request = $term->slug.'/'; |
| 1648 | 1683 | } |
| 1649 | 1684 | |
@@ -1658,9 +1693,13 @@ discard block |
||
| 1658 | 1693 | $request_term .= $term_request; |
| 1659 | 1694 | |
| 1660 | 1695 | } else {
|
| 1661 | - if (isset($location_request) && $location_request != '') $request_term = $location_request; |
|
| 1696 | + if (isset($location_request) && $location_request != '') { |
|
| 1697 | + $request_term = $location_request; |
|
| 1698 | + } |
|
| 1662 | 1699 | |
| 1663 | - if (isset($term_request) && $term_request != '') $request_term .= $term_request; |
|
| 1700 | + if (isset($term_request) && $term_request != '') { |
|
| 1701 | + $request_term .= $term_request; |
|
| 1702 | + } |
|
| 1664 | 1703 | } |
| 1665 | 1704 | $request_term = trim($request_term, '/'); |
| 1666 | 1705 | |
@@ -1669,10 +1708,11 @@ discard block |
||
| 1669 | 1708 | $post_link = str_replace('%gd_taxonomy%/', '', $post_link);
|
| 1670 | 1709 | } |
| 1671 | 1710 | |
| 1672 | - if (!empty($request_term)) |
|
| 1673 | - $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1674 | - else |
|
| 1675 | - $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1711 | + if (!empty($request_term)) { |
|
| 1712 | + $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link); |
|
| 1713 | + } else { |
|
| 1714 | + $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link); |
|
| 1715 | + } |
|
| 1676 | 1716 | //echo $post_link ; |
| 1677 | 1717 | } |
| 1678 | 1718 | // temp cache the permalink |
@@ -1864,11 +1904,12 @@ discard block |
||
| 1864 | 1904 | |
| 1865 | 1905 | $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name; |
| 1866 | 1906 | |
| 1867 | - if ($echo) |
|
| 1868 | - echo $label; |
|
| 1869 | - else |
|
| 1870 | - return $label; |
|
| 1871 | -} |
|
| 1907 | + if ($echo) { |
|
| 1908 | + echo $label; |
|
| 1909 | + } else { |
|
| 1910 | + return $label; |
|
| 1911 | + } |
|
| 1912 | + } |
|
| 1872 | 1913 | |
| 1873 | 1914 | /** |
| 1874 | 1915 | * Print or Get post type plural label. |
@@ -1884,18 +1925,20 @@ discard block |
||
| 1884 | 1925 | function get_post_type_plural_label($post_type, $echo = false, $translate = false) {
|
| 1885 | 1926 | $all_postypes = geodir_get_posttypes(); |
| 1886 | 1927 | |
| 1887 | - if (!in_array($post_type, $all_postypes)) |
|
| 1888 | - return false; |
|
| 1928 | + if (!in_array($post_type, $all_postypes)) { |
|
| 1929 | + return false; |
|
| 1930 | + } |
|
| 1889 | 1931 | |
| 1890 | 1932 | $obj_post_type = get_post_type_object($post_type); |
| 1891 | 1933 | |
| 1892 | 1934 | $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name; |
| 1893 | 1935 | |
| 1894 | - if ($echo) |
|
| 1895 | - echo $label; |
|
| 1896 | - else |
|
| 1897 | - return $label; |
|
| 1898 | -} |
|
| 1936 | + if ($echo) { |
|
| 1937 | + echo $label; |
|
| 1938 | + } else { |
|
| 1939 | + return $label; |
|
| 1940 | + } |
|
| 1941 | + } |
|
| 1899 | 1942 | |
| 1900 | 1943 | /** |
| 1901 | 1944 | * Checks whether a term exists or not. |
@@ -1918,19 +1961,22 @@ discard block |
||
| 1918 | 1961 | $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE "; |
| 1919 | 1962 | |
| 1920 | 1963 | if (is_int($term)) {
|
| 1921 | - if (0 == $term) |
|
| 1922 | - return 0; |
|
| 1964 | + if (0 == $term) { |
|
| 1965 | + return 0; |
|
| 1966 | + } |
|
| 1923 | 1967 | $where = 't.term_id = %d'; |
| 1924 | - if (!empty($taxonomy)) |
|
| 1925 | - return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1926 | - else |
|
| 1927 | - return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1968 | + if (!empty($taxonomy)) { |
|
| 1969 | + return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1970 | + } else { |
|
| 1971 | + return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1972 | + } |
|
| 1928 | 1973 | } |
| 1929 | 1974 | |
| 1930 | 1975 | $term = trim(wp_unslash($term)); |
| 1931 | 1976 | |
| 1932 | - if ('' === $slug = sanitize_title($term))
|
|
| 1933 | - return 0; |
|
| 1977 | + if ('' === $slug = sanitize_title($term)) { |
|
| 1978 | + return 0; |
|
| 1979 | + } |
|
| 1934 | 1980 | |
| 1935 | 1981 | $where = 't.slug = %s'; |
| 1936 | 1982 | |
@@ -1947,14 +1993,16 @@ discard block |
||
| 1947 | 1993 | $where_fields[] = $taxonomy; |
| 1948 | 1994 | |
| 1949 | 1995 | |
| 1950 | - if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))
|
|
| 1951 | - return $result; |
|
| 1996 | + if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A)) { |
|
| 1997 | + return $result; |
|
| 1998 | + } |
|
| 1952 | 1999 | |
| 1953 | 2000 | return false; |
| 1954 | 2001 | } |
| 1955 | 2002 | |
| 1956 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
|
|
| 1957 | - return $result; |
|
| 2003 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields))) { |
|
| 2004 | + return $result; |
|
| 2005 | + } |
|
| 1958 | 2006 | |
| 1959 | 2007 | return false; |
| 1960 | 2008 | } |
