[Fusionforge-commits] r12038 - in trunk/src: common/include www/admin

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Wed Jan 19 20:43:14 CET 2011


Author: aljeux
Date: 2011-01-19 20:43:13 +0100 (Wed, 19 Jan 2011)
New Revision: 12038

Removed:
   trunk/src/www/admin/edit_licenses.php
Modified:
   trunk/src/common/include/Group.class.php
   trunk/src/www/admin/approve-pending.php
   trunk/src/www/admin/groupdelete.php
   trunk/src/www/admin/index.php
Log:
Drop deprecated licenses code.

Modified: trunk/src/common/include/Group.class.php
===================================================================
--- trunk/src/common/include/Group.class.php	2011-01-19 16:28:14 UTC (rev 12037)
+++ trunk/src/common/include/Group.class.php	2011-01-19 19:43:13 UTC (rev 12038)
@@ -5,6 +5,7 @@
  * Copyright 1999-2001, VA Linux Systems, Inc.
  * Copyright 2009-2010, Roland Mas
  * Copyright 2010-2011, Franck Villaume - Capgemini
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -42,27 +43,6 @@
 require_once $gfcommon.'include/gettext.php';
 require_once $gfcommon.'include/GroupJoinRequest.class.php';
 
-//the license_id of "Other/proprietary" license
-define('GROUP_LICENSE_OTHER',126);
-
-$LICENSE_NAMES=array();
-
-/**
- * group_get_licences() - get the licenses list
- *
- * @return array list of licenses
- */
-function & group_get_licenses() {
-	global $LICENSE_NAMES;
-	if(empty($LICENSE_NAMES)) {
-		$result = db_query_params ('select * from licenses', array());
-		while($data = db_fetch_array($result)) {
-			$LICENSE_NAMES[$data['license_id']] = $data['license_name'];
-		}
-	}
-	return $LICENSE_NAMES;
-}
-
 $GROUP_OBJ=array();
 
 /**
@@ -959,42 +939,6 @@
 	}
 
 	/**
-	 * getLicense - the license they chose.
-	 *
-	 * @return	int	ident of group license.
-	 */
-	function getLicense() {
-		return $this->data_array['license'];
-	}
-	
-	/**
-	 * getLicenseName - the name of the license
-	 *
-	 * @return	string	license name
-	 */
-	function getLicenseName() {
-		$licenses =& group_get_licenses();
-		if(isset($licenses[$this->data_array['license']])) {
-			return $licenses[$this->data_array['license']];
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * getLicenseOther - optional string describing license.
-	 *
-	 * @return	string	The custom license.
-	 */
-	function getLicenseOther() {
-		if ($this->getLicense() == GROUP_LICENSE_OTHER) {
-			return $this->data_array['license_other'];
-		} else {
-			return '';
-		}
-	}
-
-	/**
 	 * getRegistrationPurpose - the text description of the purpose of this project.
 	 *
 	 * @return	string	The application for project hosting.

Modified: trunk/src/www/admin/approve-pending.php
===================================================================
--- trunk/src/www/admin/approve-pending.php	2011-01-19 16:28:14 UTC (rev 12037)
+++ trunk/src/www/admin/approve-pending.php	2011-01-19 19:43:13 UTC (rev 12038)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -29,7 +30,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';
@@ -167,12 +167,10 @@
 	</table>
 
 	<p>
-	<strong><?php echo _('License:')." "; print license_getname($row_grp['license']); ?></strong>
-
 	<?php
 
 		if (forge_get_config('use_shell')) {
-	?>  
+	?>
 	<br /><strong><?php echo _('Home Box:')." "; print $row_grp['unix_box']; ?></strong>
 	<?php
 		} //end of sys_use_shell

Deleted: trunk/src/www/admin/edit_licenses.php
===================================================================
--- trunk/src/www/admin/edit_licenses.php	2011-01-19 16:28:14 UTC (rev 12037)
+++ trunk/src/www/admin/edit_licenses.php	2011-01-19 19:43:13 UTC (rev 12038)
@@ -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: trunk/src/www/admin/groupdelete.php
===================================================================
--- trunk/src/www/admin/groupdelete.php	2011-01-19 16:28:14 UTC (rev 12037)
+++ trunk/src/www/admin/groupdelete.php	2011-01-19 19:43:13 UTC (rev 12038)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -24,7 +25,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');

Modified: trunk/src/www/admin/index.php
===================================================================
--- trunk/src/www/admin/index.php	2011-01-19 16:28:14 UTC (rev 12037)
+++ trunk/src/www/admin/index.php	2011-01-19 19:43:13 UTC (rev 12038)
@@ -9,6 +9,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2010 (c) FusionForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -179,7 +180,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