diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Group/database.php | 13 | ||||
| -rw-r--r-- | lib/base.php | 22 | ||||
| -rw-r--r-- | lib/group.php | 16 |
3 files changed, 21 insertions, 30 deletions
diff --git a/lib/Group/database.php b/lib/Group/database.php index 8e7f1203cd2..e99f8486af7 100644 --- a/lib/Group/database.php +++ b/lib/Group/database.php @@ -72,9 +72,10 @@ class OC_GROUP_DATABASE extends OC_GROUP_BACKEND { * @param string $username Name of the user to check * @param string $groupName Name of the group */ - public static function inGroup($username,$groupName) { + public static function inGroup( $username, $groupName ){ $query = OC_DB::prepare( "SELECT * FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` = ?" ); $result = $query->execute( $groupName, $username ); +var_dump( $result ); return $result->numRows() > 0 ? true : false; } @@ -85,8 +86,8 @@ class OC_GROUP_DATABASE extends OC_GROUP_BACKEND { * @param string $username Name of the user to add to group * @param string $groupName Name of the group in which add the user */ - public static function addToGroup($username, $groupName) { - if( !OC_USER::inGroup( $username, $groupName )){ + public static function addToGroup( $username, $groupName ){ + if( !self::inGroup( $username, $groupName )){ $query = OC_DB::prepare( "INSERT INTO `*PREFIX*group_user` ( `uid`, `gid` ) VALUES( ?, ? )" ); $result = $query->execute( $username, $groupName ); } @@ -98,7 +99,7 @@ class OC_GROUP_DATABASE extends OC_GROUP_BACKEND { * @param string $username Name of the user to remove from group * @param string $groupName Name of the group from which remove the user */ - public static function removeFromGroup($username,$groupName){ + public static function removeFromGroup( $username, $groupName ){ $query = OC_DB::prepare( "DELETE FROM `*PREFIX*group_user` WHERE `uid` = ? AND `gid` = ?" ); $result = $query->execute( $username, $groupName ); } @@ -108,7 +109,7 @@ class OC_GROUP_DATABASE extends OC_GROUP_BACKEND { * * @param string $username Name of the user */ - public static function getUserGroups($username) { + public static function getUserGroups( $username ){ $query = OC_DB::prepare( "SELECT * FROM `*PREFIX*group_user` WHERE `uid` = ?" ); $result = $query->execute( $username ); @@ -124,7 +125,7 @@ class OC_GROUP_DATABASE extends OC_GROUP_BACKEND { * get a list of all groups * */ - public static function getGroups() { + public static function getGroups(){ $query = OC_DB::prepare( "SELECT * FROM `*PREFIX*groups`" ); $result = $query->execute(); diff --git a/lib/base.php b/lib/base.php index e29cf5292c2..f013cb8213d 100644 --- a/lib/base.php +++ b/lib/base.php @@ -98,7 +98,8 @@ OC_PLUGIN::loadPlugins( "" ); if(!isset($CONFIG_BACKEND)){ $CONFIG_BACKEND='database'; } -OC_USER::setBackend($CONFIG_BACKEND); +OC_USER::setBackend( $CONFIG_BACKEND ); +OC_GROUP::setBackend( $CONFIG_BACKEND ); // Set up file system unless forbidden if( !$RUNTIME_NOSETUPFS ){ @@ -149,7 +150,7 @@ class OC_UTIL { // If we are not forced to load a specific user we load the one that is logged in if( $user == "" && OC_USER::isLoggedIn()){ - $user = $_SESSION['username_clean']; + $user = $_SESSION['user_id']; } if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem @@ -384,22 +385,21 @@ class OC_DB { // Prepare options array $options = array( - 'portability' => MDB2_PORTABILITY_ALL, - 'log_line_break' => '<br>', - 'idxname_format' => '%s', - 'debug' => true, - 'quote_identifier' => true, - ); + 'portability' => MDB2_PORTABILITY_ALL, + 'log_line_break' => '<br>', + 'idxname_format' => '%s', + 'debug' => true, + 'quote_identifier' => true ); // Add the dsn according to the database type - if($CONFIG_DBTYPE=='sqlite'){ + if( $CONFIG_DBTYPE == 'sqlite' ){ // sqlite $dsn = array( 'phptype' => 'sqlite', 'database' => "$SERVERROOT/$CONFIG_DBNAME", 'mode' => '0644' ); } - elseif($CONFIG_DBTYPE=='mysql'){ + elseif( $CONFIG_DBTYPE == 'mysql' ){ // MySQL $dsn = array( 'phptype' => 'mysql', @@ -408,7 +408,7 @@ class OC_DB { 'hostspec' => $CONFIG_DBHOST, 'database' => $CONFIG_DBNAME ); } - elseif($CONFIG_DBTYPE=='pgsql'){ + elseif( $CONFIG_DBTYPE == 'pgsql' ){ // PostgreSQL $dsn = array( 'phptype' => 'pgsql', diff --git a/lib/group.php b/lib/group.php index 0701627e4ee..06c91bc2436 100644 --- a/lib/group.php +++ b/lib/group.php @@ -68,27 +68,17 @@ class OC_GROUP { case 'database': case 'mysql': case 'sqlite': - oc_require_once('User/database.php'); - self::$_backend = new OC_USER_DATABASE(); + oc_require_once('Group/database.php'); + self::$_backend = new OC_GROUP_DATABASE(); break; default: - $className = 'OC_USER_' . strToUpper($backend); + $className = 'OC_GROUP_' . strToUpper($backend); self::$_backend = new $className(); break; } } /** - * Get the name of a group - * - * @param string $groupId ID of the group - * @param boolean $noCache If false the cache is used to find the name of the group - */ - public static function getGroupName($groupId, $noCache=false) { - return self::$_backend->getGroupName($groupId, $noCache); - } - - /** * Check if a user belongs to a group * * @param string $username Name of the user to check |