[Gforge-commits] gforge/www/admin groupedit.php, 1.8, 1.9 massmail-old.php, 1.4, NONE massmail_execute.php, 1.4, NONE responses_admin.php, 1.4, 1.5 useredit.php, 1.6, 1.7

[tperdue]

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

Modified Files:
        groupedit.php responses_admin.php useredit.php 
Removed Files:
        massmail-old.php massmail_execute.php 
Log Message:
RBAC, DELETION, AND FORUM EMAIL GATEWAY

Index: groupedit.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/groupedit.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- groupedit.php       2 Aug 2004 21:14:46 -0000       1.8
+++ groupedit.php       4 Aug 2004 16:18:37 -0000       1.9
@@ -1,19 +1,17 @@
 <?php
 /**
-  *
-  * Site Admin group properties editing page
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
-
+ * Site Admin group properties editing page
+ *
+ * SourceForge: Breaking Down the Barriers to Open Source Development
+ * Copyright 1999-2001 (c) VA Linux Systems
+ * http://sourceforge.net
+ *
+ * @version   $Id$
+ * @version   $Id$
+ */
 
 require_once('pre.php');
-require_once('common/include/vars.php');
+require_once('common/include/license.php');
 require_once('www/admin/admin_utils.php');
 require_once('www/project/admin/project_admin_utils.php');
 
@@ -147,17 +145,9 @@
 <?php echo $Language->getText('admin','license'); ?>
 </td>
 <td>
-<select name="form_license">
-<option value="none"><?php echo $Language->getText('admin','na'); ?></option>
-<option value="other"><?php echo $Language->getText('admin','other'); 
?></option>
 <?php
-       while (list($k,$v) = each($LICENSE)) {
-               print "<option value=\"$k\"";
-               if ($k == $group->getLicense()) print " selected=\"selected\"";
-               print ">$v</option>\n";
-       }
+       echo license_selectbox('form_license',$group->getLicense());
 ?>
-</select>
 </td>
 </tr>
 

--- massmail-old.php DELETED ---

--- massmail_execute.php DELETED ---

Index: responses_admin.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/responses_admin.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- responses_admin.php 18 Feb 2004 09:18:25 -0000      1.4
+++ responses_admin.php 4 Aug 2004 16:18:37 -0000       1.5
@@ -15,7 +15,6 @@
 
 
 require_once('pre.php');
-require_once('common/include/vars.php');
 require_once('common/include/account.php');
 require_once('www/include/proj_email.php');
 require_once('www/include/canned_responses.php');

Index: useredit.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/useredit.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- useredit.php        18 Feb 2004 09:18:25 -0000      1.6
+++ useredit.php        4 Aug 2004 16:18:37 -0000       1.7
@@ -189,8 +189,7 @@
                <tr '.$GLOBALS['HTML']->boxGetAltRowStyle($i++).'>
                <td>'.$row_cat['group_name'].'</td>
                <td>'.$row_cat['unix_group_name'].'</td>
-               <td width="40%"><a 
href="/project/admin/?group_id='.$row_cat[group_id].'">['.$Language->getText('admin_useredit','project_admin').']</a>
-               <a 
href="/project/admin/userperms.php?group_id='.$row_cat['group_id'].'">['.$Language->getText('admin_useredit','membership_permissions').']</a></td>
+               <td width="40%"><a 
href="/project/admin/?group_id='.$row_cat[group_id].'">['.$Language->getText('admin_useredit','project_admin').']</a></td>
                </tr>
        ';