merged fix for a bug where user can view site blogs when not logged in

diff --git a/blog/lib.php b/blog/lib.php
index f13f3e4f8476f1594b124e8d5ce1fb598550dce7..776f9028c3b3754ea81fb9db10f83cec88c88687 100755 (executable)
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -408,8 +408,8 @@
 
             case 'site':
 
-                if (!isguest() && isloggedin()) {
-
+                if (isloggedin()) {
+                                       
                     $SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
                             .$CFG->prefix.'user u
                             WHERE p.userid = u.id '.$tagquerysql.'
@@ -469,22 +469,33 @@
 
             case 'group':
 
-                $SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
-                        .$CFG->prefix.'groups_members m, '.$CFG->prefix.'user u
-                        WHERE p.userid = m.userid '.$tagquerysql.'
-                        AND u.id = p.userid
-                        AND m.groupid = '.$filterselect.'
-                        AND (p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')';
+                               $SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
+                           .$CFG->prefix.'groups_members m, '.$CFG->prefix.'user u
+                           WHERE p.userid = m.userid '.$tagquerysql.'
+                           AND u.id = p.userid
+                           AND m.groupid = '.$filterselect.'
+                           AND (p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')';
 
             break;
 
             case 'user':
-
-                $SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
-                        .$CFG->prefix.'user u
-                        WHERE p.userid = u.id '.$tagquerysql.'
-                        AND u.id = '.$filterselect.'
-                        AND (p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')';
+                               
+                               if (isloggedin()) {
+                                 
+                       $SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
+                               .$CFG->prefix.'user u
+                               WHERE p.userid = u.id '.$tagquerysql.'
+                               AND u.id = '.$filterselect.'
+                               AND (p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')';
+                   } else {
+                       
+                                       $SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
+                               .$CFG->prefix.'user u
+                               WHERE p.userid = u.id '.$tagquerysql.'
+                               AND u.id = '.$filterselect.'
+                               AND p.publishstate = \'public\'';                     
+                     
+                   }
 
             break;