[Fusionforge-commits] FusionForge branch 5.2-admssw updated. 8e5729cadc525dc95b75ea3a9a5618ab9730c96b

Roland Mas lolando at fusionforge.org
Fri Feb 15 14:27:20 CET 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, 5.2-admssw has been updated
       via  8e5729cadc525dc95b75ea3a9a5618ab9730c96b (commit)
      from  ce3dd4f9816ff34c5726c014de8532a3cb3bd61f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8e5729cadc525dc95b75ea3a9a5618ab9730c96b
Author: Roland Mas <lolando at debian.org>
Date:   Fri Feb 15 14:27:13 2013 +0100

    I don't particularly like camelCase, but let's be consistent anyway

diff --git a/src/common/include/TroveCat.class.php b/src/common/include/TroveCat.class.php
index 7496c28..0ff1390 100644
--- a/src/common/include/TroveCat.class.php
+++ b/src/common/include/TroveCat.class.php
@@ -3,6 +3,7 @@
  * FusionForge trove categories
  *
  * Copyright 2013, Olivier Berger and Institut Mines-Telecom
+ * Copyright 2013, Roland Mas
  *
  * This file is part of FusionForge. FusionForge is free software;
  * you can redistribute it and/or modify it under the terms of the
@@ -105,10 +106,10 @@ class TroveCat extends Error {
 	}
 	
 	function listSubTree() {
-		return TroveCat::getsubtree($this->data_array['trove_cat_id']);
+		return TroveCat::getSubtree($this->data_array['trove_cat_id']);
 	}
 	
-	static function getallroots() {
+	static function getAllRoots() {
 		$rootcats = array();
 		
 		$res = db_query_params ('
@@ -129,7 +130,7 @@ class TroveCat extends Error {
 		return $rootcats; 
 	}
 	
-	static function getsubtree($root_cat_id) {
+	static function getSubtree($root_cat_id) {
 		$subcats = array();
 		
 		$res = db_query_params('
@@ -150,7 +151,7 @@ class TroveCat extends Error {
 		return $subcats;
 	}
 	
-	static function getprojectcats($group_id) {
+	static function getProjectCats($group_id) {
 		$cats = array();		
 	
 		$res = db_query_params ('
diff --git a/src/plugins/admssw/include/admsswPlugin.class.php b/src/plugins/admssw/include/admsswPlugin.class.php
index 9ceace2..dc755c2 100644
--- a/src/plugins/admssw/include/admsswPlugin.class.php
+++ b/src/plugins/admssw/include/admsswPlugin.class.php
@@ -4,6 +4,7 @@
  * admsswPlugin Class
  *
  * Copyright 2012-2013, Olivier Berger & Institut Mines-Telecom
+ * Copyright 2013, Roland Mas
  *
  * This file is part of FusionForge. FusionForge is free software;
  * you can redistribute it and/or modify it under the terms of the
@@ -275,7 +276,7 @@ class admsswPlugin extends Plugin {
 				'schema:operatingSystem' => array(),
 				'admssw:status' => array(),
 				'rad:theme' => array());
-		$trovecats = TroveCat::getprojectcats($group_id);
+		$trovecats = TroveCat::getProjectCats($group_id);
 		foreach($trovecats as $trovecat) {
 			$cat_id = $trovecat->getId();
 			if(!isset($this->trovecat_id_to_shortname[$cat_id])) {
@@ -526,7 +527,7 @@ class admsswPlugin extends Plugin {
 		$graph = new Graphite();
 		$this->graphSetAdmsswNameSpaces($graph);
 		
-		$rootcats = TroveCat::getallroots();
+		$rootcats = TroveCat::getAllRoots();
 		
 		foreach($rootcats as $rootcat) {
 			

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/TroveCat.class.php             |    9 +++++----
 src/plugins/admssw/include/admsswPlugin.class.php |    5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list