[Fusionforge-commits] r10750 - in trunk/src: cronjobs www/admin

Roland Mas lolando at libremir.placard.fr.eu.org
Tue Sep 28 13:40:19 CEST 2010


Author: lolando
Date: 2010-09-28 13:40:19 +0200 (Tue, 28 Sep 2010)
New Revision: 10750

Modified:
   trunk/src/cronjobs/site_stats.php
   trunk/src/www/admin/grouplist.php
Log:
USE_PFO_RBAC, not PFO_USE_RBAC

Modified: trunk/src/cronjobs/site_stats.php
===================================================================
--- trunk/src/cronjobs/site_stats.php	2010-09-28 11:21:03 UTC (rev 10749)
+++ trunk/src/cronjobs/site_stats.php	2010-09-28 11:40:19 UTC (rev 10750)
@@ -109,7 +109,7 @@
 			array ("$year$month",
 				$day));
 $err .= db_error();
-if (PFO_USE_RBAC) {
+if (USE_PFO_RBAC) {
 $rel = db_query_params ('INSERT INTO stats_project_developers (month,day,group_id,developers)
 SELECT  $1::int AS month, $2::int, pfo_role.home_group_id AS group_id, COUNT(DISTINCT(pfo_user_role.user_id)) AS developers FROM pfo_user_role, pfo_role WHERE pfo_user_role.role_id = pfo_role.role_id AND pfo_role.home_group_id IS NOT NULL GROUP BY pfo_role.home_group_id',
 			array ("$year$month",

Modified: trunk/src/www/admin/grouplist.php
===================================================================
--- trunk/src/www/admin/grouplist.php	2010-09-28 11:21:03 UTC (rev 10749)
+++ trunk/src/www/admin/grouplist.php	2010-09-28 11:40:19 UTC (rev 10750)
@@ -43,7 +43,7 @@
 
 if (isset($group_name_search)) {
 	echo "<p>"._('Projects that begin with'). " <strong>".$group_name_search."</strong></p>\n";
-	if (PFO_USE_RBAC) {
+	if (USE_PFO_RBAC) {
 		$res = db_query_params ('SELECT group_name,register_time,unix_group_name,groups.group_id,groups.is_public,status,license_name,COUNT(DISTINCT(pfo_user_role.user_id)) AS members
 FROM groups, pfo_user_role, pfo_role, licenses
 WHERE pfo_user_role.role_id=pfo_role.role_id
@@ -64,7 +64,7 @@
 				array (strtolower ("$group_name_search%"))) ;
 	}
 } else {
-	if (PFO_USE_RBAC) {
+	if (USE_PFO_RBAC) {
 		$qpa = db_construct_qpa (false, 'SELECT group_name,register_time,unix_group_name,groups.group_id,is_public,status,license_name,COUNT(DISTINCT(pfo_user_role.user_id)) AS members
 FROM groups, pfo_user_role, pfo_role, licenses
 WHERE pfo_user_role.role_id=pfo_role.role_id




More information about the Fusionforge-commits mailing list