[evolvis-commits] r10684: Made some changes for system call, but let it commented as this doesn' t work↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 17:53:38 CET 2011
Author: mirabilos
Date: 2011-02-24 17:53:37 +0100 (Thu, 24 Feb 2011)
New Revision: 10684
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/common/include/Role.class
Log:
Made some changes for system call, but let it commented as this doesn't work
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/include/Role.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/include/Role.class 2011-02-24 16:53:36 UTC (rev 10683)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/include/Role.class 2011-02-24 16:53:37 UTC (rev 10684)
@@ -280,6 +280,7 @@
* @return boolean True on success or false on failure.
*/
function update($role_name,$data) {
+ global $SYS;
//
// Cannot update role_id=1
//
@@ -351,50 +352,54 @@
$update_usergroup=true;
//iterate all users with this role
- $res=db_query("SELECT user_id
+ $res=db_query("SELECT user_id
FROM user_group
WHERE role_id='".$this->getID()."'");
for ($z=0; $z<db_numrows($res); $z++) {
- /*
- //TODO - this code is not active in RBAC - settings must be created first
+
//TODO - Shell should be separate flag
// If user acquired admin access to CVS,
// one to be given normal shell on CVS machine,
// else - restricted.
//
+/*
+ //$cvs_flags=db_result($res,$z,'cvs_flags');
+ $cvs_flags=$this->getVal('scm',0);
if ($cvs_flags>1) {
- if (!sf_ldap_user_set_attribute($user_id,"debGforgeCvsShell","/bin/bash")) {
- $this->setError(sf_ldap_get_error_msg());
+ if (!$SYS->sysUserSetAttribute($user_id,"debGforgeCvsShell","/bin/bash")) {
+ $this->setError($SYS->getErrorMessage());
db_rollback();
return false;
}
} else {
- if (!sf_ldap_user_set_attribute($user_id,"debGforgeCvsShell","/bin/cvssh")) {
- $this->setError(sf_ldap_get_error_msg());
+ if (!$SYS->sysUserSetAttribute($user_id,"debGforgeCvsShell","/bin/cvssh")) {
+ $this->setError($SYS->getErrorMessage());
db_rollback();
return false;
}
- }*/
+ }
+*/
//
// If user acquired at least commit access to CVS,
// one to be promoted to CVS group, else, demoted.
//
+/*
if ($uvalue>0) {
- /* if (!sf_ldap_group_add_user($this->Group->getID(),db_result($res,$z,'user_id'),1)) {
- $this->setError(sf_ldap_get_error_msg());
+ if (!$SYS->sysGroupAddUser($this->Group->getID(),db_result($res,$z,'user_id'),1)) {
+ $this->setError($SYS->getErrorMessage());
db_rollback();
return false;
}
- */ } else {
- /* if (!sf_ldap_group_remove_user($this->Group->getID(),db_result($res,$z,'user_id'),1)) {
- $this->setError(sf_ldap_get_error_msg());
+ } else {
+ if (!$SYS->sysGroupRemoveUser($this->Group->getID(),db_result($res,$z,'user_id'),1)) {
+ $this->setError($SYS->getErrorMessage());
db_rollback();
return false;
}
- */ }
+ }
+*/
-
}
//
// If we decide to use a "RBAC Group" to define template roles
More information about the evolvis-commits
mailing list