[Gforge-commits] gforge/www/frs shownotes.php,1.4,1.5

[gsmet]

Update of /cvsroot/gforge/gforge/www/frs
In directory db.perdue.net:/tmp/cvs-serv16417/www/frs

Modified Files:
        shownotes.php 
Log Message:
fixed [#920] Problem accessing release notes of a private package

Index: shownotes.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/frs/shownotes.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- shownotes.php       8 Oct 2004 20:33:18 -0000       1.4
+++ shownotes.php       8 Oct 2004 23:04:59 -0000       1.5
@@ -28,20 +28,6 @@
 require_once('pre.php');
 require_once('www/frs/include/frs_utils.php');
 
-//
-//  Members of projects can see all packages
-//  Non-members can only see public packages
-//
-if (session_loggedin()) {
-       if (user_ismember($group_id) || user_ismember(1,'A')) {
-               $pub_sql='';
-       } else {
-               $pub_sql=' AND frs_package.is_public=1 ';
-       }
-} else {
-       $pub_sql=' AND frs_package.is_public=1 ';
-}
-
 $result=db_query("SELECT frs_release.notes,frs_release.changes,
                
frs_release.preformatted,frs_release.name,frs_package.group_id,frs_package.is_public
                FROM frs_release,frs_package 
@@ -50,11 +36,19 @@
                AND frs_release.release_id='$release_id'");
 
 if (!$result || db_numrows($result) < 1) {
-       echo db_error();
        exit_error($Language->getText('general','error'), 
$Language->getText('project_shownotes','error_release_not_found'));
 } else {
 
        $group_id=db_result($result,0,'group_id');
+       $is_public =db_result($result,0,'is_public');
+
+       //  Members of projects can see all packages
+       //  Non-members can only see public packages
+       if(!$is_public) {
+               if (!session_loggedin() || (!user_ismember($group_id) && 
!user_ismember(1,'A'))) {
+                       exit_permission_denied();
+               }
+       }
 
        
frs_header(array('title'=>$Language->getText('project_shownotes','title'),'group'=>$group_id,'pagename'=>'project_shownotes','sectionvals'=>array(group_getname($group_id))));