[evolvis-commits] r16361: Use RBAC API rather than accessing the user_group table
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Mar 1 01:11:07 CET 2011
Author: mirabilos
Date: 2011-03-01 01:11:07 +0100 (Tue, 01 Mar 2011)
New Revision: 16361
Modified:
trunk/gforge_base/evolvisforge-5.1/src/www/export/rss20_activity.php
trunk/gforge_base/evolvisforge-5.1/src/www/export/rss20_newreleases.php
trunk/gforge_base/evolvisforge-5.1/src/www/export/rss20_news.php
Log:
Use RBAC API rather than accessing the user_group table
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/export/rss20_activity.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/export/rss20_activity.php 2011-03-01 00:11:04 UTC (rev 16360)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/export/rss20_activity.php 2011-03-01 00:11:07 UTC (rev 16361)
@@ -42,12 +42,9 @@
$link = "?group_id=$group_id";
$description = " of ".$row['group_name'];
- $reswm = db_query_params ('SELECT users.user_name,users.realname FROM user_group,users WHERE group_id=$1 AND admin_flags=$2 AND users.user_id=user_group.user_id ORDER BY users.add_date',
- array($group_id,
- 'A'),
- 1);
- if ($rowwm = db_fetch_array($reswm)) {
- $webmaster = $rowwm['user_name']."@".forge_get_config('users_host')." (".$rowwm['realname'].")";
+ $admins = RBACEngine::getUsersByAllowedAction ('project_admin', $group_id) ;
+ if (count ($admins)) {
+ $webmaster = $admins[0]->getUnixName()."@".forge_get_config('users_host')." (".$admins[0]->getRealName().")";
} else {
$webmaster = forge_get_config('admin_email');
}
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/export/rss20_newreleases.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/export/rss20_newreleases.php 2011-03-01 00:11:04 UTC (rev 16360)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/export/rss20_newreleases.php 2011-03-01 00:11:07 UTC (rev 16361)
@@ -44,14 +44,13 @@
$title = ": ".$row['group_name']." - ";
$link = "/project/showfiles.php?group_id=$group_id";
$description = " of ".$row['group_name'];
- $reswm = db_query_params ('SELECT users.user_name,users.realname FROM user_group,users WHERE group_id=$1 AND admin_flags=$2 AND users.user_id=user_group.user_id ORDER BY users.add_date',
- array($group_id,
- 'A'));
- if ($rowwm = db_fetch_array($reswm)) {
- $webmaster = $rowwm['user_name']."@".forge_get_config('users_host')." (".$rowwm['realname'].")";
+ $admins = RBACEngine::getUsersByAllowedAction ('project_admin', $group_id) ;
+ if (count ($admins)) {
+ $webmaster = $admins[0]->getUnixName()."@".forge_get_config('users_host')." (".$admins[0]->getRealName().")";
} else {
- $webmaster = forge_get_config('admin_email');
+ $webmaster = forge_get_config('admin_email');
}
+
} else {
$title = "";
$link = "/new/";
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/export/rss20_news.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/export/rss20_news.php 2011-03-01 00:11:04 UTC (rev 16360)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/export/rss20_news.php 2011-03-01 00:11:07 UTC (rev 16361)
@@ -44,14 +44,11 @@
$link = "?group_id=$group_id";
$description = " of ".$row['group_name'];
- $reswm = db_query_params ('SELECT users.user_name,users.realname FROM user_group,users WHERE group_id=$1 AND admin_flags=$2 AND users.user_id=user_group.user_id ORDER BY users.add_date',
- array($group_id,
- 'A'),
- 1);
- if ($rowwm = db_fetch_array($reswm)) {
- $webmaster = $rowwm['user_name']."@".forge_get_config('users_host')." (".$rowwm['realname'].")";
+ $admins = RBACEngine::getUsersByAllowedAction ('project_admin', $group_id) ;
+ if (count ($admins)) {
+ $webmaster = $admins[0]->getUnixName()."@".forge_get_config('users_host')." (".$admins[0]->getRealName().")";
} else {
- $webmaster = forge_get_config('admin_email');
+ $webmaster = forge_get_config('admin_email');
}
} else {
$title = "";
More information about the evolvis-commits
mailing list