Changeset 1007332

Timestamp:

10/14/2014 02:47:12 PM (11 years ago)

Author:

tjsantilo

Message:

Updated the plugin with the files Clay sent me to implement the voter id feature - public.js, public.css, class-social-polling.php, and class-sp_comments.php.

Location:

because/trunk

Files:

• README.txt (modified) (1 diff)
• public/assets/css/public.css (modified) (2 diffs)
• public/assets/js/public.js (modified) (1 diff)
• public/class-social-polling.php (modified) (4 diffs)
• public/includes/class-sp_comments.php (modified) (3 diffs)
• social-polling.php (modified) (1 diff)

because/trunk/README.txt

@@ -7 +7 @@
 Tested up to: 4.0
 <<<<<<< .mine
-Stable tag: 1.3.7
+Stable tag: 1.3.8
 =======
-Stable tag: 1.3.7
+Stable tag: 1.3.8
 >>>>>>> .r969865
 License: GPLv2 or later

because/trunk/public/assets/css/public.css

@@ -27 +27 @@
     
 }
-.answer_divs:focus .answer_image,
-.answer_divs:HOVER .answer_image{
-border:5px solid #1e8cbe;
-
-    
-    
+#answer_1_wrapper.answer_divs:focus .answer_image,
+#answer_1_wrapper.answer_divs:HOVER .answer_image{
+    border:5px solid #1e8cbe;
+}
+
+#answer_2_wrapper.answer_divs:focus .answer_image,
+#answer_2_wrapper.answer_divs:HOVER .answer_image{
+    border:5px solid #1ebe50;
 }
 
@@ -426 +428 @@
 padding: 1em;
 }
+
+.comment_voted_a{
+    color: #1e8cbe;
+}
+
+.comment_voted_b{
+    color: #1ebe50;
+}
 /*
 //----------------------------

because/trunk/public/assets/js/public.js

@@ -51 +51 @@
                 show_results($post_id);
 
-                
-        if(data === "You already voted"){
-$('#social_polling_see_results_wrapper').html('You Already Voted'); 
-}
-else{
-$('#social_polling_see_results_wrapper').html('');
-}
-
-        
-
-                
+                if(data === "already_voted"){
+                    $('#social_polling_see_results_wrapper').html('You Already Voted'); 
+                }
+                else{
+                    $('#social_polling_see_results_wrapper').html('');
+                    $('.sp_comment-list').html(data);
+                }
 
                 //console.log(data+ajaxurl);
-
-    
 
             }//success

because/trunk/public/class-social-polling.php

@@ -306 +306 @@
          if($already_voted):
          //You already voted 
-         return 'already_voted';
+            $response['vote_status'] = 'already_voted';
+            return $response;
          else:
             //Do the vote   
@@ -313 +314 @@
         
         if($do_vote):
-         return 'voted';
+            $response['vote_status'] = 'voted';
+            //modify comments to display 
+            $this->add_id_to_comments($data);
+            $response['new_comments'] = $this->update_comments($data);
         else:
          return false;
@@ -319 +323 @@
      }//social_polling_vote
      
-     
+     private function add_id_to_comments($data){
+        global $wpdb;
+
+        $table = $wpdb->prefix . "postmeta";
+        $query = "SELECT meta_key FROM $table WHERE post_id='" . $data['poll_id'] . "' AND meta_value='" . $data['vote_value']. "'";
+        $ans_choice = $wpdb->get_row($query);
+
+        if ($ans_choice->meta_key == "social_polling_answer_one_field" || $ans_choice->meta_key == "_social_polling_answer_one_field"){
+            $choice = "one";
+        }
+        else if ($ans_choice->meta_key == "social_polling_answer_two_field" || $ans_choice->meta_key == "_social_polling_answer_two_field"){
+            $choice = "two";
+        }
+
+        $table = $wpdb->prefix . "comments";
+        $comments = $wpdb->get_results("SELECT comment_ID from $table where comment_post_ID='" . $data['poll_id'] . "' AND (comment_author_IP = '".$data['voter_ip']."'  ||    (user_id = '".$data['voter_id']."'  &&   user_id != '0' ))" );   
+
+        foreach($comments as $row){
+            add_comment_meta($row->comment_ID,'vote_choice',$choice);
+        }
+                
+        return;
+     }
+
+     private function update_comments($data){
+                
+                
+                $post_id = $data['poll_id'];
+                
+                $comment_args['post_id'] = $post_id;
+
+                $comments = get_comments( $comment_args );
+
+                ob_start();
+
+                wp_list_comments(array(
+
+                            'callback' => 'mytheme_comment',
+
+                            'walker' => new zipGun_walker_comment()
+
+                            //'per_page' => 10, //Allow comment pagination
+
+                            //'reverse_top_level' => $sortby == 'oldest' ? false : true //Show the latest comments at the top of the list
+
+                ), $comments);
+
+                $updated_comments = ob_get_contents();
+
+                ob_end_clean;
+
+     }
      
       public function get_poll_results($post_id){
@@ -482 +537 @@
             endif;
             
-            switch($vote):  
+            switch($vote[vote_status]):     
             case('voted'):
-                echo 'You were voting on Post '.get_post_meta($post_id,'social_polling_question_field',true );
-                echo 'You voted '.$vote_value;
+                // echo 'You were voting on Post '.get_post_meta($post_id,'social_polling_question_field',true );
+                //  echo 'You voted '.$vote_value;
+                echo $vote['new_comments'];
             break;
             
             case('already_voted'):
-                echo 'You already voted';
+                echo "already_voted";
             break;          
             

because/trunk/public/includes/class-sp_comments.php

@@ -81 +81 @@
             add_action('wp_ajax_sp_Comments_Ajax',  array( $this,'sp_Comments_Ajax'));
 
-                        
+            add_action('comment_post', array( $this,'check_user_vote'));
 
             
@@ -153 +153 @@
     }//Contruct
 
-    
+    // function to check if user has voted in the Polling
+
+    public function check_user_vote($comment_id){
+        global $wpdb;
+        
+        if ( is_user_logged_in() ):
+            $user_id = $this->get_voter('');    
+        else:
+            $user_id = md5($this->get_voter('ip_address')); 
+        endif;
+
+        $table = $wpdb->prefix . "social_polling";
+        $post_id = get_the_ID();
+
+        // check to see if the user has voted on the current poll
+        $query = "SELECT vote_value FROM $table WHERE poll_id='" . $post_id . "' AND (voter_ip = '".$user_id."'  ||    (voter_id = '".$user_id."'  &&   voter_id != '0' ))";
+        $vote_val = $wpdb->get_row($query);
+
+        if ($vote_val){
+            // if the user has voted then check to see which question in the poll the answer is
+
+            $table = $wpdb->prefix . "postmeta";
+            $query = "SELECT meta_key FROM $table WHERE post_id='" . $post_id . "' AND meta_value='" . $vote_val->vote_value . "'";
+            $ans_choice = $wpdb->get_row($query);
+                   
+
+            // add vote identifier to the comment
+            if ($ans_choice->meta_key == "social_polling_answer_one_field" || $ans_choice->meta_key == "_social_polling_answer_one_field"){
+                add_comment_meta($comment_id,'vote_choice','one');
+            }
+            elseif ($ans_choice->meta_key == "social_polling_answer_two_field" || $ans_choice->meta_key == "social_polling_answer_two_field"){
+                add_comment_meta($comment_id,'vote_choice','two');  
+            }
+        }
+    }
 
     
@@ -1510 +1544 @@
 }//CLASS spComments
 
-
-
-
-
-
+add_filter('comment_text', 'comment_vote_choice');
+
+function comment_vote_choice( $comment_text){
+
+        $comment_ID = get_comment_ID();
+    
+        echo "<p";
+        
+        $test = get_comment_meta($comment_ID,"vote_choice",true);
+
+        if ($test == "one"){
+            echo " class='comment_voted_a'";
+        }
+        elseif ($test == "two") {
+            echo " class='comment_voted_b'";
+        }
+        
+        echo ">$comment_text</p>";
+}
 
 function mytheme_comment($comment, $args, $depth) {

because/trunk/social-polling.php

@@ -34 +34 @@
 
 <<<<<<< .mine
- * Version:           1.3.7
+ * Version:           1.3.8
 =======
- * Version:           1.3.7
+ * Version:           1.3.8
 >>>>>>> .r969865