[evolvis-commits] r8016: cleaning some old cruft out of /admin/ -- LOTS more to do?==?UTF-8?Q?↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 15:55:18 CET 2011


Author: mirabilos
Date: 2011-02-24 15:55:18 +0100 (Thu, 24 Feb 2011)
New Revision: 8016

Added:
   trunk/gforge_base/evolvisforge-5.1/gforge/db/20021230.sql
Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/admin_utils.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/database.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/groupedit.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/vhost.php
Log:
cleaning some old cruft out of /admin/ -- LOTS more to do


Added: trunk/gforge_base/evolvisforge-5.1/gforge/db/20021230.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20021230.sql	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20021230.sql	2011-02-24 14:55:18 UTC (rev 8016)
@@ -0,0 +1 @@
+drop table group_type;

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/admin_utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/admin_utils.php	2011-02-24 14:55:17 UTC (rev 8015)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/admin_utils.php	2011-02-24 14:55:18 UTC (rev 8016)
@@ -1,6 +1,5 @@
 <?php
 /**
-  *
   * Module of support routines for Site Admin
   *
   * SourceForge: Breaking Down the Barriers to Open Source Development
@@ -8,20 +7,13 @@
   * http://sourceforge.net
   *
   * @version   $Id$
-  *
   */
 
 
 function site_admin_header($params) {
-	GLOBAL $HTML;
-	global $feedback;
+	global $feedback,$HTML;
 	$HTML->header($params);
 	echo html_feedback_top($feedback);
-	echo '<H2>'.$GLOBALS['sys_name'].' Site Admin</H2>
-	<P><A HREF="/admin/">Site Admin Home</A> |
-	<A HREF="/news/admin/">Site News Admin</A> |
-	<A HREF="/stats/">Site Stats</A>
-	<P>';
 }
 
 function site_admin_footer($vals=0) {
@@ -30,33 +22,4 @@
 	$HTML->footer(array());
 }
 
-function show_group_type_box($name='group_type',$checked_val='xzxz') {
-	$result=db_query("SELECT * FROM group_type");
-	return html_build_select_box ($result,'group_type',$checked_val,false);
-}
-
-// Return group_id by group name. Should be in Group.class
-function seek_gid($g_unixname) {
-
-	$gname = strtolower($g_unixname);
-
-	$res_vh = db_query("
-		SELECT *
-		FROM groups
-		WHERE unix_group_name='$gname'
-	");
-
-	if (db_numrows($res_vh) < 1) {
-
-	        return 0;
-
-	} else {
-
-		$row_db = db_fetch_array($res_vh);
-		return $row_db['group_id'];
-
-	}
-
-}
-
 ?>

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/database.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/database.php	2011-02-24 14:55:17 UTC (rev 8015)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/database.php	2011-02-24 14:55:18 UTC (rev 8016)
@@ -27,11 +27,9 @@
 
 if ($submit) {
 
-	$group_id = seek_gid($groupname);
-
 	if ($group_id) {
 
-		$group =& group_get_object($group_id);
+		$group =& group_get_object_by_name($groupname);
 		exit_assert_object($group, 'Group');
 
 		$user =& session_get_user();

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/groupedit.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/groupedit.php	2011-02-24 14:55:17 UTC (rev 8015)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/groupedit.php	2011-02-24 14:55:18 UTC (rev 8016)
@@ -37,7 +37,7 @@
 
 // This function performs very update
 function do_update(&$group, $is_public, $status, $license,
-		   $group_type, $unix_box, $http_domain) {
+		   1, $unix_box, $http_domain) {
 	global $feedback;
 
 	db_begin();
@@ -90,11 +90,6 @@
 <tr>
 <td colspan="3">
 
-Group Type:
-<?php
-echo show_group_type_box('group_type', $group->getType());
-?>
-
 Status:
 <?php echo html_build_select_box_from_arrays(
 	array('I','A','P','H','D'),

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/index.php	2011-02-24 14:55:17 UTC (rev 8015)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/index.php	2011-02-24 14:55:18 UTC (rev 8016)
@@ -27,15 +27,10 @@
 
 ?>
  
-<p><i><b>Warning!</b> These functions currently have minimal error checking,
-if any. They are fine to play with but may not act as expected if you leave
-fields blank, etc... Also, navigating the admin functions with the 
-<b>back</b> button is highly unadvised.</i>
-
-<p><B>User/Group Maintenance</B>
+<p><b>User Maintenance</b>
 <ul>
-<li><a href="userlist.php">Display Full User List/Edit Users</a>  
-<li>Display Users Beginning with : 
+	<li><a href="userlist.php">Display Full User List/Edit Users</a>  
+	<li>Display Users Beginning with : 
 <?php
 	for ($i=0; $i < count($abc_array); $i++) {
 		echo "<a href=\"search.php?usersearch=1&search=$abc_array[$i]%\">$abc_array[$i]</a>|";
@@ -49,8 +44,12 @@
   <input type="hidden" name="usersearch" value="1">
   <input type="submit" value="get">
 </form>
-<BR> 
-<li><a href="grouplist.php">Display Full Group List/Edit Groups</a>
+</ul>
+<p>
+<b>Group Maintenance</b>
+<p>
+<ul>
+	<li><a href="grouplist.php">Display Full Group List/Edit Groups</a>
 
 <li>Display Groups Beginning with : 
 <?php
@@ -69,55 +68,70 @@
 <p>
 
 
-<LI>Groups with <a href="approve-pending.php"><B>P</B> (pending) Status</A> <i>(New Project Approval)</i>
-<LI>Groups with <a href="search.php?groupsearch=1&search=%&status=I"><B>I</B> (incomplete) Status</A>
-<LI>Groups with <a href="search.php?groupsearch=1&search=%&status=D"><B>D</B> (deleted) Status</A>
-<LI><a href="search.php?groupsearch=1&search=%&is_public=0">Private Groups </A>
+<li><a href="/register/">Register New Project</a>
+<li>Groups with <a href="approve-pending.php"><b>P</b> (pending) Status</a> <i>(New Project Approval)</i>
+<li>Groups with <a href="search.php?groupsearch=1&search=%&status=D"><b>D</b> (deleted) Status</a>
+<li><a href="search.php?groupsearch=1&search=%&is_public=0">Private Groups </a>
 </ul>
 
-<p><b><A HREF="/register/">Register New Project</A></b>
-<p><b>Trove</b>
+<p>
+<b>News</b>
+<p>
 <ul>
-<li><a href="trove/trove_cat_list.php">Display Trove Map</a>
-<li><a href="trove/trove_cat_add.php">Add to the Trove Map</a>
+	<li><a href="/news/admin/">Approve/Reject</a> Front-page news
 </ul>
 
-<P><B>Site Utilities</B>
-<UL>
-<LI><A href="massmail.php">Mail Engine for <?php echo $GLOBALS['sys_name']; ?> Subscribers</A>
-<LI><A href="unsubscribe.php"><?php echo $GLOBALS['sys_name']; ?> Site Mailings Maintenance</A>
-<LI><A HREF="edit_supported_languages.php">Add, Delete, or Edit Supported Languages</A>
-<LI><A HREF="edit_frs_filetype.php">Add, Delete, or Edit File Types</A>
-<LI><A HREF="edit_frs_processor.php">Add, Delete, or Edit Processors</A>
-<LI><A HREF="edit_frs_theme.php">Add, Delete, or Edit Themes</A>
-<LI><A HREF="loadtabfiles.php">Translation file tool</A>
-</UL>
+<p>
+<b>Stats</b>
+<p>
+<ul>
+	<li><a href="/stats/">Site-Wide Stats</a>
+</ul>
 
-<P><B>Global Admin Tools / Mass Insert Tools</B>
-<UL>
-<LI><A HREF="vhost.php">Virtual Host Administration Tool</A>
-<LI><A HREF="database.php">Project Database Administration</A>
-</UL>
+<p>
+<b>Trove Project Tree</b>
+<ul>
+	<li><a href="trove/trove_cat_list.php">Display Trove Map</a>
+	<li><a href="trove/trove_cat_add.php">Add to the Trove Map</a>
+</ul>
 
-<P><B>Quick Site Statistics</B></P>
+<p><b>Site Utilities</b>
+<ul>
+	<li><A href="massmail.php">Mail Engine for <?php echo $GLOBALS['sys_name']; ?> Subscribers</a>
+	<li><A href="unsubscribe.php"><?php echo $GLOBALS['sys_name']; ?> Site Mailings Maintenance</a>
+	<li><a href="edit_supported_languages.php">Add, Delete, or Edit Supported Languages</a>
+	<li><a href="edit_frs_filetype.php">Add, Delete, or Edit File Types</a>
+	<li><a href="edit_frs_processor.php">Add, Delete, or Edit Processors</a>
+	<li><a href="edit_frs_theme.php">Add, Delete, or Edit Themes</a>
+	<li><a href="loadtabfiles.php">Translation file tool</a>
+</ul>
 
+<p>
+<b>Global Admin Tools / Mass Insert Tools</b>
+<ul>
+	<li><a href="vhost.php">Virtual Host Administration Tool</a>
+	<li><a href="database.php">Project Database Administration</a>
+</ul>
+
+<p><b>Quick Site Statistics</b></p>
+
 <?php
 
 $res=db_query("SELECT count(*) AS count FROM users WHERE status='A'");
 $row = db_fetch_array($res);
-print "<P>Active site users: <B>$row[count]</B>";
+print "<p>Active site users: <b>$row[count]</b>";
 
 $res=db_query("SELECT count(*) AS count FROM groups");
 $row = db_fetch_array($res);
-print "<BR>Registered projects: <B>$row[count]</B>";
+print "<BR>Registered projects: <b>$row[count]</b>";
 
 $res=db_query("SELECT count(*) AS count FROM groups WHERE status='A'");
 $row = db_fetch_array($res);
-print "<BR>Active projects: <B>$row[count]</B>";
+print "<BR>Active projects: <b>$row[count]</b>";
 
 $res=db_query("SELECT count(*) AS count FROM groups WHERE status='P'");
 $row = db_fetch_array($res);
-print "<BR>Pending projects: <B>$row[count]</B>";
+print "<BR>Pending projects: <b>$row[count]</b>";
 
 site_admin_footer(array());
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/vhost.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/vhost.php	2011-02-24 14:55:17 UTC (rev 8015)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/vhost.php	2011-02-24 14:55:18 UTC (rev 8016)
@@ -26,11 +26,9 @@
 
 if ($add) {
 
-	$group_id = seek_gid($groupname);
-
 	if ($group_id) {
 
-		$group = &group_get_object($group_id);
+		$group = &group_get_object_by_name($groupname);
 		exit_assert_object($group, 'Group');
 
 		if (valid_hostname($vhost_name)) {



More information about the evolvis-commits mailing list