@@ -26,11 +26,11 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | if (!isset($default_cat) || empty($default_cat)) {
|
| 28 | 28 | $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : ''; |
| 29 | - }else{
|
|
| 30 | - if(!is_int($default_cat)){
|
|
| 29 | + } else {
|
|
| 30 | + if (!is_int($default_cat)) {
|
|
| 31 | 31 | $category = get_term_by('name', $default_cat, $taxonomy);
|
| 32 | - if(isset($category->term_id)){
|
|
| 33 | - $default_cat = $category->term_id; |
|
| 32 | + if (isset($category->term_id)) {
|
|
| 33 | + $default_cat = $category->term_id; |
|
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | |
| 59 | 59 | if ($default_pos === false) {
|
| 60 | 60 | |
| 61 | - $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str); |
|
| 61 | + $change_cat_str = str_replace($default_cat.',y:', $default_cat.',y,d:', $change_cat_str); |
|
| 62 | 62 | |
| 63 | 63 | } |
| 64 | 64 | |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | $gd_post = $post; |
| 147 | 147 | if (!empty($gd_post) && is_array($gd_post)) {
|
| 148 | - $gd_post = (object)$post; |
|
| 148 | + $gd_post = (object) $post; |
|
| 149 | 149 | |
| 150 | 150 | // Fix WPML duplicate. |
| 151 | 151 | if (geodir_is_wpml() && !empty($request_info['action']) && $request_info['action'] == 'editpost' && !empty($request_info['icl_trid']) && !isset($post['post_date'])) {
|
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | $send_post_submit_mail = false; |
| 240 | 240 | |
| 241 | 241 | // unhook this function so it doesn't loop infinitely |
| 242 | - remove_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 242 | + remove_action('save_post', 'geodir_post_information_save', 10, 2);
|
|
| 243 | 243 | |
| 244 | 244 | if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
| 245 | 245 | $post['ID'] = $request_info['pid']; |
@@ -263,13 +263,13 @@ discard block |
||
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | // re-hook this function |
| 266 | - add_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 266 | + add_action('save_post', 'geodir_post_information_save', 10, 2);
|
|
| 267 | 267 | |
| 268 | 268 | $post_tags = ''; |
| 269 | 269 | if (!isset($request_info['post_tags'])) {
|
| 270 | 270 | |
| 271 | 271 | $post_type = $request_info['listing_type']; |
| 272 | - $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
|
|
| 272 | + $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type.'_tags', array('fields' => 'names')));
|
|
| 273 | 273 | |
| 274 | 274 | } |
| 275 | 275 | |
@@ -287,13 +287,13 @@ discard block |
||
| 287 | 287 | $payment_info = array(); |
| 288 | 288 | $package_info = array(); |
| 289 | 289 | |
| 290 | - $package_info = (array)geodir_post_package_info($package_info, $post); |
|
| 290 | + $package_info = (array) geodir_post_package_info($package_info, $post); |
|
| 291 | 291 | |
| 292 | 292 | $post_package_id = geodir_get_post_meta($last_post_id, 'package_id'); |
| 293 | 293 | |
| 294 | 294 | if (!empty($package_info) && !$post_package_id) {
|
| 295 | 295 | if (isset($package_info['days']) && $package_info['days'] != 0) {
|
| 296 | - $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
|
|
| 296 | + $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['days']." days"));
|
|
| 297 | 297 | } else {
|
| 298 | 298 | $payment_info['expire_date'] = 'Never'; |
| 299 | 299 | } |
@@ -314,8 +314,8 @@ discard block |
||
| 314 | 314 | $extrafields = $val['extra_fields']; |
| 315 | 315 | |
| 316 | 316 | if (trim($type) == 'address') {
|
| 317 | - $prefix = $name . '_'; |
|
| 318 | - $address = $prefix . 'address'; |
|
| 317 | + $prefix = $name.'_'; |
|
| 318 | + $address = $prefix.'address'; |
|
| 319 | 319 | |
| 320 | 320 | if (isset($request_info[$address]) && $request_info[$address] != '') {
|
| 321 | 321 | $gd_post_info[$address] = wp_slash($request_info[$address]); |
@@ -325,59 +325,59 @@ discard block |
||
| 325 | 325 | $extrafields = unserialize($extrafields); |
| 326 | 326 | |
| 327 | 327 | |
| 328 | - if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
|
|
| 328 | + if (!isset($request_info[$prefix.'city']) || $request_info[$prefix.'city'] == '') {
|
|
| 329 | 329 | |
| 330 | 330 | $location_result = geodir_get_default_location(); |
| 331 | 331 | |
| 332 | - $gd_post_info[$prefix . 'city'] = $location_result->city; |
|
| 333 | - $gd_post_info[$prefix . 'region'] = $location_result->region; |
|
| 334 | - $gd_post_info[$prefix . 'country'] = $location_result->country; |
|
| 332 | + $gd_post_info[$prefix.'city'] = $location_result->city; |
|
| 333 | + $gd_post_info[$prefix.'region'] = $location_result->region; |
|
| 334 | + $gd_post_info[$prefix.'country'] = $location_result->country; |
|
| 335 | 335 | |
| 336 | - $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 336 | + $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location |
|
| 337 | 337 | |
| 338 | 338 | } else {
|
| 339 | 339 | |
| 340 | - $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city']; |
|
| 341 | - $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region']; |
|
| 342 | - $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country']; |
|
| 340 | + $gd_post_info[$prefix.'city'] = $request_info[$prefix.'city']; |
|
| 341 | + $gd_post_info[$prefix.'region'] = $request_info[$prefix.'region']; |
|
| 342 | + $gd_post_info[$prefix.'country'] = $request_info[$prefix.'country']; |
|
| 343 | 343 | |
| 344 | 344 | //----------set post locations when import dummy data------- |
| 345 | 345 | $location_result = geodir_get_default_location(); |
| 346 | 346 | |
| 347 | - $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 347 | + $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location |
|
| 348 | 348 | //----------------------------------------------------------------- |
| 349 | 349 | |
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | |
| 353 | - if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
|
|
| 354 | - $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip']; |
|
| 353 | + if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix.'zip'])) {
|
|
| 354 | + $gd_post_info[$prefix.'zip'] = $request_info[$prefix.'zip']; |
|
| 355 | 355 | } |
| 356 | 356 | |
| 357 | 357 | |
| 358 | 358 | if (isset($extrafields['show_map']) && $extrafields['show_map']) {
|
| 359 | 359 | |
| 360 | - if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
|
|
| 361 | - $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude']; |
|
| 360 | + if (isset($request_info[$prefix.'latitude']) && $request_info[$prefix.'latitude'] != '') {
|
|
| 361 | + $gd_post_info[$prefix.'latitude'] = $request_info[$prefix.'latitude']; |
|
| 362 | 362 | } |
| 363 | 363 | |
| 364 | - if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
|
|
| 365 | - $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude']; |
|
| 364 | + if (isset($request_info[$prefix.'longitude']) && $request_info[$prefix.'longitude'] != '') {
|
|
| 365 | + $gd_post_info[$prefix.'longitude'] = $request_info[$prefix.'longitude']; |
|
| 366 | 366 | } |
| 367 | 367 | |
| 368 | - if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
|
|
| 369 | - $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview']; |
|
| 368 | + if (isset($request_info[$prefix.'mapview']) && $request_info[$prefix.'mapview'] != '') {
|
|
| 369 | + $gd_post_info[$prefix.'mapview'] = $request_info[$prefix.'mapview']; |
|
| 370 | 370 | } |
| 371 | 371 | |
| 372 | - if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
|
|
| 373 | - $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom']; |
|
| 372 | + if (isset($request_info[$prefix.'mapzoom']) && $request_info[$prefix.'mapzoom'] != '') {
|
|
| 373 | + $gd_post_info[$prefix.'mapzoom'] = $request_info[$prefix.'mapzoom']; |
|
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | // show lat lng |
| 379 | - if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
|
|
| 380 | - $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng']; |
|
| 379 | + if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix.'latlng'])) {
|
|
| 380 | + $gd_post_info[$prefix.'latlng'] = $request_info[$prefix.'latlng']; |
|
| 381 | 381 | } |
| 382 | 382 | } |
| 383 | 383 | |
@@ -403,16 +403,16 @@ discard block |
||
| 403 | 403 | |
| 404 | 404 | // check if we need to change the format or not |
| 405 | 405 | $date_format_len = strlen(str_replace(' ', '', $date_format));
|
| 406 | - if($date_format_len>5){// if greater then 5 then it's the old style format.
|
|
| 406 | + if ($date_format_len > 5) {// if greater then 5 then it's the old style format.
|
|
| 407 | 407 | |
| 408 | - $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
|
|
| 409 | - $replace = array('d','j','l','m','n','F','Y');//PHP date format
|
|
| 408 | + $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format
|
|
| 409 | + $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format
|
|
| 410 | 410 | |
| 411 | 411 | $date_format = str_replace($search, $replace, $date_format); |
| 412 | 412 | |
| 413 | 413 | $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
|
| 414 | 414 | |
| 415 | - }else{
|
|
| 415 | + } else {
|
|
| 416 | 416 | $post_htmlvar_value = $request_info[$name]; |
| 417 | 417 | } |
| 418 | 418 | |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | if (isset($request_info[$name])) {
|
| 427 | 427 | $gd_post_info[$name] = $request_info[$name]; |
| 428 | 428 | } else {
|
| 429 | - if (isset($request_info['gd_field_' . $name])) {
|
|
| 429 | + if (isset($request_info['gd_field_'.$name])) {
|
|
| 430 | 430 | $gd_post_info[$name] = ''; /* fix de-select for multiselect */ |
| 431 | 431 | } |
| 432 | 432 | } |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | } |
| 487 | 487 | |
| 488 | 488 | if (is_array($post_tags)) {
|
| 489 | - $taxonomy = $request_info['listing_type'] . '_tags'; |
|
| 489 | + $taxonomy = $request_info['listing_type'].'_tags'; |
|
| 490 | 490 | wp_set_object_terms($last_post_id, $post_tags, $taxonomy); |
| 491 | 491 | } |
| 492 | 492 | |
@@ -498,7 +498,7 @@ discard block |
||
| 498 | 498 | $tmpimgArr = trim($request_info['post_images'], ","); |
| 499 | 499 | $tmpimgArr = explode(",", $tmpimgArr);
|
| 500 | 500 | geodir_save_post_images($last_post_id, $tmpimgArr, $dummy); |
| 501 | - } else{
|
|
| 501 | + } else {
|
|
| 502 | 502 | geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy); |
| 503 | 503 | } |
| 504 | 504 | |
@@ -579,7 +579,7 @@ discard block |
||
| 579 | 579 | if (!in_array($post_type, $all_postypes)) |
| 580 | 580 | return false; |
| 581 | 581 | |
| 582 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 582 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 583 | 583 | |
| 584 | 584 | /** |
| 585 | 585 | * Apply Filter to change Post info |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | * @since 1.0.0 |
| 590 | 590 | * @package GeoDirectory |
| 591 | 591 | */ |
| 592 | - $query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
|
|
| 592 | + $query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM ".$wpdb->posts." p,".$table." pd
|
|
| 593 | 593 | WHERE p.ID = pd.post_id |
| 594 | 594 | AND pd.post_id = %d", $post_id)); |
| 595 | 595 | |
@@ -652,7 +652,7 @@ discard block |
||
| 652 | 652 | |
| 653 | 653 | $post_type = get_post_type($post_id); |
| 654 | 654 | |
| 655 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 655 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 656 | 656 | |
| 657 | 657 | /** |
| 658 | 658 | * Filter to change Post info |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | |
| 674 | 674 | $columns = $wpdb->get_col("show columns from $table");
|
| 675 | 675 | foreach ($postmeta as $mkey => $mval) {
|
| 676 | - if(in_array($mkey,$columns)) {
|
|
| 676 | + if (in_array($mkey, $columns)) {
|
|
| 677 | 677 | if (is_array($mval)) {
|
| 678 | 678 | $mval = implode(",", $mval);
|
| 679 | 679 | } |
@@ -702,12 +702,12 @@ discard block |
||
| 702 | 702 | */ |
| 703 | 703 | do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
|
| 704 | 704 | |
| 705 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 705 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
|
|
| 706 | 706 | |
| 707 | 707 | $query_string_array[] = $post_id; |
| 708 | 708 | $wpdb->query( |
| 709 | 709 | $wpdb->prepare( |
| 710 | - "UPDATE " . $table . " SET " . $query_string_escaped . " where post_id =%d", |
|
| 710 | + "UPDATE ".$table." SET ".$query_string_escaped." where post_id =%d", |
|
| 711 | 711 | $query_string_array |
| 712 | 712 | ) |
| 713 | 713 | ); |
@@ -718,7 +718,7 @@ discard block |
||
| 718 | 718 | array_unshift($query_string_array, $post_id); |
| 719 | 719 | $wpdb->query( |
| 720 | 720 | $wpdb->prepare( |
| 721 | - "INSERT INTO " . $table . " SET post_id = %d," . $query_string_escaped, |
|
| 721 | + "INSERT INTO ".$table." SET post_id = %d,".$query_string_escaped, |
|
| 722 | 722 | $query_string_array |
| 723 | 723 | ) |
| 724 | 724 | ); |
@@ -764,7 +764,7 @@ discard block |
||
| 764 | 764 | |
| 765 | 765 | $post_type = get_post_type($post_id); |
| 766 | 766 | |
| 767 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 767 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 768 | 768 | |
| 769 | 769 | if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
|
| 770 | 770 | |
@@ -772,11 +772,11 @@ discard block |
||
| 772 | 772 | $meta_value = implode(",", $meta_value);
|
| 773 | 773 | } |
| 774 | 774 | |
| 775 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 775 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
|
|
| 776 | 776 | |
| 777 | 777 | $wpdb->query( |
| 778 | 778 | $wpdb->prepare( |
| 779 | - "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d", |
|
| 779 | + "UPDATE ".$table." SET ".$postmeta." = '".$meta_value."' where post_id =%d", |
|
| 780 | 780 | array($post_id) |
| 781 | 781 | ) |
| 782 | 782 | ); |
@@ -785,7 +785,7 @@ discard block |
||
| 785 | 785 | |
| 786 | 786 | $wpdb->query( |
| 787 | 787 | $wpdb->prepare( |
| 788 | - "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'", |
|
| 788 | + "INSERT INTO ".$table." SET post_id = %d, ".$postmeta." = '".$meta_value."'", |
|
| 789 | 789 | array($post_id) |
| 790 | 790 | ) |
| 791 | 791 | ); |
@@ -818,14 +818,14 @@ discard block |
||
| 818 | 818 | |
| 819 | 819 | $post_type = get_post_type($post_id); |
| 820 | 820 | |
| 821 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 821 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 822 | 822 | |
| 823 | 823 | if (is_array($postmeta) && !empty($postmeta) && $post_id) {
|
| 824 | 824 | $post_meta_set_query = ''; |
| 825 | 825 | |
| 826 | 826 | foreach ($postmeta as $mkey) {
|
| 827 | 827 | if ($mval != '') |
| 828 | - $post_meta_set_query .= $mkey . " = '', "; |
|
| 828 | + $post_meta_set_query .= $mkey." = '', "; |
|
| 829 | 829 | } |
| 830 | 830 | |
| 831 | 831 | $post_meta_set_query = trim($post_meta_set_query, ", "); |
@@ -834,11 +834,11 @@ discard block |
||
| 834 | 834 | return false; |
| 835 | 835 | } |
| 836 | 836 | |
| 837 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 837 | + if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {
|
|
| 838 | 838 | |
| 839 | 839 | $wpdb->query( |
| 840 | 840 | $wpdb->prepare( |
| 841 | - "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d", |
|
| 841 | + "UPDATE ".$table." SET ".$post_meta_set_query." where post_id = %d", |
|
| 842 | 842 | array($post_id) |
| 843 | 843 | ) |
| 844 | 844 | ); |
@@ -847,11 +847,11 @@ discard block |
||
| 847 | 847 | } |
| 848 | 848 | |
| 849 | 849 | } elseif ($postmeta != '' && $post_id) {
|
| 850 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 850 | + if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {
|
|
| 851 | 851 | |
| 852 | 852 | $wpdb->query( |
| 853 | 853 | $wpdb->prepare( |
| 854 | - "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d", |
|
| 854 | + "UPDATE ".$table." SET ".$postmeta."= '' where post_id = %d", |
|
| 855 | 855 | array($post_id) |
| 856 | 856 | ) |
| 857 | 857 | ); |
@@ -893,10 +893,10 @@ discard block |
||
| 893 | 893 | if (!in_array($post_type, $all_postypes)) |
| 894 | 894 | return false; |
| 895 | 895 | |
| 896 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 896 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 897 | 897 | |
| 898 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
|
|
| 899 | - $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
|
|
| 898 | + if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$meta_key."'") != '') {
|
|
| 899 | + $meta_value = $wpdb->get_var($wpdb->prepare("SELECT ".$meta_key." from ".$table." where post_id = %d", array($post_id)));
|
|
| 900 | 900 | |
| 901 | 901 | if ($meta_value && $meta_value !== '') {
|
| 902 | 902 | $meta_value = maybe_serialize($meta_value); |
@@ -915,7 +915,7 @@ discard block |
||
| 915 | 915 | * @param string $meta_key The meta key to retrieve. |
| 916 | 916 | * @param bool $single Optional. Whether to return a single value. Default false. |
| 917 | 917 | */ |
| 918 | - return apply_filters( 'geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single ); |
|
| 918 | + return apply_filters('geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single);
|
|
| 919 | 919 | } |
| 920 | 920 | } |
| 921 | 921 | |
@@ -941,13 +941,13 @@ discard block |
||
| 941 | 941 | |
| 942 | 942 | $post_type = get_post_type($post_id); |
| 943 | 943 | |
| 944 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 944 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 945 | 945 | |
| 946 | 946 | $post_images = geodir_get_images($post_id); |
| 947 | 947 | |
| 948 | 948 | $wpdb->query( |
| 949 | 949 | $wpdb->prepare( |
| 950 | - "UPDATE " . $table . " SET featured_image = '' where post_id =%d", |
|
| 950 | + "UPDATE ".$table." SET featured_image = '' where post_id =%d", |
|
| 951 | 951 | array($post_id) |
| 952 | 952 | ) |
| 953 | 953 | ); |
@@ -977,12 +977,12 @@ discard block |
||
| 977 | 977 | $file_path = ''; |
| 978 | 978 | /* --------- start ------- */ |
| 979 | 979 | |
| 980 | - $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
|
|
| 980 | + $split_img_path = explode(str_replace(array('http://', 'https://'), '', $uploads['baseurl']), str_replace(array('http://', 'https://'), '', $post_image[$m]));
|
|
| 981 | 981 | |
| 982 | 982 | $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
| 983 | 983 | |
| 984 | 984 | |
| 985 | - if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
|
|
| 985 | + if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM ".GEODIR_ATTACHMENT_TABLE." WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
|
|
| 986 | 986 | |
| 987 | 987 | /* --------- end ------- */ |
| 988 | 988 | $curr_img_url = $post_image[$m]; |
@@ -1026,7 +1026,7 @@ discard block |
||
| 1026 | 1026 | // If the uploaded file is the right format |
| 1027 | 1027 | if (in_array($uploaded_file_type, $allowed_file_types)) {
|
| 1028 | 1028 | if (!function_exists('wp_handle_upload')) {
|
| 1029 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1029 | + require_once(ABSPATH.'wp-admin/includes/file.php'); |
|
| 1030 | 1030 | } |
| 1031 | 1031 | |
| 1032 | 1032 | if (!is_dir($geodir_uploadpath)) {
|
@@ -1034,41 +1034,41 @@ discard block |
||
| 1034 | 1034 | } |
| 1035 | 1035 | |
| 1036 | 1036 | $external_img = false; |
| 1037 | - if (strpos( str_replace( array('http://','https://'),'',$curr_img_url ), str_replace(array('http://','https://'),'',$uploads['baseurl'] ) ) !== false) {
|
|
| 1037 | + if (strpos(str_replace(array('http://', 'https://'), '', $curr_img_url), str_replace(array('http://', 'https://'), '', $uploads['baseurl'])) !== false) {
|
|
| 1038 | 1038 | } else {
|
| 1039 | 1039 | $external_img = true; |
| 1040 | 1040 | } |
| 1041 | 1041 | |
| 1042 | 1042 | if ($dummy || $external_img) {
|
| 1043 | 1043 | $uploaded_file = array(); |
| 1044 | - $uploaded = (array)fetch_remote_file($curr_img_url); |
|
| 1044 | + $uploaded = (array) fetch_remote_file($curr_img_url); |
|
| 1045 | 1045 | |
| 1046 | 1046 | if (isset($uploaded['error']) && empty($uploaded['error'])) {
|
| 1047 | 1047 | $new_name = basename($uploaded['file']); |
| 1048 | 1048 | $uploaded_file = $uploaded; |
| 1049 | - }else{
|
|
| 1050 | - print_r($uploaded);exit; |
|
| 1049 | + } else {
|
|
| 1050 | + print_r($uploaded); exit; |
|
| 1051 | 1051 | } |
| 1052 | 1052 | $external_img = false; |
| 1053 | 1053 | } else {
|
| 1054 | - $new_name = $post_id . '_' . $file_name; |
|
| 1054 | + $new_name = $post_id.'_'.$file_name; |
|
| 1055 | 1055 | |
| 1056 | 1056 | if ($curr_img_dir == $sub_dir) {
|
| 1057 | - $img_path = $geodir_uploadpath . '/' . $filename; |
|
| 1058 | - $img_url = $geodir_uploadurl . '/' . $filename; |
|
| 1057 | + $img_path = $geodir_uploadpath.'/'.$filename; |
|
| 1058 | + $img_url = $geodir_uploadurl.'/'.$filename; |
|
| 1059 | 1059 | } else {
|
| 1060 | - $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1061 | - $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1060 | + $img_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename; |
|
| 1061 | + $img_url = $uploads['url'].'/temp_'.$current_user->data->ID.'/'.$filename; |
|
| 1062 | 1062 | } |
| 1063 | 1063 | |
| 1064 | 1064 | $uploaded_file = ''; |
| 1065 | 1065 | |
| 1066 | 1066 | if (file_exists($img_path)) {
|
| 1067 | - $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1067 | + $uploaded_file = copy($img_path, $geodir_uploadpath.'/'.$new_name); |
|
| 1068 | 1068 | $file_path = ''; |
| 1069 | - } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
|
|
| 1069 | + } else if (file_exists($uploads['basedir'].$curr_img_dir.$filename)) {
|
|
| 1070 | 1070 | $uploaded_file = true; |
| 1071 | - $file_path = $curr_img_dir . '/' . $filename; |
|
| 1071 | + $file_path = $curr_img_dir.'/'.$filename; |
|
| 1072 | 1072 | } |
| 1073 | 1073 | |
| 1074 | 1074 | if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) |
@@ -1077,14 +1077,14 @@ discard block |
||
| 1077 | 1077 | |
| 1078 | 1078 | if (!empty($uploaded_file)) {
|
| 1079 | 1079 | if (!isset($file_path) || !$file_path) {
|
| 1080 | - $file_path = $sub_dir . '/' . $new_name; |
|
| 1080 | + $file_path = $sub_dir.'/'.$new_name; |
|
| 1081 | 1081 | } |
| 1082 | 1082 | |
| 1083 | - $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
|
|
| 1083 | + $postcurr_images[] = str_replace(array('http://', 'https://'), '', $uploads['baseurl'].$file_path);
|
|
| 1084 | 1084 | |
| 1085 | 1085 | if ($menu_order == 1) {
|
| 1086 | 1086 | |
| 1087 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
|
|
| 1087 | + $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
|
|
| 1088 | 1088 | |
| 1089 | 1089 | } |
| 1090 | 1090 | |
@@ -1102,12 +1102,12 @@ discard block |
||
| 1102 | 1102 | |
| 1103 | 1103 | foreach ($attachment as $key => $val) {
|
| 1104 | 1104 | if ($val != '') |
| 1105 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 1105 | + $attachment_set .= $key." = '".$val."', "; |
|
| 1106 | 1106 | } |
| 1107 | 1107 | |
| 1108 | 1108 | $attachment_set = trim($attachment_set, ", "); |
| 1109 | 1109 | |
| 1110 | - $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 1110 | + $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
|
|
| 1111 | 1111 | |
| 1112 | 1112 | $valid_file_ids[] = $wpdb->insert_id; |
| 1113 | 1113 | } |
@@ -1118,17 +1118,17 @@ discard block |
||
| 1118 | 1118 | } else {
|
| 1119 | 1119 | $valid_file_ids[] = $find_image; |
| 1120 | 1120 | |
| 1121 | - $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
|
|
| 1121 | + $postcurr_images[] = str_replace(array('http://', 'https://'), '', $post_image[$m]);
|
|
| 1122 | 1122 | |
| 1123 | 1123 | $wpdb->query( |
| 1124 | 1124 | $wpdb->prepare( |
| 1125 | - "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d", |
|
| 1125 | + "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order = %d where file =%s AND post_id =%d", |
|
| 1126 | 1126 | array($menu_order, $split_img_path[1], $post_id) |
| 1127 | 1127 | ) |
| 1128 | 1128 | ); |
| 1129 | 1129 | |
| 1130 | 1130 | if ($menu_order == 1) |
| 1131 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
|
|
| 1131 | + $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
|
|
| 1132 | 1132 | |
| 1133 | 1133 | } |
| 1134 | 1134 | |
@@ -1152,9 +1152,9 @@ discard block |
||
| 1152 | 1152 | |
| 1153 | 1153 | foreach ($post_images as $img) {
|
| 1154 | 1154 | |
| 1155 | - if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
|
|
| 1155 | + if (!in_array(str_replace(array('http://', 'https://'), '', $img->src), $postcurr_images)) {
|
|
| 1156 | 1156 | |
| 1157 | - $invalid_files[] = (object)array('src' => $img->src);
|
|
| 1157 | + $invalid_files[] = (object) array('src' => $img->src);
|
|
| 1158 | 1158 | |
| 1159 | 1159 | } |
| 1160 | 1160 | |
@@ -1162,12 +1162,12 @@ discard block |
||
| 1162 | 1162 | |
| 1163 | 1163 | } |
| 1164 | 1164 | |
| 1165 | - $invalid_files = (object)$invalid_files; |
|
| 1165 | + $invalid_files = (object) $invalid_files; |
|
| 1166 | 1166 | } |
| 1167 | 1167 | |
| 1168 | 1168 | $remove_files[] = $post_id; |
| 1169 | 1169 | |
| 1170 | - $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
|
|
| 1170 | + $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE ".$valid_files_condition." post_id = %d", $remove_files));
|
|
| 1171 | 1171 | |
| 1172 | 1172 | if (!empty($invalid_files)) |
| 1173 | 1173 | geodir_remove_attachments($invalid_files); |
@@ -1207,7 +1207,7 @@ discard block |
||
| 1207 | 1207 | rmdir($dirPath); |
| 1208 | 1208 | } */ |
| 1209 | 1209 | |
| 1210 | - $dirname = $uploads_dir . '/temp_' . $current_user->ID; |
|
| 1210 | + $dirname = $uploads_dir.'/temp_'.$current_user->ID; |
|
| 1211 | 1211 | geodir_delete_directory($dirname); |
| 1212 | 1212 | } |
| 1213 | 1213 | |
@@ -1229,10 +1229,10 @@ discard block |
||
| 1229 | 1229 | return false; |
| 1230 | 1230 | while ($file = readdir($dir_handle)) {
|
| 1231 | 1231 | if ($file != "." && $file != "..") {
|
| 1232 | - if (!is_dir($dirname . "/" . $file)) |
|
| 1233 | - unlink($dirname . "/" . $file); |
|
| 1232 | + if (!is_dir($dirname."/".$file)) |
|
| 1233 | + unlink($dirname."/".$file); |
|
| 1234 | 1234 | else |
| 1235 | - geodir_delete_directory($dirname . '/' . $file); |
|
| 1235 | + geodir_delete_directory($dirname.'/'.$file); |
|
| 1236 | 1236 | } |
| 1237 | 1237 | } |
| 1238 | 1238 | closedir($dir_handle); |
@@ -1261,8 +1261,8 @@ discard block |
||
| 1261 | 1261 | foreach ($postcurr_images as $postimg) {
|
| 1262 | 1262 | $image_name_arr = explode('/', $postimg->src);
|
| 1263 | 1263 | $filename = end($image_name_arr); |
| 1264 | - if (file_exists($uploads_dir . '/' . $filename)) |
|
| 1265 | - unlink($uploads_dir . '/' . $filename); |
|
| 1264 | + if (file_exists($uploads_dir.'/'.$filename)) |
|
| 1265 | + unlink($uploads_dir.'/'.$filename); |
|
| 1266 | 1266 | } |
| 1267 | 1267 | |
| 1268 | 1268 | } // endif |
@@ -1303,28 +1303,28 @@ discard block |
||
| 1303 | 1303 | } |
| 1304 | 1304 | |
| 1305 | 1305 | if (!in_array($post_type, geodir_get_posttypes())) {
|
| 1306 | - return false;// if not a GD CPT return; |
|
| 1306 | + return false; // if not a GD CPT return; |
|
| 1307 | 1307 | } |
| 1308 | 1308 | |
| 1309 | 1309 | |
| 1310 | - $list_img_size = get_option('geodir_listing_img_size','default');
|
|
| 1310 | + $list_img_size = get_option('geodir_listing_img_size', 'default');
|
|
| 1311 | 1311 | |
| 1312 | - if( $size=='list-thumb' && $list_img_size != 'default' ){
|
|
| 1313 | - $fimg = get_the_post_thumbnail_url($post_id,$list_img_size); |
|
| 1314 | - if($fimg){
|
|
| 1312 | + if ($size == 'list-thumb' && $list_img_size != 'default') {
|
|
| 1313 | + $fimg = get_the_post_thumbnail_url($post_id, $list_img_size); |
|
| 1314 | + if ($fimg) {
|
|
| 1315 | 1315 | $uploads = wp_upload_dir(); |
| 1316 | 1316 | $uploads_baseurl = $uploads['baseurl']; |
| 1317 | - $file = str_replace($uploads_baseurl,'',$fimg); |
|
| 1317 | + $file = str_replace($uploads_baseurl, '', $fimg); |
|
| 1318 | 1318 | } |
| 1319 | 1319 | } |
| 1320 | 1320 | |
| 1321 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1321 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 1322 | 1322 | |
| 1323 | 1323 | if (!$file) {
|
| 1324 | 1324 | if (isset($post->featured_image)) {
|
| 1325 | 1325 | $file = $post->featured_image; |
| 1326 | 1326 | } else {
|
| 1327 | - $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
|
|
| 1327 | + $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM ".$table." WHERE post_id = %d", array($post_id)));
|
|
| 1328 | 1328 | } |
| 1329 | 1329 | } |
| 1330 | 1330 | |
@@ -1343,7 +1343,7 @@ discard block |
||
| 1343 | 1343 | |
| 1344 | 1344 | $file_name = $file_info['basename']; |
| 1345 | 1345 | |
| 1346 | - $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1346 | + $uploads_url = $uploads_baseurl.$sub_dir; |
|
| 1347 | 1347 | /* |
| 1348 | 1348 | * Allows the filter of image src for such things as CDN change. |
| 1349 | 1349 | * |
@@ -1353,8 +1353,8 @@ discard block |
||
| 1353 | 1353 | * @param string $uploads_url The server upload directory url. |
| 1354 | 1354 | * @param string $uploads_baseurl The uploads dir base url. |
| 1355 | 1355 | */ |
| 1356 | - $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1357 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1356 | + $img_arr['src'] = apply_filters('geodir_get_featured_image_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);
|
|
| 1357 | + $img_arr['path'] = $uploads_path.'/'.$file_name; |
|
| 1358 | 1358 | $width = 0; |
| 1359 | 1359 | $height = 0; |
| 1360 | 1360 | if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
@@ -1397,7 +1397,7 @@ discard block |
||
| 1397 | 1397 | $file_name = $file_info['basename']; |
| 1398 | 1398 | |
| 1399 | 1399 | $img_arr['src'] = $default_img; |
| 1400 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1400 | + $img_arr['path'] = $uploads_path.'/'.$file_name; |
|
| 1401 | 1401 | |
| 1402 | 1402 | $width = 0; |
| 1403 | 1403 | $height = 0; |
@@ -1414,7 +1414,7 @@ discard block |
||
| 1414 | 1414 | } |
| 1415 | 1415 | |
| 1416 | 1416 | if (!empty($img_arr)) |
| 1417 | - return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path ); |
|
| 1417 | + return (object) $img_arr; //return (object)array( 'src' => $file_url, 'path' => $file_path ); |
|
| 1418 | 1418 | else |
| 1419 | 1419 | return false; |
| 1420 | 1420 | } |
@@ -1477,7 +1477,7 @@ discard block |
||
| 1477 | 1477 | |
| 1478 | 1478 | $arrImages = $wpdb->get_results( |
| 1479 | 1479 | $wpdb->prepare( |
| 1480 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ", |
|
| 1480 | + "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d".$not_featured." ORDER BY menu_order ASC, ID DESC $limit_q ", |
|
| 1481 | 1481 | array('%image%', $post_id)
|
| 1482 | 1482 | ) |
| 1483 | 1483 | ); |
@@ -1503,7 +1503,7 @@ discard block |
||
| 1503 | 1503 | |
| 1504 | 1504 | $file_name = $file_info['basename']; |
| 1505 | 1505 | |
| 1506 | - $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1506 | + $uploads_url = $uploads_baseurl.$sub_dir; |
|
| 1507 | 1507 | /* |
| 1508 | 1508 | * Allows the filter of image src for such things as CDN change. |
| 1509 | 1509 | * |
@@ -1513,8 +1513,8 @@ discard block |
||
| 1513 | 1513 | * @param string $uploads_url The server upload directory url. |
| 1514 | 1514 | * @param string $uploads_baseurl The uploads dir base url. |
| 1515 | 1515 | */ |
| 1516 | - $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1517 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1516 | + $img_arr['src'] = apply_filters('geodir_get_images_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);
|
|
| 1517 | + $img_arr['path'] = $uploads_path.'/'.$file_name; |
|
| 1518 | 1518 | $width = 0; |
| 1519 | 1519 | $height = 0; |
| 1520 | 1520 | if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
@@ -1531,7 +1531,7 @@ discard block |
||
| 1531 | 1531 | $img_arr['content'] = $attechment->content; // add the description to the array |
| 1532 | 1532 | $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1. |
| 1533 | 1533 | |
| 1534 | - $return_arr[] = (object)$img_arr; |
|
| 1534 | + $return_arr[] = (object) $img_arr; |
|
| 1535 | 1535 | |
| 1536 | 1536 | $counter++; |
| 1537 | 1537 | } |
@@ -1542,7 +1542,7 @@ discard block |
||
| 1542 | 1542 | * @since 1.6.20 |
| 1543 | 1543 | * @param array $return_arr The array of image objects. |
| 1544 | 1544 | */ |
| 1545 | - return apply_filters('geodir_get_images_arr',$return_arr);
|
|
| 1545 | + return apply_filters('geodir_get_images_arr', $return_arr);
|
|
| 1546 | 1546 | } else if ($no_images) {
|
| 1547 | 1547 | $default_img = ''; |
| 1548 | 1548 | $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
@@ -1581,7 +1581,7 @@ discard block |
||
| 1581 | 1581 | $img_arr['title'] = $file_info['filename']; // add the title to the array |
| 1582 | 1582 | $img_arr['content'] = $file_info['filename']; // add the description to the array |
| 1583 | 1583 | |
| 1584 | - $return_arr[] = (object)$img_arr; |
|
| 1584 | + $return_arr[] = (object) $img_arr; |
|
| 1585 | 1585 | |
| 1586 | 1586 | /** |
| 1587 | 1587 | * Filter the images array so things can be changed. |
@@ -1589,7 +1589,7 @@ discard block |
||
| 1589 | 1589 | * @since 1.6.20 |
| 1590 | 1590 | * @param array $return_arr The array of image objects. |
| 1591 | 1591 | */ |
| 1592 | - return apply_filters('geodir_get_images_arr',$return_arr);
|
|
| 1592 | + return apply_filters('geodir_get_images_arr', $return_arr);
|
|
| 1593 | 1593 | } else |
| 1594 | 1594 | return false; |
| 1595 | 1595 | } |
@@ -1614,8 +1614,8 @@ discard block |
||
| 1614 | 1614 | |
| 1615 | 1615 | $html = ''; |
| 1616 | 1616 | if (!empty($request)) {
|
| 1617 | - if (!is_object($request)){
|
|
| 1618 | - $request = (object)$request; |
|
| 1617 | + if (!is_object($request)) {
|
|
| 1618 | + $request = (object) $request; |
|
| 1619 | 1619 | } |
| 1620 | 1620 | |
| 1621 | 1621 | if (isset($request->src) && !isset($request->path)) {
|
@@ -1629,7 +1629,7 @@ discard block |
||
| 1629 | 1629 | $img_no_http = str_replace(array("http://", "https://"), "", $request->path);
|
| 1630 | 1630 | $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
|
| 1631 | 1631 | if (strpos($img_no_http, $upload_no_http) !== false) {
|
| 1632 | - $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path); |
|
| 1632 | + $request->path = str_replace($img_no_http, $upload_dir['basedir'], $request->path); |
|
| 1633 | 1633 | } |
| 1634 | 1634 | |
| 1635 | 1635 | $width = 0; |
@@ -1646,7 +1646,7 @@ discard block |
||
| 1646 | 1646 | $image->height = $height; |
| 1647 | 1647 | $image->title = isset($request->title) ? $request->title : ''; |
| 1648 | 1648 | |
| 1649 | - $max_size = (object)geodir_get_imagesize($size); |
|
| 1649 | + $max_size = (object) geodir_get_imagesize($size); |
|
| 1650 | 1650 | |
| 1651 | 1651 | if (!is_wp_error($max_size)) {
|
| 1652 | 1652 | if ($image->width) {
|
@@ -1658,13 +1658,13 @@ discard block |
||
| 1658 | 1658 | $width_per = 100; |
| 1659 | 1659 | } |
| 1660 | 1660 | |
| 1661 | - if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
|
|
| 1662 | - $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '" /></div>'; |
|
| 1661 | + if (is_admin() && !isset($_REQUEST['geodir_ajax'])) {
|
|
| 1662 | + $html = '<div class="geodir_thumbnail"><img style="max-height:'.$max_size->h.'px;" alt="place image" src="'.$image->src.'" /></div>'; |
|
| 1663 | 1663 | } else {
|
| 1664 | - if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
|
|
| 1665 | - $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>'; |
|
| 1666 | - }else{
|
|
| 1667 | - $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
|
|
| 1664 | + if ($size == 'widget-thumb' || !get_option('geodir_lazy_load', 1)) {
|
|
| 1665 | + $html = '<div class="geodir_thumbnail" style="background-image:url(\''.$image->src.'\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>'; |
|
| 1666 | + } else {
|
|
| 1667 | + $html = '<div data-src="'.str_replace(' ', '%20', $image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
|
|
| 1668 | 1668 | } |
| 1669 | 1669 | |
| 1670 | 1670 | } |
@@ -1699,15 +1699,15 @@ discard block |
||
| 1699 | 1699 | |
| 1700 | 1700 | $post_type = get_post_type($post_id); |
| 1701 | 1701 | |
| 1702 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1702 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 1703 | 1703 | |
| 1704 | 1704 | if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
|
| 1705 | 1705 | |
| 1706 | - if ($taxonomy == $post_type . '_tags') {
|
|
| 1706 | + if ($taxonomy == $post_type.'_tags') {
|
|
| 1707 | 1707 | if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
| 1708 | 1708 | geodir_save_post_meta($post_id, 'post_tags', $terms); |
| 1709 | 1709 | } |
| 1710 | - } elseif ($taxonomy == $post_type . 'category') {
|
|
| 1710 | + } elseif ($taxonomy == $post_type.'category') {
|
|
| 1711 | 1711 | $srcharr = array('"', '\\');
|
| 1712 | 1712 | $replarr = array(""", '');
|
| 1713 | 1713 | |
@@ -1729,7 +1729,7 @@ discard block |
||
| 1729 | 1729 | |
| 1730 | 1730 | $wpdb->get_var( |
| 1731 | 1731 | $wpdb->prepare( |
| 1732 | - "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ", |
|
| 1732 | + "DELETE from ".GEODIR_ICON_TABLE." WHERE cat_id NOT IN ($format) AND post_id = %d ", |
|
| 1733 | 1733 | $cat_ids_array_del |
| 1734 | 1734 | ) |
| 1735 | 1735 | ); |
@@ -1737,7 +1737,7 @@ discard block |
||
| 1737 | 1737 | |
| 1738 | 1738 | $post_term = $wpdb->get_col( |
| 1739 | 1739 | $wpdb->prepare( |
| 1740 | - "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id", |
|
| 1740 | + "SELECT term_id FROM ".$wpdb->term_taxonomy." WHERE term_taxonomy_id IN($format) GROUP BY term_id", |
|
| 1741 | 1741 | $cat_ids_array |
| 1742 | 1742 | ) |
| 1743 | 1743 | ); |
@@ -1759,16 +1759,16 @@ discard block |
||
| 1759 | 1759 | $lat = geodir_get_post_meta($post_id, 'post_latitude', true); |
| 1760 | 1760 | $lng = geodir_get_post_meta($post_id, 'post_longitude', true); |
| 1761 | 1761 | |
| 1762 | - $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
|
|
| 1763 | - $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true); |
|
| 1762 | + $timing = ' - '.date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
|
|
| 1763 | + $timing .= ' - '.geodir_get_post_meta($post_id, 'st_time', true); |
|
| 1764 | 1764 | |
| 1765 | 1765 | $json = '{';
|
| 1766 | - $json .= '"id":"' . $post_id . '",'; |
|
| 1767 | - $json .= '"lat_pos": "' . $lat . '",'; |
|
| 1768 | - $json .= '"long_pos": "' . $lng . '",'; |
|
| 1769 | - $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",'; |
|
| 1770 | - $json .= '"icon":"' . $term_icon . '",'; |
|
| 1771 | - $json .= '"group":"catgroup' . $cat_id . '"'; |
|
| 1766 | + $json .= '"id":"'.$post_id.'",'; |
|
| 1767 | + $json .= '"lat_pos": "'.$lat.'",'; |
|
| 1768 | + $json .= '"long_pos": "'.$lng.'",'; |
|
| 1769 | + $json .= '"marker_id":"'.$post_id.'_'.$cat_id.'",'; |
|
| 1770 | + $json .= '"icon":"'.$term_icon.'",'; |
|
| 1771 | + $json .= '"group":"catgroup'.$cat_id.'"'; |
|
| 1772 | 1772 | $json .= '}'; |
| 1773 | 1773 | |
| 1774 | 1774 | |
@@ -1776,9 +1776,9 @@ discard block |
||
| 1776 | 1776 | $post_marker_json = $json; |
| 1777 | 1777 | |
| 1778 | 1778 | |
| 1779 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
|
|
| 1779 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".GEODIR_ICON_TABLE." WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
|
|
| 1780 | 1780 | |
| 1781 | - $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
|
|
| 1781 | + $json_query = $wpdb->prepare("UPDATE ".GEODIR_ICON_TABLE." SET
|
|
| 1782 | 1782 | post_title = %s, |
| 1783 | 1783 | json = %s |
| 1784 | 1784 | WHERE post_id = %d AND cat_id = %d ", |
@@ -1786,7 +1786,7 @@ discard block |
||
| 1786 | 1786 | |
| 1787 | 1787 | } else {
|
| 1788 | 1788 | |
| 1789 | - $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
|
|
| 1789 | + $json_query = $wpdb->prepare("INSERT INTO ".GEODIR_ICON_TABLE." SET
|
|
| 1790 | 1790 | post_id = %d, |
| 1791 | 1791 | post_title = %s, |
| 1792 | 1792 | cat_id = %d, |
@@ -1804,17 +1804,17 @@ discard block |
||
| 1804 | 1804 | if (!empty($post_term) && is_array($post_term)) {
|
| 1805 | 1805 | $categories = implode(',', $post_term);
|
| 1806 | 1806 | |
| 1807 | - if ($categories != '' && $categories != 0) $categories = ',' . $categories . ','; |
|
| 1807 | + if ($categories != '' && $categories != 0) $categories = ','.$categories.','; |
|
| 1808 | 1808 | |
| 1809 | 1809 | if (empty($post_marker_json)) |
| 1810 | 1810 | $post_marker_json = isset($json) ? $json : ''; |
| 1811 | 1811 | |
| 1812 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 1812 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
|
|
| 1813 | 1813 | |
| 1814 | 1814 | $wpdb->query( |
| 1815 | 1815 | $wpdb->prepare( |
| 1816 | - "UPDATE " . $table . " SET |
|
| 1817 | - " . $taxonomy . " = %s, |
|
| 1816 | + "UPDATE ".$table." SET |
|
| 1817 | + " . $taxonomy." = %s, |
|
| 1818 | 1818 | marker_json = %s |
| 1819 | 1819 | where post_id = %d", |
| 1820 | 1820 | array($categories, $post_marker_json, $post_id) |
@@ -1835,7 +1835,7 @@ discard block |
||
| 1835 | 1835 | |
| 1836 | 1836 | $wpdb->query( |
| 1837 | 1837 | $wpdb->prepare( |
| 1838 | - "UPDATE " . $table . " SET |
|
| 1838 | + "UPDATE ".$table." SET |
|
| 1839 | 1839 | default_category = %s |
| 1840 | 1840 | where post_id = %d", |
| 1841 | 1841 | array($categories[0], $post_id) |
@@ -1860,9 +1860,9 @@ discard block |
||
| 1860 | 1860 | |
| 1861 | 1861 | $wpdb->query( |
| 1862 | 1862 | $wpdb->prepare( |
| 1863 | - "INSERT INTO " . $table . " SET |
|
| 1863 | + "INSERT INTO ".$table." SET |
|
| 1864 | 1864 | post_id = %d, |
| 1865 | - " . $taxonomy . " = %s, |
|
| 1865 | + " . $taxonomy." = %s, |
|
| 1866 | 1866 | marker_json = %s ", |
| 1867 | 1867 | |
| 1868 | 1868 | array($post_id, $categories, $post_marker_json) |
@@ -1994,7 +1994,7 @@ discard block |
||
| 1994 | 1994 | } ?>"><img alt="bubble image" style="max-height:50px;" |
| 1995 | 1995 | src="<?php echo $post_images[0]; ?>"/></a></div> |
| 1996 | 1996 | <?php |
| 1997 | - }else{
|
|
| 1997 | + } else {
|
|
| 1998 | 1998 | echo '<div class="geodir-bubble_image"></div>'; |
| 1999 | 1999 | } |
| 2000 | 2000 | } else {
|
@@ -2002,7 +2002,7 @@ discard block |
||
| 2002 | 2002 | ?> |
| 2003 | 2003 | <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div> |
| 2004 | 2004 | <?php |
| 2005 | - }else{
|
|
| 2005 | + } else {
|
|
| 2006 | 2006 | echo '<div class="geodir-bubble_image"></div>'; |
| 2007 | 2007 | } |
| 2008 | 2008 | } |
@@ -2032,7 +2032,7 @@ discard block |
||
| 2032 | 2032 | * @param object $postinfo_obj The posts info as an object. |
| 2033 | 2033 | * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
| 2034 | 2034 | */ |
| 2035 | - do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
|
|
| 2035 | + do_action('geodir_infowindow_meta_after', $postinfo_obj, $post_preview);
|
|
| 2036 | 2036 | ?> |
| 2037 | 2037 | </div> |
| 2038 | 2038 | <?php |
@@ -2042,9 +2042,9 @@ discard block |
||
| 2042 | 2042 | <div class="geodir-bubble-meta-fade"></div> |
| 2043 | 2043 | <div class="geodir-bubble-meta-bottom"> |
| 2044 | 2044 | <?php if ($rating_star != '') { ?>
|
| 2045 | - <span class="geodir-bubble-rating"><?php echo $rating_star;?></span> |
|
| 2045 | + <span class="geodir-bubble-rating"><?php echo $rating_star; ?></span> |
|
| 2046 | 2046 | <?php } ?> |
| 2047 | - <span class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID);?></span> |
|
| 2047 | + <span class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID); ?></span> |
|
| 2048 | 2048 | <span class="geodir-bubble-reviews"> |
| 2049 | 2049 | <a href="<?php echo get_comments_link($ID); ?>" class="geodir-pcomments"><i class="fa fa-comments"></i> <?php echo get_comments_number($ID); ?></a> |
| 2050 | 2050 | </span> |
@@ -2106,11 +2106,11 @@ discard block |
||
| 2106 | 2106 | |
| 2107 | 2107 | $post_type = get_post_type($post_id); |
| 2108 | 2108 | |
| 2109 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2109 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2110 | 2110 | |
| 2111 | 2111 | $wpdb->query( |
| 2112 | 2112 | $wpdb->prepare( |
| 2113 | - "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d", |
|
| 2113 | + "UPDATE ".$table." SET post_status=%s WHERE post_id=%d", |
|
| 2114 | 2114 | array($status, $post_id) |
| 2115 | 2115 | ) |
| 2116 | 2116 | ); |
@@ -2182,18 +2182,18 @@ discard block |
||
| 2182 | 2182 | |
| 2183 | 2183 | $post_type = get_post_type($post_id); |
| 2184 | 2184 | |
| 2185 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2185 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2186 | 2186 | |
| 2187 | 2187 | $wpdb->query( |
| 2188 | 2188 | $wpdb->prepare( |
| 2189 | - "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2189 | + "UPDATE ".$table." SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2190 | 2190 | array($updatingpost, $temppost) |
| 2191 | 2191 | ) |
| 2192 | 2192 | ); |
| 2193 | 2193 | |
| 2194 | 2194 | $wpdb->query( |
| 2195 | 2195 | $wpdb->prepare( |
| 2196 | - "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2196 | + "UPDATE ".GEODIR_ICON_TABLE." SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2197 | 2197 | array($updatingpost, $temppost) |
| 2198 | 2198 | ) |
| 2199 | 2199 | ); |
@@ -2202,7 +2202,7 @@ discard block |
||
| 2202 | 2202 | |
| 2203 | 2203 | $wpdb->query( |
| 2204 | 2204 | $wpdb->prepare( |
| 2205 | - "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2205 | + "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2206 | 2206 | array($updatingpost, $temppost) |
| 2207 | 2207 | ) |
| 2208 | 2208 | ); |
@@ -2240,12 +2240,12 @@ discard block |
||
| 2240 | 2240 | if (!in_array($post_type, $all_postypes)) |
| 2241 | 2241 | return false; |
| 2242 | 2242 | |
| 2243 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2243 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2244 | 2244 | |
| 2245 | 2245 | /* Delete custom post meta*/ |
| 2246 | 2246 | $wpdb->query( |
| 2247 | 2247 | $wpdb->prepare( |
| 2248 | - "DELETE FROM " . $table . " WHERE `post_id` = %d", |
|
| 2248 | + "DELETE FROM ".$table." WHERE `post_id` = %d", |
|
| 2249 | 2249 | array($deleted_postid) |
| 2250 | 2250 | ) |
| 2251 | 2251 | ); |
@@ -2254,7 +2254,7 @@ discard block |
||
| 2254 | 2254 | |
| 2255 | 2255 | $wpdb->query( |
| 2256 | 2256 | $wpdb->prepare( |
| 2257 | - "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d", |
|
| 2257 | + "DELETE FROM ".GEODIR_ICON_TABLE." WHERE `post_id` = %d", |
|
| 2258 | 2258 | array($deleted_postid) |
| 2259 | 2259 | ) |
| 2260 | 2260 | ); |
@@ -2264,7 +2264,7 @@ discard block |
||
| 2264 | 2264 | |
| 2265 | 2265 | $wpdb->query( |
| 2266 | 2266 | $wpdb->prepare( |
| 2267 | - "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d", |
|
| 2267 | + "DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE `post_id` = %d", |
|
| 2268 | 2268 | array($deleted_postid) |
| 2269 | 2269 | ) |
| 2270 | 2270 | ); |
@@ -2336,7 +2336,7 @@ discard block |
||
| 2336 | 2336 | */ |
| 2337 | 2337 | do_action('geodir_before_add_from_favorite', $post_id);
|
| 2338 | 2338 | |
| 2339 | - echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>'; |
|
| 2339 | + echo '<a href="javascript:void(0);" title="'.$remove_favourite_text.'" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\''.$post_id.'\',\'remove\');"><i class="'.$favourite_icon.'"></i> '.$unfavourite_text.'</a>'; |
|
| 2340 | 2340 | |
| 2341 | 2341 | /** |
| 2342 | 2342 | * Called after adding the post from favourites. |
@@ -2415,7 +2415,7 @@ discard block |
||
| 2415 | 2415 | */ |
| 2416 | 2416 | do_action('geodir_before_remove_from_favorite', $post_id);
|
| 2417 | 2417 | |
| 2418 | - echo '<a href="javascript:void(0);" title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>'; |
|
| 2418 | + echo '<a href="javascript:void(0);" title="'.$add_favourite_text.'" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\''.$post_id.'\',\'add\');"><i class="'.$favourite_icon.'"></i> '.$favourite_text.'</a>'; |
|
| 2419 | 2419 | |
| 2420 | 2420 | /** |
| 2421 | 2421 | * Called after removing the post from favourites. |
@@ -2510,24 +2510,24 @@ discard block |
||
| 2510 | 2510 | $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
| 2511 | 2511 | |
| 2512 | 2512 | if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
|
| 2513 | - ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>" ><a |
|
| 2513 | + ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>" ><a |
|
| 2514 | 2514 | class="geodir-removetofav-icon" href="javascript:void(0);" |
| 2515 | - onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');" |
|
| 2516 | - title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?> |
|
| 2515 | + onclick="javascript:addToFavourite(<?php echo $post_id; ?>,'remove');" |
|
| 2516 | + title="<?php echo $remove_favourite_text; ?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text; ?> |
|
| 2517 | 2517 | </a> </span><?php |
| 2518 | 2518 | |
| 2519 | 2519 | } else {
|
| 2520 | 2520 | |
| 2521 | 2521 | if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
|
| 2522 | - $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\''; |
|
| 2522 | + $script_text = 'javascript:window.location.href=\''.geodir_login_url().'\''; |
|
| 2523 | 2523 | } else |
| 2524 | - $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
|
|
| 2524 | + $script_text = 'javascript:addToFavourite('.$post_id.',\'add\')';
|
|
| 2525 | 2525 | |
| 2526 | - ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon" |
|
| 2526 | + ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"><a class="geodir-addtofav-icon" |
|
| 2527 | 2527 | href="javascript:void(0);" |
| 2528 | - onclick="<?php echo $script_text;?>" |
|
| 2529 | - title="<?php echo $add_favourite_text;?>"><i |
|
| 2530 | - class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span> |
|
| 2528 | + onclick="<?php echo $script_text; ?>" |
|
| 2529 | + title="<?php echo $add_favourite_text; ?>"><i |
|
| 2530 | + class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text; ?></a></span> |
|
| 2531 | 2531 | <?php } |
| 2532 | 2532 | } |
| 2533 | 2533 | } |
@@ -2557,7 +2557,7 @@ discard block |
||
| 2557 | 2557 | |
| 2558 | 2558 | $post_type = $taxonomy_obj->object_type[0]; |
| 2559 | 2559 | |
| 2560 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2560 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2561 | 2561 | |
| 2562 | 2562 | /** |
| 2563 | 2563 | * Filter to modify the 'join' query |
@@ -2580,8 +2580,8 @@ discard block |
||
| 2580 | 2580 | $where = apply_filters('geodir_cat_post_count_where', $where, $term);
|
| 2581 | 2581 | |
| 2582 | 2582 | $count_query = "SELECT count(post_id) FROM |
| 2583 | - " . $table . " as pd " . $join . " |
|
| 2584 | - WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
|
|
| 2583 | + " . $table." as pd ".$join." |
|
| 2584 | + WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id."',".$term->taxonomy.") ".$where;
|
|
| 2585 | 2585 | |
| 2586 | 2586 | $cat_post_count = $wpdb->get_var($count_query); |
| 2587 | 2587 | if (empty($cat_post_count) || is_wp_error($cat_post_count)) |
@@ -2664,13 +2664,13 @@ discard block |
||
| 2664 | 2664 | global $post; |
| 2665 | 2665 | $all_postypes = geodir_get_posttypes(); |
| 2666 | 2666 | if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
|
| 2667 | - $out = ' <a class="excerpt-read-more" href="' . get_permalink($post->ID) . '" title="' . get_the_title($post->ID) . '">'; |
|
| 2667 | + $out = ' <a class="excerpt-read-more" href="'.get_permalink($post->ID).'" title="'.get_the_title($post->ID).'">'; |
|
| 2668 | 2668 | /** |
| 2669 | 2669 | * Filter excerpt read more text. |
| 2670 | 2670 | * |
| 2671 | 2671 | * @since 1.0.0 |
| 2672 | 2672 | */ |
| 2673 | - $out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) ); |
|
| 2673 | + $out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));
|
|
| 2674 | 2674 | $out .= '</a>'; |
| 2675 | 2675 | return $out; |
| 2676 | 2676 | } |
@@ -2699,14 +2699,14 @@ discard block |
||
| 2699 | 2699 | if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
|
| 2700 | 2700 | |
| 2701 | 2701 | $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy); |
| 2702 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 2702 | + $table = $plugin_prefix.$geodir_post_type.'_detail'; |
|
| 2703 | 2703 | |
| 2704 | 2704 | $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']); |
| 2705 | - $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png'; |
|
| 2705 | + $term_icon = $path_parts['dirname'].'/cat_icon_'.$term_id.'.png'; |
|
| 2706 | 2706 | |
| 2707 | 2707 | $posts = $wpdb->get_results( |
| 2708 | 2708 | $wpdb->prepare( |
| 2709 | - "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ", |
|
| 2709 | + "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM ".$table." WHERE FIND_IN_SET(%s,%1\$s ) ", |
|
| 2710 | 2710 | array($term_id, $taxonomy) |
| 2711 | 2711 | ) |
| 2712 | 2712 | ); |
@@ -2718,19 +2718,19 @@ discard block |
||
| 2718 | 2718 | $lng = $post_obj->post_longitude; |
| 2719 | 2719 | |
| 2720 | 2720 | $json = '{';
|
| 2721 | - $json .= '"id":"' . $post_obj->post_id . '",'; |
|
| 2722 | - $json .= '"lat_pos": "' . $lat . '",'; |
|
| 2723 | - $json .= '"long_pos": "' . $lng . '",'; |
|
| 2724 | - $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",'; |
|
| 2725 | - $json .= '"icon":"' . $term_icon . '",'; |
|
| 2726 | - $json .= '"group":"catgroup' . $term_id . '"'; |
|
| 2721 | + $json .= '"id":"'.$post_obj->post_id.'",'; |
|
| 2722 | + $json .= '"lat_pos": "'.$lat.'",'; |
|
| 2723 | + $json .= '"long_pos": "'.$lng.'",'; |
|
| 2724 | + $json .= '"marker_id":"'.$post_obj->post_id.'_'.$term_id.'",'; |
|
| 2725 | + $json .= '"icon":"'.$term_icon.'",'; |
|
| 2726 | + $json .= '"group":"catgroup'.$term_id.'"'; |
|
| 2727 | 2727 | $json .= '}'; |
| 2728 | 2728 | |
| 2729 | 2729 | if ($post_obj->default_category == $term_id) {
|
| 2730 | 2730 | |
| 2731 | 2731 | $wpdb->query( |
| 2732 | 2732 | $wpdb->prepare( |
| 2733 | - "UPDATE " . $table . " SET marker_json = %s where post_id = %d", |
|
| 2733 | + "UPDATE ".$table." SET marker_json = %s where post_id = %d", |
|
| 2734 | 2734 | array($json, $post_obj->post_id) |
| 2735 | 2735 | ) |
| 2736 | 2736 | ); |
@@ -2738,7 +2738,7 @@ discard block |
||
| 2738 | 2738 | |
| 2739 | 2739 | $wpdb->query( |
| 2740 | 2740 | $wpdb->prepare( |
| 2741 | - "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d", |
|
| 2741 | + "UPDATE ".GEODIR_ICON_TABLE." SET json = %s WHERE post_id = %d AND cat_id = %d", |
|
| 2742 | 2742 | array($json, $post_obj->post_id, $term_id) |
| 2743 | 2743 | ) |
| 2744 | 2744 | ); |
@@ -2862,7 +2862,7 @@ discard block |
||
| 2862 | 2862 | // print_r($uploads ) ; |
| 2863 | 2863 | $post_first_image = $wpdb->get_results( |
| 2864 | 2864 | $wpdb->prepare( |
| 2865 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1 ", array($post_id) |
|
| 2865 | + "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = %d and menu_order = 1 ", array($post_id) |
|
| 2866 | 2866 | ) |
| 2867 | 2867 | ); |
| 2868 | 2868 | |
@@ -2883,9 +2883,9 @@ discard block |
||
| 2883 | 2883 | |
| 2884 | 2884 | $post_type = get_post_type($post_id); |
| 2885 | 2885 | |
| 2886 | - $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2886 | + $table_name = $plugin_prefix.$post_type.'_detail'; |
|
| 2887 | 2887 | |
| 2888 | - $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
|
|
| 2888 | + $wpdb->query("UPDATE ".$table_name." SET featured_image='".$post_first_image[0]->file."' WHERE post_id =".$post_id);
|
|
| 2889 | 2889 | |
| 2890 | 2890 | $new_attachment_name = basename($post_first_image[0]->file); |
| 2891 | 2891 | |
@@ -2898,11 +2898,11 @@ discard block |
||
| 2898 | 2898 | wp_delete_attachment($post_thumbnail_id); |
| 2899 | 2899 | |
| 2900 | 2900 | } |
| 2901 | - $filename = $uploads['basedir'] . $post_first_image[0]->file; |
|
| 2901 | + $filename = $uploads['basedir'].$post_first_image[0]->file; |
|
| 2902 | 2902 | |
| 2903 | 2903 | $attachment = array( |
| 2904 | 2904 | 'post_mime_type' => $post_first_image[0]->mime_type, |
| 2905 | - 'guid' => $uploads['baseurl'] . $post_first_image[0]->file, |
|
| 2905 | + 'guid' => $uploads['baseurl'].$post_first_image[0]->file, |
|
| 2906 | 2906 | 'post_parent' => $post_id, |
| 2907 | 2907 | 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
|
| 2908 | 2908 | 'post_content' => '' |
@@ -2915,7 +2915,7 @@ discard block |
||
| 2915 | 2915 | |
| 2916 | 2916 | set_post_thumbnail($post_id, $id); |
| 2917 | 2917 | |
| 2918 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 2918 | + require_once(ABSPATH.'wp-admin/includes/image.php'); |
|
| 2919 | 2919 | wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename)); |
| 2920 | 2920 | |
| 2921 | 2921 | } |
@@ -2948,35 +2948,35 @@ discard block |
||
| 2948 | 2948 | $post_id = absint($_POST['post_id']); |
| 2949 | 2949 | $upload_dir = wp_upload_dir(); |
| 2950 | 2950 | $post_type = get_post_type($_POST['post_id']); |
| 2951 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2951 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2952 | 2952 | |
| 2953 | 2953 | $post_arr = $wpdb->get_results($wpdb->prepare( |
| 2954 | - "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1", |
|
| 2954 | + "SELECT * FROM $wpdb->posts p JOIN ".$table." gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1", |
|
| 2955 | 2955 | array($post_id) |
| 2956 | 2956 | ) |
| 2957 | 2957 | , ARRAY_A); |
| 2958 | 2958 | |
| 2959 | 2959 | $arrImages = $wpdb->get_results( |
| 2960 | 2960 | $wpdb->prepare( |
| 2961 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ", |
|
| 2961 | + "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ", |
|
| 2962 | 2962 | array('%image%', $post_id)
|
| 2963 | 2963 | ) |
| 2964 | 2964 | ); |
| 2965 | 2965 | if ($arrImages) {
|
| 2966 | 2966 | $image_arr = array(); |
| 2967 | 2967 | foreach ($arrImages as $img) {
|
| 2968 | - $image_arr[] = $upload_dir['baseurl'] . $img->file; |
|
| 2968 | + $image_arr[] = $upload_dir['baseurl'].$img->file; |
|
| 2969 | 2969 | } |
| 2970 | 2970 | $comma_separated = implode(",", $image_arr);
|
| 2971 | 2971 | $post_arr[0]['post_images'] = $comma_separated; |
| 2972 | 2972 | } |
| 2973 | 2973 | |
| 2974 | 2974 | |
| 2975 | - $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category']; |
|
| 2975 | + $cats = $post_arr[0][$post_arr[0]['post_type'].'category']; |
|
| 2976 | 2976 | $cat_arr = array_filter(explode(",", $cats));
|
| 2977 | 2977 | $trans_cat = array(); |
| 2978 | 2978 | foreach ($cat_arr as $cat) {
|
| 2979 | - $trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'] . 'category', false); |
|
| 2979 | + $trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'].'category', false); |
|
| 2980 | 2980 | } |
| 2981 | 2981 | |
| 2982 | 2982 | |
@@ -3018,7 +3018,7 @@ discard block |
||
| 3018 | 3018 | |
| 3019 | 3019 | $get_data = $wpdb->get_results( |
| 3020 | 3020 | $wpdb->prepare( |
| 3021 | - "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'", |
|
| 3021 | + "SELECT htmlvar_name, field_type, extra_fields FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1'", |
|
| 3022 | 3022 | array($listing_type) |
| 3023 | 3023 | ) |
| 3024 | 3024 | ); |
@@ -3031,12 +3031,12 @@ discard block |
||
| 3031 | 3031 | |
| 3032 | 3032 | $extra_fields = unserialize($data->extra_fields); |
| 3033 | 3033 | |
| 3034 | - $prefix = $data->htmlvar_name . '_'; |
|
| 3034 | + $prefix = $data->htmlvar_name.'_'; |
|
| 3035 | 3035 | |
| 3036 | - $fields_info[$prefix . 'address'] = $data->field_type; |
|
| 3036 | + $fields_info[$prefix.'address'] = $data->field_type; |
|
| 3037 | 3037 | |
| 3038 | 3038 | if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) |
| 3039 | - $fields_info[$prefix . 'zip'] = $data->field_type; |
|
| 3039 | + $fields_info[$prefix.'zip'] = $data->field_type; |
|
| 3040 | 3040 | |
| 3041 | 3041 | } else {
|
| 3042 | 3042 | |
@@ -3135,18 +3135,18 @@ discard block |
||
| 3135 | 3135 | * @since 1.6.22 Added image from location page. |
| 3136 | 3136 | * @package GeoDirectory |
| 3137 | 3137 | */ |
| 3138 | -function geodir_fb_like_thumbnail(){
|
|
| 3138 | +function geodir_fb_like_thumbnail() {
|
|
| 3139 | 3139 | |
| 3140 | 3140 | $facebook_image = ''; |
| 3141 | 3141 | |
| 3142 | - if(is_single()){// single post
|
|
| 3142 | + if (is_single()) {// single post
|
|
| 3143 | 3143 | global $post; |
| 3144 | - if(isset($post->featured_image) && $post->featured_image){
|
|
| 3144 | + if (isset($post->featured_image) && $post->featured_image) {
|
|
| 3145 | 3145 | $upload_dir = wp_upload_dir(); |
| 3146 | 3146 | $facebook_image = $upload_dir['baseurl'].$post->featured_image; |
| 3147 | 3147 | |
| 3148 | 3148 | } |
| 3149 | - }elseif(geodir_is_page('location')){// location page
|
|
| 3149 | + }elseif (geodir_is_page('location')) {// location page
|
|
| 3150 | 3150 | if (function_exists('geodir_get_location_seo')) {
|
| 3151 | 3151 | $seo = geodir_get_location_seo(); |
| 3152 | 3152 | if (isset($seo->seo_image) && $seo->seo_image) {
|
@@ -3155,11 +3155,11 @@ discard block |
||
| 3155 | 3155 | } |
| 3156 | 3156 | } |
| 3157 | 3157 | |
| 3158 | - if(!$facebook_image){
|
|
| 3158 | + if (!$facebook_image) {
|
|
| 3159 | 3159 | global $post; |
| 3160 | 3160 | |
| 3161 | - if (has_post_thumbnail( $post->ID ) ){
|
|
| 3162 | - $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'full' ); |
|
| 3161 | + if (has_post_thumbnail($post->ID)) {
|
|
| 3162 | + $image = wp_get_attachment_image_src(get_post_thumbnail_id($post->ID), 'full'); |
|
| 3163 | 3163 | $facebook_image = isset($image[0]) ? $image[0] : ''; |
| 3164 | 3164 | } |
| 3165 | 3165 | } |
@@ -3172,9 +3172,9 @@ discard block |
||
| 3172 | 3172 | * @since 1.6.22 |
| 3173 | 3173 | * @param string $facebook_image The image URL or blank. |
| 3174 | 3174 | */ |
| 3175 | - $facebook_image = apply_filters('geodir_fb_share_image',$facebook_image);
|
|
| 3175 | + $facebook_image = apply_filters('geodir_fb_share_image', $facebook_image);
|
|
| 3176 | 3176 | |
| 3177 | - if($facebook_image){
|
|
| 3177 | + if ($facebook_image) {
|
|
| 3178 | 3178 | echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$facebook_image\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n"; |
| 3179 | 3179 | } |
| 3180 | 3180 | |
@@ -132,12 +132,12 @@ discard block |
||
| 132 | 132 | |
| 133 | 133 | if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {
|
| 134 | 134 | } else {
|
| 135 | - $geodir_map_options['height'] = $geodir_map_options['height'] . 'px'; |
|
| 135 | + $geodir_map_options['height'] = $geodir_map_options['height'].'px'; |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {
|
| 139 | 139 | } else {
|
| 140 | - $geodir_map_options['width'] = $geodir_map_options['width'] . 'px'; |
|
| 140 | + $geodir_map_options['width'] = $geodir_map_options['width'].'px'; |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -169,10 +169,10 @@ discard block |
||
| 169 | 169 | */ |
| 170 | 170 | $exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));
|
| 171 | 171 | |
| 172 | - if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)): |
|
| 172 | + if (count((array) $post_types) != count($exclude_post_types) || ($enable_jason_on_load)): |
|
| 173 | 173 | // Set default map options |
| 174 | 174 | |
| 175 | - wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);
|
|
| 175 | + wp_enqueue_script('geodir-map-widget', geodir_plugin_url().'/geodirectory-functions/map-functions/js/map.min.js', array(), false, true);
|
|
| 176 | 176 | |
| 177 | 177 | wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);
|
| 178 | 178 | |
@@ -191,41 +191,41 @@ discard block |
||
| 191 | 191 | */ |
| 192 | 192 | $map_width = apply_filters('geodir_change_map_width', $map_width);
|
| 193 | 193 | ?> |
| 194 | - <div id="catcher_<?php echo $map_canvas_name;?>"></div> |
|
| 194 | + <div id="catcher_<?php echo $map_canvas_name; ?>"></div> |
|
| 195 | 195 | <div class="stick_trigger_container"> |
| 196 | 196 | <div class="trigger_sticky triggeroff_sticky"></div> |
| 197 | - <div class="top_banner_section geodir_map_container <?php echo $map_class_name;?>" |
|
| 198 | - id="sticky_map_<?php echo $map_canvas_name;?>" |
|
| 199 | - style="min-height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"> |
|
| 197 | + <div class="top_banner_section geodir_map_container <?php echo $map_class_name; ?>" |
|
| 198 | + id="sticky_map_<?php echo $map_canvas_name; ?>" |
|
| 199 | + style="min-height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"> |
|
| 200 | 200 | |
| 201 | 201 | <div class="map_background"> |
| 202 | 202 | <div class="top_banner_section_in clearfix"> |
| 203 | - <div class="<?php echo $map_canvas_name;?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name;?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fa fa-arrows-alt"></i></span></div>
|
|
| 204 | - <div class="<?php echo $map_canvas_name;?>_TopRight TopRight"></div> |
|
| 205 | - <div id="<?php echo $map_canvas_name;?>_wrapper" class="main_map_wrapper" |
|
| 206 | - style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"> |
|
| 203 | + <div class="<?php echo $map_canvas_name; ?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name; ?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fa fa-arrows-alt"></i></span></div>
|
|
| 204 | + <div class="<?php echo $map_canvas_name; ?>_TopRight TopRight"></div> |
|
| 205 | + <div id="<?php echo $map_canvas_name; ?>_wrapper" class="main_map_wrapper" |
|
| 206 | + style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"> |
|
| 207 | 207 | <!-- new map start --> |
| 208 | 208 | <div class="iprelative"> |
| 209 | - <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name;?>" |
|
| 210 | - style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div> |
|
| 211 | - <div id="<?php echo $map_canvas_name;?>_loading_div" class="loading_div" |
|
| 212 | - style=" height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div> |
|
| 209 | + <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name; ?>" |
|
| 210 | + style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div> |
|
| 211 | + <div id="<?php echo $map_canvas_name; ?>_loading_div" class="loading_div" |
|
| 212 | + style=" height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div> |
|
| 213 | 213 | <!--<div id="home_map_counter"></div> --> |
| 214 | - <div id="<?php echo $map_canvas_name;?>_map_nofound" |
|
| 214 | + <div id="<?php echo $map_canvas_name; ?>_map_nofound" |
|
| 215 | 215 | class="advmap_nofound"><?php echo MAP_NO_RESULTS; ?></div> |
| 216 | - <div id="<?php echo $map_canvas_name;?>_map_notloaded" |
|
| 216 | + <div id="<?php echo $map_canvas_name; ?>_map_notloaded" |
|
| 217 | 217 | class="advmap_notloaded"><?php _e('<h3>Google Map Not Loaded</h3><p>Sorry, unable to load Google Maps API.', 'geodirectory'); ?></div>
|
| 218 | 218 | </div> |
| 219 | 219 | <!-- new map end --> |
| 220 | 220 | </div> |
| 221 | - <div class="<?php echo $map_canvas_name;?>_BottomLeft BottomLeft"></div> |
|
| 221 | + <div class="<?php echo $map_canvas_name; ?>_BottomLeft BottomLeft"></div> |
|
| 222 | 222 | </div> |
| 223 | 223 | </div> |
| 224 | 224 | <?php if ($geodir_map_options['enable_jason_on_load']) { ?>
|
| 225 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="1"/> |
|
| 225 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="1"/> |
|
| 226 | 226 | <?php } else {
|
| 227 | 227 | ?> |
| 228 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/> |
|
| 228 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="0"/> |
|
| 229 | 229 | <?php } |
| 230 | 230 | |
| 231 | 231 | if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters']) |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | <div class="gd-input-group-addon gd-directions-right gd-mylocation-go"><input type="button" value="<?php _e('Get Directions', 'geodirectory'); ?>" class="<?php echo $map_canvas_name; ?>_getdirection" id="directions" onclick="calcRoute('<?php echo $map_canvas_name; ?>')" /></div>
|
| 246 | 246 | </div> |
| 247 | 247 | <script> |
| 248 | - <?php if(geodir_is_page('detail')){?>
|
|
| 248 | + <?php if (geodir_is_page('detail')) {?>
|
|
| 249 | 249 | jQuery(function () {
|
| 250 | 250 | gd_initialize_ac(); |
| 251 | 251 | }); |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | // Create the autocomplete object, restricting the search |
| 257 | 257 | // to geographical location types. |
| 258 | 258 | autocomplete = new google.maps.places.Autocomplete( |
| 259 | - /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name;?>_fromAddress')),
|
|
| 259 | + /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name; ?>_fromAddress')),
|
|
| 260 | 260 | {types: ['geocode']});
|
| 261 | 261 | // When the user selects an address from the dropdown, |
| 262 | 262 | // populate the address fields in the form. |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | |
| 271 | 271 | if (window.gdMaps == 'osm') {
|
| 272 | 272 | window.setTimeout(function() {
|
| 273 | - calcRoute('<?php echo $map_canvas_name;?>');
|
|
| 273 | + calcRoute('<?php echo $map_canvas_name; ?>');
|
|
| 274 | 274 | }, 1000); |
| 275 | 275 | } |
| 276 | 276 | } |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | */ |
| 325 | 325 | $map_search_pt = apply_filters('geodir_default_map_search_pt', $geodir_default_map_search_pt);
|
| 326 | 326 | ?> |
| 327 | - <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel;?>"> |
|
| 327 | + <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel; ?>"> |
|
| 328 | 328 | <?php |
| 329 | 329 | $exclude_post_types = get_option('geodir_exclude_post_type_on_map');
|
| 330 | 330 | $geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);
|
@@ -334,12 +334,12 @@ discard block |
||
| 334 | 334 | } |
| 335 | 335 | ?> |
| 336 | 336 | <div |
| 337 | - class="map-category-listing<?php echo $map_cat_class;?>"> |
|
| 337 | + class="map-category-listing<?php echo $map_cat_class; ?>"> |
|
| 338 | 338 | <div class="gd-trigger gd-triggeroff"><i class="fa fa-compress"></i><i class="fa fa-expand"></i></div> |
| 339 | - <div id="<?php echo $map_canvas_name;?>_cat" |
|
| 340 | - class="<?php echo $map_canvas_name;?>_map_category map_category" |
|
| 341 | - <?php if ($child_collapse){ ?>checked="checked" <?php }?>
|
|
| 342 | - style="max-height:<?php echo $geodir_map_options['height'];?>;"> |
|
| 339 | + <div id="<?php echo $map_canvas_name; ?>_cat" |
|
| 340 | + class="<?php echo $map_canvas_name; ?>_map_category map_category" |
|
| 341 | + <?php if ($child_collapse) { ?>checked="checked" <?php }?>
|
|
| 342 | + style="max-height:<?php echo $geodir_map_options['height']; ?>;"> |
|
| 343 | 343 | <input |
| 344 | 344 | onkeydown="if(event.keyCode == 13){build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false)}"
|
| 345 | 345 | type="text" |
@@ -351,11 +351,11 @@ discard block |
||
| 351 | 351 | <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="1"/> |
| 352 | 352 | <?php } else {$child_collapse = "0";
|
| 353 | 353 | ?> |
| 354 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_child_collapse" value="0"/> |
|
| 354 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="0"/> |
|
| 355 | 355 | <?php } ?> |
| 356 | 356 | <input type="hidden" id="<?php echo $map_canvas_name; ?>_cat_enabled" value="1"/> |
| 357 | 357 | <div class="geodir_toggle"> |
| 358 | - <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'),0,true,0,$map_canvas_name,$child_collapse,true); ?> |
|
| 358 | + <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'), 0, true, 0, $map_canvas_name, $child_collapse, true); ?> |
|
| 359 | 359 | <script>jQuery( document ).ready(function() {
|
| 360 | 360 | geodir_show_sub_cat_collapse_button(); |
| 361 | 361 | });</script> |
@@ -384,21 +384,21 @@ discard block |
||
| 384 | 384 | $city = $country != 'me' ? $city : ''; |
| 385 | 385 | $gd_neighbourhood = $country != 'me' ? $gd_neighbourhood : ''; |
| 386 | 386 | ?> |
| 387 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/> |
|
| 388 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_country" name="gd_country" |
|
| 389 | - value="<?php echo $country;?>"/> |
|
| 390 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_region" name="gd_region" |
|
| 391 | - value="<?php echo $region;?>"/> |
|
| 392 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_city" name="gd_city" |
|
| 393 | - value="<?php echo $city;?>"/> |
|
| 394 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_neighbourhood" name="gd_neighbourhood" |
|
| 395 | - value="<?php echo $gd_neighbourhood;?>"/> |
|
| 387 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="1"/> |
|
| 388 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_country" name="gd_country" |
|
| 389 | + value="<?php echo $country; ?>"/> |
|
| 390 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_region" name="gd_region" |
|
| 391 | + value="<?php echo $region; ?>"/> |
|
| 392 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_city" name="gd_city" |
|
| 393 | + value="<?php echo $city; ?>"/> |
|
| 394 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_neighbourhood" name="gd_neighbourhood" |
|
| 395 | + value="<?php echo $gd_neighbourhood; ?>"/> |
|
| 396 | 396 | <?php } else { //end of location filter
|
| 397 | 397 | ?> |
| 398 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="0"/> |
|
| 398 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="0"/> |
|
| 399 | 399 | <?php }?> |
| 400 | 400 | |
| 401 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt;?>"/> |
|
| 401 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt; ?>"/> |
|
| 402 | 402 | |
| 403 | 403 | <input type="hidden" name="limitstart" value=""/> |
| 404 | 404 | |
@@ -415,8 +415,8 @@ discard block |
||
| 415 | 415 | } |
| 416 | 416 | if (count($map_post_types) > 1) {
|
| 417 | 417 | ?> |
| 418 | - <div class="map-places-listing" id="<?php echo $map_canvas_name;?>_posttype_menu" |
|
| 419 | - style="max-width:<?php echo $map_width;?>!important;"> |
|
| 418 | + <div class="map-places-listing" id="<?php echo $map_canvas_name; ?>_posttype_menu" |
|
| 419 | + style="max-width:<?php echo $map_width; ?>!important;"> |
|
| 420 | 420 | |
| 421 | 421 | <?php if (isset($geodir_map_options['is_geodir_home_map_widget']) && $map_args['is_geodir_home_map_widget']) { ?>
|
| 422 | 422 | <div class="geodir-map-posttype-list"><?php } ?> |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | foreach ($post_types as $post_type => $args) {
|
| 428 | 428 | if (!in_array($post_type, $exclude_post_types)) {
|
| 429 | 429 | $class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : ''; |
| 430 | - echo '<li id="' . $post_type . '" ' . $class . '><a href="javascript:void(0);" onclick="jQuery(\'#' . $map_canvas_name . '_posttype\').val(\'' . $post_type . '\');build_map_ajax_search_param(\'' . $map_canvas_name . '\', true)">' . __($args->labels->name, 'geodirectory') . '</a></li>'; |
|
| 430 | + echo '<li id="'.$post_type.'" '.$class.'><a href="javascript:void(0);" onclick="jQuery(\'#'.$map_canvas_name.'_posttype\').val(\''.$post_type.'\');build_map_ajax_search_param(\''.$map_canvas_name.'\', true)">'.__($args->labels->name, 'geodirectory').'</a></li>'; |
|
| 431 | 431 | } |
| 432 | 432 | } |
| 433 | 433 | ?> |
@@ -452,8 +452,8 @@ discard block |
||
| 452 | 452 | <script type="text/javascript"> |
| 453 | 453 | |
| 454 | 454 | jQuery(document).ready(function () {
|
| 455 | - build_map_ajax_search_param('<?php echo $map_canvas_name;?>', false);
|
|
| 456 | - map_sticky('<?php echo $map_canvas_name;?>');
|
|
| 455 | + build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false);
|
|
| 456 | + map_sticky('<?php echo $map_canvas_name; ?>');
|
|
| 457 | 457 | }); |
| 458 | 458 | |
| 459 | 459 | </script> |
@@ -464,18 +464,18 @@ discard block |
||
| 464 | 464 | <script> |
| 465 | 465 | (function () {
|
| 466 | 466 | var screenH = jQuery(window).height(); |
| 467 | - var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']);?>";
|
|
| 467 | + var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']); ?>";
|
|
| 468 | 468 | |
| 469 | 469 | var ptypeH = ''; |
| 470 | - if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {
|
|
| 471 | - ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();
|
|
| 470 | + if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {
|
|
| 471 | + ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();
|
|
| 472 | 472 | } |
| 473 | 473 | |
| 474 | - jQuery("#sticky_map_<?php echo $map_canvas_name;?>").css("min-height", screenH * (heightVH / 100) + 'px');
|
|
| 475 | - jQuery("#<?php echo $map_canvas_name;?>_wrapper").height(screenH * (heightVH / 100) + 'px');
|
|
| 476 | - jQuery("#<?php echo $map_canvas_name;?>").height(screenH * (heightVH / 100) + 'px');
|
|
| 477 | - jQuery("#<?php echo $map_canvas_name;?>_loading_div").height(screenH * (heightVH / 100) + 'px');
|
|
| 478 | - jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');
|
|
| 474 | + jQuery("#sticky_map_<?php echo $map_canvas_name; ?>").css("min-height", screenH * (heightVH / 100) + 'px');
|
|
| 475 | + jQuery("#<?php echo $map_canvas_name; ?>_wrapper").height(screenH * (heightVH / 100) + 'px');
|
|
| 476 | + jQuery("#<?php echo $map_canvas_name; ?>").height(screenH * (heightVH / 100) + 'px');
|
|
| 477 | + jQuery("#<?php echo $map_canvas_name; ?>_loading_div").height(screenH * (heightVH / 100) + 'px');
|
|
| 478 | + jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');
|
|
| 479 | 479 | |
| 480 | 480 | }()); |
| 481 | 481 | </script> |
@@ -487,13 +487,13 @@ discard block |
||
| 487 | 487 | <script> |
| 488 | 488 | (function () {
|
| 489 | 489 | var screenH = jQuery(window).height(); |
| 490 | - var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']);?>";
|
|
| 490 | + var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']); ?>";
|
|
| 491 | 491 | var ptypeH = ''; |
| 492 | - if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {
|
|
| 493 | - ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();
|
|
| 492 | + if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {
|
|
| 493 | + ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();
|
|
| 494 | 494 | } |
| 495 | 495 | |
| 496 | - jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", heightVH - ptypeH + 'px');
|
|
| 496 | + jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", heightVH - ptypeH + 'px');
|
|
| 497 | 497 | |
| 498 | 498 | }()); |
| 499 | 499 | </script> |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | * @param array $geodir_map_options Array of map settings. |
| 509 | 509 | * @param string $map_canvas_name The canvas name and ID for the map. |
| 510 | 510 | */ |
| 511 | - do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);
|
|
| 511 | + do_action('geodir_map_after_render', $geodir_map_options, $map_canvas_name);
|
|
| 512 | 512 | |
| 513 | 513 | |
| 514 | 514 | endif; // Exclude posttypes if end |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {
|
| 56 | 56 | |
| 57 | - if(isset($map_jason[$post->ID])){return null;}
|
|
| 57 | + if (isset($map_jason[$post->ID])) {return null; }
|
|
| 58 | 58 | |
| 59 | 59 | $srcharr = array("'", "/", "-", '"', '\\');
|
| 60 | 60 | $replarr = array("′", "⁄", "–", "“", '');
|
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $title = str_replace($srcharr, $replarr, $post_title); |
| 68 | 68 | |
| 69 | 69 | if (is_ssl()) {
|
| 70 | - $icon = str_replace("http:","https:",$icon );
|
|
| 70 | + $icon = str_replace("http:", "https:", $icon);
|
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | if ($icon != '') {
|
@@ -83,14 +83,14 @@ discard block |
||
| 83 | 83 | $icon_size = array('w' => 36, 'h' => 45);
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - $post_json = '{"id":"' . $post->ID
|
|
| 87 | - . '","t": "' . $title |
|
| 88 | - . '","lt": "' . $post->post_latitude |
|
| 89 | - . '","ln": "' . $post->post_longitude |
|
| 90 | - . '","mk_id":"' . $post->ID . '_' . $post->default_category |
|
| 91 | - . '","i":"' . $icon |
|
| 92 | - . '","w":"' . $icon_size['w'] |
|
| 93 | - . '","h":"' . $icon_size['h'] . '"}'; |
|
| 86 | + $post_json = '{"id":"'.$post->ID
|
|
| 87 | + . '","t": "'.$title |
|
| 88 | + . '","lt": "'.$post->post_latitude |
|
| 89 | + . '","ln": "'.$post->post_longitude |
|
| 90 | + . '","mk_id":"'.$post->ID.'_'.$post->default_category |
|
| 91 | + . '","i":"'.$icon |
|
| 92 | + . '","w":"'.$icon_size['w'] |
|
| 93 | + . '","h":"'.$icon_size['h'].'"}'; |
|
| 94 | 94 | |
| 95 | 95 | /** |
| 96 | 96 | * Filter the json data when creating output for post json marker.. |
@@ -99,10 +99,10 @@ discard block |
||
| 99 | 99 | * @param string $post_json JSON representation of the post marker info. |
| 100 | 100 | * @param object $post The post object. |
| 101 | 101 | */ |
| 102 | - $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
|
|
| 102 | + $post_map_json = apply_filters('geodir_create_marker_jason_of_posts', $post_json, $post);
|
|
| 103 | 103 | |
| 104 | 104 | // only assign it if it has a value |
| 105 | - if($post_map_json){
|
|
| 105 | + if ($post_map_json) {
|
|
| 106 | 106 | $map_jason[$post->ID] = $post_map_json; |
| 107 | 107 | } |
| 108 | 108 | |
@@ -126,13 +126,13 @@ discard block |
||
| 126 | 126 | if (is_array($map_jason) && !empty($map_jason)) {
|
| 127 | 127 | |
| 128 | 128 | // on details page only show the main marker on the map |
| 129 | - if(geodir_is_page('detail')){
|
|
| 129 | + if (geodir_is_page('detail')) {
|
|
| 130 | 130 | global $post; |
| 131 | - if(isset($map_jason[$post->ID])){
|
|
| 131 | + if (isset($map_jason[$post->ID])) {
|
|
| 132 | 132 | $map_jason = array($map_jason[$post->ID]); |
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | - $canvas_jason = $canvas . "_jason"; |
|
| 135 | + $canvas_jason = $canvas."_jason"; |
|
| 136 | 136 | $map_canvas_arr[$canvas] = array_unique($map_jason); |
| 137 | 137 | unset($cat_content_info); |
| 138 | 138 | $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
|
@@ -141,11 +141,11 @@ discard block |
||
| 141 | 141 | $json_content = substr(implode(',', $cat_content_info), 1);
|
| 142 | 142 | $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
|
| 143 | 143 | $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08 |
| 144 | - $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
|
|
| 144 | + $canvas_jason = '[{"totalcount":"'.$totalcount.'",'.$json_content.']';
|
|
| 145 | 145 | } else {
|
| 146 | 146 | $canvas_jason = '[{"totalcount":"0"}]';
|
| 147 | 147 | } |
| 148 | - $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 148 | + $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason); |
|
| 149 | 149 | |
| 150 | 150 | /** |
| 151 | 151 | * Filter the send_marker_jason_to_js() function map canvas json args. |
@@ -157,12 +157,12 @@ discard block |
||
| 157 | 157 | * @param string $canvas Map canvas array key. |
| 158 | 158 | * @param array $map_canvas_jason_args Map canvas args. |
| 159 | 159 | */ |
| 160 | - $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 160 | + $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);
|
|
| 161 | 161 | |
| 162 | - wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 162 | + wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);
|
|
| 163 | 163 | } else {
|
| 164 | 164 | $canvas_jason = '[{"totalcount":"0"}]';
|
| 165 | - $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 165 | + $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason); |
|
| 166 | 166 | |
| 167 | 167 | /** |
| 168 | 168 | * Filter the send_marker_jason_to_js() function map canvas json args. |
@@ -174,8 +174,8 @@ discard block |
||
| 174 | 174 | * @param string $canvas Map canvas array key. |
| 175 | 175 | * @param array $map_canvas_jason_args Map canvas args. |
| 176 | 176 | */ |
| 177 | - $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 178 | - wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 177 | + $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);
|
|
| 178 | + wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);
|
|
| 179 | 179 | } |
| 180 | 180 | } |
| 181 | 181 | |
@@ -240,11 +240,11 @@ discard block |
||
| 240 | 240 | $display = !$child_collapse ? '' : 'display:none'; |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | - $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 243 | + $out = '<ul class="treeview '.$list_class.'" style="margin-left:'.$p.'px;'.$display.';">'; |
|
| 244 | 244 | |
| 245 | 245 | $geodir_cat_icons = geodir_get_term_icon(); |
| 246 | 246 | |
| 247 | - $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
|
|
| 247 | + $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
|
|
| 248 | 248 | if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
|
| 249 | 249 | $geodir_default_map_search_pt = $homemap_catlist_ptype; |
| 250 | 250 | } |
@@ -259,23 +259,23 @@ discard block |
||
| 259 | 259 | |
| 260 | 260 | // Untick the category by default on home map |
| 261 | 261 | if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
|
| 262 | - if (geodir_wpml_is_taxonomy_translated($post_type . 'category')) { // if WPML
|
|
| 262 | + if (geodir_wpml_is_taxonomy_translated($post_type.'category')) { // if WPML
|
|
| 263 | 263 | global $sitepress; |
| 264 | 264 | $default_lang = $sitepress->get_default_language(); |
| 265 | 265 | $term_id = geodir_wpml_object_id($cat_term->term_id, $post_type.'category', true, $default_lang); |
| 266 | - }else{
|
|
| 266 | + } else {
|
|
| 267 | 267 | $term_id = $cat_term->term_id; |
| 268 | 268 | } |
| 269 | - if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
|
|
| 269 | + if (!empty($geodir_home_map_untick) && in_array($post_type.'_'.$term_id, $geodir_home_map_untick)) {
|
|
| 270 | 270 | $checked = ''; |
| 271 | 271 | } |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | - $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"'; |
|
| 275 | - $term_check .= ' name="' . $map_canvas_name . '_cat[]" '; |
|
| 276 | - $term_check .= ' title="' . esc_attr(geodir_utf8_ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">'; |
|
| 277 | - $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '"/>'; |
|
| 278 | - $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . geodir_utf8_ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>'; |
|
| 274 | + $term_check = '<input type="checkbox" '.$checked.' id="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'" class="group_selector '.$main_list_class.'"'; |
|
| 275 | + $term_check .= ' name="'.$map_canvas_name.'_cat[]" '; |
|
| 276 | + $term_check .= ' title="'.esc_attr(geodir_utf8_ucfirst($cat_term->name)).'" value="'.$cat_term->term_id.'" onclick="javascript:build_map_ajax_search_param(\''.$map_canvas_name.'\',false, this)">'; |
|
| 277 | + $term_img = '<img height="15" width="15" alt="'.$cat_term->taxonomy.'" src="'.$icon.'" title="'.geodir_utf8_ucfirst($cat_term->name).'"/>'; |
|
| 278 | + $out .= '<li>'.$term_check.'<label for="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'">'.$term_img.geodir_utf8_ucfirst($cat_term->name).'</label><i class="fa fa-long-arrow-down"></i>'; |
|
| 279 | 279 | |
| 280 | 280 | endif; |
| 281 | 281 | |
@@ -387,19 +387,19 @@ discard block |
||
| 387 | 387 | * @package GeoDirectory |
| 388 | 388 | */ |
| 389 | 389 | function geodir_map_load_script() {
|
| 390 | - if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'google-maps-api', 'done')) {
|
|
| 390 | + if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is('google-maps-api', 'done')) {
|
|
| 391 | 391 | $plugin_url = geodir_plugin_url(); |
| 392 | 392 | ?> |
| 393 | 393 | <script type="text/javascript"> |
| 394 | 394 | if (!(window.google && typeof google.maps !== 'undefined')) {
|
| 395 | - var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-style-css");css.setAttribute("href","<?php echo $plugin_url;?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION;?>");
|
|
| 395 | + var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-style-css");css.setAttribute("href","<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION; ?>");
|
|
| 396 | 396 | document.getElementsByTagName("head")[0].appendChild(css);
|
| 397 | - var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-routing-style");css.setAttribute("href","<?php echo $plugin_url;?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css?ver=<?php echo GEODIRECTORY_VERSION;?>");
|
|
| 397 | + var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-routing-style");css.setAttribute("href","<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css?ver=<?php echo GEODIRECTORY_VERSION; ?>");
|
|
| 398 | 398 | document.getElementsByTagName("head")[0].appendChild(css);
|
| 399 | - document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
|
|
| 400 | - document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/osm.geocode.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
|
|
| 401 | - document.write('<' + 'script id="geodirectory-leaflet-routing-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
|
|
| 402 | - document.write('<' + 'script id="geodirectory-o-overlappingmarker-script" src="<?php echo $plugin_url;?>/geodirectory-assets/jawj/oms-leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
|
|
| 399 | + document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
|
|
| 400 | + document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/osm.geocode.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
|
|
| 401 | + document.write('<' + 'script id="geodirectory-leaflet-routing-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
|
|
| 402 | + document.write('<' + 'script id="geodirectory-o-overlappingmarker-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/jawj/oms-leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
|
|
| 403 | 403 | } |
| 404 | 404 | </script> |
| 405 | 405 | <?php |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | /** |
| 11 | 11 | * Get All Plugin functions from WordPress |
| 12 | 12 | */ |
| 13 | -include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); |
|
| 13 | +include_once(ABSPATH.'wp-admin/includes/plugin.php'); |
|
| 14 | 14 | |
| 15 | 15 | /*-----------------------------------------------------------------------------------*/ |
| 16 | 16 | /* Helper functions */ |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | * @return string example url eg: http://wpgeo.directory/wp-content/plugins/geodirectory |
| 28 | 28 | */ |
| 29 | 29 | function geodir_plugin_url() {
|
| 30 | - return plugins_url( '', dirname( __FILE__ ) ); |
|
| 30 | + return plugins_url('', dirname(__FILE__));
|
|
| 31 | 31 | /* |
| 32 | 32 | if ( is_ssl() ) : |
| 33 | 33 | return str_replace( 'http://', 'https://', WP_PLUGIN_URL ) . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); |
@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | * @return string example url eg: /home/geo/public_html/wp-content/plugins/geodirectory |
| 48 | 48 | */ |
| 49 | 49 | function geodir_plugin_path() {
|
| 50 | - if ( defined( 'GD_TESTING_MODE' ) && GD_TESTING_MODE ) {
|
|
| 51 | - return dirname( dirname( __FILE__ ) ); |
|
| 50 | + if (defined('GD_TESTING_MODE') && GD_TESTING_MODE) {
|
|
| 51 | + return dirname(dirname(__FILE__)); |
|
| 52 | 52 | } else {
|
| 53 | - return WP_PLUGIN_DIR . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); |
|
| 53 | + return WP_PLUGIN_DIR."/".plugin_basename(dirname(dirname(__FILE__))); |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
@@ -65,10 +65,10 @@ discard block |
||
| 65 | 65 | * @return bool true or false. |
| 66 | 66 | * @todo check if this is faster than normal WP check and remove if not. |
| 67 | 67 | */ |
| 68 | -function geodir_is_plugin_active( $plugin ) {
|
|
| 69 | - $active_plugins = get_option( 'active_plugins' ); |
|
| 70 | - foreach ( $active_plugins as $key => $active_plugin ) {
|
|
| 71 | - if ( strstr( $active_plugin, $plugin ) ) {
|
|
| 68 | +function geodir_is_plugin_active($plugin) {
|
|
| 69 | + $active_plugins = get_option('active_plugins');
|
|
| 70 | + foreach ($active_plugins as $key => $active_plugin) {
|
|
| 71 | + if (strstr($active_plugin, $plugin)) {
|
|
| 72 | 72 | return true; |
| 73 | 73 | } |
| 74 | 74 | } |
@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | * |
| 91 | 91 | * @return bool|int|string the formatted date. |
| 92 | 92 | */ |
| 93 | -function geodir_get_formated_date( $date ) {
|
|
| 94 | - return mysql2date( get_option( 'date_format' ), $date ); |
|
| 93 | +function geodir_get_formated_date($date) {
|
|
| 94 | + return mysql2date(get_option('date_format'), $date);
|
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | /** |
@@ -107,8 +107,8 @@ discard block |
||
| 107 | 107 | * |
| 108 | 108 | * @return bool|int|string the formatted time. |
| 109 | 109 | */ |
| 110 | -function geodir_get_formated_time( $time ) {
|
|
| 111 | - return mysql2date( get_option( 'time_format' ), $time, $translate = true ); |
|
| 110 | +function geodir_get_formated_time($time) {
|
|
| 111 | + return mysql2date(get_option('time_format'), $time, $translate = true);
|
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | |
@@ -126,35 +126,35 @@ discard block |
||
| 126 | 126 | * |
| 127 | 127 | * @return string Formatted link. |
| 128 | 128 | */ |
| 129 | -function geodir_getlink( $url, $params = array(), $use_existing_arguments = false ) {
|
|
| 130 | - if ( $use_existing_arguments ) {
|
|
| 129 | +function geodir_getlink($url, $params = array(), $use_existing_arguments = false) {
|
|
| 130 | + if ($use_existing_arguments) {
|
|
| 131 | 131 | $params = $params + $_GET; |
| 132 | 132 | } |
| 133 | - if ( ! $params ) {
|
|
| 133 | + if (!$params) {
|
|
| 134 | 134 | return $url; |
| 135 | 135 | } |
| 136 | 136 | $link = $url; |
| 137 | - if ( strpos( $link, '?' ) === false ) {
|
|
| 137 | + if (strpos($link, '?') === false) {
|
|
| 138 | 138 | $link .= '?'; |
| 139 | 139 | } //If there is no '?' add one at the end |
| 140 | - elseif ( strpos( $link, '//maps.google.com/maps/api/js?language=' ) ) {
|
|
| 140 | + elseif (strpos($link, '//maps.google.com/maps/api/js?language=')) {
|
|
| 141 | 141 | $link .= '&'; |
| 142 | 142 | } //If there is no '&' at the END, add one. |
| 143 | - elseif ( ! preg_match( '/(\?|\&(amp;)?)$/', $link ) ) {
|
|
| 143 | + elseif (!preg_match('/(\?|\&(amp;)?)$/', $link)) {
|
|
| 144 | 144 | $link .= '&'; |
| 145 | 145 | } //If there is no '&' at the END, add one. |
| 146 | 146 | |
| 147 | 147 | $params_arr = array(); |
| 148 | - foreach ( $params as $key => $value ) {
|
|
| 149 | - if ( gettype( $value ) == 'array' ) { //Handle array data properly
|
|
| 150 | - foreach ( $value as $val ) {
|
|
| 151 | - $params_arr[] = $key . '[]=' . urlencode( $val ); |
|
| 148 | + foreach ($params as $key => $value) {
|
|
| 149 | + if (gettype($value) == 'array') { //Handle array data properly
|
|
| 150 | + foreach ($value as $val) {
|
|
| 151 | + $params_arr[] = $key.'[]='.urlencode($val); |
|
| 152 | 152 | } |
| 153 | 153 | } else {
|
| 154 | - $params_arr[] = $key . '=' . urlencode( $value ); |
|
| 154 | + $params_arr[] = $key.'='.urlencode($value); |
|
| 155 | 155 | } |
| 156 | 156 | } |
| 157 | - $link .= implode( '&', $params_arr ); |
|
| 157 | + $link .= implode('&', $params_arr);
|
|
| 158 | 158 | |
| 159 | 159 | return $link; |
| 160 | 160 | } |
@@ -171,18 +171,18 @@ discard block |
||
| 171 | 171 | * |
| 172 | 172 | * @return string Listing page url if valid. Otherwise home url will be returned. |
| 173 | 173 | */ |
| 174 | -function geodir_get_addlisting_link( $post_type = '' ) {
|
|
| 174 | +function geodir_get_addlisting_link($post_type = '') {
|
|
| 175 | 175 | global $wpdb; |
| 176 | 176 | |
| 177 | 177 | //$check_pkg = $wpdb->get_var("SELECT pid FROM ".GEODIR_PRICE_TABLE." WHERE post_type='".$post_type."' and status != '0'");
|
| 178 | 178 | $check_pkg = 1; |
| 179 | - if ( post_type_exists( $post_type ) && $check_pkg ) {
|
|
| 179 | + if (post_type_exists($post_type) && $check_pkg) {
|
|
| 180 | 180 | |
| 181 | - $add_listing_link = get_page_link( geodir_add_listing_page_id() ); |
|
| 181 | + $add_listing_link = get_page_link(geodir_add_listing_page_id()); |
|
| 182 | 182 | |
| 183 | - return esc_url( add_query_arg( array( 'listing_type' => $post_type ), $add_listing_link ) ); |
|
| 183 | + return esc_url(add_query_arg(array('listing_type' => $post_type), $add_listing_link));
|
|
| 184 | 184 | } else {
|
| 185 | - return get_bloginfo( 'url' ); |
|
| 185 | + return get_bloginfo('url');
|
|
| 186 | 186 | } |
| 187 | 187 | } |
| 188 | 188 | |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | if (!empty($_SERVER['PHP_SELF']) && !empty($_SERVER['REQUEST_URI'])) {
|
| 211 | 211 | // To build the entire URI we need to prepend the protocol, and the http host |
| 212 | 212 | // to the URI string. |
| 213 | - $pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; |
|
| 213 | + $pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; |
|
| 214 | 214 | } else {
|
| 215 | 215 | /* |
| 216 | 216 | * Since we do not have REQUEST_URI to work with, we will assume we are |
@@ -219,11 +219,11 @@ discard block |
||
| 219 | 219 | * |
| 220 | 220 | * IIS uses the SCRIPT_NAME variable instead of a REQUEST_URI variable... thanks, MS |
| 221 | 221 | */ |
| 222 | - $pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']; |
|
| 222 | + $pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']; |
|
| 223 | 223 | |
| 224 | 224 | // If the query string exists append it to the URI string |
| 225 | 225 | if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
|
| 226 | - $pageURL .= '?' . $_SERVER['QUERY_STRING']; |
|
| 226 | + $pageURL .= '?'.$_SERVER['QUERY_STRING']; |
|
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | * |
| 235 | 235 | * @param string $pageURL The URL of the current page. |
| 236 | 236 | */ |
| 237 | - return apply_filters( 'geodir_curPageURL', $pageURL ); |
|
| 237 | + return apply_filters('geodir_curPageURL', $pageURL);
|
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | /** |
@@ -249,12 +249,12 @@ discard block |
||
| 249 | 249 | * |
| 250 | 250 | * @return string Cleaned variable. |
| 251 | 251 | */ |
| 252 | -function geodir_clean( $string ) {
|
|
| 252 | +function geodir_clean($string) {
|
|
| 253 | 253 | |
| 254 | - $string = trim( strip_tags( stripslashes( $string ) ) ); |
|
| 255 | - $string = str_replace( " ", "-", $string ); // Replaces all spaces with hyphens. |
|
| 256 | - $string = preg_replace( '/[^A-Za-z0-9\-\_]/', '', $string ); // Removes special chars. |
|
| 257 | - $string = preg_replace( '/-+/', '-', $string ); // Replaces multiple hyphens with single one. |
|
| 254 | + $string = trim(strip_tags(stripslashes($string))); |
|
| 255 | + $string = str_replace(" ", "-", $string); // Replaces all spaces with hyphens.
|
|
| 256 | + $string = preg_replace('/[^A-Za-z0-9\-\_]/', '', $string); // Removes special chars.
|
|
| 257 | + $string = preg_replace('/-+/', '-', $string); // Replaces multiple hyphens with single one.
|
|
| 258 | 258 | |
| 259 | 259 | return $string; |
| 260 | 260 | } |
@@ -268,13 +268,13 @@ discard block |
||
| 268 | 268 | */ |
| 269 | 269 | function geodir_get_weekday() {
|
| 270 | 270 | return array( |
| 271 | - __( 'Sunday', 'geodirectory' ), |
|
| 272 | - __( 'Monday', 'geodirectory' ), |
|
| 273 | - __( 'Tuesday', 'geodirectory' ), |
|
| 274 | - __( 'Wednesday', 'geodirectory' ), |
|
| 275 | - __( 'Thursday', 'geodirectory' ), |
|
| 276 | - __( 'Friday', 'geodirectory' ), |
|
| 277 | - __( 'Saturday', 'geodirectory' ) |
|
| 271 | + __('Sunday', 'geodirectory'),
|
|
| 272 | + __('Monday', 'geodirectory'),
|
|
| 273 | + __('Tuesday', 'geodirectory'),
|
|
| 274 | + __('Wednesday', 'geodirectory'),
|
|
| 275 | + __('Thursday', 'geodirectory'),
|
|
| 276 | + __('Friday', 'geodirectory'),
|
|
| 277 | + __('Saturday', 'geodirectory')
|
|
| 278 | 278 | ); |
| 279 | 279 | } |
| 280 | 280 | |
@@ -287,11 +287,11 @@ discard block |
||
| 287 | 287 | */ |
| 288 | 288 | function geodir_get_weeks() {
|
| 289 | 289 | return array( |
| 290 | - __( 'First', 'geodirectory' ), |
|
| 291 | - __( 'Second', 'geodirectory' ), |
|
| 292 | - __( 'Third', 'geodirectory' ), |
|
| 293 | - __( 'Fourth', 'geodirectory' ), |
|
| 294 | - __( 'Last', 'geodirectory' ) |
|
| 290 | + __('First', 'geodirectory'),
|
|
| 291 | + __('Second', 'geodirectory'),
|
|
| 292 | + __('Third', 'geodirectory'),
|
|
| 293 | + __('Fourth', 'geodirectory'),
|
|
| 294 | + __('Last', 'geodirectory')
|
|
| 295 | 295 | ); |
| 296 | 296 | } |
| 297 | 297 | |
@@ -310,112 +310,112 @@ discard block |
||
| 310 | 310 | * |
| 311 | 311 | * @return bool If valid returns true. Otherwise false. |
| 312 | 312 | */ |
| 313 | -function geodir_is_page( $gdpage = '' ) {
|
|
| 313 | +function geodir_is_page($gdpage = '') {
|
|
| 314 | 314 | |
| 315 | 315 | global $wp_query, $post, $wp; |
| 316 | 316 | //if(!is_admin()): |
| 317 | 317 | |
| 318 | - switch ( $gdpage ): |
|
| 318 | + switch ($gdpage): |
|
| 319 | 319 | case 'add-listing': |
| 320 | 320 | |
| 321 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_add_listing_page_id() ) {
|
|
| 321 | + if (is_page() && get_query_var('page_id') == geodir_add_listing_page_id()) {
|
|
| 322 | 322 | return true; |
| 323 | - } elseif ( is_page() && isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
|
|
| 323 | + } elseif (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
|
|
| 324 | 324 | return true; |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | break; |
| 328 | 328 | case 'preview': |
| 329 | - if ( ( is_page() && get_query_var( 'page_id' ) == geodir_preview_page_id() ) && isset( $_REQUEST['listing_type'] ) |
|
| 330 | - && in_array( $_REQUEST['listing_type'], geodir_get_posttypes() ) |
|
| 329 | + if ((is_page() && get_query_var('page_id') == geodir_preview_page_id()) && isset($_REQUEST['listing_type'])
|
|
| 330 | + && in_array($_REQUEST['listing_type'], geodir_get_posttypes()) |
|
| 331 | 331 | ) {
|
| 332 | 332 | return true; |
| 333 | 333 | } |
| 334 | 334 | break; |
| 335 | 335 | case 'listing-success': |
| 336 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_success_page_id() ) {
|
|
| 336 | + if (is_page() && get_query_var('page_id') == geodir_success_page_id()) {
|
|
| 337 | 337 | return true; |
| 338 | 338 | } |
| 339 | 339 | break; |
| 340 | 340 | case 'detail': |
| 341 | - $post_type = get_query_var( 'post_type' ); |
|
| 342 | - if ( is_array( $post_type ) ) {
|
|
| 343 | - $post_type = reset( $post_type ); |
|
| 341 | + $post_type = get_query_var('post_type');
|
|
| 342 | + if (is_array($post_type)) {
|
|
| 343 | + $post_type = reset($post_type); |
|
| 344 | 344 | } |
| 345 | - if ( is_single() && in_array( $post_type, geodir_get_posttypes() ) ) {
|
|
| 345 | + if (is_single() && in_array($post_type, geodir_get_posttypes())) {
|
|
| 346 | 346 | return true; |
| 347 | 347 | } |
| 348 | 348 | break; |
| 349 | 349 | case 'pt': |
| 350 | - $post_type = get_query_var( 'post_type' ); |
|
| 351 | - if ( is_array( $post_type ) ) {
|
|
| 352 | - $post_type = reset( $post_type ); |
|
| 350 | + $post_type = get_query_var('post_type');
|
|
| 351 | + if (is_array($post_type)) {
|
|
| 352 | + $post_type = reset($post_type); |
|
| 353 | 353 | } |
| 354 | - if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) && ! is_tax() ) {
|
|
| 354 | + if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes()) && !is_tax()) {
|
|
| 355 | 355 | return true; |
| 356 | 356 | } |
| 357 | 357 | |
| 358 | 358 | break; |
| 359 | 359 | case 'listing': |
| 360 | - if ( is_tax() && geodir_get_taxonomy_posttype() ) {
|
|
| 360 | + if (is_tax() && geodir_get_taxonomy_posttype()) {
|
|
| 361 | 361 | global $current_term, $taxonomy, $term; |
| 362 | 362 | |
| 363 | 363 | return true; |
| 364 | 364 | } |
| 365 | - $post_type = get_query_var( 'post_type' ); |
|
| 366 | - if ( is_array( $post_type ) ) {
|
|
| 367 | - $post_type = reset( $post_type ); |
|
| 365 | + $post_type = get_query_var('post_type');
|
|
| 366 | + if (is_array($post_type)) {
|
|
| 367 | + $post_type = reset($post_type); |
|
| 368 | 368 | } |
| 369 | - if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) ) {
|
|
| 369 | + if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes())) {
|
|
| 370 | 370 | return true; |
| 371 | 371 | } |
| 372 | 372 | |
| 373 | 373 | break; |
| 374 | 374 | case 'home': |
| 375 | 375 | |
| 376 | - if ( ( is_page() && get_query_var( 'page_id' ) == geodir_home_page_id() ) || is_page_geodir_home() ) {
|
|
| 376 | + if ((is_page() && get_query_var('page_id') == geodir_home_page_id()) || is_page_geodir_home()) {
|
|
| 377 | 377 | return true; |
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | break; |
| 381 | 381 | case 'location': |
| 382 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_location_page_id() ) {
|
|
| 382 | + if (is_page() && get_query_var('page_id') == geodir_location_page_id()) {
|
|
| 383 | 383 | return true; |
| 384 | 384 | } |
| 385 | 385 | break; |
| 386 | 386 | case 'author': |
| 387 | - if ( is_author() && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 387 | + if (is_author() && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 388 | 388 | return true; |
| 389 | 389 | } |
| 390 | 390 | |
| 391 | - if ( function_exists( 'bp_loggedin_user_id' ) && function_exists( 'bp_displayed_user_id' ) && $my_id = (int) bp_loggedin_user_id() ) {
|
|
| 392 | - if ( ( (bool) bp_is_current_component( 'listings' ) || (bool) bp_is_current_component( 'favorites' ) ) && $my_id > 0 && $my_id == (int) bp_displayed_user_id() ) {
|
|
| 391 | + if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int) bp_loggedin_user_id()) {
|
|
| 392 | + if (((bool) bp_is_current_component('listings') || (bool) bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int) bp_displayed_user_id()) {
|
|
| 393 | 393 | return true; |
| 394 | 394 | } |
| 395 | 395 | } |
| 396 | 396 | break; |
| 397 | 397 | case 'search': |
| 398 | - if ( is_search() && isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 398 | + if (is_search() && isset($_REQUEST['geodir_search'])) {
|
|
| 399 | 399 | return true; |
| 400 | 400 | } |
| 401 | 401 | break; |
| 402 | 402 | case 'info': |
| 403 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_info_page_id() ) {
|
|
| 403 | + if (is_page() && get_query_var('page_id') == geodir_info_page_id()) {
|
|
| 404 | 404 | return true; |
| 405 | 405 | } |
| 406 | 406 | break; |
| 407 | 407 | case 'login': |
| 408 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_login_page_id() ) {
|
|
| 408 | + if (is_page() && get_query_var('page_id') == geodir_login_page_id()) {
|
|
| 409 | 409 | return true; |
| 410 | 410 | } |
| 411 | 411 | break; |
| 412 | 412 | case 'checkout': |
| 413 | - if ( is_page() && function_exists( 'geodir_payment_checkout_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_checkout_page_id() ) {
|
|
| 413 | + if (is_page() && function_exists('geodir_payment_checkout_page_id') && get_query_var('page_id') == geodir_payment_checkout_page_id()) {
|
|
| 414 | 414 | return true; |
| 415 | 415 | } |
| 416 | 416 | break; |
| 417 | 417 | case 'invoices': |
| 418 | - if ( is_page() && function_exists( 'geodir_payment_invoices_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_invoices_page_id() ) {
|
|
| 418 | + if (is_page() && function_exists('geodir_payment_invoices_page_id') && get_query_var('page_id') == geodir_payment_invoices_page_id()) {
|
|
| 419 | 419 | return true; |
| 420 | 420 | } |
| 421 | 421 | break; |
@@ -440,25 +440,25 @@ discard block |
||
| 440 | 440 | * |
| 441 | 441 | * @param object $wp WordPress object. |
| 442 | 442 | */ |
| 443 | -function geodir_set_is_geodir_page( $wp ) {
|
|
| 444 | - if ( ! is_admin() ) {
|
|
| 443 | +function geodir_set_is_geodir_page($wp) {
|
|
| 444 | + if (!is_admin()) {
|
|
| 445 | 445 | //$wp->query_vars['gd_is_geodir_page'] = false; |
| 446 | 446 | //print_r() |
| 447 | - if ( empty( $wp->query_vars ) || ! array_diff( array_keys( $wp->query_vars ), array( |
|
| 447 | + if (empty($wp->query_vars) || !array_diff(array_keys($wp->query_vars), array( |
|
| 448 | 448 | 'preview', |
| 449 | 449 | 'page', |
| 450 | 450 | 'paged', |
| 451 | 451 | 'cpage' |
| 452 | - ) ) |
|
| 452 | + )) |
|
| 453 | 453 | ) {
|
| 454 | - if ( geodir_is_page( 'home' ) ) {
|
|
| 454 | + if (geodir_is_page('home')) {
|
|
| 455 | 455 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 456 | 456 | } |
| 457 | 457 | |
| 458 | 458 | |
| 459 | 459 | } |
| 460 | 460 | |
| 461 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['page_id'] ) ) {
|
|
| 461 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['page_id'])) {
|
|
| 462 | 462 | if ( |
| 463 | 463 | $wp->query_vars['page_id'] == geodir_add_listing_page_id() |
| 464 | 464 | || $wp->query_vars['page_id'] == geodir_preview_page_id() |
@@ -467,26 +467,26 @@ discard block |
||
| 467 | 467 | || $wp->query_vars['page_id'] == geodir_home_page_id() |
| 468 | 468 | || $wp->query_vars['page_id'] == geodir_info_page_id() |
| 469 | 469 | || $wp->query_vars['page_id'] == geodir_login_page_id() |
| 470 | - || ( function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() ) |
|
| 471 | - || ( function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() ) |
|
| 470 | + || (function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())
|
|
| 471 | + || (function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())
|
|
| 472 | 472 | ) {
|
| 473 | 473 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 474 | 474 | } |
| 475 | 475 | } |
| 476 | 476 | |
| 477 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['pagename'] ) ) {
|
|
| 478 | - $page = get_page_by_path( $wp->query_vars['pagename'] ); |
|
| 477 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['pagename'])) {
|
|
| 478 | + $page = get_page_by_path($wp->query_vars['pagename']); |
|
| 479 | 479 | |
| 480 | - if ( ! empty( $page ) && ( |
|
| 480 | + if (!empty($page) && ( |
|
| 481 | 481 | $page->ID == geodir_add_listing_page_id() |
| 482 | 482 | || $page->ID == geodir_preview_page_id() |
| 483 | 483 | || $page->ID == geodir_success_page_id() |
| 484 | 484 | || $page->ID == geodir_location_page_id() |
| 485 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_home_page_id() ) |
|
| 486 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_info_page_id() ) |
|
| 487 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_login_page_id() ) |
|
| 488 | - || ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() ) |
|
| 489 | - || ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() ) |
|
| 485 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_home_page_id()) |
|
| 486 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_info_page_id()) |
|
| 487 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_login_page_id()) |
|
| 488 | + || (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())
|
|
| 489 | + || (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())
|
|
| 490 | 490 | ) |
| 491 | 491 | ) {
|
| 492 | 492 | $wp->query_vars['gd_is_geodir_page'] = true; |
@@ -494,20 +494,20 @@ discard block |
||
| 494 | 494 | } |
| 495 | 495 | |
| 496 | 496 | |
| 497 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['post_type'] ) && $wp->query_vars['post_type'] != '' ) {
|
|
| 497 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {
|
|
| 498 | 498 | $requested_post_type = $wp->query_vars['post_type']; |
| 499 | 499 | // check if this post type is geodirectory post types |
| 500 | 500 | $post_type_array = geodir_get_posttypes(); |
| 501 | - if ( in_array( $requested_post_type, $post_type_array ) ) {
|
|
| 501 | + if (in_array($requested_post_type, $post_type_array)) {
|
|
| 502 | 502 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 503 | 503 | } |
| 504 | 504 | } |
| 505 | 505 | |
| 506 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) ) {
|
|
| 507 | - $geodir_taxonomis = geodir_get_taxonomies( '', true ); |
|
| 508 | - if ( ! empty( $geodir_taxonomis ) ) {
|
|
| 509 | - foreach ( $geodir_taxonomis as $taxonomy ) {
|
|
| 510 | - if ( array_key_exists( $taxonomy, $wp->query_vars ) ) {
|
|
| 506 | + if (!isset($wp->query_vars['gd_is_geodir_page'])) {
|
|
| 507 | + $geodir_taxonomis = geodir_get_taxonomies('', true);
|
|
| 508 | + if (!empty($geodir_taxonomis)) {
|
|
| 509 | + foreach ($geodir_taxonomis as $taxonomy) {
|
|
| 510 | + if (array_key_exists($taxonomy, $wp->query_vars)) {
|
|
| 511 | 511 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 512 | 512 | break; |
| 513 | 513 | } |
@@ -516,20 +516,20 @@ discard block |
||
| 516 | 516 | |
| 517 | 517 | } |
| 518 | 518 | |
| 519 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['author_name'] ) && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 519 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['author_name']) && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 520 | 520 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 521 | 521 | } |
| 522 | 522 | |
| 523 | 523 | |
| 524 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 524 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($_REQUEST['geodir_search'])) {
|
|
| 525 | 525 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 526 | 526 | } |
| 527 | 527 | |
| 528 | 528 | |
| 529 | 529 | //check if homepage |
| 530 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) |
|
| 531 | - && ! isset( $wp->query_vars['page_id'] ) |
|
| 532 | - && ! isset( $wp->query_vars['pagename'] ) |
|
| 530 | + if (!isset($wp->query_vars['gd_is_geodir_page']) |
|
| 531 | + && !isset($wp->query_vars['page_id']) |
|
| 532 | + && !isset($wp->query_vars['pagename']) |
|
| 533 | 533 | && is_page_geodir_home() |
| 534 | 534 | ) {
|
| 535 | 535 | $wp->query_vars['gd_is_geodir_page'] = true; |
@@ -553,14 +553,14 @@ discard block |
||
| 553 | 553 | */ |
| 554 | 554 | function geodir_is_geodir_page() {
|
| 555 | 555 | global $wp; |
| 556 | - if ( isset( $wp->query_vars['gd_is_geodir_page'] ) && $wp->query_vars['gd_is_geodir_page'] ) {
|
|
| 556 | + if (isset($wp->query_vars['gd_is_geodir_page']) && $wp->query_vars['gd_is_geodir_page']) {
|
|
| 557 | 557 | return true; |
| 558 | 558 | } else {
|
| 559 | 559 | return false; |
| 560 | 560 | } |
| 561 | 561 | } |
| 562 | 562 | |
| 563 | -if ( ! function_exists( 'geodir_get_imagesize' ) ) {
|
|
| 563 | +if (!function_exists('geodir_get_imagesize')) {
|
|
| 564 | 564 | /** |
| 565 | 565 | * Get image size using the size key . |
| 566 | 566 | * |
@@ -571,13 +571,13 @@ discard block |
||
| 571 | 571 | * |
| 572 | 572 | * @return array|mixed|void|WP_Error If valid returns image size. Else returns error. |
| 573 | 573 | */ |
| 574 | - function geodir_get_imagesize( $size = '' ) {
|
|
| 574 | + function geodir_get_imagesize($size = '') {
|
|
| 575 | 575 | |
| 576 | 576 | $imagesizes = array( |
| 577 | - 'list-thumb' => array( 'w' => 283, 'h' => 188 ), |
|
| 578 | - 'thumbnail' => array( 'w' => 125, 'h' => 125 ), |
|
| 579 | - 'widget-thumb' => array( 'w' => 50, 'h' => 50 ), |
|
| 580 | - 'slider-thumb' => array( 'w' => 100, 'h' => 100 ) |
|
| 577 | + 'list-thumb' => array('w' => 283, 'h' => 188),
|
|
| 578 | + 'thumbnail' => array('w' => 125, 'h' => 125),
|
|
| 579 | + 'widget-thumb' => array('w' => 50, 'h' => 50),
|
|
| 580 | + 'slider-thumb' => array('w' => 100, 'h' => 100)
|
|
| 581 | 581 | ); |
| 582 | 582 | |
| 583 | 583 | /** |
@@ -587,9 +587,9 @@ discard block |
||
| 587 | 587 | * |
| 588 | 588 | * @param array $imagesizes Image size array. |
| 589 | 589 | */ |
| 590 | - $imagesizes = apply_filters( 'geodir_imagesizes', $imagesizes ); |
|
| 590 | + $imagesizes = apply_filters('geodir_imagesizes', $imagesizes);
|
|
| 591 | 591 | |
| 592 | - if ( ! empty( $size ) && array_key_exists( $size, $imagesizes ) ) {
|
|
| 592 | + if (!empty($size) && array_key_exists($size, $imagesizes)) {
|
|
| 593 | 593 | /** |
| 594 | 594 | * Filters image size of the passed key. |
| 595 | 595 | * |
@@ -597,11 +597,11 @@ discard block |
||
| 597 | 597 | * |
| 598 | 598 | * @param array $imagesizes [$size] Image size array of the passed key. |
| 599 | 599 | */ |
| 600 | - return apply_filters( 'geodir_get_imagesize_' . $size, $imagesizes[ $size ] ); |
|
| 600 | + return apply_filters('geodir_get_imagesize_'.$size, $imagesizes[$size]);
|
|
| 601 | 601 | |
| 602 | - } elseif ( ! empty( $size ) ) {
|
|
| 602 | + } elseif (!empty($size)) {
|
|
| 603 | 603 | |
| 604 | - return new WP_Error( 'geodir_no_imagesize', __( "Given image size is not valid", 'geodirectory' ) ); |
|
| 604 | + return new WP_Error('geodir_no_imagesize', __("Given image size is not valid", 'geodirectory'));
|
|
| 605 | 605 | |
| 606 | 606 | } |
| 607 | 607 | |
@@ -625,7 +625,7 @@ discard block |
||
| 625 | 625 | */ |
| 626 | 626 | |
| 627 | 627 | |
| 628 | -if ( ! function_exists( 'createRandomString' ) ) {
|
|
| 628 | +if (!function_exists('createRandomString')) {
|
|
| 629 | 629 | /** |
| 630 | 630 | * Creates random string. |
| 631 | 631 | * |
@@ -635,21 +635,21 @@ discard block |
||
| 635 | 635 | */ |
| 636 | 636 | function createRandomString() {
|
| 637 | 637 | $chars = "abcdefghijkmlnopqrstuvwxyz1023456789"; |
| 638 | - srand( (double) microtime() * 1000000 ); |
|
| 638 | + srand((double) microtime() * 1000000); |
|
| 639 | 639 | $i = 0; |
| 640 | 640 | $rstring = ''; |
| 641 | - while ( $i <= 25 ) {
|
|
| 641 | + while ($i <= 25) {
|
|
| 642 | 642 | $num = rand() % 33; |
| 643 | - $tmp = substr( $chars, $num, 1 ); |
|
| 644 | - $rstring = $rstring . $tmp; |
|
| 645 | - $i ++; |
|
| 643 | + $tmp = substr($chars, $num, 1); |
|
| 644 | + $rstring = $rstring.$tmp; |
|
| 645 | + $i++; |
|
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | return $rstring; |
| 649 | 649 | } |
| 650 | 650 | } |
| 651 | 651 | |
| 652 | -if ( ! function_exists( 'geodir_getDistanceRadius' ) ) {
|
|
| 652 | +if (!function_exists('geodir_getDistanceRadius')) {
|
|
| 653 | 653 | /** |
| 654 | 654 | * Calculates the distance radius. |
| 655 | 655 | * |
@@ -660,9 +660,9 @@ discard block |
||
| 660 | 660 | * |
| 661 | 661 | * @return float The mean radius. |
| 662 | 662 | */ |
| 663 | - function geodir_getDistanceRadius( $uom = 'km' ) {
|
|
| 663 | + function geodir_getDistanceRadius($uom = 'km') {
|
|
| 664 | 664 | // Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude |
| 665 | - switch ( geodir_strtolower( $uom ) ): |
|
| 665 | + switch (geodir_strtolower($uom)): |
|
| 666 | 666 | case 'km' : |
| 667 | 667 | $earthMeanRadius = 6371.009; // km |
| 668 | 668 | break; |
@@ -694,7 +694,7 @@ discard block |
||
| 694 | 694 | } |
| 695 | 695 | |
| 696 | 696 | |
| 697 | -if ( ! function_exists( 'geodir_calculateDistanceFromLatLong' ) ) {
|
|
| 697 | +if (!function_exists('geodir_calculateDistanceFromLatLong')) {
|
|
| 698 | 698 | /** |
| 699 | 699 | * Calculate the great circle distance between two points identified by longitude and latitude. |
| 700 | 700 | * |
@@ -707,17 +707,17 @@ discard block |
||
| 707 | 707 | * |
| 708 | 708 | * @return float The distance. |
| 709 | 709 | */ |
| 710 | - function geodir_calculateDistanceFromLatLong( $point1, $point2, $uom = 'km' ) {
|
|
| 710 | + function geodir_calculateDistanceFromLatLong($point1, $point2, $uom = 'km') {
|
|
| 711 | 711 | // Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude |
| 712 | 712 | |
| 713 | - $earthMeanRadius = geodir_getDistanceRadius( $uom ); |
|
| 713 | + $earthMeanRadius = geodir_getDistanceRadius($uom); |
|
| 714 | 714 | |
| 715 | - $deltaLatitude = deg2rad( (float) $point2['latitude'] - (float) $point1['latitude'] ); |
|
| 716 | - $deltaLongitude = deg2rad( (float) $point2['longitude'] - (float) $point1['longitude'] ); |
|
| 717 | - $a = sin( $deltaLatitude / 2 ) * sin( $deltaLatitude / 2 ) + |
|
| 718 | - cos( deg2rad( (float) $point1['latitude'] ) ) * cos( deg2rad( (float) $point2['latitude'] ) ) * |
|
| 719 | - sin( $deltaLongitude / 2 ) * sin( $deltaLongitude / 2 ); |
|
| 720 | - $c = 2 * atan2( sqrt( $a ), sqrt( 1 - $a ) ); |
|
| 715 | + $deltaLatitude = deg2rad((float) $point2['latitude'] - (float) $point1['latitude']); |
|
| 716 | + $deltaLongitude = deg2rad((float) $point2['longitude'] - (float) $point1['longitude']); |
|
| 717 | + $a = sin($deltaLatitude / 2) * sin($deltaLatitude / 2) + |
|
| 718 | + cos(deg2rad((float) $point1['latitude'])) * cos(deg2rad((float) $point2['latitude'])) * |
|
| 719 | + sin($deltaLongitude / 2) * sin($deltaLongitude / 2); |
|
| 720 | + $c = 2 * atan2(sqrt($a), sqrt(1 - $a)); |
|
| 721 | 721 | $distance = $earthMeanRadius * $c; |
| 722 | 722 | |
| 723 | 723 | return $distance; |
@@ -726,7 +726,7 @@ discard block |
||
| 726 | 726 | } |
| 727 | 727 | |
| 728 | 728 | |
| 729 | -if ( ! function_exists( 'geodir_sendEmail' ) ) {
|
|
| 729 | +if (!function_exists('geodir_sendEmail')) {
|
|
| 730 | 730 | /** |
| 731 | 731 | * The main function that send transactional emails using the args provided. |
| 732 | 732 | * |
@@ -745,95 +745,95 @@ discard block |
||
| 745 | 745 | * @param string $post_id The post ID. |
| 746 | 746 | * @param string $user_id The user ID. |
| 747 | 747 | */ |
| 748 | - function geodir_sendEmail( $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '' ) {
|
|
| 748 | + function geodir_sendEmail($fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '') {
|
|
| 749 | 749 | $login_details = ''; |
| 750 | 750 | |
| 751 | 751 | // strip slashes from subject & message text |
| 752 | - $to_subject = stripslashes_deep( $to_subject ); |
|
| 753 | - $to_message = stripslashes_deep( $to_message ); |
|
| 752 | + $to_subject = stripslashes_deep($to_subject); |
|
| 753 | + $to_message = stripslashes_deep($to_message); |
|
| 754 | 754 | |
| 755 | - if ( $message_type == 'send_friend' ) {
|
|
| 756 | - $subject = get_option( 'geodir_email_friend_subject' ); |
|
| 757 | - $message = get_option( 'geodir_email_friend_content' ); |
|
| 758 | - } elseif ( $message_type == 'send_enquiry' ) {
|
|
| 759 | - $subject = get_option( 'geodir_email_enquiry_subject' ); |
|
| 760 | - $message = get_option( 'geodir_email_enquiry_content' ); |
|
| 755 | + if ($message_type == 'send_friend') {
|
|
| 756 | + $subject = get_option('geodir_email_friend_subject');
|
|
| 757 | + $message = get_option('geodir_email_friend_content');
|
|
| 758 | + } elseif ($message_type == 'send_enquiry') {
|
|
| 759 | + $subject = get_option('geodir_email_enquiry_subject');
|
|
| 760 | + $message = get_option('geodir_email_enquiry_content');
|
|
| 761 | 761 | |
| 762 | 762 | // change to name in some cases |
| 763 | - $post_author = get_post_field( 'post_author', $post_id ); |
|
| 764 | - if(is_super_admin( $post_author )){// if admin probably not the post author so change name
|
|
| 765 | - $toEmailName = __('Business Owner','geodirectory');
|
|
| 766 | - }elseif(defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id,'claimed')!='1'){// if claim manager installed but listing not claimed
|
|
| 767 | - $toEmailName = __('Business Owner','geodirectory');
|
|
| 763 | + $post_author = get_post_field('post_author', $post_id);
|
|
| 764 | + if (is_super_admin($post_author)) {// if admin probably not the post author so change name
|
|
| 765 | + $toEmailName = __('Business Owner', 'geodirectory');
|
|
| 766 | + }elseif (defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id, 'claimed') != '1') {// if claim manager installed but listing not claimed
|
|
| 767 | + $toEmailName = __('Business Owner', 'geodirectory');
|
|
| 768 | 768 | } |
| 769 | 769 | |
| 770 | 770 | |
| 771 | - } elseif ( $message_type == 'forgot_password' ) {
|
|
| 772 | - $subject = get_option( 'geodir_forgot_password_subject' ); |
|
| 773 | - $message = get_option( 'geodir_forgot_password_content' ); |
|
| 771 | + } elseif ($message_type == 'forgot_password') {
|
|
| 772 | + $subject = get_option('geodir_forgot_password_subject');
|
|
| 773 | + $message = get_option('geodir_forgot_password_content');
|
|
| 774 | 774 | $login_details = $to_message; |
| 775 | - } elseif ( $message_type == 'registration' ) {
|
|
| 776 | - $subject = get_option( 'geodir_registration_success_email_subject' ); |
|
| 777 | - $message = get_option( 'geodir_registration_success_email_content' ); |
|
| 775 | + } elseif ($message_type == 'registration') {
|
|
| 776 | + $subject = get_option('geodir_registration_success_email_subject');
|
|
| 777 | + $message = get_option('geodir_registration_success_email_content');
|
|
| 778 | 778 | $login_details = $to_message; |
| 779 | - } elseif ( $message_type == 'post_submit' ) {
|
|
| 780 | - $subject = get_option( 'geodir_post_submited_success_email_subject' ); |
|
| 781 | - $message = get_option( 'geodir_post_submited_success_email_content' ); |
|
| 782 | - } elseif ( $message_type == 'listing_published' ) {
|
|
| 783 | - $subject = get_option( 'geodir_post_published_email_subject' ); |
|
| 784 | - $message = get_option( 'geodir_post_published_email_content' ); |
|
| 785 | - } elseif ( $message_type == 'listing_edited' ) {
|
|
| 786 | - $subject = get_option( 'geodir_post_edited_email_subject_admin' ); |
|
| 787 | - $message = get_option( 'geodir_post_edited_email_content_admin' ); |
|
| 779 | + } elseif ($message_type == 'post_submit') {
|
|
| 780 | + $subject = get_option('geodir_post_submited_success_email_subject');
|
|
| 781 | + $message = get_option('geodir_post_submited_success_email_content');
|
|
| 782 | + } elseif ($message_type == 'listing_published') {
|
|
| 783 | + $subject = get_option('geodir_post_published_email_subject');
|
|
| 784 | + $message = get_option('geodir_post_published_email_content');
|
|
| 785 | + } elseif ($message_type == 'listing_edited') {
|
|
| 786 | + $subject = get_option('geodir_post_edited_email_subject_admin');
|
|
| 787 | + $message = get_option('geodir_post_edited_email_content_admin');
|
|
| 788 | 788 | } |
| 789 | 789 | |
| 790 | - if ( ! empty( $subject ) ) {
|
|
| 791 | - $subject = __( stripslashes_deep( $subject ), 'geodirectory' ); |
|
| 790 | + if (!empty($subject)) {
|
|
| 791 | + $subject = __(stripslashes_deep($subject), 'geodirectory'); |
|
| 792 | 792 | } |
| 793 | 793 | |
| 794 | - if ( ! empty( $message ) ) {
|
|
| 795 | - $message = __( stripslashes_deep( $message ), 'geodirectory' ); |
|
| 794 | + if (!empty($message)) {
|
|
| 795 | + $message = __(stripslashes_deep($message), 'geodirectory'); |
|
| 796 | 796 | } |
| 797 | 797 | |
| 798 | - $to_message = nl2br( $to_message ); |
|
| 799 | - $sitefromEmail = get_option( 'site_email' ); |
|
| 798 | + $to_message = nl2br($to_message); |
|
| 799 | + $sitefromEmail = get_option('site_email');
|
|
| 800 | 800 | $sitefromEmailName = get_site_emailName(); |
| 801 | - $productlink = get_permalink( $post_id ); |
|
| 801 | + $productlink = get_permalink($post_id); |
|
| 802 | 802 | |
| 803 | 803 | $user_login = ''; |
| 804 | - if ( $user_id > 0 && $user_info = get_userdata( $user_id ) ) {
|
|
| 804 | + if ($user_id > 0 && $user_info = get_userdata($user_id)) {
|
|
| 805 | 805 | $user_login = $user_info->user_login; |
| 806 | 806 | } |
| 807 | 807 | |
| 808 | 808 | $posted_date = ''; |
| 809 | 809 | $listingLink = ''; |
| 810 | 810 | |
| 811 | - $post_info = get_post( $post_id ); |
|
| 811 | + $post_info = get_post($post_id); |
|
| 812 | 812 | |
| 813 | - if ( $post_info ) {
|
|
| 813 | + if ($post_info) {
|
|
| 814 | 814 | $posted_date = $post_info->post_date; |
| 815 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; |
|
| 815 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; |
|
| 816 | 816 | } |
| 817 | 817 | $siteurl = home_url(); |
| 818 | - $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>'; |
|
| 818 | + $siteurl_link = '<a href="'.$siteurl.'">'.$siteurl.'</a>'; |
|
| 819 | 819 | $loginurl = geodir_login_url(); |
| 820 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; |
|
| 820 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; |
|
| 821 | 821 | |
| 822 | - $post_author_id = ! empty( $post_info ) ? $post_info->post_author : 0; |
|
| 823 | - $post_author_data = $post_author_id ? get_userdata( $post_author_id ) : NULL; |
|
| 824 | - $post_author_name = geodir_get_client_name( $post_author_id ); |
|
| 825 | - $post_author_email = !empty( $post_author_data->user_email ) ? $post_author_data->user_email : ''; |
|
| 826 | - $current_date = date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) ); |
|
| 827 | - |
|
| 828 | - if ( $fromEmail == '' ) {
|
|
| 829 | - $fromEmail = get_option( 'site_email' ); |
|
| 822 | + $post_author_id = !empty($post_info) ? $post_info->post_author : 0; |
|
| 823 | + $post_author_data = $post_author_id ? get_userdata($post_author_id) : NULL; |
|
| 824 | + $post_author_name = geodir_get_client_name($post_author_id); |
|
| 825 | + $post_author_email = !empty($post_author_data->user_email) ? $post_author_data->user_email : ''; |
|
| 826 | + $current_date = date_i18n('Y-m-d H:i:s', current_time('timestamp'));
|
|
| 827 | + |
|
| 828 | + if ($fromEmail == '') {
|
|
| 829 | + $fromEmail = get_option('site_email');
|
|
| 830 | 830 | } |
| 831 | 831 | |
| 832 | - if ( $fromEmailName == '' ) {
|
|
| 833 | - $fromEmailName = get_option( 'site_email_name' ); |
|
| 832 | + if ($fromEmailName == '') {
|
|
| 833 | + $fromEmailName = get_option('site_email_name');
|
|
| 834 | 834 | } |
| 835 | 835 | |
| 836 | - $search_array = array( |
|
| 836 | + $search_array = array( |
|
| 837 | 837 | '[#listing_link#]', |
| 838 | 838 | '[#site_name_url#]', |
| 839 | 839 | '[#post_id#]', |
@@ -875,7 +875,7 @@ discard block |
||
| 875 | 875 | $post_author_email, |
| 876 | 876 | $current_date, |
| 877 | 877 | ); |
| 878 | - $message = str_replace( $search_array, $replace_array, $message ); |
|
| 878 | + $message = str_replace($search_array, $replace_array, $message); |
|
| 879 | 879 | |
| 880 | 880 | $search_array = array( |
| 881 | 881 | '[#listing_link#]', |
@@ -913,12 +913,12 @@ discard block |
||
| 913 | 913 | $post_author_email, |
| 914 | 914 | $current_date |
| 915 | 915 | ); |
| 916 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 916 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 917 | 917 | |
| 918 | - $headers = array(); |
|
| 918 | + $headers = array(); |
|
| 919 | 919 | $headers[] = 'Content-type: text/html; charset=UTF-8'; |
| 920 | - $headers[] = "Reply-To: " . $fromEmail; |
|
| 921 | - $headers[] = 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>'; |
|
| 920 | + $headers[] = "Reply-To: ".$fromEmail; |
|
| 921 | + $headers[] = 'From: '.$sitefromEmailName.' <'.$sitefromEmail.'>'; |
|
| 922 | 922 | |
| 923 | 923 | $to = $toEmail; |
| 924 | 924 | |
@@ -940,7 +940,7 @@ discard block |
||
| 940 | 940 | * @param string $post_id The post ID. |
| 941 | 941 | * @param string $user_id The user ID. |
| 942 | 942 | */ |
| 943 | - $to = apply_filters( 'geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 943 | + $to = apply_filters('geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 944 | 944 | /** |
| 945 | 945 | * Filter the client email subject. |
| 946 | 946 | * |
@@ -959,7 +959,7 @@ discard block |
||
| 959 | 959 | * @param string $post_id The post ID. |
| 960 | 960 | * @param string $user_id The user ID. |
| 961 | 961 | */ |
| 962 | - $subject = apply_filters( 'geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 962 | + $subject = apply_filters('geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 963 | 963 | /** |
| 964 | 964 | * Filter the client email message. |
| 965 | 965 | * |
@@ -978,7 +978,7 @@ discard block |
||
| 978 | 978 | * @param string $post_id The post ID. |
| 979 | 979 | * @param string $user_id The user ID. |
| 980 | 980 | */ |
| 981 | - $message = apply_filters( 'geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 981 | + $message = apply_filters('geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 982 | 982 | /** |
| 983 | 983 | * Filter the client email headers. |
| 984 | 984 | * |
@@ -997,39 +997,39 @@ discard block |
||
| 997 | 997 | * @param string $post_id The post ID. |
| 998 | 998 | * @param string $user_id The user ID. |
| 999 | 999 | */ |
| 1000 | - $headers = apply_filters( 'geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1000 | + $headers = apply_filters('geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1001 | 1001 | |
| 1002 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1002 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1003 | 1003 | |
| 1004 | - if ( ! $sent ) {
|
|
| 1005 | - if ( is_array( $to ) ) {
|
|
| 1006 | - $to = implode( ',', $to ); |
|
| 1004 | + if (!$sent) {
|
|
| 1005 | + if (is_array($to)) {
|
|
| 1006 | + $to = implode(',', $to);
|
|
| 1007 | 1007 | } |
| 1008 | 1008 | $log_message = sprintf( |
| 1009 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1009 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1010 | 1010 | $message_type, |
| 1011 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1011 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1012 | 1012 | $to, |
| 1013 | 1013 | $subject |
| 1014 | 1014 | ); |
| 1015 | - geodir_error_log( $log_message ); |
|
| 1015 | + geodir_error_log($log_message); |
|
| 1016 | 1016 | } |
| 1017 | 1017 | |
| 1018 | 1018 | ///////// ADMIN BCC EMIALS |
| 1019 | - $adminEmail = get_bloginfo( 'admin_email' ); |
|
| 1019 | + $adminEmail = get_bloginfo('admin_email');
|
|
| 1020 | 1020 | $to = $adminEmail; |
| 1021 | 1021 | |
| 1022 | 1022 | $admin_bcc = false; |
| 1023 | - if ( $message_type == 'registration' ) {
|
|
| 1024 | - $message_raw = explode( __( "Password:", 'geodirectory' ), $message ); |
|
| 1025 | - $message_raw2 = explode( "</p>", $message_raw[1], 2 ); |
|
| 1026 | - $message = $message_raw[0] . __( 'Password:', 'geodirectory' ) . ' **********</p>' . $message_raw2[1]; |
|
| 1023 | + if ($message_type == 'registration') {
|
|
| 1024 | + $message_raw = explode(__("Password:", 'geodirectory'), $message);
|
|
| 1025 | + $message_raw2 = explode("</p>", $message_raw[1], 2);
|
|
| 1026 | + $message = $message_raw[0].__('Password:', 'geodirectory').' **********</p>'.$message_raw2[1];
|
|
| 1027 | 1027 | } |
| 1028 | - if ( $message_type == 'post_submit' && ( get_option( 'geodir_notify_post_submit' ) || get_option( 'geodir_notify_post_submit', '-1' ) == '-1' ) ) {
|
|
| 1029 | - $subject = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_subject_admin' ) ), 'geodirectory' ); |
|
| 1030 | - $message = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_content_admin' ) ), 'geodirectory' ); |
|
| 1028 | + if ($message_type == 'post_submit' && (get_option('geodir_notify_post_submit') || get_option('geodir_notify_post_submit', '-1') == '-1')) {
|
|
| 1029 | + $subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');
|
|
| 1030 | + $message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');
|
|
| 1031 | 1031 | |
| 1032 | - $search_array = array( |
|
| 1032 | + $search_array = array( |
|
| 1033 | 1033 | '[#listing_link#]', |
| 1034 | 1034 | '[#site_name_url#]', |
| 1035 | 1035 | '[#post_id#]', |
@@ -1065,7 +1065,7 @@ discard block |
||
| 1065 | 1065 | $user_login, |
| 1066 | 1066 | $post_author_email, |
| 1067 | 1067 | ); |
| 1068 | - $message = str_replace( $search_array, $replace_array, $message ); |
|
| 1068 | + $message = str_replace($search_array, $replace_array, $message); |
|
| 1069 | 1069 | |
| 1070 | 1070 | $search_array = array( |
| 1071 | 1071 | '[#listing_link#]', |
@@ -1097,26 +1097,26 @@ discard block |
||
| 1097 | 1097 | $user_login, |
| 1098 | 1098 | $post_author_email, |
| 1099 | 1099 | ); |
| 1100 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 1100 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 1101 | 1101 | |
| 1102 | 1102 | $subject .= ' - ADMIN BCC COPY'; |
| 1103 | 1103 | $admin_bcc = true; |
| 1104 | 1104 | |
| 1105 | - } elseif ( $message_type == 'registration' && get_option( 'geodir_bcc_new_user' ) ) {
|
|
| 1105 | + } elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {
|
|
| 1106 | 1106 | $subject .= ' - ADMIN BCC COPY'; |
| 1107 | 1107 | $admin_bcc = true; |
| 1108 | - } elseif ( $message_type == 'send_friend' && get_option( 'geodir_bcc_friend' ) ) {
|
|
| 1108 | + } elseif ($message_type == 'send_friend' && get_option('geodir_bcc_friend')) {
|
|
| 1109 | 1109 | $subject .= ' - ADMIN BCC COPY'; |
| 1110 | 1110 | $admin_bcc = true; |
| 1111 | - } elseif ( $message_type == 'send_enquiry' && get_option( 'geodir_bcc_enquiry' ) ) {
|
|
| 1111 | + } elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {
|
|
| 1112 | 1112 | $subject .= ' - ADMIN BCC COPY'; |
| 1113 | 1113 | $admin_bcc = true; |
| 1114 | - } elseif ( $message_type == 'listing_published' && get_option( 'geodir_bcc_listing_published' ) ) {
|
|
| 1114 | + } elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {
|
|
| 1115 | 1115 | $subject .= ' - ADMIN BCC COPY'; |
| 1116 | 1116 | $admin_bcc = true; |
| 1117 | 1117 | } |
| 1118 | 1118 | |
| 1119 | - if ( $admin_bcc === true ) {
|
|
| 1119 | + if ($admin_bcc === true) {
|
|
| 1120 | 1120 | |
| 1121 | 1121 | /** |
| 1122 | 1122 | * Filter the client email subject. |
@@ -1136,7 +1136,7 @@ discard block |
||
| 1136 | 1136 | * @param string $post_id The post ID. |
| 1137 | 1137 | * @param string $user_id The user ID. |
| 1138 | 1138 | */ |
| 1139 | - $subject = apply_filters( 'geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1139 | + $subject = apply_filters('geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1140 | 1140 | /** |
| 1141 | 1141 | * Filter the client email message. |
| 1142 | 1142 | * |
@@ -1155,23 +1155,23 @@ discard block |
||
| 1155 | 1155 | * @param string $post_id The post ID. |
| 1156 | 1156 | * @param string $user_id The user ID. |
| 1157 | 1157 | */ |
| 1158 | - $message = apply_filters( 'geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1158 | + $message = apply_filters('geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1159 | 1159 | |
| 1160 | 1160 | |
| 1161 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1161 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1162 | 1162 | |
| 1163 | - if ( ! $sent ) {
|
|
| 1164 | - if ( is_array( $to ) ) {
|
|
| 1165 | - $to = implode( ',', $to ); |
|
| 1163 | + if (!$sent) {
|
|
| 1164 | + if (is_array($to)) {
|
|
| 1165 | + $to = implode(',', $to);
|
|
| 1166 | 1166 | } |
| 1167 | 1167 | $log_message = sprintf( |
| 1168 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1168 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1169 | 1169 | $message_type, |
| 1170 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1170 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1171 | 1171 | $to, |
| 1172 | 1172 | $subject |
| 1173 | 1173 | ); |
| 1174 | - geodir_error_log( $log_message ); |
|
| 1174 | + geodir_error_log($log_message); |
|
| 1175 | 1175 | } |
| 1176 | 1176 | } |
| 1177 | 1177 | |
@@ -1187,51 +1187,51 @@ discard block |
||
| 1187 | 1187 | */ |
| 1188 | 1188 | function geodir_taxonomy_breadcrumb() {
|
| 1189 | 1189 | |
| 1190 | - $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ); |
|
| 1190 | + $term = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));
|
|
| 1191 | 1191 | $parent = $term->parent; |
| 1192 | 1192 | |
| 1193 | - while ( $parent ): |
|
| 1193 | + while ($parent): |
|
| 1194 | 1194 | $parents[] = $parent; |
| 1195 | - $new_parent = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); |
|
| 1195 | + $new_parent = get_term_by('id', $parent, get_query_var('taxonomy'));
|
|
| 1196 | 1196 | $parent = $new_parent->parent; |
| 1197 | 1197 | endwhile; |
| 1198 | 1198 | |
| 1199 | - if ( ! empty( $parents ) ): |
|
| 1200 | - $parents = array_reverse( $parents ); |
|
| 1199 | + if (!empty($parents)): |
|
| 1200 | + $parents = array_reverse($parents); |
|
| 1201 | 1201 | |
| 1202 | - foreach ( $parents as $parent ): |
|
| 1203 | - $item = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); |
|
| 1204 | - $url = get_term_link( $item, get_query_var( 'taxonomy' ) ); |
|
| 1205 | - echo '<li> > <a href="' . $url . '">' . $item->name . '</a></li>'; |
|
| 1202 | + foreach ($parents as $parent): |
|
| 1203 | + $item = get_term_by('id', $parent, get_query_var('taxonomy'));
|
|
| 1204 | + $url = get_term_link($item, get_query_var('taxonomy'));
|
|
| 1205 | + echo '<li> > <a href="'.$url.'">'.$item->name.'</a></li>'; |
|
| 1206 | 1206 | endforeach; |
| 1207 | 1207 | |
| 1208 | 1208 | endif; |
| 1209 | 1209 | |
| 1210 | - echo '<li> > ' . $term->name . '</li>'; |
|
| 1210 | + echo '<li> > '.$term->name.'</li>'; |
|
| 1211 | 1211 | } |
| 1212 | 1212 | |
| 1213 | -function geodir_wpml_post_type_archive_link($link, $post_type){
|
|
| 1213 | +function geodir_wpml_post_type_archive_link($link, $post_type) {
|
|
| 1214 | 1214 | if (geodir_is_wpml()) {
|
| 1215 | - $post_types = get_option( 'geodir_post_types' ); |
|
| 1215 | + $post_types = get_option('geodir_post_types');
|
|
| 1216 | 1216 | |
| 1217 | - if ( isset( $post_types[ $post_type ] ) ) {
|
|
| 1218 | - $slug = $post_types[ $post_type ]['rewrite']['slug']; |
|
| 1217 | + if (isset($post_types[$post_type])) {
|
|
| 1218 | + $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1219 | 1219 | |
| 1220 | 1220 | // Alter the CPT slug if WPML is set to do so |
| 1221 | - if ( geodir_wpml_is_post_type_translated( $post_type ) ) {
|
|
| 1222 | - if ( gd_wpml_slug_translation_turned_on( $post_type ) && $language_code = gd_wpml_get_lang_from_url( $link) ) {
|
|
| 1221 | + if (geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 1222 | + if (gd_wpml_slug_translation_turned_on($post_type) && $language_code = gd_wpml_get_lang_from_url($link)) {
|
|
| 1223 | 1223 | |
| 1224 | 1224 | $org_slug = $slug; |
| 1225 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1225 | + $slug = apply_filters('wpml_translate_single_string',
|
|
| 1226 | 1226 | $slug, |
| 1227 | 1227 | 'WordPress', |
| 1228 | - 'URL slug: ' . $slug, |
|
| 1229 | - $language_code ); |
|
| 1228 | + 'URL slug: '.$slug, |
|
| 1229 | + $language_code); |
|
| 1230 | 1230 | |
| 1231 | - if ( ! $slug ) {
|
|
| 1231 | + if (!$slug) {
|
|
| 1232 | 1232 | $slug = $org_slug; |
| 1233 | 1233 | } else {
|
| 1234 | - $link = str_replace( $org_slug, $slug, $link ); |
|
| 1234 | + $link = str_replace($org_slug, $slug, $link); |
|
| 1235 | 1235 | } |
| 1236 | 1236 | } |
| 1237 | 1237 | } |
@@ -1240,7 +1240,7 @@ discard block |
||
| 1240 | 1240 | |
| 1241 | 1241 | return $link; |
| 1242 | 1242 | } |
| 1243 | -add_filter( 'post_type_archive_link','geodir_wpml_post_type_archive_link', 1000, 2); |
|
| 1243 | +add_filter('post_type_archive_link', 'geodir_wpml_post_type_archive_link', 1000, 2);
|
|
| 1244 | 1244 | |
| 1245 | 1245 | /** |
| 1246 | 1246 | * Main function that generates breadcrumb for all pages. |
@@ -1261,9 +1261,9 @@ discard block |
||
| 1261 | 1261 | * |
| 1262 | 1262 | * @since 1.0.0 |
| 1263 | 1263 | */ |
| 1264 | - $separator = apply_filters( 'geodir_breadcrumb_separator', ' > ' ); |
|
| 1264 | + $separator = apply_filters('geodir_breadcrumb_separator', ' > ');
|
|
| 1265 | 1265 | |
| 1266 | - if ( ! geodir_is_page( 'home' ) ) {
|
|
| 1266 | + if (!geodir_is_page('home')) {
|
|
| 1267 | 1267 | $breadcrumb = ''; |
| 1268 | 1268 | $url_categoris = ''; |
| 1269 | 1269 | $breadcrumb .= '<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">'; |
@@ -1272,167 +1272,167 @@ discard block |
||
| 1272 | 1272 | * |
| 1273 | 1273 | * @since 1.0.0 |
| 1274 | 1274 | */ |
| 1275 | - $breadcrumb .= '<li>' . apply_filters( 'geodir_breadcrumb_first_link', '<a href="' . home_url() . '">' . __( 'Home', 'geodirectory' ) . '</a>' ) . '</li>'; |
|
| 1275 | + $breadcrumb .= '<li>'.apply_filters('geodir_breadcrumb_first_link', '<a href="'.home_url().'">'.__('Home', 'geodirectory').'</a>').'</li>';
|
|
| 1276 | 1276 | |
| 1277 | 1277 | $gd_post_type = geodir_get_current_posttype(); |
| 1278 | - $post_type_info = get_post_type_object( $gd_post_type ); |
|
| 1278 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 1279 | 1279 | |
| 1280 | - remove_filter( 'post_type_archive_link', 'geodir_get_posttype_link' ); |
|
| 1280 | + remove_filter('post_type_archive_link', 'geodir_get_posttype_link');
|
|
| 1281 | 1281 | |
| 1282 | - $listing_link = get_post_type_archive_link( $gd_post_type ); |
|
| 1282 | + $listing_link = get_post_type_archive_link($gd_post_type); |
|
| 1283 | 1283 | |
| 1284 | - add_filter( 'post_type_archive_link', 'geodir_get_posttype_link', 10, 2 ); |
|
| 1285 | - $listing_link = rtrim( $listing_link, '/' ); |
|
| 1284 | + add_filter('post_type_archive_link', 'geodir_get_posttype_link', 10, 2);
|
|
| 1285 | + $listing_link = rtrim($listing_link, '/'); |
|
| 1286 | 1286 | $listing_link .= '/'; |
| 1287 | 1287 | |
| 1288 | 1288 | $post_type_for_location_link = $listing_link; |
| 1289 | - $location_terms = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 1289 | + $location_terms = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 1290 | 1290 | |
| 1291 | 1291 | global $wp, $gd_session; |
| 1292 | 1292 | $location_link = $post_type_for_location_link; |
| 1293 | 1293 | |
| 1294 | - if ( geodir_is_page( 'detail' ) || geodir_is_page( 'listing' ) ) {
|
|
| 1294 | + if (geodir_is_page('detail') || geodir_is_page('listing')) {
|
|
| 1295 | 1295 | global $post; |
| 1296 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; |
|
| 1297 | - $neighbourhood_active = $location_manager && get_option( 'location_neighbourhoods' ) ? true : false; |
|
| 1296 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1297 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1298 | 1298 | |
| 1299 | - if ( geodir_is_page( 'detail' ) && isset( $post->country_slug ) ) {
|
|
| 1299 | + if (geodir_is_page('detail') && isset($post->country_slug)) {
|
|
| 1300 | 1300 | $location_terms = array( |
| 1301 | 1301 | 'gd_country' => $post->country_slug, |
| 1302 | 1302 | 'gd_region' => $post->region_slug, |
| 1303 | 1303 | 'gd_city' => $post->city_slug |
| 1304 | 1304 | ); |
| 1305 | 1305 | |
| 1306 | - if ( $neighbourhood_active && ! empty( $location_terms['gd_city'] ) && $gd_ses_neighbourhood = $gd_session->get( 'gd_neighbourhood' ) ) {
|
|
| 1306 | + if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1307 | 1307 | $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
| 1308 | 1308 | } |
| 1309 | 1309 | } |
| 1310 | 1310 | |
| 1311 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 1311 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1312 | 1312 | |
| 1313 | 1313 | $hide_url_part = array(); |
| 1314 | - if ( $location_manager ) {
|
|
| 1315 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); |
|
| 1316 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); |
|
| 1317 | - |
|
| 1318 | - if ( $hide_region_part && $hide_country_part ) {
|
|
| 1319 | - $hide_url_part = array( 'gd_country', 'gd_region' ); |
|
| 1320 | - } else if ( $hide_region_part && ! $hide_country_part ) {
|
|
| 1321 | - $hide_url_part = array( 'gd_region' ); |
|
| 1322 | - } else if ( ! $hide_region_part && $hide_country_part ) {
|
|
| 1323 | - $hide_url_part = array( 'gd_country' ); |
|
| 1314 | + if ($location_manager) {
|
|
| 1315 | + $hide_country_part = get_option('geodir_location_hide_country_part');
|
|
| 1316 | + $hide_region_part = get_option('geodir_location_hide_region_part');
|
|
| 1317 | + |
|
| 1318 | + if ($hide_region_part && $hide_country_part) {
|
|
| 1319 | + $hide_url_part = array('gd_country', 'gd_region');
|
|
| 1320 | + } else if ($hide_region_part && !$hide_country_part) {
|
|
| 1321 | + $hide_url_part = array('gd_region');
|
|
| 1322 | + } else if (!$hide_region_part && $hide_country_part) {
|
|
| 1323 | + $hide_url_part = array('gd_country');
|
|
| 1324 | 1324 | } |
| 1325 | 1325 | } |
| 1326 | 1326 | |
| 1327 | 1327 | $hide_text_part = array(); |
| 1328 | - if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 1329 | - $hide_text_part = array( 'gd_region' ); |
|
| 1328 | + if ($geodir_show_location_url == 'country_city') {
|
|
| 1329 | + $hide_text_part = array('gd_region');
|
|
| 1330 | 1330 | |
| 1331 | - if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
|
|
| 1332 | - unset( $location_terms['gd_region'] ); |
|
| 1331 | + if (isset($location_terms['gd_region']) && !$location_manager) {
|
|
| 1332 | + unset($location_terms['gd_region']); |
|
| 1333 | 1333 | } |
| 1334 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 1335 | - $hide_text_part = array( 'gd_country' ); |
|
| 1334 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 1335 | + $hide_text_part = array('gd_country');
|
|
| 1336 | 1336 | |
| 1337 | - if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
|
|
| 1338 | - unset( $location_terms['gd_country'] ); |
|
| 1337 | + if (isset($location_terms['gd_country']) && !$location_manager) {
|
|
| 1338 | + unset($location_terms['gd_country']); |
|
| 1339 | 1339 | } |
| 1340 | - } else if ( $geodir_show_location_url == 'city' ) {
|
|
| 1341 | - $hide_text_part = array( 'gd_country', 'gd_region' ); |
|
| 1340 | + } else if ($geodir_show_location_url == 'city') {
|
|
| 1341 | + $hide_text_part = array('gd_country', 'gd_region');
|
|
| 1342 | 1342 | |
| 1343 | - if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
|
|
| 1344 | - unset( $location_terms['gd_country'] ); |
|
| 1343 | + if (isset($location_terms['gd_country']) && !$location_manager) {
|
|
| 1344 | + unset($location_terms['gd_country']); |
|
| 1345 | 1345 | } |
| 1346 | - if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
|
|
| 1347 | - unset( $location_terms['gd_region'] ); |
|
| 1346 | + if (isset($location_terms['gd_region']) && !$location_manager) {
|
|
| 1347 | + unset($location_terms['gd_region']); |
|
| 1348 | 1348 | } |
| 1349 | 1349 | } |
| 1350 | 1350 | |
| 1351 | 1351 | $is_location_last = ''; |
| 1352 | 1352 | $is_taxonomy_last = ''; |
| 1353 | 1353 | $breadcrumb .= '<li>'; |
| 1354 | - if ( get_query_var( $gd_post_type . 'category' ) ) {
|
|
| 1355 | - $gd_taxonomy = $gd_post_type . 'category'; |
|
| 1356 | - } elseif ( get_query_var( $gd_post_type . '_tags' ) ) {
|
|
| 1357 | - $gd_taxonomy = $gd_post_type . '_tags'; |
|
| 1354 | + if (get_query_var($gd_post_type.'category')) {
|
|
| 1355 | + $gd_taxonomy = $gd_post_type.'category'; |
|
| 1356 | + } elseif (get_query_var($gd_post_type.'_tags')) {
|
|
| 1357 | + $gd_taxonomy = $gd_post_type.'_tags'; |
|
| 1358 | 1358 | } |
| 1359 | 1359 | |
| 1360 | - $breadcrumb .= $separator . '<a href="' . $listing_link . '">' . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; |
|
| 1361 | - if ( ! empty( $gd_taxonomy ) || geodir_is_page( 'detail' ) ) {
|
|
| 1360 | + $breadcrumb .= $separator.'<a href="'.$listing_link.'">'.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory').'</a>'; |
|
| 1361 | + if (!empty($gd_taxonomy) || geodir_is_page('detail')) {
|
|
| 1362 | 1362 | $is_location_last = false; |
| 1363 | 1363 | } else {
|
| 1364 | 1364 | $is_location_last = true; |
| 1365 | 1365 | } |
| 1366 | 1366 | |
| 1367 | - if ( ! empty( $gd_taxonomy ) && geodir_is_page( 'listing' ) ) {
|
|
| 1367 | + if (!empty($gd_taxonomy) && geodir_is_page('listing')) {
|
|
| 1368 | 1368 | $is_taxonomy_last = true; |
| 1369 | 1369 | } else {
|
| 1370 | 1370 | $is_taxonomy_last = false; |
| 1371 | 1371 | } |
| 1372 | 1372 | |
| 1373 | - if ( ! empty( $location_terms ) ) {
|
|
| 1374 | - $geodir_get_locations = function_exists( 'get_actual_location_name' ) ? true : false; |
|
| 1373 | + if (!empty($location_terms)) {
|
|
| 1374 | + $geodir_get_locations = function_exists('get_actual_location_name') ? true : false;
|
|
| 1375 | 1375 | |
| 1376 | - foreach ( $location_terms as $key => $location_term ) {
|
|
| 1377 | - if ( $location_term != '' ) {
|
|
| 1378 | - if ( ! empty( $hide_url_part ) && in_array( $key, $hide_url_part ) ) { // Hide location part from url & breadcrumb.
|
|
| 1376 | + foreach ($location_terms as $key => $location_term) {
|
|
| 1377 | + if ($location_term != '') {
|
|
| 1378 | + if (!empty($hide_url_part) && in_array($key, $hide_url_part)) { // Hide location part from url & breadcrumb.
|
|
| 1379 | 1379 | continue; |
| 1380 | 1380 | } |
| 1381 | 1381 | |
| 1382 | - $gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location_term ); |
|
| 1383 | - $gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text ); |
|
| 1384 | - $gd_location_link_text = geodir_utf8_ucfirst( $gd_location_link_text ); |
|
| 1382 | + $gd_location_link_text = preg_replace('/-(\d+)$/', '', $location_term);
|
|
| 1383 | + $gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);
|
|
| 1384 | + $gd_location_link_text = geodir_utf8_ucfirst($gd_location_link_text); |
|
| 1385 | 1385 | |
| 1386 | 1386 | $location_term_actual_country = ''; |
| 1387 | 1387 | $location_term_actual_region = ''; |
| 1388 | 1388 | $location_term_actual_city = ''; |
| 1389 | 1389 | $location_term_actual_neighbourhood = ''; |
| 1390 | - if ( $geodir_get_locations ) {
|
|
| 1391 | - if ( $key == 'gd_country' ) {
|
|
| 1392 | - $location_term_actual_country = get_actual_location_name( 'country', $location_term, true ); |
|
| 1393 | - } else if ( $key == 'gd_region' ) {
|
|
| 1394 | - $location_term_actual_region = get_actual_location_name( 'region', $location_term, true ); |
|
| 1395 | - } else if ( $key == 'gd_city' ) {
|
|
| 1396 | - $location_term_actual_city = get_actual_location_name( 'city', $location_term, true ); |
|
| 1397 | - } else if ( $key == 'gd_neighbourhood' ) {
|
|
| 1398 | - $location_term_actual_neighbourhood = get_actual_location_name( 'neighbourhood', $location_term, true ); |
|
| 1390 | + if ($geodir_get_locations) {
|
|
| 1391 | + if ($key == 'gd_country') {
|
|
| 1392 | + $location_term_actual_country = get_actual_location_name('country', $location_term, true);
|
|
| 1393 | + } else if ($key == 'gd_region') {
|
|
| 1394 | + $location_term_actual_region = get_actual_location_name('region', $location_term, true);
|
|
| 1395 | + } else if ($key == 'gd_city') {
|
|
| 1396 | + $location_term_actual_city = get_actual_location_name('city', $location_term, true);
|
|
| 1397 | + } else if ($key == 'gd_neighbourhood') {
|
|
| 1398 | + $location_term_actual_neighbourhood = get_actual_location_name('neighbourhood', $location_term, true);
|
|
| 1399 | 1399 | } |
| 1400 | 1400 | } else {
|
| 1401 | 1401 | $location_info = geodir_get_location(); |
| 1402 | 1402 | |
| 1403 | - if ( ! empty( $location_info ) && isset( $location_info->location_id ) ) {
|
|
| 1404 | - if ( $key == 'gd_country' ) {
|
|
| 1405 | - $location_term_actual_country = __( $location_info->country, 'geodirectory' ); |
|
| 1406 | - } else if ( $key == 'gd_region' ) {
|
|
| 1407 | - $location_term_actual_region = __( $location_info->region, 'geodirectory' ); |
|
| 1408 | - } else if ( $key == 'gd_city' ) {
|
|
| 1409 | - $location_term_actual_city = __( $location_info->city, 'geodirectory' ); |
|
| 1403 | + if (!empty($location_info) && isset($location_info->location_id)) {
|
|
| 1404 | + if ($key == 'gd_country') {
|
|
| 1405 | + $location_term_actual_country = __($location_info->country, 'geodirectory'); |
|
| 1406 | + } else if ($key == 'gd_region') {
|
|
| 1407 | + $location_term_actual_region = __($location_info->region, 'geodirectory'); |
|
| 1408 | + } else if ($key == 'gd_city') {
|
|
| 1409 | + $location_term_actual_city = __($location_info->city, 'geodirectory'); |
|
| 1410 | 1410 | } |
| 1411 | 1411 | } |
| 1412 | 1412 | } |
| 1413 | 1413 | |
| 1414 | - if ( $is_location_last && $key == 'gd_country' && ! ( isset( $location_terms['gd_region'] ) && $location_terms['gd_region'] != '' ) && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {
|
|
| 1415 | - $breadcrumb .= $location_term_actual_country != '' ? $separator . $location_term_actual_country : $separator . $gd_location_link_text; |
|
| 1416 | - } else if ( $is_location_last && $key == 'gd_region' && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {
|
|
| 1417 | - $breadcrumb .= $location_term_actual_region != '' ? $separator . $location_term_actual_region : $separator . $gd_location_link_text; |
|
| 1418 | - } else if ( $is_location_last && $key == 'gd_city' && empty( $location_terms['gd_neighbourhood'] ) ) {
|
|
| 1419 | - $breadcrumb .= $location_term_actual_city != '' ? $separator . $location_term_actual_city : $separator . $gd_location_link_text; |
|
| 1420 | - } else if ( $is_location_last && $key == 'gd_neighbourhood' ) {
|
|
| 1421 | - $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator . $location_term_actual_neighbourhood : $separator . $gd_location_link_text; |
|
| 1414 | + if ($is_location_last && $key == 'gd_country' && !(isset($location_terms['gd_region']) && $location_terms['gd_region'] != '') && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {
|
|
| 1415 | + $breadcrumb .= $location_term_actual_country != '' ? $separator.$location_term_actual_country : $separator.$gd_location_link_text; |
|
| 1416 | + } else if ($is_location_last && $key == 'gd_region' && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {
|
|
| 1417 | + $breadcrumb .= $location_term_actual_region != '' ? $separator.$location_term_actual_region : $separator.$gd_location_link_text; |
|
| 1418 | + } else if ($is_location_last && $key == 'gd_city' && empty($location_terms['gd_neighbourhood'])) {
|
|
| 1419 | + $breadcrumb .= $location_term_actual_city != '' ? $separator.$location_term_actual_city : $separator.$gd_location_link_text; |
|
| 1420 | + } else if ($is_location_last && $key == 'gd_neighbourhood') {
|
|
| 1421 | + $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator.$location_term_actual_neighbourhood : $separator.$gd_location_link_text; |
|
| 1422 | 1422 | } else {
|
| 1423 | - if ( get_option( 'permalink_structure' ) != '' ) {
|
|
| 1424 | - $location_link .= $location_term . '/'; |
|
| 1423 | + if (get_option('permalink_structure') != '') {
|
|
| 1424 | + $location_link .= $location_term.'/'; |
|
| 1425 | 1425 | } else {
|
| 1426 | - $location_link .= "&$key=" . $location_term; |
|
| 1426 | + $location_link .= "&$key=".$location_term; |
|
| 1427 | 1427 | } |
| 1428 | 1428 | |
| 1429 | - if ( $key == 'gd_country' && $location_term_actual_country != '' ) {
|
|
| 1429 | + if ($key == 'gd_country' && $location_term_actual_country != '') {
|
|
| 1430 | 1430 | $gd_location_link_text = $location_term_actual_country; |
| 1431 | - } else if ( $key == 'gd_region' && $location_term_actual_region != '' ) {
|
|
| 1431 | + } else if ($key == 'gd_region' && $location_term_actual_region != '') {
|
|
| 1432 | 1432 | $gd_location_link_text = $location_term_actual_region; |
| 1433 | - } else if ( $key == 'gd_city' && $location_term_actual_city != '' ) {
|
|
| 1433 | + } else if ($key == 'gd_city' && $location_term_actual_city != '') {
|
|
| 1434 | 1434 | $gd_location_link_text = $location_term_actual_city; |
| 1435 | - } else if ( $key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '' ) {
|
|
| 1435 | + } else if ($key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '') {
|
|
| 1436 | 1436 | $gd_location_link_text = $location_term_actual_neighbourhood; |
| 1437 | 1437 | } |
| 1438 | 1438 | |
@@ -1442,77 +1442,77 @@ discard block |
||
| 1442 | 1442 | } |
| 1443 | 1443 | */ |
| 1444 | 1444 | |
| 1445 | - $breadcrumb .= $separator . '<a href="' . $location_link . '">' . $gd_location_link_text . '</a>'; |
|
| 1445 | + $breadcrumb .= $separator.'<a href="'.$location_link.'">'.$gd_location_link_text.'</a>'; |
|
| 1446 | 1446 | } |
| 1447 | 1447 | } |
| 1448 | 1448 | } |
| 1449 | 1449 | } |
| 1450 | 1450 | |
| 1451 | - if ( ! empty( $gd_taxonomy ) ) {
|
|
| 1451 | + if (!empty($gd_taxonomy)) {
|
|
| 1452 | 1452 | $term_index = 1; |
| 1453 | 1453 | |
| 1454 | 1454 | //if(get_option('geodir_add_categories_url'))
|
| 1455 | 1455 | {
|
| 1456 | - if ( get_query_var( $gd_post_type . '_tags' ) ) {
|
|
| 1457 | - $cat_link = $listing_link . 'tags/'; |
|
| 1456 | + if (get_query_var($gd_post_type.'_tags')) {
|
|
| 1457 | + $cat_link = $listing_link.'tags/'; |
|
| 1458 | 1458 | } else {
|
| 1459 | 1459 | $cat_link = $listing_link; |
| 1460 | 1460 | } |
| 1461 | 1461 | |
| 1462 | - foreach ( $location_terms as $key => $location_term ) {
|
|
| 1463 | - if ( $location_manager && in_array( $key, $hide_url_part ) ) {
|
|
| 1462 | + foreach ($location_terms as $key => $location_term) {
|
|
| 1463 | + if ($location_manager && in_array($key, $hide_url_part)) {
|
|
| 1464 | 1464 | continue; |
| 1465 | 1465 | } |
| 1466 | 1466 | |
| 1467 | - if ( $location_term != '' ) {
|
|
| 1468 | - if ( get_option( 'permalink_structure' ) != '' ) {
|
|
| 1469 | - $cat_link .= $location_term . '/'; |
|
| 1467 | + if ($location_term != '') {
|
|
| 1468 | + if (get_option('permalink_structure') != '') {
|
|
| 1469 | + $cat_link .= $location_term.'/'; |
|
| 1470 | 1470 | } |
| 1471 | 1471 | } |
| 1472 | 1472 | } |
| 1473 | 1473 | |
| 1474 | - $term_array = explode( "/", trim( $wp_query->query[ $gd_taxonomy ], "/" ) ); |
|
| 1475 | - foreach ( $term_array as $term ) {
|
|
| 1476 | - $term_link_text = preg_replace( '/-(\d+)$/', '', $term ); |
|
| 1477 | - $term_link_text = preg_replace( '/[_-]/', ' ', $term_link_text ); |
|
| 1474 | + $term_array = explode("/", trim($wp_query->query[$gd_taxonomy], "/"));
|
|
| 1475 | + foreach ($term_array as $term) {
|
|
| 1476 | + $term_link_text = preg_replace('/-(\d+)$/', '', $term);
|
|
| 1477 | + $term_link_text = preg_replace('/[_-]/', ' ', $term_link_text);
|
|
| 1478 | 1478 | |
| 1479 | 1479 | // get term actual name |
| 1480 | - $term_info = get_term_by( 'slug', $term, $gd_taxonomy, 'ARRAY_A' ); |
|
| 1481 | - if ( ! empty( $term_info ) && isset( $term_info['name'] ) && $term_info['name'] != '' ) {
|
|
| 1482 | - $term_link_text = urldecode( $term_info['name'] ); |
|
| 1480 | + $term_info = get_term_by('slug', $term, $gd_taxonomy, 'ARRAY_A');
|
|
| 1481 | + if (!empty($term_info) && isset($term_info['name']) && $term_info['name'] != '') {
|
|
| 1482 | + $term_link_text = urldecode($term_info['name']); |
|
| 1483 | 1483 | } else {
|
| 1484 | 1484 | continue; |
| 1485 | 1485 | //$term_link_text = wp_strip_all_tags(geodir_ucwords(urldecode($term_link_text))); |
| 1486 | 1486 | } |
| 1487 | 1487 | |
| 1488 | - if ( $term_index == count( $term_array ) && $is_taxonomy_last ) {
|
|
| 1489 | - $breadcrumb .= $separator . $term_link_text; |
|
| 1488 | + if ($term_index == count($term_array) && $is_taxonomy_last) {
|
|
| 1489 | + $breadcrumb .= $separator.$term_link_text; |
|
| 1490 | 1490 | } else {
|
| 1491 | - $cat_link .= $term . '/'; |
|
| 1492 | - $breadcrumb .= $separator . '<a href="' . $cat_link . '">' . $term_link_text . '</a>'; |
|
| 1491 | + $cat_link .= $term.'/'; |
|
| 1492 | + $breadcrumb .= $separator.'<a href="'.$cat_link.'">'.$term_link_text.'</a>'; |
|
| 1493 | 1493 | } |
| 1494 | - $term_index ++; |
|
| 1494 | + $term_index++; |
|
| 1495 | 1495 | } |
| 1496 | 1496 | } |
| 1497 | 1497 | |
| 1498 | 1498 | |
| 1499 | 1499 | } |
| 1500 | 1500 | |
| 1501 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 1502 | - $breadcrumb .= $separator . get_the_title(); |
|
| 1501 | + if (geodir_is_page('detail')) {
|
|
| 1502 | + $breadcrumb .= $separator.get_the_title(); |
|
| 1503 | 1503 | } |
| 1504 | 1504 | |
| 1505 | 1505 | $breadcrumb .= '</li>'; |
| 1506 | 1506 | |
| 1507 | 1507 | |
| 1508 | - } elseif ( geodir_is_page( 'author' ) ) {
|
|
| 1508 | + } elseif (geodir_is_page('author')) {
|
|
| 1509 | 1509 | $dashboard_post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : $gd_post_type; |
| 1510 | 1510 | $user_id = get_current_user_id(); |
| 1511 | - $author_link = get_author_posts_url( $user_id ); |
|
| 1512 | - $default_author_link = geodir_getlink( $author_link, array( |
|
| 1511 | + $author_link = get_author_posts_url($user_id); |
|
| 1512 | + $default_author_link = geodir_getlink($author_link, array( |
|
| 1513 | 1513 | 'geodir_dashbord' => 'true', |
| 1514 | 1514 | 'stype' => $dashboard_post_type |
| 1515 | - ), false ); |
|
| 1515 | + ), false); |
|
| 1516 | 1516 | |
| 1517 | 1517 | /** |
| 1518 | 1518 | * Filter author page link. |
@@ -1522,16 +1522,16 @@ discard block |
||
| 1522 | 1522 | * @param string $default_author_link Default author link. |
| 1523 | 1523 | * @param int $user_id Author ID. |
| 1524 | 1524 | */ |
| 1525 | - $default_author_link = apply_filters( 'geodir_dashboard_author_link', $default_author_link, $user_id ); |
|
| 1525 | + $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_id);
|
|
| 1526 | 1526 | |
| 1527 | 1527 | $breadcrumb .= '<li>'; |
| 1528 | - $breadcrumb .= $separator . '<a href="' . $default_author_link . '">' . __( 'My Dashboard', 'geodirectory' ) . '</a>'; |
|
| 1528 | + $breadcrumb .= $separator.'<a href="'.$default_author_link.'">'.__('My Dashboard', 'geodirectory').'</a>';
|
|
| 1529 | 1529 | |
| 1530 | - if ( isset( $_REQUEST['list'] ) ) {
|
|
| 1531 | - $author_link = geodir_getlink( $author_link, array( |
|
| 1530 | + if (isset($_REQUEST['list'])) {
|
|
| 1531 | + $author_link = geodir_getlink($author_link, array( |
|
| 1532 | 1532 | 'geodir_dashbord' => 'true', |
| 1533 | 1533 | 'stype' => $_REQUEST['stype'] |
| 1534 | - ), false ); |
|
| 1534 | + ), false); |
|
| 1535 | 1535 | |
| 1536 | 1536 | /** |
| 1537 | 1537 | * Filter author page link. |
@@ -1542,61 +1542,61 @@ discard block |
||
| 1542 | 1542 | * @param int $user_id Author ID. |
| 1543 | 1543 | * @param string $_REQUEST ['stype'] Post type. |
| 1544 | 1544 | */ |
| 1545 | - $author_link = apply_filters( 'geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype'] ); |
|
| 1545 | + $author_link = apply_filters('geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype']);
|
|
| 1546 | 1546 | |
| 1547 | - $breadcrumb .= $separator . '<a href="' . $author_link . '">' . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; |
|
| 1548 | - $breadcrumb .= $separator . geodir_utf8_ucfirst( __( 'My', 'geodirectory' ) . ' ' . $_REQUEST['list'] ); |
|
| 1547 | + $breadcrumb .= $separator.'<a href="'.$author_link.'">'.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory').'</a>'; |
|
| 1548 | + $breadcrumb .= $separator.geodir_utf8_ucfirst(__('My', 'geodirectory').' '.$_REQUEST['list']);
|
|
| 1549 | 1549 | } else {
|
| 1550 | - $breadcrumb .= $separator . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ); |
|
| 1550 | + $breadcrumb .= $separator.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory'); |
|
| 1551 | 1551 | } |
| 1552 | 1552 | |
| 1553 | 1553 | $breadcrumb .= '</li>'; |
| 1554 | - } elseif ( is_category() || is_single() ) {
|
|
| 1554 | + } elseif (is_category() || is_single()) {
|
|
| 1555 | 1555 | $category = get_the_category(); |
| 1556 | - if ( is_category() ) {
|
|
| 1557 | - $breadcrumb .= '<li>' . $separator . $category[0]->cat_name . '</li>'; |
|
| 1556 | + if (is_category()) {
|
|
| 1557 | + $breadcrumb .= '<li>'.$separator.$category[0]->cat_name.'</li>'; |
|
| 1558 | 1558 | } |
| 1559 | - if ( is_single() ) {
|
|
| 1560 | - $breadcrumb .= '<li>' . $separator . '<a href="' . get_category_link( $category[0]->term_id ) . '">' . $category[0]->cat_name . '</a></li>'; |
|
| 1561 | - $breadcrumb .= '<li>' . $separator . get_the_title() . '</li>'; |
|
| 1559 | + if (is_single()) {
|
|
| 1560 | + $breadcrumb .= '<li>'.$separator.'<a href="'.get_category_link($category[0]->term_id).'">'.$category[0]->cat_name.'</a></li>'; |
|
| 1561 | + $breadcrumb .= '<li>'.$separator.get_the_title().'</li>'; |
|
| 1562 | 1562 | } |
| 1563 | 1563 | /* End of my version ##################################################### */ |
| 1564 | - } else if ( is_page() ) {
|
|
| 1564 | + } else if (is_page()) {
|
|
| 1565 | 1565 | $page_title = get_the_title(); |
| 1566 | 1566 | |
| 1567 | - if ( geodir_is_page( 'location' ) ) {
|
|
| 1567 | + if (geodir_is_page('location')) {
|
|
| 1568 | 1568 | $location_page_id = geodir_location_page_id(); |
| 1569 | - $loc_post = get_post( $location_page_id ); |
|
| 1569 | + $loc_post = get_post($location_page_id); |
|
| 1570 | 1570 | $post_name = $loc_post->post_name; |
| 1571 | - $slug = ucwords( str_replace( '-', ' ', $post_name ) ); |
|
| 1572 | - $page_title = ! empty( $slug ) ? $slug : __( 'Location', 'geodirectory' ); |
|
| 1571 | + $slug = ucwords(str_replace('-', ' ', $post_name));
|
|
| 1572 | + $page_title = !empty($slug) ? $slug : __('Location', 'geodirectory');
|
|
| 1573 | 1573 | } |
| 1574 | 1574 | |
| 1575 | - $breadcrumb .= '<li>' . $separator; |
|
| 1576 | - $breadcrumb .= stripslashes_deep( $page_title ); |
|
| 1575 | + $breadcrumb .= '<li>'.$separator; |
|
| 1576 | + $breadcrumb .= stripslashes_deep($page_title); |
|
| 1577 | 1577 | $breadcrumb .= '</li>'; |
| 1578 | - } else if ( is_tag() ) {
|
|
| 1579 | - $breadcrumb .= "<li> " . $separator . single_tag_title( '', false ) . '</li>'; |
|
| 1580 | - } else if ( is_day() ) {
|
|
| 1581 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1582 | - the_time( 'F jS, Y' ); |
|
| 1578 | + } else if (is_tag()) {
|
|
| 1579 | + $breadcrumb .= "<li> ".$separator.single_tag_title('', false).'</li>';
|
|
| 1580 | + } else if (is_day()) {
|
|
| 1581 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1582 | + the_time('F jS, Y');
|
|
| 1583 | 1583 | $breadcrumb .= '</li>'; |
| 1584 | - } else if ( is_month() ) {
|
|
| 1585 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1586 | - the_time( 'F, Y' ); |
|
| 1584 | + } else if (is_month()) {
|
|
| 1585 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1586 | + the_time('F, Y');
|
|
| 1587 | 1587 | $breadcrumb .= '</li>'; |
| 1588 | - } else if ( is_year() ) {
|
|
| 1589 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1590 | - the_time( 'Y' ); |
|
| 1588 | + } else if (is_year()) {
|
|
| 1589 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1590 | + the_time('Y');
|
|
| 1591 | 1591 | $breadcrumb .= '</li>'; |
| 1592 | - } else if ( is_author() ) {
|
|
| 1593 | - $breadcrumb .= "<li> " . $separator . __( " Author Archive", 'geodirectory' ); |
|
| 1592 | + } else if (is_author()) {
|
|
| 1593 | + $breadcrumb .= "<li> ".$separator.__(" Author Archive", 'geodirectory');
|
|
| 1594 | 1594 | $breadcrumb .= '</li>'; |
| 1595 | - } else if ( isset( $_GET['paged'] ) && ! empty( $_GET['paged'] ) ) {
|
|
| 1596 | - $breadcrumb .= "<li>" . $separator . __( "Blog Archives", 'geodirectory' ); |
|
| 1595 | + } else if (isset($_GET['paged']) && !empty($_GET['paged'])) {
|
|
| 1596 | + $breadcrumb .= "<li>".$separator.__("Blog Archives", 'geodirectory');
|
|
| 1597 | 1597 | $breadcrumb .= '</li>'; |
| 1598 | - } else if ( is_search() ) {
|
|
| 1599 | - $breadcrumb .= "<li> " . $separator . __( " Search Results", 'geodirectory' ); |
|
| 1598 | + } else if (is_search()) {
|
|
| 1599 | + $breadcrumb .= "<li> ".$separator.__(" Search Results", 'geodirectory');
|
|
| 1600 | 1600 | $breadcrumb .= '</li>'; |
| 1601 | 1601 | } |
| 1602 | 1602 | $breadcrumb .= '</ul></div>'; |
@@ -1609,13 +1609,13 @@ discard block |
||
| 1609 | 1609 | * @param string $breadcrumb Breadcrumb HTML. |
| 1610 | 1610 | * @param string $separator Breadcrumb separator. |
| 1611 | 1611 | */ |
| 1612 | - echo $breadcrumb = apply_filters( 'geodir_breadcrumb', $breadcrumb, $separator ); |
|
| 1612 | + echo $breadcrumb = apply_filters('geodir_breadcrumb', $breadcrumb, $separator);
|
|
| 1613 | 1613 | } |
| 1614 | 1614 | } |
| 1615 | 1615 | |
| 1616 | 1616 | |
| 1617 | -add_action( "admin_init", "geodir_allow_wpadmin" ); // check user is admin |
|
| 1618 | -if ( ! function_exists( 'geodir_allow_wpadmin' ) ) {
|
|
| 1617 | +add_action("admin_init", "geodir_allow_wpadmin"); // check user is admin
|
|
| 1618 | +if (!function_exists('geodir_allow_wpadmin')) {
|
|
| 1619 | 1619 | /** |
| 1620 | 1620 | * Allow only admins to access wp-admin. |
| 1621 | 1621 | * |
@@ -1627,12 +1627,12 @@ discard block |
||
| 1627 | 1627 | */ |
| 1628 | 1628 | function geodir_allow_wpadmin() {
|
| 1629 | 1629 | global $wpdb; |
| 1630 | - if ( get_option( 'geodir_allow_wpadmin' ) == '0' && is_user_logged_in() && ( ! defined( 'DOING_AJAX' ) ) ) // checking action in request to allow ajax request go through |
|
| 1630 | + if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && (!defined('DOING_AJAX'))) // checking action in request to allow ajax request go through
|
|
| 1631 | 1631 | {
|
| 1632 | - if ( current_user_can( 'administrator' ) ) {
|
|
| 1632 | + if (current_user_can('administrator')) {
|
|
| 1633 | 1633 | } else {
|
| 1634 | 1634 | |
| 1635 | - wp_redirect( home_url() ); |
|
| 1635 | + wp_redirect(home_url()); |
|
| 1636 | 1636 | exit; |
| 1637 | 1637 | } |
| 1638 | 1638 | |
@@ -1651,23 +1651,23 @@ discard block |
||
| 1651 | 1651 | * |
| 1652 | 1652 | * @return array|WP_Error The uploaded data as array. When failure returns error. |
| 1653 | 1653 | */ |
| 1654 | -function fetch_remote_file( $url ) {
|
|
| 1654 | +function fetch_remote_file($url) {
|
|
| 1655 | 1655 | // extract the file name and extension from the url |
| 1656 | - require_once( ABSPATH . 'wp-includes/pluggable.php' ); |
|
| 1657 | - $file_name = basename( $url ); |
|
| 1658 | - if ( strpos( $file_name, '?' ) !== false ) {
|
|
| 1659 | - list( $file_name ) = explode( '?', $file_name ); |
|
| 1656 | + require_once(ABSPATH.'wp-includes/pluggable.php'); |
|
| 1657 | + $file_name = basename($url); |
|
| 1658 | + if (strpos($file_name, '?') !== false) {
|
|
| 1659 | + list($file_name) = explode('?', $file_name);
|
|
| 1660 | 1660 | } |
| 1661 | 1661 | $dummy = false; |
| 1662 | 1662 | $add_to_cache = false; |
| 1663 | 1663 | $key = null; |
| 1664 | - if ( strpos( $url, '/dummy/' ) !== false ) {
|
|
| 1664 | + if (strpos($url, '/dummy/') !== false) {
|
|
| 1665 | 1665 | $dummy = true; |
| 1666 | - $key = "dummy_" . str_replace( '.', '_', $file_name ); |
|
| 1667 | - $value = get_transient( 'cached_dummy_images' ); |
|
| 1668 | - if ( $value ) {
|
|
| 1669 | - if ( isset( $value[ $key ] ) ) {
|
|
| 1670 | - return $value[ $key ]; |
|
| 1666 | + $key = "dummy_".str_replace('.', '_', $file_name);
|
|
| 1667 | + $value = get_transient('cached_dummy_images');
|
|
| 1668 | + if ($value) {
|
|
| 1669 | + if (isset($value[$key])) {
|
|
| 1670 | + return $value[$key]; |
|
| 1671 | 1671 | } else {
|
| 1672 | 1672 | $add_to_cache = true; |
| 1673 | 1673 | } |
@@ -1678,62 +1678,62 @@ discard block |
||
| 1678 | 1678 | |
| 1679 | 1679 | // get placeholder file in the upload dir with a unique, sanitized filename |
| 1680 | 1680 | |
| 1681 | - $post_upload_date = isset( $post['upload_date'] ) ? $post['upload_date'] : ''; |
|
| 1681 | + $post_upload_date = isset($post['upload_date']) ? $post['upload_date'] : ''; |
|
| 1682 | 1682 | |
| 1683 | - $upload = wp_upload_bits( $file_name, 0, '', $post_upload_date ); |
|
| 1684 | - if ( $upload['error'] ) {
|
|
| 1685 | - return new WP_Error( 'upload_dir_error', $upload['error'] ); |
|
| 1683 | + $upload = wp_upload_bits($file_name, 0, '', $post_upload_date); |
|
| 1684 | + if ($upload['error']) {
|
|
| 1685 | + return new WP_Error('upload_dir_error', $upload['error']);
|
|
| 1686 | 1686 | } |
| 1687 | 1687 | |
| 1688 | 1688 | |
| 1689 | - sleep( 0.3 );// if multiple remote file this can cause the remote server to timeout so we add a slight delay |
|
| 1689 | + sleep(0.3); // if multiple remote file this can cause the remote server to timeout so we add a slight delay |
|
| 1690 | 1690 | |
| 1691 | 1691 | // fetch the remote url and write it to the placeholder file |
| 1692 | - $headers = wp_remote_get( $url, array( 'stream' => true, 'filename' => $upload['file'] ) ); |
|
| 1692 | + $headers = wp_remote_get($url, array('stream' => true, 'filename' => $upload['file']));
|
|
| 1693 | 1693 | |
| 1694 | 1694 | $log_message = ''; |
| 1695 | - if ( is_wp_error( $headers ) ) {
|
|
| 1696 | - echo 'file: ' . $url; |
|
| 1695 | + if (is_wp_error($headers)) {
|
|
| 1696 | + echo 'file: '.$url; |
|
| 1697 | 1697 | |
| 1698 | - return new WP_Error( 'import_file_error', $headers->get_error_message() ); |
|
| 1698 | + return new WP_Error('import_file_error', $headers->get_error_message());
|
|
| 1699 | 1699 | } |
| 1700 | 1700 | |
| 1701 | 1701 | // clear cache to make compat with EWWW Image Optimizer |
| 1702 | - if(defined( 'EWWW_IMAGE_OPTIMIZER_PLUGIN_FILE')){
|
|
| 1702 | + if (defined('EWWW_IMAGE_OPTIMIZER_PLUGIN_FILE')) {
|
|
| 1703 | 1703 | clearstatcache(); |
| 1704 | 1704 | } |
| 1705 | - $filesize = filesize( $upload['file'] ); |
|
| 1705 | + $filesize = filesize($upload['file']); |
|
| 1706 | 1706 | // request failed |
| 1707 | - if ( ! $headers ) {
|
|
| 1708 | - $log_message = __( 'Remote server did not respond', 'geodirectory' ); |
|
| 1707 | + if (!$headers) {
|
|
| 1708 | + $log_message = __('Remote server did not respond', 'geodirectory');
|
|
| 1709 | 1709 | } // make sure the fetch was successful |
| 1710 | - elseif ( $headers['response']['code'] != '200' ) {
|
|
| 1711 | - $log_message = sprintf( __( 'Remote server returned error response %1$d %2$s', 'geodirectory' ), esc_html( $headers['response'] ), get_status_header_desc( $headers['response'] ) ); |
|
| 1712 | - } elseif ( isset( $headers['headers']['content-length'] ) && $filesize != $headers['headers']['content-length'] ) {
|
|
| 1713 | - $log_message = __( 'Remote file is incorrect size', 'geodirectory' ); |
|
| 1714 | - } elseif ( 0 == $filesize ) {
|
|
| 1715 | - $log_message = __( 'Zero size file downloaded', 'geodirectory' ); |
|
| 1716 | - } |
|
| 1717 | - |
|
| 1718 | - if ( $log_message ) {
|
|
| 1719 | - $del = unlink( $upload['file'] ); |
|
| 1720 | - if ( ! $del ) {
|
|
| 1721 | - geodir_error_log( __( 'GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory' ) ); |
|
| 1710 | + elseif ($headers['response']['code'] != '200') {
|
|
| 1711 | + $log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));
|
|
| 1712 | + } elseif (isset($headers['headers']['content-length']) && $filesize != $headers['headers']['content-length']) {
|
|
| 1713 | + $log_message = __('Remote file is incorrect size', 'geodirectory');
|
|
| 1714 | + } elseif (0 == $filesize) {
|
|
| 1715 | + $log_message = __('Zero size file downloaded', 'geodirectory');
|
|
| 1716 | + } |
|
| 1717 | + |
|
| 1718 | + if ($log_message) {
|
|
| 1719 | + $del = unlink($upload['file']); |
|
| 1720 | + if (!$del) {
|
|
| 1721 | + geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory'));
|
|
| 1722 | 1722 | } |
| 1723 | 1723 | |
| 1724 | - return new WP_Error( 'import_file_error', $log_message ); |
|
| 1724 | + return new WP_Error('import_file_error', $log_message);
|
|
| 1725 | 1725 | } |
| 1726 | 1726 | |
| 1727 | - if ( $dummy && $add_to_cache && is_array( $upload ) ) {
|
|
| 1728 | - $images = get_transient( 'cached_dummy_images' ); |
|
| 1729 | - if ( is_array( $images ) ) {
|
|
| 1730 | - $images[ $key ] = $upload; |
|
| 1727 | + if ($dummy && $add_to_cache && is_array($upload)) {
|
|
| 1728 | + $images = get_transient('cached_dummy_images');
|
|
| 1729 | + if (is_array($images)) {
|
|
| 1730 | + $images[$key] = $upload; |
|
| 1731 | 1731 | } else {
|
| 1732 | - $images = array( $key => $upload ); |
|
| 1732 | + $images = array($key => $upload); |
|
| 1733 | 1733 | } |
| 1734 | 1734 | |
| 1735 | 1735 | //setting the cache using the WP Transient API |
| 1736 | - set_transient( 'cached_dummy_images', $images, 60 * 10 ); //10 minutes cache |
|
| 1736 | + set_transient('cached_dummy_images', $images, 60 * 10); //10 minutes cache
|
|
| 1737 | 1737 | } |
| 1738 | 1738 | |
| 1739 | 1739 | return $upload; |
@@ -1747,12 +1747,12 @@ discard block |
||
| 1747 | 1747 | * @return string|void Max upload size. |
| 1748 | 1748 | */ |
| 1749 | 1749 | function geodir_max_upload_size() {
|
| 1750 | - $max_filesize = (float) get_option( 'geodir_upload_max_filesize', 2 ); |
|
| 1750 | + $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);
|
|
| 1751 | 1751 | |
| 1752 | - if ( $max_filesize > 0 && $max_filesize < 1 ) {
|
|
| 1753 | - $max_filesize = (int) ( $max_filesize * 1024 ) . 'kb'; |
|
| 1752 | + if ($max_filesize > 0 && $max_filesize < 1) {
|
|
| 1753 | + $max_filesize = (int) ($max_filesize * 1024).'kb'; |
|
| 1754 | 1754 | } else {
|
| 1755 | - $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; |
|
| 1755 | + $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb'; |
|
| 1756 | 1756 | } |
| 1757 | 1757 | |
| 1758 | 1758 | /** |
@@ -1762,7 +1762,7 @@ discard block |
||
| 1762 | 1762 | * |
| 1763 | 1763 | * @param string $max_filesize Max file upload size. Ex. 10mb, 512kb. |
| 1764 | 1764 | */ |
| 1765 | - return apply_filters( 'geodir_default_image_upload_size_limit', $max_filesize ); |
|
| 1765 | + return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
|
|
| 1766 | 1766 | } |
| 1767 | 1767 | |
| 1768 | 1768 | /** |
@@ -1775,8 +1775,8 @@ discard block |
||
| 1775 | 1775 | * @return bool If dummy folder exists returns true, else false. |
| 1776 | 1776 | */ |
| 1777 | 1777 | function geodir_dummy_folder_exists() {
|
| 1778 | - $path = geodir_plugin_path() . '/geodirectory-admin/dummy/'; |
|
| 1779 | - if ( ! is_dir( $path ) ) {
|
|
| 1778 | + $path = geodir_plugin_path().'/geodirectory-admin/dummy/'; |
|
| 1779 | + if (!is_dir($path)) {
|
|
| 1780 | 1780 | return false; |
| 1781 | 1781 | } else {
|
| 1782 | 1782 | return true; |
@@ -1795,17 +1795,17 @@ discard block |
||
| 1795 | 1795 | * |
| 1796 | 1796 | * @return object Author info. |
| 1797 | 1797 | */ |
| 1798 | -function geodir_get_author_info( $aid ) {
|
|
| 1798 | +function geodir_get_author_info($aid) {
|
|
| 1799 | 1799 | global $wpdb; |
| 1800 | 1800 | /*$infosql = "select * from $wpdb->users where ID=$aid";*/ |
| 1801 | - $infosql = $wpdb->prepare( "select * from $wpdb->users where ID=%d", array( $aid ) ); |
|
| 1802 | - $info = $wpdb->get_results( $infosql ); |
|
| 1803 | - if ( $info ) {
|
|
| 1801 | + $infosql = $wpdb->prepare("select * from $wpdb->users where ID=%d", array($aid));
|
|
| 1802 | + $info = $wpdb->get_results($infosql); |
|
| 1803 | + if ($info) {
|
|
| 1804 | 1804 | return $info[0]; |
| 1805 | 1805 | } |
| 1806 | 1806 | } |
| 1807 | 1807 | |
| 1808 | -if ( ! function_exists( 'adminEmail' ) ) {
|
|
| 1808 | +if (!function_exists('adminEmail')) {
|
|
| 1809 | 1809 | /** |
| 1810 | 1810 | * Send emails to client on post submission, renew etc. |
| 1811 | 1811 | * |
@@ -1818,67 +1818,67 @@ discard block |
||
| 1818 | 1818 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1819 | 1819 | * @param string $custom_1 Custom data to be sent. |
| 1820 | 1820 | */ |
| 1821 | - function adminEmail( $page_id, $user_id, $message_type, $custom_1 = '' ) {
|
|
| 1821 | + function adminEmail($page_id, $user_id, $message_type, $custom_1 = '') {
|
|
| 1822 | 1822 | global $wpdb; |
| 1823 | - if ( $message_type == 'expiration' ) {
|
|
| 1824 | - $subject = stripslashes( __( get_option( 'renew_email_subject' ), 'geodirectory' ) ); |
|
| 1825 | - $client_message = stripslashes( __( get_option( 'renew_email_content' ), 'geodirectory' ) ); |
|
| 1826 | - } elseif ( $message_type == 'post_submited' ) {
|
|
| 1827 | - $subject = __( get_option( 'post_submited_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1828 | - $client_message = __( get_option( 'post_submited_success_email_content_admin' ), 'geodirectory' ); |
|
| 1829 | - } elseif ( $message_type == 'renew' ) {
|
|
| 1830 | - $subject = __( get_option( 'post_renew_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1831 | - $client_message = __( get_option( 'post_renew_success_email_content_admin' ), 'geodirectory' ); |
|
| 1832 | - } elseif ( $message_type == 'upgrade' ) {
|
|
| 1833 | - $subject = __( get_option( 'post_upgrade_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1834 | - $client_message = __( get_option( 'post_upgrade_success_email_content_admin' ), 'geodirectory' ); |
|
| 1835 | - } elseif ( $message_type == 'claim_approved' ) {
|
|
| 1836 | - $subject = __( get_option( 'claim_approved_email_subject' ), 'geodirectory' ); |
|
| 1837 | - $client_message = __( get_option( 'claim_approved_email_content' ), 'geodirectory' ); |
|
| 1838 | - } elseif ( $message_type == 'claim_rejected' ) {
|
|
| 1839 | - $subject = __( get_option( 'claim_rejected_email_subject' ), 'geodirectory' ); |
|
| 1840 | - $client_message = __( get_option( 'claim_rejected_email_content' ), 'geodirectory' ); |
|
| 1841 | - } elseif ( $message_type == 'claim_requested' ) {
|
|
| 1842 | - $subject = __( get_option( 'claim_email_subject_admin' ), 'geodirectory' ); |
|
| 1843 | - $client_message = __( get_option( 'claim_email_content_admin' ), 'geodirectory' ); |
|
| 1844 | - } elseif ( $message_type == 'auto_claim' ) {
|
|
| 1845 | - $subject = __( get_option( 'auto_claim_email_subject' ), 'geodirectory' ); |
|
| 1846 | - $client_message = __( get_option( 'auto_claim_email_content' ), 'geodirectory' ); |
|
| 1847 | - } elseif ( $message_type == 'payment_success' ) {
|
|
| 1848 | - $subject = __( get_option( 'post_payment_success_admin_email_subject' ), 'geodirectory' ); |
|
| 1849 | - $client_message = __( get_option( 'post_payment_success_admin_email_content' ), 'geodirectory' ); |
|
| 1850 | - } elseif ( $message_type == 'payment_fail' ) {
|
|
| 1851 | - $subject = __( get_option( 'post_payment_fail_admin_email_subject' ), 'geodirectory' ); |
|
| 1852 | - $client_message = __( get_option( 'post_payment_fail_admin_email_content' ), 'geodirectory' ); |
|
| 1823 | + if ($message_type == 'expiration') {
|
|
| 1824 | + $subject = stripslashes(__(get_option('renew_email_subject'), 'geodirectory'));
|
|
| 1825 | + $client_message = stripslashes(__(get_option('renew_email_content'), 'geodirectory'));
|
|
| 1826 | + } elseif ($message_type == 'post_submited') {
|
|
| 1827 | + $subject = __(get_option('post_submited_success_email_subject_admin'), 'geodirectory');
|
|
| 1828 | + $client_message = __(get_option('post_submited_success_email_content_admin'), 'geodirectory');
|
|
| 1829 | + } elseif ($message_type == 'renew') {
|
|
| 1830 | + $subject = __(get_option('post_renew_success_email_subject_admin'), 'geodirectory');
|
|
| 1831 | + $client_message = __(get_option('post_renew_success_email_content_admin'), 'geodirectory');
|
|
| 1832 | + } elseif ($message_type == 'upgrade') {
|
|
| 1833 | + $subject = __(get_option('post_upgrade_success_email_subject_admin'), 'geodirectory');
|
|
| 1834 | + $client_message = __(get_option('post_upgrade_success_email_content_admin'), 'geodirectory');
|
|
| 1835 | + } elseif ($message_type == 'claim_approved') {
|
|
| 1836 | + $subject = __(get_option('claim_approved_email_subject'), 'geodirectory');
|
|
| 1837 | + $client_message = __(get_option('claim_approved_email_content'), 'geodirectory');
|
|
| 1838 | + } elseif ($message_type == 'claim_rejected') {
|
|
| 1839 | + $subject = __(get_option('claim_rejected_email_subject'), 'geodirectory');
|
|
| 1840 | + $client_message = __(get_option('claim_rejected_email_content'), 'geodirectory');
|
|
| 1841 | + } elseif ($message_type == 'claim_requested') {
|
|
| 1842 | + $subject = __(get_option('claim_email_subject_admin'), 'geodirectory');
|
|
| 1843 | + $client_message = __(get_option('claim_email_content_admin'), 'geodirectory');
|
|
| 1844 | + } elseif ($message_type == 'auto_claim') {
|
|
| 1845 | + $subject = __(get_option('auto_claim_email_subject'), 'geodirectory');
|
|
| 1846 | + $client_message = __(get_option('auto_claim_email_content'), 'geodirectory');
|
|
| 1847 | + } elseif ($message_type == 'payment_success') {
|
|
| 1848 | + $subject = __(get_option('post_payment_success_admin_email_subject'), 'geodirectory');
|
|
| 1849 | + $client_message = __(get_option('post_payment_success_admin_email_content'), 'geodirectory');
|
|
| 1850 | + } elseif ($message_type == 'payment_fail') {
|
|
| 1851 | + $subject = __(get_option('post_payment_fail_admin_email_subject'), 'geodirectory');
|
|
| 1852 | + $client_message = __(get_option('post_payment_fail_admin_email_content'), 'geodirectory');
|
|
| 1853 | 1853 | } |
| 1854 | 1854 | $transaction_details = $custom_1; |
| 1855 | - $fromEmail = get_option( 'site_email' ); |
|
| 1855 | + $fromEmail = get_option('site_email');
|
|
| 1856 | 1856 | $fromEmailName = get_site_emailName(); |
| 1857 | 1857 | //$alivedays = get_post_meta($page_id,'alive_days',true); |
| 1858 | - $pkg_limit = get_property_price_info_listing( $page_id ); |
|
| 1858 | + $pkg_limit = get_property_price_info_listing($page_id); |
|
| 1859 | 1859 | $alivedays = $pkg_limit['days']; |
| 1860 | - $productlink = get_permalink( $page_id ); |
|
| 1861 | - $post_info = get_post( $page_id ); |
|
| 1862 | - $post_date = date( 'dS F,Y', strtotime( $post_info->post_date ) ); |
|
| 1863 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; |
|
| 1860 | + $productlink = get_permalink($page_id); |
|
| 1861 | + $post_info = get_post($page_id); |
|
| 1862 | + $post_date = date('dS F,Y', strtotime($post_info->post_date));
|
|
| 1863 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; |
|
| 1864 | 1864 | $loginurl = geodir_login_url(); |
| 1865 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; |
|
| 1865 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; |
|
| 1866 | 1866 | $siteurl = home_url(); |
| 1867 | - $siteurl_link = '<a href="' . $siteurl . '">' . $fromEmailName . '</a>'; |
|
| 1868 | - $user_info = get_userdata( $user_id ); |
|
| 1867 | + $siteurl_link = '<a href="'.$siteurl.'">'.$fromEmailName.'</a>'; |
|
| 1868 | + $user_info = get_userdata($user_id); |
|
| 1869 | 1869 | $user_email = $user_info->user_email; |
| 1870 | - $display_name = geodir_get_client_name( $user_id ); |
|
| 1870 | + $display_name = geodir_get_client_name($user_id); |
|
| 1871 | 1871 | $user_login = $user_info->user_login; |
| 1872 | - $number_of_grace_days = get_option( 'ptthemes_listing_preexpiry_notice_days' ); |
|
| 1873 | - if ( $number_of_grace_days == '' ) {
|
|
| 1872 | + $number_of_grace_days = get_option('ptthemes_listing_preexpiry_notice_days');
|
|
| 1873 | + if ($number_of_grace_days == '') {
|
|
| 1874 | 1874 | $number_of_grace_days = 1; |
| 1875 | 1875 | } |
| 1876 | - if ( $post_info->post_type == 'event' ) {
|
|
| 1876 | + if ($post_info->post_type == 'event') {
|
|
| 1877 | 1877 | $post_type = 'event'; |
| 1878 | 1878 | } else {
|
| 1879 | 1879 | $post_type = 'listing'; |
| 1880 | 1880 | } |
| 1881 | - $renew_link = '<a href="' . $siteurl . '?ptype=post_' . $post_type . '&renew=1&pid=' . $page_id . '">' . RENEW_LINK . '</a>'; |
|
| 1881 | + $renew_link = '<a href="'.$siteurl.'?ptype=post_'.$post_type.'&renew=1&pid='.$page_id.'">'.RENEW_LINK.'</a>'; |
|
| 1882 | 1882 | $search_array = array( |
| 1883 | 1883 | '[#client_name#]', |
| 1884 | 1884 | '[#listing_link#]', |
@@ -1894,7 +1894,7 @@ discard block |
||
| 1894 | 1894 | '[#site_name#]', |
| 1895 | 1895 | '[#transaction_details#]' |
| 1896 | 1896 | ); |
| 1897 | - $replace_array = array( |
|
| 1897 | + $replace_array = array( |
|
| 1898 | 1898 | $display_name, |
| 1899 | 1899 | $listingLink, |
| 1900 | 1900 | $post_date, |
@@ -1909,13 +1909,13 @@ discard block |
||
| 1909 | 1909 | $fromEmailName, |
| 1910 | 1910 | $transaction_details |
| 1911 | 1911 | ); |
| 1912 | - $client_message = str_replace( $search_array, $replace_array, $client_message ); |
|
| 1913 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 1912 | + $client_message = str_replace($search_array, $replace_array, $client_message); |
|
| 1913 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 1914 | 1914 | |
| 1915 | 1915 | |
| 1916 | - $headers = array(); |
|
| 1916 | + $headers = array(); |
|
| 1917 | 1917 | $headers[] = 'Content-type: text/html; charset=UTF-8'; |
| 1918 | - $headers[] = 'From: ' . $fromEmailName . ' <' . $fromEmail . '>'; |
|
| 1918 | + $headers[] = 'From: '.$fromEmailName.' <'.$fromEmail.'>'; |
|
| 1919 | 1919 | |
| 1920 | 1920 | $to = $fromEmail; |
| 1921 | 1921 | $message = $client_message; |
@@ -1933,7 +1933,7 @@ discard block |
||
| 1933 | 1933 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1934 | 1934 | * @param string $custom_1 Custom data to be sent. |
| 1935 | 1935 | */ |
| 1936 | - $to = apply_filters( 'geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1936 | + $to = apply_filters('geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1937 | 1937 | /** |
| 1938 | 1938 | * Filter the admin email subject. |
| 1939 | 1939 | * |
@@ -1946,7 +1946,7 @@ discard block |
||
| 1946 | 1946 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1947 | 1947 | * @param string $custom_1 Custom data to be sent. |
| 1948 | 1948 | */ |
| 1949 | - $subject = apply_filters( 'geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1949 | + $subject = apply_filters('geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1950 | 1950 | /** |
| 1951 | 1951 | * Filter the admin email message. |
| 1952 | 1952 | * |
@@ -1959,7 +1959,7 @@ discard block |
||
| 1959 | 1959 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1960 | 1960 | * @param string $custom_1 Custom data to be sent. |
| 1961 | 1961 | */ |
| 1962 | - $message = apply_filters( 'geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1962 | + $message = apply_filters('geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1963 | 1963 | /** |
| 1964 | 1964 | * Filter the admin email headers. |
| 1965 | 1965 | * |
@@ -1972,22 +1972,22 @@ discard block |
||
| 1972 | 1972 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1973 | 1973 | * @param string $custom_1 Custom data to be sent. |
| 1974 | 1974 | */ |
| 1975 | - $headers = apply_filters( 'geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1975 | + $headers = apply_filters('geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1976 | 1976 | |
| 1977 | 1977 | |
| 1978 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1979 | - if ( ! $sent ) {
|
|
| 1980 | - if ( is_array( $to ) ) {
|
|
| 1981 | - $to = implode( ',', $to ); |
|
| 1978 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1979 | + if (!$sent) {
|
|
| 1980 | + if (is_array($to)) {
|
|
| 1981 | + $to = implode(',', $to);
|
|
| 1982 | 1982 | } |
| 1983 | 1983 | $log_message = sprintf( |
| 1984 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1984 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1985 | 1985 | $message_type, |
| 1986 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1986 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1987 | 1987 | $to, |
| 1988 | 1988 | $subject |
| 1989 | 1989 | ); |
| 1990 | - geodir_error_log( $log_message ); |
|
| 1990 | + geodir_error_log($log_message); |
|
| 1991 | 1991 | } |
| 1992 | 1992 | } |
| 1993 | 1993 | } |
@@ -2007,12 +2007,12 @@ discard block |
||
| 2007 | 2007 | * |
| 2008 | 2008 | * @return array Category IDs. |
| 2009 | 2009 | */ |
| 2010 | -function gd_lang_object_ids( $ids_array, $type ) {
|
|
| 2011 | - if ( geodir_is_wpml() ) {
|
|
| 2010 | +function gd_lang_object_ids($ids_array, $type) {
|
|
| 2011 | + if (geodir_is_wpml()) {
|
|
| 2012 | 2012 | $res = array(); |
| 2013 | - foreach ( $ids_array as $id ) {
|
|
| 2014 | - $xlat = geodir_wpml_object_id( $id, $type, false ); |
|
| 2015 | - if ( ! is_null( $xlat ) ) {
|
|
| 2013 | + foreach ($ids_array as $id) {
|
|
| 2014 | + $xlat = geodir_wpml_object_id($id, $type, false); |
|
| 2015 | + if (!is_null($xlat)) {
|
|
| 2016 | 2016 | $res[] = $xlat; |
| 2017 | 2017 | } |
| 2018 | 2018 | } |
@@ -2036,20 +2036,20 @@ discard block |
||
| 2036 | 2036 | * |
| 2037 | 2037 | * @return array Modified Body CSS classes. |
| 2038 | 2038 | */ |
| 2039 | -function geodir_custom_posts_body_class( $classes ) {
|
|
| 2039 | +function geodir_custom_posts_body_class($classes) {
|
|
| 2040 | 2040 | global $wpdb, $wp; |
| 2041 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 2042 | - if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {
|
|
| 2041 | + $post_types = geodir_get_posttypes('object');
|
|
| 2042 | + if (!empty($post_types) && count((array) $post_types) > 1) {
|
|
| 2043 | 2043 | $classes[] = 'geodir_custom_posts'; |
| 2044 | 2044 | } |
| 2045 | 2045 | |
| 2046 | 2046 | // fix body class for signup page |
| 2047 | - if ( geodir_is_page( 'login' ) ) {
|
|
| 2047 | + if (geodir_is_page('login')) {
|
|
| 2048 | 2048 | $new_classes = array(); |
| 2049 | 2049 | $new_classes[] = 'signup page-geodir-signup'; |
| 2050 | - if ( ! empty( $classes ) ) {
|
|
| 2051 | - foreach ( $classes as $class ) {
|
|
| 2052 | - if ( $class && $class != 'home' && $class != 'blog' ) {
|
|
| 2050 | + if (!empty($classes)) {
|
|
| 2051 | + foreach ($classes as $class) {
|
|
| 2052 | + if ($class && $class != 'home' && $class != 'blog') {
|
|
| 2053 | 2053 | $new_classes[] = $class; |
| 2054 | 2054 | } |
| 2055 | 2055 | } |
@@ -2057,14 +2057,14 @@ discard block |
||
| 2057 | 2057 | $classes = $new_classes; |
| 2058 | 2058 | } |
| 2059 | 2059 | |
| 2060 | - if ( geodir_is_geodir_page() ) {
|
|
| 2060 | + if (geodir_is_geodir_page()) {
|
|
| 2061 | 2061 | $classes[] = 'geodir-page'; |
| 2062 | 2062 | } |
| 2063 | 2063 | |
| 2064 | 2064 | return $classes; |
| 2065 | 2065 | } |
| 2066 | 2066 | |
| 2067 | -add_filter( 'body_class', 'geodir_custom_posts_body_class' ); // let's add a class to the body so we can style the new addition to the search |
|
| 2067 | +add_filter('body_class', 'geodir_custom_posts_body_class'); // let's add a class to the body so we can style the new addition to the search
|
|
| 2068 | 2068 | |
| 2069 | 2069 | |
| 2070 | 2070 | /** |
@@ -2080,7 +2080,7 @@ discard block |
||
| 2080 | 2080 | * |
| 2081 | 2081 | * @since 1.0.0 |
| 2082 | 2082 | */ |
| 2083 | - return apply_filters( 'geodir_map_zoom_level', array( |
|
| 2083 | + return apply_filters('geodir_map_zoom_level', array(
|
|
| 2084 | 2084 | 1, |
| 2085 | 2085 | 2, |
| 2086 | 2086 | 3, |
@@ -2100,7 +2100,7 @@ discard block |
||
| 2100 | 2100 | 17, |
| 2101 | 2101 | 18, |
| 2102 | 2102 | 19 |
| 2103 | - ) ); |
|
| 2103 | + )); |
|
| 2104 | 2104 | |
| 2105 | 2105 | } |
| 2106 | 2106 | |
@@ -2113,12 +2113,12 @@ discard block |
||
| 2113 | 2113 | * |
| 2114 | 2114 | * @param string $geodir_option_name Option key. |
| 2115 | 2115 | */ |
| 2116 | -function geodir_option_version_backup( $geodir_option_name ) {
|
|
| 2116 | +function geodir_option_version_backup($geodir_option_name) {
|
|
| 2117 | 2117 | $version_date = time(); |
| 2118 | - $geodir_option = get_option( $geodir_option_name ); |
|
| 2118 | + $geodir_option = get_option($geodir_option_name); |
|
| 2119 | 2119 | |
| 2120 | - if ( ! empty( $geodir_option ) ) {
|
|
| 2121 | - add_option( $geodir_option_name . '_' . $version_date, $geodir_option ); |
|
| 2120 | + if (!empty($geodir_option)) {
|
|
| 2121 | + add_option($geodir_option_name.'_'.$version_date, $geodir_option); |
|
| 2122 | 2122 | } |
| 2123 | 2123 | } |
| 2124 | 2124 | |
@@ -2132,10 +2132,10 @@ discard block |
||
| 2132 | 2132 | * |
| 2133 | 2133 | * @return int Page ID. |
| 2134 | 2134 | */ |
| 2135 | -function get_page_id_geodir_add_listing_page( $page_id ) {
|
|
| 2136 | - if ( geodir_wpml_multilingual_status() ) {
|
|
| 2135 | +function get_page_id_geodir_add_listing_page($page_id) {
|
|
| 2136 | + if (geodir_wpml_multilingual_status()) {
|
|
| 2137 | 2137 | $post_type = 'post_page'; |
| 2138 | - $page_id = geodir_get_wpml_element_id( $page_id, $post_type ); |
|
| 2138 | + $page_id = geodir_get_wpml_element_id($page_id, $post_type); |
|
| 2139 | 2139 | } |
| 2140 | 2140 | |
| 2141 | 2141 | return $page_id; |
@@ -2149,7 +2149,7 @@ discard block |
||
| 2149 | 2149 | * @return bool Returns true when sitepress multilingual CMS active. else returns false. |
| 2150 | 2150 | */ |
| 2151 | 2151 | function geodir_wpml_multilingual_status() {
|
| 2152 | - if ( geodir_is_wpml() ) {
|
|
| 2152 | + if (geodir_is_wpml()) {
|
|
| 2153 | 2153 | return true; |
| 2154 | 2154 | } |
| 2155 | 2155 | |
@@ -2167,19 +2167,19 @@ discard block |
||
| 2167 | 2167 | * |
| 2168 | 2168 | * @return int Element ID when exists. Else the page id. |
| 2169 | 2169 | */ |
| 2170 | -function geodir_get_wpml_element_id( $page_id, $post_type ) {
|
|
| 2170 | +function geodir_get_wpml_element_id($page_id, $post_type) {
|
|
| 2171 | 2171 | global $sitepress; |
| 2172 | - if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
|
|
| 2173 | - $trid = $sitepress->get_element_trid( $page_id, $post_type ); |
|
| 2172 | + if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
|
|
| 2173 | + $trid = $sitepress->get_element_trid($page_id, $post_type); |
|
| 2174 | 2174 | |
| 2175 | - if ( $trid > 0 ) {
|
|
| 2176 | - $translations = $sitepress->get_element_translations( $trid, $post_type ); |
|
| 2175 | + if ($trid > 0) {
|
|
| 2176 | + $translations = $sitepress->get_element_translations($trid, $post_type); |
|
| 2177 | 2177 | |
| 2178 | 2178 | $lang = $sitepress->get_current_language(); |
| 2179 | 2179 | $lang = $lang ? $lang : $sitepress->get_default_language(); |
| 2180 | 2180 | |
| 2181 | - if ( ! empty( $translations ) && ! empty( $lang ) && isset( $translations[ $lang ] ) && isset( $translations[ $lang ]->element_id ) && ! empty( $translations[ $lang ]->element_id ) ) {
|
|
| 2182 | - $page_id = $translations[ $lang ]->element_id; |
|
| 2181 | + if (!empty($translations) && !empty($lang) && isset($translations[$lang]) && isset($translations[$lang]->element_id) && !empty($translations[$lang]->element_id)) {
|
|
| 2182 | + $page_id = $translations[$lang]->element_id; |
|
| 2183 | 2183 | } |
| 2184 | 2184 | } |
| 2185 | 2185 | } |
@@ -2196,15 +2196,15 @@ discard block |
||
| 2196 | 2196 | */ |
| 2197 | 2197 | function geodir_wpml_check_element_id() {
|
| 2198 | 2198 | global $sitepress; |
| 2199 | - if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
|
|
| 2199 | + if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
|
|
| 2200 | 2200 | $el_type = 'post_page'; |
| 2201 | - $el_id = get_option( 'geodir_add_listing_page' ); |
|
| 2201 | + $el_id = get_option('geodir_add_listing_page');
|
|
| 2202 | 2202 | $default_lang = $sitepress->get_default_language(); |
| 2203 | - $el_details = $sitepress->get_element_language_details( $el_id, $el_type ); |
|
| 2203 | + $el_details = $sitepress->get_element_language_details($el_id, $el_type); |
|
| 2204 | 2204 | |
| 2205 | - if ( ! ( $el_id > 0 && $default_lang && ! empty( $el_details ) && isset( $el_details->language_code ) && $el_details->language_code == $default_lang ) ) {
|
|
| 2206 | - if ( ! $el_details->source_language_code ) {
|
|
| 2207 | - $sitepress->set_element_language_details( $el_id, $el_type, '', $default_lang ); |
|
| 2205 | + if (!($el_id > 0 && $default_lang && !empty($el_details) && isset($el_details->language_code) && $el_details->language_code == $default_lang)) {
|
|
| 2206 | + if (!$el_details->source_language_code) {
|
|
| 2207 | + $sitepress->set_element_language_details($el_id, $el_type, '', $default_lang); |
|
| 2208 | 2208 | $sitepress->icl_translations_cache->clear(); |
| 2209 | 2209 | } |
| 2210 | 2210 | } |
@@ -2224,44 +2224,44 @@ discard block |
||
| 2224 | 2224 | * |
| 2225 | 2225 | * @return string Orderby SQL. |
| 2226 | 2226 | */ |
| 2227 | -function geodir_widget_listings_get_order( $query_args ) {
|
|
| 2227 | +function geodir_widget_listings_get_order($query_args) {
|
|
| 2228 | 2228 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2229 | 2229 | |
| 2230 | 2230 | $query_args = $gd_query_args_widgets; |
| 2231 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2232 | - return $wpdb->posts . ".post_date DESC, "; |
|
| 2231 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2232 | + return $wpdb->posts.".post_date DESC, "; |
|
| 2233 | 2233 | } |
| 2234 | 2234 | |
| 2235 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2236 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2235 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2236 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2237 | 2237 | |
| 2238 | - $sort_by = ! empty( $query_args['order_by'] ) ? $query_args['order_by'] : ''; |
|
| 2238 | + $sort_by = !empty($query_args['order_by']) ? $query_args['order_by'] : ''; |
|
| 2239 | 2239 | |
| 2240 | - switch ( $sort_by ) {
|
|
| 2240 | + switch ($sort_by) {
|
|
| 2241 | 2241 | case 'latest': |
| 2242 | 2242 | case 'newest': |
| 2243 | - $orderby = $wpdb->posts . ".post_date DESC, "; |
|
| 2243 | + $orderby = $wpdb->posts.".post_date DESC, "; |
|
| 2244 | 2244 | break; |
| 2245 | 2245 | case 'featured': |
| 2246 | - $orderby = $table . ".is_featured ASC, ". $wpdb->posts . ".post_date DESC, "; |
|
| 2246 | + $orderby = $table.".is_featured ASC, ".$wpdb->posts.".post_date DESC, "; |
|
| 2247 | 2247 | break; |
| 2248 | 2248 | case 'az': |
| 2249 | - $orderby = $wpdb->posts . ".post_title ASC, "; |
|
| 2249 | + $orderby = $wpdb->posts.".post_title ASC, "; |
|
| 2250 | 2250 | break; |
| 2251 | 2251 | case 'high_review': |
| 2252 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 2252 | + $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, "; |
|
| 2253 | 2253 | break; |
| 2254 | 2254 | case 'high_rating': |
| 2255 | - $orderby = "( " . $table . ".overall_rating ) DESC, "; |
|
| 2255 | + $orderby = "( ".$table.".overall_rating ) DESC, "; |
|
| 2256 | 2256 | break; |
| 2257 | 2257 | case 'random': |
| 2258 | 2258 | $orderby = "RAND(), "; |
| 2259 | 2259 | break; |
| 2260 | 2260 | default: |
| 2261 | - if ( $custom_orderby = geodir_prepare_custom_sorting( $sort_by, $table ) ) {
|
|
| 2262 | - $orderby = $custom_orderby . ", "; |
|
| 2261 | + if ($custom_orderby = geodir_prepare_custom_sorting($sort_by, $table)) {
|
|
| 2262 | + $orderby = $custom_orderby.", "; |
|
| 2263 | 2263 | } else {
|
| 2264 | - $orderby = $wpdb->posts . ".post_title ASC, "; |
|
| 2264 | + $orderby = $wpdb->posts.".post_title ASC, "; |
|
| 2265 | 2265 | } |
| 2266 | 2266 | break; |
| 2267 | 2267 | } |
@@ -2286,16 +2286,16 @@ discard block |
||
| 2286 | 2286 | * |
| 2287 | 2287 | * @return mixed Result object. |
| 2288 | 2288 | */ |
| 2289 | -function geodir_get_widget_listings( $query_args = array(), $count_only = false ) {
|
|
| 2289 | +function geodir_get_widget_listings($query_args = array(), $count_only = false) {
|
|
| 2290 | 2290 | global $wpdb, $plugin_prefix, $table_prefix; |
| 2291 | 2291 | $GLOBALS['gd_query_args_widgets'] = $query_args; |
| 2292 | 2292 | $gd_query_args_widgets = $query_args; |
| 2293 | 2293 | |
| 2294 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2295 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2296 | - $supports_wpml = geodir_wpml_is_post_type_translated( $post_type ); |
|
| 2294 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2295 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2296 | + $supports_wpml = geodir_wpml_is_post_type_translated($post_type); |
|
| 2297 | 2297 | |
| 2298 | - $fields = $wpdb->posts . ".*, " . $table . ".*"; |
|
| 2298 | + $fields = $wpdb->posts.".*, ".$table.".*"; |
|
| 2299 | 2299 | /** |
| 2300 | 2300 | * Filter widget listing fields string part that is being used for query. |
| 2301 | 2301 | * |
@@ -2305,17 +2305,17 @@ discard block |
||
| 2305 | 2305 | * @param string $table Table name. |
| 2306 | 2306 | * @param string $post_type Post type. |
| 2307 | 2307 | */ |
| 2308 | - $fields = apply_filters( 'geodir_filter_widget_listings_fields', $fields, $table, $post_type ); |
|
| 2308 | + $fields = apply_filters('geodir_filter_widget_listings_fields', $fields, $table, $post_type);
|
|
| 2309 | 2309 | |
| 2310 | - $join = "INNER JOIN " . $table . " ON (" . $table . ".post_id = " . $wpdb->posts . ".ID)";
|
|
| 2310 | + $join = "INNER JOIN ".$table." ON (".$table.".post_id = ".$wpdb->posts.".ID)";
|
|
| 2311 | 2311 | |
| 2312 | 2312 | ########### WPML ########### |
| 2313 | 2313 | |
| 2314 | - if ( $supports_wpml ) {
|
|
| 2314 | + if ($supports_wpml) {
|
|
| 2315 | 2315 | global $sitepress; |
| 2316 | 2316 | $lang_code = ICL_LANGUAGE_CODE; |
| 2317 | - if ( $lang_code ) {
|
|
| 2318 | - $join .= " JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 2317 | + if ($lang_code) {
|
|
| 2318 | + $join .= " JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID"; |
|
| 2319 | 2319 | } |
| 2320 | 2320 | } |
| 2321 | 2321 | |
@@ -2329,15 +2329,15 @@ discard block |
||
| 2329 | 2329 | * @param string $join Join clause string. |
| 2330 | 2330 | * @param string $post_type Post type. |
| 2331 | 2331 | */ |
| 2332 | - $join = apply_filters( 'geodir_filter_widget_listings_join', $join, $post_type ); |
|
| 2332 | + $join = apply_filters('geodir_filter_widget_listings_join', $join, $post_type);
|
|
| 2333 | 2333 | |
| 2334 | - $post_status = is_super_admin() ? " OR " . $wpdb->posts . ".post_status = 'private'" : ''; |
|
| 2334 | + $post_status = is_super_admin() ? " OR ".$wpdb->posts.".post_status = 'private'" : ''; |
|
| 2335 | 2335 | |
| 2336 | - $where = " AND ( " . $wpdb->posts . ".post_status = 'publish' " . $post_status . " ) AND " . $wpdb->posts . ".post_type = '" . $post_type . "'"; |
|
| 2336 | + $where = " AND ( ".$wpdb->posts.".post_status = 'publish' ".$post_status." ) AND ".$wpdb->posts.".post_type = '".$post_type."'"; |
|
| 2337 | 2337 | |
| 2338 | 2338 | ########### WPML ########### |
| 2339 | - if ( $supports_wpml ) {
|
|
| 2340 | - if ( $lang_code ) {
|
|
| 2339 | + if ($supports_wpml) {
|
|
| 2340 | + if ($lang_code) {
|
|
| 2341 | 2341 | $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type = 'post_$post_type' "; |
| 2342 | 2342 | } |
| 2343 | 2343 | } |
@@ -2350,8 +2350,8 @@ discard block |
||
| 2350 | 2350 | * @param string $where Where clause string. |
| 2351 | 2351 | * @param string $post_type Post type. |
| 2352 | 2352 | */ |
| 2353 | - $where = apply_filters( 'geodir_filter_widget_listings_where', $where, $post_type ); |
|
| 2354 | - $where = $where != '' ? " WHERE 1=1 " . $where : ''; |
|
| 2353 | + $where = apply_filters('geodir_filter_widget_listings_where', $where, $post_type);
|
|
| 2354 | + $where = $where != '' ? " WHERE 1=1 ".$where : ''; |
|
| 2355 | 2355 | |
| 2356 | 2356 | $groupby = " GROUP BY $wpdb->posts.ID "; //@todo is this needed? faster without |
| 2357 | 2357 | /** |
@@ -2362,15 +2362,15 @@ discard block |
||
| 2362 | 2362 | * @param string $groupby Group by clause string. |
| 2363 | 2363 | * @param string $post_type Post type. |
| 2364 | 2364 | */ |
| 2365 | - $groupby = apply_filters( 'geodir_filter_widget_listings_groupby', $groupby, $post_type ); |
|
| 2365 | + $groupby = apply_filters('geodir_filter_widget_listings_groupby', $groupby, $post_type);
|
|
| 2366 | 2366 | |
| 2367 | - if ( $count_only ) {
|
|
| 2368 | - $sql = "SELECT COUNT(DISTINCT " . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . " |
|
| 2369 | - " . $join . " |
|
| 2367 | + if ($count_only) {
|
|
| 2368 | + $sql = "SELECT COUNT(DISTINCT ".$wpdb->posts.".ID) AS total FROM ".$wpdb->posts." |
|
| 2369 | + " . $join." |
|
| 2370 | 2370 | " . $where; |
| 2371 | - $rows = (int) $wpdb->get_var( $sql ); |
|
| 2371 | + $rows = (int) $wpdb->get_var($sql); |
|
| 2372 | 2372 | } else {
|
| 2373 | - $orderby = geodir_widget_listings_get_order( $query_args ); |
|
| 2373 | + $orderby = geodir_widget_listings_get_order($query_args); |
|
| 2374 | 2374 | /** |
| 2375 | 2375 | * Filter widget listing orderby clause string part that is being used for query. |
| 2376 | 2376 | * |
@@ -2380,33 +2380,33 @@ discard block |
||
| 2380 | 2380 | * @param string $table Table name. |
| 2381 | 2381 | * @param string $post_type Post type. |
| 2382 | 2382 | */ |
| 2383 | - $orderby = apply_filters( 'geodir_filter_widget_listings_orderby', $orderby, $table, $post_type ); |
|
| 2383 | + $orderby = apply_filters('geodir_filter_widget_listings_orderby', $orderby, $table, $post_type);
|
|
| 2384 | 2384 | |
| 2385 | 2385 | $second_orderby = array(); |
| 2386 | - if ( strpos( $orderby, strtolower( $table . ".is_featured" ) ) === false ) {
|
|
| 2387 | - $second_orderby[] = $table . ".is_featured ASC"; |
|
| 2386 | + if (strpos($orderby, strtolower($table.".is_featured")) === false) {
|
|
| 2387 | + $second_orderby[] = $table.".is_featured ASC"; |
|
| 2388 | 2388 | } |
| 2389 | 2389 | |
| 2390 | - if ( strpos( $orderby, strtolower( $wpdb->posts . ".post_date" ) ) === false ) {
|
|
| 2391 | - $second_orderby[] = $wpdb->posts . ".post_date DESC"; |
|
| 2390 | + if (strpos($orderby, strtolower($wpdb->posts.".post_date")) === false) {
|
|
| 2391 | + $second_orderby[] = $wpdb->posts.".post_date DESC"; |
|
| 2392 | 2392 | } |
| 2393 | 2393 | |
| 2394 | - if ( strpos( $orderby, strtolower( $wpdb->posts . ".post_title" ) ) === false ) {
|
|
| 2395 | - $second_orderby[] = $wpdb->posts . ".post_title ASC"; |
|
| 2394 | + if (strpos($orderby, strtolower($wpdb->posts.".post_title")) === false) {
|
|
| 2395 | + $second_orderby[] = $wpdb->posts.".post_title ASC"; |
|
| 2396 | 2396 | } |
| 2397 | 2397 | |
| 2398 | - if ( !empty( $second_orderby ) ) {
|
|
| 2399 | - $orderby .= implode( ', ', $second_orderby ); |
|
| 2398 | + if (!empty($second_orderby)) {
|
|
| 2399 | + $orderby .= implode(', ', $second_orderby);
|
|
| 2400 | 2400 | } |
| 2401 | 2401 | |
| 2402 | - if ( !empty( $orderby ) ) {
|
|
| 2403 | - $orderby = trim( $orderby ); |
|
| 2404 | - $orderby = rtrim( $orderby, "," ); |
|
| 2402 | + if (!empty($orderby)) {
|
|
| 2403 | + $orderby = trim($orderby); |
|
| 2404 | + $orderby = rtrim($orderby, ","); |
|
| 2405 | 2405 | } |
| 2406 | 2406 | |
| 2407 | - $orderby = $orderby != '' ? " ORDER BY " . $orderby : ''; |
|
| 2407 | + $orderby = $orderby != '' ? " ORDER BY ".$orderby : ''; |
|
| 2408 | 2408 | |
| 2409 | - $limit = ! empty( $query_args['posts_per_page'] ) ? $query_args['posts_per_page'] : 5; |
|
| 2409 | + $limit = !empty($query_args['posts_per_page']) ? $query_args['posts_per_page'] : 5; |
|
| 2410 | 2410 | /** |
| 2411 | 2411 | * Filter widget listing limit that is being used for query. |
| 2412 | 2412 | * |
@@ -2415,27 +2415,27 @@ discard block |
||
| 2415 | 2415 | * @param int $limit Query results limit. |
| 2416 | 2416 | * @param string $post_type Post type. |
| 2417 | 2417 | */ |
| 2418 | - $limit = apply_filters( 'geodir_filter_widget_listings_limit', $limit, $post_type ); |
|
| 2418 | + $limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);
|
|
| 2419 | 2419 | |
| 2420 | - $page = ! empty( $query_args['pageno'] ) ? absint( $query_args['pageno'] ) : 1; |
|
| 2421 | - if ( ! $page ) {
|
|
| 2420 | + $page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1; |
|
| 2421 | + if (!$page) {
|
|
| 2422 | 2422 | $page = 1; |
| 2423 | 2423 | } |
| 2424 | 2424 | |
| 2425 | - $limit = (int) $limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int) $limit ) . ", " . (int) $limit : ""; |
|
| 2425 | + $limit = (int) $limit > 0 ? " LIMIT ".absint(($page - 1) * (int) $limit).", ".(int) $limit : ""; |
|
| 2426 | 2426 | |
| 2427 | 2427 | //@todo removed SQL_CALC_FOUND_ROWS from below as don't think it is needed and query is faster without |
| 2428 | - $sql = "SELECT " . $fields . " FROM " . $wpdb->posts . " |
|
| 2429 | - " . $join . " |
|
| 2430 | - " . $where . " |
|
| 2431 | - " . $groupby . " |
|
| 2432 | - " . $orderby . " |
|
| 2428 | + $sql = "SELECT ".$fields." FROM ".$wpdb->posts." |
|
| 2429 | + " . $join." |
|
| 2430 | + " . $where." |
|
| 2431 | + " . $groupby." |
|
| 2432 | + " . $orderby." |
|
| 2433 | 2433 | " . $limit; |
| 2434 | - $rows = $wpdb->get_results( $sql ); |
|
| 2434 | + $rows = $wpdb->get_results($sql); |
|
| 2435 | 2435 | } |
| 2436 | 2436 | |
| 2437 | - unset( $GLOBALS['gd_query_args_widgets'] ); |
|
| 2438 | - unset( $gd_query_args_widgets ); |
|
| 2437 | + unset($GLOBALS['gd_query_args_widgets']); |
|
| 2438 | + unset($gd_query_args_widgets); |
|
| 2439 | 2439 | |
| 2440 | 2440 | return $rows; |
| 2441 | 2441 | } |
@@ -2452,11 +2452,11 @@ discard block |
||
| 2452 | 2452 | * |
| 2453 | 2453 | * @return string Modified fields SQL. |
| 2454 | 2454 | */ |
| 2455 | -function geodir_function_widget_listings_fields( $fields ) {
|
|
| 2455 | +function geodir_function_widget_listings_fields($fields) {
|
|
| 2456 | 2456 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2457 | 2457 | |
| 2458 | 2458 | $query_args = $gd_query_args_widgets; |
| 2459 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2459 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2460 | 2460 | return $fields; |
| 2461 | 2461 | } |
| 2462 | 2462 | |
@@ -2475,24 +2475,24 @@ discard block |
||
| 2475 | 2475 | * |
| 2476 | 2476 | * @return string Modified join clause SQL. |
| 2477 | 2477 | */ |
| 2478 | -function geodir_function_widget_listings_join( $join ) {
|
|
| 2478 | +function geodir_function_widget_listings_join($join) {
|
|
| 2479 | 2479 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2480 | 2480 | |
| 2481 | 2481 | $query_args = $gd_query_args_widgets; |
| 2482 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2482 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2483 | 2483 | return $join; |
| 2484 | 2484 | } |
| 2485 | 2485 | |
| 2486 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2487 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2486 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2487 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2488 | 2488 | |
| 2489 | - if ( ! empty( $query_args['with_pics_only'] ) ) {
|
|
| 2490 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 2489 | + if (!empty($query_args['with_pics_only'])) {
|
|
| 2490 | + $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )"; |
|
| 2491 | 2491 | } |
| 2492 | 2492 | |
| 2493 | - if ( ! empty( $query_args['tax_query'] ) ) {
|
|
| 2494 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); |
|
| 2495 | - if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
|
|
| 2493 | + if (!empty($query_args['tax_query'])) {
|
|
| 2494 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); |
|
| 2495 | + if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
|
|
| 2496 | 2496 | $join .= $tax_queries['join']; |
| 2497 | 2497 | } |
| 2498 | 2498 | } |
@@ -2513,60 +2513,60 @@ discard block |
||
| 2513 | 2513 | * |
| 2514 | 2514 | * @return string Modified where clause SQL. |
| 2515 | 2515 | */ |
| 2516 | -function geodir_function_widget_listings_where( $where ) {
|
|
| 2516 | +function geodir_function_widget_listings_where($where) {
|
|
| 2517 | 2517 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2518 | 2518 | |
| 2519 | 2519 | $query_args = $gd_query_args_widgets; |
| 2520 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2520 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2521 | 2521 | return $where; |
| 2522 | 2522 | } |
| 2523 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2524 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2523 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2524 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2525 | 2525 | |
| 2526 | - if ( ! empty( $query_args ) ) {
|
|
| 2527 | - if ( ! empty( $query_args['gd_location'] ) && function_exists( 'geodir_default_location_where' ) ) {
|
|
| 2528 | - $where = geodir_default_location_where( $where, $table ); |
|
| 2526 | + if (!empty($query_args)) {
|
|
| 2527 | + if (!empty($query_args['gd_location']) && function_exists('geodir_default_location_where')) {
|
|
| 2528 | + $where = geodir_default_location_where($where, $table); |
|
| 2529 | 2529 | } |
| 2530 | 2530 | |
| 2531 | - if ( ! empty( $query_args['post_author'] ) ) {
|
|
| 2532 | - $where .= " AND " . $wpdb->posts . ".post_author = " . (int) $query_args['post_author']; |
|
| 2531 | + if (!empty($query_args['post_author'])) {
|
|
| 2532 | + $where .= " AND ".$wpdb->posts.".post_author = ".(int) $query_args['post_author']; |
|
| 2533 | 2533 | } |
| 2534 | 2534 | |
| 2535 | - if ( ! empty( $query_args['show_featured_only'] ) ) {
|
|
| 2536 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 2535 | + if (!empty($query_args['show_featured_only'])) {
|
|
| 2536 | + $where .= " AND ".$table.".is_featured = '1'"; |
|
| 2537 | 2537 | } |
| 2538 | 2538 | |
| 2539 | - if ( ! empty( $query_args['show_special_only'] ) ) {
|
|
| 2540 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 2539 | + if (!empty($query_args['show_special_only'])) {
|
|
| 2540 | + $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )"; |
|
| 2541 | 2541 | } |
| 2542 | 2542 | |
| 2543 | - if ( ! empty( $query_args['with_pics_only'] ) ) {
|
|
| 2544 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL "; |
|
| 2543 | + if (!empty($query_args['with_pics_only'])) {
|
|
| 2544 | + $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL "; |
|
| 2545 | 2545 | } |
| 2546 | 2546 | |
| 2547 | - if ( ! empty( $query_args['featured_image_only'] ) ) {
|
|
| 2548 | - $where .= " AND " . $table . ".featured_image IS NOT NULL AND " . $table . ".featured_image!='' "; |
|
| 2547 | + if (!empty($query_args['featured_image_only'])) {
|
|
| 2548 | + $where .= " AND ".$table.".featured_image IS NOT NULL AND ".$table.".featured_image!='' "; |
|
| 2549 | 2549 | } |
| 2550 | 2550 | |
| 2551 | - if ( ! empty( $query_args['with_videos_only'] ) ) {
|
|
| 2552 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 2551 | + if (!empty($query_args['with_videos_only'])) {
|
|
| 2552 | + $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )"; |
|
| 2553 | 2553 | } |
| 2554 | 2554 | |
| 2555 | - if ( ! empty( $query_args['show_favorites_only'] ) ) {
|
|
| 2555 | + if (!empty($query_args['show_favorites_only'])) {
|
|
| 2556 | 2556 | $user_favorites = '-1'; |
| 2557 | 2557 | |
| 2558 | - if ( !empty( $query_args['favorites_by_user'] ) ) {
|
|
| 2559 | - $user_favorites = get_user_meta( (int)$query_args['favorites_by_user'], 'gd_user_favourite_post', true ); |
|
| 2558 | + if (!empty($query_args['favorites_by_user'])) {
|
|
| 2559 | + $user_favorites = get_user_meta((int) $query_args['favorites_by_user'], 'gd_user_favourite_post', true); |
|
| 2560 | 2560 | $user_favorites = !empty($user_favorites) && is_array($user_favorites) ? implode("','", $user_favorites) : '-1';
|
| 2561 | 2561 | } |
| 2562 | 2562 | |
| 2563 | - $where .= " AND `" . $wpdb->posts . "`.`ID` IN('" . $user_favorites . "')";
|
|
| 2563 | + $where .= " AND `".$wpdb->posts."`.`ID` IN('".$user_favorites."')";
|
|
| 2564 | 2564 | } |
| 2565 | 2565 | |
| 2566 | - if ( ! empty( $query_args['tax_query'] ) ) {
|
|
| 2567 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); |
|
| 2566 | + if (!empty($query_args['tax_query'])) {
|
|
| 2567 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); |
|
| 2568 | 2568 | |
| 2569 | - if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
|
|
| 2569 | + if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
|
|
| 2570 | 2570 | $where .= $tax_queries['where']; |
| 2571 | 2571 | } |
| 2572 | 2572 | } |
@@ -2587,11 +2587,11 @@ discard block |
||
| 2587 | 2587 | * |
| 2588 | 2588 | * @return string Modified orderby clause SQL. |
| 2589 | 2589 | */ |
| 2590 | -function geodir_function_widget_listings_orderby( $orderby ) {
|
|
| 2590 | +function geodir_function_widget_listings_orderby($orderby) {
|
|
| 2591 | 2591 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2592 | 2592 | |
| 2593 | 2593 | $query_args = $gd_query_args_widgets; |
| 2594 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2594 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2595 | 2595 | return $orderby; |
| 2596 | 2596 | } |
| 2597 | 2597 | |
@@ -2610,15 +2610,15 @@ discard block |
||
| 2610 | 2610 | * |
| 2611 | 2611 | * @return int Query limit. |
| 2612 | 2612 | */ |
| 2613 | -function geodir_function_widget_listings_limit( $limit ) {
|
|
| 2613 | +function geodir_function_widget_listings_limit($limit) {
|
|
| 2614 | 2614 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2615 | 2615 | |
| 2616 | 2616 | $query_args = $gd_query_args_widgets; |
| 2617 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2617 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2618 | 2618 | return $limit; |
| 2619 | 2619 | } |
| 2620 | 2620 | |
| 2621 | - if ( ! empty( $query_args ) && ! empty( $query_args['posts_per_page'] ) ) {
|
|
| 2621 | + if (!empty($query_args) && !empty($query_args['posts_per_page'])) {
|
|
| 2622 | 2622 | $limit = (int) $query_args['posts_per_page']; |
| 2623 | 2623 | } |
| 2624 | 2624 | |
@@ -2636,12 +2636,12 @@ discard block |
||
| 2636 | 2636 | * |
| 2637 | 2637 | * @return int Large size width. |
| 2638 | 2638 | */ |
| 2639 | -function geodir_media_image_large_width( $default = 800, $params = '' ) {
|
|
| 2640 | - $large_size_w = get_option( 'large_size_w' ); |
|
| 2639 | +function geodir_media_image_large_width($default = 800, $params = '') {
|
|
| 2640 | + $large_size_w = get_option('large_size_w');
|
|
| 2641 | 2641 | $large_size_w = $large_size_w > 0 ? $large_size_w : $default; |
| 2642 | - $large_size_w = absint( $large_size_w ); |
|
| 2642 | + $large_size_w = absint($large_size_w); |
|
| 2643 | 2643 | |
| 2644 | - if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
|
|
| 2644 | + if (!get_option('geodir_use_wp_media_large_size')) {
|
|
| 2645 | 2645 | $large_size_w = 800; |
| 2646 | 2646 | } |
| 2647 | 2647 | |
@@ -2654,7 +2654,7 @@ discard block |
||
| 2654 | 2654 | * @param int $default Default width. |
| 2655 | 2655 | * @param string|array $params Image parameters. |
| 2656 | 2656 | */ |
| 2657 | - $large_size_w = apply_filters( 'geodir_filter_media_image_large_width', $large_size_w, $default, $params ); |
|
| 2657 | + $large_size_w = apply_filters('geodir_filter_media_image_large_width', $large_size_w, $default, $params);
|
|
| 2658 | 2658 | |
| 2659 | 2659 | return $large_size_w; |
| 2660 | 2660 | } |
@@ -2670,12 +2670,12 @@ discard block |
||
| 2670 | 2670 | * |
| 2671 | 2671 | * @return int Large size height. |
| 2672 | 2672 | */ |
| 2673 | -function geodir_media_image_large_height( $default = 800, $params = '' ) {
|
|
| 2674 | - $large_size_h = get_option( 'large_size_h' ); |
|
| 2673 | +function geodir_media_image_large_height($default = 800, $params = '') {
|
|
| 2674 | + $large_size_h = get_option('large_size_h');
|
|
| 2675 | 2675 | $large_size_h = $large_size_h > 0 ? $large_size_h : $default; |
| 2676 | - $large_size_h = absint( $large_size_h ); |
|
| 2676 | + $large_size_h = absint($large_size_h); |
|
| 2677 | 2677 | |
| 2678 | - if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
|
|
| 2678 | + if (!get_option('geodir_use_wp_media_large_size')) {
|
|
| 2679 | 2679 | $large_size_h = 800; |
| 2680 | 2680 | } |
| 2681 | 2681 | |
@@ -2688,7 +2688,7 @@ discard block |
||
| 2688 | 2688 | * @param int $default Default height. |
| 2689 | 2689 | * @param string|array $params Image parameters. |
| 2690 | 2690 | */ |
| 2691 | - $large_size_h = apply_filters( 'geodir_filter_media_image_large_height', $large_size_h, $default, $params ); |
|
| 2691 | + $large_size_h = apply_filters('geodir_filter_media_image_large_height', $large_size_h, $default, $params);
|
|
| 2692 | 2692 | |
| 2693 | 2693 | return $large_size_h; |
| 2694 | 2694 | } |
@@ -2705,8 +2705,8 @@ discard block |
||
| 2705 | 2705 | * |
| 2706 | 2706 | * @return string Sanitized name. |
| 2707 | 2707 | */ |
| 2708 | -function geodir_sanitize_location_name( $type, $name, $translate = true ) {
|
|
| 2709 | - if ( $name == '' ) {
|
|
| 2708 | +function geodir_sanitize_location_name($type, $name, $translate = true) {
|
|
| 2709 | + if ($name == '') {
|
|
| 2710 | 2710 | return null; |
| 2711 | 2711 | } |
| 2712 | 2712 | |
@@ -2715,13 +2715,13 @@ discard block |
||
| 2715 | 2715 | $type = $type == 'gd_city' ? 'city' : $type; |
| 2716 | 2716 | |
| 2717 | 2717 | $return = $name; |
| 2718 | - if ( function_exists( 'get_actual_location_name' ) ) {
|
|
| 2719 | - $return = get_actual_location_name( $type, $name, $translate ); |
|
| 2718 | + if (function_exists('get_actual_location_name')) {
|
|
| 2719 | + $return = get_actual_location_name($type, $name, $translate); |
|
| 2720 | 2720 | } else {
|
| 2721 | - $return = preg_replace( '/-(\d+)$/', '', $return ); |
|
| 2722 | - $return = preg_replace( '/[_-]/', ' ', $return ); |
|
| 2723 | - $return = geodir_ucwords( $return ); |
|
| 2724 | - $return = $translate ? __( $return, 'geodirectory' ) : $return; |
|
| 2721 | + $return = preg_replace('/-(\d+)$/', '', $return);
|
|
| 2722 | + $return = preg_replace('/[_-]/', ' ', $return);
|
|
| 2723 | + $return = geodir_ucwords($return); |
|
| 2724 | + $return = $translate ? __($return, 'geodirectory') : $return; |
|
| 2725 | 2725 | } |
| 2726 | 2726 | |
| 2727 | 2727 | return $return; |
@@ -2739,26 +2739,26 @@ discard block |
||
| 2739 | 2739 | * |
| 2740 | 2740 | * @param int $number Comments number. |
| 2741 | 2741 | */ |
| 2742 | -function geodir_comments_number( $number ) {
|
|
| 2742 | +function geodir_comments_number($number) {
|
|
| 2743 | 2743 | global $post; |
| 2744 | 2744 | |
| 2745 | - if ( !empty( $post->post_type ) && geodir_cpt_has_rating_disabled( $post->post_type ) ) {
|
|
| 2745 | + if (!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type)) {
|
|
| 2746 | 2746 | $number = get_comments_number(); |
| 2747 | 2747 | |
| 2748 | - if ( $number > 1 ) {
|
|
| 2749 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Comments', 'geodirectory' ) ); |
|
| 2750 | - } elseif ( $number == 0 || $number == '' ) {
|
|
| 2751 | - $output = __( 'No Comments', 'geodirectory' ); |
|
| 2748 | + if ($number > 1) {
|
|
| 2749 | + $output = str_replace('%', number_format_i18n($number), __('% Comments', 'geodirectory'));
|
|
| 2750 | + } elseif ($number == 0 || $number == '') {
|
|
| 2751 | + $output = __('No Comments', 'geodirectory');
|
|
| 2752 | 2752 | } else { // must be one
|
| 2753 | - $output = __( '1 Comment', 'geodirectory' ); |
|
| 2753 | + $output = __('1 Comment', 'geodirectory');
|
|
| 2754 | 2754 | } |
| 2755 | 2755 | } else {
|
| 2756 | - if ( $number > 1 ) {
|
|
| 2757 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Reviews', 'geodirectory' ) ); |
|
| 2758 | - } elseif ( $number == 0 || $number == '' ) {
|
|
| 2759 | - $output = __( 'No Reviews', 'geodirectory' ); |
|
| 2756 | + if ($number > 1) {
|
|
| 2757 | + $output = str_replace('%', number_format_i18n($number), __('% Reviews', 'geodirectory'));
|
|
| 2758 | + } elseif ($number == 0 || $number == '') {
|
|
| 2759 | + $output = __('No Reviews', 'geodirectory');
|
|
| 2760 | 2760 | } else { // must be one
|
| 2761 | - $output = __( '1 Review', 'geodirectory' ); |
|
| 2761 | + $output = __('1 Review', 'geodirectory');
|
|
| 2762 | 2762 | } |
| 2763 | 2763 | } |
| 2764 | 2764 | |
@@ -2775,18 +2775,18 @@ discard block |
||
| 2775 | 2775 | */ |
| 2776 | 2776 | function is_page_geodir_home() {
|
| 2777 | 2777 | global $wpdb; |
| 2778 | - $cur_url = str_replace( array( "https://", "http://", "www." ), array( '', '', '' ), geodir_curPageURL() ); |
|
| 2779 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 2780 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 2778 | + $cur_url = str_replace(array("https://", "http://", "www."), array('', '', ''), geodir_curPageURL());
|
|
| 2779 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 2780 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 2781 | 2781 | } |
| 2782 | - $home_url = home_url( '', 'http' ); |
|
| 2783 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 2784 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 2782 | + $home_url = home_url('', 'http');
|
|
| 2783 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 2784 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 2785 | 2785 | } |
| 2786 | - $home_url = str_replace( "www.", "", $home_url ); |
|
| 2787 | - if ( ( strpos( $home_url, $cur_url ) !== false || strpos( $home_url . '/', $cur_url ) !== false ) && ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && get_option( 'page_on_front' ) == get_option( 'geodir_home_page' ) ) ) {
|
|
| 2786 | + $home_url = str_replace("www.", "", $home_url);
|
|
| 2787 | + if ((strpos($home_url, $cur_url) !== false || strpos($home_url.'/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page'))) {
|
|
| 2788 | 2788 | return true; |
| 2789 | - } elseif ( get_query_var( 'page_id' ) == get_option( 'page_on_front' ) && 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && get_option( 'page_on_front' ) == get_option( 'geodir_home_page' ) ) {
|
|
| 2789 | + } elseif (get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page')) {
|
|
| 2790 | 2790 | return true; |
| 2791 | 2791 | } else {
|
| 2792 | 2792 | return false; |
@@ -2806,18 +2806,18 @@ discard block |
||
| 2806 | 2806 | * |
| 2807 | 2807 | * @return string The canonical URL. |
| 2808 | 2808 | */ |
| 2809 | -function geodir_wpseo_homepage_canonical( $url ) {
|
|
| 2809 | +function geodir_wpseo_homepage_canonical($url) {
|
|
| 2810 | 2810 | global $post; |
| 2811 | 2811 | |
| 2812 | - if ( is_page_geodir_home() ) {
|
|
| 2812 | + if (is_page_geodir_home()) {
|
|
| 2813 | 2813 | return home_url(); |
| 2814 | 2814 | } |
| 2815 | 2815 | |
| 2816 | 2816 | return $url; |
| 2817 | 2817 | } |
| 2818 | 2818 | |
| 2819 | -add_filter( 'wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10 ); |
|
| 2820 | -add_filter( 'aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10 ); |
|
| 2819 | +add_filter('wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10);
|
|
| 2820 | +add_filter('aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10);
|
|
| 2821 | 2821 | |
| 2822 | 2822 | /** |
| 2823 | 2823 | * Add extra fields to google maps script call. |
@@ -2830,20 +2830,20 @@ discard block |
||
| 2830 | 2830 | * |
| 2831 | 2831 | * @return string Modified extra string. |
| 2832 | 2832 | */ |
| 2833 | -function geodir_googlemap_script_extra_details_page( $extra ) {
|
|
| 2833 | +function geodir_googlemap_script_extra_details_page($extra) {
|
|
| 2834 | 2834 | global $post; |
| 2835 | 2835 | $add_google_places_api = false; |
| 2836 | - if ( isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
|
|
| 2836 | + if (isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
|
|
| 2837 | 2837 | $add_google_places_api = true; |
| 2838 | 2838 | } |
| 2839 | - if ( ! str_replace( 'libraries=places', '', $extra ) && ( geodir_is_page( 'detail' ) || $add_google_places_api ) ) {
|
|
| 2839 | + if (!str_replace('libraries=places', '', $extra) && (geodir_is_page('detail') || $add_google_places_api)) {
|
|
| 2840 | 2840 | $extra .= "&libraries=places"; |
| 2841 | 2841 | } |
| 2842 | 2842 | |
| 2843 | 2843 | return $extra; |
| 2844 | 2844 | } |
| 2845 | 2845 | |
| 2846 | -add_filter( 'geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1 ); |
|
| 2846 | +add_filter('geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1);
|
|
| 2847 | 2847 | |
| 2848 | 2848 | |
| 2849 | 2849 | /** |
@@ -2862,120 +2862,120 @@ discard block |
||
| 2862 | 2862 | * after_widget. |
| 2863 | 2863 | * @param array|string $instance The settings for the particular instance of the widget. |
| 2864 | 2864 | */ |
| 2865 | -function geodir_popular_post_category_output( $args = '', $instance = '' ) {
|
|
| 2865 | +function geodir_popular_post_category_output($args = '', $instance = '') {
|
|
| 2866 | 2866 | // prints the widget |
| 2867 | 2867 | global $wpdb, $plugin_prefix, $geodir_post_category_str; |
| 2868 | - extract( $args, EXTR_SKIP ); |
|
| 2868 | + extract($args, EXTR_SKIP); |
|
| 2869 | 2869 | |
| 2870 | 2870 | echo $before_widget; |
| 2871 | 2871 | |
| 2872 | 2872 | /** This filter is documented in geodirectory_widgets.php */ |
| 2873 | - $title = empty( $instance['title'] ) ? __( 'Popular Categories', 'geodirectory' ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 2873 | + $title = empty($instance['title']) ? __('Popular Categories', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 2874 | 2874 | |
| 2875 | 2875 | $gd_post_type = geodir_get_current_posttype(); |
| 2876 | 2876 | |
| 2877 | - $category_limit = isset( $instance['category_limit'] ) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; |
|
| 2877 | + $category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; |
|
| 2878 | 2878 | if (!isset($category_restrict)) {
|
| 2879 | 2879 | $category_restrict = false; |
| 2880 | 2880 | } |
| 2881 | - if ( ! empty( $gd_post_type ) ) {
|
|
| 2881 | + if (!empty($gd_post_type)) {
|
|
| 2882 | 2882 | $default_post_type = $gd_post_type; |
| 2883 | - } elseif ( isset( $instance['default_post_type'] ) && gdsc_is_post_type_valid( $instance['default_post_type'] ) ) {
|
|
| 2883 | + } elseif (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type'])) {
|
|
| 2884 | 2884 | $default_post_type = $instance['default_post_type']; |
| 2885 | 2885 | } else {
|
| 2886 | 2886 | $all_gd_post_type = geodir_get_posttypes(); |
| 2887 | - $default_post_type = ( isset( $all_gd_post_type[0] ) ) ? $all_gd_post_type[0] : ''; |
|
| 2887 | + $default_post_type = (isset($all_gd_post_type[0])) ? $all_gd_post_type[0] : ''; |
|
| 2888 | 2888 | } |
| 2889 | - $parent_only = !empty( $instance['parent_only'] ) ? true : false; |
|
| 2889 | + $parent_only = !empty($instance['parent_only']) ? true : false; |
|
| 2890 | 2890 | |
| 2891 | 2891 | $taxonomy = array(); |
| 2892 | - if ( ! empty( $gd_post_type ) ) {
|
|
| 2893 | - $taxonomy[] = $gd_post_type . "category"; |
|
| 2892 | + if (!empty($gd_post_type)) {
|
|
| 2893 | + $taxonomy[] = $gd_post_type."category"; |
|
| 2894 | 2894 | } else {
|
| 2895 | - $taxonomy = geodir_get_taxonomies( $gd_post_type ); |
|
| 2895 | + $taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 2896 | 2896 | } |
| 2897 | 2897 | |
| 2898 | 2898 | $taxonomy = apply_filters('geodir_pp_category_taxonomy', $taxonomy);
|
| 2899 | 2899 | |
| 2900 | - $term_args = array( 'taxonomy' => $taxonomy ); |
|
| 2901 | - if ( $parent_only ) {
|
|
| 2900 | + $term_args = array('taxonomy' => $taxonomy);
|
|
| 2901 | + if ($parent_only) {
|
|
| 2902 | 2902 | $term_args['parent'] = 0; |
| 2903 | 2903 | } |
| 2904 | 2904 | |
| 2905 | - $terms = get_terms( $term_args ); |
|
| 2905 | + $terms = get_terms($term_args); |
|
| 2906 | 2906 | $a_terms = array(); |
| 2907 | 2907 | $b_terms = array(); |
| 2908 | 2908 | |
| 2909 | - foreach ( $terms as $term ) {
|
|
| 2910 | - if ( $term->count > 0 ) {
|
|
| 2911 | - $a_terms[ $term->taxonomy ][] = $term; |
|
| 2909 | + foreach ($terms as $term) {
|
|
| 2910 | + if ($term->count > 0) {
|
|
| 2911 | + $a_terms[$term->taxonomy][] = $term; |
|
| 2912 | 2912 | } |
| 2913 | 2913 | } |
| 2914 | 2914 | |
| 2915 | - if ( ! empty( $a_terms ) ) {
|
|
| 2915 | + if (!empty($a_terms)) {
|
|
| 2916 | 2916 | // Sort CPT taxonomies in categories widget. |
| 2917 | - if ( !empty( $taxonomy ) && is_array( $taxonomy ) && count( $taxonomy ) > 1 ) {
|
|
| 2917 | + if (!empty($taxonomy) && is_array($taxonomy) && count($taxonomy) > 1) {
|
|
| 2918 | 2918 | $gd_post_types = geodir_get_posttypes(); |
| 2919 | 2919 | $sort_taxonomies = array(); |
| 2920 | 2920 | |
| 2921 | - foreach ( $gd_post_types as $gd_post_type ) {
|
|
| 2922 | - $taxonomy_name = $gd_post_type . 'category'; |
|
| 2921 | + foreach ($gd_post_types as $gd_post_type) {
|
|
| 2922 | + $taxonomy_name = $gd_post_type.'category'; |
|
| 2923 | 2923 | |
| 2924 | - if ( !empty( $a_terms[$taxonomy_name] ) ) {
|
|
| 2924 | + if (!empty($a_terms[$taxonomy_name])) {
|
|
| 2925 | 2925 | $sort_taxonomies[$taxonomy_name] = $a_terms[$taxonomy_name]; |
| 2926 | 2926 | } |
| 2927 | 2927 | } |
| 2928 | - $a_terms = !empty( $sort_taxonomies ) ? $sort_taxonomies : $a_terms; |
|
| 2928 | + $a_terms = !empty($sort_taxonomies) ? $sort_taxonomies : $a_terms; |
|
| 2929 | 2929 | } |
| 2930 | 2930 | |
| 2931 | 2931 | $sort_by = apply_filters('geodir_pp_category_sort', 'count');
|
| 2932 | - foreach ( $a_terms as $b_key => $b_val ) {
|
|
| 2933 | - $b_terms[ $b_key ] = geodir_sort_terms( $b_val, $sort_by ); |
|
| 2932 | + foreach ($a_terms as $b_key => $b_val) {
|
|
| 2933 | + $b_terms[$b_key] = geodir_sort_terms($b_val, $sort_by); |
|
| 2934 | 2934 | } |
| 2935 | 2935 | |
| 2936 | - $default_taxonomy = $default_post_type != '' && isset( $b_terms[ $default_post_type . 'category' ] ) ? $default_post_type . 'category' : ''; |
|
| 2936 | + $default_taxonomy = $default_post_type != '' && isset($b_terms[$default_post_type.'category']) ? $default_post_type.'category' : ''; |
|
| 2937 | 2937 | |
| 2938 | 2938 | $tax_change_output = ''; |
| 2939 | - if ( count( $b_terms ) > 1 ) {
|
|
| 2940 | - $tax_change_output .= "<select data-limit='$category_limit' data-parent='" . (int)$parent_only . "' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; |
|
| 2941 | - foreach ( $b_terms as $key => $val ) {
|
|
| 2942 | - $ptype = get_post_type_object( str_replace( "category", "", $key ) ); |
|
| 2943 | - $cpt_name = __( $ptype->labels->singular_name, 'geodirectory' ); |
|
| 2944 | - $tax_change_output .= "<option value='$key' " . selected( $key, $default_taxonomy, false ) . ">" . sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name ) . "</option>"; |
|
| 2939 | + if (count($b_terms) > 1) {
|
|
| 2940 | + $tax_change_output .= "<select data-limit='$category_limit' data-parent='".(int) $parent_only."' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; |
|
| 2941 | + foreach ($b_terms as $key => $val) {
|
|
| 2942 | + $ptype = get_post_type_object(str_replace("category", "", $key));
|
|
| 2943 | + $cpt_name = __($ptype->labels->singular_name, 'geodirectory'); |
|
| 2944 | + $tax_change_output .= "<option value='$key' ".selected($key, $default_taxonomy, false).">".sprintf(__('%s Categories', 'geodirectory'), $cpt_name)."</option>";
|
|
| 2945 | 2945 | } |
| 2946 | 2946 | $tax_change_output .= "</select>"; |
| 2947 | 2947 | } |
| 2948 | 2948 | |
| 2949 | - if ( ! empty( $b_terms ) ) {
|
|
| 2950 | - $terms = $default_taxonomy != '' && isset( $b_terms[ $default_taxonomy ] ) ? $b_terms[ $default_taxonomy ] : reset( $b_terms );// get the first array |
|
| 2951 | - global $cat_count;//make global so we can change via function |
|
| 2949 | + if (!empty($b_terms)) {
|
|
| 2950 | + $terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms); // get the first array |
|
| 2951 | + global $cat_count; //make global so we can change via function |
|
| 2952 | 2952 | $cat_count = 0; |
| 2953 | 2953 | ?> |
| 2954 | 2954 | <div class="geodir-category-list-in clearfix"> |
| 2955 | 2955 | <div class="geodir-cat-list clearfix"> |
| 2956 | 2956 | <?php |
| 2957 | - echo $before_title . __( $title ) . $after_title; |
|
| 2957 | + echo $before_title.__($title).$after_title; |
|
| 2958 | 2958 | |
| 2959 | 2959 | echo $tax_change_output; |
| 2960 | 2960 | |
| 2961 | 2961 | echo '<ul class="geodir-popular-cat-list">'; |
| 2962 | 2962 | |
| 2963 | - geodir_helper_cat_list_output( $terms, $category_limit, $category_restrict); |
|
| 2963 | + geodir_helper_cat_list_output($terms, $category_limit, $category_restrict); |
|
| 2964 | 2964 | |
| 2965 | 2965 | echo '</ul>'; |
| 2966 | 2966 | ?> |
| 2967 | 2967 | </div> |
| 2968 | 2968 | <?php |
| 2969 | 2969 | $hide = ''; |
| 2970 | - if ( $cat_count < $category_limit ) {
|
|
| 2970 | + if ($cat_count < $category_limit) {
|
|
| 2971 | 2971 | $hide = 'style="display:none;"'; |
| 2972 | 2972 | } |
| 2973 | 2973 | echo "<div class='geodir-cat-list-more' $hide >"; |
| 2974 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">' . __( 'More Categories', 'geodirectory' ) . '</a>'; |
|
| 2975 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">' . __( 'Less Categories', 'geodirectory' ) . '</a>'; |
|
| 2974 | + echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">'.__('More Categories', 'geodirectory').'</a>';
|
|
| 2975 | + echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">'.__('Less Categories', 'geodirectory').'</a>';
|
|
| 2976 | 2976 | echo "</div>"; |
| 2977 | 2977 | /* add scripts */ |
| 2978 | - add_action( 'wp_footer', 'geodir_popular_category_add_scripts', 100 ); |
|
| 2978 | + add_action('wp_footer', 'geodir_popular_category_add_scripts', 100);
|
|
| 2979 | 2979 | ?> |
| 2980 | 2980 | </div> |
| 2981 | 2981 | <?php |
@@ -2995,28 +2995,28 @@ discard block |
||
| 2995 | 2995 | * @param int $category_limit Number of categories to display by default. |
| 2996 | 2996 | * @param bool $category_restrict If the cat limit should be hidden or not shown. |
| 2997 | 2997 | */ |
| 2998 | -function geodir_helper_cat_list_output( $terms, $category_limit , $category_restrict=false) {
|
|
| 2998 | +function geodir_helper_cat_list_output($terms, $category_limit, $category_restrict = false) {
|
|
| 2999 | 2999 | global $geodir_post_category_str, $cat_count; |
| 3000 | 3000 | $term_icons = geodir_get_term_icon(); |
| 3001 | 3001 | |
| 3002 | 3002 | $geodir_post_category_str = array(); |
| 3003 | 3003 | |
| 3004 | 3004 | |
| 3005 | - foreach ( $terms as $cat ) {
|
|
| 3006 | - $post_type = str_replace( "category", "", $cat->taxonomy ); |
|
| 3007 | - $term_icon_url = ! empty( $term_icons ) && isset( $term_icons[ $cat->term_id ] ) ? $term_icons[ $cat->term_id ] : ''; |
|
| 3005 | + foreach ($terms as $cat) {
|
|
| 3006 | + $post_type = str_replace("category", "", $cat->taxonomy);
|
|
| 3007 | + $term_icon_url = !empty($term_icons) && isset($term_icons[$cat->term_id]) ? $term_icons[$cat->term_id] : ''; |
|
| 3008 | 3008 | |
| 3009 | - $cat_count ++; |
|
| 3009 | + $cat_count++; |
|
| 3010 | 3010 | |
| 3011 | - $geodir_post_category_str[] = array( 'posttype' => $post_type, 'termid' => $cat->term_id ); |
|
| 3011 | + $geodir_post_category_str[] = array('posttype' => $post_type, 'termid' => $cat->term_id);
|
|
| 3012 | 3012 | |
| 3013 | - $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; |
|
| 3014 | - if($category_restrict && $cat_count > $category_limit ){
|
|
| 3013 | + $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; |
|
| 3014 | + if ($category_restrict && $cat_count > $category_limit) {
|
|
| 3015 | 3015 | continue; |
| 3016 | 3016 | } |
| 3017 | 3017 | $total_post = $cat->count; |
| 3018 | 3018 | |
| 3019 | - $term_link = get_term_link( $cat, $cat->taxonomy ); |
|
| 3019 | + $term_link = get_term_link($cat, $cat->taxonomy); |
|
| 3020 | 3020 | /** |
| 3021 | 3021 | * Filer the category term link. |
| 3022 | 3022 | * |
@@ -3026,11 +3026,11 @@ discard block |
||
| 3026 | 3026 | * @param int $cat ->term_id The term id. |
| 3027 | 3027 | * @param string $post_type Wordpress post type. |
| 3028 | 3028 | */ |
| 3029 | - $term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type ); |
|
| 3029 | + $term_link = apply_filters('geodir_category_term_link', $term_link, $cat->term_id, $post_type);
|
|
| 3030 | 3030 | |
| 3031 | - echo '<li class="' . $class_row . '"><a href="' . $term_link . '">'; |
|
| 3032 | - echo '<img alt="' . esc_attr( $cat->name ) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">'; |
|
| 3033 | - echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';
|
|
| 3031 | + echo '<li class="'.$class_row.'"><a href="'.$term_link.'">'; |
|
| 3032 | + echo '<img alt="'.esc_attr($cat->name).' icon" style="height:20px;vertical-align:middle;" src="'.$term_icon_url.'"/> <span class="cat-link">'; |
|
| 3033 | + echo $cat->name.'</span> <span class="geodir_term_class geodir_link_span geodir_category_class_'.$post_type.'_'.$cat->term_id.'">('.$total_post.')</span> ';
|
|
| 3034 | 3034 | echo '</a></li>'; |
| 3035 | 3035 | } |
| 3036 | 3036 | } |
@@ -3045,14 +3045,14 @@ discard block |
||
| 3045 | 3045 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. |
| 3046 | 3046 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3047 | 3047 | */ |
| 3048 | -function geodir_listing_slider_widget_output( $args = '', $instance = '' ) {
|
|
| 3048 | +function geodir_listing_slider_widget_output($args = '', $instance = '') {
|
|
| 3049 | 3049 | // prints the widget |
| 3050 | - extract( $args, EXTR_SKIP ); |
|
| 3050 | + extract($args, EXTR_SKIP); |
|
| 3051 | 3051 | |
| 3052 | 3052 | echo $before_widget; |
| 3053 | 3053 | |
| 3054 | 3054 | /** This filter is documented in geodirectory_widgets.php */ |
| 3055 | - $title = empty( $instance['title'] ) ? '' : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3055 | + $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3056 | 3056 | /** |
| 3057 | 3057 | * Filter the widget post type. |
| 3058 | 3058 | * |
@@ -3060,7 +3060,7 @@ discard block |
||
| 3060 | 3060 | * |
| 3061 | 3061 | * @param string $instance ['post_type'] Post type of listing. |
| 3062 | 3062 | */ |
| 3063 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); |
|
| 3063 | + $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
|
|
| 3064 | 3064 | /** |
| 3065 | 3065 | * Filter the widget's term. |
| 3066 | 3066 | * |
@@ -3068,7 +3068,7 @@ discard block |
||
| 3068 | 3068 | * |
| 3069 | 3069 | * @param string $instance ['category'] Filter by term. Can be any valid term. |
| 3070 | 3070 | */ |
| 3071 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); |
|
| 3071 | + $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
|
|
| 3072 | 3072 | /** |
| 3073 | 3073 | * Filter widget's "add_location_filter" value. |
| 3074 | 3074 | * |
@@ -3076,7 +3076,7 @@ discard block |
||
| 3076 | 3076 | * |
| 3077 | 3077 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. |
| 3078 | 3078 | */ |
| 3079 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); |
|
| 3079 | + $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
|
|
| 3080 | 3080 | /** |
| 3081 | 3081 | * Filter the widget listings limit. |
| 3082 | 3082 | * |
@@ -3084,7 +3084,7 @@ discard block |
||
| 3084 | 3084 | * |
| 3085 | 3085 | * @param string $instance ['post_number'] Number of listings to display. |
| 3086 | 3086 | */ |
| 3087 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); |
|
| 3087 | + $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
|
|
| 3088 | 3088 | /** |
| 3089 | 3089 | * Filter the widget listings limit shown at one time. |
| 3090 | 3090 | * |
@@ -3092,7 +3092,7 @@ discard block |
||
| 3092 | 3092 | * |
| 3093 | 3093 | * @param string $instance ['max_show'] Number of listings to display on screen. |
| 3094 | 3094 | */ |
| 3095 | - $max_show = empty( $instance['max_show'] ) ? '1' : apply_filters( 'widget_max_show', $instance['max_show'] ); |
|
| 3095 | + $max_show = empty($instance['max_show']) ? '1' : apply_filters('widget_max_show', $instance['max_show']);
|
|
| 3096 | 3096 | /** |
| 3097 | 3097 | * Filter the widget slide width. |
| 3098 | 3098 | * |
@@ -3100,7 +3100,7 @@ discard block |
||
| 3100 | 3100 | * |
| 3101 | 3101 | * @param string $instance ['slide_width'] Width of the slides shown. |
| 3102 | 3102 | */ |
| 3103 | - $slide_width = empty( $instance['slide_width'] ) ? '' : apply_filters( 'widget_slide_width', $instance['slide_width'] ); |
|
| 3103 | + $slide_width = empty($instance['slide_width']) ? '' : apply_filters('widget_slide_width', $instance['slide_width']);
|
|
| 3104 | 3104 | /** |
| 3105 | 3105 | * Filter widget's "show title" value. |
| 3106 | 3106 | * |
@@ -3108,7 +3108,7 @@ discard block |
||
| 3108 | 3108 | * |
| 3109 | 3109 | * @param string|bool $instance ['show_title'] Do you want to display title? Can be 1 or 0. |
| 3110 | 3110 | */ |
| 3111 | - $show_title = empty( $instance['show_title'] ) ? '' : apply_filters( 'widget_show_title', $instance['show_title'] ); |
|
| 3111 | + $show_title = empty($instance['show_title']) ? '' : apply_filters('widget_show_title', $instance['show_title']);
|
|
| 3112 | 3112 | /** |
| 3113 | 3113 | * Filter widget's "slideshow" value. |
| 3114 | 3114 | * |
@@ -3116,7 +3116,7 @@ discard block |
||
| 3116 | 3116 | * |
| 3117 | 3117 | * @param int $instance ['slideshow'] Setup a slideshow for the slider to animate automatically. |
| 3118 | 3118 | */ |
| 3119 | - $slideshow = empty( $instance['slideshow'] ) ? 0 : apply_filters( 'widget_slideshow', $instance['slideshow'] ); |
|
| 3119 | + $slideshow = empty($instance['slideshow']) ? 0 : apply_filters('widget_slideshow', $instance['slideshow']);
|
|
| 3120 | 3120 | /** |
| 3121 | 3121 | * Filter widget's "animationLoop" value. |
| 3122 | 3122 | * |
@@ -3124,7 +3124,7 @@ discard block |
||
| 3124 | 3124 | * |
| 3125 | 3125 | * @param int $instance ['animationLoop'] Gives the slider a seamless infinite loop. |
| 3126 | 3126 | */ |
| 3127 | - $animationLoop = empty( $instance['animationLoop'] ) ? 0 : apply_filters( 'widget_animationLoop', $instance['animationLoop'] ); |
|
| 3127 | + $animationLoop = empty($instance['animationLoop']) ? 0 : apply_filters('widget_animationLoop', $instance['animationLoop']);
|
|
| 3128 | 3128 | /** |
| 3129 | 3129 | * Filter widget's "directionNav" value. |
| 3130 | 3130 | * |
@@ -3132,7 +3132,7 @@ discard block |
||
| 3132 | 3132 | * |
| 3133 | 3133 | * @param int $instance ['directionNav'] Enable previous/next arrow navigation?. Can be 1 or 0. |
| 3134 | 3134 | */ |
| 3135 | - $directionNav = empty( $instance['directionNav'] ) ? 0 : apply_filters( 'widget_directionNav', $instance['directionNav'] ); |
|
| 3135 | + $directionNav = empty($instance['directionNav']) ? 0 : apply_filters('widget_directionNav', $instance['directionNav']);
|
|
| 3136 | 3136 | /** |
| 3137 | 3137 | * Filter widget's "slideshowSpeed" value. |
| 3138 | 3138 | * |
@@ -3140,7 +3140,7 @@ discard block |
||
| 3140 | 3140 | * |
| 3141 | 3141 | * @param int $instance ['slideshowSpeed'] Set the speed of the slideshow cycling, in milliseconds. |
| 3142 | 3142 | */ |
| 3143 | - $slideshowSpeed = empty( $instance['slideshowSpeed'] ) ? 5000 : apply_filters( 'widget_slideshowSpeed', $instance['slideshowSpeed'] ); |
|
| 3143 | + $slideshowSpeed = empty($instance['slideshowSpeed']) ? 5000 : apply_filters('widget_slideshowSpeed', $instance['slideshowSpeed']);
|
|
| 3144 | 3144 | /** |
| 3145 | 3145 | * Filter widget's "animationSpeed" value. |
| 3146 | 3146 | * |
@@ -3148,7 +3148,7 @@ discard block |
||
| 3148 | 3148 | * |
| 3149 | 3149 | * @param int $instance ['animationSpeed'] Set the speed of animations, in milliseconds. |
| 3150 | 3150 | */ |
| 3151 | - $animationSpeed = empty( $instance['animationSpeed'] ) ? 600 : apply_filters( 'widget_animationSpeed', $instance['animationSpeed'] ); |
|
| 3151 | + $animationSpeed = empty($instance['animationSpeed']) ? 600 : apply_filters('widget_animationSpeed', $instance['animationSpeed']);
|
|
| 3152 | 3152 | /** |
| 3153 | 3153 | * Filter widget's "animation" value. |
| 3154 | 3154 | * |
@@ -3156,7 +3156,7 @@ discard block |
||
| 3156 | 3156 | * |
| 3157 | 3157 | * @param string $instance ['animation'] Controls the animation type, "fade" or "slide". |
| 3158 | 3158 | */ |
| 3159 | - $animation = empty( $instance['animation'] ) ? 'slide' : apply_filters( 'widget_animation', $instance['animation'] ); |
|
| 3159 | + $animation = empty($instance['animation']) ? 'slide' : apply_filters('widget_animation', $instance['animation']);
|
|
| 3160 | 3160 | /** |
| 3161 | 3161 | * Filter widget's "list_sort" type. |
| 3162 | 3162 | * |
@@ -3164,10 +3164,10 @@ discard block |
||
| 3164 | 3164 | * |
| 3165 | 3165 | * @param string $instance ['list_sort'] Listing sort by type. |
| 3166 | 3166 | */ |
| 3167 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); |
|
| 3168 | - $show_featured_only = ! empty( $instance['show_featured_only'] ) ? 1 : null; |
|
| 3167 | + $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
|
|
| 3168 | + $show_featured_only = !empty($instance['show_featured_only']) ? 1 : null; |
|
| 3169 | 3169 | |
| 3170 | - wp_enqueue_script( 'geodirectory-jquery-flexslider-js' ); |
|
| 3170 | + wp_enqueue_script('geodirectory-jquery-flexslider-js');
|
|
| 3171 | 3171 | ?> |
| 3172 | 3172 | <script type="text/javascript"> |
| 3173 | 3173 | jQuery(window).load(function () {
|
@@ -3186,7 +3186,7 @@ discard block |
||
| 3186 | 3186 | itemWidth: 75, |
| 3187 | 3187 | itemMargin: 5, |
| 3188 | 3188 | asNavFor: '#geodir_widget_slider', |
| 3189 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>, |
|
| 3189 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>, |
|
| 3190 | 3190 | start: function (slider) {
|
| 3191 | 3191 | // chrome 53 introduced a bug, so we need to repaint the slider when shown. |
| 3192 | 3192 | jQuery('.geodir-slides', jQuery(slider)).removeClass('flexslider-fix-rtl');
|
@@ -3194,19 +3194,19 @@ discard block |
||
| 3194 | 3194 | }); |
| 3195 | 3195 | |
| 3196 | 3196 | jQuery('#geodir_widget_slider').flexslider({
|
| 3197 | - animation: "<?php echo $animation;?>", |
|
| 3197 | + animation: "<?php echo $animation; ?>", |
|
| 3198 | 3198 | selector: ".geodir-slides > li", |
| 3199 | 3199 | namespace: "geodir-", |
| 3200 | 3200 | controlNav: true, |
| 3201 | - animationLoop: <?php echo $animationLoop;?>, |
|
| 3202 | - slideshow: <?php echo $slideshow;?>, |
|
| 3203 | - slideshowSpeed: <?php echo $slideshowSpeed;?>, |
|
| 3204 | - animationSpeed: <?php echo $animationSpeed;?>, |
|
| 3205 | - directionNav: <?php echo $directionNav;?>, |
|
| 3206 | - maxItems: <?php echo $max_show;?>, |
|
| 3201 | + animationLoop: <?php echo $animationLoop; ?>, |
|
| 3202 | + slideshow: <?php echo $slideshow; ?>, |
|
| 3203 | + slideshowSpeed: <?php echo $slideshowSpeed; ?>, |
|
| 3204 | + animationSpeed: <?php echo $animationSpeed; ?>, |
|
| 3205 | + directionNav: <?php echo $directionNav; ?>, |
|
| 3206 | + maxItems: <?php echo $max_show; ?>, |
|
| 3207 | 3207 | move: 1, |
| 3208 | - <?php if ( $slide_width ) {
|
|
| 3209 | - echo "itemWidth: " . $slide_width . ","; |
|
| 3208 | + <?php if ($slide_width) {
|
|
| 3209 | + echo "itemWidth: ".$slide_width.","; |
|
| 3210 | 3210 | }?> |
| 3211 | 3211 | sync: "#geodir_widget_carousel", |
| 3212 | 3212 | start: function (slider) {
|
@@ -3217,7 +3217,7 @@ discard block |
||
| 3217 | 3217 | jQuery('#geodir_widget_slider').css({'visibility': 'visible'});
|
| 3218 | 3218 | jQuery('#geodir_widget_carousel').css({'visibility': 'visible'});
|
| 3219 | 3219 | }, |
| 3220 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?> |
|
| 3220 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?> |
|
| 3221 | 3221 | }); |
| 3222 | 3222 | }); |
| 3223 | 3223 | </script> |
@@ -3230,62 +3230,62 @@ discard block |
||
| 3230 | 3230 | 'order_by' => $list_sort |
| 3231 | 3231 | ); |
| 3232 | 3232 | |
| 3233 | - if ( $show_featured_only ) {
|
|
| 3233 | + if ($show_featured_only) {
|
|
| 3234 | 3234 | $query_args['show_featured_only'] = 1; |
| 3235 | 3235 | } |
| 3236 | 3236 | |
| 3237 | - if ( $category != 0 || $category != '' ) {
|
|
| 3238 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3237 | + if ($category != 0 || $category != '') {
|
|
| 3238 | + $category_taxonomy = geodir_get_taxonomies($post_type); |
|
| 3239 | 3239 | $tax_query = array( |
| 3240 | 3240 | 'taxonomy' => $category_taxonomy[0], |
| 3241 | 3241 | 'field' => 'id', |
| 3242 | 3242 | 'terms' => $category |
| 3243 | 3243 | ); |
| 3244 | 3244 | |
| 3245 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 3245 | + $query_args['tax_query'] = array($tax_query); |
|
| 3246 | 3246 | } |
| 3247 | 3247 | |
| 3248 | 3248 | // we want listings with featured image only |
| 3249 | 3249 | $query_args['featured_image_only'] = 1; |
| 3250 | 3250 | |
| 3251 | - if ( $post_type == 'gd_event' ) {
|
|
| 3251 | + if ($post_type == 'gd_event') {
|
|
| 3252 | 3252 | $query_args['gedir_event_listing_filter'] = 'upcoming'; |
| 3253 | 3253 | }// show only upcoming events |
| 3254 | 3254 | |
| 3255 | - $widget_listings = geodir_get_widget_listings( $query_args ); |
|
| 3256 | - if ( ! empty( $widget_listings ) || ( isset( $with_no_results ) && $with_no_results ) ) {
|
|
| 3257 | - if ( $title ) {
|
|
| 3258 | - echo $before_title . $title . $after_title; |
|
| 3255 | + $widget_listings = geodir_get_widget_listings($query_args); |
|
| 3256 | + if (!empty($widget_listings) || (isset($with_no_results) && $with_no_results)) {
|
|
| 3257 | + if ($title) {
|
|
| 3258 | + echo $before_title.$title.$after_title; |
|
| 3259 | 3259 | } |
| 3260 | 3260 | |
| 3261 | 3261 | global $post; |
| 3262 | 3262 | |
| 3263 | - $current_post = $post;// keep current post info |
|
| 3263 | + $current_post = $post; // keep current post info |
|
| 3264 | 3264 | |
| 3265 | 3265 | $widget_main_slides = ''; |
| 3266 | 3266 | $nav_slides = ''; |
| 3267 | 3267 | $widget_slides = 0; |
| 3268 | 3268 | |
| 3269 | - foreach ( $widget_listings as $widget_listing ) {
|
|
| 3269 | + foreach ($widget_listings as $widget_listing) {
|
|
| 3270 | 3270 | global $gd_widget_listing_type; |
| 3271 | 3271 | $post = $widget_listing; |
| 3272 | - $widget_image = geodir_get_featured_image( $post->ID, 'thumbnail', get_option( 'geodir_listing_no_img' ) ); |
|
| 3272 | + $widget_image = geodir_get_featured_image($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 3273 | 3273 | |
| 3274 | - if ( ! empty( $widget_image ) ) {
|
|
| 3275 | - if ( $widget_image->height >= 200 ) {
|
|
| 3274 | + if (!empty($widget_image)) {
|
|
| 3275 | + if ($widget_image->height >= 200) {
|
|
| 3276 | 3276 | $widget_spacer_height = 0; |
| 3277 | 3277 | } else {
|
| 3278 | - $widget_spacer_height = ( ( 200 - $widget_image->height ) / 2 ); |
|
| 3278 | + $widget_spacer_height = ((200 - $widget_image->height) / 2); |
|
| 3279 | 3279 | } |
| 3280 | 3280 | |
| 3281 | - $widget_main_slides .= '<li class="geodir-listing-slider-widget"><img class="geodir-listing-slider-spacer" src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:' . $widget_spacer_height . 'px !important;margin:0 auto;" width="100" />'; |
|
| 3281 | + $widget_main_slides .= '<li class="geodir-listing-slider-widget"><img class="geodir-listing-slider-spacer" src="'.geodir_plugin_url()."/geodirectory-assets/images/spacer.gif".'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:'.$widget_spacer_height.'px !important;margin:0 auto;" width="100" />'; |
|
| 3282 | 3282 | |
| 3283 | 3283 | $title = ''; |
| 3284 | - if ( $show_title ) {
|
|
| 3285 | - $title_html = '<div class="geodir-slider-title"><a href="' . get_permalink( $post->ID ) . '">' . get_the_title( $post->ID ) . '</a></div>'; |
|
| 3284 | + if ($show_title) {
|
|
| 3285 | + $title_html = '<div class="geodir-slider-title"><a href="'.get_permalink($post->ID).'">'.get_the_title($post->ID).'</a></div>'; |
|
| 3286 | 3286 | $post_id = $post->ID; |
| 3287 | - $post_permalink = get_permalink( $post->ID ); |
|
| 3288 | - $post_title = get_the_title( $post->ID ); |
|
| 3287 | + $post_permalink = get_permalink($post->ID); |
|
| 3288 | + $post_title = get_the_title($post->ID); |
|
| 3289 | 3289 | /** |
| 3290 | 3290 | * Filter the listing slider widget title. |
| 3291 | 3291 | * |
@@ -3296,12 +3296,12 @@ discard block |
||
| 3296 | 3296 | * @param string $post_permalink The post permalink url. |
| 3297 | 3297 | * @param string $post_title The post title text. |
| 3298 | 3298 | */ |
| 3299 | - $title = apply_filters( 'geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title ); |
|
| 3299 | + $title = apply_filters('geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title);
|
|
| 3300 | 3300 | } |
| 3301 | 3301 | |
| 3302 | - $widget_main_slides .= $title . '<a href="' . get_permalink( $post->ID ) . '"><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:200px;margin:0 auto;" /></a></li>'; |
|
| 3303 | - $nav_slides .= '<li><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 3304 | - $widget_slides ++; |
|
| 3302 | + $widget_main_slides .= $title.'<a href="'.get_permalink($post->ID).'"><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:200px;margin:0 auto;" /></a></li>'; |
|
| 3303 | + $nav_slides .= '<li><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 3304 | + $widget_slides++; |
|
| 3305 | 3305 | } |
| 3306 | 3306 | } |
| 3307 | 3307 | ?> |
@@ -3310,7 +3310,7 @@ discard block |
||
| 3310 | 3310 | <div id="geodir_widget_slider" class="geodir_flexslider"> |
| 3311 | 3311 | <ul class="geodir-slides clearfix"><?php echo $widget_main_slides; ?></ul> |
| 3312 | 3312 | </div> |
| 3313 | - <?php if ( $widget_slides > 1 ) { ?>
|
|
| 3313 | + <?php if ($widget_slides > 1) { ?>
|
|
| 3314 | 3314 | <div id="geodir_widget_carousel" class="geodir_flexslider"> |
| 3315 | 3315 | <ul class="geodir-slides clearfix"><?php echo $nav_slides; ?></ul> |
| 3316 | 3316 | </div> |
@@ -3318,7 +3318,7 @@ discard block |
||
| 3318 | 3318 | </div> |
| 3319 | 3319 | <?php |
| 3320 | 3320 | $GLOBALS['post'] = $current_post; |
| 3321 | - setup_postdata( $current_post ); |
|
| 3321 | + setup_postdata($current_post); |
|
| 3322 | 3322 | } |
| 3323 | 3323 | echo $after_widget; |
| 3324 | 3324 | } |
@@ -3334,50 +3334,50 @@ discard block |
||
| 3334 | 3334 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. |
| 3335 | 3335 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3336 | 3336 | */ |
| 3337 | -function geodir_loginwidget_output( $args = '', $instance = '' ) {
|
|
| 3337 | +function geodir_loginwidget_output($args = '', $instance = '') {
|
|
| 3338 | 3338 | //print_r($args); |
| 3339 | 3339 | //print_r($instance); |
| 3340 | 3340 | // prints the widget |
| 3341 | - extract( $args, EXTR_SKIP ); |
|
| 3341 | + extract($args, EXTR_SKIP); |
|
| 3342 | 3342 | |
| 3343 | 3343 | /** This filter is documented in geodirectory_widgets.php */ |
| 3344 | - $title = empty( $instance['title'] ) ? __( 'My Dashboard', 'geodirectory' ) : apply_filters( 'my_dashboard_widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3344 | + $title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('my_dashboard_widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3345 | 3345 | |
| 3346 | 3346 | echo $before_widget; |
| 3347 | - echo $before_title . $title . $after_title; |
|
| 3347 | + echo $before_title.$title.$after_title; |
|
| 3348 | 3348 | |
| 3349 | 3349 | // global $gd_session; |
| 3350 | 3350 | // print_r($gd_session); |
| 3351 | 3351 | // print_r($_SESSION); |
| 3352 | 3352 | |
| 3353 | - if ( is_user_logged_in() ) {
|
|
| 3353 | + if (is_user_logged_in()) {
|
|
| 3354 | 3354 | global $current_user; |
| 3355 | 3355 | |
| 3356 | - $author_link = get_author_posts_url( $current_user->data->ID ); |
|
| 3357 | - $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); |
|
| 3356 | + $author_link = get_author_posts_url($current_user->data->ID); |
|
| 3357 | + $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
|
|
| 3358 | 3358 | |
| 3359 | 3359 | echo '<ul class="geodir-loginbox-list">'; |
| 3360 | 3360 | ob_start(); |
| 3361 | 3361 | ?> |
| 3362 | 3362 | <li><a class="signin" |
| 3363 | - href="<?php echo wp_logout_url( home_url() ); ?>"><?php _e( 'Logout', 'geodirectory' ); ?></a></li> |
|
| 3363 | + href="<?php echo wp_logout_url(home_url()); ?>"><?php _e('Logout', 'geodirectory'); ?></a></li>
|
|
| 3364 | 3364 | <?php |
| 3365 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 3366 | - $show_add_listing_post_types_main_nav = get_option( 'geodir_add_listing_link_user_dashboard' ); |
|
| 3367 | - $geodir_allow_posttype_frontend = get_option( 'geodir_allow_posttype_frontend' ); |
|
| 3365 | + $post_types = geodir_get_posttypes('object');
|
|
| 3366 | + $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_user_dashboard');
|
|
| 3367 | + $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 3368 | 3368 | |
| 3369 | - if ( ! empty( $show_add_listing_post_types_main_nav ) ) {
|
|
| 3369 | + if (!empty($show_add_listing_post_types_main_nav)) {
|
|
| 3370 | 3370 | $addlisting_links = ''; |
| 3371 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3371 | + foreach ($post_types as $key => $postobj) {
|
|
| 3372 | 3372 | |
| 3373 | - if ( in_array( $key, $show_add_listing_post_types_main_nav ) ) {
|
|
| 3373 | + if (in_array($key, $show_add_listing_post_types_main_nav)) {
|
|
| 3374 | 3374 | |
| 3375 | - if ( $add_link = geodir_get_addlisting_link( $key ) ) {
|
|
| 3375 | + if ($add_link = geodir_get_addlisting_link($key)) {
|
|
| 3376 | 3376 | |
| 3377 | 3377 | $name = $postobj->labels->name; |
| 3378 | 3378 | |
| 3379 | 3379 | $selected = ''; |
| 3380 | - if ( geodir_get_current_posttype() == $key && geodir_is_page( 'add-listing' ) ) {
|
|
| 3380 | + if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing')) {
|
|
| 3381 | 3381 | $selected = 'selected="selected"'; |
| 3382 | 3382 | } |
| 3383 | 3383 | |
@@ -3390,23 +3390,23 @@ discard block |
||
| 3390 | 3390 | * @param string $key Add listing array key. |
| 3391 | 3391 | * @param int $current_user ->ID Current user ID. |
| 3392 | 3392 | */ |
| 3393 | - $add_link = apply_filters( 'geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID ); |
|
| 3394 | - $name = apply_filters( 'geodir_dashboard_label_add_listing', $name, $key, $current_user->ID ); |
|
| 3393 | + $add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);
|
|
| 3394 | + $name = apply_filters('geodir_dashboard_label_add_listing', $name, $key, $current_user->ID);
|
|
| 3395 | 3395 | |
| 3396 | - $addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3396 | + $addlisting_links .= '<option '.$selected.' value="'.$add_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3397 | 3397 | |
| 3398 | 3398 | } |
| 3399 | 3399 | } |
| 3400 | 3400 | |
| 3401 | 3401 | } |
| 3402 | 3402 | |
| 3403 | - if ( $addlisting_links != '' ) { ?>
|
|
| 3403 | + if ($addlisting_links != '') { ?>
|
|
| 3404 | 3404 | |
| 3405 | 3405 | <li><select id="geodir_add_listing" class="chosen_select" onchange="window.location.href=this.value" |
| 3406 | 3406 | option-autoredirect="1" name="geodir_add_listing" option-ajaxchosen="false" |
| 3407 | - data-placeholder="<?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?>"> |
|
| 3407 | + data-placeholder="<?php echo esc_attr(__('Add Listing', 'geodirectory')); ?>">
|
|
| 3408 | 3408 | <option value="" disabled="disabled" selected="selected" |
| 3409 | - style='display:none;'><?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?></option> |
|
| 3409 | + style='display:none;'><?php echo esc_attr(__('Add Listing', 'geodirectory')); ?></option>
|
|
| 3410 | 3410 | <?php echo $addlisting_links; ?> |
| 3411 | 3411 | </select></li> <?php |
| 3412 | 3412 | |
@@ -3414,24 +3414,24 @@ discard block |
||
| 3414 | 3414 | |
| 3415 | 3415 | } |
| 3416 | 3416 | // My Favourites in Dashboard |
| 3417 | - $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' ); |
|
| 3417 | + $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
|
|
| 3418 | 3418 | $user_favourite = geodir_user_favourite_listing_count(); |
| 3419 | 3419 | |
| 3420 | - if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
|
|
| 3420 | + if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
|
|
| 3421 | 3421 | $favourite_links = ''; |
| 3422 | 3422 | |
| 3423 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3424 | - if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
|
|
| 3423 | + foreach ($post_types as $key => $postobj) {
|
|
| 3424 | + if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
|
|
| 3425 | 3425 | $name = $postobj->labels->name; |
| 3426 | 3426 | $fav_author_link = apply_filters('gd_dash_fav_author_link', $author_link, $current_user->data->ID);
|
| 3427 | - $post_type_link = geodir_getlink( $fav_author_link, array( |
|
| 3427 | + $post_type_link = geodir_getlink($fav_author_link, array( |
|
| 3428 | 3428 | 'stype' => $key, |
| 3429 | 3429 | 'list' => 'favourite' |
| 3430 | - ), false ); |
|
| 3430 | + ), false); |
|
| 3431 | 3431 | |
| 3432 | 3432 | $selected = ''; |
| 3433 | 3433 | |
| 3434 | - if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 3434 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 3435 | 3435 | $selected = 'selected="selected"'; |
| 3436 | 3436 | } |
| 3437 | 3437 | /** |
@@ -3443,20 +3443,20 @@ discard block |
||
| 3443 | 3443 | * @param string $key Favorite listing array key. |
| 3444 | 3444 | * @param int $current_user ->ID Current user ID. |
| 3445 | 3445 | */ |
| 3446 | - $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID ); |
|
| 3446 | + $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID);
|
|
| 3447 | 3447 | |
| 3448 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3448 | + $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3449 | 3449 | } |
| 3450 | 3450 | } |
| 3451 | 3451 | |
| 3452 | - if ( $favourite_links != '' ) {
|
|
| 3452 | + if ($favourite_links != '') {
|
|
| 3453 | 3453 | ?> |
| 3454 | 3454 | <li> |
| 3455 | 3455 | <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" |
| 3456 | 3456 | option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" |
| 3457 | - data-placeholder="<?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?>"> |
|
| 3457 | + data-placeholder="<?php echo esc_attr(__('My Favorites', 'geodirectory')); ?>">
|
|
| 3458 | 3458 | <option value="" disabled="disabled" selected="selected" |
| 3459 | - style='display:none;'><?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?></option> |
|
| 3459 | + style='display:none;'><?php echo esc_attr(__('My Favorites', 'geodirectory')); ?></option>
|
|
| 3460 | 3460 | <?php echo $favourite_links; ?> |
| 3461 | 3461 | </select> |
| 3462 | 3462 | </li> |
@@ -3465,20 +3465,20 @@ discard block |
||
| 3465 | 3465 | } |
| 3466 | 3466 | |
| 3467 | 3467 | |
| 3468 | - $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' ); |
|
| 3468 | + $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
|
|
| 3469 | 3469 | $user_listing = geodir_user_post_listing_count(); |
| 3470 | 3470 | |
| 3471 | - if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
|
|
| 3471 | + if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
|
|
| 3472 | 3472 | $listing_links = ''; |
| 3473 | 3473 | |
| 3474 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3475 | - if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
|
|
| 3474 | + foreach ($post_types as $key => $postobj) {
|
|
| 3475 | + if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
|
|
| 3476 | 3476 | $name = $postobj->labels->name; |
| 3477 | 3477 | $listing_author_link = apply_filters('gd_dash_listing_author_link', $author_link, $current_user->data->ID);
|
| 3478 | - $listing_link = geodir_getlink( $listing_author_link, array( 'stype' => $key ), false ); |
|
| 3478 | + $listing_link = geodir_getlink($listing_author_link, array('stype' => $key), false);
|
|
| 3479 | 3479 | |
| 3480 | 3480 | $selected = ''; |
| 3481 | - if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
|
|
| 3481 | + if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
|
|
| 3482 | 3482 | $selected = 'selected="selected"'; |
| 3483 | 3483 | } |
| 3484 | 3484 | |
@@ -3491,20 +3491,20 @@ discard block |
||
| 3491 | 3491 | * @param string $key My listing array key. |
| 3492 | 3492 | * @param int $current_user ->ID Current user ID. |
| 3493 | 3493 | */ |
| 3494 | - $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID ); |
|
| 3494 | + $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID);
|
|
| 3495 | 3495 | |
| 3496 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3496 | + $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3497 | 3497 | } |
| 3498 | 3498 | } |
| 3499 | 3499 | |
| 3500 | - if ( $listing_links != '' ) {
|
|
| 3500 | + if ($listing_links != '') {
|
|
| 3501 | 3501 | ?> |
| 3502 | 3502 | <li> |
| 3503 | 3503 | <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" |
| 3504 | 3504 | option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" |
| 3505 | - data-placeholder="<?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?>"> |
|
| 3505 | + data-placeholder="<?php echo esc_attr(__('My Listings', 'geodirectory')); ?>">
|
|
| 3506 | 3506 | <option value="" disabled="disabled" selected="selected" |
| 3507 | - style='display:none;'><?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?></option> |
|
| 3507 | + style='display:none;'><?php echo esc_attr(__('My Listings', 'geodirectory')); ?></option>
|
|
| 3508 | 3508 | <?php echo $listing_links; ?> |
| 3509 | 3509 | </select> |
| 3510 | 3510 | </li> |
@@ -3520,7 +3520,7 @@ discard block |
||
| 3520 | 3520 | * |
| 3521 | 3521 | * @param string $dashboard_link Dashboard links HTML. |
| 3522 | 3522 | */ |
| 3523 | - echo apply_filters( 'geodir_dashboard_links', $dashboard_link ); |
|
| 3523 | + echo apply_filters('geodir_dashboard_links', $dashboard_link);
|
|
| 3524 | 3524 | echo '</ul>'; |
| 3525 | 3525 | |
| 3526 | 3526 | /** |
@@ -3528,7 +3528,7 @@ discard block |
||
| 3528 | 3528 | * |
| 3529 | 3529 | * @since 1.6.6 |
| 3530 | 3530 | */ |
| 3531 | - do_action( 'geodir_after_loginwidget_form_logged_in' ); |
|
| 3531 | + do_action('geodir_after_loginwidget_form_logged_in');
|
|
| 3532 | 3532 | |
| 3533 | 3533 | |
| 3534 | 3534 | } else {
|
@@ -3543,18 +3543,18 @@ discard block |
||
| 3543 | 3543 | <form name="loginform" class="loginform1" |
| 3544 | 3544 | action="<?php echo geodir_login_url(); ?>" |
| 3545 | 3545 | method="post"> |
| 3546 | - <div class="geodir_form_row"><input placeholder="<?php echo apply_filters('gd_login_wid_login_placeholder', __( 'Email', 'geodirectory' )); ?>" name="<?php echo apply_filters('gd_login_wid_login_name', 'log'); ?>"
|
|
| 3546 | + <div class="geodir_form_row"><input placeholder="<?php echo apply_filters('gd_login_wid_login_placeholder', __('Email', 'geodirectory')); ?>" name="<?php echo apply_filters('gd_login_wid_login_name', 'log'); ?>"
|
|
| 3547 | 3547 | type="text" class="textfield user_login1"/> <span |
| 3548 | 3548 | class="user_loginInfo"></span></div> |
| 3549 | - <div class="geodir_form_row"><input placeholder="<?php _e( 'Password', 'geodirectory' ); ?>" |
|
| 3549 | + <div class="geodir_form_row"><input placeholder="<?php _e('Password', 'geodirectory'); ?>"
|
|
| 3550 | 3550 | name="<?php echo apply_filters('gd_login_wid_login_pwd', 'pwd'); ?>" type="password"
|
| 3551 | 3551 | class="textfield user_pass1 input-text"/><span |
| 3552 | 3552 | class="user_passInfo"></span></div> |
| 3553 | 3553 | |
| 3554 | - <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars( geodir_curPageURL() ); ?>"/> |
|
| 3554 | + <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars(geodir_curPageURL()); ?>"/> |
|
| 3555 | 3555 | <input type="hidden" name="testcookie" value="1"/> |
| 3556 | 3556 | |
| 3557 | - <?php do_action( 'login_form' ); ?> |
|
| 3557 | + <?php do_action('login_form'); ?>
|
|
| 3558 | 3558 | |
| 3559 | 3559 | <div class="geodir_form_row clearfix"><input type="submit" name="submit" |
| 3560 | 3560 | value="<?php echo SIGN_IN_BUTTON; ?>" class="b_signin"/> |
@@ -3566,11 +3566,11 @@ discard block |
||
| 3566 | 3566 | * |
| 3567 | 3567 | * @since 1.0.0 |
| 3568 | 3568 | */ |
| 3569 | - $is_enable_signup = get_option( 'users_can_register' ); |
|
| 3569 | + $is_enable_signup = get_option('users_can_register');
|
|
| 3570 | 3570 | |
| 3571 | - if ( $is_enable_signup ) {
|
|
| 3571 | + if ($is_enable_signup) {
|
|
| 3572 | 3572 | ?> |
| 3573 | - <a href="<?php echo geodir_login_url( array( 'signup' => true ) ); ?>" |
|
| 3573 | + <a href="<?php echo geodir_login_url(array('signup' => true)); ?>"
|
|
| 3574 | 3574 | class="goedir-newuser-link"><?php echo NEW_USER_TEXT; ?></a> |
| 3575 | 3575 | |
| 3576 | 3576 | <?php |
@@ -3581,7 +3581,7 @@ discard block |
||
| 3581 | 3581 | * @since 1.0.0 |
| 3582 | 3582 | */ |
| 3583 | 3583 | ?> |
| 3584 | - <a href="<?php echo geodir_login_url( array( 'forgot' => true ) ); ?>" |
|
| 3584 | + <a href="<?php echo geodir_login_url(array('forgot' => true)); ?>"
|
|
| 3585 | 3585 | class="goedir-forgot-link"><?php echo FORGOT_PW_TEXT; ?></a></p></div> |
| 3586 | 3586 | </form> |
| 3587 | 3587 | <?php |
@@ -3590,7 +3590,7 @@ discard block |
||
| 3590 | 3590 | * |
| 3591 | 3591 | * @since 1.6.6 |
| 3592 | 3592 | */ |
| 3593 | - do_action( 'geodir_after_loginwidget_form_logged_out' ); |
|
| 3593 | + do_action('geodir_after_loginwidget_form_logged_out');
|
|
| 3594 | 3594 | } |
| 3595 | 3595 | |
| 3596 | 3596 | echo $after_widget; |
@@ -3612,14 +3612,14 @@ discard block |
||
| 3612 | 3612 | * after_widget. |
| 3613 | 3613 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3614 | 3614 | */ |
| 3615 | -function geodir_popular_postview_output( $args = '', $instance = '' ) {
|
|
| 3615 | +function geodir_popular_postview_output($args = '', $instance = '') {
|
|
| 3616 | 3616 | global $gd_session; |
| 3617 | 3617 | |
| 3618 | 3618 | // prints the widget |
| 3619 | - extract( $args, EXTR_SKIP ); |
|
| 3619 | + extract($args, EXTR_SKIP); |
|
| 3620 | 3620 | |
| 3621 | 3621 | /** This filter is documented in geodirectory_widgets.php */ |
| 3622 | - $title = empty( $instance['title'] ) ? geodir_ucwords( $instance['category_title'] ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3622 | + $title = empty($instance['title']) ? geodir_ucwords($instance['category_title']) : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3623 | 3623 | /** |
| 3624 | 3624 | * Filter the widget post type. |
| 3625 | 3625 | * |
@@ -3627,7 +3627,7 @@ discard block |
||
| 3627 | 3627 | * |
| 3628 | 3628 | * @param string $instance ['post_type'] Post type of listing. |
| 3629 | 3629 | */ |
| 3630 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); |
|
| 3630 | + $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
|
|
| 3631 | 3631 | /** |
| 3632 | 3632 | * Filter the widget's term. |
| 3633 | 3633 | * |
@@ -3635,7 +3635,7 @@ discard block |
||
| 3635 | 3635 | * |
| 3636 | 3636 | * @param string $instance ['category'] Filter by term. Can be any valid term. |
| 3637 | 3637 | */ |
| 3638 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); |
|
| 3638 | + $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
|
|
| 3639 | 3639 | /** |
| 3640 | 3640 | * Filter the widget listings limit. |
| 3641 | 3641 | * |
@@ -3643,7 +3643,7 @@ discard block |
||
| 3643 | 3643 | * |
| 3644 | 3644 | * @param string $instance ['post_number'] Number of listings to display. |
| 3645 | 3645 | */ |
| 3646 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); |
|
| 3646 | + $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
|
|
| 3647 | 3647 | /** |
| 3648 | 3648 | * Filter widget's "layout" type. |
| 3649 | 3649 | * |
@@ -3651,7 +3651,7 @@ discard block |
||
| 3651 | 3651 | * |
| 3652 | 3652 | * @param string $instance ['layout'] Widget layout type. |
| 3653 | 3653 | */ |
| 3654 | - $layout = empty( $instance['layout'] ) ? 'gridview_onehalf' : apply_filters( 'widget_layout', $instance['layout'] ); |
|
| 3654 | + $layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
|
|
| 3655 | 3655 | /** |
| 3656 | 3656 | * Filter widget's "add_location_filter" value. |
| 3657 | 3657 | * |
@@ -3659,7 +3659,7 @@ discard block |
||
| 3659 | 3659 | * |
| 3660 | 3660 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. |
| 3661 | 3661 | */ |
| 3662 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); |
|
| 3662 | + $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
|
|
| 3663 | 3663 | /** |
| 3664 | 3664 | * Filter widget's listing width. |
| 3665 | 3665 | * |
@@ -3667,7 +3667,7 @@ discard block |
||
| 3667 | 3667 | * |
| 3668 | 3668 | * @param string $instance ['listing_width'] Listing width. |
| 3669 | 3669 | */ |
| 3670 | - $listing_width = empty( $instance['listing_width'] ) ? '' : apply_filters( 'widget_listing_width', $instance['listing_width'] ); |
|
| 3670 | + $listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
|
|
| 3671 | 3671 | /** |
| 3672 | 3672 | * Filter widget's "list_sort" type. |
| 3673 | 3673 | * |
@@ -3675,36 +3675,36 @@ discard block |
||
| 3675 | 3675 | * |
| 3676 | 3676 | * @param string $instance ['list_sort'] Listing sort by type. |
| 3677 | 3677 | */ |
| 3678 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); |
|
| 3679 | - $use_viewing_post_type = ! empty( $instance['use_viewing_post_type'] ) ? true : false; |
|
| 3678 | + $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
|
|
| 3679 | + $use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false; |
|
| 3680 | 3680 | |
| 3681 | 3681 | // set post type to current viewing post type |
| 3682 | - if ( $use_viewing_post_type ) {
|
|
| 3682 | + if ($use_viewing_post_type) {
|
|
| 3683 | 3683 | $current_post_type = geodir_get_current_posttype(); |
| 3684 | - if ( $current_post_type != '' && $current_post_type != $post_type ) {
|
|
| 3684 | + if ($current_post_type != '' && $current_post_type != $post_type) {
|
|
| 3685 | 3685 | $post_type = $current_post_type; |
| 3686 | 3686 | $category = array(); // old post type category will not work for current changed post type |
| 3687 | 3687 | } |
| 3688 | 3688 | } |
| 3689 | 3689 | // replace widget title dynamically |
| 3690 | - $posttype_plural_label = __( get_post_type_plural_label( $post_type ), 'geodirectory' ); |
|
| 3691 | - $posttype_singular_label = __( get_post_type_singular_label( $post_type ), 'geodirectory' ); |
|
| 3690 | + $posttype_plural_label = __(get_post_type_plural_label($post_type), 'geodirectory'); |
|
| 3691 | + $posttype_singular_label = __(get_post_type_singular_label($post_type), 'geodirectory'); |
|
| 3692 | 3692 | |
| 3693 | - $title = str_replace( "%posttype_plural_label%", $posttype_plural_label, $title ); |
|
| 3694 | - $title = str_replace( "%posttype_singular_label%", $posttype_singular_label, $title ); |
|
| 3693 | + $title = str_replace("%posttype_plural_label%", $posttype_plural_label, $title);
|
|
| 3694 | + $title = str_replace("%posttype_singular_label%", $posttype_singular_label, $title);
|
|
| 3695 | 3695 | |
| 3696 | 3696 | $categories = $category; |
| 3697 | - if ( ! empty( $category ) && $category[0] != '0' ) {
|
|
| 3698 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3697 | + if (!empty($category) && $category[0] != '0') {
|
|
| 3698 | + $category_taxonomy = geodir_get_taxonomies($post_type); |
|
| 3699 | 3699 | |
| 3700 | 3700 | ######### WPML ######### |
| 3701 | - if ( geodir_wpml_is_taxonomy_translated( $category_taxonomy[0] ) ) {
|
|
| 3702 | - $category = gd_lang_object_ids( $category, $category_taxonomy[0] ); |
|
| 3701 | + if (geodir_wpml_is_taxonomy_translated($category_taxonomy[0])) {
|
|
| 3702 | + $category = gd_lang_object_ids($category, $category_taxonomy[0]); |
|
| 3703 | 3703 | } |
| 3704 | 3704 | ######### WPML ######### |
| 3705 | 3705 | } |
| 3706 | 3706 | |
| 3707 | - if ( isset( $instance['character_count'] ) ) {
|
|
| 3707 | + if (isset($instance['character_count'])) {
|
|
| 3708 | 3708 | /** |
| 3709 | 3709 | * Filter the widget's excerpt character count. |
| 3710 | 3710 | * |
@@ -3712,37 +3712,37 @@ discard block |
||
| 3712 | 3712 | * |
| 3713 | 3713 | * @param int $instance ['character_count'] Excerpt character count. |
| 3714 | 3714 | */ |
| 3715 | - $character_count = apply_filters( 'widget_list_character_count', $instance['character_count'] ); |
|
| 3715 | + $character_count = apply_filters('widget_list_character_count', $instance['character_count']);
|
|
| 3716 | 3716 | } else {
|
| 3717 | 3717 | $character_count = ''; |
| 3718 | 3718 | } |
| 3719 | 3719 | |
| 3720 | - if ( empty( $title ) || $title == 'All' ) {
|
|
| 3721 | - $title .= ' ' . __( get_post_type_plural_label( $post_type ), 'geodirectory' ); |
|
| 3720 | + if (empty($title) || $title == 'All') {
|
|
| 3721 | + $title .= ' '.__(get_post_type_plural_label($post_type), 'geodirectory'); |
|
| 3722 | 3722 | } |
| 3723 | 3723 | |
| 3724 | 3724 | $location_url = array(); |
| 3725 | - $city = get_query_var( 'gd_city' ); |
|
| 3726 | - if ( ! empty( $city ) ) {
|
|
| 3727 | - $country = get_query_var( 'gd_country' ); |
|
| 3728 | - $region = get_query_var( 'gd_region' ); |
|
| 3725 | + $city = get_query_var('gd_city');
|
|
| 3726 | + if (!empty($city)) {
|
|
| 3727 | + $country = get_query_var('gd_country');
|
|
| 3728 | + $region = get_query_var('gd_region');
|
|
| 3729 | 3729 | |
| 3730 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 3730 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 3731 | 3731 | |
| 3732 | - if ( $geodir_show_location_url == 'all' ) {
|
|
| 3733 | - if ( $country != '' ) {
|
|
| 3732 | + if ($geodir_show_location_url == 'all') {
|
|
| 3733 | + if ($country != '') {
|
|
| 3734 | 3734 | $location_url[] = $country; |
| 3735 | 3735 | } |
| 3736 | 3736 | |
| 3737 | - if ( $region != '' ) {
|
|
| 3737 | + if ($region != '') {
|
|
| 3738 | 3738 | $location_url[] = $region; |
| 3739 | 3739 | } |
| 3740 | - } else if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 3741 | - if ( $country != '' ) {
|
|
| 3740 | + } else if ($geodir_show_location_url == 'country_city') {
|
|
| 3741 | + if ($country != '') {
|
|
| 3742 | 3742 | $location_url[] = $country; |
| 3743 | 3743 | } |
| 3744 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 3745 | - if ( $region != '' ) {
|
|
| 3744 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 3745 | + if ($region != '') {
|
|
| 3746 | 3746 | $location_url[] = $region; |
| 3747 | 3747 | } |
| 3748 | 3748 | } |
@@ -3750,37 +3750,37 @@ discard block |
||
| 3750 | 3750 | $location_url[] = $city; |
| 3751 | 3751 | } |
| 3752 | 3752 | |
| 3753 | - $location_url = implode( '/', $location_url ); |
|
| 3753 | + $location_url = implode('/', $location_url);
|
|
| 3754 | 3754 | $skip_location = false; |
| 3755 | - if ( ! $add_location_filter && $gd_session->get( 'gd_multi_location' ) ) {
|
|
| 3755 | + if (!$add_location_filter && $gd_session->get('gd_multi_location')) {
|
|
| 3756 | 3756 | $skip_location = true; |
| 3757 | - $gd_session->un_set( 'gd_multi_location' ); |
|
| 3757 | + $gd_session->un_set('gd_multi_location');
|
|
| 3758 | 3758 | } |
| 3759 | 3759 | |
| 3760 | - if ( get_option( 'permalink_structure' ) ) {
|
|
| 3761 | - $viewall_url = get_post_type_archive_link( $post_type ); |
|
| 3760 | + if (get_option('permalink_structure')) {
|
|
| 3761 | + $viewall_url = get_post_type_archive_link($post_type); |
|
| 3762 | 3762 | } else {
|
| 3763 | - $viewall_url = get_post_type_archive_link( $post_type ); |
|
| 3763 | + $viewall_url = get_post_type_archive_link($post_type); |
|
| 3764 | 3764 | } |
| 3765 | 3765 | |
| 3766 | - if ( ! empty( $category ) && $category[0] != '0' ) {
|
|
| 3766 | + if (!empty($category) && $category[0] != '0') {
|
|
| 3767 | 3767 | global $geodir_add_location_url; |
| 3768 | 3768 | |
| 3769 | 3769 | $geodir_add_location_url = '0'; |
| 3770 | 3770 | |
| 3771 | - if ( $add_location_filter != '0' ) {
|
|
| 3771 | + if ($add_location_filter != '0') {
|
|
| 3772 | 3772 | $geodir_add_location_url = '1'; |
| 3773 | 3773 | } |
| 3774 | 3774 | |
| 3775 | - $viewall_url = get_term_link( (int) $category[0], $post_type . 'category' ); |
|
| 3775 | + $viewall_url = get_term_link((int) $category[0], $post_type.'category'); |
|
| 3776 | 3776 | |
| 3777 | 3777 | $geodir_add_location_url = null; |
| 3778 | 3778 | } |
| 3779 | - if ( $skip_location ) {
|
|
| 3780 | - $gd_session->set( 'gd_multi_location', 1 ); |
|
| 3779 | + if ($skip_location) {
|
|
| 3780 | + $gd_session->set('gd_multi_location', 1);
|
|
| 3781 | 3781 | } |
| 3782 | 3782 | |
| 3783 | - if ( is_wp_error( $viewall_url ) ) {
|
|
| 3783 | + if (is_wp_error($viewall_url)) {
|
|
| 3784 | 3784 | $viewall_url = ''; |
| 3785 | 3785 | } |
| 3786 | 3786 | |
@@ -3792,43 +3792,43 @@ discard block |
||
| 3792 | 3792 | 'order_by' => $list_sort |
| 3793 | 3793 | ); |
| 3794 | 3794 | |
| 3795 | - if ( $character_count ) {
|
|
| 3795 | + if ($character_count) {
|
|
| 3796 | 3796 | $query_args['excerpt_length'] = $character_count; |
| 3797 | 3797 | } |
| 3798 | 3798 | |
| 3799 | - if ( ! empty( $instance['show_featured_only'] ) ) {
|
|
| 3799 | + if (!empty($instance['show_featured_only'])) {
|
|
| 3800 | 3800 | $query_args['show_featured_only'] = 1; |
| 3801 | 3801 | } |
| 3802 | 3802 | |
| 3803 | - if ( ! empty( $instance['show_special_only'] ) ) {
|
|
| 3803 | + if (!empty($instance['show_special_only'])) {
|
|
| 3804 | 3804 | $query_args['show_special_only'] = 1; |
| 3805 | 3805 | } |
| 3806 | 3806 | |
| 3807 | - if ( ! empty( $instance['with_pics_only'] ) ) {
|
|
| 3807 | + if (!empty($instance['with_pics_only'])) {
|
|
| 3808 | 3808 | $query_args['with_pics_only'] = 0; |
| 3809 | 3809 | $query_args['featured_image_only'] = 1; |
| 3810 | 3810 | } |
| 3811 | 3811 | |
| 3812 | - if ( ! empty( $instance['with_videos_only'] ) ) {
|
|
| 3812 | + if (!empty($instance['with_videos_only'])) {
|
|
| 3813 | 3813 | $query_args['with_videos_only'] = 1; |
| 3814 | 3814 | } |
| 3815 | - $hide_if_empty = ! empty( $instance['hide_if_empty'] ) ? true : false; |
|
| 3815 | + $hide_if_empty = !empty($instance['hide_if_empty']) ? true : false; |
|
| 3816 | 3816 | |
| 3817 | - if ( ! empty( $categories ) && $categories[0] != '0' && !empty( $category_taxonomy ) ) {
|
|
| 3817 | + if (!empty($categories) && $categories[0] != '0' && !empty($category_taxonomy)) {
|
|
| 3818 | 3818 | $tax_query = array( |
| 3819 | 3819 | 'taxonomy' => $category_taxonomy[0], |
| 3820 | 3820 | 'field' => 'id', |
| 3821 | 3821 | 'terms' => $category |
| 3822 | 3822 | ); |
| 3823 | 3823 | |
| 3824 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 3824 | + $query_args['tax_query'] = array($tax_query); |
|
| 3825 | 3825 | } |
| 3826 | 3826 | |
| 3827 | 3827 | global $gridview_columns_widget, $geodir_is_widget_listing; |
| 3828 | 3828 | |
| 3829 | - $widget_listings = geodir_get_widget_listings( $query_args ); |
|
| 3829 | + $widget_listings = geodir_get_widget_listings($query_args); |
|
| 3830 | 3830 | |
| 3831 | - if ( $hide_if_empty && empty( $widget_listings ) ) {
|
|
| 3831 | + if ($hide_if_empty && empty($widget_listings)) {
|
|
| 3832 | 3832 | return; |
| 3833 | 3833 | } |
| 3834 | 3834 | |
@@ -3843,11 +3843,11 @@ discard block |
||
| 3843 | 3843 | * |
| 3844 | 3844 | * @since 1.0.0 |
| 3845 | 3845 | */ |
| 3846 | - do_action( 'geodir_before_view_all_link_in_widget' ); ?> |
|
| 3846 | + do_action('geodir_before_view_all_link_in_widget'); ?>
|
|
| 3847 | 3847 | <div class="geodir_list_heading clearfix"> |
| 3848 | - <?php echo $before_title . $title . $after_title; ?> |
|
| 3848 | + <?php echo $before_title.$title.$after_title; ?> |
|
| 3849 | 3849 | <a href="<?php echo $viewall_url; ?>" |
| 3850 | - class="geodir-viewall"><?php _e( 'View all', 'geodirectory' ); ?></a> |
|
| 3850 | + class="geodir-viewall"><?php _e('View all', 'geodirectory'); ?></a>
|
|
| 3851 | 3851 | </div> |
| 3852 | 3852 | <?php |
| 3853 | 3853 | /** |
@@ -3855,10 +3855,10 @@ discard block |
||
| 3855 | 3855 | * |
| 3856 | 3856 | * @since 1.0.0 |
| 3857 | 3857 | */ |
| 3858 | - do_action( 'geodir_after_view_all_link_in_widget' ); ?> |
|
| 3858 | + do_action('geodir_after_view_all_link_in_widget'); ?>
|
|
| 3859 | 3859 | <?php |
| 3860 | - if ( strstr( $layout, 'gridview' ) ) {
|
|
| 3861 | - $listing_view_exp = explode( '_', $layout ); |
|
| 3860 | + if (strstr($layout, 'gridview')) {
|
|
| 3861 | + $listing_view_exp = explode('_', $layout);
|
|
| 3862 | 3862 | $gridview_columns_widget = $layout; |
| 3863 | 3863 | $layout = $listing_view_exp[0]; |
| 3864 | 3864 | } else {
|
@@ -3869,8 +3869,8 @@ discard block |
||
| 3869 | 3869 | * |
| 3870 | 3870 | * @since 1.0.0 |
| 3871 | 3871 | */ |
| 3872 | - $template = apply_filters( "geodir_template_part-widget-listing-listview", geodir_locate_template( 'widget-listing-listview' ) ); |
|
| 3873 | - if ( ! isset( $character_count ) ) {
|
|
| 3872 | + $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
|
|
| 3873 | + if (!isset($character_count)) {
|
|
| 3874 | 3874 | /** |
| 3875 | 3875 | * Filter the widget's excerpt character count. |
| 3876 | 3876 | * |
@@ -3878,7 +3878,7 @@ discard block |
||
| 3878 | 3878 | * |
| 3879 | 3879 | * @param int $instance ['character_count'] Excerpt character count. |
| 3880 | 3880 | */ |
| 3881 | - $character_count = $character_count == '' ? 50 : apply_filters( 'widget_character_count', $character_count ); |
|
| 3881 | + $character_count = $character_count == '' ? 50 : apply_filters('widget_character_count', $character_count);
|
|
| 3882 | 3882 | } |
| 3883 | 3883 | |
| 3884 | 3884 | global $post, $map_jason, $map_canvas_arr; |
@@ -3893,13 +3893,13 @@ discard block |
||
| 3893 | 3893 | * |
| 3894 | 3894 | * @since 1.0.0 |
| 3895 | 3895 | */ |
| 3896 | - include( $template ); |
|
| 3896 | + include($template); |
|
| 3897 | 3897 | |
| 3898 | 3898 | $geodir_is_widget_listing = false; |
| 3899 | 3899 | |
| 3900 | 3900 | $GLOBALS['post'] = $current_post; |
| 3901 | - if ( ! empty( $current_post ) ) {
|
|
| 3902 | - setup_postdata( $current_post ); |
|
| 3901 | + if (!empty($current_post)) {
|
|
| 3902 | + setup_postdata($current_post); |
|
| 3903 | 3903 | } |
| 3904 | 3904 | $map_jason = $current_map_jason; |
| 3905 | 3905 | $map_canvas_arr = $current_map_canvas_arr; |
@@ -3928,12 +3928,12 @@ discard block |
||
| 3928 | 3928 | * |
| 3929 | 3929 | * @return int Reviews count. |
| 3930 | 3930 | */ |
| 3931 | -function geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ) {
|
|
| 3931 | +function geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type) {
|
|
| 3932 | 3932 | global $wpdb, $plugin_prefix; |
| 3933 | 3933 | |
| 3934 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 3934 | + $detail_table = $plugin_prefix.$post_type.'_detail'; |
|
| 3935 | 3935 | |
| 3936 | - $sql = "SELECT COALESCE(SUM(rating_count),0) FROM " . $detail_table . " WHERE post_status = 'publish' AND rating_count > 0 AND FIND_IN_SET(" . $term_id . ", " . $taxonomy . ")";
|
|
| 3936 | + $sql = "SELECT COALESCE(SUM(rating_count),0) FROM ".$detail_table." WHERE post_status = 'publish' AND rating_count > 0 AND FIND_IN_SET(".$term_id.", ".$taxonomy.")";
|
|
| 3937 | 3937 | |
| 3938 | 3938 | /** |
| 3939 | 3939 | * Filter count review sql query. |
@@ -3945,9 +3945,9 @@ discard block |
||
| 3945 | 3945 | * @param int $taxonomy The taxonomy Id. |
| 3946 | 3946 | * @param string $post_type The post type. |
| 3947 | 3947 | */ |
| 3948 | - $sql = apply_filters( 'geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type ); |
|
| 3948 | + $sql = apply_filters('geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type);
|
|
| 3949 | 3949 | |
| 3950 | - $count = $wpdb->get_var( $sql ); |
|
| 3950 | + $count = $wpdb->get_var($sql); |
|
| 3951 | 3951 | |
| 3952 | 3952 | return $count; |
| 3953 | 3953 | } |
@@ -3965,7 +3965,7 @@ discard block |
||
| 3965 | 3965 | * |
| 3966 | 3966 | * @return array Term array data. |
| 3967 | 3967 | */ |
| 3968 | -function geodir_count_reviews_by_terms( $force_update = false, $post_ID = 0 ) {
|
|
| 3968 | +function geodir_count_reviews_by_terms($force_update = false, $post_ID = 0) {
|
|
| 3969 | 3969 | /** |
| 3970 | 3970 | * Filter review count option data. |
| 3971 | 3971 | * |
@@ -3975,78 +3975,78 @@ discard block |
||
| 3975 | 3975 | * @param bool $force_update Force update option value?. Default.false. |
| 3976 | 3976 | * @param int $post_ID The post id to update if any. |
| 3977 | 3977 | */ |
| 3978 | - $option_data = apply_filters( 'geodir_count_reviews_by_terms_before', '', $force_update, $post_ID ); |
|
| 3979 | - if ( ! empty( $option_data ) ) {
|
|
| 3978 | + $option_data = apply_filters('geodir_count_reviews_by_terms_before', '', $force_update, $post_ID);
|
|
| 3979 | + if (!empty($option_data)) {
|
|
| 3980 | 3980 | return $option_data; |
| 3981 | 3981 | } |
| 3982 | 3982 | |
| 3983 | - $option_data = get_option( 'geodir_global_review_count' ); |
|
| 3983 | + $option_data = get_option('geodir_global_review_count');
|
|
| 3984 | 3984 | |
| 3985 | - if ( ! $option_data || $force_update ) {
|
|
| 3986 | - if ( (int) $post_ID > 0 ) { // Update reviews count for specific post categories only.
|
|
| 3985 | + if (!$option_data || $force_update) {
|
|
| 3986 | + if ((int) $post_ID > 0) { // Update reviews count for specific post categories only.
|
|
| 3987 | 3987 | global $gd_session; |
| 3988 | 3988 | $term_array = (array) $option_data; |
| 3989 | - $post_type = get_post_type( $post_ID ); |
|
| 3990 | - $taxonomy = $post_type . 'category'; |
|
| 3991 | - $terms = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) ); |
|
| 3992 | - |
|
| 3993 | - if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {
|
|
| 3994 | - foreach ( $terms as $term_id ) {
|
|
| 3995 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); |
|
| 3996 | - $children = get_term_children( $term_id, $taxonomy ); |
|
| 3997 | - $term_array[ $term_id ] = $count; |
|
| 3989 | + $post_type = get_post_type($post_ID); |
|
| 3990 | + $taxonomy = $post_type.'category'; |
|
| 3991 | + $terms = wp_get_object_terms($post_ID, $taxonomy, array('fields' => 'ids'));
|
|
| 3992 | + |
|
| 3993 | + if (!empty($terms) && !is_wp_error($terms)) {
|
|
| 3994 | + foreach ($terms as $term_id) {
|
|
| 3995 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); |
|
| 3996 | + $children = get_term_children($term_id, $taxonomy); |
|
| 3997 | + $term_array[$term_id] = $count; |
|
| 3998 | 3998 | } |
| 3999 | 3999 | } |
| 4000 | 4000 | |
| 4001 | - $session_listing = $gd_session->get( 'listing' ); |
|
| 4001 | + $session_listing = $gd_session->get('listing');
|
|
| 4002 | 4002 | |
| 4003 | 4003 | $terms = array(); |
| 4004 | - if ( isset( $_POST['post_category'][ $taxonomy ] ) ) {
|
|
| 4005 | - $terms = (array) $_POST['post_category'][ $taxonomy ]; |
|
| 4006 | - } else if ( ! empty( $session_listing ) && isset( $session_listing['post_category'][ $taxonomy ] ) ) {
|
|
| 4007 | - $terms = (array) $session_listing['post_category'][ $taxonomy ]; |
|
| 4004 | + if (isset($_POST['post_category'][$taxonomy])) {
|
|
| 4005 | + $terms = (array) $_POST['post_category'][$taxonomy]; |
|
| 4006 | + } else if (!empty($session_listing) && isset($session_listing['post_category'][$taxonomy])) {
|
|
| 4007 | + $terms = (array) $session_listing['post_category'][$taxonomy]; |
|
| 4008 | 4008 | } |
| 4009 | 4009 | |
| 4010 | - if ( ! empty( $terms ) ) {
|
|
| 4011 | - foreach ( $terms as $term_id ) {
|
|
| 4012 | - if ( $term_id > 0 ) {
|
|
| 4013 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); |
|
| 4014 | - $children = get_term_children( $term_id, $taxonomy ); |
|
| 4015 | - $term_array[ $term_id ] = $count; |
|
| 4010 | + if (!empty($terms)) {
|
|
| 4011 | + foreach ($terms as $term_id) {
|
|
| 4012 | + if ($term_id > 0) {
|
|
| 4013 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); |
|
| 4014 | + $children = get_term_children($term_id, $taxonomy); |
|
| 4015 | + $term_array[$term_id] = $count; |
|
| 4016 | 4016 | } |
| 4017 | 4017 | } |
| 4018 | 4018 | } |
| 4019 | 4019 | } else { // Update reviews count for all post categories.
|
| 4020 | 4020 | $term_array = array(); |
| 4021 | 4021 | $post_types = geodir_get_posttypes(); |
| 4022 | - foreach ( $post_types as $post_type ) {
|
|
| 4022 | + foreach ($post_types as $post_type) {
|
|
| 4023 | 4023 | |
| 4024 | - $taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 4024 | + $taxonomy = geodir_get_taxonomies($post_type); |
|
| 4025 | 4025 | $taxonomy = $taxonomy[0]; |
| 4026 | 4026 | |
| 4027 | 4027 | $args = array( |
| 4028 | 4028 | 'hide_empty' => false |
| 4029 | 4029 | ); |
| 4030 | 4030 | |
| 4031 | - $terms = get_terms( $taxonomy, $args ); |
|
| 4031 | + $terms = get_terms($taxonomy, $args); |
|
| 4032 | 4032 | |
| 4033 | - foreach ( $terms as $term ) {
|
|
| 4034 | - $count = geodir_count_reviews_by_term_id( $term->term_id, $taxonomy, $post_type ); |
|
| 4035 | - $children = get_term_children( $term->term_id, $taxonomy ); |
|
| 4033 | + foreach ($terms as $term) {
|
|
| 4034 | + $count = geodir_count_reviews_by_term_id($term->term_id, $taxonomy, $post_type); |
|
| 4035 | + $children = get_term_children($term->term_id, $taxonomy); |
|
| 4036 | 4036 | /*if ( is_array( $children ) ) {
|
| 4037 | 4037 | foreach ( $children as $child_id ) {
|
| 4038 | 4038 | $child_count = geodir_count_reviews_by_term_id($child_id, $taxonomy, $post_type); |
| 4039 | 4039 | $count = $count + $child_count; |
| 4040 | 4040 | } |
| 4041 | 4041 | }*/ |
| 4042 | - $term_array[ $term->term_id ] = $count; |
|
| 4042 | + $term_array[$term->term_id] = $count; |
|
| 4043 | 4043 | } |
| 4044 | 4044 | } |
| 4045 | 4045 | } |
| 4046 | 4046 | |
| 4047 | - update_option( 'geodir_global_review_count', $term_array ); |
|
| 4047 | + update_option('geodir_global_review_count', $term_array);
|
|
| 4048 | 4048 | //clear cache |
| 4049 | - wp_cache_delete( 'geodir_global_review_count' ); |
|
| 4049 | + wp_cache_delete('geodir_global_review_count');
|
|
| 4050 | 4050 | |
| 4051 | 4051 | return $term_array; |
| 4052 | 4052 | } else {
|
@@ -4062,39 +4062,39 @@ discard block |
||
| 4062 | 4062 | * @package GeoDirectory |
| 4063 | 4063 | * @return bool |
| 4064 | 4064 | */ |
| 4065 | -function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {
|
|
| 4066 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {
|
|
| 4065 | +function geodir_term_review_count_force_update($new_status, $old_status = '', $post = '') {
|
|
| 4066 | + if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'geodir_import_export') {
|
|
| 4067 | 4067 | return; // do not run if importing listings |
| 4068 | 4068 | } |
| 4069 | 4069 | |
| 4070 | - if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
|
|
| 4070 | + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
|
|
| 4071 | 4071 | return; |
| 4072 | 4072 | } |
| 4073 | 4073 | |
| 4074 | 4074 | $post_ID = 0; |
| 4075 | - if ( ! empty( $post ) ) {
|
|
| 4076 | - if ( isset( $post->post_type ) && strpos( $post->post_type, 'gd_' ) !== 0 ) {
|
|
| 4075 | + if (!empty($post)) {
|
|
| 4076 | + if (isset($post->post_type) && strpos($post->post_type, 'gd_') !== 0) {
|
|
| 4077 | 4077 | return; |
| 4078 | 4078 | } |
| 4079 | 4079 | |
| 4080 | - if ( $new_status == 'auto-draft' && $old_status == 'new' ) {
|
|
| 4080 | + if ($new_status == 'auto-draft' && $old_status == 'new') {
|
|
| 4081 | 4081 | return; |
| 4082 | 4082 | } |
| 4083 | 4083 | |
| 4084 | - if ( ! empty( $post->ID ) ) {
|
|
| 4084 | + if (!empty($post->ID)) {
|
|
| 4085 | 4085 | $post_ID = $post->ID; |
| 4086 | 4086 | } |
| 4087 | 4087 | } |
| 4088 | 4088 | |
| 4089 | - if ( $new_status != $old_status ) {
|
|
| 4090 | - geodir_count_reviews_by_terms( true, $post_ID ); |
|
| 4089 | + if ($new_status != $old_status) {
|
|
| 4090 | + geodir_count_reviews_by_terms(true, $post_ID); |
|
| 4091 | 4091 | } |
| 4092 | 4092 | |
| 4093 | 4093 | return true; |
| 4094 | 4094 | } |
| 4095 | 4095 | |
| 4096 | -function geodir_term_review_count_force_update_single_post( $post_id ) {
|
|
| 4097 | - geodir_count_reviews_by_terms( true, $post_id ); |
|
| 4096 | +function geodir_term_review_count_force_update_single_post($post_id) {
|
|
| 4097 | + geodir_count_reviews_by_terms(true, $post_id); |
|
| 4098 | 4098 | } |
| 4099 | 4099 | |
| 4100 | 4100 | /*-----------------------------------------------------------------------------------*/ |
@@ -4111,11 +4111,11 @@ discard block |
||
| 4111 | 4111 | * |
| 4112 | 4112 | * @return int Post count. |
| 4113 | 4113 | */ |
| 4114 | -function geodir_count_posts_by_term( $data, $term ) {
|
|
| 4114 | +function geodir_count_posts_by_term($data, $term) {
|
|
| 4115 | 4115 | |
| 4116 | - if ( $data ) {
|
|
| 4117 | - if ( isset( $data[ $term->term_id ] ) ) {
|
|
| 4118 | - return $data[ $term->term_id ]; |
|
| 4116 | + if ($data) {
|
|
| 4117 | + if (isset($data[$term->term_id])) {
|
|
| 4118 | + return $data[$term->term_id]; |
|
| 4119 | 4119 | } else {
|
| 4120 | 4120 | return 0; |
| 4121 | 4121 | } |
@@ -4132,8 +4132,8 @@ discard block |
||
| 4132 | 4132 | * param array $terms An array of term objects. |
| 4133 | 4133 | * @return array Sorted terms array. |
| 4134 | 4134 | */ |
| 4135 | -function geodir_sort_terms_by_count( $terms ) {
|
|
| 4136 | - usort( $terms, "geodir_sort_by_count_obj" ); |
|
| 4135 | +function geodir_sort_terms_by_count($terms) {
|
|
| 4136 | + usort($terms, "geodir_sort_by_count_obj"); |
|
| 4137 | 4137 | |
| 4138 | 4138 | return $terms; |
| 4139 | 4139 | } |
@@ -4148,8 +4148,8 @@ discard block |
||
| 4148 | 4148 | * |
| 4149 | 4149 | * @return array Sorted terms array. |
| 4150 | 4150 | */ |
| 4151 | -function geodir_sort_terms_by_review_count( $terms ) {
|
|
| 4152 | - usort( $terms, "geodir_sort_by_review_count_obj" ); |
|
| 4151 | +function geodir_sort_terms_by_review_count($terms) {
|
|
| 4152 | + usort($terms, "geodir_sort_by_review_count_obj"); |
|
| 4153 | 4153 | |
| 4154 | 4154 | return $terms; |
| 4155 | 4155 | } |
@@ -4165,12 +4165,12 @@ discard block |
||
| 4165 | 4165 | * |
| 4166 | 4166 | * @return array Sorted terms array. |
| 4167 | 4167 | */ |
| 4168 | -function geodir_sort_terms( $terms, $sort = 'count' ) {
|
|
| 4169 | - if ( $sort == 'count' ) {
|
|
| 4170 | - return geodir_sort_terms_by_count( $terms ); |
|
| 4168 | +function geodir_sort_terms($terms, $sort = 'count') {
|
|
| 4169 | + if ($sort == 'count') {
|
|
| 4170 | + return geodir_sort_terms_by_count($terms); |
|
| 4171 | 4171 | } |
| 4172 | - if ( $sort == 'review_count' ) {
|
|
| 4173 | - return geodir_sort_terms_by_review_count( $terms ); |
|
| 4172 | + if ($sort == 'review_count') {
|
|
| 4173 | + return geodir_sort_terms_by_review_count($terms); |
|
| 4174 | 4174 | } |
| 4175 | 4175 | return $terms; |
| 4176 | 4176 | } |
@@ -4189,7 +4189,7 @@ discard block |
||
| 4189 | 4189 | * |
| 4190 | 4190 | * @return bool |
| 4191 | 4191 | */ |
| 4192 | -function geodir_sort_by_count( $a, $b ) {
|
|
| 4192 | +function geodir_sort_by_count($a, $b) {
|
|
| 4193 | 4193 | return $a['count'] < $b['count']; |
| 4194 | 4194 | } |
| 4195 | 4195 | |
@@ -4204,7 +4204,7 @@ discard block |
||
| 4204 | 4204 | * |
| 4205 | 4205 | * @return bool |
| 4206 | 4206 | */ |
| 4207 | -function geodir_sort_by_count_obj( $a, $b ) {
|
|
| 4207 | +function geodir_sort_by_count_obj($a, $b) {
|
|
| 4208 | 4208 | return $a->count < $b->count; |
| 4209 | 4209 | } |
| 4210 | 4210 | |
@@ -4219,7 +4219,7 @@ discard block |
||
| 4219 | 4219 | * |
| 4220 | 4220 | * @return bool |
| 4221 | 4221 | */ |
| 4222 | -function geodir_sort_by_review_count_obj( $a, $b ) {
|
|
| 4222 | +function geodir_sort_by_review_count_obj($a, $b) {
|
|
| 4223 | 4223 | return $a->review_count < $b->review_count; |
| 4224 | 4224 | } |
| 4225 | 4225 | |
@@ -4236,35 +4236,35 @@ discard block |
||
| 4236 | 4236 | * @since 1.4.2 |
| 4237 | 4237 | * @package GeoDirectory |
| 4238 | 4238 | */ |
| 4239 | - $locale = apply_filters( 'plugin_locale', get_locale(), 'geodirectory' ); |
|
| 4239 | + $locale = apply_filters('plugin_locale', get_locale(), 'geodirectory');
|
|
| 4240 | 4240 | |
| 4241 | - load_textdomain( 'geodirectory', WP_LANG_DIR . '/' . 'geodirectory' . '/' . 'geodirectory' . '-' . $locale . '.mo' ); |
|
| 4242 | - load_plugin_textdomain( 'geodirectory', false, plugin_basename( dirname( dirname( __FILE__ ) ) ) . '/geodirectory-languages' ); |
|
| 4241 | + load_textdomain('geodirectory', WP_LANG_DIR.'/'.'geodirectory'.'/'.'geodirectory'.'-'.$locale.'.mo');
|
|
| 4242 | + load_plugin_textdomain('geodirectory', false, plugin_basename(dirname(dirname(__FILE__))).'/geodirectory-languages');
|
|
| 4243 | 4243 | |
| 4244 | 4244 | /** |
| 4245 | 4245 | * Define language constants. |
| 4246 | 4246 | * |
| 4247 | 4247 | * @since 1.0.0 |
| 4248 | 4248 | */ |
| 4249 | - require_once( geodir_plugin_path() . '/language.php' ); |
|
| 4249 | + require_once(geodir_plugin_path().'/language.php'); |
|
| 4250 | 4250 | |
| 4251 | - $language_file = geodir_plugin_path() . '/db-language.php'; |
|
| 4251 | + $language_file = geodir_plugin_path().'/db-language.php'; |
|
| 4252 | 4252 | |
| 4253 | 4253 | // Load language string file if not created yet |
| 4254 | - if ( ! file_exists( $language_file ) ) {
|
|
| 4254 | + if (!file_exists($language_file)) {
|
|
| 4255 | 4255 | geodirectory_load_db_language(); |
| 4256 | 4256 | } |
| 4257 | 4257 | |
| 4258 | - if ( file_exists( $language_file ) ) {
|
|
| 4258 | + if (file_exists($language_file)) {
|
|
| 4259 | 4259 | /** |
| 4260 | 4260 | * Language strings from database. |
| 4261 | 4261 | * |
| 4262 | 4262 | * @since 1.4.2 |
| 4263 | 4263 | */ |
| 4264 | 4264 | try {
|
| 4265 | - require_once( $language_file ); |
|
| 4266 | - } catch ( Exception $e ) {
|
|
| 4267 | - error_log( 'Language Error: ' . $e->getMessage() ); |
|
| 4265 | + require_once($language_file); |
|
| 4266 | + } catch (Exception $e) {
|
|
| 4267 | + error_log('Language Error: '.$e->getMessage());
|
|
| 4268 | 4268 | } |
| 4269 | 4269 | } |
| 4270 | 4270 | } |
@@ -4281,19 +4281,19 @@ discard block |
||
| 4281 | 4281 | */ |
| 4282 | 4282 | function geodirectory_load_db_language() {
|
| 4283 | 4283 | global $wp_filesystem; |
| 4284 | - if ( empty( $wp_filesystem ) ) {
|
|
| 4285 | - require_once( ABSPATH . '/wp-admin/includes/file.php' ); |
|
| 4284 | + if (empty($wp_filesystem)) {
|
|
| 4285 | + require_once(ABSPATH.'/wp-admin/includes/file.php'); |
|
| 4286 | 4286 | WP_Filesystem(); |
| 4287 | 4287 | global $wp_filesystem; |
| 4288 | 4288 | } |
| 4289 | 4289 | |
| 4290 | - $language_file = geodir_plugin_path() . '/db-language.php'; |
|
| 4290 | + $language_file = geodir_plugin_path().'/db-language.php'; |
|
| 4291 | 4291 | |
| 4292 | - if ( is_file( $language_file ) && ! is_writable( $language_file ) ) {
|
|
| 4292 | + if (is_file($language_file) && !is_writable($language_file)) {
|
|
| 4293 | 4293 | return false; |
| 4294 | 4294 | } // Not possible to create. |
| 4295 | 4295 | |
| 4296 | - if ( ! is_file( $language_file ) && ! is_writable( dirname( $language_file ) ) ) {
|
|
| 4296 | + if (!is_file($language_file) && !is_writable(dirname($language_file))) {
|
|
| 4297 | 4297 | return false; |
| 4298 | 4298 | } // Not possible to create. |
| 4299 | 4299 | |
@@ -4307,9 +4307,9 @@ discard block |
||
| 4307 | 4307 | * |
| 4308 | 4308 | * @param array $contents_strings Array of strings. |
| 4309 | 4309 | */ |
| 4310 | - $contents_strings = apply_filters( 'geodir_load_db_language', $contents_strings ); |
|
| 4310 | + $contents_strings = apply_filters('geodir_load_db_language', $contents_strings);
|
|
| 4311 | 4311 | |
| 4312 | - $contents_strings = array_unique( $contents_strings ); |
|
| 4312 | + $contents_strings = array_unique($contents_strings); |
|
| 4313 | 4313 | |
| 4314 | 4314 | $contents_head = array(); |
| 4315 | 4315 | $contents_head[] = "<?php"; |
@@ -4326,21 +4326,21 @@ discard block |
||
| 4326 | 4326 | $contents_foot[] = ""; |
| 4327 | 4327 | $contents_foot[] = ""; |
| 4328 | 4328 | |
| 4329 | - $contents = implode( PHP_EOL, $contents_head ); |
|
| 4329 | + $contents = implode(PHP_EOL, $contents_head); |
|
| 4330 | 4330 | |
| 4331 | - if ( ! empty( $contents_strings ) ) {
|
|
| 4332 | - foreach ( $contents_strings as $string ) {
|
|
| 4333 | - if ( is_scalar( $string ) && $string != '' ) {
|
|
| 4334 | - $string = str_replace( "'", "\'", $string ); |
|
| 4335 | - geodir_wpml_register_string( $string ); |
|
| 4336 | - $contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";
|
|
| 4331 | + if (!empty($contents_strings)) {
|
|
| 4332 | + foreach ($contents_strings as $string) {
|
|
| 4333 | + if (is_scalar($string) && $string != '') {
|
|
| 4334 | + $string = str_replace("'", "\'", $string);
|
|
| 4335 | + geodir_wpml_register_string($string); |
|
| 4336 | + $contents .= PHP_EOL."__('".$string."', 'geodirectory');";
|
|
| 4337 | 4337 | } |
| 4338 | 4338 | } |
| 4339 | 4339 | } |
| 4340 | 4340 | |
| 4341 | - $contents .= implode( PHP_EOL, $contents_foot ); |
|
| 4341 | + $contents .= implode(PHP_EOL, $contents_foot); |
|
| 4342 | 4342 | |
| 4343 | - if ( $wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE ) ) {
|
|
| 4343 | + if ($wp_filesystem->put_contents($language_file, $contents, FS_CHMOD_FILE)) {
|
|
| 4344 | 4344 | return false; |
| 4345 | 4345 | } // Failure; could not write file. |
| 4346 | 4346 | |
@@ -4361,49 +4361,49 @@ discard block |
||
| 4361 | 4361 | * |
| 4362 | 4362 | * @return array Translation texts. |
| 4363 | 4363 | */ |
| 4364 | -function geodir_load_custom_field_translation( $translation_texts = array() ) {
|
|
| 4364 | +function geodir_load_custom_field_translation($translation_texts = array()) {
|
|
| 4365 | 4365 | global $wpdb; |
| 4366 | 4366 | |
| 4367 | 4367 | // Custom fields table |
| 4368 | - $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM " . GEODIR_CUSTOM_FIELDS_TABLE; |
|
| 4369 | - $rows = $wpdb->get_results( $sql ); |
|
| 4368 | + $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM ".GEODIR_CUSTOM_FIELDS_TABLE; |
|
| 4369 | + $rows = $wpdb->get_results($sql); |
|
| 4370 | 4370 | |
| 4371 | - if ( ! empty( $rows ) ) {
|
|
| 4372 | - foreach ( $rows as $row ) {
|
|
| 4373 | - if ( ! empty( $row->admin_title ) ) {
|
|
| 4374 | - $translation_texts[] = stripslashes_deep( $row->admin_title ); |
|
| 4371 | + if (!empty($rows)) {
|
|
| 4372 | + foreach ($rows as $row) {
|
|
| 4373 | + if (!empty($row->admin_title)) {
|
|
| 4374 | + $translation_texts[] = stripslashes_deep($row->admin_title); |
|
| 4375 | 4375 | } |
| 4376 | 4376 | |
| 4377 | - if ( ! empty( $row->admin_desc ) ) {
|
|
| 4378 | - $translation_texts[] = stripslashes_deep( $row->admin_desc ); |
|
| 4377 | + if (!empty($row->admin_desc)) {
|
|
| 4378 | + $translation_texts[] = stripslashes_deep($row->admin_desc); |
|
| 4379 | 4379 | } |
| 4380 | 4380 | |
| 4381 | - if ( ! empty( $row->site_title ) ) {
|
|
| 4382 | - $translation_texts[] = stripslashes_deep( $row->site_title ); |
|
| 4381 | + if (!empty($row->site_title)) {
|
|
| 4382 | + $translation_texts[] = stripslashes_deep($row->site_title); |
|
| 4383 | 4383 | } |
| 4384 | 4384 | |
| 4385 | - if ( ! empty( $row->clabels ) ) {
|
|
| 4386 | - $translation_texts[] = stripslashes_deep( $row->clabels ); |
|
| 4385 | + if (!empty($row->clabels)) {
|
|
| 4386 | + $translation_texts[] = stripslashes_deep($row->clabels); |
|
| 4387 | 4387 | } |
| 4388 | 4388 | |
| 4389 | - if ( ! empty( $row->required_msg ) ) {
|
|
| 4390 | - $translation_texts[] = stripslashes_deep( $row->required_msg ); |
|
| 4389 | + if (!empty($row->required_msg)) {
|
|
| 4390 | + $translation_texts[] = stripslashes_deep($row->required_msg); |
|
| 4391 | 4391 | } |
| 4392 | 4392 | |
| 4393 | - if ( ! empty( $row->validation_msg ) ) {
|
|
| 4394 | - $translation_texts[] = stripslashes_deep( $row->validation_msg ); |
|
| 4393 | + if (!empty($row->validation_msg)) {
|
|
| 4394 | + $translation_texts[] = stripslashes_deep($row->validation_msg); |
|
| 4395 | 4395 | } |
| 4396 | 4396 | |
| 4397 | - if ( ! empty( $row->default_value ) ) {
|
|
| 4398 | - $translation_texts[] = stripslashes_deep( $row->default_value ); |
|
| 4397 | + if (!empty($row->default_value)) {
|
|
| 4398 | + $translation_texts[] = stripslashes_deep($row->default_value); |
|
| 4399 | 4399 | } |
| 4400 | 4400 | |
| 4401 | - if ( ! empty( $row->option_values ) ) {
|
|
| 4402 | - $option_values = geodir_string_values_to_options( stripslashes_deep( $row->option_values ) ); |
|
| 4401 | + if (!empty($row->option_values)) {
|
|
| 4402 | + $option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values)); |
|
| 4403 | 4403 | |
| 4404 | - if ( ! empty( $option_values ) ) {
|
|
| 4405 | - foreach ( $option_values as $option_value ) {
|
|
| 4406 | - if ( ! empty( $option_value['label'] ) ) {
|
|
| 4404 | + if (!empty($option_values)) {
|
|
| 4405 | + foreach ($option_values as $option_value) {
|
|
| 4406 | + if (!empty($option_value['label'])) {
|
|
| 4407 | 4407 | $translation_texts[] = $option_value['label']; |
| 4408 | 4408 | } |
| 4409 | 4409 | } |
@@ -4413,56 +4413,56 @@ discard block |
||
| 4413 | 4413 | } |
| 4414 | 4414 | |
| 4415 | 4415 | // Custom sorting fields table |
| 4416 | - $sql = "SELECT site_title, asc_title, desc_title FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE; |
|
| 4417 | - $rows = $wpdb->get_results( $sql ); |
|
| 4416 | + $sql = "SELECT site_title, asc_title, desc_title FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE; |
|
| 4417 | + $rows = $wpdb->get_results($sql); |
|
| 4418 | 4418 | |
| 4419 | - if ( ! empty( $rows ) ) {
|
|
| 4420 | - foreach ( $rows as $row ) {
|
|
| 4421 | - if ( ! empty( $row->site_title ) ) {
|
|
| 4422 | - $translation_texts[] = stripslashes_deep( $row->site_title ); |
|
| 4419 | + if (!empty($rows)) {
|
|
| 4420 | + foreach ($rows as $row) {
|
|
| 4421 | + if (!empty($row->site_title)) {
|
|
| 4422 | + $translation_texts[] = stripslashes_deep($row->site_title); |
|
| 4423 | 4423 | } |
| 4424 | 4424 | |
| 4425 | - if ( ! empty( $row->asc_title ) ) {
|
|
| 4426 | - $translation_texts[] = stripslashes_deep( $row->asc_title ); |
|
| 4425 | + if (!empty($row->asc_title)) {
|
|
| 4426 | + $translation_texts[] = stripslashes_deep($row->asc_title); |
|
| 4427 | 4427 | } |
| 4428 | 4428 | |
| 4429 | - if ( ! empty( $row->desc_title ) ) {
|
|
| 4430 | - $translation_texts[] = stripslashes_deep( $row->desc_title ); |
|
| 4429 | + if (!empty($row->desc_title)) {
|
|
| 4430 | + $translation_texts[] = stripslashes_deep($row->desc_title); |
|
| 4431 | 4431 | } |
| 4432 | 4432 | } |
| 4433 | 4433 | } |
| 4434 | 4434 | |
| 4435 | 4435 | // Advance search filter fields table |
| 4436 | - if ( defined( 'GEODIR_ADVANCE_SEARCH_TABLE' ) ) {
|
|
| 4437 | - $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM " . GEODIR_ADVANCE_SEARCH_TABLE; |
|
| 4438 | - $rows = $wpdb->get_results( $sql ); |
|
| 4439 | - |
|
| 4440 | - if ( ! empty( $rows ) ) {
|
|
| 4441 | - foreach ( $rows as $row ) {
|
|
| 4442 | - if ( ! empty( $row->field_site_name ) ) {
|
|
| 4443 | - $translation_texts[] = stripslashes_deep( $row->field_site_name ); |
|
| 4436 | + if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {
|
|
| 4437 | + $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM ".GEODIR_ADVANCE_SEARCH_TABLE; |
|
| 4438 | + $rows = $wpdb->get_results($sql); |
|
| 4439 | + |
|
| 4440 | + if (!empty($rows)) {
|
|
| 4441 | + foreach ($rows as $row) {
|
|
| 4442 | + if (!empty($row->field_site_name)) {
|
|
| 4443 | + $translation_texts[] = stripslashes_deep($row->field_site_name); |
|
| 4444 | 4444 | } |
| 4445 | 4445 | |
| 4446 | - if ( ! empty( $row->front_search_title ) ) {
|
|
| 4447 | - $translation_texts[] = stripslashes_deep( $row->front_search_title ); |
|
| 4446 | + if (!empty($row->front_search_title)) {
|
|
| 4447 | + $translation_texts[] = stripslashes_deep($row->front_search_title); |
|
| 4448 | 4448 | } |
| 4449 | 4449 | |
| 4450 | - if ( ! empty( $row->first_search_text ) ) {
|
|
| 4451 | - $translation_texts[] = stripslashes_deep( $row->first_search_text ); |
|
| 4450 | + if (!empty($row->first_search_text)) {
|
|
| 4451 | + $translation_texts[] = stripslashes_deep($row->first_search_text); |
|
| 4452 | 4452 | } |
| 4453 | 4453 | |
| 4454 | - if ( ! empty( $row->last_search_text ) ) {
|
|
| 4455 | - $translation_texts[] = stripslashes_deep( $row->last_search_text ); |
|
| 4454 | + if (!empty($row->last_search_text)) {
|
|
| 4455 | + $translation_texts[] = stripslashes_deep($row->last_search_text); |
|
| 4456 | 4456 | } |
| 4457 | 4457 | |
| 4458 | - if ( ! empty( $row->field_desc ) ) {
|
|
| 4459 | - $translation_texts[] = stripslashes_deep( $row->field_desc ); |
|
| 4458 | + if (!empty($row->field_desc)) {
|
|
| 4459 | + $translation_texts[] = stripslashes_deep($row->field_desc); |
|
| 4460 | 4460 | } |
| 4461 | 4461 | } |
| 4462 | 4462 | } |
| 4463 | 4463 | } |
| 4464 | 4464 | |
| 4465 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; |
|
| 4465 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 4466 | 4466 | |
| 4467 | 4467 | return $translation_texts; |
| 4468 | 4468 | } |
@@ -4484,7 +4484,7 @@ discard block |
||
| 4484 | 4484 | * |
| 4485 | 4485 | * @param array $geodir_allowed_mime_types and file extensions. |
| 4486 | 4486 | */ |
| 4487 | - return apply_filters( 'geodir_allowed_mime_types', array( |
|
| 4487 | + return apply_filters('geodir_allowed_mime_types', array(
|
|
| 4488 | 4488 | 'Image' => array( // Image formats. |
| 4489 | 4489 | 'jpg' => 'image/jpeg', |
| 4490 | 4490 | 'jpe' => 'image/jpeg', |
@@ -4553,18 +4553,18 @@ discard block |
||
| 4553 | 4553 | * |
| 4554 | 4554 | * @return string User display name. |
| 4555 | 4555 | */ |
| 4556 | -function geodir_get_client_name( $user_id ) {
|
|
| 4556 | +function geodir_get_client_name($user_id) {
|
|
| 4557 | 4557 | $client_name = ''; |
| 4558 | 4558 | |
| 4559 | - $user_data = get_userdata( $user_id ); |
|
| 4559 | + $user_data = get_userdata($user_id); |
|
| 4560 | 4560 | |
| 4561 | - if ( ! empty( $user_data ) ) {
|
|
| 4562 | - if ( isset( $user_data->display_name ) && trim( $user_data->display_name ) != '' ) {
|
|
| 4563 | - $client_name = trim( $user_data->display_name ); |
|
| 4564 | - } else if ( isset( $user_data->user_nicename ) && trim( $user_data->user_nicename ) != '' ) {
|
|
| 4565 | - $client_name = trim( $user_data->user_nicename ); |
|
| 4561 | + if (!empty($user_data)) {
|
|
| 4562 | + if (isset($user_data->display_name) && trim($user_data->display_name) != '') {
|
|
| 4563 | + $client_name = trim($user_data->display_name); |
|
| 4564 | + } else if (isset($user_data->user_nicename) && trim($user_data->user_nicename) != '') {
|
|
| 4565 | + $client_name = trim($user_data->user_nicename); |
|
| 4566 | 4566 | } else {
|
| 4567 | - $client_name = trim( $user_data->user_login ); |
|
| 4567 | + $client_name = trim($user_data->user_login); |
|
| 4568 | 4568 | } |
| 4569 | 4569 | } |
| 4570 | 4570 | |
@@ -4572,17 +4572,17 @@ discard block |
||
| 4572 | 4572 | } |
| 4573 | 4573 | |
| 4574 | 4574 | |
| 4575 | -add_filter( 'wpseo_replacements', 'geodir_wpseo_replacements', 10, 1 ); |
|
| 4575 | +add_filter('wpseo_replacements', 'geodir_wpseo_replacements', 10, 1);
|
|
| 4576 | 4576 | /* |
| 4577 | 4577 | * Add location variables to wpseo replacements. |
| 4578 | 4578 | * |
| 4579 | 4579 | * @since 1.5.4 |
| 4580 | 4580 | */ |
| 4581 | -function geodir_wpseo_replacements( $vars ) {
|
|
| 4581 | +function geodir_wpseo_replacements($vars) {
|
|
| 4582 | 4582 | |
| 4583 | 4583 | // location variables |
| 4584 | 4584 | $gd_post_type = geodir_get_current_posttype(); |
| 4585 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 4585 | + $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 4586 | 4586 | /** |
| 4587 | 4587 | * Filter the title variables location variables array |
| 4588 | 4588 | * |
@@ -4592,7 +4592,7 @@ discard block |
||
| 4592 | 4592 | * @param array $location_array The array of location variables. |
| 4593 | 4593 | * @param array $vars The page title variables. |
| 4594 | 4594 | */ |
| 4595 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr_seo', $location_array, $vars ); |
|
| 4595 | + $location_array = apply_filters('geodir_filter_title_variables_location_arr_seo', $location_array, $vars);
|
|
| 4596 | 4596 | |
| 4597 | 4597 | |
| 4598 | 4598 | $location_replace_vars = geodir_location_replace_vars($location_array, NULL, ''); |
@@ -4607,13 +4607,13 @@ discard block |
||
| 4607 | 4607 | * @param string $vars The title with variables. |
| 4608 | 4608 | * @param array $location_array The array of location variables. |
| 4609 | 4609 | */ |
| 4610 | - return apply_filters( 'geodir_wpseo_replacements_vars', $vars, $location_array ); |
|
| 4610 | + return apply_filters('geodir_wpseo_replacements_vars', $vars, $location_array);
|
|
| 4611 | 4611 | } |
| 4612 | 4612 | |
| 4613 | 4613 | |
| 4614 | -add_filter( 'geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3 ); |
|
| 4615 | -add_filter( 'geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2 ); |
|
| 4616 | -add_filter( 'geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3 ); |
|
| 4614 | +add_filter('geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3);
|
|
| 4615 | +add_filter('geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2);
|
|
| 4616 | +add_filter('geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3);
|
|
| 4617 | 4617 | |
| 4618 | 4618 | /** |
| 4619 | 4619 | * Filter the title variables. |
@@ -4655,14 +4655,14 @@ discard block |
||
| 4655 | 4655 | * |
| 4656 | 4656 | * @return string Title after filtered variables. |
| 4657 | 4657 | */ |
| 4658 | -function geodir_filter_title_variables( $title, $gd_page, $sep = '' ) {
|
|
| 4658 | +function geodir_filter_title_variables($title, $gd_page, $sep = '') {
|
|
| 4659 | 4659 | global $wp, $post; |
| 4660 | 4660 | |
| 4661 | - if ( ! $gd_page || ! $title ) {
|
|
| 4661 | + if (!$gd_page || !$title) {
|
|
| 4662 | 4662 | return $title; // if no a GD page then bail. |
| 4663 | 4663 | } |
| 4664 | 4664 | |
| 4665 | - if ( $sep == '' ) {
|
|
| 4665 | + if ($sep == '') {
|
|
| 4666 | 4666 | /** |
| 4667 | 4667 | * Filter the page title separator. |
| 4668 | 4668 | * |
@@ -4671,100 +4671,100 @@ discard block |
||
| 4671 | 4671 | * |
| 4672 | 4672 | * @param string $sep The separator, default: `|`. |
| 4673 | 4673 | */ |
| 4674 | - $sep = apply_filters( 'geodir_page_title_separator', '|' ); |
|
| 4674 | + $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 4675 | 4675 | } |
| 4676 | 4676 | |
| 4677 | - if ( strpos( $title, '%%title%%' ) !== false ) {
|
|
| 4678 | - $title = str_replace( "%%title%%", $post->post_title, $title ); |
|
| 4677 | + if (strpos($title, '%%title%%') !== false) {
|
|
| 4678 | + $title = str_replace("%%title%%", $post->post_title, $title);
|
|
| 4679 | 4679 | } |
| 4680 | 4680 | |
| 4681 | - if ( strpos( $title, '%%sitename%%' ) !== false ) {
|
|
| 4682 | - $title = str_replace( "%%sitename%%", get_bloginfo( 'name' ), $title ); |
|
| 4681 | + if (strpos($title, '%%sitename%%') !== false) {
|
|
| 4682 | + $title = str_replace("%%sitename%%", get_bloginfo('name'), $title);
|
|
| 4683 | 4683 | } |
| 4684 | 4684 | |
| 4685 | - if ( strpos( $title, '%%sitedesc%%' ) !== false ) {
|
|
| 4686 | - $title = str_replace( "%%sitedesc%%", get_bloginfo( 'description' ), $title ); |
|
| 4685 | + if (strpos($title, '%%sitedesc%%') !== false) {
|
|
| 4686 | + $title = str_replace("%%sitedesc%%", get_bloginfo('description'), $title);
|
|
| 4687 | 4687 | } |
| 4688 | 4688 | |
| 4689 | - if ( strpos( $title, '%%excerpt%%' ) !== false ) {
|
|
| 4690 | - $title = str_replace( "%%excerpt%%", strip_tags( get_the_excerpt() ), $title ); |
|
| 4689 | + if (strpos($title, '%%excerpt%%') !== false) {
|
|
| 4690 | + $title = str_replace("%%excerpt%%", strip_tags(get_the_excerpt()), $title);
|
|
| 4691 | 4691 | } |
| 4692 | 4692 | |
| 4693 | - if ( $gd_page == 'search' || $gd_page == 'author' ) {
|
|
| 4694 | - $post_type = isset( $_REQUEST['stype'] ) ? sanitize_text_field( $_REQUEST['stype'] ) : ''; |
|
| 4695 | - } else if ( $gd_page == 'add-listing' ) {
|
|
| 4696 | - $post_type = ( isset( $_REQUEST['listing_type'] ) ) ? sanitize_text_field( $_REQUEST['listing_type'] ) : ''; |
|
| 4697 | - $post_type = ! $post_type && ! empty( $_REQUEST['pid'] ) ? get_post_type( (int) $_REQUEST['pid'] ) : $post_type; |
|
| 4698 | - } else if ( isset( $post->post_type ) && $post->post_type && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 4693 | + if ($gd_page == 'search' || $gd_page == 'author') {
|
|
| 4694 | + $post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : ''; |
|
| 4695 | + } else if ($gd_page == 'add-listing') {
|
|
| 4696 | + $post_type = (isset($_REQUEST['listing_type'])) ? sanitize_text_field($_REQUEST['listing_type']) : ''; |
|
| 4697 | + $post_type = !$post_type && !empty($_REQUEST['pid']) ? get_post_type((int) $_REQUEST['pid']) : $post_type; |
|
| 4698 | + } else if (isset($post->post_type) && $post->post_type && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 4699 | 4699 | $post_type = $post->post_type; |
| 4700 | 4700 | } else {
|
| 4701 | - $post_type = get_query_var( 'post_type' ); |
|
| 4701 | + $post_type = get_query_var('post_type');
|
|
| 4702 | 4702 | } |
| 4703 | 4703 | |
| 4704 | - if ( strpos( $title, '%%pt_single%%' ) !== false ) {
|
|
| 4704 | + if (strpos($title, '%%pt_single%%') !== false) {
|
|
| 4705 | 4705 | $singular_name = ''; |
| 4706 | - if ( $post_type && $singular_name = get_post_type_singular_label( $post_type ) ) {
|
|
| 4707 | - $singular_name = __( $singular_name, 'geodirectory' ); |
|
| 4706 | + if ($post_type && $singular_name = get_post_type_singular_label($post_type)) {
|
|
| 4707 | + $singular_name = __($singular_name, 'geodirectory'); |
|
| 4708 | 4708 | } |
| 4709 | 4709 | |
| 4710 | - $title = str_replace( "%%pt_single%%", $singular_name, $title ); |
|
| 4710 | + $title = str_replace("%%pt_single%%", $singular_name, $title);
|
|
| 4711 | 4711 | } |
| 4712 | 4712 | |
| 4713 | - if ( strpos( $title, '%%pt_plural%%' ) !== false ) {
|
|
| 4713 | + if (strpos($title, '%%pt_plural%%') !== false) {
|
|
| 4714 | 4714 | $plural_name = ''; |
| 4715 | - if ( $post_type && $plural_name = get_post_type_plural_label( $post_type ) ) {
|
|
| 4716 | - $plural_name = __( $plural_name, 'geodirectory' ); |
|
| 4715 | + if ($post_type && $plural_name = get_post_type_plural_label($post_type)) {
|
|
| 4716 | + $plural_name = __($plural_name, 'geodirectory'); |
|
| 4717 | 4717 | } |
| 4718 | 4718 | |
| 4719 | - $title = str_replace( "%%pt_plural%%", $plural_name, $title ); |
|
| 4719 | + $title = str_replace("%%pt_plural%%", $plural_name, $title);
|
|
| 4720 | 4720 | } |
| 4721 | 4721 | |
| 4722 | - if ( strpos( $title, '%%category%%' ) !== false ) {
|
|
| 4722 | + if (strpos($title, '%%category%%') !== false) {
|
|
| 4723 | 4723 | $cat_name = ''; |
| 4724 | 4724 | |
| 4725 | - if ( $gd_page == 'detail' ) {
|
|
| 4726 | - if ( $post->default_category ) {
|
|
| 4727 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); |
|
| 4728 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; |
|
| 4725 | + if ($gd_page == 'detail') {
|
|
| 4726 | + if ($post->default_category) {
|
|
| 4727 | + $cat = get_term($post->default_category, $post->post_type.'category'); |
|
| 4728 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; |
|
| 4729 | 4729 | } |
| 4730 | - } else if ( $gd_page == 'listing' ) {
|
|
| 4730 | + } else if ($gd_page == 'listing') {
|
|
| 4731 | 4731 | $queried_object = get_queried_object(); |
| 4732 | - if ( isset( $queried_object->name ) ) {
|
|
| 4732 | + if (isset($queried_object->name)) {
|
|
| 4733 | 4733 | $cat_name = $queried_object->name; |
| 4734 | 4734 | } |
| 4735 | 4735 | } |
| 4736 | - $title = str_replace( "%%category%%", $cat_name, $title ); |
|
| 4736 | + $title = str_replace("%%category%%", $cat_name, $title);
|
|
| 4737 | 4737 | } |
| 4738 | 4738 | |
| 4739 | - if ( strpos( $title, '%%tag%%' ) !== false ) {
|
|
| 4739 | + if (strpos($title, '%%tag%%') !== false) {
|
|
| 4740 | 4740 | $cat_name = ''; |
| 4741 | 4741 | |
| 4742 | - if ( $gd_page == 'detail' ) {
|
|
| 4743 | - if ( $post->default_category ) {
|
|
| 4744 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); |
|
| 4745 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; |
|
| 4742 | + if ($gd_page == 'detail') {
|
|
| 4743 | + if ($post->default_category) {
|
|
| 4744 | + $cat = get_term($post->default_category, $post->post_type.'category'); |
|
| 4745 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; |
|
| 4746 | 4746 | } |
| 4747 | - } else if ( $gd_page == 'listing' ) {
|
|
| 4747 | + } else if ($gd_page == 'listing') {
|
|
| 4748 | 4748 | $queried_object = get_queried_object(); |
| 4749 | - if ( isset( $queried_object->name ) ) {
|
|
| 4749 | + if (isset($queried_object->name)) {
|
|
| 4750 | 4750 | $cat_name = $queried_object->name; |
| 4751 | 4751 | } |
| 4752 | 4752 | } |
| 4753 | - $title = str_replace( "%%tag%%", $cat_name, $title ); |
|
| 4753 | + $title = str_replace("%%tag%%", $cat_name, $title);
|
|
| 4754 | 4754 | } |
| 4755 | 4755 | |
| 4756 | - if ( strpos( $title, '%%id%%' ) !== false ) {
|
|
| 4757 | - $ID = ( isset( $post->ID ) ) ? $post->ID : ''; |
|
| 4758 | - $title = str_replace( "%%id%%", $ID, $title ); |
|
| 4756 | + if (strpos($title, '%%id%%') !== false) {
|
|
| 4757 | + $ID = (isset($post->ID)) ? $post->ID : ''; |
|
| 4758 | + $title = str_replace("%%id%%", $ID, $title);
|
|
| 4759 | 4759 | } |
| 4760 | 4760 | |
| 4761 | - if ( strpos( $title, '%%sep%%' ) !== false ) {
|
|
| 4762 | - $title = str_replace( "%%sep%%", $sep, $title ); |
|
| 4761 | + if (strpos($title, '%%sep%%') !== false) {
|
|
| 4762 | + $title = str_replace("%%sep%%", $sep, $title);
|
|
| 4763 | 4763 | } |
| 4764 | 4764 | |
| 4765 | 4765 | // location variables |
| 4766 | 4766 | $gd_post_type = geodir_get_current_posttype(); |
| 4767 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 4767 | + $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 4768 | 4768 | |
| 4769 | 4769 | /** |
| 4770 | 4770 | * Filter the title variables location variables array |
@@ -4777,20 +4777,20 @@ discard block |
||
| 4777 | 4777 | * @param string $gd_page The page being filtered. |
| 4778 | 4778 | * @param string $sep The separator, default: `|`. |
| 4779 | 4779 | */ |
| 4780 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep ); |
|
| 4780 | + $location_array = apply_filters('geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep);
|
|
| 4781 | 4781 | |
| 4782 | - if ( $gd_page == 'location' && get_query_var( 'gd_country_full' ) ) {
|
|
| 4783 | - if ( get_query_var( 'gd_country_full' ) ) {
|
|
| 4784 | - $location_array['gd_country'] = get_query_var( 'gd_country_full' ); |
|
| 4782 | + if ($gd_page == 'location' && get_query_var('gd_country_full')) {
|
|
| 4783 | + if (get_query_var('gd_country_full')) {
|
|
| 4784 | + $location_array['gd_country'] = get_query_var('gd_country_full');
|
|
| 4785 | 4785 | } |
| 4786 | - if ( get_query_var( 'gd_region_full' ) ) {
|
|
| 4787 | - $location_array['gd_region'] = get_query_var( 'gd_region_full' ); |
|
| 4786 | + if (get_query_var('gd_region_full')) {
|
|
| 4787 | + $location_array['gd_region'] = get_query_var('gd_region_full');
|
|
| 4788 | 4788 | } |
| 4789 | - if ( get_query_var( 'gd_city_full' ) ) {
|
|
| 4790 | - $location_array['gd_city'] = get_query_var( 'gd_city_full' ); |
|
| 4789 | + if (get_query_var('gd_city_full')) {
|
|
| 4790 | + $location_array['gd_city'] = get_query_var('gd_city_full');
|
|
| 4791 | 4791 | } |
| 4792 | - if ( get_query_var( 'gd_neighbourhood_full' ) ) {
|
|
| 4793 | - $location_array['gd_neighbourhood'] = get_query_var( 'gd_neighbourhood_full' ); |
|
| 4792 | + if (get_query_var('gd_neighbourhood_full')) {
|
|
| 4793 | + $location_array['gd_neighbourhood'] = get_query_var('gd_neighbourhood_full');
|
|
| 4794 | 4794 | } |
| 4795 | 4795 | } |
| 4796 | 4796 | |
@@ -4805,57 +4805,57 @@ discard block |
||
| 4805 | 4805 | * @param string $gd_page The page being filtered. |
| 4806 | 4806 | * @param string $sep The separator, default: `|`. |
| 4807 | 4807 | */ |
| 4808 | - $title = apply_filters( 'geodir_replace_location_variables', $title, $location_array, $gd_page, $sep ); |
|
| 4808 | + $title = apply_filters('geodir_replace_location_variables', $title, $location_array, $gd_page, $sep);
|
|
| 4809 | 4809 | |
| 4810 | - if ( strpos( $title, '%%search_term%%' ) !== false ) {
|
|
| 4810 | + if (strpos($title, '%%search_term%%') !== false) {
|
|
| 4811 | 4811 | $search_term = ''; |
| 4812 | - if ( isset( $_REQUEST['s'] ) ) {
|
|
| 4813 | - $search_term = esc_attr( $_REQUEST['s'] ); |
|
| 4812 | + if (isset($_REQUEST['s'])) {
|
|
| 4813 | + $search_term = esc_attr($_REQUEST['s']); |
|
| 4814 | 4814 | } |
| 4815 | - $title = str_replace( "%%search_term%%", $search_term, $title ); |
|
| 4815 | + $title = str_replace("%%search_term%%", $search_term, $title);
|
|
| 4816 | 4816 | } |
| 4817 | 4817 | |
| 4818 | - if ( strpos( $title, '%%search_near%%' ) !== false ) {
|
|
| 4818 | + if (strpos($title, '%%search_near%%') !== false) {
|
|
| 4819 | 4819 | $search_term = ''; |
| 4820 | - if ( isset( $_REQUEST['snear'] ) ) {
|
|
| 4821 | - $search_term = esc_attr( $_REQUEST['snear'] ); |
|
| 4820 | + if (isset($_REQUEST['snear'])) {
|
|
| 4821 | + $search_term = esc_attr($_REQUEST['snear']); |
|
| 4822 | 4822 | } |
| 4823 | - $title = str_replace( "%%search_near%%", $search_term, $title ); |
|
| 4823 | + $title = str_replace("%%search_near%%", $search_term, $title);
|
|
| 4824 | 4824 | } |
| 4825 | 4825 | |
| 4826 | - if ( strpos( $title, '%%name%%' ) !== false ) {
|
|
| 4827 | - if ( is_author() ) {
|
|
| 4828 | - $curauth = ( get_query_var( 'author_name' ) ) ? get_user_by( 'slug', get_query_var( 'author_name' ) ) : get_userdata( get_query_var( 'author' ) ); |
|
| 4826 | + if (strpos($title, '%%name%%') !== false) {
|
|
| 4827 | + if (is_author()) {
|
|
| 4828 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 4829 | 4829 | $author_name = $curauth->display_name; |
| 4830 | 4830 | } else {
|
| 4831 | 4831 | $author_name = get_the_author(); |
| 4832 | 4832 | } |
| 4833 | - if ( ! $author_name || $author_name === '' ) {
|
|
| 4833 | + if (!$author_name || $author_name === '') {
|
|
| 4834 | 4834 | $queried_object = get_queried_object(); |
| 4835 | 4835 | |
| 4836 | - if ( isset( $queried_object->data->user_nicename ) ) {
|
|
| 4836 | + if (isset($queried_object->data->user_nicename)) {
|
|
| 4837 | 4837 | $author_name = $queried_object->data->display_name; |
| 4838 | 4838 | } |
| 4839 | 4839 | } |
| 4840 | - $title = str_replace( "%%name%%", $author_name, $title ); |
|
| 4840 | + $title = str_replace("%%name%%", $author_name, $title);
|
|
| 4841 | 4841 | } |
| 4842 | 4842 | |
| 4843 | - if ( strpos( $title, '%%page%%' ) !== false ) {
|
|
| 4844 | - $page = geodir_title_meta_page( $sep ); |
|
| 4845 | - $title = str_replace( "%%page%%", $page, $title ); |
|
| 4843 | + if (strpos($title, '%%page%%') !== false) {
|
|
| 4844 | + $page = geodir_title_meta_page($sep); |
|
| 4845 | + $title = str_replace("%%page%%", $page, $title);
|
|
| 4846 | 4846 | } |
| 4847 | - if ( strpos( $title, '%%pagenumber%%' ) !== false ) {
|
|
| 4847 | + if (strpos($title, '%%pagenumber%%') !== false) {
|
|
| 4848 | 4848 | $pagenumber = geodir_title_meta_pagenumber(); |
| 4849 | - $title = str_replace( "%%pagenumber%%", $pagenumber, $title ); |
|
| 4849 | + $title = str_replace("%%pagenumber%%", $pagenumber, $title);
|
|
| 4850 | 4850 | } |
| 4851 | - if ( strpos( $title, '%%pagetotal%%' ) !== false ) {
|
|
| 4851 | + if (strpos($title, '%%pagetotal%%') !== false) {
|
|
| 4852 | 4852 | $pagetotal = geodir_title_meta_pagetotal(); |
| 4853 | - $title = str_replace( "%%pagetotal%%", $pagetotal, $title ); |
|
| 4853 | + $title = str_replace("%%pagetotal%%", $pagetotal, $title);
|
|
| 4854 | 4854 | } |
| 4855 | 4855 | |
| 4856 | - $title = wptexturize( $title ); |
|
| 4857 | - $title = convert_chars( $title ); |
|
| 4858 | - $title = esc_html( $title ); |
|
| 4856 | + $title = wptexturize($title); |
|
| 4857 | + $title = convert_chars($title); |
|
| 4858 | + $title = esc_html($title); |
|
| 4859 | 4859 | |
| 4860 | 4860 | /** |
| 4861 | 4861 | * Filter the title variables after standard ones have been filtered. |
@@ -4869,7 +4869,7 @@ discard block |
||
| 4869 | 4869 | * @param string $sep The separator, default: `|`. |
| 4870 | 4870 | */ |
| 4871 | 4871 | |
| 4872 | - return apply_filters( 'geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep ); |
|
| 4872 | + return apply_filters('geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep);
|
|
| 4873 | 4873 | } |
| 4874 | 4874 | |
| 4875 | 4875 | /** |
@@ -4882,82 +4882,82 @@ discard block |
||
| 4882 | 4882 | * |
| 4883 | 4883 | * @return array Translation texts. |
| 4884 | 4884 | */ |
| 4885 | -function geodir_load_cpt_text_translation( $translation_texts = array() ) {
|
|
| 4886 | - $gd_post_types = geodir_get_posttypes( 'array' ); |
|
| 4885 | +function geodir_load_cpt_text_translation($translation_texts = array()) {
|
|
| 4886 | + $gd_post_types = geodir_get_posttypes('array');
|
|
| 4887 | 4887 | |
| 4888 | - if ( ! empty( $gd_post_types ) ) {
|
|
| 4889 | - foreach ( $gd_post_types as $post_type => $cpt_info ) {
|
|
| 4890 | - $labels = isset( $cpt_info['labels'] ) ? $cpt_info['labels'] : ''; |
|
| 4891 | - $description = isset( $cpt_info['description'] ) ? $cpt_info['description'] : ''; |
|
| 4892 | - $seo = isset( $cpt_info['seo'] ) ? $cpt_info['seo'] : ''; |
|
| 4888 | + if (!empty($gd_post_types)) {
|
|
| 4889 | + foreach ($gd_post_types as $post_type => $cpt_info) {
|
|
| 4890 | + $labels = isset($cpt_info['labels']) ? $cpt_info['labels'] : ''; |
|
| 4891 | + $description = isset($cpt_info['description']) ? $cpt_info['description'] : ''; |
|
| 4892 | + $seo = isset($cpt_info['seo']) ? $cpt_info['seo'] : ''; |
|
| 4893 | 4893 | |
| 4894 | - if ( ! empty( $labels ) ) {
|
|
| 4895 | - if ( $labels['name'] != '' && ! in_array( $labels['name'], $translation_texts ) ) {
|
|
| 4894 | + if (!empty($labels)) {
|
|
| 4895 | + if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts)) {
|
|
| 4896 | 4896 | $translation_texts[] = $labels['name']; |
| 4897 | 4897 | } |
| 4898 | - if ( $labels['singular_name'] != '' && ! in_array( $labels['singular_name'], $translation_texts ) ) {
|
|
| 4898 | + if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts)) {
|
|
| 4899 | 4899 | $translation_texts[] = $labels['singular_name']; |
| 4900 | 4900 | } |
| 4901 | - if ( $labels['add_new'] != '' && ! in_array( $labels['add_new'], $translation_texts ) ) {
|
|
| 4901 | + if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts)) {
|
|
| 4902 | 4902 | $translation_texts[] = $labels['add_new']; |
| 4903 | 4903 | } |
| 4904 | - if ( $labels['add_new_item'] != '' && ! in_array( $labels['add_new_item'], $translation_texts ) ) {
|
|
| 4904 | + if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts)) {
|
|
| 4905 | 4905 | $translation_texts[] = $labels['add_new_item']; |
| 4906 | 4906 | } |
| 4907 | - if ( $labels['edit_item'] != '' && ! in_array( $labels['edit_item'], $translation_texts ) ) {
|
|
| 4907 | + if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts)) {
|
|
| 4908 | 4908 | $translation_texts[] = $labels['edit_item']; |
| 4909 | 4909 | } |
| 4910 | - if ( $labels['new_item'] != '' && ! in_array( $labels['new_item'], $translation_texts ) ) {
|
|
| 4910 | + if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts)) {
|
|
| 4911 | 4911 | $translation_texts[] = $labels['new_item']; |
| 4912 | 4912 | } |
| 4913 | - if ( $labels['view_item'] != '' && ! in_array( $labels['view_item'], $translation_texts ) ) {
|
|
| 4913 | + if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts)) {
|
|
| 4914 | 4914 | $translation_texts[] = $labels['view_item']; |
| 4915 | 4915 | } |
| 4916 | - if ( $labels['search_items'] != '' && ! in_array( $labels['search_items'], $translation_texts ) ) {
|
|
| 4916 | + if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts)) {
|
|
| 4917 | 4917 | $translation_texts[] = $labels['search_items']; |
| 4918 | 4918 | } |
| 4919 | - if ( $labels['not_found'] != '' && ! in_array( $labels['not_found'], $translation_texts ) ) {
|
|
| 4919 | + if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts)) {
|
|
| 4920 | 4920 | $translation_texts[] = $labels['not_found']; |
| 4921 | 4921 | } |
| 4922 | - if ( $labels['not_found_in_trash'] != '' && ! in_array( $labels['not_found_in_trash'], $translation_texts ) ) {
|
|
| 4922 | + if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts)) {
|
|
| 4923 | 4923 | $translation_texts[] = $labels['not_found_in_trash']; |
| 4924 | 4924 | } |
| 4925 | - if ( isset( $labels['label_post_profile'] ) && $labels['label_post_profile'] != '' && ! in_array( $labels['label_post_profile'], $translation_texts ) ) {
|
|
| 4925 | + if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts)) {
|
|
| 4926 | 4926 | $translation_texts[] = $labels['label_post_profile']; |
| 4927 | 4927 | } |
| 4928 | - if ( isset( $labels['label_post_info'] ) && $labels['label_post_info'] != '' && ! in_array( $labels['label_post_info'], $translation_texts ) ) {
|
|
| 4928 | + if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts)) {
|
|
| 4929 | 4929 | $translation_texts[] = $labels['label_post_info']; |
| 4930 | 4930 | } |
| 4931 | - if ( isset( $labels['label_post_images'] ) && $labels['label_post_images'] != '' && ! in_array( $labels['label_post_images'], $translation_texts ) ) {
|
|
| 4931 | + if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts)) {
|
|
| 4932 | 4932 | $translation_texts[] = $labels['label_post_images']; |
| 4933 | 4933 | } |
| 4934 | - if ( isset( $labels['label_post_map'] ) && $labels['label_post_map'] != '' && ! in_array( $labels['label_post_map'], $translation_texts ) ) {
|
|
| 4934 | + if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts)) {
|
|
| 4935 | 4935 | $translation_texts[] = $labels['label_post_map']; |
| 4936 | 4936 | } |
| 4937 | - if ( isset( $labels['label_reviews'] ) && $labels['label_reviews'] != '' && ! in_array( $labels['label_reviews'], $translation_texts ) ) {
|
|
| 4937 | + if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts)) {
|
|
| 4938 | 4938 | $translation_texts[] = $labels['label_reviews']; |
| 4939 | 4939 | } |
| 4940 | - if ( isset( $labels['label_related_listing'] ) && $labels['label_related_listing'] != '' && ! in_array( $labels['label_related_listing'], $translation_texts ) ) {
|
|
| 4940 | + if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts)) {
|
|
| 4941 | 4941 | $translation_texts[] = $labels['label_related_listing']; |
| 4942 | 4942 | } |
| 4943 | 4943 | } |
| 4944 | 4944 | |
| 4945 | - if ( $description != '' && ! in_array( $description, $translation_texts ) ) {
|
|
| 4946 | - $translation_texts[] = normalize_whitespace( $description ); |
|
| 4945 | + if ($description != '' && !in_array($description, $translation_texts)) {
|
|
| 4946 | + $translation_texts[] = normalize_whitespace($description); |
|
| 4947 | 4947 | } |
| 4948 | 4948 | |
| 4949 | - if ( ! empty( $seo ) ) {
|
|
| 4950 | - if ( isset( $seo['meta_keyword'] ) && $seo['meta_keyword'] != '' && ! in_array( $seo['meta_keyword'], $translation_texts ) ) {
|
|
| 4951 | - $translation_texts[] = normalize_whitespace( $seo['meta_keyword'] ); |
|
| 4949 | + if (!empty($seo)) {
|
|
| 4950 | + if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts)) {
|
|
| 4951 | + $translation_texts[] = normalize_whitespace($seo['meta_keyword']); |
|
| 4952 | 4952 | } |
| 4953 | 4953 | |
| 4954 | - if ( isset( $seo['meta_description'] ) && $seo['meta_description'] != '' && ! in_array( $seo['meta_description'], $translation_texts ) ) {
|
|
| 4955 | - $translation_texts[] = normalize_whitespace( $seo['meta_description'] ); |
|
| 4954 | + if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts)) {
|
|
| 4955 | + $translation_texts[] = normalize_whitespace($seo['meta_description']); |
|
| 4956 | 4956 | } |
| 4957 | 4957 | } |
| 4958 | 4958 | } |
| 4959 | 4959 | } |
| 4960 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; |
|
| 4960 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 4961 | 4961 | |
| 4962 | 4962 | return $translation_texts; |
| 4963 | 4963 | } |
@@ -4972,27 +4972,27 @@ discard block |
||
| 4972 | 4972 | * |
| 4973 | 4973 | * @return array Location terms. |
| 4974 | 4974 | */ |
| 4975 | -function geodir_remove_location_terms( $location_terms = array() ) {
|
|
| 4976 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; |
|
| 4975 | +function geodir_remove_location_terms($location_terms = array()) {
|
|
| 4976 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 4977 | 4977 | |
| 4978 | - if ( ! empty( $location_terms ) && $location_manager ) {
|
|
| 4979 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); |
|
| 4980 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); |
|
| 4978 | + if (!empty($location_terms) && $location_manager) {
|
|
| 4979 | + $hide_country_part = get_option('geodir_location_hide_country_part');
|
|
| 4980 | + $hide_region_part = get_option('geodir_location_hide_region_part');
|
|
| 4981 | 4981 | |
| 4982 | - if ( $hide_region_part && $hide_country_part ) {
|
|
| 4983 | - if ( isset( $location_terms['gd_country'] ) ) {
|
|
| 4984 | - unset( $location_terms['gd_country'] ); |
|
| 4982 | + if ($hide_region_part && $hide_country_part) {
|
|
| 4983 | + if (isset($location_terms['gd_country'])) {
|
|
| 4984 | + unset($location_terms['gd_country']); |
|
| 4985 | 4985 | } |
| 4986 | - if ( isset( $location_terms['gd_region'] ) ) {
|
|
| 4987 | - unset( $location_terms['gd_region'] ); |
|
| 4986 | + if (isset($location_terms['gd_region'])) {
|
|
| 4987 | + unset($location_terms['gd_region']); |
|
| 4988 | 4988 | } |
| 4989 | - } else if ( $hide_region_part && ! $hide_country_part ) {
|
|
| 4990 | - if ( isset( $location_terms['gd_region'] ) ) {
|
|
| 4991 | - unset( $location_terms['gd_region'] ); |
|
| 4989 | + } else if ($hide_region_part && !$hide_country_part) {
|
|
| 4990 | + if (isset($location_terms['gd_region'])) {
|
|
| 4991 | + unset($location_terms['gd_region']); |
|
| 4992 | 4992 | } |
| 4993 | - } else if ( ! $hide_region_part && $hide_country_part ) {
|
|
| 4994 | - if ( isset( $location_terms['gd_country'] ) ) {
|
|
| 4995 | - unset( $location_terms['gd_country'] ); |
|
| 4993 | + } else if (!$hide_region_part && $hide_country_part) {
|
|
| 4994 | + if (isset($location_terms['gd_country'])) {
|
|
| 4995 | + unset($location_terms['gd_country']); |
|
| 4996 | 4996 | } |
| 4997 | 4997 | } |
| 4998 | 4998 | } |
@@ -5003,7 +5003,7 @@ discard block |
||
| 5003 | 5003 | * @since 1.6.22 |
| 5004 | 5004 | * @param array $location_terms The array of location terms. |
| 5005 | 5005 | */ |
| 5006 | - return apply_filters('geodir_remove_location_terms',$location_terms);
|
|
| 5006 | + return apply_filters('geodir_remove_location_terms', $location_terms);
|
|
| 5007 | 5007 | } |
| 5008 | 5008 | |
| 5009 | 5009 | /** |
@@ -5019,40 +5019,40 @@ discard block |
||
| 5019 | 5019 | * @param WP_Post $post Post object. |
| 5020 | 5020 | * @param bool $update Whether this is an existing listing being updated or not. |
| 5021 | 5021 | */ |
| 5022 | -function geodir_on_wp_insert_post( $post_ID, $post, $update ) {
|
|
| 5022 | +function geodir_on_wp_insert_post($post_ID, $post, $update) {
|
|
| 5023 | 5023 | global $gd_notified_edited; |
| 5024 | 5024 | |
| 5025 | - if ( ! $update ) {
|
|
| 5025 | + if (!$update) {
|
|
| 5026 | 5026 | return; |
| 5027 | 5027 | } |
| 5028 | 5028 | |
| 5029 | - $action = isset( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action'] ) : ''; |
|
| 5030 | - $is_admin = is_admin() && ( ! defined( 'DOING_AJAX' ) || ( defined( 'DOING_AJAX' ) && ! DOING_AJAX ) ) ? true : false; |
|
| 5029 | + $action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : ''; |
|
| 5030 | + $is_admin = is_admin() && (!defined('DOING_AJAX') || (defined('DOING_AJAX') && !DOING_AJAX)) ? true : false;
|
|
| 5031 | 5031 | $inline_save = $action == 'inline-save' ? true : false; |
| 5032 | 5032 | |
| 5033 | - if ( empty( $post->post_type ) || $is_admin || $inline_save || ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) ) {
|
|
| 5033 | + if (empty($post->post_type) || $is_admin || $inline_save || (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)) {
|
|
| 5034 | 5034 | return; |
| 5035 | 5035 | } |
| 5036 | 5036 | |
| 5037 | - if ( $action != '' && in_array( $action, array( 'geodir_import_export' ) ) ) {
|
|
| 5037 | + if ($action != '' && in_array($action, array('geodir_import_export'))) {
|
|
| 5038 | 5038 | return; |
| 5039 | 5039 | } |
| 5040 | 5040 | |
| 5041 | 5041 | $user_id = (int) get_current_user_id(); |
| 5042 | 5042 | |
| 5043 | - if ( $user_id > 0 && get_option( 'geodir_notify_post_edited' ) && ! wp_is_post_revision( $post_ID ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 5044 | - $author_id = ! empty( $post->post_author ) ? $post->post_author : 0; |
|
| 5043 | + if ($user_id > 0 && get_option('geodir_notify_post_edited') && !wp_is_post_revision($post_ID) && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 5044 | + $author_id = !empty($post->post_author) ? $post->post_author : 0; |
|
| 5045 | 5045 | |
| 5046 | - if ( $user_id == $author_id && ! is_super_admin() && empty( $gd_notified_edited[$post_ID] ) ) {
|
|
| 5047 | - if ( !empty( $gd_notified_edited ) ) {
|
|
| 5046 | + if ($user_id == $author_id && !is_super_admin() && empty($gd_notified_edited[$post_ID])) {
|
|
| 5047 | + if (!empty($gd_notified_edited)) {
|
|
| 5048 | 5048 | $gd_notified_edited = array(); |
| 5049 | 5049 | } |
| 5050 | 5050 | $gd_notified_edited[$post_ID] = true; |
| 5051 | 5051 | |
| 5052 | - $from_email = get_option( 'site_email' ); |
|
| 5052 | + $from_email = get_option('site_email');
|
|
| 5053 | 5053 | $from_name = get_site_emailName(); |
| 5054 | - $to_email = get_option( 'admin_email' ); |
|
| 5055 | - $to_name = get_option( 'name' ); |
|
| 5054 | + $to_email = get_option('admin_email');
|
|
| 5055 | + $to_name = get_option('name');
|
|
| 5056 | 5056 | $message_type = 'listing_edited'; |
| 5057 | 5057 | |
| 5058 | 5058 | $notify_edited = true; |
@@ -5064,9 +5064,9 @@ discard block |
||
| 5064 | 5064 | * @param bool $notify_edited Notify on listing edited by author? |
| 5065 | 5065 | * @param object $post The current post object. |
| 5066 | 5066 | */ |
| 5067 | - $notify_edited = apply_filters( 'geodir_notify_on_listing_edited', $notify_edited, $post ); |
|
| 5067 | + $notify_edited = apply_filters('geodir_notify_on_listing_edited', $notify_edited, $post);
|
|
| 5068 | 5068 | |
| 5069 | - geodir_sendEmail( $from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID ); |
|
| 5069 | + geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); |
|
| 5070 | 5070 | } |
| 5071 | 5071 | } |
| 5072 | 5072 | } |
@@ -5081,14 +5081,14 @@ discard block |
||
| 5081 | 5081 | * |
| 5082 | 5082 | * @return string|null The current page start & end numbering. |
| 5083 | 5083 | */ |
| 5084 | -function geodir_title_meta_page( $sep ) {
|
|
| 5084 | +function geodir_title_meta_page($sep) {
|
|
| 5085 | 5085 | $replacement = null; |
| 5086 | 5086 | |
| 5087 | - $max = geodir_title_meta_pagenumbering( 'max' ); |
|
| 5088 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); |
|
| 5087 | + $max = geodir_title_meta_pagenumbering('max');
|
|
| 5088 | + $nr = geodir_title_meta_pagenumbering('nr');
|
|
| 5089 | 5089 | |
| 5090 | - if ( $max > 1 && $nr > 1 ) {
|
|
| 5091 | - $replacement = sprintf( $sep . ' ' . __( 'Page %1$d of %2$d', 'geodirectory' ), $nr, $max ); |
|
| 5090 | + if ($max > 1 && $nr > 1) {
|
|
| 5091 | + $replacement = sprintf($sep.' '.__('Page %1$d of %2$d', 'geodirectory'), $nr, $max);
|
|
| 5092 | 5092 | } |
| 5093 | 5093 | |
| 5094 | 5094 | return $replacement; |
@@ -5105,8 +5105,8 @@ discard block |
||
| 5105 | 5105 | function geodir_title_meta_pagenumber() {
|
| 5106 | 5106 | $replacement = null; |
| 5107 | 5107 | |
| 5108 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); |
|
| 5109 | - if ( isset( $nr ) && $nr > 0 ) {
|
|
| 5108 | + $nr = geodir_title_meta_pagenumbering('nr');
|
|
| 5109 | + if (isset($nr) && $nr > 0) {
|
|
| 5110 | 5110 | $replacement = (string) $nr; |
| 5111 | 5111 | } |
| 5112 | 5112 | |
@@ -5124,8 +5124,8 @@ discard block |
||
| 5124 | 5124 | function geodir_title_meta_pagetotal() {
|
| 5125 | 5125 | $replacement = null; |
| 5126 | 5126 | |
| 5127 | - $max = geodir_title_meta_pagenumbering( 'max' ); |
|
| 5128 | - if ( isset( $max ) && $max > 0 ) {
|
|
| 5127 | + $max = geodir_title_meta_pagenumbering('max');
|
|
| 5128 | + if (isset($max) && $max > 0) {
|
|
| 5129 | 5129 | $replacement = (string) $max; |
| 5130 | 5130 | } |
| 5131 | 5131 | |
@@ -5145,36 +5145,36 @@ discard block |
||
| 5145 | 5145 | * |
| 5146 | 5146 | * @return int|null The current page numbering. |
| 5147 | 5147 | */ |
| 5148 | -function geodir_title_meta_pagenumbering( $request = 'nr' ) {
|
|
| 5148 | +function geodir_title_meta_pagenumbering($request = 'nr') {
|
|
| 5149 | 5149 | global $wp_query, $post; |
| 5150 | 5150 | $max_num_pages = null; |
| 5151 | 5151 | $page_number = null; |
| 5152 | 5152 | |
| 5153 | 5153 | $max_num_pages = 1; |
| 5154 | 5154 | |
| 5155 | - if ( ! is_singular() ) {
|
|
| 5156 | - $page_number = get_query_var( 'paged' ); |
|
| 5157 | - if ( $page_number === 0 || $page_number === '' ) {
|
|
| 5155 | + if (!is_singular()) {
|
|
| 5156 | + $page_number = get_query_var('paged');
|
|
| 5157 | + if ($page_number === 0 || $page_number === '') {
|
|
| 5158 | 5158 | $page_number = 1; |
| 5159 | 5159 | } |
| 5160 | 5160 | |
| 5161 | - if ( isset( $wp_query->max_num_pages ) && ( $wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0 ) ) {
|
|
| 5161 | + if (isset($wp_query->max_num_pages) && ($wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0)) {
|
|
| 5162 | 5162 | $max_num_pages = $wp_query->max_num_pages; |
| 5163 | 5163 | } |
| 5164 | 5164 | } else {
|
| 5165 | - $page_number = get_query_var( 'page' ); |
|
| 5166 | - if ( $page_number === 0 || $page_number === '' ) {
|
|
| 5165 | + $page_number = get_query_var('page');
|
|
| 5166 | + if ($page_number === 0 || $page_number === '') {
|
|
| 5167 | 5167 | $page_number = 1; |
| 5168 | 5168 | } |
| 5169 | 5169 | |
| 5170 | - if ( isset( $post->post_content ) ) {
|
|
| 5171 | - $max_num_pages = ( substr_count( $post->post_content, '<!--nextpage-->' ) + 1 ); |
|
| 5170 | + if (isset($post->post_content)) {
|
|
| 5171 | + $max_num_pages = (substr_count($post->post_content, '<!--nextpage-->') + 1); |
|
| 5172 | 5172 | } |
| 5173 | 5173 | } |
| 5174 | 5174 | |
| 5175 | 5175 | $return = null; |
| 5176 | 5176 | |
| 5177 | - switch ( $request ) {
|
|
| 5177 | + switch ($request) {
|
|
| 5178 | 5178 | case 'nr': |
| 5179 | 5179 | $return = $page_number; |
| 5180 | 5180 | break; |
@@ -5195,14 +5195,14 @@ discard block |
||
| 5195 | 5195 | * |
| 5196 | 5196 | * @return array Terms. |
| 5197 | 5197 | */ |
| 5198 | -function geodir_filter_empty_terms( $terms ) {
|
|
| 5199 | - if ( empty( $terms ) ) {
|
|
| 5198 | +function geodir_filter_empty_terms($terms) {
|
|
| 5199 | + if (empty($terms)) {
|
|
| 5200 | 5200 | return $terms; |
| 5201 | 5201 | } |
| 5202 | 5202 | |
| 5203 | 5203 | $return = array(); |
| 5204 | - foreach ( $terms as $term ) {
|
|
| 5205 | - if ( isset( $term->count ) && $term->count > 0 ) {
|
|
| 5204 | + foreach ($terms as $term) {
|
|
| 5205 | + if (isset($term->count) && $term->count > 0) {
|
|
| 5206 | 5206 | $return[] = $term; |
| 5207 | 5207 | } else {
|
| 5208 | 5208 | /** |
@@ -5213,7 +5213,7 @@ discard block |
||
| 5213 | 5213 | * @param array $return The array of terms to return. |
| 5214 | 5214 | * @param object $term The term object. |
| 5215 | 5215 | */ |
| 5216 | - $return = apply_filters( 'geodir_filter_empty_terms_filter', $return, $term ); |
|
| 5216 | + $return = apply_filters('geodir_filter_empty_terms_filter', $return, $term);
|
|
| 5217 | 5217 | } |
| 5218 | 5218 | } |
| 5219 | 5219 | |
@@ -5230,15 +5230,15 @@ discard block |
||
| 5230 | 5230 | * |
| 5231 | 5231 | * @return array |
| 5232 | 5232 | */ |
| 5233 | -function geodir_remove_hentry( $class ) {
|
|
| 5234 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 5235 | - $class = array_diff( $class, array( 'hentry' ) ); |
|
| 5233 | +function geodir_remove_hentry($class) {
|
|
| 5234 | + if (geodir_is_page('detail')) {
|
|
| 5235 | + $class = array_diff($class, array('hentry'));
|
|
| 5236 | 5236 | } |
| 5237 | 5237 | |
| 5238 | 5238 | return $class; |
| 5239 | 5239 | } |
| 5240 | 5240 | |
| 5241 | -add_filter( 'post_class', 'geodir_remove_hentry' ); |
|
| 5241 | +add_filter('post_class', 'geodir_remove_hentry');
|
|
| 5242 | 5242 | |
| 5243 | 5243 | /** |
| 5244 | 5244 | * Registers a individual text string for WPML translation. |
@@ -5250,8 +5250,8 @@ discard block |
||
| 5250 | 5250 | * @param string $domain The plugin domain. Default geodirectory. |
| 5251 | 5251 | * @param string $name The name of the string which helps to know what's being translated. |
| 5252 | 5252 | */ |
| 5253 | -function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {
|
|
| 5254 | - do_action( 'wpml_register_single_string', $domain, $name, $string ); |
|
| 5253 | +function geodir_wpml_register_string($string, $domain = 'geodirectory', $name = '') {
|
|
| 5254 | + do_action('wpml_register_single_string', $domain, $name, $string);
|
|
| 5255 | 5255 | } |
| 5256 | 5256 | |
| 5257 | 5257 | /** |
@@ -5266,6 +5266,6 @@ discard block |
||
| 5266 | 5266 | * @param string $language_code Return the translation in this language. Default is NULL which returns the current language. |
| 5267 | 5267 | * @return string The translated string. |
| 5268 | 5268 | */ |
| 5269 | -function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {
|
|
| 5270 | - return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code ); |
|
| 5269 | +function geodir_wpml_translate_string($string, $domain = 'geodirectory', $name = '', $language_code = NULL) {
|
|
| 5270 | + return apply_filters('wpml_translate_single_string', $string, $domain, $name, $language_code);
|
|
| 5271 | 5271 | } |
@@ -39,21 +39,21 @@ discard block |
||
| 39 | 39 | $is_detail_page = false; |
| 40 | 40 | $geodir_map_name = geodir_map_name(); |
| 41 | 41 | |
| 42 | - if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
|
|
| 42 | + if ((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview'))) {
|
|
| 43 | 43 | $is_detail_page = true; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | wp_enqueue_script('jquery');
|
| 47 | 47 | |
| 48 | - wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 48 | + wp_register_script('geodirectory-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 49 | 49 | wp_enqueue_script('geodirectory-script');
|
| 50 | 50 | |
| 51 | 51 | $geodir_vars_data = array( |
| 52 | 52 | 'siteurl' => get_option('siteurl'),
|
| 53 | 53 | 'geodir_plugin_url' => geodir_plugin_url(), |
| 54 | - 'geodir_lazy_load' => get_option('geodir_lazy_load',1),
|
|
| 54 | + 'geodir_lazy_load' => get_option('geodir_lazy_load', 1),
|
|
| 55 | 55 | 'geodir_ajax_url' => geodir_get_ajax_url(), |
| 56 | - 'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
|
|
| 56 | + 'geodir_gd_modal' => (int) get_option('geodir_disable_gb_modal'),
|
|
| 57 | 57 | 'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue |
| 58 | 58 | ); |
| 59 | 59 | |
@@ -74,24 +74,24 @@ discard block |
||
| 74 | 74 | * |
| 75 | 75 | * } |
| 76 | 76 | */ |
| 77 | - $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
|
|
| 77 | + $geodir_vars_data = apply_filters('geodir_vars_data', $geodir_vars_data);
|
|
| 78 | 78 | |
| 79 | 79 | wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
|
| 80 | 80 | |
| 81 | - wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 82 | - if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
|
|
| 81 | + wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 82 | + if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-flexslider-js'); }
|
|
| 83 | 83 | |
| 84 | - wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 84 | + wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url().'/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 85 | 85 | wp_enqueue_script('geodirectory-lightbox-jquery');
|
| 86 | 86 | |
| 87 | - wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 87 | + wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url().'/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 88 | 88 | if ($is_detail_page) {
|
| 89 | 89 | wp_enqueue_script('geodirectory-jquery-simplemodal');
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | if (in_array($geodir_map_name, array('auto', 'google'))) {
|
| 93 | - $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 94 | - $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 93 | + $map_lang = "&language=".geodir_get_map_default_language(); |
|
| 94 | + $map_key = "&key=".geodir_get_map_api_key(); |
|
| 95 | 95 | /** |
| 96 | 96 | * Filter the variables that are added to the end of the google maps script call. |
| 97 | 97 | * |
@@ -101,55 +101,55 @@ discard block |
||
| 101 | 101 | * @param string $var The string to filter, default is empty string. |
| 102 | 102 | */ |
| 103 | 103 | $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
| 104 | - wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
|
|
| 104 | + wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);
|
|
| 105 | 105 | |
| 106 | 106 | // Overlapping Marker Spiderfier |
| 107 | - wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 107 | + wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 108 | 108 | wp_enqueue_script('geodirectory-g-overlappingmarker-script');
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | if ($geodir_map_name == 'osm') {
|
| 112 | 112 | // Leaflet OpenStreetMap |
| 113 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 113 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 114 | 114 | wp_enqueue_style('geodirectory-leaflet-style');
|
| 115 | 115 | |
| 116 | - wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 116 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 117 | 117 | wp_enqueue_script('geodirectory-leaflet-script');
|
| 118 | 118 | |
| 119 | - wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 119 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 120 | 120 | wp_enqueue_script('geodirectory-leaflet-geo-script');
|
| 121 | 121 | |
| 122 | 122 | if ($is_detail_page) {
|
| 123 | - wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
|
|
| 123 | + wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
|
|
| 124 | 124 | wp_enqueue_style('geodirectory-leaflet-routing-style');
|
| 125 | 125 | |
| 126 | - wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 126 | + wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 127 | 127 | wp_enqueue_script('geodirectory-leaflet-routing-script');
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | // Overlapping Marker Spiderfier Leaflet |
| 131 | - wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 131 | + wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 132 | 132 | wp_enqueue_script('geodirectory-o-overlappingmarker-script');
|
| 133 | 133 | } |
| 134 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 134 | + wp_enqueue_script('jquery-ui-autocomplete');
|
|
| 135 | 135 | |
| 136 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 136 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 137 | 137 | wp_enqueue_script('geodirectory-goMap-script');
|
| 138 | 138 | |
| 139 | - wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 139 | + wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 140 | 140 | wp_enqueue_script('chosen');
|
| 141 | 141 | |
| 142 | - wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 142 | + wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 143 | 143 | wp_enqueue_script('geodirectory-choose-ajax');
|
| 144 | 144 | |
| 145 | - wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
|
|
| 145 | + wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
|
|
| 146 | 146 | |
| 147 | 147 | if (is_page() && geodir_is_page('add-listing')) {
|
| 148 | 148 | // SCRIPT FOR UPLOAD |
| 149 | 149 | wp_enqueue_script('plupload-all');
|
| 150 | 150 | wp_enqueue_script('jquery-ui-sortable');
|
| 151 | 151 | |
| 152 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
|
|
| 152 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 153 | 153 | wp_enqueue_script('geodirectory-plupload-script');
|
| 154 | 154 | // SCRIPT FOR UPLOAD END |
| 155 | 155 | |
@@ -196,27 +196,27 @@ discard block |
||
| 196 | 196 | |
| 197 | 197 | wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
| 198 | 198 | |
| 199 | - wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
|
|
| 199 | + wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation.min.js#asyncload');
|
|
| 200 | 200 | } // End if for add place page |
| 201 | 201 | |
| 202 | - wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 202 | + wp_register_script('geodirectory-post-custom-js', geodir_plugin_url().'/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 203 | 203 | if ($is_detail_page) {
|
| 204 | 204 | wp_enqueue_script('geodirectory-post-custom-js');
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | // font awesome rating script |
| 208 | 208 | if (get_option('geodir_reviewrating_enable_font_awesome')) {
|
| 209 | - wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 209 | + wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 210 | 210 | wp_enqueue_script('geodir-barrating-js');
|
| 211 | 211 | } else { // default rating script
|
| 212 | - wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 212 | + wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 213 | 213 | wp_enqueue_script('geodir-jRating-js');
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | - wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 216 | + wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 217 | 217 | wp_enqueue_script('geodir-on-document-load');
|
| 218 | 218 | |
| 219 | - wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 219 | + wp_register_script('google-geometa', geodir_plugin_url().'/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 220 | 220 | wp_enqueue_script('google-geometa');
|
| 221 | 221 | } |
| 222 | 222 | |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | */ |
| 232 | 232 | function geodir_header_scripts() |
| 233 | 233 | {
|
| 234 | - echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
|
|
| 234 | + echo '<style>'.stripslashes(get_option('geodir_coustem_css')).'</style>';
|
|
| 235 | 235 | echo stripslashes(get_option('geodir_header_scripts'));
|
| 236 | 236 | } |
| 237 | 237 | |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | */ |
| 246 | 246 | function geodir_google_analytics_tracking_code() |
| 247 | 247 | {
|
| 248 | - if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
|
|
| 248 | + if (get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')) {?>
|
|
| 249 | 249 | |
| 250 | 250 | <script> |
| 251 | 251 | (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
@@ -253,14 +253,14 @@ discard block |
||
| 253 | 253 | m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
| 254 | 254 | })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); |
| 255 | 255 | |
| 256 | - ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id'));?>', 'auto');
|
|
| 257 | - <?php if(get_option('geodir_ga_anonymize_ip')){echo "ga('set', 'anonymizeIP', true);";}?>
|
|
| 256 | + ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id')); ?>', 'auto');
|
|
| 257 | + <?php if (get_option('geodir_ga_anonymize_ip')) {echo "ga('set', 'anonymizeIP', true);"; }?>
|
|
| 258 | 258 | ga('send', 'pageview');
|
| 259 | 259 | |
| 260 | 260 | </script> |
| 261 | 261 | |
| 262 | 262 | <?php |
| 263 | - }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
|
|
| 263 | + }elseif (get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')) {
|
|
| 264 | 264 | echo stripslashes(get_option('geodir_ga_tracking_code'));
|
| 265 | 265 | } |
| 266 | 266 | } |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | * |
| 284 | 284 | * Flexbox wont wrap on ios for search form items |
| 285 | 285 | */ |
| 286 | - if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
|
|
| 286 | + if (!empty($_SERVER['HTTP_USER_AGENT']) && preg_match('/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'])) {
|
|
| 287 | 287 | echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
|
| 288 | 288 | } |
| 289 | 289 | } |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | */ |
| 300 | 300 | function geodir_add_async_forscript($url) |
| 301 | 301 | {
|
| 302 | - if (strpos($url, '#asyncload')===false) |
|
| 302 | + if (strpos($url, '#asyncload') === false) |
|
| 303 | 303 | return $url; |
| 304 | 304 | else if (is_admin()) |
| 305 | 305 | return str_replace('#asyncload', '', $url);
|
@@ -317,12 +317,12 @@ discard block |
||
| 317 | 317 | function geodir_templates_styles() |
| 318 | 318 | {
|
| 319 | 319 | |
| 320 | - wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 320 | + wp_register_style('geodir-core-scss', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 321 | 321 | wp_enqueue_style('geodir-core-scss');
|
| 322 | - wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
|
|
| 322 | + wp_register_style('geodir-core-scss-footer', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
|
|
| 323 | 323 | |
| 324 | - if(is_rtl()){
|
|
| 325 | - wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 324 | + if (is_rtl()) {
|
|
| 325 | + wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 326 | 326 | wp_enqueue_style('geodirectory-frontend-rtl-style');
|
| 327 | 327 | } |
| 328 | 328 | |
@@ -396,18 +396,18 @@ discard block |
||
| 396 | 396 | $term_id = get_queried_object_id(); |
| 397 | 397 | $taxonomy = get_query_var('taxonomy');
|
| 398 | 398 | |
| 399 | - if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
|
|
| 400 | - $term = get_term($term_id, $post_type . 'category'); |
|
| 399 | + if ($term_id && $post_type && get_query_var('taxonomy') == $post_type.'category') {
|
|
| 400 | + $term = get_term($term_id, $post_type.'category'); |
|
| 401 | 401 | } |
| 402 | 402 | } |
| 403 | 403 | |
| 404 | - if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
|
|
| 405 | - $taxonomy_search = $_REQUEST['s' . $post_type . 'category']; |
|
| 404 | + if (geodir_is_page('search') && !empty($_REQUEST['s'.$post_type.'category'])) {
|
|
| 405 | + $taxonomy_search = $_REQUEST['s'.$post_type.'category']; |
|
| 406 | 406 | |
| 407 | 407 | if (!is_array($taxonomy_search)) {
|
| 408 | - $term = get_term((int)$taxonomy_search, $post_type . 'category'); |
|
| 409 | - } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
|
|
| 410 | - $term = get_term((int)$taxonomy_search[0], $post_type . 'category'); |
|
| 408 | + $term = get_term((int) $taxonomy_search, $post_type.'category'); |
|
| 409 | + } else if (is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
|
|
| 410 | + $term = get_term((int) $taxonomy_search[0], $post_type.'category'); |
|
| 411 | 411 | } |
| 412 | 412 | } |
| 413 | 413 | |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | if ($max_page > 1 || $always_show) {
|
| 420 | 420 | // Extra pagination info |
| 421 | 421 | $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
|
| 422 | - $start_no = ( $paged - 1 ) * $posts_per_page + 1; |
|
| 422 | + $start_no = ($paged - 1) * $posts_per_page + 1; |
|
| 423 | 423 | $end_no = min($paged * $posts_per_page, $numposts); |
| 424 | 424 | |
| 425 | 425 | if ($geodir_pagination_more_info != '') {
|
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | } else {
|
| 430 | 430 | $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
|
| 431 | 431 | } |
| 432 | - $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>'; |
|
| 432 | + $pagination_info = '<div class="gd-pagination-details">'.$pegination_desc.'</div>'; |
|
| 433 | 433 | /** |
| 434 | 434 | * Adds an extra pagination info above/under pagination. |
| 435 | 435 | * |
@@ -445,15 +445,15 @@ discard block |
||
| 445 | 445 | $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
|
| 446 | 446 | |
| 447 | 447 | if ($geodir_pagination_more_info == 'before') {
|
| 448 | - $before = $before . $pagination_info; |
|
| 448 | + $before = $before.$pagination_info; |
|
| 449 | 449 | } else if ($geodir_pagination_more_info == 'after') {
|
| 450 | - $after = $pagination_info . $after; |
|
| 450 | + $after = $pagination_info.$after; |
|
| 451 | 451 | } |
| 452 | 452 | } |
| 453 | 453 | |
| 454 | 454 | echo "$before <div class='Navi gd-navi'>"; |
| 455 | 455 | if ($paged >= ($pages_to_show - 1)) {
|
| 456 | - echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link()) . '">«</a>';
|
|
| 456 | + echo '<a href="'.str_replace('&paged', '&paged', get_pagenum_link()).'">«</a>';
|
|
| 457 | 457 | } |
| 458 | 458 | previous_posts_link($prelabel); |
| 459 | 459 | for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
|
@@ -461,13 +461,13 @@ discard block |
||
| 461 | 461 | if ($i == $paged) {
|
| 462 | 462 | echo "<strong class='on'>$i</strong>"; |
| 463 | 463 | } else {
|
| 464 | - echo ' <a href="' . str_replace('&paged', '&paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
|
|
| 464 | + echo ' <a href="'.str_replace('&paged', '&paged', get_pagenum_link($i)).'">'.$i.'</a> ';
|
|
| 465 | 465 | } |
| 466 | 466 | } |
| 467 | 467 | } |
| 468 | 468 | next_posts_link($nxtlabel, $max_page); |
| 469 | 469 | if (($paged + $half_pages_to_show) < ($max_page)) {
|
| 470 | - echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link($max_page)) . '">»</a>';
|
|
| 470 | + echo '<a href="'.str_replace('&paged', '&paged', get_pagenum_link($max_page)).'">»</a>';
|
|
| 471 | 471 | } |
| 472 | 472 | echo "</div> $after"; |
| 473 | 473 | } |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | jQuery(function ($) {
|
| 506 | 506 | $("#distance_slider").slider({
|
| 507 | 507 | range: true, |
| 508 | - values: [0, <?php echo ($_REQUEST['sdist']!='') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>], |
|
| 508 | + values: [0, <?php echo ($_REQUEST['sdist'] != '') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>], |
|
| 509 | 509 | min: 0, |
| 510 | 510 | max: <?php echo $dist; ?>, |
| 511 | 511 | step: <?php echo $dist_dif; ?>, |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : ''; |
| 573 | 573 | ?> |
| 574 | 574 | <script type="text/javascript"> |
| 575 | - var default_location = '<?php echo $city ;?>'; |
|
| 575 | + var default_location = '<?php echo $city; ?>'; |
|
| 576 | 576 | var latlng; |
| 577 | 577 | var address; |
| 578 | 578 | var dist = 0; |
@@ -588,7 +588,7 @@ discard block |
||
| 588 | 588 | var $form = jQuery(this).closest('form');
|
| 589 | 589 | |
| 590 | 590 | if (jQuery("#sdist input[type='radio']:checked").length != 0) dist = jQuery("#sdist input[type='radio']:checked").val();
|
| 591 | - if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text;?>') jQuery('.search_text', $form).val(s);
|
|
| 591 | + if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text; ?>') jQuery('.search_text', $form).val(s);
|
|
| 592 | 592 | |
| 593 | 593 | // Disable location based search for disabled location post type. |
| 594 | 594 | if (jQuery('.search_by_post', $form).val() != '' && typeof gd_cpt_no_location == 'function') {
|
@@ -602,7 +602,7 @@ discard block |
||
| 602 | 602 | } |
| 603 | 603 | } |
| 604 | 604 | |
| 605 | - if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text;?>')) {
|
|
| 605 | + if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text; ?>')) {
|
|
| 606 | 606 | geodir_setsearch($form); |
| 607 | 607 | } else {
|
| 608 | 608 | jQuery(".snear", $form).val('');
|
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | }); |
| 621 | 621 | |
| 622 | 622 | function geodir_setsearch($form) {
|
| 623 | - if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text;?>')) jQuery(".snear", $form).val(default_location);
|
|
| 623 | + if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text; ?>')) jQuery(".snear", $form).val(default_location);
|
|
| 624 | 624 | geocodeAddress($form); |
| 625 | 625 | } |
| 626 | 626 | |
@@ -639,15 +639,15 @@ discard block |
||
| 639 | 639 | // Call the geocode function |
| 640 | 640 | Sgeocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null; |
| 641 | 641 | |
| 642 | - if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != '' ) || jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {
|
|
| 643 | - if (jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {
|
|
| 642 | + if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != '' ) || jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {
|
|
| 643 | + if (jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {
|
|
| 644 | 644 | jQuery(".snear", $form).val('');
|
| 645 | 645 | } |
| 646 | 646 | jQuery($form).submit(); |
| 647 | 647 | } else {
|
| 648 | 648 | var address = jQuery(".snear", $form).val();
|
| 649 | 649 | |
| 650 | - if (jQuery('.snear', $form).val() == '<?php echo $default_near_text;?>') {
|
|
| 650 | + if (jQuery('.snear', $form).val() == '<?php echo $default_near_text; ?>') {
|
|
| 651 | 651 | initialise2(); |
| 652 | 652 | } else {
|
| 653 | 653 | <?php |
@@ -660,12 +660,12 @@ discard block |
||
| 660 | 660 | $near_add2 = apply_filters('geodir_search_near_addition', '');
|
| 661 | 661 | ?> |
| 662 | 662 | if (window.gdMaps === 'google') {
|
| 663 | - Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},
|
|
| 663 | + Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", '.$near_add.'"' : '').$near_add2; ?>},
|
|
| 664 | 664 | function (results, status) {
|
| 665 | 665 | if (status == google.maps.GeocoderStatus.OK) {
|
| 666 | 666 | updateSearchPosition(results[0].geometry.location, $form); |
| 667 | 667 | } else {
|
| 668 | - alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory');?>" + status);
|
|
| 668 | + alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory'); ?>" + status);
|
|
| 669 | 669 | } |
| 670 | 670 | }); |
| 671 | 671 | } else if (window.gdMaps === 'osm') {
|
@@ -674,7 +674,7 @@ discard block |
||
| 674 | 674 | if (typeof geo !== 'undefined' && geo.lat && geo.lon) {
|
| 675 | 675 | updateSearchPosition(geo, $form); |
| 676 | 676 | } else {
|
| 677 | - alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory');?>");
|
|
| 677 | + alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory'); ?>");
|
|
| 678 | 678 | } |
| 679 | 679 | }); |
| 680 | 680 | } else {
|
@@ -720,19 +720,19 @@ discard block |
||
| 720 | 720 | var msg; |
| 721 | 721 | switch (err.code) {
|
| 722 | 722 | case err.UNKNOWN_ERROR: |
| 723 | - msg = "<?php _e('Unable to find your location','geodirectory');?>";
|
|
| 723 | + msg = "<?php _e('Unable to find your location', 'geodirectory'); ?>";
|
|
| 724 | 724 | break; |
| 725 | 725 | case err.PERMISSION_DENINED: |
| 726 | - msg = "<?php _e('Permission denied in finding your location','geodirectory');?>";
|
|
| 726 | + msg = "<?php _e('Permission denied in finding your location', 'geodirectory'); ?>";
|
|
| 727 | 727 | break; |
| 728 | 728 | case err.POSITION_UNAVAILABLE: |
| 729 | - msg = "<?php _e('Your location is currently unknown','geodirectory');?>";
|
|
| 729 | + msg = "<?php _e('Your location is currently unknown', 'geodirectory'); ?>";
|
|
| 730 | 730 | break; |
| 731 | 731 | case err.BREAK: |
| 732 | - msg = "<?php _e('Attempt to find location took too long','geodirectory');?>";
|
|
| 732 | + msg = "<?php _e('Attempt to find location took too long', 'geodirectory'); ?>";
|
|
| 733 | 733 | break; |
| 734 | 734 | default: |
| 735 | - msg = "<?php _e('Location detection not supported in browser','geodirectory');?>";
|
|
| 735 | + msg = "<?php _e('Location detection not supported in browser', 'geodirectory'); ?>";
|
|
| 736 | 736 | } |
| 737 | 737 | jQuery('#info').html(msg);
|
| 738 | 738 | } |
@@ -782,7 +782,7 @@ discard block |
||
| 782 | 782 | * @param object $post The post object. |
| 783 | 783 | * @param string $link The link to the post. |
| 784 | 784 | */ |
| 785 | - $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img"> </span></a>',$post,$link);
|
|
| 785 | + $return = apply_filters('geodir_featured_badge_on_image', '<a href="'.$link.'"><span class="geodir_featured_img"> </span></a>', $post, $link);
|
|
| 786 | 786 | break; |
| 787 | 787 | case 'new' : |
| 788 | 788 | /** |
@@ -792,7 +792,7 @@ discard block |
||
| 792 | 792 | * @param object $post The post object. |
| 793 | 793 | * @param string $link The link to the post. |
| 794 | 794 | */ |
| 795 | - $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing"> </span></a>',$post,$link);
|
|
| 795 | + $return = apply_filters('geodir_new_badge_on_image', '<a href="'.$link.'"><span class="geodir_new_listing"> </span></a>', $post, $link);
|
|
| 796 | 796 | break; |
| 797 | 797 | |
| 798 | 798 | } |
@@ -806,8 +806,8 @@ discard block |
||
| 806 | 806 | * @since 1.6.22 |
| 807 | 807 | */ |
| 808 | 808 | function geodir_fix_script_conflict() {
|
| 809 | - if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) {
|
|
| 810 | - wp_dequeue_script( 'flexslider' ); |
|
| 809 | + if (wp_script_is('flexslider', 'enqueued') && wp_script_is('geodirectory-jquery-flexslider-js', 'enqueued')) {
|
|
| 810 | + wp_dequeue_script('flexslider');
|
|
| 811 | 811 | } |
| 812 | 812 | } |
| 813 | -add_action( 'wp_enqueue_scripts', 'geodir_fix_script_conflict', 100 ); |
|
| 814 | 813 | \ No newline at end of file |
| 814 | +add_action('wp_enqueue_scripts', 'geodir_fix_script_conflict', 100); |
|
| 815 | 815 | \ No newline at end of file |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | function geodir_get_admin_option_form($current_tab) |
| 64 | 64 | {
|
| 65 | - geodir_admin_option_form($current_tab);// defined in admin template tags.php |
|
| 65 | + geodir_admin_option_form($current_tab); // defined in admin template tags.php |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | add_action('geodir_update_options_compatibility_settings', 'geodir_update_options_compatibility_settings');
|
| 71 | 71 | add_action('geodir_update_options_default_location_settings', 'geodir_location_form_submit');
|
| 72 | 72 | add_action('geodir_before_admin_panel', 'geodir_before_admin_panel'); // this function is in admin_functions.php
|
| 73 | -add_action('geodir_before_update_options', 'geodir_before_update_options',10,2);
|
|
| 73 | +add_action('geodir_before_update_options', 'geodir_before_update_options', 10, 2);
|
|
| 74 | 74 | |
| 75 | 75 | //add_action('geodir_before_admin_panel', 'geodir_autoinstall_admin_header');
|
| 76 | 76 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | // Disable VC editor for GD post types. |
| 101 | 101 | if (class_exists('Vc_Role_Access_Controller')) {
|
| 102 | - add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 ); |
|
| 102 | + add_filter('vc_role_access_with_post_types_can', '__return_false', 100);
|
|
| 103 | 103 | } |
| 104 | 104 | } |
| 105 | 105 | |
@@ -126,8 +126,8 @@ discard block |
||
| 126 | 126 | add_action('admin_panel_init', 'geodir_admin_list_columns', 2);
|
| 127 | 127 | |
| 128 | 128 | /* --- insert dummy post action ---*/ |
| 129 | -add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1,3);
|
|
| 130 | -add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1,3);
|
|
| 129 | +add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1, 3);
|
|
| 130 | +add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1, 3);
|
|
| 131 | 131 | |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -236,9 +236,9 @@ discard block |
||
| 236 | 236 | |
| 237 | 237 | // Filter-Payment-Manager |
| 238 | 238 | |
| 239 | - add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
|
|
| 239 | + add_meta_box('geodir_post_images', $post_typename.' '.__('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
|
|
| 240 | 240 | |
| 241 | - add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
|
|
| 241 | + add_meta_box('geodir_post_info', $post_typename.' '.__('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
|
|
| 242 | 242 | |
| 243 | 243 | // no need of this box as all fields moved to main information box |
| 244 | 244 | //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
|
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | |
| 248 | 248 | } |
| 249 | 249 | |
| 250 | -add_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 250 | +add_action('save_post', 'geodir_post_information_save', 10, 2);
|
|
| 251 | 251 | |
| 252 | 252 | |
| 253 | 253 | |
@@ -274,10 +274,10 @@ discard block |
||
| 274 | 274 | |
| 275 | 275 | $gd_taxonomy = geodir_get_taxonomies($geodir_post_type); |
| 276 | 276 | |
| 277 | - if(!empty($gd_taxonomy)) {
|
|
| 277 | + if (!empty($gd_taxonomy)) {
|
|
| 278 | 278 | foreach ($gd_taxonomy as $tax) {
|
| 279 | 279 | |
| 280 | - remove_meta_box($tax . 'div', $geodir_post_type, 'normal'); |
|
| 280 | + remove_meta_box($tax.'div', $geodir_post_type, 'normal'); |
|
| 281 | 281 | |
| 282 | 282 | } |
| 283 | 283 | } |
@@ -363,14 +363,14 @@ discard block |
||
| 363 | 363 | add_action('geodir_manage_available_fields_predefined', 'geodir_manage_available_fields_predefined');
|
| 364 | 364 | add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');
|
| 365 | 365 | |
| 366 | -function geodir_manage_available_fields_predefined($sub_tab){
|
|
| 367 | - if($sub_tab=='custom_fields'){
|
|
| 366 | +function geodir_manage_available_fields_predefined($sub_tab) {
|
|
| 367 | + if ($sub_tab == 'custom_fields') {
|
|
| 368 | 368 | geodir_custom_available_fields('predefined');
|
| 369 | 369 | } |
| 370 | 370 | } |
| 371 | 371 | |
| 372 | -function geodir_manage_available_fields_custom($sub_tab){
|
|
| 373 | - if($sub_tab=='custom_fields'){
|
|
| 372 | +function geodir_manage_available_fields_custom($sub_tab) {
|
|
| 373 | + if ($sub_tab == 'custom_fields') {
|
|
| 374 | 374 | geodir_custom_available_fields('custom');
|
| 375 | 375 | } |
| 376 | 376 | } |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | global $wpdb; |
| 441 | 441 | $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
| 442 | 442 | ?> |
| 443 | - <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/> |
|
| 443 | + <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/> |
|
| 444 | 444 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/> |
| 445 | 445 | <ul> |
| 446 | 446 | <?php |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | |
| 452 | 452 | $check_html_variable = $wpdb->get_var( |
| 453 | 453 | $wpdb->prepare( |
| 454 | - "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s", |
|
| 454 | + "SELECT htmlvar_name FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s", |
|
| 455 | 455 | array($val['htmlvar_name'], $listing_type, $val['field_type']) |
| 456 | 456 | ) |
| 457 | 457 | ); |
@@ -459,23 +459,23 @@ discard block |
||
| 459 | 459 | $display = $check_html_variable ? ' style="display:none;"' : ''; |
| 460 | 460 | ?> |
| 461 | 461 | |
| 462 | - <li class="gd-cf-tooltip-wrap" <?php echo $display;?>> |
|
| 462 | + <li class="gd-cf-tooltip-wrap" <?php echo $display; ?>> |
|
| 463 | 463 | <?php |
| 464 | - if(isset($val['description']) && $val['description']){
|
|
| 464 | + if (isset($val['description']) && $val['description']) {
|
|
| 465 | 465 | echo '<div class="gdcf-tooltip">'.$val['description'].'</div>'; |
| 466 | 466 | }?> |
| 467 | 467 | |
| 468 | - <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>" data-field-type="<?php echo $val['field_type'];?>" |
|
| 469 | - title="<?php echo $val['site_title'];?>" |
|
| 470 | - class="gd-draggable-form-items gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);"> |
|
| 468 | + <a id="gd-<?php echo $val['field_type']; ?>-_-<?php echo $val['htmlvar_name']; ?>" data-field-type-key="<?php echo $val['htmlvar_name']; ?>" data-field-type="<?php echo $val['field_type']; ?>" |
|
| 469 | + title="<?php echo $val['site_title']; ?>" |
|
| 470 | + class="gd-draggable-form-items gd-<?php echo $val['field_type']; ?> geodir-sort-<?php echo $val['htmlvar_name']; ?>" href="javascript:void(0);"> |
|
| 471 | 471 | <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {
|
| 472 | 472 | echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>'; |
| 473 | - }elseif(isset($val['field_icon']) && $val['field_icon'] ){
|
|
| 473 | + }elseif (isset($val['field_icon']) && $val['field_icon']) {
|
|
| 474 | 474 | echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';
|
| 475 | - }else{
|
|
| 475 | + } else {
|
|
| 476 | 476 | echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
| 477 | 477 | }?> |
| 478 | - <?php echo $val['site_title'];?> |
|
| 478 | + <?php echo $val['site_title']; ?> |
|
| 479 | 479 | </a> |
| 480 | 480 | </li> |
| 481 | 481 | |
@@ -503,7 +503,7 @@ discard block |
||
| 503 | 503 | <?php |
| 504 | 504 | global $wpdb; |
| 505 | 505 | |
| 506 | - $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
|
|
| 506 | + $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
|
|
| 507 | 507 | |
| 508 | 508 | if (!empty($fields)) {
|
| 509 | 509 | foreach ($fields as $field) {
|
@@ -528,14 +528,14 @@ discard block |
||
| 528 | 528 | * @since 1.6.9 |
| 529 | 529 | * @package GeoDirectory |
| 530 | 530 | */ |
| 531 | -function geodir_custom_fields_custom($post_type=''){
|
|
| 531 | +function geodir_custom_fields_custom($post_type = '') {
|
|
| 532 | 532 | |
| 533 | 533 | $custom_fields = array(); |
| 534 | 534 | |
| 535 | 535 | /** |
| 536 | 536 | * @see `geodir_custom_fields` |
| 537 | 537 | */ |
| 538 | - return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
|
|
| 538 | + return apply_filters('geodir_custom_fields_custom', $custom_fields, $post_type);
|
|
| 539 | 539 | } |
| 540 | 540 | |
| 541 | 541 | |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | * @since 1.6.6 |
| 547 | 547 | * @package GeoDirectory |
| 548 | 548 | */ |
| 549 | -function geodir_custom_fields($post_type=''){
|
|
| 549 | +function geodir_custom_fields($post_type = '') {
|
|
| 550 | 550 | |
| 551 | 551 | $custom_fields = array( |
| 552 | 552 | 'text' => array( |
@@ -681,7 +681,7 @@ discard block |
||
| 681 | 681 | * } |
| 682 | 682 | * @param string $post_type The post type requested. |
| 683 | 683 | */ |
| 684 | - return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
|
|
| 684 | + return apply_filters('geodir_custom_fields', $custom_fields, $post_type);
|
|
| 685 | 685 | } |
| 686 | 686 | |
| 687 | 687 | /** |
@@ -692,25 +692,25 @@ discard block |
||
| 692 | 692 | * @param string $type The custom field type, predefined, custom or blank for default |
| 693 | 693 | * @package GeoDirectory |
| 694 | 694 | */ |
| 695 | -function geodir_custom_available_fields($type='') |
|
| 695 | +function geodir_custom_available_fields($type = '') |
|
| 696 | 696 | {
|
| 697 | 697 | $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
| 698 | 698 | ?> |
| 699 | - <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/> |
|
| 699 | + <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/> |
|
| 700 | 700 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" /> |
| 701 | 701 | |
| 702 | 702 | <?php |
| 703 | - if($type=='predefined'){
|
|
| 703 | + if ($type == 'predefined') {
|
|
| 704 | 704 | $cfs = geodir_custom_fields_predefined($listing_type); |
| 705 | - }elseif($type=='custom'){
|
|
| 705 | + }elseif ($type == 'custom') {
|
|
| 706 | 706 | $cfs = geodir_custom_fields_custom($listing_type); |
| 707 | - }else{
|
|
| 707 | + } else {
|
|
| 708 | 708 | $cfs = geodir_custom_fields($listing_type); |
| 709 | 709 | ?> |
| 710 | 710 | <ul class="full gd-cf-tooltip-wrap"> |
| 711 | 711 | <li> |
| 712 | 712 | <div class="gdcf-tooltip"> |
| 713 | - <?php _e('This adds a section separator with a title.', 'geodirectory');?>
|
|
| 713 | + <?php _e('This adds a section separator with a title.', 'geodirectory'); ?>
|
|
| 714 | 714 | </div> |
| 715 | 715 | <a id="gt-fieldset" |
| 716 | 716 | class="gd-draggable-form-items gt-fieldset" |
@@ -721,7 +721,7 @@ discard block |
||
| 721 | 721 | |
| 722 | 722 | <i class="fa fa-long-arrow-left " aria-hidden="true"></i> |
| 723 | 723 | <i class="fa fa-long-arrow-right " aria-hidden="true"></i> |
| 724 | - <?php _e('Fieldset (section separator)', 'geodirectory');?>
|
|
| 724 | + <?php _e('Fieldset (section separator)', 'geodirectory'); ?>
|
|
| 725 | 725 | </a> |
| 726 | 726 | </li> |
| 727 | 727 | </ul> |
@@ -729,15 +729,15 @@ discard block |
||
| 729 | 729 | <?php |
| 730 | 730 | } |
| 731 | 731 | |
| 732 | - if(!empty($cfs)) {
|
|
| 732 | + if (!empty($cfs)) {
|
|
| 733 | 733 | echo '<ul>'; |
| 734 | - foreach ( $cfs as $id => $cf ) {
|
|
| 734 | + foreach ($cfs as $id => $cf) {
|
|
| 735 | 735 | ?> |
| 736 | 736 | |
| 737 | 737 | <li class="gd-cf-tooltip-wrap"> |
| 738 | 738 | <?php |
| 739 | - if ( isset( $cf['description'] ) && $cf['description'] ) {
|
|
| 740 | - echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>'; |
|
| 739 | + if (isset($cf['description']) && $cf['description']) {
|
|
| 740 | + echo '<div class="gdcf-tooltip">'.$cf['description'].'</div>'; |
|
| 741 | 741 | } ?> |
| 742 | 742 | |
| 743 | 743 | <a id="gd-<?php echo $id; ?>" |
@@ -747,10 +747,10 @@ discard block |
||
| 747 | 747 | class="gd-draggable-form-items <?php echo $cf['class']; ?>" |
| 748 | 748 | href="javascript:void(0);"> |
| 749 | 749 | |
| 750 | - <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {
|
|
| 751 | - echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>'; |
|
| 752 | - } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
|
|
| 753 | - echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';
|
|
| 750 | + <?php if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {
|
|
| 751 | + echo '<i class="'.$cf['icon'].'" aria-hidden="true"></i>'; |
|
| 752 | + } elseif (isset($cf['icon']) && $cf['icon']) {
|
|
| 753 | + echo '<b style="background-image: url("'.$cf['icon'].'")"></b>';
|
|
| 754 | 754 | } else {
|
| 755 | 755 | echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
| 756 | 756 | } ?> |
@@ -759,7 +759,7 @@ discard block |
||
| 759 | 759 | </li> |
| 760 | 760 | <?php |
| 761 | 761 | } |
| 762 | - }else{
|
|
| 762 | + } else {
|
|
| 763 | 763 | _e('There are no custom fields here yet.', 'geodirectory');
|
| 764 | 764 | } |
| 765 | 765 | ?> |
@@ -787,7 +787,7 @@ discard block |
||
| 787 | 787 | <ul class="core"> |
| 788 | 788 | <?php |
| 789 | 789 | global $wpdb; |
| 790 | - $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
|
|
| 790 | + $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
|
|
| 791 | 791 | |
| 792 | 792 | if (!empty($fields)) {
|
| 793 | 793 | foreach ($fields as $field) {
|
@@ -797,7 +797,7 @@ discard block |
||
| 797 | 797 | $field_type_key = $field->field_type_key; |
| 798 | 798 | $field_ins_upd = 'display'; |
| 799 | 799 | |
| 800 | - geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key); |
|
| 800 | + geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd, $field_type_key); |
|
| 801 | 801 | } |
| 802 | 802 | } |
| 803 | 803 | ?></ul> |
@@ -956,8 +956,8 @@ discard block |
||
| 956 | 956 | |
| 957 | 957 | if (!get_option('geodir_remove_unnecessary_fields')) {
|
| 958 | 958 | |
| 959 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
|
|
| 960 | - $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
|
|
| 959 | + if ($wpdb->get_var("SHOW COLUMNS FROM ".$plugin_prefix."gd_place_detail WHERE field = 'categories'"))
|
|
| 960 | + $wpdb->query("ALTER TABLE `".$plugin_prefix."gd_place_detail` DROP `categories`");
|
|
| 961 | 961 | |
| 962 | 962 | update_option('geodir_remove_unnecessary_fields', '1');
|
| 963 | 963 | |
@@ -986,7 +986,7 @@ discard block |
||
| 986 | 986 | case 'diagnosis' : |
| 987 | 987 | if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
|
| 988 | 988 | $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
| 989 | - call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 989 | + call_user_func('geodir_diagnose_'.$diagnose_this);
|
|
| 990 | 990 | |
| 991 | 991 | } |
| 992 | 992 | exit(); |
@@ -995,7 +995,7 @@ discard block |
||
| 995 | 995 | case 'diagnosis-fix' : |
| 996 | 996 | if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') |
| 997 | 997 | $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
| 998 | - call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 998 | + call_user_func('geodir_diagnose_'.$diagnose_this);
|
|
| 999 | 999 | exit(); |
| 1000 | 1000 | break; |
| 1001 | 1001 | } |
@@ -1020,50 +1020,50 @@ discard block |
||
| 1020 | 1020 | {
|
| 1021 | 1021 | global $wpdb; |
| 1022 | 1022 | //$filter_arr['output_str'] .='###'.$table.'###'; |
| 1023 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
|
|
| 1024 | - $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
|
|
| 1023 | + if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0) {
|
|
| 1024 | + $filter_arr['output_str'] .= "<li>".__('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory')."</li>";
|
|
| 1025 | 1025 | $filter_arr['is_error_during_diagnose'] = true; |
| 1026 | 1026 | |
| 1027 | - } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1028 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1027 | + } elseif ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {
|
|
| 1028 | + $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1029 | 1029 | $filter_arr['is_error_during_diagnose'] = true; |
| 1030 | - $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
|
|
| 1030 | + $filter_arr['output_str'] .= "<li>".__('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory')."</li>";
|
|
| 1031 | 1031 | $filter_arr['is_error_during_diagnose'] = true; |
| 1032 | 1032 | |
| 1033 | 1033 | if ($fix) {
|
| 1034 | - $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
|
|
| 1035 | - $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
|
|
| 1034 | + $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$table."_ms_bak"); // get backup table count
|
|
| 1035 | + $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table"); // get new table count
|
|
| 1036 | 1036 | |
| 1037 | 1037 | if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
|
| 1038 | 1038 | //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
|
| 1039 | 1039 | |
| 1040 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
|
|
| 1040 | + $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename bak table to new table
|
|
| 1041 | 1041 | |
| 1042 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1043 | - $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
|
|
| 1042 | + if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {
|
|
| 1043 | + $filter_arr['output_str'] .= "<li>".__('-->FIXED: Renamed and backed up the tables', 'geodirectory')."</li>";
|
|
| 1044 | 1044 | } else {
|
| 1045 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1045 | + $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
|
|
| 1046 | 1046 | } |
| 1047 | 1047 | |
| 1048 | 1048 | } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
|
| 1049 | 1049 | |
| 1050 | - $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
|
|
| 1051 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
|
|
| 1050 | + $wpdb->query("RENAME TABLE ".$wpdb->prefix."$table TO ".$table."_ms_bak2"); // rename new table to bak2
|
|
| 1051 | + $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$wpdb->prefix."$table"); // rename bak table to new table
|
|
| 1052 | 1052 | |
| 1053 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1054 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1053 | + if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1054 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table)."</li>";
|
|
| 1055 | 1055 | } else {
|
| 1056 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1056 | + $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
|
|
| 1057 | 1057 | } |
| 1058 | 1058 | |
| 1059 | 1059 | } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
|
| 1060 | 1060 | |
| 1061 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
|
|
| 1061 | + $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename ms_bak table to ms_bak2
|
|
| 1062 | 1062 | |
| 1063 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1064 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
|
|
| 1063 | + if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {
|
|
| 1064 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table)."</li>";
|
|
| 1065 | 1065 | } else {
|
| 1066 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1066 | + $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
|
|
| 1067 | 1067 | } |
| 1068 | 1068 | |
| 1069 | 1069 | } |
@@ -1071,54 +1071,54 @@ discard block |
||
| 1071 | 1071 | } |
| 1072 | 1072 | |
| 1073 | 1073 | |
| 1074 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1075 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1074 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {
|
|
| 1075 | + $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1076 | 1076 | $filter_arr['is_error_during_diagnose'] = true; |
| 1077 | 1077 | |
| 1078 | 1078 | if ($fix) {
|
| 1079 | 1079 | if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
|
| 1080 | 1080 | if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
|
| 1081 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1081 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table)."</li>";
|
|
| 1082 | 1082 | } else {
|
| 1083 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
|
|
| 1083 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table)."</li>";
|
|
| 1084 | 1084 | } |
| 1085 | 1085 | |
| 1086 | - } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
|
|
| 1087 | - if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
|
|
| 1088 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1086 | + } elseif ($wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table") == 0) {// if main table is empty but original is not, delete main and rename original
|
|
| 1087 | + if ($wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."$table")) {
|
|
| 1088 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix.$table)."</li>";
|
|
| 1089 | 1089 | } else {
|
| 1090 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1090 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix.$table)."</li>";
|
|
| 1091 | 1091 | } |
| 1092 | - if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1093 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1092 | + if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1093 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
|
|
| 1094 | 1094 | } else {
|
| 1095 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1095 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
|
|
| 1096 | 1096 | } |
| 1097 | 1097 | } else {// else rename the original table to _ms_bak
|
| 1098 | - if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1099 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1098 | + if ($wpdb->query("RENAME TABLE $table TO ".$table."_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1099 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table."_ms_bak")."</li>";
|
|
| 1100 | 1100 | } else {
|
| 1101 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1101 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table."_ms_bak")."</li>";
|
|
| 1102 | 1102 | } |
| 1103 | 1103 | } |
| 1104 | 1104 | } |
| 1105 | 1105 | |
| 1106 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1107 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1106 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {
|
|
| 1107 | + $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1108 | 1108 | $filter_arr['is_error_during_diagnose'] = true; |
| 1109 | 1109 | |
| 1110 | 1110 | if ($fix) {
|
| 1111 | 1111 | // if original table exists but new does not, rename |
| 1112 | - if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1113 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1112 | + if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1113 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
|
|
| 1114 | 1114 | } else {
|
| 1115 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1115 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
|
|
| 1116 | 1116 | } |
| 1117 | 1117 | |
| 1118 | 1118 | } |
| 1119 | 1119 | |
| 1120 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1121 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1120 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {
|
|
| 1121 | + $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1122 | 1122 | $filter_arr['is_error_during_diagnose'] = true; |
| 1123 | 1123 | |
| 1124 | 1124 | if ($fix) {
|
@@ -1132,11 +1132,11 @@ discard block |
||
| 1132 | 1132 | delete_option('geodir_custom_posts_db_version');
|
| 1133 | 1133 | delete_option('geodir_reviewratings_db_version');
|
| 1134 | 1134 | delete_option('geodiradvancesearch_db_version');
|
| 1135 | - $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
|
|
| 1135 | + $filter_arr['output_str'] .= "<li>".__('-->TRY: Please refresh page to run table install functions', 'geodirectory')."</li>";
|
|
| 1136 | 1136 | } |
| 1137 | 1137 | |
| 1138 | 1138 | } else {
|
| 1139 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1139 | + $filter_arr['output_str'] .= "<li>".sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1140 | 1140 | } |
| 1141 | 1141 | return $filter_arr; |
| 1142 | 1142 | } |
@@ -1177,21 +1177,21 @@ discard block |
||
| 1177 | 1177 | } |
| 1178 | 1178 | |
| 1179 | 1179 | if ($stepped_process) {
|
| 1180 | - $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset ); |
|
| 1181 | - $posts = $wpdb->get_results( $sql ); |
|
| 1180 | + $sql = $wpdb->prepare("SELECT * FROM ".$wpdb->prefix."geodir_".$ptype."_detail LIMIT %d OFFSET %d", $step_max_items, $offset);
|
|
| 1181 | + $posts = $wpdb->get_results($sql); |
|
| 1182 | 1182 | |
| 1183 | 1183 | if (!empty($posts)) {
|
| 1184 | 1184 | |
| 1185 | 1185 | foreach ($posts as $p) {
|
| 1186 | 1186 | $p->post_type = $ptype; |
| 1187 | - $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1187 | + $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));
|
|
| 1188 | 1188 | if (empty($raw_tags)) {
|
| 1189 | 1189 | $post_tags = ''; |
| 1190 | 1190 | } else {
|
| 1191 | 1191 | $post_tags = implode(",", $raw_tags);
|
| 1192 | 1192 | } |
| 1193 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1194 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1193 | + $tablename = $plugin_prefix.$p->post_type.'_detail'; |
|
| 1194 | + $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1195 | 1195 | |
| 1196 | 1196 | } |
| 1197 | 1197 | if ($step >= $max_step) {
|
@@ -1207,23 +1207,23 @@ discard block |
||
| 1207 | 1207 | if (!empty($all_postypes)) {
|
| 1208 | 1208 | foreach ($all_postypes as $key) {
|
| 1209 | 1209 | // update each GD CPT |
| 1210 | - $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail"); |
|
| 1210 | + $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail");
|
|
| 1211 | 1211 | |
| 1212 | 1212 | if (!empty($posts)) {
|
| 1213 | 1213 | |
| 1214 | 1214 | foreach ($posts as $p) {
|
| 1215 | 1215 | $p->post_type = $key; |
| 1216 | - $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1216 | + $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));
|
|
| 1217 | 1217 | if (empty($raw_tags)) {
|
| 1218 | 1218 | $post_tags = ''; |
| 1219 | 1219 | } else {
|
| 1220 | 1220 | $post_tags = implode(",", $raw_tags);
|
| 1221 | 1221 | } |
| 1222 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1223 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1222 | + $tablename = $plugin_prefix.$p->post_type.'_detail'; |
|
| 1223 | + $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1224 | 1224 | |
| 1225 | 1225 | } |
| 1226 | - $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1226 | + $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";
|
|
| 1227 | 1227 | } |
| 1228 | 1228 | |
| 1229 | 1229 | } |
@@ -1234,14 +1234,14 @@ discard block |
||
| 1234 | 1234 | |
| 1235 | 1235 | if ($is_error_during_diagnose) {
|
| 1236 | 1236 | $info_div_class = "geodir_problem_info"; |
| 1237 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1237 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1238 | 1238 | } else {
|
| 1239 | 1239 | $info_div_class = "geodir_noproblem_info"; |
| 1240 | 1240 | $fix_button_txt = ''; |
| 1241 | 1241 | } |
| 1242 | 1242 | |
| 1243 | 1243 | if ($stepped_process) {
|
| 1244 | - $percent = ($step/$max_step) * 100; |
|
| 1244 | + $percent = ($step / $max_step) * 100; |
|
| 1245 | 1245 | if ($output_str == 'done') {
|
| 1246 | 1246 | echo $output_str; |
| 1247 | 1247 | } else {
|
@@ -1284,29 +1284,29 @@ discard block |
||
| 1284 | 1284 | if (!empty($all_postypes)) {
|
| 1285 | 1285 | foreach ($all_postypes as $key) {
|
| 1286 | 1286 | // update each GD CTP |
| 1287 | - $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
|
|
| 1287 | + $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail d WHERE d.".$key."category='' ");
|
|
| 1288 | 1288 | |
| 1289 | 1289 | if (!empty($posts)) {
|
| 1290 | 1290 | |
| 1291 | 1291 | foreach ($posts as $p) {
|
| 1292 | 1292 | $p->post_type = $key; |
| 1293 | - $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
|
|
| 1293 | + $raw_cats = wp_get_object_terms($p->post_id, $p->post_type.'category', array('fields' => 'ids'));
|
|
| 1294 | 1294 | |
| 1295 | 1295 | if (empty($raw_cats)) {
|
| 1296 | 1296 | $post_categories = get_post_meta($p->post_id, 'post_categories', true); |
| 1297 | 1297 | |
| 1298 | - if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
|
|
| 1299 | - $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
|
|
| 1300 | - foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
|
|
| 1298 | + if (!empty($post_categories) && !empty($post_categories[$p->post_type.'category'])) {
|
|
| 1299 | + $post_categories[$p->post_type.'category'] = str_replace("d:", "", $post_categories[$p->post_type.'category']);
|
|
| 1300 | + foreach (explode(",", $post_categories[$p->post_type.'category']) as $cat_part) {
|
|
| 1301 | 1301 | if (is_numeric($cat_part)) {
|
| 1302 | - $raw_cats[] = (int)$cat_part; |
|
| 1302 | + $raw_cats[] = (int) $cat_part; |
|
| 1303 | 1303 | } |
| 1304 | 1304 | } |
| 1305 | 1305 | |
| 1306 | 1306 | } |
| 1307 | 1307 | |
| 1308 | 1308 | if (!empty($raw_cats)) {
|
| 1309 | - $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category'); |
|
| 1309 | + $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type.'category'); |
|
| 1310 | 1310 | |
| 1311 | 1311 | } |
| 1312 | 1312 | |
@@ -1316,14 +1316,14 @@ discard block |
||
| 1316 | 1316 | if (empty($raw_cats)) {
|
| 1317 | 1317 | $post_cats = ''; |
| 1318 | 1318 | } else {
|
| 1319 | - $post_cats = ',' . implode(",", $raw_cats) . ',';
|
|
| 1319 | + $post_cats = ','.implode(",", $raw_cats).',';
|
|
| 1320 | 1320 | } |
| 1321 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1322 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
|
|
| 1321 | + $tablename = $plugin_prefix.$p->post_type.'_detail'; |
|
| 1322 | + $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET ".$p->post_type."category=%s WHERE post_id =%d", $post_cats, $p->post_id));
|
|
| 1323 | 1323 | } |
| 1324 | 1324 | |
| 1325 | 1325 | } |
| 1326 | - $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1326 | + $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";
|
|
| 1327 | 1327 | |
| 1328 | 1328 | } |
| 1329 | 1329 | |
@@ -1331,7 +1331,7 @@ discard block |
||
| 1331 | 1331 | |
| 1332 | 1332 | if ($is_error_during_diagnose) {
|
| 1333 | 1333 | $info_div_class = "geodir_problem_info"; |
| 1334 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1334 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1335 | 1335 | } else {
|
| 1336 | 1336 | $info_div_class = "geodir_noproblem_info"; |
| 1337 | 1337 | $fix_button_txt = ''; |
@@ -1384,15 +1384,15 @@ discard block |
||
| 1384 | 1384 | if (!empty($ver_arr)) {
|
| 1385 | 1385 | foreach ($ver_arr as $key => $val) {
|
| 1386 | 1386 | if (delete_option($val)) {
|
| 1387 | - $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
|
|
| 1387 | + $output_str .= "<li>".$key.__(' Version: Deleted', 'geodirectory')."</li>";
|
|
| 1388 | 1388 | } else {
|
| 1389 | - $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
|
|
| 1389 | + $output_str .= "<li>".$key.__(' Version: Not Found', 'geodirectory')."</li>";
|
|
| 1390 | 1390 | } |
| 1391 | 1391 | |
| 1392 | 1392 | } |
| 1393 | 1393 | |
| 1394 | 1394 | if ($output_str) {
|
| 1395 | - $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
|
|
| 1395 | + $output_str .= "<li><strong>".__(' Upgrade/install scripts will run on next page reload.', 'geodirectory')."</strong></li>";
|
|
| 1396 | 1396 | } |
| 1397 | 1397 | |
| 1398 | 1398 | } |
@@ -1429,43 +1429,43 @@ discard block |
||
| 1429 | 1429 | $output_str = ''; |
| 1430 | 1430 | |
| 1431 | 1431 | // check review locations |
| 1432 | - if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
|
|
| 1433 | - $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
|
|
| 1432 | + if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
|
|
| 1433 | + $output_str .= "<li>".__('Review locations missing or broken', 'geodirectory')."</li>";
|
|
| 1434 | 1434 | $is_error_during_diagnose = true; |
| 1435 | 1435 | |
| 1436 | 1436 | if ($fix) {
|
| 1437 | 1437 | if (geodir_fix_review_location()) {
|
| 1438 | - $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
|
|
| 1438 | + $output_str .= "<li><strong>".__('-->FIXED: Review locations fixed', 'geodirectory')."</strong></li>";
|
|
| 1439 | 1439 | } else {
|
| 1440 | - $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1440 | + $output_str .= "<li><strong>".__('-->FAILED: Review locations fix failed', 'geodirectory')."</strong></li>";
|
|
| 1441 | 1441 | } |
| 1442 | 1442 | } |
| 1443 | 1443 | |
| 1444 | 1444 | } else {
|
| 1445 | - $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
|
|
| 1445 | + $output_str .= "<li>".__('Review locations ok', 'geodirectory')."</li>";
|
|
| 1446 | 1446 | } |
| 1447 | 1447 | |
| 1448 | 1448 | // check review content |
| 1449 | - if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
|
|
| 1450 | - $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
|
|
| 1449 | + if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_content IS NULL")) {
|
|
| 1450 | + $output_str .= "<li>".__('Review content missing or broken', 'geodirectory')."</li>";
|
|
| 1451 | 1451 | $is_error_during_diagnose = true; |
| 1452 | 1452 | |
| 1453 | 1453 | if ($fix) {
|
| 1454 | 1454 | if (geodir_fix_review_content()) {
|
| 1455 | - $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
|
|
| 1455 | + $output_str .= "<li><strong>".__('-->FIXED: Review content fixed', 'geodirectory')."</strong></li>";
|
|
| 1456 | 1456 | } else {
|
| 1457 | - $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1457 | + $output_str .= "<li><strong>".__('-->FAILED: Review content fix failed', 'geodirectory')."</strong></li>";
|
|
| 1458 | 1458 | } |
| 1459 | 1459 | } |
| 1460 | 1460 | |
| 1461 | 1461 | } else {
|
| 1462 | - $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
|
|
| 1462 | + $output_str .= "<li>".__('Review content ok', 'geodirectory')."</li>";
|
|
| 1463 | 1463 | } |
| 1464 | 1464 | |
| 1465 | 1465 | |
| 1466 | 1466 | if ($is_error_during_diagnose) {
|
| 1467 | 1467 | $info_div_class = "geodir_problem_info"; |
| 1468 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1468 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1469 | 1469 | } else {
|
| 1470 | 1470 | $info_div_class = "geodir_noproblem_info"; |
| 1471 | 1471 | $fix_button_txt = ''; |
@@ -1529,7 +1529,7 @@ discard block |
||
| 1529 | 1529 | |
| 1530 | 1530 | if ($is_error_during_diagnose) {
|
| 1531 | 1531 | $info_div_class = "geodir_problem_info"; |
| 1532 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
|
|
| 1532 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
|
|
| 1533 | 1533 | } else {
|
| 1534 | 1534 | $info_div_class = "geodir_noproblem_info"; |
| 1535 | 1535 | $fix_button_txt = ''; |
@@ -1563,7 +1563,7 @@ discard block |
||
| 1563 | 1563 | else {
|
| 1564 | 1564 | $page_found = $wpdb->get_var( |
| 1565 | 1565 | $wpdb->prepare( |
| 1566 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 1566 | + "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;", |
|
| 1567 | 1567 | array($slug) |
| 1568 | 1568 | ) |
| 1569 | 1569 | ); |
@@ -1609,18 +1609,18 @@ discard block |
||
| 1609 | 1609 | ////////////////////////////////// |
| 1610 | 1610 | $option_value = get_option('geodir_home_page');
|
| 1611 | 1611 | $page = get_post($option_value); |
| 1612 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1612 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1613 | 1613 | |
| 1614 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1615 | - $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1614 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1615 | + $output_str .= "<li>".__('GD Home page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1616 | 1616 | else {
|
| 1617 | 1617 | $is_error_during_diagnose = true; |
| 1618 | - $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1618 | + $output_str .= "<li><strong>".__('GD Home page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1619 | 1619 | if ($fix) {
|
| 1620 | 1620 | if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
|
| 1621 | - $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1621 | + $output_str .= "<li><strong>".__('-->FIXED: GD Home page fixed', 'geodirectory')."</strong></li>";
|
|
| 1622 | 1622 | } else {
|
| 1623 | - $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1623 | + $output_str .= "<li><strong>".__('-->FAILED: GD Home page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1624 | 1624 | } |
| 1625 | 1625 | } |
| 1626 | 1626 | } |
@@ -1634,18 +1634,18 @@ discard block |
||
| 1634 | 1634 | ////////////////////////////////// |
| 1635 | 1635 | $option_value = get_option('geodir_add_listing_page');
|
| 1636 | 1636 | $page = get_post($option_value); |
| 1637 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1637 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1638 | 1638 | |
| 1639 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1640 | - $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1639 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1640 | + $output_str .= "<li>".__('Add Listing page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1641 | 1641 | else {
|
| 1642 | 1642 | $is_error_during_diagnose = true; |
| 1643 | - $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1643 | + $output_str .= "<li><strong>".__('Add Listing page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1644 | 1644 | if ($fix) {
|
| 1645 | 1645 | if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
|
| 1646 | - $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1646 | + $output_str .= "<li><strong>".__('-->FIXED: Add Listing page fixed', 'geodirectory')."</strong></li>";
|
|
| 1647 | 1647 | } else {
|
| 1648 | - $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1648 | + $output_str .= "<li><strong>".__('-->FAILED: Add Listing page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1649 | 1649 | } |
| 1650 | 1650 | } |
| 1651 | 1651 | } |
@@ -1660,18 +1660,18 @@ discard block |
||
| 1660 | 1660 | ////////////////////////////////// |
| 1661 | 1661 | $option_value = get_option('geodir_preview_page');
|
| 1662 | 1662 | $page = get_post($option_value); |
| 1663 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1663 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1664 | 1664 | |
| 1665 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1666 | - $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1665 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1666 | + $output_str .= "<li>".__('Listing Preview page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1667 | 1667 | else {
|
| 1668 | 1668 | $is_error_during_diagnose = true; |
| 1669 | - $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1669 | + $output_str .= "<li><strong>".__('Listing Preview page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1670 | 1670 | if ($fix) {
|
| 1671 | 1671 | if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
|
| 1672 | - $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1672 | + $output_str .= "<li><strong>".__('-->FIXED: Listing Preview page fixed', 'geodirectory')."</strong></li>";
|
|
| 1673 | 1673 | } else {
|
| 1674 | - $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1674 | + $output_str .= "<li><strong>".__('-->FAILED: Listing Preview page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1675 | 1675 | } |
| 1676 | 1676 | } |
| 1677 | 1677 | } |
@@ -1685,18 +1685,18 @@ discard block |
||
| 1685 | 1685 | ////////////////////////////////// |
| 1686 | 1686 | $option_value = get_option('geodir_success_page');
|
| 1687 | 1687 | $page = get_post($option_value); |
| 1688 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1688 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1689 | 1689 | |
| 1690 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1691 | - $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1690 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1691 | + $output_str .= "<li>".__('Listing Success page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1692 | 1692 | else {
|
| 1693 | 1693 | $is_error_during_diagnose = true; |
| 1694 | - $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1694 | + $output_str .= "<li><strong>".__('Listing Success page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1695 | 1695 | if ($fix) {
|
| 1696 | 1696 | if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
|
| 1697 | - $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1697 | + $output_str .= "<li><strong>".__('-->FIXED: Listing Success page fixed', 'geodirectory')."</strong></li>";
|
|
| 1698 | 1698 | } else {
|
| 1699 | - $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1699 | + $output_str .= "<li><strong>".__('-->FAILED: Listing Success page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1700 | 1700 | } |
| 1701 | 1701 | } |
| 1702 | 1702 | } |
@@ -1710,18 +1710,18 @@ discard block |
||
| 1710 | 1710 | ////////////////////////////////// |
| 1711 | 1711 | $option_value = get_option('geodir_info_page');
|
| 1712 | 1712 | $page = get_post($option_value); |
| 1713 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1713 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1714 | 1714 | |
| 1715 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1716 | - $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1715 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1716 | + $output_str .= "<li>".__('Info page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1717 | 1717 | else {
|
| 1718 | 1718 | $is_error_during_diagnose = true; |
| 1719 | - $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1719 | + $output_str .= "<li><strong>".__('Info page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1720 | 1720 | if ($fix) {
|
| 1721 | 1721 | if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
|
| 1722 | - $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1722 | + $output_str .= "<li><strong>".__('-->FIXED: Info page fixed', 'geodirectory')."</strong></li>";
|
|
| 1723 | 1723 | } else {
|
| 1724 | - $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1724 | + $output_str .= "<li><strong>".__('-->FAILED: Info page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1725 | 1725 | } |
| 1726 | 1726 | } |
| 1727 | 1727 | } |
@@ -1735,18 +1735,18 @@ discard block |
||
| 1735 | 1735 | ////////////////////////////////// |
| 1736 | 1736 | $option_value = get_option('geodir_login_page');
|
| 1737 | 1737 | $page = get_post($option_value); |
| 1738 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1738 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1739 | 1739 | |
| 1740 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1741 | - $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1740 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1741 | + $output_str .= "<li>".__('Login page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1742 | 1742 | else {
|
| 1743 | 1743 | $is_error_during_diagnose = true; |
| 1744 | - $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1744 | + $output_str .= "<li><strong>".__('Login page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1745 | 1745 | if ($fix) {
|
| 1746 | 1746 | if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
|
| 1747 | - $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1747 | + $output_str .= "<li><strong>".__('-->FIXED: Login page fixed', 'geodirectory')."</strong></li>";
|
|
| 1748 | 1748 | } else {
|
| 1749 | - $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1749 | + $output_str .= "<li><strong>".__('-->FAILED: Login page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1750 | 1750 | } |
| 1751 | 1751 | } |
| 1752 | 1752 | } |
@@ -1760,18 +1760,18 @@ discard block |
||
| 1760 | 1760 | ////////////////////////////////// |
| 1761 | 1761 | $option_value = get_option('geodir_location_page');
|
| 1762 | 1762 | $page = get_post($option_value); |
| 1763 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1763 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1764 | 1764 | |
| 1765 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1766 | - $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1765 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1766 | + $output_str .= "<li>".__('Location page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1767 | 1767 | else {
|
| 1768 | 1768 | $is_error_during_diagnose = true; |
| 1769 | - $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1769 | + $output_str .= "<li><strong>".__('Location page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1770 | 1770 | if ($fix) {
|
| 1771 | 1771 | if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
|
| 1772 | - $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1772 | + $output_str .= "<li><strong>".__('-->FIXED: Location page fixed', 'geodirectory')."</strong></li>";
|
|
| 1773 | 1773 | } else {
|
| 1774 | - $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1774 | + $output_str .= "<li><strong>".__('-->FAILED: Location page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1775 | 1775 | } |
| 1776 | 1776 | } |
| 1777 | 1777 | } |
@@ -1780,13 +1780,13 @@ discard block |
||
| 1780 | 1780 | /* Diagnose Location Page Ends */ |
| 1781 | 1781 | //////////////////////////////// |
| 1782 | 1782 | |
| 1783 | - $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
|
|
| 1783 | + $page_chk_arr = array('output_str'=>$output_str, 'is_error_during_diagnose'=>$is_error_during_diagnose);
|
|
| 1784 | 1784 | /** |
| 1785 | 1785 | * This action is called at the end of the GD Tools page check function. |
| 1786 | 1786 | * |
| 1787 | 1787 | * @since 1.5.2 |
| 1788 | 1788 | */ |
| 1789 | - $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
|
|
| 1789 | + $page_chk_arr = apply_filters('geodir_diagnose_default_pages', $page_chk_arr);
|
|
| 1790 | 1790 | |
| 1791 | 1791 | $output_str = $page_chk_arr['output_str']; |
| 1792 | 1792 | $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose']; |
@@ -1796,7 +1796,7 @@ discard block |
||
| 1796 | 1796 | flush_rewrite_rules(); |
| 1797 | 1797 | } |
| 1798 | 1798 | $info_div_class = "geodir_problem_info"; |
| 1799 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
|
|
| 1799 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
|
|
| 1800 | 1800 | } else {
|
| 1801 | 1801 | $info_div_class = "geodir_noproblem_info"; |
| 1802 | 1802 | $fix_button_txt = ''; |
@@ -1824,10 +1824,10 @@ discard block |
||
| 1824 | 1824 | $fix_button_txt = ''; |
| 1825 | 1825 | |
| 1826 | 1826 | if ($is_error_during_diagnose) {
|
| 1827 | - $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
|
|
| 1827 | + $output_str .= "<li>".__('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory').' '.geodir_plugin_path().'/db-language.php'."</li>";
|
|
| 1828 | 1828 | $info_div_class = "geodir_problem_info"; |
| 1829 | 1829 | } else {
|
| 1830 | - $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
|
|
| 1830 | + $output_str .= "<li>".__('Load custom fields in to file for translation: ok', 'geodirectory')."</li>";
|
|
| 1831 | 1831 | $info_div_class = "geodir_noproblem_info"; |
| 1832 | 1832 | $fix_button_txt = ''; |
| 1833 | 1833 | } |
@@ -1869,17 +1869,17 @@ discard block |
||
| 1869 | 1869 | global $wpdb, $wp_query, $plugin_prefix; |
| 1870 | 1870 | |
| 1871 | 1871 | if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
|
| 1872 | - $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail'; |
|
| 1872 | + $table = $plugin_prefix.$wp_query->query_vars['post_type'].'_detail'; |
|
| 1873 | 1873 | |
| 1874 | - $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)'; |
|
| 1874 | + $join = $clauses['join'].' INNER JOIN '.$table.' AS gd_posts ON (gd_posts.post_id = '.$wpdb->posts.'.ID)'; |
|
| 1875 | 1875 | $clauses['join'] = $join; |
| 1876 | 1876 | |
| 1877 | - $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : ''; |
|
| 1877 | + $fields = $clauses['fields'] != '' ? $clauses['fields'].', ' : ''; |
|
| 1878 | 1878 | $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire'; |
| 1879 | 1879 | $clauses['fields'] = $fields; |
| 1880 | 1880 | |
| 1881 | 1881 | $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC'; |
| 1882 | - $orderby = 'gd_expire ' . $order; |
|
| 1882 | + $orderby = 'gd_expire '.$order; |
|
| 1883 | 1883 | $clauses['orderby'] = $orderby; |
| 1884 | 1884 | } |
| 1885 | 1885 | return $clauses; |
@@ -1922,7 +1922,7 @@ discard block |
||
| 1922 | 1922 | global $current_user; |
| 1923 | 1923 | $upload_dir = wp_upload_dir(); |
| 1924 | 1924 | |
| 1925 | - $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv'; |
|
| 1925 | + $file = $upload_dir['path'].'/temp_'.$current_user->data->ID.'/geodir_tmp.csv'; |
|
| 1926 | 1926 | $handle = fopen($file, 'w'); |
| 1927 | 1927 | |
| 1928 | 1928 | fwrite($handle, $input); |
@@ -1967,7 +1967,7 @@ discard block |
||
| 1967 | 1967 | $uploads_dir = $uploads['path']; |
| 1968 | 1968 | $image_name_arr = explode('/', $filename);
|
| 1969 | 1969 | $filename = end($image_name_arr); |
| 1970 | - $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1970 | + $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename; |
|
| 1971 | 1971 | $return = array(); |
| 1972 | 1972 | $return['file'] = $uploadedFile; |
| 1973 | 1973 | $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
|
@@ -1984,8 +1984,8 @@ discard block |
||
| 1984 | 1984 | |
| 1985 | 1985 | if (($handle = fopen($target_path, "r")) !== FALSE) {
|
| 1986 | 1986 | while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
|
| 1987 | - if(is_array($data) && !empty($data)) {
|
|
| 1988 | - $file[] = '"' . implode('","', $data) . '"';
|
|
| 1987 | + if (is_array($data) && !empty($data)) {
|
|
| 1988 | + $file[] = '"'.implode('","', $data).'"';
|
|
| 1989 | 1989 | } |
| 1990 | 1990 | } |
| 1991 | 1991 | fclose($handle); |
@@ -2102,10 +2102,10 @@ discard block |
||
| 2102 | 2102 | $tag_arr = explode(',', $post_tags);
|
| 2103 | 2103 | } |
| 2104 | 2104 | |
| 2105 | - $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database |
|
| 2105 | + $table = $plugin_prefix.$buffer[5].'_detail'; // check table in database |
|
| 2106 | 2106 | |
| 2107 | 2107 | $error = ''; |
| 2108 | - if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
|
|
| 2108 | + if ($wpdb->get_var("SHOW TABLES LIKE '".$table."'") != $table) {
|
|
| 2109 | 2109 | $invalid_post_type++; |
| 2110 | 2110 | continue; |
| 2111 | 2111 | } |
@@ -2131,7 +2131,7 @@ discard block |
||
| 2131 | 2131 | if ($buffer[$c] != '0' && $buffer[$c] != '') {
|
| 2132 | 2132 | $submitdata = date('Y-m-d');
|
| 2133 | 2133 | |
| 2134 | - $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
|
|
| 2134 | + $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata."+".addslashes($buffer[$c])." days"));
|
|
| 2135 | 2135 | } else {
|
| 2136 | 2136 | $gd_post_info['expire_date'] = 'Never'; |
| 2137 | 2137 | } |
@@ -2159,7 +2159,7 @@ discard block |
||
| 2159 | 2159 | |
| 2160 | 2160 | // Post status |
| 2161 | 2161 | if ($customKeyarray[$c] == 'post_status') {
|
| 2162 | - $post_status = sanitize_key( $buffer[$c] ); |
|
| 2162 | + $post_status = sanitize_key($buffer[$c]); |
|
| 2163 | 2163 | } |
| 2164 | 2164 | } |
| 2165 | 2165 | |
@@ -2177,8 +2177,8 @@ discard block |
||
| 2177 | 2177 | |
| 2178 | 2178 | // Default post status |
| 2179 | 2179 | $default_status = 'publish'; |
| 2180 | - $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 2181 | - $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 2180 | + $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status; |
|
| 2181 | + $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status; |
|
| 2182 | 2182 | |
| 2183 | 2183 | $my_post['post_title'] = $post_title; |
| 2184 | 2184 | $my_post['post_content'] = $post_desc; |
@@ -2222,7 +2222,7 @@ discard block |
||
| 2222 | 2222 | $payment_info = array(); |
| 2223 | 2223 | $package_info = array(); |
| 2224 | 2224 | |
| 2225 | - $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]); |
|
| 2225 | + $package_info = (array) geodir_post_package_info($package_info, '', $buffer[5]); |
|
| 2226 | 2226 | $package_id = ''; |
| 2227 | 2227 | if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
|
| 2228 | 2228 | $package_id = $gd_post_info['package_id']; |
@@ -2232,7 +2232,7 @@ discard block |
||
| 2232 | 2232 | $payment_info['package_id'] = $package_info['pid']; |
| 2233 | 2233 | |
| 2234 | 2234 | if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
|
| 2235 | - $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
|
|
| 2235 | + $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['alive_days']." days"));
|
|
| 2236 | 2236 | } else {
|
| 2237 | 2237 | $payment_info['expire_date'] = 'Never'; |
| 2238 | 2238 | } |
@@ -2244,7 +2244,7 @@ discard block |
||
| 2244 | 2244 | |
| 2245 | 2245 | $post_type = get_post_type($last_postid); |
| 2246 | 2246 | |
| 2247 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2247 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2248 | 2248 | |
| 2249 | 2249 | geodir_save_post_info($last_postid, $gd_post_info); |
| 2250 | 2250 | |
@@ -2265,7 +2265,7 @@ discard block |
||
| 2265 | 2265 | $attachment['post_id'] = $last_postid; |
| 2266 | 2266 | $attachment['title'] = $img_name_arr[0]; |
| 2267 | 2267 | $attachment['content'] = ''; |
| 2268 | - $attachment['file'] = $sub_dir . '/' . $image_name; |
|
| 2268 | + $attachment['file'] = $sub_dir.'/'.$image_name; |
|
| 2269 | 2269 | $attachment['mime_type'] = $uploaded_file_type; |
| 2270 | 2270 | $attachment['menu_order'] = $menu_order; |
| 2271 | 2271 | $attachment['is_featured'] = 0; |
@@ -2274,15 +2274,15 @@ discard block |
||
| 2274 | 2274 | |
| 2275 | 2275 | foreach ($attachment as $key => $val) {
|
| 2276 | 2276 | if ($val != '') |
| 2277 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 2277 | + $attachment_set .= $key." = '".$val."', "; |
|
| 2278 | 2278 | } |
| 2279 | 2279 | $attachment_set = trim($attachment_set, ", "); |
| 2280 | 2280 | |
| 2281 | - $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 2281 | + $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
|
|
| 2282 | 2282 | |
| 2283 | 2283 | if ($menu_order == 1) {
|
| 2284 | 2284 | $post_type = get_post_type($last_postid); |
| 2285 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
|
|
| 2285 | + $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($sub_dir.'/'.$image_name, $last_postid)));
|
|
| 2286 | 2286 | } |
| 2287 | 2287 | $menu_order++; |
| 2288 | 2288 | } |
@@ -2323,11 +2323,11 @@ discard block |
||
| 2323 | 2323 | } |
| 2324 | 2324 | |
| 2325 | 2325 | // Add the tab in left sidebar menu fro import & export page. |
| 2326 | -add_filter( 'geodir_settings_tabs_array', 'geodir_import_export_tab', 94 ); |
|
| 2326 | +add_filter('geodir_settings_tabs_array', 'geodir_import_export_tab', 94);
|
|
| 2327 | 2327 | |
| 2328 | 2328 | // Handle ajax request for import/export. |
| 2329 | -add_action( 'wp_ajax_geodir_import_export', 'geodir_ajax_import_export' ); |
|
| 2330 | -add_action( 'wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export' ); |
|
| 2329 | +add_action('wp_ajax_geodir_import_export', 'geodir_ajax_import_export');
|
|
| 2330 | +add_action('wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export');
|
|
| 2331 | 2331 | |
| 2332 | 2332 | |
| 2333 | 2333 | /** |
@@ -2338,40 +2338,40 @@ discard block |
||
| 2338 | 2338 | * @param $post_id int $post_id The post ID of the post being saved. |
| 2339 | 2339 | * @param $post object $post The post object of the post being saved. |
| 2340 | 2340 | */ |
| 2341 | -function geodir_update_location_prefix($post_id,$post){
|
|
| 2342 | - if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
|
|
| 2343 | - update_option('geodir_location_prefix',$post->post_name);
|
|
| 2341 | +function geodir_update_location_prefix($post_id, $post) {
|
|
| 2342 | + if ($post->post_type == 'page' && $post->post_name && $post_id == get_option('geodir_location_page')) {
|
|
| 2343 | + update_option('geodir_location_prefix', $post->post_name);
|
|
| 2344 | 2344 | } |
| 2345 | 2345 | |
| 2346 | 2346 | } |
| 2347 | 2347 | |
| 2348 | -add_action('save_post', 'geodir_update_location_prefix',10,2);
|
|
| 2348 | +add_action('save_post', 'geodir_update_location_prefix', 10, 2);
|
|
| 2349 | 2349 | |
| 2350 | -add_action( 'wp_ajax_geodir_ga_callback', 'geodir_ga_callback' ); |
|
| 2350 | +add_action('wp_ajax_geodir_ga_callback', 'geodir_ga_callback');
|
|
| 2351 | 2351 | |
| 2352 | -function geodir_ga_callback(){
|
|
| 2352 | +function geodir_ga_callback() {
|
|
| 2353 | 2353 | |
| 2354 | -if(isset($_REQUEST['code']) && $_REQUEST['code']) {
|
|
| 2354 | +if (isset($_REQUEST['code']) && $_REQUEST['code']) {
|
|
| 2355 | 2355 | $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?"; |
| 2356 | 2356 | $code = "code=".$_REQUEST['code']; |
| 2357 | 2357 | $grant_type = "&grant_type=authorization_code"; |
| 2358 | - $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 2358 | + $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";
|
|
| 2359 | 2359 | $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
| 2360 | 2360 | $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
|
| 2361 | 2361 | |
| 2362 | - $auth_url = $oAuthURL . $code . $redirect_uri . $grant_type . $client_id .$client_secret; |
|
| 2362 | + $auth_url = $oAuthURL.$code.$redirect_uri.$grant_type.$client_id.$client_secret; |
|
| 2363 | 2363 | |
| 2364 | 2364 | $response = wp_remote_post($auth_url, array('timeout' => 15));
|
| 2365 | 2365 | |
| 2366 | 2366 | //print_r($response); |
| 2367 | 2367 | |
| 2368 | - $error_msg = __('Something went wrong','geodirectory');
|
|
| 2369 | - if(!empty($response['response']['code']) && $response['response']['code']==200){
|
|
| 2368 | + $error_msg = __('Something went wrong', 'geodirectory');
|
|
| 2369 | + if (!empty($response['response']['code']) && $response['response']['code'] == 200) {
|
|
| 2370 | 2370 | |
| 2371 | 2371 | $parts = json_decode($response['body']); |
| 2372 | 2372 | //print_r($parts); |
| 2373 | - if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
|
|
| 2374 | - else{
|
|
| 2373 | + if (!isset($parts->access_token)) {echo $error_msg." - #1"; exit; }
|
|
| 2374 | + else {
|
|
| 2375 | 2375 | |
| 2376 | 2376 | update_option('gd_ga_access_token', $parts->access_token);
|
| 2377 | 2377 | update_option('gd_ga_refresh_token', $parts->refresh_token);
|
@@ -2380,18 +2380,18 @@ discard block |
||
| 2380 | 2380 | |
| 2381 | 2381 | |
| 2382 | 2382 | } |
| 2383 | - elseif(!empty($response['response']['code'])) {
|
|
| 2383 | + elseif (!empty($response['response']['code'])) {
|
|
| 2384 | 2384 | $parts = json_decode($response['body']); |
| 2385 | 2385 | |
| 2386 | - if(isset($parts->error)){
|
|
| 2387 | - echo $parts->error.": ".$parts->error_description;exit; |
|
| 2388 | - }else{
|
|
| 2389 | - echo $error_msg." - #2";exit; |
|
| 2386 | + if (isset($parts->error)) {
|
|
| 2387 | + echo $parts->error.": ".$parts->error_description; exit; |
|
| 2388 | + } else {
|
|
| 2389 | + echo $error_msg." - #2"; exit; |
|
| 2390 | 2390 | } |
| 2391 | 2391 | |
| 2392 | - }else{
|
|
| 2392 | + } else {
|
|
| 2393 | 2393 | |
| 2394 | - echo $error_msg." - #3";exit; |
|
| 2394 | + echo $error_msg." - #3"; exit; |
|
| 2395 | 2395 | |
| 2396 | 2396 | } |
| 2397 | 2397 | } |
@@ -2413,7 +2413,7 @@ discard block |
||
| 2413 | 2413 | function geodir_uninstall_settings($general_settings) {
|
| 2414 | 2414 | $settings = array(); |
| 2415 | 2415 | $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
|
| 2416 | - $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
|
|
| 2416 | + $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory'));
|
|
| 2417 | 2417 | |
| 2418 | 2418 | $plugins = get_plugins(); |
| 2419 | 2419 | $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
|
@@ -2425,7 +2425,7 @@ discard block |
||
| 2425 | 2425 | if (in_array($plugin_name, $un_plugins)) {
|
| 2426 | 2426 | $settings[] = array( |
| 2427 | 2427 | 'type' => 'checkbox', |
| 2428 | - 'id' => 'geodir_un_' . $plugin_name, |
|
| 2428 | + 'id' => 'geodir_un_'.$plugin_name, |
|
| 2429 | 2429 | 'name' => $data['Name'], |
| 2430 | 2430 | 'desc' => __('Remove all data when deleted?', 'geodirectory'),
|
| 2431 | 2431 | 'std' => '0' |
@@ -2459,7 +2459,7 @@ discard block |
||
| 2459 | 2459 | * @since 1.6.9 |
| 2460 | 2460 | */ |
| 2461 | 2461 | function geodir_uninstall_settings_desc() {
|
| 2462 | - echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';
|
|
| 2462 | + echo '<p class="gd-un-settings-desc">'.__('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory').'</p>';
|
|
| 2463 | 2463 | } |
| 2464 | 2464 | add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');
|
| 2465 | 2465 | |
@@ -2523,12 +2523,12 @@ discard block |
||
| 2523 | 2523 | |
| 2524 | 2524 | |
| 2525 | 2525 | if ($delete) {
|
| 2526 | - $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";
|
|
| 2526 | + $output_str .= "<li><strong>".__('Table dropped, refresh page to reinstall.', 'geodirectory')."</strong></li>";
|
|
| 2527 | 2527 | ob_start(); |
| 2528 | 2528 | geodir_diagnose_version_clear(); |
| 2529 | 2529 | ob_end_clean(); |
| 2530 | - }else{
|
|
| 2531 | - $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";
|
|
| 2530 | + } else {
|
|
| 2531 | + $output_str .= "<li><strong>".__('Something went wrong.', 'geodirectory')."</strong></li>";
|
|
| 2532 | 2532 | } |
| 2533 | 2533 | |
| 2534 | 2534 | if ($is_error_during_diagnose) {
|
@@ -2553,9 +2553,9 @@ discard block |
||
| 2553 | 2553 | * @param object $row The post|taxonomy object. |
| 2554 | 2554 | * @return array Filtered actions. |
| 2555 | 2555 | */ |
| 2556 | -function geodir_disable_quick_edit( $actions = array(), $row = null ) {
|
|
| 2557 | - if ( isset( $actions['inline hide-if-no-js'] ) ) {
|
|
| 2558 | - unset( $actions['inline hide-if-no-js'] ); |
|
| 2556 | +function geodir_disable_quick_edit($actions = array(), $row = null) {
|
|
| 2557 | + if (isset($actions['inline hide-if-no-js'])) {
|
|
| 2558 | + unset($actions['inline hide-if-no-js']); |
|
| 2559 | 2559 | } |
| 2560 | 2560 | |
| 2561 | 2561 | return $actions; |
@@ -2574,23 +2574,23 @@ discard block |
||
| 2574 | 2574 | function geodir_check_quick_edit() {
|
| 2575 | 2575 | global $pagenow, $current_screen, $gd_cpt_screen; |
| 2576 | 2576 | |
| 2577 | - if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {
|
|
| 2578 | - if ( empty( $gd_cpt_screen ) ) {
|
|
| 2579 | - if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {
|
|
| 2577 | + if (($pagenow == 'edit.php' || $pagenow == 'edit-tags.php') && !empty($current_screen->post_type)) {
|
|
| 2578 | + if (empty($gd_cpt_screen)) {
|
|
| 2579 | + if (in_array($current_screen->post_type, geodir_get_posttypes())) {
|
|
| 2580 | 2580 | $gd_cpt_screen = 'y'; |
| 2581 | 2581 | } else {
|
| 2582 | 2582 | $gd_cpt_screen = 'n'; |
| 2583 | 2583 | } |
| 2584 | 2584 | } |
| 2585 | 2585 | |
| 2586 | - if ( $gd_cpt_screen == 'y' ) {
|
|
| 2587 | - if ( $pagenow == 'edit.php' ) {
|
|
| 2588 | - add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2589 | - add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2590 | - } elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {
|
|
| 2591 | - add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2586 | + if ($gd_cpt_screen == 'y') {
|
|
| 2587 | + if ($pagenow == 'edit.php') {
|
|
| 2588 | + add_filter('post_row_actions', 'geodir_disable_quick_edit', 10, 2);
|
|
| 2589 | + add_filter('page_row_actions', 'geodir_disable_quick_edit', 10, 2);
|
|
| 2590 | + } elseif ($pagenow == 'edit-tags.php' && !empty($current_screen->taxonomy)) {
|
|
| 2591 | + add_filter($current_screen->taxonomy.'_row_actions', 'geodir_disable_quick_edit', 10, 2); |
|
| 2592 | 2592 | } |
| 2593 | 2593 | } |
| 2594 | 2594 | } |
| 2595 | 2595 | } |
| 2596 | -add_action( 'admin_head', 'geodir_check_quick_edit', 10 ); |
|
| 2597 | 2596 | \ No newline at end of file |
| 2597 | +add_action('admin_head', 'geodir_check_quick_edit', 10); |
|
| 2598 | 2598 | \ No newline at end of file |
@@ -28,31 +28,31 @@ discard block |
||
| 28 | 28 | * @package GeoDirectory |
| 29 | 29 | */ |
| 30 | 30 | function geodir_admin_styles() {
|
| 31 | - wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
| 31 | + wp_register_style('geodirectory-admin-css', geodir_plugin_url().'/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
| 32 | 32 | wp_enqueue_style('geodirectory-admin-css');
|
| 33 | 33 | |
| 34 | - wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
| 34 | + wp_register_style('geodirectory-frontend-style', geodir_plugin_url().'/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
| 35 | 35 | wp_enqueue_style('geodirectory-frontend-style');
|
| 36 | 36 | |
| 37 | - wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
| 37 | + wp_register_style('geodir-chosen-style', geodir_plugin_url().'/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
| 38 | 38 | wp_enqueue_style('geodir-chosen-style');
|
| 39 | 39 | |
| 40 | - wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
| 40 | + wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url().'/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
| 41 | 41 | wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
|
| 42 | 42 | |
| 43 | - wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
| 43 | + wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url().'/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
| 44 | 44 | wp_enqueue_style('geodirectory-jquery-ui-css');
|
| 45 | 45 | |
| 46 | - wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
| 46 | + wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url().'/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
| 47 | 47 | wp_enqueue_style('geodirectory-custom-fields-css');
|
| 48 | 48 | |
| 49 | - wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
| 49 | + wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url().'/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
| 50 | 50 | wp_enqueue_style('geodirectory-pluplodar-css');
|
| 51 | 51 | |
| 52 | - wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
| 52 | + wp_register_style('geodir-rating-style', geodir_plugin_url().'/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
| 53 | 53 | wp_enqueue_style('geodir-rating-style');
|
| 54 | 54 | |
| 55 | - wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
| 55 | + wp_register_style('geodir-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
| 56 | 56 | wp_enqueue_style('geodir-rtl-style');
|
| 57 | 57 | } |
| 58 | 58 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
| 71 | 71 | wp_enqueue_style('font-awesome');
|
| 72 | 72 | |
| 73 | - wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 73 | + wp_register_script('geodirectory-admin', geodir_plugin_url().'/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 74 | 74 | wp_enqueue_script('geodirectory-admin');
|
| 75 | 75 | |
| 76 | 76 | } |
@@ -89,68 +89,68 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | wp_enqueue_script('jquery');
|
| 91 | 91 | |
| 92 | - wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);
|
|
| 92 | + wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);
|
|
| 93 | 93 | |
| 94 | - wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 94 | + wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 95 | 95 | wp_enqueue_script('chosen');
|
| 96 | 96 | |
| 97 | - wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
| 97 | + wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
| 98 | 98 | wp_enqueue_script('geodirectory-choose-ajax');
|
| 99 | 99 | |
| 100 | 100 | if (isset($_REQUEST['listing_type'])) {
|
| 101 | - wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
|
|
| 101 | + wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url().'/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
|
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | wp_enqueue_script('geodirectory-custom-fields-script');
|
| 105 | - $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions'; |
|
| 105 | + $plugin_path = geodir_plugin_url().'/geodirectory-functions/cat-meta-functions'; |
|
| 106 | 106 | |
| 107 | - wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);
|
|
| 107 | + wp_enqueue_script('tax-meta-clss', $plugin_path.'/js/tax-meta-clss.js', array('jquery'), null, true);
|
|
| 108 | 108 | |
| 109 | 109 | if (in_array($geodir_map_name, array('auto', 'google'))) {
|
| 110 | - $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 111 | - $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 110 | + $map_lang = "&language=".geodir_get_map_default_language(); |
|
| 111 | + $map_key = "&key=".geodir_get_map_api_key(); |
|
| 112 | 112 | /** This filter is documented in geodirectory_template_tags.php */ |
| 113 | 113 | $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
| 114 | - wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
|
|
| 114 | + wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);
|
|
| 115 | 115 | |
| 116 | 116 | // Overlapping Marker Spiderfier |
| 117 | - wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 117 | + wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 118 | 118 | wp_enqueue_script('geodirectory-g-overlappingmarker-script');
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | if ($geodir_map_name == 'osm') {
|
| 122 | 122 | // Leaflet OpenStreetMap |
| 123 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 123 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 124 | 124 | wp_enqueue_style('geodirectory-leaflet-style');
|
| 125 | 125 | |
| 126 | - wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 126 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 127 | 127 | wp_enqueue_script('geodirectory-leaflet-script');
|
| 128 | 128 | |
| 129 | - wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 129 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 130 | 130 | wp_enqueue_script('geodirectory-leaflet-geo-script');
|
| 131 | 131 | |
| 132 | 132 | // Overlapping Marker Spiderfier Leaflet |
| 133 | - wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 133 | + wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 134 | 134 | wp_enqueue_script('geodirectory-o-overlappingmarker-script');
|
| 135 | 135 | } |
| 136 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 136 | + wp_enqueue_script('jquery-ui-autocomplete');
|
|
| 137 | 137 | |
| 138 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 138 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 139 | 139 | wp_enqueue_script('geodirectory-goMap-script');
|
| 140 | 140 | |
| 141 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 141 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 142 | 142 | wp_enqueue_script('geodirectory-goMap-script');
|
| 143 | 143 | |
| 144 | 144 | // font awesome rating script |
| 145 | 145 | if (get_option('geodir_reviewrating_enable_font_awesome')) {
|
| 146 | - wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 146 | + wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 147 | 147 | wp_enqueue_script('geodir-barrating-js');
|
| 148 | 148 | } else { // default rating script
|
| 149 | - wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);
|
|
| 149 | + wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);
|
|
| 150 | 150 | wp_enqueue_script('geodir-jRating-js');
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 153 | + wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 154 | 154 | wp_enqueue_script('geodir-on-document-load');
|
| 155 | 155 | |
| 156 | 156 | |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | wp_enqueue_script('plupload-all');
|
| 159 | 159 | wp_enqueue_script('jquery-ui-sortable');
|
| 160 | 160 | |
| 161 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 161 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 162 | 162 | wp_enqueue_script('geodirectory-plupload-script');
|
| 163 | 163 | |
| 164 | 164 | // SCRIPT FOR UPLOAD END |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
|
| 213 | 213 | |
| 214 | 214 | |
| 215 | - wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 215 | + wp_register_script('geodirectory-admin-script', geodir_plugin_url().'/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 216 | 216 | wp_enqueue_script('geodirectory-admin-script');
|
| 217 | 217 | |
| 218 | 218 | wp_enqueue_style('farbtastic');
|
@@ -220,10 +220,10 @@ discard block |
||
| 220 | 220 | |
| 221 | 221 | $screen = get_current_screen(); |
| 222 | 222 | if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
|
| 223 | - wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
|
|
| 223 | + wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation_admin.js');
|
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | - $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
|
|
| 226 | + $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl').'?geodir_ajax=true')));
|
|
| 227 | 227 | wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
|
| 228 | 228 | |
| 229 | 229 | } |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | |
| 247 | 247 | if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
|
| 248 | 248 | |
| 249 | - add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
| 249 | + add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url().'/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
| 250 | 250 | |
| 251 | 251 | |
| 252 | 252 | } |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | $geodir_menu_order[] = 'separator-geodirectory'; |
| 281 | 281 | if (!empty($post_types)) {
|
| 282 | 282 | foreach ($post_types as $post_type) {
|
| 283 | - $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
| 283 | + $geodir_menu_order[] = 'edit.php?post_type='.$post_type; |
|
| 284 | 284 | } |
| 285 | 285 | } |
| 286 | 286 | $geodir_menu_order[] = $item; |
@@ -323,8 +323,8 @@ discard block |
||
| 323 | 323 | {
|
| 324 | 324 | if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
|
| 325 | 325 | echo '<div id="message" class="updated fade"> |
| 326 | - <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>
|
|
| 327 | - <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>
|
|
| 326 | + <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory').' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">'.__('Support us by leaving a rating!', 'geodirectory').'</a></p>
|
|
| 327 | + <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory').'</strong></p>
|
|
| 328 | 328 | </div>'; |
| 329 | 329 | |
| 330 | 330 | } |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
|
| 333 | 333 | switch ($_REQUEST['msg']) {
|
| 334 | 334 | case 'success': |
| 335 | - echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
|
|
| 335 | + echo '<div id="message" class="updated fade"><p><strong>'.__('Your settings have been saved.', 'geodirectory').'</strong></p></div>';
|
|
| 336 | 336 | flush_rewrite_rules(false); |
| 337 | 337 | |
| 338 | 338 | break; |
@@ -340,30 +340,30 @@ discard block |
||
| 340 | 340 | $gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : ''; |
| 341 | 341 | |
| 342 | 342 | if ($gderr == 21) |
| 343 | - echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';
|
|
| 343 | + echo '<div id="message" class="error fade"><p><strong>'.__('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory').'</strong></p></div>';
|
|
| 344 | 344 | else |
| 345 | - echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
|
|
| 345 | + echo '<div id="message" class="error fade"><p><strong>'.__('Error: Your settings have not been saved, please try again.', 'geodirectory').'</strong></p></div>';
|
|
| 346 | 346 | break; |
| 347 | 347 | } |
| 348 | 348 | } |
| 349 | 349 | |
| 350 | 350 | $geodir_load_map = get_option('geodir_load_map');
|
| 351 | 351 | $need_map_key = false; |
| 352 | - if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
|
|
| 352 | + if ($geodir_load_map == '' || $geodir_load_map == 'google' || $geodir_load_map == 'auto') {
|
|
| 353 | 353 | $need_map_key = true; |
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | if (!geodir_get_map_api_key() && $need_map_key) {
|
| 357 | - echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 357 | + echo '<div class="error"><p><strong>'.sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings').'\'>', '</a>').'</strong></p></div>';
|
|
| 358 | 358 | } |
| 359 | 359 | |
| 360 | 360 | if (!geodir_is_default_location_set()) {
|
| 361 | - echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 361 | + echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';
|
|
| 362 | 362 | |
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | if (!function_exists('curl_init')) {
|
| 366 | - echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';
|
|
| 366 | + echo '<div class="error"><p><strong>'.__('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory').'</strong></p></div>';
|
|
| 367 | 367 | |
| 368 | 368 | } |
| 369 | 369 | |
@@ -383,18 +383,18 @@ discard block |
||
| 383 | 383 | function geodir_handle_option_form_submit($current_tab) |
| 384 | 384 | {
|
| 385 | 385 | global $geodir_settings; |
| 386 | - if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
|
|
| 386 | + if (file_exists(dirname(__FILE__).'/option-pages/'.$current_tab.'_array.php')) {
|
|
| 387 | 387 | /** |
| 388 | 388 | * Contains settings array for current tab. |
| 389 | 389 | * |
| 390 | 390 | * @since 1.0.0 |
| 391 | 391 | * @package GeoDirectory |
| 392 | 392 | */ |
| 393 | - include_once('option-pages/' . $current_tab . '_array.php');
|
|
| 393 | + include_once('option-pages/'.$current_tab.'_array.php');
|
|
| 394 | 394 | } |
| 395 | 395 | if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
| 396 | 396 | if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
| 397 | - if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 397 | + if (!wp_verify_nonce($_REQUEST['_wpnonce-'.$current_tab], 'geodir-settings-'.$current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 398 | 398 | |
| 399 | 399 | /** |
| 400 | 400 | * Fires before updating geodirectory admin settings. |
@@ -427,13 +427,13 @@ discard block |
||
| 427 | 427 | * @param string $current_tab The current settings tab name. |
| 428 | 428 | * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
| 429 | 429 | */ |
| 430 | - do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
|
|
| 430 | + do_action('geodir_update_options_'.$current_tab, $geodir_settings[$current_tab]);
|
|
| 431 | 431 | |
| 432 | 432 | flush_rewrite_rules(false); |
| 433 | 433 | |
| 434 | 434 | $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : ''; |
| 435 | 435 | |
| 436 | - $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
|
|
| 436 | + $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$_REQUEST['active_tab'].'&msg=success');
|
|
| 437 | 437 | |
| 438 | 438 | wp_redirect($redirect_url); |
| 439 | 439 | exit(); |
@@ -472,18 +472,18 @@ discard block |
||
| 472 | 472 | |
| 473 | 473 | elseif (isset($value['type']) && $value['type'] == 'image_width') : |
| 474 | 474 | |
| 475 | - if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
|
|
| 476 | - update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']); |
|
| 477 | - update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']); |
|
| 478 | - if (isset($_POST[$value['id'] . '_crop'])) : |
|
| 479 | - update_option($value['id'] . '_crop', 1); |
|
| 475 | + if (isset($value['id']) && isset($_POST[$value['id'].'_width'])) {
|
|
| 476 | + update_option($value['id'].'_width', $_POST[$value['id'].'_width']); |
|
| 477 | + update_option($value['id'].'_height', $_POST[$value['id'].'_height']); |
|
| 478 | + if (isset($_POST[$value['id'].'_crop'])) : |
|
| 479 | + update_option($value['id'].'_crop', 1); |
|
| 480 | 480 | else : |
| 481 | - update_option($value['id'] . '_crop', 0); |
|
| 481 | + update_option($value['id'].'_crop', 0); |
|
| 482 | 482 | endif; |
| 483 | 483 | } else {
|
| 484 | - update_option($value['id'] . '_width', $value['std']); |
|
| 485 | - update_option($value['id'] . '_height', $value['std']); |
|
| 486 | - update_option($value['id'] . '_crop', 1); |
|
| 484 | + update_option($value['id'].'_width', $value['std']); |
|
| 485 | + update_option($value['id'].'_height', $value['std']); |
|
| 486 | + update_option($value['id'].'_crop', 1); |
|
| 487 | 487 | } |
| 488 | 488 | |
| 489 | 489 | elseif (isset($value['type']) && $value['type'] == 'map') : |
@@ -525,12 +525,12 @@ discard block |
||
| 525 | 525 | elseif (isset($value['type']) && $value['type'] == 'file') : |
| 526 | 526 | |
| 527 | 527 | |
| 528 | - if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
|
|
| 528 | + if (isset($_POST[$value['id'].'_remove']) && $_POST[$value['id'].'_remove']) {// if remove is set then remove the file
|
|
| 529 | 529 | |
| 530 | 530 | if (get_option($value['id'])) {
|
| 531 | 531 | $image_name_arr = explode('/', get_option($value['id']));
|
| 532 | 532 | $noimg_name = end($image_name_arr); |
| 533 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 533 | + $img_path = $uploads['path'].'/'.$noimg_name; |
|
| 534 | 534 | if (file_exists($img_path)) |
| 535 | 535 | unlink($img_path); |
| 536 | 536 | } |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | if (get_option($value['id'])) {
|
| 559 | 559 | $image_name_arr = explode('/', get_option($value['id']));
|
| 560 | 560 | $noimg_name = end($image_name_arr); |
| 561 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 561 | + $img_path = $uploads['path'].'/'.$noimg_name; |
|
| 562 | 562 | if (file_exists($img_path)) |
| 563 | 563 | unlink($img_path); |
| 564 | 564 | } |
@@ -579,7 +579,7 @@ discard block |
||
| 579 | 579 | // same menu setting per theme. |
| 580 | 580 | if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
| 581 | 581 | $theme = wp_get_theme(); |
| 582 | - update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
|
| 582 | + update_option('geodir_theme_location_nav_'.$theme->name, $_POST[$value['id']]);
|
|
| 583 | 583 | } |
| 584 | 584 | |
| 585 | 585 | if (isset($value['id']) && isset($_POST[$value['id']])) {
|
@@ -649,7 +649,7 @@ discard block |
||
| 649 | 649 | |
| 650 | 650 | $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory'); |
| 651 | 651 | |
| 652 | - $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
| 652 | + $tabs[$geodir_post_type.'_fields_settings'] = array( |
|
| 653 | 653 | 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
|
| 654 | 654 | 'subtabs' => array( |
| 655 | 655 | array('subtab' => 'custom_fields',
|
@@ -683,7 +683,7 @@ discard block |
||
| 683 | 683 | */ |
| 684 | 684 | function geodir_tools_setting_tab($tabs) |
| 685 | 685 | {
|
| 686 | - wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 686 | + wp_enqueue_script('jquery-ui-progressbar');
|
|
| 687 | 687 | $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
|
| 688 | 688 | return $tabs; |
| 689 | 689 | } |
@@ -717,7 +717,7 @@ discard block |
||
| 717 | 717 | */ |
| 718 | 718 | function geodir_extend_geodirectory_setting_tab($tabs) |
| 719 | 719 | {
|
| 720 | - $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 720 | + $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory').' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 721 | 721 | return $tabs; |
| 722 | 722 | } |
| 723 | 723 | |
@@ -777,8 +777,8 @@ discard block |
||
| 777 | 777 | _e('Unknown', 'geodirectory');
|
| 778 | 778 | } else {
|
| 779 | 779 | /* If there is a city id, append 'city name' to the text string. */ |
| 780 | - $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
|
|
| 781 | - echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id); |
|
| 780 | + $add_location_id = $location_id > 0 ? ' ('.$location_id.')' : '';
|
|
| 781 | + echo(__($location->country, 'geodirectory').'-'.$location->region.'-'.$location->city.$add_location_id); |
|
| 782 | 782 | } |
| 783 | 783 | break; |
| 784 | 784 | |
@@ -796,14 +796,14 @@ discard block |
||
| 796 | 796 | $expire_class = 'expire_over'; |
| 797 | 797 | } |
| 798 | 798 | $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days |
| 799 | - $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
|
|
| 799 | + $date_diff_text = '<br /><span class="'.$expire_class.'">('.$date_diff.' '.$state.')</span>';
|
|
| 800 | 800 | } |
| 801 | 801 | /* If no expire_date is found, output a default message. */ |
| 802 | 802 | if (empty($expire_date)) |
| 803 | 803 | echo __('Unknown', 'geodirectory');
|
| 804 | 804 | /* If there is a expire_date, append 'days left' to the text string. */ |
| 805 | 805 | else |
| 806 | - echo $expire_date . $date_diff_text; |
|
| 806 | + echo $expire_date.$date_diff_text; |
|
| 807 | 807 | break; |
| 808 | 808 | |
| 809 | 809 | /* If displaying the 'categorys' column. */ |
@@ -870,7 +870,7 @@ discard block |
||
| 870 | 870 | function geodir_post_information_save($post_id, $post) {
|
| 871 | 871 | global $wpdb, $current_user; |
| 872 | 872 | |
| 873 | - if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
|
|
| 873 | + if (isset($post->post_type) && ($post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post')) {
|
|
| 874 | 874 | return; |
| 875 | 875 | } |
| 876 | 876 | |
@@ -938,7 +938,7 @@ discard block |
||
| 938 | 938 | $tab_id = $value['id']; |
| 939 | 939 | |
| 940 | 940 | if (isset($value['desc']) && $value['desc']) |
| 941 | - $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 941 | + $desc = '<span style=" text-transform:none;">:- '.$value['desc'].'</span>'; |
|
| 942 | 942 | |
| 943 | 943 | if (isset($value['name']) && $value['name']) {
|
| 944 | 944 | if ($first_title === true) {
|
@@ -946,9 +946,9 @@ discard block |
||
| 946 | 946 | } else {
|
| 947 | 947 | echo '</div>'; |
| 948 | 948 | } |
| 949 | - echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>'; |
|
| 949 | + echo '<dd id="'.trim($tab_id).'" class="geodir_option_tabs" ><a href="javascript:void(0);">'.$value['name'].'</a></dd>'; |
|
| 950 | 950 | |
| 951 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 951 | + echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 952 | 952 | } |
| 953 | 953 | |
| 954 | 954 | /** |
@@ -958,21 +958,21 @@ discard block |
||
| 958 | 958 | * |
| 959 | 959 | * @since 1.0.0 |
| 960 | 960 | */ |
| 961 | - do_action('geodir_settings_' . sanitize_title($value['id']));
|
|
| 961 | + do_action('geodir_settings_'.sanitize_title($value['id']));
|
|
| 962 | 962 | break; |
| 963 | 963 | |
| 964 | 964 | case 'no_tabs': |
| 965 | 965 | |
| 966 | 966 | echo '<div class="inner_content_tab_main">'; |
| 967 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 967 | + echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 968 | 968 | |
| 969 | 969 | break; |
| 970 | 970 | |
| 971 | 971 | case 'sectionstart': |
| 972 | 972 | if (isset($value['desc']) && $value['desc']) |
| 973 | - $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 973 | + $desc = '<span style=" text-transform:none;"> - '.$value['desc'].'</span>'; |
|
| 974 | 974 | if (isset($value['name']) && $value['name']) |
| 975 | - echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 975 | + echo '<h3>'.$value['name'].$desc.'</h3>'; |
|
| 976 | 976 | /** |
| 977 | 977 | * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
| 978 | 978 | * |
@@ -980,8 +980,8 @@ discard block |
||
| 980 | 980 | * |
| 981 | 981 | * @since 1.0.0 |
| 982 | 982 | */ |
| 983 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
|
|
| 984 | - echo '<table class="form-table">' . "\n\n"; |
|
| 983 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_start');
|
|
| 984 | + echo '<table class="form-table">'."\n\n"; |
|
| 985 | 985 | |
| 986 | 986 | break; |
| 987 | 987 | case 'sectionend': |
@@ -992,7 +992,7 @@ discard block |
||
| 992 | 992 | * |
| 993 | 993 | * @since 1.0.0 |
| 994 | 994 | */ |
| 995 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
| 995 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_end');
|
|
| 996 | 996 | echo '</table>'; |
| 997 | 997 | /** |
| 998 | 998 | * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
@@ -1001,7 +1001,7 @@ discard block |
||
| 1001 | 1001 | * |
| 1002 | 1002 | * @since 1.0.0 |
| 1003 | 1003 | */ |
| 1004 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
| 1004 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_after');
|
|
| 1005 | 1005 | break; |
| 1006 | 1006 | case 'text': |
| 1007 | 1007 | ?> |
@@ -1010,7 +1010,7 @@ discard block |
||
| 1010 | 1010 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
| 1011 | 1011 | id="<?php echo esc_attr($value['id']); ?>" |
| 1012 | 1012 | type="<?php echo esc_attr($value['type']); ?>" |
| 1013 | - <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1013 | + <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1014 | 1014 | style=" <?php echo esc_attr($value['css']); ?>" |
| 1015 | 1015 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1016 | 1016 | echo esc_attr(stripslashes(get_option($value['id']))); |
@@ -1027,14 +1027,14 @@ discard block |
||
| 1027 | 1027 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
| 1028 | 1028 | id="<?php echo esc_attr($value['id']); ?>" |
| 1029 | 1029 | type="<?php echo esc_attr($value['type']); ?>" |
| 1030 | - <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1030 | + <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1031 | 1031 | style=" <?php echo esc_attr($value['css']); ?>" |
| 1032 | 1032 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1033 | 1033 | echo esc_attr(stripslashes(get_option($value['id']))); |
| 1034 | 1034 | } else {
|
| 1035 | 1035 | echo esc_attr($value['std']); |
| 1036 | 1036 | } ?>"/> |
| 1037 | - <a href='https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )','geodirectory');?>" ><?php _e('Generate API Key','geodirectory');?></a>
|
|
| 1037 | + <a href='https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )', 'geodirectory'); ?>" ><?php _e('Generate API Key', 'geodirectory'); ?></a>
|
|
| 1038 | 1038 | <span class="description"><?php echo $value['desc']; ?></span></td> |
| 1039 | 1039 | </tr><?php |
| 1040 | 1040 | break; |
@@ -1046,7 +1046,7 @@ discard block |
||
| 1046 | 1046 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
| 1047 | 1047 | id="<?php echo esc_attr($value['id']); ?>" |
| 1048 | 1048 | type="<?php echo esc_attr($value['type']); ?>" |
| 1049 | - <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1049 | + <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1050 | 1050 | style="<?php echo esc_attr($value['css']); ?>" |
| 1051 | 1051 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1052 | 1052 | echo esc_attr(stripslashes(get_option($value['id']))); |
@@ -1092,17 +1092,17 @@ discard block |
||
| 1092 | 1092 | <?php _e('Width', 'geodirectory'); ?> <input
|
| 1093 | 1093 | name="<?php echo esc_attr($value['id']); ?>_width" |
| 1094 | 1094 | id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3" |
| 1095 | - value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/> |
|
| 1095 | + value="<?php if ($size = get_option($value['id'].'_width')) echo stripslashes($size); else echo $value['std']; ?>"/> |
|
| 1096 | 1096 | |
| 1097 | 1097 | <?php _e('Height', 'geodirectory'); ?> <input
|
| 1098 | 1098 | name="<?php echo esc_attr($value['id']); ?>_height" |
| 1099 | 1099 | id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3" |
| 1100 | - value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/> |
|
| 1100 | + value="<?php if ($size = get_option($value['id'].'_height')) echo stripslashes($size); else echo $value['std']; ?>"/> |
|
| 1101 | 1101 | |
| 1102 | 1102 | <label><?php _e('Hard Crop', 'geodirectory'); ?> <input
|
| 1103 | 1103 | name="<?php echo esc_attr($value['id']); ?>_crop" |
| 1104 | 1104 | id="<?php echo esc_attr($value['id']); ?>_crop" |
| 1105 | - type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label> |
|
| 1105 | + type="checkbox" <?php if (get_option($value['id'].'_crop') != '') checked(get_option($value['id'].'_crop'), 1); else checked(1); ?> /></label> |
|
| 1106 | 1106 | |
| 1107 | 1107 | <span class="description"><?php echo $value['desc'] ?></span></td> |
| 1108 | 1108 | </tr><?php |
@@ -1152,7 +1152,7 @@ discard block |
||
| 1152 | 1152 | id="<?php echo esc_attr($value['id']); ?>" |
| 1153 | 1153 | style="<?php echo esc_attr($value['css']); ?>" |
| 1154 | 1154 | class="<?php if (isset($value['class'])) echo $value['class']; ?>" |
| 1155 | - data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>" |
|
| 1155 | + data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text']; ?>" |
|
| 1156 | 1156 | option-ajaxchosen="false"> |
| 1157 | 1157 | <?php |
| 1158 | 1158 | foreach ($value['options'] as $key => $val) {
|
@@ -1162,7 +1162,7 @@ discard block |
||
| 1162 | 1162 | ?></optgroup><?php |
| 1163 | 1163 | } else {
|
| 1164 | 1164 | ?> |
| 1165 | - <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>> |
|
| 1165 | + <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values))); ?>> |
|
| 1166 | 1166 | <?php echo geodir_utf8_ucfirst($val) ?> |
| 1167 | 1167 | </option> |
| 1168 | 1168 | <?php |
@@ -1199,7 +1199,7 @@ discard block |
||
| 1199 | 1199 | ?> |
| 1200 | 1200 | |
| 1201 | 1201 | <tr valign="top"> |
| 1202 | - <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>
|
|
| 1202 | + <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory'); ?></th>
|
|
| 1203 | 1203 | <td width="60%"> |
| 1204 | 1204 | <select name="geodir_default_map_language" style="width:60%"> |
| 1205 | 1205 | <?php |
@@ -1281,7 +1281,7 @@ discard block |
||
| 1281 | 1281 | |
| 1282 | 1282 | <tr valign="top"> |
| 1283 | 1283 | <th class="titledesc" |
| 1284 | - width="40%"><?php _e('Default post type search on map', 'geodirectory');?></th>
|
|
| 1284 | + width="40%"><?php _e('Default post type search on map', 'geodirectory'); ?></th>
|
|
| 1285 | 1285 | <td width="60%"> |
| 1286 | 1286 | <select name="geodir_default_map_search_pt" style="width:60%"> |
| 1287 | 1287 | <?php |
@@ -1322,7 +1322,7 @@ discard block |
||
| 1322 | 1322 | $cat_display = 'checkbox'; |
| 1323 | 1323 | $gd_post_types = get_option('geodir_exclude_post_type_on_map');
|
| 1324 | 1324 | $gd_cats = get_option('geodir_exclude_cat_on_map');
|
| 1325 | - $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1325 | + $gd_cats_upgrade = (int) get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1326 | 1326 | $count = 1; |
| 1327 | 1327 | ?> |
| 1328 | 1328 | <table width="70%" class="widefat"> |
@@ -1351,7 +1351,7 @@ discard block |
||
| 1351 | 1351 | name="home_map_post_types[]" |
| 1352 | 1352 | id="<?php echo esc_attr($value['id']); ?>" |
| 1353 | 1353 | value="<?php echo $key; ?>" |
| 1354 | - class="map_post_type" <?php echo $checked;?> /> |
|
| 1354 | + class="map_post_type" <?php echo $checked; ?> /> |
|
| 1355 | 1355 | <?php echo __($post_types_obj->labels->singular_name, 'geodirectory'); ?></td> |
| 1356 | 1356 | <td width="40%"> |
| 1357 | 1357 | <div class="home_map_category" style="overflow:auto;width:200px;height:100px;" |
@@ -1409,12 +1409,12 @@ discard block |
||
| 1409 | 1409 | ?> |
| 1410 | 1410 | <fieldset> |
| 1411 | 1411 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
| 1412 | - <label for="<?php echo $value['id'];?>"> |
|
| 1412 | + <label for="<?php echo $value['id']; ?>"> |
|
| 1413 | 1413 | <input name="<?php echo esc_attr($value['id']); ?>" |
| 1414 | - id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio" |
|
| 1414 | + id="<?php echo esc_attr($value['id'].$value['value']); ?>" type="radio" |
|
| 1415 | 1415 | value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {
|
| 1416 | 1416 | echo 'checked="checked"'; |
| 1417 | - }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
| 1417 | + }elseif (get_option($value['id']) == '' && $value['std'] == $value['value']) {echo 'checked="checked"'; } ?> />
|
|
| 1418 | 1418 | <?php echo $value['desc']; ?></label><br> |
| 1419 | 1419 | </fieldset> |
| 1420 | 1420 | <?php |
@@ -1434,9 +1434,9 @@ discard block |
||
| 1434 | 1434 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1435 | 1435 | <td class="forminp"> |
| 1436 | 1436 | <textarea |
| 1437 | - <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>" |
|
| 1437 | + <?php if (isset($value['args'])) echo $value['args'].' '; ?>name="<?php echo esc_attr($value['id']); ?>" |
|
| 1438 | 1438 | id="<?php echo esc_attr($value['id']); ?>" |
| 1439 | - <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1439 | + <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1440 | 1440 | style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span |
| 1441 | 1441 | class="description"><?php echo $value['desc'] ?></span> |
| 1442 | 1442 | |
@@ -1481,7 +1481,7 @@ discard block |
||
| 1481 | 1481 | } |
| 1482 | 1482 | } |
| 1483 | 1483 | // |
| 1484 | - $page_setting = (int)get_option($value['id']); |
|
| 1484 | + $page_setting = (int) get_option($value['id']); |
|
| 1485 | 1485 | |
| 1486 | 1486 | $args = array('name' => $value['id'],
|
| 1487 | 1487 | 'id' => $value['id'], |
@@ -1498,7 +1498,7 @@ discard block |
||
| 1498 | 1498 | <tr valign="top" class="single_select_page"> |
| 1499 | 1499 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1500 | 1500 | <td class="forminp"> |
| 1501 | - <?php echo str_replace(' id=', " data-placeholder='" . __('Select a page...', 'geodirectory') . "' style='" . $value['css'] . "' class='" . $value['class'] . "' " . $disabled . " id=", wp_dropdown_pages($args)); ?>
|
|
| 1501 | + <?php echo str_replace(' id=', " data-placeholder='".__('Select a page...', 'geodirectory')."' style='".$value['css']."' class='".$value['class']."' ".$disabled." id=", wp_dropdown_pages($args)); ?>
|
|
| 1502 | 1502 | <span class="description"><?php echo $value['desc'] ?></span> |
| 1503 | 1503 | </td> |
| 1504 | 1504 | </tr><?php |
@@ -1507,7 +1507,7 @@ discard block |
||
| 1507 | 1507 | } |
| 1508 | 1508 | break; |
| 1509 | 1509 | case 'single_select_country' : |
| 1510 | - $country_setting = (string)get_option($value['id']); |
|
| 1510 | + $country_setting = (string) get_option($value['id']); |
|
| 1511 | 1511 | if (strstr($country_setting, ':')) : |
| 1512 | 1512 | $country = current(explode(':', $country_setting));
|
| 1513 | 1513 | $state = end(explode(':', $country_setting));
|
@@ -1530,7 +1530,7 @@ discard block |
||
| 1530 | 1530 | case 'multi_select_countries' : |
| 1531 | 1531 | $countries = $geodirectory->countries->countries; |
| 1532 | 1532 | asort($countries); |
| 1533 | - $selections = (array)get_option($value['id']); |
|
| 1533 | + $selections = (array) get_option($value['id']); |
|
| 1534 | 1534 | ?> |
| 1535 | 1535 | <tr valign="top"> |
| 1536 | 1536 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
@@ -1540,7 +1540,7 @@ discard block |
||
| 1540 | 1540 | title="Country" class="chosen_select"> |
| 1541 | 1541 | <?php |
| 1542 | 1542 | if ($countries) foreach ($countries as $key => $val) : |
| 1543 | - echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1543 | + echo '<option value="'.$key.'" '.selected(in_array($key, $selections), true, false).'>'.$val.'</option>'; |
|
| 1544 | 1544 | endforeach; |
| 1545 | 1545 | ?> |
| 1546 | 1546 | </select> |
@@ -1552,7 +1552,7 @@ discard block |
||
| 1552 | 1552 | break; |
| 1553 | 1553 | |
| 1554 | 1554 | case 'google_analytics' : |
| 1555 | - $selections = (array)get_option($value['id']); |
|
| 1555 | + $selections = (array) get_option($value['id']); |
|
| 1556 | 1556 | ?> |
| 1557 | 1557 | <tr valign="top"> |
| 1558 | 1558 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
@@ -1563,30 +1563,30 @@ discard block |
||
| 1563 | 1563 | |
| 1564 | 1564 | $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
| 1565 | 1565 | $scope = "scope=https://www.googleapis.com/auth/analytics.readonly"; |
| 1566 | - $state = "&state=123";//any string |
|
| 1567 | - $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 1566 | + $state = "&state=123"; //any string |
|
| 1567 | + $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";
|
|
| 1568 | 1568 | $response_type = "&response_type=code"; |
| 1569 | 1569 | $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
| 1570 | 1570 | $access_type = "&access_type=offline"; |
| 1571 | 1571 | $approval_prompt = "&approval_prompt=force"; |
| 1572 | 1572 | |
| 1573 | - $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt; |
|
| 1573 | + $auth_url = $oAuthURL.$scope.$state.$redirect_uri.$response_type.$client_id.$access_type.$approval_prompt; |
|
| 1574 | 1574 | |
| 1575 | 1575 | |
| 1576 | 1576 | if (get_option('geodir_ga_auth_token')) {
|
| 1577 | 1577 | ?> |
| 1578 | 1578 | <span class="button-primary" |
| 1579 | - onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize');?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
|
|
| 1579 | + onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize'); ?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
|
|
| 1580 | 1580 | <span style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>
|
| 1581 | 1581 | <?php |
| 1582 | 1582 | global $gd_ga_errors; |
| 1583 | - if(!empty($gd_ga_errors)){
|
|
| 1583 | + if (!empty($gd_ga_errors)) {
|
|
| 1584 | 1584 | print_r($gd_ga_errors); |
| 1585 | 1585 | } |
| 1586 | 1586 | } else {
|
| 1587 | 1587 | ?> |
| 1588 | 1588 | <span class="button-primary" |
| 1589 | - onclick="window.open('<?php echo geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory');?></span>
|
|
| 1589 | + onclick="window.open('<?php echo geodir_ga_activation_url(); ?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory'); ?></span>
|
|
| 1590 | 1590 | <?php |
| 1591 | 1591 | } |
| 1592 | 1592 | ?> |
@@ -1657,9 +1657,9 @@ discard block |
||
| 1657 | 1657 | |
| 1658 | 1658 | <?php if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] != '') { ?>
|
| 1659 | 1659 | jQuery('.geodir_option_tabs').removeClass('gd-tab-active');
|
| 1660 | - jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').addClass('gd-tab-active');
|
|
| 1660 | + jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').addClass('gd-tab-active');
|
|
| 1661 | 1661 | jQuery('.gd-content-heading').hide();
|
| 1662 | - jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').show();
|
|
| 1662 | + jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').show();
|
|
| 1663 | 1663 | <?php } ?> |
| 1664 | 1664 | }); |
| 1665 | 1665 | </script> |
@@ -1745,7 +1745,7 @@ discard block |
||
| 1745 | 1745 | wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
| 1746 | 1746 | |
| 1747 | 1747 | if (geodir_get_featured_image($post_id, 'thumbnail')) {
|
| 1748 | - echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
|
|
| 1748 | + echo '<h4>'.__('Featured Image', 'geodirectory').'</h4>';
|
|
| 1749 | 1749 | geodir_show_featured_image($post_id, 'thumbnail'); |
| 1750 | 1750 | } |
| 1751 | 1751 | |
@@ -1756,13 +1756,13 @@ discard block |
||
| 1756 | 1756 | |
| 1757 | 1757 | <h5 class="form_title"> |
| 1758 | 1758 | <?php if ($image_limit != 0 && $image_limit == 1) {
|
| 1759 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 1759 | + echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';
|
|
| 1760 | 1760 | } ?> |
| 1761 | 1761 | <?php if ($image_limit != 0 && $image_limit > 1) {
|
| 1762 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 1762 | + echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';
|
|
| 1763 | 1763 | } ?> |
| 1764 | 1764 | <?php if ($image_limit == 0) {
|
| 1765 | - echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 1765 | + echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';
|
|
| 1766 | 1766 | } ?> |
| 1767 | 1767 | </h5> |
| 1768 | 1768 | |
@@ -1801,10 +1801,10 @@ discard block |
||
| 1801 | 1801 | <div |
| 1802 | 1802 | class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>" |
| 1803 | 1803 | id="<?php echo $id; ?>plupload-upload-ui"> |
| 1804 | - <h4><?php _e('Drop files to upload', 'geodirectory');?></h4>
|
|
| 1804 | + <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4>
|
|
| 1805 | 1805 | <input id="<?php echo $id; ?>plupload-browse-button" type="button" |
| 1806 | 1806 | value="<?php _e('Select Files', 'geodirectory'); ?>" class="button"/>
|
| 1807 | - <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span> |
|
| 1807 | + <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span> |
|
| 1808 | 1808 | <?php if ($width && $height): ?> |
| 1809 | 1809 | <span class="plupload-resize"></span> |
| 1810 | 1810 | <span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span> |
@@ -1816,7 +1816,7 @@ discard block |
||
| 1816 | 1816 | id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;"> |
| 1817 | 1817 | </div> |
| 1818 | 1818 | <span |
| 1819 | - id="upload-msg"><?php _e('Please drag & drop the images to rearrange the order', 'geodirectory');?></span>
|
|
| 1819 | + id="upload-msg"><?php _e('Please drag & drop the images to rearrange the order', 'geodirectory'); ?></span>
|
|
| 1820 | 1820 | <span id="<?php echo $id; ?>upload-error" style="display:none"></span> |
| 1821 | 1821 | </div> |
| 1822 | 1822 | |
@@ -2026,9 +2026,9 @@ discard block |
||
| 2026 | 2026 | $plugin = 'avada-nag'; |
| 2027 | 2027 | $timestamp = 'avada-nag1234'; |
| 2028 | 2028 | $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');
|
| 2029 | - echo '<div id="' . $timestamp . '" class="error">'; |
|
| 2030 | - echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>'; |
|
| 2031 | - echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
| 2029 | + echo '<div id="'.$timestamp.'" class="error">'; |
|
| 2030 | + echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\''.$plugin.'\',\''.$timestamp.'\');" ><i class="fa fa-times"></i></span>'; |
|
| 2031 | + echo "<img class='gd-icon-noti' src='".plugin_dir_url('')."geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
| 2032 | 2032 | echo "<p>$message</p>"; |
| 2033 | 2033 | echo "</div>"; |
| 2034 | 2034 | |
@@ -2162,7 +2162,7 @@ discard block |
||
| 2162 | 2162 | |
| 2163 | 2163 | // Don't allow same slug url for listing and location |
| 2164 | 2164 | if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {
|
| 2165 | - $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');
|
|
| 2165 | + $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab.'&msg=fail&gderr=21');
|
|
| 2166 | 2166 | wp_redirect($redirect_url); |
| 2167 | 2167 | exit; |
| 2168 | 2168 | } |
@@ -2174,7 +2174,7 @@ discard block |
||
| 2174 | 2174 | $default_language = $sitepress->get_default_language(); |
| 2175 | 2175 | |
| 2176 | 2176 | if ($current_language != 'all' && $current_language != $default_language) {
|
| 2177 | - $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab);
|
|
| 2177 | + $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab);
|
|
| 2178 | 2178 | wp_redirect($redirect_url); |
| 2179 | 2179 | exit; |
| 2180 | 2180 | } |
@@ -2195,11 +2195,11 @@ discard block |
||
| 2195 | 2195 | function geodir_hide_admin_preview_button() {
|
| 2196 | 2196 | global $post_type; |
| 2197 | 2197 | $post_types = geodir_get_posttypes(); |
| 2198 | - if(in_array($post_type, $post_types)) |
|
| 2198 | + if (in_array($post_type, $post_types)) |
|
| 2199 | 2199 | echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
| 2200 | 2200 | } |
| 2201 | -add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' ); |
|
| 2202 | -add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' ); |
|
| 2201 | +add_action('admin_head-post-new.php', 'geodir_hide_admin_preview_button');
|
|
| 2202 | +add_action('admin_head-post.php', 'geodir_hide_admin_preview_button');
|
|
| 2203 | 2203 | |
| 2204 | 2204 | /** |
| 2205 | 2205 | * Add the tab in left sidebar menu fro import & export page. |
@@ -2209,8 +2209,8 @@ discard block |
||
| 2209 | 2209 | * |
| 2210 | 2210 | * @return array Array of tab data. |
| 2211 | 2211 | */ |
| 2212 | -function geodir_import_export_tab( $tabs ) {
|
|
| 2213 | - $tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) ); |
|
| 2212 | +function geodir_import_export_tab($tabs) {
|
|
| 2213 | + $tabs['import_export'] = array('label' => __('Import & Export', 'geodirectory'));
|
|
| 2214 | 2214 | return $tabs; |
| 2215 | 2215 | } |
| 2216 | 2216 | |
@@ -2224,8 +2224,8 @@ discard block |
||
| 2224 | 2224 | * @return string Html content. |
| 2225 | 2225 | */ |
| 2226 | 2226 | function geodir_import_export_page() {
|
| 2227 | - $nonce = wp_create_nonce( 'geodir_import_export_nonce' ); |
|
| 2228 | - $gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv'; |
|
| 2227 | + $nonce = wp_create_nonce('geodir_import_export_nonce');
|
|
| 2228 | + $gd_cats_sample_csv = geodir_plugin_url().'/geodirectory-assets/gd_sample_categories.csv'; |
|
| 2229 | 2229 | /** |
| 2230 | 2230 | * Filter sample category data csv file url. |
| 2231 | 2231 | * |
@@ -2234,9 +2234,9 @@ discard block |
||
| 2234 | 2234 | * |
| 2235 | 2235 | * @param string $gd_cats_sample_csv Sample category data csv file url. |
| 2236 | 2236 | */ |
| 2237 | - $gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv ); |
|
| 2237 | + $gd_cats_sample_csv = apply_filters('geodir_export_cats_sample_csv', $gd_cats_sample_csv);
|
|
| 2238 | 2238 | |
| 2239 | - $gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv'; |
|
| 2239 | + $gd_posts_sample_csv = geodir_plugin_url().'/geodirectory-assets/place_listing.csv'; |
|
| 2240 | 2240 | /** |
| 2241 | 2241 | * Filter sample post data csv file url. |
| 2242 | 2242 | * |
@@ -2245,15 +2245,15 @@ discard block |
||
| 2245 | 2245 | * |
| 2246 | 2246 | * @param string $gd_posts_sample_csv Sample post data csv file url. |
| 2247 | 2247 | */ |
| 2248 | - $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
| 2248 | + $gd_posts_sample_csv = apply_filters('geodir_export_posts_sample_csv', $gd_posts_sample_csv);
|
|
| 2249 | 2249 | |
| 2250 | - $gd_posttypes = geodir_get_posttypes( 'array' ); |
|
| 2250 | + $gd_posttypes = geodir_get_posttypes('array');
|
|
| 2251 | 2251 | |
| 2252 | 2252 | $gd_posttypes_option = ''; |
| 2253 | - foreach ( $gd_posttypes as $gd_posttype => $row ) {
|
|
| 2254 | - $gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int)geodir_get_terms_count( $gd_posttype ) . '" data-posts="' . (int)geodir_get_posts_count( $gd_posttype ) . '">' . __( $row['labels']['name'], 'geodirectory' ) . '</option>'; |
|
| 2253 | + foreach ($gd_posttypes as $gd_posttype => $row) {
|
|
| 2254 | + $gd_posttypes_option .= '<option value="'.$gd_posttype.'" data-cats="'.(int) geodir_get_terms_count($gd_posttype).'" data-posts="'.(int) geodir_get_posts_count($gd_posttype).'">'.__($row['labels']['name'], 'geodirectory').'</option>'; |
|
| 2255 | 2255 | } |
| 2256 | - wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 2256 | + wp_enqueue_script('jquery-ui-progressbar');
|
|
| 2257 | 2257 | |
| 2258 | 2258 | $gd_chunksize_options = array(); |
| 2259 | 2259 | $gd_chunksize_options[100] = 100; |
@@ -2275,50 +2275,50 @@ discard block |
||
| 2275 | 2275 | * |
| 2276 | 2276 | * @param string $gd_chunksize_options Entries options. |
| 2277 | 2277 | */ |
| 2278 | - $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options ); |
|
| 2278 | + $gd_chunksize_options = apply_filters('geodir_export_csv_chunksize_options', $gd_chunksize_options);
|
|
| 2279 | 2279 | |
| 2280 | 2280 | $gd_chunksize_option = ''; |
| 2281 | 2281 | foreach ($gd_chunksize_options as $value => $title) {
|
| 2282 | - $gd_chunksize_option .= '<option value="' . $value . '" ' . selected($value, 5000, false) . '>' . $title . '</option>'; |
|
| 2282 | + $gd_chunksize_option .= '<option value="'.$value.'" '.selected($value, 5000, false).'>'.$title.'</option>'; |
|
| 2283 | 2283 | } |
| 2284 | 2284 | |
| 2285 | 2285 | $uploads = wp_upload_dir(); |
| 2286 | - $upload_dir = wp_sprintf( CSV_TRANSFER_IMG_FOLDER, str_replace( ABSPATH, '', $uploads['path'] ) ); |
|
| 2286 | + $upload_dir = wp_sprintf(CSV_TRANSFER_IMG_FOLDER, str_replace(ABSPATH, '', $uploads['path'])); |
|
| 2287 | 2287 | ?> |
| 2288 | 2288 | </form> |
| 2289 | 2289 | <div class="inner_content_tab_main gd-import-export"> |
| 2290 | - <h3><?php _e( 'GD Import & Export CSV', 'geodirectory' ) ;?></h3> |
|
| 2291 | - <span class="description"><?php _e( 'Import & export csv for GD listings & categories.', 'geodirectory' ) ;?></span> |
|
| 2290 | + <h3><?php _e('GD Import & Export CSV', 'geodirectory'); ?></h3>
|
|
| 2291 | + <span class="description"><?php _e('Import & export csv for GD listings & categories.', 'geodirectory'); ?></span>
|
|
| 2292 | 2292 | <div class="gd-content-heading"> |
| 2293 | 2293 | |
| 2294 | 2294 | <?php |
| 2295 | 2295 | ini_set('max_execution_time', 999999);
|
| 2296 | - $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
| 2296 | + $ini_max_execution_time_check = @ini_get('max_execution_time');
|
|
| 2297 | 2297 | ini_restore('max_execution_time');
|
| 2298 | 2298 | |
| 2299 | - if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
|
|
| 2299 | + if ($ini_max_execution_time_check != 999999) { // only show these setting to the user if we can't change the ini setting
|
|
| 2300 | 2300 | ?> |
| 2301 | 2301 | <div id="gd_ie_reqs" class="metabox-holder"> |
| 2302 | 2302 | <div class="meta-box-sortables ui-sortable"> |
| 2303 | 2303 | <div class="postbox"> |
| 2304 | - <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'PHP Requirements for GD Import & Export CSV', 'geodirectory' );?></span></h3> |
|
| 2304 | + <h3 class="hndle"><span style='vertical-align:top;'><?php echo __('PHP Requirements for GD Import & Export CSV', 'geodirectory'); ?></span></h3>
|
|
| 2305 | 2305 | <div class="inside"> |
| 2306 | - <span class="description"><?php echo __( 'Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory' );?></span> |
|
| 2306 | + <span class="description"><?php echo __('Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory'); ?></span>
|
|
| 2307 | 2307 | <table class="form-table"> |
| 2308 | 2308 | <thead> |
| 2309 | 2309 | <tr> |
| 2310 | - <th><?php _e( 'PHP Settings', 'geodirectory' );?></th><th><?php _e( 'Current Value', 'geodirectory' );?></th><th><?php _e( 'Recommended Value', 'geodirectory' );?></th> |
|
| 2310 | + <th><?php _e('PHP Settings', 'geodirectory'); ?></th><th><?php _e('Current Value', 'geodirectory'); ?></th><th><?php _e('Recommended Value', 'geodirectory'); ?></th>
|
|
| 2311 | 2311 | </tr> |
| 2312 | 2312 | </thead> |
| 2313 | 2313 | <tbody> |
| 2314 | 2314 | <tr> |
| 2315 | - <td>max_input_time</td><td><?php echo @ini_get( 'max_input_time' );?></td><td>3000</td> |
|
| 2315 | + <td>max_input_time</td><td><?php echo @ini_get('max_input_time'); ?></td><td>3000</td>
|
|
| 2316 | 2316 | </tr> |
| 2317 | 2317 | <tr> |
| 2318 | - <td>max_execution_time</td><td><?php echo @ini_get( 'max_execution_time' );?></td><td>3000</td> |
|
| 2318 | + <td>max_execution_time</td><td><?php echo @ini_get('max_execution_time'); ?></td><td>3000</td>
|
|
| 2319 | 2319 | </tr> |
| 2320 | 2320 | <tr> |
| 2321 | - <td>memory_limit</td><td><?php echo @ini_get( 'memory_limit' );?></td><td>256M</td> |
|
| 2321 | + <td>memory_limit</td><td><?php echo @ini_get('memory_limit'); ?></td><td>256M</td>
|
|
| 2322 | 2322 | </tr> |
| 2323 | 2323 | </tbody> |
| 2324 | 2324 | </table> |
@@ -2330,21 +2330,21 @@ discard block |
||
| 2330 | 2330 | <div id="gd_ie_imposts" class="metabox-holder"> |
| 2331 | 2331 | <div class="meta-box-sortables ui-sortable"> |
| 2332 | 2332 | <div id="gd_ie_im_posts" class="postbox gd-hndle-pbox"> |
| 2333 | - <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Listings: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button> |
|
| 2334 | - <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Import CSV', 'geodirectory' );?></span></h3> |
|
| 2333 | + <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Listings: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
| 2334 | + <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Import CSV', 'geodirectory'); ?></span></h3>
|
|
| 2335 | 2335 | <div class="inside"> |
| 2336 | 2336 | <table class="form-table"> |
| 2337 | 2337 | <tbody> |
| 2338 | 2338 | <tr> |
| 2339 | 2339 | <td class="gd-imex-box"> |
| 2340 | 2340 | <div class="gd-im-choices"> |
| 2341 | - <p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e( 'Update listing if post with post_id already exists.', 'geodirectory' );?></label></p> |
|
| 2342 | - <p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e( 'Ignore listing if post with post_id already exists.', 'geodirectory' );?></label></p> |
|
| 2341 | + <p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e('Update listing if post with post_id already exists.', 'geodirectory'); ?></label></p>
|
|
| 2342 | + <p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e('Ignore listing if post with post_id already exists.', 'geodirectory'); ?></label></p>
|
|
| 2343 | 2343 | </div> |
| 2344 | 2344 | <div class="plupload-upload-uic hide-if-no-js" id="gd_im_postplupload-upload-ui"> |
| 2345 | 2345 | <input type="text" readonly="readonly" name="gd_im_post_file" class="gd-imex-file gd_im_post_file" id="gd_im_post" onclick="jQuery('#gd_im_postplupload-browse-button').trigger('click');" />
|
| 2346 | - <input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample"> |
|
| 2347 | - <input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv;?>" /> |
|
| 2346 | + <input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">
|
|
| 2347 | + <input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv; ?>" /> |
|
| 2348 | 2348 | <input type="hidden" id="gd_im_post_allowed_types" data-exts=".csv" value="csv" /> |
| 2349 | 2349 | <?php |
| 2350 | 2350 | /** |
@@ -2354,7 +2354,7 @@ discard block |
||
| 2354 | 2354 | */ |
| 2355 | 2355 | do_action('geodir_sample_csv_download_link');
|
| 2356 | 2356 | ?> |
| 2357 | - <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_postpluploadan' ); ?>"></span> |
|
| 2357 | + <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_postpluploadan'); ?>"></span>
|
|
| 2358 | 2358 | <div class="filelist"></div> |
| 2359 | 2359 | </div> |
| 2360 | 2360 | <span id="gd_im_postupload-error" style="display:none"></span> |
@@ -2372,7 +2372,7 @@ discard block |
||
| 2372 | 2372 | <input type="hidden" id="gd_terminateaction" value="continue"/> |
| 2373 | 2373 | </div> |
| 2374 | 2374 | <div class="gd-import-progress" id="gd-import-progress" style="display:none"> |
| 2375 | - <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font
|
|
| 2375 | + <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font
|
|
| 2376 | 2376 | id="gd-import-done">0</font> / <font id="gd-import-total">0</font> ( <font |
| 2377 | 2377 | id="gd-import-perc">0%</font> ) |
| 2378 | 2378 | <div class="gd-fileprogress"></div> |
@@ -2384,10 +2384,10 @@ discard block |
||
| 2384 | 2384 | <div class="gd-imex-btns" style="display:none;"> |
| 2385 | 2385 | <input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/> |
| 2386 | 2386 | <input onclick="gd_imex_PrepareImport(this, 'post')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" /> |
| 2387 | - <input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/> |
|
| 2388 | - <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>
|
|
| 2387 | + <input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>
|
|
| 2388 | + <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>
|
|
| 2389 | 2389 | <div id="gd_process_data" style="display:none"> |
| 2390 | - <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>
|
|
| 2390 | + <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>
|
|
| 2391 | 2391 | </div> |
| 2392 | 2392 | </div> |
| 2393 | 2393 | </td> |
@@ -2401,30 +2401,30 @@ discard block |
||
| 2401 | 2401 | <div id="gd_ie_excategs" class="metabox-holder"> |
| 2402 | 2402 | <div class="meta-box-sortables ui-sortable"> |
| 2403 | 2403 | <div id="gd_ie_ex_posts" class="postbox gd-hndle-pbox"> |
| 2404 | - <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - Listings: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button> |
|
| 2405 | - <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Export CSV', 'geodirectory' );?></span></h3> |
|
| 2404 | + <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - Listings: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
| 2405 | + <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Export CSV', 'geodirectory'); ?></span></h3>
|
|
| 2406 | 2406 | <div class="inside"> |
| 2407 | 2407 | <table class="form-table"> |
| 2408 | 2408 | <tbody> |
| 2409 | 2409 | <tr> |
| 2410 | 2410 | <td class="fld"><label for="gd_post_type"> |
| 2411 | - <?php _e( 'Post Type:', 'geodirectory' );?> |
|
| 2411 | + <?php _e('Post Type:', 'geodirectory'); ?>
|
|
| 2412 | 2412 | </label></td> |
| 2413 | 2413 | <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"> |
| 2414 | - <?php echo $gd_posttypes_option;?> |
|
| 2414 | + <?php echo $gd_posttypes_option; ?> |
|
| 2415 | 2415 | </select></td> |
| 2416 | 2416 | </tr> |
| 2417 | 2417 | <tr> |
| 2418 | - <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td> |
|
| 2419 | - <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td> |
|
| 2418 | + <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>
|
|
| 2419 | + <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>
|
|
| 2420 | 2420 | </tr> |
| 2421 | 2421 | <tr class="gd-imex-dates"> |
| 2422 | - <td class="fld"><label><?php _e( 'Published Date:', 'geodirectory' );?></label></td> |
|
| 2423 | - <td><label><span class="label-responsive"><?php _e( 'Start date:', 'geodirectory' );?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e( 'End date:', 'geodirectory' );?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td> |
|
| 2422 | + <td class="fld"><label><?php _e('Published Date:', 'geodirectory'); ?></label></td>
|
|
| 2423 | + <td><label><span class="label-responsive"><?php _e('Start date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e('End date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>
|
|
| 2424 | 2424 | </tr> |
| 2425 | 2425 | <tr> |
| 2426 | 2426 | <td class="fld" style="vertical-align:top"><label> |
| 2427 | - <?php _e( 'Progress:', 'geodirectory' );?> |
|
| 2427 | + <?php _e('Progress:', 'geodirectory'); ?>
|
|
| 2428 | 2428 | </label></td> |
| 2429 | 2429 | <td><div id='gd_progressbar_box'> |
| 2430 | 2430 | <div id="gd_progressbar" class="gd_progressbar"> |
@@ -2432,13 +2432,13 @@ discard block |
||
| 2432 | 2432 | </div> |
| 2433 | 2433 | </div> |
| 2434 | 2434 | <p style="display:inline-block"> |
| 2435 | - <?php _e( 'Elapsed Time:', 'geodirectory' );?> |
|
| 2435 | + <?php _e('Elapsed Time:', 'geodirectory'); ?>
|
|
| 2436 | 2436 | </p> |
| 2437 | 2437 | |
| 2438 | 2438 | <p id="gd_timer" class="gd_timer">00:00:00</p></td> |
| 2439 | 2439 | </tr> |
| 2440 | 2440 | <tr class="gd-ie-actions"> |
| 2441 | - <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit"> |
|
| 2441 | + <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">
|
|
| 2442 | 2442 | </td> |
| 2443 | 2443 | <td id="gd_ie_ex_files" class="gd-ie-files"></td> |
| 2444 | 2444 | </tr> |
@@ -2451,21 +2451,21 @@ discard block |
||
| 2451 | 2451 | <div id="gd_ie_imcategs" class="metabox-holder"> |
| 2452 | 2452 | <div class="meta-box-sortables ui-sortable"> |
| 2453 | 2453 | <div id="gd_ie_imcats" class="postbox gd-hndle-pbox"> |
| 2454 | - <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button> |
|
| 2455 | - <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Import CSV', 'geodirectory' );?></span></h3> |
|
| 2454 | + <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
| 2455 | + <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Import CSV', 'geodirectory'); ?></span></h3>
|
|
| 2456 | 2456 | <div class="inside"> |
| 2457 | 2457 | <table class="form-table"> |
| 2458 | 2458 | <tbody> |
| 2459 | 2459 | <tr> |
| 2460 | 2460 | <td class="gd-imex-box"> |
| 2461 | 2461 | <div class="gd-im-choices"> |
| 2462 | - <p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e( 'Update item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p> |
|
| 2463 | - <p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e( 'Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p> |
|
| 2462 | + <p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e('Update item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>
|
|
| 2463 | + <p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e('Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>
|
|
| 2464 | 2464 | </div> |
| 2465 | 2465 | <div class="plupload-upload-uic hide-if-no-js" id="gd_im_catplupload-upload-ui"> |
| 2466 | 2466 | <input type="text" readonly="readonly" name="gd_im_cat_file" class="gd-imex-file gd_im_cat_file" id="gd_im_cat" onclick="jQuery('#gd_im_catplupload-browse-button').trigger('click');" />
|
| 2467 | - <input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample"> |
|
| 2468 | - <input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv;?>" /> |
|
| 2467 | + <input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">
|
|
| 2468 | + <input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv; ?>" /> |
|
| 2469 | 2469 | <input type="hidden" id="gd_im_cat_allowed_types" data-exts=".csv" value="csv" /> |
| 2470 | 2470 | <?php |
| 2471 | 2471 | /** |
@@ -2476,7 +2476,7 @@ discard block |
||
| 2476 | 2476 | */ |
| 2477 | 2477 | do_action('geodir_sample_cats_csv_download_link');
|
| 2478 | 2478 | ?> |
| 2479 | - <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_catpluploadan' ); ?>"></span> |
|
| 2479 | + <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_catpluploadan'); ?>"></span>
|
|
| 2480 | 2480 | <div class="filelist"></div> |
| 2481 | 2481 | </div> |
| 2482 | 2482 | <span id="gd_im_catupload-error" style="display:none"></span> |
@@ -2493,7 +2493,7 @@ discard block |
||
| 2493 | 2493 | <input type="hidden" id="gd_terminateaction" value="continue"/> |
| 2494 | 2494 | </div> |
| 2495 | 2495 | <div class="gd-import-progress" id="gd-import-progress" style="display:none"> |
| 2496 | - <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font
|
|
| 2496 | + <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font
|
|
| 2497 | 2497 | id="gd-import-done">0</font> / <font id="gd-import-total">0</font> ( <font |
| 2498 | 2498 | id="gd-import-perc">0%</font> ) |
| 2499 | 2499 | <div class="gd-fileprogress"></div> |
@@ -2505,10 +2505,10 @@ discard block |
||
| 2505 | 2505 | <div class="gd-imex-btns" style="display:none;"> |
| 2506 | 2506 | <input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/> |
| 2507 | 2507 | <input onclick="gd_imex_PrepareImport(this, 'cat')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" /> |
| 2508 | - <input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/> |
|
| 2509 | - <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>
|
|
| 2508 | + <input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>
|
|
| 2509 | + <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>
|
|
| 2510 | 2510 | <div id="gd_process_data" style="display:none"> |
| 2511 | - <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>
|
|
| 2511 | + <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>
|
|
| 2512 | 2512 | </div> |
| 2513 | 2513 | </div> |
| 2514 | 2514 | </td> |
@@ -2522,26 +2522,26 @@ discard block |
||
| 2522 | 2522 | <div id="gd_ie_excategs" class="metabox-holder"> |
| 2523 | 2523 | <div class="meta-box-sortables ui-sortable"> |
| 2524 | 2524 | <div id="gd_ie_ex_cats" class="postbox gd-hndle-pbox"> |
| 2525 | - <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button> |
|
| 2526 | - <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Export CSV', 'geodirectory' );?></span></h3> |
|
| 2525 | + <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
| 2526 | + <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Export CSV', 'geodirectory'); ?></span></h3>
|
|
| 2527 | 2527 | <div class="inside"> |
| 2528 | 2528 | <table class="form-table"> |
| 2529 | 2529 | <tbody> |
| 2530 | 2530 | <tr> |
| 2531 | - <td class="fld"><label for="gd_post_type"><?php _e( 'Post Type:', 'geodirectory' );?></label></td> |
|
| 2532 | - <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option;?></select></td> |
|
| 2531 | + <td class="fld"><label for="gd_post_type"><?php _e('Post Type:', 'geodirectory'); ?></label></td>
|
|
| 2532 | + <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option; ?></select></td> |
|
| 2533 | 2533 | </tr> |
| 2534 | 2534 | <tr> |
| 2535 | - <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td> |
|
| 2536 | - <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td> |
|
| 2535 | + <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>
|
|
| 2536 | + <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>
|
|
| 2537 | 2537 | </tr> |
| 2538 | 2538 | <tr> |
| 2539 | - <td class="fld" style="vertical-align:top"><label><?php _e( 'Progress:', 'geodirectory' );?></label></td> |
|
| 2540 | - <td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e( 'Elapsed Time:', 'geodirectory' );?></p> <p id="gd_timer" class="gd_timer">00:00:00</p></td> |
|
| 2539 | + <td class="fld" style="vertical-align:top"><label><?php _e('Progress:', 'geodirectory'); ?></label></td>
|
|
| 2540 | + <td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e('Elapsed Time:', 'geodirectory'); ?></p> <p id="gd_timer" class="gd_timer">00:00:00</p></td>
|
|
| 2541 | 2541 | </tr> |
| 2542 | 2542 | <tr class="gd-ie-actions"> |
| 2543 | 2543 | <td style="vertical-align:top"> |
| 2544 | - <input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit"> |
|
| 2544 | + <input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">
|
|
| 2545 | 2545 | </td> |
| 2546 | 2546 | <td id="gd_ie_ex_files" class="gd-ie-files"></td> |
| 2547 | 2547 | </tr> |
@@ -2563,7 +2563,7 @@ discard block |
||
| 2563 | 2563 | * @param array $gd_chunksize_options File chunk size options. |
| 2564 | 2564 | * @param string $nonce Wordpress security token for GD import & export. |
| 2565 | 2565 | */ |
| 2566 | - do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce ); |
|
| 2566 | + do_action('geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce);
|
|
| 2567 | 2567 | ?> |
| 2568 | 2568 | </div> |
| 2569 | 2569 | </div> |
@@ -2582,7 +2582,7 @@ discard block |
||
| 2582 | 2582 | jQuery.ajax({
|
| 2583 | 2583 | url: ajaxurl, |
| 2584 | 2584 | type: "POST", |
| 2585 | - data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce;?>', |
|
| 2585 | + data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce; ?>', |
|
| 2586 | 2586 | dataType: 'json', |
| 2587 | 2587 | cache: false, |
| 2588 | 2588 | success: function(data) {
|
@@ -2634,7 +2634,7 @@ discard block |
||
| 2634 | 2634 | |
| 2635 | 2635 | jQuery(cont).find('.filelist .file').remove();
|
| 2636 | 2636 | |
| 2637 | - jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr( PLZ_SELECT_CSV_FILE );?></p>");
|
|
| 2637 | + jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr(PLZ_SELECT_CSV_FILE); ?></p>");
|
|
| 2638 | 2638 | jQuery('#gd-import-msg', cont).show();
|
| 2639 | 2639 | |
| 2640 | 2640 | return false; |
@@ -2693,7 +2693,7 @@ discard block |
||
| 2693 | 2693 | jQuery.ajax({
|
| 2694 | 2694 | url: ajaxurl, |
| 2695 | 2695 | type: "POST", |
| 2696 | - data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce;?>', |
|
| 2696 | + data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce; ?>', |
|
| 2697 | 2697 | dataType : 'json', |
| 2698 | 2698 | cache: false, |
| 2699 | 2699 | success: function (data) {
|
@@ -2882,27 +2882,27 @@ discard block |
||
| 2882 | 2882 | |
| 2883 | 2883 | var gdMsg = '<p></p>'; |
| 2884 | 2884 | if ( processed > 0 ) {
|
| 2885 | - var msgParse = '<p><?php echo addslashes( sprintf( __( 'Total %s item(s) found.', 'geodirectory' ), '%s' ) );?></p>'; |
|
| 2885 | + var msgParse = '<p><?php echo addslashes(sprintf(__('Total %s item(s) found.', 'geodirectory'), '%s')); ?></p>';
|
|
| 2886 | 2886 | msgParse = msgParse.replace("%s", processed);
|
| 2887 | 2887 | gdMsg += msgParse; |
| 2888 | 2888 | } |
| 2889 | 2889 | |
| 2890 | 2890 | if ( updated > 0 ) {
|
| 2891 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) updated.', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2891 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) updated.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2892 | 2892 | msgParse = msgParse.replace("%s", updated);
|
| 2893 | 2893 | msgParse = msgParse.replace("%d", processed);
|
| 2894 | 2894 | gdMsg += msgParse; |
| 2895 | 2895 | } |
| 2896 | 2896 | |
| 2897 | 2897 | if ( created > 0 ) {
|
| 2898 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) added.', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2898 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) added.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2899 | 2899 | msgParse = msgParse.replace("%s", created);
|
| 2900 | 2900 | msgParse = msgParse.replace("%d", processed);
|
| 2901 | 2901 | gdMsg += msgParse; |
| 2902 | 2902 | } |
| 2903 | 2903 | |
| 2904 | 2904 | if ( skipped > 0 ) {
|
| 2905 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) ignored due to already exists.', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2905 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) ignored due to already exists.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2906 | 2906 | msgParse = msgParse.replace("%s", skipped);
|
| 2907 | 2907 | msgParse = msgParse.replace("%d", processed);
|
| 2908 | 2908 | gdMsg += msgParse; |
@@ -2912,17 +2912,17 @@ discard block |
||
| 2912 | 2912 | if (type=='loc') {
|
| 2913 | 2913 | invalid_addr = invalid; |
| 2914 | 2914 | } |
| 2915 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2915 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2916 | 2916 | msgParse = msgParse.replace("%s", invalid_addr);
|
| 2917 | 2917 | msgParse = msgParse.replace("%d", total);
|
| 2918 | 2918 | gdMsg += msgParse; |
| 2919 | 2919 | } |
| 2920 | 2920 | |
| 2921 | 2921 | if (invalid > 0 && type!='loc') {
|
| 2922 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2922 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2923 | 2923 | |
| 2924 | 2924 | if (type=='hood') {
|
| 2925 | - msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2925 | + msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2926 | 2926 | } |
| 2927 | 2927 | msgParse = msgParse.replace("%s", invalid);
|
| 2928 | 2928 | msgParse = msgParse.replace("%d", total);
|
@@ -2930,7 +2930,7 @@ discard block |
||
| 2930 | 2930 | } |
| 2931 | 2931 | |
| 2932 | 2932 | if (images > 0) {
|
| 2933 | - gdMsg += '<p><?php echo addslashes( $upload_dir );?></p>'; |
|
| 2933 | + gdMsg += '<p><?php echo addslashes($upload_dir); ?></p>'; |
|
| 2934 | 2934 | } |
| 2935 | 2935 | gdMsg += '<p></p>'; |
| 2936 | 2936 | jQuery('#gd-import-msg', cont).find('#message').removeClass('error').addClass('updated').html(gdMsg);
|
@@ -3094,9 +3094,9 @@ discard block |
||
| 3094 | 3094 | if (typeof filters !== 'undefined' && filters && doFilter) {
|
| 3095 | 3095 | getTotal = true; |
| 3096 | 3096 | attach += '&_c=1'; |
| 3097 | - gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Preparing...', 'geodirectory' ) );?>'); |
|
| 3097 | + gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Preparing...', 'geodirectory')); ?>');
|
|
| 3098 | 3098 | } else {
|
| 3099 | - gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>'); |
|
| 3099 | + gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
|
|
| 3100 | 3100 | } |
| 3101 | 3101 | jQuery(el).find('#gd_timer').text('00:00:01');
|
| 3102 | 3102 | jQuery('#gd_ie_ex_files', el).html('');
|
@@ -3105,7 +3105,7 @@ discard block |
||
| 3105 | 3105 | jQuery.ajax({
|
| 3106 | 3106 | url: ajaxurl, |
| 3107 | 3107 | type: "POST", |
| 3108 | - data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page + attach, |
|
| 3108 | + data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page + attach, |
|
| 3109 | 3109 | dataType : 'json', |
| 3110 | 3110 | cache: false, |
| 3111 | 3111 | beforeSend: function (jqXHR, settings) {},
|
@@ -3130,11 +3130,11 @@ discard block |
||
| 3130 | 3130 | } else {
|
| 3131 | 3131 | if (pages < page || pages == page) {
|
| 3132 | 3132 | window.clearInterval(timer_posts); |
| 3133 | - gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');
|
|
| 3133 | + gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');
|
|
| 3134 | 3134 | } else {
|
| 3135 | 3135 | var percentage = Math.round(((page * chunk_size) / total_posts) * 100); |
| 3136 | 3136 | percentage = percentage > 100 ? 100 : percentage; |
| 3137 | - gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');
|
|
| 3137 | + gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
|
|
| 3138 | 3138 | } |
| 3139 | 3139 | if (typeof data.files != 'undefined' && jQuery(data.files).length ) {
|
| 3140 | 3140 | var obj_files = data.files; |
@@ -3165,7 +3165,7 @@ discard block |
||
| 3165 | 3165 | |
| 3166 | 3166 | function gd_process_export_cats(el, post_type, total_cats, chunk_size, pages, page) {
|
| 3167 | 3167 | if (page < 2) {
|
| 3168 | - gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>'); |
|
| 3168 | + gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
|
|
| 3169 | 3169 | jQuery(el).find('#gd_timer').text('00:00:01');
|
| 3170 | 3170 | jQuery('#gd_ie_ex_files', el).html('');
|
| 3171 | 3171 | } |
@@ -3173,7 +3173,7 @@ discard block |
||
| 3173 | 3173 | jQuery.ajax({
|
| 3174 | 3174 | url: ajaxurl, |
| 3175 | 3175 | type: "POST", |
| 3176 | - data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page, |
|
| 3176 | + data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page, |
|
| 3177 | 3177 | dataType : 'json', |
| 3178 | 3178 | cache: false, |
| 3179 | 3179 | beforeSend: function (jqXHR, settings) {},
|
@@ -3187,11 +3187,11 @@ discard block |
||
| 3187 | 3187 | } else {
|
| 3188 | 3188 | if (pages < page || pages == page) {
|
| 3189 | 3189 | window.clearInterval(timer_cats); |
| 3190 | - gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');
|
|
| 3190 | + gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');
|
|
| 3191 | 3191 | } else {
|
| 3192 | 3192 | var percentage = Math.round(((page * chunk_size) / total_cats) * 100); |
| 3193 | 3193 | percentage = percentage > 100 ? 100 : percentage; |
| 3194 | - gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e( 'Exporting...', 'geodirectory' );?>');
|
|
| 3194 | + gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e('Exporting...', 'geodirectory'); ?>');
|
|
| 3195 | 3195 | } |
| 3196 | 3196 | if (typeof data.files != 'undefined' && jQuery(data.files).length ) {
|
| 3197 | 3197 | var obj_files = data.files; |
@@ -3248,13 +3248,13 @@ discard block |
||
| 3248 | 3248 | function geodir_init_filesystem() |
| 3249 | 3249 | {
|
| 3250 | 3250 | |
| 3251 | - if(!function_exists('get_filesystem_method')){
|
|
| 3251 | + if (!function_exists('get_filesystem_method')) {
|
|
| 3252 | 3252 | require_once(ABSPATH."/wp-admin/includes/file.php"); |
| 3253 | 3253 | } |
| 3254 | 3254 | $access_type = get_filesystem_method(); |
| 3255 | 3255 | if ($access_type === 'direct') {
|
| 3256 | 3256 | /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */ |
| 3257 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3257 | + $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array()); |
|
| 3258 | 3258 | |
| 3259 | 3259 | /* initialize the API */ |
| 3260 | 3260 | if (!WP_Filesystem($creds)) {
|
@@ -3267,7 +3267,7 @@ discard block |
||
| 3267 | 3267 | return $wp_filesystem; |
| 3268 | 3268 | /* do our file manipulations below */ |
| 3269 | 3269 | } elseif (defined('FTP_USER')) {
|
| 3270 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3270 | + $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array()); |
|
| 3271 | 3271 | |
| 3272 | 3272 | /* initialize the API */ |
| 3273 | 3273 | if (!WP_Filesystem($creds)) {
|
@@ -3302,7 +3302,7 @@ discard block |
||
| 3302 | 3302 | * @package GeoDirectory |
| 3303 | 3303 | */ |
| 3304 | 3304 | function geodir_filesystem_notice() |
| 3305 | -{ if ( defined( 'DOING_AJAX' ) ){return;}
|
|
| 3305 | +{ if (defined('DOING_AJAX')) {return; }
|
|
| 3306 | 3306 | $access_type = get_filesystem_method(); |
| 3307 | 3307 | if ($access_type === 'direct') {
|
| 3308 | 3308 | } elseif (!defined('FTP_USER')) {
|
@@ -3343,64 +3343,64 @@ discard block |
||
| 3343 | 3343 | // try to set higher limits for import |
| 3344 | 3344 | $max_input_time = ini_get('max_input_time');
|
| 3345 | 3345 | $max_execution_time = ini_get('max_execution_time');
|
| 3346 | - $memory_limit= ini_get('memory_limit');
|
|
| 3346 | + $memory_limit = ini_get('memory_limit');
|
|
| 3347 | 3347 | |
| 3348 | - if(!$max_input_time || $max_input_time<3000){
|
|
| 3348 | + if (!$max_input_time || $max_input_time < 3000) {
|
|
| 3349 | 3349 | ini_set('max_input_time', 3000);
|
| 3350 | 3350 | } |
| 3351 | 3351 | |
| 3352 | - if(!$max_execution_time || $max_execution_time<3000){
|
|
| 3352 | + if (!$max_execution_time || $max_execution_time < 3000) {
|
|
| 3353 | 3353 | ini_set('max_execution_time', 3000);
|
| 3354 | 3354 | } |
| 3355 | 3355 | |
| 3356 | - if($memory_limit && str_replace('M','',$memory_limit)){
|
|
| 3357 | - if(str_replace('M','',$memory_limit)<256){
|
|
| 3356 | + if ($memory_limit && str_replace('M', '', $memory_limit)) {
|
|
| 3357 | + if (str_replace('M', '', $memory_limit) < 256) {
|
|
| 3358 | 3358 | ini_set('memory_limit', '256M');
|
| 3359 | 3359 | } |
| 3360 | 3360 | } |
| 3361 | 3361 | |
| 3362 | 3362 | $json = array(); |
| 3363 | 3363 | |
| 3364 | - if ( !current_user_can( 'manage_options' ) ) {
|
|
| 3365 | - wp_send_json( $json ); |
|
| 3364 | + if (!current_user_can('manage_options')) {
|
|
| 3365 | + wp_send_json($json); |
|
| 3366 | 3366 | } |
| 3367 | 3367 | |
| 3368 | - $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL; |
|
| 3369 | - $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL; |
|
| 3370 | - $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false; |
|
| 3368 | + $task = isset($_REQUEST['task']) ? $_REQUEST['task'] : NULL; |
|
| 3369 | + $nonce = isset($_REQUEST['_nonce']) ? $_REQUEST['_nonce'] : NULL; |
|
| 3370 | + $stat = isset($_REQUEST['_st']) ? $_REQUEST['_st'] : false; |
|
| 3371 | 3371 | |
| 3372 | - if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
|
|
| 3373 | - wp_send_json( $json ); |
|
| 3372 | + if (!wp_verify_nonce($nonce, 'geodir_import_export_nonce')) {
|
|
| 3373 | + wp_send_json($json); |
|
| 3374 | 3374 | } |
| 3375 | 3375 | |
| 3376 | - $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
| 3377 | - $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
| 3376 | + $post_type = isset($_REQUEST['_pt']) ? $_REQUEST['_pt'] : NULL; |
|
| 3377 | + $chunk_per_page = isset($_REQUEST['_n']) ? absint($_REQUEST['_n']) : NULL; |
|
| 3378 | 3378 | $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page; |
| 3379 | - $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1; |
|
| 3379 | + $chunk_page_no = isset($_REQUEST['_p']) ? absint($_REQUEST['_p']) : 1; |
|
| 3380 | 3380 | |
| 3381 | 3381 | $wp_filesystem = geodir_init_filesystem(); |
| 3382 | 3382 | if (!$wp_filesystem) {
|
| 3383 | - $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
| 3384 | - wp_send_json( $json ); |
|
| 3383 | + $json['error'] = __('Filesystem ERROR: Could not access filesystem.', 'geodirectory');
|
|
| 3384 | + wp_send_json($json); |
|
| 3385 | 3385 | } |
| 3386 | 3386 | |
| 3387 | 3387 | if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
|
| 3388 | - $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' ); |
|
| 3389 | - wp_send_json( $json ); |
|
| 3388 | + $json['error'] = __('Filesystem ERROR: '.$wp_filesystem->errors->get_error_message(), 'geodirectory');
|
|
| 3389 | + wp_send_json($json); |
|
| 3390 | 3390 | } |
| 3391 | 3391 | |
| 3392 | - $csv_file_dir = geodir_path_import_export( false ); |
|
| 3393 | - if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
|
|
| 3394 | - if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
|
|
| 3395 | - $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3396 | - wp_send_json( $json ); |
|
| 3392 | + $csv_file_dir = geodir_path_import_export(false); |
|
| 3393 | + if (!$wp_filesystem->is_dir($csv_file_dir)) {
|
|
| 3394 | + if (!$wp_filesystem->mkdir($csv_file_dir, FS_CHMOD_DIR)) {
|
|
| 3395 | + $json['error'] = __('ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory');
|
|
| 3396 | + wp_send_json($json); |
|
| 3397 | 3397 | } |
| 3398 | 3398 | } |
| 3399 | 3399 | |
| 3400 | 3400 | $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
| 3401 | 3401 | $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
| 3402 | 3402 | |
| 3403 | - switch ( $task ) {
|
|
| 3403 | + switch ($task) {
|
|
| 3404 | 3404 | case 'export_posts': {
|
| 3405 | 3405 | // WPML |
| 3406 | 3406 | $is_wpml = geodir_is_wpml(); |
@@ -3411,36 +3411,36 @@ discard block |
||
| 3411 | 3411 | $sitepress->switch_lang('all', true);
|
| 3412 | 3412 | } |
| 3413 | 3413 | // WPML |
| 3414 | - if ( $post_type == 'gd_event' ) {
|
|
| 3415 | - add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
| 3414 | + if ($post_type == 'gd_event') {
|
|
| 3415 | + add_filter('geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2);
|
|
| 3416 | 3416 | } |
| 3417 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3417 | + $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3418 | 3418 | |
| 3419 | - $file_name = $post_type . '_' . date( 'dmyHi' ); |
|
| 3420 | - if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
|
|
| 3421 | - $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) ); |
|
| 3419 | + $file_name = $post_type.'_'.date('dmyHi');
|
|
| 3420 | + if ($filters && isset($filters['start_date']) && isset($filters['end_date'])) {
|
|
| 3421 | + $file_name = $post_type.'_'.date_i18n('dmy', strtotime($filters['start_date'])).'_'.date_i18n('dmy', strtotime($filters['end_date']));
|
|
| 3422 | 3422 | } |
| 3423 | - $posts_count = geodir_get_posts_count( $post_type ); |
|
| 3424 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3425 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3426 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3427 | - $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv'; |
|
| 3423 | + $posts_count = geodir_get_posts_count($post_type); |
|
| 3424 | + $file_url_base = geodir_path_import_export().'/'; |
|
| 3425 | + $file_url = $file_url_base.$file_name.'.csv'; |
|
| 3426 | + $file_path = $csv_file_dir.'/'.$file_name.'.csv'; |
|
| 3427 | + $file_path_temp = $csv_file_dir.'/'.$post_type.'_'.$nonce.'.csv'; |
|
| 3428 | 3428 | |
| 3429 | 3429 | $chunk_file_paths = array(); |
| 3430 | 3430 | |
| 3431 | - if ( isset( $_REQUEST['_c'] ) ) {
|
|
| 3431 | + if (isset($_REQUEST['_c'])) {
|
|
| 3432 | 3432 | $json['total'] = $posts_count; |
| 3433 | 3433 | // WPML |
| 3434 | 3434 | if ($is_wpml) {
|
| 3435 | 3435 | $sitepress->switch_lang($active_lang, true); |
| 3436 | 3436 | } |
| 3437 | 3437 | // WPML |
| 3438 | - wp_send_json( $json ); |
|
| 3438 | + wp_send_json($json); |
|
| 3439 | 3439 | gd_die(); |
| 3440 | - } else if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3441 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3442 | - $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0; |
|
| 3443 | - $percentage = min( $percentage, 100 ); |
|
| 3440 | + } else if (isset($_REQUEST['_st'])) {
|
|
| 3441 | + $line_count = (int) geodir_import_export_line_count($file_path_temp); |
|
| 3442 | + $percentage = count($posts_count) > 0 && $line_count > 0 ? ceil($line_count / $posts_count) * 100 : 0; |
|
| 3443 | + $percentage = min($percentage, 100); |
|
| 3444 | 3444 | |
| 3445 | 3445 | $json['percentage'] = $percentage; |
| 3446 | 3446 | // WPML |
@@ -3448,45 +3448,45 @@ discard block |
||
| 3448 | 3448 | $sitepress->switch_lang($active_lang, true); |
| 3449 | 3449 | } |
| 3450 | 3450 | // WPML |
| 3451 | - wp_send_json( $json ); |
|
| 3451 | + wp_send_json($json); |
|
| 3452 | 3452 | gd_die(); |
| 3453 | 3453 | } else {
|
| 3454 | - if ( !$posts_count > 0 ) {
|
|
| 3455 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3454 | + if (!$posts_count > 0) {
|
|
| 3455 | + $json['error'] = __('No records to export.', 'geodirectory');
|
|
| 3456 | 3456 | } else {
|
| 3457 | 3457 | $total_posts = $posts_count; |
| 3458 | 3458 | if ($chunk_per_page > $total_posts) {
|
| 3459 | 3459 | $chunk_per_page = $total_posts; |
| 3460 | 3460 | } |
| 3461 | - $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
| 3461 | + $chunk_total_pages = ceil($total_posts / $chunk_per_page); |
|
| 3462 | 3462 | |
| 3463 | 3463 | $j = $chunk_page_no; |
| 3464 | - $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
| 3464 | + $chunk_save_posts = geodir_imex_get_posts($post_type, $chunk_per_page, $j); |
|
| 3465 | 3465 | |
| 3466 | 3466 | $per_page = 500; |
| 3467 | 3467 | if ($per_page > $chunk_per_page) {
|
| 3468 | 3468 | $per_page = $chunk_per_page; |
| 3469 | 3469 | } |
| 3470 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3470 | + $total_pages = ceil($chunk_per_page / $per_page); |
|
| 3471 | 3471 | |
| 3472 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3473 | - $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page ); |
|
| 3472 | + for ($i = 0; $i <= $total_pages; $i++) {
|
|
| 3473 | + $save_posts = array_slice($chunk_save_posts, ($i * $per_page), $per_page); |
|
| 3474 | 3474 | |
| 3475 | 3475 | $clear = $i == 0 ? true : false; |
| 3476 | - geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
| 3476 | + geodir_save_csv_data($file_path_temp, $save_posts, $clear); |
|
| 3477 | 3477 | } |
| 3478 | 3478 | |
| 3479 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3480 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3481 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3482 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3483 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3479 | + if ($wp_filesystem->exists($file_path_temp)) {
|
|
| 3480 | + $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : ''; |
|
| 3481 | + $chunk_file_name = $file_name.$chunk_page_no.'.csv'; |
|
| 3482 | + $file_path = $csv_file_dir.'/'.$chunk_file_name; |
|
| 3483 | + $wp_filesystem->move($file_path_temp, $file_path, true); |
|
| 3484 | 3484 | |
| 3485 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3486 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3485 | + $file_url = $file_url_base.$chunk_file_name; |
|
| 3486 | + $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3487 | 3487 | } |
| 3488 | 3488 | |
| 3489 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3489 | + if (!empty($chunk_file_paths)) {
|
|
| 3490 | 3490 | $json['total'] = $posts_count; |
| 3491 | 3491 | $json['files'] = $chunk_file_paths; |
| 3492 | 3492 | } else {
|
@@ -3494,7 +3494,7 @@ discard block |
||
| 3494 | 3494 | $json['total'] = $posts_count; |
| 3495 | 3495 | $json['files'] = array(); |
| 3496 | 3496 | } else {
|
| 3497 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3497 | + $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');
|
|
| 3498 | 3498 | } |
| 3499 | 3499 | } |
| 3500 | 3500 | } |
@@ -3503,7 +3503,7 @@ discard block |
||
| 3503 | 3503 | $sitepress->switch_lang($active_lang, true); |
| 3504 | 3504 | } |
| 3505 | 3505 | // WPML |
| 3506 | - wp_send_json( $json ); |
|
| 3506 | + wp_send_json($json); |
|
| 3507 | 3507 | } |
| 3508 | 3508 | } |
| 3509 | 3509 | break; |
@@ -3517,20 +3517,20 @@ discard block |
||
| 3517 | 3517 | $sitepress->switch_lang('all', true);
|
| 3518 | 3518 | } |
| 3519 | 3519 | // WPML |
| 3520 | - $file_name = $post_type . 'category_' . date( 'dmyHi' ); |
|
| 3520 | + $file_name = $post_type.'category_'.date('dmyHi');
|
|
| 3521 | 3521 | |
| 3522 | - $terms_count = geodir_get_terms_count( $post_type ); |
|
| 3523 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3524 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3525 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3526 | - $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv'; |
|
| 3522 | + $terms_count = geodir_get_terms_count($post_type); |
|
| 3523 | + $file_url_base = geodir_path_import_export().'/'; |
|
| 3524 | + $file_url = $file_url_base.$file_name.'.csv'; |
|
| 3525 | + $file_path = $csv_file_dir.'/'.$file_name.'.csv'; |
|
| 3526 | + $file_path_temp = $csv_file_dir.'/'.$post_type.'category_'.$nonce.'.csv'; |
|
| 3527 | 3527 | |
| 3528 | 3528 | $chunk_file_paths = array(); |
| 3529 | 3529 | |
| 3530 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3531 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3532 | - $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0; |
|
| 3533 | - $percentage = min( $percentage, 100 ); |
|
| 3530 | + if (isset($_REQUEST['_st'])) {
|
|
| 3531 | + $line_count = (int) geodir_import_export_line_count($file_path_temp); |
|
| 3532 | + $percentage = count($terms_count) > 0 && $line_count > 0 ? ceil($line_count / $terms_count) * 100 : 0; |
|
| 3533 | + $percentage = min($percentage, 100); |
|
| 3534 | 3534 | |
| 3535 | 3535 | $json['percentage'] = $percentage; |
| 3536 | 3536 | // WPML |
@@ -3538,48 +3538,48 @@ discard block |
||
| 3538 | 3538 | $sitepress->switch_lang($active_lang, true); |
| 3539 | 3539 | } |
| 3540 | 3540 | // WPML |
| 3541 | - wp_send_json( $json ); |
|
| 3541 | + wp_send_json($json); |
|
| 3542 | 3542 | } else {
|
| 3543 | - if ( !$terms_count > 0 ) {
|
|
| 3544 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3543 | + if (!$terms_count > 0) {
|
|
| 3544 | + $json['error'] = __('No records to export.', 'geodirectory');
|
|
| 3545 | 3545 | } else {
|
| 3546 | 3546 | $total_terms = $terms_count; |
| 3547 | 3547 | if ($chunk_per_page > $terms_count) {
|
| 3548 | 3548 | $chunk_per_page = $terms_count; |
| 3549 | 3549 | } |
| 3550 | - $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
| 3550 | + $chunk_total_pages = ceil($total_terms / $chunk_per_page); |
|
| 3551 | 3551 | |
| 3552 | 3552 | $j = $chunk_page_no; |
| 3553 | - $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
| 3553 | + $chunk_save_terms = geodir_imex_get_terms($post_type, $chunk_per_page, $j); |
|
| 3554 | 3554 | |
| 3555 | 3555 | $per_page = 500; |
| 3556 | 3556 | if ($per_page > $chunk_per_page) {
|
| 3557 | 3557 | $per_page = $chunk_per_page; |
| 3558 | 3558 | } |
| 3559 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3559 | + $total_pages = ceil($chunk_per_page / $per_page); |
|
| 3560 | 3560 | |
| 3561 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3562 | - $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page ); |
|
| 3561 | + for ($i = 0; $i <= $total_pages; $i++) {
|
|
| 3562 | + $save_terms = array_slice($chunk_save_terms, ($i * $per_page), $per_page); |
|
| 3563 | 3563 | |
| 3564 | 3564 | $clear = $i == 0 ? true : false; |
| 3565 | - geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
| 3565 | + geodir_save_csv_data($file_path_temp, $save_terms, $clear); |
|
| 3566 | 3566 | } |
| 3567 | 3567 | |
| 3568 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3569 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3570 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3571 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3572 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3568 | + if ($wp_filesystem->exists($file_path_temp)) {
|
|
| 3569 | + $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : ''; |
|
| 3570 | + $chunk_file_name = $file_name.$chunk_page_no.'.csv'; |
|
| 3571 | + $file_path = $csv_file_dir.'/'.$chunk_file_name; |
|
| 3572 | + $wp_filesystem->move($file_path_temp, $file_path, true); |
|
| 3573 | 3573 | |
| 3574 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3575 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3574 | + $file_url = $file_url_base.$chunk_file_name; |
|
| 3575 | + $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3576 | 3576 | } |
| 3577 | 3577 | |
| 3578 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3578 | + if (!empty($chunk_file_paths)) {
|
|
| 3579 | 3579 | $json['total'] = $terms_count; |
| 3580 | 3580 | $json['files'] = $chunk_file_paths; |
| 3581 | 3581 | } else {
|
| 3582 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3582 | + $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');
|
|
| 3583 | 3583 | } |
| 3584 | 3584 | } |
| 3585 | 3585 | // WPML |
@@ -3587,127 +3587,127 @@ discard block |
||
| 3587 | 3587 | $sitepress->switch_lang($active_lang, true); |
| 3588 | 3588 | } |
| 3589 | 3589 | // WPML |
| 3590 | - wp_send_json( $json ); |
|
| 3590 | + wp_send_json($json); |
|
| 3591 | 3591 | } |
| 3592 | 3592 | } |
| 3593 | 3593 | break; |
| 3594 | 3594 | case 'export_locations': {
|
| 3595 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3596 | - $file_name = 'gd_locations_' . date( 'dmyHi' ); |
|
| 3597 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3598 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3599 | - $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv'; |
|
| 3595 | + $file_url_base = geodir_path_import_export().'/'; |
|
| 3596 | + $file_name = 'gd_locations_'.date('dmyHi');
|
|
| 3597 | + $file_url = $file_url_base.$file_name.'.csv'; |
|
| 3598 | + $file_path = $csv_file_dir.'/'.$file_name.'.csv'; |
|
| 3599 | + $file_path_temp = $csv_file_dir.'/gd_locations_'.$nonce.'.csv'; |
|
| 3600 | 3600 | |
| 3601 | - $items_count = (int)geodir_location_imex_count_locations(); |
|
| 3601 | + $items_count = (int) geodir_location_imex_count_locations(); |
|
| 3602 | 3602 | |
| 3603 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3604 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3605 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3606 | - $percentage = min( $percentage, 100 ); |
|
| 3603 | + if (isset($_REQUEST['_st'])) {
|
|
| 3604 | + $line_count = (int) geodir_import_export_line_count($file_path_temp); |
|
| 3605 | + $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0; |
|
| 3606 | + $percentage = min($percentage, 100); |
|
| 3607 | 3607 | |
| 3608 | 3608 | $json['percentage'] = $percentage; |
| 3609 | - wp_send_json( $json ); |
|
| 3609 | + wp_send_json($json); |
|
| 3610 | 3610 | } else {
|
| 3611 | 3611 | $chunk_file_paths = array(); |
| 3612 | 3612 | |
| 3613 | - if ( !$items_count > 0 ) {
|
|
| 3614 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3613 | + if (!$items_count > 0) {
|
|
| 3614 | + $json['error'] = __('No records to export.', 'geodirectory');
|
|
| 3615 | 3615 | } else {
|
| 3616 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3617 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3616 | + $chunk_per_page = min($chunk_per_page, $items_count); |
|
| 3617 | + $chunk_total_pages = ceil($items_count / $chunk_per_page); |
|
| 3618 | 3618 | |
| 3619 | 3619 | $j = $chunk_page_no; |
| 3620 | - $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
| 3620 | + $chunk_save_items = geodir_location_imex_locations_data($chunk_per_page, $j); |
|
| 3621 | 3621 | |
| 3622 | 3622 | $per_page = 500; |
| 3623 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3624 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3623 | + $per_page = min($per_page, $chunk_per_page); |
|
| 3624 | + $total_pages = ceil($chunk_per_page / $per_page); |
|
| 3625 | 3625 | |
| 3626 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3627 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3626 | + for ($i = 0; $i <= $total_pages; $i++) {
|
|
| 3627 | + $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page); |
|
| 3628 | 3628 | |
| 3629 | 3629 | $clear = $i == 0 ? true : false; |
| 3630 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3630 | + geodir_save_csv_data($file_path_temp, $save_items, $clear); |
|
| 3631 | 3631 | } |
| 3632 | 3632 | |
| 3633 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3634 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3635 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3636 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3637 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3633 | + if ($wp_filesystem->exists($file_path_temp)) {
|
|
| 3634 | + $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : ''; |
|
| 3635 | + $chunk_file_name = $file_name.$chunk_page_no.'.csv'; |
|
| 3636 | + $file_path = $csv_file_dir.'/'.$chunk_file_name; |
|
| 3637 | + $wp_filesystem->move($file_path_temp, $file_path, true); |
|
| 3638 | 3638 | |
| 3639 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3640 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3639 | + $file_url = $file_url_base.$chunk_file_name; |
|
| 3640 | + $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3641 | 3641 | } |
| 3642 | 3642 | |
| 3643 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3643 | + if (!empty($chunk_file_paths)) {
|
|
| 3644 | 3644 | $json['total'] = $items_count; |
| 3645 | 3645 | $json['files'] = $chunk_file_paths; |
| 3646 | 3646 | } else {
|
| 3647 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3647 | + $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');
|
|
| 3648 | 3648 | } |
| 3649 | 3649 | } |
| 3650 | - wp_send_json( $json ); |
|
| 3650 | + wp_send_json($json); |
|
| 3651 | 3651 | } |
| 3652 | 3652 | } |
| 3653 | 3653 | break; |
| 3654 | 3654 | case 'export_hoods': {
|
| 3655 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3656 | - $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' ); |
|
| 3657 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3658 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3659 | - $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv'; |
|
| 3655 | + $file_url_base = geodir_path_import_export().'/'; |
|
| 3656 | + $file_name = 'gd_neighbourhoods_'.date('dmyHi');
|
|
| 3657 | + $file_url = $file_url_base.$file_name.'.csv'; |
|
| 3658 | + $file_path = $csv_file_dir.'/'.$file_name.'.csv'; |
|
| 3659 | + $file_path_temp = $csv_file_dir.'/gd_neighbourhoods_'.$nonce.'.csv'; |
|
| 3660 | 3660 | |
| 3661 | - $items_count = (int)geodir_location_imex_count_neighbourhoods(); |
|
| 3661 | + $items_count = (int) geodir_location_imex_count_neighbourhoods(); |
|
| 3662 | 3662 | |
| 3663 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3664 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3665 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3666 | - $percentage = min( $percentage, 100 ); |
|
| 3663 | + if (isset($_REQUEST['_st'])) {
|
|
| 3664 | + $line_count = (int) geodir_import_export_line_count($file_path_temp); |
|
| 3665 | + $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0; |
|
| 3666 | + $percentage = min($percentage, 100); |
|
| 3667 | 3667 | |
| 3668 | 3668 | $json['percentage'] = $percentage; |
| 3669 | - wp_send_json( $json ); |
|
| 3669 | + wp_send_json($json); |
|
| 3670 | 3670 | } else {
|
| 3671 | 3671 | $chunk_file_paths = array(); |
| 3672 | 3672 | |
| 3673 | - if ( !$items_count > 0 ) {
|
|
| 3674 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3673 | + if (!$items_count > 0) {
|
|
| 3674 | + $json['error'] = __('No records to export.', 'geodirectory');
|
|
| 3675 | 3675 | } else {
|
| 3676 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3677 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3676 | + $chunk_per_page = min($chunk_per_page, $items_count); |
|
| 3677 | + $chunk_total_pages = ceil($items_count / $chunk_per_page); |
|
| 3678 | 3678 | |
| 3679 | 3679 | $j = $chunk_page_no; |
| 3680 | - $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
| 3680 | + $chunk_save_items = geodir_location_imex_neighbourhoods_data($chunk_per_page, $j); |
|
| 3681 | 3681 | |
| 3682 | 3682 | $per_page = 500; |
| 3683 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3684 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3683 | + $per_page = min($per_page, $chunk_per_page); |
|
| 3684 | + $total_pages = ceil($chunk_per_page / $per_page); |
|
| 3685 | 3685 | |
| 3686 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3687 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3686 | + for ($i = 0; $i <= $total_pages; $i++) {
|
|
| 3687 | + $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page); |
|
| 3688 | 3688 | |
| 3689 | 3689 | $clear = $i == 0 ? true : false; |
| 3690 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3690 | + geodir_save_csv_data($file_path_temp, $save_items, $clear); |
|
| 3691 | 3691 | } |
| 3692 | 3692 | |
| 3693 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3694 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3695 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3696 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3697 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3693 | + if ($wp_filesystem->exists($file_path_temp)) {
|
|
| 3694 | + $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : ''; |
|
| 3695 | + $chunk_file_name = $file_name.$chunk_page_no.'.csv'; |
|
| 3696 | + $file_path = $csv_file_dir.'/'.$chunk_file_name; |
|
| 3697 | + $wp_filesystem->move($file_path_temp, $file_path, true); |
|
| 3698 | 3698 | |
| 3699 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3700 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3699 | + $file_url = $file_url_base.$chunk_file_name; |
|
| 3700 | + $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3701 | 3701 | } |
| 3702 | 3702 | |
| 3703 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3703 | + if (!empty($chunk_file_paths)) {
|
|
| 3704 | 3704 | $json['total'] = $items_count; |
| 3705 | 3705 | $json['files'] = $chunk_file_paths; |
| 3706 | 3706 | } else {
|
| 3707 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3707 | + $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');
|
|
| 3708 | 3708 | } |
| 3709 | 3709 | } |
| 3710 | - wp_send_json( $json ); |
|
| 3710 | + wp_send_json($json); |
|
| 3711 | 3711 | } |
| 3712 | 3712 | } |
| 3713 | 3713 | break; |
@@ -3724,34 +3724,34 @@ discard block |
||
| 3724 | 3724 | } |
| 3725 | 3725 | // WPML |
| 3726 | 3726 | |
| 3727 | - ini_set( 'auto_detect_line_endings', true ); |
|
| 3727 | + ini_set('auto_detect_line_endings', true);
|
|
| 3728 | 3728 | |
| 3729 | 3729 | $uploads = wp_upload_dir(); |
| 3730 | 3730 | $uploads_dir = $uploads['path']; |
| 3731 | 3731 | $uploads_subdir = $uploads['subdir']; |
| 3732 | 3732 | |
| 3733 | - $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL; |
|
| 3734 | - $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip'; |
|
| 3733 | + $csv_file = isset($_POST['_file']) ? $_POST['_file'] : NULL; |
|
| 3734 | + $import_choice = isset($_REQUEST['_ch']) ? $_REQUEST['_ch'] : 'skip'; |
|
| 3735 | 3735 | |
| 3736 | - $csv_file_arr = explode( '/', $csv_file ); |
|
| 3737 | - $csv_filename = end( $csv_file_arr ); |
|
| 3738 | - $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename; |
|
| 3736 | + $csv_file_arr = explode('/', $csv_file);
|
|
| 3737 | + $csv_filename = end($csv_file_arr); |
|
| 3738 | + $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$csv_filename; |
|
| 3739 | 3739 | |
| 3740 | 3740 | $json['file'] = $csv_file; |
| 3741 | - $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
| 3741 | + $json['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
|
|
| 3742 | 3742 | $file = array(); |
| 3743 | 3743 | |
| 3744 | - if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
|
|
| 3745 | - $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename ); |
|
| 3744 | + if ($csv_file && $wp_filesystem->is_file($target_path) && $wp_filesystem->exists($target_path)) {
|
|
| 3745 | + $wp_filetype = wp_check_filetype_and_ext($target_path, $csv_filename); |
|
| 3746 | 3746 | |
| 3747 | 3747 | if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
| 3748 | 3748 | $json['error'] = NULL; |
| 3749 | 3749 | |
| 3750 | 3750 | $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
| 3751 | 3751 | setlocale(LC_ALL, 'en_US.UTF-8'); |
| 3752 | - if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
|
|
| 3753 | - while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
|
|
| 3754 | - if ( !empty( $data ) ) {
|
|
| 3752 | + if (($handle = fopen($target_path, "r")) !== FALSE) {
|
|
| 3753 | + while (($data = fgetcsv($handle, 100000, ",")) !== FALSE) {
|
|
| 3754 | + if (!empty($data)) {
|
|
| 3755 | 3755 | $file[] = $data; |
| 3756 | 3756 | } |
| 3757 | 3757 | } |
@@ -3765,19 +3765,19 @@ discard block |
||
| 3765 | 3765 | $json['error'] = __('No data found in csv file.', 'geodirectory');
|
| 3766 | 3766 | } |
| 3767 | 3767 | } else {
|
| 3768 | - wp_send_json( $json ); |
|
| 3768 | + wp_send_json($json); |
|
| 3769 | 3769 | } |
| 3770 | 3770 | } else {
|
| 3771 | - wp_send_json( $json ); |
|
| 3771 | + wp_send_json($json); |
|
| 3772 | 3772 | } |
| 3773 | 3773 | |
| 3774 | - if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
|
|
| 3775 | - wp_send_json( $json ); |
|
| 3774 | + if ($task == 'prepare_import' || !empty($json['error'])) {
|
|
| 3775 | + wp_send_json($json); |
|
| 3776 | 3776 | } |
| 3777 | 3777 | |
| 3778 | 3778 | $total = $json['rows']; |
| 3779 | - $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
| 3780 | - $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
| 3779 | + $limit = isset($_POST['limit']) ? (int) $_POST['limit'] : 1; |
|
| 3780 | + $processed = isset($_POST['processed']) ? (int) $_POST['processed'] : 0; |
|
| 3781 | 3781 | |
| 3782 | 3782 | $count = $limit; |
| 3783 | 3783 | |
@@ -3802,13 +3802,13 @@ discard block |
||
| 3802 | 3802 | |
| 3803 | 3803 | $post_types = geodir_get_posttypes(); |
| 3804 | 3804 | |
| 3805 | - if ( $task == 'import_cat' ) {
|
|
| 3805 | + if ($task == 'import_cat') {
|
|
| 3806 | 3806 | if (!empty($file)) {
|
| 3807 | 3807 | $columns = isset($file[0]) ? $file[0] : NULL; |
| 3808 | 3808 | |
| 3809 | 3809 | if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
| 3810 | 3810 | $json['error'] = CSV_INVAILD_FILE; |
| 3811 | - wp_send_json( $json ); |
|
| 3811 | + wp_send_json($json); |
|
| 3812 | 3812 | exit; |
| 3813 | 3813 | } |
| 3814 | 3814 | |
@@ -3819,7 +3819,7 @@ discard block |
||
| 3819 | 3819 | |
| 3820 | 3820 | if (isset($file[$index])) {
|
| 3821 | 3821 | $row = $file[$index]; |
| 3822 | - $row = array_map( 'trim', $row ); |
|
| 3822 | + $row = array_map('trim', $row);
|
|
| 3823 | 3823 | //$row = array_map( 'utf8_encode', $row ); |
| 3824 | 3824 | |
| 3825 | 3825 | $cat_id = ''; |
@@ -3836,42 +3836,42 @@ discard block |
||
| 3836 | 3836 | $cat_id_original = ''; |
| 3837 | 3837 | |
| 3838 | 3838 | $c = 0; |
| 3839 | - foreach ($columns as $column ) {
|
|
| 3840 | - if ( $column == 'cat_id' ) {
|
|
| 3841 | - $cat_id = (int)$row[$c]; |
|
| 3842 | - } else if ( $column == 'cat_name' ) {
|
|
| 3839 | + foreach ($columns as $column) {
|
|
| 3840 | + if ($column == 'cat_id') {
|
|
| 3841 | + $cat_id = (int) $row[$c]; |
|
| 3842 | + } else if ($column == 'cat_name') {
|
|
| 3843 | 3843 | $cat_name = $row[$c]; |
| 3844 | - } else if ( $column == 'cat_slug' ) {
|
|
| 3844 | + } else if ($column == 'cat_slug') {
|
|
| 3845 | 3845 | $cat_slug = $row[$c]; |
| 3846 | - } else if ( $column == 'cat_posttype' ) {
|
|
| 3846 | + } else if ($column == 'cat_posttype') {
|
|
| 3847 | 3847 | $cat_posttype = $row[$c]; |
| 3848 | - } else if ( $column == 'cat_parent' ) {
|
|
| 3848 | + } else if ($column == 'cat_parent') {
|
|
| 3849 | 3849 | $cat_parent = trim($row[$c]); |
| 3850 | - } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
|
|
| 3850 | + } else if ($column == 'cat_schema' && $row[$c] != '') {
|
|
| 3851 | 3851 | $cat_schema = $row[$c]; |
| 3852 | - } else if ( $column == 'cat_description' ) {
|
|
| 3852 | + } else if ($column == 'cat_description') {
|
|
| 3853 | 3853 | $cat_description = $row[$c]; |
| 3854 | - } else if ( $column == 'cat_top_description' ) {
|
|
| 3854 | + } else if ($column == 'cat_top_description') {
|
|
| 3855 | 3855 | $cat_top_description = $row[$c]; |
| 3856 | - } else if ( $column == 'cat_image' ) {
|
|
| 3856 | + } else if ($column == 'cat_image') {
|
|
| 3857 | 3857 | $cat_image = $row[$c]; |
| 3858 | - } else if ( $column == 'cat_icon' ) {
|
|
| 3858 | + } else if ($column == 'cat_icon') {
|
|
| 3859 | 3859 | $cat_icon = $row[$c]; |
| 3860 | 3860 | } |
| 3861 | 3861 | // WPML |
| 3862 | - if ( $is_wpml ) {
|
|
| 3863 | - if ( $column == 'cat_language' ) {
|
|
| 3864 | - $cat_language = geodir_strtolower( trim( $row[$c] ) ); |
|
| 3865 | - } else if ( $column == 'cat_id_original' ) {
|
|
| 3866 | - $cat_id_original = (int)$row[$c]; |
|
| 3862 | + if ($is_wpml) {
|
|
| 3863 | + if ($column == 'cat_language') {
|
|
| 3864 | + $cat_language = geodir_strtolower(trim($row[$c])); |
|
| 3865 | + } else if ($column == 'cat_id_original') {
|
|
| 3866 | + $cat_id_original = (int) $row[$c]; |
|
| 3867 | 3867 | } |
| 3868 | 3868 | } |
| 3869 | 3869 | // WPML |
| 3870 | 3870 | $c++; |
| 3871 | 3871 | } |
| 3872 | 3872 | |
| 3873 | - if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
|
|
| 3874 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 3873 | + if ($cat_name == '' || !in_array($cat_posttype, $post_types)) {
|
|
| 3874 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));
|
|
| 3875 | 3875 | |
| 3876 | 3876 | $invalid++; |
| 3877 | 3877 | continue; |
@@ -3889,24 +3889,24 @@ discard block |
||
| 3889 | 3889 | $term_data['description'] = $cat_description; |
| 3890 | 3890 | $term_data['cat_schema'] = $cat_schema; |
| 3891 | 3891 | $term_data['top_description'] = $cat_top_description; |
| 3892 | - $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : ''; |
|
| 3893 | - $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : ''; |
|
| 3892 | + $term_data['image'] = $cat_image != '' ? basename($cat_image) : ''; |
|
| 3893 | + $term_data['icon'] = $cat_icon != '' ? basename($cat_icon) : ''; |
|
| 3894 | 3894 | |
| 3895 | 3895 | //$term_data = array_map( 'utf8_encode', $term_data ); |
| 3896 | 3896 | |
| 3897 | - $taxonomy = $cat_posttype . 'category'; |
|
| 3897 | + $taxonomy = $cat_posttype.'category'; |
|
| 3898 | 3898 | |
| 3899 | 3899 | $term_data['taxonomy'] = $taxonomy; |
| 3900 | 3900 | |
| 3901 | 3901 | $term_parent_id = 0; |
| 3902 | - if ($cat_parent != "" || (int)$cat_parent > 0) {
|
|
| 3902 | + if ($cat_parent != "" || (int) $cat_parent > 0) {
|
|
| 3903 | 3903 | $term_parent = ''; |
| 3904 | 3904 | |
| 3905 | - if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
|
|
| 3905 | + if ($term_parent = get_term_by('name', $cat_parent, $taxonomy)) {
|
|
| 3906 | 3906 | // |
| 3907 | - } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
|
|
| 3907 | + } else if ($term_parent = get_term_by('slug', $cat_parent, $taxonomy)) {
|
|
| 3908 | 3908 | // |
| 3909 | - } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
|
|
| 3909 | + } else if ($term_parent = get_term_by('id', $cat_parent, $taxonomy)) {
|
|
| 3910 | 3910 | // |
| 3911 | 3911 | } else {
|
| 3912 | 3912 | $term_parent_data = array(); |
@@ -3914,104 +3914,104 @@ discard block |
||
| 3914 | 3914 | //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
| 3915 | 3915 | $term_parent_data['taxonomy'] = $taxonomy; |
| 3916 | 3916 | |
| 3917 | - $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
| 3917 | + $term_parent_id = (int) geodir_imex_insert_term($taxonomy, $term_parent_data); |
|
| 3918 | 3918 | } |
| 3919 | 3919 | |
| 3920 | - if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
|
|
| 3921 | - $term_parent_id = (int)$term_parent->term_id; |
|
| 3920 | + if (!empty($term_parent) && !is_wp_error($term_parent)) {
|
|
| 3921 | + $term_parent_id = (int) $term_parent->term_id; |
|
| 3922 | 3922 | } |
| 3923 | 3923 | } |
| 3924 | - $term_data['parent'] = (int)$term_parent_id; |
|
| 3924 | + $term_data['parent'] = (int) $term_parent_id; |
|
| 3925 | 3925 | |
| 3926 | 3926 | $term_id = NULL; |
| 3927 | - if ( $import_choice == 'update' ) {
|
|
| 3928 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3927 | + if ($import_choice == 'update') {
|
|
| 3928 | + if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {
|
|
| 3929 | 3929 | $term_data['term_id'] = $term['term_id']; |
| 3930 | 3930 | |
| 3931 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3931 | + if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {
|
|
| 3932 | 3932 | $updated++; |
| 3933 | 3933 | } else {
|
| 3934 | 3934 | $invalid++; |
| 3935 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3935 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3936 | 3936 | } |
| 3937 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3937 | + } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {
|
|
| 3938 | 3938 | $term_data['term_id'] = $term['term_id']; |
| 3939 | 3939 | |
| 3940 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3940 | + if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {
|
|
| 3941 | 3941 | $updated++; |
| 3942 | 3942 | } else {
|
| 3943 | 3943 | $invalid++; |
| 3944 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3944 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3945 | 3945 | } |
| 3946 | 3946 | } else {
|
| 3947 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3947 | + if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {
|
|
| 3948 | 3948 | $created++; |
| 3949 | 3949 | } else {
|
| 3950 | 3950 | $invalid++; |
| 3951 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3951 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3952 | 3952 | } |
| 3953 | 3953 | } |
| 3954 | - } else if ( $import_choice == 'skip' ) {
|
|
| 3955 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3954 | + } else if ($import_choice == 'skip') {
|
|
| 3955 | + if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {
|
|
| 3956 | 3956 | $skipped++; |
| 3957 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3957 | + } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {
|
|
| 3958 | 3958 | $skipped++; |
| 3959 | 3959 | } else {
|
| 3960 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3960 | + if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {
|
|
| 3961 | 3961 | $created++; |
| 3962 | 3962 | } else {
|
| 3963 | 3963 | $invalid++; |
| 3964 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3964 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3965 | 3965 | } |
| 3966 | 3966 | } |
| 3967 | 3967 | } else {
|
| 3968 | 3968 | $invalid++; |
| 3969 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3969 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3970 | 3970 | } |
| 3971 | 3971 | |
| 3972 | - if ( $term_id ) {
|
|
| 3972 | + if ($term_id) {
|
|
| 3973 | 3973 | // WPML |
| 3974 | 3974 | if ($is_wpml && geodir_wpml_is_taxonomy_translated($taxonomy) && $cat_id_original > 0 && $cat_language != '') {
|
| 3975 | - $wpml_element_type = 'tax_' . $taxonomy; |
|
| 3976 | - $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type ); |
|
| 3975 | + $wpml_element_type = 'tax_'.$taxonomy; |
|
| 3976 | + $source_language = geodir_get_language_for_element($cat_id_original, $wpml_element_type); |
|
| 3977 | 3977 | $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
| 3978 | 3978 | |
| 3979 | - $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type ); |
|
| 3979 | + $trid = $sitepress->get_element_trid($cat_id_original, $wpml_element_type); |
|
| 3980 | 3980 | |
| 3981 | - $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language ); |
|
| 3981 | + $sitepress->set_element_language_details($term_id, $wpml_element_type, $trid, $cat_language, $source_language); |
|
| 3982 | 3982 | } |
| 3983 | 3983 | // WPML |
| 3984 | 3984 | |
| 3985 | - if ( isset( $term_data['top_description'] ) ) {
|
|
| 3986 | - geodir_update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype ); |
|
| 3985 | + if (isset($term_data['top_description'])) {
|
|
| 3986 | + geodir_update_tax_meta($term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype); |
|
| 3987 | 3987 | } |
| 3988 | 3988 | |
| 3989 | - if ( isset( $term_data['cat_schema'] ) ) {
|
|
| 3990 | - geodir_update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype ); |
|
| 3989 | + if (isset($term_data['cat_schema'])) {
|
|
| 3990 | + geodir_update_tax_meta($term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype); |
|
| 3991 | 3991 | } |
| 3992 | 3992 | |
| 3993 | 3993 | $attachment = false; |
| 3994 | - if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
|
|
| 3995 | - $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype ); |
|
| 3996 | - $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 3994 | + if (isset($term_data['image']) && $term_data['image'] != '') {
|
|
| 3995 | + $cat_image = geodir_get_default_catimage($term_id, $cat_posttype); |
|
| 3996 | + $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : ''; |
|
| 3997 | 3997 | |
| 3998 | - if ( basename($cat_image) != $term_data['image'] ) {
|
|
| 3998 | + if (basename($cat_image) != $term_data['image']) {
|
|
| 3999 | 3999 | $attachment = true; |
| 4000 | - geodir_update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
| 4000 | + geodir_update_tax_meta($term_id, 'ct_cat_default_img', array('id' => 'image', 'src' => $uploads['url'].'/'.$term_data['image']), $cat_posttype);
|
|
| 4001 | 4001 | } |
| 4002 | 4002 | } |
| 4003 | 4003 | |
| 4004 | - if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
|
|
| 4005 | - $cat_icon = geodir_get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype ); |
|
| 4006 | - $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 4004 | + if (isset($term_data['icon']) && $term_data['icon'] != '') {
|
|
| 4005 | + $cat_icon = geodir_get_tax_meta($term_id, 'ct_cat_icon', false, $cat_posttype); |
|
| 4006 | + $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : ''; |
|
| 4007 | 4007 | |
| 4008 | - if ( basename($cat_icon) != $term_data['icon'] ) {
|
|
| 4008 | + if (basename($cat_icon) != $term_data['icon']) {
|
|
| 4009 | 4009 | $attachment = true; |
| 4010 | - geodir_update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
| 4010 | + geodir_update_tax_meta($term_id, 'ct_cat_icon', array('id' => 'icon', 'src' => $uploads['url'].'/'.$term_data['icon']), $cat_posttype);
|
|
| 4011 | 4011 | } |
| 4012 | 4012 | } |
| 4013 | 4013 | |
| 4014 | - if ( $attachment ) {
|
|
| 4014 | + if ($attachment) {
|
|
| 4015 | 4015 | $images++; |
| 4016 | 4016 | } |
| 4017 | 4017 | } |
@@ -4033,35 +4033,35 @@ discard block |
||
| 4033 | 4033 | $json['invalid'] = $invalid; |
| 4034 | 4034 | $json['images'] = $images; |
| 4035 | 4035 | |
| 4036 | - wp_send_json( $json ); |
|
| 4036 | + wp_send_json($json); |
|
| 4037 | 4037 | exit; |
| 4038 | - } else if ( $task == 'import_post' ) {
|
|
| 4039 | - $xtimings['###1'] = microtime(true)-$xstart; |
|
| 4038 | + } else if ($task == 'import_post') {
|
|
| 4039 | + $xtimings['###1'] = microtime(true) - $xstart; |
|
| 4040 | 4040 | //run some stuff to make the import quicker |
| 4041 | - wp_defer_term_counting( true ); |
|
| 4042 | - wp_defer_comment_counting( true ); |
|
| 4043 | - $wpdb->query( 'SET autocommit = 0;' ); |
|
| 4041 | + wp_defer_term_counting(true); |
|
| 4042 | + wp_defer_comment_counting(true); |
|
| 4043 | + $wpdb->query('SET autocommit = 0;');
|
|
| 4044 | 4044 | // |
| 4045 | 4045 | // remove_all_actions('publish_post');
|
| 4046 | 4046 | // remove_all_actions('transition_post_status');
|
| 4047 | 4047 | // remove_all_actions('publish_future_post');
|
| 4048 | 4048 | |
| 4049 | 4049 | if (!empty($file)) {
|
| 4050 | - $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 4050 | + $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 4051 | 4051 | $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
| 4052 | 4052 | $default_status = 'publish'; |
| 4053 | - $current_date = date_i18n( 'Y-m-d', time() ); |
|
| 4053 | + $current_date = date_i18n('Y-m-d', time());
|
|
| 4054 | 4054 | |
| 4055 | 4055 | $columns = isset($file[0]) ? $file[0] : NULL; |
| 4056 | 4056 | |
| 4057 | 4057 | if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
| 4058 | 4058 | $json['error'] = CSV_INVAILD_FILE; |
| 4059 | - wp_send_json( $json ); |
|
| 4059 | + wp_send_json($json); |
|
| 4060 | 4060 | exit; |
| 4061 | 4061 | } |
| 4062 | - $xtimings['###2'] = microtime(true)-$xstart; |
|
| 4062 | + $xtimings['###2'] = microtime(true) - $xstart; |
|
| 4063 | 4063 | $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
|
| 4064 | - $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
| 4064 | + $wp_chars_error = __('(check & remove if any invalid characters used in data)', 'geodirectory');
|
|
| 4065 | 4065 | $processed_actual = 0; |
| 4066 | 4066 | for ($i = 1; $i <= $limit; $i++) {
|
| 4067 | 4067 | $index = $processed + $i; |
@@ -4070,9 +4070,9 @@ discard block |
||
| 4070 | 4070 | if (isset($file[$index])) {
|
| 4071 | 4071 | $processed_actual++; |
| 4072 | 4072 | $row = $file[$index]; |
| 4073 | - $row = array_map( 'trim', $row ); |
|
| 4073 | + $row = array_map('trim', $row);
|
|
| 4074 | 4074 | //$row = array_map( 'utf8_encode', $row ); |
| 4075 | - $row = array_map( 'addslashes_gpc', $row ); |
|
| 4075 | + $row = array_map('addslashes_gpc', $row);
|
|
| 4076 | 4076 | |
| 4077 | 4077 | $post_id = ''; |
| 4078 | 4078 | $post_title = ''; |
@@ -4112,82 +4112,82 @@ discard block |
||
| 4112 | 4112 | $original_post_id = ''; |
| 4113 | 4113 | |
| 4114 | 4114 | $c = 0; |
| 4115 | - foreach ($columns as $column ) {
|
|
| 4115 | + foreach ($columns as $column) {
|
|
| 4116 | 4116 | $gd_post[$column] = $row[$c]; |
| 4117 | 4117 | |
| 4118 | - if ( $column == 'post_id' ) {
|
|
| 4118 | + if ($column == 'post_id') {
|
|
| 4119 | 4119 | $post_id = $row[$c]; |
| 4120 | - } else if ( $column == 'post_title' ) {
|
|
| 4120 | + } else if ($column == 'post_title') {
|
|
| 4121 | 4121 | $post_title = sanitize_text_field($row[$c]); |
| 4122 | - } else if ( $column == 'post_author' ) {
|
|
| 4122 | + } else if ($column == 'post_author') {
|
|
| 4123 | 4123 | $post_author = $row[$c]; |
| 4124 | - } else if ( $column == 'post_date' ) {
|
|
| 4124 | + } else if ($column == 'post_date') {
|
|
| 4125 | 4125 | $post_date = $row[$c]; |
| 4126 | - } else if ( $column == 'post_content' ) {
|
|
| 4126 | + } else if ($column == 'post_content') {
|
|
| 4127 | 4127 | $post_content = $row[$c]; |
| 4128 | - } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
| 4129 | - $post_category_arr = explode( ',', $row[$c] ); |
|
| 4130 | - } else if ( $column == 'default_category' ) {
|
|
| 4128 | + } else if ($column == 'post_category' && $row[$c] != '') {
|
|
| 4129 | + $post_category_arr = explode(',', $row[$c]);
|
|
| 4130 | + } else if ($column == 'default_category') {
|
|
| 4131 | 4131 | $default_category = wp_kses_normalize_entities($row[$c]); |
| 4132 | - } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
| 4133 | - $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
| 4134 | - } else if ( $column == 'post_type' ) {
|
|
| 4132 | + } else if ($column == 'post_tags' && $row[$c] != '') {
|
|
| 4133 | + $post_tags = explode(',', sanitize_text_field($row[$c]));
|
|
| 4134 | + } else if ($column == 'post_type') {
|
|
| 4135 | 4135 | $post_type = $row[$c]; |
| 4136 | - } else if ( $column == 'post_status' ) {
|
|
| 4137 | - $post_status = sanitize_key( $row[$c] ); |
|
| 4138 | - } else if ( $column == 'is_featured' ) {
|
|
| 4139 | - $is_featured = (int)$row[$c]; |
|
| 4140 | - } else if ( $column == 'geodir_video' ) {
|
|
| 4136 | + } else if ($column == 'post_status') {
|
|
| 4137 | + $post_status = sanitize_key($row[$c]); |
|
| 4138 | + } else if ($column == 'is_featured') {
|
|
| 4139 | + $is_featured = (int) $row[$c]; |
|
| 4140 | + } else if ($column == 'geodir_video') {
|
|
| 4141 | 4141 | $geodir_video = $row[$c]; |
| 4142 | - } else if ( $column == 'post_address' ) {
|
|
| 4142 | + } else if ($column == 'post_address') {
|
|
| 4143 | 4143 | $post_address = sanitize_text_field($row[$c]); |
| 4144 | - } else if ( $column == 'post_city' ) {
|
|
| 4144 | + } else if ($column == 'post_city') {
|
|
| 4145 | 4145 | $post_city = sanitize_text_field($row[$c]); |
| 4146 | - } else if ( $column == 'post_region' ) {
|
|
| 4146 | + } else if ($column == 'post_region') {
|
|
| 4147 | 4147 | $post_region = sanitize_text_field($row[$c]); |
| 4148 | - } else if ( $column == 'post_country' ) {
|
|
| 4148 | + } else if ($column == 'post_country') {
|
|
| 4149 | 4149 | $post_country = sanitize_text_field($row[$c]); |
| 4150 | - } else if ( $column == 'post_zip' ) {
|
|
| 4150 | + } else if ($column == 'post_zip') {
|
|
| 4151 | 4151 | $post_zip = sanitize_text_field($row[$c]); |
| 4152 | - } else if ( $column == 'post_latitude' ) {
|
|
| 4152 | + } else if ($column == 'post_latitude') {
|
|
| 4153 | 4153 | $post_latitude = sanitize_text_field($row[$c]); |
| 4154 | - } else if ( $column == 'post_longitude' ) {
|
|
| 4154 | + } else if ($column == 'post_longitude') {
|
|
| 4155 | 4155 | $post_longitude = sanitize_text_field($row[$c]); |
| 4156 | - } else if ( $column == 'post_neighbourhood' ) {
|
|
| 4156 | + } else if ($column == 'post_neighbourhood') {
|
|
| 4157 | 4157 | $post_neighbourhood = sanitize_text_field($row[$c]); |
| 4158 | 4158 | unset($gd_post[$column]); |
| 4159 | - } else if ( $column == 'neighbourhood_latitude' ) {
|
|
| 4159 | + } else if ($column == 'neighbourhood_latitude') {
|
|
| 4160 | 4160 | $neighbourhood_latitude = sanitize_text_field($row[$c]); |
| 4161 | - } else if ( $column == 'neighbourhood_longitude' ) {
|
|
| 4161 | + } else if ($column == 'neighbourhood_longitude') {
|
|
| 4162 | 4162 | $neighbourhood_longitude = sanitize_text_field($row[$c]); |
| 4163 | - } else if ( $column == 'geodir_timing' ) {
|
|
| 4163 | + } else if ($column == 'geodir_timing') {
|
|
| 4164 | 4164 | $geodir_timing = sanitize_text_field($row[$c]); |
| 4165 | - } else if ( $column == 'geodir_contact' ) {
|
|
| 4165 | + } else if ($column == 'geodir_contact') {
|
|
| 4166 | 4166 | $geodir_contact = sanitize_text_field($row[$c]); |
| 4167 | - } else if ( $column == 'geodir_email' ) {
|
|
| 4167 | + } else if ($column == 'geodir_email') {
|
|
| 4168 | 4168 | $geodir_email = sanitize_email($row[$c]); |
| 4169 | - } else if ( $column == 'geodir_website' ) {
|
|
| 4169 | + } else if ($column == 'geodir_website') {
|
|
| 4170 | 4170 | $geodir_website = sanitize_text_field($row[$c]); |
| 4171 | - } else if ( $column == 'geodir_twitter' ) {
|
|
| 4171 | + } else if ($column == 'geodir_twitter') {
|
|
| 4172 | 4172 | $geodir_twitter = sanitize_text_field($row[$c]); |
| 4173 | - } else if ( $column == 'geodir_facebook' ) {
|
|
| 4173 | + } else if ($column == 'geodir_facebook') {
|
|
| 4174 | 4174 | $geodir_facebook = sanitize_text_field($row[$c]); |
| 4175 | - } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
| 4175 | + } else if ($column == 'IMAGE' && !empty($row[$c]) && $row[$c] != '') {
|
|
| 4176 | 4176 | $post_images[] = $row[$c]; |
| 4177 | - } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
| 4178 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
| 4179 | - } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
| 4177 | + } else if ($column == 'alive_days' && (int) $row[$c] > 0) {
|
|
| 4178 | + $expire_date = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $row[$c].' days'));
|
|
| 4179 | + } else if ($column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never') {
|
|
| 4180 | 4180 | $row[$c] = str_replace('/', '-', $row[$c]);
|
| 4181 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
| 4182 | - } else if ( strpos( $column, 'linked_' ) === 0 ) {
|
|
| 4183 | - $geodir_link_business = (int)$row[$c]; |
|
| 4181 | + $expire_date = date_i18n('Y-m-d', strtotime($row[$c]));
|
|
| 4182 | + } else if (strpos($column, 'linked_') === 0) {
|
|
| 4183 | + $geodir_link_business = (int) $row[$c]; |
|
| 4184 | 4184 | } |
| 4185 | 4185 | // WPML |
| 4186 | 4186 | if ($is_wpml) {
|
| 4187 | 4187 | if ($column == 'language') {
|
| 4188 | 4188 | $language = geodir_strtolower(trim($row[$c])); |
| 4189 | 4189 | } else if ($column == 'original_post_id') {
|
| 4190 | - $original_post_id = (int)$row[$c]; |
|
| 4190 | + $original_post_id = (int) $row[$c]; |
|
| 4191 | 4191 | } |
| 4192 | 4192 | } |
| 4193 | 4193 | // WPML |
@@ -4195,7 +4195,7 @@ discard block |
||
| 4195 | 4195 | } |
| 4196 | 4196 | // listing claimed or not |
| 4197 | 4197 | if ($is_claim_active && isset($gd_post['claimed'])) {
|
| 4198 | - $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4198 | + $gd_post['claimed'] = (int) $gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4199 | 4199 | } |
| 4200 | 4200 | |
| 4201 | 4201 | // WPML |
@@ -4206,43 +4206,43 @@ discard block |
||
| 4206 | 4206 | |
| 4207 | 4207 | $gd_post['IMAGE'] = $post_images; |
| 4208 | 4208 | |
| 4209 | - $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 4210 | - $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 4209 | + $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status; |
|
| 4210 | + $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status; |
|
| 4211 | 4211 | |
| 4212 | 4212 | $valid = true; |
| 4213 | 4213 | |
| 4214 | - if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
| 4214 | + if ($post_title == '' || !in_array($post_type, $post_types)) {
|
|
| 4215 | 4215 | $invalid++; |
| 4216 | 4216 | $valid = false; |
| 4217 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 4217 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));
|
|
| 4218 | 4218 | } |
| 4219 | - $xtimings['###3'] = microtime(true)-$xstart; |
|
| 4220 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 4221 | - if ( $location_allowed ) {
|
|
| 4219 | + $xtimings['###3'] = microtime(true) - $xstart; |
|
| 4220 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
| 4221 | + if ($location_allowed) {
|
|
| 4222 | 4222 | $location_result = geodir_get_default_location(); |
| 4223 | - if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
| 4223 | + if ($post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '') {
|
|
| 4224 | 4224 | $invalid_addr++; |
| 4225 | 4225 | $valid = false; |
| 4226 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4227 | - } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
| 4228 | - if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {
|
|
| 4226 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));
|
|
| 4227 | + } else if (!empty($location_result) && $location_result->location_id == 0) {
|
|
| 4228 | + if ((geodir_strtolower($post_city) != geodir_strtolower($location_result->city)) || (geodir_strtolower($post_region) != geodir_strtolower($location_result->region)) || (geodir_strtolower($post_country) != geodir_strtolower($location_result->country))) {
|
|
| 4229 | 4229 | $invalid_addr++; |
| 4230 | 4230 | $valid = false; |
| 4231 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4231 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));
|
|
| 4232 | 4232 | } else {
|
| 4233 | 4233 | if (!$location_manager) {
|
| 4234 | - $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated. |
|
| 4234 | + $gd_post['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // Set the default location when location manager not activated. |
|
| 4235 | 4235 | } |
| 4236 | 4236 | } |
| 4237 | 4237 | } |
| 4238 | 4238 | } |
| 4239 | - $xtimings['###4'] = microtime(true)-$xstart; |
|
| 4240 | - if ( !$valid ) {
|
|
| 4239 | + $xtimings['###4'] = microtime(true) - $xstart; |
|
| 4240 | + if (!$valid) {
|
|
| 4241 | 4241 | continue; |
| 4242 | 4242 | } |
| 4243 | 4243 | |
| 4244 | - $cat_taxonomy = $post_type . 'category'; |
|
| 4245 | - $tags_taxonomy = $post_type . '_tags'; |
|
| 4244 | + $cat_taxonomy = $post_type.'category'; |
|
| 4245 | + $tags_taxonomy = $post_type.'_tags'; |
|
| 4246 | 4246 | |
| 4247 | 4247 | if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
| 4248 | 4248 | $post_category_arr = array_merge(array($default_category), $post_category_arr); |
@@ -4250,29 +4250,29 @@ discard block |
||
| 4250 | 4250 | |
| 4251 | 4251 | $post_category = array(); |
| 4252 | 4252 | $default_category_id = NULL; |
| 4253 | - if ( !empty( $post_category_arr ) ) {
|
|
| 4254 | - foreach ( $post_category_arr as $value ) {
|
|
| 4255 | - $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
| 4253 | + if (!empty($post_category_arr)) {
|
|
| 4254 | + foreach ($post_category_arr as $value) {
|
|
| 4255 | + $category_name = wp_kses_normalize_entities(trim($value)); |
|
| 4256 | 4256 | |
| 4257 | - if ( $category_name != '' ) {
|
|
| 4257 | + if ($category_name != '') {
|
|
| 4258 | 4258 | $term_category = array(); |
| 4259 | 4259 | |
| 4260 | - if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
| 4260 | + if ($term = get_term_by('name', $category_name, $cat_taxonomy)) {
|
|
| 4261 | 4261 | $term_category = $term; |
| 4262 | - } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
| 4262 | + } else if ($term = get_term_by('slug', $category_name, $cat_taxonomy)) {
|
|
| 4263 | 4263 | $term_category = $term; |
| 4264 | 4264 | } else {
|
| 4265 | 4265 | $term_data = array(); |
| 4266 | 4266 | $term_data['name'] = $category_name; |
| 4267 | 4267 | $term_data['taxonomy'] = $cat_taxonomy; |
| 4268 | 4268 | |
| 4269 | - $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
| 4270 | - if ( $term_id ) {
|
|
| 4271 | - $term_category = get_term( $term_id, $cat_taxonomy ); |
|
| 4269 | + $term_id = geodir_imex_insert_term($cat_taxonomy, $term_data); |
|
| 4270 | + if ($term_id) {
|
|
| 4271 | + $term_category = get_term($term_id, $cat_taxonomy); |
|
| 4272 | 4272 | } |
| 4273 | 4273 | } |
| 4274 | 4274 | |
| 4275 | - if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
| 4275 | + if (!empty($term_category) && !is_wp_error($term_category)) {
|
|
| 4276 | 4276 | $post_category[] = intval($term_category->term_id); |
| 4277 | 4277 | |
| 4278 | 4278 | if ($category_name == $default_category) {
|
@@ -4282,14 +4282,14 @@ discard block |
||
| 4282 | 4282 | } |
| 4283 | 4283 | } |
| 4284 | 4284 | } |
| 4285 | - $xtimings['###5'] = microtime(true)-$xstart; |
|
| 4285 | + $xtimings['###5'] = microtime(true) - $xstart; |
|
| 4286 | 4286 | $save_post = array(); |
| 4287 | 4287 | $save_post['post_title'] = $post_title; |
| 4288 | 4288 | if (!empty($post_date)) {
|
| 4289 | - $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format. |
|
| 4289 | + $post_date = geodir_date($post_date, 'Y-m-d H:i:s'); // convert to mysql date format. |
|
| 4290 | 4290 | |
| 4291 | 4291 | $save_post['post_date'] = $post_date; |
| 4292 | - $save_post['post_date_gmt'] = get_gmt_from_date( $post_date ); |
|
| 4292 | + $save_post['post_date_gmt'] = get_gmt_from_date($post_date); |
|
| 4293 | 4293 | } |
| 4294 | 4294 | $save_post['post_content'] = $post_content; |
| 4295 | 4295 | $save_post['post_type'] = $post_type; |
@@ -4299,15 +4299,15 @@ discard block |
||
| 4299 | 4299 | $save_post['post_tags'] = $post_tags; |
| 4300 | 4300 | |
| 4301 | 4301 | $saved_post_id = NULL; |
| 4302 | - if ( $import_choice == 'update' ) {
|
|
| 4303 | - $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
| 4302 | + if ($import_choice == 'update') {
|
|
| 4303 | + $gd_wp_error = __('Unable to add listing, please check the listing data.', 'geodirectory');
|
|
| 4304 | 4304 | |
| 4305 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4305 | + if ($post_id > 0 && get_post($post_id)) {
|
|
| 4306 | 4306 | $save_post['ID'] = $post_id; |
| 4307 | 4307 | |
| 4308 | - if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
| 4309 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4310 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4308 | + if ($saved_post_id = wp_update_post($save_post, true)) {
|
|
| 4309 | + if (is_wp_error($saved_post_id)) {
|
|
| 4310 | + $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error; |
|
| 4311 | 4311 | $saved_post_id = 0; |
| 4312 | 4312 | } else {
|
| 4313 | 4313 | $saved_post_id = $post_id; |
@@ -4315,9 +4315,9 @@ discard block |
||
| 4315 | 4315 | } |
| 4316 | 4316 | } |
| 4317 | 4317 | } else {
|
| 4318 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4319 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4320 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4318 | + if ($saved_post_id = wp_insert_post($save_post, true)) {
|
|
| 4319 | + if (is_wp_error($saved_post_id)) {
|
|
| 4320 | + $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error; |
|
| 4321 | 4321 | $saved_post_id = 0; |
| 4322 | 4322 | } else {
|
| 4323 | 4323 | $created++; |
@@ -4325,19 +4325,19 @@ discard block |
||
| 4325 | 4325 | } |
| 4326 | 4326 | } |
| 4327 | 4327 | |
| 4328 | - if ( !$saved_post_id > 0 ) {
|
|
| 4328 | + if (!$saved_post_id > 0) {
|
|
| 4329 | 4329 | $invalid++; |
| 4330 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
| 4330 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_wp_error); |
|
| 4331 | 4331 | } |
| 4332 | - } else if ( $import_choice == 'skip' ) {
|
|
| 4333 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4332 | + } else if ($import_choice == 'skip') {
|
|
| 4333 | + if ($post_id > 0 && get_post($post_id)) {
|
|
| 4334 | 4334 | $skipped++; |
| 4335 | 4335 | } else {
|
| 4336 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4337 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4336 | + if ($saved_post_id = wp_insert_post($save_post, true)) {
|
|
| 4337 | + if (is_wp_error($saved_post_id)) {
|
|
| 4338 | 4338 | $invalid++; |
| 4339 | 4339 | |
| 4340 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
| 4340 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$saved_post_id->get_error_message().' '.$wp_chars_error); |
|
| 4341 | 4341 | $saved_post_id = 0; |
| 4342 | 4342 | } else {
|
| 4343 | 4343 | $created++; |
@@ -4345,28 +4345,28 @@ discard block |
||
| 4345 | 4345 | } else {
|
| 4346 | 4346 | $invalid++; |
| 4347 | 4347 | |
| 4348 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4348 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error); |
|
| 4349 | 4349 | } |
| 4350 | 4350 | } |
| 4351 | 4351 | } else {
|
| 4352 | 4352 | $invalid++; |
| 4353 | 4353 | |
| 4354 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4354 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error); |
|
| 4355 | 4355 | } |
| 4356 | - $xtimings['###6'] = microtime(true)-$xstart; |
|
| 4357 | - if ( (int)$saved_post_id > 0 ) {
|
|
| 4356 | + $xtimings['###6'] = microtime(true) - $xstart; |
|
| 4357 | + if ((int) $saved_post_id > 0) {
|
|
| 4358 | 4358 | // WPML |
| 4359 | 4359 | if ($is_wpml && geodir_wpml_is_post_type_translated($post_type) && $original_post_id > 0 && $language != '') {
|
| 4360 | - $wpml_post_type = 'post_' . $post_type; |
|
| 4361 | - $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
| 4360 | + $wpml_post_type = 'post_'.$post_type; |
|
| 4361 | + $source_language = geodir_get_language_for_element($original_post_id, $wpml_post_type); |
|
| 4362 | 4362 | $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
| 4363 | 4363 | |
| 4364 | - $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
| 4364 | + $trid = $sitepress->get_element_trid($original_post_id, $wpml_post_type); |
|
| 4365 | 4365 | |
| 4366 | - $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
| 4366 | + $sitepress->set_element_language_details($saved_post_id, $wpml_post_type, $trid, $language, $source_language); |
|
| 4367 | 4367 | } |
| 4368 | 4368 | // WPML |
| 4369 | - $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
| 4369 | + $gd_post_info = geodir_get_post_info($saved_post_id); |
|
| 4370 | 4370 | |
| 4371 | 4371 | $gd_post['post_id'] = $saved_post_id; |
| 4372 | 4372 | $gd_post['ID'] = $saved_post_id; |
@@ -4378,7 +4378,7 @@ discard block |
||
| 4378 | 4378 | |
| 4379 | 4379 | // post location |
| 4380 | 4380 | $post_location_id = 0; |
| 4381 | - if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
| 4381 | + if ($location_allowed && !empty($location_result) && $location_result->location_id > 0) {
|
|
| 4382 | 4382 | $gd_post['post_neighbourhood'] = ''; |
| 4383 | 4383 | |
| 4384 | 4384 | $post_location_info = array( |
@@ -4388,7 +4388,7 @@ discard block |
||
| 4388 | 4388 | 'geo_lat' => $post_latitude, |
| 4389 | 4389 | 'geo_lng' => $post_longitude |
| 4390 | 4390 | ); |
| 4391 | - if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
| 4391 | + if ($location_id = (int) geodir_add_new_location($post_location_info)) {
|
|
| 4392 | 4392 | $post_location_id = $location_id; |
| 4393 | 4393 | } |
| 4394 | 4394 | |
@@ -4430,14 +4430,14 @@ discard block |
||
| 4430 | 4430 | } |
| 4431 | 4431 | |
| 4432 | 4432 | // post package info |
| 4433 | - $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
| 4433 | + $package_id = isset($gd_post['package_id']) && !empty($gd_post['package_id']) ? (int) $gd_post['package_id'] : 0; |
|
| 4434 | 4434 | if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
| 4435 | 4435 | $package_id = $gd_post_info->package_id; |
| 4436 | 4436 | } |
| 4437 | 4437 | |
| 4438 | 4438 | $package_info = array(); |
| 4439 | 4439 | if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
| 4440 | - $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
| 4440 | + $package_info = (array) geodir_get_package_info_by_id($package_id); |
|
| 4441 | 4441 | |
| 4442 | 4442 | if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
| 4443 | 4443 | $package_info = array(); |
@@ -4445,18 +4445,18 @@ discard block |
||
| 4445 | 4445 | } |
| 4446 | 4446 | |
| 4447 | 4447 | if (empty($package_info)) {
|
| 4448 | - $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
| 4448 | + $package_info = (array) geodir_post_package_info(array(), '', $post_type); |
|
| 4449 | 4449 | } |
| 4450 | 4450 | |
| 4451 | - if (!empty($package_info)) {
|
|
| 4451 | + if (!empty($package_info)) {
|
|
| 4452 | 4452 | $package_id = $package_info['pid']; |
| 4453 | 4453 | |
| 4454 | 4454 | if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
| 4455 | 4455 | $gd_post['expire_date'] = $expire_date; |
| 4456 | 4456 | } else {
|
| 4457 | - if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
| 4458 | - $gd_post['alive_days'] = (int)$package_info['days']; |
|
| 4459 | - $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
| 4457 | + if (isset($package_info['days']) && (int) $package_info['days'] > 0) {
|
|
| 4458 | + $gd_post['alive_days'] = (int) $package_info['days']; |
|
| 4459 | + $gd_post['expire_date'] = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $package_info['days'].' days'));
|
|
| 4460 | 4460 | } else {
|
| 4461 | 4461 | $gd_post['expire_date'] = 'Never'; |
| 4462 | 4462 | } |
@@ -4465,7 +4465,7 @@ discard block |
||
| 4465 | 4465 | $gd_post['package_id'] = $package_id; |
| 4466 | 4466 | } |
| 4467 | 4467 | |
| 4468 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 4468 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 4469 | 4469 | |
| 4470 | 4470 | if ($post_type == 'gd_event') {
|
| 4471 | 4471 | $gd_post = geodir_imex_process_event_data($gd_post); |
@@ -4476,71 +4476,71 @@ discard block |
||
| 4476 | 4476 | } |
| 4477 | 4477 | |
| 4478 | 4478 | // Export franchise fields |
| 4479 | - $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 4479 | + $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;
|
|
| 4480 | 4480 | if ($is_franchise_active) {
|
| 4481 | - if ( isset( $gd_post['gd_is_franchise'] ) && empty( $gd_post['franchise'] ) ) {
|
|
| 4482 | - if ( absint( $gd_post['gd_is_franchise'] ) != 0 ) {
|
|
| 4481 | + if (isset($gd_post['gd_is_franchise']) && empty($gd_post['franchise'])) {
|
|
| 4482 | + if (absint($gd_post['gd_is_franchise']) != 0) {
|
|
| 4483 | 4483 | $gd_franchise_lock = array(); |
| 4484 | 4484 | |
| 4485 | - if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
| 4486 | - $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
| 4487 | - $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
| 4488 | - $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
| 4485 | + if (isset($gd_post['gd_franchise_lock'])) {
|
|
| 4486 | + $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock']);
|
|
| 4487 | + $gd_franchise_lock = trim($gd_franchise_lock); |
|
| 4488 | + $gd_franchise_lock = explode(",", $gd_franchise_lock);
|
|
| 4489 | 4489 | } |
| 4490 | 4490 | |
| 4491 | - update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
| 4492 | - update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
| 4491 | + update_post_meta($saved_post_id, 'gd_is_franchise', 1); |
|
| 4492 | + update_post_meta($saved_post_id, 'gd_franchise_lock', $gd_franchise_lock); |
|
| 4493 | 4493 | } else {
|
| 4494 | - if ( function_exists( 'geodir_franchise_remove_franchise' ) ) {
|
|
| 4495 | - geodir_franchise_remove_franchise( $saved_post_id ); |
|
| 4494 | + if (function_exists('geodir_franchise_remove_franchise')) {
|
|
| 4495 | + geodir_franchise_remove_franchise($saved_post_id); |
|
| 4496 | 4496 | } |
| 4497 | 4497 | } |
| 4498 | 4498 | } else {
|
| 4499 | - if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
| 4500 | - geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
| 4499 | + if (isset($gd_post['franchise']) && (int) $gd_post['franchise'] > 0 && geodir_franchise_check((int) $gd_post['franchise'])) {
|
|
| 4500 | + geodir_save_post_meta($saved_post_id, 'franchise', (int) $gd_post['franchise']); |
|
| 4501 | 4501 | } |
| 4502 | 4502 | } |
| 4503 | 4503 | } |
| 4504 | 4504 | |
| 4505 | 4505 | if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
| 4506 | - $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
| 4506 | + $save_post['post_category'] = array_unique(array_map('intval', $save_post['post_category']));
|
|
| 4507 | 4507 | if ($default_category_id) {
|
| 4508 | 4508 | $save_post['post_default_category'] = $default_category_id; |
| 4509 | 4509 | $gd_post['default_category'] = $default_category_id; |
| 4510 | 4510 | } |
| 4511 | 4511 | $gd_post[$cat_taxonomy] = $save_post['post_category']; |
| 4512 | 4512 | } |
| 4513 | - $xtimings['###7'] = microtime(true)-$xstart; |
|
| 4513 | + $xtimings['###7'] = microtime(true) - $xstart; |
|
| 4514 | 4514 | // Save post info |
| 4515 | - geodir_save_post_info( $saved_post_id, $gd_post ); |
|
| 4516 | - $xtimings['###8'] = microtime(true)-$xstart; |
|
| 4515 | + geodir_save_post_info($saved_post_id, $gd_post); |
|
| 4516 | + $xtimings['###8'] = microtime(true) - $xstart; |
|
| 4517 | 4517 | // post taxonomies |
| 4518 | - if ( !empty( $save_post['post_category'] ) ) {
|
|
| 4519 | - wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
| 4518 | + if (!empty($save_post['post_category'])) {
|
|
| 4519 | + wp_set_object_terms($saved_post_id, $save_post['post_category'], $cat_taxonomy); |
|
| 4520 | 4520 | |
| 4521 | - $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
| 4521 | + $post_default_category = isset($save_post['post_default_category']) ? $save_post['post_default_category'] : ''; |
|
| 4522 | 4522 | if ($default_category_id) {
|
| 4523 | 4523 | $post_default_category = $default_category_id; |
| 4524 | 4524 | } |
| 4525 | 4525 | $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
| 4526 | 4526 | $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
| 4527 | - $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
| 4527 | + $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']).',y:' : '';
|
|
| 4528 | 4528 | |
| 4529 | 4529 | if ($post_category_str != '' && $post_default_category) {
|
| 4530 | - $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
| 4530 | + $post_category_str = str_replace($post_default_category.',y:', $post_default_category.',y,d:', $post_category_str); |
|
| 4531 | 4531 | } |
| 4532 | 4532 | |
| 4533 | 4533 | $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
| 4534 | 4534 | |
| 4535 | - geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
| 4535 | + geodir_set_postcat_structure($saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str); |
|
| 4536 | 4536 | } |
| 4537 | - $xtimings['###8.1'] = microtime(true)-$xstart; |
|
| 4538 | - if ( !empty( $save_post['post_tags'] ) ) {
|
|
| 4539 | - wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
| 4537 | + $xtimings['###8.1'] = microtime(true) - $xstart; |
|
| 4538 | + if (!empty($save_post['post_tags'])) {
|
|
| 4539 | + wp_set_object_terms($saved_post_id, $save_post['post_tags'], $tags_taxonomy); |
|
| 4540 | 4540 | } |
| 4541 | - $xtimings['###9'] = microtime(true)-$xstart; |
|
| 4541 | + $xtimings['###9'] = microtime(true) - $xstart; |
|
| 4542 | 4542 | // Post images |
| 4543 | - if ( !empty( $post_images ) ) {
|
|
| 4543 | + if (!empty($post_images)) {
|
|
| 4544 | 4544 | $post_images = array_unique($post_images); |
| 4545 | 4545 | |
| 4546 | 4546 | $old_post_images_arr = array(); |
@@ -4548,65 +4548,65 @@ discard block |
||
| 4548 | 4548 | |
| 4549 | 4549 | $order = 1; |
| 4550 | 4550 | |
| 4551 | - $old_post_images = geodir_get_images( $saved_post_id ); |
|
| 4552 | - $xtimings['###9.1'] = microtime(true)-$xstart; |
|
| 4551 | + $old_post_images = geodir_get_images($saved_post_id); |
|
| 4552 | + $xtimings['###9.1'] = microtime(true) - $xstart; |
|
| 4553 | 4553 | if (!empty($old_post_images)) {
|
| 4554 | - foreach( $old_post_images as $old_post_image ) {
|
|
| 4554 | + foreach ($old_post_images as $old_post_image) {
|
|
| 4555 | 4555 | if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
| 4556 | 4556 | $old_post_images_arr[] = $old_post_image->file; |
| 4557 | 4557 | } |
| 4558 | 4558 | } |
| 4559 | 4559 | } |
| 4560 | 4560 | |
| 4561 | - foreach ( $post_images as $post_image ) {
|
|
| 4562 | - $image_name = basename( $post_image ); |
|
| 4561 | + foreach ($post_images as $post_image) {
|
|
| 4562 | + $image_name = basename($post_image); |
|
| 4563 | 4563 | $saved_post_images_arr[] = $image_name; |
| 4564 | 4564 | |
| 4565 | - if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
| 4565 | + if (!empty($old_post_images_arr) && in_array($image_name, $old_post_images_arr)) {
|
|
| 4566 | 4566 | continue; // Skip if image already exists. |
| 4567 | 4567 | } |
| 4568 | 4568 | |
| 4569 | - $image_name_parts = explode( '.', $image_name ); |
|
| 4570 | - array_pop( $image_name_parts ); |
|
| 4571 | - $proper_image_name = implode( '.', $image_name_parts ); |
|
| 4572 | - $xtimings['###9.2'] = microtime(true)-$xstart; |
|
| 4573 | - $arr_file_type = wp_check_filetype( $image_name ); |
|
| 4574 | - $xtimings['###9.3'] = microtime(true)-$xstart; |
|
| 4575 | - if ( !empty( $arr_file_type ) ) {
|
|
| 4569 | + $image_name_parts = explode('.', $image_name);
|
|
| 4570 | + array_pop($image_name_parts); |
|
| 4571 | + $proper_image_name = implode('.', $image_name_parts);
|
|
| 4572 | + $xtimings['###9.2'] = microtime(true) - $xstart; |
|
| 4573 | + $arr_file_type = wp_check_filetype($image_name); |
|
| 4574 | + $xtimings['###9.3'] = microtime(true) - $xstart; |
|
| 4575 | + if (!empty($arr_file_type)) {
|
|
| 4576 | 4576 | $uploaded_file_type = $arr_file_type['type']; |
| 4577 | 4577 | |
| 4578 | 4578 | $attachment = array(); |
| 4579 | 4579 | $attachment['post_id'] = $saved_post_id; |
| 4580 | 4580 | $attachment['title'] = $proper_image_name; |
| 4581 | 4581 | $attachment['content'] = ''; |
| 4582 | - $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
| 4582 | + $attachment['file'] = $uploads_subdir.'/'.$image_name; |
|
| 4583 | 4583 | $attachment['mime_type'] = $uploaded_file_type; |
| 4584 | 4584 | $attachment['menu_order'] = $order; |
| 4585 | 4585 | $attachment['is_featured'] = 0; |
| 4586 | 4586 | |
| 4587 | 4587 | $attachment_set = ''; |
| 4588 | - foreach ( $attachment as $key => $val ) {
|
|
| 4589 | - if ( $val != '' ) {
|
|
| 4590 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 4588 | + foreach ($attachment as $key => $val) {
|
|
| 4589 | + if ($val != '') {
|
|
| 4590 | + $attachment_set .= $key." = '".$val."', "; |
|
| 4591 | 4591 | } |
| 4592 | 4592 | } |
| 4593 | - $attachment_set = trim( $attachment_set, ", " ); |
|
| 4593 | + $attachment_set = trim($attachment_set, ", "); |
|
| 4594 | 4594 | |
| 4595 | 4595 | // Add new attachment |
| 4596 | - $xtimings['###9.4'] = microtime(true)-$xstart; |
|
| 4597 | - $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
| 4598 | - $xtimings['###9.5'] = microtime(true)-$xstart; |
|
| 4596 | + $xtimings['###9.4'] = microtime(true) - $xstart; |
|
| 4597 | + $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
|
|
| 4598 | + $xtimings['###9.5'] = microtime(true) - $xstart; |
|
| 4599 | 4599 | $order++; |
| 4600 | 4600 | } |
| 4601 | 4601 | } |
| 4602 | 4602 | |
| 4603 | - $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
| 4603 | + $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/".implode("' AND file NOT LIKE '%/", $saved_post_images_arr)."' )" : '';
|
|
| 4604 | 4604 | // Remove previous attachment |
| 4605 | - $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
| 4606 | - $xtimings['###9.6'] = microtime(true)-$xstart; |
|
| 4607 | - if ( !empty( $saved_post_images_arr ) ) {
|
|
| 4605 | + $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = ".(int) $saved_post_id." ".$saved_post_images_sql);
|
|
| 4606 | + $xtimings['###9.6'] = microtime(true) - $xstart; |
|
| 4607 | + if (!empty($saved_post_images_arr)) {
|
|
| 4608 | 4608 | geodir_set_wp_featured_image($saved_post_id); |
| 4609 | - $xtimings['###9.7'] = microtime(true)-$xstart; |
|
| 4609 | + $xtimings['###9.7'] = microtime(true) - $xstart; |
|
| 4610 | 4610 | /* |
| 4611 | 4611 | $menu_order = 1; |
| 4612 | 4612 | |
@@ -4622,14 +4622,14 @@ discard block |
||
| 4622 | 4622 | }*/ |
| 4623 | 4623 | } |
| 4624 | 4624 | |
| 4625 | - if ( $order > 1 ) {
|
|
| 4625 | + if ($order > 1) {
|
|
| 4626 | 4626 | $images++; |
| 4627 | 4627 | } |
| 4628 | 4628 | } |
| 4629 | - $xtimings['###10'] = microtime(true)-$xstart; |
|
| 4629 | + $xtimings['###10'] = microtime(true) - $xstart; |
|
| 4630 | 4630 | /** This action is documented in geodirectory-functions/post-functions.php */ |
| 4631 | - do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
| 4632 | - $xtimings['###11'] = microtime(true)-$xstart; |
|
| 4631 | + do_action('geodir_after_save_listing', $saved_post_id, $gd_post);
|
|
| 4632 | + $xtimings['###11'] = microtime(true) - $xstart; |
|
| 4633 | 4633 | if (isset($is_featured)) {
|
| 4634 | 4634 | geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
| 4635 | 4635 | } |
@@ -4639,7 +4639,7 @@ discard block |
||
| 4639 | 4639 | if (isset($gd_post['expire_date'])) {
|
| 4640 | 4640 | geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
| 4641 | 4641 | } |
| 4642 | - $xtimings['###12'] = microtime(true)-$xstart; |
|
| 4642 | + $xtimings['###12'] = microtime(true) - $xstart; |
|
| 4643 | 4643 | } |
| 4644 | 4644 | |
| 4645 | 4645 | // WPML |
@@ -4652,11 +4652,11 @@ discard block |
||
| 4652 | 4652 | } |
| 4653 | 4653 | |
| 4654 | 4654 | //undo some stuff to make the import quicker |
| 4655 | - wp_defer_term_counting( false ); |
|
| 4656 | - wp_defer_comment_counting( false ); |
|
| 4657 | - $wpdb->query( 'COMMIT;' ); |
|
| 4658 | - $wpdb->query( 'SET autocommit = 1;' ); |
|
| 4659 | - $xtimings['###13'] = microtime(true)-$xstart; |
|
| 4655 | + wp_defer_term_counting(false); |
|
| 4656 | + wp_defer_comment_counting(false); |
|
| 4657 | + $wpdb->query('COMMIT;');
|
|
| 4658 | + $wpdb->query('SET autocommit = 1;');
|
|
| 4659 | + $xtimings['###13'] = microtime(true) - $xstart; |
|
| 4660 | 4660 | $json = array(); |
| 4661 | 4661 | $json['processed'] = $processed_actual; |
| 4662 | 4662 | $json['created'] = $created; |
@@ -4665,13 +4665,13 @@ discard block |
||
| 4665 | 4665 | $json['invalid'] = $invalid; |
| 4666 | 4666 | $json['invalid_addr'] = $invalid_addr; |
| 4667 | 4667 | $json['images'] = $images; |
| 4668 | - $json['timing'] = microtime(true)-$xstart; |
|
| 4668 | + $json['timing'] = microtime(true) - $xstart; |
|
| 4669 | 4669 | $json['timings'] = $xtimings; |
| 4670 | 4670 | |
| 4671 | 4671 | |
| 4672 | - wp_send_json( $json ); |
|
| 4672 | + wp_send_json($json); |
|
| 4673 | 4673 | exit; |
| 4674 | - } else if ( $task == 'import_loc' ) {
|
|
| 4674 | + } else if ($task == 'import_loc') {
|
|
| 4675 | 4675 | global $gd_post_types; |
| 4676 | 4676 | $gd_post_types = $post_types; |
| 4677 | 4677 | |
@@ -4680,82 +4680,82 @@ discard block |
||
| 4680 | 4680 | |
| 4681 | 4681 | if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
| 4682 | 4682 | $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
| 4683 | - wp_send_json( $json ); |
|
| 4683 | + wp_send_json($json); |
|
| 4684 | 4684 | } |
| 4685 | 4685 | |
| 4686 | 4686 | $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
| 4687 | - $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
| 4687 | + $gd_error_location = __('Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory');
|
|
| 4688 | 4688 | for ($i = 1; $i <= $limit; $i++) {
|
| 4689 | 4689 | $index = $processed + $i; |
| 4690 | 4690 | |
| 4691 | 4691 | if (isset($file[$index])) {
|
| 4692 | 4692 | $row = $file[$index]; |
| 4693 | - $row = array_map( 'trim', $row ); |
|
| 4693 | + $row = array_map('trim', $row);
|
|
| 4694 | 4694 | $data = array(); |
| 4695 | 4695 | |
| 4696 | - foreach ($columns as $c => $column ) {
|
|
| 4696 | + foreach ($columns as $c => $column) {
|
|
| 4697 | 4697 | if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {
|
| 4698 | 4698 | $data[$column] = $row[$c]; |
| 4699 | 4699 | } |
| 4700 | 4700 | } |
| 4701 | 4701 | |
| 4702 | - if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
| 4702 | + if (empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
| 4703 | 4703 | $invalid++; |
| 4704 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4704 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4705 | 4705 | continue; |
| 4706 | 4706 | } |
| 4707 | 4707 | |
| 4708 | 4708 | $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
| 4709 | 4709 | |
| 4710 | - if ( $import_choice == 'update' ) {
|
|
| 4711 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4712 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4710 | + if ($import_choice == 'update') {
|
|
| 4711 | + if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {
|
|
| 4712 | + if ($location_id = geodir_location_update_city($data, true, $location)) {
|
|
| 4713 | 4713 | $updated++; |
| 4714 | 4714 | } else {
|
| 4715 | 4715 | $invalid++; |
| 4716 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4716 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4717 | 4717 | } |
| 4718 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4719 | - $data['location_id'] = (int)$location->location_id; |
|
| 4718 | + } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {
|
|
| 4719 | + $data['location_id'] = (int) $location->location_id; |
|
| 4720 | 4720 | |
| 4721 | - if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
| 4722 | - $data['location_id'] = (int)$location->location_id; |
|
| 4723 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
| 4724 | - $data['location_id'] = (int)$location->location_id; |
|
| 4725 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
| 4726 | - $data['location_id'] = (int)$location->location_id; |
|
| 4721 | + if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region']))) {
|
|
| 4722 | + $data['location_id'] = (int) $location->location_id; |
|
| 4723 | + } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'region' => $data['region']))) {
|
|
| 4724 | + $data['location_id'] = (int) $location->location_id; |
|
| 4725 | + } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country']))) {
|
|
| 4726 | + $data['location_id'] = (int) $location->location_id; |
|
| 4727 | 4727 | } |
| 4728 | 4728 | |
| 4729 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4729 | + if ($location_id = geodir_location_update_city($data, true, $location)) {
|
|
| 4730 | 4730 | $updated++; |
| 4731 | 4731 | } else {
|
| 4732 | 4732 | $invalid++; |
| 4733 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4733 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4734 | 4734 | } |
| 4735 | 4735 | } else {
|
| 4736 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4736 | + if ($location_id = geodir_location_insert_city($data, true)) {
|
|
| 4737 | 4737 | $created++; |
| 4738 | 4738 | } else {
|
| 4739 | 4739 | $invalid++; |
| 4740 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4740 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4741 | 4741 | } |
| 4742 | 4742 | } |
| 4743 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4744 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4743 | + } elseif ($import_choice == 'skip') {
|
|
| 4744 | + if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {
|
|
| 4745 | 4745 | $skipped++; |
| 4746 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4746 | + } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {
|
|
| 4747 | 4747 | $skipped++; |
| 4748 | 4748 | } else {
|
| 4749 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4749 | + if ($location_id = geodir_location_insert_city($data, true)) {
|
|
| 4750 | 4750 | $created++; |
| 4751 | 4751 | } else {
|
| 4752 | 4752 | $invalid++; |
| 4753 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4753 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4754 | 4754 | } |
| 4755 | 4755 | } |
| 4756 | 4756 | } else {
|
| 4757 | 4757 | $invalid++; |
| 4758 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4758 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4759 | 4759 | } |
| 4760 | 4760 | } |
| 4761 | 4761 | } |
@@ -4769,24 +4769,24 @@ discard block |
||
| 4769 | 4769 | $json['invalid'] = $invalid; |
| 4770 | 4770 | $json['images'] = $images; |
| 4771 | 4771 | |
| 4772 | - wp_send_json( $json ); |
|
| 4773 | - } else if ( $task == 'import_hood' ) {
|
|
| 4772 | + wp_send_json($json); |
|
| 4773 | + } else if ($task == 'import_hood') {
|
|
| 4774 | 4774 | if (!empty($file)) {
|
| 4775 | 4775 | $columns = isset($file[0]) ? $file[0] : NULL; |
| 4776 | 4776 | |
| 4777 | 4777 | if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
| 4778 | 4778 | $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
| 4779 | - wp_send_json( $json ); |
|
| 4779 | + wp_send_json($json); |
|
| 4780 | 4780 | } |
| 4781 | 4781 | |
| 4782 | 4782 | $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
| 4783 | - $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ); |
|
| 4783 | + $gd_error_hood = __('Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory');
|
|
| 4784 | 4784 | for ($i = 1; $i <= $limit; $i++) {
|
| 4785 | 4785 | $index = $processed + $i; |
| 4786 | 4786 | |
| 4787 | 4787 | if (isset($file[$index])) {
|
| 4788 | 4788 | $row = $file[$index]; |
| 4789 | - $row = array_map( 'trim', $row ); |
|
| 4789 | + $row = array_map('trim', $row);
|
|
| 4790 | 4790 | $data = array(); |
| 4791 | 4791 | |
| 4792 | 4792 | foreach ($columns as $c => $column) {
|
@@ -4797,20 +4797,20 @@ discard block |
||
| 4797 | 4797 | |
| 4798 | 4798 | if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
| 4799 | 4799 | $invalid++; |
| 4800 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4800 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4801 | 4801 | continue; |
| 4802 | 4802 | } |
| 4803 | 4803 | |
| 4804 | 4804 | $location_info = array(); |
| 4805 | - if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
| 4806 | - $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
| 4805 | + if (!empty($data['location_id']) && (int) $data['location_id'] > 0) {
|
|
| 4806 | + $location_info = geodir_get_location_by_id('', (int) $data['location_id']);
|
|
| 4807 | 4807 | } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
| 4808 | 4808 | $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
| 4809 | 4809 | } |
| 4810 | 4810 | |
| 4811 | 4811 | if (empty($location_info)) {
|
| 4812 | 4812 | $invalid++; |
| 4813 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4813 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4814 | 4814 | continue; |
| 4815 | 4815 | } |
| 4816 | 4816 | |
@@ -4825,35 +4825,35 @@ discard block |
||
| 4825 | 4825 | $hood_data['hood_longitude'] = $data['longitude']; |
| 4826 | 4826 | $hood_data['hood_location_id'] = $location_id; |
| 4827 | 4827 | |
| 4828 | - if ( $import_choice == 'update' ) {
|
|
| 4829 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4830 | - $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
| 4828 | + if ($import_choice == 'update') {
|
|
| 4829 | + if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {
|
|
| 4830 | + $hood_data['hood_id'] = (int) $data['neighbourhood_id']; |
|
| 4831 | 4831 | |
| 4832 | 4832 | if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
| 4833 | 4833 | $updated++; |
| 4834 | 4834 | } else {
|
| 4835 | 4835 | $invalid++; |
| 4836 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4836 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4837 | 4837 | } |
| 4838 | 4838 | } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
| 4839 | - $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
| 4839 | + $hood_data['hood_id'] = (int) $neighbourhood->hood_id; |
|
| 4840 | 4840 | |
| 4841 | 4841 | if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
| 4842 | 4842 | $updated++; |
| 4843 | 4843 | } else {
|
| 4844 | 4844 | $invalid++; |
| 4845 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4845 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4846 | 4846 | } |
| 4847 | 4847 | } else {
|
| 4848 | 4848 | if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
| 4849 | 4849 | $created++; |
| 4850 | 4850 | } else {
|
| 4851 | 4851 | $invalid++; |
| 4852 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4852 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4853 | 4853 | } |
| 4854 | 4854 | } |
| 4855 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4856 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4855 | + } elseif ($import_choice == 'skip') {
|
|
| 4856 | + if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {
|
|
| 4857 | 4857 | $skipped++; |
| 4858 | 4858 | } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
| 4859 | 4859 | $skipped++; |
@@ -4863,12 +4863,12 @@ discard block |
||
| 4863 | 4863 | $created++; |
| 4864 | 4864 | } else {
|
| 4865 | 4865 | $invalid++; |
| 4866 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4866 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4867 | 4867 | } |
| 4868 | 4868 | } |
| 4869 | 4869 | } else {
|
| 4870 | 4870 | $invalid++; |
| 4871 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4871 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4872 | 4872 | } |
| 4873 | 4873 | } |
| 4874 | 4874 | } |
@@ -4882,7 +4882,7 @@ discard block |
||
| 4882 | 4882 | $json['invalid'] = $invalid; |
| 4883 | 4883 | $json['images'] = $images; |
| 4884 | 4884 | |
| 4885 | - wp_send_json( $json ); |
|
| 4885 | + wp_send_json($json); |
|
| 4886 | 4886 | } |
| 4887 | 4887 | } |
| 4888 | 4888 | break; |
@@ -4926,29 +4926,29 @@ discard block |
||
| 4926 | 4926 | * } |
| 4927 | 4927 | * @return int|bool Term id when success, false when fail. |
| 4928 | 4928 | */ |
| 4929 | -function geodir_imex_insert_term( $taxonomy, $term_data ) {
|
|
| 4930 | - if ( empty( $taxonomy ) || empty( $term_data ) ) {
|
|
| 4929 | +function geodir_imex_insert_term($taxonomy, $term_data) {
|
|
| 4930 | + if (empty($taxonomy) || empty($term_data)) {
|
|
| 4931 | 4931 | return false; |
| 4932 | 4932 | } |
| 4933 | 4933 | |
| 4934 | - $term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : ''; |
|
| 4934 | + $term = isset($term_data['name']) && !empty($term_data['name']) ? $term_data['name'] : ''; |
|
| 4935 | 4935 | $args = array(); |
| 4936 | - $args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : ''; |
|
| 4937 | - $args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : ''; |
|
| 4938 | - $args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : ''; |
|
| 4936 | + $args['description'] = isset($term_data['description']) ? $term_data['description'] : ''; |
|
| 4937 | + $args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : ''; |
|
| 4938 | + $args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : ''; |
|
| 4939 | 4939 | |
| 4940 | - if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {
|
|
| 4941 | - $term_args = array_merge( $term_data, $args ); |
|
| 4942 | - $defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => ''); |
|
| 4943 | - $term_args = wp_parse_args( $term_args, $defaults ); |
|
| 4944 | - $term_args = sanitize_term( $term_args, $taxonomy, 'db' ); |
|
| 4945 | - $args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args ); |
|
| 4940 | + if ((!empty($args['slug']) && term_exists($args['slug'], $taxonomy)) || empty($args['slug'])) {
|
|
| 4941 | + $term_args = array_merge($term_data, $args); |
|
| 4942 | + $defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
|
|
| 4943 | + $term_args = wp_parse_args($term_args, $defaults); |
|
| 4944 | + $term_args = sanitize_term($term_args, $taxonomy, 'db'); |
|
| 4945 | + $args['slug'] = wp_unique_term_slug($args['slug'], (object) $term_args); |
|
| 4946 | 4946 | } |
| 4947 | 4947 | |
| 4948 | - if( !empty( $term ) ) {
|
|
| 4949 | - $result = wp_insert_term( $term, $taxonomy, $args ); |
|
| 4950 | - if( !is_wp_error( $result ) ) {
|
|
| 4951 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4948 | + if (!empty($term)) {
|
|
| 4949 | + $result = wp_insert_term($term, $taxonomy, $args); |
|
| 4950 | + if (!is_wp_error($result)) {
|
|
| 4951 | + return isset($result['term_id']) ? $result['term_id'] : 0; |
|
| 4952 | 4952 | } |
| 4953 | 4953 | } |
| 4954 | 4954 | |
@@ -4978,36 +4978,36 @@ discard block |
||
| 4978 | 4978 | * } |
| 4979 | 4979 | * @return int|bool Term id when success, false when fail. |
| 4980 | 4980 | */ |
| 4981 | -function geodir_imex_update_term( $taxonomy, $term_data ) {
|
|
| 4982 | - if ( empty( $taxonomy ) || empty( $term_data ) ) {
|
|
| 4981 | +function geodir_imex_update_term($taxonomy, $term_data) {
|
|
| 4982 | + if (empty($taxonomy) || empty($term_data)) {
|
|
| 4983 | 4983 | return false; |
| 4984 | 4984 | } |
| 4985 | 4985 | |
| 4986 | - $term_id = isset( $term_data['term_id'] ) && !empty( $term_data['term_id'] ) ? $term_data['term_id'] : 0; |
|
| 4986 | + $term_id = isset($term_data['term_id']) && !empty($term_data['term_id']) ? $term_data['term_id'] : 0; |
|
| 4987 | 4987 | |
| 4988 | 4988 | $args = array(); |
| 4989 | - $args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : ''; |
|
| 4990 | - $args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : ''; |
|
| 4991 | - $args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : ''; |
|
| 4989 | + $args['description'] = isset($term_data['description']) ? $term_data['description'] : ''; |
|
| 4990 | + $args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : ''; |
|
| 4991 | + $args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : ''; |
|
| 4992 | 4992 | |
| 4993 | - if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {
|
|
| 4993 | + if ($term_id > 0 && $term_info = (array) get_term($term_id, $taxonomy)) {
|
|
| 4994 | 4994 | $term_data['term_id'] = $term_info['term_id']; |
| 4995 | 4995 | |
| 4996 | - $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
|
| 4996 | + $result = wp_update_term($term_data['term_id'], $taxonomy, $term_data); |
|
| 4997 | 4997 | |
| 4998 | - if( !is_wp_error( $result ) ) {
|
|
| 4999 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4998 | + if (!is_wp_error($result)) {
|
|
| 4999 | + return isset($result['term_id']) ? $result['term_id'] : 0; |
|
| 5000 | 5000 | } |
| 5001 | - } else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 5001 | + } else if ($term_data['slug'] != '' && $term_info = (array) term_exists($term_data['slug'], $taxonomy)) {
|
|
| 5002 | 5002 | $term_data['term_id'] = $term_info['term_id']; |
| 5003 | 5003 | |
| 5004 | - $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
|
| 5004 | + $result = wp_update_term($term_data['term_id'], $taxonomy, $term_data); |
|
| 5005 | 5005 | |
| 5006 | - if( !is_wp_error( $result ) ) {
|
|
| 5007 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5006 | + if (!is_wp_error($result)) {
|
|
| 5007 | + return isset($result['term_id']) ? $result['term_id'] : 0; |
|
| 5008 | 5008 | } |
| 5009 | 5009 | } else {
|
| 5010 | - return geodir_imex_insert_term( $taxonomy, $term_data ); |
|
| 5010 | + return geodir_imex_insert_term($taxonomy, $term_data); |
|
| 5011 | 5011 | } |
| 5012 | 5012 | |
| 5013 | 5013 | return false; |
@@ -5026,20 +5026,20 @@ discard block |
||
| 5026 | 5026 | * @param string $post_type Post type. |
| 5027 | 5027 | * @return int Posts count. |
| 5028 | 5028 | */ |
| 5029 | -function geodir_get_posts_count( $post_type ) {
|
|
| 5029 | +function geodir_get_posts_count($post_type) {
|
|
| 5030 | 5030 | global $wpdb, $plugin_prefix; |
| 5031 | 5031 | |
| 5032 | - if ( !post_type_exists( $post_type ) ) {
|
|
| 5032 | + if (!post_type_exists($post_type)) {
|
|
| 5033 | 5033 | return 0; |
| 5034 | 5034 | } |
| 5035 | 5035 | |
| 5036 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5036 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 5037 | 5037 | |
| 5038 | 5038 | // Skip listing with statuses trash, auto-draft etc... |
| 5039 | 5039 | $skip_statuses = geodir_imex_export_skip_statuses(); |
| 5040 | 5040 | $where_statuses = ''; |
| 5041 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5042 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5041 | + if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
| 5042 | + $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
| 5043 | 5043 | } |
| 5044 | 5044 | |
| 5045 | 5045 | /** |
@@ -5050,11 +5050,11 @@ discard block |
||
| 5050 | 5050 | * |
| 5051 | 5051 | * @param string $where SQL where clause part. |
| 5052 | 5052 | */ |
| 5053 | - $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
| 5053 | + $where_statuses = apply_filters('geodir_get_posts_count', $where_statuses, $post_type);
|
|
| 5054 | 5054 | |
| 5055 | - $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );
|
|
| 5055 | + $query = $wpdb->prepare("SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses, $post_type);
|
|
| 5056 | 5056 | |
| 5057 | - $posts_count = (int)$wpdb->get_var( $query ); |
|
| 5057 | + $posts_count = (int) $wpdb->get_var($query); |
|
| 5058 | 5058 | |
| 5059 | 5059 | /** |
| 5060 | 5060 | * Modify returned post counts for the current post type. |
@@ -5065,7 +5065,7 @@ discard block |
||
| 5065 | 5065 | * @param int $posts_count Post counts. |
| 5066 | 5066 | * @param string $post_type Post type. |
| 5067 | 5067 | */ |
| 5068 | - $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
| 5068 | + $posts_count = apply_filters('geodir_imex_count_posts', $posts_count, $post_type);
|
|
| 5069 | 5069 | |
| 5070 | 5070 | return $posts_count; |
| 5071 | 5071 | } |
@@ -5087,19 +5087,19 @@ discard block |
||
| 5087 | 5087 | * @param int $page_no Page number. Default 0. |
| 5088 | 5088 | * @return array Array of posts data. |
| 5089 | 5089 | */ |
| 5090 | -function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
| 5090 | +function geodir_imex_get_posts($post_type, $per_page = 0, $page_no = 0) {
|
|
| 5091 | 5091 | global $wp_filesystem; |
| 5092 | 5092 | |
| 5093 | - $posts = geodir_get_export_posts( $post_type, $per_page, $page_no ); |
|
| 5093 | + $posts = geodir_get_export_posts($post_type, $per_page, $page_no); |
|
| 5094 | 5094 | |
| 5095 | 5095 | $csv_rows = array(); |
| 5096 | 5096 | |
| 5097 | - if ( !empty( $posts ) ) {
|
|
| 5098 | - $is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' ); |
|
| 5097 | + if (!empty($posts)) {
|
|
| 5098 | + $is_payment_plugin = is_plugin_active('geodir_payment_manager/geodir_payment_manager.php');
|
|
| 5099 | 5099 | $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
| 5100 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 5100 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
| 5101 | 5101 | $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;
|
| 5102 | - $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 5102 | + $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 5103 | 5103 | $is_events_active = function_exists('geodir_event_plugin_activated') ? true : false;
|
| 5104 | 5104 | $is_custom_posts_active = function_exists('geodir_custom_post_type_plugin_activated') ? true : false;
|
| 5105 | 5105 | |
@@ -5114,7 +5114,7 @@ discard block |
||
| 5114 | 5114 | $csv_row[] = 'default_category'; |
| 5115 | 5115 | $csv_row[] = 'post_tags'; |
| 5116 | 5116 | $csv_row[] = 'post_type'; |
| 5117 | - if ( $post_type == 'gd_event' ) {
|
|
| 5117 | + if ($post_type == 'gd_event') {
|
|
| 5118 | 5118 | $csv_row[] = 'event_date'; |
| 5119 | 5119 | $csv_row[] = 'event_enddate'; |
| 5120 | 5120 | $csv_row[] = 'starttime'; |
@@ -5166,25 +5166,25 @@ discard block |
||
| 5166 | 5166 | $csv_row[] = 'geodir_video'; |
| 5167 | 5167 | $csv_row[] = 'geodir_special_offers'; |
| 5168 | 5168 | if ($is_events_active || $is_custom_posts_active) {
|
| 5169 | - $csv_row[] = !empty($post_ypes[$post_type]['linkable_to']) ? 'linked_' . $post_ypes[$post_type]['linkable_to'] . '_ID' : 'linked_cpt_ID'; |
|
| 5169 | + $csv_row[] = !empty($post_ypes[$post_type]['linkable_to']) ? 'linked_'.$post_ypes[$post_type]['linkable_to'].'_ID' : 'linked_cpt_ID'; |
|
| 5170 | 5170 | } |
| 5171 | 5171 | // WPML |
| 5172 | - $is_wpml = geodir_wpml_is_post_type_translated( $post_type ); |
|
| 5172 | + $is_wpml = geodir_wpml_is_post_type_translated($post_type); |
|
| 5173 | 5173 | if ($is_wpml) {
|
| 5174 | 5174 | $csv_row[] = 'language'; |
| 5175 | 5175 | $csv_row[] = 'original_post_id'; |
| 5176 | 5176 | } |
| 5177 | 5177 | // WPML |
| 5178 | 5178 | |
| 5179 | - $custom_fields = geodir_imex_get_custom_fields( $post_type ); |
|
| 5180 | - if ( !empty( $custom_fields ) ) {
|
|
| 5181 | - foreach ( $custom_fields as $custom_field ) {
|
|
| 5179 | + $custom_fields = geodir_imex_get_custom_fields($post_type); |
|
| 5180 | + if (!empty($custom_fields)) {
|
|
| 5181 | + foreach ($custom_fields as $custom_field) {
|
|
| 5182 | 5182 | $csv_row[] = $custom_field->htmlvar_name; |
| 5183 | 5183 | } |
| 5184 | 5184 | } |
| 5185 | 5185 | |
| 5186 | 5186 | // Export franchise fields |
| 5187 | - $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 5187 | + $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;
|
|
| 5188 | 5188 | if ($is_franchise_active) {
|
| 5189 | 5189 | $csv_row[] = 'gd_is_franchise'; |
| 5190 | 5190 | $csv_row[] = 'gd_franchise_lock'; |
@@ -5205,28 +5205,28 @@ discard block |
||
| 5205 | 5205 | $csv_rows[] = $csv_row; |
| 5206 | 5206 | |
| 5207 | 5207 | $images_count = 5; |
| 5208 | - $xx=0; |
|
| 5209 | - foreach ( $posts as $post ) {$xx++;
|
|
| 5208 | + $xx = 0; |
|
| 5209 | + foreach ($posts as $post) {$xx++;
|
|
| 5210 | 5210 | $post_id = $post['ID']; |
| 5211 | 5211 | |
| 5212 | - $gd_post_info = geodir_get_post_info( $post_id ); |
|
| 5213 | - $post_info = (array)$gd_post_info; |
|
| 5212 | + $gd_post_info = geodir_get_post_info($post_id); |
|
| 5213 | + $post_info = (array) $gd_post_info; |
|
| 5214 | 5214 | |
| 5215 | - $taxonomy_category = $post_type . 'category'; |
|
| 5216 | - $taxonomy_tags = $post_type . '_tags'; |
|
| 5215 | + $taxonomy_category = $post_type.'category'; |
|
| 5216 | + $taxonomy_tags = $post_type.'_tags'; |
|
| 5217 | 5217 | |
| 5218 | 5218 | $post_category = ''; |
| 5219 | 5219 | $default_category_id = $gd_post_info->default_category; |
| 5220 | 5220 | $default_category = ''; |
| 5221 | 5221 | $post_tags = ''; |
| 5222 | - $terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) ); |
|
| 5222 | + $terms = wp_get_post_terms($post_id, array($taxonomy_category, $taxonomy_tags)); |
|
| 5223 | 5223 | |
| 5224 | - if ( !empty( $terms ) && !is_wp_error( $terms ) ) {
|
|
| 5224 | + if (!empty($terms) && !is_wp_error($terms)) {
|
|
| 5225 | 5225 | $post_category = array(); |
| 5226 | 5226 | $post_tags = array(); |
| 5227 | 5227 | |
| 5228 | - foreach ( $terms as $term ) {
|
|
| 5229 | - if ( $term->taxonomy == $taxonomy_category ) {
|
|
| 5228 | + foreach ($terms as $term) {
|
|
| 5229 | + if ($term->taxonomy == $taxonomy_category) {
|
|
| 5230 | 5230 | $post_category[] = $term->name; |
| 5231 | 5231 | |
| 5232 | 5232 | if ($default_category_id == $term->term_id) {
|
@@ -5234,7 +5234,7 @@ discard block |
||
| 5234 | 5234 | } |
| 5235 | 5235 | } |
| 5236 | 5236 | |
| 5237 | - if ( $term->taxonomy == $taxonomy_tags ) {
|
|
| 5237 | + if ($term->taxonomy == $taxonomy_tags) {
|
|
| 5238 | 5238 | $post_tags[] = $term->name; |
| 5239 | 5239 | } |
| 5240 | 5240 | } |
@@ -5242,47 +5242,47 @@ discard block |
||
| 5242 | 5242 | if (empty($default_category) && !empty($post_category)) {
|
| 5243 | 5243 | $default_category = $post_category[0]; // Set first one as default category. |
| 5244 | 5244 | } |
| 5245 | - $post_category = !empty( $post_category ) ? implode( ',', $post_category ) : ''; |
|
| 5246 | - $post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : ''; |
|
| 5245 | + $post_category = !empty($post_category) ? implode(',', $post_category) : '';
|
|
| 5246 | + $post_tags = !empty($post_tags) ? implode(',', $post_tags) : '';
|
|
| 5247 | 5247 | } |
| 5248 | 5248 | |
| 5249 | 5249 | // Franchise data |
| 5250 | - if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {
|
|
| 5250 | + if ($is_franchise_active && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 && geodir_franchise_check((int) $post_info['franchise'])) {
|
|
| 5251 | 5251 | $franchise_id = $post_info['franchise']; |
| 5252 | 5252 | $gd_franchise_info = geodir_get_post_info($franchise_id); |
| 5253 | 5253 | |
| 5254 | 5254 | if (geodir_franchise_pkg_is_active($gd_franchise_info)) {
|
| 5255 | - $franchise_info = (array)$gd_franchise_info; |
|
| 5255 | + $franchise_info = (array) $gd_franchise_info; |
|
| 5256 | 5256 | $locked_fields = geodir_franchise_get_locked_fields($franchise_id, true); |
| 5257 | 5257 | |
| 5258 | 5258 | if (!empty($locked_fields)) {
|
| 5259 | - foreach( $locked_fields as $locked_field) {
|
|
| 5259 | + foreach ($locked_fields as $locked_field) {
|
|
| 5260 | 5260 | if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {
|
| 5261 | 5261 | $post_info[$locked_field] = $franchise_info[$locked_field]; |
| 5262 | 5262 | } |
| 5263 | 5263 | |
| 5264 | 5264 | if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {
|
| 5265 | - $franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) ); |
|
| 5265 | + $franchise_terms = wp_get_post_terms($franchise_id, array($taxonomy_category, $taxonomy_tags)); |
|
| 5266 | 5266 | |
| 5267 | - if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {
|
|
| 5267 | + if (!empty($franchise_terms) && !is_wp_error($franchise_terms)) {
|
|
| 5268 | 5268 | $franchise_post_category = array(); |
| 5269 | 5269 | $franchise_post_tags = array(); |
| 5270 | 5270 | |
| 5271 | - foreach ( $franchise_terms as $franchise_term ) {
|
|
| 5272 | - if ( $franchise_term->taxonomy == $taxonomy_category ) {
|
|
| 5271 | + foreach ($franchise_terms as $franchise_term) {
|
|
| 5272 | + if ($franchise_term->taxonomy == $taxonomy_category) {
|
|
| 5273 | 5273 | $franchise_post_category[] = $franchise_term->name; |
| 5274 | 5274 | } |
| 5275 | 5275 | |
| 5276 | - if ( $franchise_term->taxonomy == $taxonomy_tags ) {
|
|
| 5276 | + if ($franchise_term->taxonomy == $taxonomy_tags) {
|
|
| 5277 | 5277 | $franchise_post_tags[] = $franchise_term->name; |
| 5278 | 5278 | } |
| 5279 | 5279 | } |
| 5280 | 5280 | |
| 5281 | 5281 | if (in_array($taxonomy_category, $locked_fields)) {
|
| 5282 | - $post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : ''; |
|
| 5282 | + $post_category = !empty($franchise_post_category) ? implode(',', $franchise_post_category) : '';
|
|
| 5283 | 5283 | } |
| 5284 | 5284 | if (in_array('post_tags', $locked_fields)) {
|
| 5285 | - $post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : ''; |
|
| 5285 | + $post_tags = !empty($franchise_post_tags) ? implode(',', $franchise_post_tags) : '';
|
|
| 5286 | 5286 | } |
| 5287 | 5287 | } |
| 5288 | 5288 | } |
@@ -5291,18 +5291,18 @@ discard block |
||
| 5291 | 5291 | } |
| 5292 | 5292 | } |
| 5293 | 5293 | |
| 5294 | - $post_images = geodir_get_images( $post_id ); |
|
| 5294 | + $post_images = geodir_get_images($post_id); |
|
| 5295 | 5295 | $current_images = array(); |
| 5296 | - if ( !empty( $post_images ) ) {
|
|
| 5297 | - foreach ( $post_images as $post_image ) {
|
|
| 5298 | - $post_image = (array)$post_image; |
|
| 5299 | - $image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : ''; |
|
| 5300 | - if ( $image ) {
|
|
| 5296 | + if (!empty($post_images)) {
|
|
| 5297 | + foreach ($post_images as $post_image) {
|
|
| 5298 | + $post_image = (array) $post_image; |
|
| 5299 | + $image = !empty($post_image) && isset($post_image['path']) && $wp_filesystem->is_file($post_image['path']) && $wp_filesystem->exists($post_image['path']) ? $post_image['src'] : ''; |
|
| 5300 | + if ($image) {
|
|
| 5301 | 5301 | $current_images[] = $image; |
| 5302 | 5302 | } |
| 5303 | 5303 | } |
| 5304 | 5304 | |
| 5305 | - $images_count = max( $images_count, count( $current_images ) ); |
|
| 5305 | + $images_count = max($images_count, count($current_images)); |
|
| 5306 | 5306 | } |
| 5307 | 5307 | |
| 5308 | 5308 | $csv_row = array(); |
@@ -5314,7 +5314,7 @@ discard block |
||
| 5314 | 5314 | $csv_row[] = $default_category; // default_category |
| 5315 | 5315 | $csv_row[] = $post_tags; // post_tags |
| 5316 | 5316 | $csv_row[] = $post_type; // post_type |
| 5317 | - if ( $post_type == 'gd_event' ) {
|
|
| 5317 | + if ($post_type == 'gd_event') {
|
|
| 5318 | 5318 | $event_data = geodir_imex_get_event_data($post, $gd_post_info); |
| 5319 | 5319 | $csv_row[] = $event_data['event_date']; // event_date |
| 5320 | 5320 | $csv_row[] = $event_data['event_enddate']; // enddate |
@@ -5335,12 +5335,12 @@ discard block |
||
| 5335 | 5335 | $csv_row[] = $event_data['recurring_end_date']; // repeat_end |
| 5336 | 5336 | } |
| 5337 | 5337 | $csv_row[] = $post_info['post_status']; // post_status |
| 5338 | - $csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured |
|
| 5338 | + $csv_row[] = (int) $post_info['is_featured'] == 1 ? 1 : ''; // is_featured |
|
| 5339 | 5339 | if ($is_claim_active) {
|
| 5340 | - $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5340 | + $csv_row[] = !empty($post_info['claimed']) && (int) $post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5341 | 5341 | } |
| 5342 | 5342 | if ($is_payment_plugin) {
|
| 5343 | - $csv_row[] = (int)$post_info['package_id']; // package_id |
|
| 5343 | + $csv_row[] = (int) $post_info['package_id']; // package_id |
|
| 5344 | 5344 | $csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days |
| 5345 | 5345 | $csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date
|
| 5346 | 5346 | } |
@@ -5376,18 +5376,18 @@ discard block |
||
| 5376 | 5376 | $csv_row[] = stripslashes($post_info['geodir_video']); // geodir_video |
| 5377 | 5377 | $csv_row[] = stripslashes($post_info['geodir_special_offers']); // geodir_special_offers |
| 5378 | 5378 | if ($is_events_active || $is_custom_posts_active) {
|
| 5379 | - $csv_row[] = !empty($post_info['geodir_link_business']) ? (int)$post_info['geodir_link_business'] : ''; // linked business |
|
| 5379 | + $csv_row[] = !empty($post_info['geodir_link_business']) ? (int) $post_info['geodir_link_business'] : ''; // linked business |
|
| 5380 | 5380 | } |
| 5381 | 5381 | // WPML |
| 5382 | 5382 | if ($is_wpml) {
|
| 5383 | - $csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type ); |
|
| 5384 | - $csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type ); |
|
| 5383 | + $csv_row[] = geodir_get_language_for_element($post_id, 'post_'.$post_type); |
|
| 5384 | + $csv_row[] = geodir_imex_original_post_id($post_id, 'post_'.$post_type); |
|
| 5385 | 5385 | } |
| 5386 | 5386 | // WPML |
| 5387 | 5387 | |
| 5388 | - if ( !empty( $custom_fields ) ) {
|
|
| 5389 | - foreach ( $custom_fields as $custom_field ) {
|
|
| 5390 | - $csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : ''; |
|
| 5388 | + if (!empty($custom_fields)) {
|
|
| 5389 | + foreach ($custom_fields as $custom_field) {
|
|
| 5390 | + $csv_row[] = isset($post_info[$custom_field->htmlvar_name]) ? $post_info[$custom_field->htmlvar_name] : ''; |
|
| 5391 | 5391 | } |
| 5392 | 5392 | } |
| 5393 | 5393 | |
@@ -5398,15 +5398,15 @@ discard block |
||
| 5398 | 5398 | $franchise = ''; |
| 5399 | 5399 | |
| 5400 | 5400 | if (geodir_franchise_pkg_is_active($gd_post_info)) {
|
| 5401 | - $gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true ); |
|
| 5402 | - $locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : ''; |
|
| 5401 | + $gd_is_franchise = (int) get_post_meta($post_id, 'gd_is_franchise', true); |
|
| 5402 | + $locaked_fields = $gd_is_franchise ? get_post_meta($post_id, 'gd_franchise_lock', true) : ''; |
|
| 5403 | 5403 | $locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');
|
| 5404 | - $franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id |
|
| 5404 | + $franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 ? (int) $post_info['franchise'] : 0; // franchise id |
|
| 5405 | 5405 | } |
| 5406 | 5406 | |
| 5407 | - $csv_row[] = (int)$gd_is_franchise; // gd_is_franchise |
|
| 5407 | + $csv_row[] = (int) $gd_is_franchise; // gd_is_franchise |
|
| 5408 | 5408 | $csv_row[] = $locaked_fields; // gd_franchise_lock fields |
| 5409 | - $csv_row[] = (int)$franchise; // franchise id |
|
| 5409 | + $csv_row[] = (int) $franchise; // franchise id |
|
| 5410 | 5410 | } |
| 5411 | 5411 | |
| 5412 | 5412 | /** |
@@ -5420,15 +5420,15 @@ discard block |
||
| 5420 | 5420 | */ |
| 5421 | 5421 | $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
| 5422 | 5422 | |
| 5423 | - for ( $c = 0; $c < $images_count; $c++ ) {
|
|
| 5424 | - $csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE |
|
| 5423 | + for ($c = 0; $c < $images_count; $c++) {
|
|
| 5424 | + $csv_row[] = isset($current_images[$c]) ? $current_images[$c] : ''; // IMAGE |
|
| 5425 | 5425 | } |
| 5426 | 5426 | |
| 5427 | 5427 | $csv_rows[] = $csv_row; |
| 5428 | 5428 | |
| 5429 | 5429 | } |
| 5430 | 5430 | |
| 5431 | - for ( $c = 0; $c < $images_count; $c++ ) {
|
|
| 5431 | + for ($c = 0; $c < $images_count; $c++) {
|
|
| 5432 | 5432 | $csv_rows[0][] = 'IMAGE'; |
| 5433 | 5433 | } |
| 5434 | 5434 | } |
@@ -5450,30 +5450,30 @@ discard block |
||
| 5450 | 5450 | * @param int $page_no Page number. Default 0. |
| 5451 | 5451 | * @return array Array of posts data. |
| 5452 | 5452 | */ |
| 5453 | -function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
| 5453 | +function geodir_get_export_posts($post_type, $per_page = 0, $page_no = 0) {
|
|
| 5454 | 5454 | global $wpdb, $plugin_prefix; |
| 5455 | 5455 | |
| 5456 | - if ( ! post_type_exists( $post_type ) ) |
|
| 5456 | + if (!post_type_exists($post_type)) |
|
| 5457 | 5457 | return new stdClass; |
| 5458 | 5458 | |
| 5459 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5459 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 5460 | 5460 | |
| 5461 | 5461 | $limit = ''; |
| 5462 | - if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5463 | - $offset = ( $page_no - 1 ) * $per_page; |
|
| 5462 | + if ($per_page > 0 && $page_no > 0) {
|
|
| 5463 | + $offset = ($page_no - 1) * $per_page; |
|
| 5464 | 5464 | |
| 5465 | - if ( $offset > 0 ) {
|
|
| 5466 | - $limit = " LIMIT " . $offset . "," . $per_page; |
|
| 5465 | + if ($offset > 0) {
|
|
| 5466 | + $limit = " LIMIT ".$offset.",".$per_page; |
|
| 5467 | 5467 | } else {
|
| 5468 | - $limit = " LIMIT " . $per_page; |
|
| 5468 | + $limit = " LIMIT ".$per_page; |
|
| 5469 | 5469 | } |
| 5470 | 5470 | } |
| 5471 | 5471 | |
| 5472 | 5472 | // Skip listing with statuses trash, auto-draft etc... |
| 5473 | 5473 | $skip_statuses = geodir_imex_export_skip_statuses(); |
| 5474 | 5474 | $where_statuses = ''; |
| 5475 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5476 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5475 | + if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
| 5476 | + $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
| 5477 | 5477 | } |
| 5478 | 5478 | |
| 5479 | 5479 | /** |
@@ -5484,9 +5484,9 @@ discard block |
||
| 5484 | 5484 | * |
| 5485 | 5485 | * @param string $where SQL where clause part. |
| 5486 | 5486 | */ |
| 5487 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5487 | + $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);
|
|
| 5488 | 5488 | |
| 5489 | - $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );
|
|
| 5489 | + $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." ORDER BY {$wpdb->posts}.ID ASC".$limit, $post_type);
|
|
| 5490 | 5490 | /** |
| 5491 | 5491 | * Modify returned posts SQL query for the current post type. |
| 5492 | 5492 | * |
@@ -5496,8 +5496,8 @@ discard block |
||
| 5496 | 5496 | * @param int $query The SQL query. |
| 5497 | 5497 | * @param string $post_type Post type. |
| 5498 | 5498 | */ |
| 5499 | - $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
| 5500 | - $results = (array)$wpdb->get_results( $query, ARRAY_A ); |
|
| 5499 | + $query = apply_filters('geodir_imex_export_posts_query', $query, $post_type);
|
|
| 5500 | + $results = (array) $wpdb->get_results($query, ARRAY_A); |
|
| 5501 | 5501 | |
| 5502 | 5502 | /** |
| 5503 | 5503 | * Modify returned post results for the current post type. |
@@ -5508,7 +5508,7 @@ discard block |
||
| 5508 | 5508 | * @param object $results An object containing all post ids. |
| 5509 | 5509 | * @param string $post_type Post type. |
| 5510 | 5510 | */ |
| 5511 | - return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
| 5511 | + return apply_filters('geodir_export_posts', $results, $post_type);
|
|
| 5512 | 5512 | } |
| 5513 | 5513 | |
| 5514 | 5514 | /** |
@@ -5526,24 +5526,24 @@ discard block |
||
| 5526 | 5526 | * @param string $post_type Post type. |
| 5527 | 5527 | * @return string The SQL query. |
| 5528 | 5528 | */ |
| 5529 | -function geodir_imex_get_events_query( $query, $post_type ) {
|
|
| 5530 | - if ( $post_type == 'gd_event' ) {
|
|
| 5529 | +function geodir_imex_get_events_query($query, $post_type) {
|
|
| 5530 | + if ($post_type == 'gd_event') {
|
|
| 5531 | 5531 | global $wpdb, $plugin_prefix; |
| 5532 | 5532 | |
| 5533 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5533 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 5534 | 5534 | $schedule_table = EVENT_SCHEDULE; |
| 5535 | 5535 | |
| 5536 | 5536 | // Skip listing with statuses trash, auto-draft etc... |
| 5537 | 5537 | $skip_statuses = geodir_imex_export_skip_statuses(); |
| 5538 | 5538 | $where_statuses = ''; |
| 5539 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5540 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5539 | + if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
| 5540 | + $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
| 5541 | 5541 | } |
| 5542 | 5542 | |
| 5543 | 5543 | /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
| 5544 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5544 | + $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);
|
|
| 5545 | 5545 | |
| 5546 | - $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );
|
|
| 5546 | + $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type);
|
|
| 5547 | 5547 | } |
| 5548 | 5548 | |
| 5549 | 5549 | return $query; |
@@ -5567,35 +5567,35 @@ discard block |
||
| 5567 | 5567 | * @param string $post_type Post type. |
| 5568 | 5568 | * @return int Total terms count. |
| 5569 | 5569 | */ |
| 5570 | -function geodir_get_terms_count( $post_type ) {
|
|
| 5571 | - $args = array( 'hide_empty' => 0 ); |
|
| 5570 | +function geodir_get_terms_count($post_type) {
|
|
| 5571 | + $args = array('hide_empty' => 0);
|
|
| 5572 | 5572 | |
| 5573 | - remove_all_filters( 'get_terms' ); |
|
| 5573 | + remove_all_filters('get_terms');
|
|
| 5574 | 5574 | |
| 5575 | - $taxonomy = $post_type . 'category'; |
|
| 5575 | + $taxonomy = $post_type.'category'; |
|
| 5576 | 5576 | |
| 5577 | 5577 | // WPML |
| 5578 | 5578 | $is_wpml = geodir_is_wpml(); |
| 5579 | 5579 | $active_lang = 'all'; |
| 5580 | - if ( $is_wpml ) {
|
|
| 5580 | + if ($is_wpml) {
|
|
| 5581 | 5581 | global $sitepress; |
| 5582 | 5582 | $active_lang = $sitepress->get_current_language(); |
| 5583 | 5583 | |
| 5584 | - if ( $active_lang != 'all' ) {
|
|
| 5585 | - $sitepress->switch_lang( 'all', true ); |
|
| 5584 | + if ($active_lang != 'all') {
|
|
| 5585 | + $sitepress->switch_lang('all', true);
|
|
| 5586 | 5586 | } |
| 5587 | 5587 | } |
| 5588 | 5588 | // WPML |
| 5589 | 5589 | |
| 5590 | - $count_terms = wp_count_terms( $taxonomy, $args ); |
|
| 5590 | + $count_terms = wp_count_terms($taxonomy, $args); |
|
| 5591 | 5591 | |
| 5592 | 5592 | // WPML |
| 5593 | - if ( $is_wpml && $active_lang !== 'all' ) {
|
|
| 5593 | + if ($is_wpml && $active_lang !== 'all') {
|
|
| 5594 | 5594 | global $sitepress; |
| 5595 | - $sitepress->switch_lang( $active_lang, true ); |
|
| 5595 | + $sitepress->switch_lang($active_lang, true); |
|
| 5596 | 5596 | } |
| 5597 | 5597 | // WPML |
| 5598 | - $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
| 5598 | + $count_terms = !is_wp_error($count_terms) ? $count_terms : 0; |
|
| 5599 | 5599 | |
| 5600 | 5600 | return $count_terms; |
| 5601 | 5601 | } |
@@ -5612,23 +5612,23 @@ discard block |
||
| 5612 | 5612 | * @param int $page_no Page number. Default 0. |
| 5613 | 5613 | * @return array Array of terms data. |
| 5614 | 5614 | */ |
| 5615 | -function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
| 5616 | - $args = array( 'hide_empty' => 0, 'orderby' => 'id' ); |
|
| 5615 | +function geodir_imex_get_terms($post_type, $per_page = 0, $page_no = 0) {
|
|
| 5616 | + $args = array('hide_empty' => 0, 'orderby' => 'id');
|
|
| 5617 | 5617 | |
| 5618 | - remove_all_filters( 'get_terms' ); |
|
| 5618 | + remove_all_filters('get_terms');
|
|
| 5619 | 5619 | |
| 5620 | - $taxonomy = $post_type . 'category'; |
|
| 5620 | + $taxonomy = $post_type.'category'; |
|
| 5621 | 5621 | |
| 5622 | - if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5623 | - $args['offset'] = ( $page_no - 1 ) * $per_page; |
|
| 5622 | + if ($per_page > 0 && $page_no > 0) {
|
|
| 5623 | + $args['offset'] = ($page_no - 1) * $per_page; |
|
| 5624 | 5624 | $args['number'] = $per_page; |
| 5625 | 5625 | } |
| 5626 | 5626 | |
| 5627 | - $terms = get_terms( $taxonomy, $args ); |
|
| 5627 | + $terms = get_terms($taxonomy, $args); |
|
| 5628 | 5628 | |
| 5629 | 5629 | $csv_rows = array(); |
| 5630 | 5630 | |
| 5631 | - if ( !empty( $terms ) ) {
|
|
| 5631 | + if (!empty($terms)) {
|
|
| 5632 | 5632 | $csv_row = array(); |
| 5633 | 5633 | $csv_row[] = 'cat_id'; |
| 5634 | 5634 | $csv_row[] = 'cat_name'; |
@@ -5637,7 +5637,7 @@ discard block |
||
| 5637 | 5637 | $csv_row[] = 'cat_parent'; |
| 5638 | 5638 | $csv_row[] = 'cat_schema'; |
| 5639 | 5639 | // WPML |
| 5640 | - $is_wpml = geodir_wpml_is_taxonomy_translated( $taxonomy ); |
|
| 5640 | + $is_wpml = geodir_wpml_is_taxonomy_translated($taxonomy); |
|
| 5641 | 5641 | if ($is_wpml) {
|
| 5642 | 5642 | $csv_row[] = 'cat_language'; |
| 5643 | 5643 | $csv_row[] = 'cat_id_original'; |
@@ -5650,16 +5650,16 @@ discard block |
||
| 5650 | 5650 | |
| 5651 | 5651 | $csv_rows[] = $csv_row; |
| 5652 | 5652 | |
| 5653 | - foreach ( $terms as $term ) {
|
|
| 5654 | - $cat_icon = geodir_get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type ); |
|
| 5655 | - $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 5653 | + foreach ($terms as $term) {
|
|
| 5654 | + $cat_icon = geodir_get_tax_meta($term->term_id, 'ct_cat_icon', false, $post_type); |
|
| 5655 | + $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : ''; |
|
| 5656 | 5656 | |
| 5657 | - $cat_image = geodir_get_default_catimage( $term->term_id, $post_type ); |
|
| 5658 | - $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 5657 | + $cat_image = geodir_get_default_catimage($term->term_id, $post_type); |
|
| 5658 | + $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : ''; |
|
| 5659 | 5659 | |
| 5660 | 5660 | $cat_parent = ''; |
| 5661 | - if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {
|
|
| 5662 | - $parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy ); |
|
| 5661 | + if (isset($term->parent) && (int) $term->parent > 0 && term_exists((int) $term->parent, $taxonomy)) {
|
|
| 5662 | + $parent_term = (array) get_term_by('id', (int) $term->parent, $taxonomy);
|
|
| 5663 | 5663 | $cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : ''; |
| 5664 | 5664 | } |
| 5665 | 5665 | |
@@ -5669,15 +5669,15 @@ discard block |
||
| 5669 | 5669 | $csv_row[] = $term->slug; |
| 5670 | 5670 | $csv_row[] = $post_type; |
| 5671 | 5671 | $csv_row[] = $cat_parent; |
| 5672 | - $csv_row[] = geodir_get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type ); |
|
| 5672 | + $csv_row[] = geodir_get_tax_meta($term->term_id, 'ct_cat_schema', false, $post_type); |
|
| 5673 | 5673 | // WPML |
| 5674 | 5674 | if ($is_wpml) {
|
| 5675 | - $csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5676 | - $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5675 | + $csv_row[] = geodir_get_language_for_element($term->term_id, 'tax_'.$taxonomy); |
|
| 5676 | + $csv_row[] = geodir_imex_original_post_id($term->term_id, 'tax_'.$taxonomy); |
|
| 5677 | 5677 | } |
| 5678 | 5678 | // WPML |
| 5679 | 5679 | $csv_row[] = $term->description; |
| 5680 | - $csv_row[] = geodir_get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type ); |
|
| 5680 | + $csv_row[] = geodir_get_tax_meta($term->term_id, 'ct_cat_top_desc', false, $post_type); |
|
| 5681 | 5681 | $csv_row[] = $cat_image; |
| 5682 | 5682 | $csv_row[] = $cat_icon; |
| 5683 | 5683 | |
@@ -5696,10 +5696,10 @@ discard block |
||
| 5696 | 5696 | * @param bool $relative True for relative path & False for absolute path. |
| 5697 | 5697 | * @return string Path to the cache directory. |
| 5698 | 5698 | */ |
| 5699 | -function geodir_path_import_export( $relative = true ) {
|
|
| 5699 | +function geodir_path_import_export($relative = true) {
|
|
| 5700 | 5700 | $upload_dir = wp_upload_dir(); |
| 5701 | 5701 | |
| 5702 | - return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache'; |
|
| 5702 | + return $relative ? $upload_dir['baseurl'].'/cache' : $upload_dir['basedir'].'/cache'; |
|
| 5703 | 5703 | } |
| 5704 | 5704 | |
| 5705 | 5705 | /** |
@@ -5715,8 +5715,8 @@ discard block |
||
| 5715 | 5715 | * @param bool $clear If true then it overwrite data otherwise add rows at the end of file. |
| 5716 | 5716 | * @return bool true if success otherwise false. |
| 5717 | 5717 | */ |
| 5718 | -function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {
|
|
| 5719 | - if ( empty( $csv_data ) ) {
|
|
| 5718 | +function geodir_save_csv_data($file_path, $csv_data = array(), $clear = true) {
|
|
| 5719 | + if (empty($csv_data)) {
|
|
| 5720 | 5720 | return false; |
| 5721 | 5721 | } |
| 5722 | 5722 | |
@@ -5724,17 +5724,17 @@ discard block |
||
| 5724 | 5724 | |
| 5725 | 5725 | $mode = $clear ? 'w+' : 'a+'; |
| 5726 | 5726 | |
| 5727 | - if ( function_exists( 'fputcsv' ) ) {
|
|
| 5728 | - $file = fopen( $file_path, $mode ); |
|
| 5729 | - foreach( $csv_data as $csv_row ) {
|
|
| 5727 | + if (function_exists('fputcsv')) {
|
|
| 5728 | + $file = fopen($file_path, $mode); |
|
| 5729 | + foreach ($csv_data as $csv_row) {
|
|
| 5730 | 5730 | //$csv_row = array_map( 'utf8_decode', $csv_row ); |
| 5731 | - $write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' ); |
|
| 5731 | + $write_successful = fputcsv($file, $csv_row, ",", $enclosure = '"'); |
|
| 5732 | 5732 | } |
| 5733 | - fclose( $file ); |
|
| 5733 | + fclose($file); |
|
| 5734 | 5734 | } else {
|
| 5735 | - foreach( $csv_data as $csv_row ) {
|
|
| 5735 | + foreach ($csv_data as $csv_row) {
|
|
| 5736 | 5736 | //$csv_row = array_map( 'utf8_decode', $csv_row ); |
| 5737 | - $wp_filesystem->put_contents( $file_path, $csv_row ); |
|
| 5737 | + $wp_filesystem->put_contents($file_path, $csv_row); |
|
| 5738 | 5738 | } |
| 5739 | 5739 | } |
| 5740 | 5740 | |
@@ -5752,14 +5752,14 @@ discard block |
||
| 5752 | 5752 | * @param string $file Full path to file. |
| 5753 | 5753 | * @return int No of file rows. |
| 5754 | 5754 | */ |
| 5755 | -function geodir_import_export_line_count( $file ) {
|
|
| 5755 | +function geodir_import_export_line_count($file) {
|
|
| 5756 | 5756 | global $wp_filesystem; |
| 5757 | 5757 | |
| 5758 | - if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {
|
|
| 5759 | - $contents = $wp_filesystem->get_contents_array( $file ); |
|
| 5758 | + if ($wp_filesystem->is_file($file) && $wp_filesystem->exists($file)) {
|
|
| 5759 | + $contents = $wp_filesystem->get_contents_array($file); |
|
| 5760 | 5760 | |
| 5761 | - if ( !empty( $contents ) && is_array( $contents ) ) {
|
|
| 5762 | - return count( $contents ) - 1; |
|
| 5761 | + if (!empty($contents) && is_array($contents)) {
|
|
| 5762 | + return count($contents) - 1; |
|
| 5763 | 5763 | } |
| 5764 | 5764 | } |
| 5765 | 5765 | |
@@ -5776,11 +5776,11 @@ discard block |
||
| 5776 | 5776 | * @param string $post_type The post type. |
| 5777 | 5777 | * @return object Queried object. |
| 5778 | 5778 | */ |
| 5779 | -function geodir_imex_get_custom_fields( $post_type ) {
|
|
| 5779 | +function geodir_imex_get_custom_fields($post_type) {
|
|
| 5780 | 5780 | global $wpdb; |
| 5781 | 5781 | |
| 5782 | - $sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array( $post_type ) );
|
|
| 5783 | - $rows = $wpdb->get_results( $sql ); |
|
| 5782 | + $sql = $wpdb->prepare("SELECT htmlvar_name FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array($post_type));
|
|
| 5783 | + $rows = $wpdb->get_results($sql); |
|
| 5784 | 5784 | |
| 5785 | 5785 | return $rows; |
| 5786 | 5786 | } |
@@ -5796,10 +5796,10 @@ discard block |
||
| 5796 | 5796 | * @return array Event data array. |
| 5797 | 5797 | */ |
| 5798 | 5798 | function geodir_imex_get_event_data($post, $gd_post_info) {
|
| 5799 | - $event_date = isset( $post['event_date'] ) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $post['event_date'] ) ) : ''; |
|
| 5799 | + $event_date = isset($post['event_date']) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($post['event_date'])) : '';
|
|
| 5800 | 5800 | $event_enddate = $event_date; |
| 5801 | - $starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : ''; |
|
| 5802 | - $endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : ''; |
|
| 5801 | + $starttime = isset($post['starttime']) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['starttime'])) : '';
|
|
| 5802 | + $endtime = isset($post['endtime']) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['endtime'])) : '';
|
|
| 5803 | 5803 | |
| 5804 | 5804 | $is_recurring_event = ''; |
| 5805 | 5805 | $event_duration_days = ''; |
@@ -5816,15 +5816,15 @@ discard block |
||
| 5816 | 5816 | |
| 5817 | 5817 | $recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array(); |
| 5818 | 5818 | if (!empty($recurring_data)) {
|
| 5819 | - $event_date = isset( $recurring_data['event_start'] ) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_start'] ) ) : $event_date; |
|
| 5820 | - $event_enddate = isset( $recurring_data['event_end'] ) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_end'] ) ) : $event_date; |
|
| 5821 | - $starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime; |
|
| 5822 | - $endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime; |
|
| 5819 | + $event_date = isset($recurring_data['event_start']) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_start'])) : $event_date;
|
|
| 5820 | + $event_enddate = isset($recurring_data['event_end']) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_end'])) : $event_date;
|
|
| 5821 | + $starttime = isset($recurring_data['starttime']) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['starttime'])) : $starttime;
|
|
| 5822 | + $endtime = isset($recurring_data['endtime']) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['endtime'])) : $endtime;
|
|
| 5823 | 5823 | $is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : ''; |
| 5824 | 5824 | $different_times = !empty($recurring_data['different_times']) ? true : false; |
| 5825 | 5825 | |
| 5826 | - $recurring_pkg = geodir_event_recurring_pkg( $gd_post_info ); |
|
| 5827 | - $is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true; |
|
| 5826 | + $recurring_pkg = geodir_event_recurring_pkg($gd_post_info); |
|
| 5827 | + $is_recurring = isset($gd_post_info->is_recurring) && (int) $gd_post_info->is_recurring == 0 ? false : true; |
|
| 5828 | 5828 | |
| 5829 | 5829 | if ($recurring_pkg && $is_recurring) {
|
| 5830 | 5830 | $recurring_dates = $event_date; |
@@ -5834,13 +5834,13 @@ discard block |
||
| 5834 | 5834 | $recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';
|
| 5835 | 5835 | |
| 5836 | 5836 | if (!empty($recurring_data['event_recurring_dates'])) {
|
| 5837 | - $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] ); |
|
| 5837 | + $event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);
|
|
| 5838 | 5838 | |
| 5839 | 5839 | if (!empty($event_recurring_dates)) {
|
| 5840 | 5840 | $recurring_dates = array(); |
| 5841 | 5841 | |
| 5842 | 5842 | foreach ($event_recurring_dates as $date) {
|
| 5843 | - $recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) ); |
|
| 5843 | + $recurring_dates[] = date_i18n('d/m/Y', strtotime($date));
|
|
| 5844 | 5844 | } |
| 5845 | 5845 | |
| 5846 | 5846 | $recurring_dates = implode(",", $recurring_dates);
|
@@ -5856,7 +5856,7 @@ discard block |
||
| 5856 | 5856 | $times = array(); |
| 5857 | 5857 | |
| 5858 | 5858 | foreach ($recurring_data['starttimes'] as $time) {
|
| 5859 | - $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00'; |
|
| 5859 | + $times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';
|
|
| 5860 | 5860 | } |
| 5861 | 5861 | |
| 5862 | 5862 | $event_starttimes = implode(",", $times);
|
@@ -5866,7 +5866,7 @@ discard block |
||
| 5866 | 5866 | $times = array(); |
| 5867 | 5867 | |
| 5868 | 5868 | foreach ($recurring_data['endtimes'] as $time) {
|
| 5869 | - $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00'; |
|
| 5869 | + $times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';
|
|
| 5870 | 5870 | } |
| 5871 | 5871 | |
| 5872 | 5872 | $event_endtimes = implode(",", $times);
|
@@ -5878,8 +5878,8 @@ discard block |
||
| 5878 | 5878 | } |
| 5879 | 5879 | } |
| 5880 | 5880 | } else {
|
| 5881 | - $event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1; |
|
| 5882 | - $recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1; |
|
| 5881 | + $event_duration_days = isset($recurring_data['duration_x']) ? (int) $recurring_data['duration_x'] : 1; |
|
| 5882 | + $recurring_interval = !empty($recurring_data['repeat_x']) && (int) $recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1; |
|
| 5883 | 5883 | |
| 5884 | 5884 | if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {
|
| 5885 | 5885 | $week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');
|
@@ -5895,11 +5895,11 @@ discard block |
||
| 5895 | 5895 | } |
| 5896 | 5896 | |
| 5897 | 5897 | $recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;
|
| 5898 | - if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {
|
|
| 5899 | - $recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['repeat_end'] ) ) : ''; |
|
| 5898 | + if (!empty($recurring_data['repeat_end_type']) && (int) $recurring_data['repeat_end_type'] == 1) {
|
|
| 5899 | + $recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['repeat_end'])) : '';
|
|
| 5900 | 5900 | $max_recurring_count = empty($recurring_end_date) ? 1 : ''; |
| 5901 | 5901 | } else {
|
| 5902 | - $max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1); |
|
| 5902 | + $max_recurring_count = (!empty($recurring_data['max_repeat']) && (int) $recurring_data['max_repeat'] > 0 ? (int) $recurring_data['max_repeat'] : 1); |
|
| 5903 | 5903 | } |
| 5904 | 5904 | } |
| 5905 | 5905 | } |
@@ -5963,9 +5963,9 @@ discard block |
||
| 5963 | 5963 | * @return array Event data array. |
| 5964 | 5964 | */ |
| 5965 | 5965 | function geodir_imex_process_event_data($gd_post) {
|
| 5966 | - $recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post ); |
|
| 5966 | + $recurring_pkg = geodir_event_recurring_pkg((object) $gd_post); |
|
| 5967 | 5967 | |
| 5968 | - $is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true; |
|
| 5968 | + $is_recurring = isset($gd_post['is_recurring_event']) && (int) $gd_post['is_recurring_event'] == 0 ? false : true; |
|
| 5969 | 5969 | $event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_date($gd_post['event_date'], 'Y-m-d') : ''; |
| 5970 | 5970 | $event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_date($gd_post['event_enddate'], 'Y-m-d') : $event_date; |
| 5971 | 5971 | $all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false; |
@@ -6012,17 +6012,17 @@ discard block |
||
| 6012 | 6012 | $event_recurring_dates = implode(",", $event_recurring_dates);
|
| 6013 | 6013 | } |
| 6014 | 6014 | } else {
|
| 6015 | - $duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1; |
|
| 6016 | - $repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1; |
|
| 6017 | - $max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1; |
|
| 6018 | - $repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_date($gd_post['recurring_end_date'], 'Y-m-d') : ''; |
|
| 6015 | + $duration_x = !empty($gd_post['event_duration_days']) ? (int) $gd_post['event_duration_days'] : 1; |
|
| 6016 | + $repeat_x = !empty($gd_post['recurring_interval']) ? (int) $gd_post['recurring_interval'] : 1; |
|
| 6017 | + $max_repeat = !empty($gd_post['max_recurring_count']) ? (int) $gd_post['max_recurring_count'] : 1; |
|
| 6018 | + $repeat_end = !empty($gd_post['recurring_end_date']) ? geodir_date($gd_post['recurring_end_date'], 'Y-m-d') : ''; |
|
| 6019 | 6019 | |
| 6020 | 6020 | $repeat_end_type = $repeat_end != '' ? 1 : 0; |
| 6021 | 6021 | $max_repeat = $repeat_end != '' ? '' : $max_repeat; |
| 6022 | 6022 | |
| 6023 | 6023 | $week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));
|
| 6024 | 6024 | |
| 6025 | - $a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();
|
|
| 6025 | + $a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days']) != '' ? explode(',', trim($gd_post['recurring_week_days'])) : array();
|
|
| 6026 | 6026 | $repeat_days = array(); |
| 6027 | 6027 | if (!empty($a_repeat_days)) {
|
| 6028 | 6028 | foreach ($a_repeat_days as $repeat_day) {
|
@@ -6040,7 +6040,7 @@ discard block |
||
| 6040 | 6040 | $repeat_weeks = array(); |
| 6041 | 6041 | if (!empty($a_repeat_weeks)) {
|
| 6042 | 6042 | foreach ($a_repeat_weeks as $repeat_week) {
|
| 6043 | - $repeat_weeks[] = (int)$repeat_week; |
|
| 6043 | + $repeat_weeks[] = (int) $repeat_week; |
|
| 6044 | 6044 | } |
| 6045 | 6045 | |
| 6046 | 6046 | $repeat_weeks = array_unique($repeat_weeks); |
@@ -6104,7 +6104,7 @@ discard block |
||
| 6104 | 6104 | |
| 6105 | 6105 | $page_found = $wpdb->get_var( |
| 6106 | 6106 | $wpdb->prepare( |
| 6107 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 6107 | + "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;", |
|
| 6108 | 6108 | array($slug) |
| 6109 | 6109 | ) |
| 6110 | 6110 | ); |
@@ -6159,7 +6159,7 @@ discard block |
||
| 6159 | 6159 | */ |
| 6160 | 6160 | function geodir_admin_upgrade_notice() {
|
| 6161 | 6161 | $class = "error"; |
| 6162 | - $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
| 6162 | + $message = __("Please update core GeoDirectory or some addons may not function correctly.", "geodirectory");
|
|
| 6163 | 6163 | echo"<div class=\"$class\"> <p>$message</p></div>"; |
| 6164 | 6164 | } |
| 6165 | 6165 | |
@@ -6171,7 +6171,7 @@ discard block |
||
| 6171 | 6171 | * @param (object) $r |
| 6172 | 6172 | * @return (string) $output |
| 6173 | 6173 | */ |
| 6174 | -function geodire_admin_upgrade_notice( $plugin_data, $r ) |
|
| 6174 | +function geodire_admin_upgrade_notice($plugin_data, $r) |
|
| 6175 | 6175 | {
|
| 6176 | 6176 | // readme contents |
| 6177 | 6177 | $args = array( |
@@ -6179,7 +6179,7 @@ discard block |
||
| 6179 | 6179 | 'redirection' => 5 |
| 6180 | 6180 | ); |
| 6181 | 6181 | $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
| 6182 | - $data = wp_remote_get( $url, $args ); |
|
| 6182 | + $data = wp_remote_get($url, $args); |
|
| 6183 | 6183 | |
| 6184 | 6184 | if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
| 6185 | 6185 | |
@@ -6194,20 +6194,20 @@ discard block |
||
| 6194 | 6194 | function geodir_in_plugin_update_message($content) {
|
| 6195 | 6195 | // Output Upgrade Notice |
| 6196 | 6196 | $matches = null; |
| 6197 | - $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
| 6197 | + $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*'.preg_quote(GEODIRECTORY_VERSION).'\s*=|$)~Uis'; |
|
| 6198 | 6198 | $upgrade_notice = ''; |
| 6199 | - if ( preg_match( $regexp, $content, $matches ) ) {
|
|
| 6200 | - if(empty($matches)){return;}
|
|
| 6199 | + if (preg_match($regexp, $content, $matches)) {
|
|
| 6200 | + if (empty($matches)) {return; }
|
|
| 6201 | 6201 | |
| 6202 | - $version = trim( $matches[1] ); |
|
| 6203 | - if($version && $version>GEODIRECTORY_VERSION){
|
|
| 6202 | + $version = trim($matches[1]); |
|
| 6203 | + if ($version && $version > GEODIRECTORY_VERSION) {
|
|
| 6204 | 6204 | |
| 6205 | 6205 | |
| 6206 | - $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
| 6207 | - if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
| 6206 | + $notices = (array) preg_split('~[\r\n]+~', trim($matches[2]));
|
|
| 6207 | + if (version_compare(GEODIRECTORY_VERSION, $version, '<')) {
|
|
| 6208 | 6208 | $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
| 6209 | - foreach ( $notices as $index => $line ) {
|
|
| 6210 | - $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
| 6209 | + foreach ($notices as $index => $line) {
|
|
| 6210 | + $upgrade_notice .= wp_kses_post(preg_replace('~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line));
|
|
| 6211 | 6211 | } |
| 6212 | 6212 | $upgrade_notice .= '</div> '; |
| 6213 | 6213 | } |
@@ -6231,7 +6231,7 @@ discard block |
||
| 6231 | 6231 | $default_language = $sitepress->get_default_language(); |
| 6232 | 6232 | if ($current_language != 'all' && $current_language != $default_language) {
|
| 6233 | 6233 | ?> |
| 6234 | - <div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory');?></strong></p></div>
|
|
| 6234 | + <div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory'); ?></strong></p></div>
|
|
| 6235 | 6235 | <?php |
| 6236 | 6236 | } |
| 6237 | 6237 | } |
@@ -6246,7 +6246,7 @@ discard block |
||
| 6246 | 6246 | * @param array Listing statuses to be skipped. |
| 6247 | 6247 | */ |
| 6248 | 6248 | function geodir_imex_export_skip_statuses() {
|
| 6249 | - $statuses = array( 'trash', 'auto-draft' ); |
|
| 6249 | + $statuses = array('trash', 'auto-draft');
|
|
| 6250 | 6250 | |
| 6251 | 6251 | /** |
| 6252 | 6252 | * Filter the statuses to skip during GD export listings. |
@@ -6256,7 +6256,7 @@ discard block |
||
| 6256 | 6256 | * |
| 6257 | 6257 | * @param array $statuses Listing statuses to be skipped. |
| 6258 | 6258 | */ |
| 6259 | - $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
| 6259 | + $statuses = apply_filters('geodir_imex_export_skip_statuses', $statuses);
|
|
| 6260 | 6260 | |
| 6261 | 6261 | return $statuses; |
| 6262 | 6262 | } |
@@ -6327,16 +6327,16 @@ discard block |
||
| 6327 | 6327 | function geodir_imex_get_filter_where($where = '', $post_type = '') {
|
| 6328 | 6328 | global $wpdb; |
| 6329 | 6329 | |
| 6330 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6330 | + $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6331 | 6331 | |
| 6332 | - if ( !empty( $filters ) ) {
|
|
| 6333 | - foreach ( $filters as $field => $value ) {
|
|
| 6332 | + if (!empty($filters)) {
|
|
| 6333 | + foreach ($filters as $field => $value) {
|
|
| 6334 | 6334 | switch ($field) {
|
| 6335 | 6335 | case 'start_date': |
| 6336 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
| 6336 | + $where .= " AND `".$wpdb->posts."`.`post_date` >= '".sanitize_text_field($value)." 00:00:00'"; |
|
| 6337 | 6337 | break; |
| 6338 | 6338 | case 'end_date': |
| 6339 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
| 6339 | + $where .= " AND `".$wpdb->posts."`.`post_date` <= '".sanitize_text_field($value)." 23:59:59'"; |
|
| 6340 | 6340 | break; |
| 6341 | 6341 | } |
| 6342 | 6342 | } |
@@ -6348,25 +6348,25 @@ discard block |
||
| 6348 | 6348 | add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);
|
| 6349 | 6349 | |
| 6350 | 6350 | |
| 6351 | -function geodir_fix_for_primer_theme(){
|
|
| 6352 | - if(!defined( 'PRIMER_VERSION' )){return;}
|
|
| 6351 | +function geodir_fix_for_primer_theme() {
|
|
| 6352 | + if (!defined('PRIMER_VERSION')) {return; }
|
|
| 6353 | 6353 | global $pagenow; |
| 6354 | 6354 | |
| 6355 | - if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
| 6355 | + if (('post.php' === $pagenow || 'post-new.php' === $pagenow) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']))) {
|
|
| 6356 | 6356 | |
| 6357 | - $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
| 6357 | + $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type($_GET['post']); |
|
| 6358 | 6358 | |
| 6359 | 6359 | $post_types = geodir_get_posttypes(); |
| 6360 | - if ($post_type && in_array($post_type, $post_types) ) {
|
|
| 6360 | + if ($post_type && in_array($post_type, $post_types)) {
|
|
| 6361 | 6361 | global $primer_customizer_layouts; |
| 6362 | - remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
| 6362 | + remove_action('add_meta_boxes', array($primer_customizer_layouts, 'add_meta_box'), 10);
|
|
| 6363 | 6363 | } |
| 6364 | 6364 | } |
| 6365 | 6365 | |
| 6366 | 6366 | } |
| 6367 | 6367 | |
| 6368 | -if(is_admin()){
|
|
| 6369 | - add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
| 6368 | +if (is_admin()) {
|
|
| 6369 | + add_action('add_meta_boxes', 'geodir_fix_for_primer_theme', 0);
|
|
| 6370 | 6370 | } |
| 6371 | 6371 | |
| 6372 | 6372 | |
@@ -6499,32 +6499,32 @@ discard block |
||
| 6499 | 6499 | |
| 6500 | 6500 | function geodir_ga_activation_url() {
|
| 6501 | 6501 | |
| 6502 | - return add_query_arg( array( |
|
| 6502 | + return add_query_arg(array( |
|
| 6503 | 6503 | 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
| 6504 | 6504 | 'scope' => GEODIR_GA_SCOPE, |
| 6505 | 6505 | 'response_type' => 'code', |
| 6506 | 6506 | 'redirect_uri' => GEODIR_GA_REDIRECT, |
| 6507 | 6507 | 'client_id' => GEODIR_GA_CLIENTID, |
| 6508 | - ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
| 6508 | + ), 'https://accounts.google.com/o/oauth2/auth'); |
|
| 6509 | 6509 | |
| 6510 | 6510 | return $url; |
| 6511 | 6511 | } |
| 6512 | 6512 | |
| 6513 | -function geodir_gd_accounts(){
|
|
| 6513 | +function geodir_gd_accounts() {
|
|
| 6514 | 6514 | $accounts = array(); |
| 6515 | - $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
| 6516 | - if($useAuth){
|
|
| 6515 | + $useAuth = (get_option('geodir_ga_auth_code') == '' ? false : true);
|
|
| 6516 | + if ($useAuth) {
|
|
| 6517 | 6517 | try {
|
| 6518 | 6518 | $accounts = geodir_ga_get_analytics_accounts(); |
| 6519 | 6519 | } catch (Exception $e) {
|
| 6520 | - geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 6520 | + geodir_error_log(wp_sprintf(__('GD Google Analytics API Error(%s) : %s', 'geodirectory'), $e->getCode(), $e->getMessage()));
|
|
| 6521 | 6521 | } |
| 6522 | 6522 | |
| 6523 | - if(is_array($accounts)){
|
|
| 6524 | - $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
| 6525 | - }elseif(get_option('geodir_ga_account_id')){
|
|
| 6523 | + if (is_array($accounts)) {
|
|
| 6524 | + $accounts = array_merge(array(__('Select Account', 'geodirectory')), $accounts);
|
|
| 6525 | + }elseif (get_option('geodir_ga_account_id')) {
|
|
| 6526 | 6526 | $accounts = array(); |
| 6527 | - $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6527 | + $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required', 'geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6528 | 6528 | } |
| 6529 | 6529 | } |
| 6530 | 6530 | return $accounts; |
@@ -6535,21 +6535,21 @@ discard block |
||
| 6535 | 6535 | global $gd_ga_errors; |
| 6536 | 6536 | $accounts = array(); |
| 6537 | 6537 | |
| 6538 | - if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
| 6538 | + if (get_option('geodir_ga_auth_token') === false) {update_option('geodir_ga_auth_token', ''); }
|
|
| 6539 | 6539 | |
| 6540 | 6540 | |
| 6541 | - if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
| 6541 | + if (get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])) {
|
|
| 6542 | 6542 | return get_option('geodir_gd_uids');
|
| 6543 | 6543 | } |
| 6544 | 6544 | |
| 6545 | 6545 | # Create a new Gdata call |
| 6546 | - if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6546 | + if (trim(get_option('geodir_ga_auth_code')) != '')
|
|
| 6547 | 6547 | $stats = new GDGoogleAnalyticsStats(); |
| 6548 | 6548 | else |
| 6549 | 6549 | return false; |
| 6550 | 6550 | |
| 6551 | 6551 | # Check if Google sucessfully logged in |
| 6552 | - if ( ! $stats->checkLogin() ) |
|
| 6552 | + if (!$stats->checkLogin()) |
|
| 6553 | 6553 | return false; |
| 6554 | 6554 | |
| 6555 | 6555 | # Get a list of accounts |
@@ -6561,28 +6561,28 @@ discard block |
||
| 6561 | 6561 | } |
| 6562 | 6562 | |
| 6563 | 6563 | |
| 6564 | - natcasesort ($accounts); |
|
| 6564 | + natcasesort($accounts); |
|
| 6565 | 6565 | |
| 6566 | 6566 | # Return the account array if there are accounts |
| 6567 | - if ( count($accounts) > 0 ){
|
|
| 6568 | - update_option('geodir_gd_uids',$accounts);
|
|
| 6567 | + if (count($accounts) > 0) {
|
|
| 6568 | + update_option('geodir_gd_uids', $accounts);
|
|
| 6569 | 6569 | return $accounts; |
| 6570 | 6570 | } |
| 6571 | 6571 | else |
| 6572 | 6572 | return false; |
| 6573 | 6573 | } |
| 6574 | 6574 | |
| 6575 | -add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' ); |
|
| 6576 | -function geodir_ga_deauthorize(){
|
|
| 6575 | +add_action('wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize');
|
|
| 6576 | +function geodir_ga_deauthorize() {
|
|
| 6577 | 6577 | |
| 6578 | - if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
| 6578 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'gd_ga_deauthorize')) {
|
|
| 6579 | 6579 | |
| 6580 | - die( 'Security check' ); |
|
| 6580 | + die('Security check');
|
|
| 6581 | 6581 | |
| 6582 | 6582 | } else {
|
| 6583 | - update_option('geodir_ga_auth_token','');
|
|
| 6584 | - update_option('geodir_ga_auth_code','');
|
|
| 6585 | - update_option('geodir_gd_uids','');
|
|
| 6583 | + update_option('geodir_ga_auth_token', '');
|
|
| 6584 | + update_option('geodir_ga_auth_code', '');
|
|
| 6585 | + update_option('geodir_gd_uids', '');
|
|
| 6586 | 6586 | |
| 6587 | 6587 | |
| 6588 | 6588 | echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|
@@ -6615,22 +6615,22 @@ discard block |
||
| 6615 | 6615 | * @since 1.6.21 |
| 6616 | 6616 | * @return array |
| 6617 | 6617 | */ |
| 6618 | -function geodir_listing_image_size_arr(){
|
|
| 6618 | +function geodir_listing_image_size_arr() {
|
|
| 6619 | 6619 | |
| 6620 | 6620 | global $_wp_additional_image_sizes; |
| 6621 | 6621 | |
| 6622 | 6622 | $sizes = array(); |
| 6623 | 6623 | |
| 6624 | - foreach ( get_intermediate_image_sizes() as $_size ) {
|
|
| 6625 | - if ( in_array( $_size, array('thumbnail', 'medium', 'medium_large', 'large') ) ) {
|
|
| 6626 | - $sizes[ $_size ]['width'] = get_option( "{$_size}_size_w" );
|
|
| 6627 | - $sizes[ $_size ]['height'] = get_option( "{$_size}_size_h" );
|
|
| 6628 | - $sizes[ $_size ]['crop'] = (bool) get_option( "{$_size}_crop" );
|
|
| 6629 | - } elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) {
|
|
| 6630 | - $sizes[ $_size ] = array( |
|
| 6631 | - 'width' => $_wp_additional_image_sizes[ $_size ]['width'], |
|
| 6632 | - 'height' => $_wp_additional_image_sizes[ $_size ]['height'], |
|
| 6633 | - 'crop' => $_wp_additional_image_sizes[ $_size ]['crop'], |
|
| 6624 | + foreach (get_intermediate_image_sizes() as $_size) {
|
|
| 6625 | + if (in_array($_size, array('thumbnail', 'medium', 'medium_large', 'large'))) {
|
|
| 6626 | + $sizes[$_size]['width'] = get_option("{$_size}_size_w");
|
|
| 6627 | + $sizes[$_size]['height'] = get_option("{$_size}_size_h");
|
|
| 6628 | + $sizes[$_size]['crop'] = (bool) get_option("{$_size}_crop");
|
|
| 6629 | + } elseif (isset($_wp_additional_image_sizes[$_size])) {
|
|
| 6630 | + $sizes[$_size] = array( |
|
| 6631 | + 'width' => $_wp_additional_image_sizes[$_size]['width'], |
|
| 6632 | + 'height' => $_wp_additional_image_sizes[$_size]['height'], |
|
| 6633 | + 'crop' => $_wp_additional_image_sizes[$_size]['crop'], |
|
| 6634 | 6634 | ); |
| 6635 | 6635 | } |
| 6636 | 6636 | } |
@@ -6641,9 +6641,9 @@ discard block |
||
| 6641 | 6641 | |
| 6642 | 6642 | $options['default'] = __('GD Default', 'geodirectory');
|
| 6643 | 6643 | |
| 6644 | - if(!empty($sizes)){
|
|
| 6645 | - foreach($sizes as $key=>$val){
|
|
| 6646 | - $options[$key] = $key. ' ( '.$val['width'].' x '.$val['height']. ' )'; |
|
| 6644 | + if (!empty($sizes)) {
|
|
| 6645 | + foreach ($sizes as $key=>$val) {
|
|
| 6646 | + $options[$key] = $key.' ( '.$val['width'].' x '.$val['height'].' )'; |
|
| 6647 | 6647 | } |
| 6648 | 6648 | } |
| 6649 | 6649 | |