Changeset 46113

Timestamp:

05/16/08 02:08:05 (2 months ago)

Author:

ronalfy

Message:

Moved edit links to just one line.
Fixed style bugs for IE7 and below.
Fixed numerous bugs for logged in users.
Fixed gravatar bug where changing the e-mail address didn't update the gravatar.

Files:

• wp-ajax-edit-comments/trunk/2.0/wp-ajax-edit-comments/css/edit-comments.css (modified) (2 diffs)
• wp-ajax-edit-comments/trunk/2.0/wp-ajax-edit-comments/js/comment-editor.js.php (modified) (1 diff)
• wp-ajax-edit-comments/trunk/2.0/wp-ajax-edit-comments/js/wp-ajax-edit-comments.js.php (modified) (4 diffs)
• wp-ajax-edit-comments/trunk/2.0/wp-ajax-edit-comments/php/AjaxEditComments.php (modified) (1 diff)
• wp-ajax-edit-comments/trunk/2.0/wp-ajax-edit-comments/wp-ajax-edit-comments.php (modified) (14 diffs)

wp-ajax-edit-comments/trunk/2.0/wp-ajax-edit-comments/css/edit-comments.css

@@ -8 +8 @@
-      padding: 2px 0px;
-      padding-left: 20px;
+      float: left;
+      margin-right: 10px;
+      /*todo - clear:after? */
+}
+.clearfix:after { /* from http://blue-anvil.com/archives/experiments-with-floats-whats-the-best-method-of-clearance*/
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
-}
-/* Begin Images */
@@ -37 +47 @@
-
-}
-.editableAuthor, .editableComment{
- color: #000;
- background-color: #ffffd3;
- }
-.editAuthor { background-color: transparent; background-image: none; display: inline; margin: 0; padding: 0; border: 0; clear: none;}
-/* Edit me for the textarea shown when editing a comment */
-.textComment textarea { width: 90%; height: 100px; }
-/* Edit me for the div that contains the comment */
-.editComment, .editableComment, .textComment{ /*clear: both;*/ }
-/* various CSS classes you can edit if you really want to
-.ajaxSaveButtons { }
-.textAuthor { }
-.ajaxApproveLinks{}
-span.ajax-admin-edit-links {}
-*/
-
-/*Edit me for the message that shows up to a user(non admin) when leaving a comment */
-.ajax-edit { font-size: 1em; font-style: italic; background-color: #333; color: #fff; padding: 5px; font-weight: bold;}
-.ajax-edit .ajax-timer { font-size: 0.8em; color: #FFCC66; }
-input.ajax-error { border: 3px solid #966; }
-textarea.ajax-error, li.ajax-error { background: #966; }

wp-ajax-edit-comments/trunk/2.0/wp-ajax-edit-comments/js/comment-editor.js.php

@@ -156 +156 @@
-                url = this.data;
-                break;
+              case "gravatar":
+                  $j("#gravatar").html(this.data).show();
+                  break;
-            }
-          }

wp-ajax-edit-comments/trunk/2.0/wp-ajax-edit-comments/js/wp-ajax-edit-comments.js.php

@@ -51 +51 @@
-      $j(".edit-comment-admin-links").attr("style", "display: inherit");
-    $j(".edit-comment-user-link").attr("style", "display: inherit");
+    /* For Crappy IE */
+    $j(".edit-comment-admin-links").show();
+    $j(".edit-comment-user-link").show();
-    $j(".ajax-admin-edit-links").each(function() { 
-      var element = $j(this);
@@ -82 +85 @@
-      data.action = 'gettimeleft';
-      data.success = function(r) {
+            if (r == "-1") {
+            minutes = 0;
+          seconds = 0;
+        } else if (r == "1") {
+            return;
+        }
-            var res = wpAjax.parseAjaxResponse(r, data.response,data.element);
-        jQuery.each( res.responses, function() {
+            //todo - check for errors
-            if (this.what == "minutes") {
-            minutes = parseInt(this.data);
@@ -110 +120 @@
-    element = timer.element;
-    //Check to see if the time has run out
-<=0 && seconds <
+==0 && seconds =
-                  $j("#edit" + timer.cid).unbind();
-      element.remove();
@@ -117 +127 @@
-      clearTimeout(timers[timer.cid]);
-                  return;
-
+ 
-            if (seconds < 0) { minutes -= 1; seconds = 59; }
-    //Create timer text

wp-ajax-edit-comments/trunk/2.0/wp-ajax-edit-comments/php/AjaxEditComments.php

@@ -27 +27 @@
-            if ($WPrapAjaxEditComments->can_edit_url($commentID, $postID)) {
-                  $comment['comment_author_url'] = trim(strip_tags(urldecode($_POST['comment_author_url'])));
+            //Quick JS Test
+            if ($comment['comment_author_url'] == "undefined") {$comment['comment_author_url']='http://';}
-            }
-            $WPrapAjaxEditComments->save_comment($commentID, $postID, $comment);

wp-ajax-edit-comments/trunk/2.0/wp-ajax-edit-comments/wp-ajax-edit-comments.php

@@ -98 +98 @@
-                  if (!$this->is_comment_owner($comment->comment_post_ID)) {
-                        //For anonymous users
-
+ clearfix
-                        $content .= "<div class='edit-comment'><a title='Ajax Edit Comments' class='ajax-admin-edit-links thickbox' href='$edit_url' id='edit-$comment->comment_ID'>";
-                        $content .= $this->adminOptions['edit_text'];
@@ -104 +104 @@
-                        //Check to see if timer is on
-                        if ($this->adminOptions['show_timer'] == 'true') {
-
+
+
+
+
-                        }
-                        $content .= "</div></div>";
-                  } else {
-
+ clearfix
-                        //Spans are used here instead of LIs because of style conflicts in the admin panel
-                        $content .= "<span class='edit-comment'><a title='Ajax Edit Comments' class='ajax-admin-edit-links thickbox' href='$edit_url' id='edit-$comment->comment_ID'>";
@@ -171 +174 @@
-                  }
-                  //Get the current comment
-
+, user_id
-                  $comment = $wpdb->get_row($query, ARRAY_A); 
-                  if (!$comment) { return 'get_comment_failed'; }
@@ -178 +181 @@
-                        return 'comment_spam';
-                  }
-
-
-
-
-
-
+
+
+
+
-                  }
-                  //Now check if options allow editing after an additional comment has been made
@@ -232 +233 @@
-                  if ($this->is_comment_owner($postID)) { return true; }
-                  $comment = get_comment($commentID, ARRAY_A);
-comment_author_email
+user_id
-                        if ($this->adminOptions['registered_users_name_edit'] == "true") { return true;}
-                  } else { //not logged in 
@@ -245 +246 @@
-                  if ($this->is_comment_owner($postID)) { return true; }
-                  $comment = get_comment($commentID, ARRAY_A);
-comment_author_email
+user_id
-                        if ($this->adminOptions['registered_users_email_edit'] == "true") { return true;}
-                  } else { //not logged in 
@@ -258 +259 @@
-                  if ($this->is_comment_owner($postID)) { return true; }
-                  $comment = get_comment($commentID, ARRAY_A);
-comment_author_email
+user_id
-                        if ($this->adminOptions['registered_users_url_edit'] == "true") { return true;}
-                  } else { //not logged in 
@@ -271 +272 @@
-                  if ($this->is_comment_owner($postID)) { return true; }
-                  $comment = get_comment($commentID, ARRAY_A);
-comment_author_email
+user_id
-                        if ($this->adminOptions['registered_users_url_edit'] == "true" || $this->adminOptions['registered_users_email_edit'] == "true" || $this->adminOptions['registered_users_name_edit'] == "true" ) { return true;}
-                  } else { //not logged in 
-                        if ($this->adminOptions['allow_url_editing'] == "true" || $this->adminOptions['allow_email_editing'] == "true" || $this->adminOptions['allow_name_editing'] == "true") { return true;}
+                  }
+                  return false;
+            }
+            /* can_indefinitely_edit
+            Parameters - $userID
+            Returns - true if can, false if not */
+            function can_indefinitely_edit($userID = 0) {
+                  if ($this->is_logged_in($userID)) {
+                        //User is logged in and this is the user's comment - Does admin allow indefinite editing?
+                        if ($this->adminOptions['registered_users_edit'] == "true") {
+                              return true; //Logged in user can indefinitely edit
+                        }
-                  }
-                  return false;
@@ -340 +353 @@
-                        return $commentID;
-                  }
-
+
+
+
-                  if ($this->adminOptions['allow_editing'] == "false") { return $commentID;}
-                  
@@ -521 +536 @@
-            }
-            /* get_time_left - Returns time remaining in seconds
-
+
+
+
-            function get_time_left($commentID = 0) {
-                  global $wpdb;
-                  $adminMinutes = (int)$this->adminOptions['minutes'];
-
+
+
-                  //Get the Timestamp
-                  $comment = $wpdb->get_row($query, ARRAY_A);
-
+
+
+
+
-                  //Get the time elapsed since making the comment
-$comment['time'] <= 0) { return "0
+(int)$comment['time'] <= 0) { return "-1
-                  $timeleft = (int)$comment['time'];
-                  $minutes = floor($timeleft/60);
@@ -607 +628 @@
-            Parameters - $email
-            Returns true if logged in, false if not */
-email = ''
-email() == $email
+userID = 0
+id() == $userID
-                        return true;
-                  } else { 
@@ -693 +714 @@
-                  //Condition the data for returning
-                  do_action('wp_ajax_comments_remove_content_filter');
+                  //todo some char issues with quotes
-                  $response->add( array(
-                              'what' => 'comment_content',
-                              'id' => $commentID,
-apply_filters('comment_text',apply_filters('get_comment_text',$this->encode($commentarr['comment_content']
+stripslashes(apply_filters('comment_text',apply_filters('get_comment_text',$this->encode($commentarr['comment_content'])
-                  ));
-                  $response->add( array(
-                              'what' => 'comment_author',
-                              'id' => $commentID,
-apply_filters('comment_author', apply_filters('get_comment_author', $this->encode($commentarr['comment_author']
+stripslashes(apply_filters('comment_author', apply_filters('get_comment_author', $this->encode($commentarr['comment_author'])
-                  ));
-                  //Quick JavaScript test
-                  $response->add( array(
-                              'what' => 'comment_author_url',
-                              'id' => $commentID,
-
+
+
+
+
+
+
-                  ));
-                  $response->send();
@@ -810 +836 @@
-                  return $user_email;
-            }
+            // Returns a logged-in user's ID
+            function get_user_id() {
+                  global $user_ID;
+                  if (!function_exists("get_currentuserinfo")) { return "-1"; }
+                  if (empty($user_ID)) {get_currentuserinfo();} //try to get user info
+                  if (empty($user_ID)) { return '-1'; } //Can't get user info, so return empty string
+                  return $user_ID;
+            }
-            
-            //Returns an array of an individual's options
@@ -857 +891 @@
-                        echo '<link rel="stylesheet" href="'.get_bloginfo('wpurl').'/wp-content/plugins/wp-ajax-edit-comments/css/edit-comments.css" type="text/css" media="screen"  />'; 
-                        echo '<link rel="stylesheet" href="'.get_bloginfo('wpurl').'//wp-includes/js/thickbox/thickbox.css" type="text/css" media="all"  />'; 
+                        /* From http://blue-anvil.com/archives/experiments-with-floats-whats-the-best-method-of-clearance */
+?>
+<!-- Ajax Edit Comments -->
+<!--[if IE]>
+<style>
+  .clearfix {display: inline-block;}
+  /* Hides from IE-mac \*/
+  * html .clearfix {height: 1%;}
+  .clearfix {display: block;}
+  /* End hide from IE-mac */
+</style>
+<![endif]-->
+<?php
-                  }
-            }