mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a cache-check in `OC_USER_Database::getGroupName()` and minor style changes 

* Added spaces here and there
  * Using camelCase for same variable
This commit is contained in:
Aldo "xoen" Giambelluca 2010-07-15 19:56:13 +02:00
parent 7b84bf5f0e
commit 64fd3f7aea
1 changed files with 183 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
inc/User/database.php
View File

@ -22,6 +22,7 @@
*/ */
/** /**
* Class for usermanagement in a SQL Database * Class for usermanagement in a SQL Database
* eg mysql, sqlite * eg mysql, sqlite
@ -33,22 +34,24 @@ class OC_USER_Database extends OC_USER {
* *
*/ */
public static function loginLisener() { public static function loginLisener() {
if(isset($_POST['loginbutton']) and isset($_POST['password']) and isset($_POST['login'])){ if ( isset($_POST['loginbutton']) AND isset($_POST['password']) AND isset($_POST['login']) ) {
if ( OC_USER::login($_POST['login'], $_POST['password']) ) { if ( OC_USER::login($_POST['login'], $_POST['password']) ) {
echo 1; echo 1;
OC_LOG::event($_SESSION['username'], 1, ''); OC_LOG::event($_SESSION['username'], 1, '');
echo 2; echo 2;
if((isset($CONFIG_HTTPFORCESSL) and $CONFIG_HTTPFORCESSL) or isset($_SERVER['HTTPS']) and $_SERVER['HTTPS'] == 'on') { if ( ( isset($CONFIG_HTTPFORCESSL) AND $CONFIG_HTTPFORCESSL )
$url = "https://". $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']; OR ( isset($_SERVER['HTTPS']) AND ( 'on' === $_SERVER['HTTPS'] ) ) ) {
$url = 'https://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
} else { } else {
$url = "http://". $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']; $url = 'http://'. $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
} }
header("Location: $url"); header('Location: $url');
die(); die();
} else { } else {
return('error'); return 'error';
} }
} }
return(''); return('');
} }
@ -59,7 +62,7 @@ class OC_USER_Database extends OC_USER {
*/ */
public static function createUser($username, $password) { public static function createUser($username, $password) {
global $CONFIG_DBTABLEPREFIX; global $CONFIG_DBTABLEPREFIX;
if(OC_USER::getuserid($username,true)!=0){ if ( 0 !== OC_USER::getUserId($username, true) ) {
return false; return false;
} else { } else {
$usernameclean = strtolower($username); $usernameclean = strtolower($username);
@ -68,9 +71,9 @@ class OC_USER_Database extends OC_USER {
$usernameclean = OC_DB::escape($usernameclean); $usernameclean = OC_DB::escape($usernameclean);
$query = "INSERT INTO `{$CONFIG_DBTABLEPREFIX}users` (`user_name` ,`user_name_clean` ,`user_password`) VALUES ('$username', '$usernameclean', '$password')"; $query = "INSERT INTO `{$CONFIG_DBTABLEPREFIX}users` (`user_name` ,`user_name_clean` ,`user_password`) VALUES ('$username', '$usernameclean', '$password')";
$result = OC_DB::query($query); $result = OC_DB::query($query);
return ($result) ? true : false; return ($result) ? true : false;
} }
} }
/** /**
@ -86,10 +89,11 @@ class OC_USER_Database extends OC_USER {
$usernameclean = OC_DB::escape($usernameclean); $usernameclean = OC_DB::escape($usernameclean);
$query = "SELECT user_id FROM {$CONFIG_DBTABLEPREFIX}users WHERE user_name_clean = '$usernameclean' AND user_password = '$password' LIMIT 1"; $query = "SELECT user_id FROM {$CONFIG_DBTABLEPREFIX}users WHERE user_name_clean = '$usernameclean' AND user_password = '$password' LIMIT 1";
$result = OC_DB::select($query); $result = OC_DB::select($query);
if(isset($result[0]) && isset($result[0]['user_id'])){ if ( isset($result[0]) AND isset($result[0]['user_id'])) {
$_SESSION['user_id'] = $result[0]['user_id']; $_SESSION['user_id'] = $result[0]['user_id'];
$_SESSION['username'] = $username; $_SESSION['username'] = $username;
$_SESSION['username_clean'] = $usernameclean; $_SESSION['username_clean'] = $usernameclean;
return true; return true;
} else { } else {
return false; return false;
@ -101,7 +105,7 @@ class OC_USER_Database extends OC_USER {
* *
*/ */
public static function logoutLisener() { public static function logoutLisener() {
if(isset($_GET['logoutbutton']) && isset($_SESSION['username'])){ if ( isset($_GET['logoutbutton']) AND isset($_SESSION['username']) ) {
OC_LOG::event($_SESSION['username'], 2, ''); OC_LOG::event($_SESSION['username'], 2, '');
$_SESSION['user_id'] = false; $_SESSION['user_id'] = false;
$_SESSION['username'] = ''; $_SESSION['username'] = '';
@ -114,7 +118,11 @@ class OC_USER_Database extends OC_USER {
* *
*/ */
public static function isLoggedIn() { public static function isLoggedIn() {
return (isset($_SESSION['user_id']) && $_SESSION['user_id'])?true:false; if ( isset($_SESSION['user_id']) AND $_SESSION['user_id'] ) {
return true;
} else {
return false;
}
} }
/** /**
@ -123,10 +131,11 @@ class OC_USER_Database extends OC_USER {
*/ */
public static function createGroup($groupname) { public static function createGroup($groupname) {
global $CONFIG_DBTABLEPREFIX; global $CONFIG_DBTABLEPREFIX;
if(OC_USER::getgroupid($groupname,true)==0){ if ( 0 === OC_USER::getGroupId($groupname, true) ) {
$groupname = OC_DB::escape($groupname); $groupname = OC_DB::escape($groupname);
$query = "INSERT INTO `{$CONFIG_DBTABLEPREFIX}groups` (`group_name`) VALUES ('$groupname')"; $query = "INSERT INTO `{$CONFIG_DBTABLEPREFIX}groups` (`group_name`) VALUES ('$groupname')";
$result = OC_DB::query($query); $result = OC_DB::query($query);
return ($result) ? true : false; return ($result) ? true : false;
} else { } else {
return false; return false;
@ -139,18 +148,20 @@ class OC_USER_Database extends OC_USER {
*/ */
public static function getUserId($username, $nocache=false) { public static function getUserId($username, $nocache=false) {
global $CONFIG_DBTABLEPREFIX; global $CONFIG_DBTABLEPREFIX;
$usernameclean=strtolower($username);
if(!$nocache and isset($_SESSION['user_id_cache'][$usernameclean])){//try to use cached value to save an sql query $usernameClean = strtolower($username);
return $_SESSION['user_id_cache'][$usernameclean]; //try to use cached value to save an sql query
if ( !$nocache AND isset($_SESSION['user_id_cache'][$usernameClean]) ) {
return $_SESSION['user_id_cache'][$usernameClean];
} }
$usernameclean=OC_DB::escape($usernameclean); $usernameClean = OC_DB::escape($usernameClean);
$query="SELECT user_id FROM {$CONFIG_DBTABLEPREFIX}users WHERE user_name_clean = '$usernameclean'"; $query = "SELECT user_id FROM {$CONFIG_DBTABLEPREFIX}users WHERE user_name_clean = '$usernameClean'";
$result = OC_DB::select($query); $result = OC_DB::select($query);
if ( !is_array($result) ) { if ( !is_array($result) ) {
return 0; return 0;
} }
if(isset($result[0]) && isset($result[0]['user_id'])){ if ( isset($result[0]) AND isset($result[0]['user_id']) ) {
$_SESSION['user_id_cache'][$usernameclean]=$result[0]['user_id']; $_SESSION['user_id_cache'][$usernameClean] = $result[0]['user_id'];
return $result[0]['user_id']; return $result[0]['user_id'];
} else { } else {
return 0; return 0;
@ -161,19 +172,21 @@ class OC_USER_Database extends OC_USER {
* get the id of a group * get the id of a group
* *
*/ */
public static function getGroupId($groupname,$nocache=false){ public static function getGroupId($groupName, $noCache=false) {
global $CONFIG_DBTABLEPREFIX; global $CONFIG_DBTABLEPREFIX;
if(!$nocache and isset($_SESSION['group_id_cache'][$groupname])){//try to use cached value to save an sql query
return $_SESSION['group_id_cache'][$groupname]; //try to use cached value to save an sql query
if ( !$noCache AND isset($_SESSION['group_id_cache'][$groupName]) ) {
return $_SESSION['group_id_cache'][$groupName];
} }
$groupname=OC_DB::escape($groupname); $groupName = OC_DB::escape($groupName);
$query="SELECT group_id FROM {$CONFIG_DBTABLEPREFIX}groups WHERE group_name = '$groupname'"; $query = "SELECT group_id FROM {$CONFIG_DBTABLEPREFIX}groups WHERE group_name = '$groupName'";
$result = OC_DB::select($query); $result = OC_DB::select($query);
if ( !is_array($result) ) { if ( !is_array($result) ) {
return 0; return 0;
} }
if(isset($result[0]) && isset($result[0]['group_id'])){ if ( isset($result[0]) AND isset($result[0]['group_id']) ) {
$_SESSION['group_id_cache'][$groupname]=$result[0]['group_id']; $_SESSION['group_id_cache'][$groupName] = $result[0]['group_id'];
return $result[0]['group_id']; return $result[0]['group_id'];
} else { } else {
return 0; return 0;
@ -184,15 +197,17 @@ class OC_USER_Database extends OC_USER {
* get the name of a group * get the name of a group
* *
*/ */
public static function getGroupName($groupid,$nocache=false){ public static function getGroupName($groupId, $noCache=false) {
global $CONFIG_DBTABLEPREFIX; global $CONFIG_DBTABLEPREFIX;
if($nocache and $name=array_search($groupid,$_SESSION['group_id_cache'])){//try to use cached value to save an sql query
//try to use cached value to save an sql query
if ( !$noCache AND ( $name = array_search($groupId,$_SESSION['group_id_cache']) ) ) {
return $name; return $name;
} }
$groupid=(integer)$groupid; $groupId = (integer)$groupId;
$query="SELECT group_name FROM {$CONFIG_DBTABLEPREFIX}groups WHERE group_id = '$groupid' LIMIT 1"; $query = "SELECT group_name FROM {$CONFIG_DBTABLEPREFIX}groups WHERE group_id = '$groupId' LIMIT 1";
$result = OC_DB::select($query); $result = OC_DB::select($query);
if(isset($result[0]) && isset($result[0]['group_name'])){ if ( isset($result[0]) AND isset($result[0]['group_name']) ) {
return $result[0]['group_name']; return $result[0]['group_name'];
} else { } else {
return 0; return 0;
@ -203,15 +218,15 @@ class OC_USER_Database extends OC_USER {
* check if a user belongs to a group * check if a user belongs to a group
* *
*/ */
public static function inGroup($username,$groupname){ public static function inGroup($username, $groupName) {
global $CONFIG_DBTABLEPREFIX; global $CONFIG_DBTABLEPREFIX;
$userid=OC_USER::getuserid($username); $userId = OC_USER::getUserId($username);
$groupid=OC_USER::getgroupid($groupname); $groupId = OC_USER::getGroupId($groupName);
if($groupid>0 and $userid>0){ if ( ( $groupId > 0 ) AND ( $userId > 0 ) ) {
$query="SELECT * FROM {$CONFIG_DBTABLEPREFIX}user_group WHERE group_id = '$groupid' AND user_id = '$userid';"; $query = "SELECT * FROM {$CONFIG_DBTABLEPREFIX}user_group WHERE group_id = '$groupId' AND user_id = '$userId';";
$result = OC_DB::select($query); $result = OC_DB::select($query);
if(isset($result[0]) && isset($result[0]['user_group_id'])){ if ( isset($result[0]) AND isset($result[0]['user_group_id']) ) {
return true; return true;
} else { } else {
return false; return false;
@ -225,14 +240,14 @@ class OC_USER_Database extends OC_USER {
* add a user to a group * add a user to a group
* *
*/ */
public static function addToGroup($username,$groupname){ public static function addToGroup($username, $groupName) {
global $CONFIG_DBTABLEPREFIX; global $CONFIG_DBTABLEPREFIX;
if(!OC_USER::ingroup($username,$groupname)){ if ( !OC_USER::inGroup($username, $groupName) ) {
$userid=OC_USER::getuserid($username); $userId = OC_USER::getuserid($username);
$groupid=OC_USER::getgroupid($groupname); $groupId = OC_USER::getgroupid($groupName);
if($groupid!=0 and $userid!=0){ if ( ( 0 != $groupId ) AND ( 0 != $userId ) ) {
$query="INSERT INTO `{$CONFIG_DBTABLEPREFIX}user_group` (`user_id` ,`group_id`) VALUES ('$userid', '$groupid');"; $query = "INSERT INTO `{$CONFIG_DBTABLEPREFIX}user_group` (`user_id` ,`group_id`) VALUES ('$userId', '$groupId');";
$result = OC_DB::query($query); $result = OC_DB::query($query);
if ( $result ) { if ( $result ) {
return true; return true;
@ -258,16 +273,17 @@ class OC_USER_Database extends OC_USER {
public static function getUserGroups($username) { public static function getUserGroups($username) {
global $CONFIG_DBTABLEPREFIX; global $CONFIG_DBTABLEPREFIX;
$userid=OC_USER::getuserid($username); $userId = OC_USER::getUserId($username);
$query = "SELECT group_id FROM {$CONFIG_DBTABLEPREFIX}user_group WHERE user_id = '$userid'"; $query = "SELECT group_id FROM {$CONFIG_DBTABLEPREFIX}user_group WHERE user_id = '$userId'";
$result = OC_DB::select($query); $result = OC_DB::select($query);
$groups = array(); $groups = array();
if ( is_array($result) ) { if ( is_array($result) ) {
foreach ( $result as $group ) { foreach ( $result as $group ) {
$groupid=$group['group_id']; $groupId = $group['group_id'];
$groups[]=OC_USER::getgroupname($groupid); $groups[] = OC_USER::getGroupName($groupId);
} }
} }
return $groups; return $groups;
} }
@ -279,8 +295,8 @@ class OC_USER_Database extends OC_USER {
global $CONFIG_DBTABLEPREFIX; global $CONFIG_DBTABLEPREFIX;
$password = sha1($password); $password = sha1($password);
$userid=OC_USER::getuserid($username); $userId = OC_USER::getUserId($username);
$query = "UPDATE {$CONFIG_DBTABLEPREFIX}users SET user_password = '$password' WHERE user_id ='$userid'"; $query = "UPDATE {$CONFIG_DBTABLEPREFIX}users SET user_password = '$password' WHERE user_id ='$userId'";
$result = OC_DB::query($query); $result = OC_DB::query($query);
if ( $result ) { if ( $result ) {
return true; return true;
@ -297,17 +313,16 @@ class OC_USER_Database extends OC_USER {
global $CONFIG_DBTABLEPREFIX; global $CONFIG_DBTABLEPREFIX;
$password = sha1($password); $password = sha1($password);
$usernameclean=strtolower($username); $usernameClean = strtolower($username);
$username = OC_DB::escape($username); $username = OC_DB::escape($username);
$usernameclean=OC_DB::escape($usernameclean); $usernameClean = OC_DB::escape($usernameClean);
$query = "SELECT user_id FROM '{$CONFIG_DBTABLEPREFIX}users' WHERE user_name_clean = '$usernameclean' AND user_password = '$password' LIMIT 1"; $query = "SELECT user_id FROM '{$CONFIG_DBTABLEPREFIX}users' WHERE user_name_clean = '$usernameClean' AND user_password = '$password' LIMIT 1";
$result = OC_DB::select($query); $result = OC_DB::select($query);
if(isset($result[0]) && isset($result[0]['user_id']) && $result[0]['user_id']>0){ if ( isset($result[0]) AND isset($result[0]['user_id']) AND ( $result[0]['user_id'] > 0 ) ) {
return true; return true;
} else { } else {
return false; return false;
} }
} }
}
?> }