[Gforge-commits] gforge/www/include pre.php, 1.28, 1.29 project_home.php, 1.37, 1.38 role_utils.php, NONE, 1.1 squal_pre.php, 1.8, 1.9

[tperdue]

Update of /cvsroot/gforge/gforge/www/include
In directory db.perdue.net:/home/tperdue/share/dev.gforge.org/www/include

Modified Files:
        pre.php project_home.php squal_pre.php 
Added Files:
        role_utils.php 
Log Message:
RBAC, DELETION, AND FORUM EMAIL GATEWAY

Index: pre.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/include/pre.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- pre.php     21 Jul 2004 15:29:22 -0000      1.28
+++ pre.php     4 Aug 2004 16:18:40 -0000       1.29
@@ -13,10 +13,6 @@
        ob_start("ob_gzhandler");
 }
 
-/*
-       redirect to proper hostname to get around certificate problem on IE 5
-*/
-
 // get constants used for flags or status
 require('common/include/constants.php');
 
@@ -35,6 +31,16 @@
        }
 }
 
+//
+//     This file contains a few variables that override the etc/local.inc vars
+//     This allows you to override such things as $sys_name, dbname, etc if 
you 
+//     have multiple installs on one server.
+//
+require('overrides.inc');
+
+/*
+       redirect to proper hostname to get around certificate problem on IE 5
+*/
 if ($HTTP_HOST != $GLOBALS['sys_default_domain'] && $HTTP_HOST != 
$GLOBALS['sys_fallback_domain']) {
        if ($SERVER_PORT == '443') {
                header ("Location: 
https://".$GLOBALS['sys_default_domain']."$REQUEST_URI");
@@ -70,6 +76,9 @@
 
 //system library
 require_once('common/include/System.class');
+if (!$sys_account_manager_type) {
+       $sys_account_manager_type='UNIX';
+}
 require_once('common/include/system/'.$sys_account_manager_type.'.class');
 $SYS=new $sys_account_manager_type();
 

Index: project_home.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/include/project_home.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- project_home.php    21 Jul 2004 23:40:19 -0000      1.37
+++ project_home.php    4 Aug 2004 16:18:40 -0000       1.38
@@ -11,7 +11,6 @@
 */
 
 require_once('www/include/vote_function.php');
-require_once('common/include/vars.php');
 require_once('www/news/news_utils.php');
 require_once('www/include/trove.php');
 require_once('www/include/project_summary.php');
@@ -164,12 +163,27 @@
                </td>
                </tr>';
 
-               $sql="SELECT frs_package.package_id,frs_package.name AS 
package_name,frs_release.name AS release_name,frs_release.release_id AS 
release_id,frs_release.release_date AS release_date ".
-                       "FROM frs_package,frs_release ".
-                       "WHERE frs_package.package_id=frs_release.package_id ".
-                       "AND frs_package.group_id='$group_id' ".
-                       "AND frs_release.status_id=1 ".
-                       "ORDER BY 
frs_package.package_id,frs_release.release_date DESC";
+               //
+               //  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 ';
+               }
+
+               $sql="SELECT frs_package.package_id,frs_package.name AS 
package_name,frs_release.name AS release_name,frs_release.release_id AS 
release_id,frs_release.release_date AS release_date 
+                       FROM frs_package,frs_release 
+                       WHERE frs_package.package_id=frs_release.package_id 
+                       AND frs_package.group_id='$group_id' 
+                       AND frs_release.status_id=1 
+                       $pub_sql
+                       ORDER BY 
frs_package.package_id,frs_release.release_date DESC";
 
                $res_files = db_query($sql);
                $rows_files=db_numrows($res_files);
@@ -340,7 +354,7 @@
                WHERE group_id='$group_id'
        ", -1, 0, SYS_DB_STATS);
        $cvs_commit_num = db_result($result,0,0);
-       $cvs_add_num    = db_result($result,0,1);
+       $cvs_add_num    = db_result($result,0,1);
        if (!$cvs_commit_num) {
                $cvs_commit_num=0;
        }

--- NEW FILE: role_utils.php ---
<?php
/*
 * Copyright 2004 GForge, LLC
 *
 * @version   $Id: role_utils.php,v 1.1 2004/08/04 16:18:40 tperdue Exp $
 * @author Tim Perdue address@hidden
 *
 * This file is part of GForge.
 *
 * GForge is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * GForge is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with GForge; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

function role_box ($group_id,$name,$selected='xzxzxz') {
        global $roleres;
        if (!$roleres) {
                $roleres=db_query("SELECT role_id,role_name 
                        FROM role WHERE group_id='$group_id'");
        }
        return html_build_select_box($roleres,$name,$selected,false);
}

?>

Index: squal_pre.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/include/squal_pre.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- squal_pre.php       26 Jul 2004 17:27:40 -0000      1.8
+++ squal_pre.php       4 Aug 2004 16:18:40 -0000       1.9
@@ -29,6 +29,10 @@
 require_once('common/include/Permission.class');
 require_once('common/include/utils.php');
 require_once('common/include/Group.class');
+require_once('www/include/BaseLanguage.class');
+
+$Language=new BaseLanguage();
+$Language->loadLanguage('English');
 
 // Plugins subsystem
 require_once('common/include/Plugin.class') ;