@@ -31,13 +31,13 @@ discard block |
||
31 | 31 | */ |
32 | 32 | function geodir_comment_meta_row_action($a) |
33 | 33 | { |
34 | - global $comment; |
|
34 | + global $comment; |
|
35 | 35 | |
36 | - $rating = geodir_get_commentoverall($comment->comment_ID); |
|
37 | - if ($rating != 0) { |
|
38 | - echo geodir_get_rating_stars($rating, $comment->comment_ID); |
|
39 | - } |
|
40 | - return $a; |
|
36 | + $rating = geodir_get_commentoverall($comment->comment_ID); |
|
37 | + if ($rating != 0) { |
|
38 | + echo geodir_get_rating_stars($rating, $comment->comment_ID); |
|
39 | + } |
|
40 | + return $a; |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | add_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box'); |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | */ |
53 | 53 | function geodir_comment_add_meta_box($comment) |
54 | 54 | { |
55 | - add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high'); |
|
55 | + add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high'); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | /** |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * @param object $comment The comment object. |
67 | 67 | */ |
68 | 68 | function geodir_comment_rating_meta($comment) { |
69 | - $post_type = get_post_type($comment->comment_post_ID); |
|
69 | + $post_type = get_post_type($comment->comment_post_ID); |
|
70 | 70 | if (in_array($post_type, (array)geodir_get_posttypes()) && (int)$comment->comment_parent == 0 && !(!empty($post_type) && geodir_cpt_has_rating_disabled($post_type))) { |
71 | 71 | $rating = geodir_get_commentoverall($comment->comment_ID); |
72 | 72 | |
@@ -106,24 +106,24 @@ discard block |
||
106 | 106 | * @global object $post The post object. |
107 | 107 | */ |
108 | 108 | function geodir_comment_rating_fields() { |
109 | - global $post; |
|
109 | + global $post; |
|
110 | 110 | |
111 | - $post_types = geodir_get_posttypes(); |
|
111 | + $post_types = geodir_get_posttypes(); |
|
112 | 112 | |
113 | - if (!empty($post->post_type) && in_array($post->post_type, $post_types) && !(!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type))) { |
|
114 | - $star_texts = array(); |
|
115 | - $star_texts[] = __('Terrible', 'geodirectory'); |
|
116 | - $star_texts[] = __('Poor', 'geodirectory'); |
|
117 | - $star_texts[] = __('Average', 'geodirectory'); |
|
118 | - $star_texts[] = __('Very Good', 'geodirectory'); |
|
119 | - $star_texts[] = __('Excellent', 'geodirectory'); |
|
113 | + if (!empty($post->post_type) && in_array($post->post_type, $post_types) && !(!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type))) { |
|
114 | + $star_texts = array(); |
|
115 | + $star_texts[] = __('Terrible', 'geodirectory'); |
|
116 | + $star_texts[] = __('Poor', 'geodirectory'); |
|
117 | + $star_texts[] = __('Average', 'geodirectory'); |
|
118 | + $star_texts[] = __('Very Good', 'geodirectory'); |
|
119 | + $star_texts[] = __('Excellent', 'geodirectory'); |
|
120 | 120 | |
121 | - $gd_rating_html = apply_filters('gd_rating_form_html', '<div class="gd_rating" data-average="0" data-id="5"></div>', $star_texts); |
|
122 | - echo $gd_rating_html; |
|
123 | - ?> |
|
121 | + $gd_rating_html = apply_filters('gd_rating_form_html', '<div class="gd_rating" data-average="0" data-id="5"></div>', $star_texts); |
|
122 | + echo $gd_rating_html; |
|
123 | + ?> |
|
124 | 124 | <input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="0"/> |
125 | 125 | <?php |
126 | - } |
|
126 | + } |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | add_filter('comment_reply_link', 'geodir_comment_replaylink'); |
@@ -139,12 +139,12 @@ discard block |
||
139 | 139 | function geodir_comment_replaylink($link) |
140 | 140 | { |
141 | 141 | |
142 | - if (strpos($link, 'wp-login.php?') !== false) { |
|
143 | - $link = str_replace(wp_login_url(),geodir_login_url(),$link); |
|
144 | - } |
|
145 | - $link = '<div class="gd_comment_replaylink">' . $link . '</div>'; |
|
142 | + if (strpos($link, 'wp-login.php?') !== false) { |
|
143 | + $link = str_replace(wp_login_url(),geodir_login_url(),$link); |
|
144 | + } |
|
145 | + $link = '<div class="gd_comment_replaylink">' . $link . '</div>'; |
|
146 | 146 | |
147 | - return $link; |
|
147 | + return $link; |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | add_filter('cancel_comment_reply_link', 'geodir_cancle_replaylink'); |
@@ -159,9 +159,9 @@ discard block |
||
159 | 159 | function geodir_cancle_replaylink($link) |
160 | 160 | { |
161 | 161 | |
162 | - $link = '<span class="gd-cancel-replaylink">' . $link . '</span>'; |
|
162 | + $link = '<span class="gd-cancel-replaylink">' . $link . '</span>'; |
|
163 | 163 | |
164 | - return $link; |
|
164 | + return $link; |
|
165 | 165 | } |
166 | 166 | |
167 | 167 | add_action('comment_post', 'geodir_save_rating'); |
@@ -177,32 +177,32 @@ discard block |
||
177 | 177 | */ |
178 | 178 | function geodir_save_rating($comment = 0) |
179 | 179 | { |
180 | - global $wpdb, $user_ID, $plugin_prefix; |
|
180 | + global $wpdb, $user_ID, $plugin_prefix; |
|
181 | 181 | |
182 | - $comment_info = get_comment($comment); |
|
182 | + $comment_info = get_comment($comment); |
|
183 | 183 | |
184 | - $post_id = $comment_info->comment_post_ID; |
|
185 | - $status = $comment_info->comment_approved; |
|
186 | - $rating_ip = geodir_get_ip(); |
|
184 | + $post_id = $comment_info->comment_post_ID; |
|
185 | + $status = $comment_info->comment_approved; |
|
186 | + $rating_ip = geodir_get_ip(); |
|
187 | 187 | |
188 | - $post = geodir_get_post_info($post_id); |
|
189 | - if (empty($post)) { |
|
190 | - return; |
|
191 | - } |
|
192 | - |
|
193 | - if ($post->post_status == 'publish') { |
|
194 | - $post_status = '1'; |
|
195 | - } else { |
|
196 | - $post_status = '0'; |
|
197 | - } |
|
188 | + $post = geodir_get_post_info($post_id); |
|
189 | + if (empty($post)) { |
|
190 | + return; |
|
191 | + } |
|
192 | + |
|
193 | + if ($post->post_status == 'publish') { |
|
194 | + $post_status = '1'; |
|
195 | + } else { |
|
196 | + $post_status = '0'; |
|
197 | + } |
|
198 | 198 | |
199 | - if (isset($_REQUEST['geodir_overallrating'])) { |
|
200 | - $overall_rating = $_REQUEST['geodir_overallrating']; |
|
199 | + if (isset($_REQUEST['geodir_overallrating'])) { |
|
200 | + $overall_rating = $_REQUEST['geodir_overallrating']; |
|
201 | 201 | |
202 | 202 | if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) { |
203 | - $overall_rating = $overall_rating > 0 ? $overall_rating : '0'; |
|
203 | + $overall_rating = $overall_rating > 0 ? $overall_rating : '0'; |
|
204 | 204 | |
205 | - $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET |
|
205 | + $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET |
|
206 | 206 | post_id = %d, |
207 | 207 | post_type = %s, |
208 | 208 | post_title = %s, |
@@ -220,35 +220,35 @@ discard block |
||
220 | 220 | post_latitude = %s, |
221 | 221 | comment_content = %s |
222 | 222 | ", |
223 | - array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content) |
|
224 | - ); |
|
225 | - |
|
226 | - $wpdb->query($sqlqry); |
|
227 | - |
|
228 | - /** |
|
229 | - * Called after saving the comment. |
|
230 | - * |
|
231 | - * @since 1.0.0 |
|
232 | - * @package GeoDirectory |
|
233 | - * @param array $_REQUEST { |
|
234 | - * Attributes of the $_REQUEST variable. |
|
235 | - * |
|
236 | - * @type string $geodir_overallrating Overall rating. |
|
237 | - * @type string $comment Comment text. |
|
238 | - * @type string $submit Submit button text. |
|
239 | - * @type string $comment_post_ID Comment post ID. |
|
240 | - * @type string $comment_parent Comment Parent ID. |
|
241 | - * @type string $_wp_unfiltered_html_comment Unfiltered html comment string. |
|
242 | - * |
|
243 | - * } |
|
244 | - */ |
|
245 | - do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post'); |
|
246 | - |
|
247 | - if ($status) { |
|
248 | - geodir_update_postrating($post_id); |
|
249 | - } |
|
250 | - } |
|
251 | - } |
|
223 | + array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content) |
|
224 | + ); |
|
225 | + |
|
226 | + $wpdb->query($sqlqry); |
|
227 | + |
|
228 | + /** |
|
229 | + * Called after saving the comment. |
|
230 | + * |
|
231 | + * @since 1.0.0 |
|
232 | + * @package GeoDirectory |
|
233 | + * @param array $_REQUEST { |
|
234 | + * Attributes of the $_REQUEST variable. |
|
235 | + * |
|
236 | + * @type string $geodir_overallrating Overall rating. |
|
237 | + * @type string $comment Comment text. |
|
238 | + * @type string $submit Submit button text. |
|
239 | + * @type string $comment_post_ID Comment post ID. |
|
240 | + * @type string $comment_parent Comment Parent ID. |
|
241 | + * @type string $_wp_unfiltered_html_comment Unfiltered html comment string. |
|
242 | + * |
|
243 | + * } |
|
244 | + */ |
|
245 | + do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post'); |
|
246 | + |
|
247 | + if ($status) { |
|
248 | + geodir_update_postrating($post_id); |
|
249 | + } |
|
250 | + } |
|
251 | + } |
|
252 | 252 | } |
253 | 253 | |
254 | 254 | |
@@ -266,51 +266,51 @@ discard block |
||
266 | 266 | */ |
267 | 267 | function geodir_update_rating_status_change($comment_id, $status) |
268 | 268 | { |
269 | - if ($status == 'delete') { |
|
270 | - return; |
|
271 | - } |
|
272 | - global $wpdb, $plugin_prefix, $user_ID; |
|
269 | + if ($status == 'delete') { |
|
270 | + return; |
|
271 | + } |
|
272 | + global $wpdb, $plugin_prefix, $user_ID; |
|
273 | 273 | |
274 | - $comment_info = get_comment($comment_id); |
|
274 | + $comment_info = get_comment($comment_id); |
|
275 | 275 | |
276 | - $post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : ''; |
|
276 | + $post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : ''; |
|
277 | 277 | |
278 | - if (!empty($comment_info)) |
|
279 | - $status = $comment_info->comment_approved; |
|
278 | + if (!empty($comment_info)) |
|
279 | + $status = $comment_info->comment_approved; |
|
280 | 280 | |
281 | - if ($status == 'approve' || $status == 1) { |
|
282 | - $status = 1; |
|
283 | - } else { |
|
284 | - $status = 0; |
|
285 | - } |
|
281 | + if ($status == 'approve' || $status == 1) { |
|
282 | + $status = 1; |
|
283 | + } else { |
|
284 | + $status = 0; |
|
285 | + } |
|
286 | 286 | |
287 | - $comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : ''; |
|
288 | - $old_rating = geodir_get_commentoverall($comment_info_ID); |
|
287 | + $comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : ''; |
|
288 | + $old_rating = geodir_get_commentoverall($comment_info_ID); |
|
289 | 289 | |
290 | - $post_type = get_post_type($post_id); |
|
290 | + $post_type = get_post_type($post_id); |
|
291 | 291 | |
292 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
292 | + $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
293 | 293 | |
294 | - if ($comment_id) { |
|
294 | + if ($comment_id) { |
|
295 | 295 | |
296 | - $overall_rating = $old_rating; |
|
296 | + $overall_rating = $old_rating; |
|
297 | 297 | |
298 | - if (isset($old_rating)) { |
|
298 | + if (isset($old_rating)) { |
|
299 | 299 | |
300 | - $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET |
|
300 | + $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET |
|
301 | 301 | overall_rating = %f, |
302 | 302 | status = %s, |
303 | 303 | comment_content = %s |
304 | 304 | WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id)); |
305 | 305 | |
306 | - $wpdb->query($sqlqry); |
|
306 | + $wpdb->query($sqlqry); |
|
307 | 307 | |
308 | - //update rating |
|
309 | - geodir_update_postrating($post_id, $post_type); |
|
308 | + //update rating |
|
309 | + geodir_update_postrating($post_id, $post_type); |
|
310 | 310 | |
311 | - } |
|
311 | + } |
|
312 | 312 | |
313 | - } |
|
313 | + } |
|
314 | 314 | |
315 | 315 | } |
316 | 316 | |
@@ -329,41 +329,41 @@ discard block |
||
329 | 329 | function geodir_update_rating($comment_id = 0) |
330 | 330 | { |
331 | 331 | |
332 | - global $wpdb, $plugin_prefix, $user_ID; |
|
332 | + global $wpdb, $plugin_prefix, $user_ID; |
|
333 | 333 | |
334 | - $comment_info = get_comment($comment_id); |
|
334 | + $comment_info = get_comment($comment_id); |
|
335 | 335 | |
336 | - $post_id = $comment_info->comment_post_ID; |
|
337 | - $status = $comment_info->comment_approved; |
|
338 | - $old_rating = geodir_get_commentoverall($comment_info->comment_ID); |
|
336 | + $post_id = $comment_info->comment_post_ID; |
|
337 | + $status = $comment_info->comment_approved; |
|
338 | + $old_rating = geodir_get_commentoverall($comment_info->comment_ID); |
|
339 | 339 | |
340 | - $post_type = get_post_type($post_id); |
|
340 | + $post_type = get_post_type($post_id); |
|
341 | 341 | |
342 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
342 | + $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
343 | 343 | |
344 | - if (isset($_REQUEST['geodir_overallrating'])) { |
|
344 | + if (isset($_REQUEST['geodir_overallrating'])) { |
|
345 | 345 | |
346 | - $overall_rating = $_REQUEST['geodir_overallrating']; |
|
346 | + $overall_rating = $_REQUEST['geodir_overallrating']; |
|
347 | 347 | |
348 | - if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) { |
|
349 | - $overall_rating = $overall_rating > 0 ? $overall_rating : '0'; |
|
348 | + if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) { |
|
349 | + $overall_rating = $overall_rating > 0 ? $overall_rating : '0'; |
|
350 | 350 | |
351 | - if (isset($old_rating)) { |
|
351 | + if (isset($old_rating)) { |
|
352 | 352 | |
353 | - $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET |
|
353 | + $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET |
|
354 | 354 | overall_rating = %f, |
355 | 355 | status = %s, |
356 | 356 | comment_content = %s |
357 | 357 | WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id)); |
358 | 358 | |
359 | - $wpdb->query($sqlqry); |
|
359 | + $wpdb->query($sqlqry); |
|
360 | 360 | |
361 | - //update rating |
|
362 | - geodir_update_postrating($post_id, $post_type); |
|
361 | + //update rating |
|
362 | + geodir_update_postrating($post_id, $post_type); |
|
363 | 363 | |
364 | - } |
|
365 | - } |
|
366 | - } |
|
364 | + } |
|
365 | + } |
|
366 | + } |
|
367 | 367 | |
368 | 368 | |
369 | 369 | } |
@@ -379,19 +379,19 @@ discard block |
||
379 | 379 | */ |
380 | 380 | function geodir_comment_delete_comment($comment_id) |
381 | 381 | { |
382 | - global $wpdb; |
|
382 | + global $wpdb; |
|
383 | 383 | |
384 | - $review_info = geodir_get_review($comment_id); |
|
385 | - if ($review_info) { |
|
386 | - geodir_update_postrating($review_info->post_id); |
|
387 | - } |
|
384 | + $review_info = geodir_get_review($comment_id); |
|
385 | + if ($review_info) { |
|
386 | + geodir_update_postrating($review_info->post_id); |
|
387 | + } |
|
388 | 388 | |
389 | - $wpdb->query( |
|
390 | - $wpdb->prepare( |
|
391 | - "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d", |
|
392 | - array($comment_id) |
|
393 | - ) |
|
394 | - ); |
|
389 | + $wpdb->query( |
|
390 | + $wpdb->prepare( |
|
391 | + "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d", |
|
392 | + array($comment_id) |
|
393 | + ) |
|
394 | + ); |
|
395 | 395 | |
396 | 396 | } |
397 | 397 | |
@@ -407,21 +407,21 @@ discard block |
||
407 | 407 | * @return string The comment content. |
408 | 408 | */ |
409 | 409 | function geodir_wrap_comment_text($content, $comment = '') { |
410 | - if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int)$comment->comment_post_ID)) { |
|
411 | - if (!is_admin()) { |
|
412 | - return '<div class="description">' . $content . '</div>'; |
|
413 | - } else { |
|
414 | - return $content; |
|
415 | - } |
|
416 | - } else { |
|
417 | - $rating = 0; |
|
418 | - if (!empty($comment)) |
|
419 | - $rating = geodir_get_commentoverall($comment->comment_ID); |
|
420 | - if ($rating != 0 && !is_admin()) { |
|
421 | - return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>'; |
|
422 | - } else |
|
423 | - return $content; |
|
424 | - } |
|
410 | + if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int)$comment->comment_post_ID)) { |
|
411 | + if (!is_admin()) { |
|
412 | + return '<div class="description">' . $content . '</div>'; |
|
413 | + } else { |
|
414 | + return $content; |
|
415 | + } |
|
416 | + } else { |
|
417 | + $rating = 0; |
|
418 | + if (!empty($comment)) |
|
419 | + $rating = geodir_get_commentoverall($comment->comment_ID); |
|
420 | + if ($rating != 0 && !is_admin()) { |
|
421 | + return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>'; |
|
422 | + } else |
|
423 | + return $content; |
|
424 | + } |
|
425 | 425 | } |
426 | 426 | |
427 | 427 | |
@@ -438,41 +438,41 @@ discard block |
||
438 | 438 | */ |
439 | 439 | function geodir_update_postrating($post_id = 0, $post_type = '', $delete = false) |
440 | 440 | { |
441 | - global $wpdb, $plugin_prefix, $comment; |
|
442 | - if (!$post_type) { |
|
443 | - $post_type = get_post_type($post_id); |
|
444 | - } |
|
445 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
446 | - $post_newrating = geodir_get_post_rating($post_id, 1); |
|
447 | - $post_newrating_count = geodir_get_review_count_total($post_id); |
|
441 | + global $wpdb, $plugin_prefix, $comment; |
|
442 | + if (!$post_type) { |
|
443 | + $post_type = get_post_type($post_id); |
|
444 | + } |
|
445 | + $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
446 | + $post_newrating = geodir_get_post_rating($post_id, 1); |
|
447 | + $post_newrating_count = geodir_get_review_count_total($post_id); |
|
448 | 448 | |
449 | 449 | |
450 | - //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ; |
|
450 | + //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ; |
|
451 | 451 | |
452 | - if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) { |
|
452 | + if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) { |
|
453 | 453 | |
454 | - $wpdb->query( |
|
455 | - $wpdb->prepare( |
|
456 | - "UPDATE " . $detail_table . " SET |
|
454 | + $wpdb->query( |
|
455 | + $wpdb->prepare( |
|
456 | + "UPDATE " . $detail_table . " SET |
|
457 | 457 | overall_rating = %f, |
458 | 458 | rating_count = %f |
459 | 459 | where post_id = %d", |
460 | - array($post_newrating, $post_newrating_count, $post_id) |
|
461 | - ) |
|
462 | - ); |
|
463 | - |
|
464 | - update_post_meta($post_id, 'overall_rating', $post_newrating); |
|
465 | - update_post_meta($post_id, 'rating_count', $post_newrating_count); |
|
466 | - } |
|
467 | - /** |
|
468 | - * Called after Updating post overall rating and rating count. |
|
469 | - * |
|
470 | - * @since 1.0.0 |
|
471 | - * @since 1.4.3 Added `$post_id` param. |
|
472 | - * @package GeoDirectory |
|
473 | - * @param int $post_id The post ID. |
|
474 | - */ |
|
475 | - do_action('geodir_update_postrating',$post_id); |
|
460 | + array($post_newrating, $post_newrating_count, $post_id) |
|
461 | + ) |
|
462 | + ); |
|
463 | + |
|
464 | + update_post_meta($post_id, 'overall_rating', $post_newrating); |
|
465 | + update_post_meta($post_id, 'rating_count', $post_newrating_count); |
|
466 | + } |
|
467 | + /** |
|
468 | + * Called after Updating post overall rating and rating count. |
|
469 | + * |
|
470 | + * @since 1.0.0 |
|
471 | + * @since 1.4.3 Added `$post_id` param. |
|
472 | + * @package GeoDirectory |
|
473 | + * @param int $post_id The post ID. |
|
474 | + */ |
|
475 | + do_action('geodir_update_postrating',$post_id); |
|
476 | 476 | |
477 | 477 | } |
478 | 478 | |
@@ -490,29 +490,29 @@ discard block |
||
490 | 490 | */ |
491 | 491 | function geodir_get_postoverall($post_id = 0) |
492 | 492 | { |
493 | - global $wpdb, $plugin_prefix; |
|
493 | + global $wpdb, $plugin_prefix; |
|
494 | 494 | |
495 | - $post_type = get_post_type($post_id); |
|
496 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
495 | + $post_type = get_post_type($post_id); |
|
496 | + $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
497 | 497 | |
498 | - if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) { |
|
498 | + if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) { |
|
499 | 499 | |
500 | - $post_ratings = $wpdb->get_var( |
|
501 | - $wpdb->prepare( |
|
502 | - "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d", |
|
503 | - array($post_id) |
|
504 | - ) |
|
505 | - ); |
|
500 | + $post_ratings = $wpdb->get_var( |
|
501 | + $wpdb->prepare( |
|
502 | + "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d", |
|
503 | + array($post_id) |
|
504 | + ) |
|
505 | + ); |
|
506 | 506 | |
507 | 507 | |
508 | - } else { |
|
509 | - $post_ratings = get_post_meta($post_id, 'overall_rating'); |
|
510 | - } |
|
508 | + } else { |
|
509 | + $post_ratings = get_post_meta($post_id, 'overall_rating'); |
|
510 | + } |
|
511 | 511 | |
512 | - if ($post_ratings) |
|
513 | - return $post_ratings; |
|
514 | - else |
|
515 | - return false; |
|
512 | + if ($post_ratings) |
|
513 | + return $post_ratings; |
|
514 | + else |
|
515 | + return false; |
|
516 | 516 | } |
517 | 517 | |
518 | 518 | |
@@ -529,19 +529,19 @@ discard block |
||
529 | 529 | */ |
530 | 530 | function geodir_get_review($comment_id = 0) |
531 | 531 | { |
532 | - global $wpdb; |
|
533 | - |
|
534 | - $reatings = $wpdb->get_row( |
|
535 | - $wpdb->prepare( |
|
536 | - "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d", |
|
537 | - array($comment_id) |
|
538 | - ) |
|
539 | - ); |
|
540 | - |
|
541 | - if (!empty($reatings)) |
|
542 | - return $reatings; |
|
543 | - else |
|
544 | - return false; |
|
532 | + global $wpdb; |
|
533 | + |
|
534 | + $reatings = $wpdb->get_row( |
|
535 | + $wpdb->prepare( |
|
536 | + "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d", |
|
537 | + array($comment_id) |
|
538 | + ) |
|
539 | + ); |
|
540 | + |
|
541 | + if (!empty($reatings)) |
|
542 | + return $reatings; |
|
543 | + else |
|
544 | + return false; |
|
545 | 545 | } |
546 | 546 | |
547 | 547 | /** |
@@ -557,19 +557,19 @@ discard block |
||
557 | 557 | */ |
558 | 558 | function geodir_get_review_total($post_id = 0) |
559 | 559 | { |
560 | - global $wpdb; |
|
561 | - |
|
562 | - $results = $wpdb->get_var( |
|
563 | - $wpdb->prepare( |
|
564 | - "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
565 | - array($post_id) |
|
566 | - ) |
|
567 | - ); |
|
568 | - |
|
569 | - if (!empty($results)) |
|
570 | - return $results; |
|
571 | - else |
|
572 | - return false; |
|
560 | + global $wpdb; |
|
561 | + |
|
562 | + $results = $wpdb->get_var( |
|
563 | + $wpdb->prepare( |
|
564 | + "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
565 | + array($post_id) |
|
566 | + ) |
|
567 | + ); |
|
568 | + |
|
569 | + if (!empty($results)) |
|
570 | + return $results; |
|
571 | + else |
|
572 | + return false; |
|
573 | 573 | } |
574 | 574 | |
575 | 575 | /** |
@@ -585,18 +585,18 @@ discard block |
||
585 | 585 | */ |
586 | 586 | function geodir_get_review_count_by_user_id($user_id = 0) |
587 | 587 | { |
588 | - global $wpdb; |
|
589 | - $results = $wpdb->get_var( |
|
590 | - $wpdb->prepare( |
|
591 | - "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0", |
|
592 | - array($user_id) |
|
593 | - ) |
|
594 | - ); |
|
595 | - |
|
596 | - if (!empty($results)) |
|
597 | - return $results; |
|
598 | - else |
|
599 | - return false; |
|
588 | + global $wpdb; |
|
589 | + $results = $wpdb->get_var( |
|
590 | + $wpdb->prepare( |
|
591 | + "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0", |
|
592 | + array($user_id) |
|
593 | + ) |
|
594 | + ); |
|
595 | + |
|
596 | + if (!empty($results)) |
|
597 | + return $results; |
|
598 | + else |
|
599 | + return false; |
|
600 | 600 | } |
601 | 601 | |
602 | 602 | /** |
@@ -614,27 +614,27 @@ discard block |
||
614 | 614 | */ |
615 | 615 | function geodir_get_post_rating($post_id = 0, $force_query = 0) |
616 | 616 | { |
617 | - global $wpdb, $post; |
|
618 | - |
|
619 | - if (isset($post->ID) && $post->ID == $post_id && !$force_query) { |
|
620 | - if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) { |
|
621 | - return $post->overall_rating; |
|
622 | - } else { |
|
623 | - return 0; |
|
624 | - } |
|
625 | - } |
|
626 | - |
|
627 | - $results = $wpdb->get_var( |
|
628 | - $wpdb->prepare( |
|
629 | - "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
630 | - array($post_id) |
|
631 | - ) |
|
632 | - ); |
|
633 | - |
|
634 | - if (!empty($results)) |
|
635 | - return $results; |
|
636 | - else |
|
637 | - return false; |
|
617 | + global $wpdb, $post; |
|
618 | + |
|
619 | + if (isset($post->ID) && $post->ID == $post_id && !$force_query) { |
|
620 | + if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) { |
|
621 | + return $post->overall_rating; |
|
622 | + } else { |
|
623 | + return 0; |
|
624 | + } |
|
625 | + } |
|
626 | + |
|
627 | + $results = $wpdb->get_var( |
|
628 | + $wpdb->prepare( |
|
629 | + "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
630 | + array($post_id) |
|
631 | + ) |
|
632 | + ); |
|
633 | + |
|
634 | + if (!empty($results)) |
|
635 | + return $results; |
|
636 | + else |
|
637 | + return false; |
|
638 | 638 | } |
639 | 639 | |
640 | 640 | /** |
@@ -650,19 +650,19 @@ discard block |
||
650 | 650 | */ |
651 | 651 | function geodir_get_review_count_total($post_id = 0) |
652 | 652 | { |
653 | - global $wpdb; |
|
654 | - |
|
655 | - $results = $wpdb->get_var( |
|
656 | - $wpdb->prepare( |
|
657 | - "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
658 | - array($post_id) |
|
659 | - ) |
|
660 | - ); |
|
661 | - |
|
662 | - if (!empty($results)) |
|
663 | - return $results; |
|
664 | - else |
|
665 | - return false; |
|
653 | + global $wpdb; |
|
654 | + |
|
655 | + $results = $wpdb->get_var( |
|
656 | + $wpdb->prepare( |
|
657 | + "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
658 | + array($post_id) |
|
659 | + ) |
|
660 | + ); |
|
661 | + |
|
662 | + if (!empty($results)) |
|
663 | + return $results; |
|
664 | + else |
|
665 | + return false; |
|
666 | 666 | } |
667 | 667 | |
668 | 668 | /** |
@@ -679,20 +679,20 @@ discard block |
||
679 | 679 | */ |
680 | 680 | function geodir_get_comments_number($post_id = 0) |
681 | 681 | { |
682 | - global $wpdb; |
|
682 | + global $wpdb; |
|
683 | 683 | |
684 | - $results = $wpdb->get_var( |
|
685 | - $wpdb->prepare( |
|
686 | - "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
687 | - array($post_id) |
|
688 | - ) |
|
689 | - ); |
|
684 | + $results = $wpdb->get_var( |
|
685 | + $wpdb->prepare( |
|
686 | + "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
687 | + array($post_id) |
|
688 | + ) |
|
689 | + ); |
|
690 | 690 | |
691 | 691 | |
692 | - if (!empty($results)) |
|
693 | - return $results; |
|
694 | - else |
|
695 | - return false; |
|
692 | + if (!empty($results)) |
|
693 | + return $results; |
|
694 | + else |
|
695 | + return false; |
|
696 | 696 | } |
697 | 697 | |
698 | 698 | /** |
@@ -708,19 +708,19 @@ discard block |
||
708 | 708 | */ |
709 | 709 | function geodir_get_commentoverall($comment_id = 0) |
710 | 710 | { |
711 | - global $wpdb; |
|
712 | - |
|
713 | - $reatings = $wpdb->get_var( |
|
714 | - $wpdb->prepare( |
|
715 | - "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d", |
|
716 | - array($comment_id) |
|
717 | - ) |
|
718 | - ); |
|
719 | - |
|
720 | - if ($reatings) |
|
721 | - return $reatings; |
|
722 | - else |
|
723 | - return false; |
|
711 | + global $wpdb; |
|
712 | + |
|
713 | + $reatings = $wpdb->get_var( |
|
714 | + $wpdb->prepare( |
|
715 | + "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d", |
|
716 | + array($comment_id) |
|
717 | + ) |
|
718 | + ); |
|
719 | + |
|
720 | + if ($reatings) |
|
721 | + return $reatings; |
|
722 | + else |
|
723 | + return false; |
|
724 | 724 | } |
725 | 725 | |
726 | 726 | /** |
@@ -734,7 +734,7 @@ discard block |
||
734 | 734 | */ |
735 | 735 | function geodir_get_commentoverall_number($post_id = 0) |
736 | 736 | { |
737 | - return geodir_get_post_rating($post_id); |
|
737 | + return geodir_get_post_rating($post_id); |
|
738 | 738 | } |
739 | 739 | |
740 | 740 | |
@@ -752,102 +752,102 @@ discard block |
||
752 | 752 | */ |
753 | 753 | function geodir_comment_template($comment_template) |
754 | 754 | { |
755 | - global $post; |
|
755 | + global $post; |
|
756 | 756 | |
757 | - $post_types = geodir_get_posttypes(); |
|
757 | + $post_types = geodir_get_posttypes(); |
|
758 | 758 | |
759 | - if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) { |
|
760 | - return; |
|
761 | - } |
|
762 | - if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business |
|
763 | - if (geodir_cpt_has_rating_disabled($post->post_type)) { |
|
764 | - return $comment_template; |
|
765 | - } |
|
759 | + if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) { |
|
760 | + return; |
|
761 | + } |
|
762 | + if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business |
|
763 | + if (geodir_cpt_has_rating_disabled($post->post_type)) { |
|
764 | + return $comment_template; |
|
765 | + } |
|
766 | 766 | |
767 | - $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available |
|
768 | - if (!$template) { |
|
769 | - $template = dirname(__FILE__) . '/reviews.php'; |
|
770 | - } |
|
771 | - return $template; |
|
772 | - } |
|
767 | + $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available |
|
768 | + if (!$template) { |
|
769 | + $template = dirname(__FILE__) . '/reviews.php'; |
|
770 | + } |
|
771 | + return $template; |
|
772 | + } |
|
773 | 773 | } |
774 | 774 | |
775 | 775 | add_filter("comments_template", "geodir_comment_template"); |
776 | 776 | |
777 | 777 | |
778 | 778 | if (!function_exists('geodir_comment')) { |
779 | - /** |
|
780 | - * Comment HTML markup. |
|
781 | - * |
|
782 | - * @since 1.0.0 |
|
783 | - * @package GeoDirectory |
|
784 | - * @global object $post The current post object. |
|
785 | - * @param object $comment The comment object. |
|
786 | - * @param string|array $args { |
|
787 | - * Optional. Formatting options. |
|
788 | - * |
|
789 | - * @type object $walker Instance of a Walker class to list comments. Default null. |
|
790 | - * @type int $max_depth The maximum comments depth. Default empty. |
|
791 | - * @type string $style The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'. |
|
792 | - * @type string $callback Callback function to use. Default null. |
|
793 | - * @type string $end-callback Callback function to use at the end. Default null. |
|
794 | - * @type string $type Type of comments to list. |
|
795 | - * Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'. |
|
796 | - * @type int $page Page ID to list comments for. Default empty. |
|
797 | - * @type int $per_page Number of comments to list per page. Default empty. |
|
798 | - * @type int $avatar_size Height and width dimensions of the avatar size. Default 32. |
|
799 | - * @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'. |
|
800 | - * @type bool $reverse_children Whether to reverse child comments in the list. Default null. |
|
801 | - * @type string $format How to format the comments list. |
|
802 | - * Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'. |
|
803 | - * @type bool $short_ping Whether to output short pings. Default false. |
|
804 | - * @type bool $echo Whether to echo the output or return it. Default true. |
|
805 | - * } |
|
806 | - * @param int $depth Depth of comment. |
|
807 | - */ |
|
808 | - function geodir_comment($comment, $args, $depth) |
|
809 | - { |
|
810 | - $GLOBALS['comment'] = $comment; |
|
811 | - switch ($comment->comment_type) : |
|
812 | - case 'pingback' : |
|
813 | - case 'trackback' : |
|
814 | - // Display trackbacks differently than normal comments. |
|
815 | - ?> |
|
779 | + /** |
|
780 | + * Comment HTML markup. |
|
781 | + * |
|
782 | + * @since 1.0.0 |
|
783 | + * @package GeoDirectory |
|
784 | + * @global object $post The current post object. |
|
785 | + * @param object $comment The comment object. |
|
786 | + * @param string|array $args { |
|
787 | + * Optional. Formatting options. |
|
788 | + * |
|
789 | + * @type object $walker Instance of a Walker class to list comments. Default null. |
|
790 | + * @type int $max_depth The maximum comments depth. Default empty. |
|
791 | + * @type string $style The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'. |
|
792 | + * @type string $callback Callback function to use. Default null. |
|
793 | + * @type string $end-callback Callback function to use at the end. Default null. |
|
794 | + * @type string $type Type of comments to list. |
|
795 | + * Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'. |
|
796 | + * @type int $page Page ID to list comments for. Default empty. |
|
797 | + * @type int $per_page Number of comments to list per page. Default empty. |
|
798 | + * @type int $avatar_size Height and width dimensions of the avatar size. Default 32. |
|
799 | + * @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'. |
|
800 | + * @type bool $reverse_children Whether to reverse child comments in the list. Default null. |
|
801 | + * @type string $format How to format the comments list. |
|
802 | + * Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'. |
|
803 | + * @type bool $short_ping Whether to output short pings. Default false. |
|
804 | + * @type bool $echo Whether to echo the output or return it. Default true. |
|
805 | + * } |
|
806 | + * @param int $depth Depth of comment. |
|
807 | + */ |
|
808 | + function geodir_comment($comment, $args, $depth) |
|
809 | + { |
|
810 | + $GLOBALS['comment'] = $comment; |
|
811 | + switch ($comment->comment_type) : |
|
812 | + case 'pingback' : |
|
813 | + case 'trackback' : |
|
814 | + // Display trackbacks differently than normal comments. |
|
815 | + ?> |
|
816 | 816 | <li <?php comment_class('geodir-comment'); ?> id="comment-<?php comment_ID(); ?>"> |
817 | 817 | <p><?php _e('Pingback:', 'geodirectory'); ?> <?php comment_author_link(); ?> <?php edit_comment_link(__('(Edit)', 'geodirectory'), '<span class="edit-link">', '</span>'); ?></p> |
818 | 818 | <?php |
819 | - break; |
|
820 | - default : |
|
821 | - // Proceed with normal comments. |
|
822 | - global $post; |
|
823 | - ?> |
|
819 | + break; |
|
820 | + default : |
|
821 | + // Proceed with normal comments. |
|
822 | + global $post; |
|
823 | + ?> |
|
824 | 824 | <li <?php comment_class('geodir-comment'); ?> id="li-comment-<?php comment_ID(); ?>"> |
825 | 825 | <article id="comment-<?php comment_ID(); ?>" class="comment"> |
826 | 826 | <header class="comment-meta comment-author vcard"> |
827 | 827 | <?php |
828 | - /** |
|
829 | - * Filter to modify comment avatar size |
|
830 | - * |
|
831 | - * You can use this filter to change comment avatar size. |
|
832 | - * |
|
833 | - * @since 1.0.0 |
|
834 | - * @package GeoDirectory |
|
835 | - */ |
|
836 | - $avatar_size = apply_filters('geodir_comment_avatar_size', 44); |
|
837 | - echo get_avatar($comment, $avatar_size); |
|
838 | - printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>', |
|
839 | - get_comment_author_link(), |
|
840 | - // If current post author is also comment author, make it known visually. |
|
841 | - ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : '' |
|
842 | - ); |
|
843 | - echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>"; |
|
844 | - printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>', |
|
845 | - esc_url(get_comment_link($comment->comment_ID)), |
|
846 | - get_comment_time('c'), |
|
847 | - /* translators: 1: date, 2: time */ |
|
848 | - sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time()) |
|
849 | - ); |
|
850 | - ?> |
|
828 | + /** |
|
829 | + * Filter to modify comment avatar size |
|
830 | + * |
|
831 | + * You can use this filter to change comment avatar size. |
|
832 | + * |
|
833 | + * @since 1.0.0 |
|
834 | + * @package GeoDirectory |
|
835 | + */ |
|
836 | + $avatar_size = apply_filters('geodir_comment_avatar_size', 44); |
|
837 | + echo get_avatar($comment, $avatar_size); |
|
838 | + printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>', |
|
839 | + get_comment_author_link(), |
|
840 | + // If current post author is also comment author, make it known visually. |
|
841 | + ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : '' |
|
842 | + ); |
|
843 | + echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>"; |
|
844 | + printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>', |
|
845 | + esc_url(get_comment_link($comment->comment_ID)), |
|
846 | + get_comment_time('c'), |
|
847 | + /* translators: 1: date, 2: time */ |
|
848 | + sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time()) |
|
849 | + ); |
|
850 | + ?> |
|
851 | 851 | </header> |
852 | 852 | <!-- .comment-meta --> |
853 | 853 | |
@@ -871,47 +871,47 @@ discard block |
||
871 | 871 | </article> |
872 | 872 | <!-- #comment-## --> |
873 | 873 | <?php |
874 | - break; |
|
875 | - endswitch; // end comment_type check |
|
876 | - } |
|
874 | + break; |
|
875 | + endswitch; // end comment_type check |
|
876 | + } |
|
877 | 877 | } |
878 | 878 | |
879 | 879 | |
880 | 880 | add_filter('get_comments_number', 'geodir_fix_comment_count', 10, 2); |
881 | 881 | if (!function_exists('geodir_fix_comment_count')) { |
882 | - /** |
|
883 | - * Fix comment count by not listing replies as reviews |
|
884 | - * |
|
885 | - * @since 1.0.0 |
|
886 | - * @package GeoDirectory |
|
887 | - * @global object $post The current post object. |
|
888 | - * @param int $count The comment count. |
|
889 | - * @param int $post_id The post ID. |
|
890 | - * @todo $post is unreachable since the function return the count before that variable. |
|
891 | - * @return bool|null|string The comment count. |
|
892 | - */ |
|
893 | - function geodir_fix_comment_count($count, $post_id) |
|
894 | - { |
|
895 | - if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) { |
|
896 | - global $post; |
|
897 | - $post_types = geodir_get_posttypes(); |
|
898 | - |
|
899 | - if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int)$post_id)) { |
|
900 | - $review_count = geodir_get_review_count_total($post_id); |
|
901 | - return $review_count; |
|
902 | - |
|
903 | - if ($post && isset($post->rating_count)) { |
|
904 | - return $post->rating_count; |
|
905 | - } else { |
|
906 | - return geodir_get_comments_number($post_id); |
|
907 | - } |
|
908 | - } else { |
|
909 | - return $count; |
|
910 | - } |
|
911 | - } else { |
|
912 | - return $count; |
|
913 | - } |
|
914 | - } |
|
882 | + /** |
|
883 | + * Fix comment count by not listing replies as reviews |
|
884 | + * |
|
885 | + * @since 1.0.0 |
|
886 | + * @package GeoDirectory |
|
887 | + * @global object $post The current post object. |
|
888 | + * @param int $count The comment count. |
|
889 | + * @param int $post_id The post ID. |
|
890 | + * @todo $post is unreachable since the function return the count before that variable. |
|
891 | + * @return bool|null|string The comment count. |
|
892 | + */ |
|
893 | + function geodir_fix_comment_count($count, $post_id) |
|
894 | + { |
|
895 | + if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) { |
|
896 | + global $post; |
|
897 | + $post_types = geodir_get_posttypes(); |
|
898 | + |
|
899 | + if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int)$post_id)) { |
|
900 | + $review_count = geodir_get_review_count_total($post_id); |
|
901 | + return $review_count; |
|
902 | + |
|
903 | + if ($post && isset($post->rating_count)) { |
|
904 | + return $post->rating_count; |
|
905 | + } else { |
|
906 | + return geodir_get_comments_number($post_id); |
|
907 | + } |
|
908 | + } else { |
|
909 | + return $count; |
|
910 | + } |
|
911 | + } else { |
|
912 | + return $count; |
|
913 | + } |
|
914 | + } |
|
915 | 915 | } |
916 | 916 | |
917 | 917 | /** |
@@ -929,14 +929,14 @@ discard block |
||
929 | 929 | */ |
930 | 930 | function geodir_get_rating_stars($rating, $post_id, $small = false) |
931 | 931 | { |
932 | - if (!empty($post_id) && geodir_cpt_has_rating_disabled((int)$post_id)) { |
|
933 | - return NULL; |
|
934 | - } |
|
935 | - $a_rating = $rating / 5 * 100; |
|
936 | - |
|
937 | - if ($small) { |
|
938 | - $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>'; |
|
939 | - } else { |
|
932 | + if (!empty($post_id) && geodir_cpt_has_rating_disabled((int)$post_id)) { |
|
933 | + return NULL; |
|
934 | + } |
|
935 | + $a_rating = $rating / 5 * 100; |
|
936 | + |
|
937 | + if ($small) { |
|
938 | + $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>'; |
|
939 | + } else { |
|
940 | 940 | if (function_exists('geodir_reviewrating_draw_overall_rating')) { |
941 | 941 | // Show rating stars from review rating manager |
942 | 942 | $r_html = geodir_reviewrating_draw_overall_rating($rating); |
@@ -953,8 +953,8 @@ discard block |
||
953 | 953 | } |
954 | 954 | $r_html = '<div class="geodir-rating" style="' . $attach_style . '"><div class="gd_rating_show" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingAverage" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star">' . $rating_img . $rating_img . $rating_img . $rating_img . $rating_img . '</div></div></div>'; |
955 | 955 | } |
956 | - } |
|
957 | - return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5); |
|
956 | + } |
|
957 | + return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5); |
|
958 | 958 | } |
959 | 959 | |
960 | 960 | /** |
@@ -968,23 +968,23 @@ discard block |
||
968 | 968 | function geodir_is_reviews_show($pageview = '') |
969 | 969 | { |
970 | 970 | |
971 | - $active_tabs = get_option('geodir_detail_page_tabs_excluded'); |
|
972 | - |
|
973 | - $is_display = true; |
|
974 | - if (!empty($active_tabs) && in_array('reviews', $active_tabs)) |
|
975 | - $is_display = false; |
|
976 | - |
|
977 | - /** |
|
978 | - * Filter to change display value. |
|
979 | - * |
|
980 | - * You can use this filter to change the is_display value. |
|
981 | - * |
|
982 | - * @since 1.0.0 |
|
983 | - * @package GeoDirectory |
|
984 | - * @param bool $is_display Display ratings when set to true. |
|
985 | - * @param string $pageview The view template. Ex: listview, gridview etc. |
|
986 | - */ |
|
987 | - return apply_filters('geodir_is_reviews_show', $is_display, $pageview); |
|
971 | + $active_tabs = get_option('geodir_detail_page_tabs_excluded'); |
|
972 | + |
|
973 | + $is_display = true; |
|
974 | + if (!empty($active_tabs) && in_array('reviews', $active_tabs)) |
|
975 | + $is_display = false; |
|
976 | + |
|
977 | + /** |
|
978 | + * Filter to change display value. |
|
979 | + * |
|
980 | + * You can use this filter to change the is_display value. |
|
981 | + * |
|
982 | + * @since 1.0.0 |
|
983 | + * @package GeoDirectory |
|
984 | + * @param bool $is_display Display ratings when set to true. |
|
985 | + * @param string $pageview The view template. Ex: listview, gridview etc. |
|
986 | + */ |
|
987 | + return apply_filters('geodir_is_reviews_show', $is_display, $pageview); |
|
988 | 988 | } |
989 | 989 | |
990 | 990 | |
@@ -992,9 +992,9 @@ discard block |
||
992 | 992 | * If Disqus plugin is active, do some fixes to show on blogs but no on GD post types |
993 | 993 | */ |
994 | 994 | if(function_exists('dsq_can_replace')) { |
995 | - remove_filter('comments_template', 'dsq_comments_template'); |
|
996 | - add_filter('comments_template', 'dsq_comments_template', 100); |
|
997 | - add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1); |
|
995 | + remove_filter('comments_template', 'dsq_comments_template'); |
|
996 | + add_filter('comments_template', 'dsq_comments_template', 100); |
|
997 | + add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1); |
|
998 | 998 | } |
999 | 999 | |
1000 | 1000 | |
@@ -1008,14 +1008,14 @@ discard block |
||
1008 | 1008 | * @return string `1` if active `0` if disabled. |
1009 | 1009 | */ |
1010 | 1010 | function geodir_option_disqus_active($disqus_active){ |
1011 | - global $post; |
|
1012 | - $all_postypes = geodir_get_posttypes(); |
|
1011 | + global $post; |
|
1012 | + $all_postypes = geodir_get_posttypes(); |
|
1013 | 1013 | |
1014 | - if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){ |
|
1015 | - $disqus_active = '0'; |
|
1016 | - } |
|
1014 | + if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){ |
|
1015 | + $disqus_active = '0'; |
|
1016 | + } |
|
1017 | 1017 | |
1018 | - return $disqus_active; |
|
1018 | + return $disqus_active; |
|
1019 | 1019 | } |
1020 | 1020 | |
1021 | 1021 | /** |
@@ -1029,23 +1029,23 @@ discard block |
||
1029 | 1029 | * @return array Modified tabs array. |
1030 | 1030 | */ |
1031 | 1031 | function geodir_detail_reviews_tab_title($tabs_arr) { |
1032 | - $post_type = geodir_get_current_posttype(); |
|
1032 | + $post_type = geodir_get_current_posttype(); |
|
1033 | 1033 | |
1034 | - if (!empty($tabs_arr) && !empty($tabs_arr['reviews']) && isset($tabs_arr['reviews']['heading_text']) && $post_type != '' && geodir_cpt_has_rating_disabled($post_type)) { |
|
1035 | - $label_reviews = __('Comments', 'geodirectory'); |
|
1034 | + if (!empty($tabs_arr) && !empty($tabs_arr['reviews']) && isset($tabs_arr['reviews']['heading_text']) && $post_type != '' && geodir_cpt_has_rating_disabled($post_type)) { |
|
1035 | + $label_reviews = __('Comments', 'geodirectory'); |
|
1036 | 1036 | |
1037 | - if (defined('GEODIR_CP_VERSION')) { |
|
1038 | - $post_types = geodir_get_posttypes('array'); |
|
1037 | + if (defined('GEODIR_CP_VERSION')) { |
|
1038 | + $post_types = geodir_get_posttypes('array'); |
|
1039 | 1039 | |
1040 | - if (!empty($post_types[$post_type]['labels']['label_reviews'])) { |
|
1041 | - $label_reviews = stripslashes(__($post_types[$post_type]['labels']['label_reviews'], 'geodirectory')); |
|
1042 | - } |
|
1043 | - } |
|
1040 | + if (!empty($post_types[$post_type]['labels']['label_reviews'])) { |
|
1041 | + $label_reviews = stripslashes(__($post_types[$post_type]['labels']['label_reviews'], 'geodirectory')); |
|
1042 | + } |
|
1043 | + } |
|
1044 | 1044 | |
1045 | - $tabs_arr['reviews']['heading_text'] = $label_reviews; |
|
1046 | - } |
|
1045 | + $tabs_arr['reviews']['heading_text'] = $label_reviews; |
|
1046 | + } |
|
1047 | 1047 | |
1048 | - return $tabs_arr; |
|
1048 | + return $tabs_arr; |
|
1049 | 1049 | } |
1050 | 1050 | add_filter('geodir_detail_page_tab_list_extend', 'geodir_detail_reviews_tab_title', 1000, 1); |
1051 | 1051 | |
@@ -1056,13 +1056,13 @@ discard block |
||
1056 | 1056 | * @since 1.6.21 |
1057 | 1057 | */ |
1058 | 1058 | function geodir_jetpack_disable_comments(){ |
1059 | - //only run if jetpack installed |
|
1060 | - if(defined('JETPACK__VERSION')){ |
|
1061 | - $post_types = geodir_get_posttypes(); |
|
1062 | - foreach($post_types as $post_type){ |
|
1063 | - add_filter('jetpack_comment_form_enabled_for_' . $post_type, '__return_false'); |
|
1064 | - } |
|
1065 | - } |
|
1059 | + //only run if jetpack installed |
|
1060 | + if(defined('JETPACK__VERSION')){ |
|
1061 | + $post_types = geodir_get_posttypes(); |
|
1062 | + foreach($post_types as $post_type){ |
|
1063 | + add_filter('jetpack_comment_form_enabled_for_' . $post_type, '__return_false'); |
|
1064 | + } |
|
1065 | + } |
|
1066 | 1066 | } |
1067 | 1067 | |
1068 | 1068 | add_action('plugins_loaded','geodir_jetpack_disable_comments'); |
@@ -1077,13 +1077,13 @@ discard block |
||
1077 | 1077 | * @return bool True if allowed otherwise False. |
1078 | 1078 | */ |
1079 | 1079 | function geodir_check_reviews_open( $open, $post_id ) { |
1080 | - if ( $open && $post_id && geodir_is_page( 'detail' ) ) { |
|
1081 | - if ( in_array( get_post_status( $post_id ), array( 'draft', 'pending', 'auto-draft', 'trash' ) ) ) { |
|
1082 | - $open = false; |
|
1083 | - } |
|
1084 | - } |
|
1080 | + if ( $open && $post_id && geodir_is_page( 'detail' ) ) { |
|
1081 | + if ( in_array( get_post_status( $post_id ), array( 'draft', 'pending', 'auto-draft', 'trash' ) ) ) { |
|
1082 | + $open = false; |
|
1083 | + } |
|
1084 | + } |
|
1085 | 1085 | |
1086 | - return $open; |
|
1086 | + return $open; |
|
1087 | 1087 | } |
1088 | 1088 | add_filter( 'comments_open', 'geodir_check_reviews_open', 10, 2 ); |
1089 | 1089 | |
@@ -1098,10 +1098,10 @@ discard block |
||
1098 | 1098 | * @return string Filtered comment content. |
1099 | 1099 | */ |
1100 | 1100 | function geodir_remove_img_tags_from_comment( $comment_text, $comment = array(), $args = array() ) { |
1101 | - if ( !empty( $comment_text ) && !empty( $comment ) && strpos( $comment_text, '[img' ) !== false && strpos( get_post_type( $comment->comment_post_ID ), 'gd_' ) === 0 ) { |
|
1102 | - $comment_text = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_text ); |
|
1103 | - $comment_text = trim( $comment_text ); |
|
1104 | - } |
|
1105 | - return $comment_text; |
|
1101 | + if ( !empty( $comment_text ) && !empty( $comment ) && strpos( $comment_text, '[img' ) !== false && strpos( get_post_type( $comment->comment_post_ID ), 'gd_' ) === 0 ) { |
|
1102 | + $comment_text = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_text ); |
|
1103 | + $comment_text = trim( $comment_text ); |
|
1104 | + } |
|
1105 | + return $comment_text; |
|
1106 | 1106 | } |
1107 | 1107 | add_filter( 'comment_text', 'geodir_remove_img_tags_from_comment', 10, 3 ); |
1108 | 1108 | \ No newline at end of file |