/[drupal]/contributions/modules/groups/patches/tracker.patch
ViewVC logotype

Diff of /contributions/modules/groups/patches/tracker.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.5, Tue May 11 00:40:20 2004 UTC revision 1.6, Wed Nov 24 22:03:32 2004 UTC
# Line 11  Line 11 
11     }     }
12    
13  -  if (arg(1)) {  -  if (arg(1)) {
14  -    $uid = check_query(arg(1));  -    $uid = db_escape_string(arg(1));
15  -  -
16  -    $result = pager_query("SELECT n.nid, n.title, n.type, n.changed, n.uid, u.name, MAX(GREATEST(n.changed, c.timestamp)) AS last_post FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid INNER JOIN {users} u ON n.uid = u.uid WHERE n.status = 1 AND (n.uid = '$uid' OR c.uid = '$uid') GROUP BY n.nid, n.title, n.type, n.changed, n.uid, u.name ORDER BY last_post DESC", 25, 0, "SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid WHERE n.status = 1 AND (n.uid = '$uid' OR c.uid = '$uid')");  -    $result = pager_query("SELECT n.nid, n.title, n.type, n.changed, n.uid, u.name, MAX(GREATEST(n.changed, c.timestamp)) AS last_post FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid INNER JOIN {users} u ON n.uid = u.uid WHERE n.status = 1 AND (n.uid = '$uid' OR c.uid = '$uid') GROUP BY n.nid, n.title, n.type, n.changed, n.uid, u.name ORDER BY last_post DESC", 25, 0, "SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid WHERE n.status = 1 AND (n.uid = '$uid' OR c.uid = '$uid')");
17  -  -
18  +  if (arg(1) && arg(2)) {  +  if (arg(1) && arg(2)) {
19  +    switch (arg(1)) {  +    switch (arg(1)) {
20  +      case 'uid':  +      case 'uid':
21  +        $uid = check_query(arg(2));  +        $uid = db_escape_string(arg(2));
22  +        $result = pager_query("SELECT n.nid, n.title, n.type, n.changed, n.uid, u.name, MAX(GREATEST(n.changed, c.timestamp)) AS last_post FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {term_node} t ON n.nid = t.nid WHERE t.tid IN (". groups_get_terms() .") AND n.status = 1 AND (n.uid = '$uid' OR c.uid = '$uid') GROUP BY n.nid, n.title, n.type, n.changed, n.uid, u.name ORDER BY last_post DESC", 25, 0, "SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid INNER JOIN {term_node} t ON n.nid = t.nid WHERE t.tid IN (". groups_get_terms() .") AND n.status = 1 AND (n.uid = '$uid' OR c.uid = '$uid')");  +        $result = pager_query("SELECT n.nid, n.title, n.type, n.changed, n.uid, u.name, MAX(GREATEST(n.changed, c.timestamp)) AS last_post FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {term_node} t ON n.nid = t.nid WHERE t.tid IN (". groups_get_terms() .") AND n.status = 1 AND (n.uid = '$uid' OR c.uid = '$uid') GROUP BY n.nid, n.title, n.type, n.changed, n.uid, u.name ORDER BY last_post DESC", 25, 0, "SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid INNER JOIN {term_node} t ON n.nid = t.nid WHERE t.tid IN (". groups_get_terms() .") AND n.status = 1 AND (n.uid = '$uid' OR c.uid = '$uid')");
23  +        break;  +        break;
24  +      case 'tid':  +      case 'tid':
25  +        $tid = check_query(arg(2));  +        $tid = db_escape_string(arg(2));
26  +        $result = pager_query("SELECT n.nid, n.title, n.type, n.changed, n.uid, u.name, MAX(GREATEST(n.changed, c.timestamp)) AS last_post FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {term_node} t ON n.nid = t.nid WHERE t.tid = $tid AND t.tid IN (". groups_get_terms() .") AND n.status = 1 GROUP BY n.nid, n.title, n.type, n.changed, n.uid, u.name ORDER BY last_post DESC", 25, 0, "SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} t ON n.nid = t.nid WHERE t.tid = $tid AND n.status = 1");  +        $result = pager_query("SELECT n.nid, n.title, n.type, n.changed, n.uid, u.name, MAX(GREATEST(n.changed, c.timestamp)) AS last_post FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {term_node} t ON n.nid = t.nid WHERE t.tid = $tid AND t.tid IN (". groups_get_terms() .") AND n.status = 1 GROUP BY n.nid, n.title, n.type, n.changed, n.uid, u.name ORDER BY last_post DESC", 25, 0, "SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} t ON n.nid = t.nid WHERE t.tid = $tid AND n.status = 1");
27  +        break;  +        break;
28  +    }  +    }
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6
  ViewVC Help
Powered by ViewVC 1.1.2