// wp_redirect( get_permalink( $question_id ) ); // wp_send_json_success( array( 'url' => get_permalink( $question_id ) ) ); // return true;+With new code: +
wp_redirect('https://your-site.com'); wp_send_json_success( array( 'url' => get_permalink( $question_id ) ) ); return true;+To redirect users to a different page when user submit a question, please open the
Question.php file in the folder path wp-content -> plugins -> dw-question-answer -> inc -> Post -> Question.phpfile. Find the line code around line 439:
+exit( wp_safe_redirect( get_permalink( $new_question ) ) );`+Then replace with the following code to redirect to home page: +
exit( wp_safe_redirect( home_url() ) );+Notice: you can use similar to redirect user to any other page as you wish (in your case to the question listing page) +Eg: like this is my url :
http://mysite/discussion-forum/
+exit( wp_safe_redirect( home_url() .'discussion-forum/' ) );+About the permalink of categories, have you tried to add the permalink in the Settings of Q&A]]>
| Features / Options | +Premium Version | +Free Version | +
|---|---|---|
| Multi style | ++ | + |
| All Extension | ++ | + |
| Markdown Editor | ++ | + |
| Anti-spam by Google reCaptchaV2 | ++ | + |
| Anti-spam by FunCaptcha | ++ | + |
| Anti-spam by Akismet | ++ | + |
| Manual approve answer | ++ | + |
| Manual approve question | ++ | + |
| Anonymous vote | ++ | + |
| Mention user | ++ | + |
| Permalink friendly SEO | ++ | + |
| Upload Files | ++ | + |
| Notification Bar | ++ | + |
| Ultimate Member Integration | ++ | + |
| UserPro Integration | ++ | + |
| Manager Anonymous info | ++ | + |
| Alway Show Admin answer First | ++ | + |
| Login/register Redirect Page | ++ | + |
| The ShortCode | +5 | +2 | +
| The Widgets | +7 | +4 | +
| Get DWQA | ++ Get Pro Version + | + + | +
To support this plugin and get more features, upgrade to DW Question & Answer Pro →
Q&A section.', 'dwqa' ); ?>
+Q&A section.', 'dw-question-answer' ); ?>
- +' . __( 'No valid changelog was found.', 'dwqa' ) . '
'; + $readme = '' . __( 'No valid changelog was found.', 'dw-question-answer' ) . '
'; } else { $readme = file_get_contents( $file ); $readme = nl2br( esc_html( $readme ) ); @@ -236,4 +242,4 @@ public function get_contributors() { } } -?> \ No newline at end of file +?> diff --git a/inc/Ajax.php b/inc/Ajax.php index 0b2434bc..b41c0baa 100644 --- a/inc/Ajax.php +++ b/inc/Ajax.php @@ -7,8 +7,10 @@ public function __construct() { // Ajax remove Answer add_action( 'wp_ajax_dwqa_delete_answer', array( $this, 'delete_answer' ) ); + // Ajax flag answer spam add_action( 'wp_ajax_dwqa-action-flag-answer', array( $this, 'flag_answer' ) ); + //Ajax vote best answer add_action( 'wp_ajax_dwqa-vote-best-answer', array( $this, 'vote_best_answer' ) ); add_action( 'wp_ajax_dwqa-unvote-best-answer', array( $this, 'unvote_best_answer' ) ); @@ -16,19 +18,23 @@ public function __construct() { //Question add_action( 'wp_ajax_dwqa_delete_question', array( $this, 'delete_question' ) ); add_action( 'wp_ajax_dwqa-update-question-status', array( $this, 'update_status' ) ); + + // Ajax search and suggest question + add_action( 'wp_ajax_dwqa-auto-suggest-search-result', array( $this, 'auto_suggest_for_seach' ) ); + add_action( 'wp_ajax_nopriv_dwqa-auto-suggest-search-result', array( $this, 'auto_suggest_for_seach' ) ); } public function delete_comment() { if ( ! isset( $_GET['_wpnonce'] ) || ! wp_verify_nonce( sanitize_text_field( $_GET['_wpnonce'] ), '_dwqa_delete_comment' ) ) { - wp_die( __( 'Are you cheating huh?', 'dwqa' ) ); + wp_die( __( 'Are you cheating huh?', 'dw-question-answer' ) ); } if ( !dwqa_current_user_can( 'delete_comment' ) ) { - wp_die( __( 'You do not have permission to edit comment.', 'dwqa' ) ); + wp_die( __( 'You do not have permission to edit comment.', 'dw-question-answer' ) ); } if ( ! isset( $_GET['comment_id'] ) ) { - wp_die( __( 'Comment ID must be showed.', 'dwqa' ) ); + wp_die( __( 'Comment ID must be showed.', 'dw-question-answer' ) ); } wp_delete_comment( intval( $_GET['comment_id'] ) ); @@ -37,47 +43,53 @@ public function delete_comment() { } function delete_answer() { - if ( ! isset( $_GET['_wpnonce'] ) || ! wp_verify_nonce( $_GET['_wpnonce'], '_dwqa_action_remove_answer_nonce' ) || 'dwqa_delete_answer' !== $_GET['action'] ) { - wp_die( __( 'Are you cheating huh?', 'dwqa' ) ); + if ( ! isset( $_GET['_wpnonce'] ) || ! wp_verify_nonce( sanitize_text_field( $_GET['_wpnonce'] ), '_dwqa_action_remove_answer_nonce' ) || 'dwqa_delete_answer' !== $_GET['action'] ) { + wp_die( __( 'Are you cheating huh?', 'dw-question-answer' ) ); } if ( ! isset( $_GET['answer_id'] ) ) { - wp_die( __( 'Answer is missing.', 'dwqa' ), 'error' ); + wp_die( __( 'Answer is missing.', 'dw-question-answer' ), 'error' ); } - if ( 'dwqa-answer' !== get_post_type( $_GET['answer_id'] ) ) { - wp_die( __( 'This post is not answer.', 'dwqa' ) ); + $answer_id = absint( $_GET['answer_id'] ); + + if ( 'dwqa-answer' !== get_post_type( $answer_id ) ) { + wp_die( __( 'This post is not answer.', 'dw-question-answer' ) ); } - if ( !dwqa_current_user_can( 'delete_answer' ) ) { - wp_die( __( 'You do not have permission to delete this post.', 'dwqa' ) ); + if ( !dwqa_current_user_can( 'delete_answer', $answer_id ) && !dwqa_current_user_can( 'edit_posts' ) ) { + wp_die( __( 'You do not have permission to delete this post.', 'dw-question-answer' ) ); } - do_action( 'dwqa_prepare_delete_answer', $_GET['answer_id'] ); + do_action( 'dwqa_prepare_delete_answer', $answer_id ); - $question_id = get_post_meta( $_GET['answer_id'], '_question', true ); + $question_id = dwqa_get_post_parent_id( $answer_id ); - $id = wp_delete_post( $_GET['answer_id'] ); + $id = wp_trash_post( $answer_id ); if ( is_wp_error( $id ) ) { wp_die( $id->get_error_message() ); } $answer_count = get_post_meta( $question_id, '_dwqa_answers_count', true ); - update_post_meta( $question_id, '_dwqa_answers_count', (int) $answer_count - 1 ); + $new_answer_count = (int) $answer_count - 1; + if ( (int) $new_answer_count < 0 ) { + $new_answer_count = intval( 0 ); + } + update_post_meta( $question_id, '_dwqa_answers_count', $new_answer_count ); - do_action( 'dwqa_delete_answer', $_GET['answer_id'], $question_id ); + do_action( 'dwqa_delete_answer', $answer_id, $question_id ); wp_redirect( get_permalink( $question_id ) ); - exit(); + die(); } public function flag_answer() { if ( ! isset( $_POST['wpnonce'] ) || ! wp_verify_nonce( sanitize_text_field( $_POST['wpnonce'] ), '_dwqa_action_flag_answer_nonce' ) ) { - wp_send_json_error( array( 'message' => __( 'Are you cheating huh?', 'dwqa' ) ) ); + wp_send_json_error( array( 'message' => __( 'Are you cheating huh?', 'dw-question-answer' ) ) ); } if ( ! isset( $_POST['answer_id'] ) ) { - wp_send_json_error( array( 'message' => __( 'Missing id of answer', 'dwqa' ) ) ); + wp_send_json_error( array( 'message' => __( 'Missing id of answer', 'dw-question-answer' ) ) ); } global $current_user; $answer_id = intval( $_POST['answer_id'] ); @@ -103,62 +115,72 @@ public function flag_answer() { public function vote_best_answer() { global $current_user; - check_ajax_referer( '_dwqa_vote_best_answer', 'nonce' ); - if ( ! isset( $_POST['answer'] ) ) { + if ( ! isset( $_GET['_wpnonce'] ) || ! wp_verify_nonce( $_GET['_wpnonce'], '_dwqa_vote_best_answer' ) ) { + wp_die( __( 'Are you cheating huh?', 'dw-question-answer' ) ); + } + if ( ! isset( $_GET['answer'] ) ) { exit( 0 ); } - $answer_id = intval( $_POST['answer'] ); - $q = get_post_meta( $answer_id, '_question', true ); - $question = get_post( $q ); + $answer_id = intval( $_GET['answer'] ); + + $question_id = dwqa_get_post_parent_id( $answer_id ); + $question = get_post( $question_id ); + if ( $current_user->ID == $question->post_author || current_user_can( 'edit_posts' ) ) { do_action( 'dwqa_vote_best_answer', $answer_id ); - update_post_meta( $q, '_dwqa_best_answer', $answer_id ); + update_post_meta( $question_id, '_dwqa_best_answer', $answer_id ); } + + wp_redirect( get_permalink( $question_id ) ); + exit; } public function unvote_best_answer() { global $current_user; - check_ajax_referer( '_dwqa_vote_best_answer', 'nonce' ); - if ( ! isset( $_POST['answer'] ) ) { + if ( ! isset( $_GET['_wpnonce'] ) || ! wp_verify_nonce( $_GET['_wpnonce'], '_dwqa_vote_best_answer' ) ) { + wp_die( __( 'Are you cheating huh?', 'dw-question-answer' ) ); + } + if ( ! isset( $_GET['answer'] ) ) { exit( 0 ); } - $answer_id = intval( $_POST['answer'] ); - $q = get_post_meta( $answer_id, '_question', true ); - $question = get_post( $q ); + $answer_id = intval( $_GET['answer'] ); + $question_id = dwqa_get_post_parent_id( $answer_id ); + $question = get_post( $question_id ); if ( $current_user->ID == $question->post_author || current_user_can( 'edit_posts' ) ) { do_action( 'dwqa_unvote_best_answer', $answer_id ); - delete_post_meta( $q, '_dwqa_best_answer' ); + delete_post_meta( $question_id, '_dwqa_best_answer' ); } - + wp_redirect( get_permalink( $question_id ) ); + exit; } public function delete_question() { global $dwqa_general_settings; - if ( ! isset( $_GET['_wpnonce'] ) || ! wp_verify_nonce( $_GET['_wpnonce'], '_dwqa_action_remove_question_nonce' ) || 'dwqa_delete_question' !== $_GET['action'] ) { - wp_die( __( 'Are you cheating huh?', 'dwqa' ) ); + if ( ! isset( $_GET['_wpnonce'] ) || ! wp_verify_nonce( sanitize_text_field( $_GET['_wpnonce'] ), '_dwqa_action_remove_question_nonce' ) || 'dwqa_delete_question' !== $_GET['action'] ) { + wp_die( __( 'Are you cheating huh?', 'dw-question-answer' ) ); } if ( ! isset( $_GET['question_id'] ) ) { - wp_die( __( 'Question is missing.', 'dwqa' ), 'error' ); + wp_die( __( 'Question is missing.', 'dw-question-answer' ), 'error' ); } - if ( 'dwqa-question' !== get_post_type( $_GET['question_id'] ) ) { - wp_die( __( 'This post is not question.', 'dwqa' ) ); + if ( 'dwqa-question' !== get_post_type( intval( $_GET['question_id'] ) ) ) { + wp_die( __( 'This post is not question.', 'dw-question-answer' ) ); } if ( !dwqa_current_user_can( 'delete_answer' ) ) { - wp_die( __( 'You do not have permission to delete this post.', 'dwqa' ) ); + wp_die( __( 'You do not have permission to delete this post.', 'dw-question-answer' ) ); } - do_action( 'before_delete_post', $_GET['question_id'] ); + do_action( 'before_delete_post', intval( $_GET['question_id'] ) ); - $id = wp_delete_post( $_GET['question_id'] ); + $id = wp_delete_post( intval( $_GET['question_id'] ) ); if ( is_wp_error( $id ) ) { wp_die( $id->get_error_message() ); } - do_action( 'dwqa_delete_question', $_GET['question_id'] ); + do_action( 'dwqa_delete_question', intval( $_GET['question_id'] ) ); $url = home_url(); if ( isset( $dwqa_general_settings['pages']['archive-question'] ) ) { @@ -191,8 +213,92 @@ public function update_status() { } } else { wp_send_json_error( array( - 'message' => __( 'You do not have permission to edit question status', 'dwqa' ) + 'message' => __( 'You do not have permission to edit question status', 'dw-question-answer' ) ) ); } } + + public function auto_suggest_for_seach(){ + if ( ! isset( $_POST['nonce']) ) { + wp_send_json_error( array( array( + 'error' => 'sercurity', + 'message' => __( 'Are you cheating huh?', 'dw-question-answer' ) + ) ) ); + } + check_ajax_referer( '_dwqa_filter_nonce', 'nonce' ); + + if ( ! isset( $_POST['title'] ) ) { + wp_send_json_error( array( array( + 'error' => 'empty title', + 'message' => __( 'Not Found!!!', 'dw-question-answer' ), + ) ) ); + } + + $status = 'publish'; + if ( is_user_logged_in() ) { + $status = array( 'publish', 'private' ); + } + + $search = sanitize_text_field( $_POST['title'] ); + $args_query = array( + 'post_type' => 'dwqa-question', + 'posts_per_page' => 6, + 'post_status' => $status, + ); + preg_match_all( '/#\S*\w/i', $search, $matches ); + if ( $matches && is_array( $matches ) && count( $matches ) > 0 && count( $matches[0] ) > 0 ) { + $args_query['tax_query'][] = array( + 'taxonomy' => 'dwqa-question_tag', + 'field' => 'slug', + 'terms' => $matches[0], + 'operator' => 'IN', + ); + $search = preg_replace( '/#\S*\w/i', '', $search ); + } + $args_query['s'] = $search; + $args_query = apply_filters( 'dwqa_prepare_search_query_args', $args_query ); + $query = new WP_Query( $args_query ); + if ( ! $query->have_posts() ) { + global $current_search; + $current_search = $search; + add_filter( 'posts_where' , array( $this, 'posts_where_suggest' ) ); + unset( $args_query['s'] ); + $query = new WP_Query( $args_query ); + remove_filter( 'posts_where' , array( $this, 'posts_where_suggest') ); + } + $results = array(); + if ( $query->have_posts() ) { + $html = ''; + while ( $query->have_posts() ) { + $query->the_post(); + $results[] = array( + 'title' => get_post_field( 'post_title', get_the_ID() ), + 'url' => get_permalink( get_the_ID() ) + ); + } + wp_reset_query(); + wp_send_json_success( $results ); + } else { + wp_reset_query(); + wp_send_json_error( array( array( 'error' => 'not found', 'message' => __( 'Not Found!!!', 'dw-question-answer' ) ) ) ); + } + } + + public function posts_where_suggest( $where ) { + global $current_search; + $first = true; + $s = explode( ' ', $current_search ); + if ( count( $s ) > 0 ) { + $where .= ' AND ('; + foreach ( $s as $w ) { + if ( ! $first ) { + $where .= ' OR '; + } + $where .= "post_title REGEXP '".preg_quote( $w )."'"; + $first = false; + } + $where .= ' ) '; + } + return $where; + } } \ No newline at end of file diff --git a/inc/Akismet.php b/inc/Akismet.php new file mode 100644 index 00000000..570d62b2 --- /dev/null +++ b/inc/Akismet.php @@ -0,0 +1,555 @@ +akismet_ua = "DWQA/".get_option( 'dwqa-db-version', '1.4.7' )." | Akismet/3.1.7"; + add_action('init', array( $this, 'dwqa_admin_show_spam_page')); + add_action('init', array( $this, 'dwqa_akismet_mark_spam')); + // add_action( 'admin_menu', array( $this, 'reported_list_admin' ) ); + + // add_action( 'wp_enqueue_scripts', array($this,'dwqa_akismet_enqueue_script' ),10); + + add_action('manage_posts_extra_tablenav', array( $this, 'dwqa_admin_add_button_empty_spam')); + // add_action( 'wp_ajax_dwqa_report_spam_to_admin', array( $this, 'dwqa_report_spam_to_admin') ); + // add_filter( 'dwqa_question_button_action', array( $this, 'dwqa_add_button_action_report_spam_to_admin'), 10); + // add_filter( 'dwqa_answer_button_action', array( $this, 'dwqa_add_button_action_report_spam_to_admin'), 10); + add_filter( 'post_row_actions', array( $this, 'dwqa_admin_add_post_row_button'), 11, 2 ); + + //setkey + $this->akismetAPIKey = (isset($dwqa_general_settings['akismet-api-key']) && $dwqa_general_settings['akismet-api-key']!='')?$dwqa_general_settings['akismet-api-key']:''; + + // Call to verify key function + if($this->akismet_verify_key($this->akismetAPIKey)){ + //verified do something + + $this->data = array( + 'blog' => get_option( 'home' ), + 'blog_charset' => get_option( 'blog_charset' ), + 'blog_lang' => get_locale(), + 'user_ip' => $this->get_user_ip(), + 'user_agent' => (isset($_SERVER['HTTP_USER_AGENT'])?$_SERVER['HTTP_USER_AGENT']:''), + 'referrer' => (isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:''), + 'permalink' => '', + 'comment_type' => '', + 'comment_author' => '', + 'comment_author_email' => '', + 'comment_author_url' => '', + 'comment_content' => '', + 'comment_approved' => '', //post_status + 'comment_date' => '', //post_date + 'comment_ID' => '', //postID + 'comment_post_ID' => '', //post_parent_ID + 'is_test' => false, + ); + + // Keys to ignore + $ignore = array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' ); + // Loop through _SERVER args and remove whitelisted keys + foreach ( $_SERVER as $key => $value ) { + + // Key should not be ignored + if ( !in_array( $key, $ignore ) && is_string( $value ) ) { + $this->data[$key] = $value; + + // Key should be ignored + } else { + $this->data[$key] = ''; + } + } + + add_filter( 'dwqa_insert_question_args', array( $this, 'dwqa_check_spam' ) , 10, 1 ); + add_filter( 'dwqa_insert_answer_args', array( $this, 'dwqa_check_spam' ) , 10, 1 ); + add_filter( 'dwqa_insert_comment_args', array( $this, 'dwqa_check_spam' ) , 10, 1 ); + // add_action( 'dwqa_after_mark_unspam', array( $this, 'dwqa_check_spam' ) , 10, 1 ); + } + } + } + + // Create reported list admin + public function reported_list_admin(){ + $dwqa_reported_page = add_submenu_page( 'edit.php?post_type=dwqa-question', __( 'Report Spam List','dw-question-answer' ), __( 'Report Spam','dw-question-answer' ), 'manage_options', 'dwqa-report-spam-list', array( $this, 'reported_list_admin_display' ) ); + } + public function reported_list_admin_display(){ + require_once DWQA_DIR . 'inc/class/class-display-reported-list-table.php'; + $reportedTable = new Reported_List_Table(); + $reportedTable->process_bulk_action(); + + echo ''; + // print_r($query); + // echo ''; + $_data = $this->setup_data_list($query); + $reportedTable->prepare_items($_data); + + echo ''; + echo '
'; - _e( 'Sorry, but nothing matched your filter. ', 'dwqa' ); - if ( is_user_logged_in() ) { - global $dwqa_options; - if ( isset( $dwqa_options['pages']['submit-question']) ) { - $submit_link = get_permalink( $dwqa_options['pages']['submit-question'] ); - if ( $submit_link ) { - printf( - '%s %s', - __( 'You can ask question', 'dwqa' ), - $submit_link, - __( 'here', 'dwqa' ) - ); - } - } - } else { - printf( '%s %s', - __( 'Please','dwqa' ), - wp_login_url( get_post_type_archive_link( 'dwqa-question' ) ), - __( 'Login','dwqa' ) - ); - $register_link = wp_register( '', '',false ); - if ( ! empty( $register_link) && $register_link ) { - echo __( ' or','dwqa' ).' '.$register_link; - } - _e( ' to submit question.','dwqa' ); - } - - echo '
'; - $results = ob_get_contents(); - ob_end_clean(); - } - - wp_send_json_success( array( - 'results' => $results, - 'pagenavi' => isset( $pagenavigation) ? $pagenavigation : '' - ) ); - wp_die(); - } - - private function get_questions( $on_paged = true ) { - $posts_per_page = $this->filter['posts_per_page'] ; - $paged = $this->filter['paged']; - $offset = ($paged - 1) * $posts_per_page; - - // pagenavigation - $number = -1; - if ( $on_paged ) - $number = $posts_per_page; - // arguments array for get questions - $status = array( 'publish' ); - if ( is_user_logged_in() ) { - $status[] = 'private'; - $status[] = 'pending'; - } - $sticky_questions = get_option( 'dwqa_sticky_questions', array() ); - $args = array( - 'posts_per_page' => $number, - 'offset' => $offset, - 'post_type' => 'dwqa-question', - 'suppress_filters' => false, - 'post__not_in' => $sticky_questions, - 'post_status' => $status, - ); - - if ( is_user_logged_in() ) { - $args['perm'] = 'readable'; - } - - $args['order'] = ( $this->filter['order'] && $this->filter['order'] != 'ASC' ? 'DESC' : 'ASC' ); - - switch ( $this->filter['type'] ) { - case 'views': - $args['meta_key'] = '_dwqa_views'; - $args['orderby'] = 'meta_value_num'; - break; - case 'votes': - $args['meta_key'] = '_dwqa_votes'; - $args['orderby'] = 'meta_value_num'; - break; - default : - $args['orderby'] = 'modified'; - break; - } - - switch ( $this->filter['filter_plus'] ) { - case 'resolved' : - $args['meta_query'][] = array( - 'key' => '_dwqa_status', - 'value' => array( 'resolved' ), - 'compare' => 'IN', - ); - break; - case 'replied': - - $args['meta_query'][] = array( - 'key' => '_dwqa_status', - 'value' => array( 'open', 're-open', 'pending', 'answered' ), - 'compare' => 'IN', - ); - //not have answered by admin - break; - case 'overdue': - case 'new-comment': - case 'open' : - $args['meta_query'][] = array( - 'key' => '_dwqa_status', - 'value' => array( 'open', 're-open', 'pending' ), - 'compare' => 'IN', - ); - //not have answered by admin - break; - case 'pending-review': - $args['meta_query'][] = array( - 'key' => '_dwqa_status', - 'value' => array( 'pending' ), - 'compare' => 'IN', - ); - break; - case 'closed' : - $args['meta_query'][] = array( - 'key' => '_dwqa_status', - 'value' => array( 'closed' ), - 'compare' => 'IN', - ); - break; - } - if ( $this->filter['category'] != 'all' ) { - $args['tax_query'][] = array( - 'taxonomy' => 'dwqa-question_category', - 'field' => 'id', - 'terms' => array( $this->filter['category'] ), - 'operator' => 'IN', - ); - } - - if ( (boolean) $this->filter['tags'] ) { - $args['tax_query'][] = array( - 'taxonomy' => 'dwqa-question_tag', - 'field' => 'id', - 'terms' => array( $this->filter['tags'] ), - 'operator' => 'IN', - ); - } - - if ( isset( $this->filter['title'] ) && $this->filter['title'] && $this->filter['title'] !== 'Search' ) { - $args['s'] = $this->filter['title']; - } - - $questions = new WP_Query( $args ); - return $questions; - } - - function edit_posts_orderby( $orderby_statement ) { - switch ( $this->filter['type'] ) { - case 'answers': - $order = ( $this->filter['order'] && $this->filter['order'] != 'ASC' ? 'DESC' : 'ASC' ); - $orderby_statement = 'count_answer.dwqa_answers '. $order; - break; - case 'views'; - case 'votes'; - break; - - default: - // $order = ( $this->filter['order'] && $this->filter['order'] != 'ASC' ? 'DESC' : 'ASC' ); - // $orderby_statement = $this->order_filter_default( $orderby_statement, $order ); - break; - } - return $orderby_statement; - } - - // Join for searching metadata - function join_postmeta_count_answers( $join ) { - global $wp_query, $wpdb; - switch ( $this->filter['type'] ) { - case 'answers': - $join .= "LEFT JOIN - ( SELECT meta_value AS question, COUNT( * ) AS dwqa_answers - FROM $wpdb->postmeta - WHERE meta_key = '_question' - GROUP BY meta_value ) AS count_answer - ON $wpdb->posts.ID = count_answer.question - "; - break; - case 'views'; - case 'votes'; - break; - default: - // $join = $this->join_filter_default( $join ); - break; - } - return $join; - } - - - public function join_filter_default( $join ) { - global $wpdb; - - $join .= "LEFT JOIN - ( SELECT $wpdb->postmeta.meta_value as question, max( $wpdb->posts.post_modified) as post_modified - FROM $wpdb->posts, $wpdb->postmeta - WHERE - $wpdb->posts.post_type = 'dwqa-answer' - AND ( - $wpdb->posts.post_status = 'publish'"; - if ( is_user_logged_in() ) { - $join .= " OR $wpdb->posts.post_status = 'private' "; - $join .= " OR $wpdb->posts.post_status = 'pending' "; - } - $join .= ") - AND $wpdb->postmeta.post_id = $wpdb->posts.ID - AND $wpdb->postmeta.meta_key = '_question' - GROUP BY question ) as dw_table_latest_answers - ON $wpdb->posts.ID = dw_table_latest_answers.question "; - - return $join; - } - - public function order_filter_default( $orderby_statement, $order = 'DESC' ) { - global $wpdb; - return " ifnull( dw_table_latest_answers.post_modified, $wpdb->posts.post_modified) ".$order; - } - - public function posts_where_filter_default( $where ) { - global $current_user; - $manager = 0; - if ( dwqa_current_user_can( 'edit_question' ) ) { - $manager = 1; - } - $where .= " AND if ( post_status = 'private', if ( $manager = 1, 1, if ( post_author = $current_user->ID, 1, 0 ) ), 1 ) = 1"; - $where .= " AND if ( post_status = 'pending', if ( $manager = 1, 1, if ( post_author = $current_user->ID, 1, 0 ) ), 1 ) = 1"; - return $where; - } - - // Filter post where - public function posts_where( $where ) { - global $wpdb, $dwqa_general_settings; - $get_question_answered_query = "SELECT `dw_latest_answer_date`.question - FROM `{$wpdb->posts}`, - ( SELECT `{$wpdb->postmeta}`.meta_value as question, max( `{$wpdb->posts}`.post_date) as post_date - FROM `{$wpdb->posts}`, `{$wpdb->postmeta}` - WHERE `{$wpdb->posts}`.post_type = 'dwqa-answer' - AND ( `{$wpdb->posts}`.post_status = 'publish' - OR `{$wpdb->posts}`.post_status = 'private' ) - AND `{$wpdb->postmeta}`.post_id = `{$wpdb->posts}`.ID - AND `{$wpdb->postmeta}`.meta_key = '_question' - GROUP BY question ) AS dw_latest_answer_date, - {$wpdb->users}, - {$wpdb->usermeta} - - WHERE `{$wpdb->posts}`.post_status = 'publish' - AND `{$wpdb->posts}`.post_type = 'dwqa-answer' - AND `{$wpdb->posts}`.post_date = `dw_latest_answer_date`.post_date - AND `{$wpdb->users}`.ID = `{$wpdb->posts}`.post_author - AND `{$wpdb->usermeta}`.user_id = `{$wpdb->users}`.ID - AND `{$wpdb->usermeta}`.meta_key = '{$wpdb->prefix}capabilities' - AND ( - `{$wpdb->usermeta}`.meta_value LIKE '%administrator%' - OR `{$wpdb->usermeta}`.meta_value LIKE '%editor%' - OR `{$wpdb->usermeta}`.meta_value LIKE '%author%' - )"; - - switch ( $this->filter['filter_plus'] ) { - case 'overdue' : - $overdue_time_frame = isset( $dwqa_general_settings['question-overdue-time-frame']) ? $dwqa_general_settings['question-overdue-time-frame'] : 2; - $where .= " AND post_date < '" . date( 'Y-m-d H:i:s', strtotime( '-'.$overdue_time_frame.' days' ) ) . "'"; - case 'open': - // answered - $where .= ' AND ID NOT IN (' . $get_question_answered_query . ' )'; - break; - case 'replied': - // answered - $where .= ' AND ID IN (' . $get_question_answered_query. ' )'; - break; - case 'new-comment': - if ( current_user_can( 'edit_posts' ) ) { - $where .= " AND ID IN ( - SELECT `{$wpdb->postmeta}`.meta_value FROM - `{$wpdb->comments}` - JOIN - ( SELECT `{$wpdb->comments}`.comment_ID, `{$wpdb->comments}`.comment_post_ID, max( `{$wpdb->comments}`.comment_date ) as comment_time FROM `{$wpdb->comments}` - JOIN `{$wpdb->posts}` ON `{$wpdb->comments}`.comment_post_ID = `{$wpdb->posts}`.ID - WHERE `{$wpdb->comments}`.comment_approved = 1 AND `{$wpdb->posts}`.post_type = 'dwqa-answer' - GROUP BY `{$wpdb->comments}`.comment_post_ID ) as t1 - ON `{$wpdb->comments}`.comment_post_ID = t1.comment_post_ID AND `{$wpdb->comments}`.comment_date = t1.comment_time - JOIN `{$wpdb->usermeta}` ON `{$wpdb->comments}`.user_id = `{$wpdb->usermeta}`.user_id - JOIN `{$wpdb->postmeta}` ON `{$wpdb->postmeta}`.post_id = `{$wpdb->comments}`.comment_post_ID - WHERE 1=1 AND `{$wpdb->usermeta}`.meta_key = '{$wpdb->prefix}capabilities' - AND `{$wpdb->usermeta}`.meta_value NOT LIKE '%administrator%' - AND `{$wpdb->usermeta}`.meta_value NOT LIKE '%editor%' - AND `{$wpdb->usermeta}`.meta_value NOT LIKE '%author%' - AND `{$wpdb->postmeta}`.meta_key = '_question' - ) "; - } - # code... - break; - } - - return $where; - } - - public function where_title( $where ){ - if ( isset( $_POST['title'] ) ) { - $where .= " AND post_title LIKE '%".preg_quote( sanitize_text_field( $_POST['title'] ) )."%'"; - } - return $where; - } - - public function posts_where_suggest( $where ) { - global $current_search; - $first = true; - $s = explode( ' ', $current_search ); - if ( count( $s ) > 0 ) { - $where .= ' AND ('; - foreach ( $s as $w ) { - if ( ! $first ) { - $where .= ' OR '; - } - $where .= "post_title REGEXP '".preg_quote( $w )."'"; - $first = false; - } - $where .= ' ) '; - } - return $where; - } - - public function auto_suggest_for_seach(){ - if ( ! isset( $_POST['nonce']) ) { - wp_send_json_error( array( array( - 'error' => 'sercurity', - 'message' => __( 'Are you cheating huh?', 'dwqa' ) - ) ) ); - } - check_ajax_referer( '_dwqa_filter_nonce', 'nonce' ); - - if ( ! isset( $_POST['title'] ) ) { - wp_send_json_error( array( array( - 'error' => 'empty title', - 'message' => __( 'Search query is empty', 'dwqa' ), - ) ) ); - } - - $status = 'publish'; - if ( is_user_logged_in() ) { - $status = array( 'publish', 'private' ); - } - - $search = sanitize_text_field( $_POST['title'] ); - $args_query = array( - 'post_type' => 'dwqa-question', - 'posts_per_page' => 6, - 'post_status' => $status, - ); - preg_match_all( '/#\S*\w/i', $search, $matches ); - if ( $matches && is_array( $matches ) && count( $matches ) > 0 && count( $matches[0] ) > 0 ) { - $args_query['tax_query'][] = array( - 'taxonomy' => 'dwqa-question_tag', - 'field' => 'slug', - 'terms' => $matches[0], - 'operator' => 'IN', - ); - $search = preg_replace( '/#\S*\w/i', '', $search ); - } - $args_query['s'] = $search; - $query = new WP_Query( $args_query ); - if ( ! $query->have_posts() ) { - global $current_search; - $current_search = $search; - add_filter( 'posts_where' , array( $this, 'posts_where_suggest' ) ); - unset( $args_query['s'] ); - $query = new WP_Query( $args_query ); - remove_filter( 'posts_where' , array( $this, 'posts_where_suggest') ); - } - $results = array(); - if ( $query->have_posts() ) { - $html = ''; - while ( $query->have_posts() ) { - $query->the_post(); - $results[] = array( - 'title' => get_post_field( 'post_title', get_the_ID() ), - 'url' => get_permalink( get_the_ID() ) - ); - } - wp_reset_query(); - wp_send_json_success( $results ); - } else { - wp_reset_query(); - wp_send_json_error( array( array( 'error' => 'not found', 'message' => __( 'Search query is empty', 'dwqa' ) ) ) ); - } - } - - public function prepare_archive_posts() { + public function prepare_archive_posts( $args ) { global $wp_query,$dwqa_general_settings; $posts_per_page = isset( $dwqa_general_settings['posts-per-page'] ) ? $dwqa_general_settings['posts-per-page'] : 5; $user = isset( $_GET['user'] ) && !empty( $_GET['user'] ) ? urldecode( $_GET['user'] ) : false; - $filter = isset( $_GET['filter'] ) && !empty( $_GET['filter'] ) ? $_GET['filter'] : 'all'; - $search_text = isset( $_GET['qs'] ) ? $_GET['qs'] : false; - $sort = isset( $_GET['sort'] ) ? $_GET['sort'] : ''; + $filter = isset( $_GET['filter'] ) && !empty( $_GET['filter'] ) ? sanitize_text_field( $_GET['filter'] ) : 'all'; + $search_text = isset( $_GET['qs'] ) ? sanitize_text_field( $_GET['qs'] ) : false; + $sort = isset( $_GET['sort'] ) ? sanitize_text_field( $_GET['sort'] ) : ''; $query = array( 'post_type' => 'dwqa-question', 'posts_per_page' => $posts_per_page, - 'orderby' => 'modified', + 'orderby' => 'modified' ); $page_text = dwqa_is_front_page() ? 'page' : 'paged'; $paged = get_query_var( $page_text ); @@ -527,8 +44,7 @@ public function prepare_archive_posts() { // filter by user if ( $user ) { - $user = get_user_by( 'login', $user ); - $query['author'] = $user->ID; + $query['author_name'] = esc_html( $user ); } @@ -571,7 +87,7 @@ public function prepare_archive_posts() { case 'closed': $query['meta_query'][] = array( 'key' => '_dwqa_status', - 'value' => array( 'closed' ), + 'value' => array( 'closed', 'close' ), 'compare' => 'IN', ); break; @@ -610,7 +126,7 @@ public function prepare_archive_posts() { // search if ( $search_text ) { $search = sanitize_text_field( $search_text ); - preg_match_all( '/#\S*\w/i', $search_text, $matches ); + preg_match_all( '/#\S*\w/i', $search, $matches ); if ( $matches && is_array( $matches ) && count( $matches ) > 0 && count( $matches[0] ) > 0 ) { $query['tax_query'][] = array( 'taxonomy' => 'dwqa-question_tag', @@ -621,86 +137,94 @@ public function prepare_archive_posts() { $search = preg_replace( '/#\S*\w/i', '', $search ); } - $query['s'] = $search; + $query['search_question_title'] = $search; } $sticky_questions = get_option( 'dwqa_sticky_questions' ); - // exclude sticky question - if ( $sticky_questions && 'all' == $filter && !$sort && !$search_text ) { - $query['post__not_in'] = $sticky_questions; - } - if ( is_user_logged_in() ) { - $query['post_status'] = array( 'publish', 'private', 'pending' ); + $query['post_status'] = array( 'publish', 'private' ); } - $wp_query->dwqa_questions = new WP_Query( $query ); - } + $query = wp_parse_args( $args, $query ); - public function sticky_question() { - global $wp_query; - $sticky_questions = get_option( 'dwqa_sticky_questions' ); + $query = apply_filters( 'dwqa_prepare_archive_posts', $query ); - $user = isset( $_GET['user'] ) && !empty( $_GET['user'] ) ? urldecode( $_GET['user'] ) : false; - $filter = isset( $_GET['filter'] ) && !empty( $_GET['filter'] ) ? $_GET['filter'] : 'all'; - $search_text = isset( $_GET['qs'] ) ? $_GET['qs'] : false; - $sort = isset( $_GET['sort'] ) ? $_GET['sort'] : ''; + // $wp_query->dwqa_questions = new WP_Query( $query ); - $cat = get_query_var( 'dwqa-question_category' ) ? get_query_var( 'dwqa-question_category' ) : false; - $tag = get_query_var( 'dwqa-question_tag' ) ? get_query_var( 'dwqa-question_tag' ) : false; + if(isset($query['search_question_title']) && $query['search_question_title'] != ''){ + + add_filter( 'posts_where', array($this, 'questions_where'), 10, 1 ); + $wp_query->dwqa_questions = new WP_Query( $query ); + remove_filter( 'posts_where', array($this, 'questions_where'), 10, 1 ); + }else{ + $wp_query->dwqa_questions = new WP_Query( $query ); + } + + // sticky question + $sticky_questions = get_option( 'dwqa_sticky_questions' ); + if ( !empty( $sticky_questions ) && 'all' == $filter && ! $sort && !$search_text && $query['paged'] == 1 ) { - if ( $sticky_questions && 'all' == $filter && !$search_text && !$sort ) { if ( $cat ) { foreach( $sticky_questions as $key => $id ) { $terms = wp_get_post_terms( $id, 'dwqa-question_category' ); - if ( empty( $terms ) || $cat !== $terms[0]->slug ) { unset( $sticky_questions[ $key ] ); } } - - $args['tax_query'][] = array( - 'taxonomy' => 'dwqa-question_category', - 'terms' => $cat, - 'field' => 'slug' - ); } if ( $tag ) { foreach( $sticky_questions as $key => $id ) { $terms = wp_get_post_terms( $id, 'dwqa-question_tag' ); - if ( empty( $terms ) || $tag !== $terms[0]->slug ) { unset( $sticky_questions[ $key ] ); } } - - $args['tax_query'][] = array( - 'taxonomy' => 'dwqa-question_category', - 'terms' => $cat, - 'field' => 'slug' - ); } if ( $user ) { - $user = get_user_by( 'login', $user ); foreach( $sticky_questions as $key => $id ) { - if ( $user->data->ID !== get_post_field( 'post_author', $id ) ) { + if ( $user->ID !== get_post_field( 'post_author', $id ) ) { unset( $sticky_questions[ $key ] ); } } } - - $args = array( - 'posts_per_page' => 40, - 'post_type' => 'dwqa-question', - 'post__in' => $sticky_questions, - ); + + if ( !is_array( $sticky_questions ) ) { + $sticky_questions = array( $sticky_questions ); + } + $num_posts = count( $wp_query->dwqa_questions->posts ); + $stickies_offset = 0; + + for ( $i = 0; $i < $num_posts; $i++ ) { + if ( in_array( $wp_query->dwqa_questions->posts[ $i ]->ID, $sticky_questions ) ) { + $sticky_post = $wp_query->dwqa_questions->posts[$i]; + + array_splice( $wp_query->dwqa_questions->posts, $i, 1 ); + array_splice( $wp_query->dwqa_questions->posts, $stickies_offset, 0, array( $sticky_post ) ); + + $stickies_offset++; + + $offset = array_search( $sticky_post->ID, $sticky_questions ); + unset( $sticky_questions[$offset] ); + } + } if ( !empty( $sticky_questions ) ) { - $wp_query->dwqa_question_stickies = new WP_Query( $args ); + $stickies = get_posts( array( + 'post__in' => $sticky_questions, + 'post_type' => 'dwqa-question', + 'post_status' => 'publish', + 'nopaging' => true + ) ); + + foreach( $stickies as $sticky_post ) { + array_splice( $wp_query->dwqa_questions->posts, $stickies_offset, 0, array( $sticky_post ) ); + $stickies_offset++; + } } + $wp_query->dwqa_questions->post_count = count( $wp_query->dwqa_questions->posts ); } } @@ -710,60 +234,108 @@ public function after_archive_posts() { } public function prepare_answers( $posts, $query ) { - global $dwqa; - $query->test = 'rambu'; + global $dwqa, $dwqa_general_settings; - if ( is_main_query() && $query->is_single() && $query->query_vars['post_type'] == $dwqa->question->get_slug() ) { + if ( $query->is_single() && $query->query_vars['post_type'] == $dwqa->question->get_slug() ) { $question = $posts[0]; $ans_cur_page = isset( $_GET['ans-page'] ) ? intval( $_GET['ans-page'] ) : 1; + $posts_per_page = isset( $dwqa_general_settings['answer-per-page'] ) ? $dwqa_general_settings['answer-per-page'] : 5; // We will include the all answers of this question here; $args = array( 'post_type' => 'dwqa-answer', - 'posts_per_page' => get_option( 'posts_per_page' ), 'order' => 'ASC', 'paged' => $ans_cur_page, - 'meta_query' => array( - array( - 'key' => '_question', - 'value' => $question->ID - ), - ), - 'post_status' => array( 'publish', 'private', 'draft' ), - 'perm' => 'readable', + 'post_parent' => $question->ID, + 'post_status' => array( 'publish', 'private', 'draft' ) ); + + if ( isset( $dwqa_general_settings['show-all-answers-on-single-question-page'] ) && $dwqa_general_settings['show-all-answers-on-single-question-page'] ) { + $args['nopaging'] = true; + } else { + $args['posts_per_page'] = $posts_per_page; + } + + $best_answer = dwqa_get_the_best_answer( $question->ID ); + + $args = apply_filters( 'dwqa_prepare_answers', $args ); + $query->dwqa_answers = new WP_Query( $args ); - $query->dwqa_answers->best_answer = dwqa_get_the_best_answer( $question->ID ); + + // best answer + if ( $best_answer && !empty( $best_answer ) ) { + $sticky_posts = array( $best_answer ); + $num_posts = count( $query->dwqa_answers->posts ); + $best_offset = 0; + + for( $i = 0; $i < $num_posts; $i++ ) { + if ( $query->dwqa_answers->posts[ $i ]->ID == $best_answer ) { + $sticky_post = $query->dwqa_answers->posts[$i]; + + array_splice($query->dwqa_answers->posts, $i, 1); + + array_splice($query->dwqa_answers->posts, $best_offset, 0, array($sticky_post)); + + $best_offset++; + + $offset = array_search($sticky_post->ID, $sticky_posts); + unset( $sticky_posts[$offset] ); + } + } + + if ( !empty($sticky_posts) ) { + $stickies = get_posts( array( + 'post__in' => $sticky_posts, + 'post_type' => 'dwqa-answer', + 'post_status' => 'publish', + 'nopaging' => true + ) ); + + foreach ( $stickies as $sticky_post ) { + array_splice( $query->dwqa_answers->posts, $best_offset, 0, array( $sticky_post ) ); + $best_offset++; + } + } + } + $query->dwqa_answers->post_count = count( $query->dwqa_answers->posts ); } return $posts; } public function __construct(){ - global $wpdb; - //Init - $prefix = wp_cache_get( 'dwqa-database-prefix' ); - if ( false == $prefix ) { - $prefix = $wpdb->prefix; - wp_cache_set( 'dwqa-database-prefix', $prefix ); - } - - $this->tb_posts = $prefix . 'posts'; - $this->tb_postmeta = $prefix . 'postmeta'; - $table = $prefix . 'dwqa_question_index'; - $filter = array( $this, 'filter_question' ); - - add_action( 'wp_ajax_dwqa-filter-question', $filter ); - add_action( 'wp_ajax_nopriv_dwqa-filter-question', $filter ); - - add_action( 'wp_ajax_dwqa-auto-suggest-search-result', array( $this, 'auto_suggest_for_seach' ) ); - add_action( 'wp_ajax_nopriv_dwqa-auto-suggest-search-result', array( $this, 'auto_suggest_for_seach' ) ); - - add_action( 'dwqa_before_questions_list', array( $this, 'prepare_archive_posts' ) ); + add_action( 'bp_dwqa_before_questions_list', array( $this, 'prepare_archive_posts' ) ); add_action( 'dwqa_after_questions_list', array( $this, 'after_archive_posts' ) ); - add_action( 'dwqa_before_question_stickies', array( $this, 'sticky_question' ) ); add_action( 'dwqa_after_question_stickies', array( $this, 'after_archive_posts' ) ); //Prepare answers for single questions add_action( 'the_posts', array( $this, 'prepare_answers' ), 10, 2 ); + add_filter( 'parse_query', array( $this, 'dwqa_theme_fix_category_page' ) ); + } + + function dwqa_theme_fix_category_page( $query ) { + if ( isset( $query->query_vars['dwqa-question_tag'] ) || isset( $query->query_vars['dwqa-question_category'] ) ) { + $dwqa_options = get_option( 'dwqa_options', array() ); + $query->query_vars['posts_per_page'] = isset( $dwqa_options['posts-per-page'] ) ? $dwqa_options['posts-per-page'] : 15; + } + return $query; + } + + public function questions_where($where){ + global $wpdb; + $search_text = isset( $_GET['qs'] ) ? sanitize_text_field( $_GET['qs'] ) : false; + $first = true; + $s = explode( ' ', $search_text ); + if ( count( $s ) > 0 ) { + $where .= ' AND ('; + foreach ( $s as $w ) { + if ( ! $first ) { + $where .= ' OR '; + } + $where .= "post_title REGEXP '".preg_quote( $w )."'"; + $first = false; + } + $where .= ' ) '; + } + return $where; } } ?> \ No newline at end of file diff --git a/inc/Handle.php b/inc/Handle.php index 75e0e0b9..b5f7b1b8 100644 --- a/inc/Handle.php +++ b/inc/Handle.php @@ -20,34 +20,43 @@ public function insert_answer() { if ( ! isset( $_POST['dwqa-action'] ) || ! isset( $_POST['submit-answer'] ) ) { return false; } - - if ( 'add-answer' !== $_POST['dwqa-action'] ) { + // do_action( 'dwqa_add_answer', $answer_id, $question_id ); + // die(); + if ( 'add-answer' !== sanitize_text_field( $_POST['dwqa-action'] ) ) { return false; } if ( ! isset( $_POST['_wpnonce'] ) || ! wp_verify_nonce( esc_html( $_POST['_wpnonce'] ), '_dwqa_add_new_answer' ) ) { - dwqa_add_notice( __( '"Helllo", Are you cheating huh?.', 'dwqa' ), 'error' ); + dwqa_add_notice( __( '"Helllo", Are you cheating huh?.', 'dw-question-answer' ), 'error' ); } - if ( $_POST['submit-answer'] == __( 'Delete draft', 'dwqa' ) ) { + if ( sanitize_text_field( $_POST['submit-answer'] ) == __( 'Delete draft', 'dw-question-answer' ) ) { $draft = isset( $_POST['answer-id'] ) ? intval( $_POST['answer-id'] ) : 0; if ( $draft ) wp_delete_post( $draft ); } if ( empty( $_POST['answer-content'] ) ) { - dwqa_add_notice( __( 'Answer content is empty', 'dwqa' ), 'error' ); + dwqa_add_notice( __( 'Answer content is empty', 'dw-question-answer' ), 'error' ); } if ( empty( $_POST['question_id'] ) ) { - dwqa_add_notice( __( 'Question is empty', 'dwqa' ), 'error' ); + dwqa_add_notice( __( 'Question is empty', 'dw-question-answer' ), 'error' ); } if ( !dwqa_current_user_can( 'post_answer' ) ) { - dwqa_add_notice( __( 'You do not have permission to submit question.', 'dwqa' ), 'error' ); + dwqa_add_notice( __( 'You do not have permission to submit question.', 'dw-question-answer' ), 'error' ); + } + + if ( !is_user_logged_in() && ( empty( $_POST['user-email'] ) || !is_email( sanitize_email( $_POST['user-email'] ) ) ) ) { + dwqa_add_notice( __( 'Missing email information', 'dw-question-answer' ), 'error' ); + } + + if ( !is_user_logged_in() && ( empty( $_POST['user-name'] ) ) ) { + dwqa_add_notice( __( 'Missing name information', 'dw-question-answer' ), 'error' ); } if ( !dwqa_valid_captcha( 'single-question' ) ) { - dwqa_add_notice( __( 'Captcha is not correct', 'dwqa' ), 'error' ); + dwqa_add_notice( __( 'Captcha is not correct', 'dw-question-answer' ), 'error' ); } $user_id = 0; @@ -59,11 +68,14 @@ public function insert_answer() { if ( isset( $_POST['user-email'] ) && is_email( $_POST['user-email'] ) ) { $post_author_email = sanitize_email( $_POST['user-email'] ); } + if ( isset( $_POST['user-name'] ) && !empty( $_POST['user-name'] ) ) { + $post_author_name = sanitize_text_field( $_POST['user-name'] ); + } } $question_id = intval( $_POST['question_id'] ); - $answer_title = __( 'Answer for ', 'dwqa' ) . get_post_field( 'post_title', $question_id ); + $answer_title = __( 'Answer for ', 'dw-question-answer' ) . get_post_field( 'post_title', $question_id ); $answ_content = apply_filters( 'dwqa_prepare_answer_content', $_POST['answer-content'] ); $answers = array( @@ -75,9 +87,9 @@ public function insert_answer() { 'post_parent' => $question_id, ); - $answers['post_status'] = isset( $_POST['save-draft'] ) - ? 'draft' - : ( isset( $_POST['dwqa-status'] ) && $_POST['dwqa-status'] ? $_POST['dwqa-status'] : 'publish' ); + $answers['post_status'] = isset( $_POST['save-draft'] ) + ? 'draft' + : ( isset( $_POST['dwqa-status'] ) && $_POST['dwqa-status'] ? sanitize_text_field( $_POST['dwqa-status'] ) : 'publish' ); do_action( 'dwqa_prepare_add_answer' ); @@ -85,6 +97,8 @@ public function insert_answer() { return false; } + $answers = apply_filters( 'dwqa_insert_answer_args', $answers ); + $answer_id = wp_insert_post( $answers ); if ( !is_wp_error( $answer_id ) ) { @@ -95,7 +109,6 @@ public function insert_answer() { $answer_count = get_post_meta( $question_id, '_dwqa_answers_count', true ); update_post_meta( $question_id, '_dwqa_answers_count', (int) $answer_count + 1 ); } - update_post_meta( $answer_id, '_question', $question_id ); if ( $is_anonymous ) { update_post_meta( $answer_id, '_dwqa_is_anonymous', true ); @@ -103,11 +116,19 @@ public function insert_answer() { if ( isset( $post_author_email ) && is_email( $post_author_email ) ) { update_post_meta( $answer_id, '_dwqa_anonymous_email', $post_author_email ); } + + if ( isset( $post_author_name ) && !empty( $post_author_name ) ) { + update_post_meta( $answer_id, '_dwqa_anonymous_name', $post_author_name ); + } } else { - add_post_meta( $question_id, '_dwqa_followers', get_current_user_id() ); + if ( !dwqa_is_followed( $question_id, get_current_user_id() ) ) { + add_post_meta( $question_id, '_dwqa_followers', get_current_user_id() ); + } } do_action( 'dwqa_add_answer', $answer_id, $question_id ); + $this->update_modified_date( $question_id , current_time( 'timestamp', 0 ), current_time( 'timestamp', 1 ) ); + exit( wp_redirect( get_permalink( $question_id ) ) ); } else { dwqa_add_wp_error_message( $answer_id ); @@ -117,29 +138,29 @@ public function insert_answer() { public function update_answer() { if ( isset( $_POST['dwqa-edit-answer-submit'] ) ) { if ( !dwqa_current_user_can( 'edit_answer' ) ) { - dwqa_add_notice( __( "You do not have permission to edit answer.", 'dwqa' ), 'error' ); + dwqa_add_notice( __( "You do not have permission to edit answer.", 'dw-question-answer' ), 'error' ); } if ( !isset( $_POST['_wpnonce'] ) && !wp_verify_nonce( esc_html( $_POST['_wpnonce'] ), '_dwqa_edit_answer' ) ) { - dwqa_add_notice( __( 'Hello, Are you cheating huh?', 'dwqa' ), 'error' ); + dwqa_add_notice( __( 'Hello, Are you cheating huh?', 'dw-question-answer' ), 'error' ); } $answer_content = apply_filters( 'dwqa_prepare_edit_answer_content', $_POST['answer_content'] ); if ( empty( $answer_content ) ) { - dwqa_add_notice( __( 'You must enter a valid answer content.', 'dwqa' ), 'error' ); + dwqa_add_notice( __( 'You must enter a valid answer content.', 'dw-question-answer' ), 'error' ); } - $answer_id = isset( $_POST['answer_id'] ) ? $_POST['answer_id'] : false; + $answer_id = isset( $_POST['answer_id'] ) ? intval( $_POST['answer_id'] ) : false; if ( !$answer_id ) { - dwqa_add_notice( __( 'Answer is missing.', 'dwqa' ), 'error' ); + dwqa_add_notice( __( 'Answer is missing.', 'dw-question-answer' ), 'error' ); } if ( 'dwqa-answer' !== get_post_type( $answer_id ) ) { - dwqa_add_notice( __( 'This post is not answer.', 'dwqa' ), 'error' ); + dwqa_add_notice( __( 'This post is not answer.', 'dw-question-answer' ), 'error' ); } - do_action( 'dwqa_prepare_update_question', $answer_id ); + do_action( 'dwqa_prepare_insert_question', $answer_id ); if ( dwqa_count_notices( 'error' ) > 0 ) { return false; @@ -156,7 +177,9 @@ public function update_answer() { $old_post = get_post( $answer_id ); $new_post = get_post( $new_answer_id ); do_action( 'dwqa_update_answer', $new_answer_id, $old_post, $new_post ); - $question_id = get_post_meta( $new_answer_id, '_question', true ); + $question_id = dwqa_get_post_parent_id( $new_answer_id ); + $this->update_modified_date( $question_id , current_time( 'sql', 0 ), current_time( 'sql', 1 ) ); + wp_safe_redirect( get_permalink( $question_id ) . '#answer-' . $new_answer_id ); } else { dwqa_add_wp_error_message( $new_answer_id ); @@ -170,16 +193,16 @@ public function insert_comment() { global $current_user; if ( isset( $_POST['comment-submit'] ) ) { if ( ! dwqa_current_user_can( 'post_comment' ) ) { - dwqa_add_notice( __( 'You can\'t post comment', 'dwqa' ), 'error', true ); + dwqa_add_notice( __( 'You can\'t post comment', 'dw-question-answer' ), 'error', true ); } if ( ! isset( $_POST['comment_post_ID'] ) ) { - dwqa_add_notice( __( 'Missing post id.', 'dwqa' ), 'error', true ); + dwqa_add_notice( __( 'Missing post id.', 'dw-question-answer' ), 'error', true ); } $comment_content = isset( $_POST['comment'] ) ? $_POST['comment'] : ''; $comment_content = apply_filters( 'dwqa_pre_comment_content', $comment_content ); if ( empty( $comment_content ) ) { - dwqa_add_notice( __( 'Please enter your comment content', 'dwqa' ), 'error', true ); + dwqa_add_notice( __( 'Please enter your comment content', 'dw-question-answer' ), 'error', true ); } $args = array( @@ -194,26 +217,50 @@ public function insert_comment() { $args['comment_author'] = $current_user->display_name; } else { if ( ! isset( $_POST['email'] ) || ! sanitize_email( $_POST['email'] ) ) { - dwqa_add_notice( __( 'Missing email information', 'dwqa' ), 'error', true ); + dwqa_add_notice( __( 'Missing email information', 'dw-question-answer' ), 'error', true ); + } + + if ( ! isset( $_POST['name'] ) || empty( $_POST['name'] ) ) { + dwqa_add_notice( __( 'Missing name information', 'dw-question-answer' ), 'error', true ); } - $args['comment_author'] = isset( $_POST['name'] ) ? sanitize_text_field( $_POST['name'] ) : 'anonymous'; + $args['comment_author'] = isset( $_POST['name'] ) ? sanitize_text_field( $_POST['name'] ) : 'Anonymous'; $args['comment_author_email'] = sanitize_email( $_POST['email'] ); $args['comment_author_url'] = isset( $_POST['url'] ) ? esc_url( $_POST['url'] ) : ''; $args['user_id'] = -1; } + + $question_id = absint( $_POST['comment_post_ID'] ); + if ( 'dwqa-answer' == get_post_type( $question_id ) ) { + $question_id = dwqa_get_question_from_answer_id( $question_id ); + } + $redirect_to = get_permalink( $question_id ); + + if ( isset( $_GET['ans-page'] ) ) { + $redirect_to = add_query_arg( 'ans-page', absint( $_GET['ans-page'] ), $redirect_to ); + } + + + + if ( dwqa_count_notices( 'error', true ) > 0 ) { + $redirect_to = apply_filters( 'dwqa_submit_comment_error_redirect', $redirect_to, $question_id); + exit(wp_safe_redirect( $redirect_to )); return false; } + + $args = apply_filters( 'dwqa_insert_comment_args', $args ); - $comment_id = wp_insert_comment( $args ); + $comment_id = wp_insert_comment( $args ); global $comment; $comment = get_comment( $comment_id ); $client_id = isset( $_POST['clientId'] ) ? sanitize_text_field( $_POST['clientId'] ) : false; do_action( 'dwqa_add_comment', $comment_id, $client_id ); + $redirect_to = apply_filters( 'dwqa_submit_comment_success_redirect', $redirect_to, $question_id); + exit(wp_safe_redirect( $redirect_to )); } } @@ -221,28 +268,28 @@ public function update_comment() { global $post_submit_filter; if ( isset( $_POST['dwqa-edit-comment-submit'] ) ) { if ( ! isset( $_POST['comment_id']) ) { - dwqa_add_notice( __( 'Comment is missing', 'dwqa' ), 'error' ); + dwqa_add_notice( __( 'Comment is missing', 'dw-question-answer' ), 'error' ); } $comment_id = intval( $_POST['comment_id'] ); - $comment_content = isset( $_POST['comment_content'] ) ? esc_html( $_POST['comment_content'] ) : ''; + $comment_content = isset( $_POST['comment_content'] ) ? $_POST['comment_content'] : ''; $comment_content = apply_filters( 'dwqa_pre_update_comment_content', $comment_content ); if ( ! isset( $_POST['_wpnonce'] ) || ! wp_verify_nonce( sanitize_text_field( $_POST['_wpnonce'] ), '_dwqa_edit_comment' ) ) { - dwqa_add_notice( __( 'Are you cheating huh?', 'dwqa' ), 'error' ); + dwqa_add_notice( __( 'Are you cheating huh?', 'dw-question-answer' ), 'error' ); } - if ( !dwqa_current_user_can( 'You do not have permission to edit answer.' ) ) { - dwqa_add_notice( __( 'You do not have permission to edit comment.', 'dwqa' ), 'error' ); + if ( !dwqa_current_user_can( 'edit_comment', $comment_id ) ) { + dwqa_add_notice( __( 'You do not have permission to edit comment.', 'dw-question-answer' ), 'error' ); } if ( strlen( $comment_content ) <= 0 || ! isset( $comment_id ) || ( int )$comment_id <= 0 ) { - dwqa_add_notice( __( 'Comment content must not be empty.', 'dwqa' ), 'error' ); + dwqa_add_notice( __( 'Comment content must not be empty.', 'dw-question-answer' ), 'error' ); } else { $commentarr = array( 'comment_ID' => $comment_id, 'comment_content' => $comment_content ); - + $intval = wp_update_comment( $commentarr ); if ( !is_wp_error( $intval ) ) { $comment = get_comment( $comment_id ); @@ -266,12 +313,22 @@ public function submit_question() { if ( isset( $_POST['_wpnonce'] ) && wp_verify_nonce( esc_html( $_POST['_wpnonce'] ), '_dwqa_submit_question' ) ) { if ( $valid_captcha ) { if ( empty( $_POST['question-title'] ) ) { - - // $dwqa_submit_question_errors->add( 'submit_question', 'You must enter a valid question title' ); - dwqa_add_notice( __( 'You must enter a valid question title.', 'error' ) ); + dwqa_add_notice( __( 'You must enter a valid question title.', 'dw-question-answer' ), 'error' ); return false; } + if ( !is_user_logged_in() ) { + if ( empty( $_POST['_dwqa_anonymous_email'] ) || !is_email( sanitize_email( $_POST['_dwqa_anonymous_email'] ) ) ) { + dwqa_add_notice( __( 'Missing email information', 'dw-question-answer' ), 'error' ); + return false; + } + + if ( empty( $_POST['_dwqa_anonymous_name'] ) ) { + dwqa_add_notice( __( 'Missing name information', 'dw-question-answer' ), 'error' ); + return false; + } + } + $title = esc_html( $_POST['question-title'] ); $category = isset( $_POST['question-category'] ) ? @@ -283,7 +340,7 @@ public function submit_question() { $tags = isset( $_POST['question-tag'] ) ? esc_html( $_POST['question-tag'] ): ''; - $content = isset( $_POST['question-content'] ) ? $_POST['question-content'] : ''; + $content = isset( $_POST['question-content'] ) ? $_POST['question-content'] : ''; $content = apply_filters( 'dwqa_prepare_question_content', $content ); $user_id = 0; @@ -292,7 +349,7 @@ public function submit_question() { $user_id = get_current_user_id(); } else { //$post_author_email = $_POST['user-email']; - if ( isset( $_POST['login-type'] ) && $_POST['login-type'] == 'sign-in' ) { + if ( isset( $_POST['login-type'] ) && sanitize_text_field( $_POST['login-type'] ) == 'sign-in' ) { $user = wp_signon( array( 'user_login' => isset( $_POST['user-name'] ) ? esc_html( $_POST['user-name'] ) : '', 'user_password' => isset( $_POST['user-password'] ) ? esc_html( $_POST['user-password'] ) : '', @@ -307,7 +364,7 @@ public function submit_question() { $dwqa_current_error = $user; return false; } - } elseif ( isset( $_POST['login-type'] ) && $_POST['login-type'] == 'sign-up' ) { + } elseif ( isset( $_POST['login-type'] ) && sanitize_text_field( $_POST['login-type'] ) == 'sign-up' ) { //Create new user $users_can_register = get_option( 'users_can_register' ); if ( isset( $_POST['user-email'] ) && isset( $_POST['user-name-signup'] ) @@ -346,13 +403,13 @@ public function submit_question() { } else { $message = ''; if ( ! $users_can_register ) { - $message .= __( 'User Registration was disabled.','dwqa' ).''.__( 'DW Question Answer is a WordPress Plugin which helps you build a Question & Answer system on your WordPress sites. The plugin is easy to install and set up. Let start building up your community with this WordPress question & answer system.', 'dwqa' ).'
'.$this->help_tab_designwall() + 'title' => __( 'Overview', 'dw-question-answer' ), + 'content' => ''.__( 'DW Question Answer is a WordPress Plugin which helps you build a Question & Answer system on your WordPress sites. The plugin is easy to install and set up. Let start building up your community with this WordPress question & answer system.', 'dw-question-answer' ).'
'.$this->help_tab_designwall() ), 'dwqa-guide-add-list-page' => array( - 'title' => __( 'Setup Question List Page', 'dwqa' ), + 'title' => __( 'Setup Question List Page', 'dw-question-answer' ), 'content' => $this->help_tab_guide_make_question_list_page() ), 'dwqa-guide-add-ask-page' => array( - 'title' => __( 'Setup Ask Question Page', 'dwqa' ), + 'title' => __( 'Setup Ask Question Page', 'dw-question-answer' ), 'content' => $this->help_tab_guide_make_ask_question_page() ), 'dwqa-guide-shortcode' => array( - 'title' => __( 'Shortcode', 'dwqa' ), + 'title' => __( 'Shortcode', 'dw-question-answer' ), 'content' => $this->help_tab_guide_shortcode() ), 'dwqa-guide-style-integration' => array( - 'title' => __( 'Style integration', 'dwqa' ), + 'title' => __( 'Style integration', 'dw-question-answer' ), 'content' => $this->help_tab_guide_style_integration() ) ); @@ -146,7 +150,7 @@ private function help_tab_guide_style_integration() { ob_start(); ?>
get_admin_email(); @@ -24,31 +53,12 @@ public function new_question_notify( $question_id, $user_id ) { $subject = get_option( 'dwqa_subscrible_new_question_email_subject' ); if ( ! $subject ) { - $subject = __( 'A new question was posted on {site_name}', 'dwqa' ); + $subject = __( 'A new question was posted on {site_name}', 'dw-question-answer' ); } $subject = str_replace( '{site_name}', get_bloginfo( 'name' ), $subject ); $subject = str_replace( '{question_title}', $question->post_title, $subject ); $subject = str_replace( '{question_id}', $question->ID, $subject ); $subject = str_replace( '{username}', get_the_author_meta( 'display_name', $user_id ), $subject ); - // To send HTML mail, the Content-type header must be set - $headers = 'MIME-Version: 1.0' . "\r\n"; - $headers .= 'Content-type: text/html; charset=utf-8' . "\r\n"; - //From email - $from_email = get_option( 'dwqa_subscrible_from_address' ); - if ( $from_email ) { - $headers .= 'From: ' . $from_email . "\r\n"; - } - - //Cc email - $cc_address = get_option( 'dwqa_subscrible_cc_address' ); - if ( $cc_address ) { - $headers .= 'Cc: ' . $cc_address . "\r\n"; - } - //Bcc email - $bcc_address = get_option( 'dwqa_subscrible_bcc_address' ); - if ( $bcc_address ) { - $headers .= 'Bcc: ' . $bcc_address . "\r\n"; - } $message = dwqa_get_mail_template( 'dwqa_subscrible_new_question_email', 'new-question' ); if ( ! $message ) { @@ -62,7 +72,7 @@ public function new_question_notify( $question_id, $user_id ) { } //sender $message = str_replace( '{user_avatar}', get_avatar( $user_id, '60' ), $message ); - $message = str_replace( '{user_link}', get_author_posts_url( $user_id ), $message ); + $message = str_replace( '{user_link}', dwqa_get_author_link( $user_id ), $message ); $message = str_replace( '{username}', get_the_author_meta( 'display_name', $user_id ), $message ); //question $message = str_replace( '{question_link}', get_permalink( $question_id ), $message ); @@ -76,158 +86,193 @@ public function new_question_notify( $question_id, $user_id ) { $message = str_replace( '{site_description}', get_bloginfo( 'description' ), $message ); $message = str_replace( '{site_url}', site_url(), $message ); + $headers = array( + "From: {$this->get_from_name()} <{$this->get_from_address()}>", + "Reply-To: {$this->get_from_address()}", + "Content-Type: {$this->get_content_type()}; charset=utf-8" + ); + // start send out email - wp_mail( $admin_email, $subject, $message, $headers ); + foreach( $admin_email as $to ) { + if ( is_email( $to ) ) + $sended = $this->send( sanitize_email( $to ), $subject, $message, $headers ); + } } - public function new_answer_nofity( $answer_id ) { - $enabled = get_option( 'dwqa_subscrible_enable_new_answer_notification', 1 ); - if ( ! $enabled ) { + public function new_answer_notify( $answer_id, $question_id ) { + // print_r( $answer_id ); die; + if ( 'dwqa-answer' !== get_post_type( $answer_id ) ) { return false; } - //Admin email - $admin_email = get_bloginfo( 'admin_email' );; - $enable_send_copy = get_option( 'dwqa_subscrible_send_copy_to_admin' ); - - $question_id = get_post_meta( $answer_id, '_question', true ); - $question = get_post( $question_id ); - $answer = get_post( $answer_id ); - if ( $answer->post_status != 'publish' && $answer->post_status != 'private' ) { + if ( 'dwqa-question' !== get_post_type( $question_id ) ) { return false; } - //Send email alert for author of question about this answer - if ( dwqa_is_anonymous( $question_id ) ) { - $email = get_post_meta( $question_id, '_dwqa_anonymous_email', true ); - if ( ! is_email( $email ) ) { - return false; - } - } else { - // if user is not the author of question/answer, add user to followers list - if ( $question->post_author != $answer->post_author ) { - if ( ! dwqa_is_followed( $question_id, $answer->post_author ) ) { - add_post_meta( $question_id, '_dwqa_followers', $answer->post_author ); - } - } - $email = get_the_author_meta( 'user_email', $question->post_author ); + // default value + $site_name = get_bloginfo( 'name' ); + $question_title = get_the_title( $question_id ); + $answer_content = get_post_field( 'post_content', $answer_id ); + $question_link = get_permalink( $question_id ); + $answer_link = trailingslashit( $question_link ) . '#answer-' . $answer_id; + $site_description = get_bloginfo( 'description' ); + $site_url = site_url(); + $enable_send_copy = get_option( 'dwqa_subscrible_send_copy_to_admin' ); + $admin_email = $this->get_admin_email('answer'); + $site_logo = get_option( 'dwqa_subscrible_email_logo', '' ); + $site_logo = $site_logo ? '
%s
', - __( 'How to use DW Question Answer', 'dwqa' ), - __( 'Documents, Support From DesignWall (help)', 'dwqa' ) + __( 'How to use DW Question Answer', 'dw-question-answer' ), + __( 'Documents, Support From DesignWall (help)', 'dw-question-answer' ) ), 'position' => array( 'edge' => 'top', 'align' => 'right' ) ) @@ -67,8 +67,8 @@ public function register_pointer_testing( $p ) { 'target' => '#adminmenu a[href="edit.php?post_type=dwqa-question&page=dwqa-settings"]', 'options' => array( 'content' => sprintf( '%s
', - __( 'Config your support channel', 'dwqa' ), - __( 'Change comment settings, and create the Submit question page.', 'dwqa' ) + __( 'Config your support channel', 'dw-question-answer' ), + __( 'Change comment settings, and create the Submit question page.', 'dw-question-answer' ) ), 'position' => array( 'edge' => 'left', 'align' => 'middle' ) ) diff --git a/inc/Posts/Answer.php b/inc/Posts/Answer.php index c3b1de3a..414f8909 100644 --- a/inc/Posts/Answer.php +++ b/inc/Posts/Answer.php @@ -15,18 +15,24 @@ function dwqa_question_answers_count( $question_id = null ) { $question_id = $post->ID; } - $answer_count = get_transient( 'dwqa_answer_count_for_' . $question_id ); + $answer_count = wp_cache_get( 'dwqa_answer_count_for_' . $question_id ); - if ( false === $answer_count ) { - $sql = "SELECT COUNT( DISTINCT `P`.ID ) FROM {$wpdb->postmeta} PM JOIN {$wpdb->posts} P ON `PM`.post_id = `P`.ID WHERE `PM`.meta_key = '_question' AND meta_value = {$question_id} AND `P`.post_type = 'dwqa-answer' AND `P`.post_status = 'publish'"; - $sql .= " AND ( `P`.post_status = 'publish' "; - if ( dwqa_current_user_can( 'edit_question', $question_id ) ) { - $sql .= " OR `P`.post_status = 'private'"; + if ( !$answer_count ) { + + $args = array( + 'post_type' => 'dwqa-answer', + 'post_parent' => $question_id, + 'post_per_page' => '-1', + 'post_status' => array('publish') + ); + + if ( dwqa_current_user_can( 'edit_question', $question_id ) || dwqa_current_user_can( 'manage_question' ) ) { + $args['post_status'][] = 'private'; } - $sql .= " )"; - $answer_count = $wpdb->get_var( $sql ); + $answer = new WP_Query($args); + $answer_count = $answer->found_posts; - set_transient( 'dwqa_answer_count_for_' . $question_id, $answer_count, 15*60 ); + wp_cache_set( 'dwqa_answer_count_for_' . $question_id, $answer_count, '', 15*60 ); } return $answer_count; @@ -49,11 +55,11 @@ function dwqa_is_answer_flag( $post_id ) { return false; //showing } -function dwqa_is_the_best_answer( $answer_id, $question_id = false ) { - if ( ! $question_id ) { - $question_id = get_the_ID(); +function dwqa_is_the_best_answer( $answer_id = false ) { + if ( ! $answer_id ) { + $answer_id = get_the_ID(); } - + $question_id = dwqa_get_question_from_answer_id( $answer_id ); $best_answer = dwqa_get_the_best_answer( $question_id ); if ( $best_answer && $best_answer == $answer_id ) { return true; @@ -82,14 +88,7 @@ function dwqa_get_the_best_answer( $question_id = false ) { 'post_type' => $dwqa->answer->get_slug(), 'posts_per_page' => 1, 'meta_key' => '_dwqa_votes', - 'meta_query' => array( - 'relation' => 'AND', - array( - 'key' => '_question', - 'value' => $question_id . '', - 'compare' => '=', - ) - ), + 'post_parent' => $question_id, 'fields' => 'ids', 'orderby' => 'meta_value_num', 'order' => 'DESC' @@ -122,14 +121,8 @@ function dwqa_user_get_draft( $question_id = false ) { } global $current_user; $args = array( - 'post_type' => 'dwqa-answer', - 'meta_query' => array( - array( - 'key' => '_question', - 'value' => array( $question_id ), - 'compare' => 'IN', - ), - ), + 'post_type' => 'dwqa-answer', + 'post_parent' => $question_id, 'post_status' => 'draft', ); @@ -163,13 +156,7 @@ function dwqa_get_drafts( $question_id = false ) { $answers = get_posts( array( 'post_type' => 'dwqa-answer', 'posts_per_page' => 40, - 'meta_query' => array( - array( - 'key' => '_question', - 'value' => array( $question_id ), - 'compare' => 'IN', - ), - ), + 'post_parent' => $question_id, 'post_status' => 'draft', ) ); @@ -192,12 +179,7 @@ function dwqa_question_answer_count_by_status( $question_id, $status = 'publish' $query = new WP_Query( array( 'post_type' => 'dwqa-answer', 'post_status' => $status, - 'meta_query' => array( - array( - 'key' => '_question', - 'value' => $question_id, - ), - ), + 'post_parent' => $question_id, 'fields' => 'ids' ) ); return $query->found_posts; @@ -215,21 +197,23 @@ function dwqa_get_question_from_answer_id( $answer_id = false ) { $answer_id = get_the_ID(); } - return get_post_meta( $answer_id, '_question', true ); + return dwqa_get_post_parent_id( $answer_id ); } class DWQA_Posts_Answer extends DWQA_Posts_Base { public function __construct() { parent::__construct( 'dwqa-answer', array( - 'plural' => __( 'Answers', 'dwqa' ), - 'singular' => __( 'Answer', 'dwqa' ), - 'menu' => __( 'Answers', 'dwqa' ), + 'plural' => __( 'Answers', 'dw-question-answer' ), + 'singular' => __( 'Answer', 'dw-question-answer' ), + 'menu' => __( 'Answers', 'dw-question-answer' ), ) ); add_action( 'manage_' . $this->get_slug() . '_posts_custom_column', array( $this, 'columns_content' ), 10, 2 ); add_action( 'post_row_actions', array( $this, 'unset_old_actions' ) ); + add_action( 'add_meta_boxes', array( $this, 'question_metabox' ) ); + add_filter( 'wp_insert_post_data', array( $this, 'save_metabox_post_data' ), 10, 2 ); //Cache add_action( 'dwqa_add_answer', array( $this, 'update_transient_when_add_answer' ), 10, 2 ); @@ -262,13 +246,13 @@ public function set_has_archive() { } public function columns_head( $defaults ) { - if ( isset( $_GET['post_type'] ) && $_GET['post_type'] == $this->get_slug() ) { + if ( isset( $_GET['post_type'] ) && sanitize_text_field( $_GET['post_type'] ) == $this->get_slug() ) { $defaults = array( 'cb' => '', - 'info' => __( 'Answer', 'dwqa' ), - 'author' => __( 'Author', 'dwqa' ), + 'info' => __( 'Answer', 'dw-question-answer' ), + 'author' => __( 'Author', 'dw-question-answer' ), 'comment' => '', - 'dwqa-question' => __( 'In Response To', 'dwqa' ), + 'dwqa-question' => __( 'In Response To', 'dw-question-answer' ), ); } return $defaults; @@ -318,17 +302,17 @@ public function columns_content( $column_name, $post_ID ) { ); printf( '%s %s %s %s+ +
++ + +
+ diff --git a/inc/Posts/Base.php b/inc/Posts/Base.php index bb9ba4c9..21b2b967 100644 --- a/inc/Posts/Base.php +++ b/inc/Posts/Base.php @@ -1,8 +1,37 @@ 'authorization', - 'error_message' => __( 'Are you cheating, huh?', 'dwqa' ), + 'error_message' => __( 'Are you cheating, huh?', 'dw-question-answer' ), ); $vote_for = isset( $_POST['vote_for'] ) && sanitize_text_field( $_POST['vote_for'] ) == 'question' @@ -15,7 +44,7 @@ function dwqa_action_vote( ) { if ( ! isset( $_POST[ 'post' ] ) ) { $result['error_code'] = 'missing ' . $vote_for; - $result['error_message'] = __( 'What '.$vote_for.' are you looking for?', 'dwqa' ); + $result['error_message'] = __( 'What '.$vote_for.' are you looking for?', 'dw-question-answer' ); wp_send_json_error( $result ); } @@ -23,16 +52,34 @@ function dwqa_action_vote( ) { $point = isset( $_POST['type'] ) && sanitize_text_field( $_POST['type'] ) == 'up' ? 1 : -1; //vote + $dwqa_user_vote_id = ''; if ( is_user_logged_in( ) ) { global $current_user; + $dwqa_user_vote_id = $current_user->ID; + }else{ + global $dwqa_general_settings; + if(isset($dwqa_general_settings['allow-anonymous-vote']) && $dwqa_general_settings['allow-anonymous-vote']){ + $dwqa_user_vote_id = dwqa_get_current_user_session(); + } + } + if ($dwqa_user_vote_id!=''){ + if ( ! dwqa_is_user_voted( $post_id, $point, $dwqa_user_vote_id ) ) { + $votes = get_post_meta( $post_id, '_dwqa_votes_log', true ); - if ( ! dwqa_is_user_voted( $post_id, $point ) ) { - $votes = maybe_unserialize( get_post_meta( $post_id, '_dwqa_votes_log', true ) ); - - $votes[$current_user->ID] = $point; + //remove vote serialize + $data_votes = @unserialize($votes); + if ($data_votes !== false) { + $votes = $data_votes; + } + + if(!$votes || !is_array($votes)){ + $votes = array(); + } + + $votes[$dwqa_user_vote_id] = $point; //update do_action( 'dwqa_vote_'.$vote_for, $post_id, ( int ) $point ); - update_post_meta( $post_id, '_dwqa_votes_log', serialize( $votes ) ); + update_post_meta( $post_id, '_dwqa_votes_log', $votes); // Update vote point dwqa_update_vote_count( $post_id ); @@ -43,21 +90,13 @@ function dwqa_action_vote( ) { wp_send_json_success( array( 'vote' => $point ) ); } else { $result['error_code'] = 'voted'; - $result['error_message'] = __( 'You voted for this ' . $vote_for, 'dwqa' ); + $result['error_message'] = __( 'You voted for this ' . $vote_for, 'dw-question-answer' ); wp_send_json_error( $result ); } - } elseif ( 'question' == $vote_for ) { - // useful of question with meta field is "_dwqa_question_useful", point of this question - $useful = get_post_meta( $post_id, '_dwqa_'.$vote_for.'_useful', true ); - $useful = $useful ? ( int ) $useful : 0; - - do_action( 'dwqa_vote_'.$vote_for, $post_id, ( int ) $point ); - update_post_meta( $post_id, '_dwqa_'.$vote_for.'_useful', $useful + $point ); - - // Number of votes by guest - $useful_rate = get_post_meta( $post_id, '_dwqa_'.$vote_for.'_useful_rate', true ); - $useful_rate = $useful_rate ? ( int ) $useful_rate : 0; - update_post_meta( $post_id, '_dwqa_'.$vote_for.'_useful_rate', $useful_rate + 1 ); + }else{ + $result['error_code'] = 'anonymous'; + $result['error_message'] = __( 'You aren\'t allowed voted for this ' . $vote_for, 'dw-question-answer' ); + wp_send_json_error( $result ); } } add_action( 'wp_ajax_dwqa-action-vote', 'dwqa_action_vote' ); @@ -75,7 +114,7 @@ function dwqa_is_user_voted( $post_id, $point, $user = false ) { global $current_user; $user = $current_user->ID; } - $votes = maybe_unserialize( get_post_meta( $post_id, '_dwqa_votes_log', true ) ); + $votes = get_post_meta( $post_id, '_dwqa_votes_log', true ); if ( empty( $votes ) ) { return false; @@ -111,7 +150,7 @@ function dwqa_update_vote_count( $post_id ) { global $post; $post_id = $post->ID; } - $votes = maybe_unserialize( get_post_meta( $post_id, '_dwqa_votes_log', true ) ); + $votes = get_post_meta( $post_id, '_dwqa_votes_log', true ); if ( empty( $votes ) ) { return 0; @@ -218,7 +257,7 @@ function dwqa_get_latest_action_date( $question = false, $before = '', $af $question_list_link = isset( $dwqa_general_settings['pages']['archive-question'] ) ? get_permalink( $dwqa_general_settings['pages']['archive-question'] ) : false; $latest_answer = dwqa_get_latest_answer( $question ); - $last_activity_date = $latest_answer ? $latest_answer->post_date : get_post_field( 'post_date', $question ); + $last_activity_date = $latest_answer ? $latest_answer->post_date_gmt : get_post_field( 'post_date_gmt', $question ); $post_id = $latest_answer ? $latest_answer->ID : $question; $author_id = $post->post_author; if ( $author_id == 0 || dwqa_is_anonymous( $post_id ) ) { @@ -227,7 +266,7 @@ function dwqa_get_latest_action_date( $question = false, $before = '', $af if ( $anonymous_name ) { $display_name = $anonymous_name . ' '; } else { - $display_name = __( 'Anonymous', 'dwqa' ) . ' '; + $display_name = __( 'Anonymous', 'dw-question-answer' ) . ' '; } } else { $display_name = get_the_author_meta( 'display_name', $author_id ); @@ -248,13 +287,13 @@ function dwqa_get_latest_action_date( $question = false, $before = '', $af if ( $last_activity_date && $post->last_activity_type == 'answer' ) { $date = human_time_diff( strtotime( $last_activity_date ), current_time( 'timestamp' ) ); - return sprintf( __( '%s answered %s ago', 'dwqa' ), $author_link, $date ); + return sprintf( __( '%s answered %s ago', 'dw-question-answer' ), $author_link, $date ); } if ( 'dwqa-answer' == get_post_type( $question ) ) { - return sprintf( __( '%s answered %s ago', 'dwqa' ), $author_link, human_time_diff( get_the_time( 'U' ), current_time( 'timestamp' ) ) ); + return sprintf( __( '%s answered %s ago', 'dw-question-answer' ), $author_link, human_time_diff( get_post_time( 'U', true, $question ) ) ); } - return sprintf( __( '%s asked %s ago', 'dwqa' ), $author_link, human_time_diff( get_the_time( 'U' ), current_time( 'timestamp' ) ) ); + return sprintf( __( '%s asked %s ago', 'dw-question-answer' ), $author_link, human_time_diff( get_post_time( 'U', true, $question ) ) ); } function dwqa_is_edit() { @@ -303,8 +342,8 @@ public function get_slug() { public function get_name_labels() { return wp_parse_args( $this->labels, array( - 'plural' => __( 'DWQA Posts', 'dwqa' ), - 'singular' => __( 'DWQA Post', 'dwqa' ), + 'plural' => __( 'DWQA Posts', 'dw-question-answer' ), + 'singular' => __( 'DWQA Post', 'dw-question-answer' ), 'rewrite' => true, ) ); } @@ -315,15 +354,15 @@ public function set_labels() { return $labels = array( 'name' => $names['plural'], 'singular_name' => $names['singular'], - 'add_new' => _x( 'Add New', 'dwqa', 'dwqa' ) . ' ' . $names['singular'], - 'add_new_item' => __( 'Add New', 'dwqa' ) . ' ' . $names['singular'], - 'edit_item' => __( 'Edit', 'dwqa' ) . ' ' . $names['singular'], - 'new_item' => __( 'New', 'dwqa' ) . ' ' . $names['singular'], - 'view_item' => __( 'View', 'dwqa' ) . ' ' . $names['singular'], - 'search_items' => __( 'Search ', 'dwqa' ) . $names['plural'], - 'not_found' => $names['plural'] . ' ' . __( 'not found', 'dwqa' ), - 'not_found_in_trash' => $names['plural'] . ' ' . __( 'not found in Trash', 'dwqa' ), - 'parent_item_colon' => __( 'Parent:', 'dwqa' ) . ' ' . $names['singular'], + 'add_new' => _x( 'Add New', 'dwqa', 'dw-question-answer' ) . ' ' . $names['singular'], + 'add_new_item' => __( 'Add New', 'dw-question-answer' ) . ' ' . $names['singular'], + 'edit_item' => __( 'Edit', 'dw-question-answer' ) . ' ' . $names['singular'], + 'new_item' => __( 'New', 'dw-question-answer' ) . ' ' . $names['singular'], + 'view_item' => __( 'View', 'dw-question-answer' ) . ' ' . $names['singular'], + 'search_items' => __( 'Search ', 'dw-question-answer' ) . $names['plural'], + 'not_found' => $names['plural'] . ' ' . __( 'not found', 'dw-question-answer' ), + 'not_found_in_trash' => $names['plural'] . ' ' . __( 'not found in Trash', 'dw-question-answer' ), + 'parent_item_colon' => __( 'Parent:', 'dw-question-answer' ) . ' ' . $names['singular'], 'menu_name' => isset( $names['menu'] ) ? $names['menu'] : $names['plural'], ); } diff --git a/inc/Posts/Comment.php b/inc/Posts/Comment.php index 71e33b09..50aaf18d 100644 --- a/inc/Posts/Comment.php +++ b/inc/Posts/Comment.php @@ -11,7 +11,7 @@ public function __construct() { add_filter( 'comment_id_fields', array( $this, 'comment_form_id_fields_filter' ), 10, 3 ); add_filter( 'get_comment_text', array( $this, 'sanitizie_comment' ), 10, 2 ); - add_filter( 'get_comment', array( $this, 'comment_author_link_anonymous' ) ); + //add_filter( 'get_comment', array( $this, 'comment_author_link_anonymous' ) ); add_action( 'wp_insert_comment', array( $this, 'reopen_question_have_new_comment' ) ); @@ -27,9 +27,9 @@ public function __construct() { public function hook_redirect_comment_for_answer( $location, $comment ) { if ( 'dwqa-answer' == get_post_type( $comment->comment_post_ID ) ) { - $question = get_post_meta( $comment->comment_post_ID, '_question', true ); - if ( $question ) { - return get_post_permalink( $question ).'#'.'answer-' . $comment->comment_post_ID . '&comment='.$comment->comment_ID; + $question_id = dwqa_get_post_parent_id( $comment->comment_post_ID ); + if ( $question_id ) { + return get_post_permalink( $question_id ).'#'.'answer-' . $comment->comment_post_ID . '&comment='.$comment->comment_ID; } } return $location; @@ -73,7 +73,7 @@ public function comment_form_id_fields_filter( $result, $id, $replytoid ) { public function sanitizie_comment( $content, $comment ) { $post_type = get_post_type( $comment->comment_post_ID ); if ( $post_type == 'dwqa-question' || $post_type == 'dwqa-answer' ) { - $content = str_replace( esc_html( 'id="dwqa_option_answer_registation"> -
+ 'dwqa_options[pages][archive-question]', - 'show_option_none' => __( 'Select Archive Question Page','dwqa' ), + 'show_option_none' => __( 'Select Archive Question Page','dw-question-answer' ), 'option_none_value' => 0, 'selected' => $archive_question_page, ) ); - ?> + ?>'.__( 'hours','dw-question-answer' ).'( ? )
'; } function dwqa_question_overdue_time_frame_display() { global $dwqa_general_settings; - echo ''.__( 'days','dwqa' ).'( ? )
'; + echo ''.__( 'days','dw-question-answer' ).'( ? )
'; } function dwqa_submit_question_page_display(){ @@ -44,12 +44,12 @@ function dwqa_submit_question_page_display(){ 'dwqa_options[pages][submit-question]', - 'show_option_none' => __( 'Select Submit Question Page','dwqa' ), + 'show_option_none' => __( 'Select Submit Question Page','dw-question-answer' ), 'option_none_value' => 0, 'selected' => $submit_question_page, ) ); - ?> - + ?>+