Changeset 1133

Timestamp:

05/31/07 12:35:15 (2 years ago)

Author:

icewing

Message:

Marcus Povey <marcus@dushka.co.uk>
* Generic comments ajaxy stuff committed. Rather rough and ready + php
_needs_ some tidying.

Files:

• devel/mod/generic_comments/comments_actions.php (modified) (3 diffs)
• devel/mod/generic_comments/generic_comments.js (modified) (4 diffs)
• devel/mod/generic_comments/lib.php (modified) (3 diffs)

devel/mod/generic_comments/comments_actions.php

@@ -8 +8 @@
-                // Create a comment
-            case "comment:add":
+                $ok = false;
-                $comment = new StdClass;
-                $comment->object_id = optional_param('object_id',0,PARAM_INT);
@@ -33 +34 @@
-                            $comment = plugin_hook("comment","publish",$comment);
-                            $messages[] = __gettext("Your comment has been added."); // gettext variable
+                            $ok = true;
-                            
-                            // If we're logged on and not the owner of this post, add post to our watchlist
@@ -63 +65 @@
-                {
-                        // If we are returning xml for the ajax response then output message and die.
+
+                        if ($ok!=true) { 
+                                $ok = "<error>1</error>\n"; 
+                        } else { 
+                                $messages[] = __gettext(" Click <a href=\"\">here</a> to refresh");
+                                $ok = "<error>0</error>\n";
+                        }
+                        
-                        $msg = implode("\n", $messages);
-                        header("Content-type: text/xml");
-
+
+
-                        exit;
-                }

devel/mod/generic_comments/generic_comments.js

@@ -1 +1 @@
-var http_Request = false;
+var success = false;
+var objectid = "";
-
-function showhide(oid)
@@ -51 +53 @@
-                        message = result.getElementsByTagName('message')[0];
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                } else {
-                        alert('There was a problem with the request.');
@@ -59 +72 @@
-}
-
-
+, oid
-{
-        var parameters;
+        objectid = oid;
-
-        http_Request = getAjaxObj();
@@ -94 +108 @@
-
-        frm.new_comment.disabled=false;
+
+        if (success==true) { 
+                frm.new_comment.value=""; 
+        }
-}

devel/mod/generic_comments/lib.php

@@ -293 +293 @@
-                }
-
+                
+
+                $thispageurl = generic_comments_add_parameter_to_url(get_url($object_id, $object_type),'comment_sort',$sort_sequence);
-                $comment_name_enc = templates_draw(array(
-        
@@ -302 +305 @@
-                            );
-                $postcomment = __gettext("Post comment...");
+
+                if ($comments = get_records_sql("SELECT * FROM {$CFG->prefix}comments WHERE object_id = $object_id AND object_type = '$object_type' ORDER BY posted $sort_sequence")) {
+                $numcomments = count($comments);
+                $pagelinks = '';
+                if (!empty($perpage) && $numcomments > $perpage) {
+                    $comments = array_slice($comments, $offset, $perpage);
+                    $numpages = ceil($numcomments / $perpage);
+                    $pagelinks = __gettext("Page: ");
+                    for ($i = 1; $i <= $numpages; $i++) {
+                        $pagenum = $i - 1;
+                        if ($pagenum != $page) {
+                                if ($pagenum) {
+                                        $pageurl = generic_comments_add_parameter_to_url($thispageurl,'commentpage',$pagenum);
+                                }
+                            //$pageurl = $thispageurl . (($pagenum) ? '.' . $pagenum : '');
+                            $pagelinks .= ' <a href="' . $pageurl . '">' . $i . '</a>' ;
+                        } else {
+                            $pagelinks .= ' ' . $i . ' ';
+                        }
+                        
+                    }
+                    //$thispageurl .= '.' . $page;
+                    $thispageurl = generic_comments_add_parameter_to_url($thispageurl,'commentpage',$page);
+                    
+                }
+                
+                foreach($comments as $comment) {
+                    $commentmenu = "";
+                    if (isloggedin() && ($comment->owner == $_SESSION['userid'] || run("permissions:check",array("comment:delete",$_SESSION['userid'],$comment->object_id,$comment->object_type)))) {
+                        $returnConfirm = __gettext("Are you sure you want to permanently delete this comment?");
+                        $Delete = __gettext("Delete");
+                        $commentmenu = <<< END
+                        <a href="{$CFG->wwwroot}mod/generic_comments/action_redirection.php?action=comment:delete&amp;comment_form_type=$comment_form_type&amp;comment_delete={$comment->ident}" onclick="return confirm('$returnConfirm')">$Delete</a>
+END;
+                    }
+                    $comment->postedname = htmlspecialchars($comment->postedname, ENT_COMPAT, 'utf-8');
+                    
+                    // turn commentor name into a link if they're a registered user
+                    // add rel="nofollow" to comment links if they're not
+                    if ($comment->owner > 0) {
+                        $commentownerusername = user_info('username', $comment->owner);
+                        $comment->postedname = '<a href="' . url . $commentownerusername . '/">' . $comment->postedname . '</a>';
+                        $comment->icon = '<a href="' . url . $commentownerusername . '/">' . user_icon_html($comment->owner,50) . "</a>";
+                        $comment->body = run("weblogs:text:process", array($comment->body, false));
+                    } else {
+                        $comment->icon = "<img src=\"" . $CFG->wwwroot . "_icons/data/default.png\" width=\"50\" height=\"50\" align=\"left\" alt=\"\" />";
+                        $comment->body = run("weblogs:text:process", array($comment->body, true));
+                    }
+                    
+                    $commentsbody .= templates_draw(array(
+                                                          'context' => 'weblogcomment',
+                                                          'postedname' => $comment->postedname,
+                                                          'body' => '<a name="cmt' . $comment->ident . '" id="cmt' . $comment->ident . '"></a>' . $comment->body,
+                                                          'posted' => strftime("%A, %d %B %Y, %H:%M %Z",$comment->posted),
+                                                          'usericon' => $comment->icon,
+                                                          'permalink' => $thispageurl . "#cmt" . $comment->ident,
+                                                          'links' =>  $commentmenu
+                                                          )
+                                                    );
+                    
+                }
+                $commentsbody = templates_draw(array(
+                                                     'context' => 'weblogcomments',
+                                                     'paging' => $pagelinks,
+                                                     'comments' => $commentsbody
+                                                     )
+                                               );
+        }
+
-                $bodyfrm = <<< END
-                        <span style="cursor:hand; cursor:pointer" onclick="showhide('oid_$object_id')">$comment_count $comment_form_text</span>
@@ -315 +387 @@
-                                        $comment_name_enc
-                                </form>
-
-
+
+
+
+
-                        </div>
-END;