--- C:/Users/Sina/Desktop/notify/notify.module	Thu Dec 18 01:30:06 2008
+++ C:/Users/Sina/Desktop/notify - Copy/notify.module	Wed Dec 16 13:11:14 2009
@@ -430,7 +430,12 @@
     }
 
     // Fetch new comments.
-    $cresult = db_query(db_rewrite_sql('SELECT c.nid, c.cid, c.subject, c.name FROM {comments} c INNER JOIN {node} n ON c.nid = n.nid WHERE c.status = %d AND c.timestamp > %d AND c.timestamp <= %d '. $reqntype . ' ORDER BY c.nid, c.timestamp', 'c'), COMMENT_PUBLISHED, $period, time());
+    if (user_access('administer comments')) {
+        //Include unapproved comments if user has comments administration privilage
+        $cresult = db_query(db_rewrite_sql('SELECT c.nid, c.cid, c.subject, c.name FROM {comments} c INNER JOIN {node} n ON c.nid = n.nid WHERE c.timestamp > %d AND c.timestamp <= %d '. $reqntype . ' ORDER BY c.nid, c.timestamp', 'c'), $period, time());
+    } else {
+        $cresult = db_query(db_rewrite_sql('SELECT c.nid, c.cid, c.subject, c.name FROM {comments} c INNER JOIN {node} n ON c.nid = n.nid WHERE c.status = %d AND c.timestamp > %d AND c.timestamp <= %d '. $reqntype . ' ORDER BY c.nid, c.timestamp', 'c'), COMMENT_PUBLISHED, $period, time());
+    }
     $comments = array();
     while ($comment = db_fetch_object($cresult)) {
       $comments[$comment->nid][] = $comment;
@@ -492,6 +497,13 @@
         if (!node_access('view', $nodes[$nid])) {
           continue;
         }
+        
+        if ($comment->status == 1) {
+          $status = t('Published');
+        }
+        elseif ($comment->status == 0) {
+          $status = t('Unpublished');
+        }
 
         if ($comment_body) {
           $comment_body .= $mini_separator ."\n\n";
@@ -500,7 +512,7 @@
 
         $comment_count = 0;
         foreach ($comment as $c) {
-          $comment_body .= '   '. ++$comment_count .'. '. t('!title by !author', array('!title' => $c->subject, '!author' => ($c->name ? $c->name : variable_get('anonymous', 'Anonymous')))) ."\n"
+          $comment_body .= '   '. ++$comment_count .'. '. t('[!status] !title by !author', array('!status'=>$status,'!title' => $c->subject, '!author' => ($c->name ? $c->name : variable_get('anonymous', 'Anonymous')))) ."\n"
             .'     '. url('node/'. $nid, array('fragment' => 'comment-'. $c->cid, 'absolute' => TRUE)) ."\n\n";
           $total_comment_count++;
         }