GeoDirectory /
geodirectory
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | function geodir_get_ajax_url() |
| 21 | 21 | {
|
| 22 | - return admin_url('admin-ajax.php?action=geodir_ajax_action');
|
|
| 22 | + return admin_url('admin-ajax.php?action=geodir_ajax_action');
|
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | ///////////////////// |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | add_filter('query_vars', 'geodir_add_geodir_page_var');
|
| 88 | 88 | add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8
|
| 89 | 89 | if (get_option('permalink_structure') != '')
|
| 90 | - add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 90 | + add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 91 | 91 | |
| 92 | 92 | add_filter('parse_query', 'geodir_modified_query');
|
| 93 | 93 | |
@@ -154,14 +154,14 @@ discard block |
||
| 154 | 154 | /* POST AND LOOP ACTIONS */ |
| 155 | 155 | //////////////////////// |
| 156 | 156 | if (!is_admin()) {
|
| 157 | - add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtual page from everywhere
|
|
| 158 | - add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);
|
|
| 159 | - /** Exclude Virtual Pages From Pages List **/ |
|
| 160 | - add_action('pre_get_posts', 'set_listing_request', 0);
|
|
| 161 | - add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);
|
|
| 162 | - add_filter('excerpt_more', 'geodir_excerpt_more', 1000);
|
|
| 163 | - add_filter('excerpt_length', 'geodir_excerpt_length', 1000);
|
|
| 164 | - add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter
|
|
| 157 | + add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtual page from everywhere
|
|
| 158 | + add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);
|
|
| 159 | + /** Exclude Virtual Pages From Pages List **/ |
|
| 160 | + add_action('pre_get_posts', 'set_listing_request', 0);
|
|
| 161 | + add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);
|
|
| 162 | + add_filter('excerpt_more', 'geodir_excerpt_more', 1000);
|
|
| 163 | + add_filter('excerpt_length', 'geodir_excerpt_length', 1000);
|
|
| 164 | + add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter
|
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | |
@@ -223,12 +223,12 @@ discard block |
||
| 223 | 223 | */ |
| 224 | 224 | function geodir_unset_prev_theme_nav_location($newname) |
| 225 | 225 | {
|
| 226 | - $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 227 | - if ($geodir_theme_location) {
|
|
| 228 | - update_option('geodir_theme_location_nav', $geodir_theme_location);
|
|
| 229 | - } else {
|
|
| 230 | - update_option('geodir_theme_location_nav', '');
|
|
| 231 | - } |
|
| 226 | + $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 227 | + if ($geodir_theme_location) {
|
|
| 228 | + update_option('geodir_theme_location_nav', $geodir_theme_location);
|
|
| 229 | + } else {
|
|
| 230 | + update_option('geodir_theme_location_nav', '');
|
|
| 231 | + } |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | /// add action for theme switch to blank previous theme navigation location setting |
@@ -249,42 +249,42 @@ discard block |
||
| 249 | 249 | */ |
| 250 | 250 | function geodir_add_post_filters() |
| 251 | 251 | {
|
| 252 | - /** |
|
| 253 | - * Contains all function for filtering listing. |
|
| 254 | - * |
|
| 255 | - * @since 1.0.0 |
|
| 256 | - * @package GeoDirectory |
|
| 257 | - */ |
|
| 258 | - include_once('geodirectory-functions/listing_filters.php');
|
|
| 252 | + /** |
|
| 253 | + * Contains all function for filtering listing. |
|
| 254 | + * |
|
| 255 | + * @since 1.0.0 |
|
| 256 | + * @package GeoDirectory |
|
| 257 | + */ |
|
| 258 | + include_once('geodirectory-functions/listing_filters.php');
|
|
| 259 | 259 | |
| 260 | - // Theme My Login compatibility fix |
|
| 261 | - if ( isset( $_REQUEST['geodir_search'] ) && class_exists( 'Theme_My_Login' ) ) {
|
|
| 262 | - remove_action( 'pre_get_posts', array( Theme_My_Login::get_object(), 'pre_get_posts' ) ); |
|
| 263 | - } |
|
| 260 | + // Theme My Login compatibility fix |
|
| 261 | + if ( isset( $_REQUEST['geodir_search'] ) && class_exists( 'Theme_My_Login' ) ) {
|
|
| 262 | + remove_action( 'pre_get_posts', array( Theme_My_Login::get_object(), 'pre_get_posts' ) ); |
|
| 263 | + } |
|
| 264 | 264 | |
| 265 | - if ( isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 266 | - add_filter( 'geodir_filter_widget_listings_fields', 'geodir_search_widget_location_filter_fields', 100, 3 ); |
|
| 267 | - add_filter( 'geodir_filter_widget_listings_orderby', 'geodir_search_widget_location_filter_orderby', 100, 3 ); |
|
| 268 | - } |
|
| 265 | + if ( isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 266 | + add_filter( 'geodir_filter_widget_listings_fields', 'geodir_search_widget_location_filter_fields', 100, 3 ); |
|
| 267 | + add_filter( 'geodir_filter_widget_listings_orderby', 'geodir_search_widget_location_filter_orderby', 100, 3 ); |
|
| 268 | + } |
|
| 269 | 269 | } |
| 270 | 270 | |
| 271 | 271 | |
| 272 | 272 | if (!function_exists('geodir_init_defaults')) {
|
| 273 | - /** |
|
| 274 | - * Calls the function to register the GeoDirectory default CPT and taxonomies. |
|
| 275 | - * |
|
| 276 | - * @since 1.0.0 |
|
| 277 | - * @package GeoDirectory |
|
| 278 | - */ |
|
| 279 | - function geodir_init_defaults() |
|
| 280 | - {
|
|
| 281 | - if (function_exists('geodir_register_defaults')) {
|
|
| 273 | + /** |
|
| 274 | + * Calls the function to register the GeoDirectory default CPT and taxonomies. |
|
| 275 | + * |
|
| 276 | + * @since 1.0.0 |
|
| 277 | + * @package GeoDirectory |
|
| 278 | + */ |
|
| 279 | + function geodir_init_defaults() |
|
| 280 | + {
|
|
| 281 | + if (function_exists('geodir_register_defaults')) {
|
|
| 282 | 282 | |
| 283 | - geodir_register_defaults(); |
|
| 283 | + geodir_register_defaults(); |
|
| 284 | 284 | |
| 285 | - } |
|
| 285 | + } |
|
| 286 | 286 | |
| 287 | - } |
|
| 287 | + } |
|
| 288 | 288 | } |
| 289 | 289 | |
| 290 | 290 | |
@@ -306,26 +306,26 @@ discard block |
||
| 306 | 306 | // CALLED ON 'sidebars_widgets' FILTER |
| 307 | 307 | |
| 308 | 308 | if (!function_exists('geodir_restrict_widget')) {
|
| 309 | - /** |
|
| 310 | - * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page. |
|
| 311 | - * |
|
| 312 | - * @global bool $is_listing Sets the global value to true if on a GD category page. False if not. |
|
| 313 | - * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not. |
|
| 314 | - * @since 1.0.0 |
|
| 315 | - * @package GeoDirectory |
|
| 316 | - */ |
|
| 317 | - function geodir_restrict_widget() |
|
| 318 | - {
|
|
| 319 | - global $is_listing, $is_single_place; |
|
| 309 | + /** |
|
| 310 | + * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page. |
|
| 311 | + * |
|
| 312 | + * @global bool $is_listing Sets the global value to true if on a GD category page. False if not. |
|
| 313 | + * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not. |
|
| 314 | + * @since 1.0.0 |
|
| 315 | + * @package GeoDirectory |
|
| 316 | + */ |
|
| 317 | + function geodir_restrict_widget() |
|
| 318 | + {
|
|
| 319 | + global $is_listing, $is_single_place; |
|
| 320 | 320 | |
| 321 | - // set is listing |
|
| 322 | - (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;
|
|
| 321 | + // set is listing |
|
| 322 | + (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;
|
|
| 323 | 323 | |
| 324 | - // set is single place |
|
| 325 | - (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;
|
|
| 324 | + // set is single place |
|
| 325 | + (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;
|
|
| 326 | 326 | |
| 327 | 327 | |
| 328 | - } |
|
| 328 | + } |
|
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | |
@@ -346,31 +346,31 @@ discard block |
||
| 346 | 346 | */ |
| 347 | 347 | function geodir_detail_page_sidebar_content_sorting() |
| 348 | 348 | {
|
| 349 | - $arr_detail_page_sidebar_content = |
|
| 350 | - /** |
|
| 351 | - * An array of functions to be called to be displayed on the details (post) page sidebar. |
|
| 352 | - * |
|
| 353 | - * This filter can be used to remove sections of the details page sidebar, |
|
| 354 | - * add new sections or rearrange the order of the sections. |
|
| 355 | - * |
|
| 356 | - * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.
|
|
| 357 | - * @since 1.0.0 |
|
| 358 | - */ |
|
| 359 | - apply_filters('geodir_detail_page_sidebar_content',
|
|
| 360 | - array('geodir_social_sharing_buttons',
|
|
| 361 | - 'geodir_detail_page_google_analytics', |
|
| 362 | - 'geodir_edit_post_link', |
|
| 363 | - 'geodir_detail_page_review_rating', |
|
| 364 | - 'geodir_detail_page_more_info' |
|
| 365 | - ) // end of array |
|
| 366 | - ); // end of apply filter |
|
| 367 | - if (!empty($arr_detail_page_sidebar_content)) {
|
|
| 368 | - foreach ($arr_detail_page_sidebar_content as $content_function) {
|
|
| 369 | - if (function_exists($content_function)) {
|
|
| 370 | - add_action('geodir_detail_page_sidebar', $content_function);
|
|
| 371 | - } |
|
| 372 | - } |
|
| 373 | - } |
|
| 349 | + $arr_detail_page_sidebar_content = |
|
| 350 | + /** |
|
| 351 | + * An array of functions to be called to be displayed on the details (post) page sidebar. |
|
| 352 | + * |
|
| 353 | + * This filter can be used to remove sections of the details page sidebar, |
|
| 354 | + * add new sections or rearrange the order of the sections. |
|
| 355 | + * |
|
| 356 | + * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.
|
|
| 357 | + * @since 1.0.0 |
|
| 358 | + */ |
|
| 359 | + apply_filters('geodir_detail_page_sidebar_content',
|
|
| 360 | + array('geodir_social_sharing_buttons',
|
|
| 361 | + 'geodir_detail_page_google_analytics', |
|
| 362 | + 'geodir_edit_post_link', |
|
| 363 | + 'geodir_detail_page_review_rating', |
|
| 364 | + 'geodir_detail_page_more_info' |
|
| 365 | + ) // end of array |
|
| 366 | + ); // end of apply filter |
|
| 367 | + if (!empty($arr_detail_page_sidebar_content)) {
|
|
| 368 | + foreach ($arr_detail_page_sidebar_content as $content_function) {
|
|
| 369 | + if (function_exists($content_function)) {
|
|
| 370 | + add_action('geodir_detail_page_sidebar', $content_function);
|
|
| 371 | + } |
|
| 372 | + } |
|
| 373 | + } |
|
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | add_action('geodir_after_edit_post_link', 'geodir_add_to_favourite_link', 1);
|
@@ -385,14 +385,14 @@ discard block |
||
| 385 | 385 | */ |
| 386 | 386 | function geodir_add_to_favourite_link() |
| 387 | 387 | {
|
| 388 | - global $post, $preview; |
|
| 389 | - if (!$preview && geodir_is_page('detail')) {
|
|
| 390 | - ?> |
|
| 388 | + global $post, $preview; |
|
| 389 | + if (!$preview && geodir_is_page('detail')) {
|
|
| 390 | + ?> |
|
| 391 | 391 | <p class="edit_link"> |
| 392 | 392 | <?php geodir_favourite_html($post->post_author, $post->ID); ?> |
| 393 | 393 | </p> |
| 394 | 394 | <?php |
| 395 | - } |
|
| 395 | + } |
|
| 396 | 396 | } |
| 397 | 397 | |
| 398 | 398 | /** |
@@ -406,41 +406,41 @@ discard block |
||
| 406 | 406 | */ |
| 407 | 407 | function geodir_social_sharing_buttons() |
| 408 | 408 | {
|
| 409 | - global $preview; |
|
| 410 | - ob_start(); // Start buffering; |
|
| 411 | - /** |
|
| 412 | - * This action is called before the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 413 | - * |
|
| 414 | - * @since 1.0.0 |
|
| 415 | - */ |
|
| 416 | - do_action('geodir_before_social_sharing_buttons');
|
|
| 417 | - if (!$preview) {
|
|
| 418 | - ?> |
|
| 409 | + global $preview; |
|
| 410 | + ob_start(); // Start buffering; |
|
| 411 | + /** |
|
| 412 | + * This action is called before the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 413 | + * |
|
| 414 | + * @since 1.0.0 |
|
| 415 | + */ |
|
| 416 | + do_action('geodir_before_social_sharing_buttons');
|
|
| 417 | + if (!$preview) {
|
|
| 418 | + ?> |
|
| 419 | 419 | <div class="likethis"> |
| 420 | 420 | <?php geodir_twitter_tweet_button(); ?> |
| 421 | 421 | <?php geodir_fb_like_button(); ?> |
| 422 | 422 | <?php geodir_google_plus_button(); ?> |
| 423 | 423 | </div> |
| 424 | 424 | <?php |
| 425 | - }// end of if, if its a preview or not |
|
| 426 | - |
|
| 427 | - /** |
|
| 428 | - * This action is called after the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 429 | - * |
|
| 430 | - * @since 1.0.0 |
|
| 431 | - */ |
|
| 432 | - do_action('geodir_after_social_sharing_buttons');
|
|
| 433 | - $content_html = ob_get_clean(); |
|
| 434 | - if (trim($content_html) != '') |
|
| 435 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 436 | - if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 437 | - /** |
|
| 438 | - * Filter the geodir_social_sharing_buttons() function content. |
|
| 439 | - * |
|
| 440 | - * @param string $content_html The output html of the geodir_social_sharing_buttons() function. |
|
| 441 | - */ |
|
| 442 | - echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);
|
|
| 443 | - } |
|
| 425 | + }// end of if, if its a preview or not |
|
| 426 | + |
|
| 427 | + /** |
|
| 428 | + * This action is called after the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 429 | + * |
|
| 430 | + * @since 1.0.0 |
|
| 431 | + */ |
|
| 432 | + do_action('geodir_after_social_sharing_buttons');
|
|
| 433 | + $content_html = ob_get_clean(); |
|
| 434 | + if (trim($content_html) != '') |
|
| 435 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 436 | + if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 437 | + /** |
|
| 438 | + * Filter the geodir_social_sharing_buttons() function content. |
|
| 439 | + * |
|
| 440 | + * @param string $content_html The output html of the geodir_social_sharing_buttons() function. |
|
| 441 | + */ |
|
| 442 | + echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);
|
|
| 443 | + } |
|
| 444 | 444 | |
| 445 | 445 | |
| 446 | 446 | } |
@@ -458,46 +458,46 @@ discard block |
||
| 458 | 458 | */ |
| 459 | 459 | function geodir_edit_post_link() |
| 460 | 460 | {
|
| 461 | - global $post, $preview; |
|
| 462 | - ob_start(); // Start buffering; |
|
| 463 | - /** |
|
| 464 | - * This is called before the edit post link html in the function geodir_edit_post_link() |
|
| 465 | - * |
|
| 466 | - * @since 1.0.0 |
|
| 467 | - */ |
|
| 468 | - do_action('geodir_before_edit_post_link');
|
|
| 469 | - if (!$preview) {
|
|
| 470 | - $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 461 | + global $post, $preview; |
|
| 462 | + ob_start(); // Start buffering; |
|
| 463 | + /** |
|
| 464 | + * This is called before the edit post link html in the function geodir_edit_post_link() |
|
| 465 | + * |
|
| 466 | + * @since 1.0.0 |
|
| 467 | + */ |
|
| 468 | + do_action('geodir_before_edit_post_link');
|
|
| 469 | + if (!$preview) {
|
|
| 470 | + $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 471 | 471 | |
| 472 | - if ($is_current_user_owner) {
|
|
| 473 | - $post_id = $post->ID; |
|
| 472 | + if ($is_current_user_owner) {
|
|
| 473 | + $post_id = $post->ID; |
|
| 474 | 474 | |
| 475 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 476 | - $post_id = (int)$_REQUEST['pid']; |
|
| 477 | - } |
|
| 475 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 476 | + $post_id = (int)$_REQUEST['pid']; |
|
| 477 | + } |
|
| 478 | 478 | |
| 479 | - $postlink = get_permalink(geodir_add_listing_page_id()); |
|
| 480 | - $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
|
| 481 | - echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 482 | - } |
|
| 483 | - }// end of if, if its a preview or not |
|
| 484 | - /** |
|
| 485 | - * This is called after the edit post link html in the function geodir_edit_post_link() |
|
| 486 | - * |
|
| 487 | - * @since 1.0.0 |
|
| 488 | - */ |
|
| 489 | - do_action('geodir_after_edit_post_link');
|
|
| 490 | - $content_html = ob_get_clean(); |
|
| 491 | - if (trim($content_html) != '') |
|
| 492 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 493 | - if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 494 | - /** |
|
| 495 | - * Filter the geodir_edit_post_link() function content. |
|
| 496 | - * |
|
| 497 | - * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 498 | - */ |
|
| 499 | - echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);
|
|
| 500 | - } |
|
| 479 | + $postlink = get_permalink(geodir_add_listing_page_id()); |
|
| 480 | + $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
|
| 481 | + echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 482 | + } |
|
| 483 | + }// end of if, if its a preview or not |
|
| 484 | + /** |
|
| 485 | + * This is called after the edit post link html in the function geodir_edit_post_link() |
|
| 486 | + * |
|
| 487 | + * @since 1.0.0 |
|
| 488 | + */ |
|
| 489 | + do_action('geodir_after_edit_post_link');
|
|
| 490 | + $content_html = ob_get_clean(); |
|
| 491 | + if (trim($content_html) != '') |
|
| 492 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 493 | + if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 494 | + /** |
|
| 495 | + * Filter the geodir_edit_post_link() function content. |
|
| 496 | + * |
|
| 497 | + * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 498 | + */ |
|
| 499 | + echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);
|
|
| 500 | + } |
|
| 501 | 501 | } |
| 502 | 502 | |
| 503 | 503 | /** |
@@ -511,42 +511,42 @@ discard block |
||
| 511 | 511 | */ |
| 512 | 512 | function geodir_detail_page_google_analytics() |
| 513 | 513 | {
|
| 514 | - global $post,$preview; |
|
| 515 | - if($preview){return '';}
|
|
| 516 | - $package_info = array(); |
|
| 517 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 514 | + global $post,$preview; |
|
| 515 | + if($preview){return '';}
|
|
| 516 | + $package_info = array(); |
|
| 517 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 518 | 518 | |
| 519 | - $id = trim(get_option('geodir_ga_account_id'));
|
|
| 519 | + $id = trim(get_option('geodir_ga_account_id'));
|
|
| 520 | 520 | |
| 521 | - if (!$id) {
|
|
| 522 | - return; //if no Google Analytics ID then bail. |
|
| 523 | - } |
|
| 521 | + if (!$id) {
|
|
| 522 | + return; //if no Google Analytics ID then bail. |
|
| 523 | + } |
|
| 524 | 524 | |
| 525 | - ob_start(); // Start buffering; |
|
| 526 | - /** |
|
| 527 | - * This is called before the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 528 | - * |
|
| 529 | - * @since 1.0.0 |
|
| 530 | - */ |
|
| 531 | - do_action('geodir_before_google_analytics');
|
|
| 525 | + ob_start(); // Start buffering; |
|
| 526 | + /** |
|
| 527 | + * This is called before the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 528 | + * |
|
| 529 | + * @since 1.0.0 |
|
| 530 | + */ |
|
| 531 | + do_action('geodir_before_google_analytics');
|
|
| 532 | 532 | |
| 533 | - $refresh_time = get_option('geodir_ga_refresh_time', 5);
|
|
| 534 | - /** |
|
| 535 | - * Filter the time interval to check & refresh new users results. |
|
| 536 | - * |
|
| 537 | - * @since 1.5.9 |
|
| 538 | - * |
|
| 539 | - * @param int $refresh_time Time interval to check & refresh new users results. |
|
| 540 | - */ |
|
| 541 | - $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);
|
|
| 542 | - $refresh_time = absint($refresh_time * 1000); |
|
| 533 | + $refresh_time = get_option('geodir_ga_refresh_time', 5);
|
|
| 534 | + /** |
|
| 535 | + * Filter the time interval to check & refresh new users results. |
|
| 536 | + * |
|
| 537 | + * @since 1.5.9 |
|
| 538 | + * |
|
| 539 | + * @param int $refresh_time Time interval to check & refresh new users results. |
|
| 540 | + */ |
|
| 541 | + $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);
|
|
| 542 | + $refresh_time = absint($refresh_time * 1000); |
|
| 543 | 543 | |
| 544 | - $hide_refresh = get_option('geodir_ga_auto_refresh');
|
|
| 544 | + $hide_refresh = get_option('geodir_ga_auto_refresh');
|
|
| 545 | 545 | |
| 546 | - $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
|
| 547 | - if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 548 | - $page_url = urlencode($_SERVER['REQUEST_URI']); |
|
| 549 | - ?> |
|
| 546 | + $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
|
| 547 | + if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 548 | + $page_url = urlencode($_SERVER['REQUEST_URI']); |
|
| 549 | + ?> |
|
| 550 | 550 | <script type="text/javascript"> |
| 551 | 551 | var gd_gaTimeOut; |
| 552 | 552 | var gd_gaTime = parseInt('<?php echo $refresh_time;?>');
|
@@ -798,15 +798,15 @@ discard block |
||
| 798 | 798 | var labels = results[1].rows.map(function(row) { return +row[0]; });
|
| 799 | 799 | |
| 800 | 800 | <?php |
| 801 | - // Here we list the shorthand days of the week so it can be used in translation. |
|
| 802 | - __("Mon",'geodirectory');
|
|
| 803 | - __("Tue",'geodirectory');
|
|
| 804 | - __("Wed",'geodirectory');
|
|
| 805 | - __("Thu",'geodirectory');
|
|
| 806 | - __("Fri",'geodirectory');
|
|
| 807 | - __("Sat",'geodirectory');
|
|
| 808 | - __("Sun",'geodirectory');
|
|
| 809 | - ?> |
|
| 801 | + // Here we list the shorthand days of the week so it can be used in translation. |
|
| 802 | + __("Mon",'geodirectory');
|
|
| 803 | + __("Tue",'geodirectory');
|
|
| 804 | + __("Wed",'geodirectory');
|
|
| 805 | + __("Thu",'geodirectory');
|
|
| 806 | + __("Fri",'geodirectory');
|
|
| 807 | + __("Sat",'geodirectory');
|
|
| 808 | + __("Sun",'geodirectory');
|
|
| 809 | + ?> |
|
| 810 | 810 | |
| 811 | 811 | labels = [ |
| 812 | 812 | "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",
|
@@ -1055,24 +1055,24 @@ discard block |
||
| 1055 | 1055 | </span> |
| 1056 | 1056 | |
| 1057 | 1057 | <?php |
| 1058 | - } |
|
| 1059 | - /** |
|
| 1060 | - * This is called after the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 1061 | - * |
|
| 1062 | - * @since 1.0.0 |
|
| 1063 | - */ |
|
| 1064 | - do_action('geodir_after_google_analytics');
|
|
| 1065 | - $content_html = ob_get_clean(); |
|
| 1066 | - if (trim($content_html) != '') |
|
| 1067 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1068 | - if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1069 | - /** |
|
| 1070 | - * Filter the geodir_edit_post_link() function content. |
|
| 1071 | - * |
|
| 1072 | - * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 1073 | - */ |
|
| 1074 | - echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);
|
|
| 1075 | - } |
|
| 1058 | + } |
|
| 1059 | + /** |
|
| 1060 | + * This is called after the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 1061 | + * |
|
| 1062 | + * @since 1.0.0 |
|
| 1063 | + */ |
|
| 1064 | + do_action('geodir_after_google_analytics');
|
|
| 1065 | + $content_html = ob_get_clean(); |
|
| 1066 | + if (trim($content_html) != '') |
|
| 1067 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1068 | + if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1069 | + /** |
|
| 1070 | + * Filter the geodir_edit_post_link() function content. |
|
| 1071 | + * |
|
| 1072 | + * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 1073 | + */ |
|
| 1074 | + echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);
|
|
| 1075 | + } |
|
| 1076 | 1076 | } |
| 1077 | 1077 | |
| 1078 | 1078 | /** |
@@ -1089,94 +1089,94 @@ discard block |
||
| 1089 | 1089 | */ |
| 1090 | 1090 | function geodir_detail_page_review_rating() |
| 1091 | 1091 | {
|
| 1092 | - global $post, $preview, $post_images; |
|
| 1092 | + global $post, $preview, $post_images; |
|
| 1093 | 1093 | |
| 1094 | - if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {
|
|
| 1095 | - return; |
|
| 1096 | - } |
|
| 1097 | - ob_start(); // Start buffering; |
|
| 1098 | - /** |
|
| 1099 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1100 | - * |
|
| 1101 | - * This is called outside the check for an actual rating and the check for preview page. |
|
| 1102 | - * |
|
| 1103 | - * @since 1.0.0 |
|
| 1104 | - */ |
|
| 1105 | - do_action('geodir_before_detail_page_review_rating');
|
|
| 1106 | - |
|
| 1107 | - $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1108 | - $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1109 | - |
|
| 1110 | - if ($post_avgratings != 0 && !$preview) {
|
|
| 1111 | - /** |
|
| 1112 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1113 | - * |
|
| 1114 | - * This is called inside the check for an actual rating and the check for preview page. |
|
| 1115 | - * |
|
| 1116 | - * @since 1.0.0 |
|
| 1117 | - * @param float $post_avgratings Average rating for the current post. |
|
| 1118 | - * @param int $post->ID Current post ID. |
|
| 1119 | - */ |
|
| 1120 | - do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1121 | - |
|
| 1122 | - $html = '<p style=" float:left;">'; |
|
| 1123 | - $html .= geodir_get_rating_stars($post_avgratings, $post->ID); |
|
| 1124 | - $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">'; |
|
| 1125 | - $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings; |
|
| 1094 | + if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {
|
|
| 1095 | + return; |
|
| 1096 | + } |
|
| 1097 | + ob_start(); // Start buffering; |
|
| 1098 | + /** |
|
| 1099 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1100 | + * |
|
| 1101 | + * This is called outside the check for an actual rating and the check for preview page. |
|
| 1102 | + * |
|
| 1103 | + * @since 1.0.0 |
|
| 1104 | + */ |
|
| 1105 | + do_action('geodir_before_detail_page_review_rating');
|
|
| 1106 | + |
|
| 1107 | + $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1108 | + $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1109 | + |
|
| 1110 | + if ($post_avgratings != 0 && !$preview) {
|
|
| 1111 | + /** |
|
| 1112 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1113 | + * |
|
| 1114 | + * This is called inside the check for an actual rating and the check for preview page. |
|
| 1115 | + * |
|
| 1116 | + * @since 1.0.0 |
|
| 1117 | + * @param float $post_avgratings Average rating for the current post. |
|
| 1118 | + * @param int $post->ID Current post ID. |
|
| 1119 | + */ |
|
| 1120 | + do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1121 | + |
|
| 1122 | + $html = '<p style=" float:left;">'; |
|
| 1123 | + $html .= geodir_get_rating_stars($post_avgratings, $post->ID); |
|
| 1124 | + $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">'; |
|
| 1125 | + $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings; |
|
| 1126 | 1126 | |
| 1127 | 1127 | $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');
|
| 1128 | 1128 | |
| 1129 | 1129 | $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';
|
| 1130 | 1130 | |
| 1131 | - $html .= '<span class="item">'; |
|
| 1132 | - $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1131 | + $html .= '<span class="item">'; |
|
| 1132 | + $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1133 | 1133 | |
| 1134 | - if ($post_images) {
|
|
| 1135 | - foreach ($post_images as $img) {
|
|
| 1136 | - $post_img = $img->src; |
|
| 1137 | - break; |
|
| 1138 | - } |
|
| 1139 | - } |
|
| 1140 | - |
|
| 1141 | - if (isset($post_img) && $post_img) {
|
|
| 1142 | - $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1143 | - } |
|
| 1144 | - |
|
| 1145 | - $html .= '</span>'; |
|
| 1146 | - |
|
| 1147 | - echo $html .= '</div>'; |
|
| 1148 | - /** |
|
| 1149 | - * This is called after the rating html in the function geodir_detail_page_review_rating(). |
|
| 1150 | - * |
|
| 1151 | - * This is called inside the check for an actual rating and the check for preview page. |
|
| 1152 | - * |
|
| 1153 | - * @since 1.0.0 |
|
| 1154 | - * @param float $post_avgratings Average rating for the current post. |
|
| 1155 | - * @param int $post->ID Current post ID. |
|
| 1156 | - */ |
|
| 1157 | - do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1158 | - } |
|
| 1159 | - /** |
|
| 1160 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1161 | - * |
|
| 1162 | - * This is called outside the check for an actual rating and the check for preview page. |
|
| 1163 | - * |
|
| 1164 | - * @since 1.0.0 |
|
| 1165 | - */ |
|
| 1166 | - do_action('geodir_after_detail_page_review_rating');
|
|
| 1167 | - $content_html = ob_get_clean(); |
|
| 1168 | - if (trim($content_html) != '') {
|
|
| 1169 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1170 | - } |
|
| 1171 | - if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1172 | - /** |
|
| 1173 | - * Filter the geodir_detail_page_review_rating() function content. |
|
| 1174 | - * |
|
| 1175 | - * @since 1.0.0 |
|
| 1176 | - * @param string $content_html The output html of the geodir_detail_page_review_rating() function. |
|
| 1177 | - */ |
|
| 1178 | - echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);
|
|
| 1179 | - } |
|
| 1134 | + if ($post_images) {
|
|
| 1135 | + foreach ($post_images as $img) {
|
|
| 1136 | + $post_img = $img->src; |
|
| 1137 | + break; |
|
| 1138 | + } |
|
| 1139 | + } |
|
| 1140 | + |
|
| 1141 | + if (isset($post_img) && $post_img) {
|
|
| 1142 | + $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1143 | + } |
|
| 1144 | + |
|
| 1145 | + $html .= '</span>'; |
|
| 1146 | + |
|
| 1147 | + echo $html .= '</div>'; |
|
| 1148 | + /** |
|
| 1149 | + * This is called after the rating html in the function geodir_detail_page_review_rating(). |
|
| 1150 | + * |
|
| 1151 | + * This is called inside the check for an actual rating and the check for preview page. |
|
| 1152 | + * |
|
| 1153 | + * @since 1.0.0 |
|
| 1154 | + * @param float $post_avgratings Average rating for the current post. |
|
| 1155 | + * @param int $post->ID Current post ID. |
|
| 1156 | + */ |
|
| 1157 | + do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1158 | + } |
|
| 1159 | + /** |
|
| 1160 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1161 | + * |
|
| 1162 | + * This is called outside the check for an actual rating and the check for preview page. |
|
| 1163 | + * |
|
| 1164 | + * @since 1.0.0 |
|
| 1165 | + */ |
|
| 1166 | + do_action('geodir_after_detail_page_review_rating');
|
|
| 1167 | + $content_html = ob_get_clean(); |
|
| 1168 | + if (trim($content_html) != '') {
|
|
| 1169 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1170 | + } |
|
| 1171 | + if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1172 | + /** |
|
| 1173 | + * Filter the geodir_detail_page_review_rating() function content. |
|
| 1174 | + * |
|
| 1175 | + * @since 1.0.0 |
|
| 1176 | + * @param string $content_html The output html of the geodir_detail_page_review_rating() function. |
|
| 1177 | + */ |
|
| 1178 | + echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);
|
|
| 1179 | + } |
|
| 1180 | 1180 | } |
| 1181 | 1181 | |
| 1182 | 1182 | /** |
@@ -1188,35 +1188,35 @@ discard block |
||
| 1188 | 1188 | */ |
| 1189 | 1189 | function geodir_detail_page_more_info() |
| 1190 | 1190 | {
|
| 1191 | - ob_start(); // Start buffering; |
|
| 1192 | - /** |
|
| 1193 | - * This is called before the info section html. |
|
| 1194 | - * |
|
| 1195 | - * @since 1.0.0 |
|
| 1196 | - */ |
|
| 1197 | - do_action('geodir_before_detail_page_more_info');
|
|
| 1198 | - if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {
|
|
| 1199 | - echo $geodir_post_detail_fields; |
|
| 1200 | - } |
|
| 1201 | - /** |
|
| 1202 | - * This is called after the info section html. |
|
| 1203 | - * |
|
| 1204 | - * @since 1.0.0 |
|
| 1205 | - */ |
|
| 1206 | - do_action('geodir_after_detail_page_more_info');
|
|
| 1207 | - |
|
| 1208 | - $content_html = ob_get_clean(); |
|
| 1209 | - if (trim($content_html) != '') |
|
| 1210 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1211 | - if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1212 | - /** |
|
| 1213 | - * Filter the output html for function geodir_detail_page_more_info(). |
|
| 1214 | - * |
|
| 1215 | - * @since 1.0.0 |
|
| 1216 | - * @param string $content_html The output html of the geodir_detail_page_more_info() function. |
|
| 1217 | - */ |
|
| 1218 | - echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);
|
|
| 1219 | - } |
|
| 1191 | + ob_start(); // Start buffering; |
|
| 1192 | + /** |
|
| 1193 | + * This is called before the info section html. |
|
| 1194 | + * |
|
| 1195 | + * @since 1.0.0 |
|
| 1196 | + */ |
|
| 1197 | + do_action('geodir_before_detail_page_more_info');
|
|
| 1198 | + if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {
|
|
| 1199 | + echo $geodir_post_detail_fields; |
|
| 1200 | + } |
|
| 1201 | + /** |
|
| 1202 | + * This is called after the info section html. |
|
| 1203 | + * |
|
| 1204 | + * @since 1.0.0 |
|
| 1205 | + */ |
|
| 1206 | + do_action('geodir_after_detail_page_more_info');
|
|
| 1207 | + |
|
| 1208 | + $content_html = ob_get_clean(); |
|
| 1209 | + if (trim($content_html) != '') |
|
| 1210 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1211 | + if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1212 | + /** |
|
| 1213 | + * Filter the output html for function geodir_detail_page_more_info(). |
|
| 1214 | + * |
|
| 1215 | + * @since 1.0.0 |
|
| 1216 | + * @param string $content_html The output html of the geodir_detail_page_more_info() function. |
|
| 1217 | + */ |
|
| 1218 | + echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);
|
|
| 1219 | + } |
|
| 1220 | 1220 | } |
| 1221 | 1221 | |
| 1222 | 1222 | |
@@ -1230,15 +1230,15 @@ discard block |
||
| 1230 | 1230 | */ |
| 1231 | 1231 | function geodir_localize_all_js_msg() |
| 1232 | 1232 | {// check_ajax_referer function is used to make sure no files are uploaded remotely but it will fail if used between https and non https so we do the check below of the urls
|
| 1233 | - if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1234 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 1235 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1236 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 1237 | - } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1238 | - $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 1239 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1240 | - $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 1241 | - } |
|
| 1233 | + if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1234 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 1235 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1236 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 1237 | + } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1238 | + $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 1239 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1240 | + $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 1241 | + } |
|
| 1242 | 1242 | |
| 1243 | 1243 | /** |
| 1244 | 1244 | * Filter the allowed image type extensions for post images. |
@@ -1248,60 +1248,60 @@ discard block |
||
| 1248 | 1248 | */ |
| 1249 | 1249 | $allowed_img_types = apply_filters('geodir_allowed_post_image_exts', array('jpg', 'jpeg', 'jpe', 'gif', 'png'));
|
| 1250 | 1250 | |
| 1251 | - $default_marker_icon = get_option('geodir_default_marker_icon');
|
|
| 1252 | - $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));
|
|
| 1253 | - $default_marker_width = $default_marker_size['w']; |
|
| 1254 | - $default_marker_height = $default_marker_size['h']; |
|
| 1251 | + $default_marker_icon = get_option('geodir_default_marker_icon');
|
|
| 1252 | + $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));
|
|
| 1253 | + $default_marker_width = $default_marker_size['w']; |
|
| 1254 | + $default_marker_height = $default_marker_size['h']; |
|
| 1255 | 1255 | |
| 1256 | - $arr_alert_msg = array( |
|
| 1257 | - 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 1258 | - 'geodir_admin_ajax_url' => $ajax_url, |
|
| 1259 | - 'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),
|
|
| 1260 | - 'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),
|
|
| 1261 | - 'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),
|
|
| 1262 | - 'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),
|
|
| 1263 | - //start not show alert msg |
|
| 1264 | - 'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),
|
|
| 1265 | - 'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),
|
|
| 1266 | - 'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),
|
|
| 1267 | - 'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),
|
|
| 1268 | - 'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),
|
|
| 1269 | - // end not show alert msg |
|
| 1270 | - 'my_place_listing_del' => __('Are you sure you wish to delete this listing?', 'geodirectory'),
|
|
| 1271 | - 'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),
|
|
| 1272 | - //start not show alert msg |
|
| 1273 | - 'rating_error_msg' => __('Error : please retry', 'geodirectory'),
|
|
| 1274 | - 'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),
|
|
| 1275 | - 'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),
|
|
| 1276 | - 'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),
|
|
| 1277 | - 'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),
|
|
| 1278 | - 'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),
|
|
| 1279 | - 'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),
|
|
| 1280 | - 'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),
|
|
| 1281 | - 'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),
|
|
| 1282 | - 'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),
|
|
| 1283 | - 'geodir_field_id_required' => __('This field is required.', 'geodirectory'),
|
|
| 1284 | - 'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),
|
|
| 1285 | - 'geodir_default_marker_icon' => $default_marker_icon, |
|
| 1286 | - 'geodir_default_marker_w' => $default_marker_width, |
|
| 1287 | - 'geodir_default_marker_h' => $default_marker_height, |
|
| 1288 | - 'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG, |
|
| 1289 | - 'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG, |
|
| 1290 | - 'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),
|
|
| 1291 | - 'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),
|
|
| 1292 | - 'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),
|
|
| 1293 | - 'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),
|
|
| 1294 | - 'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),
|
|
| 1295 | - 'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),
|
|
| 1296 | - /* on/off dragging for phone devices */ |
|
| 1297 | - 'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,
|
|
| 1298 | - 'geodir_is_mobile' => wp_is_mobile() ? true : false, |
|
| 1299 | - 'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),
|
|
| 1300 | - 'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),
|
|
| 1301 | - 'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),
|
|
| 1302 | - 'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),
|
|
| 1303 | - 'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),
|
|
| 1304 | - 'geodir_action_remove' => __('Remove', 'geodirectory'),
|
|
| 1256 | + $arr_alert_msg = array( |
|
| 1257 | + 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 1258 | + 'geodir_admin_ajax_url' => $ajax_url, |
|
| 1259 | + 'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),
|
|
| 1260 | + 'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),
|
|
| 1261 | + 'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),
|
|
| 1262 | + 'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),
|
|
| 1263 | + //start not show alert msg |
|
| 1264 | + 'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),
|
|
| 1265 | + 'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),
|
|
| 1266 | + 'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),
|
|
| 1267 | + 'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),
|
|
| 1268 | + 'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),
|
|
| 1269 | + // end not show alert msg |
|
| 1270 | + 'my_place_listing_del' => __('Are you sure you wish to delete this listing?', 'geodirectory'),
|
|
| 1271 | + 'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),
|
|
| 1272 | + //start not show alert msg |
|
| 1273 | + 'rating_error_msg' => __('Error : please retry', 'geodirectory'),
|
|
| 1274 | + 'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),
|
|
| 1275 | + 'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),
|
|
| 1276 | + 'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),
|
|
| 1277 | + 'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),
|
|
| 1278 | + 'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),
|
|
| 1279 | + 'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),
|
|
| 1280 | + 'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),
|
|
| 1281 | + 'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),
|
|
| 1282 | + 'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),
|
|
| 1283 | + 'geodir_field_id_required' => __('This field is required.', 'geodirectory'),
|
|
| 1284 | + 'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),
|
|
| 1285 | + 'geodir_default_marker_icon' => $default_marker_icon, |
|
| 1286 | + 'geodir_default_marker_w' => $default_marker_width, |
|
| 1287 | + 'geodir_default_marker_h' => $default_marker_height, |
|
| 1288 | + 'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG, |
|
| 1289 | + 'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG, |
|
| 1290 | + 'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),
|
|
| 1291 | + 'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),
|
|
| 1292 | + 'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),
|
|
| 1293 | + 'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),
|
|
| 1294 | + 'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),
|
|
| 1295 | + 'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),
|
|
| 1296 | + /* on/off dragging for phone devices */ |
|
| 1297 | + 'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,
|
|
| 1298 | + 'geodir_is_mobile' => wp_is_mobile() ? true : false, |
|
| 1299 | + 'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),
|
|
| 1300 | + 'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),
|
|
| 1301 | + 'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),
|
|
| 1302 | + 'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),
|
|
| 1303 | + 'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),
|
|
| 1304 | + 'geodir_action_remove' => __('Remove', 'geodirectory'),
|
|
| 1305 | 1305 | 'geodir_txt_all_files' => __('Allowed files', 'geodirectory'),
|
| 1306 | 1306 | 'geodir_err_file_type' => __('File type error. Allowed file types: %s', 'geodirectory'),
|
| 1307 | 1307 | 'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',
|
@@ -1309,40 +1309,40 @@ discard block |
||
| 1309 | 1309 | 'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),
|
| 1310 | 1310 | 'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',
|
| 1311 | 1311 | 'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',
|
| 1312 | - 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
|
| 1313 | - 'geodir_map_name' => geodir_map_name(), |
|
| 1314 | - 'osmStart' => __('Start', 'geodirectory'),
|
|
| 1315 | - 'osmVia' => __('Via {viaNumber}', 'geodirectory'),
|
|
| 1316 | - 'osmEnd' => __('Enter Your Location', 'geodirectory'),
|
|
| 1317 | - 'ga_delete_check' => __('Are you wish to Deauthorize and break Analytics?', 'geodirectory'),
|
|
| 1318 | - 'geoMyLocation' => __('My Location', 'geodirectory'),
|
|
| 1319 | - 'geoErrUNKNOWN_ERROR' => addslashes(__('Unable to find your location', 'geodirectory')),
|
|
| 1320 | - 'geoErrPERMISSION_DENINED' => addslashes(__('Permission denied in finding your location', 'geodirectory')),
|
|
| 1321 | - 'geoErrPOSITION_UNAVAILABLE' => addslashes(__('Your location is currently unknown', 'geodirectory')),
|
|
| 1322 | - 'geoErrBREAK' => addslashes(__('Attempt to find location took too long', 'geodirectory')),
|
|
| 1323 | - 'geoErrDEFAULT' => addslashes(__('Location detection not supported in browser', 'geodirectory')),
|
|
| 1324 | - ); |
|
| 1325 | - |
|
| 1326 | - /** |
|
| 1327 | - * Filters the translated JS strings from function geodir_localize_all_js_msg(). |
|
| 1328 | - * |
|
| 1329 | - * With this filter you can add, remove or change translated JS strings. |
|
| 1330 | - * You should add your own translations to this if you are building an addon rather than adding another script block. |
|
| 1331 | - * |
|
| 1332 | - * @since 1.0.0 |
|
| 1333 | - */ |
|
| 1334 | - $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
|
| 1335 | - |
|
| 1336 | - foreach ($arr_alert_msg as $key => $value) {
|
|
| 1337 | - if (!is_scalar($value)) |
|
| 1338 | - continue; |
|
| 1339 | - $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1340 | - } |
|
| 1312 | + 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
|
| 1313 | + 'geodir_map_name' => geodir_map_name(), |
|
| 1314 | + 'osmStart' => __('Start', 'geodirectory'),
|
|
| 1315 | + 'osmVia' => __('Via {viaNumber}', 'geodirectory'),
|
|
| 1316 | + 'osmEnd' => __('Enter Your Location', 'geodirectory'),
|
|
| 1317 | + 'ga_delete_check' => __('Are you wish to Deauthorize and break Analytics?', 'geodirectory'),
|
|
| 1318 | + 'geoMyLocation' => __('My Location', 'geodirectory'),
|
|
| 1319 | + 'geoErrUNKNOWN_ERROR' => addslashes(__('Unable to find your location', 'geodirectory')),
|
|
| 1320 | + 'geoErrPERMISSION_DENINED' => addslashes(__('Permission denied in finding your location', 'geodirectory')),
|
|
| 1321 | + 'geoErrPOSITION_UNAVAILABLE' => addslashes(__('Your location is currently unknown', 'geodirectory')),
|
|
| 1322 | + 'geoErrBREAK' => addslashes(__('Attempt to find location took too long', 'geodirectory')),
|
|
| 1323 | + 'geoErrDEFAULT' => addslashes(__('Location detection not supported in browser', 'geodirectory')),
|
|
| 1324 | + ); |
|
| 1325 | + |
|
| 1326 | + /** |
|
| 1327 | + * Filters the translated JS strings from function geodir_localize_all_js_msg(). |
|
| 1328 | + * |
|
| 1329 | + * With this filter you can add, remove or change translated JS strings. |
|
| 1330 | + * You should add your own translations to this if you are building an addon rather than adding another script block. |
|
| 1331 | + * |
|
| 1332 | + * @since 1.0.0 |
|
| 1333 | + */ |
|
| 1334 | + $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
|
| 1341 | 1335 | |
| 1342 | - $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1343 | - echo '<script>'; |
|
| 1344 | - echo $script; |
|
| 1345 | - echo '</script>'; |
|
| 1336 | + foreach ($arr_alert_msg as $key => $value) {
|
|
| 1337 | + if (!is_scalar($value)) |
|
| 1338 | + continue; |
|
| 1339 | + $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1340 | + } |
|
| 1341 | + |
|
| 1342 | + $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1343 | + echo '<script>'; |
|
| 1344 | + echo $script; |
|
| 1345 | + echo '</script>'; |
|
| 1346 | 1346 | } |
| 1347 | 1347 | |
| 1348 | 1348 | add_action('admin_bar_menu', 'geodir_admin_bar_site_menu', 31);
|
@@ -1358,11 +1358,11 @@ discard block |
||
| 1358 | 1358 | */ |
| 1359 | 1359 | function geodir_admin_bar_site_menu($wp_admin_bar) |
| 1360 | 1360 | {
|
| 1361 | - if (get_option("geodir_installed")) {
|
|
| 1362 | - if (current_user_can('manage_options')) {
|
|
| 1363 | - $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));
|
|
| 1364 | - } |
|
| 1365 | - } |
|
| 1361 | + if (get_option("geodir_installed")) {
|
|
| 1362 | + if (current_user_can('manage_options')) {
|
|
| 1363 | + $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));
|
|
| 1364 | + } |
|
| 1365 | + } |
|
| 1366 | 1366 | } |
| 1367 | 1367 | |
| 1368 | 1368 | add_action('geodir_before_listing', 'geodir_display_sort_options'); /*function in custom_functions.php*/
|
@@ -1388,25 +1388,25 @@ discard block |
||
| 1388 | 1388 | */ |
| 1389 | 1389 | function geodir_store_sidebars() |
| 1390 | 1390 | {
|
| 1391 | - global $geodir_sidebars; |
|
| 1392 | - global $sidebars_widgets; |
|
| 1393 | - |
|
| 1394 | - if (!is_array($sidebars_widgets)) |
|
| 1395 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1396 | - $geodir_old_sidebars = array(); |
|
| 1397 | - |
|
| 1398 | - if (is_array($geodir_sidebars)) {
|
|
| 1399 | - foreach ($geodir_sidebars as $val) {
|
|
| 1400 | - if (is_array($sidebars_widgets)) {
|
|
| 1401 | - if (array_key_exists($val, $sidebars_widgets)) |
|
| 1402 | - $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1403 | - else |
|
| 1404 | - $geodir_old_sidebars[$val] = array(); |
|
| 1405 | - } |
|
| 1406 | - } |
|
| 1407 | - } |
|
| 1408 | - update_option('geodir_sidebars', $geodir_old_sidebars);
|
|
| 1409 | - geodir_option_version_backup('geodir_sidebars');
|
|
| 1391 | + global $geodir_sidebars; |
|
| 1392 | + global $sidebars_widgets; |
|
| 1393 | + |
|
| 1394 | + if (!is_array($sidebars_widgets)) |
|
| 1395 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1396 | + $geodir_old_sidebars = array(); |
|
| 1397 | + |
|
| 1398 | + if (is_array($geodir_sidebars)) {
|
|
| 1399 | + foreach ($geodir_sidebars as $val) {
|
|
| 1400 | + if (is_array($sidebars_widgets)) {
|
|
| 1401 | + if (array_key_exists($val, $sidebars_widgets)) |
|
| 1402 | + $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1403 | + else |
|
| 1404 | + $geodir_old_sidebars[$val] = array(); |
|
| 1405 | + } |
|
| 1406 | + } |
|
| 1407 | + } |
|
| 1408 | + update_option('geodir_sidebars', $geodir_old_sidebars);
|
|
| 1409 | + geodir_option_version_backup('geodir_sidebars');
|
|
| 1410 | 1410 | |
| 1411 | 1411 | } |
| 1412 | 1412 | |
@@ -1420,28 +1420,28 @@ discard block |
||
| 1420 | 1420 | */ |
| 1421 | 1421 | function geodir_restore_sidebars() |
| 1422 | 1422 | {
|
| 1423 | - global $sidebars_widgets; |
|
| 1424 | - |
|
| 1425 | - if (!is_array($sidebars_widgets)) |
|
| 1426 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1427 | - |
|
| 1428 | - if (is_array($sidebars_widgets)) {
|
|
| 1429 | - $geodir_old_sidebars = get_option('geodir_sidebars');
|
|
| 1430 | - if (is_array($geodir_old_sidebars)) {
|
|
| 1431 | - foreach ($geodir_old_sidebars as $key => $val) {
|
|
| 1432 | - if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1433 | - {
|
|
| 1434 | - $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1435 | - } |
|
| 1423 | + global $sidebars_widgets; |
|
| 1436 | 1424 | |
| 1425 | + if (!is_array($sidebars_widgets)) |
|
| 1426 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1437 | 1427 | |
| 1438 | - } |
|
| 1439 | - } |
|
| 1428 | + if (is_array($sidebars_widgets)) {
|
|
| 1429 | + $geodir_old_sidebars = get_option('geodir_sidebars');
|
|
| 1430 | + if (is_array($geodir_old_sidebars)) {
|
|
| 1431 | + foreach ($geodir_old_sidebars as $key => $val) {
|
|
| 1432 | + if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1433 | + {
|
|
| 1434 | + $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1435 | + } |
|
| 1440 | 1436 | |
| 1441 | - } |
|
| 1442 | 1437 | |
| 1443 | - update_option('sidebars_widgets', $sidebars_widgets);
|
|
| 1444 | - update_option('geodir_sidebars', '');
|
|
| 1438 | + } |
|
| 1439 | + } |
|
| 1440 | + |
|
| 1441 | + } |
|
| 1442 | + |
|
| 1443 | + update_option('sidebars_widgets', $sidebars_widgets);
|
|
| 1444 | + update_option('geodir_sidebars', '');
|
|
| 1445 | 1445 | } |
| 1446 | 1446 | |
| 1447 | 1447 | add_action('geodir_after_listing_post_gridview', 'geodir_after_listing_post_gridview');
|
@@ -1454,9 +1454,9 @@ discard block |
||
| 1454 | 1454 | */ |
| 1455 | 1455 | function geodir_after_listing_post_gridview() |
| 1456 | 1456 | {
|
| 1457 | - global $gridview_columns; |
|
| 1457 | + global $gridview_columns; |
|
| 1458 | 1458 | |
| 1459 | - $gridview_columns = ''; |
|
| 1459 | + $gridview_columns = ''; |
|
| 1460 | 1460 | |
| 1461 | 1461 | } |
| 1462 | 1462 | |
@@ -1484,11 +1484,11 @@ discard block |
||
| 1484 | 1484 | */ |
| 1485 | 1485 | function so_handle_038($url, $original_url, $_context) |
| 1486 | 1486 | {
|
| 1487 | - if (strstr($url, "maps.google.com/maps/api/js") !== false) {
|
|
| 1488 | - $url = str_replace("&", "&", $url); // or $url = $original_url
|
|
| 1489 | - } |
|
| 1487 | + if (strstr($url, "maps.google.com/maps/api/js") !== false) {
|
|
| 1488 | + $url = str_replace("&", "&", $url); // or $url = $original_url
|
|
| 1489 | + } |
|
| 1490 | 1490 | |
| 1491 | - return $url; |
|
| 1491 | + return $url; |
|
| 1492 | 1492 | } |
| 1493 | 1493 | |
| 1494 | 1494 | |
@@ -1504,34 +1504,34 @@ discard block |
||
| 1504 | 1504 | function geodir_after_main_form_fields() {
|
| 1505 | 1505 | global $gd_session; |
| 1506 | 1506 | |
| 1507 | - if (get_option('geodir_accept_term_condition')) {
|
|
| 1508 | - global $post; |
|
| 1509 | - $term_condition = ''; |
|
| 1510 | - if (isset($_REQUEST['backandedit'])) {
|
|
| 1511 | - $post = (object)$gd_session->get('listing');
|
|
| 1512 | - $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
|
| 1513 | - } |
|
| 1514 | - |
|
| 1515 | - ?> |
|
| 1507 | + if (get_option('geodir_accept_term_condition')) {
|
|
| 1508 | + global $post; |
|
| 1509 | + $term_condition = ''; |
|
| 1510 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 1511 | + $post = (object)$gd_session->get('listing');
|
|
| 1512 | + $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
|
| 1513 | + } |
|
| 1514 | + |
|
| 1515 | + ?> |
|
| 1516 | 1516 | <div id="geodir_accept_term_condition_row" class="required_field geodir_form_row clearfix"> |
| 1517 | 1517 | <label> </label> |
| 1518 | 1518 | |
| 1519 | 1519 | <div class="geodir_taxonomy_field" style="float:left; width:70%;"> |
| 1520 | 1520 | <span style="display:block"> |
| 1521 | 1521 | <input class="main_list_selecter" type="checkbox" <?php if ($term_condition == '1') {
|
| 1522 | - echo 'checked="checked"'; |
|
| 1523 | - } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
|
| 1522 | + echo 'checked="checked"'; |
|
| 1523 | + } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
|
| 1524 | 1524 | class="geodir_textfield" value="1" |
| 1525 | 1525 | style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>
|
| 1526 | 1526 | </span> |
| 1527 | 1527 | </div> |
| 1528 | 1528 | <span class="geodir_message_error"><?php if (isset($required_msg)) {
|
| 1529 | - _e($required_msg, 'geodirectory'); |
|
| 1530 | - } ?></span> |
|
| 1529 | + _e($required_msg, 'geodirectory'); |
|
| 1530 | + } ?></span> |
|
| 1531 | 1531 | </div> |
| 1532 | 1532 | <?php |
| 1533 | 1533 | |
| 1534 | - } |
|
| 1534 | + } |
|
| 1535 | 1535 | } |
| 1536 | 1536 | |
| 1537 | 1537 | |
@@ -1556,42 +1556,42 @@ discard block |
||
| 1556 | 1556 | */ |
| 1557 | 1557 | function geodir_detail_page_tab_is_display($is_display, $tab) |
| 1558 | 1558 | {
|
| 1559 | - global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields; |
|
| 1559 | + global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields; |
|
| 1560 | 1560 | |
| 1561 | - if ($tab == 'post_profile') {
|
|
| 1562 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1563 | - $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
|
| 1561 | + if ($tab == 'post_profile') {
|
|
| 1562 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1563 | + $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
|
| 1564 | 1564 | |
| 1565 | - if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1566 | - $is_display = false; |
|
| 1567 | - } |
|
| 1568 | - } |
|
| 1565 | + if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1566 | + $is_display = false; |
|
| 1567 | + } |
|
| 1568 | + } |
|
| 1569 | 1569 | |
| 1570 | - if ($tab == 'post_info') |
|
| 1571 | - $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1570 | + if ($tab == 'post_info') |
|
| 1571 | + $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1572 | 1572 | |
| 1573 | - if ($tab == 'post_images') |
|
| 1574 | - $is_display = (!empty($post_images)) ? true : false; |
|
| 1573 | + if ($tab == 'post_images') |
|
| 1574 | + $is_display = (!empty($post_images)) ? true : false; |
|
| 1575 | 1575 | |
| 1576 | - if ($tab == 'post_video') |
|
| 1577 | - $is_display = (!empty($video)) ? true : false; |
|
| 1576 | + if ($tab == 'post_video') |
|
| 1577 | + $is_display = (!empty($video)) ? true : false; |
|
| 1578 | 1578 | |
| 1579 | - if ($tab == 'special_offers') |
|
| 1580 | - $is_display = (!empty($special_offers)) ? true : false; |
|
| 1579 | + if ($tab == 'special_offers') |
|
| 1580 | + $is_display = (!empty($special_offers)) ? true : false; |
|
| 1581 | 1581 | |
| 1582 | - if ($tab == 'reviews') |
|
| 1583 | - $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1582 | + if ($tab == 'reviews') |
|
| 1583 | + $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1584 | 1584 | |
| 1585 | - if ($tab == 'related_listing') {
|
|
| 1586 | - $message = __('No listings found which match your selection.', 'geodirectory');
|
|
| 1585 | + if ($tab == 'related_listing') {
|
|
| 1586 | + $message = __('No listings found which match your selection.', 'geodirectory');
|
|
| 1587 | 1587 | |
| 1588 | - /** This action is documented in geodirectory-functions/template_functions.php */ |
|
| 1589 | - $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);
|
|
| 1588 | + /** This action is documented in geodirectory-functions/template_functions.php */ |
|
| 1589 | + $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);
|
|
| 1590 | 1590 | |
| 1591 | - $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;
|
|
| 1592 | - } |
|
| 1591 | + $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;
|
|
| 1592 | + } |
|
| 1593 | 1593 | |
| 1594 | - return $is_display; |
|
| 1594 | + return $is_display; |
|
| 1595 | 1595 | } |
| 1596 | 1596 | |
| 1597 | 1597 | |
@@ -1607,69 +1607,69 @@ discard block |
||
| 1607 | 1607 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 1608 | 1608 | */ |
| 1609 | 1609 | function geodir_changes_in_custom_fields_table() {
|
| 1610 | - global $wpdb, $plugin_prefix; |
|
| 1610 | + global $wpdb, $plugin_prefix; |
|
| 1611 | 1611 | |
| 1612 | 1612 | // Remove unused virtual page |
| 1613 | 1613 | $listings_page_id = (int)get_option('geodir_listing_page');
|
| 1614 | 1614 | if ($listings_page_id) {
|
| 1615 | 1615 | $wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));
|
| 1616 | - delete_option('geodir_listing_page');
|
|
| 1616 | + delete_option('geodir_listing_page');
|
|
| 1617 | 1617 | } |
| 1618 | 1618 | |
| 1619 | - if (!get_option('geodir_changes_in_custom_fields_table')) {
|
|
| 1620 | - $wpdb->query( |
|
| 1621 | - $wpdb->prepare( |
|
| 1622 | - "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1623 | - array('1', '1', 'admin')
|
|
| 1624 | - ) |
|
| 1625 | - ); |
|
| 1619 | + if (!get_option('geodir_changes_in_custom_fields_table')) {
|
|
| 1620 | + $wpdb->query( |
|
| 1621 | + $wpdb->prepare( |
|
| 1622 | + "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1623 | + array('1', '1', 'admin')
|
|
| 1624 | + ) |
|
| 1625 | + ); |
|
| 1626 | 1626 | |
| 1627 | 1627 | |
| 1628 | - /* --- terms meta value set --- */ |
|
| 1628 | + /* --- terms meta value set --- */ |
|
| 1629 | 1629 | |
| 1630 | - update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1630 | + update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1631 | 1631 | |
| 1632 | - $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1632 | + $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1633 | 1633 | |
| 1634 | - if (!empty($options_data)) {
|
|
| 1634 | + if (!empty($options_data)) {
|
|
| 1635 | 1635 | |
| 1636 | - foreach ($options_data as $optobj) {
|
|
| 1636 | + foreach ($options_data as $optobj) {
|
|
| 1637 | 1637 | |
| 1638 | - $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
|
| 1638 | + $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
|
| 1639 | 1639 | |
| 1640 | - $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1640 | + $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1641 | 1641 | |
| 1642 | - if (!empty($taxonomies_data)) {
|
|
| 1642 | + if (!empty($taxonomies_data)) {
|
|
| 1643 | 1643 | |
| 1644 | - foreach ($taxonomies_data as $taxobj) {
|
|
| 1644 | + foreach ($taxonomies_data as $taxobj) {
|
|
| 1645 | 1645 | |
| 1646 | - $taxObject = get_taxonomy($taxobj->taxonomy); |
|
| 1647 | - $post_type = $taxObject->object_type[0]; |
|
| 1646 | + $taxObject = get_taxonomy($taxobj->taxonomy); |
|
| 1647 | + $post_type = $taxObject->object_type[0]; |
|
| 1648 | 1648 | |
| 1649 | - $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1649 | + $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1650 | 1650 | |
| 1651 | - $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1651 | + $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1652 | 1652 | |
| 1653 | - if ($duplicate_data) {
|
|
| 1653 | + if ($duplicate_data) {
|
|
| 1654 | 1654 | |
| 1655 | - $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1655 | + $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1656 | 1656 | |
| 1657 | - } else {
|
|
| 1657 | + } else {
|
|
| 1658 | 1658 | |
| 1659 | - $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1659 | + $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1660 | 1660 | |
| 1661 | - } |
|
| 1661 | + } |
|
| 1662 | 1662 | |
| 1663 | - } |
|
| 1663 | + } |
|
| 1664 | 1664 | |
| 1665 | - } |
|
| 1665 | + } |
|
| 1666 | 1666 | |
| 1667 | - } |
|
| 1668 | - } |
|
| 1667 | + } |
|
| 1668 | + } |
|
| 1669 | 1669 | |
| 1670 | - update_option('geodir_changes_in_custom_fields_table', '1');
|
|
| 1670 | + update_option('geodir_changes_in_custom_fields_table', '1');
|
|
| 1671 | 1671 | |
| 1672 | - } |
|
| 1672 | + } |
|
| 1673 | 1673 | |
| 1674 | 1674 | } |
| 1675 | 1675 | |
@@ -1688,24 +1688,24 @@ discard block |
||
| 1688 | 1688 | function geodir_location_slug_check($slug) |
| 1689 | 1689 | {
|
| 1690 | 1690 | |
| 1691 | - global $wpdb, $table_prefix; |
|
| 1691 | + global $wpdb, $table_prefix; |
|
| 1692 | 1692 | |
| 1693 | - $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1693 | + $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1694 | 1694 | |
| 1695 | - if ($slug_exists) {
|
|
| 1695 | + if ($slug_exists) {
|
|
| 1696 | 1696 | |
| 1697 | - $suffix = 1; |
|
| 1698 | - do {
|
|
| 1699 | - $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1700 | - $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1701 | - $suffix++; |
|
| 1702 | - } while ($location_slug_check && $suffix < 100); |
|
| 1697 | + $suffix = 1; |
|
| 1698 | + do {
|
|
| 1699 | + $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1700 | + $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1701 | + $suffix++; |
|
| 1702 | + } while ($location_slug_check && $suffix < 100); |
|
| 1703 | 1703 | |
| 1704 | - $slug = $alt_location_name; |
|
| 1704 | + $slug = $alt_location_name; |
|
| 1705 | 1705 | |
| 1706 | - } |
|
| 1706 | + } |
|
| 1707 | 1707 | |
| 1708 | - return $slug; |
|
| 1708 | + return $slug; |
|
| 1709 | 1709 | |
| 1710 | 1710 | } |
| 1711 | 1711 | |
@@ -1730,42 +1730,42 @@ discard block |
||
| 1730 | 1730 | function geodir_update_term_slug($term_id, $tt_id, $taxonomy) |
| 1731 | 1731 | {
|
| 1732 | 1732 | |
| 1733 | - global $wpdb, $plugin_prefix, $table_prefix; |
|
| 1733 | + global $wpdb, $plugin_prefix, $table_prefix; |
|
| 1734 | 1734 | |
| 1735 | - $tern_data = get_term_by('id', $term_id, $taxonomy);
|
|
| 1735 | + $tern_data = get_term_by('id', $term_id, $taxonomy);
|
|
| 1736 | 1736 | |
| 1737 | - $slug = $tern_data->slug; |
|
| 1737 | + $slug = $tern_data->slug; |
|
| 1738 | 1738 | |
| 1739 | - /** |
|
| 1740 | - * Filter if a term slug exists. |
|
| 1741 | - * |
|
| 1742 | - * @since 1.0.0 |
|
| 1743 | - * @package GeoDirectory |
|
| 1744 | - * @param bool $bool Default: false. |
|
| 1745 | - * @param string $slug The term slug. |
|
| 1746 | - * @param int $term_id The term ID. |
|
| 1747 | - */ |
|
| 1748 | - $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);
|
|
| 1739 | + /** |
|
| 1740 | + * Filter if a term slug exists. |
|
| 1741 | + * |
|
| 1742 | + * @since 1.0.0 |
|
| 1743 | + * @package GeoDirectory |
|
| 1744 | + * @param bool $bool Default: false. |
|
| 1745 | + * @param string $slug The term slug. |
|
| 1746 | + * @param int $term_id The term ID. |
|
| 1747 | + */ |
|
| 1748 | + $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);
|
|
| 1749 | 1749 | |
| 1750 | - if ($slug_exists) {
|
|
| 1750 | + if ($slug_exists) {
|
|
| 1751 | 1751 | |
| 1752 | - $suffix = 1; |
|
| 1753 | - do {
|
|
| 1754 | - $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1752 | + $suffix = 1; |
|
| 1753 | + do {
|
|
| 1754 | + $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1755 | 1755 | |
| 1756 | - /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 1757 | - $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
| 1756 | + /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 1757 | + $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
| 1758 | 1758 | |
| 1759 | - $suffix++; |
|
| 1760 | - } while ($term_slug_check && $suffix < 100); |
|
| 1759 | + $suffix++; |
|
| 1760 | + } while ($term_slug_check && $suffix < 100); |
|
| 1761 | 1761 | |
| 1762 | - $slug = $new_slug; |
|
| 1762 | + $slug = $new_slug; |
|
| 1763 | 1763 | |
| 1764 | - //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
|
| 1764 | + //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
|
| 1765 | 1765 | |
| 1766 | - $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1766 | + $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1767 | 1767 | |
| 1768 | - } |
|
| 1768 | + } |
|
| 1769 | 1769 | |
| 1770 | 1770 | // Update tag in detail table. |
| 1771 | 1771 | $taxonomy_obj = get_taxonomy($taxonomy); |
@@ -1806,21 +1806,21 @@ discard block |
||
| 1806 | 1806 | function geodir_term_slug_is_exists($slug_exists, $slug, $term_id) |
| 1807 | 1807 | {
|
| 1808 | 1808 | |
| 1809 | - global $wpdb, $table_prefix; |
|
| 1809 | + global $wpdb, $table_prefix; |
|
| 1810 | 1810 | |
| 1811 | - $default_location = geodir_get_default_location(); |
|
| 1811 | + $default_location = geodir_get_default_location(); |
|
| 1812 | 1812 | |
| 1813 | - $country_slug = $default_location->country_slug; |
|
| 1814 | - $region_slug = $default_location->region_slug; |
|
| 1815 | - $city_slug = $default_location->city_slug; |
|
| 1813 | + $country_slug = $default_location->country_slug; |
|
| 1814 | + $region_slug = $default_location->region_slug; |
|
| 1815 | + $city_slug = $default_location->city_slug; |
|
| 1816 | 1816 | |
| 1817 | - if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1818 | - return $slug_exists = true; |
|
| 1817 | + if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1818 | + return $slug_exists = true; |
|
| 1819 | 1819 | |
| 1820 | - if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1821 | - return $slug_exists = true; |
|
| 1820 | + if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1821 | + return $slug_exists = true; |
|
| 1822 | 1822 | |
| 1823 | - return $slug_exists; |
|
| 1823 | + return $slug_exists; |
|
| 1824 | 1824 | } |
| 1825 | 1825 | |
| 1826 | 1826 | |
@@ -1840,75 +1840,75 @@ discard block |
||
| 1840 | 1840 | */ |
| 1841 | 1841 | function geodir_custom_page_title($title = '', $sep = '') |
| 1842 | 1842 | {
|
| 1843 | - global $wp; |
|
| 1844 | - if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
|
|
| 1845 | - return $title; |
|
| 1846 | - } |
|
| 1843 | + global $wp; |
|
| 1844 | + if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
|
|
| 1845 | + return $title; |
|
| 1846 | + } |
|
| 1847 | 1847 | |
| 1848 | - if ($sep == '') {
|
|
| 1849 | - /** |
|
| 1850 | - * Filter the page title separator. |
|
| 1851 | - * |
|
| 1852 | - * @since 1.0.0 |
|
| 1853 | - * @package GeoDirectory |
|
| 1854 | - * @param string $sep The separator, default: `|`. |
|
| 1855 | - */ |
|
| 1856 | - $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 1857 | - } |
|
| 1848 | + if ($sep == '') {
|
|
| 1849 | + /** |
|
| 1850 | + * Filter the page title separator. |
|
| 1851 | + * |
|
| 1852 | + * @since 1.0.0 |
|
| 1853 | + * @package GeoDirectory |
|
| 1854 | + * @param string $sep The separator, default: `|`. |
|
| 1855 | + */ |
|
| 1856 | + $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 1857 | + } |
|
| 1858 | 1858 | |
| 1859 | 1859 | |
| 1860 | - $gd_page = ''; |
|
| 1861 | - if(geodir_is_page('home')){
|
|
| 1862 | - $gd_page = 'home'; |
|
| 1863 | - $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
|
| 1864 | - } |
|
| 1865 | - elseif(geodir_is_page('detail')){
|
|
| 1866 | - $gd_page = 'detail'; |
|
| 1867 | - $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
|
| 1868 | - } |
|
| 1869 | - elseif(geodir_is_page('pt')){
|
|
| 1870 | - $gd_page = 'pt'; |
|
| 1871 | - $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
|
| 1872 | - } |
|
| 1873 | - elseif(geodir_is_page('listing')){
|
|
| 1874 | - $gd_page = 'listing'; |
|
| 1875 | - $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
|
| 1876 | - } |
|
| 1877 | - elseif(geodir_is_page('location')){
|
|
| 1878 | - $gd_page = 'location'; |
|
| 1879 | - $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
|
| 1880 | - } |
|
| 1881 | - elseif(geodir_is_page('search')){
|
|
| 1882 | - $gd_page = 'search'; |
|
| 1883 | - $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
|
| 1884 | - } |
|
| 1885 | - elseif(geodir_is_page('add-listing')){
|
|
| 1886 | - $gd_page = 'add-listing'; |
|
| 1887 | - $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
|
| 1888 | - } |
|
| 1889 | - elseif(geodir_is_page('author')){
|
|
| 1890 | - $gd_page = 'author'; |
|
| 1891 | - $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
|
| 1892 | - } |
|
| 1893 | - elseif(geodir_is_page('login')){
|
|
| 1894 | - $gd_page = 'login'; |
|
| 1895 | - $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
|
| 1896 | - } |
|
| 1897 | - elseif(geodir_is_page('listing-success')){
|
|
| 1898 | - $gd_page = 'listing-success'; |
|
| 1899 | - $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
|
| 1900 | - } |
|
| 1860 | + $gd_page = ''; |
|
| 1861 | + if(geodir_is_page('home')){
|
|
| 1862 | + $gd_page = 'home'; |
|
| 1863 | + $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
|
| 1864 | + } |
|
| 1865 | + elseif(geodir_is_page('detail')){
|
|
| 1866 | + $gd_page = 'detail'; |
|
| 1867 | + $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
|
| 1868 | + } |
|
| 1869 | + elseif(geodir_is_page('pt')){
|
|
| 1870 | + $gd_page = 'pt'; |
|
| 1871 | + $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
|
| 1872 | + } |
|
| 1873 | + elseif(geodir_is_page('listing')){
|
|
| 1874 | + $gd_page = 'listing'; |
|
| 1875 | + $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
|
| 1876 | + } |
|
| 1877 | + elseif(geodir_is_page('location')){
|
|
| 1878 | + $gd_page = 'location'; |
|
| 1879 | + $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
|
| 1880 | + } |
|
| 1881 | + elseif(geodir_is_page('search')){
|
|
| 1882 | + $gd_page = 'search'; |
|
| 1883 | + $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
|
| 1884 | + } |
|
| 1885 | + elseif(geodir_is_page('add-listing')){
|
|
| 1886 | + $gd_page = 'add-listing'; |
|
| 1887 | + $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
|
| 1888 | + } |
|
| 1889 | + elseif(geodir_is_page('author')){
|
|
| 1890 | + $gd_page = 'author'; |
|
| 1891 | + $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
|
| 1892 | + } |
|
| 1893 | + elseif(geodir_is_page('login')){
|
|
| 1894 | + $gd_page = 'login'; |
|
| 1895 | + $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
|
| 1896 | + } |
|
| 1897 | + elseif(geodir_is_page('listing-success')){
|
|
| 1898 | + $gd_page = 'listing-success'; |
|
| 1899 | + $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
|
| 1900 | + } |
|
| 1901 | 1901 | |
| 1902 | 1902 | |
| 1903 | - /** |
|
| 1904 | - * Filter page meta title to replace variables. |
|
| 1905 | - * |
|
| 1906 | - * @since 1.5.4 |
|
| 1907 | - * @param string $title The page title including variables. |
|
| 1908 | - * @param string $gd_page The GeoDirectory page type if any. |
|
| 1909 | - * @param string $sep The title separator symbol. |
|
| 1910 | - */ |
|
| 1911 | - return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);
|
|
| 1903 | + /** |
|
| 1904 | + * Filter page meta title to replace variables. |
|
| 1905 | + * |
|
| 1906 | + * @since 1.5.4 |
|
| 1907 | + * @param string $title The page title including variables. |
|
| 1908 | + * @param string $gd_page The GeoDirectory page type if any. |
|
| 1909 | + * @param string $sep The title separator symbol. |
|
| 1910 | + */ |
|
| 1911 | + return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);
|
|
| 1912 | 1912 | |
| 1913 | 1913 | } |
| 1914 | 1914 | |
@@ -1924,36 +1924,36 @@ discard block |
||
| 1924 | 1924 | function geodir_set_post_attachment() |
| 1925 | 1925 | {
|
| 1926 | 1926 | |
| 1927 | - if (!get_option('geodir_set_post_attachments')) {
|
|
| 1927 | + if (!get_option('geodir_set_post_attachments')) {
|
|
| 1928 | 1928 | |
| 1929 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1930 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1929 | + require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1930 | + require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1931 | 1931 | |
| 1932 | - $all_postypes = geodir_get_posttypes(); |
|
| 1932 | + $all_postypes = geodir_get_posttypes(); |
|
| 1933 | 1933 | |
| 1934 | - foreach($all_postypes as $post_type){
|
|
| 1935 | - $args = array( |
|
| 1936 | - 'posts_per_page' => -1, |
|
| 1937 | - 'post_type' => $post_type, |
|
| 1938 | - 'post_status' => 'publish'); |
|
| 1934 | + foreach($all_postypes as $post_type){
|
|
| 1935 | + $args = array( |
|
| 1936 | + 'posts_per_page' => -1, |
|
| 1937 | + 'post_type' => $post_type, |
|
| 1938 | + 'post_status' => 'publish'); |
|
| 1939 | 1939 | |
| 1940 | - $posts_array = get_posts($args); |
|
| 1940 | + $posts_array = get_posts($args); |
|
| 1941 | 1941 | |
| 1942 | - if (!empty($posts_array)) {
|
|
| 1942 | + if (!empty($posts_array)) {
|
|
| 1943 | 1943 | |
| 1944 | - foreach ($posts_array as $post) {
|
|
| 1944 | + foreach ($posts_array as $post) {
|
|
| 1945 | 1945 | |
| 1946 | - geodir_set_wp_featured_image($post->ID); |
|
| 1946 | + geodir_set_wp_featured_image($post->ID); |
|
| 1947 | 1947 | |
| 1948 | - } |
|
| 1948 | + } |
|
| 1949 | 1949 | |
| 1950 | - } |
|
| 1951 | - } |
|
| 1950 | + } |
|
| 1951 | + } |
|
| 1952 | 1952 | |
| 1953 | 1953 | |
| 1954 | - update_option('geodir_set_post_attachments', '1');
|
|
| 1954 | + update_option('geodir_set_post_attachments', '1');
|
|
| 1955 | 1955 | |
| 1956 | - } |
|
| 1956 | + } |
|
| 1957 | 1957 | |
| 1958 | 1958 | } |
| 1959 | 1959 | |
@@ -1970,19 +1970,19 @@ discard block |
||
| 1970 | 1970 | function geodir_remove_url_seperator() |
| 1971 | 1971 | {
|
| 1972 | 1972 | |
| 1973 | - if (!get_option('geodir_remove_url_seperator')) {
|
|
| 1973 | + if (!get_option('geodir_remove_url_seperator')) {
|
|
| 1974 | 1974 | |
| 1975 | - if (get_option('geodir_listingurl_separator'))
|
|
| 1976 | - delete_option('geodir_listingurl_separator');
|
|
| 1975 | + if (get_option('geodir_listingurl_separator'))
|
|
| 1976 | + delete_option('geodir_listingurl_separator');
|
|
| 1977 | 1977 | |
| 1978 | - if (get_option('geodir_detailurl_separator'))
|
|
| 1979 | - delete_option('geodir_detailurl_separator');
|
|
| 1978 | + if (get_option('geodir_detailurl_separator'))
|
|
| 1979 | + delete_option('geodir_detailurl_separator');
|
|
| 1980 | 1980 | |
| 1981 | - flush_rewrite_rules(false); |
|
| 1981 | + flush_rewrite_rules(false); |
|
| 1982 | 1982 | |
| 1983 | - update_option('geodir_remove_url_seperator', '1');
|
|
| 1983 | + update_option('geodir_remove_url_seperator', '1');
|
|
| 1984 | 1984 | |
| 1985 | - } |
|
| 1985 | + } |
|
| 1986 | 1986 | |
| 1987 | 1987 | } |
| 1988 | 1988 | |
@@ -1998,19 +1998,19 @@ discard block |
||
| 1998 | 1998 | */ |
| 1999 | 1999 | function geodir_remove_url_seperator_form_permalink_settings($permalink_arr) |
| 2000 | 2000 | {
|
| 2001 | - foreach ($permalink_arr as $key => $value) {
|
|
| 2001 | + foreach ($permalink_arr as $key => $value) {
|
|
| 2002 | 2002 | |
| 2003 | - if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 2004 | - unset($permalink_arr[$key]); |
|
| 2003 | + if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 2004 | + unset($permalink_arr[$key]); |
|
| 2005 | 2005 | |
| 2006 | - } |
|
| 2006 | + } |
|
| 2007 | 2007 | |
| 2008 | - return $permalink_arr; |
|
| 2008 | + return $permalink_arr; |
|
| 2009 | 2009 | |
| 2010 | 2010 | } |
| 2011 | 2011 | |
| 2012 | 2012 | if (!is_admin()) {
|
| 2013 | - add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');
|
|
| 2013 | + add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');
|
|
| 2014 | 2014 | } |
| 2015 | 2015 | /** |
| 2016 | 2016 | * Set status from draft to publish. |
@@ -2023,16 +2023,16 @@ discard block |
||
| 2023 | 2023 | */ |
| 2024 | 2024 | function geodir_set_status_draft_to_publish_for_own_post($post) |
| 2025 | 2025 | {
|
| 2026 | - $user_id = get_current_user_id(); |
|
| 2026 | + $user_id = get_current_user_id(); |
|
| 2027 | 2027 | |
| 2028 | - if(!$user_id){return $post;}
|
|
| 2028 | + if(!$user_id){return $post;}
|
|
| 2029 | 2029 | |
| 2030 | - $gd_post_types = geodir_get_posttypes(); |
|
| 2030 | + $gd_post_types = geodir_get_posttypes(); |
|
| 2031 | 2031 | |
| 2032 | - if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {
|
|
| 2033 | - $post[0]->post_status = 'publish'; |
|
| 2034 | - } |
|
| 2035 | - return $post; |
|
| 2032 | + if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {
|
|
| 2033 | + $post[0]->post_status = 'publish'; |
|
| 2034 | + } |
|
| 2035 | + return $post; |
|
| 2036 | 2036 | } |
| 2037 | 2037 | |
| 2038 | 2038 | |
@@ -2124,33 +2124,33 @@ discard block |
||
| 2124 | 2124 | */ |
| 2125 | 2125 | function geodir_detail_page_tab_headings_change($tabs_arr) |
| 2126 | 2126 | {
|
| 2127 | - global $wpdb; |
|
| 2127 | + global $wpdb; |
|
| 2128 | 2128 | |
| 2129 | - $post_type = geodir_get_current_posttype(); |
|
| 2129 | + $post_type = geodir_get_current_posttype(); |
|
| 2130 | 2130 | |
| 2131 | - $all_postypes = geodir_get_posttypes(); |
|
| 2131 | + $all_postypes = geodir_get_posttypes(); |
|
| 2132 | 2132 | |
| 2133 | - if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {
|
|
| 2133 | + if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {
|
|
| 2134 | 2134 | |
| 2135 | - if (array_key_exists('post_video', $tabs_arr)) {
|
|
| 2135 | + if (array_key_exists('post_video', $tabs_arr)) {
|
|
| 2136 | 2136 | |
| 2137 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2137 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2138 | 2138 | |
| 2139 | - if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2140 | - $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2141 | - } |
|
| 2139 | + if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2140 | + $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2141 | + } |
|
| 2142 | 2142 | |
| 2143 | - if (array_key_exists('special_offers', $tabs_arr)) {
|
|
| 2143 | + if (array_key_exists('special_offers', $tabs_arr)) {
|
|
| 2144 | 2144 | |
| 2145 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2145 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2146 | 2146 | |
| 2147 | - if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2148 | - $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2149 | - } |
|
| 2147 | + if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2148 | + $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2149 | + } |
|
| 2150 | 2150 | |
| 2151 | - } |
|
| 2151 | + } |
|
| 2152 | 2152 | |
| 2153 | - return $tabs_arr; |
|
| 2153 | + return $tabs_arr; |
|
| 2154 | 2154 | |
| 2155 | 2155 | } |
| 2156 | 2156 | |
@@ -2163,10 +2163,10 @@ discard block |
||
| 2163 | 2163 | */ |
| 2164 | 2164 | function geodir_remove_template_redirect_actions() |
| 2165 | 2165 | {
|
| 2166 | - if (geodir_is_page('login')){
|
|
| 2167 | - remove_all_actions('template_redirect');
|
|
| 2168 | - remove_action('init', 'avia_modify_front', 10);
|
|
| 2169 | - } |
|
| 2166 | + if (geodir_is_page('login')){
|
|
| 2167 | + remove_all_actions('template_redirect');
|
|
| 2168 | + remove_action('init', 'avia_modify_front', 10);
|
|
| 2169 | + } |
|
| 2170 | 2170 | } |
| 2171 | 2171 | |
| 2172 | 2172 | |
@@ -2188,51 +2188,51 @@ discard block |
||
| 2188 | 2188 | function geodirectory_before_featured_image_delete($attachment_id) |
| 2189 | 2189 | {
|
| 2190 | 2190 | |
| 2191 | - global $wpdb, $plugin_prefix; |
|
| 2191 | + global $wpdb, $plugin_prefix; |
|
| 2192 | 2192 | |
| 2193 | - $post_id = get_post_field('post_parent', $attachment_id);
|
|
| 2193 | + $post_id = get_post_field('post_parent', $attachment_id);
|
|
| 2194 | 2194 | |
| 2195 | - $attachment_url = wp_get_attachment_url($attachment_id); |
|
| 2195 | + $attachment_url = wp_get_attachment_url($attachment_id); |
|
| 2196 | 2196 | |
| 2197 | - if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {
|
|
| 2197 | + if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {
|
|
| 2198 | 2198 | |
| 2199 | - $post_type = get_post_type($post_id); |
|
| 2199 | + $post_type = get_post_type($post_id); |
|
| 2200 | 2200 | |
| 2201 | - $all_postypes = geodir_get_posttypes(); |
|
| 2201 | + $all_postypes = geodir_get_posttypes(); |
|
| 2202 | 2202 | |
| 2203 | - if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2204 | - return false; |
|
| 2203 | + if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2204 | + return false; |
|
| 2205 | 2205 | |
| 2206 | - $uploads = wp_upload_dir(); |
|
| 2206 | + $uploads = wp_upload_dir(); |
|
| 2207 | 2207 | |
| 2208 | - $split_img_path = explode($uploads['baseurl'], $attachment_url); |
|
| 2208 | + $split_img_path = explode($uploads['baseurl'], $attachment_url); |
|
| 2209 | 2209 | |
| 2210 | - $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 2210 | + $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 2211 | 2211 | |
| 2212 | - $wpdb->query( |
|
| 2213 | - $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2214 | - array($post_id, $split_img_file_path) |
|
| 2215 | - ) |
|
| 2216 | - ); |
|
| 2212 | + $wpdb->query( |
|
| 2213 | + $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2214 | + array($post_id, $split_img_file_path) |
|
| 2215 | + ) |
|
| 2216 | + ); |
|
| 2217 | 2217 | |
| 2218 | - $attachment_data = $wpdb->get_row( |
|
| 2219 | - $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2220 | - array($post_id) |
|
| 2221 | - ) |
|
| 2222 | - ); |
|
| 2218 | + $attachment_data = $wpdb->get_row( |
|
| 2219 | + $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2220 | + array($post_id) |
|
| 2221 | + ) |
|
| 2222 | + ); |
|
| 2223 | 2223 | |
| 2224 | - if (!empty($attachment_data)) {
|
|
| 2225 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2226 | - } |
|
| 2224 | + if (!empty($attachment_data)) {
|
|
| 2225 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2226 | + } |
|
| 2227 | 2227 | |
| 2228 | 2228 | |
| 2229 | - $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2229 | + $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2230 | 2230 | |
| 2231 | - $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2231 | + $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2232 | 2232 | |
| 2233 | - geodir_set_wp_featured_image($post_id); |
|
| 2233 | + geodir_set_wp_featured_image($post_id); |
|
| 2234 | 2234 | |
| 2235 | - } |
|
| 2235 | + } |
|
| 2236 | 2236 | |
| 2237 | 2237 | } |
| 2238 | 2238 | |
@@ -2250,79 +2250,79 @@ discard block |
||
| 2250 | 2250 | function geodir_temp_set_post_attachment() |
| 2251 | 2251 | {
|
| 2252 | 2252 | |
| 2253 | - global $wpdb, $plugin_prefix; |
|
| 2253 | + global $wpdb, $plugin_prefix; |
|
| 2254 | 2254 | |
| 2255 | - $all_postypes = geodir_get_posttypes(); |
|
| 2255 | + $all_postypes = geodir_get_posttypes(); |
|
| 2256 | 2256 | |
| 2257 | - foreach ($all_postypes as $posttype) {
|
|
| 2257 | + foreach ($all_postypes as $posttype) {
|
|
| 2258 | 2258 | |
| 2259 | - $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2259 | + $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2260 | 2260 | |
| 2261 | - $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2261 | + $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2262 | 2262 | |
| 2263 | - if (!empty($get_post_data)) {
|
|
| 2263 | + if (!empty($get_post_data)) {
|
|
| 2264 | 2264 | |
| 2265 | - foreach ($get_post_data as $data) {
|
|
| 2265 | + foreach ($get_post_data as $data) {
|
|
| 2266 | 2266 | |
| 2267 | - $post_id = $data->post_id; |
|
| 2267 | + $post_id = $data->post_id; |
|
| 2268 | 2268 | |
| 2269 | - $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2269 | + $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2270 | 2270 | |
| 2271 | - if (!empty($attachment_data)) {
|
|
| 2271 | + if (!empty($attachment_data)) {
|
|
| 2272 | 2272 | |
| 2273 | - foreach ($attachment_data as $attach) {
|
|
| 2273 | + foreach ($attachment_data as $attach) {
|
|
| 2274 | 2274 | |
| 2275 | - $file_info = pathinfo($attach->file); |
|
| 2275 | + $file_info = pathinfo($attach->file); |
|
| 2276 | 2276 | |
| 2277 | - $sub_dir = ''; |
|
| 2278 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2279 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2277 | + $sub_dir = ''; |
|
| 2278 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2279 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2280 | 2280 | |
| 2281 | - $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 2282 | - $uploads_path = $uploads['basedir']; |
|
| 2281 | + $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 2282 | + $uploads_path = $uploads['basedir']; |
|
| 2283 | 2283 | |
| 2284 | - $file_name = $file_info['basename']; |
|
| 2284 | + $file_name = $file_info['basename']; |
|
| 2285 | 2285 | |
| 2286 | - $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2286 | + $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2287 | 2287 | |
| 2288 | - if (!file_exists($img_arr['path'])) {
|
|
| 2288 | + if (!file_exists($img_arr['path'])) {
|
|
| 2289 | 2289 | |
| 2290 | - $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2290 | + $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2291 | 2291 | |
| 2292 | - } |
|
| 2292 | + } |
|
| 2293 | 2293 | |
| 2294 | - } |
|
| 2294 | + } |
|
| 2295 | 2295 | |
| 2296 | - $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2296 | + $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2297 | 2297 | |
| 2298 | - if (!empty($attachment_data)) {
|
|
| 2298 | + if (!empty($attachment_data)) {
|
|
| 2299 | 2299 | |
| 2300 | - if ($attachment_data->ID) |
|
| 2301 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2300 | + if ($attachment_data->ID) |
|
| 2301 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2302 | 2302 | |
| 2303 | - } else {
|
|
| 2303 | + } else {
|
|
| 2304 | 2304 | |
| 2305 | - if (has_post_thumbnail($post_id)) {
|
|
| 2305 | + if (has_post_thumbnail($post_id)) {
|
|
| 2306 | 2306 | |
| 2307 | - $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2307 | + $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2308 | 2308 | |
| 2309 | - wp_delete_attachment($post_thumbnail_id); |
|
| 2309 | + wp_delete_attachment($post_thumbnail_id); |
|
| 2310 | 2310 | |
| 2311 | - } |
|
| 2311 | + } |
|
| 2312 | 2312 | |
| 2313 | - } |
|
| 2313 | + } |
|
| 2314 | 2314 | |
| 2315 | - $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2315 | + $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2316 | 2316 | |
| 2317 | - geodir_set_wp_featured_image($post_id); |
|
| 2317 | + geodir_set_wp_featured_image($post_id); |
|
| 2318 | 2318 | |
| 2319 | - } |
|
| 2319 | + } |
|
| 2320 | 2320 | |
| 2321 | - } |
|
| 2321 | + } |
|
| 2322 | 2322 | |
| 2323 | - } |
|
| 2323 | + } |
|
| 2324 | 2324 | |
| 2325 | - } |
|
| 2325 | + } |
|
| 2326 | 2326 | |
| 2327 | 2327 | } |
| 2328 | 2328 | |
@@ -2340,9 +2340,9 @@ discard block |
||
| 2340 | 2340 | function geodir_default_rating_star_icon() |
| 2341 | 2341 | {
|
| 2342 | 2342 | |
| 2343 | - if (!get_option('geodir_default_rating_star_icon')) {
|
|
| 2344 | - update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2345 | - } |
|
| 2343 | + if (!get_option('geodir_default_rating_star_icon')) {
|
|
| 2344 | + update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2345 | + } |
|
| 2346 | 2346 | |
| 2347 | 2347 | } |
| 2348 | 2348 | |
@@ -2360,25 +2360,25 @@ discard block |
||
| 2360 | 2360 | */ |
| 2361 | 2361 | function geodir_user_post_listing_count($user_id = 0) |
| 2362 | 2362 | {
|
| 2363 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 2364 | - if(!$user_id){
|
|
| 2365 | - $user_id = $current_user->ID; |
|
| 2366 | - } |
|
| 2363 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 2364 | + if(!$user_id){
|
|
| 2365 | + $user_id = $current_user->ID; |
|
| 2366 | + } |
|
| 2367 | 2367 | |
| 2368 | - $all_posts = get_option('geodir_listing_link_user_dashboard');
|
|
| 2368 | + $all_posts = get_option('geodir_listing_link_user_dashboard');
|
|
| 2369 | 2369 | |
| 2370 | - $user_listing = array(); |
|
| 2371 | - if ($user_id && is_array($all_posts) && !empty($all_posts)) {
|
|
| 2372 | - foreach ($all_posts as $ptype) {
|
|
| 2373 | - $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
| 2370 | + $user_listing = array(); |
|
| 2371 | + if ($user_id && is_array($all_posts) && !empty($all_posts)) {
|
|
| 2372 | + foreach ($all_posts as $ptype) {
|
|
| 2373 | + $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
| 2374 | 2374 | |
| 2375 | - if ($total_posts > 0) {
|
|
| 2376 | - $user_listing[$ptype] = $total_posts; |
|
| 2377 | - } |
|
| 2378 | - } |
|
| 2379 | - } |
|
| 2375 | + if ($total_posts > 0) {
|
|
| 2376 | + $user_listing[$ptype] = $total_posts; |
|
| 2377 | + } |
|
| 2378 | + } |
|
| 2379 | + } |
|
| 2380 | 2380 | |
| 2381 | - return $user_listing; |
|
| 2381 | + return $user_listing; |
|
| 2382 | 2382 | } |
| 2383 | 2383 | |
| 2384 | 2384 | |
@@ -2398,189 +2398,189 @@ discard block |
||
| 2398 | 2398 | */ |
| 2399 | 2399 | function geodir_detail_page_custom_field_tab($tabs_arr) |
| 2400 | 2400 | {
|
| 2401 | - global $post; |
|
| 2402 | - |
|
| 2403 | - $post_type = geodir_get_current_posttype(); |
|
| 2404 | - $all_postypes = geodir_get_posttypes(); |
|
| 2405 | - |
|
| 2406 | - if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {
|
|
| 2407 | - $package_info = array(); |
|
| 2408 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 2409 | - $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 2410 | - $fields_location = 'owntab'; |
|
| 2411 | - |
|
| 2412 | - $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
|
| 2413 | - //remove video and special offers if it is already set to show |
|
| 2414 | - if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2415 | - $unset_video = true; |
|
| 2416 | - } |
|
| 2417 | - |
|
| 2418 | - if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2419 | - $unset_special_offers = true; |
|
| 2420 | - } |
|
| 2421 | - if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2422 | - foreach($custom_fields as $key => $custom_field){
|
|
| 2423 | - if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2424 | - unset($custom_fields[$key]); |
|
| 2425 | - } |
|
| 2426 | - if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2427 | - unset($custom_fields[$key]); |
|
| 2428 | - } |
|
| 2429 | - } |
|
| 2430 | - } |
|
| 2431 | - |
|
| 2432 | - |
|
| 2433 | - if (!empty($custom_fields)) {
|
|
| 2434 | - $parse_custom_fields = array(); |
|
| 2435 | - foreach ($custom_fields as $field) {
|
|
| 2436 | - $field = stripslashes_deep($field); // strip slashes |
|
| 2437 | - $type = $field; |
|
| 2438 | - $field_name = $field['htmlvar_name']; |
|
| 2439 | - if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2440 | - $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2441 | - } |
|
| 2401 | + global $post; |
|
| 2442 | 2402 | |
| 2443 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2444 | - if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2445 | - continue; |
|
| 2446 | - } |
|
| 2403 | + $post_type = geodir_get_current_posttype(); |
|
| 2404 | + $all_postypes = geodir_get_posttypes(); |
|
| 2447 | 2405 | |
| 2448 | - $parse_custom_fields[] = $field; |
|
| 2449 | - } |
|
| 2450 | - } |
|
| 2451 | - $custom_fields = $parse_custom_fields; |
|
| 2452 | - } |
|
| 2453 | - //print_r($custom_fields); |
|
| 2454 | - if (!empty($custom_fields)) {
|
|
| 2406 | + if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {
|
|
| 2407 | + $package_info = array(); |
|
| 2408 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 2409 | + $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 2410 | + $fields_location = 'owntab'; |
|
| 2455 | 2411 | |
| 2456 | - global $field_set_start; |
|
| 2412 | + $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
|
| 2413 | + //remove video and special offers if it is already set to show |
|
| 2414 | + if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2415 | + $unset_video = true; |
|
| 2416 | + } |
|
| 2457 | 2417 | |
| 2458 | - $post = stripslashes_deep($post); // strip slashes |
|
| 2459 | - |
|
| 2460 | - $field_set_start = 0; |
|
| 2461 | - $fieldset_count = 0; |
|
| 2462 | - $fieldset = ''; |
|
| 2463 | - $total_fields = count($custom_fields); |
|
| 2464 | - $count_field = 0; |
|
| 2465 | - $fieldset_arr = array(); |
|
| 2466 | - $i = 0; |
|
| 2467 | - $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL; |
|
| 2468 | - |
|
| 2469 | - foreach ($custom_fields as $field) {
|
|
| 2470 | - $count_field++; |
|
| 2471 | - $field_name = $field['htmlvar_name']; |
|
| 2472 | - if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2473 | - $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2474 | - } |
|
| 2418 | + if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2419 | + $unset_special_offers = true; |
|
| 2420 | + } |
|
| 2421 | + if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2422 | + foreach($custom_fields as $key => $custom_field){
|
|
| 2423 | + if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2424 | + unset($custom_fields[$key]); |
|
| 2425 | + } |
|
| 2426 | + if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2427 | + unset($custom_fields[$key]); |
|
| 2428 | + } |
|
| 2429 | + } |
|
| 2430 | + } |
|
| 2475 | 2431 | |
| 2476 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2477 | - $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
|
| 2478 | - $site_title = trim($field['site_title']); |
|
| 2479 | - $type = $field; |
|
| 2480 | - $variables_array = array(); |
|
| 2481 | 2432 | |
| 2482 | - if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2483 | - continue; |
|
| 2484 | - } |
|
| 2433 | + if (!empty($custom_fields)) {
|
|
| 2434 | + $parse_custom_fields = array(); |
|
| 2435 | + foreach ($custom_fields as $field) {
|
|
| 2436 | + $field = stripslashes_deep($field); // strip slashes |
|
| 2437 | + $type = $field; |
|
| 2438 | + $field_name = $field['htmlvar_name']; |
|
| 2439 | + if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2440 | + $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2441 | + } |
|
| 2485 | 2442 | |
| 2486 | - if ($type['type'] != 'fieldset') {
|
|
| 2487 | - $i++; |
|
| 2488 | - $variables_array['post_id'] = $post->ID; |
|
| 2489 | - $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 2490 | - $variables_array['value'] = isset($post->{$type['htmlvar_name']}) ? $post->{$type['htmlvar_name']} : '';
|
|
| 2491 | - |
|
| 2492 | - }else{
|
|
| 2493 | - $i = 0; |
|
| 2494 | - $fieldset_count++; |
|
| 2495 | - $field_set_start = 1; |
|
| 2496 | - $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2497 | - $fieldset_arr[$fieldset_count]['label'] = $label; |
|
| 2498 | - } |
|
| 2443 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2444 | + if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2445 | + continue; |
|
| 2446 | + } |
|
| 2499 | 2447 | |
| 2448 | + $parse_custom_fields[] = $field; |
|
| 2449 | + } |
|
| 2450 | + } |
|
| 2451 | + $custom_fields = $parse_custom_fields; |
|
| 2452 | + } |
|
| 2453 | + //print_r($custom_fields); |
|
| 2454 | + if (!empty($custom_fields)) {
|
|
| 2500 | 2455 | |
| 2501 | - if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2502 | - $type = stripslashes_deep($type); // strip slashes |
|
| 2503 | - if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2504 | - $html = ''; |
|
| 2505 | - $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 2506 | - if($html_var=='post'){$html_var='post_address';}
|
|
| 2507 | - $field_icon = geodir_field_icon_proccess($type); |
|
| 2508 | - $filed_type = $type['type']; |
|
| 2509 | - |
|
| 2510 | - /** |
|
| 2511 | - * Filter the output for custom fields. |
|
| 2512 | - * |
|
| 2513 | - * Here we can remove or add new functions depending on the field type. |
|
| 2514 | - * |
|
| 2515 | - * @param string $html The html to be filtered (blank). |
|
| 2516 | - * @param string $fields_location The location the field is to be show. |
|
| 2517 | - * @param array $type The array of field values. |
|
| 2518 | - */ |
|
| 2519 | - $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2520 | - |
|
| 2521 | - |
|
| 2522 | - /** |
|
| 2523 | - * Filter custom field output in tab. |
|
| 2524 | - * |
|
| 2525 | - * @since 1.5.6 |
|
| 2526 | - * |
|
| 2527 | - * @param string $html_var The HTML variable name for the field. |
|
| 2528 | - * @param string $html Custom field unfiltered HTML. |
|
| 2529 | - * @param array $variables_array Custom field variables array. |
|
| 2530 | - */ |
|
| 2531 | - $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);
|
|
| 2532 | - |
|
| 2533 | - $fieldset_html = ''; |
|
| 2534 | - if ($field_set_start == 1) {
|
|
| 2535 | - $add_html = false; |
|
| 2536 | - if ($type['type'] == 'fieldset' && $fieldset_count > 1) {
|
|
| 2537 | - if ($fieldset != '') {
|
|
| 2538 | - $add_html = true; |
|
| 2539 | - $label = $fieldset_arr[$fieldset_count - 1]['label']; |
|
| 2540 | - $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name']; |
|
| 2541 | - } |
|
| 2542 | - $fieldset_html = $fieldset; |
|
| 2543 | - $fieldset = ''; |
|
| 2544 | - } else {
|
|
| 2545 | - $fieldset .= $html; |
|
| 2546 | - if ($total_fields == $count_field && $fieldset != '') {
|
|
| 2547 | - $add_html = true; |
|
| 2548 | - $label = $fieldset_arr[$fieldset_count]['label']; |
|
| 2549 | - $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name']; |
|
| 2550 | - $fieldset_html = $fieldset; |
|
| 2551 | - } |
|
| 2552 | - } |
|
| 2456 | + global $field_set_start; |
|
| 2553 | 2457 | |
| 2554 | - if ($add_html) {
|
|
| 2555 | - $tabs_arr[$htmlvar_name] = array( |
|
| 2556 | - 'heading_text' => __($label, 'geodirectory'), |
|
| 2557 | - 'is_active_tab' => false, |
|
| 2558 | - /** |
|
| 2559 | - * Filter if a custom field should be displayed on the details page tab. |
|
| 2560 | - * |
|
| 2561 | - * @since 1.0.0 |
|
| 2562 | - * @param string $htmlvar_name The field HTML var name. |
|
| 2563 | - */ |
|
| 2564 | - 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
|
| 2565 | - 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2566 | - ); |
|
| 2567 | - } |
|
| 2568 | - } else {
|
|
| 2569 | - if ($html != '') {
|
|
| 2570 | - $tabs_arr[$html_var] = array( |
|
| 2571 | - 'heading_text' => __($label, 'geodirectory'), |
|
| 2572 | - 'is_active_tab' => false, |
|
| 2573 | - /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 2574 | - 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),
|
|
| 2575 | - 'tab_content' => $html |
|
| 2576 | - ); |
|
| 2577 | - } |
|
| 2578 | - } |
|
| 2579 | - } |
|
| 2580 | - } |
|
| 2581 | - } |
|
| 2582 | - } |
|
| 2583 | - return $tabs_arr; |
|
| 2458 | + $post = stripslashes_deep($post); // strip slashes |
|
| 2459 | + |
|
| 2460 | + $field_set_start = 0; |
|
| 2461 | + $fieldset_count = 0; |
|
| 2462 | + $fieldset = ''; |
|
| 2463 | + $total_fields = count($custom_fields); |
|
| 2464 | + $count_field = 0; |
|
| 2465 | + $fieldset_arr = array(); |
|
| 2466 | + $i = 0; |
|
| 2467 | + $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL; |
|
| 2468 | + |
|
| 2469 | + foreach ($custom_fields as $field) {
|
|
| 2470 | + $count_field++; |
|
| 2471 | + $field_name = $field['htmlvar_name']; |
|
| 2472 | + if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2473 | + $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2474 | + } |
|
| 2475 | + |
|
| 2476 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2477 | + $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
|
| 2478 | + $site_title = trim($field['site_title']); |
|
| 2479 | + $type = $field; |
|
| 2480 | + $variables_array = array(); |
|
| 2481 | + |
|
| 2482 | + if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2483 | + continue; |
|
| 2484 | + } |
|
| 2485 | + |
|
| 2486 | + if ($type['type'] != 'fieldset') {
|
|
| 2487 | + $i++; |
|
| 2488 | + $variables_array['post_id'] = $post->ID; |
|
| 2489 | + $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 2490 | + $variables_array['value'] = isset($post->{$type['htmlvar_name']}) ? $post->{$type['htmlvar_name']} : '';
|
|
| 2491 | + |
|
| 2492 | + }else{
|
|
| 2493 | + $i = 0; |
|
| 2494 | + $fieldset_count++; |
|
| 2495 | + $field_set_start = 1; |
|
| 2496 | + $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2497 | + $fieldset_arr[$fieldset_count]['label'] = $label; |
|
| 2498 | + } |
|
| 2499 | + |
|
| 2500 | + |
|
| 2501 | + if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2502 | + $type = stripslashes_deep($type); // strip slashes |
|
| 2503 | + if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2504 | + $html = ''; |
|
| 2505 | + $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 2506 | + if($html_var=='post'){$html_var='post_address';}
|
|
| 2507 | + $field_icon = geodir_field_icon_proccess($type); |
|
| 2508 | + $filed_type = $type['type']; |
|
| 2509 | + |
|
| 2510 | + /** |
|
| 2511 | + * Filter the output for custom fields. |
|
| 2512 | + * |
|
| 2513 | + * Here we can remove or add new functions depending on the field type. |
|
| 2514 | + * |
|
| 2515 | + * @param string $html The html to be filtered (blank). |
|
| 2516 | + * @param string $fields_location The location the field is to be show. |
|
| 2517 | + * @param array $type The array of field values. |
|
| 2518 | + */ |
|
| 2519 | + $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2520 | + |
|
| 2521 | + |
|
| 2522 | + /** |
|
| 2523 | + * Filter custom field output in tab. |
|
| 2524 | + * |
|
| 2525 | + * @since 1.5.6 |
|
| 2526 | + * |
|
| 2527 | + * @param string $html_var The HTML variable name for the field. |
|
| 2528 | + * @param string $html Custom field unfiltered HTML. |
|
| 2529 | + * @param array $variables_array Custom field variables array. |
|
| 2530 | + */ |
|
| 2531 | + $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);
|
|
| 2532 | + |
|
| 2533 | + $fieldset_html = ''; |
|
| 2534 | + if ($field_set_start == 1) {
|
|
| 2535 | + $add_html = false; |
|
| 2536 | + if ($type['type'] == 'fieldset' && $fieldset_count > 1) {
|
|
| 2537 | + if ($fieldset != '') {
|
|
| 2538 | + $add_html = true; |
|
| 2539 | + $label = $fieldset_arr[$fieldset_count - 1]['label']; |
|
| 2540 | + $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name']; |
|
| 2541 | + } |
|
| 2542 | + $fieldset_html = $fieldset; |
|
| 2543 | + $fieldset = ''; |
|
| 2544 | + } else {
|
|
| 2545 | + $fieldset .= $html; |
|
| 2546 | + if ($total_fields == $count_field && $fieldset != '') {
|
|
| 2547 | + $add_html = true; |
|
| 2548 | + $label = $fieldset_arr[$fieldset_count]['label']; |
|
| 2549 | + $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name']; |
|
| 2550 | + $fieldset_html = $fieldset; |
|
| 2551 | + } |
|
| 2552 | + } |
|
| 2553 | + |
|
| 2554 | + if ($add_html) {
|
|
| 2555 | + $tabs_arr[$htmlvar_name] = array( |
|
| 2556 | + 'heading_text' => __($label, 'geodirectory'), |
|
| 2557 | + 'is_active_tab' => false, |
|
| 2558 | + /** |
|
| 2559 | + * Filter if a custom field should be displayed on the details page tab. |
|
| 2560 | + * |
|
| 2561 | + * @since 1.0.0 |
|
| 2562 | + * @param string $htmlvar_name The field HTML var name. |
|
| 2563 | + */ |
|
| 2564 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
|
| 2565 | + 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2566 | + ); |
|
| 2567 | + } |
|
| 2568 | + } else {
|
|
| 2569 | + if ($html != '') {
|
|
| 2570 | + $tabs_arr[$html_var] = array( |
|
| 2571 | + 'heading_text' => __($label, 'geodirectory'), |
|
| 2572 | + 'is_active_tab' => false, |
|
| 2573 | + /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 2574 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),
|
|
| 2575 | + 'tab_content' => $html |
|
| 2576 | + ); |
|
| 2577 | + } |
|
| 2578 | + } |
|
| 2579 | + } |
|
| 2580 | + } |
|
| 2581 | + } |
|
| 2582 | + } |
|
| 2583 | + return $tabs_arr; |
|
| 2584 | 2584 | } |
| 2585 | 2585 | |
| 2586 | 2586 | /* display add listing page for wpml */ |
@@ -2604,39 +2604,39 @@ discard block |
||
| 2604 | 2604 | */ |
| 2605 | 2605 | function geodir_add_post_status_author_page() |
| 2606 | 2606 | {
|
| 2607 | - global $wpdb, $post; |
|
| 2608 | - |
|
| 2609 | - $html = ''; |
|
| 2610 | - if (get_current_user_id()) {
|
|
| 2611 | - |
|
| 2612 | - $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));
|
|
| 2613 | - if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {
|
|
| 2614 | - |
|
| 2615 | - // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them. |
|
| 2616 | - $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");
|
|
| 2617 | - $status = "<strong>(";
|
|
| 2618 | - $status_icon = '<i class="fa fa-play"></i>'; |
|
| 2619 | - if ($real_status == 'publish') {
|
|
| 2620 | - $status .= __('Published', 'geodirectory');
|
|
| 2621 | - } else {
|
|
| 2622 | - $status .= __('Not published', 'geodirectory');
|
|
| 2623 | - $status_icon = '<i class="fa fa-pause"></i>'; |
|
| 2624 | - } |
|
| 2625 | - $status .= ")</strong>"; |
|
| 2607 | + global $wpdb, $post; |
|
| 2608 | + |
|
| 2609 | + $html = ''; |
|
| 2610 | + if (get_current_user_id()) {
|
|
| 2611 | + |
|
| 2612 | + $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));
|
|
| 2613 | + if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {
|
|
| 2614 | + |
|
| 2615 | + // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them. |
|
| 2616 | + $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");
|
|
| 2617 | + $status = "<strong>(";
|
|
| 2618 | + $status_icon = '<i class="fa fa-play"></i>'; |
|
| 2619 | + if ($real_status == 'publish') {
|
|
| 2620 | + $status .= __('Published', 'geodirectory');
|
|
| 2621 | + } else {
|
|
| 2622 | + $status .= __('Not published', 'geodirectory');
|
|
| 2623 | + $status_icon = '<i class="fa fa-pause"></i>'; |
|
| 2624 | + } |
|
| 2625 | + $status .= ")</strong>"; |
|
| 2626 | 2626 | |
| 2627 | - $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2628 | - } |
|
| 2629 | - } |
|
| 2627 | + $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2628 | + } |
|
| 2629 | + } |
|
| 2630 | 2630 | |
| 2631 | - if ($html != '') {
|
|
| 2632 | - /** |
|
| 2633 | - * Filter the post status text on the author page. |
|
| 2634 | - * |
|
| 2635 | - * @since 1.0.0 |
|
| 2636 | - * @param string $html The HTML of the status. |
|
| 2637 | - */ |
|
| 2638 | - echo apply_filters('geodir_filter_status_text_on_author_page', $html);
|
|
| 2639 | - } |
|
| 2631 | + if ($html != '') {
|
|
| 2632 | + /** |
|
| 2633 | + * Filter the post status text on the author page. |
|
| 2634 | + * |
|
| 2635 | + * @since 1.0.0 |
|
| 2636 | + * @param string $html The HTML of the status. |
|
| 2637 | + */ |
|
| 2638 | + echo apply_filters('geodir_filter_status_text_on_author_page', $html);
|
|
| 2639 | + } |
|
| 2640 | 2640 | |
| 2641 | 2641 | |
| 2642 | 2642 | } |
@@ -2650,9 +2650,9 @@ discard block |
||
| 2650 | 2650 | * @package GeoDirectory |
| 2651 | 2651 | */ |
| 2652 | 2652 | function geodir_init_no_rating() {
|
| 2653 | - if (geodir_rating_disabled_post_types()) {
|
|
| 2654 | - add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);
|
|
| 2655 | - } |
|
| 2653 | + if (geodir_rating_disabled_post_types()) {
|
|
| 2654 | + add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);
|
|
| 2655 | + } |
|
| 2656 | 2656 | } |
| 2657 | 2657 | |
| 2658 | 2658 | /** |
@@ -2666,22 +2666,22 @@ discard block |
||
| 2666 | 2666 | * @return array Modified sort options array. |
| 2667 | 2667 | */ |
| 2668 | 2668 | function geodir_no_rating_get_sort_options($options, $post_type = '') {
|
| 2669 | - if (!empty($post_type) && geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 2670 | - $new_options = array(); |
|
| 2669 | + if (!empty($post_type) && geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 2670 | + $new_options = array(); |
|
| 2671 | 2671 | |
| 2672 | - if (!empty($options)) {
|
|
| 2673 | - foreach ($options as $option) {
|
|
| 2674 | - if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {
|
|
| 2675 | - continue; |
|
| 2676 | - } |
|
| 2677 | - $new_options[] = $option; |
|
| 2678 | - } |
|
| 2672 | + if (!empty($options)) {
|
|
| 2673 | + foreach ($options as $option) {
|
|
| 2674 | + if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {
|
|
| 2675 | + continue; |
|
| 2676 | + } |
|
| 2677 | + $new_options[] = $option; |
|
| 2678 | + } |
|
| 2679 | 2679 | |
| 2680 | - $options = $new_options; |
|
| 2681 | - } |
|
| 2682 | - } |
|
| 2680 | + $options = $new_options; |
|
| 2681 | + } |
|
| 2682 | + } |
|
| 2683 | 2683 | |
| 2684 | - return $options; |
|
| 2684 | + return $options; |
|
| 2685 | 2685 | } |
| 2686 | 2686 | |
| 2687 | 2687 | /** |
@@ -2693,9 +2693,9 @@ discard block |
||
| 2693 | 2693 | * @return array Modified class array. |
| 2694 | 2694 | */ |
| 2695 | 2695 | function geodir_body_class_active_map($classes = array()) {
|
| 2696 | - $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2696 | + $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2697 | 2697 | |
| 2698 | - return $classes; |
|
| 2698 | + return $classes; |
|
| 2699 | 2699 | } |
| 2700 | 2700 | add_filter('body_class', 'geodir_body_class_active_map', 100);
|
| 2701 | 2701 | |
@@ -2708,9 +2708,9 @@ discard block |
||
| 2708 | 2708 | * @return string Modified class string. |
| 2709 | 2709 | */ |
| 2710 | 2710 | function geodir_admin_body_class_active_map($class = '') {
|
| 2711 | - $class .= ' gd-map-' . geodir_map_name(); |
|
| 2711 | + $class .= ' gd-map-' . geodir_map_name(); |
|
| 2712 | 2712 | |
| 2713 | - return $class; |
|
| 2713 | + return $class; |
|
| 2714 | 2714 | } |
| 2715 | 2715 | add_filter('admin_body_class', 'geodir_admin_body_class_active_map', 100);
|
| 2716 | 2716 | |
@@ -2728,36 +2728,36 @@ discard block |
||
| 2728 | 2728 | * @return array Translation texts. |
| 2729 | 2729 | */ |
| 2730 | 2730 | function geodir_load_gd_options_text_translation($translation_texts = array()) {
|
| 2731 | - $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2732 | - |
|
| 2733 | - $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
|
| 2734 | - |
|
| 2735 | - /** |
|
| 2736 | - * Filters the geodirectory option names that requires to add for translation. |
|
| 2737 | - * |
|
| 2738 | - * @since 1.5.7 |
|
| 2739 | - * @package GeoDirectory |
|
| 2740 | - * |
|
| 2741 | - * @param array $gd_options Array of option names. |
|
| 2742 | - */ |
|
| 2743 | - $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);
|
|
| 2744 | - $gd_options = array_unique($gd_options); |
|
| 2745 | - |
|
| 2746 | - if (!empty($gd_options)) {
|
|
| 2747 | - foreach ($gd_options as $gd_option) {
|
|
| 2748 | - if ($gd_option != '' && $option_value = get_option($gd_option)) {
|
|
| 2749 | - $option_value = is_string($option_value) ? stripslashes_deep($option_value) : ''; |
|
| 2731 | + $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2732 | + |
|
| 2733 | + $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
|
| 2734 | + |
|
| 2735 | + /** |
|
| 2736 | + * Filters the geodirectory option names that requires to add for translation. |
|
| 2737 | + * |
|
| 2738 | + * @since 1.5.7 |
|
| 2739 | + * @package GeoDirectory |
|
| 2740 | + * |
|
| 2741 | + * @param array $gd_options Array of option names. |
|
| 2742 | + */ |
|
| 2743 | + $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);
|
|
| 2744 | + $gd_options = array_unique($gd_options); |
|
| 2745 | + |
|
| 2746 | + if (!empty($gd_options)) {
|
|
| 2747 | + foreach ($gd_options as $gd_option) {
|
|
| 2748 | + if ($gd_option != '' && $option_value = get_option($gd_option)) {
|
|
| 2749 | + $option_value = is_string($option_value) ? stripslashes_deep($option_value) : ''; |
|
| 2750 | 2750 | |
| 2751 | - if ($option_value != '' && !in_array($option_value, $translation_texts)) {
|
|
| 2752 | - $translation_texts[] = stripslashes_deep($option_value); |
|
| 2753 | - } |
|
| 2754 | - } |
|
| 2755 | - } |
|
| 2756 | - } |
|
| 2751 | + if ($option_value != '' && !in_array($option_value, $translation_texts)) {
|
|
| 2752 | + $translation_texts[] = stripslashes_deep($option_value); |
|
| 2753 | + } |
|
| 2754 | + } |
|
| 2755 | + } |
|
| 2756 | + } |
|
| 2757 | 2757 | |
| 2758 | - $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 2758 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 2759 | 2759 | |
| 2760 | - return $translation_texts; |
|
| 2760 | + return $translation_texts; |
|
| 2761 | 2761 | } |
| 2762 | 2762 | |
| 2763 | 2763 | add_filter('geodir_load_db_language', 'geodir_load_gd_options_text_translation');
|
@@ -2771,15 +2771,15 @@ discard block |
||
| 2771 | 2771 | |
| 2772 | 2772 | add_filter('get_comments_link', 'gd_get_comments_link', 10, 2);
|
| 2773 | 2773 | function gd_get_comments_link($comments_link, $post_id) {
|
| 2774 | - $post_type = get_post_type($post_id); |
|
| 2774 | + $post_type = get_post_type($post_id); |
|
| 2775 | 2775 | |
| 2776 | - $all_postypes = geodir_get_posttypes(); |
|
| 2777 | - if (in_array($post_type, $all_postypes)) {
|
|
| 2778 | - $comments_link = str_replace('#comments', '#reviews', $comments_link);
|
|
| 2779 | - $comments_link = str_replace('#respond', '#reviews', $comments_link);
|
|
| 2780 | - } |
|
| 2776 | + $all_postypes = geodir_get_posttypes(); |
|
| 2777 | + if (in_array($post_type, $all_postypes)) {
|
|
| 2778 | + $comments_link = str_replace('#comments', '#reviews', $comments_link);
|
|
| 2779 | + $comments_link = str_replace('#respond', '#reviews', $comments_link);
|
|
| 2780 | + } |
|
| 2781 | 2781 | |
| 2782 | - return $comments_link; |
|
| 2782 | + return $comments_link; |
|
| 2783 | 2783 | } |
| 2784 | 2784 | |
| 2785 | 2785 | |
@@ -2797,11 +2797,11 @@ discard block |
||
| 2797 | 2797 | function geodir_add_nav_menu_class( $args ) |
| 2798 | 2798 | {
|
| 2799 | 2799 | |
| 2800 | - if(isset($args['menu_class'])){
|
|
| 2801 | - $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
|
| 2802 | - } |
|
| 2800 | + if(isset($args['menu_class'])){
|
|
| 2801 | + $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
|
| 2802 | + } |
|
| 2803 | 2803 | |
| 2804 | - return $args; |
|
| 2804 | + return $args; |
|
| 2805 | 2805 | } |
| 2806 | 2806 | |
| 2807 | 2807 | add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' ); |
@@ -2818,15 +2818,15 @@ discard block |
||
| 2818 | 2818 | * @return string Filtered locale ID. |
| 2819 | 2819 | */ |
| 2820 | 2820 | function geodir_wpml_filter_locale($locale) {
|
| 2821 | - global $sitepress; |
|
| 2821 | + global $sitepress; |
|
| 2822 | 2822 | |
| 2823 | - $post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : ''); |
|
| 2823 | + $post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : ''); |
|
| 2824 | 2824 | |
| 2825 | - if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {
|
|
| 2826 | - $locale = $sitepress->get_locale($current_lang); |
|
| 2827 | - } |
|
| 2825 | + if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {
|
|
| 2826 | + $locale = $sitepress->get_locale($current_lang); |
|
| 2827 | + } |
|
| 2828 | 2828 | |
| 2829 | - return $locale; |
|
| 2829 | + return $locale; |
|
| 2830 | 2830 | } |
| 2831 | 2831 | |
| 2832 | 2832 | /** |
@@ -2836,19 +2836,19 @@ discard block |
||
| 2836 | 2836 | * @package GeoDirectory |
| 2837 | 2837 | */ |
| 2838 | 2838 | function geodir_wpml_set_filter() {
|
| 2839 | - if (geodir_is_wpml()) {
|
|
| 2840 | - global $sitepress; |
|
| 2839 | + if (geodir_is_wpml()) {
|
|
| 2840 | + global $sitepress; |
|
| 2841 | 2841 | |
| 2842 | - if ($sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
| 2843 | - add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);
|
|
| 2844 | - } |
|
| 2842 | + if ($sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
| 2843 | + add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);
|
|
| 2844 | + } |
|
| 2845 | 2845 | |
| 2846 | - add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);
|
|
| 2847 | - add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 ); |
|
| 2848 | - if (is_admin()) {
|
|
| 2849 | - add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 ); |
|
| 2850 | - } |
|
| 2851 | - } |
|
| 2846 | + add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);
|
|
| 2847 | + add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 ); |
|
| 2848 | + if (is_admin()) {
|
|
| 2849 | + add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 ); |
|
| 2850 | + } |
|
| 2851 | + } |
|
| 2852 | 2852 | } |
| 2853 | 2853 | add_filter('plugins_loaded', 'geodir_wpml_set_filter');
|
| 2854 | 2854 | |
@@ -2861,38 +2861,38 @@ discard block |
||
| 2861 | 2861 | * @return array Filtered languages. |
| 2862 | 2862 | */ |
| 2863 | 2863 | function geodir_wpml_filter_ls_languages($languages) {
|
| 2864 | - if (geodir_is_geodir_page()) {
|
|
| 2865 | - $keep_vars = array(); |
|
| 2864 | + if (geodir_is_geodir_page()) {
|
|
| 2865 | + $keep_vars = array(); |
|
| 2866 | 2866 | |
| 2867 | - if (geodir_is_page('add-listing')) {
|
|
| 2868 | - $keep_vars = array('listing_type', 'package_id');
|
|
| 2869 | - } else if (geodir_is_page('search')) {
|
|
| 2870 | - $keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');
|
|
| 2871 | - } else if (geodir_is_page('author')) {
|
|
| 2872 | - $keep_vars = array('geodir_dashbord', 'stype', 'list');
|
|
| 2873 | - } else if (geodir_is_page('login')) {
|
|
| 2874 | - $keep_vars = array('forgot', 'signup');
|
|
| 2875 | - } |
|
| 2867 | + if (geodir_is_page('add-listing')) {
|
|
| 2868 | + $keep_vars = array('listing_type', 'package_id');
|
|
| 2869 | + } else if (geodir_is_page('search')) {
|
|
| 2870 | + $keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');
|
|
| 2871 | + } else if (geodir_is_page('author')) {
|
|
| 2872 | + $keep_vars = array('geodir_dashbord', 'stype', 'list');
|
|
| 2873 | + } else if (geodir_is_page('login')) {
|
|
| 2874 | + $keep_vars = array('forgot', 'signup');
|
|
| 2875 | + } |
|
| 2876 | 2876 | |
| 2877 | - if (!empty($keep_vars)) {
|
|
| 2878 | - foreach ( $languages as $code => $url) {
|
|
| 2879 | - $filter_url = $url['url']; |
|
| 2877 | + if (!empty($keep_vars)) {
|
|
| 2878 | + foreach ( $languages as $code => $url) {
|
|
| 2879 | + $filter_url = $url['url']; |
|
| 2880 | 2880 | |
| 2881 | - foreach ($keep_vars as $var) {
|
|
| 2882 | - if (isset($_GET[$var]) && !is_array($_GET[$var])) {
|
|
| 2883 | - $filter_url = remove_query_arg(array($var), $filter_url); |
|
| 2884 | - $filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url); |
|
| 2885 | - } |
|
| 2886 | - } |
|
| 2881 | + foreach ($keep_vars as $var) {
|
|
| 2882 | + if (isset($_GET[$var]) && !is_array($_GET[$var])) {
|
|
| 2883 | + $filter_url = remove_query_arg(array($var), $filter_url); |
|
| 2884 | + $filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url); |
|
| 2885 | + } |
|
| 2886 | + } |
|
| 2887 | 2887 | |
| 2888 | - if ($filter_url != $url['url']) {
|
|
| 2889 | - $languages[$code]['url'] = $filter_url; |
|
| 2890 | - } |
|
| 2891 | - } |
|
| 2892 | - } |
|
| 2893 | - } |
|
| 2888 | + if ($filter_url != $url['url']) {
|
|
| 2889 | + $languages[$code]['url'] = $filter_url; |
|
| 2890 | + } |
|
| 2891 | + } |
|
| 2892 | + } |
|
| 2893 | + } |
|
| 2894 | 2894 | |
| 2895 | - return $languages; |
|
| 2895 | + return $languages; |
|
| 2896 | 2896 | } |
| 2897 | 2897 | add_filter( 'icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1 ); |
| 2898 | 2898 | |
@@ -2903,18 +2903,18 @@ discard block |
||
| 2903 | 2903 | * |
| 2904 | 2904 | */ |
| 2905 | 2905 | function geodir_remove_yoast_seo_metas(){
|
| 2906 | - if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {
|
|
| 2907 | - $wpseo = WPSEO_Frontend::get_instance(); |
|
| 2906 | + if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {
|
|
| 2907 | + $wpseo = WPSEO_Frontend::get_instance(); |
|
| 2908 | 2908 | |
| 2909 | - remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 ); |
|
| 2910 | - remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 ); |
|
| 2911 | - remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 ); |
|
| 2912 | - remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 ); |
|
| 2913 | - remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 ); |
|
| 2914 | - remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 ); |
|
| 2909 | + remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 ); |
|
| 2910 | + remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 ); |
|
| 2911 | + remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 ); |
|
| 2912 | + remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 ); |
|
| 2913 | + remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 ); |
|
| 2914 | + remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 ); |
|
| 2915 | 2915 | |
| 2916 | - remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 ); |
|
| 2917 | - } |
|
| 2916 | + remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 ); |
|
| 2917 | + } |
|
| 2918 | 2918 | } |
| 2919 | 2919 | |
| 2920 | 2920 | /** |
@@ -2928,20 +2928,20 @@ discard block |
||
| 2928 | 2928 | * |
| 2929 | 2929 | */ |
| 2930 | 2930 | function geodir_wpml_ajax_set_guest_lang() {
|
| 2931 | - if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {
|
|
| 2932 | - if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {
|
|
| 2933 | - global $sitepress; |
|
| 2931 | + if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {
|
|
| 2932 | + if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {
|
|
| 2933 | + global $sitepress; |
|
| 2934 | 2934 | |
| 2935 | - $referer = wp_get_referer(); |
|
| 2935 | + $referer = wp_get_referer(); |
|
| 2936 | 2936 | |
| 2937 | - $current_lang = $sitepress->get_current_language(); |
|
| 2938 | - $referrer_lang = $sitepress->get_language_from_url( $referer ); |
|
| 2937 | + $current_lang = $sitepress->get_current_language(); |
|
| 2938 | + $referrer_lang = $sitepress->get_language_from_url( $referer ); |
|
| 2939 | 2939 | |
| 2940 | - if ( $referrer_lang && $current_lang != $referrer_lang ) {
|
|
| 2941 | - $_GET['lang'] = $referrer_lang; |
|
| 2942 | - } |
|
| 2943 | - } |
|
| 2944 | - } |
|
| 2940 | + if ( $referrer_lang && $current_lang != $referrer_lang ) {
|
|
| 2941 | + $_GET['lang'] = $referrer_lang; |
|
| 2942 | + } |
|
| 2943 | + } |
|
| 2944 | + } |
|
| 2945 | 2945 | } |
| 2946 | 2946 | add_action( 'plugins_loaded', 'geodir_wpml_ajax_set_guest_lang', -1 ); |
| 2947 | 2947 | |
@@ -2953,36 +2953,36 @@ discard block |
||
| 2953 | 2953 | * @param object $wp The WordPress object. |
| 2954 | 2954 | */ |
| 2955 | 2955 | function geodir_check_redirect($wp) {
|
| 2956 | - if (is_404() || (!empty($wp->query_vars['error']) && $wp->query_vars['error'] == '404')) {
|
|
| 2957 | - $current_url = geodir_curPageURL(); |
|
| 2958 | - $search = 'czech-republic'; |
|
| 2959 | - $replace = 'czechia'; |
|
| 2956 | + if (is_404() || (!empty($wp->query_vars['error']) && $wp->query_vars['error'] == '404')) {
|
|
| 2957 | + $current_url = geodir_curPageURL(); |
|
| 2958 | + $search = 'czech-republic'; |
|
| 2959 | + $replace = 'czechia'; |
|
| 2960 | 2960 | |
| 2961 | - $has_slash = substr($current_url, -1); |
|
| 2962 | - if ($has_slash != "/") {
|
|
| 2963 | - $current_url .= '/'; |
|
| 2964 | - } |
|
| 2961 | + $has_slash = substr($current_url, -1); |
|
| 2962 | + if ($has_slash != "/") {
|
|
| 2963 | + $current_url .= '/'; |
|
| 2964 | + } |
|
| 2965 | 2965 | |
| 2966 | - $redirect = false; |
|
| 2967 | - if (strpos($current_url, '/' . $search . '/') !== false) {
|
|
| 2968 | - $redirect = true; |
|
| 2969 | - $current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);
|
|
| 2970 | - } |
|
| 2966 | + $redirect = false; |
|
| 2967 | + if (strpos($current_url, '/' . $search . '/') !== false) {
|
|
| 2968 | + $redirect = true; |
|
| 2969 | + $current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);
|
|
| 2970 | + } |
|
| 2971 | 2971 | |
| 2972 | - if ($has_slash != "/") {
|
|
| 2973 | - $current_url = trim($current_url, '/'); |
|
| 2974 | - } |
|
| 2972 | + if ($has_slash != "/") {
|
|
| 2973 | + $current_url = trim($current_url, '/'); |
|
| 2974 | + } |
|
| 2975 | 2975 | |
| 2976 | - if (strpos($current_url, 'gd_country=' . $search) !== false) {
|
|
| 2977 | - $redirect = true; |
|
| 2978 | - $current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);
|
|
| 2979 | - } |
|
| 2980 | - |
|
| 2981 | - if ($redirect) {
|
|
| 2982 | - wp_redirect($current_url); |
|
| 2983 | - exit; |
|
| 2984 | - } |
|
| 2985 | - } |
|
| 2976 | + if (strpos($current_url, 'gd_country=' . $search) !== false) {
|
|
| 2977 | + $redirect = true; |
|
| 2978 | + $current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);
|
|
| 2979 | + } |
|
| 2980 | + |
|
| 2981 | + if ($redirect) {
|
|
| 2982 | + wp_redirect($current_url); |
|
| 2983 | + exit; |
|
| 2984 | + } |
|
| 2985 | + } |
|
| 2986 | 2986 | } |
| 2987 | 2987 | add_action('parse_request', 'geodir_check_redirect', 101, 1);
|
| 2988 | 2988 | |
@@ -3002,50 +3002,50 @@ discard block |
||
| 3002 | 3002 | * @param string $original_slug The original post slug. |
| 3003 | 3003 | */ |
| 3004 | 3004 | function geodir_check_post_to_term_slug( $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug ) {
|
| 3005 | - global $wpdb, $sitepress; |
|
| 3005 | + global $wpdb, $sitepress; |
|
| 3006 | 3006 | |
| 3007 | - if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {
|
|
| 3008 | - $wpml_post_join = ""; |
|
| 3009 | - $wpml_post_where = ""; |
|
| 3010 | - $wpml_term_join = ""; |
|
| 3011 | - $wpml_term_where = ""; |
|
| 3007 | + if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {
|
|
| 3008 | + $wpml_post_join = ""; |
|
| 3009 | + $wpml_post_where = ""; |
|
| 3010 | + $wpml_term_join = ""; |
|
| 3011 | + $wpml_term_where = ""; |
|
| 3012 | 3012 | |
| 3013 | - if (geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3014 | - $post_language = $post_ID ? $sitepress->post_translations()->get_element_lang_code($post_ID) : $sitepress->get_current_language(); |
|
| 3015 | - $post_language = $post_language ? $post_language : $sitepress->post_translations()->get_save_post_lang($post_ID, $sitepress); |
|
| 3016 | - if (!$post_language) {
|
|
| 3017 | - $post_language = $sitepress->get_current_language(); |
|
| 3018 | - } |
|
| 3013 | + if (geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3014 | + $post_language = $post_ID ? $sitepress->post_translations()->get_element_lang_code($post_ID) : $sitepress->get_current_language(); |
|
| 3015 | + $post_language = $post_language ? $post_language : $sitepress->post_translations()->get_save_post_lang($post_ID, $sitepress); |
|
| 3016 | + if (!$post_language) {
|
|
| 3017 | + $post_language = $sitepress->get_current_language(); |
|
| 3018 | + } |
|
| 3019 | 3019 | |
| 3020 | - $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3021 | - $wpml_post_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3020 | + $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3021 | + $wpml_post_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3022 | 3022 | |
| 3023 | - $wpml_term_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON icl_t.element_id = tt.term_taxonomy_id AND icl_t.element_type = CONCAT('tax_', tt.taxonomy)";
|
|
| 3024 | - $wpml_term_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3025 | - } |
|
| 3023 | + $wpml_term_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON icl_t.element_id = tt.term_taxonomy_id AND icl_t.element_type = CONCAT('tax_', tt.taxonomy)";
|
|
| 3024 | + $wpml_term_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3025 | + } |
|
| 3026 | 3026 | |
| 3027 | - $term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $slug ) );
|
|
| 3027 | + $term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $slug ) );
|
|
| 3028 | 3028 | |
| 3029 | - if ( $term_slug_check ) {
|
|
| 3030 | - $suffix = 1; |
|
| 3029 | + if ( $term_slug_check ) {
|
|
| 3030 | + $suffix = 1; |
|
| 3031 | 3031 | |
| 3032 | - do {
|
|
| 3033 | - $alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; |
|
| 3032 | + do {
|
|
| 3033 | + $alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; |
|
| 3034 | 3034 | |
| 3035 | - $term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $alt_slug ) );
|
|
| 3035 | + $term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $alt_slug ) );
|
|
| 3036 | 3036 | |
| 3037 | - $post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s AND p.ID != %d {$wpml_term_where} LIMIT 1", $alt_slug, $post_type, $post_ID ) );
|
|
| 3037 | + $post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s AND p.ID != %d {$wpml_term_where} LIMIT 1", $alt_slug, $post_type, $post_ID ) );
|
|
| 3038 | 3038 | |
| 3039 | - $term_slug_check = $term_check || $post_check; |
|
| 3039 | + $term_slug_check = $term_check || $post_check; |
|
| 3040 | 3040 | |
| 3041 | - $suffix++; |
|
| 3042 | - } while ( $term_slug_check ); |
|
| 3041 | + $suffix++; |
|
| 3042 | + } while ( $term_slug_check ); |
|
| 3043 | 3043 | |
| 3044 | - $slug = $alt_slug; |
|
| 3045 | - } |
|
| 3046 | - } |
|
| 3044 | + $slug = $alt_slug; |
|
| 3045 | + } |
|
| 3046 | + } |
|
| 3047 | 3047 | |
| 3048 | - return $slug; |
|
| 3048 | + return $slug; |
|
| 3049 | 3049 | } |
| 3050 | 3050 | add_filter( 'wp_unique_post_slug', 'geodir_check_post_to_term_slug', 101, 6 ); |
| 3051 | 3051 | |
@@ -3065,47 +3065,47 @@ discard block |
||
| 3065 | 3065 | * @return bool true when exists. false when not exists. |
| 3066 | 3066 | */ |
| 3067 | 3067 | function geodir_check_term_to_post_slug( $slug_exists, $slug, $term_id ) {
|
| 3068 | - global $wpdb, $gd_term_post_type, $gd_term_taxonomy, $sitepress; |
|
| 3068 | + global $wpdb, $gd_term_post_type, $gd_term_taxonomy, $sitepress; |
|
| 3069 | 3069 | |
| 3070 | - if ( $slug_exists ) {
|
|
| 3071 | - return $slug_exists; |
|
| 3072 | - } |
|
| 3070 | + if ( $slug_exists ) {
|
|
| 3071 | + return $slug_exists; |
|
| 3072 | + } |
|
| 3073 | 3073 | |
| 3074 | - if ( !empty( $gd_term_taxonomy ) && isset($gd_term_taxonomy[$term_id]) ) {
|
|
| 3075 | - $taxonomy = $gd_term_taxonomy[$term_id]; |
|
| 3076 | - } else {
|
|
| 3077 | - $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) ); |
|
| 3078 | - $gd_term_taxonomy[$term_id] = $taxonomy; |
|
| 3079 | - } |
|
| 3074 | + if ( !empty( $gd_term_taxonomy ) && isset($gd_term_taxonomy[$term_id]) ) {
|
|
| 3075 | + $taxonomy = $gd_term_taxonomy[$term_id]; |
|
| 3076 | + } else {
|
|
| 3077 | + $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) ); |
|
| 3078 | + $gd_term_taxonomy[$term_id] = $taxonomy; |
|
| 3079 | + } |
|
| 3080 | 3080 | |
| 3081 | - if ( empty($taxonomy) ) {
|
|
| 3082 | - return $slug_exists; |
|
| 3083 | - } |
|
| 3081 | + if ( empty($taxonomy) ) {
|
|
| 3082 | + return $slug_exists; |
|
| 3083 | + } |
|
| 3084 | 3084 | |
| 3085 | - if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {
|
|
| 3086 | - $post_type = $gd_term_post_type[$term_id]; |
|
| 3087 | - } else {
|
|
| 3088 | - $taxonomy_obj = get_taxonomy( $taxonomy ); |
|
| 3089 | - $post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL; |
|
| 3090 | - } |
|
| 3085 | + if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {
|
|
| 3086 | + $post_type = $gd_term_post_type[$term_id]; |
|
| 3087 | + } else {
|
|
| 3088 | + $taxonomy_obj = get_taxonomy( $taxonomy ); |
|
| 3089 | + $post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL; |
|
| 3090 | + } |
|
| 3091 | 3091 | |
| 3092 | - $wpml_post_join = ""; |
|
| 3093 | - $wpml_post_where = ""; |
|
| 3092 | + $wpml_post_join = ""; |
|
| 3093 | + $wpml_post_where = ""; |
|
| 3094 | 3094 | |
| 3095 | - if (geodir_wpml_is_taxonomy_translated($taxonomy) || geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3096 | - $term_language = $term_id ? geodir_get_language_for_element($term_id, 'tax_' . $taxonomy) : $sitepress->get_current_language(); |
|
| 3097 | - if (!$term_language) {
|
|
| 3098 | - $term_language = $sitepress->get_current_language(); |
|
| 3099 | - } |
|
| 3095 | + if (geodir_wpml_is_taxonomy_translated($taxonomy) || geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3096 | + $term_language = $term_id ? geodir_get_language_for_element($term_id, 'tax_' . $taxonomy) : $sitepress->get_current_language(); |
|
| 3097 | + if (!$term_language) {
|
|
| 3098 | + $term_language = $sitepress->get_current_language(); |
|
| 3099 | + } |
|
| 3100 | 3100 | |
| 3101 | - $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3102 | - $wpml_post_where = " AND icl_t.language_code = '" . $term_language ."'"; |
|
| 3103 | - } |
|
| 3101 | + $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3102 | + $wpml_post_where = " AND icl_t.language_code = '" . $term_language ."'"; |
|
| 3103 | + } |
|
| 3104 | 3104 | |
| 3105 | - if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s {$wpml_post_where} LIMIT 1", $slug, $post_type ) ) ) {
|
|
| 3106 | - $slug_exists = true; |
|
| 3107 | - } |
|
| 3105 | + if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s {$wpml_post_where} LIMIT 1", $slug, $post_type ) ) ) {
|
|
| 3106 | + $slug_exists = true; |
|
| 3107 | + } |
|
| 3108 | 3108 | |
| 3109 | - return $slug_exists; |
|
| 3109 | + return $slug_exists; |
|
| 3110 | 3110 | } |
| 3111 | 3111 | add_filter( 'geodir_term_slug_is_exists', 'geodir_check_term_to_post_slug', 10, 3 ); |
| 3112 | 3112 | \ No newline at end of file |
@@ -14,15 +14,15 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | if (get_current_user_id()) { |
| 16 | 16 | |
| 17 | - $_redirect = home_url(); |
|
| 18 | - if (isset($_REQUEST['redirect_add_listing'])) { |
|
| 19 | - $_redirect = $_REQUEST['redirect_add_listing']; |
|
| 20 | - } elseif (!empty($_REQUEST['redirect_to'])) { |
|
| 21 | - $_redirect = $_REQUEST['redirect_to']; |
|
| 22 | - } |
|
| 23 | - |
|
| 24 | - wp_safe_redirect($_redirect , 302); |
|
| 25 | - exit; |
|
| 17 | + $_redirect = home_url(); |
|
| 18 | + if (isset($_REQUEST['redirect_add_listing'])) { |
|
| 19 | + $_redirect = $_REQUEST['redirect_add_listing']; |
|
| 20 | + } elseif (!empty($_REQUEST['redirect_to'])) { |
|
| 21 | + $_redirect = $_REQUEST['redirect_to']; |
|
| 22 | + } |
|
| 23 | + |
|
| 24 | + wp_safe_redirect($_redirect , 302); |
|
| 25 | + exit; |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | // call header |
@@ -16,10 +16,10 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | function geodir_session_start() |
| 18 | 18 | {
|
| 19 | - if (!session_id()) session_start(); |
|
| 20 | - global $geodir_add_location_url; |
|
| 19 | + if (!session_id()) session_start(); |
|
| 20 | + global $geodir_add_location_url; |
|
| 21 | 21 | |
| 22 | - $geodir_add_location_url = NULL; |
|
| 22 | + $geodir_add_location_url = NULL; |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | /** |
@@ -33,18 +33,18 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | function geodir_modified_query($query) |
| 35 | 35 | {
|
| 36 | - if ($query->is_main_query() && ( |
|
| 37 | - (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
|
|
| 38 | - || geodir_is_page('listing')
|
|
| 39 | - || geodir_is_page('author')
|
|
| 40 | - || geodir_is_page('search')
|
|
| 41 | - || geodir_is_page('detail'))
|
|
| 42 | - ) {
|
|
| 43 | - |
|
| 44 | - $query->set('is_geodir_loop', true);
|
|
| 45 | - } |
|
| 36 | + if ($query->is_main_query() && ( |
|
| 37 | + (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
|
|
| 38 | + || geodir_is_page('listing')
|
|
| 39 | + || geodir_is_page('author')
|
|
| 40 | + || geodir_is_page('search')
|
|
| 41 | + || geodir_is_page('detail'))
|
|
| 42 | + ) {
|
|
| 43 | + |
|
| 44 | + $query->set('is_geodir_loop', true);
|
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - return $query; |
|
| 47 | + return $query; |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -67,81 +67,81 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | function set_listing_request($query ) |
| 69 | 69 | {
|
| 70 | - global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA; |
|
| 70 | + global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA; |
|
| 71 | 71 | |
| 72 | 72 | |
| 73 | - // fix woocommerce shop products filtered by language for GD + WPML + Woocommerce |
|
| 74 | - if (!geodir_is_geodir_page()) {
|
|
| 75 | - return; |
|
| 76 | - } |
|
| 73 | + // fix woocommerce shop products filtered by language for GD + WPML + Woocommerce |
|
| 74 | + if (!geodir_is_geodir_page()) {
|
|
| 75 | + return; |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | - /* remove all pre filters */ |
|
| 79 | - remove_all_filters('query');
|
|
| 80 | - remove_all_filters('posts_search');
|
|
| 81 | - remove_all_filters('posts_fields');
|
|
| 82 | - remove_all_filters('posts_join');
|
|
| 83 | - remove_all_filters('posts_orderby');
|
|
| 84 | - remove_all_filters('posts_where');
|
|
| 78 | + /* remove all pre filters */ |
|
| 79 | + remove_all_filters('query');
|
|
| 80 | + remove_all_filters('posts_search');
|
|
| 81 | + remove_all_filters('posts_fields');
|
|
| 82 | + remove_all_filters('posts_join');
|
|
| 83 | + remove_all_filters('posts_orderby');
|
|
| 84 | + remove_all_filters('posts_where');
|
|
| 85 | 85 | |
| 86 | 86 | |
| 87 | - if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')): |
|
| 87 | + if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')): |
|
| 88 | 88 | |
| 89 | - if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = ''; |
|
| 90 | - //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = ''; |
|
| 89 | + if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = ''; |
|
| 90 | + //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = ''; |
|
| 91 | 91 | |
| 92 | - if (isset($_REQUEST['sdist'])) {
|
|
| 93 | - ($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000; |
|
| 94 | - } elseif (get_option('geodir_search_dist') != '') {
|
|
| 95 | - $dist = get_option('geodir_search_dist');
|
|
| 92 | + if (isset($_REQUEST['sdist'])) {
|
|
| 93 | + ($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000; |
|
| 94 | + } elseif (get_option('geodir_search_dist') != '') {
|
|
| 95 | + $dist = get_option('geodir_search_dist');
|
|
| 96 | 96 | |
| 97 | - } else {
|
|
| 98 | - $dist = 25000; |
|
| 99 | - } // Distance |
|
| 97 | + } else {
|
|
| 98 | + $dist = 25000; |
|
| 99 | + } // Distance |
|
| 100 | 100 | |
| 101 | - if (isset($_REQUEST['sgeo_lat'])) {
|
|
| 102 | - $mylat = (float)esc_attr($_REQUEST['sgeo_lat']); |
|
| 103 | - } else {
|
|
| 104 | - $mylat = (float)geodir_get_current_city_lat(); |
|
| 105 | - } // Latitude |
|
| 101 | + if (isset($_REQUEST['sgeo_lat'])) {
|
|
| 102 | + $mylat = (float)esc_attr($_REQUEST['sgeo_lat']); |
|
| 103 | + } else {
|
|
| 104 | + $mylat = (float)geodir_get_current_city_lat(); |
|
| 105 | + } // Latitude |
|
| 106 | 106 | |
| 107 | - if (isset($_REQUEST['sgeo_lon'])) {
|
|
| 108 | - $mylon = (float)esc_attr($_REQUEST['sgeo_lon']); |
|
| 109 | - } else {
|
|
| 110 | - $mylon = (float)geodir_get_current_city_lng(); |
|
| 111 | - } // Distance |
|
| 107 | + if (isset($_REQUEST['sgeo_lon'])) {
|
|
| 108 | + $mylon = (float)esc_attr($_REQUEST['sgeo_lon']); |
|
| 109 | + } else {
|
|
| 110 | + $mylon = (float)geodir_get_current_city_lng(); |
|
| 111 | + } // Distance |
|
| 112 | 112 | |
| 113 | - if (isset($_REQUEST['snear'])) {
|
|
| 114 | - $snear = trim(esc_attr($_REQUEST['snear'])); |
|
| 115 | - } |
|
| 113 | + if (isset($_REQUEST['snear'])) {
|
|
| 114 | + $snear = trim(esc_attr($_REQUEST['snear'])); |
|
| 115 | + } |
|
| 116 | 116 | |
| 117 | - if (isset($_REQUEST['s'])) {
|
|
| 118 | - $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s']))); |
|
| 119 | - } |
|
| 117 | + if (isset($_REQUEST['s'])) {
|
|
| 118 | + $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s']))); |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | - if ($snear == 'NEAR ME') {
|
|
| 122 | - $ip = $_SERVER['REMOTE_ADDR']; |
|
| 123 | - $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));
|
|
| 124 | - $mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude])); |
|
| 125 | - $mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude])); |
|
| 126 | - } |
|
| 121 | + if ($snear == 'NEAR ME') {
|
|
| 122 | + $ip = $_SERVER['REMOTE_ADDR']; |
|
| 123 | + $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));
|
|
| 124 | + $mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude])); |
|
| 125 | + $mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude])); |
|
| 126 | + } |
|
| 127 | 127 | |
| 128 | 128 | |
| 129 | - if (strstr($s, ',')) {
|
|
| 130 | - $s_AA = str_replace(" ", "", $s);
|
|
| 131 | - $s_A = explode(",", $s_AA);
|
|
| 132 | - $s_A = implode('","', $s_A);
|
|
| 133 | - $s_A = '"' . $s_A . '"'; |
|
| 134 | - } else {
|
|
| 135 | - $s_A = '"' . $s . '"'; |
|
| 136 | - } |
|
| 129 | + if (strstr($s, ',')) {
|
|
| 130 | + $s_AA = str_replace(" ", "", $s);
|
|
| 131 | + $s_A = explode(",", $s_AA);
|
|
| 132 | + $s_A = implode('","', $s_A);
|
|
| 133 | + $s_A = '"' . $s_A . '"'; |
|
| 134 | + } else {
|
|
| 135 | + $s_A = '"' . $s . '"'; |
|
| 136 | + } |
|
| 137 | 137 | |
| 138 | - if (strstr($s, ' ')) {
|
|
| 139 | - $s_SA = explode(" ", $s);
|
|
| 140 | - } else {
|
|
| 141 | - $s_SA = ''; |
|
| 142 | - } |
|
| 138 | + if (strstr($s, ' ')) {
|
|
| 139 | + $s_SA = explode(" ", $s);
|
|
| 140 | + } else {
|
|
| 141 | + $s_SA = ''; |
|
| 142 | + } |
|
| 143 | 143 | |
| 144 | - endif; |
|
| 144 | + endif; |
|
| 145 | 145 | |
| 146 | 146 | |
| 147 | 147 | |
@@ -162,56 +162,56 @@ discard block |
||
| 162 | 162 | */ |
| 163 | 163 | function geodir_listing_loop_filter($query) |
| 164 | 164 | {
|
| 165 | - global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term; |
|
| 165 | + global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term; |
|
| 166 | 166 | |
| 167 | - // fix wp_reset_query for popular post view widget |
|
| 168 | - if (!geodir_is_geodir_page()) {
|
|
| 169 | - return; |
|
| 170 | - } |
|
| 167 | + // fix wp_reset_query for popular post view widget |
|
| 168 | + if (!geodir_is_geodir_page()) {
|
|
| 169 | + return; |
|
| 170 | + } |
|
| 171 | 171 | |
| 172 | - $geodir_post_type = geodir_get_current_posttype(); |
|
| 173 | - |
|
| 174 | - if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
|
|
| 175 | - $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy'); |
|
| 176 | - |
|
| 177 | - if (isset($wp_query->query[$taxonomies[0]])) {
|
|
| 178 | - $request_term = explode("/", $wp_query->query[$taxonomies[0]]);
|
|
| 179 | - $request_term = end($request_term); |
|
| 180 | - if (!term_exists($request_term)) {
|
|
| 181 | - $args = array('number' => '1',);
|
|
| 182 | - $terms_arr = get_terms($taxonomies[0], $args); |
|
| 183 | - foreach ($terms_arr as $location_term) {
|
|
| 184 | - $term_arr = $location_term; |
|
| 185 | - $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
|
|
| 186 | - } |
|
| 187 | - $wp_query->queried_object_id = 1; |
|
| 188 | - $wp_query->queried_object = $term_arr; |
|
| 189 | - //print_r($wp_query) ; |
|
| 190 | - } |
|
| 191 | - } |
|
| 172 | + $geodir_post_type = geodir_get_current_posttype(); |
|
| 173 | + |
|
| 174 | + if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
|
|
| 175 | + $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy'); |
|
| 176 | + |
|
| 177 | + if (isset($wp_query->query[$taxonomies[0]])) {
|
|
| 178 | + $request_term = explode("/", $wp_query->query[$taxonomies[0]]);
|
|
| 179 | + $request_term = end($request_term); |
|
| 180 | + if (!term_exists($request_term)) {
|
|
| 181 | + $args = array('number' => '1',);
|
|
| 182 | + $terms_arr = get_terms($taxonomies[0], $args); |
|
| 183 | + foreach ($terms_arr as $location_term) {
|
|
| 184 | + $term_arr = $location_term; |
|
| 185 | + $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
|
|
| 186 | + } |
|
| 187 | + $wp_query->queried_object_id = 1; |
|
| 188 | + $wp_query->queried_object = $term_arr; |
|
| 189 | + //print_r($wp_query) ; |
|
| 190 | + } |
|
| 191 | + } |
|
| 192 | 192 | |
| 193 | - } |
|
| 194 | - if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
|
|
| 195 | - |
|
| 196 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 197 | - |
|
| 198 | - add_filter('posts_fields', 'geodir_posts_fields', 1);
|
|
| 199 | - add_filter('posts_join', 'geodir_posts_join', 1);
|
|
| 200 | - geodir_post_where(); |
|
| 201 | - if (!is_admin()) |
|
| 202 | - add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 203 | - |
|
| 204 | - // advanced filter for popular post view widget |
|
| 205 | - global $wp_query; |
|
| 206 | - if (!is_admin()) {
|
|
| 207 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 208 | - add_filter('posts_join', 'geodir_filter_widget_join', 1000);
|
|
| 209 | - } |
|
| 210 | - add_filter('posts_where', 'geodir_filter_widget_where', 1000);
|
|
| 211 | - } |
|
| 193 | + } |
|
| 194 | + if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
|
|
| 212 | 195 | |
| 213 | - } |
|
| 214 | - return $query; |
|
| 196 | + $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 197 | + |
|
| 198 | + add_filter('posts_fields', 'geodir_posts_fields', 1);
|
|
| 199 | + add_filter('posts_join', 'geodir_posts_join', 1);
|
|
| 200 | + geodir_post_where(); |
|
| 201 | + if (!is_admin()) |
|
| 202 | + add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 203 | + |
|
| 204 | + // advanced filter for popular post view widget |
|
| 205 | + global $wp_query; |
|
| 206 | + if (!is_admin()) {
|
|
| 207 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 208 | + add_filter('posts_join', 'geodir_filter_widget_join', 1000);
|
|
| 209 | + } |
|
| 210 | + add_filter('posts_where', 'geodir_filter_widget_where', 1000);
|
|
| 211 | + } |
|
| 212 | + |
|
| 213 | + } |
|
| 214 | + return $query; |
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | |
@@ -230,67 +230,67 @@ discard block |
||
| 230 | 230 | * @return string Modified fields query string. |
| 231 | 231 | */ |
| 232 | 232 | function geodir_posts_fields($fields) {
|
| 233 | - global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session; |
|
| 233 | + global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session; |
|
| 234 | 234 | |
| 235 | - // Filter-Location-Manager to add location table. |
|
| 236 | - $fields .= ", " . $table . ".* "; |
|
| 235 | + // Filter-Location-Manager to add location table. |
|
| 236 | + $fields .= ", " . $table . ".* "; |
|
| 237 | 237 | |
| 238 | 238 | if ($snear != '' || $gd_session->get('all_near_me')) {
|
| 239 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 239 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 240 | 240 | |
| 241 | 241 | if ($gd_session->get('all_near_me')) {
|
| 242 | - $mylat = $gd_session->get('user_lat');
|
|
| 243 | - $mylon = $gd_session->get('user_lon');
|
|
| 244 | - } |
|
| 245 | - |
|
| 246 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 247 | - } |
|
| 248 | - |
|
| 249 | - global $s; |
|
| 250 | - if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 251 | - $keywords = explode(" ", $s);
|
|
| 252 | - |
|
| 253 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 254 | - foreach($keywords as $kkey=>$kword){
|
|
| 255 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 256 | - unset($keywords[$kkey]); |
|
| 257 | - } |
|
| 258 | - } |
|
| 259 | - } |
|
| 242 | + $mylat = $gd_session->get('user_lat');
|
|
| 243 | + $mylon = $gd_session->get('user_lon');
|
|
| 244 | + } |
|
| 260 | 245 | |
| 246 | + $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 247 | + } |
|
| 261 | 248 | |
| 262 | - if (count($keywords) > 1) {
|
|
| 263 | - $parts = array( |
|
| 264 | - 'AND' => 'gd_alltitlematch_part', |
|
| 265 | - 'OR' => 'gd_titlematch_part' |
|
| 266 | - ); |
|
| 267 | - $gd_titlematch_part = ""; |
|
| 268 | - foreach ($parts as $key => $part) {
|
|
| 269 | - $gd_titlematch_part .= " CASE WHEN "; |
|
| 270 | - $count = 0; |
|
| 271 | - foreach ($keywords as $keyword) {
|
|
| 272 | - $keyword = trim($keyword); |
|
| 273 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 249 | + global $s; |
|
| 250 | + if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 251 | + $keywords = explode(" ", $s);
|
|
| 252 | + |
|
| 253 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 254 | + foreach($keywords as $kkey=>$kword){
|
|
| 255 | + if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 256 | + unset($keywords[$kkey]); |
|
| 257 | + } |
|
| 258 | + } |
|
| 259 | + } |
|
| 260 | + |
|
| 261 | + |
|
| 262 | + if (count($keywords) > 1) {
|
|
| 263 | + $parts = array( |
|
| 264 | + 'AND' => 'gd_alltitlematch_part', |
|
| 265 | + 'OR' => 'gd_titlematch_part' |
|
| 266 | + ); |
|
| 267 | + $gd_titlematch_part = ""; |
|
| 268 | + foreach ($parts as $key => $part) {
|
|
| 269 | + $gd_titlematch_part .= " CASE WHEN "; |
|
| 270 | + $count = 0; |
|
| 271 | + foreach ($keywords as $keyword) {
|
|
| 272 | + $keyword = trim($keyword); |
|
| 273 | + $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 274 | 274 | $count++; |
| 275 | - if ($count < count($keywords)) {
|
|
| 276 | - // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " "; |
|
| 275 | + if ($count < count($keywords)) {
|
|
| 276 | + // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " "; |
|
| 277 | 277 | $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " "; |
| 278 | - } else {
|
|
| 279 | - //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' "; |
|
| 278 | + } else {
|
|
| 279 | + //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' "; |
|
| 280 | 280 | $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) "; |
| 281 | - } |
|
| 282 | - } |
|
| 283 | - $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ","; |
|
| 284 | - } |
|
| 285 | - } else {
|
|
| 286 | - $gd_titlematch_part = ""; |
|
| 287 | - } |
|
| 288 | - $s = stripslashes_deep( $s ); |
|
| 289 | - $s = wp_specialchars_decode($s,ENT_QUOTES); |
|
| 281 | + } |
|
| 282 | + } |
|
| 283 | + $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ","; |
|
| 284 | + } |
|
| 285 | + } else {
|
|
| 286 | + $gd_titlematch_part = ""; |
|
| 287 | + } |
|
| 288 | + $s = stripslashes_deep( $s ); |
|
| 289 | + $s = wp_specialchars_decode($s,ENT_QUOTES); |
|
| 290 | 290 | $fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));
|
| 291 | - } |
|
| 291 | + } |
|
| 292 | 292 | |
| 293 | - return $fields; |
|
| 293 | + return $fields; |
|
| 294 | 294 | } |
| 295 | 295 | |
| 296 | 296 | |
@@ -307,26 +307,26 @@ discard block |
||
| 307 | 307 | */ |
| 308 | 308 | function geodir_posts_join($join) |
| 309 | 309 | {
|
| 310 | - global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix; |
|
| 310 | + global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix; |
|
| 311 | 311 | |
| 312 | - ########### WPML ########### |
|
| 312 | + ########### WPML ########### |
|
| 313 | 313 | |
| 314 | - if ( geodir_wpml_is_post_type_translated( $geodir_post_type ) ) {
|
|
| 315 | - global $sitepress; |
|
| 316 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 317 | - $default_lang_code = $sitepress->get_default_language(); |
|
| 318 | - if ($lang_code) {
|
|
| 319 | - $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 320 | - } |
|
| 314 | + if ( geodir_wpml_is_post_type_translated( $geodir_post_type ) ) {
|
|
| 315 | + global $sitepress; |
|
| 316 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 317 | + $default_lang_code = $sitepress->get_default_language(); |
|
| 318 | + if ($lang_code) {
|
|
| 319 | + $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 320 | + } |
|
| 321 | 321 | |
| 322 | - } |
|
| 323 | - ########### WPML ########### |
|
| 322 | + } |
|
| 323 | + ########### WPML ########### |
|
| 324 | 324 | |
| 325 | - $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID) ";
|
|
| 326 | - //===old code start |
|
| 327 | - //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id) " ;//===old code end
|
|
| 325 | + $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID) ";
|
|
| 326 | + //===old code start |
|
| 327 | + //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id) " ;//===old code end
|
|
| 328 | 328 | |
| 329 | - return $join; |
|
| 329 | + return $join; |
|
| 330 | 330 | } |
| 331 | 331 | |
| 332 | 332 | |
@@ -344,15 +344,15 @@ discard block |
||
| 344 | 344 | */ |
| 345 | 345 | function geodir_posts_orderby($orderby) |
| 346 | 346 | {
|
| 347 | - global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort; |
|
| 347 | + global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort; |
|
| 348 | 348 | |
| 349 | - $sort_by = ''; |
|
| 350 | - $orderby = ' '; |
|
| 349 | + $sort_by = ''; |
|
| 350 | + $orderby = ' '; |
|
| 351 | 351 | |
| 352 | - if (get_query_var('order_by'))
|
|
| 353 | - $sort_by = get_query_var('order_by');
|
|
| 352 | + if (get_query_var('order_by'))
|
|
| 353 | + $sort_by = get_query_var('order_by');
|
|
| 354 | 354 | |
| 355 | - /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){
|
|
| 355 | + /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){
|
|
| 356 | 356 | $current_term = $wp_query->get_queried_object(); |
| 357 | 357 | } |
| 358 | 358 | |
@@ -366,133 +366,133 @@ discard block |
||
| 366 | 366 | }*/ |
| 367 | 367 | |
| 368 | 368 | |
| 369 | - if ($snear != '') {
|
|
| 370 | - $orderby .= " distance,"; |
|
| 371 | - } |
|
| 369 | + if ($snear != '') {
|
|
| 370 | + $orderby .= " distance,"; |
|
| 371 | + } |
|
| 372 | 372 | |
| 373 | - if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) |
|
| 374 | - $sort_by = esc_attr($_REQUEST['sort_by']); |
|
| 373 | + if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) |
|
| 374 | + $sort_by = esc_attr($_REQUEST['sort_by']); |
|
| 375 | 375 | |
| 376 | 376 | |
| 377 | - if ($sort_by == '') {
|
|
| 378 | - $default_sort = geodir_get_posts_default_sort($geodir_post_type); |
|
| 379 | - if (!empty($default_sort)) |
|
| 380 | - $sort_by = $default_sort; |
|
| 381 | - } |
|
| 377 | + if ($sort_by == '') {
|
|
| 378 | + $default_sort = geodir_get_posts_default_sort($geodir_post_type); |
|
| 379 | + if (!empty($default_sort)) |
|
| 380 | + $sort_by = $default_sort; |
|
| 381 | + } |
|
| 382 | 382 | |
| 383 | - /* |
|
| 383 | + /* |
|
| 384 | 384 | if search by term & no location then order always "relevance" |
| 385 | 385 | if search by location then order always "nearest" |
| 386 | 386 | */ |
| 387 | - if (is_main_query() && geodir_is_page('search')) {
|
|
| 388 | - $search_term = get_query_var('s');
|
|
| 389 | - |
|
| 390 | - if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {
|
|
| 391 | - $sort_by = 'az'; |
|
| 392 | - } |
|
| 387 | + if (is_main_query() && geodir_is_page('search')) {
|
|
| 388 | + $search_term = get_query_var('s');
|
|
| 393 | 389 | |
| 394 | - if ($snear != '' && $sort_by!='farthest') {
|
|
| 395 | - $sort_by = 'nearest'; |
|
| 396 | - } |
|
| 397 | - } |
|
| 390 | + if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {
|
|
| 391 | + $sort_by = 'az'; |
|
| 392 | + } |
|
| 398 | 393 | |
| 399 | - switch ($sort_by): |
|
| 400 | - case 'newest': |
|
| 401 | - $orderby = "$wpdb->posts.post_date desc, "; |
|
| 402 | - break; |
|
| 403 | - case 'oldest': |
|
| 404 | - $orderby = "$wpdb->posts.post_date asc, "; |
|
| 405 | - break; |
|
| 406 | - case 'low_review': |
|
| 407 | - case 'rating_count_asc': |
|
| 408 | - $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, "; |
|
| 409 | - break; |
|
| 410 | - case 'high_review': |
|
| 411 | - case 'rating_count_desc': |
|
| 412 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 413 | - break; |
|
| 414 | - case 'low_rating': |
|
| 415 | - $orderby = "( " . $table . ".overall_rating ) ASC, " . $table . ".rating_count ASC, "; |
|
| 416 | - break; |
|
| 417 | - case 'high_rating': |
|
| 418 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 419 | - break; |
|
| 420 | - case 'featured': |
|
| 421 | - $orderby = $table . ".is_featured asc, "; |
|
| 422 | - break; |
|
| 423 | - case 'nearest': |
|
| 424 | - $orderby = " distance asc, "; |
|
| 425 | - break; |
|
| 426 | - case 'farthest': |
|
| 427 | - $orderby = " distance desc, "; |
|
| 428 | - break; |
|
| 429 | - case 'random': |
|
| 430 | - $orderby = " rand(), "; |
|
| 431 | - break; |
|
| 432 | - case 'az': |
|
| 433 | - $orderby = "$wpdb->posts.post_title asc, "; |
|
| 434 | - break; |
|
| 435 | - // sort by rating |
|
| 436 | - case 'overall_rating_desc': |
|
| 437 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 438 | - break; |
|
| 439 | - case 'overall_rating_asc': |
|
| 440 | - $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, "; |
|
| 441 | - break; |
|
| 442 | - default: |
|
| 443 | - |
|
| 444 | - break; |
|
| 445 | - endswitch; |
|
| 446 | - |
|
| 447 | - if ($sort_by != '' && geodir_cpt_has_rating_disabled($geodir_post_type)) {
|
|
| 448 | - if (in_array($sort_by, array('high_review', 'rating_count_desc', 'high_rating', 'overall_rating_desc'))) {
|
|
| 449 | - $orderby = "$wpdb->posts.comment_count DESC, "; |
|
| 450 | - $sort_by = 'comment_count_desc'; |
|
| 451 | - } else if (in_array($sort_by, array('low_review', 'rating_count_asc', 'low_rating', 'overall_rating_asc'))) {
|
|
| 452 | - $orderby = "$wpdb->posts.comment_count ASC, "; |
|
| 453 | - $sort_by = 'comment_count_asc'; |
|
| 454 | - } |
|
| 455 | - } |
|
| 394 | + if ($snear != '' && $sort_by!='farthest') {
|
|
| 395 | + $sort_by = 'nearest'; |
|
| 396 | + } |
|
| 397 | + } |
|
| 456 | 398 | |
| 457 | - global $s; |
|
| 399 | + switch ($sort_by): |
|
| 400 | + case 'newest': |
|
| 401 | + $orderby = "$wpdb->posts.post_date desc, "; |
|
| 402 | + break; |
|
| 403 | + case 'oldest': |
|
| 404 | + $orderby = "$wpdb->posts.post_date asc, "; |
|
| 405 | + break; |
|
| 406 | + case 'low_review': |
|
| 407 | + case 'rating_count_asc': |
|
| 408 | + $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, "; |
|
| 409 | + break; |
|
| 410 | + case 'high_review': |
|
| 411 | + case 'rating_count_desc': |
|
| 412 | + $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 413 | + break; |
|
| 414 | + case 'low_rating': |
|
| 415 | + $orderby = "( " . $table . ".overall_rating ) ASC, " . $table . ".rating_count ASC, "; |
|
| 416 | + break; |
|
| 417 | + case 'high_rating': |
|
| 418 | + $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 419 | + break; |
|
| 420 | + case 'featured': |
|
| 421 | + $orderby = $table . ".is_featured asc, "; |
|
| 422 | + break; |
|
| 423 | + case 'nearest': |
|
| 424 | + $orderby = " distance asc, "; |
|
| 425 | + break; |
|
| 426 | + case 'farthest': |
|
| 427 | + $orderby = " distance desc, "; |
|
| 428 | + break; |
|
| 429 | + case 'random': |
|
| 430 | + $orderby = " rand(), "; |
|
| 431 | + break; |
|
| 432 | + case 'az': |
|
| 433 | + $orderby = "$wpdb->posts.post_title asc, "; |
|
| 434 | + break; |
|
| 435 | + // sort by rating |
|
| 436 | + case 'overall_rating_desc': |
|
| 437 | + $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 438 | + break; |
|
| 439 | + case 'overall_rating_asc': |
|
| 440 | + $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, "; |
|
| 441 | + break; |
|
| 442 | + default: |
|
| 443 | + |
|
| 444 | + break; |
|
| 445 | + endswitch; |
|
| 446 | + |
|
| 447 | + if ($sort_by != '' && geodir_cpt_has_rating_disabled($geodir_post_type)) {
|
|
| 448 | + if (in_array($sort_by, array('high_review', 'rating_count_desc', 'high_rating', 'overall_rating_desc'))) {
|
|
| 449 | + $orderby = "$wpdb->posts.comment_count DESC, "; |
|
| 450 | + $sort_by = 'comment_count_desc'; |
|
| 451 | + } else if (in_array($sort_by, array('low_review', 'rating_count_asc', 'low_rating', 'overall_rating_asc'))) {
|
|
| 452 | + $orderby = "$wpdb->posts.comment_count ASC, "; |
|
| 453 | + $sort_by = 'comment_count_asc'; |
|
| 454 | + } |
|
| 455 | + } |
|
| 458 | 456 | |
| 459 | - if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 460 | - $keywords = explode(" ", $s);
|
|
| 461 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 462 | - foreach($keywords as $kkey=>$kword){
|
|
| 463 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 464 | - unset($keywords[$kkey]); |
|
| 465 | - } |
|
| 466 | - } |
|
| 467 | - } |
|
| 468 | - if ($sort_by == 'nearest' || $sort_by == 'farthest') {
|
|
| 469 | - if (count($keywords) > 1) {
|
|
| 470 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 471 | - } else {
|
|
| 472 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 473 | - } |
|
| 474 | - } else {
|
|
| 475 | - if (count($keywords) > 1) {
|
|
| 476 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
| 477 | - } else {
|
|
| 478 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
| 479 | - } |
|
| 480 | - } |
|
| 481 | - } |
|
| 457 | + global $s; |
|
| 458 | + |
|
| 459 | + if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 460 | + $keywords = explode(" ", $s);
|
|
| 461 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 462 | + foreach($keywords as $kkey=>$kword){
|
|
| 463 | + if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 464 | + unset($keywords[$kkey]); |
|
| 465 | + } |
|
| 466 | + } |
|
| 467 | + } |
|
| 468 | + if ($sort_by == 'nearest' || $sort_by == 'farthest') {
|
|
| 469 | + if (count($keywords) > 1) {
|
|
| 470 | + $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 471 | + } else {
|
|
| 472 | + $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 473 | + } |
|
| 474 | + } else {
|
|
| 475 | + if (count($keywords) > 1) {
|
|
| 476 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
| 477 | + } else {
|
|
| 478 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
| 479 | + } |
|
| 480 | + } |
|
| 481 | + } |
|
| 482 | 482 | |
| 483 | - /** |
|
| 484 | - * Filter order by SQL. |
|
| 485 | - * |
|
| 486 | - * @since 1.0.0 |
|
| 487 | - * @param string $orderby The orderby query string. |
|
| 488 | - * @param string $sort_by Sortby query string. |
|
| 489 | - * @param string $table Listing table name. |
|
| 490 | - */ |
|
| 491 | - $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);
|
|
| 483 | + /** |
|
| 484 | + * Filter order by SQL. |
|
| 485 | + * |
|
| 486 | + * @since 1.0.0 |
|
| 487 | + * @param string $orderby The orderby query string. |
|
| 488 | + * @param string $sort_by Sortby query string. |
|
| 489 | + * @param string $table Listing table name. |
|
| 490 | + */ |
|
| 491 | + $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);
|
|
| 492 | 492 | |
| 493 | - $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 493 | + $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 494 | 494 | |
| 495 | - return $orderby; |
|
| 495 | + return $orderby; |
|
| 496 | 496 | } |
| 497 | 497 | |
| 498 | 498 | |
@@ -510,53 +510,53 @@ discard block |
||
| 510 | 510 | function geodir_posts_order_by_custom_sort($orderby, $sort_by, $table) |
| 511 | 511 | {
|
| 512 | 512 | |
| 513 | - global $wpdb; |
|
| 513 | + global $wpdb; |
|
| 514 | 514 | |
| 515 | - if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) {
|
|
| 515 | + if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) {
|
|
| 516 | 516 | |
| 517 | - $sort_array = explode('_', $sort_by);
|
|
| 517 | + $sort_array = explode('_', $sort_by);
|
|
| 518 | 518 | |
| 519 | - $sort_by_count = count($sort_array); |
|
| 519 | + $sort_by_count = count($sort_array); |
|
| 520 | 520 | |
| 521 | - $order = $sort_array[$sort_by_count - 1]; |
|
| 521 | + $order = $sort_array[$sort_by_count - 1]; |
|
| 522 | 522 | |
| 523 | - if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {
|
|
| 523 | + if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {
|
|
| 524 | 524 | |
| 525 | - $sort_by = str_replace('_' . $order, '', $sort_by);
|
|
| 525 | + $sort_by = str_replace('_' . $order, '', $sort_by);
|
|
| 526 | 526 | |
| 527 | - switch ($sort_by): |
|
| 527 | + switch ($sort_by): |
|
| 528 | 528 | |
| 529 | - case 'post_date': |
|
| 530 | - case 'comment_count': |
|
| 529 | + case 'post_date': |
|
| 530 | + case 'comment_count': |
|
| 531 | 531 | |
| 532 | - $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
| 533 | - break; |
|
| 532 | + $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
| 533 | + break; |
|
| 534 | 534 | |
| 535 | - case 'distance': |
|
| 536 | - $orderby = $sort_by . " " . $order . ", "; |
|
| 537 | - break; |
|
| 535 | + case 'distance': |
|
| 536 | + $orderby = $sort_by . " " . $order . ", "; |
|
| 537 | + break; |
|
| 538 | 538 | |
| 539 | 539 | |
| 540 | - // sort by rating |
|
| 541 | - case 'overall_rating': |
|
| 542 | - $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 540 | + // sort by rating |
|
| 541 | + case 'overall_rating': |
|
| 542 | + $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 543 | 543 | |
| 544 | - break; |
|
| 544 | + break; |
|
| 545 | 545 | |
| 546 | 546 | |
| 547 | - default: |
|
| 548 | - if (geodir_column_exist($table, $sort_by)) {
|
|
| 547 | + default: |
|
| 548 | + if (geodir_column_exist($table, $sort_by)) {
|
|
| 549 | 549 | $orderby = $table . "." . $sort_by . " " . $order . ", "; |
| 550 | 550 | } |
| 551 | - break; |
|
| 551 | + break; |
|
| 552 | 552 | |
| 553 | - endswitch; |
|
| 553 | + endswitch; |
|
| 554 | 554 | |
| 555 | - } |
|
| 555 | + } |
|
| 556 | 556 | |
| 557 | - } |
|
| 557 | + } |
|
| 558 | 558 | |
| 559 | - return $orderby; |
|
| 559 | + return $orderby; |
|
| 560 | 560 | } |
| 561 | 561 | |
| 562 | 562 | /** |
@@ -571,34 +571,34 @@ discard block |
||
| 571 | 571 | {
|
| 572 | 572 | |
| 573 | 573 | |
| 574 | - global $wpdb, $geodir_post_type, $table, $s, $snear; |
|
| 574 | + global $wpdb, $geodir_post_type, $table, $s, $snear; |
|
| 575 | 575 | |
| 576 | - if (!is_admin()) {
|
|
| 576 | + if (!is_admin()) {
|
|
| 577 | 577 | |
| 578 | - if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 579 | - add_filter('posts_where', 'geodir_edit_listing_where', 1);
|
|
| 578 | + if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 579 | + add_filter('posts_where', 'geodir_edit_listing_where', 1);
|
|
| 580 | 580 | |
| 581 | - } elseif ((is_search() && $_REQUEST['geodir_search'])) {
|
|
| 581 | + } elseif ((is_search() && $_REQUEST['geodir_search'])) {
|
|
| 582 | 582 | |
| 583 | - add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 583 | + add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 584 | 584 | |
| 585 | - if ($snear != '') |
|
| 586 | - add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 585 | + if ($snear != '') |
|
| 586 | + add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 587 | 587 | |
| 588 | - add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 588 | + add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 589 | 589 | |
| 590 | - } elseif (geodir_is_page('author')) {
|
|
| 590 | + } elseif (geodir_is_page('author')) {
|
|
| 591 | 591 | |
| 592 | - add_filter('posts_where', 'author_filter_where', 1);
|
|
| 592 | + add_filter('posts_where', 'author_filter_where', 1);
|
|
| 593 | 593 | |
| 594 | - } |
|
| 594 | + } |
|
| 595 | 595 | |
| 596 | - //if (!geodir_is_page('detail'))
|
|
| 597 | - add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 596 | + //if (!geodir_is_page('detail'))
|
|
| 597 | + add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 598 | 598 | |
| 599 | - //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
|
| 599 | + //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
|
| 600 | 600 | |
| 601 | - } |
|
| 601 | + } |
|
| 602 | 602 | } |
| 603 | 603 | |
| 604 | 604 | /** |
@@ -613,13 +613,13 @@ discard block |
||
| 613 | 613 | */ |
| 614 | 614 | function geodir_preview_post_cap($allcaps, $caps, $args) |
| 615 | 615 | {
|
| 616 | - $user_id = get_current_user_id(); |
|
| 617 | - if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {
|
|
| 616 | + $user_id = get_current_user_id(); |
|
| 617 | + if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {
|
|
| 618 | 618 | |
| 619 | - $allcaps['edit_posts'] = true; |
|
| 620 | - } |
|
| 621 | - //print_r($allcaps); |
|
| 622 | - return $allcaps; |
|
| 619 | + $allcaps['edit_posts'] = true; |
|
| 620 | + } |
|
| 621 | + //print_r($allcaps); |
|
| 622 | + return $allcaps; |
|
| 623 | 623 | } |
| 624 | 624 | |
| 625 | 625 | |
@@ -634,9 +634,9 @@ discard block |
||
| 634 | 634 | */ |
| 635 | 635 | function geodir_edit_listing_where($where) |
| 636 | 636 | {
|
| 637 | - global $wpdb; |
|
| 638 | - $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);
|
|
| 639 | - return $where; |
|
| 637 | + global $wpdb; |
|
| 638 | + $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);
|
|
| 639 | + return $where; |
|
| 640 | 640 | } |
| 641 | 641 | |
| 642 | 642 | |
@@ -653,29 +653,29 @@ discard block |
||
| 653 | 653 | */ |
| 654 | 654 | function geodir_default_where($where) |
| 655 | 655 | {
|
| 656 | - global $wp_query, $wpdb; |
|
| 657 | - |
|
| 658 | - //print_r($wp_query); |
|
| 659 | - ########### WPML ########### |
|
| 660 | - |
|
| 661 | - if (geodir_is_wpml()) {
|
|
| 662 | - global $sitepress, $table_prefix; |
|
| 663 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 664 | - $default_lang_code = $sitepress->get_default_language(); |
|
| 665 | - $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
|
| 666 | - //echo '##########'.$q_post_type; |
|
| 667 | - if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) {
|
|
| 668 | - $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 669 | - //$where .= " AND icl_t.language_code = '$lang_code' "; |
|
| 670 | - } |
|
| 656 | + global $wp_query, $wpdb; |
|
| 671 | 657 | |
| 672 | - } |
|
| 673 | - ########### WPML ########### |
|
| 658 | + //print_r($wp_query); |
|
| 659 | + ########### WPML ########### |
|
| 660 | + |
|
| 661 | + if (geodir_is_wpml()) {
|
|
| 662 | + global $sitepress, $table_prefix; |
|
| 663 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 664 | + $default_lang_code = $sitepress->get_default_language(); |
|
| 665 | + $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
|
| 666 | + //echo '##########'.$q_post_type; |
|
| 667 | + if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) {
|
|
| 668 | + $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 669 | + //$where .= " AND icl_t.language_code = '$lang_code' "; |
|
| 670 | + } |
|
| 674 | 671 | |
| 672 | + } |
|
| 673 | + ########### WPML ########### |
|
| 675 | 674 | |
| 676 | - return $where = str_replace("0 = 1", "1=1", $where);
|
|
| 677 | 675 | |
| 678 | - /* ====== old code start === |
|
| 676 | + return $where = str_replace("0 = 1", "1=1", $where);
|
|
| 677 | + |
|
| 678 | + /* ====== old code start === |
|
| 679 | 679 | $where = str_replace("0 = 1", "1=1", $where);
|
| 680 | 680 | $country = get_query_var('gd_country');
|
| 681 | 681 | $region = get_query_var('gd_region');
|
@@ -716,92 +716,92 @@ discard block |
||
| 716 | 716 | * @return string Modified where query string. |
| 717 | 717 | */ |
| 718 | 718 | function searching_filter_where($where) {
|
| 719 | - global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session; |
|
| 719 | + global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session; |
|
| 720 | 720 | |
| 721 | - $search_term = 'OR'; |
|
| 722 | - $search_term = 'AND'; |
|
| 723 | - $geodir_custom_search = ''; |
|
| 724 | - $category_search_range = ''; |
|
| 721 | + $search_term = 'OR'; |
|
| 722 | + $search_term = 'AND'; |
|
| 723 | + $geodir_custom_search = ''; |
|
| 724 | + $category_search_range = ''; |
|
| 725 | 725 | |
| 726 | - if (is_single() && get_query_var('post_type')) {
|
|
| 726 | + if (is_single() && get_query_var('post_type')) {
|
|
| 727 | 727 | return $where; |
| 728 | 728 | } |
| 729 | 729 | |
| 730 | - if (is_tax()) {
|
|
| 730 | + if (is_tax()) {
|
|
| 731 | 731 | return $where; |
| 732 | 732 | } |
| 733 | 733 | |
| 734 | 734 | $s = trim($s); |
| 735 | - $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 736 | - $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 737 | - |
|
| 738 | - $where = ''; |
|
| 739 | - $better_search_terms = ''; |
|
| 740 | - if (isset($_REQUEST['stype'])) |
|
| 741 | - $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
| 742 | - else |
|
| 743 | - $post_types = 'gd_place'; |
|
| 744 | - |
|
| 745 | - if ($s != '') {
|
|
| 746 | - $keywords = explode(" ", $s);
|
|
| 747 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 748 | - foreach($keywords as $kkey=>$kword){
|
|
| 749 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 750 | - unset($keywords[$kkey]); |
|
| 751 | - } |
|
| 752 | - } |
|
| 753 | - } |
|
| 735 | + $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 736 | + $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 754 | 737 | |
| 755 | - if (!empty($keywords)) {
|
|
| 756 | - foreach ($keywords as $keyword) {
|
|
| 757 | - $keyword = trim($keyword); |
|
| 758 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 759 | - if ($keyword != '') {
|
|
| 760 | - /** |
|
| 761 | - * Filter the search query keywords SQL. |
|
| 762 | - * |
|
| 763 | - * @since 1.5.9 |
|
| 764 | - * @package GeoDirectory |
|
| 765 | - * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`. |
|
| 766 | - * @param array $keywords The array of keywords for the query. |
|
| 767 | - * @param string $keyword The single keyword being searched. |
|
| 768 | - */ |
|
| 738 | + $where = ''; |
|
| 739 | + $better_search_terms = ''; |
|
| 740 | + if (isset($_REQUEST['stype'])) |
|
| 741 | + $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
| 742 | + else |
|
| 743 | + $post_types = 'gd_place'; |
|
| 744 | + |
|
| 745 | + if ($s != '') {
|
|
| 746 | + $keywords = explode(" ", $s);
|
|
| 747 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 748 | + foreach($keywords as $kkey=>$kword){
|
|
| 749 | + if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 750 | + unset($keywords[$kkey]); |
|
| 751 | + } |
|
| 752 | + } |
|
| 753 | + } |
|
| 754 | + |
|
| 755 | + if (!empty($keywords)) {
|
|
| 756 | + foreach ($keywords as $keyword) {
|
|
| 757 | + $keyword = trim($keyword); |
|
| 758 | + $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 759 | + if ($keyword != '') {
|
|
| 760 | + /** |
|
| 761 | + * Filter the search query keywords SQL. |
|
| 762 | + * |
|
| 763 | + * @since 1.5.9 |
|
| 764 | + * @package GeoDirectory |
|
| 765 | + * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`. |
|
| 766 | + * @param array $keywords The array of keywords for the query. |
|
| 767 | + * @param string $keyword The single keyword being searched. |
|
| 768 | + */ |
|
| 769 | 769 | $better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);
|
| 770 | - } |
|
| 771 | - } |
|
| 772 | - } |
|
| 773 | - } |
|
| 770 | + } |
|
| 771 | + } |
|
| 772 | + } |
|
| 773 | + } |
|
| 774 | 774 | |
| 775 | - /* get taxonomy */ |
|
| 776 | - $taxonomies = geodir_get_taxonomies($post_types, true); |
|
| 777 | - if($taxonomies) {
|
|
| 778 | - $taxonomies = implode("','", $taxonomies);
|
|
| 779 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 780 | - }else{$taxonomies='';}
|
|
| 775 | + /* get taxonomy */ |
|
| 776 | + $taxonomies = geodir_get_taxonomies($post_types, true); |
|
| 777 | + if($taxonomies) {
|
|
| 778 | + $taxonomies = implode("','", $taxonomies);
|
|
| 779 | + $taxonomies = "'" . $taxonomies . "'"; |
|
| 780 | + }else{$taxonomies='';}
|
|
| 781 | 781 | |
| 782 | - $content_where = $terms_where = ''; |
|
| 782 | + $content_where = $terms_where = ''; |
|
| 783 | 783 | if ($s != '') {
|
| 784 | - /** |
|
| 785 | - * Filter the search query content where values. |
|
| 786 | - * |
|
| 787 | - * @since 1.5.0 |
|
| 788 | - * @package GeoDirectory |
|
| 789 | - * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`. |
|
| 790 | - */ |
|
| 784 | + /** |
|
| 785 | + * Filter the search query content where values. |
|
| 786 | + * |
|
| 787 | + * @since 1.5.0 |
|
| 788 | + * @package GeoDirectory |
|
| 789 | + * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`. |
|
| 790 | + */ |
|
| 791 | 791 | $content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");
|
| 792 | - /** |
|
| 793 | - * Filter the search query term values. |
|
| 794 | - * |
|
| 795 | - * @since 1.5.0 |
|
| 796 | - * @package GeoDirectory |
|
| 797 | - * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`. |
|
| 798 | - */ |
|
| 799 | - $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");
|
|
| 792 | + /** |
|
| 793 | + * Filter the search query term values. |
|
| 794 | + * |
|
| 795 | + * @since 1.5.0 |
|
| 796 | + * @package GeoDirectory |
|
| 797 | + * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`. |
|
| 798 | + */ |
|
| 799 | + $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");
|
|
| 800 | 800 | } |
| 801 | 801 | |
| 802 | 802 | |
| 803 | - // get term sql |
|
| 804 | - $term_sql = " SELECT $wpdb->term_taxonomy.term_id |
|
| 803 | + // get term sql |
|
| 804 | + $term_sql = " SELECT $wpdb->term_taxonomy.term_id |
|
| 805 | 805 | FROM $wpdb->term_taxonomy, $wpdb->terms, $wpdb->term_relationships |
| 806 | 806 | WHERE $wpdb->term_taxonomy.term_id = $wpdb->terms.term_id |
| 807 | 807 | AND $wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id |
@@ -809,42 +809,42 @@ discard block |
||
| 809 | 809 | $terms_where |
| 810 | 810 | GROUP BY $wpdb->term_taxonomy.term_id"; |
| 811 | 811 | |
| 812 | - $term_results = $wpdb->get_results($term_sql); |
|
| 813 | - $term_ids = array(); |
|
| 814 | - $terms_sql = ''; |
|
| 812 | + $term_results = $wpdb->get_results($term_sql); |
|
| 813 | + $term_ids = array(); |
|
| 814 | + $terms_sql = ''; |
|
| 815 | 815 | |
| 816 | - if(!empty($term_results)){
|
|
| 817 | - foreach($term_results as $term_id){
|
|
| 818 | - $term_ids[] = $term_id; |
|
| 819 | - } |
|
| 820 | - if(!empty( $term_ids)){
|
|
| 816 | + if(!empty($term_results)){
|
|
| 817 | + foreach($term_results as $term_id){
|
|
| 818 | + $term_ids[] = $term_id; |
|
| 819 | + } |
|
| 820 | + if(!empty( $term_ids)){
|
|
| 821 | 821 | |
| 822 | - foreach($term_ids as $term){
|
|
| 823 | - $terms_sql .= " OR FIND_IN_SET($term->term_id , ".$table.".".$post_types."category) "; |
|
| 824 | - } |
|
| 825 | - } |
|
| 826 | - } |
|
| 822 | + foreach($term_ids as $term){
|
|
| 823 | + $terms_sql .= " OR FIND_IN_SET($term->term_id , ".$table.".".$post_types."category) "; |
|
| 824 | + } |
|
| 825 | + } |
|
| 826 | + } |
|
| 827 | 827 | |
| 828 | 828 | |
| 829 | - if ($snear != '') {
|
|
| 829 | + if ($snear != '') {
|
|
| 830 | 830 | |
| 831 | 831 | |
| 832 | - if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {
|
|
| 833 | - $dist = $gd_session->get('near_me_range');
|
|
| 834 | - } |
|
| 835 | - $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 836 | - $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 837 | - $lat1 = $mylat - ($dist / 69); |
|
| 838 | - $lat2 = $mylat + ($dist / 69); |
|
| 832 | + if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {
|
|
| 833 | + $dist = $gd_session->get('near_me_range');
|
|
| 834 | + } |
|
| 835 | + $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 836 | + $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 837 | + $lat1 = $mylat - ($dist / 69); |
|
| 838 | + $lat2 = $mylat + ($dist / 69); |
|
| 839 | 839 | |
| 840 | - $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
| 841 | - $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
| 842 | - $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
| 843 | - $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
| 840 | + $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
| 841 | + $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
| 842 | + $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
| 843 | + $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
| 844 | 844 | |
| 845 | 845 | |
| 846 | 846 | |
| 847 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 847 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 848 | 848 | $content_where |
| 849 | 849 | $terms_sql |
| 850 | 850 | ) |
@@ -853,35 +853,35 @@ discard block |
||
| 853 | 853 | AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 ) |
| 854 | 854 | AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) "; |
| 855 | 855 | |
| 856 | - if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
|
| 857 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 858 | - $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;
|
|
| 859 | - } |
|
| 856 | + if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
|
| 857 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 858 | + $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;
|
|
| 859 | + } |
|
| 860 | 860 | |
| 861 | - } else {
|
|
| 861 | + } else {
|
|
| 862 | 862 | |
| 863 | 863 | |
| 864 | 864 | |
| 865 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 865 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 866 | 866 | $content_where |
| 867 | 867 | $terms_sql |
| 868 | 868 | ) |
| 869 | 869 | |
| 870 | 870 | AND $wpdb->posts.post_type in ('$post_types')
|
| 871 | 871 | AND ($wpdb->posts.post_status = 'publish') "; |
| 872 | - } |
|
| 872 | + } |
|
| 873 | 873 | |
| 874 | 874 | ########### WPML ########### |
| 875 | - if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 875 | + if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 876 | 876 | $lang_code = ICL_LANGUAGE_CODE; |
| 877 | 877 | |
| 878 | 878 | if ($lang_code && $post_types) {
|
| 879 | - $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 880 | - } |
|
| 881 | - } |
|
| 882 | - ########### WPML ########### |
|
| 879 | + $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 880 | + } |
|
| 881 | + } |
|
| 882 | + ########### WPML ########### |
|
| 883 | 883 | |
| 884 | - return $where; |
|
| 884 | + return $where; |
|
| 885 | 885 | } |
| 886 | 886 | |
| 887 | 887 | |
@@ -896,45 +896,45 @@ discard block |
||
| 896 | 896 | * @return string Modified where query string. |
| 897 | 897 | */ |
| 898 | 898 | function author_filter_where($where) {
|
| 899 | - global $wpdb, $geodir_post_type, $table, $curr; |
|
| 899 | + global $wpdb, $geodir_post_type, $table, $curr; |
|
| 900 | 900 | |
| 901 | - $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 902 | - $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 901 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 902 | + $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 903 | 903 | |
| 904 | - if (isset($_REQUEST['stype'])) {
|
|
| 905 | - $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 906 | - } else {
|
|
| 907 | - $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
|
| 908 | - } |
|
| 904 | + if (isset($_REQUEST['stype'])) {
|
|
| 905 | + $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 906 | + } else {
|
|
| 907 | + $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
|
| 908 | + } |
|
| 909 | 909 | |
| 910 | - if ($user_id > 0) {
|
|
| 911 | - if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 912 | - $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true); |
|
| 913 | - $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
|
| 914 | - $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
|
| 915 | - } else |
|
| 916 | - $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 917 | - |
|
| 918 | - if ($user_id == (int)get_current_user_id()) {
|
|
| 919 | - $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
|
| 920 | - } else {
|
|
| 921 | - $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
| 922 | - } |
|
| 923 | - } else {
|
|
| 924 | - $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
| 925 | - } |
|
| 910 | + if ($user_id > 0) {
|
|
| 911 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 912 | + $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true); |
|
| 913 | + $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
|
| 914 | + $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
|
| 915 | + } else |
|
| 916 | + $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 917 | + |
|
| 918 | + if ($user_id == (int)get_current_user_id()) {
|
|
| 919 | + $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
|
| 920 | + } else {
|
|
| 921 | + $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
| 922 | + } |
|
| 923 | + } else {
|
|
| 924 | + $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
| 925 | + } |
|
| 926 | 926 | |
| 927 | - ########### WPML ########### |
|
| 928 | - if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
|
| 929 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 930 | - if ($lang_code) {
|
|
| 931 | - $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 932 | - } |
|
| 927 | + ########### WPML ########### |
|
| 928 | + if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
|
| 929 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 930 | + if ($lang_code) {
|
|
| 931 | + $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 932 | + } |
|
| 933 | 933 | |
| 934 | - } |
|
| 935 | - ########### WPML ########### |
|
| 934 | + } |
|
| 935 | + ########### WPML ########### |
|
| 936 | 936 | |
| 937 | - return $where; |
|
| 937 | + return $where; |
|
| 938 | 938 | } |
| 939 | 939 | |
| 940 | 940 | /** |
@@ -949,11 +949,11 @@ discard block |
||
| 949 | 949 | */ |
| 950 | 950 | function geodir_filter_widget_join($join) |
| 951 | 951 | {
|
| 952 | - global $wp_query, $table; |
|
| 953 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 954 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 955 | - } |
|
| 956 | - return $join; |
|
| 952 | + global $wp_query, $table; |
|
| 953 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 954 | + $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 955 | + } |
|
| 956 | + return $join; |
|
| 957 | 957 | } |
| 958 | 958 | |
| 959 | 959 | /** |
@@ -968,43 +968,43 @@ discard block |
||
| 968 | 968 | */ |
| 969 | 969 | function geodir_filter_widget_where($where) |
| 970 | 970 | {
|
| 971 | - global $wp_query, $table; |
|
| 972 | - if (!empty($wp_query->query['show_featured_only'])) {
|
|
| 973 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 974 | - } |
|
| 975 | - if (!empty($wp_query->query['show_special_only'])) {
|
|
| 976 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 977 | - } |
|
| 978 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 979 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 980 | - } |
|
| 981 | - if (!empty($wp_query->query['with_videos_only'])) {
|
|
| 982 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 983 | - } |
|
| 984 | - return $where; |
|
| 971 | + global $wp_query, $table; |
|
| 972 | + if (!empty($wp_query->query['show_featured_only'])) {
|
|
| 973 | + $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 974 | + } |
|
| 975 | + if (!empty($wp_query->query['show_special_only'])) {
|
|
| 976 | + $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 977 | + } |
|
| 978 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 979 | + $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 980 | + } |
|
| 981 | + if (!empty($wp_query->query['with_videos_only'])) {
|
|
| 982 | + $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 983 | + } |
|
| 984 | + return $where; |
|
| 985 | 985 | } |
| 986 | 986 | |
| 987 | 987 | |
| 988 | 988 | function geodir_related_posts_fields($fields) {
|
| 989 | - global $wp_query, $wpdb, $table, $post; |
|
| 989 | + global $wp_query, $wpdb, $table, $post; |
|
| 990 | 990 | |
| 991 | - $fields .= ", " . $table . ".* "; |
|
| 991 | + $fields .= ", " . $table . ".* "; |
|
| 992 | 992 | |
| 993 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 993 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 994 | 994 | |
| 995 | - $mylat = $post->post_latitude; |
|
| 996 | - $mylon = $post->post_longitude; |
|
| 995 | + $mylat = $post->post_latitude; |
|
| 996 | + $mylon = $post->post_longitude; |
|
| 997 | 997 | |
| 998 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 999 | - return $fields; |
|
| 998 | + $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 999 | + return $fields; |
|
| 1000 | 1000 | } |
| 1001 | 1001 | function geodir_related_posts_fields_filter($query) {
|
| 1002 | - if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1003 | - && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
| 1004 | - && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
| 1005 | - ) {
|
|
| 1006 | - add_filter('posts_fields', 'geodir_related_posts_fields', 1);
|
|
| 1007 | - } |
|
| 1002 | + if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1003 | + && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
| 1004 | + && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
| 1005 | + ) {
|
|
| 1006 | + add_filter('posts_fields', 'geodir_related_posts_fields', 1);
|
|
| 1007 | + } |
|
| 1008 | 1008 | } |
| 1009 | 1009 | add_action('pre_get_posts', 'geodir_related_posts_fields_filter', 1);
|
| 1010 | 1010 | |
@@ -1019,30 +1019,30 @@ discard block |
||
| 1019 | 1019 | * @return string|null If field exists in table returns order by clause else returns empty. |
| 1020 | 1020 | */ |
| 1021 | 1021 | function geodir_prepare_custom_sorting( $sorting, $table ) {
|
| 1022 | - $orderby = ''; |
|
| 1022 | + $orderby = ''; |
|
| 1023 | 1023 | |
| 1024 | - if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1025 | - return $orderby; |
|
| 1026 | - } |
|
| 1024 | + if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1025 | + return $orderby; |
|
| 1026 | + } |
|
| 1027 | 1027 | |
| 1028 | - if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1029 | - $sorting_array = explode( '_', $sorting ); |
|
| 1028 | + if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1029 | + $sorting_array = explode( '_', $sorting ); |
|
| 1030 | 1030 | |
| 1031 | - if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1032 | - $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1033 | - array_pop( $sorting_array ); |
|
| 1031 | + if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1032 | + $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1033 | + array_pop( $sorting_array ); |
|
| 1034 | 1034 | |
| 1035 | - if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1036 | - $sort_by = implode( '_', $sorting_array ); |
|
| 1035 | + if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1036 | + $sort_by = implode( '_', $sorting_array ); |
|
| 1037 | 1037 | |
| 1038 | - if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1039 | - $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1040 | - } |
|
| 1041 | - } |
|
| 1042 | - } |
|
| 1043 | - } |
|
| 1038 | + if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1039 | + $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1040 | + } |
|
| 1041 | + } |
|
| 1042 | + } |
|
| 1043 | + } |
|
| 1044 | 1044 | |
| 1045 | - return $orderby; |
|
| 1045 | + return $orderby; |
|
| 1046 | 1046 | } |
| 1047 | 1047 | |
| 1048 | 1048 | /** |
@@ -1062,21 +1062,21 @@ discard block |
||
| 1062 | 1062 | * @return string Modified fields SQL. |
| 1063 | 1063 | */ |
| 1064 | 1064 | function geodir_search_widget_location_filter_fields( $fields, $table, $post_type ) {
|
| 1065 | - global $wpdb, $gd_query_args_widgets, $snear, $gd_session; |
|
| 1065 | + global $wpdb, $gd_query_args_widgets, $snear, $gd_session; |
|
| 1066 | 1066 | |
| 1067 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1068 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1067 | + if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1068 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1069 | 1069 | |
| 1070 | - if ( $location_allowed && strpos( strtolower( $fields ), ' as distance ' ) === false && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1071 | - $latitude = sanitize_text_field( $_REQUEST['sgeo_lat'] ); |
|
| 1072 | - $longitude = sanitize_text_field( $_REQUEST['sgeo_lon'] ); |
|
| 1073 | - $radius = geodir_getDistanceRadius( get_option( 'geodir_search_dist_1' ) ); |
|
| 1070 | + if ( $location_allowed && strpos( strtolower( $fields ), ' as distance ' ) === false && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1071 | + $latitude = sanitize_text_field( $_REQUEST['sgeo_lat'] ); |
|
| 1072 | + $longitude = sanitize_text_field( $_REQUEST['sgeo_lon'] ); |
|
| 1073 | + $radius = geodir_getDistanceRadius( get_option( 'geodir_search_dist_1' ) ); |
|
| 1074 | 1074 | |
| 1075 | - $fields .= $wpdb->prepare( ", (" . $radius . " * 2 * ASIN(SQRT(POWER(SIN((ABS(%s) - ABS(" . $table . ".post_latitude)) * PI() / 180 / 2), 2) + COS(ABS(%s) * PI() / 180) * COS(ABS(" . $table . ".post_latitude) * PI() / 180) * POWER(SIN((%s - " . $table . ".post_longitude) * PI() / 180 / 2), 2)))) AS distance ", $latitude, $latitude, $longitude );
|
|
| 1076 | - } |
|
| 1077 | - } |
|
| 1075 | + $fields .= $wpdb->prepare( ", (" . $radius . " * 2 * ASIN(SQRT(POWER(SIN((ABS(%s) - ABS(" . $table . ".post_latitude)) * PI() / 180 / 2), 2) + COS(ABS(%s) * PI() / 180) * COS(ABS(" . $table . ".post_latitude) * PI() / 180) * POWER(SIN((%s - " . $table . ".post_longitude) * PI() / 180 / 2), 2)))) AS distance ", $latitude, $latitude, $longitude );
|
|
| 1076 | + } |
|
| 1077 | + } |
|
| 1078 | 1078 | |
| 1079 | - return $fields; |
|
| 1079 | + return $fields; |
|
| 1080 | 1080 | } |
| 1081 | 1081 | |
| 1082 | 1082 | /** |
@@ -1095,15 +1095,15 @@ discard block |
||
| 1095 | 1095 | * @return string Modified fields SQL. |
| 1096 | 1096 | */ |
| 1097 | 1097 | function geodir_search_widget_location_filter_orderby( $orderby, $table, $post_type ) {
|
| 1098 | - global $gd_query_args_widgets, $snear, $gd_session; |
|
| 1098 | + global $gd_query_args_widgets, $snear, $gd_session; |
|
| 1099 | 1099 | |
| 1100 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1101 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1100 | + if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1101 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1102 | 1102 | |
| 1103 | - if ( $location_allowed && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1104 | - $orderby = "distance ASC, " . $orderby; |
|
| 1105 | - } |
|
| 1106 | - } |
|
| 1103 | + if ( $location_allowed && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1104 | + $orderby = "distance ASC, " . $orderby; |
|
| 1105 | + } |
|
| 1106 | + } |
|
| 1107 | 1107 | |
| 1108 | - return $orderby; |
|
| 1108 | + return $orderby; |
|
| 1109 | 1109 | } |
| 1110 | 1110 | \ No newline at end of file |
@@ -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 | ' . __(geodir_utf8_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 | ' . __(geodir_utf8_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 | + |
|
| 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 | + } |
|
| 147 | 158 | |
| 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 . '"> |
|
| 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="' . $sub_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="' . $sub_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 | |
@@ -402,49 +402,49 @@ discard block |
||
| 402 | 402 | * @return string The post type. |
| 403 | 403 | */ |
| 404 | 404 | function geodir_get_current_posttype() {
|
| 405 | - global $wp_query, $post, $geodir_post_type; |
|
| 405 | + global $wp_query, $post, $geodir_post_type; |
|
| 406 | 406 | |
| 407 | - $geodir_post_type = get_query_var('post_type');
|
|
| 407 | + $geodir_post_type = get_query_var('post_type');
|
|
| 408 | 408 | |
| 409 | - if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
|
|
| 410 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 411 | - $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 412 | - elseif (isset($_REQUEST['listing_type'])) |
|
| 413 | - $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 414 | - } |
|
| 409 | + if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
|
|
| 410 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 411 | + $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 412 | + elseif (isset($_REQUEST['listing_type'])) |
|
| 413 | + $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 414 | + } |
|
| 415 | 415 | |
| 416 | - if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
|
|
| 417 | - $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 416 | + if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
|
|
| 417 | + $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 418 | 418 | |
| 419 | - if (is_tax()) |
|
| 420 | - $geodir_post_type = geodir_get_taxonomy_posttype(); |
|
| 419 | + if (is_tax()) |
|
| 420 | + $geodir_post_type = geodir_get_taxonomy_posttype(); |
|
| 421 | 421 | |
| 422 | - // Retrive post type for map marker html ajax request on preview page. |
|
| 423 | - if (empty($geodir_post_type) && defined('DOING_AJAX') && !empty($post)) {
|
|
| 424 | - if (!empty($post->post_type)) {
|
|
| 425 | - $geodir_post_type = $post->post_type; |
|
| 426 | - } else if (!empty($post->listing_type)) {
|
|
| 427 | - $geodir_post_type = $post->listing_type; |
|
| 428 | - } |
|
| 429 | - } |
|
| 422 | + // Retrive post type for map marker html ajax request on preview page. |
|
| 423 | + if (empty($geodir_post_type) && defined('DOING_AJAX') && !empty($post)) {
|
|
| 424 | + if (!empty($post->post_type)) {
|
|
| 425 | + $geodir_post_type = $post->post_type; |
|
| 426 | + } else if (!empty($post->listing_type)) {
|
|
| 427 | + $geodir_post_type = $post->listing_type; |
|
| 428 | + } |
|
| 429 | + } |
|
| 430 | 430 | |
| 431 | - $all_postypes = geodir_get_posttypes(); |
|
| 432 | - $all_postypes = stripslashes_deep($all_postypes); |
|
| 431 | + $all_postypes = geodir_get_posttypes(); |
|
| 432 | + $all_postypes = stripslashes_deep($all_postypes); |
|
| 433 | 433 | |
| 434 | - if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) |
|
| 435 | - $geodir_post_type = ''; |
|
| 434 | + if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) |
|
| 435 | + $geodir_post_type = ''; |
|
| 436 | 436 | |
| 437 | - if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){
|
|
| 438 | - $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 439 | - } |
|
| 437 | + if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){
|
|
| 438 | + $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 439 | + } |
|
| 440 | 440 | |
| 441 | 441 | |
| 442 | - /** |
|
| 443 | - * Filter the default CPT return. |
|
| 444 | - * |
|
| 445 | - * @since 1.6.9 |
|
| 446 | - */ |
|
| 447 | - return apply_filters('geodir_get_current_posttype',$geodir_post_type);
|
|
| 442 | + /** |
|
| 443 | + * Filter the default CPT return. |
|
| 444 | + * |
|
| 445 | + * @since 1.6.9 |
|
| 446 | + */ |
|
| 447 | + return apply_filters('geodir_get_current_posttype',$geodir_post_type);
|
|
| 448 | 448 | } |
| 449 | 449 | |
| 450 | 450 | /** |
@@ -458,22 +458,22 @@ discard block |
||
| 458 | 458 | */ |
| 459 | 459 | function geodir_get_default_posttype() |
| 460 | 460 | {
|
| 461 | - $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) ); |
|
| 462 | - |
|
| 463 | - $stype = false; |
|
| 464 | - foreach ( $post_types as $post_type => $info ) {
|
|
| 465 | - global $wpdb; |
|
| 466 | - $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) ); |
|
| 467 | - if ( $has_posts ) {
|
|
| 468 | - $stype = $post_type; break; |
|
| 469 | - } |
|
| 470 | - } |
|
| 471 | - |
|
| 472 | - if(!$stype){
|
|
| 473 | - $stype = 'gd_place'; |
|
| 474 | - } |
|
| 475 | - |
|
| 476 | - return $stype; |
|
| 461 | + $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) ); |
|
| 462 | + |
|
| 463 | + $stype = false; |
|
| 464 | + foreach ( $post_types as $post_type => $info ) {
|
|
| 465 | + global $wpdb; |
|
| 466 | + $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) ); |
|
| 467 | + if ( $has_posts ) {
|
|
| 468 | + $stype = $post_type; break; |
|
| 469 | + } |
|
| 470 | + } |
|
| 471 | + |
|
| 472 | + if(!$stype){
|
|
| 473 | + $stype = 'gd_place'; |
|
| 474 | + } |
|
| 475 | + |
|
| 476 | + return $stype; |
|
| 477 | 477 | } |
| 478 | 478 | |
| 479 | 479 | /** |
@@ -487,21 +487,21 @@ discard block |
||
| 487 | 487 | */ |
| 488 | 488 | function geodir_get_posttypes($output = 'names') |
| 489 | 489 | {
|
| 490 | - $post_types = array(); |
|
| 491 | - $post_types = get_option('geodir_post_types');
|
|
| 492 | - $post_types = stripslashes_deep($post_types); |
|
| 493 | - if (!empty($post_types)) {
|
|
| 494 | - switch ($output): |
|
| 495 | - case 'object': |
|
| 496 | - case 'Object': |
|
| 497 | - $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types; |
|
| 498 | - break; |
|
| 499 | - case 'array': |
|
| 500 | - case 'Array': |
|
| 501 | - $post_types = (array)$post_types; |
|
| 502 | - break; |
|
| 490 | + $post_types = array(); |
|
| 491 | + $post_types = get_option('geodir_post_types');
|
|
| 492 | + $post_types = stripslashes_deep($post_types); |
|
| 493 | + if (!empty($post_types)) {
|
|
| 494 | + switch ($output): |
|
| 495 | + case 'object': |
|
| 496 | + case 'Object': |
|
| 497 | + $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types; |
|
| 498 | + break; |
|
| 499 | + case 'array': |
|
| 500 | + case 'Array': |
|
| 501 | + $post_types = (array)$post_types; |
|
| 502 | + break; |
|
| 503 | 503 | case 'options': |
| 504 | - $post_types = (array)$post_types; |
|
| 504 | + $post_types = (array)$post_types; |
|
| 505 | 505 | |
| 506 | 506 | $options = array(); |
| 507 | 507 | if (!empty($post_types)) {
|
@@ -510,17 +510,17 @@ discard block |
||
| 510 | 510 | } |
| 511 | 511 | } |
| 512 | 512 | $post_types = $options; |
| 513 | - break; |
|
| 514 | - default: |
|
| 515 | - $post_types = array_keys($post_types); |
|
| 516 | - break; |
|
| 517 | - endswitch; |
|
| 518 | - } |
|
| 519 | - |
|
| 520 | - if (!empty($post_types)) |
|
| 521 | - return $post_types; |
|
| 522 | - else |
|
| 523 | - return array(); |
|
| 513 | + break; |
|
| 514 | + default: |
|
| 515 | + $post_types = array_keys($post_types); |
|
| 516 | + break; |
|
| 517 | + endswitch; |
|
| 518 | + } |
|
| 519 | + |
|
| 520 | + if (!empty($post_types)) |
|
| 521 | + return $post_types; |
|
| 522 | + else |
|
| 523 | + return array(); |
|
| 524 | 524 | } |
| 525 | 525 | |
| 526 | 526 | /** |
@@ -533,104 +533,104 @@ discard block |
||
| 533 | 533 | */ |
| 534 | 534 | function geodir_get_posttype_info($post_type = '') |
| 535 | 535 | {
|
| 536 | - $post_types = array(); |
|
| 537 | - $post_types = get_option('geodir_post_types');
|
|
| 538 | - $post_types = stripslashes_deep($post_types); |
|
| 539 | - if (!empty($post_types) && $post_type != '') {
|
|
| 540 | - return $post_types[$post_type]; |
|
| 541 | - } else |
|
| 542 | - return false; |
|
| 536 | + $post_types = array(); |
|
| 537 | + $post_types = get_option('geodir_post_types');
|
|
| 538 | + $post_types = stripslashes_deep($post_types); |
|
| 539 | + if (!empty($post_types) && $post_type != '') {
|
|
| 540 | + return $post_types[$post_type]; |
|
| 541 | + } else |
|
| 542 | + return false; |
|
| 543 | 543 | } |
| 544 | 544 | |
| 545 | 545 | if (!function_exists('geodir_get_taxonomies')) {
|
| 546 | - /** |
|
| 547 | - * Get all custom taxonomies. |
|
| 548 | - * |
|
| 549 | - * @since 1.0.0 |
|
| 550 | - * @package GeoDirectory |
|
| 551 | - * @param string $post_type The post type. |
|
| 552 | - * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 553 | - * @return array|bool Taxonomies on success. false on failure. |
|
| 554 | - */ |
|
| 555 | - function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false) {
|
|
| 556 | - $taxonomies = array(); |
|
| 557 | - $gd_taxonomies = array(); |
|
| 558 | - |
|
| 559 | - if ($taxonomies = get_option('geodir_taxonomies')) {
|
|
| 560 | - $gd_taxonomies = array_keys($taxonomies); |
|
| 561 | - |
|
| 562 | - if ($post_type != '') {
|
|
| 563 | - $gd_taxonomies = array(); |
|
| 564 | - } |
|
| 546 | + /** |
|
| 547 | + * Get all custom taxonomies. |
|
| 548 | + * |
|
| 549 | + * @since 1.0.0 |
|
| 550 | + * @package GeoDirectory |
|
| 551 | + * @param string $post_type The post type. |
|
| 552 | + * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 553 | + * @return array|bool Taxonomies on success. false on failure. |
|
| 554 | + */ |
|
| 555 | + function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false) {
|
|
| 556 | + $taxonomies = array(); |
|
| 557 | + $gd_taxonomies = array(); |
|
| 558 | + |
|
| 559 | + if ($taxonomies = get_option('geodir_taxonomies')) {
|
|
| 560 | + $gd_taxonomies = array_keys($taxonomies); |
|
| 561 | + |
|
| 562 | + if ($post_type != '') {
|
|
| 563 | + $gd_taxonomies = array(); |
|
| 564 | + } |
|
| 565 | 565 | |
| 566 | - $i = 0; |
|
| 567 | - foreach ($taxonomies as $taxonomy => $args) {
|
|
| 568 | - if ($post_type != '' && $args['object_type'] == $post_type) {
|
|
| 569 | - $gd_taxonomies[] = $taxonomy; |
|
| 570 | - } |
|
| 566 | + $i = 0; |
|
| 567 | + foreach ($taxonomies as $taxonomy => $args) {
|
|
| 568 | + if ($post_type != '' && $args['object_type'] == $post_type) {
|
|
| 569 | + $gd_taxonomies[] = $taxonomy; |
|
| 570 | + } |
|
| 571 | 571 | |
| 572 | - if ($tages_taxonomies === false && substr($taxonomy , -5) == '_tags') {
|
|
| 573 | - if (array_search($taxonomy, $gd_taxonomies) !== false) {
|
|
| 574 | - unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]); |
|
| 575 | - } |
|
| 576 | - } |
|
| 577 | - } |
|
| 572 | + if ($tages_taxonomies === false && substr($taxonomy , -5) == '_tags') {
|
|
| 573 | + if (array_search($taxonomy, $gd_taxonomies) !== false) {
|
|
| 574 | + unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]); |
|
| 575 | + } |
|
| 576 | + } |
|
| 577 | + } |
|
| 578 | + |
|
| 579 | + $gd_taxonomies = array_values($gd_taxonomies); |
|
| 580 | + } |
|
| 578 | 581 | |
| 579 | - $gd_taxonomies = array_values($gd_taxonomies); |
|
| 580 | - } |
|
| 581 | - |
|
| 582 | - /** |
|
| 583 | - * Filter the taxonomies. |
|
| 584 | - * |
|
| 585 | - * @since 1.0.0 |
|
| 586 | - * @param array $gd_taxonomies The taxonomy array. |
|
| 587 | - */ |
|
| 588 | - $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);
|
|
| 589 | - |
|
| 590 | - if (!empty($taxonomies)) {
|
|
| 591 | - return $taxonomies; |
|
| 592 | - } else {
|
|
| 593 | - return false; |
|
| 594 | - } |
|
| 595 | - } |
|
| 582 | + /** |
|
| 583 | + * Filter the taxonomies. |
|
| 584 | + * |
|
| 585 | + * @since 1.0.0 |
|
| 586 | + * @param array $gd_taxonomies The taxonomy array. |
|
| 587 | + */ |
|
| 588 | + $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);
|
|
| 589 | + |
|
| 590 | + if (!empty($taxonomies)) {
|
|
| 591 | + return $taxonomies; |
|
| 592 | + } else {
|
|
| 593 | + return false; |
|
| 594 | + } |
|
| 595 | + } |
|
| 596 | 596 | } |
| 597 | 597 | |
| 598 | 598 | if (!function_exists(' geodir_get_categories_dl')) {
|
| 599 | - /** |
|
| 600 | - * Get categories dropdown HTML. |
|
| 601 | - * |
|
| 602 | - * @since 1.0.0 |
|
| 603 | - * @package GeoDirectory |
|
| 604 | - * @param string $post_type The post type. |
|
| 605 | - * @param string $selected The selected value. |
|
| 606 | - * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 607 | - * @param bool $echo Prints the HTML when set to true. Default: true. |
|
| 608 | - * @return void|string Dropdown HTML. |
|
| 609 | - */ |
|
| 610 | - function geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true) |
|
| 611 | - {
|
|
| 612 | - |
|
| 613 | - $html = ''; |
|
| 614 | - $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies); |
|
| 615 | - |
|
| 616 | - $categories = get_terms($taxonomies); |
|
| 617 | - |
|
| 618 | - $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
|
|
| 619 | - |
|
| 620 | - foreach ($categories as $category_obj) {
|
|
| 621 | - $select_opt = ''; |
|
| 622 | - if ($selected == $category_obj->term_id) {
|
|
| 623 | - $select_opt = 'selected="selected"'; |
|
| 624 | - } |
|
| 625 | - $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">' |
|
| 626 | - . geodir_utf8_ucfirst($category_obj->name) . '</option>'; |
|
| 627 | - } |
|
| 628 | - |
|
| 629 | - if ($echo) |
|
| 630 | - echo $html; |
|
| 631 | - else |
|
| 632 | - return $html; |
|
| 633 | - } |
|
| 599 | + /** |
|
| 600 | + * Get categories dropdown HTML. |
|
| 601 | + * |
|
| 602 | + * @since 1.0.0 |
|
| 603 | + * @package GeoDirectory |
|
| 604 | + * @param string $post_type The post type. |
|
| 605 | + * @param string $selected The selected value. |
|
| 606 | + * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 607 | + * @param bool $echo Prints the HTML when set to true. Default: true. |
|
| 608 | + * @return void|string Dropdown HTML. |
|
| 609 | + */ |
|
| 610 | + function geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true) |
|
| 611 | + {
|
|
| 612 | + |
|
| 613 | + $html = ''; |
|
| 614 | + $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies); |
|
| 615 | + |
|
| 616 | + $categories = get_terms($taxonomies); |
|
| 617 | + |
|
| 618 | + $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
|
|
| 619 | + |
|
| 620 | + foreach ($categories as $category_obj) {
|
|
| 621 | + $select_opt = ''; |
|
| 622 | + if ($selected == $category_obj->term_id) {
|
|
| 623 | + $select_opt = 'selected="selected"'; |
|
| 624 | + } |
|
| 625 | + $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">' |
|
| 626 | + . geodir_utf8_ucfirst($category_obj->name) . '</option>'; |
|
| 627 | + } |
|
| 628 | + |
|
| 629 | + if ($echo) |
|
| 630 | + echo $html; |
|
| 631 | + else |
|
| 632 | + return $html; |
|
| 633 | + } |
|
| 634 | 634 | } |
| 635 | 635 | |
| 636 | 636 | |
@@ -645,28 +645,28 @@ discard block |
||
| 645 | 645 | function geodir_get_listing_slug($object_type = '') |
| 646 | 646 | {
|
| 647 | 647 | |
| 648 | - $listing_slug = ''; |
|
| 648 | + $listing_slug = ''; |
|
| 649 | 649 | |
| 650 | - $post_types = get_option('geodir_post_types');
|
|
| 651 | - $taxonomies = get_option('geodir_taxonomies');
|
|
| 650 | + $post_types = get_option('geodir_post_types');
|
|
| 651 | + $taxonomies = get_option('geodir_taxonomies');
|
|
| 652 | 652 | |
| 653 | 653 | |
| 654 | - if ($object_type != '') {
|
|
| 655 | - if (!empty($post_types) && array_key_exists($object_type, $post_types)) {
|
|
| 654 | + if ($object_type != '') {
|
|
| 655 | + if (!empty($post_types) && array_key_exists($object_type, $post_types)) {
|
|
| 656 | 656 | |
| 657 | - $object_info = $post_types[$object_type]; |
|
| 658 | - $listing_slug = $object_info['listing_slug']; |
|
| 659 | - } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {
|
|
| 660 | - $object_info = $taxonomies[$object_type]; |
|
| 661 | - $listing_slug = $object_info['listing_slug']; |
|
| 662 | - } |
|
| 657 | + $object_info = $post_types[$object_type]; |
|
| 658 | + $listing_slug = $object_info['listing_slug']; |
|
| 659 | + } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {
|
|
| 660 | + $object_info = $taxonomies[$object_type]; |
|
| 661 | + $listing_slug = $object_info['listing_slug']; |
|
| 662 | + } |
|
| 663 | 663 | |
| 664 | - } |
|
| 664 | + } |
|
| 665 | 665 | |
| 666 | - if (!empty($listing_slug)) |
|
| 667 | - return $listing_slug; |
|
| 668 | - else |
|
| 669 | - return false; |
|
| 666 | + if (!empty($listing_slug)) |
|
| 667 | + return $listing_slug; |
|
| 668 | + else |
|
| 669 | + return false; |
|
| 670 | 670 | } |
| 671 | 671 | |
| 672 | 672 | |
@@ -681,212 +681,212 @@ discard block |
||
| 681 | 681 | */ |
| 682 | 682 | function geodir_get_taxonomy_posttype($taxonomy = '') |
| 683 | 683 | {
|
| 684 | - global $wp_query; |
|
| 685 | - |
|
| 686 | - $post_type = array(); |
|
| 687 | - $taxonomies = array(); |
|
| 688 | - |
|
| 689 | - if (!empty($taxonomy)) {
|
|
| 690 | - $taxonomies[] = $taxonomy; |
|
| 691 | - } elseif (isset($wp_query->tax_query->queries)) {
|
|
| 692 | - $tax_arr = $wp_query->tax_query->queries; |
|
| 693 | - //if tax query has 'relation' set then it will break wp_list_pluck so we remove it |
|
| 694 | - if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
|
|
| 695 | - $taxonomies = wp_list_pluck($tax_arr, 'taxonomy'); |
|
| 696 | - } |
|
| 697 | - |
|
| 698 | - if (!empty($taxonomies)) {
|
|
| 699 | - foreach (geodir_get_posttypes() as $pt) {
|
|
| 700 | - $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt); |
|
| 701 | - if (array_intersect($taxonomies, $object_taxonomies)) |
|
| 702 | - $post_type[] = $pt; |
|
| 703 | - } |
|
| 704 | - } |
|
| 705 | - |
|
| 706 | - if (!empty($post_type)) |
|
| 707 | - return $post_type[0]; |
|
| 708 | - else |
|
| 709 | - return false; |
|
| 684 | + global $wp_query; |
|
| 685 | + |
|
| 686 | + $post_type = array(); |
|
| 687 | + $taxonomies = array(); |
|
| 688 | + |
|
| 689 | + if (!empty($taxonomy)) {
|
|
| 690 | + $taxonomies[] = $taxonomy; |
|
| 691 | + } elseif (isset($wp_query->tax_query->queries)) {
|
|
| 692 | + $tax_arr = $wp_query->tax_query->queries; |
|
| 693 | + //if tax query has 'relation' set then it will break wp_list_pluck so we remove it |
|
| 694 | + if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
|
|
| 695 | + $taxonomies = wp_list_pluck($tax_arr, 'taxonomy'); |
|
| 696 | + } |
|
| 697 | + |
|
| 698 | + if (!empty($taxonomies)) {
|
|
| 699 | + foreach (geodir_get_posttypes() as $pt) {
|
|
| 700 | + $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt); |
|
| 701 | + if (array_intersect($taxonomies, $object_taxonomies)) |
|
| 702 | + $post_type[] = $pt; |
|
| 703 | + } |
|
| 704 | + } |
|
| 705 | + |
|
| 706 | + if (!empty($post_type)) |
|
| 707 | + return $post_type[0]; |
|
| 708 | + else |
|
| 709 | + return false; |
|
| 710 | 710 | } |
| 711 | 711 | |
| 712 | 712 | if (!function_exists('geodir_custom_taxonomy_walker')) {
|
| 713 | - /** |
|
| 714 | - * Custom taxonomy walker function. |
|
| 715 | - * |
|
| 716 | - * @since 1.0.0 |
|
| 717 | - * @package GeoDirectory |
|
| 718 | - * @param string $cat_taxonomy The taxonomy name. |
|
| 719 | - * @param int $cat_parent The parent term ID. |
|
| 720 | - * @param bool $hide_empty Hide empty taxonomies? Default: false. |
|
| 721 | - * @param int $pading CSS padding in pixels. |
|
| 722 | - * @return string|void taxonomy HTML. |
|
| 723 | - */ |
|
| 724 | - function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0) |
|
| 725 | - {
|
|
| 726 | - global $cat_display, $post_cat, $exclude_cats; |
|
| 727 | - |
|
| 728 | - $search_terms = trim($post_cat, ","); |
|
| 729 | - |
|
| 730 | - $search_terms = explode(",", $search_terms);
|
|
| 731 | - |
|
| 732 | - $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));
|
|
| 733 | - |
|
| 734 | - $display = ''; |
|
| 735 | - $onchange = ''; |
|
| 736 | - $term_check = ''; |
|
| 737 | - $main_list_class = ''; |
|
| 738 | - $out = ''; |
|
| 739 | - //If there are terms, start displaying |
|
| 740 | - if (count($cat_terms) > 0) {
|
|
| 741 | - //Displaying as a list |
|
| 742 | - $p = $pading * 20; |
|
| 743 | - $pading++; |
|
| 744 | - |
|
| 745 | - |
|
| 746 | - if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
|
|
| 747 | - if ($cat_parent == 0) {
|
|
| 748 | - $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display; |
|
| 749 | - $main_list_class = 'class="main_list_selecter"'; |
|
| 750 | - } else {
|
|
| 751 | - //$display = 'display:none'; |
|
| 752 | - $list_class = 'sub_list gd-sub-cats-list'; |
|
| 753 | - } |
|
| 754 | - } |
|
| 713 | + /** |
|
| 714 | + * Custom taxonomy walker function. |
|
| 715 | + * |
|
| 716 | + * @since 1.0.0 |
|
| 717 | + * @package GeoDirectory |
|
| 718 | + * @param string $cat_taxonomy The taxonomy name. |
|
| 719 | + * @param int $cat_parent The parent term ID. |
|
| 720 | + * @param bool $hide_empty Hide empty taxonomies? Default: false. |
|
| 721 | + * @param int $pading CSS padding in pixels. |
|
| 722 | + * @return string|void taxonomy HTML. |
|
| 723 | + */ |
|
| 724 | + function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0) |
|
| 725 | + {
|
|
| 726 | + global $cat_display, $post_cat, $exclude_cats; |
|
| 727 | + |
|
| 728 | + $search_terms = trim($post_cat, ","); |
|
| 729 | + |
|
| 730 | + $search_terms = explode(",", $search_terms);
|
|
| 731 | + |
|
| 732 | + $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));
|
|
| 733 | + |
|
| 734 | + $display = ''; |
|
| 735 | + $onchange = ''; |
|
| 736 | + $term_check = ''; |
|
| 737 | + $main_list_class = ''; |
|
| 738 | + $out = ''; |
|
| 739 | + //If there are terms, start displaying |
|
| 740 | + if (count($cat_terms) > 0) {
|
|
| 741 | + //Displaying as a list |
|
| 742 | + $p = $pading * 20; |
|
| 743 | + $pading++; |
|
| 744 | + |
|
| 745 | + |
|
| 746 | + if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
|
|
| 747 | + if ($cat_parent == 0) {
|
|
| 748 | + $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display; |
|
| 749 | + $main_list_class = 'class="main_list_selecter"'; |
|
| 750 | + } else {
|
|
| 751 | + //$display = 'display:none'; |
|
| 752 | + $list_class = 'sub_list gd-sub-cats-list'; |
|
| 753 | + } |
|
| 754 | + } |
|
| 755 | 755 | |
| 756 | - if ($cat_display == 'checkbox' || $cat_display == 'radio') {
|
|
| 757 | - $p = 0; |
|
| 758 | - $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 759 | - } |
|
| 756 | + if ($cat_display == 'checkbox' || $cat_display == 'radio') {
|
|
| 757 | + $p = 0; |
|
| 758 | + $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 759 | + } |
|
| 760 | 760 | |
| 761 | - foreach ($cat_terms as $cat_term) {
|
|
| 761 | + foreach ($cat_terms as $cat_term) {
|
|
| 762 | 762 | |
| 763 | - $checked = ''; |
|
| 763 | + $checked = ''; |
|
| 764 | 764 | |
| 765 | - if (in_array($cat_term->term_id, $search_terms)) {
|
|
| 766 | - if ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 767 | - $checked = 'selected="selected"'; |
|
| 768 | - else |
|
| 769 | - $checked = 'checked="checked"'; |
|
| 770 | - } |
|
| 765 | + if (in_array($cat_term->term_id, $search_terms)) {
|
|
| 766 | + if ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 767 | + $checked = 'selected="selected"'; |
|
| 768 | + else |
|
| 769 | + $checked = 'checked="checked"'; |
|
| 770 | + } |
|
| 771 | 771 | |
| 772 | - if ($cat_display == 'radio') |
|
| 773 | - $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="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>'; |
|
| 774 | - elseif ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 775 | - $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</option>'; |
|
| 772 | + if ($cat_display == 'radio') |
|
| 773 | + $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="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>'; |
|
| 774 | + elseif ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 775 | + $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</option>'; |
|
| 776 | 776 | |
| 777 | - else {
|
|
| 778 | - $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="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>'; |
|
| 779 | - } |
|
| 777 | + else {
|
|
| 778 | + $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="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>'; |
|
| 779 | + } |
|
| 780 | 780 | |
| 781 | - // Call recurson to print sub cats |
|
| 782 | - $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading); |
|
| 781 | + // Call recurson to print sub cats |
|
| 782 | + $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading); |
|
| 783 | 783 | |
| 784 | - } |
|
| 784 | + } |
|
| 785 | 785 | |
| 786 | - if ($cat_display == 'checkbox' || $cat_display == 'radio') |
|
| 787 | - $out .= '</div>'; |
|
| 786 | + if ($cat_display == 'checkbox' || $cat_display == 'radio') |
|
| 787 | + $out .= '</div>'; |
|
| 788 | 788 | |
| 789 | - return $out; |
|
| 790 | - } |
|
| 791 | - return; |
|
| 792 | - } |
|
| 789 | + return $out; |
|
| 790 | + } |
|
| 791 | + return; |
|
| 792 | + } |
|
| 793 | 793 | } |
| 794 | 794 | |
| 795 | 795 | if (!function_exists('geodir_custom_taxonomy_walker2')) {
|
| 796 | - /** |
|
| 797 | - * Custom taxonomy walker function. |
|
| 798 | - * |
|
| 799 | - * @since 1.0.0 |
|
| 800 | - * @package GeoDirectory |
|
| 801 | - * @global object $post WordPress Post object. |
|
| 802 | - * @global object $gd_session GeoDirectory Session object. |
|
| 803 | - * @param string $cat_taxonomy The taxonomy name. |
|
| 804 | - * @param string $cat_limit Number of categories to display. |
|
| 805 | - */ |
|
| 806 | - function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '') |
|
| 807 | - {
|
|
| 808 | - $post_category = ''; |
|
| 809 | - $post_category_str = ''; |
|
| 810 | - global $exclude_cats, $gd_session; |
|
| 811 | - |
|
| 812 | - $cat_exclude = ''; |
|
| 813 | - if (is_array($exclude_cats) && !empty($exclude_cats)) |
|
| 814 | - $cat_exclude = serialize($exclude_cats); |
|
| 815 | - |
|
| 816 | - if (isset($_REQUEST['backandedit'])) {
|
|
| 817 | - $post = (object)$gd_session->get('listing');
|
|
| 818 | - |
|
| 819 | - if (!is_array($post->post_category[$cat_taxonomy])) |
|
| 820 | - $post_category = $post->post_category[$cat_taxonomy]; |
|
| 821 | - |
|
| 822 | - $post_categories = $post->post_category_str; |
|
| 823 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) |
|
| 824 | - $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 825 | - |
|
| 826 | - } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
|
|
| 827 | - global $post; |
|
| 828 | - |
|
| 829 | - $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true); |
|
| 830 | - if (empty($post_category) && isset($post->{$cat_taxonomy})) {
|
|
| 831 | - $post_category = $post->{$cat_taxonomy};
|
|
| 832 | - } |
|
| 796 | + /** |
|
| 797 | + * Custom taxonomy walker function. |
|
| 798 | + * |
|
| 799 | + * @since 1.0.0 |
|
| 800 | + * @package GeoDirectory |
|
| 801 | + * @global object $post WordPress Post object. |
|
| 802 | + * @global object $gd_session GeoDirectory Session object. |
|
| 803 | + * @param string $cat_taxonomy The taxonomy name. |
|
| 804 | + * @param string $cat_limit Number of categories to display. |
|
| 805 | + */ |
|
| 806 | + function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '') |
|
| 807 | + {
|
|
| 808 | + $post_category = ''; |
|
| 809 | + $post_category_str = ''; |
|
| 810 | + global $exclude_cats, $gd_session; |
|
| 811 | + |
|
| 812 | + $cat_exclude = ''; |
|
| 813 | + if (is_array($exclude_cats) && !empty($exclude_cats)) |
|
| 814 | + $cat_exclude = serialize($exclude_cats); |
|
| 815 | + |
|
| 816 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 817 | + $post = (object)$gd_session->get('listing');
|
|
| 818 | + |
|
| 819 | + if (!is_array($post->post_category[$cat_taxonomy])) |
|
| 820 | + $post_category = $post->post_category[$cat_taxonomy]; |
|
| 821 | + |
|
| 822 | + $post_categories = $post->post_category_str; |
|
| 823 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) |
|
| 824 | + $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 825 | + |
|
| 826 | + } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
|
|
| 827 | + global $post; |
|
| 828 | + |
|
| 829 | + $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true); |
|
| 830 | + if (empty($post_category) && isset($post->{$cat_taxonomy})) {
|
|
| 831 | + $post_category = $post->{$cat_taxonomy};
|
|
| 832 | + } |
|
| 833 | 833 | |
| 834 | - $post_categories = get_post_meta($post->ID, 'post_categories', true); |
|
| 834 | + $post_categories = get_post_meta($post->ID, 'post_categories', true); |
|
| 835 | 835 | |
| 836 | - if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 837 | - foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {
|
|
| 838 | - if (is_numeric($cat_part)) {
|
|
| 839 | - $cat_part_arr[] = $cat_part; |
|
| 840 | - } |
|
| 841 | - } |
|
| 842 | - if (is_array($cat_part_arr)) {
|
|
| 843 | - $post_category = implode(',', $cat_part_arr);
|
|
| 844 | - } |
|
| 845 | - } |
|
| 836 | + if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 837 | + foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {
|
|
| 838 | + if (is_numeric($cat_part)) {
|
|
| 839 | + $cat_part_arr[] = $cat_part; |
|
| 840 | + } |
|
| 841 | + } |
|
| 842 | + if (is_array($cat_part_arr)) {
|
|
| 843 | + $post_category = implode(',', $cat_part_arr);
|
|
| 844 | + } |
|
| 845 | + } |
|
| 846 | 846 | |
| 847 | - if (!empty($post_category)) {
|
|
| 848 | - $cat1 = array_filter(explode(',', $post_category));
|
|
| 849 | - $post_category = ',' . implode(',', $cat1) . ',';
|
|
| 847 | + if (!empty($post_category)) {
|
|
| 848 | + $cat1 = array_filter(explode(',', $post_category));
|
|
| 849 | + $post_category = ',' . implode(',', $cat1) . ',';
|
|
| 850 | 850 | |
| 851 | - } |
|
| 851 | + } |
|
| 852 | 852 | |
| 853 | - if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {
|
|
| 853 | + if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {
|
|
| 854 | 854 | |
| 855 | - $post_category_upd = explode(',', $post_category);
|
|
| 856 | - $post_category_change = ''; |
|
| 857 | - foreach ($post_category_upd as $cat) {
|
|
| 855 | + $post_category_upd = explode(',', $post_category);
|
|
| 856 | + $post_category_change = ''; |
|
| 857 | + foreach ($post_category_upd as $cat) {
|
|
| 858 | 858 | |
| 859 | - if (!in_array($cat, $exclude_cats) && $cat != '') {
|
|
| 860 | - $post_category_change .= ',' . $cat; |
|
| 861 | - } |
|
| 862 | - } |
|
| 863 | - $post_category = $post_category_change; |
|
| 864 | - } |
|
| 859 | + if (!in_array($cat, $exclude_cats) && $cat != '') {
|
|
| 860 | + $post_category_change .= ',' . $cat; |
|
| 861 | + } |
|
| 862 | + } |
|
| 863 | + $post_category = $post_category_change; |
|
| 864 | + } |
|
| 865 | 865 | |
| 866 | 866 | |
| 867 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 868 | - $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 869 | - } |
|
| 870 | - } |
|
| 867 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 868 | + $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 869 | + } |
|
| 870 | + } |
|
| 871 | 871 | |
| 872 | - echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']" />'; |
|
| 872 | + echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']" />'; |
|
| 873 | 873 | |
| 874 | - echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']" />'; |
|
| 874 | + echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']" />'; |
|
| 875 | 875 | |
| 876 | - echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']" />'; |
|
| 876 | + echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']" />'; |
|
| 877 | 877 | |
| 878 | 878 | |
| 879 | - ?> |
|
| 879 | + ?> |
|
| 880 | 880 | <div class="cat_sublist"> |
| 881 | 881 | <?php |
| 882 | 882 | |
| 883 | - $post_id = isset($post->ID) ? $post->ID : ''; |
|
| 883 | + $post_id = isset($post->ID) ? $post->ID : ''; |
|
| 884 | 884 | |
| 885 | - if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 885 | + if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 886 | 886 | |
| 887 | - geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories); |
|
| 888 | - } |
|
| 889 | - ?> |
|
| 887 | + geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories); |
|
| 888 | + } |
|
| 889 | + ?> |
|
| 890 | 890 | </div> |
| 891 | 891 | <script type="text/javascript"> |
| 892 | 892 | |
@@ -1009,22 +1009,22 @@ discard block |
||
| 1009 | 1009 | |
| 1010 | 1010 | </script> |
| 1011 | 1011 | <?php |
| 1012 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 1013 | - $post_cat_str = $post_categories[$cat_taxonomy]; |
|
| 1014 | - $post_cat_array = explode("#", $post_cat_str);
|
|
| 1015 | - if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) |
|
| 1016 | - $style = "display:none;"; |
|
| 1017 | - } |
|
| 1018 | - ?> |
|
| 1012 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 1013 | + $post_cat_str = $post_categories[$cat_taxonomy]; |
|
| 1014 | + $post_cat_array = explode("#", $post_cat_str);
|
|
| 1015 | + if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) |
|
| 1016 | + $style = "display:none;"; |
|
| 1017 | + } |
|
| 1018 | + ?> |
|
| 1019 | 1019 | <div class="main_cat_list" style=" <?php if (isset($style)) {
|
| 1020 | - echo $style; |
|
| 1021 | - }?> "> |
|
| 1020 | + echo $style; |
|
| 1021 | + }?> "> |
|
| 1022 | 1022 | <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list |
| 1023 | - ?> |
|
| 1023 | + ?> |
|
| 1024 | 1024 | </div> |
| 1025 | 1025 | <?php |
| 1026 | 1026 | |
| 1027 | - } |
|
| 1027 | + } |
|
| 1028 | 1028 | } |
| 1029 | 1029 | |
| 1030 | 1030 | /** |
@@ -1041,23 +1041,23 @@ discard block |
||
| 1041 | 1041 | */ |
| 1042 | 1042 | function geodir_addpost_categories_html($request_taxonomy, $parrent, $selected = false, $main_selected = true, $default = false, $exclude = '') |
| 1043 | 1043 | {
|
| 1044 | - global $exclude_cats; |
|
| 1044 | + global $exclude_cats; |
|
| 1045 | 1045 | |
| 1046 | - if ($exclude != '') {
|
|
| 1047 | - $exclude_cats = maybe_unserialize(base64_decode($exclude)); |
|
| 1046 | + if ($exclude != '') {
|
|
| 1047 | + $exclude_cats = maybe_unserialize(base64_decode($exclude)); |
|
| 1048 | 1048 | |
| 1049 | - if(is_array( $exclude_cats)){
|
|
| 1050 | - $exclude_cats = array_map( 'intval', $exclude_cats ); |
|
| 1051 | - }else{
|
|
| 1052 | - $exclude_cats = intval($exclude_cats); |
|
| 1053 | - } |
|
| 1049 | + if(is_array( $exclude_cats)){
|
|
| 1050 | + $exclude_cats = array_map( 'intval', $exclude_cats ); |
|
| 1051 | + }else{
|
|
| 1052 | + $exclude_cats = intval($exclude_cats); |
|
| 1053 | + } |
|
| 1054 | 1054 | |
| 1055 | - } |
|
| 1055 | + } |
|
| 1056 | 1056 | |
| 1057 | - if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) || |
|
| 1058 | - (!is_array($exclude_cats) || empty($exclude_cats)) |
|
| 1059 | - ) {
|
|
| 1060 | - ?> |
|
| 1057 | + if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) || |
|
| 1058 | + (!is_array($exclude_cats) || empty($exclude_cats)) |
|
| 1059 | + ) {
|
|
| 1060 | + ?> |
|
| 1061 | 1061 | |
| 1062 | 1062 | <?php $main_cat = get_term($parrent, $request_taxonomy); ?> |
| 1063 | 1063 | |
@@ -1086,8 +1086,8 @@ discard block |
||
| 1086 | 1086 | |
| 1087 | 1087 | <br/> |
| 1088 | 1088 | <?php |
| 1089 | - $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1090 | - if (!empty($cat_terms)) { ?>
|
|
| 1089 | + $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1090 | + if (!empty($cat_terms)) { ?>
|
|
| 1091 | 1091 | <span> <?php printf(__('Add listing in category', 'geodirectory')); ?></span>
|
| 1092 | 1092 | <?php geodir_get_catlist($request_taxonomy, $parrent, $selected) ?> |
| 1093 | 1093 | <?php } ?> |
@@ -1109,53 +1109,53 @@ discard block |
||
| 1109 | 1109 | function geodir_editpost_categories_html($request_taxonomy, $request_postid, $post_categories) |
| 1110 | 1110 | {
|
| 1111 | 1111 | |
| 1112 | - if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {
|
|
| 1113 | - $post_cat_str = $post_categories[$request_taxonomy]; |
|
| 1114 | - $post_cat_array = explode("#", $post_cat_str);
|
|
| 1115 | - if (is_array($post_cat_array)) {
|
|
| 1116 | - $post_cat_array = array_unique( $post_cat_array ); |
|
| 1112 | + if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {
|
|
| 1113 | + $post_cat_str = $post_categories[$request_taxonomy]; |
|
| 1114 | + $post_cat_array = explode("#", $post_cat_str);
|
|
| 1115 | + if (is_array($post_cat_array)) {
|
|
| 1116 | + $post_cat_array = array_unique( $post_cat_array ); |
|
| 1117 | 1117 | |
| 1118 | 1118 | foreach ($post_cat_array as $post_cat_html) {
|
| 1119 | 1119 | |
| 1120 | - $post_cat_info = explode(":", $post_cat_html);
|
|
| 1121 | - $post_maincat_str = $post_cat_info[0]; |
|
| 1120 | + $post_cat_info = explode(":", $post_cat_html);
|
|
| 1121 | + $post_maincat_str = $post_cat_info[0]; |
|
| 1122 | 1122 | |
| 1123 | - if (!empty($post_maincat_str)) {
|
|
| 1124 | - $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1125 | - $post_maincat_id = $post_maincat_info[0]; |
|
| 1126 | - ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1127 | - (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1128 | - } |
|
| 1129 | - $post_sub_catid = ''; |
|
| 1130 | - if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1131 | - $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1132 | - } |
|
| 1123 | + if (!empty($post_maincat_str)) {
|
|
| 1124 | + $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1125 | + $post_maincat_id = $post_maincat_info[0]; |
|
| 1126 | + ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1127 | + (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1128 | + } |
|
| 1129 | + $post_sub_catid = ''; |
|
| 1130 | + if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1131 | + $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1132 | + } |
|
| 1133 | 1133 | |
| 1134 | - geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1134 | + geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1135 | 1135 | |
| 1136 | - } |
|
| 1137 | - } else {
|
|
| 1136 | + } |
|
| 1137 | + } else {
|
|
| 1138 | 1138 | |
| 1139 | - $post_cat_info = explode(":", $post_cat_str);
|
|
| 1140 | - $post_maincat_str = $post_cat_info[0]; |
|
| 1139 | + $post_cat_info = explode(":", $post_cat_str);
|
|
| 1140 | + $post_maincat_str = $post_cat_info[0]; |
|
| 1141 | 1141 | |
| 1142 | - $post_sub_catid = ''; |
|
| 1142 | + $post_sub_catid = ''; |
|
| 1143 | 1143 | |
| 1144 | - if (!empty($post_maincat_str)) {
|
|
| 1145 | - $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1146 | - $post_maincat_id = $post_maincat_info[0]; |
|
| 1147 | - ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1148 | - (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1149 | - } |
|
| 1144 | + if (!empty($post_maincat_str)) {
|
|
| 1145 | + $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1146 | + $post_maincat_id = $post_maincat_info[0]; |
|
| 1147 | + ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1148 | + (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1149 | + } |
|
| 1150 | 1150 | |
| 1151 | - if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1152 | - $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1153 | - } |
|
| 1151 | + if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1152 | + $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1153 | + } |
|
| 1154 | 1154 | |
| 1155 | - geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1155 | + geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1156 | 1156 | |
| 1157 | - } |
|
| 1158 | - } |
|
| 1157 | + } |
|
| 1158 | + } |
|
| 1159 | 1159 | } |
| 1160 | 1160 | |
| 1161 | 1161 | /** |
@@ -1169,35 +1169,35 @@ discard block |
||
| 1169 | 1169 | */ |
| 1170 | 1170 | function geodir_get_catlist($cat_taxonomy, $parrent = 0, $selected = false) |
| 1171 | 1171 | {
|
| 1172 | - global $exclude_cats; |
|
| 1172 | + global $exclude_cats; |
|
| 1173 | 1173 | |
| 1174 | - $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1174 | + $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1175 | 1175 | |
| 1176 | - if (!empty($cat_terms)) {
|
|
| 1177 | - $onchange = ''; |
|
| 1178 | - $onchange = ' onchange="show_subcatlist(this.value, this)" '; |
|
| 1176 | + if (!empty($cat_terms)) {
|
|
| 1177 | + $onchange = ''; |
|
| 1178 | + $onchange = ' onchange="show_subcatlist(this.value, this)" '; |
|
| 1179 | 1179 | |
| 1180 | - $option_selected = ''; |
|
| 1181 | - if (!$selected) |
|
| 1182 | - $option_slected = ' selected="selected" '; |
|
| 1180 | + $option_selected = ''; |
|
| 1181 | + if (!$selected) |
|
| 1182 | + $option_slected = ' selected="selected" '; |
|
| 1183 | 1183 | |
| 1184 | - echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >'; |
|
| 1184 | + echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >'; |
|
| 1185 | 1185 | |
| 1186 | - echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
|
|
| 1186 | + echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
|
|
| 1187 | 1187 | |
| 1188 | - foreach ($cat_terms as $cat_term) {
|
|
| 1189 | - $option_selected = ''; |
|
| 1190 | - if ($selected == $cat_term->term_id) |
|
| 1191 | - $option_selected = ' selected="selected" '; |
|
| 1188 | + foreach ($cat_terms as $cat_term) {
|
|
| 1189 | + $option_selected = ''; |
|
| 1190 | + if ($selected == $cat_term->term_id) |
|
| 1191 | + $option_selected = ' selected="selected" '; |
|
| 1192 | 1192 | |
| 1193 | - // Count child terms |
|
| 1194 | - $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) ); |
|
| 1195 | - $has_child = !empty( $child_terms ) ? 't' : 'f'; |
|
| 1193 | + // Count child terms |
|
| 1194 | + $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) ); |
|
| 1195 | + $has_child = !empty( $child_terms ) ? 't' : 'f'; |
|
| 1196 | 1196 | |
| 1197 | - echo '<option ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . geodir_utf8_ucfirst($cat_term->name) . '</option>'; |
|
| 1198 | - } |
|
| 1199 | - echo '</select>'; |
|
| 1200 | - } |
|
| 1197 | + echo '<option ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . geodir_utf8_ucfirst($cat_term->name) . '</option>'; |
|
| 1198 | + } |
|
| 1199 | + echo '</select>'; |
|
| 1200 | + } |
|
| 1201 | 1201 | } |
| 1202 | 1202 | |
| 1203 | 1203 | /** |
@@ -1213,28 +1213,28 @@ discard block |
||
| 1213 | 1213 | */ |
| 1214 | 1214 | function geodir_custom_update_messages($messages) |
| 1215 | 1215 | {
|
| 1216 | - global $post, $post_ID; |
|
| 1217 | - |
|
| 1218 | - $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');
|
|
| 1219 | - |
|
| 1220 | - foreach ($post_types as $post_type => $post_object) {
|
|
| 1221 | - |
|
| 1222 | - $messages[$post_type] = array( |
|
| 1223 | - 0 => '', // Unused. Messages start at index 1. |
|
| 1224 | - 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),
|
|
| 1225 | - 2 => __('Custom field updated.', 'geodirectory'),
|
|
| 1226 | - 3 => __('Custom field deleted.', 'geodirectory'),
|
|
| 1227 | - 4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1228 | - 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,
|
|
| 1229 | - 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),
|
|
| 1230 | - 7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1231 | - 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),
|
|
| 1232 | - 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),
|
|
| 1233 | - 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),
|
|
| 1234 | - ); |
|
| 1235 | - } |
|
| 1236 | - |
|
| 1237 | - return $messages; |
|
| 1216 | + global $post, $post_ID; |
|
| 1217 | + |
|
| 1218 | + $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');
|
|
| 1219 | + |
|
| 1220 | + foreach ($post_types as $post_type => $post_object) {
|
|
| 1221 | + |
|
| 1222 | + $messages[$post_type] = array( |
|
| 1223 | + 0 => '', // Unused. Messages start at index 1. |
|
| 1224 | + 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),
|
|
| 1225 | + 2 => __('Custom field updated.', 'geodirectory'),
|
|
| 1226 | + 3 => __('Custom field deleted.', 'geodirectory'),
|
|
| 1227 | + 4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1228 | + 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,
|
|
| 1229 | + 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),
|
|
| 1230 | + 7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1231 | + 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),
|
|
| 1232 | + 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),
|
|
| 1233 | + 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),
|
|
| 1234 | + ); |
|
| 1235 | + } |
|
| 1236 | + |
|
| 1237 | + return $messages; |
|
| 1238 | 1238 | } |
| 1239 | 1239 | |
| 1240 | 1240 | |
@@ -1249,182 +1249,182 @@ discard block |
||
| 1249 | 1249 | function geodir_register_defaults() |
| 1250 | 1250 | {
|
| 1251 | 1251 | |
| 1252 | - global $wpdb; |
|
| 1253 | - |
|
| 1254 | - $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico'; |
|
| 1255 | - |
|
| 1256 | - if (!$listing_slug = get_option('geodir_listing_prefix'))
|
|
| 1257 | - $listing_slug = 'places'; |
|
| 1258 | - |
|
| 1259 | - /** |
|
| 1260 | - * Taxonomies |
|
| 1261 | - **/ |
|
| 1262 | - //if ( ! taxonomy_exists('gd_place_tags') )
|
|
| 1263 | - {
|
|
| 1264 | - |
|
| 1265 | - $gd_placetags = array(); |
|
| 1266 | - $gd_placetags['object_type'] = 'gd_place'; |
|
| 1267 | - $gd_placetags['listing_slug'] = $listing_slug . '/tags'; |
|
| 1268 | - $gd_placetags['args'] = array( |
|
| 1269 | - 'public' => true, |
|
| 1270 | - 'hierarchical' => false, |
|
| 1271 | - 'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
|
|
| 1272 | - 'query_var' => true, |
|
| 1273 | - |
|
| 1274 | - 'labels' => array( |
|
| 1275 | - 'name' => __('Place Tags', 'geodirectory'),
|
|
| 1276 | - 'singular_name' => __('Place Tag', 'geodirectory'),
|
|
| 1277 | - 'search_items' => __('Search Place Tags', 'geodirectory'),
|
|
| 1278 | - 'popular_items' => __('Popular Place Tags', 'geodirectory'),
|
|
| 1279 | - 'all_items' => __('All Place Tags', 'geodirectory'),
|
|
| 1280 | - 'edit_item' => __('Edit Place Tag', 'geodirectory'),
|
|
| 1281 | - 'update_item' => __('Update Place Tag', 'geodirectory'),
|
|
| 1282 | - 'add_new_item' => __('Add New Place Tag', 'geodirectory'),
|
|
| 1283 | - 'new_item_name' => __('New Place Tag Name', 'geodirectory'),
|
|
| 1284 | - 'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),
|
|
| 1285 | - 'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),
|
|
| 1286 | - 'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),
|
|
| 1287 | - ), |
|
| 1288 | - ); |
|
| 1289 | - |
|
| 1290 | - |
|
| 1291 | - $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1292 | - $geodir_taxonomies['gd_place_tags'] = $gd_placetags; |
|
| 1293 | - update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1294 | - |
|
| 1295 | - |
|
| 1296 | - // Update post types and delete tmp options |
|
| 1297 | - flush_rewrite_rules(); |
|
| 1298 | - |
|
| 1299 | - } |
|
| 1300 | - |
|
| 1301 | - //if ( ! taxonomy_exists('gd_placecategory') )
|
|
| 1302 | - {
|
|
| 1303 | - |
|
| 1304 | - $gd_placecategory = array(); |
|
| 1305 | - $gd_placecategory['object_type'] = 'gd_place'; |
|
| 1306 | - $gd_placecategory['listing_slug'] = $listing_slug; |
|
| 1307 | - $gd_placecategory['args'] = array( |
|
| 1308 | - 'public' => true, |
|
| 1309 | - 'hierarchical' => true, |
|
| 1310 | - 'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),
|
|
| 1311 | - 'query_var' => true, |
|
| 1312 | - 'labels' => array( |
|
| 1313 | - 'name' => __('Place Categories', 'geodirectory'),
|
|
| 1314 | - 'singular_name' => __('Place Category', 'geodirectory'),
|
|
| 1315 | - 'search_items' => __('Search Place Categories', 'geodirectory'),
|
|
| 1316 | - 'popular_items' => __('Popular Place Categories', 'geodirectory'),
|
|
| 1317 | - 'all_items' => __('All Place Categories', 'geodirectory'),
|
|
| 1318 | - 'edit_item' => __('Edit Place Category', 'geodirectory'),
|
|
| 1319 | - 'update_item' => __('Update Place Category', 'geodirectory'),
|
|
| 1320 | - 'add_new_item' => __('Add New Place Category', 'geodirectory'),
|
|
| 1321 | - 'new_item_name' => __('New Place Category', 'geodirectory'),
|
|
| 1322 | - 'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),
|
|
| 1323 | - ), |
|
| 1324 | - ); |
|
| 1325 | - |
|
| 1326 | - |
|
| 1327 | - $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1328 | - $geodir_taxonomies['gd_placecategory'] = $gd_placecategory; |
|
| 1329 | - update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1330 | - |
|
| 1331 | - |
|
| 1332 | - flush_rewrite_rules(); |
|
| 1333 | - } |
|
| 1334 | - |
|
| 1335 | - /** |
|
| 1336 | - * Post Types |
|
| 1337 | - **/ |
|
| 1338 | - |
|
| 1339 | - //if ( ! post_type_exists('gd_place') )
|
|
| 1340 | - {
|
|
| 1341 | - |
|
| 1342 | - $labels = array( |
|
| 1343 | - 'name' => __('Places', 'geodirectory'),
|
|
| 1344 | - 'singular_name' => __('Place', 'geodirectory'),
|
|
| 1345 | - 'add_new' => __('Add New', 'geodirectory'),
|
|
| 1346 | - 'add_new_item' => __('Add New Place', 'geodirectory'),
|
|
| 1347 | - 'edit_item' => __('Edit Place', 'geodirectory'),
|
|
| 1348 | - 'new_item' => __('New Place', 'geodirectory'),
|
|
| 1349 | - 'view_item' => __('View Place', 'geodirectory'),
|
|
| 1350 | - 'search_items' => __('Search Places', 'geodirectory'),
|
|
| 1351 | - 'not_found' => __('No Place Found', 'geodirectory'),
|
|
| 1352 | - 'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));
|
|
| 1353 | - |
|
| 1354 | - $place_default = array( |
|
| 1355 | - 'labels' => $labels, |
|
| 1356 | - 'can_export' => true, |
|
| 1357 | - 'capability_type' => 'post', |
|
| 1358 | - 'description' => 'Place post type.', |
|
| 1359 | - 'has_archive' => $listing_slug, |
|
| 1360 | - 'hierarchical' => false, |
|
| 1361 | - 'map_meta_cap' => true, |
|
| 1362 | - 'menu_icon' => $menu_icon, |
|
| 1363 | - 'public' => true, |
|
| 1364 | - 'query_var' => true, |
|
| 1365 | - 'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
|
|
| 1366 | - 'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
|
|
| 1367 | - 'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
|
|
| 1368 | - |
|
| 1369 | - //Update custom post types |
|
| 1370 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 1371 | - $geodir_post_types['gd_place'] = $place_default; |
|
| 1372 | - update_option('geodir_post_types', $geodir_post_types);
|
|
| 1373 | - |
|
| 1374 | - // Update post types and delete tmp options |
|
| 1375 | - flush_rewrite_rules(); |
|
| 1376 | - } |
|
| 1377 | - |
|
| 1378 | - |
|
| 1379 | - geodir_register_taxonomies(); |
|
| 1380 | - geodir_register_post_types(); |
|
| 1381 | - |
|
| 1382 | - //die; |
|
| 1252 | + global $wpdb; |
|
| 1253 | + |
|
| 1254 | + $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico'; |
|
| 1255 | + |
|
| 1256 | + if (!$listing_slug = get_option('geodir_listing_prefix'))
|
|
| 1257 | + $listing_slug = 'places'; |
|
| 1258 | + |
|
| 1259 | + /** |
|
| 1260 | + * Taxonomies |
|
| 1261 | + **/ |
|
| 1262 | + //if ( ! taxonomy_exists('gd_place_tags') )
|
|
| 1263 | + {
|
|
| 1264 | + |
|
| 1265 | + $gd_placetags = array(); |
|
| 1266 | + $gd_placetags['object_type'] = 'gd_place'; |
|
| 1267 | + $gd_placetags['listing_slug'] = $listing_slug . '/tags'; |
|
| 1268 | + $gd_placetags['args'] = array( |
|
| 1269 | + 'public' => true, |
|
| 1270 | + 'hierarchical' => false, |
|
| 1271 | + 'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
|
|
| 1272 | + 'query_var' => true, |
|
| 1273 | + |
|
| 1274 | + 'labels' => array( |
|
| 1275 | + 'name' => __('Place Tags', 'geodirectory'),
|
|
| 1276 | + 'singular_name' => __('Place Tag', 'geodirectory'),
|
|
| 1277 | + 'search_items' => __('Search Place Tags', 'geodirectory'),
|
|
| 1278 | + 'popular_items' => __('Popular Place Tags', 'geodirectory'),
|
|
| 1279 | + 'all_items' => __('All Place Tags', 'geodirectory'),
|
|
| 1280 | + 'edit_item' => __('Edit Place Tag', 'geodirectory'),
|
|
| 1281 | + 'update_item' => __('Update Place Tag', 'geodirectory'),
|
|
| 1282 | + 'add_new_item' => __('Add New Place Tag', 'geodirectory'),
|
|
| 1283 | + 'new_item_name' => __('New Place Tag Name', 'geodirectory'),
|
|
| 1284 | + 'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),
|
|
| 1285 | + 'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),
|
|
| 1286 | + 'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),
|
|
| 1287 | + ), |
|
| 1288 | + ); |
|
| 1289 | + |
|
| 1290 | + |
|
| 1291 | + $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1292 | + $geodir_taxonomies['gd_place_tags'] = $gd_placetags; |
|
| 1293 | + update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1294 | + |
|
| 1295 | + |
|
| 1296 | + // Update post types and delete tmp options |
|
| 1297 | + flush_rewrite_rules(); |
|
| 1298 | + |
|
| 1299 | + } |
|
| 1300 | + |
|
| 1301 | + //if ( ! taxonomy_exists('gd_placecategory') )
|
|
| 1302 | + {
|
|
| 1303 | + |
|
| 1304 | + $gd_placecategory = array(); |
|
| 1305 | + $gd_placecategory['object_type'] = 'gd_place'; |
|
| 1306 | + $gd_placecategory['listing_slug'] = $listing_slug; |
|
| 1307 | + $gd_placecategory['args'] = array( |
|
| 1308 | + 'public' => true, |
|
| 1309 | + 'hierarchical' => true, |
|
| 1310 | + 'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),
|
|
| 1311 | + 'query_var' => true, |
|
| 1312 | + 'labels' => array( |
|
| 1313 | + 'name' => __('Place Categories', 'geodirectory'),
|
|
| 1314 | + 'singular_name' => __('Place Category', 'geodirectory'),
|
|
| 1315 | + 'search_items' => __('Search Place Categories', 'geodirectory'),
|
|
| 1316 | + 'popular_items' => __('Popular Place Categories', 'geodirectory'),
|
|
| 1317 | + 'all_items' => __('All Place Categories', 'geodirectory'),
|
|
| 1318 | + 'edit_item' => __('Edit Place Category', 'geodirectory'),
|
|
| 1319 | + 'update_item' => __('Update Place Category', 'geodirectory'),
|
|
| 1320 | + 'add_new_item' => __('Add New Place Category', 'geodirectory'),
|
|
| 1321 | + 'new_item_name' => __('New Place Category', 'geodirectory'),
|
|
| 1322 | + 'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),
|
|
| 1323 | + ), |
|
| 1324 | + ); |
|
| 1325 | + |
|
| 1326 | + |
|
| 1327 | + $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1328 | + $geodir_taxonomies['gd_placecategory'] = $gd_placecategory; |
|
| 1329 | + update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1330 | + |
|
| 1331 | + |
|
| 1332 | + flush_rewrite_rules(); |
|
| 1333 | + } |
|
| 1334 | + |
|
| 1335 | + /** |
|
| 1336 | + * Post Types |
|
| 1337 | + **/ |
|
| 1338 | + |
|
| 1339 | + //if ( ! post_type_exists('gd_place') )
|
|
| 1340 | + {
|
|
| 1341 | + |
|
| 1342 | + $labels = array( |
|
| 1343 | + 'name' => __('Places', 'geodirectory'),
|
|
| 1344 | + 'singular_name' => __('Place', 'geodirectory'),
|
|
| 1345 | + 'add_new' => __('Add New', 'geodirectory'),
|
|
| 1346 | + 'add_new_item' => __('Add New Place', 'geodirectory'),
|
|
| 1347 | + 'edit_item' => __('Edit Place', 'geodirectory'),
|
|
| 1348 | + 'new_item' => __('New Place', 'geodirectory'),
|
|
| 1349 | + 'view_item' => __('View Place', 'geodirectory'),
|
|
| 1350 | + 'search_items' => __('Search Places', 'geodirectory'),
|
|
| 1351 | + 'not_found' => __('No Place Found', 'geodirectory'),
|
|
| 1352 | + 'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));
|
|
| 1353 | + |
|
| 1354 | + $place_default = array( |
|
| 1355 | + 'labels' => $labels, |
|
| 1356 | + 'can_export' => true, |
|
| 1357 | + 'capability_type' => 'post', |
|
| 1358 | + 'description' => 'Place post type.', |
|
| 1359 | + 'has_archive' => $listing_slug, |
|
| 1360 | + 'hierarchical' => false, |
|
| 1361 | + 'map_meta_cap' => true, |
|
| 1362 | + 'menu_icon' => $menu_icon, |
|
| 1363 | + 'public' => true, |
|
| 1364 | + 'query_var' => true, |
|
| 1365 | + 'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
|
|
| 1366 | + 'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
|
|
| 1367 | + 'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
|
|
| 1368 | + |
|
| 1369 | + //Update custom post types |
|
| 1370 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 1371 | + $geodir_post_types['gd_place'] = $place_default; |
|
| 1372 | + update_option('geodir_post_types', $geodir_post_types);
|
|
| 1373 | + |
|
| 1374 | + // Update post types and delete tmp options |
|
| 1375 | + flush_rewrite_rules(); |
|
| 1376 | + } |
|
| 1377 | + |
|
| 1378 | + |
|
| 1379 | + geodir_register_taxonomies(); |
|
| 1380 | + geodir_register_post_types(); |
|
| 1381 | + |
|
| 1382 | + //die; |
|
| 1383 | 1383 | |
| 1384 | 1384 | } |
| 1385 | 1385 | |
| 1386 | 1386 | $gd_wpml_get_languages = ""; |
| 1387 | 1387 | function gd_wpml_get_lang_from_url($url) {
|
| 1388 | - global $sitepress, $gd_wpml_get_languages; |
|
| 1388 | + global $sitepress, $gd_wpml_get_languages; |
|
| 1389 | 1389 | |
| 1390 | - if (geodir_is_wpml()) {
|
|
| 1391 | - return $sitepress->get_language_from_url($url); |
|
| 1392 | - } |
|
| 1390 | + if (geodir_is_wpml()) {
|
|
| 1391 | + return $sitepress->get_language_from_url($url); |
|
| 1392 | + } |
|
| 1393 | 1393 | |
| 1394 | - if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {
|
|
| 1395 | - return $_REQUEST['lang']; |
|
| 1396 | - } |
|
| 1394 | + if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {
|
|
| 1395 | + return $_REQUEST['lang']; |
|
| 1396 | + } |
|
| 1397 | 1397 | |
| 1398 | - $url = str_replace(array("http://","https://"),"",$url);
|
|
| 1398 | + $url = str_replace(array("http://","https://"),"",$url);
|
|
| 1399 | 1399 | |
| 1400 | - // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
|
|
| 1401 | - $site_url = str_replace(array("http://","https://"),"",site_url());
|
|
| 1400 | + // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
|
|
| 1401 | + $site_url = str_replace(array("http://","https://"),"",site_url());
|
|
| 1402 | 1402 | |
| 1403 | - $url = str_replace($site_url,"",$url); |
|
| 1403 | + $url = str_replace($site_url,"",$url); |
|
| 1404 | 1404 | |
| 1405 | - $segments = explode('/', trim($url, '/'));
|
|
| 1405 | + $segments = explode('/', trim($url, '/'));
|
|
| 1406 | 1406 | |
| 1407 | - if ($gd_wpml_get_languages) {
|
|
| 1408 | - $langs = $gd_wpml_get_languages; |
|
| 1409 | - } else {
|
|
| 1410 | - $gd_wpml_get_languages = $sitepress->get_active_languages(); |
|
| 1411 | - } |
|
| 1407 | + if ($gd_wpml_get_languages) {
|
|
| 1408 | + $langs = $gd_wpml_get_languages; |
|
| 1409 | + } else {
|
|
| 1410 | + $gd_wpml_get_languages = $sitepress->get_active_languages(); |
|
| 1411 | + } |
|
| 1412 | 1412 | |
| 1413 | - if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {
|
|
| 1414 | - return $segments[0]; |
|
| 1415 | - } |
|
| 1413 | + if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {
|
|
| 1414 | + return $segments[0]; |
|
| 1415 | + } |
|
| 1416 | 1416 | |
| 1417 | - return false; |
|
| 1417 | + return false; |
|
| 1418 | 1418 | } |
| 1419 | 1419 | |
| 1420 | 1420 | function gd_wpml_slug_translation_turned_on($post_type) {
|
| 1421 | 1421 | |
| 1422 | - global $sitepress; |
|
| 1423 | - $settings = $sitepress->get_settings(); |
|
| 1424 | - return isset($settings['posts_slug_translation']['types'][$post_type]) |
|
| 1425 | - && $settings['posts_slug_translation']['types'][$post_type] |
|
| 1426 | - && isset($settings['posts_slug_translation']['on']) |
|
| 1427 | - && $settings['posts_slug_translation']['on']; |
|
| 1422 | + global $sitepress; |
|
| 1423 | + $settings = $sitepress->get_settings(); |
|
| 1424 | + return isset($settings['posts_slug_translation']['types'][$post_type]) |
|
| 1425 | + && $settings['posts_slug_translation']['types'][$post_type] |
|
| 1426 | + && isset($settings['posts_slug_translation']['on']) |
|
| 1427 | + && $settings['posts_slug_translation']['on']; |
|
| 1428 | 1428 | } |
| 1429 | 1429 | |
| 1430 | 1430 | |
@@ -1451,158 +1451,158 @@ discard block |
||
| 1451 | 1451 | */ |
| 1452 | 1452 | function geodir_listing_permalink_structure($post_link, $post_obj, $leavename, $sample) |
| 1453 | 1453 | {
|
| 1454 | - //echo $post_link."<br />".$sample ; |
|
| 1454 | + //echo $post_link."<br />".$sample ; |
|
| 1455 | 1455 | |
| 1456 | 1456 | |
| 1457 | - global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache; |
|
| 1458 | - if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {
|
|
| 1459 | - } elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {
|
|
| 1460 | - return $post_link; |
|
| 1461 | - } else {
|
|
| 1462 | - $orig_post = $post; |
|
| 1463 | - $post = $post_obj; |
|
| 1464 | - } |
|
| 1457 | + global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache; |
|
| 1458 | + if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {
|
|
| 1459 | + } elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {
|
|
| 1460 | + return $post_link; |
|
| 1461 | + } else {
|
|
| 1462 | + $orig_post = $post; |
|
| 1463 | + $post = $post_obj; |
|
| 1464 | + } |
|
| 1465 | 1465 | |
| 1466 | - if (in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 1466 | + if (in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 1467 | 1467 | |
| 1468 | - // if we dont have a GD post then try to grab it |
|
| 1469 | - if(!isset($post->default_category)){
|
|
| 1470 | - $gd_post = geodir_get_post_info($post->ID); |
|
| 1471 | - if(!empty($gd_post)){
|
|
| 1472 | - $post = $gd_post; |
|
| 1473 | - } |
|
| 1474 | - } |
|
| 1468 | + // if we dont have a GD post then try to grab it |
|
| 1469 | + if(!isset($post->default_category)){
|
|
| 1470 | + $gd_post = geodir_get_post_info($post->ID); |
|
| 1471 | + if(!empty($gd_post)){
|
|
| 1472 | + $post = $gd_post; |
|
| 1473 | + } |
|
| 1474 | + } |
|
| 1475 | 1475 | |
| 1476 | 1476 | |
| 1477 | - $post_types = get_option('geodir_post_types');
|
|
| 1478 | - $slug = $post_types[$post->post_type]['rewrite']['slug']; |
|
| 1477 | + $post_types = get_option('geodir_post_types');
|
|
| 1478 | + $slug = $post_types[$post->post_type]['rewrite']['slug']; |
|
| 1479 | 1479 | |
| 1480 | - // Alter the CPT slug if WPML is set to do so |
|
| 1481 | - if(geodir_wpml_is_post_type_translated($post->post_type)){
|
|
| 1482 | - if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
|
|
| 1480 | + // Alter the CPT slug if WPML is set to do so |
|
| 1481 | + if(geodir_wpml_is_post_type_translated($post->post_type)){
|
|
| 1482 | + if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
|
|
| 1483 | 1483 | |
| 1484 | - $org_slug = $slug; |
|
| 1485 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1486 | - $slug, |
|
| 1487 | - 'WordPress', |
|
| 1488 | - 'URL slug: ' . $slug, |
|
| 1489 | - $language_code); |
|
| 1484 | + $org_slug = $slug; |
|
| 1485 | + $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1486 | + $slug, |
|
| 1487 | + 'WordPress', |
|
| 1488 | + 'URL slug: ' . $slug, |
|
| 1489 | + $language_code); |
|
| 1490 | 1490 | |
| 1491 | - if(!$slug){$slug = $org_slug;}
|
|
| 1491 | + if(!$slug){$slug = $org_slug;}
|
|
| 1492 | 1492 | |
| 1493 | - } |
|
| 1494 | - } |
|
| 1493 | + } |
|
| 1494 | + } |
|
| 1495 | 1495 | |
| 1496 | - if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1497 | - remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 1498 | - } |
|
| 1496 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1497 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 1498 | + } |
|
| 1499 | 1499 | |
| 1500 | - // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz. |
|
| 1501 | - $site_url = trailingslashit(get_bloginfo('url'));
|
|
| 1500 | + // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz. |
|
| 1501 | + $site_url = trailingslashit(get_bloginfo('url'));
|
|
| 1502 | 1502 | |
| 1503 | - if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1504 | - add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 1505 | - } |
|
| 1506 | - |
|
| 1507 | - $fix_url = strpos($post_link, $site_url) === 0 ? true : false; |
|
| 1508 | - if ($fix_url) {
|
|
| 1509 | - $post_link = str_replace($site_url, '', $post_link); |
|
| 1510 | - } |
|
| 1511 | - |
|
| 1512 | - $post_link = trailingslashit( |
|
| 1513 | - preg_replace( "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 ) |
|
| 1514 | - ); |
|
| 1515 | - |
|
| 1516 | - if ($fix_url) {
|
|
| 1517 | - $post_link = $site_url . $post_link; |
|
| 1518 | - } |
|
| 1519 | - |
|
| 1520 | - if (isset($comment_post_cache[$post->ID])) {
|
|
| 1521 | - $post = $comment_post_cache[$post->ID]; |
|
| 1522 | - } |
|
| 1523 | - if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {
|
|
| 1524 | - $post_id = $post->ID; |
|
| 1525 | - if (isset($orig_post)) {
|
|
| 1526 | - $post = $orig_post; |
|
| 1527 | - } |
|
| 1528 | - return $gd_permalink_cache[$post_id]; |
|
| 1529 | - } |
|
| 1503 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1504 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 1505 | + } |
|
| 1506 | + |
|
| 1507 | + $fix_url = strpos($post_link, $site_url) === 0 ? true : false; |
|
| 1508 | + if ($fix_url) {
|
|
| 1509 | + $post_link = str_replace($site_url, '', $post_link); |
|
| 1510 | + } |
|
| 1530 | 1511 | |
| 1531 | - if (!isset($post->post_locations)) {
|
|
| 1532 | - $post_type = $post->post_type; |
|
| 1533 | - $ID = $post->ID; |
|
| 1534 | - $post2 = $wpdb->get_row( |
|
| 1535 | - $wpdb->prepare( |
|
| 1536 | - "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1537 | - array($post->ID) |
|
| 1538 | - ) |
|
| 1539 | - ); |
|
| 1512 | + $post_link = trailingslashit( |
|
| 1513 | + preg_replace( "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 ) |
|
| 1514 | + ); |
|
| 1515 | + |
|
| 1516 | + if ($fix_url) {
|
|
| 1517 | + $post_link = $site_url . $post_link; |
|
| 1518 | + } |
|
| 1519 | + |
|
| 1520 | + if (isset($comment_post_cache[$post->ID])) {
|
|
| 1521 | + $post = $comment_post_cache[$post->ID]; |
|
| 1522 | + } |
|
| 1523 | + if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {
|
|
| 1524 | + $post_id = $post->ID; |
|
| 1525 | + if (isset($orig_post)) {
|
|
| 1526 | + $post = $orig_post; |
|
| 1527 | + } |
|
| 1528 | + return $gd_permalink_cache[$post_id]; |
|
| 1529 | + } |
|
| 1540 | 1530 | |
| 1541 | - $post = (object)array_merge((array)$post, (array)$post2); |
|
| 1531 | + if (!isset($post->post_locations)) {
|
|
| 1532 | + $post_type = $post->post_type; |
|
| 1533 | + $ID = $post->ID; |
|
| 1534 | + $post2 = $wpdb->get_row( |
|
| 1535 | + $wpdb->prepare( |
|
| 1536 | + "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1537 | + array($post->ID) |
|
| 1538 | + ) |
|
| 1539 | + ); |
|
| 1542 | 1540 | |
| 1543 | - $comment_post_cache[$post->ID] = $post; |
|
| 1544 | - } |
|
| 1541 | + $post = (object)array_merge((array)$post, (array)$post2); |
|
| 1545 | 1542 | |
| 1543 | + $comment_post_cache[$post->ID] = $post; |
|
| 1544 | + } |
|
| 1546 | 1545 | |
| 1547 | 1546 | |
| 1548 | - if (false !== strpos($post_link, '%gd_taxonomy%')) {
|
|
| 1549 | 1547 | |
| 1550 | - if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
|
|
| 1551 | - $location_request = ''; |
|
| 1548 | + if (false !== strpos($post_link, '%gd_taxonomy%')) {
|
|
| 1552 | 1549 | |
| 1550 | + if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
|
|
| 1551 | + $location_request = ''; |
|
| 1553 | 1552 | |
| 1554 | - if (!empty($post->post_locations)) {
|
|
| 1555 | - $geodir_arr_locations = explode(',', $post->post_locations);
|
|
| 1556 | - if (count($geodir_arr_locations) == 3) {
|
|
| 1557 | - $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1558 | - $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1559 | - $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1560 | - $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1561 | - $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1562 | - $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1563 | 1553 | |
| 1564 | - $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1565 | - 'region_slug' => $post->region_slug, |
|
| 1566 | - 'city_slug' => $post->city_slug |
|
| 1567 | - ); |
|
| 1554 | + if (!empty($post->post_locations)) {
|
|
| 1555 | + $geodir_arr_locations = explode(',', $post->post_locations);
|
|
| 1556 | + if (count($geodir_arr_locations) == 3) {
|
|
| 1557 | + $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1558 | + $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1559 | + $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1560 | + $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1561 | + $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1562 | + $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1568 | 1563 | |
| 1569 | - } else |
|
| 1570 | - $post_location = geodir_get_location(); |
|
| 1564 | + $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1565 | + 'region_slug' => $post->region_slug, |
|
| 1566 | + 'city_slug' => $post->city_slug |
|
| 1567 | + ); |
|
| 1571 | 1568 | |
| 1569 | + } else |
|
| 1570 | + $post_location = geodir_get_location(); |
|
| 1572 | 1571 | |
| 1573 | - } else {
|
|
| 1574 | 1572 | |
| 1575 | - $post_location_sql = $wpdb->get_results( |
|
| 1576 | - $wpdb->prepare( |
|
| 1577 | - "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1578 | - array($post->ID) |
|
| 1579 | - ) |
|
| 1580 | - ); |
|
| 1581 | - |
|
| 1582 | - if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {
|
|
| 1583 | - |
|
| 1584 | - $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);
|
|
| 1585 | - if (count($geodir_arr_locations) == 3) {
|
|
| 1586 | - $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1587 | - $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1588 | - $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1589 | - $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1590 | - $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1591 | - $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1592 | - |
|
| 1593 | - $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1594 | - 'region_slug' => $post->region_slug, |
|
| 1595 | - 'city_slug' => $post->city_slug |
|
| 1596 | - ); |
|
| 1573 | + } else {
|
|
| 1597 | 1574 | |
| 1598 | - } |
|
| 1599 | - } else |
|
| 1600 | - $post_location = geodir_get_location(); |
|
| 1601 | - } |
|
| 1575 | + $post_location_sql = $wpdb->get_results( |
|
| 1576 | + $wpdb->prepare( |
|
| 1577 | + "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1578 | + array($post->ID) |
|
| 1579 | + ) |
|
| 1580 | + ); |
|
| 1581 | + |
|
| 1582 | + if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {
|
|
| 1583 | + |
|
| 1584 | + $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);
|
|
| 1585 | + if (count($geodir_arr_locations) == 3) {
|
|
| 1586 | + $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1587 | + $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1588 | + $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1589 | + $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1590 | + $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1591 | + $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1592 | + |
|
| 1593 | + $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1594 | + 'region_slug' => $post->region_slug, |
|
| 1595 | + 'city_slug' => $post->city_slug |
|
| 1596 | + ); |
|
| 1597 | + |
|
| 1598 | + } |
|
| 1599 | + } else |
|
| 1600 | + $post_location = geodir_get_location(); |
|
| 1601 | + } |
|
| 1602 | 1602 | |
| 1603 | 1603 | |
| 1604 | - if (!empty($post_location)) {
|
|
| 1605 | - $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : ''; |
|
| 1604 | + if (!empty($post_location)) {
|
|
| 1605 | + $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : ''; |
|
| 1606 | 1606 | $region_slug = isset($post_location->region_slug) ? $post_location->region_slug : ''; |
| 1607 | 1607 | $city_slug = isset($post_location->city_slug) ? $post_location->city_slug : ''; |
| 1608 | 1608 | |
@@ -1620,88 +1620,88 @@ discard block |
||
| 1620 | 1620 | $location_slug[] = $city_slug; |
| 1621 | 1621 | |
| 1622 | 1622 | $location_request .= implode('/', $location_slug) . '/';
|
| 1623 | - } |
|
| 1624 | - } |
|
| 1623 | + } |
|
| 1624 | + } |
|
| 1625 | 1625 | |
| 1626 | - if (get_option('geodir_add_categories_url')) {
|
|
| 1626 | + if (get_option('geodir_add_categories_url')) {
|
|
| 1627 | 1627 | |
| 1628 | - $term_request = ''; |
|
| 1629 | - $taxonomies = geodir_get_taxonomies($post->post_type); |
|
| 1630 | - $taxonomies = !empty($taxonomies) && is_array($taxonomies) ? end($taxonomies) : ''; |
|
| 1628 | + $term_request = ''; |
|
| 1629 | + $taxonomies = geodir_get_taxonomies($post->post_type); |
|
| 1630 | + $taxonomies = !empty($taxonomies) && is_array($taxonomies) ? end($taxonomies) : ''; |
|
| 1631 | 1631 | |
| 1632 | - if (!empty($post->default_category)) {
|
|
| 1633 | - $post_terms = $post->default_category; |
|
| 1634 | - } else {
|
|
| 1635 | - $post_terms = ''; |
|
| 1636 | - |
|
| 1637 | - if(isset($_POST['post_default_category']) && $_POST['post_default_category']){
|
|
| 1638 | - $post_terms = absint($_POST['post_default_category']); |
|
| 1639 | - }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {
|
|
| 1640 | - $post_terms = is_array($_POST['post_category'][$taxonomies]) ? $_POST['post_category'][$taxonomies] : explode(",", trim($_POST['post_category'][$taxonomies], ","));
|
|
| 1641 | - $post_terms = !empty($post_terms) ? absint($post_terms[0]) : 0; |
|
| 1642 | - }elseif (isset($post->{$taxonomies})) {
|
|
| 1643 | - $post_terms = explode(",", trim($post->{$taxonomies}, ","));
|
|
| 1644 | - $post_terms = $post_terms[0]; |
|
| 1645 | - } |
|
| 1632 | + if (!empty($post->default_category)) {
|
|
| 1633 | + $post_terms = $post->default_category; |
|
| 1634 | + } else {
|
|
| 1635 | + $post_terms = ''; |
|
| 1636 | + |
|
| 1637 | + if(isset($_POST['post_default_category']) && $_POST['post_default_category']){
|
|
| 1638 | + $post_terms = absint($_POST['post_default_category']); |
|
| 1639 | + }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {
|
|
| 1640 | + $post_terms = is_array($_POST['post_category'][$taxonomies]) ? $_POST['post_category'][$taxonomies] : explode(",", trim($_POST['post_category'][$taxonomies], ","));
|
|
| 1641 | + $post_terms = !empty($post_terms) ? absint($post_terms[0]) : 0; |
|
| 1642 | + }elseif (isset($post->{$taxonomies})) {
|
|
| 1643 | + $post_terms = explode(",", trim($post->{$taxonomies}, ","));
|
|
| 1644 | + $post_terms = $post_terms[0]; |
|
| 1645 | + } |
|
| 1646 | 1646 | |
| 1647 | - if (!$post_terms) |
|
| 1648 | - $post_terms = geodir_get_post_meta($post->ID, 'default_category', true); |
|
| 1647 | + if (!$post_terms) |
|
| 1648 | + $post_terms = geodir_get_post_meta($post->ID, 'default_category', true); |
|
| 1649 | 1649 | |
| 1650 | - if (!$post_terms) {
|
|
| 1651 | - $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true); |
|
| 1650 | + if (!$post_terms) {
|
|
| 1651 | + $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true); |
|
| 1652 | 1652 | |
| 1653 | - if ($post_terms) {
|
|
| 1654 | - $post_terms = explode(",", trim($post_terms, ","));
|
|
| 1655 | - $post_terms = $post_terms[0]; |
|
| 1656 | - } |
|
| 1657 | - } |
|
| 1658 | - } |
|
| 1653 | + if ($post_terms) {
|
|
| 1654 | + $post_terms = explode(",", trim($post_terms, ","));
|
|
| 1655 | + $post_terms = $post_terms[0]; |
|
| 1656 | + } |
|
| 1657 | + } |
|
| 1658 | + } |
|
| 1659 | 1659 | |
| 1660 | - $term = get_term_by('id', $post_terms, $taxonomies);
|
|
| 1660 | + $term = get_term_by('id', $post_terms, $taxonomies);
|
|
| 1661 | 1661 | |
| 1662 | - if (!empty($term)) |
|
| 1663 | - $term_request = $term->slug; |
|
| 1664 | - //$term_request = $term->slug.'/'; |
|
| 1665 | - } |
|
| 1662 | + if (!empty($term)) |
|
| 1663 | + $term_request = $term->slug; |
|
| 1664 | + //$term_request = $term->slug.'/'; |
|
| 1665 | + } |
|
| 1666 | 1666 | |
| 1667 | - $request_term = ''; |
|
| 1668 | - $listingurl_separator = ''; |
|
| 1669 | - //$detailurl_separator = get_option('geodir_detailurl_separator');
|
|
| 1670 | - $detailurl_separator = ''; |
|
| 1671 | - if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {
|
|
| 1672 | - $request_term = $location_request; |
|
| 1673 | - //$listingurl_separator = get_option('geodir_listingurl_separator');
|
|
| 1674 | - //$request_term .= $listingurl_separator.'/'.$term_request; |
|
| 1675 | - $request_term .= $term_request; |
|
| 1667 | + $request_term = ''; |
|
| 1668 | + $listingurl_separator = ''; |
|
| 1669 | + //$detailurl_separator = get_option('geodir_detailurl_separator');
|
|
| 1670 | + $detailurl_separator = ''; |
|
| 1671 | + if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {
|
|
| 1672 | + $request_term = $location_request; |
|
| 1673 | + //$listingurl_separator = get_option('geodir_listingurl_separator');
|
|
| 1674 | + //$request_term .= $listingurl_separator.'/'.$term_request; |
|
| 1675 | + $request_term .= $term_request; |
|
| 1676 | 1676 | |
| 1677 | - } else {
|
|
| 1678 | - if (isset($location_request) && $location_request != '') $request_term = $location_request; |
|
| 1677 | + } else {
|
|
| 1678 | + if (isset($location_request) && $location_request != '') $request_term = $location_request; |
|
| 1679 | 1679 | |
| 1680 | - if (isset($term_request) && $term_request != '') $request_term .= $term_request; |
|
| 1681 | - } |
|
| 1682 | - $request_term = trim($request_term, '/'); |
|
| 1680 | + if (isset($term_request) && $term_request != '') $request_term .= $term_request; |
|
| 1681 | + } |
|
| 1682 | + $request_term = trim($request_term, '/'); |
|
| 1683 | 1683 | |
| 1684 | - // Fix with WPML the location terms added twice when CPT slug is translated. |
|
| 1685 | - if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {
|
|
| 1686 | - $post_link = str_replace('%gd_taxonomy%/', '', $post_link);
|
|
| 1687 | - } |
|
| 1684 | + // Fix with WPML the location terms added twice when CPT slug is translated. |
|
| 1685 | + if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {
|
|
| 1686 | + $post_link = str_replace('%gd_taxonomy%/', '', $post_link);
|
|
| 1687 | + } |
|
| 1688 | 1688 | |
| 1689 | - if (!empty($request_term)) |
|
| 1690 | - $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1691 | - else |
|
| 1692 | - $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1693 | - //echo $post_link ; |
|
| 1694 | - } |
|
| 1695 | - // temp cache the permalink |
|
| 1696 | - if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {
|
|
| 1697 | - $gd_permalink_cache[$post->ID] = $post_link; |
|
| 1698 | - } |
|
| 1699 | - } |
|
| 1700 | - if (isset($orig_post)) {
|
|
| 1701 | - $post = $orig_post; |
|
| 1702 | - } |
|
| 1703 | - |
|
| 1704 | - return $post_link; |
|
| 1689 | + if (!empty($request_term)) |
|
| 1690 | + $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1691 | + else |
|
| 1692 | + $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1693 | + //echo $post_link ; |
|
| 1694 | + } |
|
| 1695 | + // temp cache the permalink |
|
| 1696 | + if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {
|
|
| 1697 | + $gd_permalink_cache[$post->ID] = $post_link; |
|
| 1698 | + } |
|
| 1699 | + } |
|
| 1700 | + if (isset($orig_post)) {
|
|
| 1701 | + $post = $orig_post; |
|
| 1702 | + } |
|
| 1703 | + |
|
| 1704 | + return $post_link; |
|
| 1705 | 1705 | } |
| 1706 | 1706 | |
| 1707 | 1707 | /** |
@@ -1717,99 +1717,99 @@ discard block |
||
| 1717 | 1717 | * @return string The term link. |
| 1718 | 1718 | */ |
| 1719 | 1719 | function geodir_term_link($termlink, $term, $taxonomy) {
|
| 1720 | - $geodir_taxonomies = geodir_get_taxonomies('', true);
|
|
| 1720 | + $geodir_taxonomies = geodir_get_taxonomies('', true);
|
|
| 1721 | 1721 | |
| 1722 | - if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {
|
|
| 1723 | - global $geodir_add_location_url, $gd_session; |
|
| 1724 | - $include_location = false; |
|
| 1725 | - $request_term = array(); |
|
| 1726 | - $add_location_url = get_option('geodir_add_location_url');
|
|
| 1727 | - $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1722 | + if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {
|
|
| 1723 | + global $geodir_add_location_url, $gd_session; |
|
| 1724 | + $include_location = false; |
|
| 1725 | + $request_term = array(); |
|
| 1726 | + $add_location_url = get_option('geodir_add_location_url');
|
|
| 1727 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1728 | 1728 | |
| 1729 | - $listing_slug = geodir_get_listing_slug($taxonomy); |
|
| 1729 | + $listing_slug = geodir_get_listing_slug($taxonomy); |
|
| 1730 | 1730 | |
| 1731 | - if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {
|
|
| 1732 | - if ($geodir_add_location_url && $add_location_url) {
|
|
| 1733 | - $include_location = true; |
|
| 1734 | - } |
|
| 1735 | - } elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {
|
|
| 1736 | - $include_location = true; |
|
| 1737 | - } elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {
|
|
| 1738 | - $include_location = true; |
|
| 1739 | - } |
|
| 1740 | - |
|
| 1741 | - if ($include_location) {
|
|
| 1742 | - global $post; |
|
| 1731 | + if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {
|
|
| 1732 | + if ($geodir_add_location_url && $add_location_url) {
|
|
| 1733 | + $include_location = true; |
|
| 1734 | + } |
|
| 1735 | + } elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {
|
|
| 1736 | + $include_location = true; |
|
| 1737 | + } elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {
|
|
| 1738 | + $include_location = true; |
|
| 1739 | + } |
|
| 1740 | + |
|
| 1741 | + if ($include_location) {
|
|
| 1742 | + global $post; |
|
| 1743 | 1743 | |
| 1744 | - $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1744 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1745 | 1745 | |
| 1746 | - if (geodir_is_page('detail') && isset($post->country_slug)) {
|
|
| 1747 | - $location_terms = array( |
|
| 1748 | - 'gd_country' => $post->country_slug, |
|
| 1749 | - 'gd_region' => $post->region_slug, |
|
| 1750 | - 'gd_city' => $post->city_slug |
|
| 1751 | - ); |
|
| 1746 | + if (geodir_is_page('detail') && isset($post->country_slug)) {
|
|
| 1747 | + $location_terms = array( |
|
| 1748 | + 'gd_country' => $post->country_slug, |
|
| 1749 | + 'gd_region' => $post->region_slug, |
|
| 1750 | + 'gd_city' => $post->city_slug |
|
| 1751 | + ); |
|
| 1752 | 1752 | |
| 1753 | - if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1754 | - $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
|
| 1755 | - } |
|
| 1756 | - } else {
|
|
| 1757 | - $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1758 | - } |
|
| 1753 | + if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1754 | + $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
|
| 1755 | + } |
|
| 1756 | + } else {
|
|
| 1757 | + $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1758 | + } |
|
| 1759 | 1759 | |
| 1760 | - $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1761 | - $location_terms = geodir_remove_location_terms($location_terms); |
|
| 1760 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1761 | + $location_terms = geodir_remove_location_terms($location_terms); |
|
| 1762 | 1762 | |
| 1763 | - if (!empty($location_terms)) {
|
|
| 1764 | - $url_separator = ''; |
|
| 1763 | + if (!empty($location_terms)) {
|
|
| 1764 | + $url_separator = ''; |
|
| 1765 | 1765 | |
| 1766 | - if (get_option('permalink_structure') != '') {
|
|
| 1767 | - $old_listing_slug = '/' . $listing_slug . '/'; |
|
| 1768 | - $request_term = implode("/", $location_terms);
|
|
| 1769 | - $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/'; |
|
| 1766 | + if (get_option('permalink_structure') != '') {
|
|
| 1767 | + $old_listing_slug = '/' . $listing_slug . '/'; |
|
| 1768 | + $request_term = implode("/", $location_terms);
|
|
| 1769 | + $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/'; |
|
| 1770 | 1770 | |
| 1771 | - $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug)); |
|
| 1772 | - } else {
|
|
| 1773 | - $termlink = geodir_getlink($termlink, $request_term); |
|
| 1774 | - } |
|
| 1775 | - } |
|
| 1776 | - } |
|
| 1771 | + $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug)); |
|
| 1772 | + } else {
|
|
| 1773 | + $termlink = geodir_getlink($termlink, $request_term); |
|
| 1774 | + } |
|
| 1775 | + } |
|
| 1776 | + } |
|
| 1777 | 1777 | |
| 1778 | - // Alter the CPT slug is WPML is set to do so |
|
| 1779 | - /* we can replace this with the below function |
|
| 1778 | + // Alter the CPT slug is WPML is set to do so |
|
| 1779 | + /* we can replace this with the below function |
|
| 1780 | 1780 | if(geodir_is_wpml()){
|
| 1781 | 1781 | global $sitepress; |
| 1782 | 1782 | $post_type = str_replace("category","",$taxonomy);
|
| 1783 | 1783 | $termlink = $sitepress->post_type_archive_link_filter( $termlink, $post_type); |
| 1784 | 1784 | }*/ |
| 1785 | 1785 | |
| 1786 | - // Alter the CPT slug if WPML is set to do so |
|
| 1787 | - if (geodir_is_wpml()) {
|
|
| 1788 | - $post_types = get_option('geodir_post_types');
|
|
| 1789 | - $post_type = str_replace("category","",$taxonomy);
|
|
| 1790 | - $post_type = str_replace("_tags","",$post_type);
|
|
| 1791 | - $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1792 | - if (geodir_wpml_is_post_type_translated($post_type) && gd_wpml_slug_translation_turned_on($post_type)) {
|
|
| 1793 | - global $sitepress; |
|
| 1794 | - $default_lang = $sitepress->get_default_language(); |
|
| 1795 | - $language_code = gd_wpml_get_lang_from_url($termlink); |
|
| 1796 | - if (!$language_code ) {
|
|
| 1797 | - $language_code = $default_lang; |
|
| 1798 | - } |
|
| 1786 | + // Alter the CPT slug if WPML is set to do so |
|
| 1787 | + if (geodir_is_wpml()) {
|
|
| 1788 | + $post_types = get_option('geodir_post_types');
|
|
| 1789 | + $post_type = str_replace("category","",$taxonomy);
|
|
| 1790 | + $post_type = str_replace("_tags","",$post_type);
|
|
| 1791 | + $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1792 | + if (geodir_wpml_is_post_type_translated($post_type) && gd_wpml_slug_translation_turned_on($post_type)) {
|
|
| 1793 | + global $sitepress; |
|
| 1794 | + $default_lang = $sitepress->get_default_language(); |
|
| 1795 | + $language_code = gd_wpml_get_lang_from_url($termlink); |
|
| 1796 | + if (!$language_code ) {
|
|
| 1797 | + $language_code = $default_lang; |
|
| 1798 | + } |
|
| 1799 | 1799 | |
| 1800 | - $org_slug = $slug; |
|
| 1801 | - $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);
|
|
| 1800 | + $org_slug = $slug; |
|
| 1801 | + $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);
|
|
| 1802 | 1802 | |
| 1803 | - if (!$slug) {
|
|
| 1804 | - $slug = $org_slug; |
|
| 1805 | - } |
|
| 1803 | + if (!$slug) {
|
|
| 1804 | + $slug = $org_slug; |
|
| 1805 | + } |
|
| 1806 | 1806 | |
| 1807 | - $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug ,$termlink, 1));
|
|
| 1808 | - } |
|
| 1809 | - } |
|
| 1810 | - } |
|
| 1807 | + $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug ,$termlink, 1));
|
|
| 1808 | + } |
|
| 1809 | + } |
|
| 1810 | + } |
|
| 1811 | 1811 | |
| 1812 | - return $termlink; |
|
| 1812 | + return $termlink; |
|
| 1813 | 1813 | } |
| 1814 | 1814 | |
| 1815 | 1815 | /** |
@@ -1835,14 +1835,14 @@ discard block |
||
| 1835 | 1835 | if (in_array($post_type, geodir_get_posttypes())) {
|
| 1836 | 1836 | if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {
|
| 1837 | 1837 | if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {
|
| 1838 | - $location_terms = array( |
|
| 1839 | - 'gd_country' => $post->country_slug, |
|
| 1840 | - 'gd_region' => $post->region_slug, |
|
| 1841 | - 'gd_city' => $post->city_slug |
|
| 1842 | - ); |
|
| 1843 | - } else {
|
|
| 1844 | - $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1845 | - } |
|
| 1838 | + $location_terms = array( |
|
| 1839 | + 'gd_country' => $post->country_slug, |
|
| 1840 | + 'gd_region' => $post->region_slug, |
|
| 1841 | + 'gd_city' => $post->city_slug |
|
| 1842 | + ); |
|
| 1843 | + } else {
|
|
| 1844 | + $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1845 | + } |
|
| 1846 | 1846 | |
| 1847 | 1847 | $location_terms = geodir_remove_location_terms($location_terms); |
| 1848 | 1848 | |
@@ -1874,17 +1874,17 @@ discard block |
||
| 1874 | 1874 | * @return void|string Label. |
| 1875 | 1875 | */ |
| 1876 | 1876 | function get_post_type_singular_label($post_type, $echo = false, $translate = false) {
|
| 1877 | - $obj_post_type = get_post_type_object($post_type); |
|
| 1878 | - if (!is_object($obj_post_type)) {
|
|
| 1879 | - return; |
|
| 1880 | - } |
|
| 1877 | + $obj_post_type = get_post_type_object($post_type); |
|
| 1878 | + if (!is_object($obj_post_type)) {
|
|
| 1879 | + return; |
|
| 1880 | + } |
|
| 1881 | 1881 | |
| 1882 | - $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name; |
|
| 1882 | + $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name; |
|
| 1883 | 1883 | |
| 1884 | - if ($echo) |
|
| 1885 | - echo $label; |
|
| 1886 | - else |
|
| 1887 | - return $label; |
|
| 1884 | + if ($echo) |
|
| 1885 | + echo $label; |
|
| 1886 | + else |
|
| 1887 | + return $label; |
|
| 1888 | 1888 | } |
| 1889 | 1889 | |
| 1890 | 1890 | /** |
@@ -1899,19 +1899,19 @@ discard block |
||
| 1899 | 1899 | * @return void|string Label. |
| 1900 | 1900 | */ |
| 1901 | 1901 | function get_post_type_plural_label($post_type, $echo = false, $translate = false) {
|
| 1902 | - $all_postypes = geodir_get_posttypes(); |
|
| 1902 | + $all_postypes = geodir_get_posttypes(); |
|
| 1903 | 1903 | |
| 1904 | - if (!in_array($post_type, $all_postypes)) |
|
| 1905 | - return false; |
|
| 1904 | + if (!in_array($post_type, $all_postypes)) |
|
| 1905 | + return false; |
|
| 1906 | 1906 | |
| 1907 | - $obj_post_type = get_post_type_object($post_type); |
|
| 1907 | + $obj_post_type = get_post_type_object($post_type); |
|
| 1908 | 1908 | |
| 1909 | - $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name; |
|
| 1909 | + $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name; |
|
| 1910 | 1910 | |
| 1911 | - if ($echo) |
|
| 1912 | - echo $label; |
|
| 1913 | - else |
|
| 1914 | - return $label; |
|
| 1911 | + if ($echo) |
|
| 1912 | + echo $label; |
|
| 1913 | + else |
|
| 1914 | + return $label; |
|
| 1915 | 1915 | } |
| 1916 | 1916 | |
| 1917 | 1917 | /** |
@@ -1929,51 +1929,51 @@ discard block |
||
| 1929 | 1929 | */ |
| 1930 | 1930 | function geodir_term_exists($term, $taxonomy = '', $parent = 0) |
| 1931 | 1931 | {
|
| 1932 | - global $wpdb; |
|
| 1933 | - |
|
| 1934 | - $select = "SELECT term_id FROM $wpdb->terms as t WHERE "; |
|
| 1935 | - $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 "; |
|
| 1936 | - |
|
| 1937 | - if (is_int($term)) {
|
|
| 1938 | - if (0 == $term) |
|
| 1939 | - return 0; |
|
| 1940 | - $where = 't.term_id = %d'; |
|
| 1941 | - if (!empty($taxonomy)) |
|
| 1942 | - return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1943 | - else |
|
| 1944 | - return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1945 | - } |
|
| 1932 | + global $wpdb; |
|
| 1933 | + |
|
| 1934 | + $select = "SELECT term_id FROM $wpdb->terms as t WHERE "; |
|
| 1935 | + $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 "; |
|
| 1936 | + |
|
| 1937 | + if (is_int($term)) {
|
|
| 1938 | + if (0 == $term) |
|
| 1939 | + return 0; |
|
| 1940 | + $where = 't.term_id = %d'; |
|
| 1941 | + if (!empty($taxonomy)) |
|
| 1942 | + return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1943 | + else |
|
| 1944 | + return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1945 | + } |
|
| 1946 | 1946 | |
| 1947 | - $term = trim(wp_unslash($term)); |
|
| 1947 | + $term = trim(wp_unslash($term)); |
|
| 1948 | 1948 | |
| 1949 | - if ('' === $slug = sanitize_title($term))
|
|
| 1950 | - return 0; |
|
| 1949 | + if ('' === $slug = sanitize_title($term))
|
|
| 1950 | + return 0; |
|
| 1951 | 1951 | |
| 1952 | - $where = 't.slug = %s'; |
|
| 1952 | + $where = 't.slug = %s'; |
|
| 1953 | 1953 | |
| 1954 | - $where_fields = array($slug); |
|
| 1955 | - if (!empty($taxonomy)) {
|
|
| 1956 | - $parent = (int)$parent; |
|
| 1957 | - if ($parent > 0) {
|
|
| 1958 | - $where_fields[] = $parent; |
|
| 1959 | - $else_where_fields[] = $parent; |
|
| 1960 | - $where .= ' AND tt.parent = %d'; |
|
| 1954 | + $where_fields = array($slug); |
|
| 1955 | + if (!empty($taxonomy)) {
|
|
| 1956 | + $parent = (int)$parent; |
|
| 1957 | + if ($parent > 0) {
|
|
| 1958 | + $where_fields[] = $parent; |
|
| 1959 | + $else_where_fields[] = $parent; |
|
| 1960 | + $where .= ' AND tt.parent = %d'; |
|
| 1961 | 1961 | |
| 1962 | - } |
|
| 1962 | + } |
|
| 1963 | 1963 | |
| 1964 | - $where_fields[] = $taxonomy; |
|
| 1964 | + $where_fields[] = $taxonomy; |
|
| 1965 | 1965 | |
| 1966 | 1966 | |
| 1967 | - 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))
|
|
| 1968 | - return $result; |
|
| 1967 | + 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))
|
|
| 1968 | + return $result; |
|
| 1969 | 1969 | |
| 1970 | - return false; |
|
| 1971 | - } |
|
| 1970 | + return false; |
|
| 1971 | + } |
|
| 1972 | 1972 | |
| 1973 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
|
|
| 1974 | - return $result; |
|
| 1973 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
|
|
| 1974 | + return $result; |
|
| 1975 | 1975 | |
| 1976 | - return false; |
|
| 1976 | + return false; |
|
| 1977 | 1977 | } |
| 1978 | 1978 | |
| 1979 | 1979 | /** |
@@ -1985,7 +1985,7 @@ discard block |
||
| 1985 | 1985 | function geodir_get_term_icon_rebuild() |
| 1986 | 1986 | {
|
| 1987 | 1987 | |
| 1988 | - update_option('gd_term_icons', '');
|
|
| 1988 | + update_option('gd_term_icons', '');
|
|
| 1989 | 1989 | |
| 1990 | 1990 | } |
| 1991 | 1991 | |
@@ -2003,61 +2003,61 @@ discard block |
||
| 2003 | 2003 | */ |
| 2004 | 2004 | function geodir_get_term_icon($term_id = false, $rebuild = false) |
| 2005 | 2005 | {
|
| 2006 | - global $wpdb; |
|
| 2007 | - if (!$rebuild) {
|
|
| 2008 | - $terms_icons = get_option('gd_term_icons');
|
|
| 2009 | - } else {
|
|
| 2010 | - $terms_icons = array(); |
|
| 2011 | - } |
|
| 2012 | - |
|
| 2013 | - if (empty($terms_icons)) {
|
|
| 2014 | - $terms_icons = array(); |
|
| 2015 | - $default_icon_url = get_option('geodir_default_marker_icon');
|
|
| 2016 | - $taxonomy = geodir_get_taxonomies(); |
|
| 2017 | - $post_types = geodir_get_posttypes(); |
|
| 2018 | - $tax_arr = array(); |
|
| 2019 | - foreach ($post_types as $post_type) {
|
|
| 2020 | - $tax_arr[] = "'" . $post_type . "category'"; |
|
| 2021 | - } |
|
| 2022 | - $tax_c = implode(',', $tax_arr);
|
|
| 2023 | - $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
|
|
| 2024 | - //$terms = get_terms( $taxonomy ); |
|
| 2025 | - |
|
| 2026 | - if($terms) {
|
|
| 2027 | - foreach ($terms as $term) {
|
|
| 2028 | - $post_type = str_replace("category", "", $term->taxonomy);
|
|
| 2029 | - $a_terms[$post_type][] = $term; |
|
| 2006 | + global $wpdb; |
|
| 2007 | + if (!$rebuild) {
|
|
| 2008 | + $terms_icons = get_option('gd_term_icons');
|
|
| 2009 | + } else {
|
|
| 2010 | + $terms_icons = array(); |
|
| 2011 | + } |
|
| 2030 | 2012 | |
| 2031 | - } |
|
| 2032 | - } |
|
| 2013 | + if (empty($terms_icons)) {
|
|
| 2014 | + $terms_icons = array(); |
|
| 2015 | + $default_icon_url = get_option('geodir_default_marker_icon');
|
|
| 2016 | + $taxonomy = geodir_get_taxonomies(); |
|
| 2017 | + $post_types = geodir_get_posttypes(); |
|
| 2018 | + $tax_arr = array(); |
|
| 2019 | + foreach ($post_types as $post_type) {
|
|
| 2020 | + $tax_arr[] = "'" . $post_type . "category'"; |
|
| 2021 | + } |
|
| 2022 | + $tax_c = implode(',', $tax_arr);
|
|
| 2023 | + $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
|
|
| 2024 | + //$terms = get_terms( $taxonomy ); |
|
| 2033 | 2025 | |
| 2034 | - if($a_terms) {
|
|
| 2035 | - foreach ($a_terms as $pt => $t2) {
|
|
| 2026 | + if($terms) {
|
|
| 2027 | + foreach ($terms as $term) {
|
|
| 2028 | + $post_type = str_replace("category", "", $term->taxonomy);
|
|
| 2029 | + $a_terms[$post_type][] = $term; |
|
| 2036 | 2030 | |
| 2037 | - foreach ($t2 as $term) {
|
|
| 2038 | - $term_icon = geodir_get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt); |
|
| 2039 | - if ($term_icon) {
|
|
| 2040 | - $term_icon_url = $term_icon["src"]; |
|
| 2041 | - } else {
|
|
| 2042 | - $term_icon_url = $default_icon_url; |
|
| 2043 | - } |
|
| 2044 | - $terms_icons[$term->term_id] = $term_icon_url; |
|
| 2045 | - } |
|
| 2046 | - } |
|
| 2047 | - } |
|
| 2031 | + } |
|
| 2032 | + } |
|
| 2048 | 2033 | |
| 2049 | - update_option('gd_term_icons', $terms_icons);
|
|
| 2050 | - } |
|
| 2034 | + if($a_terms) {
|
|
| 2035 | + foreach ($a_terms as $pt => $t2) {
|
|
| 2051 | 2036 | |
| 2052 | - if ($term_id && isset($terms_icons[$term_id])) {
|
|
| 2053 | - return $terms_icons[$term_id]; |
|
| 2054 | - } elseif ($term_id && !isset($terms_icons[$term_id])) {
|
|
| 2055 | - return get_option('geodir_default_marker_icon');
|
|
| 2056 | - } |
|
| 2037 | + foreach ($t2 as $term) {
|
|
| 2038 | + $term_icon = geodir_get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt); |
|
| 2039 | + if ($term_icon) {
|
|
| 2040 | + $term_icon_url = $term_icon["src"]; |
|
| 2041 | + } else {
|
|
| 2042 | + $term_icon_url = $default_icon_url; |
|
| 2043 | + } |
|
| 2044 | + $terms_icons[$term->term_id] = $term_icon_url; |
|
| 2045 | + } |
|
| 2046 | + } |
|
| 2047 | + } |
|
| 2048 | + |
|
| 2049 | + update_option('gd_term_icons', $terms_icons);
|
|
| 2050 | + } |
|
| 2057 | 2051 | |
| 2058 | - if (is_ssl()) {
|
|
| 2059 | - $terms_icons = str_replace("http:","https:",$terms_icons );
|
|
| 2060 | - } |
|
| 2052 | + if ($term_id && isset($terms_icons[$term_id])) {
|
|
| 2053 | + return $terms_icons[$term_id]; |
|
| 2054 | + } elseif ($term_id && !isset($terms_icons[$term_id])) {
|
|
| 2055 | + return get_option('geodir_default_marker_icon');
|
|
| 2056 | + } |
|
| 2057 | + |
|
| 2058 | + if (is_ssl()) {
|
|
| 2059 | + $terms_icons = str_replace("http:","https:",$terms_icons );
|
|
| 2060 | + } |
|
| 2061 | 2061 | |
| 2062 | - return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
|
|
| 2062 | + return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
|
|
| 2063 | 2063 | } |
| 2064 | 2064 | \ No newline at end of file |
