|
@@ -52,31 +52,31 @@ discard block |
|
|
block discarded – undo |
|
52
|
52
|
jQuery(listSel).children('li').switchClass('gridview_onehalf gridview_onethird gridview_onefourth', 'gridview_onefifth', 600);
|
|
53
|
53
|
}
|
|
54
|
54
|
|
|
55
|
|
- jQuery.post("<?php echo geodir_get_ajax_url();?>&gd_listing_view=" + val, function (data) {
|
|
|
55
|
+ jQuery.post("<?php echo geodir_get_ajax_url(); ?>&gd_listing_view=" + val, function (data) {
|
|
56
|
56
|
//alert(data );
|
|
57
|
57
|
});
|
|
58
|
58
|
}
|
|
59
|
59
|
</script>
|
|
60
|
60
|
<div class="geodir-list-view-select">
|
|
61
|
61
|
<select name="gd_list_view" id="gd_list_view" onchange="geodir_list_view_select(this);">
|
|
62
|
|
- <?php $listing_view = (int) $gd_session->get( 'gd_listing_view' ); ?>
|
|
63
|
|
- <option value=""><?php _e( 'View:', 'geodirectory' ); ?></option>
|
|
|
62
|
+ <?php $listing_view = (int) $gd_session->get('gd_listing_view'); ?>
|
|
|
63
|
+ <option value=""><?php _e('View:', 'geodirectory'); ?></option>
|
|
64
|
64
|
<option
|
|
65
|
|
- value="1" <?php selected( 1, $listing_view ); ?>><?php _e( 'View: List', 'geodirectory' ); ?></option>
|
|
|
65
|
+ value="1" <?php selected(1, $listing_view); ?>><?php _e('View: List', 'geodirectory'); ?></option>
|
|
66
|
66
|
<option
|
|
67
|
|
- value="2" <?php selected( 2, $listing_view ); ?>><?php _e( 'View: Grid 2', 'geodirectory' ); ?></option>
|
|
|
67
|
+ value="2" <?php selected(2, $listing_view); ?>><?php _e('View: Grid 2', 'geodirectory'); ?></option>
|
|
68
|
68
|
<option
|
|
69
|
|
- value="3" <?php selected( 3, $listing_view ); ?>><?php _e( 'View: Grid 3', 'geodirectory' ); ?></option>
|
|
|
69
|
+ value="3" <?php selected(3, $listing_view); ?>><?php _e('View: Grid 3', 'geodirectory'); ?></option>
|
|
70
|
70
|
<option
|
|
71
|
|
- value="4" <?php selected( 4, $listing_view ); ?>><?php _e( 'View: Grid 4', 'geodirectory' ); ?></option>
|
|
|
71
|
+ value="4" <?php selected(4, $listing_view); ?>><?php _e('View: Grid 4', 'geodirectory'); ?></option>
|
|
72
|
72
|
<option
|
|
73
|
|
- value="5" <?php selected( 5, $listing_view ); ?>><?php _e( 'View: Grid 5', 'geodirectory' ); ?></option>
|
|
|
73
|
+ value="5" <?php selected(5, $listing_view); ?>><?php _e('View: Grid 5', 'geodirectory'); ?></option>
|
|
74
|
74
|
</select>
|
|
75
|
75
|
</div>
|
|
76
|
76
|
<?php
|
|
77
|
77
|
}
|
|
78
|
78
|
|
|
79
|
|
-add_action( 'geodir_before_listing', 'geodir_list_view_select', 100 );
|
|
|
79
|
+add_action('geodir_before_listing', 'geodir_list_view_select', 100);
|
|
80
|
80
|
|
|
81
|
81
|
/**
|
|
82
|
82
|
* Limit the listing excerpt.
|
|
@@ -91,9 +91,9 @@ discard block |
|
|
block discarded – undo |
|
91
|
91
|
* @global object $post The current post object.
|
|
92
|
92
|
* @return string The modified excerpt.
|
|
93
|
93
|
*/
|
|
94
|
|
-function geodir_max_excerpt( $charlength ) {
|
|
|
94
|
+function geodir_max_excerpt($charlength) {
|
|
95
|
95
|
global $post;
|
|
96
|
|
- if ( $charlength == '0' ) {
|
|
|
96
|
+ if ($charlength == '0') {
|
|
97
|
97
|
return;
|
|
98
|
98
|
}
|
|
99
|
99
|
$out = '';
|
|
@@ -101,46 +101,46 @@ discard block |
|
|
block discarded – undo |
|
101
|
101
|
$temp_post = $post;
|
|
102
|
102
|
$excerpt = get_the_excerpt();
|
|
103
|
103
|
|
|
104
|
|
- $charlength ++;
|
|
105
|
|
- $excerpt_more = function_exists( 'geodirf_excerpt_more' ) ? geodirf_excerpt_more( '' ) : geodir_excerpt_more( '' );
|
|
106
|
|
- if ( geodir_utf8_strlen( $excerpt ) > $charlength ) {
|
|
107
|
|
- if ( geodir_utf8_strlen( $excerpt_more ) > 0 && geodir_utf8_strpos( $excerpt, $excerpt_more ) !== false ) {
|
|
108
|
|
- $excut = - ( geodir_utf8_strlen( $excerpt_more ) );
|
|
109
|
|
- $subex = geodir_utf8_substr( $excerpt, 0, $excut );
|
|
110
|
|
- if ( $charlength > 0 && geodir_utf8_strlen( $subex ) > $charlength ) {
|
|
111
|
|
- $subex = geodir_utf8_substr( $subex, 0, $charlength );
|
|
|
104
|
+ $charlength++;
|
|
|
105
|
+ $excerpt_more = function_exists('geodirf_excerpt_more') ? geodirf_excerpt_more('') : geodir_excerpt_more('');
|
|
|
106
|
+ if (geodir_utf8_strlen($excerpt) > $charlength) {
|
|
|
107
|
+ if (geodir_utf8_strlen($excerpt_more) > 0 && geodir_utf8_strpos($excerpt, $excerpt_more) !== false) {
|
|
|
108
|
+ $excut = - (geodir_utf8_strlen($excerpt_more));
|
|
|
109
|
+ $subex = geodir_utf8_substr($excerpt, 0, $excut);
|
|
|
110
|
+ if ($charlength > 0 && geodir_utf8_strlen($subex) > $charlength) {
|
|
|
111
|
+ $subex = geodir_utf8_substr($subex, 0, $charlength);
|
|
112
|
112
|
}
|
|
113
|
113
|
$out .= $subex;
|
|
114
|
114
|
} else {
|
|
115
|
|
- $subex = geodir_utf8_substr( $excerpt, 0, $charlength - 5 );
|
|
116
|
|
- $exwords = explode( ' ', $subex );
|
|
117
|
|
- $excut = - ( geodir_utf8_strlen( $exwords[ count( $exwords ) - 1 ] ) );
|
|
118
|
|
- if ( $excut < 0 ) {
|
|
119
|
|
- $out .= geodir_utf8_substr( $subex, 0, $excut );
|
|
|
115
|
+ $subex = geodir_utf8_substr($excerpt, 0, $charlength - 5);
|
|
|
116
|
+ $exwords = explode(' ', $subex);
|
|
|
117
|
+ $excut = - (geodir_utf8_strlen($exwords[count($exwords) - 1]));
|
|
|
118
|
+ if ($excut < 0) {
|
|
|
119
|
+ $out .= geodir_utf8_substr($subex, 0, $excut);
|
|
120
|
120
|
} else {
|
|
121
|
121
|
$out .= $subex;
|
|
122
|
122
|
}
|
|
123
|
123
|
}
|
|
124
|
|
- $out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">';
|
|
|
124
|
+ $out .= ' <a class="excerpt-read-more" href="'.get_permalink().'" title="'.get_the_title().'">';
|
|
125
|
125
|
/**
|
|
126
|
126
|
* Filter excerpt read more text.
|
|
127
|
127
|
*
|
|
128
|
128
|
* @since 1.0.0
|
|
129
|
129
|
*/
|
|
130
|
|
- $out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) );
|
|
|
130
|
+ $out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));
|
|
131
|
131
|
$out .= '</a>';
|
|
132
|
132
|
|
|
133
|
133
|
} else {
|
|
134
|
|
- if ( geodir_utf8_strlen( $excerpt_more ) > 0 && geodir_utf8_strpos( $excerpt, $excerpt_more ) !== false ) {
|
|
135
|
|
- $excut = - ( geodir_utf8_strlen( $excerpt_more ) );
|
|
136
|
|
- $out .= geodir_utf8_substr( $excerpt, 0, $excut );
|
|
137
|
|
- $out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">';
|
|
|
134
|
+ if (geodir_utf8_strlen($excerpt_more) > 0 && geodir_utf8_strpos($excerpt, $excerpt_more) !== false) {
|
|
|
135
|
+ $excut = - (geodir_utf8_strlen($excerpt_more));
|
|
|
136
|
+ $out .= geodir_utf8_substr($excerpt, 0, $excut);
|
|
|
137
|
+ $out .= ' <a class="excerpt-read-more" href="'.get_permalink().'" title="'.get_the_title().'">';
|
|
138
|
138
|
/**
|
|
139
|
139
|
* Filter excerpt read more text.
|
|
140
|
140
|
*
|
|
141
|
141
|
* @since 1.0.0
|
|
142
|
142
|
*/
|
|
143
|
|
- $out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) );
|
|
|
143
|
+ $out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));
|
|
144
|
144
|
$out .= '</a>';
|
|
145
|
145
|
} else {
|
|
146
|
146
|
$out .= $excerpt;
|
|
@@ -163,7 +163,7 @@ discard block |
|
|
block discarded – undo |
|
163
|
163
|
*
|
|
164
|
164
|
* @return object Returns filtered package info as an object.
|
|
165
|
165
|
*/
|
|
166
|
|
-function geodir_post_package_info( $package_info, $post = '', $post_type = '' ) {
|
|
|
166
|
+function geodir_post_package_info($package_info, $post = '', $post_type = '') {
|
|
167
|
167
|
$package_info['pid'] = 0;
|
|
168
|
168
|
$package_info['days'] = 0;
|
|
169
|
169
|
$package_info['amount'] = 0;
|
|
@@ -192,7 +192,7 @@ discard block |
|
|
block discarded – undo |
|
192
|
192
|
* @param object|string $post The post object.
|
|
193
|
193
|
* @param string $post_type The post type.
|
|
194
|
194
|
*/
|
|
195
|
|
- return (object) apply_filters( 'geodir_post_package_info', $package_info, $post, $post_type );
|
|
|
195
|
+ return (object) apply_filters('geodir_post_package_info', $package_info, $post, $post_type);
|
|
196
|
196
|
|
|
197
|
197
|
}
|
|
198
|
198
|
|
|
@@ -220,11 +220,11 @@ discard block |
|
|
block discarded – undo |
|
220
|
220
|
*
|
|
221
|
221
|
* }
|
|
222
|
222
|
*/
|
|
223
|
|
-function geodir_send_inquiry( $request ) {
|
|
|
223
|
+function geodir_send_inquiry($request) {
|
|
224
|
224
|
global $wpdb;
|
|
225
|
225
|
|
|
226
|
226
|
// strip slashes from text
|
|
227
|
|
- $request = ! empty( $request ) ? stripslashes_deep( $request ) : $request;
|
|
|
227
|
+ $request = !empty($request) ? stripslashes_deep($request) : $request;
|
|
228
|
228
|
|
|
229
|
229
|
$yourname = sanitize_text_field($request['inq_name']);
|
|
230
|
230
|
$youremail = sanitize_email($request['inq_email']);
|
|
@@ -232,25 +232,25 @@ discard block |
|
|
block discarded – undo |
|
232
|
232
|
$frnd_comments = sanitize_text_field($request['inq_msg']);
|
|
233
|
233
|
$pid = absint($request['pid']);
|
|
234
|
234
|
|
|
235
|
|
- $author_id = '';
|
|
|
235
|
+ $author_id = '';
|
|
236
|
236
|
|
|
237
|
|
- if ( $pid && 'publish' == get_post_status ( $pid ) ) {
|
|
|
237
|
+ if ($pid && 'publish' == get_post_status($pid)) {
|
|
238
|
238
|
|
|
239
|
|
- check_ajax_referer( 'send_inquiry_'.$pid );
|
|
|
239
|
+ check_ajax_referer('send_inquiry_'.$pid);
|
|
240
|
240
|
|
|
241
|
241
|
$p_post = get_post($pid);
|
|
242
|
242
|
|
|
243
|
|
- $author_id = $p_post->post_author;
|
|
|
243
|
+ $author_id = $p_post->post_author;
|
|
244
|
244
|
|
|
245
|
|
- }else{
|
|
|
245
|
+ } else {
|
|
246
|
246
|
gd_die();
|
|
247
|
247
|
}
|
|
248
|
248
|
|
|
249
|
|
- $to_email = geodir_get_post_meta( $pid, 'geodir_email', true );
|
|
250
|
|
- $to_name = geodir_get_client_name( $author_id );
|
|
|
249
|
+ $to_email = geodir_get_post_meta($pid, 'geodir_email', true);
|
|
|
250
|
+ $to_name = geodir_get_client_name($author_id);
|
|
251
|
251
|
|
|
252
|
|
- if ( $to_email == '' ) {
|
|
253
|
|
- $to_email = get_option( 'admin_email' );
|
|
|
252
|
+ if ($to_email == '') {
|
|
|
253
|
+ $to_email = get_option('admin_email');
|
|
254
|
254
|
}
|
|
255
|
255
|
|
|
256
|
256
|
/**
|
|
@@ -271,10 +271,10 @@ discard block |
|
|
block discarded – undo |
|
271
|
271
|
* }
|
|
272
|
272
|
* @param string $type The form type, default: `Enquiry`.
|
|
273
|
273
|
*/
|
|
274
|
|
- do_action( 'geodir_after_send_enquiry', $request, 'Enquiry' );
|
|
|
274
|
+ do_action('geodir_after_send_enquiry', $request, 'Enquiry');
|
|
275
|
275
|
|
|
276
|
276
|
$client_message = $frnd_comments;
|
|
277
|
|
- $client_message .= '<br>' . __( 'From :', 'geodirectory' ) . ' ' . $yourname . '<br>' . __( 'Phone :', 'geodirectory' ) . ' ' . $inq_phone . '<br>' . __( 'Email :', 'geodirectory' ) . ' ' . $youremail . '<br><br>' . __( 'Sent from', 'geodirectory' ) . ' - <b><a href="' . trailingslashit( home_url() ) . '">' . get_option( 'blogname' ) . '</a></b>.';
|
|
|
277
|
+ $client_message .= '<br>'.__('From :', 'geodirectory').' '.$yourname.'<br>'.__('Phone :', 'geodirectory').' '.$inq_phone.'<br>'.__('Email :', 'geodirectory').' '.$youremail.'<br><br>'.__('Sent from', 'geodirectory').' - <b><a href="'.trailingslashit(home_url()).'">'.get_option('blogname').'</a></b>.';
|
|
278
|
278
|
/**
|
|
279
|
279
|
* Filter client message text.
|
|
280
|
280
|
*
|
|
@@ -282,7 +282,7 @@ discard block |
|
|
block discarded – undo |
|
282
|
282
|
*
|
|
283
|
283
|
* @param string $client_message Client message text.
|
|
284
|
284
|
*/
|
|
285
|
|
- $client_message = apply_filters( 'geodir_inquiry_email_msg', $client_message );
|
|
|
285
|
+ $client_message = apply_filters('geodir_inquiry_email_msg', $client_message);
|
|
286
|
286
|
|
|
287
|
287
|
/**
|
|
288
|
288
|
* Called before the send enquiry email is sent.
|
|
@@ -301,12 +301,12 @@ discard block |
|
|
block discarded – undo |
|
301
|
301
|
*
|
|
302
|
302
|
* }
|
|
303
|
303
|
*/
|
|
304
|
|
- do_action( 'geodir_before_send_enquiry_email', $request );
|
|
305
|
|
- if ( $to_email ) {
|
|
|
304
|
+ do_action('geodir_before_send_enquiry_email', $request);
|
|
|
305
|
+ if ($to_email) {
|
|
306
|
306
|
// strip slashes message
|
|
307
|
|
- $client_message = stripslashes_deep( $client_message );
|
|
|
307
|
+ $client_message = stripslashes_deep($client_message);
|
|
308
|
308
|
|
|
309
|
|
- geodir_sendEmail( $youremail, $yourname, $to_email, $to_name, '', $client_message, $extra = '', 'send_enquiry', $request['pid'] );//To client email
|
|
|
309
|
+ geodir_sendEmail($youremail, $yourname, $to_email, $to_name, '', $client_message, $extra = '', 'send_enquiry', $request['pid']); //To client email
|
|
310
|
310
|
}
|
|
311
|
311
|
|
|
312
|
312
|
/**
|
|
@@ -326,12 +326,12 @@ discard block |
|
|
block discarded – undo |
|
326
|
326
|
*
|
|
327
|
327
|
* }
|
|
328
|
328
|
*/
|
|
329
|
|
- do_action( 'geodir_after_send_enquiry_email', $request );
|
|
330
|
|
- $url = get_permalink( $pid );
|
|
331
|
|
- if ( strstr( $url, '?' ) ) {
|
|
332
|
|
- $url = $url . "&send_inquiry=success";
|
|
|
329
|
+ do_action('geodir_after_send_enquiry_email', $request);
|
|
|
330
|
+ $url = get_permalink($pid);
|
|
|
331
|
+ if (strstr($url, '?')) {
|
|
|
332
|
+ $url = $url."&send_inquiry=success";
|
|
333
|
333
|
} else {
|
|
334
|
|
- $url = $url . "?send_inquiry=success";
|
|
|
334
|
+ $url = $url."?send_inquiry=success";
|
|
335
|
335
|
}
|
|
336
|
336
|
/**
|
|
337
|
337
|
* Filter redirect url after the send enquiry email is sent.
|
|
@@ -340,8 +340,8 @@ discard block |
|
|
block discarded – undo |
|
340
|
340
|
*
|
|
341
|
341
|
* @param string $url Redirect url.
|
|
342
|
342
|
*/
|
|
343
|
|
- $url = apply_filters( 'geodir_send_enquiry_after_submit_redirect', $url );
|
|
344
|
|
- wp_redirect( $url );
|
|
|
343
|
+ $url = apply_filters('geodir_send_enquiry_after_submit_redirect', $url);
|
|
|
344
|
+ wp_redirect($url);
|
|
345
|
345
|
gd_die();
|
|
346
|
346
|
|
|
347
|
347
|
}
|
|
@@ -372,11 +372,11 @@ discard block |
|
|
block discarded – undo |
|
372
|
372
|
*
|
|
373
|
373
|
* @deprecated 1.6.26
|
|
374
|
374
|
*/
|
|
375
|
|
-function geodir_send_friend( $request ) {
|
|
|
375
|
+function geodir_send_friend($request) {
|
|
376
|
376
|
global $wpdb;
|
|
377
|
377
|
|
|
378
|
378
|
// strip slashes from text
|
|
379
|
|
- $request = ! empty( $request ) ? stripslashes_deep( $request ) : $request;
|
|
|
379
|
+ $request = !empty($request) ? stripslashes_deep($request) : $request;
|
|
380
|
380
|
|
|
381
|
381
|
$yourname = sanitize_text_field($request['yourname']);
|
|
382
|
382
|
$youremail = sanitize_email($request['youremail']);
|
|
@@ -385,11 +385,11 @@ discard block |
|
|
block discarded – undo |
|
385
|
385
|
$pid = absint($request['pid']);
|
|
386
|
386
|
$to_email = sanitize_email($request['to_email']);
|
|
387
|
387
|
$to_name = sanitize_text_field($request['to_name']);
|
|
388
|
|
- if ( $pid && 'publish' == get_post_status ( $pid ) ) {
|
|
|
388
|
+ if ($pid && 'publish' == get_post_status($pid)) {
|
|
389
|
389
|
|
|
390
|
|
- check_ajax_referer( 'send_to_frnd_'.$pid );
|
|
|
390
|
+ check_ajax_referer('send_to_frnd_'.$pid);
|
|
391
|
391
|
|
|
392
|
|
- }else{
|
|
|
392
|
+ } else {
|
|
393
|
393
|
gd_die();
|
|
394
|
394
|
}
|
|
395
|
395
|
|
|
@@ -412,8 +412,8 @@ discard block |
|
|
block discarded – undo |
|
412
|
412
|
*
|
|
413
|
413
|
* }
|
|
414
|
414
|
*/
|
|
415
|
|
- do_action( 'geodir_before_send_to_friend_email', $request );
|
|
416
|
|
- geodir_sendEmail( $youremail, $yourname, $to_email, $to_name, $frnd_subject, $frnd_comments, $extra = '', 'send_friend', $request['pid'] );//To client email
|
|
|
415
|
+ do_action('geodir_before_send_to_friend_email', $request);
|
|
|
416
|
+ geodir_sendEmail($youremail, $yourname, $to_email, $to_name, $frnd_subject, $frnd_comments, $extra = '', 'send_friend', $request['pid']); //To client email
|
|
417
|
417
|
|
|
418
|
418
|
/**
|
|
419
|
419
|
* Called after the send to friend email is sent.
|
|
@@ -434,13 +434,13 @@ discard block |
|
|
block discarded – undo |
|
434
|
434
|
*
|
|
435
|
435
|
* }
|
|
436
|
436
|
*/
|
|
437
|
|
- do_action( 'geodir_after_send_to_friend_email', $request );
|
|
|
437
|
+ do_action('geodir_after_send_to_friend_email', $request);
|
|
438
|
438
|
|
|
439
|
|
- $url = get_permalink( $pid );
|
|
440
|
|
- if ( strstr( $url, '?' ) ) {
|
|
441
|
|
- $url = $url . "&sendtofrnd=success";
|
|
|
439
|
+ $url = get_permalink($pid);
|
|
|
440
|
+ if (strstr($url, '?')) {
|
|
|
441
|
+ $url = $url."&sendtofrnd=success";
|
|
442
|
442
|
} else {
|
|
443
|
|
- $url = $url . "?sendtofrnd=success";
|
|
|
443
|
+ $url = $url."?sendtofrnd=success";
|
|
444
|
444
|
}
|
|
445
|
445
|
/**
|
|
446
|
446
|
* Filter redirect url after the send to friend email is sent.
|
|
@@ -449,8 +449,8 @@ discard block |
|
|
block discarded – undo |
|
449
|
449
|
*
|
|
450
|
450
|
* @param string $url Redirect url.
|
|
451
|
451
|
*/
|
|
452
|
|
- $url = apply_filters( 'geodir_send_to_friend_after_submit_redirect', $url );
|
|
453
|
|
- wp_redirect( $url );
|
|
|
452
|
+ $url = apply_filters('geodir_send_to_friend_after_submit_redirect', $url);
|
|
|
453
|
+ wp_redirect($url);
|
|
454
|
454
|
gd_die();
|
|
455
|
455
|
}
|
|
456
|
456
|
|
|
@@ -464,8 +464,8 @@ discard block |
|
|
block discarded – undo |
|
464
|
464
|
*
|
|
465
|
465
|
* @param string $hash_key
|
|
466
|
466
|
*/
|
|
467
|
|
-function geodir_before_tab_content( $hash_key ) {
|
|
468
|
|
- switch ( $hash_key ) {
|
|
|
467
|
+function geodir_before_tab_content($hash_key) {
|
|
|
468
|
+ switch ($hash_key) {
|
|
469
|
469
|
case 'post_info' :
|
|
470
|
470
|
echo '<div class="geodir-company_info field-group">';
|
|
471
|
471
|
break;
|
|
@@ -475,7 +475,7 @@ discard block |
|
|
block discarded – undo |
|
475
|
475
|
*
|
|
476
|
476
|
* @since 1.0.0
|
|
477
|
477
|
*/
|
|
478
|
|
- echo ' <div id="' . apply_filters( 'geodir_post_gallery_id', 'geodir-post-gallery' ) . '" class="clearfix" >';
|
|
|
478
|
+ echo ' <div id="'.apply_filters('geodir_post_gallery_id', 'geodir-post-gallery').'" class="clearfix" >';
|
|
479
|
479
|
break;
|
|
480
|
480
|
case 'reviews' :
|
|
481
|
481
|
echo '<div id="reviews-wrap" class="clearfix"> ';
|
|
@@ -499,8 +499,8 @@ discard block |
|
|
block discarded – undo |
|
499
|
499
|
*
|
|
500
|
500
|
* @param string $hash_key
|
|
501
|
501
|
*/
|
|
502
|
|
-function geodir_after_tab_content( $hash_key ) {
|
|
503
|
|
- switch ( $hash_key ) {
|
|
|
502
|
+function geodir_after_tab_content($hash_key) {
|
|
|
503
|
+ switch ($hash_key) {
|
|
504
|
504
|
case 'post_info' :
|
|
505
|
505
|
echo '</div>';
|
|
506
|
506
|
break;
|
|
@@ -531,25 +531,25 @@ discard block |
|
|
block discarded – undo |
|
531
|
531
|
* @global object $wpdb WordPress Database object.
|
|
532
|
532
|
* @return bool|null|string Returns default sort results, when the post type is valid. Otherwise returns false.
|
|
533
|
533
|
*/
|
|
534
|
|
-function geodir_get_posts_default_sort( $post_type ) {
|
|
|
534
|
+function geodir_get_posts_default_sort($post_type) {
|
|
535
|
535
|
|
|
536
|
536
|
global $wpdb;
|
|
537
|
537
|
|
|
538
|
|
- if ( $post_type != '' ) {
|
|
|
538
|
+ if ($post_type != '') {
|
|
539
|
539
|
|
|
540
|
540
|
$all_postypes = geodir_get_posttypes();
|
|
541
|
541
|
|
|
542
|
|
- if ( ! in_array( $post_type, $all_postypes ) ) {
|
|
|
542
|
+ if (!in_array($post_type, $all_postypes)) {
|
|
543
|
543
|
return false;
|
|
544
|
544
|
}
|
|
545
|
545
|
|
|
546
|
|
- $sort_field_info = $wpdb->get_var( $wpdb->prepare( "select default_order from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type= %s and is_active=%d and is_default=%d", array(
|
|
|
546
|
+ $sort_field_info = $wpdb->get_var($wpdb->prepare("select default_order from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where post_type= %s and is_active=%d and is_default=%d", array(
|
|
547
|
547
|
$post_type,
|
|
548
|
548
|
1,
|
|
549
|
549
|
1
|
|
550
|
|
- ) ) );
|
|
|
550
|
+ )));
|
|
551
|
551
|
|
|
552
|
|
- if ( ! empty( $sort_field_info ) ) {
|
|
|
552
|
+ if (!empty($sort_field_info)) {
|
|
553
|
553
|
return $sort_field_info;
|
|
554
|
554
|
}
|
|
555
|
555
|
|
|
@@ -569,20 +569,20 @@ discard block |
|
|
block discarded – undo |
|
569
|
569
|
* @global object $wpdb WordPress Database object.
|
|
570
|
570
|
* @return bool|mixed|void Returns sort results, when the post type is valid. Otherwise returns false.
|
|
571
|
571
|
*/
|
|
572
|
|
-function geodir_get_sort_options( $post_type ) {
|
|
|
572
|
+function geodir_get_sort_options($post_type) {
|
|
573
|
573
|
global $wpdb;
|
|
574
|
574
|
|
|
575
|
|
- if ( $post_type != '' ) {
|
|
|
575
|
+ if ($post_type != '') {
|
|
576
|
576
|
$all_postypes = geodir_get_posttypes();
|
|
577
|
577
|
|
|
578
|
|
- if ( ! in_array( $post_type, $all_postypes ) ) {
|
|
|
578
|
+ if (!in_array($post_type, $all_postypes)) {
|
|
579
|
579
|
return false;
|
|
580
|
580
|
}
|
|
581
|
581
|
|
|
582
|
|
- $sort_field_info = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type=%s AND is_active=%d AND (sort_asc=1 || sort_desc=1 || field_type='random') AND field_type != 'address' ORDER BY sort_order ASC", array(
|
|
|
582
|
+ $sort_field_info = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type=%s AND is_active=%d AND (sort_asc=1 || sort_desc=1 || field_type='random') AND field_type != 'address' ORDER BY sort_order ASC", array(
|
|
583
|
583
|
$post_type,
|
|
584
|
584
|
1
|
|
585
|
|
- ) ) );
|
|
|
585
|
+ )));
|
|
586
|
586
|
|
|
587
|
587
|
/**
|
|
588
|
588
|
* Filter post sort options.
|
|
@@ -592,7 +592,7 @@ discard block |
|
|
block discarded – undo |
|
592
|
592
|
* @param array $sort_field_info Unfiltered sort field array.
|
|
593
|
593
|
* @param string $post_type Post type.
|
|
594
|
594
|
*/
|
|
595
|
|
- return apply_filters( 'geodir_get_sort_options', $sort_field_info, $post_type );
|
|
|
595
|
+ return apply_filters('geodir_get_sort_options', $sort_field_info, $post_type);
|
|
596
|
596
|
}
|
|
597
|
597
|
|
|
598
|
598
|
}
|
|
@@ -613,63 +613,63 @@ discard block |
|
|
block discarded – undo |
|
613
|
613
|
*
|
|
614
|
614
|
* @since 1.4.4
|
|
615
|
615
|
*/
|
|
616
|
|
- if ( is_search() ) {
|
|
|
616
|
+ if (is_search()) {
|
|
617
|
617
|
return;
|
|
618
|
618
|
}
|
|
619
|
619
|
|
|
620
|
620
|
$sort_by = '';
|
|
621
|
621
|
|
|
622
|
|
- if ( isset( $_REQUEST['sort_by'] ) ) {
|
|
|
622
|
+ if (isset($_REQUEST['sort_by'])) {
|
|
623
|
623
|
$sort_by = $_REQUEST['sort_by'];
|
|
624
|
624
|
}
|
|
625
|
625
|
|
|
626
|
626
|
$gd_post_type = geodir_get_current_posttype();
|
|
627
|
627
|
|
|
628
|
|
- $sort_options = geodir_get_sort_options( $gd_post_type );
|
|
|
628
|
+ $sort_options = geodir_get_sort_options($gd_post_type);
|
|
629
|
629
|
|
|
630
|
630
|
|
|
631
|
631
|
$sort_field_options = '';
|
|
632
|
632
|
|
|
633
|
|
- if ( ! empty( $sort_options ) ) {
|
|
634
|
|
- foreach ( $sort_options as $sort ) {
|
|
635
|
|
- $sort = stripslashes_deep( $sort ); // strip slashes
|
|
|
633
|
+ if (!empty($sort_options)) {
|
|
|
634
|
+ foreach ($sort_options as $sort) {
|
|
|
635
|
+ $sort = stripslashes_deep($sort); // strip slashes
|
|
636
|
636
|
|
|
637
|
|
- $label = __( $sort->site_title, 'geodirectory' );
|
|
|
637
|
+ $label = __($sort->site_title, 'geodirectory');
|
|
638
|
638
|
|
|
639
|
|
- if ( $sort->field_type == 'random' ) {
|
|
|
639
|
+ if ($sort->field_type == 'random') {
|
|
640
|
640
|
$key = $sort->field_type;
|
|
641
|
|
- ( $sort_by == $key || ( $sort->is_default == '1' && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';
|
|
642
|
|
- $sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';
|
|
|
641
|
+ ($sort_by == $key || ($sort->is_default == '1' && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';
|
|
|
642
|
+ $sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';
|
|
643
|
643
|
}
|
|
644
|
644
|
|
|
645
|
|
- if ( $sort->htmlvar_name == 'comment_count' ) {
|
|
|
645
|
+ if ($sort->htmlvar_name == 'comment_count') {
|
|
646
|
646
|
$sort->htmlvar_name = 'rating_count';
|
|
647
|
647
|
}
|
|
648
|
648
|
|
|
649
|
|
- if ( $sort->sort_asc ) {
|
|
650
|
|
- $key = $sort->htmlvar_name . '_asc';
|
|
|
649
|
+ if ($sort->sort_asc) {
|
|
|
650
|
+ $key = $sort->htmlvar_name.'_asc';
|
|
651
|
651
|
$label = $sort->site_title;
|
|
652
|
|
- if ( $sort->asc_title ) {
|
|
|
652
|
+ if ($sort->asc_title) {
|
|
653
|
653
|
$label = $sort->asc_title;
|
|
654
|
654
|
}
|
|
655
|
|
- ( $sort_by == $key || ( $sort->is_default == '1' && $sort->default_order == $key && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';
|
|
656
|
|
- $sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';
|
|
|
655
|
+ ($sort_by == $key || ($sort->is_default == '1' && $sort->default_order == $key && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';
|
|
|
656
|
+ $sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';
|
|
657
|
657
|
}
|
|
658
|
658
|
|
|
659
|
|
- if ( $sort->sort_desc ) {
|
|
660
|
|
- $key = $sort->htmlvar_name . '_desc';
|
|
|
659
|
+ if ($sort->sort_desc) {
|
|
|
660
|
+ $key = $sort->htmlvar_name.'_desc';
|
|
661
|
661
|
$label = $sort->site_title;
|
|
662
|
|
- if ( $sort->desc_title ) {
|
|
|
662
|
+ if ($sort->desc_title) {
|
|
663
|
663
|
$label = $sort->desc_title;
|
|
664
|
664
|
}
|
|
665
|
|
- ( $sort_by == $key || ( $sort->is_default == '1' && $sort->default_order == $key && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';
|
|
666
|
|
- $sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';
|
|
|
665
|
+ ($sort_by == $key || ($sort->is_default == '1' && $sort->default_order == $key && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';
|
|
|
666
|
+ $sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';
|
|
667
|
667
|
}
|
|
668
|
668
|
|
|
669
|
669
|
}
|
|
670
|
670
|
}
|
|
671
|
671
|
|
|
672
|
|
- if ( $sort_field_options != '' ) {
|
|
|
672
|
+ if ($sort_field_options != '') {
|
|
673
|
673
|
|
|
674
|
674
|
?>
|
|
675
|
675
|
|
|
@@ -678,9 +678,9 @@ discard block |
|
|
block discarded – undo |
|
678
|
678
|
<select name="sort_by" id="sort_by" onchange="javascript:window.location=this.value;">
|
|
679
|
679
|
|
|
680
|
680
|
<option
|
|
681
|
|
- value="<?php echo esc_url( add_query_arg( 'sort_by', '' ) ); ?>" <?php if ( $sort_by == '' ) {
|
|
|
681
|
+ value="<?php echo esc_url(add_query_arg('sort_by', '')); ?>" <?php if ($sort_by == '') {
|
|
682
|
682
|
echo 'selected="selected"';
|
|
683
|
|
- } ?>><?php _e( 'Sort By', 'geodirectory' ); ?></option><?php
|
|
|
683
|
+ } ?>><?php _e('Sort By', 'geodirectory'); ?></option><?php
|
|
684
|
684
|
|
|
685
|
685
|
echo $sort_field_options; ?>
|
|
686
|
686
|
|
|
@@ -708,9 +708,9 @@ discard block |
|
|
block discarded – undo |
|
708
|
708
|
*
|
|
709
|
709
|
* @return string Returns the section title.
|
|
710
|
710
|
*/
|
|
711
|
|
-function geodir_advance_customfields_heading( $title, $field_type ) {
|
|
|
711
|
+function geodir_advance_customfields_heading($title, $field_type) {
|
|
712
|
712
|
|
|
713
|
|
- if ( in_array( $field_type, array( 'multiselect', 'textarea', 'taxonomy' ) ) ) {
|
|
|
713
|
+ if (in_array($field_type, array('multiselect', 'textarea', 'taxonomy'))) {
|
|
714
|
714
|
$title = '';
|
|
715
|
715
|
}
|
|
716
|
716
|
|
|
@@ -732,34 +732,34 @@ discard block |
|
|
block discarded – undo |
|
732
|
732
|
* @global object $gd_session GeoDirectory Session object.
|
|
733
|
733
|
* @return string Returns related posts html.
|
|
734
|
734
|
*/
|
|
735
|
|
-function geodir_related_posts_display( $request ) {
|
|
736
|
|
- if ( ! empty( $request ) ) {
|
|
737
|
|
- $before_title = ( isset( $request['before_title'] ) && ! empty( $request['before_title'] ) ) ? $request['before_title'] : '';
|
|
738
|
|
- $after_title = ( isset( $request['after_title'] ) && ! empty( $request['after_title'] ) ) ? $request['after_title'] : '';
|
|
739
|
|
-
|
|
740
|
|
- $title = ( isset( $request['title'] ) && ! empty( $request['title'] ) ) ? $request['title'] : __( 'Related Listings', 'geodirectory' );
|
|
741
|
|
- $post_number = ( isset( $request['post_number'] ) && ! empty( $request['post_number'] ) ) ? $request['post_number'] : '5';
|
|
742
|
|
- $relate_to = ( isset( $request['relate_to'] ) && ! empty( $request['relate_to'] ) ) ? $request['relate_to'] : 'category';
|
|
743
|
|
- $layout = ( isset( $request['layout'] ) && ! empty( $request['layout'] ) ) ? $request['layout'] : 'gridview_onehalf';
|
|
744
|
|
- $add_location_filter = ( isset( $request['add_location_filter'] ) && ! empty( $request['add_location_filter'] ) ) ? $request['add_location_filter'] : '0';
|
|
745
|
|
- $listing_width = ( isset( $request['listing_width'] ) && ! empty( $request['listing_width'] ) ) ? $request['listing_width'] : '';
|
|
746
|
|
- $list_sort = ( isset( $request['list_sort'] ) && ! empty( $request['list_sort'] ) ) ? $request['list_sort'] : 'latest';
|
|
747
|
|
- $character_count = ( isset( $request['character_count'] ) && ! empty( $request['character_count'] ) ) ? $request['character_count'] : '';
|
|
|
735
|
+function geodir_related_posts_display($request) {
|
|
|
736
|
+ if (!empty($request)) {
|
|
|
737
|
+ $before_title = (isset($request['before_title']) && !empty($request['before_title'])) ? $request['before_title'] : '';
|
|
|
738
|
+ $after_title = (isset($request['after_title']) && !empty($request['after_title'])) ? $request['after_title'] : '';
|
|
|
739
|
+
|
|
|
740
|
+ $title = (isset($request['title']) && !empty($request['title'])) ? $request['title'] : __('Related Listings', 'geodirectory');
|
|
|
741
|
+ $post_number = (isset($request['post_number']) && !empty($request['post_number'])) ? $request['post_number'] : '5';
|
|
|
742
|
+ $relate_to = (isset($request['relate_to']) && !empty($request['relate_to'])) ? $request['relate_to'] : 'category';
|
|
|
743
|
+ $layout = (isset($request['layout']) && !empty($request['layout'])) ? $request['layout'] : 'gridview_onehalf';
|
|
|
744
|
+ $add_location_filter = (isset($request['add_location_filter']) && !empty($request['add_location_filter'])) ? $request['add_location_filter'] : '0';
|
|
|
745
|
+ $listing_width = (isset($request['listing_width']) && !empty($request['listing_width'])) ? $request['listing_width'] : '';
|
|
|
746
|
+ $list_sort = (isset($request['list_sort']) && !empty($request['list_sort'])) ? $request['list_sort'] : 'latest';
|
|
|
747
|
+ $character_count = (isset($request['character_count']) && !empty($request['character_count'])) ? $request['character_count'] : '';
|
|
748
|
748
|
|
|
749
|
749
|
global $wpdb, $post, $gd_session, $related_nearest, $related_parent_lat, $related_parent_lon;
|
|
750
|
|
- $related_parent_lat = !empty($post->post_latitude) && geodir_is_page( 'detail' ) ? $post->post_latitude : '';
|
|
751
|
|
- $related_parent_lon = !empty($post->post_longitude) && geodir_is_page( 'detail' ) ? $post->post_longitude : '';
|
|
|
750
|
+ $related_parent_lat = !empty($post->post_latitude) && geodir_is_page('detail') ? $post->post_latitude : '';
|
|
|
751
|
+ $related_parent_lon = !empty($post->post_longitude) && geodir_is_page('detail') ? $post->post_longitude : '';
|
|
752
|
752
|
$arr_detail_page_tabs = geodir_detail_page_tabs_list();
|
|
753
|
753
|
|
|
754
|
754
|
$related_listing_array = array();
|
|
755
|
|
- if ( get_option( 'geodir_add_related_listing_posttypes' ) ) {
|
|
756
|
|
- $related_listing_array = get_option( 'geodir_add_related_listing_posttypes' );
|
|
|
755
|
+ if (get_option('geodir_add_related_listing_posttypes')) {
|
|
|
756
|
+ $related_listing_array = get_option('geodir_add_related_listing_posttypes');
|
|
757
|
757
|
}
|
|
758
|
|
- if ( isset($post->post_type) && in_array( $post->post_type, $related_listing_array ) ) {
|
|
|
758
|
+ if (isset($post->post_type) && in_array($post->post_type, $related_listing_array)) {
|
|
759
|
759
|
$arr_detail_page_tabs['related_listing']['is_display'] = true;
|
|
760
|
760
|
}
|
|
761
|
761
|
|
|
762
|
|
- $is_display = ! empty( $arr_detail_page_tabs['related_listing'] ) && isset( $arr_detail_page_tabs['related_listing']['is_display'] ) ? $arr_detail_page_tabs['related_listing']['is_display'] : false;
|
|
|
762
|
+ $is_display = !empty($arr_detail_page_tabs['related_listing']) && isset($arr_detail_page_tabs['related_listing']['is_display']) ? $arr_detail_page_tabs['related_listing']['is_display'] : false;
|
|
763
|
763
|
$origi_post = $post;
|
|
764
|
764
|
$post_type = '';
|
|
765
|
765
|
$post_id = '';
|
|
@@ -767,90 +767,90 @@ discard block |
|
|
block discarded – undo |
|
767
|
767
|
$tax_field = 'id';
|
|
768
|
768
|
$category = array();
|
|
769
|
769
|
|
|
770
|
|
- if ( isset( $_REQUEST['backandedit'] ) ) {
|
|
771
|
|
- $post = (object) $gd_session->get( 'listing' );
|
|
|
770
|
+ if (isset($_REQUEST['backandedit'])) {
|
|
|
771
|
+ $post = (object) $gd_session->get('listing');
|
|
772
|
772
|
$post_type = $post->listing_type;
|
|
773
|
|
- if ( isset( $_REQUEST['pid'] ) && $_REQUEST['pid'] != '' ) {
|
|
|
773
|
+ if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
774
|
774
|
$post_id = $_REQUEST['pid'];
|
|
775
|
775
|
}
|
|
776
|
|
- } elseif ( isset( $_REQUEST['pid'] ) && $_REQUEST['pid'] != '' ) {
|
|
777
|
|
- $post = geodir_get_post_info( $_REQUEST['pid'] );
|
|
|
776
|
+ } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
|
777
|
+ $post = geodir_get_post_info($_REQUEST['pid']);
|
|
778
|
778
|
$post_type = $post->post_type;
|
|
779
|
779
|
$post_id = $_REQUEST['pid'];
|
|
780
|
|
- } elseif ( isset( $post->post_type ) && $post->post_type != '' ) {
|
|
|
780
|
+ } elseif (isset($post->post_type) && $post->post_type != '') {
|
|
781
|
781
|
$post_type = $post->post_type;
|
|
782
|
782
|
$post_id = $post->ID;
|
|
783
|
783
|
}
|
|
784
|
784
|
|
|
785
|
|
- if ( $relate_to == 'category' ) {
|
|
|
785
|
+ if ($relate_to == 'category') {
|
|
786
|
786
|
|
|
787
|
|
- $category_taxonomy = $post_type . $relate_to;
|
|
788
|
|
- if ( isset( $post->{$category_taxonomy} ) && $post->{$category_taxonomy} != '' ) {
|
|
789
|
|
- $category = explode( ',', trim( $post->{$category_taxonomy}, ',' ) );
|
|
|
787
|
+ $category_taxonomy = $post_type.$relate_to;
|
|
|
788
|
+ if (isset($post->{$category_taxonomy} ) && $post->{$category_taxonomy} != '') {
|
|
|
789
|
+ $category = explode(',', trim($post->{$category_taxonomy}, ','));
|
|
790
|
790
|
}
|
|
791
|
791
|
|
|
792
|
|
- } elseif ( $relate_to == 'tags' ) {
|
|
|
792
|
+ } elseif ($relate_to == 'tags') {
|
|
793
|
793
|
|
|
794
|
|
- $category_taxonomy = $post_type . '_' . $relate_to;
|
|
795
|
|
- if ( $post->post_tags != '' ) {
|
|
796
|
|
- $category = explode( ',', trim( $post->post_tags, ',' ) );
|
|
|
794
|
+ $category_taxonomy = $post_type.'_'.$relate_to;
|
|
|
795
|
+ if ($post->post_tags != '') {
|
|
|
796
|
+ $category = explode(',', trim($post->post_tags, ','));
|
|
797
|
797
|
}
|
|
798
|
798
|
$tax_field = 'name';
|
|
799
|
799
|
}
|
|
800
|
800
|
|
|
801
|
801
|
/* --- return false in invalid request --- */
|
|
802
|
|
- if ( empty( $category ) ) {
|
|
|
802
|
+ if (empty($category)) {
|
|
803
|
803
|
return false;
|
|
804
|
804
|
}
|
|
805
|
805
|
|
|
806
|
806
|
$all_postypes = geodir_get_posttypes();
|
|
807
|
807
|
|
|
808
|
|
- if ( ! in_array( $post_type, $all_postypes ) ) {
|
|
|
808
|
+ if (!in_array($post_type, $all_postypes)) {
|
|
809
|
809
|
return false;
|
|
810
|
810
|
}
|
|
811
|
811
|
|
|
812
|
812
|
/* --- return false in invalid request --- */
|
|
813
|
813
|
|
|
814
|
814
|
$location_url = '';
|
|
815
|
|
- if ( $add_location_filter != '0' ) {
|
|
|
815
|
+ if ($add_location_filter != '0') {
|
|
816
|
816
|
$location_url = array();
|
|
817
|
|
- $geodir_show_location_url = get_option( 'geodir_show_location_url' );
|
|
|
817
|
+ $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
818
|
818
|
|
|
819
|
|
- $gd_city = get_query_var( 'gd_city' );
|
|
|
819
|
+ $gd_city = get_query_var('gd_city');
|
|
820
|
820
|
|
|
821
|
|
- if ( $gd_city ) {
|
|
822
|
|
- $gd_country = get_query_var( 'gd_country' );
|
|
823
|
|
- $gd_region = get_query_var( 'gd_region' );
|
|
|
821
|
+ if ($gd_city) {
|
|
|
822
|
+ $gd_country = get_query_var('gd_country');
|
|
|
823
|
+ $gd_region = get_query_var('gd_region');
|
|
824
|
824
|
} else {
|
|
825
|
825
|
$location = geodir_get_default_location();
|
|
826
|
826
|
|
|
827
|
|
- $gd_country = isset( $location->country_slug ) ? $location->country_slug : '';
|
|
828
|
|
- $gd_region = isset( $location->region_slug ) ? $location->region_slug : '';
|
|
829
|
|
- $gd_city = isset( $location->city_slug ) ? $location->city_slug : '';
|
|
|
827
|
+ $gd_country = isset($location->country_slug) ? $location->country_slug : '';
|
|
|
828
|
+ $gd_region = isset($location->region_slug) ? $location->region_slug : '';
|
|
|
829
|
+ $gd_city = isset($location->city_slug) ? $location->city_slug : '';
|
|
830
|
830
|
}
|
|
831
|
831
|
|
|
832
|
|
- if ( $geodir_show_location_url == 'all' ) {
|
|
|
832
|
+ if ($geodir_show_location_url == 'all') {
|
|
833
|
833
|
$location_url[] = $gd_country;
|
|
834
|
834
|
$location_url[] = $gd_region;
|
|
835
|
|
- } else if ( $geodir_show_location_url == 'country_city' ) {
|
|
|
835
|
+ } else if ($geodir_show_location_url == 'country_city') {
|
|
836
|
836
|
$location_url[] = $gd_country;
|
|
837
|
|
- } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
|
837
|
+ } else if ($geodir_show_location_url == 'region_city') {
|
|
838
|
838
|
$location_url[] = $gd_region;
|
|
839
|
839
|
}
|
|
840
|
840
|
|
|
841
|
841
|
$location_url[] = $gd_city;
|
|
842
|
842
|
|
|
843
|
|
- $location_url = implode( '/', $location_url );
|
|
|
843
|
+ $location_url = implode('/', $location_url);
|
|
844
|
844
|
}
|
|
845
|
845
|
|
|
846
|
846
|
|
|
847
|
|
- if ( ! empty( $category ) ) {
|
|
|
847
|
+ if (!empty($category)) {
|
|
848
|
848
|
global $geodir_add_location_url;
|
|
849
|
849
|
$geodir_add_location_url = '0';
|
|
850
|
|
- if ( $add_location_filter != '0' ) {
|
|
|
850
|
+ if ($add_location_filter != '0') {
|
|
851
|
851
|
$geodir_add_location_url = '1';
|
|
852
|
852
|
}
|
|
853
|
|
- $viewall_url = get_term_link( (int) $category[0], $post_type . $category_taxonomy );
|
|
|
853
|
+ $viewall_url = get_term_link((int) $category[0], $post_type.$category_taxonomy);
|
|
854
|
854
|
$geodir_add_location_url = null;
|
|
855
|
855
|
}
|
|
856
|
856
|
ob_start();
|
|
@@ -860,24 +860,24 @@ discard block |
|
|
block discarded – undo |
|
860
|
860
|
<div class="geodir_locations geodir_location_listing">
|
|
861
|
861
|
|
|
862
|
862
|
<?php
|
|
863
|
|
- if ( isset( $request['is_widget'] ) && $request['is_widget'] == '1' ) {
|
|
|
863
|
+ if (isset($request['is_widget']) && $request['is_widget'] == '1') {
|
|
864
|
864
|
/** geodir_before_title filter Documented in geodirectory_widgets.php */
|
|
865
|
|
- $before_title = isset( $before_title ) ? $before_title : apply_filters( 'geodir_before_title', '<h3 class="widget-title">' );
|
|
|
865
|
+ $before_title = isset($before_title) ? $before_title : apply_filters('geodir_before_title', '<h3 class="widget-title">');
|
|
866
|
866
|
/** geodir_after_title filter Documented in geodirectory_widgets.php */
|
|
867
|
|
- $after_title = isset( $after_title ) ? $after_title : apply_filters( 'geodir_after_title', '</h3>' );
|
|
|
867
|
+ $after_title = isset($after_title) ? $after_title : apply_filters('geodir_after_title', '</h3>');
|
|
868
|
868
|
?>
|
|
869
|
869
|
<div class="location_list_heading clearfix">
|
|
870
|
|
- <?php echo $before_title . $title . $after_title; ?>
|
|
|
870
|
+ <?php echo $before_title.$title.$after_title; ?>
|
|
871
|
871
|
</div>
|
|
872
|
872
|
<?php
|
|
873
|
873
|
}
|
|
874
|
874
|
$query_args = array(
|
|
875
|
875
|
'posts_per_page' => $post_number,
|
|
876
|
876
|
'is_geodir_loop' => true,
|
|
877
|
|
- 'gd_location' => ( $add_location_filter ) ? true : false,
|
|
|
877
|
+ 'gd_location' => ($add_location_filter) ? true : false,
|
|
878
|
878
|
'post_type' => $post_type,
|
|
879
|
879
|
'order_by' => $list_sort,
|
|
880
|
|
- 'post__not_in' => array( $post_id ),
|
|
|
880
|
+ 'post__not_in' => array($post_id),
|
|
881
|
881
|
'excerpt_length' => $character_count,
|
|
882
|
882
|
'related_listings' => $is_display
|
|
883
|
883
|
);
|
|
@@ -888,7 +888,7 @@ discard block |
|
|
block discarded – undo |
|
888
|
888
|
'terms' => $category
|
|
889
|
889
|
);
|
|
890
|
890
|
|
|
891
|
|
- $query_args['tax_query'] = array( $tax_query );
|
|
|
891
|
+ $query_args['tax_query'] = array($tax_query);
|
|
892
|
892
|
|
|
893
|
893
|
global $gridview_columns_widget, $post;
|
|
894
|
894
|
|
|
@@ -900,21 +900,21 @@ discard block |
|
|
block discarded – undo |
|
900
|
900
|
* @param array $query_args The query array.
|
|
901
|
901
|
* @param array $request Related posts request array.
|
|
902
|
902
|
*/
|
|
903
|
|
- $query_args = apply_filters( 'geodir_related_posts_widget_query_args', $query_args, $request );
|
|
|
903
|
+ $query_args = apply_filters('geodir_related_posts_widget_query_args', $query_args, $request);
|
|
904
|
904
|
|
|
905
|
|
- query_posts( $query_args );
|
|
|
905
|
+ query_posts($query_args);
|
|
906
|
906
|
|
|
907
|
|
- if ( strstr( $layout, 'gridview' ) ) {
|
|
908
|
|
- $listing_view_exp = explode( '_', $layout );
|
|
|
907
|
+ if (strstr($layout, 'gridview')) {
|
|
|
908
|
+ $listing_view_exp = explode('_', $layout);
|
|
909
|
909
|
$gridview_columns_widget = $layout;
|
|
910
|
910
|
$layout = $listing_view_exp[0];
|
|
911
|
|
- } else if ( $layout == 'list' ) {
|
|
|
911
|
+ } else if ($layout == 'list') {
|
|
912
|
912
|
$gridview_columns_widget = '';
|
|
913
|
913
|
}
|
|
914
|
914
|
$related_posts = true;
|
|
915
|
915
|
|
|
916
|
916
|
$related_nearest = false;
|
|
917
|
|
- if ( $list_sort == 'nearest' ) {
|
|
|
917
|
+ if ($list_sort == 'nearest') {
|
|
918
|
918
|
$related_nearest = true;
|
|
919
|
919
|
}
|
|
920
|
920
|
|
|
@@ -931,14 +931,14 @@ discard block |
|
|
block discarded – undo |
|
931
|
931
|
*
|
|
932
|
932
|
* @since 1.0.0
|
|
933
|
933
|
*/
|
|
934
|
|
- $template = apply_filters( "geodir_template_part-related-listing-listview", geodir_locate_template( 'widget-listing-listview' ) );
|
|
|
934
|
+ $template = apply_filters("geodir_template_part-related-listing-listview", geodir_locate_template('widget-listing-listview'));
|
|
935
|
935
|
|
|
936
|
936
|
/**
|
|
937
|
937
|
* Includes related listing listview template.
|
|
938
|
938
|
*
|
|
939
|
939
|
* @since 1.0.0
|
|
940
|
940
|
*/
|
|
941
|
|
- include( $template );
|
|
|
941
|
+ include($template);
|
|
942
|
942
|
|
|
943
|
943
|
wp_reset_query();
|
|
944
|
944
|
$post = $origi_post;
|
|
@@ -966,12 +966,12 @@ discard block |
|
|
block discarded – undo |
|
966
|
966
|
function geodir_category_count_script() {
|
|
967
|
967
|
global $geodir_post_category_str;
|
|
968
|
968
|
|
|
969
|
|
- if ( ! empty( $geodir_post_category_str ) ) {
|
|
970
|
|
- $geodir_post_category_str = serialize( $geodir_post_category_str );
|
|
|
969
|
+ if (!empty($geodir_post_category_str)) {
|
|
|
970
|
+ $geodir_post_category_str = serialize($geodir_post_category_str);
|
|
971
|
971
|
}
|
|
972
|
972
|
|
|
973
|
|
- $all_var['post_category_array'] = html_entity_decode( (string) $geodir_post_category_str, ENT_QUOTES, 'UTF-8' );
|
|
974
|
|
- $script = "var post_category_array = " . json_encode( $all_var ) . ';';
|
|
|
973
|
+ $all_var['post_category_array'] = html_entity_decode((string) $geodir_post_category_str, ENT_QUOTES, 'UTF-8');
|
|
|
974
|
+ $script = "var post_category_array = ".json_encode($all_var).';';
|
|
975
|
975
|
echo '<script>';
|
|
976
|
976
|
echo $script;
|
|
977
|
977
|
echo '</script>';
|
|
@@ -986,8 +986,8 @@ discard block |
|
|
block discarded – undo |
|
986
|
986
|
* @return string Returns the default language.
|
|
987
|
987
|
*/
|
|
988
|
988
|
function geodir_get_map_default_language() {
|
|
989
|
|
- $geodir_default_map_language = get_option( 'geodir_default_map_language' );
|
|
990
|
|
- if ( empty( $geodir_default_map_language ) ) {
|
|
|
989
|
+ $geodir_default_map_language = get_option('geodir_default_map_language');
|
|
|
990
|
+ if (empty($geodir_default_map_language)) {
|
|
991
|
991
|
$geodir_default_map_language = 'en';
|
|
992
|
992
|
}
|
|
993
|
993
|
|
|
@@ -998,7 +998,7 @@ discard block |
|
|
block discarded – undo |
|
998
|
998
|
*
|
|
999
|
999
|
* @param string $geodir_default_map_language Default map language.
|
|
1000
|
1000
|
*/
|
|
1001
|
|
- return apply_filters( 'geodir_default_map_language', $geodir_default_map_language );
|
|
|
1001
|
+ return apply_filters('geodir_default_map_language', $geodir_default_map_language);
|
|
1002
|
1002
|
}
|
|
1003
|
1003
|
|
|
1004
|
1004
|
/**
|
|
@@ -1009,7 +1009,7 @@ discard block |
|
|
block discarded – undo |
|
1009
|
1009
|
* @return string Returns the api key.
|
|
1010
|
1010
|
*/
|
|
1011
|
1011
|
function geodir_get_map_api_key() {
|
|
1012
|
|
- $key = get_option( 'geodir_google_api_key' );
|
|
|
1012
|
+ $key = get_option('geodir_google_api_key');
|
|
1013
|
1013
|
|
|
1014
|
1014
|
/**
|
|
1015
|
1015
|
* Filter Google maps api key.
|
|
@@ -1018,7 +1018,7 @@ discard block |
|
|
block discarded – undo |
|
1018
|
1018
|
*
|
|
1019
|
1019
|
* @param string $key Google maps api key.
|
|
1020
|
1020
|
*/
|
|
1021
|
|
- return apply_filters( 'geodir_google_api_key', $key );
|
|
|
1021
|
+ return apply_filters('geodir_google_api_key', $key);
|
|
1022
|
1022
|
}
|
|
1023
|
1023
|
|
|
1024
|
1024
|
|
|
@@ -1038,20 +1038,20 @@ discard block |
|
|
block discarded – undo |
|
1038
|
1038
|
global $wp, $post, $wp_query, $wpdb, $geodir_addon_list;
|
|
1039
|
1039
|
|
|
1040
|
1040
|
$is_geodir_page = geodir_is_geodir_page();
|
|
1041
|
|
- if ( ! $is_geodir_page ) {
|
|
|
1041
|
+ if (!$is_geodir_page) {
|
|
1042
|
1042
|
return;
|
|
1043
|
1043
|
}// if non GD page, bail
|
|
1044
|
1044
|
|
|
1045
|
1045
|
$use_gd_meta = true;
|
|
1046
|
|
- if ( ( class_exists( 'WPSEO_Frontend' ) || class_exists( 'All_in_One_SEO_Pack' ) ) && !geodir_disable_yoast_seo_metas() ) {
|
|
|
1046
|
+ if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
|
|
1047
|
1047
|
$use_gd_meta = false;
|
|
1048
|
1048
|
|
|
1049
|
|
- if ( geodir_is_page( 'search' ) ) {
|
|
|
1049
|
+ if (geodir_is_page('search')) {
|
|
1050
|
1050
|
$use_gd_meta = true;
|
|
1051
|
1051
|
}
|
|
1052
|
1052
|
}
|
|
1053
|
1053
|
|
|
1054
|
|
- if ( ! $use_gd_meta ) {
|
|
|
1054
|
+ if (!$use_gd_meta) {
|
|
1055
|
1055
|
return;
|
|
1056
|
1056
|
}// bail if Yoast Wordpress SEO or All_in_One_SEO_Pack active.
|
|
1057
|
1057
|
|
|
@@ -1059,68 +1059,68 @@ discard block |
|
|
block discarded – undo |
|
1059
|
1059
|
|
|
1060
|
1060
|
$all_postypes = geodir_get_posttypes();
|
|
1061
|
1061
|
|
|
1062
|
|
- $geodir_taxonomies = geodir_get_taxonomies( '', true );
|
|
|
1062
|
+ $geodir_taxonomies = geodir_get_taxonomies('', true);
|
|
1063
|
1063
|
|
|
1064
|
1064
|
$meta_desc = '';
|
|
1065
|
1065
|
$meta_key = '';
|
|
1066
|
|
- if ( isset( $current_term->ID ) && $current_term->ID == geodir_location_page_id() ) {
|
|
|
1066
|
+ if (isset($current_term->ID) && $current_term->ID == geodir_location_page_id()) {
|
|
1067
|
1067
|
/**
|
|
1068
|
1068
|
* Filter SEO meta location description.
|
|
1069
|
1069
|
*
|
|
1070
|
1070
|
* @since 1.0.0
|
|
1071
|
1071
|
*/
|
|
1072
|
|
- $meta_desc = apply_filters( 'geodir_seo_meta_location_description', '' );
|
|
|
1072
|
+ $meta_desc = apply_filters('geodir_seo_meta_location_description', '');
|
|
1073
|
1073
|
$meta_desc .= '';
|
|
1074
|
1074
|
}
|
|
1075
|
|
- if ( have_posts() && is_single() OR is_page() ) {
|
|
1076
|
|
- while ( have_posts() ) {
|
|
|
1075
|
+ if (have_posts() && is_single() OR is_page()) {
|
|
|
1076
|
+ while (have_posts()) {
|
|
1077
|
1077
|
the_post();
|
|
1078
|
1078
|
|
|
1079
|
|
- if ( has_excerpt() ) {
|
|
1080
|
|
- $out_excerpt = strip_tags( strip_shortcodes( get_the_excerpt() ) );
|
|
1081
|
|
- if ( empty( $out_excerpt ) ) {
|
|
1082
|
|
- $out_excerpt = strip_tags( do_shortcode( get_the_excerpt() ) );
|
|
|
1079
|
+ if (has_excerpt()) {
|
|
|
1080
|
+ $out_excerpt = strip_tags(strip_shortcodes(get_the_excerpt()));
|
|
|
1081
|
+ if (empty($out_excerpt)) {
|
|
|
1082
|
+ $out_excerpt = strip_tags(do_shortcode(get_the_excerpt()));
|
|
1083
|
1083
|
}
|
|
1084
|
|
- $out_excerpt = str_replace( array( "\r\n", "\r", "\n" ), "", $out_excerpt );
|
|
|
1084
|
+ $out_excerpt = str_replace(array("\r\n", "\r", "\n"), "", $out_excerpt);
|
|
1085
|
1085
|
} else {
|
|
1086
|
|
- $out_excerpt = str_replace( array( "\r\n", "\r", "\n" ), "", $post->post_content );
|
|
1087
|
|
- $out_excerpt = strip_tags( strip_shortcodes( $out_excerpt ) );
|
|
1088
|
|
- if ( empty( $out_excerpt ) ) {
|
|
1089
|
|
- $out_excerpt = strip_tags( do_shortcode( $out_excerpt ) ); // parse short code from content
|
|
|
1086
|
+ $out_excerpt = str_replace(array("\r\n", "\r", "\n"), "", $post->post_content);
|
|
|
1087
|
+ $out_excerpt = strip_tags(strip_shortcodes($out_excerpt));
|
|
|
1088
|
+ if (empty($out_excerpt)) {
|
|
|
1089
|
+ $out_excerpt = strip_tags(do_shortcode($out_excerpt)); // parse short code from content
|
|
1090
|
1090
|
}
|
|
1091
|
|
- $out_excerpt = trim( wp_trim_words( $out_excerpt, 35, '' ), '.!?,;:-' );
|
|
|
1091
|
+ $out_excerpt = trim(wp_trim_words($out_excerpt, 35, ''), '.!?,;:-');
|
|
1092
|
1092
|
}
|
|
1093
|
1093
|
|
|
1094
|
1094
|
$meta_desc .= $out_excerpt;
|
|
1095
|
1095
|
}
|
|
1096
|
|
- } elseif ( ( is_category() || is_tag() ) && isset( $current_term->taxonomy ) && in_array( $current_term->taxonomy, $geodir_taxonomies ) ) {
|
|
1097
|
|
- if ( is_category() ) {
|
|
1098
|
|
- $meta_desc .= __( "Posts related to Category:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_cat_title( "", false ) );
|
|
1099
|
|
- } elseif ( is_tag() ) {
|
|
1100
|
|
- $meta_desc .= __( "Posts related to Tag:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_tag_title( "", false ) );
|
|
|
1096
|
+ } elseif ((is_category() || is_tag()) && isset($current_term->taxonomy) && in_array($current_term->taxonomy, $geodir_taxonomies)) {
|
|
|
1097
|
+ if (is_category()) {
|
|
|
1098
|
+ $meta_desc .= __("Posts related to Category:", 'geodirectory')." ".geodir_utf8_ucfirst(single_cat_title("", false));
|
|
|
1099
|
+ } elseif (is_tag()) {
|
|
|
1100
|
+ $meta_desc .= __("Posts related to Tag:", 'geodirectory')." ".geodir_utf8_ucfirst(single_tag_title("", false));
|
|
1101
|
1101
|
}
|
|
1102
|
|
- } elseif ( isset( $current_term->taxonomy ) && in_array( $current_term->taxonomy, $geodir_taxonomies ) ) {
|
|
1103
|
|
- $meta_desc .= isset( $current_term->description ) ? $current_term->description : '';
|
|
|
1102
|
+ } elseif (isset($current_term->taxonomy) && in_array($current_term->taxonomy, $geodir_taxonomies)) {
|
|
|
1103
|
+ $meta_desc .= isset($current_term->description) ? $current_term->description : '';
|
|
1104
|
1104
|
}
|
|
1105
|
1105
|
|
|
1106
|
1106
|
|
|
1107
|
1107
|
$geodir_post_type = geodir_get_current_posttype();
|
|
1108
|
|
- $geodir_post_type_info = get_post_type_object( $geodir_post_type );
|
|
1109
|
|
- $geodir_is_page_listing = geodir_is_page( 'listing' ) ? true : false;
|
|
1110
|
|
-
|
|
1111
|
|
- $category_taxonomy = geodir_get_taxonomies( $geodir_post_type );
|
|
1112
|
|
- $tag_taxonomy = geodir_get_taxonomies( $geodir_post_type, true );
|
|
1113
|
|
-
|
|
1114
|
|
- $geodir_is_category = isset( $category_taxonomy[0] ) && get_query_var( $category_taxonomy[0] ) ? get_query_var( $category_taxonomy[0] ) : false;
|
|
1115
|
|
- $geodir_is_tag = isset( $tag_taxonomy[0] ) && get_query_var( $tag_taxonomy[0] ) ? true : false;
|
|
1116
|
|
-
|
|
1117
|
|
- $geodir_is_search = geodir_is_page( 'search' ) ? true : false;
|
|
1118
|
|
- $geodir_is_location = geodir_is_page( 'location' ) ? true : false;
|
|
1119
|
|
- $geodir_location_manager = isset( $geodir_addon_list['geodir_location_manager'] ) && $geodir_addon_list['geodir_location_manager'] = 'yes' ? true : false;
|
|
1120
|
|
- $godir_location_terms = geodir_get_current_location_terms( 'query_vars' );
|
|
1121
|
|
- $gd_city = $geodir_location_manager && isset( $godir_location_terms['gd_city'] ) ? $godir_location_terms['gd_city'] : null;
|
|
1122
|
|
- $gd_region = $geodir_location_manager && isset( $godir_location_terms['gd_region'] ) ? $godir_location_terms['gd_region'] : null;
|
|
1123
|
|
- $gd_country = $geodir_location_manager && isset( $godir_location_terms['gd_country'] ) ? $godir_location_terms['gd_country'] : null;
|
|
|
1108
|
+ $geodir_post_type_info = get_post_type_object($geodir_post_type);
|
|
|
1109
|
+ $geodir_is_page_listing = geodir_is_page('listing') ? true : false;
|
|
|
1110
|
+
|
|
|
1111
|
+ $category_taxonomy = geodir_get_taxonomies($geodir_post_type);
|
|
|
1112
|
+ $tag_taxonomy = geodir_get_taxonomies($geodir_post_type, true);
|
|
|
1113
|
+
|
|
|
1114
|
+ $geodir_is_category = isset($category_taxonomy[0]) && get_query_var($category_taxonomy[0]) ? get_query_var($category_taxonomy[0]) : false;
|
|
|
1115
|
+ $geodir_is_tag = isset($tag_taxonomy[0]) && get_query_var($tag_taxonomy[0]) ? true : false;
|
|
|
1116
|
+
|
|
|
1117
|
+ $geodir_is_search = geodir_is_page('search') ? true : false;
|
|
|
1118
|
+ $geodir_is_location = geodir_is_page('location') ? true : false;
|
|
|
1119
|
+ $geodir_location_manager = isset($geodir_addon_list['geodir_location_manager']) && $geodir_addon_list['geodir_location_manager'] = 'yes' ? true : false;
|
|
|
1120
|
+ $godir_location_terms = geodir_get_current_location_terms('query_vars');
|
|
|
1121
|
+ $gd_city = $geodir_location_manager && isset($godir_location_terms['gd_city']) ? $godir_location_terms['gd_city'] : null;
|
|
|
1122
|
+ $gd_region = $geodir_location_manager && isset($godir_location_terms['gd_region']) ? $godir_location_terms['gd_region'] : null;
|
|
|
1123
|
+ $gd_country = $geodir_location_manager && isset($godir_location_terms['gd_country']) ? $godir_location_terms['gd_country'] : null;
|
|
1124
|
1124
|
/**
|
|
1125
|
1125
|
* Filter the Everywhere text in location description.
|
|
1126
|
1126
|
*
|
|
@@ -1128,108 +1128,108 @@ discard block |
|
|
block discarded – undo |
|
1128
|
1128
|
*
|
|
1129
|
1129
|
* @param string $replace_location Everywhere text.
|
|
1130
|
1130
|
*/
|
|
1131
|
|
- $replace_location = apply_filters( 'geodir_location_description_everywhere_text', __( 'Everywhere', 'geodirectory' ) );
|
|
|
1131
|
+ $replace_location = apply_filters('geodir_location_description_everywhere_text', __('Everywhere', 'geodirectory'));
|
|
1132
|
1132
|
$location_id = null;
|
|
1133
|
|
- if ( $geodir_location_manager ) {
|
|
1134
|
|
- $sql = $wpdb->prepare( "SELECT location_id FROM " . POST_LOCATION_TABLE . " WHERE city_slug=%s ORDER BY location_id ASC LIMIT 1", array( $gd_city ) );
|
|
1135
|
|
- $location_id = (int) $wpdb->get_var( $sql );
|
|
|
1133
|
+ if ($geodir_location_manager) {
|
|
|
1134
|
+ $sql = $wpdb->prepare("SELECT location_id FROM ".POST_LOCATION_TABLE." WHERE city_slug=%s ORDER BY location_id ASC LIMIT 1", array($gd_city));
|
|
|
1135
|
+ $location_id = (int) $wpdb->get_var($sql);
|
|
1136
|
1136
|
$location_type = geodir_what_is_current_location();
|
|
1137
|
|
- if ( $location_type == 'city' ) {
|
|
1138
|
|
- $replace_location = geodir_get_current_location( array( 'what' => 'city', 'echo' => false ) );
|
|
1139
|
|
- } elseif ( $location_type == 'region' ) {
|
|
1140
|
|
- $replace_location = geodir_get_current_location( array( 'what' => 'region', 'echo' => false ) );
|
|
1141
|
|
- } elseif ( $location_type == 'country' ) {
|
|
1142
|
|
- $replace_location = geodir_get_current_location( array( 'what' => 'country', 'echo' => false ) );
|
|
1143
|
|
- $replace_location = __( $replace_location, 'geodirectory' );
|
|
1144
|
|
- }
|
|
1145
|
|
- $country = get_query_var( 'gd_country' );
|
|
1146
|
|
- $region = get_query_var( 'gd_region' );
|
|
1147
|
|
- $city = get_query_var( 'gd_city' );
|
|
|
1137
|
+ if ($location_type == 'city') {
|
|
|
1138
|
+ $replace_location = geodir_get_current_location(array('what' => 'city', 'echo' => false));
|
|
|
1139
|
+ } elseif ($location_type == 'region') {
|
|
|
1140
|
+ $replace_location = geodir_get_current_location(array('what' => 'region', 'echo' => false));
|
|
|
1141
|
+ } elseif ($location_type == 'country') {
|
|
|
1142
|
+ $replace_location = geodir_get_current_location(array('what' => 'country', 'echo' => false));
|
|
|
1143
|
+ $replace_location = __($replace_location, 'geodirectory');
|
|
|
1144
|
+ }
|
|
|
1145
|
+ $country = get_query_var('gd_country');
|
|
|
1146
|
+ $region = get_query_var('gd_region');
|
|
|
1147
|
+ $city = get_query_var('gd_city');
|
|
1148
|
1148
|
$current_location = '';
|
|
1149
|
|
- if ( $country != '' ) {
|
|
1150
|
|
- $current_location = get_actual_location_name( 'country', $country, true );
|
|
|
1149
|
+ if ($country != '') {
|
|
|
1150
|
+ $current_location = get_actual_location_name('country', $country, true);
|
|
1151
|
1151
|
}
|
|
1152
|
|
- if ( $region != '' ) {
|
|
1153
|
|
- $current_location = get_actual_location_name( 'region', $region );
|
|
|
1152
|
+ if ($region != '') {
|
|
|
1153
|
+ $current_location = get_actual_location_name('region', $region);
|
|
1154
|
1154
|
}
|
|
1155
|
|
- if ( $city != '' ) {
|
|
1156
|
|
- $current_location = get_actual_location_name( 'city', $city );
|
|
|
1155
|
+ if ($city != '') {
|
|
|
1156
|
+ $current_location = get_actual_location_name('city', $city);
|
|
1157
|
1157
|
}
|
|
1158
|
1158
|
$replace_location = $current_location != '' ? $current_location : $replace_location;
|
|
1159
|
1159
|
}
|
|
1160
|
1160
|
|
|
1161
|
1161
|
$geodir_meta_keys = '';
|
|
1162
|
1162
|
$geodir_meta_desc = '';
|
|
1163
|
|
- if ( $is_geodir_page && ! empty( $geodir_post_type_info ) ) {
|
|
1164
|
|
- if ( $geodir_is_page_listing || $geodir_is_search || geodir_is_page( 'add-listing' ) ) {
|
|
1165
|
|
- $geodir_meta_keys = isset( $geodir_post_type_info->seo['meta_keyword'] ) && $geodir_post_type_info->seo['meta_keyword'] != '' ? $geodir_post_type_info->seo['meta_keyword'] : $geodir_meta_keys;
|
|
|
1163
|
+ if ($is_geodir_page && !empty($geodir_post_type_info)) {
|
|
|
1164
|
+ if ($geodir_is_page_listing || $geodir_is_search || geodir_is_page('add-listing')) {
|
|
|
1165
|
+ $geodir_meta_keys = isset($geodir_post_type_info->seo['meta_keyword']) && $geodir_post_type_info->seo['meta_keyword'] != '' ? $geodir_post_type_info->seo['meta_keyword'] : $geodir_meta_keys;
|
|
1166
|
1166
|
|
|
1167
|
|
- $geodir_meta_desc = isset( $geodir_post_type_info->description ) ? $geodir_post_type_info->description : $geodir_meta_desc;
|
|
1168
|
|
- $geodir_meta_desc = isset( $geodir_post_type_info->seo['meta_description'] ) && $geodir_post_type_info->seo['meta_description'] != '' ? $geodir_post_type_info->seo['meta_description'] : $geodir_meta_desc;
|
|
|
1167
|
+ $geodir_meta_desc = isset($geodir_post_type_info->description) ? $geodir_post_type_info->description : $geodir_meta_desc;
|
|
|
1168
|
+ $geodir_meta_desc = isset($geodir_post_type_info->seo['meta_description']) && $geodir_post_type_info->seo['meta_description'] != '' ? $geodir_post_type_info->seo['meta_description'] : $geodir_meta_desc;
|
|
1169
|
1169
|
|
|
1170
|
|
- if ( $geodir_is_category ) {
|
|
1171
|
|
- $category = $geodir_is_category ? get_term_by( 'slug', $geodir_is_category, $category_taxonomy[0] ) : null;
|
|
1172
|
|
- if ( isset( $category->term_id ) && ! empty( $category->term_id ) ) {
|
|
|
1170
|
+ if ($geodir_is_category) {
|
|
|
1171
|
+ $category = $geodir_is_category ? get_term_by('slug', $geodir_is_category, $category_taxonomy[0]) : null;
|
|
|
1172
|
+ if (isset($category->term_id) && !empty($category->term_id)) {
|
|
1173
|
1173
|
$category_id = $category->term_id;
|
|
1174
|
|
- $category_desc = trim( $category->description ) != '' ? trim( $category->description ) : geodir_get_tax_meta( $category_id, 'ct_cat_top_desc', false, $geodir_post_type );
|
|
1175
|
|
- if ( $location_id ) {
|
|
1176
|
|
- $option_name = 'geodir_cat_loc_' . $geodir_post_type . '_' . $category_id;
|
|
1177
|
|
- $cat_loc_option = get_option( $option_name );
|
|
1178
|
|
-
|
|
1179
|
|
- $gd_cat_loc_default = ! empty( $cat_loc_option ) && isset( $cat_loc_option['gd_cat_loc_default'] ) && $cat_loc_option['gd_cat_loc_default'] > 0 ? true : false;
|
|
1180
|
|
- if ( ! $gd_cat_loc_default ) {
|
|
1181
|
|
- $option_name = 'geodir_cat_loc_' . $geodir_post_type . '_' . $category_id . '_' . $location_id;
|
|
1182
|
|
- $option = get_option( $option_name );
|
|
1183
|
|
- $category_desc = isset( $option['gd_cat_loc_desc'] ) && trim( $option['gd_cat_loc_desc'] ) != '' ? trim( $option['gd_cat_loc_desc'] ) : $category_desc;
|
|
|
1174
|
+ $category_desc = trim($category->description) != '' ? trim($category->description) : geodir_get_tax_meta($category_id, 'ct_cat_top_desc', false, $geodir_post_type);
|
|
|
1175
|
+ if ($location_id) {
|
|
|
1176
|
+ $option_name = 'geodir_cat_loc_'.$geodir_post_type.'_'.$category_id;
|
|
|
1177
|
+ $cat_loc_option = get_option($option_name);
|
|
|
1178
|
+
|
|
|
1179
|
+ $gd_cat_loc_default = !empty($cat_loc_option) && isset($cat_loc_option['gd_cat_loc_default']) && $cat_loc_option['gd_cat_loc_default'] > 0 ? true : false;
|
|
|
1180
|
+ if (!$gd_cat_loc_default) {
|
|
|
1181
|
+ $option_name = 'geodir_cat_loc_'.$geodir_post_type.'_'.$category_id.'_'.$location_id;
|
|
|
1182
|
+ $option = get_option($option_name);
|
|
|
1183
|
+ $category_desc = isset($option['gd_cat_loc_desc']) && trim($option['gd_cat_loc_desc']) != '' ? trim($option['gd_cat_loc_desc']) : $category_desc;
|
|
1184
|
1184
|
}
|
|
1185
|
1185
|
}
|
|
1186
|
|
- $geodir_meta_desc = __( "Posts related to Category:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_cat_title( "", false ) ) . '. ' . $category_desc;
|
|
|
1186
|
+ $geodir_meta_desc = __("Posts related to Category:", 'geodirectory')." ".geodir_utf8_ucfirst(single_cat_title("", false)).'. '.$category_desc;
|
|
1187
|
1187
|
}
|
|
1188
|
|
- } else if ( $geodir_is_tag ) {
|
|
1189
|
|
- $geodir_meta_desc = __( "Posts related to Tag:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_tag_title( "", false ) ) . '. ' . $geodir_meta_desc;
|
|
|
1188
|
+ } else if ($geodir_is_tag) {
|
|
|
1189
|
+ $geodir_meta_desc = __("Posts related to Tag:", 'geodirectory')." ".geodir_utf8_ucfirst(single_tag_title("", false)).'. '.$geodir_meta_desc;
|
|
1190
|
1190
|
}
|
|
1191
|
1191
|
}
|
|
1192
|
1192
|
}
|
|
1193
|
1193
|
|
|
1194
|
1194
|
|
|
1195
|
1195
|
$gd_page = '';
|
|
1196
|
|
- if ( geodir_is_page( 'home' ) ) {
|
|
|
1196
|
+ if (geodir_is_page('home')) {
|
|
1197
|
1197
|
$gd_page = 'home';
|
|
1198
|
|
- $meta_desc = ( get_option( 'geodir_meta_desc_homepage' ) ) ? get_option( 'geodir_meta_desc_homepage' ) : $meta_desc;
|
|
1199
|
|
- } elseif ( geodir_is_page( 'detail' ) ) {
|
|
|
1198
|
+ $meta_desc = (get_option('geodir_meta_desc_homepage')) ? get_option('geodir_meta_desc_homepage') : $meta_desc;
|
|
|
1199
|
+ } elseif (geodir_is_page('detail')) {
|
|
1200
|
1200
|
$gd_page = 'detail';
|
|
1201
|
|
- $meta_desc = ( get_option( 'geodir_meta_desc_detail' ) ) ? get_option( 'geodir_meta_desc_detail' ) : $meta_desc;
|
|
1202
|
|
- } elseif ( geodir_is_page( 'pt' ) ) {
|
|
|
1201
|
+ $meta_desc = (get_option('geodir_meta_desc_detail')) ? get_option('geodir_meta_desc_detail') : $meta_desc;
|
|
|
1202
|
+ } elseif (geodir_is_page('pt')) {
|
|
1203
|
1203
|
$gd_page = 'pt';
|
|
1204
|
|
- $meta_desc = ( get_option( 'geodir_meta_desc_pt' ) ) ? get_option( 'geodir_meta_desc_pt' ) : $meta_desc;
|
|
1205
|
|
- } elseif ( geodir_is_page( 'listing' ) ) {
|
|
|
1204
|
+ $meta_desc = (get_option('geodir_meta_desc_pt')) ? get_option('geodir_meta_desc_pt') : $meta_desc;
|
|
|
1205
|
+ } elseif (geodir_is_page('listing')) {
|
|
1206
|
1206
|
$gd_page = 'listing';
|
|
1207
|
|
- $meta_desc = ( get_option( 'geodir_meta_desc_listing' ) ) ? get_option( 'geodir_meta_desc_listing' ) : $meta_desc;
|
|
1208
|
|
- } elseif ( geodir_is_page( 'location' ) ) {
|
|
|
1207
|
+ $meta_desc = (get_option('geodir_meta_desc_listing')) ? get_option('geodir_meta_desc_listing') : $meta_desc;
|
|
|
1208
|
+ } elseif (geodir_is_page('location')) {
|
|
1209
|
1209
|
$gd_page = 'location';
|
|
1210
|
|
- $meta_desc = ( get_option( 'geodir_meta_desc_location' ) ) ? get_option( 'geodir_meta_desc_location' ) : $meta_desc;
|
|
1211
|
|
- $meta_desc = apply_filters( 'geodir_seo_meta_location_description', $meta_desc );
|
|
|
1210
|
+ $meta_desc = (get_option('geodir_meta_desc_location')) ? get_option('geodir_meta_desc_location') : $meta_desc;
|
|
|
1211
|
+ $meta_desc = apply_filters('geodir_seo_meta_location_description', $meta_desc);
|
|
1212
|
1212
|
|
|
1213
|
|
- } elseif ( geodir_is_page( 'search' ) ) {
|
|
|
1213
|
+ } elseif (geodir_is_page('search')) {
|
|
1214
|
1214
|
$gd_page = 'search';
|
|
1215
|
|
- $meta_desc = ( get_option( 'geodir_meta_desc_search' ) ) ? get_option( 'geodir_meta_desc_search' ) : $meta_desc;
|
|
1216
|
|
- } elseif ( geodir_is_page( 'add-listing' ) ) {
|
|
|
1215
|
+ $meta_desc = (get_option('geodir_meta_desc_search')) ? get_option('geodir_meta_desc_search') : $meta_desc;
|
|
|
1216
|
+ } elseif (geodir_is_page('add-listing')) {
|
|
1217
|
1217
|
$gd_page = 'add-listing';
|
|
1218
|
|
- $meta_desc = ( get_option( 'geodir_meta_desc_add-listing' ) ) ? get_option( 'geodir_meta_desc_add-listing' ) : $meta_desc;
|
|
1219
|
|
- } elseif ( geodir_is_page( 'author' ) ) {
|
|
|
1218
|
+ $meta_desc = (get_option('geodir_meta_desc_add-listing')) ? get_option('geodir_meta_desc_add-listing') : $meta_desc;
|
|
|
1219
|
+ } elseif (geodir_is_page('author')) {
|
|
1220
|
1220
|
$gd_page = 'author';
|
|
1221
|
|
- $meta_desc = ( get_option( 'geodir_meta_desc_author' ) ) ? get_option( 'geodir_meta_desc_author' ) : $meta_desc;
|
|
1222
|
|
- } elseif ( geodir_is_page( 'login' ) ) {
|
|
|
1221
|
+ $meta_desc = (get_option('geodir_meta_desc_author')) ? get_option('geodir_meta_desc_author') : $meta_desc;
|
|
|
1222
|
+ } elseif (geodir_is_page('login')) {
|
|
1223
|
1223
|
$gd_page = 'login';
|
|
1224
|
|
- $meta_desc = ( get_option( 'geodir_meta_desc_login' ) ) ? get_option( 'geodir_meta_desc_login' ) : $meta_desc;
|
|
1225
|
|
- } elseif ( geodir_is_page( 'listing-success' ) ) {
|
|
|
1224
|
+ $meta_desc = (get_option('geodir_meta_desc_login')) ? get_option('geodir_meta_desc_login') : $meta_desc;
|
|
|
1225
|
+ } elseif (geodir_is_page('listing-success')) {
|
|
1226
|
1226
|
$gd_page = 'listing-success';
|
|
1227
|
|
- $meta_desc = ( get_option( 'geodir_meta_desc_listing-success' ) ) ? get_option( 'geodir_meta_desc_listing-success' ) : $meta_desc;
|
|
|
1227
|
+ $meta_desc = (get_option('geodir_meta_desc_listing-success')) ? get_option('geodir_meta_desc_listing-success') : $meta_desc;
|
|
1228
|
1228
|
}
|
|
1229
|
1229
|
|
|
1230
|
1230
|
|
|
1231
|
|
- if ( $meta_desc ) {
|
|
1232
|
|
- $meta_desc = stripslashes_deep( $meta_desc );
|
|
|
1231
|
+ if ($meta_desc) {
|
|
|
1232
|
+ $meta_desc = stripslashes_deep($meta_desc);
|
|
1233
|
1233
|
/**
|
|
1234
|
1234
|
* Filter page description to replace variables.
|
|
1235
|
1235
|
*
|
|
@@ -1238,7 +1238,7 @@ discard block |
|
|
block discarded – undo |
|
1238
|
1238
|
* @param string $title The page description including variables.
|
|
1239
|
1239
|
* @param string $gd_page The GeoDirectory page type if any.
|
|
1240
|
1240
|
*/
|
|
1241
|
|
- $meta_desc = apply_filters( 'geodir_seo_meta_description_pre', __( $meta_desc, 'geodirectory' ), $gd_page, '' );
|
|
|
1241
|
+ $meta_desc = apply_filters('geodir_seo_meta_description_pre', __($meta_desc, 'geodirectory'), $gd_page, '');
|
|
1242
|
1242
|
|
|
1243
|
1243
|
/**
|
|
1244
|
1244
|
* Filter SEO meta description.
|
|
@@ -1247,20 +1247,20 @@ discard block |
|
|
block discarded – undo |
|
1247
|
1247
|
*
|
|
1248
|
1248
|
* @param string $meta_desc Meta description content.
|
|
1249
|
1249
|
*/
|
|
1250
|
|
- echo apply_filters( 'geodir_seo_meta_description', '<meta name="description" content="' . $meta_desc . '" />', $meta_desc );
|
|
|
1250
|
+ echo apply_filters('geodir_seo_meta_description', '<meta name="description" content="'.$meta_desc.'" />', $meta_desc);
|
|
1251
|
1251
|
}
|
|
1252
|
1252
|
|
|
1253
|
1253
|
// meta keywords
|
|
1254
|
|
- if ( isset( $post->post_type ) && in_array( $post->post_type, $all_postypes ) ) {
|
|
1255
|
|
- $place_tags = wp_get_post_terms( $post->ID, $post->post_type . '_tags', array( "fields" => "names" ) );
|
|
1256
|
|
- $place_cats = wp_get_post_terms( $post->ID, $post->post_type . 'category', array( "fields" => "names" ) );
|
|
|
1254
|
+ if (isset($post->post_type) && in_array($post->post_type, $all_postypes)) {
|
|
|
1255
|
+ $place_tags = wp_get_post_terms($post->ID, $post->post_type.'_tags', array("fields" => "names"));
|
|
|
1256
|
+ $place_cats = wp_get_post_terms($post->ID, $post->post_type.'category', array("fields" => "names"));
|
|
1257
|
1257
|
|
|
1258
|
|
- $meta_key .= implode( ", ", array_merge( (array) $place_cats, (array) $place_tags ) );
|
|
|
1258
|
+ $meta_key .= implode(", ", array_merge((array) $place_cats, (array) $place_tags));
|
|
1259
|
1259
|
} else {
|
|
1260
|
1260
|
$posttags = get_the_tags();
|
|
1261
|
|
- if ( $posttags ) {
|
|
1262
|
|
- foreach ( $posttags as $tag ) {
|
|
1263
|
|
- $meta_key .= $tag->name . ' ';
|
|
|
1261
|
+ if ($posttags) {
|
|
|
1262
|
+ foreach ($posttags as $tag) {
|
|
|
1263
|
+ $meta_key .= $tag->name.' ';
|
|
1264
|
1264
|
}
|
|
1265
|
1265
|
} else {
|
|
1266
|
1266
|
// $tags = get_tags( array( 'orderby' => 'count', 'order' => 'DESC' ) );
|
|
@@ -1276,20 +1276,20 @@ discard block |
|
|
block discarded – undo |
|
1276
|
1276
|
}
|
|
1277
|
1277
|
}
|
|
1278
|
1278
|
|
|
1279
|
|
- $meta_key = $meta_key != '' ? rtrim( trim( $meta_key ), "," ) : $meta_key;
|
|
1280
|
|
- $geodir_meta_keys = $geodir_meta_keys != '' ? ( $meta_key != '' ? $meta_key . ', ' . $geodir_meta_keys : $geodir_meta_keys ) : $meta_key;
|
|
1281
|
|
- if ( $geodir_meta_keys != '' ) {
|
|
1282
|
|
- $geodir_meta_keys = strip_tags( $geodir_meta_keys );
|
|
1283
|
|
- $geodir_meta_keys = esc_html( $geodir_meta_keys );
|
|
1284
|
|
- $geodir_meta_keys = geodir_strtolower( $geodir_meta_keys );
|
|
1285
|
|
- $geodir_meta_keys = wp_html_excerpt( $geodir_meta_keys, 1000, '' );
|
|
1286
|
|
- $geodir_meta_keys = str_replace( '%location%', $replace_location, $geodir_meta_keys );
|
|
|
1279
|
+ $meta_key = $meta_key != '' ? rtrim(trim($meta_key), ",") : $meta_key;
|
|
|
1280
|
+ $geodir_meta_keys = $geodir_meta_keys != '' ? ($meta_key != '' ? $meta_key.', '.$geodir_meta_keys : $geodir_meta_keys) : $meta_key;
|
|
|
1281
|
+ if ($geodir_meta_keys != '') {
|
|
|
1282
|
+ $geodir_meta_keys = strip_tags($geodir_meta_keys);
|
|
|
1283
|
+ $geodir_meta_keys = esc_html($geodir_meta_keys);
|
|
|
1284
|
+ $geodir_meta_keys = geodir_strtolower($geodir_meta_keys);
|
|
|
1285
|
+ $geodir_meta_keys = wp_html_excerpt($geodir_meta_keys, 1000, '');
|
|
|
1286
|
+ $geodir_meta_keys = str_replace('%location%', $replace_location, $geodir_meta_keys);
|
|
1287
|
1287
|
|
|
1288
|
|
- $meta_key = rtrim( trim( $geodir_meta_keys ), "," );
|
|
|
1288
|
+ $meta_key = rtrim(trim($geodir_meta_keys), ",");
|
|
1289
|
1289
|
}
|
|
1290
|
1290
|
|
|
1291
|
|
- if ( $meta_key ) {
|
|
1292
|
|
- $meta_key = stripslashes_deep( $meta_key );
|
|
|
1291
|
+ if ($meta_key) {
|
|
|
1292
|
+ $meta_key = stripslashes_deep($meta_key);
|
|
1293
|
1293
|
/**
|
|
1294
|
1294
|
* Filter SEO meta keywords.
|
|
1295
|
1295
|
*
|
|
@@ -1297,7 +1297,7 @@ discard block |
|
|
block discarded – undo |
|
1297
|
1297
|
*
|
|
1298
|
1298
|
* @param string $meta_desc Meta keywords.
|
|
1299
|
1299
|
*/
|
|
1300
|
|
- echo apply_filters( 'geodir_seo_meta_keywords', '<meta name="keywords" content="' . $meta_key . '" />', $meta_key );
|
|
|
1300
|
+ echo apply_filters('geodir_seo_meta_keywords', '<meta name="keywords" content="'.$meta_key.'" />', $meta_key);
|
|
1301
|
1301
|
}
|
|
1302
|
1302
|
|
|
1303
|
1303
|
}
|
|
@@ -1317,8 +1317,8 @@ discard block |
|
|
block discarded – undo |
|
1317
|
1317
|
|
|
1318
|
1318
|
$geodir_detail_page_tabs_array = geodir_detail_page_tabs_array();
|
|
1319
|
1319
|
|
|
1320
|
|
- foreach ( $geodir_detail_page_tabs_array as $key => $tabs_obj ) {
|
|
1321
|
|
- $geodir_detail_page_tabs_key_value_array[ $key ] = $tabs_obj['heading_text'];
|
|
|
1320
|
+ foreach ($geodir_detail_page_tabs_array as $key => $tabs_obj) {
|
|
|
1321
|
+ $geodir_detail_page_tabs_key_value_array[$key] = $tabs_obj['heading_text'];
|
|
1322
|
1322
|
}
|
|
1323
|
1323
|
|
|
1324
|
1324
|
return $geodir_detail_page_tabs_key_value_array;
|
|
@@ -1340,57 +1340,57 @@ discard block |
|
|
block discarded – undo |
|
1340
|
1340
|
* @since 1.0.0
|
|
1341
|
1341
|
*/
|
|
1342
|
1342
|
$arr_tabs['post_profile'] = array(
|
|
1343
|
|
- 'heading_text' => __( 'Profile', 'geodirectory' ),
|
|
|
1343
|
+ 'heading_text' => __('Profile', 'geodirectory'),
|
|
1344
|
1344
|
'is_active_tab' => true,
|
|
1345
|
|
- 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_profile' ),
|
|
|
1345
|
+ 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_profile'),
|
|
1346
|
1346
|
'tab_content' => ''
|
|
1347
|
1347
|
);
|
|
1348
|
|
- $arr_tabs['post_info'] = array(
|
|
1349
|
|
- 'heading_text' => __( 'More Info', 'geodirectory' ),
|
|
|
1348
|
+ $arr_tabs['post_info'] = array(
|
|
|
1349
|
+ 'heading_text' => __('More Info', 'geodirectory'),
|
|
1350
|
1350
|
'is_active_tab' => false,
|
|
1351
|
|
- 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_info' ),
|
|
|
1351
|
+ 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_info'),
|
|
1352
|
1352
|
'tab_content' => ''
|
|
1353
|
1353
|
);
|
|
1354
|
1354
|
|
|
1355
|
1355
|
$arr_tabs['post_images'] = array(
|
|
1356
|
|
- 'heading_text' => __( 'Photos', 'geodirectory' ),
|
|
|
1356
|
+ 'heading_text' => __('Photos', 'geodirectory'),
|
|
1357
|
1357
|
'is_active_tab' => false,
|
|
1358
|
|
- 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_images' ),
|
|
|
1358
|
+ 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_images'),
|
|
1359
|
1359
|
'tab_content' => ''
|
|
1360
|
1360
|
);
|
|
1361
|
1361
|
|
|
1362
|
1362
|
$arr_tabs['post_video'] = array(
|
|
1363
|
|
- 'heading_text' => __( 'Video', 'geodirectory' ),
|
|
|
1363
|
+ 'heading_text' => __('Video', 'geodirectory'),
|
|
1364
|
1364
|
'is_active_tab' => false,
|
|
1365
|
|
- 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_video' ),
|
|
|
1365
|
+ 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_video'),
|
|
1366
|
1366
|
'tab_content' => ''
|
|
1367
|
1367
|
);
|
|
1368
|
1368
|
|
|
1369
|
1369
|
$arr_tabs['special_offers'] = array(
|
|
1370
|
|
- 'heading_text' => __( 'Special Offers', 'geodirectory' ),
|
|
|
1370
|
+ 'heading_text' => __('Special Offers', 'geodirectory'),
|
|
1371
|
1371
|
'is_active_tab' => false,
|
|
1372
|
|
- 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'special_offers' ),
|
|
|
1372
|
+ 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'special_offers'),
|
|
1373
|
1373
|
'tab_content' => ''
|
|
1374
|
1374
|
);
|
|
1375
|
1375
|
|
|
1376
|
1376
|
$arr_tabs['post_map'] = array(
|
|
1377
|
|
- 'heading_text' => __( 'Map', 'geodirectory' ),
|
|
|
1377
|
+ 'heading_text' => __('Map', 'geodirectory'),
|
|
1378
|
1378
|
'is_active_tab' => false,
|
|
1379
|
|
- 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_map' ),
|
|
|
1379
|
+ 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_map'),
|
|
1380
|
1380
|
'tab_content' => ''
|
|
1381
|
1381
|
);
|
|
1382
|
1382
|
|
|
1383
|
1383
|
$arr_tabs['reviews'] = array(
|
|
1384
|
|
- 'heading_text' => __( 'Reviews', 'geodirectory' ),
|
|
|
1384
|
+ 'heading_text' => __('Reviews', 'geodirectory'),
|
|
1385
|
1385
|
'is_active_tab' => false,
|
|
1386
|
|
- 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'reviews' ),
|
|
|
1386
|
+ 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'reviews'),
|
|
1387
|
1387
|
'tab_content' => 'review display'
|
|
1388
|
1388
|
);
|
|
1389
|
1389
|
|
|
1390
|
1390
|
$arr_tabs['related_listing'] = array(
|
|
1391
|
|
- 'heading_text' => __( 'Related Listing', 'geodirectory' ),
|
|
|
1391
|
+ 'heading_text' => __('Related Listing', 'geodirectory'),
|
|
1392
|
1392
|
'is_active_tab' => false,
|
|
1393
|
|
- 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'related_listing' ),
|
|
|
1393
|
+ 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'related_listing'),
|
|
1394
|
1394
|
'tab_content' => ''
|
|
1395
|
1395
|
);
|
|
1396
|
1396
|
|
|
@@ -1399,7 +1399,7 @@ discard block |
|
|
block discarded – undo |
|
1399
|
1399
|
*
|
|
1400
|
1400
|
* @since 1.0.0
|
|
1401
|
1401
|
*/
|
|
1402
|
|
- return apply_filters( 'geodir_detail_page_tab_list_extend', $arr_tabs );
|
|
|
1402
|
+ return apply_filters('geodir_detail_page_tab_list_extend', $arr_tabs);
|
|
1403
|
1403
|
|
|
1404
|
1404
|
|
|
1405
|
1405
|
}
|
|
@@ -1413,13 +1413,13 @@ discard block |
|
|
block discarded – undo |
|
1413
|
1413
|
* @return mixed|array Tabs array.
|
|
1414
|
1414
|
*/
|
|
1415
|
1415
|
function geodir_detail_page_tabs_list() {
|
|
1416
|
|
- $tabs_excluded = get_option( 'geodir_detail_page_tabs_excluded' );
|
|
|
1416
|
+ $tabs_excluded = get_option('geodir_detail_page_tabs_excluded');
|
|
1417
|
1417
|
$tabs_array = geodir_detail_page_tabs_array();
|
|
1418
|
1418
|
|
|
1419
|
|
- if ( ! empty( $tabs_excluded ) ) {
|
|
1420
|
|
- foreach ( $tabs_excluded as $tab ) {
|
|
1421
|
|
- if ( array_key_exists( $tab, $tabs_array ) ) {
|
|
1422
|
|
- unset( $tabs_array[ $tab ] );
|
|
|
1419
|
+ if (!empty($tabs_excluded)) {
|
|
|
1420
|
+ foreach ($tabs_excluded as $tab) {
|
|
|
1421
|
+ if (array_key_exists($tab, $tabs_array)) {
|
|
|
1422
|
+ unset($tabs_array[$tab]);
|
|
1423
|
1423
|
}
|
|
1424
|
1424
|
}
|
|
1425
|
1425
|
}
|
|
@@ -1443,66 +1443,66 @@ discard block |
|
|
block discarded – undo |
|
1443
|
1443
|
function geodir_show_detail_page_tabs() {
|
|
1444
|
1444
|
global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields, $preview;
|
|
1445
|
1445
|
|
|
1446
|
|
- $post_id = ! empty( $post ) && isset( $post->ID ) ? (int) $post->ID : 0;
|
|
1447
|
|
- $request_post_id = ! empty( $_REQUEST['p'] ) ? (int) $_REQUEST['p'] : 0;
|
|
1448
|
|
- $is_backend_preview = ( is_single() && ! empty( $_REQUEST['post_type'] ) && ! empty( $_REQUEST['preview'] ) && ! empty( $_REQUEST['p'] ) ) && is_super_admin() ? true : false; // skip if preview from backend
|
|
|
1446
|
+ $post_id = !empty($post) && isset($post->ID) ? (int) $post->ID : 0;
|
|
|
1447
|
+ $request_post_id = !empty($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0;
|
|
|
1448
|
+ $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend
|
|
1449
|
1449
|
|
|
1450
|
|
- if ( $is_backend_preview && ! $post_id > 0 && $request_post_id > 0 ) {
|
|
1451
|
|
- $post = geodir_get_post_info( $request_post_id );
|
|
1452
|
|
- setup_postdata( $post );
|
|
|
1450
|
+ if ($is_backend_preview && !$post_id > 0 && $request_post_id > 0) {
|
|
|
1451
|
+ $post = geodir_get_post_info($request_post_id);
|
|
|
1452
|
+ setup_postdata($post);
|
|
1453
|
1453
|
}
|
|
1454
|
1454
|
|
|
1455
|
|
- $geodir_post_detail_fields = geodir_show_listing_info( 'moreinfo' );
|
|
|
1455
|
+ $geodir_post_detail_fields = geodir_show_listing_info('moreinfo');
|
|
1456
|
1456
|
|
|
1457
|
1457
|
$package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : ''));
|
|
1458
|
1458
|
$image_limit = '';
|
|
1459
|
1459
|
if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {
|
|
1460
|
|
- $image_limit = (int)$package_info->image_limit;
|
|
|
1460
|
+ $image_limit = (int) $package_info->image_limit;
|
|
1461
|
1461
|
}
|
|
1462
|
1462
|
|
|
1463
|
|
- if ( geodir_is_page( 'detail' ) ) {
|
|
1464
|
|
- $video = geodir_get_video( $post->ID );
|
|
1465
|
|
- $special_offers = geodir_get_special_offers( $post->ID );
|
|
|
1463
|
+ if (geodir_is_page('detail')) {
|
|
|
1464
|
+ $video = geodir_get_video($post->ID);
|
|
|
1465
|
+ $special_offers = geodir_get_special_offers($post->ID);
|
|
1466
|
1466
|
$related_listing_array = array();
|
|
1467
|
|
- if ( get_option( 'geodir_add_related_listing_posttypes' ) ) {
|
|
1468
|
|
- $related_listing_array = get_option( 'geodir_add_related_listing_posttypes' );
|
|
|
1467
|
+ if (get_option('geodir_add_related_listing_posttypes')) {
|
|
|
1468
|
+ $related_listing_array = get_option('geodir_add_related_listing_posttypes');
|
|
1469
|
1469
|
}
|
|
1470
|
1470
|
|
|
1471
|
|
- $excluded_tabs = get_option( 'geodir_detail_page_tabs_excluded' );
|
|
1472
|
|
- if ( ! $excluded_tabs ) {
|
|
|
1471
|
+ $excluded_tabs = get_option('geodir_detail_page_tabs_excluded');
|
|
|
1472
|
+ if (!$excluded_tabs) {
|
|
1473
|
1473
|
$excluded_tabs = array();
|
|
1474
|
1474
|
}
|
|
1475
|
1475
|
|
|
1476
|
1476
|
$related_listing = '';
|
|
1477
|
|
- if ( in_array( $post->post_type, $related_listing_array ) && ! in_array( 'related_listing', $excluded_tabs ) ) {
|
|
|
1477
|
+ if (in_array($post->post_type, $related_listing_array) && !in_array('related_listing', $excluded_tabs)) {
|
|
1478
|
1478
|
$request = array(
|
|
1479
|
|
- 'post_number' => get_option( 'geodir_related_post_count' ),
|
|
1480
|
|
- 'relate_to' => get_option( 'geodir_related_post_relate_to' ),
|
|
1481
|
|
- 'layout' => get_option( 'geodir_related_post_listing_view' ),
|
|
1482
|
|
- 'add_location_filter' => get_option( 'geodir_related_post_location_filter' ),
|
|
1483
|
|
- 'list_sort' => get_option( 'geodir_related_post_sortby' ),
|
|
1484
|
|
- 'character_count' => get_option( 'geodir_related_post_excerpt' )
|
|
|
1479
|
+ 'post_number' => get_option('geodir_related_post_count'),
|
|
|
1480
|
+ 'relate_to' => get_option('geodir_related_post_relate_to'),
|
|
|
1481
|
+ 'layout' => get_option('geodir_related_post_listing_view'),
|
|
|
1482
|
+ 'add_location_filter' => get_option('geodir_related_post_location_filter'),
|
|
|
1483
|
+ 'list_sort' => get_option('geodir_related_post_sortby'),
|
|
|
1484
|
+ 'character_count' => get_option('geodir_related_post_excerpt')
|
|
1485
|
1485
|
);
|
|
1486
|
1486
|
|
|
1487
|
|
- if ( $post->post_type == 'gd_event' && defined( 'GDEVENTS_VERSION' ) ) {
|
|
1488
|
|
- $related_listing = geodir_get_detail_page_related_events( $request );
|
|
|
1487
|
+ if ($post->post_type == 'gd_event' && defined('GDEVENTS_VERSION')) {
|
|
|
1488
|
+ $related_listing = geodir_get_detail_page_related_events($request);
|
|
1489
|
1489
|
} else {
|
|
1490
|
|
- $related_listing = geodir_related_posts_display( $request );
|
|
|
1490
|
+ $related_listing = geodir_related_posts_display($request);
|
|
1491
|
1491
|
}
|
|
1492
|
1492
|
|
|
1493
|
1493
|
}
|
|
1494
|
1494
|
|
|
1495
|
|
- $post_images = geodir_get_images( $post->ID, 'thumbnail' );
|
|
|
1495
|
+ $post_images = geodir_get_images($post->ID, 'thumbnail');
|
|
1496
|
1496
|
$thumb_image = '';
|
|
1497
|
|
- if ( ! empty( $post_images ) ) {
|
|
|
1497
|
+ if (!empty($post_images)) {
|
|
1498
|
1498
|
$count = 1;
|
|
1499
|
|
- foreach ( $post_images as $image ) {
|
|
|
1499
|
+ foreach ($post_images as $image) {
|
|
1500
|
1500
|
if ($image_limit !== '' && $count > $image_limit) {
|
|
1501
|
1501
|
break;
|
|
1502
|
1502
|
}
|
|
1503
|
|
- $caption = ( ! empty( $image->caption ) ) ? $image->caption : '';
|
|
1504
|
|
- $thumb_image .= '<a href="' . $image->src . '" title="' . $caption . '">';
|
|
1505
|
|
- $thumb_image .= geodir_show_image( $image, 'thumbnail', true, false );
|
|
|
1503
|
+ $caption = (!empty($image->caption)) ? $image->caption : '';
|
|
|
1504
|
+ $thumb_image .= '<a href="'.$image->src.'" title="'.$caption.'">';
|
|
|
1505
|
+ $thumb_image .= geodir_show_image($image, 'thumbnail', true, false);
|
|
1506
|
1506
|
$thumb_image .= '</a>';
|
|
1507
|
1507
|
$count++;
|
|
1508
|
1508
|
}
|
|
@@ -1512,11 +1512,11 @@ discard block |
|
|
block discarded – undo |
|
1512
|
1512
|
$map_args['map_canvas_name'] = 'detail_page_map_canvas';
|
|
1513
|
1513
|
$map_args['width'] = '600';
|
|
1514
|
1514
|
$map_args['height'] = '300';
|
|
1515
|
|
- if ( $post->post_mapzoom ) {
|
|
1516
|
|
- $map_args['zoom'] = '' . $post->post_mapzoom . '';
|
|
|
1515
|
+ if ($post->post_mapzoom) {
|
|
|
1516
|
+ $map_args['zoom'] = ''.$post->post_mapzoom.'';
|
|
1517
|
1517
|
}
|
|
1518
|
1518
|
$map_args['autozoom'] = false;
|
|
1519
|
|
- $map_args['scrollwheel'] = ( get_option( 'geodir_add_listing_mouse_scroll' ) ) ? 0 : 1;
|
|
|
1519
|
+ $map_args['scrollwheel'] = (get_option('geodir_add_listing_mouse_scroll')) ? 0 : 1;
|
|
1520
|
1520
|
$map_args['child_collapse'] = '0';
|
|
1521
|
1521
|
$map_args['enable_cat_filters'] = false;
|
|
1522
|
1522
|
$map_args['enable_text_search'] = false;
|
|
@@ -1525,29 +1525,29 @@ discard block |
|
|
block discarded – undo |
|
1525
|
1525
|
$map_args['enable_jason_on_load'] = true;
|
|
1526
|
1526
|
$map_args['enable_map_direction'] = true;
|
|
1527
|
1527
|
$map_args['map_class_name'] = 'geodir-map-detail-page';
|
|
1528
|
|
- $map_args['maptype'] = ( ! empty( $post->post_mapview ) ) ? $post->post_mapview : 'ROADMAP';
|
|
1529
|
|
- } else if ( geodir_is_page( 'preview' ) ) {
|
|
1530
|
|
- $video = isset( $post->geodir_video ) ? $post->geodir_video : '';
|
|
1531
|
|
- $special_offers = isset( $post->geodir_special_offers ) ? $post->geodir_special_offers : '';
|
|
|
1528
|
+ $map_args['maptype'] = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';
|
|
|
1529
|
+ } else if (geodir_is_page('preview')) {
|
|
|
1530
|
+ $video = isset($post->geodir_video) ? $post->geodir_video : '';
|
|
|
1531
|
+ $special_offers = isset($post->geodir_special_offers) ? $post->geodir_special_offers : '';
|
|
1532
|
1532
|
|
|
1533
|
|
- if ( isset( $post->post_images ) ) {
|
|
1534
|
|
- $post->post_images = trim( $post->post_images, "," );
|
|
|
1533
|
+ if (isset($post->post_images)) {
|
|
|
1534
|
+ $post->post_images = trim($post->post_images, ",");
|
|
1535
|
1535
|
}
|
|
1536
|
1536
|
|
|
1537
|
|
- if ( isset( $post->post_images ) && ! empty( $post->post_images ) ) {
|
|
1538
|
|
- $post_images = explode( ",", $post->post_images );
|
|
|
1537
|
+ if (isset($post->post_images) && !empty($post->post_images)) {
|
|
|
1538
|
+ $post_images = explode(",", $post->post_images);
|
|
1539
|
1539
|
}
|
|
1540
|
1540
|
|
|
1541
|
1541
|
$thumb_image = '';
|
|
1542
|
|
- if ( ! empty( $post_images ) ) {
|
|
|
1542
|
+ if (!empty($post_images)) {
|
|
1543
|
1543
|
$count = 1;
|
|
1544
|
|
- foreach ( $post_images as $image ) {
|
|
1545
|
|
- if ( $image != '' ) {
|
|
|
1544
|
+ foreach ($post_images as $image) {
|
|
|
1545
|
+ if ($image != '') {
|
|
1546
|
1546
|
if ($image_limit !== '' && $count > $image_limit) {
|
|
1547
|
1547
|
break;
|
|
1548
|
1548
|
}
|
|
1549
|
|
- $thumb_image .= '<a href="' . $image . '">';
|
|
1550
|
|
- $thumb_image .= geodir_show_image( array( 'src' => $image ), 'thumbnail', true, false );
|
|
|
1549
|
+ $thumb_image .= '<a href="'.$image.'">';
|
|
|
1550
|
+ $thumb_image .= geodir_show_image(array('src' => $image), 'thumbnail', true, false);
|
|
1551
|
1551
|
$thumb_image .= '</a>';
|
|
1552
|
1552
|
$count++;
|
|
1553
|
1553
|
}
|
|
@@ -1555,18 +1555,18 @@ discard block |
|
|
block discarded – undo |
|
1555
|
1555
|
}
|
|
1556
|
1556
|
|
|
1557
|
1557
|
global $map_jason;
|
|
1558
|
|
- $marker_json = $post->marker_json != '' ? json_decode( $post->marker_json, true ) : array();
|
|
1559
|
|
- $marker_icon = ( ! empty( $marker_json ) && ! empty( $marker_json['i'] ) ) ? $marker_json['i'] : '';
|
|
1560
|
|
- $icon_size = geodir_get_marker_size( $marker_icon );
|
|
|
1558
|
+ $marker_json = $post->marker_json != '' ? json_decode($post->marker_json, true) : array();
|
|
|
1559
|
+ $marker_icon = (!empty($marker_json) && !empty($marker_json['i'])) ? $marker_json['i'] : '';
|
|
|
1560
|
+ $icon_size = geodir_get_marker_size($marker_icon);
|
|
1561
|
1561
|
$marker_json['w'] = $icon_size['w'];
|
|
1562
|
1562
|
$marker_json['h'] = $icon_size['h'];
|
|
1563
|
|
- $map_jason[] = json_encode( $marker_json );
|
|
|
1563
|
+ $map_jason[] = json_encode($marker_json);
|
|
1564
|
1564
|
|
|
1565
|
|
- $address_latitude = isset( $post->post_latitude ) ? $post->post_latitude : '';
|
|
1566
|
|
- $address_longitude = isset( $post->post_longitude ) ? $post->post_longitude : '';
|
|
1567
|
|
- $mapview = isset( $post->post_mapview ) ? $post->post_mapview : '';
|
|
1568
|
|
- $mapzoom = isset( $post->post_mapzoom ) ? $post->post_mapzoom : '';
|
|
1569
|
|
- if ( ! $mapzoom ) {
|
|
|
1565
|
+ $address_latitude = isset($post->post_latitude) ? $post->post_latitude : '';
|
|
|
1566
|
+ $address_longitude = isset($post->post_longitude) ? $post->post_longitude : '';
|
|
|
1567
|
+ $mapview = isset($post->post_mapview) ? $post->post_mapview : '';
|
|
|
1568
|
+ $mapzoom = isset($post->post_mapzoom) ? $post->post_mapzoom : '';
|
|
|
1569
|
+ if (!$mapzoom) {
|
|
1570
|
1570
|
$mapzoom = 12;
|
|
1571
|
1571
|
}
|
|
1572
|
1572
|
|
|
@@ -1589,37 +1589,37 @@ discard block |
|
|
block discarded – undo |
|
1589
|
1589
|
$map_args['map_class_name'] = 'geodir-map-preview-page';
|
|
1590
|
1590
|
}
|
|
1591
|
1591
|
|
|
1592
|
|
- $arr_detail_page_tabs = geodir_detail_page_tabs_list();// get this sooner so we can get the active tab for the user
|
|
|
1592
|
+ $arr_detail_page_tabs = geodir_detail_page_tabs_list(); // get this sooner so we can get the active tab for the user
|
|
1593
|
1593
|
|
|
1594
|
1594
|
$active_tab = '';
|
|
1595
|
1595
|
$active_tab_name = '';
|
|
1596
|
1596
|
$default_tab = '';
|
|
1597
|
1597
|
$default_tab_name = '';
|
|
1598
|
|
- foreach ( $arr_detail_page_tabs as $tab_index => $tabs ) {
|
|
1599
|
|
- if ( isset( $tabs['is_active_tab'] ) && $tabs['is_active_tab'] && ! empty( $tabs['is_display'] ) && isset( $tabs['heading_text'] ) && $tabs['heading_text'] ) {
|
|
|
1598
|
+ foreach ($arr_detail_page_tabs as $tab_index => $tabs) {
|
|
|
1599
|
+ if (isset($tabs['is_active_tab']) && $tabs['is_active_tab'] && !empty($tabs['is_display']) && isset($tabs['heading_text']) && $tabs['heading_text']) {
|
|
1600
|
1600
|
$active_tab = $tab_index;
|
|
1601
|
|
- $active_tab_name = __( $tabs['heading_text'], 'geodirectory' );
|
|
|
1601
|
+ $active_tab_name = __($tabs['heading_text'], 'geodirectory');
|
|
1602
|
1602
|
}
|
|
1603
|
1603
|
|
|
1604
|
|
- if ( $default_tab === '' && ! empty( $tabs['is_display'] ) && ! empty( $tabs['heading_text'] ) ) {
|
|
|
1604
|
+ if ($default_tab === '' && !empty($tabs['is_display']) && !empty($tabs['heading_text'])) {
|
|
1605
|
1605
|
$default_tab = $tab_index;
|
|
1606
|
|
- $default_tab_name = __( $tabs['heading_text'], 'geodirectory' );
|
|
|
1606
|
+ $default_tab_name = __($tabs['heading_text'], 'geodirectory');
|
|
1607
|
1607
|
}
|
|
1608
|
1608
|
}
|
|
1609
|
1609
|
|
|
1610
|
|
- if ( $active_tab === '' && $default_tab !== '' ) { // Make first tab as a active tab if not any tab is active.
|
|
1611
|
|
- if ( isset( $arr_detail_page_tabs[ $active_tab ] ) && isset( $arr_detail_page_tabs[ $active_tab ]['is_active_tab'] ) ) {
|
|
1612
|
|
- $arr_detail_page_tabs[ $active_tab ]['is_active_tab'] = false;
|
|
|
1610
|
+ if ($active_tab === '' && $default_tab !== '') { // Make first tab as a active tab if not any tab is active.
|
|
|
1611
|
+ if (isset($arr_detail_page_tabs[$active_tab]) && isset($arr_detail_page_tabs[$active_tab]['is_active_tab'])) {
|
|
|
1612
|
+ $arr_detail_page_tabs[$active_tab]['is_active_tab'] = false;
|
|
1613
|
1613
|
}
|
|
1614
|
1614
|
|
|
1615
|
|
- $arr_detail_page_tabs[ $default_tab ]['is_active_tab'] = true;
|
|
|
1615
|
+ $arr_detail_page_tabs[$default_tab]['is_active_tab'] = true;
|
|
1616
|
1616
|
$active_tab = $default_tab;
|
|
1617
|
1617
|
$active_tab_name = $default_tab_name;
|
|
1618
|
1618
|
}
|
|
1619
|
|
- $tab_list = ( get_option( 'geodir_disable_tabs', false ) ) ? true : false;
|
|
|
1619
|
+ $tab_list = (get_option('geodir_disable_tabs', false)) ? true : false;
|
|
1620
|
1620
|
?>
|
|
1621
|
1621
|
<div class="geodir-tabs" id="gd-tabs" style="position:relative;">
|
|
1622
|
|
- <?php if ( ! $tab_list ){ ?>
|
|
|
1622
|
+ <?php if (!$tab_list) { ?>
|
|
1623
|
1623
|
<div id="geodir-tab-mobile-menu">
|
|
1624
|
1624
|
<i class="fas fa-bars"></i>
|
|
1625
|
1625
|
<span class="geodir-mobile-active-tab"><?php echo $active_tab_name; ?></span>
|
|
@@ -1634,26 +1634,26 @@ discard block |
|
|
block discarded – undo |
|
1634
|
1634
|
* @since 1.0.0
|
|
1635
|
1635
|
* @see 'geodir_after_tab_list'
|
|
1636
|
1636
|
*/
|
|
1637
|
|
- do_action( 'geodir_before_tab_list' ); ?>
|
|
|
1637
|
+ do_action('geodir_before_tab_list'); ?>
|
|
1638
|
1638
|
<?php
|
|
1639
|
1639
|
|
|
1640
|
|
- foreach ( $arr_detail_page_tabs as $tab_index => $detail_page_tab ) {
|
|
1641
|
|
- if ( $detail_page_tab['is_display'] ) {
|
|
|
1640
|
+ foreach ($arr_detail_page_tabs as $tab_index => $detail_page_tab) {
|
|
|
1641
|
+ if ($detail_page_tab['is_display']) {
|
|
1642
|
1642
|
|
|
1643
|
|
- if ( ! $tab_list ) {
|
|
|
1643
|
+ if (!$tab_list) {
|
|
1644
|
1644
|
?>
|
|
1645
|
1645
|
<dt></dt> <!-- added to comply with validation -->
|
|
1646
|
|
- <dd <?php if ( $detail_page_tab['is_active_tab'] ){ ?>class="geodir-tab-active"<?php } ?> ><a
|
|
|
1646
|
+ <dd <?php if ($detail_page_tab['is_active_tab']) { ?>class="geodir-tab-active"<?php } ?> ><a
|
|
1647
|
1647
|
data-tab="#<?php echo $tab_index; ?>"
|
|
1648
|
|
- data-status="enable"><?php _e( $detail_page_tab['heading_text'], 'geodirectory' ); ?></a>
|
|
|
1648
|
+ data-status="enable"><?php _e($detail_page_tab['heading_text'], 'geodirectory'); ?></a>
|
|
1649
|
1649
|
</dd>
|
|
1650
|
1650
|
<?php
|
|
1651
|
1651
|
}
|
|
1652
|
1652
|
ob_start() // start tab content buffering
|
|
1653
|
1653
|
?>
|
|
1654
|
1654
|
<li id="<?php echo $tab_index; ?>Tab">
|
|
1655
|
|
- <?php if ( $tab_list ) {
|
|
1656
|
|
- $tab_title = '<span class="gd-tab-list-title" ><a href="#' . $tab_index . '">' . __( $detail_page_tab['heading_text'], 'geodirectory' ) . '</a></span><hr />';
|
|
|
1655
|
+ <?php if ($tab_list) {
|
|
|
1656
|
+ $tab_title = '<span class="gd-tab-list-title" ><a href="#'.$tab_index.'">'.__($detail_page_tab['heading_text'], 'geodirectory').'</a></span><hr />';
|
|
1657
|
1657
|
/**
|
|
1658
|
1658
|
* Filter the tab list title html.
|
|
1659
|
1659
|
*
|
|
@@ -1663,7 +1663,7 @@ discard block |
|
|
block discarded – undo |
|
1663
|
1663
|
* @param string $tab_index The tab index type.
|
|
1664
|
1664
|
* @param array $detail_page_tab The array of values including title text.
|
|
1665
|
1665
|
*/
|
|
1666
|
|
- echo apply_filters( 'geodir_tab_list_title', $tab_title, $tab_index, $detail_page_tab );
|
|
|
1666
|
+ echo apply_filters('geodir_tab_list_title', $tab_title, $tab_index, $detail_page_tab);
|
|
1667
|
1667
|
} ?>
|
|
1668
|
1668
|
<div id="<?php echo $tab_index; ?>" class="hash-offset"></div>
|
|
1669
|
1669
|
<?php
|
|
@@ -1674,7 +1674,7 @@ discard block |
|
|
block discarded – undo |
|
1674
|
1674
|
*
|
|
1675
|
1675
|
* @param string $tab_index The tab name ID.
|
|
1676
|
1676
|
*/
|
|
1677
|
|
- do_action( 'geodir_before_tab_content', $tab_index );
|
|
|
1677
|
+ do_action('geodir_before_tab_content', $tab_index);
|
|
1678
|
1678
|
|
|
1679
|
1679
|
/**
|
|
1680
|
1680
|
* Called before the details tab content is output per tab.
|
|
@@ -1684,21 +1684,21 @@ discard block |
|
|
block discarded – undo |
|
1684
|
1684
|
* @since 1.0.0
|
|
1685
|
1685
|
* @todo do we need this if we have the hook above? 'geodir_before_tab_content'
|
|
1686
|
1686
|
*/
|
|
1687
|
|
- do_action( 'geodir_before_' . $tab_index . '_tab_content' );
|
|
|
1687
|
+ do_action('geodir_before_'.$tab_index.'_tab_content');
|
|
1688
|
1688
|
/// write a code to generate content of each tab
|
|
1689
|
|
- switch ( $tab_index ) {
|
|
|
1689
|
+ switch ($tab_index) {
|
|
1690
|
1690
|
case 'post_profile':
|
|
1691
|
1691
|
/**
|
|
1692
|
1692
|
* Called before the listing description content on the details page tab.
|
|
1693
|
1693
|
*
|
|
1694
|
1694
|
* @since 1.0.0
|
|
1695
|
1695
|
*/
|
|
1696
|
|
- do_action( 'geodir_before_description_on_listing_detail' );
|
|
1697
|
|
- if ( geodir_is_page( 'detail' ) ) {
|
|
|
1696
|
+ do_action('geodir_before_description_on_listing_detail');
|
|
|
1697
|
+ if (geodir_is_page('detail')) {
|
|
1698
|
1698
|
the_content();
|
|
1699
|
1699
|
} else {
|
|
1700
|
1700
|
/** This action is documented in geodirectory_template_actions.php */
|
|
1701
|
|
- echo apply_filters( 'the_content', stripslashes( $post->post_desc ) );
|
|
|
1701
|
+ echo apply_filters('the_content', stripslashes($post->post_desc));
|
|
1702
|
1702
|
}
|
|
1703
|
1703
|
|
|
1704
|
1704
|
/**
|
|
@@ -1706,7 +1706,7 @@ discard block |
|
|
block discarded – undo |
|
1706
|
1706
|
*
|
|
1707
|
1707
|
* @since 1.0.0
|
|
1708
|
1708
|
*/
|
|
1709
|
|
- do_action( 'geodir_after_description_on_listing_detail' );
|
|
|
1709
|
+ do_action('geodir_after_description_on_listing_detail');
|
|
1710
|
1710
|
break;
|
|
1711
|
1711
|
case 'post_info':
|
|
1712
|
1712
|
echo $geodir_post_detail_fields;
|
|
@@ -1716,32 +1716,32 @@ discard block |
|
|
block discarded – undo |
|
1716
|
1716
|
break;
|
|
1717
|
1717
|
case 'post_video':
|
|
1718
|
1718
|
// some browsers hide $_POST data if used for embeds so we replace with a placeholder
|
|
1719
|
|
- if ( $preview ) {
|
|
1720
|
|
- if ( $video ) {
|
|
1721
|
|
- echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fas fa-video\" aria-hidden=\"true\"></i><br />" . __( 'Video Preview Placeholder', 'geodirectory' ) . "</p></span>";
|
|
|
1719
|
+ if ($preview) {
|
|
|
1720
|
+ if ($video) {
|
|
|
1721
|
+ echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fas fa-video\" aria-hidden=\"true\"></i><br />".__('Video Preview Placeholder', 'geodirectory')."</p></span>";
|
|
1722
|
1722
|
}
|
|
1723
|
1723
|
} else {
|
|
1724
|
1724
|
|
|
1725
|
1725
|
// stop payment manager filtering content length
|
|
1726
|
|
- $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' );
|
|
1727
|
|
- if ( false !== $filter_priority ) {
|
|
1728
|
|
- remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );
|
|
|
1726
|
+ $filter_priority = has_filter('the_content', 'geodir_payments_the_content');
|
|
|
1727
|
+ if (false !== $filter_priority) {
|
|
|
1728
|
+ remove_filter('the_content', 'geodir_payments_the_content', $filter_priority);
|
|
1729
|
1729
|
}
|
|
1730
|
1730
|
|
|
1731
|
1731
|
/** This action is documented in geodirectory_template_actions.php */
|
|
1732
|
|
- echo apply_filters( 'the_content', stripslashes( $video ) );// we apply the_content filter so oembed works also;
|
|
|
1732
|
+ echo apply_filters('the_content', stripslashes($video)); // we apply the_content filter so oembed works also;
|
|
1733
|
1733
|
|
|
1734
|
|
- if ( false !== $filter_priority ) {
|
|
1735
|
|
- add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );
|
|
|
1734
|
+ if (false !== $filter_priority) {
|
|
|
1735
|
+ add_filter('the_content', 'geodir_payments_the_content', $filter_priority);
|
|
1736
|
1736
|
}
|
|
1737
|
1737
|
}
|
|
1738
|
1738
|
break;
|
|
1739
|
1739
|
case 'special_offers':
|
|
1740
|
|
- echo apply_filters( 'gd_special_offers_content', wpautop( stripslashes( $special_offers ) ) );
|
|
|
1740
|
+ echo apply_filters('gd_special_offers_content', wpautop(stripslashes($special_offers)));
|
|
1741
|
1741
|
|
|
1742
|
1742
|
break;
|
|
1743
|
1743
|
case 'post_map':
|
|
1744
|
|
- geodir_draw_map( $map_args );
|
|
|
1744
|
+ geodir_draw_map($map_args);
|
|
1745
|
1745
|
break;
|
|
1746
|
1746
|
case 'reviews':
|
|
1747
|
1747
|
comments_template();
|
|
@@ -1750,7 +1750,7 @@ discard block |
|
|
block discarded – undo |
|
1750
|
1750
|
echo $related_listing;
|
|
1751
|
1751
|
break;
|
|
1752
|
1752
|
default: {
|
|
1753
|
|
- if ( ( isset( $post->{$tab_index} ) || ( ! isset( $post->{$tab_index} ) && ( strpos( $tab_index, 'gd_tab_' ) !== false || $tab_index == 'link_business' ) ) ) && ! empty( $detail_page_tab['tab_content'] ) ) {
|
|
|
1753
|
+ if ((isset($post->{$tab_index} ) || (!isset($post->{$tab_index} ) && (strpos($tab_index, 'gd_tab_') !== false || $tab_index == 'link_business'))) && !empty($detail_page_tab['tab_content'])) {
|
|
1754
|
1754
|
echo $detail_page_tab['tab_content'];
|
|
1755
|
1755
|
}
|
|
1756
|
1756
|
}
|
|
@@ -1762,7 +1762,7 @@ discard block |
|
|
block discarded – undo |
|
1762
|
1762
|
*
|
|
1763
|
1763
|
* @since 1.0.0
|
|
1764
|
1764
|
*/
|
|
1765
|
|
- do_action( 'geodir_after_tab_content', $tab_index );
|
|
|
1765
|
+ do_action('geodir_after_tab_content', $tab_index);
|
|
1766
|
1766
|
|
|
1767
|
1767
|
/**
|
|
1768
|
1768
|
* Called after the details tab content is output per tab.
|
|
@@ -1772,7 +1772,7 @@ discard block |
|
|
block discarded – undo |
|
1772
|
1772
|
* @since 1.0.0
|
|
1773
|
1773
|
* @todo do we need this if we have the hook above? 'geodir_after_tab_content'
|
|
1774
|
1774
|
*/
|
|
1775
|
|
- do_action( 'geodir_after_' . $tab_index . '_tab_content' );
|
|
|
1775
|
+ do_action('geodir_after_'.$tab_index.'_tab_content');
|
|
1776
|
1776
|
?> </li>
|
|
1777
|
1777
|
<?php
|
|
1778
|
1778
|
/**
|
|
@@ -1780,7 +1780,7 @@ discard block |
|
|
block discarded – undo |
|
1780
|
1780
|
*
|
|
1781
|
1781
|
* @since 1.0.0
|
|
1782
|
1782
|
*/
|
|
1783
|
|
- $arr_detail_page_tabs[ $tab_index ]['tab_content'] = apply_filters( "geodir_modify_" . $detail_page_tab['tab_content'] . "_tab_content", ob_get_clean() );
|
|
|
1783
|
+ $arr_detail_page_tabs[$tab_index]['tab_content'] = apply_filters("geodir_modify_".$detail_page_tab['tab_content']."_tab_content", ob_get_clean());
|
|
1784
|
1784
|
} // end of if for is_display
|
|
1785
|
1785
|
}// end of foreach
|
|
1786
|
1786
|
|
|
@@ -1790,14 +1790,14 @@ discard block |
|
|
block discarded – undo |
|
1790
|
1790
|
* @since 1.0.0
|
|
1791
|
1791
|
* @see 'geodir_before_tab_list'
|
|
1792
|
1792
|
*/
|
|
1793
|
|
- do_action( 'geodir_after_tab_list' );
|
|
|
1793
|
+ do_action('geodir_after_tab_list');
|
|
1794
|
1794
|
?>
|
|
1795
|
|
- <?php if ( ! $tab_list ){ ?></dl><?php } ?>
|
|
1796
|
|
- <ul class="geodir-tabs-content entry-content <?php if ( $tab_list ) { ?>geodir-tabs-list<?php } ?>"
|
|
|
1795
|
+ <?php if (!$tab_list) { ?></dl><?php } ?>
|
|
|
1796
|
+ <ul class="geodir-tabs-content entry-content <?php if ($tab_list) { ?>geodir-tabs-list<?php } ?>"
|
|
1797
|
1797
|
style="position:relative;">
|
|
1798
|
1798
|
<?php
|
|
1799
|
|
- foreach ( $arr_detail_page_tabs as $detail_page_tab ) {
|
|
1800
|
|
- if ( $detail_page_tab['is_display'] && ! empty( $detail_page_tab['tab_content'] ) ) {
|
|
|
1799
|
+ foreach ($arr_detail_page_tabs as $detail_page_tab) {
|
|
|
1800
|
+ if ($detail_page_tab['is_display'] && !empty($detail_page_tab['tab_content'])) {
|
|
1801
|
1801
|
echo $detail_page_tab['tab_content'];
|
|
1802
|
1802
|
}// end of if
|
|
1803
|
1803
|
}// end of foreach
|
|
@@ -1807,11 +1807,11 @@ discard block |
|
|
block discarded – undo |
|
1807
|
1807
|
*
|
|
1808
|
1808
|
* @since 1.0.0
|
|
1809
|
1809
|
*/
|
|
1810
|
|
- do_action( 'geodir_add_tab_content' ); ?>
|
|
|
1810
|
+ do_action('geodir_add_tab_content'); ?>
|
|
1811
|
1811
|
</ul>
|
|
1812
|
1812
|
<!--gd-tabs-content ul end-->
|
|
1813
|
1813
|
</div>
|
|
1814
|
|
- <?php if ( ! $tab_list ) { ?>
|
|
|
1814
|
+ <?php if (!$tab_list) { ?>
|
|
1815
|
1815
|
<script>
|
|
1816
|
1816
|
if (window.location.hash && window.location.hash.indexOf('&') === -1 && jQuery(window.location.hash + 'Tab').length) {
|
|
1817
|
1817
|
hashVal = window.location.hash;
|
|
@@ -1843,31 +1843,31 @@ discard block |
|
|
block discarded – undo |
|
1843
|
1843
|
*
|
|
1844
|
1844
|
* @return mixed Image file.
|
|
1845
|
1845
|
*/
|
|
1846
|
|
-function geodir_exif( $file ) {
|
|
1847
|
|
- if ( empty( $file ) || ! is_array( $file ) ) {
|
|
|
1846
|
+function geodir_exif($file) {
|
|
|
1847
|
+ if (empty($file) || !is_array($file)) {
|
|
1848
|
1848
|
return $file;
|
|
1849
|
1849
|
}
|
|
1850
|
1850
|
|
|
1851
|
|
- $file_path = ! empty( $file['tmp_name'] ) ? sanitize_text_field( $file['tmp_name'] ) : '';
|
|
1852
|
|
- if ( ! ( $file_path && file_exists( $file_path ) ) ) {
|
|
|
1851
|
+ $file_path = !empty($file['tmp_name']) ? sanitize_text_field($file['tmp_name']) : '';
|
|
|
1852
|
+ if (!($file_path && file_exists($file_path))) {
|
|
1853
|
1853
|
return $file;
|
|
1854
|
1854
|
}
|
|
1855
|
1855
|
$file['file'] = $file_path;
|
|
1856
|
1856
|
|
|
1857
|
|
- if ( ! file_is_valid_image( $file_path ) ) {
|
|
|
1857
|
+ if (!file_is_valid_image($file_path)) {
|
|
1858
|
1858
|
return $file; // Bail if file is not an image.
|
|
1859
|
1859
|
}
|
|
1860
|
1860
|
|
|
1861
|
|
- if ( ! function_exists( 'wp_get_image_editor' ) ) {
|
|
|
1861
|
+ if (!function_exists('wp_get_image_editor')) {
|
|
1862
|
1862
|
return $file;
|
|
1863
|
1863
|
}
|
|
1864
|
1864
|
|
|
1865
|
1865
|
$mime_type = $file['type'];
|
|
1866
|
1866
|
$exif = array();
|
|
1867
|
|
- if ( $mime_type == 'image/jpeg' && function_exists( 'exif_read_data' ) ) {
|
|
|
1867
|
+ if ($mime_type == 'image/jpeg' && function_exists('exif_read_data')) {
|
|
1868
|
1868
|
try {
|
|
1869
|
|
- $exif = exif_read_data( $file_path );
|
|
1870
|
|
- } catch ( Exception $e ) {
|
|
|
1869
|
+ $exif = exif_read_data($file_path);
|
|
|
1870
|
+ } catch (Exception $e) {
|
|
1871
|
1871
|
$exif = array();
|
|
1872
|
1872
|
}
|
|
1873
|
1873
|
}
|
|
@@ -1876,13 +1876,13 @@ discard block |
|
|
block discarded – undo |
|
1876
|
1876
|
$flip = false;
|
|
1877
|
1877
|
$modify = false;
|
|
1878
|
1878
|
$orientation = 0;
|
|
1879
|
|
- if ( ! empty( $exif ) && isset( $exif['Orientation'] ) ) {
|
|
1880
|
|
- switch ( (int) $exif['Orientation'] ) {
|
|
|
1879
|
+ if (!empty($exif) && isset($exif['Orientation'])) {
|
|
|
1880
|
+ switch ((int) $exif['Orientation']) {
|
|
1881
|
1881
|
case 1:
|
|
1882
|
1882
|
// do nothing
|
|
1883
|
1883
|
break;
|
|
1884
|
1884
|
case 2:
|
|
1885
|
|
- $flip = array( false, true );
|
|
|
1885
|
+ $flip = array(false, true);
|
|
1886
|
1886
|
$modify = true;
|
|
1887
|
1887
|
break;
|
|
1888
|
1888
|
case 3:
|
|
@@ -1891,13 +1891,13 @@ discard block |
|
|
block discarded – undo |
|
1891
|
1891
|
$modify = true;
|
|
1892
|
1892
|
break;
|
|
1893
|
1893
|
case 4:
|
|
1894
|
|
- $flip = array( true, false );
|
|
|
1894
|
+ $flip = array(true, false);
|
|
1895
|
1895
|
$modify = true;
|
|
1896
|
1896
|
break;
|
|
1897
|
1897
|
case 5:
|
|
1898
|
1898
|
$orientation = - 90;
|
|
1899
|
1899
|
$rotate = true;
|
|
1900
|
|
- $flip = array( false, true );
|
|
|
1900
|
+ $flip = array(false, true);
|
|
1901
|
1901
|
$modify = true;
|
|
1902
|
1902
|
break;
|
|
1903
|
1903
|
case 6:
|
|
@@ -1908,7 +1908,7 @@ discard block |
|
|
block discarded – undo |
|
1908
|
1908
|
case 7:
|
|
1909
|
1909
|
$orientation = - 270;
|
|
1910
|
1910
|
$rotate = true;
|
|
1911
|
|
- $flip = array( false, true );
|
|
|
1911
|
+ $flip = array(false, true);
|
|
1912
|
1912
|
$modify = true;
|
|
1913
|
1913
|
break;
|
|
1914
|
1914
|
case 8:
|
|
@@ -1934,31 +1934,31 @@ discard block |
|
|
block discarded – undo |
|
1934
|
1934
|
* @param int|null $quality Image Compression quality between 1-100% scale. Default null.
|
|
1935
|
1935
|
* @param string $quality Image mime type.
|
|
1936
|
1936
|
*/
|
|
1937
|
|
- $quality = apply_filters( 'geodir_image_upload_set_quality', $quality, $mime_type );
|
|
1938
|
|
- if ( $quality !== null ) {
|
|
|
1937
|
+ $quality = apply_filters('geodir_image_upload_set_quality', $quality, $mime_type);
|
|
|
1938
|
+ if ($quality !== null) {
|
|
1939
|
1939
|
$modify = true;
|
|
1940
|
1940
|
}
|
|
1941
|
1941
|
|
|
1942
|
|
- if ( ! $modify ) {
|
|
|
1942
|
+ if (!$modify) {
|
|
1943
|
1943
|
return $file; // no change
|
|
1944
|
1944
|
}
|
|
1945
|
1945
|
|
|
1946
|
|
- $image = wp_get_image_editor( $file_path );
|
|
1947
|
|
- if ( ! is_wp_error( $image ) ) {
|
|
1948
|
|
- if ( $rotate ) {
|
|
1949
|
|
- $image->rotate( $orientation );
|
|
|
1946
|
+ $image = wp_get_image_editor($file_path);
|
|
|
1947
|
+ if (!is_wp_error($image)) {
|
|
|
1948
|
+ if ($rotate) {
|
|
|
1949
|
+ $image->rotate($orientation);
|
|
1950
|
1950
|
}
|
|
1951
|
1951
|
|
|
1952
|
|
- if ( ! empty( $flip ) ) {
|
|
1953
|
|
- $image->flip( $flip[0], $flip[1] );
|
|
|
1952
|
+ if (!empty($flip)) {
|
|
|
1953
|
+ $image->flip($flip[0], $flip[1]);
|
|
1954
|
1954
|
}
|
|
1955
|
1955
|
|
|
1956
|
|
- if ( $quality !== null ) {
|
|
1957
|
|
- $image->set_quality( (int) $quality );
|
|
|
1956
|
+ if ($quality !== null) {
|
|
|
1957
|
+ $image->set_quality((int) $quality);
|
|
1958
|
1958
|
}
|
|
1959
|
1959
|
|
|
1960
|
|
- $result = $image->save( $file_path );
|
|
1961
|
|
- if ( ! is_wp_error( $result ) ) {
|
|
|
1960
|
+ $result = $image->save($file_path);
|
|
|
1961
|
+ if (!is_wp_error($result)) {
|
|
1962
|
1962
|
$file['file'] = $result['path'];
|
|
1963
|
1963
|
$file['tmp_name'] = $result['path'];
|
|
1964
|
1964
|
}
|
|
@@ -1986,7 +1986,7 @@ discard block |
|
|
block discarded – undo |
|
1986
|
1986
|
*
|
|
1987
|
1987
|
* @return string Returns the recent reviews html.
|
|
1988
|
1988
|
*/
|
|
1989
|
|
-function geodir_get_recent_reviews( $g_size = 60, $no_comments = 5, $comment_lenth = 60, $show_pass_post = false ) {
|
|
|
1989
|
+function geodir_get_recent_reviews($g_size = 60, $no_comments = 5, $comment_lenth = 60, $show_pass_post = false) {
|
|
1990
|
1990
|
global $wpdb, $tablecomments, $tableposts, $rating_table_name, $gd_session, $table_prefix;
|
|
1991
|
1991
|
$tablecomments = $wpdb->comments;
|
|
1992
|
1992
|
$tableposts = $wpdb->posts;
|
|
@@ -1996,17 +1996,17 @@ discard block |
|
|
block discarded – undo |
|
1996
|
1996
|
$region_filter = '';
|
|
1997
|
1997
|
$country_filter = '';
|
|
1998
|
1998
|
|
|
1999
|
|
- if ( $gd_session->get( 'gd_multi_location' ) ) {
|
|
2000
|
|
- if ( $gd_ses_country = $gd_session->get( 'gd_country' ) ) {
|
|
2001
|
|
- $country_filter = $wpdb->prepare( " AND r.post_country=%s ", str_replace( "-", " ", $gd_ses_country ) );
|
|
|
1999
|
+ if ($gd_session->get('gd_multi_location')) {
|
|
|
2000
|
+ if ($gd_ses_country = $gd_session->get('gd_country')) {
|
|
|
2001
|
+ $country_filter = $wpdb->prepare(" AND r.post_country=%s ", str_replace("-", " ", $gd_ses_country));
|
|
2002
|
2002
|
}
|
|
2003
|
2003
|
|
|
2004
|
|
- if ( $gd_ses_region = $gd_session->get( 'gd_region' ) ) {
|
|
2005
|
|
- $region_filter = $wpdb->prepare( " AND r.post_region=%s ", str_replace( "-", " ", $gd_ses_region ) );
|
|
|
2004
|
+ if ($gd_ses_region = $gd_session->get('gd_region')) {
|
|
|
2005
|
+ $region_filter = $wpdb->prepare(" AND r.post_region=%s ", str_replace("-", " ", $gd_ses_region));
|
|
2006
|
2006
|
}
|
|
2007
|
2007
|
|
|
2008
|
|
- if ( $gd_ses_city = $gd_session->get( 'gd_city' ) ) {
|
|
2009
|
|
- $city_filter = $wpdb->prepare( " AND r.post_city=%s ", str_replace( "-", " ", $gd_ses_city ) );
|
|
|
2008
|
+ if ($gd_ses_city = $gd_session->get('gd_city')) {
|
|
|
2009
|
+ $city_filter = $wpdb->prepare(" AND r.post_city=%s ", str_replace("-", " ", $gd_ses_city));
|
|
2010
|
2010
|
}
|
|
2011
|
2011
|
}
|
|
2012
|
2012
|
|
|
@@ -2017,84 +2017,84 @@ discard block |
|
|
block discarded – undo |
|
2017
|
2017
|
$lang_code = ICL_LANGUAGE_CODE;
|
|
2018
|
2018
|
|
|
2019
|
2019
|
if ($lang_code) {
|
|
2020
|
|
- $join .= " JOIN " . $table_prefix . "icl_translations AS icltr2 ON icltr2.element_id = c.comment_post_ID AND p.ID = icltr2.element_id AND CONCAT('post_', p.post_type) = icltr2.element_type LEFT JOIN " . $table_prefix . "icl_translations AS icltr_comment ON icltr_comment.element_id = c.comment_ID AND icltr_comment.element_type = 'comment'";
|
|
2021
|
|
- $where .= " AND icltr2.language_code = '" . $lang_code . "' AND (icltr_comment.language_code IS NULL OR icltr_comment.language_code = icltr2.language_code)";
|
|
|
2020
|
+ $join .= " JOIN ".$table_prefix."icl_translations AS icltr2 ON icltr2.element_id = c.comment_post_ID AND p.ID = icltr2.element_id AND CONCAT('post_', p.post_type) = icltr2.element_type LEFT JOIN ".$table_prefix."icl_translations AS icltr_comment ON icltr_comment.element_id = c.comment_ID AND icltr_comment.element_type = 'comment'";
|
|
|
2021
|
+ $where .= " AND icltr2.language_code = '".$lang_code."' AND (icltr_comment.language_code IS NULL OR icltr_comment.language_code = icltr2.language_code)";
|
|
2022
|
2022
|
}
|
|
2023
|
2023
|
}
|
|
2024
|
2024
|
|
|
2025
|
|
- $request = "SELECT r.id AS ID, r.post_type, r.comment_id AS comment_ID, r.post_date AS comment_date, r.overall_rating, r.user_id, r.post_id FROM " . GEODIR_REVIEW_TABLE . " AS r JOIN " . $wpdb->comments . " AS c ON c.comment_ID = r.comment_id JOIN " . $wpdb->posts . " AS p ON p.ID = c.comment_post_ID " . $join . " WHERE c.comment_parent = 0 AND c.comment_approved = 1 AND r.status = 1 AND r.overall_rating >= 1 AND p.post_status = 'publish' " . $where . " ORDER BY r.post_date DESC, r.id DESC LIMIT ". $no_comments;
|
|
|
2025
|
+ $request = "SELECT r.id AS ID, r.post_type, r.comment_id AS comment_ID, r.post_date AS comment_date, r.overall_rating, r.user_id, r.post_id FROM ".GEODIR_REVIEW_TABLE." AS r JOIN ".$wpdb->comments." AS c ON c.comment_ID = r.comment_id JOIN ".$wpdb->posts." AS p ON p.ID = c.comment_post_ID ".$join." WHERE c.comment_parent = 0 AND c.comment_approved = 1 AND r.status = 1 AND r.overall_rating >= 1 AND p.post_status = 'publish' ".$where." ORDER BY r.post_date DESC, r.id DESC LIMIT ".$no_comments;
|
|
2026
|
2026
|
|
|
2027
|
|
- $comments = $wpdb->get_results( $request );
|
|
|
2027
|
+ $comments = $wpdb->get_results($request);
|
|
2028
|
2028
|
|
|
2029
|
|
- foreach ( $comments as $comment ) {
|
|
|
2029
|
+ foreach ($comments as $comment) {
|
|
2030
|
2030
|
// Set the extra comment info needed.
|
|
2031
|
|
- $comment_extra = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID" );
|
|
|
2031
|
+ $comment_extra = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID");
|
|
2032
|
2032
|
$comment->comment_content = $comment_extra->comment_content;
|
|
2033
|
2033
|
$comment->comment_author = $comment_extra->comment_author;
|
|
2034
|
2034
|
$comment->comment_author_email = $comment_extra->comment_author_email;
|
|
2035
|
2035
|
|
|
2036
|
2036
|
$comment_id = '';
|
|
2037
|
2037
|
$comment_id = $comment->comment_ID;
|
|
2038
|
|
- $comment_content = strip_tags( $comment->comment_content );
|
|
|
2038
|
+ $comment_content = strip_tags($comment->comment_content);
|
|
2039
|
2039
|
|
|
2040
|
|
- $comment_content = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_content );
|
|
|
2040
|
+ $comment_content = preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_content);
|
|
2041
|
2041
|
|
|
2042
|
|
- $permalink = get_permalink( $comment->ID ) . "#comment-" . $comment->comment_ID;
|
|
|
2042
|
+ $permalink = get_permalink($comment->ID)."#comment-".$comment->comment_ID;
|
|
2043
|
2043
|
$comment_author_email = $comment->comment_author_email;
|
|
2044
|
2044
|
$comment_post_ID = $comment->post_id;
|
|
2045
|
2045
|
|
|
2046
|
|
- $post_title = get_the_title( $comment_post_ID );
|
|
2047
|
|
- $permalink = get_permalink( $comment_post_ID );
|
|
2048
|
|
- $comment_permalink = $permalink . "#comment-" . $comment->comment_ID;
|
|
2049
|
|
- $read_more = '<a class="comment_excerpt" href="' . $comment_permalink . '">' . __( 'Read more', 'geodirectory' ) . '</a>';
|
|
|
2046
|
+ $post_title = get_the_title($comment_post_ID);
|
|
|
2047
|
+ $permalink = get_permalink($comment_post_ID);
|
|
|
2048
|
+ $comment_permalink = $permalink."#comment-".$comment->comment_ID;
|
|
|
2049
|
+ $read_more = '<a class="comment_excerpt" href="'.$comment_permalink.'">'.__('Read more', 'geodirectory').'</a>';
|
|
2050
|
2050
|
|
|
2051
|
|
- $comment_content_length = strlen( $comment_content );
|
|
2052
|
|
- if ( $comment_content_length > $comment_lenth ) {
|
|
2053
|
|
- $comment_excerpt = geodir_utf8_substr( $comment_content, 0, $comment_lenth ) . '... ' . $read_more;
|
|
|
2051
|
+ $comment_content_length = strlen($comment_content);
|
|
|
2052
|
+ if ($comment_content_length > $comment_lenth) {
|
|
|
2053
|
+ $comment_excerpt = geodir_utf8_substr($comment_content, 0, $comment_lenth).'... '.$read_more;
|
|
2054
|
2054
|
} else {
|
|
2055
|
2055
|
$comment_excerpt = $comment_content;
|
|
2056
|
2056
|
}
|
|
2057
|
2057
|
|
|
2058
|
|
- if ( $comment->user_id ) {
|
|
2059
|
|
- $user_profile_url = get_author_posts_url( $comment->user_id );
|
|
|
2058
|
+ if ($comment->user_id) {
|
|
|
2059
|
+ $user_profile_url = get_author_posts_url($comment->user_id);
|
|
2060
|
2060
|
} else {
|
|
2061
|
2061
|
$user_profile_url = '';
|
|
2062
|
2062
|
}
|
|
2063
|
2063
|
|
|
2064
|
|
- if ( $comment_id ) {
|
|
|
2064
|
+ if ($comment_id) {
|
|
2065
|
2065
|
$comments_echo .= '<li class="clearfix">';
|
|
2066
|
|
- $comments_echo .= "<span class=\"li" . $comment_id . " geodir_reviewer_image\">";
|
|
2067
|
|
- if ( function_exists( 'get_avatar' ) ) {
|
|
2068
|
|
- if ( ! isset( $comment->comment_type ) ) {
|
|
2069
|
|
- if ( $user_profile_url ) {
|
|
2070
|
|
- $comments_echo .= '<a href="' . $user_profile_url . '">';
|
|
|
2066
|
+ $comments_echo .= "<span class=\"li".$comment_id." geodir_reviewer_image\">";
|
|
|
2067
|
+ if (function_exists('get_avatar')) {
|
|
|
2068
|
+ if (!isset($comment->comment_type)) {
|
|
|
2069
|
+ if ($user_profile_url) {
|
|
|
2070
|
+ $comments_echo .= '<a href="'.$user_profile_url.'">';
|
|
2071
|
2071
|
}
|
|
2072
|
|
- $comments_echo .= get_avatar( $comment->comment_author_email, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );
|
|
2073
|
|
- if ( $user_profile_url ) {
|
|
|
2072
|
+ $comments_echo .= get_avatar($comment->comment_author_email, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');
|
|
|
2073
|
+ if ($user_profile_url) {
|
|
2074
|
2074
|
$comments_echo .= '</a>';
|
|
2075
|
2075
|
}
|
|
2076
|
|
- } elseif ( ( isset( $comment->comment_type ) && $comment->comment_type == 'trackback' ) || ( isset( $comment->comment_type ) && $comment->comment_type == 'pingback' ) ) {
|
|
2077
|
|
- if ( $user_profile_url ) {
|
|
2078
|
|
- $comments_echo .= '<a href="' . $user_profile_url . '">';
|
|
|
2076
|
+ } elseif ((isset($comment->comment_type) && $comment->comment_type == 'trackback') || (isset($comment->comment_type) && $comment->comment_type == 'pingback')) {
|
|
|
2077
|
+ if ($user_profile_url) {
|
|
|
2078
|
+ $comments_echo .= '<a href="'.$user_profile_url.'">';
|
|
2079
|
2079
|
}
|
|
2080
|
|
- $comments_echo .= get_avatar( $comment->comment_author_url, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );
|
|
|
2080
|
+ $comments_echo .= get_avatar($comment->comment_author_url, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');
|
|
2081
|
2081
|
}
|
|
2082
|
|
- } elseif ( function_exists( 'gravatar' ) ) {
|
|
2083
|
|
- if ( $user_profile_url ) {
|
|
2084
|
|
- $comments_echo .= '<a href="' . $user_profile_url . '">';
|
|
|
2082
|
+ } elseif (function_exists('gravatar')) {
|
|
|
2083
|
+ if ($user_profile_url) {
|
|
|
2084
|
+ $comments_echo .= '<a href="'.$user_profile_url.'">';
|
|
2085
|
2085
|
}
|
|
2086
|
2086
|
$comments_echo .= "<img src=\"";
|
|
2087
|
|
- if ( '' == $comment->comment_type ) {
|
|
2088
|
|
- $comments_echo .= gravatar( $comment->comment_author_email, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );
|
|
2089
|
|
- if ( $user_profile_url ) {
|
|
|
2087
|
+ if ('' == $comment->comment_type) {
|
|
|
2088
|
+ $comments_echo .= gravatar($comment->comment_author_email, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');
|
|
|
2089
|
+ if ($user_profile_url) {
|
|
2090
|
2090
|
$comments_echo .= '</a>';
|
|
2091
|
2091
|
}
|
|
2092
|
|
- } elseif ( ( 'trackback' == $comment->comment_type ) || ( 'pingback' == $comment->comment_type ) ) {
|
|
2093
|
|
- if ( $user_profile_url ) {
|
|
2094
|
|
- $comments_echo .= '<a href="' . $user_profile_url . '">';
|
|
|
2092
|
+ } elseif (('trackback' == $comment->comment_type) || ('pingback' == $comment->comment_type)) {
|
|
|
2093
|
+ if ($user_profile_url) {
|
|
|
2094
|
+ $comments_echo .= '<a href="'.$user_profile_url.'">';
|
|
2095
|
2095
|
}
|
|
2096
|
|
- $comments_echo .= gravatar( $comment->comment_author_url, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );
|
|
2097
|
|
- if ( $user_profile_url ) {
|
|
|
2096
|
+ $comments_echo .= gravatar($comment->comment_author_url, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');
|
|
|
2097
|
+ if ($user_profile_url) {
|
|
2098
|
2098
|
$comments_echo .= '</a>';
|
|
2099
|
2099
|
}
|
|
2100
|
2100
|
}
|
|
@@ -2105,17 +2105,17 @@ discard block |
|
|
block discarded – undo |
|
2105
|
2105
|
|
|
2106
|
2106
|
$comments_echo .= '<span class="geodir_reviewer_content">';
|
|
2107
|
2107
|
$author_link = apply_filters('geodir_reviewer_content_author_link', true);
|
|
2108
|
|
- if ( $comment->user_id && $author_link ) {
|
|
2109
|
|
- $comments_echo .= '<a href="' . get_author_posts_url( $comment->user_id ) . '">';
|
|
|
2108
|
+ if ($comment->user_id && $author_link) {
|
|
|
2109
|
+ $comments_echo .= '<a href="'.get_author_posts_url($comment->user_id).'">';
|
|
2110
|
2110
|
}
|
|
2111
|
|
- $comments_echo .= '<span class="geodir_reviewer_author">' . $comment->comment_author . '</span> ';
|
|
2112
|
|
- if ( $comment->user_id && $author_link ) {
|
|
|
2111
|
+ $comments_echo .= '<span class="geodir_reviewer_author">'.$comment->comment_author.'</span> ';
|
|
|
2112
|
+ if ($comment->user_id && $author_link) {
|
|
2113
|
2113
|
$comments_echo .= '</a>';
|
|
2114
|
2114
|
}
|
|
2115
|
|
- $comments_echo .= '<span class="geodir_reviewer_reviewed">' . __( 'reviewed', 'geodirectory' ) . '</span> ';
|
|
2116
|
|
- $comments_echo .= '<a href="' . $permalink . '" class="geodir_reviewer_title">' . $post_title . '</a>';
|
|
2117
|
|
- $comments_echo .= geodir_get_rating_stars( $comment->overall_rating, $comment_post_ID );
|
|
2118
|
|
- $comments_echo .= '<p class="geodir_reviewer_text">' . $comment_excerpt . '';
|
|
|
2115
|
+ $comments_echo .= '<span class="geodir_reviewer_reviewed">'.__('reviewed', 'geodirectory').'</span> ';
|
|
|
2116
|
+ $comments_echo .= '<a href="'.$permalink.'" class="geodir_reviewer_title">'.$post_title.'</a>';
|
|
|
2117
|
+ $comments_echo .= geodir_get_rating_stars($comment->overall_rating, $comment_post_ID);
|
|
|
2118
|
+ $comments_echo .= '<p class="geodir_reviewer_text">'.$comment_excerpt.'';
|
|
2119
|
2119
|
//echo preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_excerpt);
|
|
2120
|
2120
|
$comments_echo .= '</p>';
|
|
2121
|
2121
|
|
|
@@ -2135,25 +2135,25 @@ discard block |
|
|
block discarded – undo |
|
2135
|
2135
|
* @return array Returns post categories as an array.
|
|
2136
|
2136
|
*/
|
|
2137
|
2137
|
function geodir_home_map_cats_key_value_array() {
|
|
2138
|
|
- $post_types = geodir_get_posttypes( 'object' );
|
|
|
2138
|
+ $post_types = geodir_get_posttypes('object');
|
|
2139
|
2139
|
|
|
2140
|
2140
|
$return = array();
|
|
2141
|
|
- if ( ! empty( $post_types ) ) {
|
|
2142
|
|
- foreach ( $post_types as $key => $post_type ) {
|
|
2143
|
|
- $cpt_name = __( $post_type->labels->singular_name, 'geodirectory' );
|
|
2144
|
|
- $post_type_name = sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name );
|
|
2145
|
|
- $taxonomies = geodir_get_taxonomies( $key );
|
|
2146
|
|
- $cat_taxonomy = ! empty( $taxonomies[0] ) ? $taxonomies[0] : null;
|
|
2147
|
|
- $cat_terms = $cat_taxonomy ? get_terms( $cat_taxonomy ) : null;
|
|
2148
|
|
-
|
|
2149
|
|
- if ( ! empty( $cat_terms ) ) {
|
|
2150
|
|
- $return[ 'optgroup_start-' . $key ] = $post_type_name;
|
|
2151
|
|
-
|
|
2152
|
|
- foreach ( $cat_terms as $cat_term ) {
|
|
2153
|
|
- $return[ $key . '_' . $cat_term->term_id ] = $cat_term->name;
|
|
|
2141
|
+ if (!empty($post_types)) {
|
|
|
2142
|
+ foreach ($post_types as $key => $post_type) {
|
|
|
2143
|
+ $cpt_name = __($post_type->labels->singular_name, 'geodirectory');
|
|
|
2144
|
+ $post_type_name = sprintf(__('%s Categories', 'geodirectory'), $cpt_name);
|
|
|
2145
|
+ $taxonomies = geodir_get_taxonomies($key);
|
|
|
2146
|
+ $cat_taxonomy = !empty($taxonomies[0]) ? $taxonomies[0] : null;
|
|
|
2147
|
+ $cat_terms = $cat_taxonomy ? get_terms($cat_taxonomy) : null;
|
|
|
2148
|
+
|
|
|
2149
|
+ if (!empty($cat_terms)) {
|
|
|
2150
|
+ $return['optgroup_start-'.$key] = $post_type_name;
|
|
|
2151
|
+
|
|
|
2152
|
+ foreach ($cat_terms as $cat_term) {
|
|
|
2153
|
+ $return[$key.'_'.$cat_term->term_id] = $cat_term->name;
|
|
2154
|
2154
|
}
|
|
2155
|
2155
|
|
|
2156
|
|
- $return[ 'optgroup_end-' . $key ] = $post_type_name;
|
|
|
2156
|
+ $return['optgroup_end-'.$key] = $post_type_name;
|
|
2157
|
2157
|
}
|
|
2158
|
2158
|
}
|
|
2159
|
2159
|
}
|
|
@@ -2169,14 +2169,14 @@ discard block |
|
|
block discarded – undo |
|
2169
|
2169
|
* @package GeoDirectory
|
|
2170
|
2170
|
*/
|
|
2171
|
2171
|
function geodir_twitter_tweet_button() {
|
|
2172
|
|
- if ( isset( $_GET['gde'] ) ) {
|
|
2173
|
|
- $link = '?url=' . urlencode( geodir_curPageURL() );
|
|
|
2172
|
+ if (isset($_GET['gde'])) {
|
|
|
2173
|
+ $link = '?url='.urlencode(geodir_curPageURL());
|
|
2174
|
2174
|
} else {
|
|
2175
|
2175
|
$link = '';
|
|
2176
|
2176
|
}
|
|
2177
|
2177
|
?>
|
|
2178
|
2178
|
<a href="http://twitter.com/share<?php echo $link; ?>"
|
|
2179
|
|
- class="twitter-share-button"><?php _e( 'Tweet', 'geodirectory' ); ?></a>
|
|
|
2179
|
+ class="twitter-share-button"><?php _e('Tweet', 'geodirectory'); ?></a>
|
|
2180
|
2180
|
<script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
|
|
2181
|
2181
|
<?php
|
|
2182
|
2182
|
}
|
|
@@ -2193,10 +2193,10 @@ discard block |
|
|
block discarded – undo |
|
2193
|
2193
|
function geodir_fb_like_button() {
|
|
2194
|
2194
|
global $post;
|
|
2195
|
2195
|
?>
|
|
2196
|
|
- <iframe <?php if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false ) ) {
|
|
|
2196
|
+ <iframe <?php if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) {
|
|
2197
|
2197
|
echo 'allowtransparency="true"';
|
|
2198
|
2198
|
} ?> class="facebook"
|
|
2199
|
|
- src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode( get_permalink( $post->ID ) ); ?>&layout=button_count&show_faces=false&width=100&action=like&colorscheme=light"
|
|
|
2199
|
+ src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode(get_permalink($post->ID)); ?>&layout=button_count&show_faces=false&width=100&action=like&colorscheme=light"
|
|
2200
|
2200
|
style="border:none; overflow:hidden; width:100px; height:20px"></iframe>
|
|
2201
|
2201
|
<?php
|
|
2202
|
2202
|
}
|
|
@@ -2227,7 +2227,7 @@ discard block |
|
|
block discarded – undo |
|
2227
|
2227
|
|
|
2228
|
2228
|
|
|
2229
|
2229
|
function geodir_listing_bounce_map_pin_on_hover() {
|
|
2230
|
|
- if ( get_option( 'geodir_listing_hover_bounce_map_pin', true ) ) {
|
|
|
2230
|
+ if (get_option('geodir_listing_hover_bounce_map_pin', true)) {
|
|
2231
|
2231
|
?>
|
|
2232
|
2232
|
<script>
|
|
2233
|
2233
|
jQuery(function ($) {
|
|
@@ -2250,44 +2250,44 @@ discard block |
|
|
block discarded – undo |
|
2250
|
2250
|
}
|
|
2251
|
2251
|
}
|
|
2252
|
2252
|
|
|
2253
|
|
-add_action( 'geodir_after_listing_listview', 'geodir_listing_bounce_map_pin_on_hover', 10 );
|
|
|
2253
|
+add_action('geodir_after_listing_listview', 'geodir_listing_bounce_map_pin_on_hover', 10);
|
|
2254
|
2254
|
|
|
2255
|
|
-add_action( 'geodir_after_favorite_html', 'geodir_output_favourite_html_listings', 1, 1 );
|
|
2256
|
|
-function geodir_output_favourite_html_listings( $post_id ) {
|
|
2257
|
|
- geodir_favourite_html( '', $post_id );
|
|
|
2255
|
+add_action('geodir_after_favorite_html', 'geodir_output_favourite_html_listings', 1, 1);
|
|
|
2256
|
+function geodir_output_favourite_html_listings($post_id) {
|
|
|
2257
|
+ geodir_favourite_html('', $post_id);
|
|
2258
|
2258
|
}
|
|
2259
|
2259
|
|
|
2260
|
|
-add_action( 'geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2 );
|
|
2261
|
|
-function geodir_output_pinpoint_html_listings( $post_id, $post = array() ) {
|
|
|
2260
|
+add_action('geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2);
|
|
|
2261
|
+function geodir_output_pinpoint_html_listings($post_id, $post = array()) {
|
|
2262
|
2262
|
global $wp_query;
|
|
2263
|
2263
|
|
|
2264
|
2264
|
$show_pin_point = $wp_query->is_main_query();
|
|
2265
|
2265
|
|
|
2266
|
|
- if ( ! empty( $post ) && ! empty( $show_pin_point ) && is_active_widget( false, "", "geodir_map_v3_listing_map" ) ) {
|
|
2267
|
|
- $term_icon_url = geodir_get_tax_meta( $post->default_category, 'ct_cat_icon', false, $post->post_type );
|
|
2268
|
|
- $marker_icon = isset( $term_icon_url['src'] ) ? $term_icon_url['src'] : get_option( 'geodir_default_marker_icon' );
|
|
|
2266
|
+ if (!empty($post) && !empty($show_pin_point) && is_active_widget(false, "", "geodir_map_v3_listing_map")) {
|
|
|
2267
|
+ $term_icon_url = geodir_get_tax_meta($post->default_category, 'ct_cat_icon', false, $post->post_type);
|
|
|
2268
|
+ $marker_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : get_option('geodir_default_marker_icon');
|
|
2269
|
2269
|
?>
|
|
2270
|
2270
|
<span class="geodir-pinpoint"
|
|
2271
|
|
- style="background:url('<?php echo $marker_icon; ?>') no-repeat scroll left top transparent;background-size:auto 100%; -webkit-background-size:auto 100%;-moz-background-size:auto 100%;height:9px;width:14px;"><?php echo apply_filters( 'geodir_listing_listview_pinpoint_inner_content', '', 'listing' ); ?></span>
|
|
|
2271
|
+ style="background:url('<?php echo $marker_icon; ?>') no-repeat scroll left top transparent;background-size:auto 100%; -webkit-background-size:auto 100%;-moz-background-size:auto 100%;height:9px;width:14px;"><?php echo apply_filters('geodir_listing_listview_pinpoint_inner_content', '', 'listing'); ?></span>
|
|
2272
|
2272
|
<a class="geodir-pinpoint-link" href="javascript:void(0)"
|
|
2273
|
2273
|
onclick="if(typeof openMarker=='function'){openMarker('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"
|
|
2274
|
2274
|
onmouseover="if(typeof animate_marker=='function'){animate_marker('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"
|
|
2275
|
|
- onmouseout="if(typeof stop_marker_animation=='function'){stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"><?php _e( 'Pinpoint', 'geodirectory' ); ?></a>
|
|
|
2275
|
+ onmouseout="if(typeof stop_marker_animation=='function'){stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"><?php _e('Pinpoint', 'geodirectory'); ?></a>
|
|
2276
|
2276
|
<?php
|
|
2277
|
2277
|
}
|
|
2278
|
2278
|
}
|
|
2279
|
2279
|
|
|
2280
|
2280
|
function geodir_search_form_submit_button() {
|
|
2281
|
2281
|
|
|
2282
|
|
- $new_style = get_option( 'geodir_show_search_old_search_from' ) ? false : true;
|
|
|
2282
|
+ $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
|
|
2283
|
2283
|
|
|
2284
|
|
- if ( $new_style ) {
|
|
|
2284
|
+ if ($new_style) {
|
|
2285
|
2285
|
$default_search_button_label = '<i class="fas fa-search" aria-hidden="true"></i>';
|
|
2286
|
|
- }else{
|
|
|
2286
|
+ } else {
|
|
2287
|
2287
|
$default_search_button_label = 'Search';
|
|
2288
|
2288
|
}
|
|
2289
|
|
- if ( get_option( 'geodir_search_button_label' ) && get_option( 'geodir_search_button_label' ) != 'Search' ) {
|
|
2290
|
|
- $default_search_button_label = __( get_option( 'geodir_search_button_label' ), 'geodirectory' );
|
|
|
2289
|
+ if (get_option('geodir_search_button_label') && get_option('geodir_search_button_label') != 'Search') {
|
|
|
2290
|
+ $default_search_button_label = __(get_option('geodir_search_button_label'), 'geodirectory');
|
|
2291
|
2291
|
}
|
|
2292
|
2292
|
|
|
2293
|
2293
|
/**
|
|
@@ -2299,76 +2299,76 @@ discard block |
|
|
block discarded – undo |
|
2299
|
2299
|
*
|
|
2300
|
2300
|
* @param string $default_search_button_label The current search button text.
|
|
2301
|
2301
|
*/
|
|
2302
|
|
- $default_search_button_label = apply_filters( 'geodir_search_default_search_button_text', $default_search_button_label );
|
|
|
2302
|
+ $default_search_button_label = apply_filters('geodir_search_default_search_button_text', $default_search_button_label);
|
|
2303
|
2303
|
|
|
2304
|
2304
|
$fa_class = '';
|
|
2305
|
|
- if ( strpos( $default_search_button_label, '&#' ) !== false ) {
|
|
|
2305
|
+ if (strpos($default_search_button_label, '&#') !== false) {
|
|
2306
|
2306
|
$fa_class = 'fa';
|
|
2307
|
2307
|
}
|
|
2308
|
2308
|
|
|
2309
|
|
- if ( ! empty( $new_style ) ) {
|
|
|
2309
|
+ if (!empty($new_style)) {
|
|
2310
|
2310
|
?>
|
|
2311
|
|
- <button class="geodir_submit_search"><?php _e( $default_search_button_label ,'geodirectory'); ?></button>
|
|
2312
|
|
- <?php }else{?>
|
|
2313
|
|
- <input type="button" value="<?php esc_attr_e( $default_search_button_label ); ?>" class="geodir_submit_search"/>
|
|
|
2311
|
+ <button class="geodir_submit_search"><?php _e($default_search_button_label, 'geodirectory'); ?></button>
|
|
|
2312
|
+ <?php } else {?>
|
|
|
2313
|
+ <input type="button" value="<?php esc_attr_e($default_search_button_label); ?>" class="geodir_submit_search"/>
|
|
2314
|
2314
|
<?php }
|
|
2315
|
2315
|
}
|
|
2316
|
2316
|
|
|
2317
|
|
-add_action( 'geodir_before_search_button', 'geodir_search_form_submit_button', 5000 );
|
|
|
2317
|
+add_action('geodir_before_search_button', 'geodir_search_form_submit_button', 5000);
|
|
2318
|
2318
|
|
|
2319
|
2319
|
function geodir_search_form_post_type_input() {
|
|
2320
|
2320
|
global $geodir_search_post_type;
|
|
2321
|
|
- $post_types = apply_filters( 'geodir_search_form_post_types', geodir_get_posttypes( 'object' ) );
|
|
|
2321
|
+ $post_types = apply_filters('geodir_search_form_post_types', geodir_get_posttypes('object'));
|
|
2322
|
2322
|
$curr_post_type = $geodir_search_post_type;
|
|
2323
|
2323
|
|
|
2324
|
|
- if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {
|
|
|
2324
|
+ if (!empty($post_types) && count((array) $post_types) > 1) {
|
|
2325
|
2325
|
|
|
2326
|
|
- foreach ( $post_types as $post_type => $info ){
|
|
|
2326
|
+ foreach ($post_types as $post_type => $info) {
|
|
2327
|
2327
|
global $wpdb;
|
|
2328
|
|
- $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );
|
|
2329
|
|
- if ( ! $has_posts ) {
|
|
|
2328
|
+ $has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));
|
|
|
2329
|
+ if (!$has_posts) {
|
|
2330
|
2330
|
unset($post_types->{$post_type});
|
|
2331
|
2331
|
}
|
|
2332
|
2332
|
}
|
|
2333
|
2333
|
|
|
2334
|
|
- if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {
|
|
|
2334
|
+ if (!empty($post_types) && count((array) $post_types) > 1) {
|
|
2335
|
2335
|
|
|
2336
|
|
- $new_style = get_option( 'geodir_show_search_old_search_from' ) ? false : true;
|
|
2337
|
|
- if ( $new_style ) {
|
|
|
2336
|
+ $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
|
|
|
2337
|
+ if ($new_style) {
|
|
2338
|
2338
|
echo "<div class='gd-search-input-wrapper gd-search-field-cpt'>";
|
|
2339
|
2339
|
}
|
|
2340
|
2340
|
?>
|
|
2341
|
2341
|
<select name="stype" class="search_by_post">
|
|
2342
|
|
- <?php foreach ( $post_types as $post_type => $info ):
|
|
|
2342
|
+ <?php foreach ($post_types as $post_type => $info):
|
|
2343
|
2343
|
global $wpdb;
|
|
2344
|
2344
|
?>
|
|
2345
|
2345
|
|
|
2346
|
|
- <option data-label="<?php echo get_post_type_archive_link( $post_type ); ?>"
|
|
2347
|
|
- value="<?php echo $post_type; ?>" <?php if ( isset( $_REQUEST['stype'] ) ) {
|
|
2348
|
|
- if ( $post_type == $_REQUEST['stype'] ) {
|
|
|
2346
|
+ <option data-label="<?php echo get_post_type_archive_link($post_type); ?>"
|
|
|
2347
|
+ value="<?php echo $post_type; ?>" <?php if (isset($_REQUEST['stype'])) {
|
|
|
2348
|
+ if ($post_type == $_REQUEST['stype']) {
|
|
2349
|
2349
|
echo 'selected="selected"';
|
|
2350
|
2350
|
}
|
|
2351
|
|
- } elseif ( $curr_post_type == $post_type ) {
|
|
|
2351
|
+ } elseif ($curr_post_type == $post_type) {
|
|
2352
|
2352
|
echo 'selected="selected"';
|
|
2353
|
|
- } ?>><?php _e( geodir_utf8_ucfirst( $info->labels->name ), 'geodirectory' ); ?></option>
|
|
|
2353
|
+ } ?>><?php _e(geodir_utf8_ucfirst($info->labels->name), 'geodirectory'); ?></option>
|
|
2354
|
2354
|
|
|
2355
|
2355
|
<?php endforeach; ?>
|
|
2356
|
2356
|
</select>
|
|
2357
|
2357
|
<?php
|
|
2358
|
|
- if ( $new_style ) {
|
|
|
2358
|
+ if ($new_style) {
|
|
2359
|
2359
|
echo "</div>";
|
|
2360
|
2360
|
}
|
|
2361
|
|
- }else{
|
|
2362
|
|
- if(! empty( $post_types )){
|
|
2363
|
|
- $pt_arr = (array)$post_types;
|
|
2364
|
|
- echo '<input type="hidden" name="stype" value="' . key( $pt_arr ) . '" />';
|
|
2365
|
|
- }else{
|
|
|
2361
|
+ } else {
|
|
|
2362
|
+ if (!empty($post_types)) {
|
|
|
2363
|
+ $pt_arr = (array) $post_types;
|
|
|
2364
|
+ echo '<input type="hidden" name="stype" value="'.key($pt_arr).'" />';
|
|
|
2365
|
+ } else {
|
|
2366
|
2366
|
echo '<input type="hidden" name="stype" value="gd_place" />';
|
|
2367
|
2367
|
}
|
|
2368
|
2368
|
|
|
2369
|
2369
|
}
|
|
2370
|
2370
|
|
|
2371
|
|
- }elseif ( ! empty( $post_types ) ) {
|
|
|
2371
|
+ }elseif (!empty($post_types)) {
|
|
2372
|
2372
|
echo '<input type="hidden" name="stype" value="gd_place" />';
|
|
2373
|
2373
|
}
|
|
2374
|
2374
|
}
|
|
@@ -2376,27 +2376,27 @@ discard block |
|
|
block discarded – undo |
|
2376
|
2376
|
function geodir_search_form_search_input() {
|
|
2377
|
2377
|
|
|
2378
|
2378
|
$default_search_for_text = SEARCH_FOR_TEXT;
|
|
2379
|
|
- if ( get_option( 'geodir_search_field_default_text' ) ) {
|
|
2380
|
|
- $default_search_for_text = __( get_option( 'geodir_search_field_default_text' ), 'geodirectory' );
|
|
|
2379
|
+ if (get_option('geodir_search_field_default_text')) {
|
|
|
2380
|
+ $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
|
|
2381
|
2381
|
}
|
|
2382
|
2382
|
|
|
2383
|
2383
|
$new_style = get_option('geodir_show_search_old_search_from') ? false : true;
|
|
2384
|
|
- if($new_style){
|
|
|
2384
|
+ if ($new_style) {
|
|
2385
|
2385
|
echo "<div class='gd-search-input-wrapper gd-search-field-search'>";
|
|
2386
|
2386
|
}
|
|
2387
|
2387
|
?>
|
|
2388
|
2388
|
<input class="search_text" name="s"
|
|
2389
|
|
- value="<?php if ( isset( $_REQUEST['s'] ) && trim( $_REQUEST['s'] ) != '' ) {
|
|
2390
|
|
- $search_term = esc_attr( stripslashes_deep( $_REQUEST['s'] ) );
|
|
|
2389
|
+ value="<?php if (isset($_REQUEST['s']) && trim($_REQUEST['s']) != '') {
|
|
|
2390
|
+ $search_term = esc_attr(stripslashes_deep($_REQUEST['s']));
|
|
2391
|
2391
|
echo $search_term;
|
|
2392
|
2392
|
} else {
|
|
2393
|
2393
|
echo $default_search_for_text;
|
|
2394
|
2394
|
} ?>" type="text"
|
|
2395
|
|
- onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql( $default_search_for_text ); ?>';}"
|
|
2396
|
|
- onfocus="if (this.value == '<?php echo esc_sql( $default_search_for_text ); ?>') {this.value = '';}"
|
|
|
2395
|
+ onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql($default_search_for_text); ?>';}"
|
|
|
2396
|
+ onfocus="if (this.value == '<?php echo esc_sql($default_search_for_text); ?>') {this.value = '';}"
|
|
2397
|
2397
|
onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);">
|
|
2398
|
2398
|
<?php
|
|
2399
|
|
- if($new_style){
|
|
|
2399
|
+ if ($new_style) {
|
|
2400
|
2400
|
echo "</div>";
|
|
2401
|
2401
|
}
|
|
2402
|
2402
|
}
|
|
@@ -2404,12 +2404,12 @@ discard block |
|
|
block discarded – undo |
|
2404
|
2404
|
function geodir_search_form_near_input() {
|
|
2405
|
2405
|
|
|
2406
|
2406
|
$default_near_text = NEAR_TEXT;
|
|
2407
|
|
- if ( get_option( 'geodir_near_field_default_text' ) ) {
|
|
2408
|
|
- $default_near_text = __( get_option( 'geodir_near_field_default_text' ), 'geodirectory' );
|
|
|
2407
|
+ if (get_option('geodir_near_field_default_text')) {
|
|
|
2408
|
+ $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
|
|
2409
|
2409
|
}
|
|
2410
|
2410
|
|
|
2411
|
|
- if ( isset( $_REQUEST['snear'] ) && $_REQUEST['snear'] != '' ) {
|
|
2412
|
|
- $near = esc_attr( stripslashes_deep( $_REQUEST['snear'] ) );
|
|
|
2411
|
+ if (isset($_REQUEST['snear']) && $_REQUEST['snear'] != '') {
|
|
|
2412
|
+ $near = esc_attr(stripslashes_deep($_REQUEST['snear']));
|
|
2413
|
2413
|
} else {
|
|
2414
|
2414
|
$near = $default_near_text;
|
|
2415
|
2415
|
}
|
|
@@ -2423,7 +2423,7 @@ discard block |
|
|
block discarded – undo |
|
2423
|
2423
|
* @since 1.6.9
|
|
2424
|
2424
|
* @param string $curr_post_type The current post type.
|
|
2425
|
2425
|
*/
|
|
2426
|
|
- $near_input_extra = apply_filters('geodir_near_input_extra','',$curr_post_type);
|
|
|
2426
|
+ $near_input_extra = apply_filters('geodir_near_input_extra', '', $curr_post_type);
|
|
2427
|
2427
|
|
|
2428
|
2428
|
|
|
2429
|
2429
|
/**
|
|
@@ -2436,7 +2436,7 @@ discard block |
|
|
block discarded – undo |
|
2436
|
2436
|
* @param string $near The current near value.
|
|
2437
|
2437
|
* @param string $default_near_text The default near value.
|
|
2438
|
2438
|
*/
|
|
2439
|
|
- $near = apply_filters( 'geodir_search_near_text', $near, $default_near_text );
|
|
|
2439
|
+ $near = apply_filters('geodir_search_near_text', $near, $default_near_text);
|
|
2440
|
2440
|
/**
|
|
2441
|
2441
|
* Filter the default "Near" text value for the search form.
|
|
2442
|
2442
|
*
|
|
@@ -2447,7 +2447,7 @@ discard block |
|
|
block discarded – undo |
|
2447
|
2447
|
* @param string $near The current near value.
|
|
2448
|
2448
|
* @param string $default_near_text The default near value.
|
|
2449
|
2449
|
*/
|
|
2450
|
|
- $default_near_text = apply_filters( 'geodir_search_default_near_text', $default_near_text, $near );
|
|
|
2450
|
+ $default_near_text = apply_filters('geodir_search_default_near_text', $default_near_text, $near);
|
|
2451
|
2451
|
/**
|
|
2452
|
2452
|
* Filter the class for the near search input.
|
|
2453
|
2453
|
*
|
|
@@ -2455,10 +2455,10 @@ discard block |
|
|
block discarded – undo |
|
2455
|
2455
|
*
|
|
2456
|
2456
|
* @param string $class The class for the HTML near input, default is blank.
|
|
2457
|
2457
|
*/
|
|
2458
|
|
- $near_class = apply_filters( 'geodir_search_near_class', '' );
|
|
|
2458
|
+ $near_class = apply_filters('geodir_search_near_class', '');
|
|
2459
|
2459
|
|
|
2460
|
2460
|
$new_style = get_option('geodir_show_search_old_search_from') ? false : true;
|
|
2461
|
|
- if($new_style){
|
|
|
2461
|
+ if ($new_style) {
|
|
2462
|
2462
|
echo "<div class='gd-search-input-wrapper gd-search-field-near' $near_input_extra>";
|
|
2463
|
2463
|
|
|
2464
|
2464
|
do_action('geodir_before_near_input');
|
|
@@ -2466,30 +2466,30 @@ discard block |
|
|
block discarded – undo |
|
2466
|
2466
|
|
|
2467
|
2467
|
?>
|
|
2468
|
2468
|
<input name="snear" class="snear <?php echo $near_class; ?>" type="text" value="<?php echo $near; ?>"
|
|
2469
|
|
- onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql( $near ); ?>' != '' ? '<?php echo esc_sql( $near ); ?>' : '<?php echo $default_near_text; ?>');}"
|
|
2470
|
|
- onfocus="if (this.value == '<?php echo $default_near_text; ?>' || this.value =='<?php echo esc_sql( $near ); ?>') {this.value = '';}"
|
|
2471
|
|
- onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);" <?php echo $near_input_extra;?>/>
|
|
|
2469
|
+ onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql($near); ?>' != '' ? '<?php echo esc_sql($near); ?>' : '<?php echo $default_near_text; ?>');}"
|
|
|
2470
|
+ onfocus="if (this.value == '<?php echo $default_near_text; ?>' || this.value =='<?php echo esc_sql($near); ?>') {this.value = '';}"
|
|
|
2471
|
+ onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);" <?php echo $near_input_extra; ?>/>
|
|
2472
|
2472
|
<?php
|
|
2473
|
|
- if($new_style){
|
|
|
2473
|
+ if ($new_style) {
|
|
2474
|
2474
|
do_action('geodir_after_near_input');
|
|
2475
|
2475
|
|
|
2476
|
2476
|
echo "</div>";
|
|
2477
|
2477
|
}
|
|
2478
|
2478
|
}
|
|
2479
|
2479
|
|
|
2480
|
|
-add_action( 'geodir_search_form_inputs', 'geodir_search_form_post_type_input', 10 );
|
|
2481
|
|
-add_action( 'geodir_search_form_inputs', 'geodir_search_form_search_input', 20 );
|
|
2482
|
|
-add_action( 'geodir_search_form_inputs', 'geodir_search_form_near_input', 30 );
|
|
|
2480
|
+add_action('geodir_search_form_inputs', 'geodir_search_form_post_type_input', 10);
|
|
|
2481
|
+add_action('geodir_search_form_inputs', 'geodir_search_form_search_input', 20);
|
|
|
2482
|
+add_action('geodir_search_form_inputs', 'geodir_search_form_near_input', 30);
|
|
2483
|
2483
|
|
|
2484
|
|
-function geodir_get_search_post_type($pt=''){
|
|
|
2484
|
+function geodir_get_search_post_type($pt = '') {
|
|
2485
|
2485
|
global $geodir_search_post_type;
|
|
2486
|
2486
|
|
|
2487
|
|
- if($pt!=''){return $geodir_search_post_type = $pt;}
|
|
2488
|
|
- if(!empty($geodir_search_post_type)){ return $geodir_search_post_type;}
|
|
|
2487
|
+ if ($pt != '') {return $geodir_search_post_type = $pt; }
|
|
|
2488
|
+ if (!empty($geodir_search_post_type)) { return $geodir_search_post_type; }
|
|
2489
|
2489
|
|
|
2490
|
2490
|
$geodir_search_post_type = geodir_get_current_posttype();
|
|
2491
|
2491
|
|
|
2492
|
|
- if(!$geodir_search_post_type) {
|
|
|
2492
|
+ if (!$geodir_search_post_type) {
|
|
2493
|
2493
|
$geodir_search_post_type = geodir_get_default_posttype();
|
|
2494
|
2494
|
}
|
|
2495
|
2495
|
|
|
@@ -2497,7 +2497,7 @@ discard block |
|
|
block discarded – undo |
|
2497
|
2497
|
return $geodir_search_post_type;
|
|
2498
|
2498
|
}
|
|
2499
|
2499
|
|
|
2500
|
|
-function geodir_search_form(){
|
|
|
2500
|
+function geodir_search_form() {
|
|
2501
|
2501
|
|
|
2502
|
2502
|
geodir_get_search_post_type();
|
|
2503
|
2503
|
|
|
@@ -2507,8 +2507,8 @@ discard block |
|
|
block discarded – undo |
|
2507
|
2507
|
die();
|
|
2508
|
2508
|
}
|
|
2509
|
2509
|
|
|
2510
|
|
-add_action( 'wp_ajax_geodir_search_form', 'geodir_search_form' );
|
|
2511
|
|
-add_action( 'wp_ajax_nopriv_geodir_search_form', 'geodir_search_form' );
|
|
|
2510
|
+add_action('wp_ajax_geodir_search_form', 'geodir_search_form');
|
|
|
2511
|
+add_action('wp_ajax_nopriv_geodir_search_form', 'geodir_search_form');
|
|
2512
|
2512
|
|
|
2513
|
2513
|
/**
|
|
2514
|
2514
|
* Check wpml active or not.
|
|
@@ -2582,7 +2582,7 @@ discard block |
|
|
block discarded – undo |
|
2582
|
2582
|
}
|
|
2583
|
2583
|
}
|
|
2584
|
2584
|
}
|
|
2585
|
|
-add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );
|
|
|
2585
|
+add_filter('icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4);
|
|
2586
|
2586
|
|
|
2587
|
2587
|
/**
|
|
2588
|
2588
|
* Duplicate post listing manually after listing saved.
|
|
@@ -2606,7 +2606,7 @@ discard block |
|
|
block discarded – undo |
|
2606
|
2606
|
foreach ($post_duplicates as $lang => $dup_post_id) {
|
|
2607
|
2607
|
geodir_icl_make_duplicate($post_id, $lang, $request_info, $dup_post_id, true);
|
|
2608
|
2608
|
}
|
|
2609
|
|
- do_action( 'geodir_wpml_listing_duplicated', $post_id, $request_info );
|
|
|
2609
|
+ do_action('geodir_wpml_listing_duplicated', $post_id, $request_info);
|
|
2610
|
2610
|
}
|
|
2611
|
2611
|
}
|
|
2612
|
2612
|
|
|
@@ -2625,7 +2625,7 @@ discard block |
|
|
block discarded – undo |
|
2625
|
2625
|
function geodir_wpml_duplicate_post_reviews($master_post_id, $tr_post_id, $lang) {
|
|
2626
|
2626
|
global $wpdb;
|
|
2627
|
2627
|
|
|
2628
|
|
- $reviews = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id=%d ORDER BY id ASC", $master_post_id), ARRAY_A);
|
|
|
2628
|
+ $reviews = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM ".GEODIR_REVIEW_TABLE." WHERE post_id=%d ORDER BY id ASC", $master_post_id), ARRAY_A);
|
|
2629
|
2629
|
|
|
2630
|
2630
|
if (!empty($reviews)) {
|
|
2631
|
2631
|
foreach ($reviews as $review) {
|
|
@@ -2654,15 +2654,15 @@ discard block |
|
|
block discarded – undo |
|
2654
|
2654
|
global $wpdb, $plugin_prefix;
|
|
2655
|
2655
|
|
|
2656
|
2656
|
$post_type = get_post_type($master_post_id);
|
|
2657
|
|
- $post_table = $plugin_prefix . $post_type . '_detail';
|
|
|
2657
|
+ $post_table = $plugin_prefix.$post_type.'_detail';
|
|
2658
|
2658
|
|
|
2659
|
|
- $query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));
|
|
2660
|
|
- $data = (array)$wpdb->get_row($query);
|
|
|
2659
|
+ $query = $wpdb->prepare("SELECT * FROM ".$post_table." WHERE post_id = %d", array($master_post_id));
|
|
|
2660
|
+ $data = (array) $wpdb->get_row($query);
|
|
2661
|
2661
|
|
|
2662
|
|
- if ( !empty( $data ) ) {
|
|
2663
|
|
- $data = apply_filters( 'geodir_icl_duplicate_post_data', $data, $master_post_id, $tr_post_id, $lang );
|
|
|
2662
|
+ if (!empty($data)) {
|
|
|
2663
|
+ $data = apply_filters('geodir_icl_duplicate_post_data', $data, $master_post_id, $tr_post_id, $lang);
|
|
2664
|
2664
|
$data['post_id'] = $tr_post_id;
|
|
2665
|
|
- unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category']);
|
|
|
2665
|
+ unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type.'category']);
|
|
2666
|
2666
|
$wpdb->update($post_table, $data, array('post_id' => $tr_post_id));
|
|
2667
|
2667
|
return true;
|
|
2668
|
2668
|
}
|
|
@@ -2687,7 +2687,7 @@ discard block |
|
|
block discarded – undo |
|
2687
|
2687
|
global $sitepress, $wpdb;
|
|
2688
|
2688
|
$post_type = get_post_type($master_post_id);
|
|
2689
|
2689
|
|
|
2690
|
|
- remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language
|
|
|
2690
|
+ remove_filter('get_term', array($sitepress, 'get_term_adjust_id')); // AVOID filtering to current language
|
|
2691
|
2691
|
|
|
2692
|
2692
|
$taxonomies = get_object_taxonomies($post_type);
|
|
2693
|
2693
|
foreach ($taxonomies as $taxonomy) {
|
|
@@ -2696,9 +2696,9 @@ discard block |
|
|
block discarded – undo |
|
2696
|
2696
|
|
|
2697
|
2697
|
if ($terms) {
|
|
2698
|
2698
|
foreach ($terms as $term) {
|
|
2699
|
|
- $tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);
|
|
|
2699
|
+ $tr_id = apply_filters('translate_object_id', $term->term_id, $taxonomy, false, $lang);
|
|
2700
|
2700
|
|
|
2701
|
|
- if (!is_null($tr_id)){
|
|
|
2701
|
+ if (!is_null($tr_id)) {
|
|
2702
|
2702
|
// not using get_term - unfiltered get_term
|
|
2703
|
2703
|
$translated_term = $wpdb->get_row($wpdb->prepare("
|
|
2704
|
2704
|
SELECT * FROM {$wpdb->terms} t JOIN {$wpdb->term_taxonomy} x ON x.term_id = t.term_id WHERE t.term_id = %d AND x.taxonomy = %s", $tr_id, $taxonomy));
|
|
@@ -2707,14 +2707,14 @@ discard block |
|
|
block discarded – undo |
|
2707
|
2707
|
}
|
|
2708
|
2708
|
}
|
|
2709
|
2709
|
|
|
2710
|
|
- if (!is_taxonomy_hierarchical($taxonomy)){
|
|
2711
|
|
- $terms_array = array_unique( array_map( 'intval', $terms_array ) );
|
|
|
2710
|
+ if (!is_taxonomy_hierarchical($taxonomy)) {
|
|
|
2711
|
+ $terms_array = array_unique(array_map('intval', $terms_array));
|
|
2712
|
2712
|
}
|
|
2713
|
2713
|
|
|
2714
|
2714
|
wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);
|
|
2715
|
2715
|
|
|
2716
|
|
- if ($taxonomy == $post_type . 'category') {
|
|
2717
|
|
- geodir_set_postcat_structure($tr_post_id, $post_type . 'category');
|
|
|
2716
|
+ if ($taxonomy == $post_type.'category') {
|
|
|
2717
|
+ geodir_set_postcat_structure($tr_post_id, $post_type.'category');
|
|
2718
|
2718
|
}
|
|
2719
|
2719
|
}
|
|
2720
|
2720
|
}
|
|
@@ -2735,15 +2735,15 @@ discard block |
|
|
block discarded – undo |
|
2735
|
2735
|
function geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang) {
|
|
2736
|
2736
|
global $wpdb;
|
|
2737
|
2737
|
|
|
2738
|
|
- $query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));
|
|
|
2738
|
+ $query = $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));
|
|
2739
|
2739
|
$wpdb->query($query);
|
|
2740
|
2740
|
|
|
2741
|
|
- $query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));
|
|
|
2741
|
+ $query = $wpdb->prepare("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));
|
|
2742
|
2742
|
$post_images = $wpdb->get_results($query);
|
|
2743
|
2743
|
|
|
2744
|
|
- if ( !empty( $post_images ) ) {
|
|
2745
|
|
- foreach ( $post_images as $post_image) {
|
|
2746
|
|
- $image_data = (array)$post_image;
|
|
|
2744
|
+ if (!empty($post_images)) {
|
|
|
2745
|
+ foreach ($post_images as $post_image) {
|
|
|
2746
|
+ $image_data = (array) $post_image;
|
|
2747
|
2747
|
unset($image_data['ID']);
|
|
2748
|
2748
|
$image_data['post_id'] = $tr_post_id;
|
|
2749
|
2749
|
|
|
@@ -2776,13 +2776,13 @@ discard block |
|
|
block discarded – undo |
|
2776
|
2776
|
function geodir_wpml_duplicate_post_review($master_comment_id, $master_post_id, $tr_post_id, $lang) {
|
|
2777
|
2777
|
global $wpdb, $plugin_prefix, $sitepress;
|
|
2778
|
2778
|
|
|
2779
|
|
- $review = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d ORDER BY id ASC", $master_comment_id), ARRAY_A);
|
|
|
2779
|
+ $review = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d ORDER BY id ASC", $master_comment_id), ARRAY_A);
|
|
2780
|
2780
|
|
|
2781
|
2781
|
if (empty($review)) {
|
|
2782
|
2782
|
return false;
|
|
2783
|
2783
|
}
|
|
2784
|
2784
|
if ($review['post_id'] != $master_post_id) {
|
|
2785
|
|
- $wpdb->query($wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET post_id=%d WHERE comment_id=%d", $master_post_id, $master_comment_id));
|
|
|
2785
|
+ $wpdb->query($wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET post_id=%d WHERE comment_id=%d", $master_post_id, $master_comment_id));
|
|
2786
|
2786
|
geodir_update_postrating($master_post_id, $post_type);
|
|
2787
|
2787
|
}
|
|
2788
|
2788
|
|
|
@@ -2793,9 +2793,9 @@ discard block |
|
|
block discarded – undo |
|
2793
|
2793
|
}
|
|
2794
|
2794
|
|
|
2795
|
2795
|
$post_type = get_post_type($master_post_id);
|
|
2796
|
|
- $post_table = $plugin_prefix . $post_type . '_detail';
|
|
|
2796
|
+ $post_table = $plugin_prefix.$post_type.'_detail';
|
|
2797
|
2797
|
|
|
2798
|
|
- $translated_post = $wpdb->get_row($wpdb->prepare("SELECT post_title, post_latitude, post_longitude, post_city, post_region, post_country FROM " . $post_table . " WHERE post_id = %d", $tr_post_id), ARRAY_A);
|
|
|
2798
|
+ $translated_post = $wpdb->get_row($wpdb->prepare("SELECT post_title, post_latitude, post_longitude, post_city, post_region, post_country FROM ".$post_table." WHERE post_id = %d", $tr_post_id), ARRAY_A);
|
|
2799
|
2799
|
if (empty($translated_post)) {
|
|
2800
|
2800
|
return false;
|
|
2801
|
2801
|
}
|
|
@@ -2813,7 +2813,7 @@ discard block |
|
|
block discarded – undo |
|
2813
|
2813
|
unset($review['id']);
|
|
2814
|
2814
|
}
|
|
2815
|
2815
|
|
|
2816
|
|
- $tr_review_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d AND post_id=%d ORDER BY id ASC", $tr_comment_id, $tr_post_id));
|
|
|
2816
|
+ $tr_review_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d AND post_id=%d ORDER BY id ASC", $tr_comment_id, $tr_post_id));
|
|
2817
|
2817
|
|
|
2818
|
2818
|
if ($tr_review_id) { // update review
|
|
2819
|
2819
|
$wpdb->update(GEODIR_REVIEW_TABLE, $review, array('id' => $tr_review_id));
|
|
@@ -2826,8 +2826,8 @@ discard block |
|
|
block discarded – undo |
|
2826
|
2826
|
geodir_update_postrating($tr_post_id, $post_type);
|
|
2827
|
2827
|
|
|
2828
|
2828
|
if (defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_review') && $sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
2829
|
|
- $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_COMMENTS_REVIEWS_TABLE . " WHERE comment_id = %d", array($tr_comment_id)));
|
|
2830
|
|
- $likes = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_COMMENTS_REVIEWS_TABLE . " WHERE comment_id=%d ORDER BY like_date ASC", $master_comment_id, $tr_post_id), ARRAY_A);
|
|
|
2829
|
+ $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_COMMENTS_REVIEWS_TABLE." WHERE comment_id = %d", array($tr_comment_id)));
|
|
|
2830
|
+ $likes = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_COMMENTS_REVIEWS_TABLE." WHERE comment_id=%d ORDER BY like_date ASC", $master_comment_id, $tr_post_id), ARRAY_A);
|
|
2831
|
2831
|
|
|
2832
|
2832
|
if (!empty($likes)) {
|
|
2833
|
2833
|
foreach ($likes as $like) {
|
|
@@ -2929,7 +2929,7 @@ discard block |
|
|
block discarded – undo |
|
2929
|
2929
|
* @return bool True if review star disabled, otherwise false.
|
|
2930
|
2930
|
*/
|
|
2931
|
2931
|
function geodir_rating_disabled_post_types() {
|
|
2932
|
|
- $post_types = get_option( 'geodir_disable_rating_cpt' );
|
|
|
2932
|
+ $post_types = get_option('geodir_disable_rating_cpt');
|
|
2933
|
2933
|
|
|
2934
|
2934
|
/**
|
|
2935
|
2935
|
* Filter the post types array which have rating disabled.
|
|
@@ -2938,7 +2938,7 @@ discard block |
|
|
block discarded – undo |
|
2938
|
2938
|
*
|
|
2939
|
2939
|
* @param array $post_types Array of post types which have rating starts disabled.
|
|
2940
|
2940
|
*/
|
|
2941
|
|
- return apply_filters( 'geodir_rating_disabled_post_types', $post_types );
|
|
|
2941
|
+ return apply_filters('geodir_rating_disabled_post_types', $post_types);
|
|
2942
|
2942
|
}
|
|
2943
|
2943
|
|
|
2944
|
2944
|
/**
|
|
@@ -2950,30 +2950,30 @@ discard block |
|
|
block discarded – undo |
|
2950
|
2950
|
* @param bool $taxonomy Whether $post_type is taxonomy or not.
|
|
2951
|
2951
|
* @return bool True if review star disabled, otherwise false.
|
|
2952
|
2952
|
*/
|
|
2953
|
|
-function geodir_cpt_has_rating_disabled( $post_type = '', $taxonomy = false ) {
|
|
|
2953
|
+function geodir_cpt_has_rating_disabled($post_type = '', $taxonomy = false) {
|
|
2954
|
2954
|
$post_types = geodir_rating_disabled_post_types();
|
|
2955
|
2955
|
|
|
2956
|
|
- if ( empty( $post_types ) ) {
|
|
|
2956
|
+ if (empty($post_types)) {
|
|
2957
|
2957
|
return false;
|
|
2958
|
2958
|
}
|
|
2959
|
2959
|
|
|
2960
|
|
- if ( is_int( $post_type ) ) {
|
|
2961
|
|
- $post_type = get_post_type( $post_type );
|
|
|
2960
|
+ if (is_int($post_type)) {
|
|
|
2961
|
+ $post_type = get_post_type($post_type);
|
|
2962
|
2962
|
}
|
|
2963
|
2963
|
|
|
2964
|
|
- if ( $taxonomy && !empty( $post_types ) ) {
|
|
|
2964
|
+ if ($taxonomy && !empty($post_types)) {
|
|
2965
|
2965
|
$posttypes = array();
|
|
2966
|
2966
|
|
|
2967
|
|
- foreach ( $post_types as $posttype ) {
|
|
2968
|
|
- $posttypes[] = $posttype . 'category';
|
|
2969
|
|
- $posttypes[] = $posttype . '_tags';
|
|
|
2967
|
+ foreach ($post_types as $posttype) {
|
|
|
2968
|
+ $posttypes[] = $posttype.'category';
|
|
|
2969
|
+ $posttypes[] = $posttype.'_tags';
|
|
2970
|
2970
|
}
|
|
2971
|
2971
|
|
|
2972
|
2972
|
$post_types = $posttypes;
|
|
2973
|
2973
|
}
|
|
2974
|
2974
|
|
|
2975
|
2975
|
$return = false;
|
|
2976
|
|
- if ( $post_type != '' && !empty( $post_types ) && in_array( $post_type, $post_types ) ) {
|
|
|
2976
|
+ if ($post_type != '' && !empty($post_types) && in_array($post_type, $post_types)) {
|
|
2977
|
2977
|
$return = true;
|
|
2978
|
2978
|
}
|
|
2979
|
2979
|
|
|
@@ -2988,7 +2988,7 @@ discard block |
|
|
block discarded – undo |
|
2988
|
2988
|
* @return bool True if Yoast SEO disabled on GD pages.
|
|
2989
|
2989
|
*/
|
|
2990
|
2990
|
function geodir_disable_yoast_seo_metas() {
|
|
2991
|
|
- return (bool)get_option( 'geodir_disable_yoast_meta' );
|
|
|
2991
|
+ return (bool) get_option('geodir_disable_yoast_meta');
|
|
2992
|
2992
|
}
|
|
2993
|
2993
|
|
|
2994
|
2994
|
/**
|
|
@@ -2999,30 +2999,30 @@ discard block |
|
|
block discarded – undo |
|
2999
|
2999
|
* @param int $post_id The post ID.
|
|
3000
|
3000
|
* @return bool True if allowed.
|
|
3001
|
3001
|
*/
|
|
3002
|
|
-function geodir_wpml_allowed_to_duplicate( $post_id ) {
|
|
|
3002
|
+function geodir_wpml_allowed_to_duplicate($post_id) {
|
|
3003
|
3003
|
$allowed = false;
|
|
3004
|
3004
|
|
|
3005
|
|
- if ( !geodir_is_wpml() || empty( $post_id ) ) {
|
|
|
3005
|
+ if (!geodir_is_wpml() || empty($post_id)) {
|
|
3006
|
3006
|
return $allowed;
|
|
3007
|
3007
|
}
|
|
3008
|
3008
|
|
|
3009
|
|
- $user_id = (int)get_current_user_id();
|
|
|
3009
|
+ $user_id = (int) get_current_user_id();
|
|
3010
|
3010
|
|
|
3011
|
|
- if ( empty( $user_id ) ) {
|
|
|
3011
|
+ if (empty($user_id)) {
|
|
3012
|
3012
|
return $allowed;
|
|
3013
|
3013
|
}
|
|
3014
|
3014
|
|
|
3015
|
|
- $post_type = get_post_type( $post_id );
|
|
3016
|
|
- if ( !geodir_wpml_is_post_type_translated( $post_type ) || get_post_meta( $post_id, '_icl_lang_duplicate_of', true ) ) {
|
|
|
3015
|
+ $post_type = get_post_type($post_id);
|
|
|
3016
|
+ if (!geodir_wpml_is_post_type_translated($post_type) || get_post_meta($post_id, '_icl_lang_duplicate_of', true)) {
|
|
3017
|
3017
|
return $allowed;
|
|
3018
|
3018
|
}
|
|
3019
|
3019
|
|
|
3020
|
|
- if ( geodir_listing_belong_to_current_user( $post_id ) ) {
|
|
|
3020
|
+ if (geodir_listing_belong_to_current_user($post_id)) {
|
|
3021
|
3021
|
$allowed = true;
|
|
3022
|
3022
|
}
|
|
3023
|
3023
|
|
|
3024
|
|
- $disable_cpts = get_option( 'geodir_wpml_disable_duplicate' );
|
|
3025
|
|
- if ( $allowed && !empty( $disable_cpts ) && in_array( $post_type, $disable_cpts ) ) {
|
|
|
3024
|
+ $disable_cpts = get_option('geodir_wpml_disable_duplicate');
|
|
|
3025
|
+ if ($allowed && !empty($disable_cpts) && in_array($post_type, $disable_cpts)) {
|
|
3026
|
3026
|
$allowed = false;
|
|
3027
|
3027
|
}
|
|
3028
|
3028
|
|
|
@@ -3032,7 +3032,7 @@ discard block |
|
|
block discarded – undo |
|
3032
|
3032
|
* @param bool $allowed True if allowed.
|
|
3033
|
3033
|
* @param int $post_id The post ID.
|
|
3034
|
3034
|
*/
|
|
3035
|
|
- return apply_filters( 'geodir_wpml_allowed_to_duplicate', $allowed, $post_id );
|
|
|
3035
|
+ return apply_filters('geodir_wpml_allowed_to_duplicate', $allowed, $post_id);
|
|
3036
|
3036
|
}
|
|
3037
|
3037
|
|
|
3038
|
3038
|
/**
|
|
@@ -3047,61 +3047,61 @@ discard block |
|
|
block discarded – undo |
|
3047
|
3047
|
* @param string $content_html The output html of the geodir_edit_post_link() function.
|
|
3048
|
3048
|
* @return string Filtered html of the geodir_edit_post_link() function.
|
|
3049
|
3049
|
*/
|
|
3050
|
|
-function geodir_wpml_frontend_duplicate_listing( $content_html ) {
|
|
|
3050
|
+function geodir_wpml_frontend_duplicate_listing($content_html) {
|
|
3051
|
3051
|
global $post, $preview, $sitepress;
|
|
3052
|
3052
|
|
|
3053
|
|
- if ( !empty( $post->ID ) && !$preview && geodir_is_page( 'detail' ) && geodir_wpml_allowed_to_duplicate( $post->ID ) ) {
|
|
|
3053
|
+ if (!empty($post->ID) && !$preview && geodir_is_page('detail') && geodir_wpml_allowed_to_duplicate($post->ID)) {
|
|
3054
|
3054
|
$post_id = $post->ID;
|
|
3055
|
|
- $element_type = 'post_' . get_post_type( $post_id );
|
|
3056
|
|
- $original_post_id = $sitepress->get_original_element_id( $post_id, $element_type );
|
|
|
3055
|
+ $element_type = 'post_'.get_post_type($post_id);
|
|
|
3056
|
+ $original_post_id = $sitepress->get_original_element_id($post_id, $element_type);
|
|
3057
|
3057
|
|
|
3058
|
|
- if ( $original_post_id == $post_id ) {
|
|
|
3058
|
+ if ($original_post_id == $post_id) {
|
|
3059
|
3059
|
$wpml_languages = $sitepress->get_active_languages();
|
|
3060
|
|
- $post_language = $sitepress->get_language_for_element( $post_id, $element_type );
|
|
|
3060
|
+ $post_language = $sitepress->get_language_for_element($post_id, $element_type);
|
|
3061
|
3061
|
|
|
3062
|
|
- if ( !empty( $wpml_languages ) && isset( $wpml_languages[ $post_language ] ) ) {
|
|
3063
|
|
- unset( $wpml_languages[ $post_language ] );
|
|
|
3062
|
+ if (!empty($wpml_languages) && isset($wpml_languages[$post_language])) {
|
|
|
3063
|
+ unset($wpml_languages[$post_language]);
|
|
3064
|
3064
|
}
|
|
3065
|
3065
|
|
|
3066
|
|
- if ( !empty( $wpml_languages ) ) {
|
|
3067
|
|
- $trid = $sitepress->get_element_trid( $post_id, $element_type );
|
|
3068
|
|
- $element_translations = $sitepress->get_element_translations( $trid, $element_type );
|
|
3069
|
|
- $duplicates = $sitepress->get_duplicates( $post_id );
|
|
|
3066
|
+ if (!empty($wpml_languages)) {
|
|
|
3067
|
+ $trid = $sitepress->get_element_trid($post_id, $element_type);
|
|
|
3068
|
+ $element_translations = $sitepress->get_element_translations($trid, $element_type);
|
|
|
3069
|
+ $duplicates = $sitepress->get_duplicates($post_id);
|
|
3070
|
3070
|
|
|
3071
|
|
- $wpml_content = '<div class="geodir-company_info gd-detail-duplicate"><h3 class="widget-title">' . __( 'Translate Listing', 'geodirectory' ) . '</h3>';
|
|
|
3071
|
+ $wpml_content = '<div class="geodir-company_info gd-detail-duplicate"><h3 class="widget-title">'.__('Translate Listing', 'geodirectory').'</h3>';
|
|
3072
|
3072
|
$wpml_content .= '<table class="gd-duplicate-table" style="width:100%;margin:0"><tbody>';
|
|
3073
|
|
- $wpml_content .= '<tr style="border-bottom:solid 1px #efefef"><th style="padding:0 2px 2px 2px">' . __( 'Language', 'geodirectory' ) . '</th><th style="width:25px;"></th><th style="width:5em;text-align:center">' . __( 'Translate', 'geodirectory' ) . '</th></tr>';
|
|
|
3073
|
+ $wpml_content .= '<tr style="border-bottom:solid 1px #efefef"><th style="padding:0 2px 2px 2px">'.__('Language', 'geodirectory').'</th><th style="width:25px;"></th><th style="width:5em;text-align:center">'.__('Translate', 'geodirectory').'</th></tr>';
|
|
3074
|
3074
|
|
|
3075
|
3075
|
$needs_translation = false;
|
|
3076
|
3076
|
|
|
3077
|
|
- foreach ( $wpml_languages as $lang_code => $lang ) {
|
|
|
3077
|
+ foreach ($wpml_languages as $lang_code => $lang) {
|
|
3078
|
3078
|
$duplicates_text = '';
|
|
3079
|
3079
|
$translated = false;
|
|
3080
|
3080
|
|
|
3081
|
|
- if ( !empty( $element_translations ) && isset( $element_translations[$lang_code] ) ) {
|
|
|
3081
|
+ if (!empty($element_translations) && isset($element_translations[$lang_code])) {
|
|
3082
|
3082
|
$translated = true;
|
|
3083
|
3083
|
|
|
3084
|
|
- if ( !empty( $duplicates ) && isset( $duplicates[$lang_code] ) ) {
|
|
3085
|
|
- $duplicates_text = ' ' . __( '(duplicate)', 'geodirectory' );
|
|
|
3084
|
+ if (!empty($duplicates) && isset($duplicates[$lang_code])) {
|
|
|
3085
|
+ $duplicates_text = ' '.__('(duplicate)', 'geodirectory');
|
|
3086
|
3086
|
}
|
|
3087
|
3087
|
} else {
|
|
3088
|
3088
|
$needs_translation = true;
|
|
3089
|
3089
|
}
|
|
3090
|
3090
|
|
|
3091
|
|
- $wpml_content .= '<tr><td style="padding:4px">' . $lang['english_name'] . $duplicates_text . '</td><td> </td><td style="text-align:center;">';
|
|
|
3091
|
+ $wpml_content .= '<tr><td style="padding:4px">'.$lang['english_name'].$duplicates_text.'</td><td> </td><td style="text-align:center;">';
|
|
3092
|
3092
|
|
|
3093
|
|
- if ( $translated ) {
|
|
|
3093
|
+ if ($translated) {
|
|
3094
|
3094
|
$wpml_content .= '<i class="fas fa-check" style="color:orange"></i>';
|
|
3095
|
3095
|
} else {
|
|
3096
|
|
- $wpml_content .= '<input name="gd_icl_dup[]" value="' . $lang_code . '" title="' . esc_attr__( 'Create duplicate', 'geodirectory' ) . '" type="checkbox">';
|
|
|
3096
|
+ $wpml_content .= '<input name="gd_icl_dup[]" value="'.$lang_code.'" title="'.esc_attr__('Create duplicate', 'geodirectory').'" type="checkbox">';
|
|
3097
|
3097
|
}
|
|
3098
|
3098
|
|
|
3099
|
3099
|
$wpml_content .= '</td></tr>';
|
|
3100
|
3100
|
}
|
|
3101
|
3101
|
|
|
3102
|
|
- if ( $needs_translation ) {
|
|
3103
|
|
- $nonce = wp_create_nonce( 'geodir_duplicate_nonce' );
|
|
3104
|
|
- $wpml_content .= '<tr><td> </td><td style="vertical-align:middle;padding-top:13px"><i style="display:none" class="fas fa-spin fa-sync"></i></td><td style="padding:15px 3px 3px 3px;text-align:right"><button data-nonce="' . esc_attr( $nonce ) . '" data-post-id="' . $post_id . '" id="gd_make_duplicates" class="button-secondary">' . __( 'Duplicate', 'geodirectory' ) . '</button></td></tr>';
|
|
|
3102
|
+ if ($needs_translation) {
|
|
|
3103
|
+ $nonce = wp_create_nonce('geodir_duplicate_nonce');
|
|
|
3104
|
+ $wpml_content .= '<tr><td> </td><td style="vertical-align:middle;padding-top:13px"><i style="display:none" class="fas fa-spin fa-sync"></i></td><td style="padding:15px 3px 3px 3px;text-align:right"><button data-nonce="'.esc_attr($nonce).'" data-post-id="'.$post_id.'" id="gd_make_duplicates" class="button-secondary">'.__('Duplicate', 'geodirectory').'</button></td></tr>';
|
|
3105
|
3105
|
}
|
|
3106
|
3106
|
|
|
3107
|
3107
|
$wpml_content .= '</tbody></table>';
|
|
@@ -3123,12 +3123,12 @@ discard block |
|
|
block discarded – undo |
|
3123
|
3123
|
* @param array $settings GD design settings array.
|
|
3124
|
3124
|
* @return array Filtered GD design settings array..
|
|
3125
|
3125
|
*/
|
|
3126
|
|
-function geodir_wpml_duplicate_settings( $settings = array() ) {
|
|
|
3126
|
+function geodir_wpml_duplicate_settings($settings = array()) {
|
|
3127
|
3127
|
$new_settings = array();
|
|
3128
|
3128
|
|
|
3129
|
|
- foreach ( $settings as $key => $setting ) {
|
|
|
3129
|
+ foreach ($settings as $key => $setting) {
|
|
3130
|
3130
|
|
|
3131
|
|
- if ( isset( $setting['type'] ) && $setting['type'] == 'sectionend' && $setting['id'] == 'detail_page_settings' ) {
|
|
|
3131
|
+ if (isset($setting['type']) && $setting['type'] == 'sectionend' && $setting['id'] == 'detail_page_settings') {
|
|
3132
|
3132
|
$new_settings[] = array(
|
|
3133
|
3133
|
'name' => __('Disable WPML duplicate translation', 'geodirectory'),
|
|
3134
|
3134
|
'desc' => __('Select post types to disable front end WPML duplicate translation. For selected post types the WPML duplicate option will be disabled from listing detail page sidebar.', 'geodirectory'),
|
|
@@ -3156,12 +3156,12 @@ discard block |
|
|
block discarded – undo |
|
3156
|
3156
|
* @param string $taxonomy name/slug of a taxonomy.
|
|
3157
|
3157
|
* @return bool true if the taxonomy is currently set to being translatable in WPML.
|
|
3158
|
3158
|
*/
|
|
3159
|
|
-function geodir_wpml_is_taxonomy_translated( $taxonomy ) {
|
|
3160
|
|
- if ( empty( $taxonomy ) || !geodir_is_wpml() || !function_exists( 'is_taxonomy_translated' ) ) {
|
|
|
3159
|
+function geodir_wpml_is_taxonomy_translated($taxonomy) {
|
|
|
3160
|
+ if (empty($taxonomy) || !geodir_is_wpml() || !function_exists('is_taxonomy_translated')) {
|
|
3161
|
3161
|
return false;
|
|
3162
|
3162
|
}
|
|
3163
|
3163
|
|
|
3164
|
|
- if ( is_taxonomy_translated( $taxonomy ) ) {
|
|
|
3164
|
+ if (is_taxonomy_translated($taxonomy)) {
|
|
3165
|
3165
|
return true;
|
|
3166
|
3166
|
}
|
|
3167
|
3167
|
|
|
@@ -3176,12 +3176,12 @@ discard block |
|
|
block discarded – undo |
|
3176
|
3176
|
* @param string $post_type name/slug of a post_type.
|
|
3177
|
3177
|
* @return bool true if the post_type is currently set to being translatable in WPML.
|
|
3178
|
3178
|
*/
|
|
3179
|
|
-function geodir_wpml_is_post_type_translated( $post_type ) {
|
|
3180
|
|
- if ( empty( $post_type ) || !geodir_is_wpml() || !function_exists( 'is_post_type_translated' ) ) {
|
|
|
3179
|
+function geodir_wpml_is_post_type_translated($post_type) {
|
|
|
3180
|
+ if (empty($post_type) || !geodir_is_wpml() || !function_exists('is_post_type_translated')) {
|
|
3181
|
3181
|
return false;
|
|
3182
|
3182
|
}
|
|
3183
|
3183
|
|
|
3184
|
|
- if ( is_post_type_translated( $post_type ) ) {
|
|
|
3184
|
+ if (is_post_type_translated($post_type)) {
|
|
3185
|
3185
|
return true;
|
|
3186
|
3186
|
}
|
|
3187
|
3187
|
|
|
@@ -3203,12 +3203,12 @@ discard block |
|
|
block discarded – undo |
|
3203
|
3203
|
*
|
|
3204
|
3204
|
* @return int|NULL
|
|
3205
|
3205
|
*/
|
|
3206
|
|
-function geodir_wpml_object_id( $element_id, $element_type = 'post', $return_original_if_missing = false, $ulanguage_code = null ) {
|
|
3207
|
|
- if ( geodir_is_wpml() ) {
|
|
3208
|
|
- if ( function_exists( 'wpml_object_id_filter' ) ) {
|
|
3209
|
|
- return apply_filters( 'wpml_object_id', $element_id, $element_type, $return_original_if_missing, $ulanguage_code );
|
|
|
3206
|
+function geodir_wpml_object_id($element_id, $element_type = 'post', $return_original_if_missing = false, $ulanguage_code = null) {
|
|
|
3207
|
+ if (geodir_is_wpml()) {
|
|
|
3208
|
+ if (function_exists('wpml_object_id_filter')) {
|
|
|
3209
|
+ return apply_filters('wpml_object_id', $element_id, $element_type, $return_original_if_missing, $ulanguage_code);
|
|
3210
|
3210
|
} else {
|
|
3211
|
|
- return icl_object_id( $element_id, $element_type, $return_original_if_missing, $ulanguage_code );
|
|
|
3211
|
+ return icl_object_id($element_id, $element_type, $return_original_if_missing, $ulanguage_code);
|
|
3212
|
3212
|
}
|
|
3213
|
3213
|
}
|
|
3214
|
3214
|
|