[Fusionforge-commits] r6821 - in trunk/gforge: common/include www/export www/include www/soap/common www/themes/gforge www/themes/gforge-simple-theme www/themes/lite www/themes/ultralite

Roland Mas lolando at libremir.placard.fr.eu.org
Fri Jan 30 09:22:27 CET 2009


Author: lolando
Date: 2009-01-30 09:22:27 +0100 (Fri, 30 Jan 2009)
New Revision: 6821

Added:
   trunk/gforge/common/include/FusionForge.class.php
Removed:
   trunk/gforge/common/include/GForge.class.php
Modified:
   trunk/gforge/www/export/rss20_version.php
   trunk/gforge/www/include/Layout.class.php
   trunk/gforge/www/include/features_boxes.php
   trunk/gforge/www/soap/common/group.php
   trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php
   trunk/gforge/www/themes/gforge/Theme.class.php
   trunk/gforge/www/themes/lite/Theme.class.php
   trunk/gforge/www/themes/ultralite/Theme.class.php
Log:
Renamed the GForge class to FusionForge

Copied: trunk/gforge/common/include/FusionForge.class.php (from rev 6820, trunk/gforge/common/include/GForge.class.php)
===================================================================
--- trunk/gforge/common/include/FusionForge.class.php	                        (rev 0)
+++ trunk/gforge/common/include/FusionForge.class.php	2009-01-30 08:22:27 UTC (rev 6821)
@@ -0,0 +1,97 @@
+<?php   
+/**
+ *	FusionForge object
+ *
+ *	Provides some top-level information about the FusionForge installation.
+ *
+ * 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
+ */
+
+require_once $gfcommon.'include/Error.class.php';
+class FusionForge extends Error {
+
+	var $software_name ;
+	var $software_version ;
+
+	/**
+	 *	FusionForge - FusionForge object constructor
+	 */
+	function FusionForge() {
+		$this->Error();
+
+		$this->software_name = 'FusionForge' ;
+		$this->software_version = '4.7' ;
+
+		return true;
+	}
+
+	function getNumberOfPublicHostedProjects() {
+		$res=db_query("SELECT count(*) AS count FROM groups WHERE status='A' AND is_public=1");	
+		if (!$res || db_numrows($res) < 1) {
+			$this->setError('Unable to get hosted project count: '.db_error());
+			return false;
+		}
+		return $this->parseCount($res);
+	}
+
+	function getNumberOfHostedProjects() {
+		$res=db_query("SELECT count(*) AS count FROM groups WHERE status='A'");	
+		if (!$res || db_numrows($res) < 1) {
+			$this->setError('Unable to get hosted project count: '.db_error());
+			return false;
+		}
+		return $this->parseCount($res);
+	}
+
+	function getNumberOfActiveUsers() {
+	  $res = db_query("SELECT count(*) AS count FROM users WHERE status='A' and user_id != 100");
+		if (!$res || db_numrows($res) < 1) {
+			$this->setError('Unable to get user count: '.db_error());
+			return false;
+		}
+		return $this->parseCount($res);
+	}
+
+
+	function getPublicProjectNames() {
+		$res = db_query("SELECT unix_group_name FROM groups WHERE status='A' AND is_public=1");
+		if (!$res) {
+			$this->setError('Unable to get list of public projects: '.db_error());
+			return false;
+		}
+		$rows=db_numrows($res);
+		$result = array();
+    for ($i=0; $i<$rows; $i++) {
+			$result[$i] = db_result($res, $i, 'unix_group_name');
+    }
+		return $result;
+	}
+	
+	function parseCount($res) {
+    $row_count = db_fetch_array($res);
+    return $row_count['count'];
+	}
+
+
+}
+
+// Local Variables:
+// mode: php
+// c-file-style: "bsd"
+// End:
+
+?>

Deleted: trunk/gforge/common/include/GForge.class.php
===================================================================
--- trunk/gforge/common/include/GForge.class.php	2009-01-29 23:04:20 UTC (rev 6820)
+++ trunk/gforge/common/include/GForge.class.php	2009-01-30 08:22:27 UTC (rev 6821)
@@ -1,97 +0,0 @@
-<?php   
-/**
- *	GForge object
- *
- *	Provides some top-level information about the GForge installation.
- *
- * 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
- */
-
-require_once $gfcommon.'include/Error.class.php';
-class GForge extends Error {
-
-	var $software_name ;
-	var $software_version ;
-
-	/**
-	 *	GForge - GForge object constructor
-	 */
-	function GForge() {
-		$this->Error();
-
-		$this->software_name = 'FusionForge' ;
-		$this->software_version = '4.7' ;
-
-		return true;
-	}
-
-	function getNumberOfPublicHostedProjects() {
-		$res=db_query("SELECT count(*) AS count FROM groups WHERE status='A' AND is_public=1");	
-		if (!$res || db_numrows($res) < 1) {
-			$this->setError('Unable to get hosted project count: '.db_error());
-			return false;
-		}
-		return $this->parseCount($res);
-	}
-
-	function getNumberOfHostedProjects() {
-		$res=db_query("SELECT count(*) AS count FROM groups WHERE status='A'");	
-		if (!$res || db_numrows($res) < 1) {
-			$this->setError('Unable to get hosted project count: '.db_error());
-			return false;
-		}
-		return $this->parseCount($res);
-	}
-
-	function getNumberOfActiveUsers() {
-	  $res = db_query("SELECT count(*) AS count FROM users WHERE status='A' and user_id != 100");
-		if (!$res || db_numrows($res) < 1) {
-			$this->setError('Unable to get user count: '.db_error());
-			return false;
-		}
-		return $this->parseCount($res);
-	}
-
-
-	function getPublicProjectNames() {
-		$res = db_query("SELECT unix_group_name FROM groups WHERE status='A' AND is_public=1");
-		if (!$res) {
-			$this->setError('Unable to get list of public projects: '.db_error());
-			return false;
-		}
-		$rows=db_numrows($res);
-		$result = array();
-    for ($i=0; $i<$rows; $i++) {
-			$result[$i] = db_result($res, $i, 'unix_group_name');
-    }
-		return $result;
-	}
-	
-	function parseCount($res) {
-    $row_count = db_fetch_array($res);
-    return $row_count['count'];
-	}
-
-
-}
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
-
-?>

Modified: trunk/gforge/www/export/rss20_version.php
===================================================================
--- trunk/gforge/www/export/rss20_version.php	2009-01-29 23:04:20 UTC (rev 6820)
+++ trunk/gforge/www/export/rss20_version.php	2009-01-30 08:22:27 UTC (rev 6821)
@@ -1,12 +1,13 @@
 <?php
-// export projects list in RSS 2.0
-// Author: Scott Grayban <sgrayban at borgnet.us>
-//
+
+// Export software version in RSS 2.0
+// Author: Christian Bayle <bayle at debian.org>
+
 include "../env.inc.php";
 include "pre.php";
-require_once $gfcommon.'include/GForge.class.php';
+require_once $gfcommon.'include/FusionForge.class.php';
 
-$forge=new GForge();
+$forge=new FusionForge();
 $vers=$forge->software_version;
 $name=$forge->software_name;
 $date=gmdate('D, d M Y g:i:s',time())." GMT";

Modified: trunk/gforge/www/include/Layout.class.php
===================================================================
--- trunk/gforge/www/include/Layout.class.php	2009-01-29 23:04:20 UTC (rev 6820)
+++ trunk/gforge/www/include/Layout.class.php	2009-01-30 08:22:27 UTC (rev 6821)
@@ -14,7 +14,7 @@
  */
  
 require_once $gfcommon.'include/constants.php';
-require_once $gfcommon.'include/GForge.class.php';
+require_once $gfcommon.'include/FusionForge.class.php';
 require_once $gfwww.'search/include/SearchManager.class.php';
 
 class Layout extends Error {
@@ -274,7 +274,7 @@
 <a href="http://fusionforge.org/"><img src="/images/pow-gforge.png" alt="Powered By FusionForge" border="0" /></a>
 <br />
 <?php
-			$forge = GForge() ;
+			$forge = FusionForge() ;
 		printf (_('This site is running %1$s version %2$d'),
 			$forge->software_name,
 			$forge->software_version) ;

Modified: trunk/gforge/www/include/features_boxes.php
===================================================================
--- trunk/gforge/www/include/features_boxes.php	2009-01-29 23:04:20 UTC (rev 6820)
+++ trunk/gforge/www/include/features_boxes.php	2009-01-30 08:22:27 UTC (rev 6821)
@@ -11,7 +11,7 @@
 
 //require_once('../env.inc.php');
 //require_once('pre.php');
-require_once $gfcommon.'include/GForge.class.php';
+require_once $gfcommon.'include/FusionForge.class.php';
 
 function show_features_boxes() {
 	GLOBAL $HTML,$sys_use_ratings;
@@ -112,7 +112,7 @@
 }
 
 function show_sitestats() {
-	$gforge = new GForge();
+	$gforge = new FusionForge();
 	$return = '';
 	$return .= _('Hosted Projects').': <strong>'.number_format($gforge->getNumberOfPublicHostedProjects()).'</strong>';
 	$return .= '<br />'._('Registered Users').': <strong>'.number_format($gforge->getNumberOfActiveUsers()).'</strong>';

Modified: trunk/gforge/www/soap/common/group.php
===================================================================
--- trunk/gforge/www/soap/common/group.php	2009-01-29 23:04:20 UTC (rev 6820)
+++ trunk/gforge/www/soap/common/group.php	2009-01-30 08:22:27 UTC (rev 6821)
@@ -3,30 +3,29 @@
  * SOAP Group Include - this file contains wrapper functions for the SOAP interface
  *
  * Copyright 2004 (c) GForge, LLC
- * http://gforge.org
  *
  * @version   $Id$
  *
- * This file is part of GForge.
+ * This file is part of FusionForge.
  *
- * GForge is free software; you can redistribute it and/or modify
+ * 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.
  *
- * GForge is distributed in the hope that it will be useful,
+ * 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 GForge; if not, write to the Free Software
+ * along with FusionForge; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  US
  */
 
 require_once $gfcommon.'include/Error.class.php';
 require_once $gfcommon.'include/Group.class.php';
-require_once $gfcommon.'include/GForge.class.php';
+require_once $gfcommon.'include/FusionForge.class.php';
 
 // Add The definition of a group object
 $server->wsdl->addComplexType(
@@ -115,10 +114,10 @@
 // use as a way to get group names for use in getGroupsByName
 function &getPublicProjectNames($session_ser) {
 	continue_session($session_ser);
-	$gforge = new GForge();
-	$result = $gforge->getPublicProjectNames();
-	if ($gforge->isError()) {
-		$errMsg = 'Could Not Get Public Group Names: '.$gforge->getErrorMessage();
+	$forge = new FusionForge();
+	$result = $forge->getPublicProjectNames();
+	if ($forge->isError()) {
+		$errMsg = 'Could Not Get Public Group Names: '.$forge->getErrorMessage();
 		return new soap_fault ('2003','group',$errMsg,$errMsg);
 	}
 	return $result;

Modified: trunk/gforge/www/themes/gforge/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/gforge/Theme.class.php	2009-01-29 23:04:20 UTC (rev 6820)
+++ trunk/gforge/www/themes/gforge/Theme.class.php	2009-01-30 08:22:27 UTC (rev 6821)
@@ -1,7 +1,7 @@
 <?php
 
 require_once $gfwww.'include/Layout.class.php';
-require_once $gfcommon.'include/GForge.class.php';
+require_once $gfcommon.'include/FusionForge.class.php';
 
 define('THEME_DIR', util_make_url ('/themes/gforge'));
 
@@ -222,7 +222,7 @@
 <a href="http://fusionforge.org/"><img src="/images/pow-gforge.png" alt="Powered By FusionForge" border="0" /></a>
 <br />
 <?php
-		    $forge = GForge() ;
+		    $forge = FusionForge() ;
 	    printf (_('This site is running %1$s version %2$s'),
 		    $forge->software_name,
 		    $forge->software_version) ;

Modified: trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php	2009-01-29 23:04:20 UTC (rev 6820)
+++ trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php	2009-01-30 08:22:27 UTC (rev 6821)
@@ -14,7 +14,7 @@
  */
 
 require_once $gfwww.'search/include/SearchManager.class.php';
-require_once $gfcommon.'include/GForge.class.php';
+require_once $gfcommon.'include/FusionForge.class.php';
 
 class Theme extends Error {
 
@@ -216,7 +216,7 @@
 	border="0" /></a>
 <br />
 <?php
-		    $forge = GForge() ;
+		    $forge = FusionForge() ;
 	    printf (_('This site is running %1$s version %2$s'),
 		    $forge->software_name,
 		    $forge->software_version) ;

Modified: trunk/gforge/www/themes/lite/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/lite/Theme.class.php	2009-01-29 23:04:20 UTC (rev 6820)
+++ trunk/gforge/www/themes/lite/Theme.class.php	2009-01-30 08:22:27 UTC (rev 6821)
@@ -8,7 +8,7 @@
  *
  * @version   $Id$
  */
-require_once $gfcommon.'include/GForge.class.php';
+require_once $gfcommon.'include/FusionForge.class.php';
 
 class Theme extends Layout {
 
@@ -69,9 +69,9 @@
 	 */
 	function header($params) {
 		if (!$params['title']) {
-			$params['title'] = "GForge";
+			$params['title'] = "FusionForge";
 		} else {
-			$params['title'] = "GForge: " . $params['title'];
+			$params['title'] = "FusionForge: " . $params['title'];
 		}
 		echo '<?xml version="1.0" encoding="utf-8"?>'."\n";
 		?>
@@ -177,7 +177,7 @@
 <center>
 <a href="http://fusionforge.org/"><img src="<?php echo util_make_url ('/images/pow-gforge.png'); ?>" alt="Powered By FusionForge" border="0" /></a>
 <?php
-		    $forge = GForge() ;
+		    $forge = FusionForge() ;
 	    printf (_('This site is running %1$s version %2$d'),
 		    $forge->software_name,
 		    $forge->software_version) ;

Modified: trunk/gforge/www/themes/ultralite/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/ultralite/Theme.class.php	2009-01-29 23:04:20 UTC (rev 6820)
+++ trunk/gforge/www/themes/ultralite/Theme.class.php	2009-01-30 08:22:27 UTC (rev 6821)
@@ -1,6 +1,6 @@
 <?php
 
-require_once $gfcommon.'include/GForge.class.php';
+require_once $gfcommon.'include/FusionForge.class.php';
 
 class Theme extends Layout {
 	/**
@@ -146,7 +146,7 @@
 		<center>
 		<a href="http://fusionforge.org/">Powered By FusionForge</a><br />
 <?php
-			$forge = GForge() ;
+			$forge = FusionForge() ;
 		printf (_('This site is running %1$s version %2$d'),
 			$forge->software_name,
 			$forge->software_version) ;




More information about the Fusionforge-commits mailing list