[Fusionforge-commits] r12687 - branches/Branch_5_1/src/www/admin

Alain Peyrat aljeux at fusionforge.org
Fri Mar 11 18:09:17 CET 2011


Author: aljeux
Date: 2011-03-11 18:09:17 +0100 (Fri, 11 Mar 2011)
New Revision: 12687

Removed:
   branches/Branch_5_1/src/www/admin/edit_licenses.php
Modified:
   branches/Branch_5_1/src/www/admin/approve-pending.php
   branches/Branch_5_1/src/www/admin/groupdelete.php
   branches/Branch_5_1/src/www/admin/index.php
Log:
license have been dropped, clean code.

Modified: branches/Branch_5_1/src/www/admin/approve-pending.php
===================================================================
--- branches/Branch_5_1/src/www/admin/approve-pending.php	2011-03-11 17:09:07 UTC (rev 12686)
+++ branches/Branch_5_1/src/www/admin/approve-pending.php	2011-03-11 17:09:17 UTC (rev 12687)
@@ -29,7 +29,6 @@
 require_once('../env.inc.php');
 require_once $gfcommon.'include/pre.php';
 require_once $gfcommon.'include/account.php';
-require_once $gfcommon.'include/license.php';
 require_once $gfwww.'include/canned_responses.php';
 require_once $gfwww.'admin/admin_utils.php';
 require_once $gfwww.'project/admin/project_admin_utils.php';
@@ -166,8 +165,6 @@
 	</table>
 
 	<p>
-	<strong><?php echo _('License:')." "; print license_getname($row_grp['license']); ?></strong>
-
 	<?php
 
 		if (forge_get_config('use_shell')) {

Deleted: branches/Branch_5_1/src/www/admin/edit_licenses.php
===================================================================
--- branches/Branch_5_1/src/www/admin/edit_licenses.php	2011-03-11 17:09:07 UTC (rev 12686)
+++ branches/Branch_5_1/src/www/admin/edit_licenses.php	2011-03-11 17:09:17 UTC (rev 12687)
@@ -1,33 +0,0 @@
-<?php
-/**
- * Site Admin page to edit licenses
- *
- * Copyright 1999-2001 (c) VA Linux Systems
- * Copyright 2002-2004 (c) GForge Team
- * http://fusionforge.org/
- *
- * This file is part of FusionForge.
- *
- * FusionForge 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.
- *
- * FusionForge 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 FusionForge; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-$unit        = 'license';
-$table       = 'licenses';
-$primary_key = 'license_id';
-
-require_once('../env.inc.php');
-include_once $gfwww.'admin/admin_table.php';
-
-?>

Modified: branches/Branch_5_1/src/www/admin/groupdelete.php
===================================================================
--- branches/Branch_5_1/src/www/admin/groupdelete.php	2011-03-11 17:09:07 UTC (rev 12686)
+++ branches/Branch_5_1/src/www/admin/groupdelete.php	2011-03-11 17:09:17 UTC (rev 12687)
@@ -24,7 +24,6 @@
 
 require_once('../env.inc.php');
 require_once $gfcommon.'include/pre.php';
-require_once $gfcommon.'include/license.php';
 require_once $gfwww.'admin/admin_utils.php';
 
 session_require_global_perm ('forge_admin');
@@ -45,7 +44,7 @@
 	if (!$group->delete($sure, $reallysure, $reallyreallysure)) {
 		exit_error($group->getErrorMessage(),'admin');
 	} else {
-		plugin_hook('delete_link',$_GET['group_id']) ;
+		plugin_hook('delete_link',$group_id);
         $feedback = _('Project successfully deleted');
         session_redirect('/admin/?feedback='.urlencode($feedback));
 	}

Modified: branches/Branch_5_1/src/www/admin/index.php
===================================================================
--- branches/Branch_5_1/src/www/admin/index.php	2011-03-11 17:09:07 UTC (rev 12686)
+++ branches/Branch_5_1/src/www/admin/index.php	2011-03-11 17:09:17 UTC (rev 12687)
@@ -178,7 +178,6 @@
 	<li><a href="edit_frs_filetype.php"><?php echo _('Add, Delete, or Edit File Types'); ?></a></li>
 	<li><a href="edit_frs_processor.php"><?php echo _('Add, Delete, or Edit Processors'); ?></a></li>
 	<li><a href="edit_theme.php"><?php echo _('Add, Delete, or Edit Themes'); ?></a></li>
-	<li><a href="edit_licenses.php"><?php echo _('Add, Delete, or Edit Licenses'); ?></a></li>
 	<li><a href="<?php echo util_make_url ('/stats/lastlogins.php'); ?>"><?php echo _('Last Logins'); ?></a></li>
 	<li><a href="cronman.php"><?php echo _('Cron Manager'); ?></a></li>
 	<li><a href="pluginman.php"><?php echo _('Plugin Manager'); ?></a></li>




More information about the Fusionforge-commits mailing list