$result=db_query_range(db_rewrite_sql('SELECT c.nid, c.* FROM {comments} c WHERE c.status = 0 ORDER BY c.timestamp DESC','c'),0,10);
$result=db_query_range(db_rewrite_sql('SELECT c.nid, c.* FROM {comments} c WHERE c.status = %d ORDER BY c.timestamp DESC','c'),COMMENT_PUBLISHED,0,10);
@@ -395,7 +401,7 @@ function comment_reply($nid, $pid = NULL) {
// if this is a reply to another comment, show that comment first
// else, we'll just show the user the node they're commenting on.
if($pid){
$comment=db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0',$pid));
$comment=db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = %d',$pid,COMMENT_PUBLISHED));
@@ -502,7 +508,7 @@ function comment_preview($edit) {
$output.=theme('comment_form',$edit,t('Reply'));
if($edit['pid']){
$comment=db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0',$edit['pid']));
$comment=db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = %d',$edit['pid'],COMMENT_PUBLISHED));
$sql='SELECT c.subject, c.nid, c.cid, c.comment, c.timestamp, c.status, c.name, c.homepage, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.status = '.db_escape_string($status);
$sql.=tablesort_sql($header);
$result=pager_query($sql,50);
...
...
@@ -1025,7 +1031,7 @@ function comment_admin_overview($type = 'new') {
// Use the timestamp to retrieve the number of new comments.
$result=db_result(db_query('SELECT COUNT(c.cid) FROM {node} n INNER JOIN {comments} c ON n.nid = c.nid WHERE n.nid = %d AND timestamp > %d AND c.status = 0',$nid,$timestamp));
$result=db_result(db_query('SELECT COUNT(c.cid) FROM {node} n INNER JOIN {comments} c ON n.nid = c.nid WHERE n.nid = %d AND timestamp > %d AND c.status = %d',$nid,$timestamp,COMMENT_PUBLISHED));
return$result;
}
...
...
@@ -1651,12 +1657,12 @@ function _comment_per_page() {
* - comment_count: the total number of approved/published comments on this node.
*/
function_comment_update_node_statistics($nid){
$count=db_result(db_query('SELECT COUNT(cid) FROM {comments} WHERE nid = %d AND status = 0',$nid));
$count=db_result(db_query('SELECT COUNT(cid) FROM {comments} WHERE nid = %d AND status = %d',$nid,COMMENT_PUBLISHED));
// comments exist
if($count>0){
$node=node_load(array('nid'=>$nid));
$last_reply=db_fetch_object(db_query_range('SELECT cid, name, timestamp, uid FROM {comments} WHERE nid = %d AND status = 0 ORDER BY cid DESC',$nid,0,1));
$last_reply=db_fetch_object(db_query_range('SELECT cid, name, timestamp, uid FROM {comments} WHERE nid = %d AND status = %d ORDER BY cid DESC',$nid,COMMENT_PUBLISHED,0,1));
db_query("UPDATE {node_comment_statistics} SET comment_count = %d, last_comment_timestamp = %d, last_comment_name = '%s', last_comment_uid = %d WHERE nid = %d",$count,$last_reply->timestamp,$last_reply->uid?NULL:$last_reply->name,$last_reply->uid,$nid);
$result=db_query_range(db_rewrite_sql('SELECT c.nid, c.* FROM {comments} c WHERE c.status = 0 ORDER BY c.timestamp DESC','c'),0,10);
$result=db_query_range(db_rewrite_sql('SELECT c.nid, c.* FROM {comments} c WHERE c.status = %d ORDER BY c.timestamp DESC','c'),COMMENT_PUBLISHED,0,10);
@@ -395,7 +401,7 @@ function comment_reply($nid, $pid = NULL) {
// if this is a reply to another comment, show that comment first
// else, we'll just show the user the node they're commenting on.
if($pid){
$comment=db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0',$pid));
$comment=db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = %d',$pid,COMMENT_PUBLISHED));
@@ -502,7 +508,7 @@ function comment_preview($edit) {
$output.=theme('comment_form',$edit,t('Reply'));
if($edit['pid']){
$comment=db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0',$edit['pid']));
$comment=db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = %d',$edit['pid'],COMMENT_PUBLISHED));
$sql='SELECT c.subject, c.nid, c.cid, c.comment, c.timestamp, c.status, c.name, c.homepage, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.status = '.db_escape_string($status);
$sql.=tablesort_sql($header);
$result=pager_query($sql,50);
...
...
@@ -1025,7 +1031,7 @@ function comment_admin_overview($type = 'new') {
// Use the timestamp to retrieve the number of new comments.
$result=db_result(db_query('SELECT COUNT(c.cid) FROM {node} n INNER JOIN {comments} c ON n.nid = c.nid WHERE n.nid = %d AND timestamp > %d AND c.status = 0',$nid,$timestamp));
$result=db_result(db_query('SELECT COUNT(c.cid) FROM {node} n INNER JOIN {comments} c ON n.nid = c.nid WHERE n.nid = %d AND timestamp > %d AND c.status = %d',$nid,$timestamp,COMMENT_PUBLISHED));
return$result;
}
...
...
@@ -1651,12 +1657,12 @@ function _comment_per_page() {
* - comment_count: the total number of approved/published comments on this node.
*/
function_comment_update_node_statistics($nid){
$count=db_result(db_query('SELECT COUNT(cid) FROM {comments} WHERE nid = %d AND status = 0',$nid));
$count=db_result(db_query('SELECT COUNT(cid) FROM {comments} WHERE nid = %d AND status = %d',$nid,COMMENT_PUBLISHED));
// comments exist
if($count>0){
$node=node_load(array('nid'=>$nid));
$last_reply=db_fetch_object(db_query_range('SELECT cid, name, timestamp, uid FROM {comments} WHERE nid = %d AND status = 0 ORDER BY cid DESC',$nid,0,1));
$last_reply=db_fetch_object(db_query_range('SELECT cid, name, timestamp, uid FROM {comments} WHERE nid = %d AND status = %d ORDER BY cid DESC',$nid,COMMENT_PUBLISHED,0,1));
db_query("UPDATE {node_comment_statistics} SET comment_count = %d, last_comment_timestamp = %d, last_comment_name = '%s', last_comment_uid = %d WHERE nid = %d",$count,$last_reply->timestamp,$last_reply->uid?NULL:$last_reply->name,$last_reply->uid,$nid);
@@ -73,11 +73,11 @@ function tracker_page($uid = 0) {
$output.='';
if($uid){
$sql='SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = 0 OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_post DESC';
$sql='SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_post DESC';
$sql=db_rewrite_sql($sql);
$sql_count='SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = 0 OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)';
$sql_count='SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)';
$sql='SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 ORDER BY last_post DESC';
@@ -73,11 +73,11 @@ function tracker_page($uid = 0) {
$output.='';
if($uid){
$sql='SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = 0 OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_post DESC';
$sql='SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_post DESC';
$sql=db_rewrite_sql($sql);
$sql_count='SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = 0 OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)';
$sql_count='SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)';
$sql='SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 ORDER BY last_post DESC';