Ticket #354: commentwall-walltowall.diff

mod/commentwall/lib.php

@@ -82 +82 @@
-                
-                return get_records_sql($query);
-        }
+
+
+        /**
+         * Retrieve the wall-to-wall for a given pair of userids.
+         *
+         * @return mixed Array of comment objects, else returns false.
+         * @param unknown_type $userid The user / wall we are retrieving
+         * @param unknown_type $limit Limit on the search
+         * @param unknown_type $offset Offset
+         */
+        function commentwall_getwalltowall($userid, $otherid, $limit = 10, $offset = 0)
+        {
+                global $CFG;
+                
+                $query = "SELECT * FROM " . $CFG->prefix . "commentwall " . 
+                         "WHERE (wallowner=" . $userid . " AND comment_owner=" . $otherid . ") OR ".
+                         "(wallowner=" . $otherid . " AND comment_owner=" . $userid . ") ".
+                         "ORDER BY posted desc LIMIT " . $offset . "," . $limit;
+                
+                //echo $query;
+                
+                return get_records_sql($query);
+        }
+
-        
-        /**
-         * Add a comment to a wall.
@@ -223 +247 @@
-                $text = $comment_obj->content;
-                
-                $replytowall = __gettext("Post reply");
-
+
+
-                $delete = __gettext("Delete");
-                
-page_owner()
+$comment_obj->wallowner
-
-                $replybar = "";
-                if (isloggedin())
-                {
-                        //$replybar .= "<a href=\"#commentwall_form_-1\">$replytowall</a>";
-       if (($comment_obj->wallowner != $comment_obj->comment_owner) && ($comment_obj->comment_owner != 0))
+  if (($comment_obj->wallowner != $comment_obj->comment_owner) && ($comment_obj->comment_owner != 0)) {
-                                $replybar .= "<a href=\"{$CFG->wwwroot}mod/commentwall/index.php?owner={$comment_obj->comment_owner}&wallowner={$comment_obj->comment_owner}&comment_owner={$_SESSION['userid']}&reply={$comment_obj->ident}&return_url=" .urlencode($_SERVER['REQUEST_URI'])."\">$replytootherwall</a> | ";    
-
-
-
-
+
+
+
+
+
-                }
-
-
@@ -314 +340 @@
-                )
-                {
-            // $owner = page_owner();
-%s's comment wall"), user_info("name", page_owner()
+Write on %s's comment wall"), user_info("name", $owner
-
-            if (($showalltxt) && ($wall))
-            {
@@ -322 +348 @@
-            }
-
-
-page_owner()
+$owner
-                
-                if (!$wall) {
-                        $html .= "<p>" . __gettext("No comments on this wall, why not be the first?") . "</p>";

mod/commentwall/walltowall.php

@@ +1 @@
+<?php
+  /** wall-to-wall viewing page */
+
+  // Load the Elgg framework
+
+require_once("../../includes.php");
+global $CFG, $messages;
+
+/*
+ * Variable initialisation
+ */
+
+$owner = optional_param('owner', page_owner());
+    
+$other = required_param('other');
+
+$offset = optional_param('offset', 0);
+$limit = optional_param('limit', 10);
+    
+$title = sprintf(__gettext("%s and %s's Wall-to-wall"), user_info("name", $owner), user_info("name", $other));
+    
+$wall = commentwall_getwalltowall($owner, $other, $limit, $offset);
+
+$html = commentwall_displaywall_html($wall, true, $other);
+$html.= commentwall_display_footer($owner, $limit, $offset);
+    
+templates_page_output($title, $html);
+    
+?>