From 9ff483759f522d9e32daa242dc8bb26d5f36d4b0 Mon Sep 17 00:00:00 2001 From: fabian Date: Thu, 15 Jul 2010 14:11:53 +0200 Subject: [PATCH] Abstract lib_user --- inc/lib_user.php | 223 ++++++++++------------------------------------- 1 file changed, 46 insertions(+), 177 deletions(-) diff --git a/inc/lib_user.php b/inc/lib_user.php index 5fbde168ace..902c999f0ac 100755 --- a/inc/lib_user.php +++ b/inc/lib_user.php @@ -41,28 +41,14 @@ if(!isset($_SESSION['group_id_cache'])){ */ class OC_USER { + public static $class_type; + /** * check if the login button is pressed and logg the user in * */ public static function loginLisener(){ - if(isset($_POST['loginbutton']) and isset($_POST['password']) and isset($_POST['login'])){ - if(OC_USER::login($_POST['login'],$_POST['password'])){ - echo 1; - OC_LOG::event($_SESSION['username'],1,''); - echo 2; - if((isset($CONFIG_HTTPFORCESSL) and $CONFIG_HTTPFORCESSL) or isset($_SERVER['HTTPS']) and $_SERVER['HTTPS'] == 'on') { - $url = "https://". $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']; - }else{ - $url = "http://". $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']; - } - header("Location: $url"); - die(); - }else{ - return('error'); - } - } - return(''); + return self::$class_type->loginLisener(); } @@ -71,19 +57,7 @@ class OC_USER { * */ public static function createUser($username,$password){ - global $CONFIG_DBTABLEPREFIX; - if(OC_USER::getuserid($username,true)!=0){ - return false; - }else{ - $usernameclean=strtolower($username); - $password=sha1($password); - $username=OC_DB::escape($username); - $usernameclean=OC_DB::escape($usernameclean); - $query="INSERT INTO `{$CONFIG_DBTABLEPREFIX}users` (`user_name` ,`user_name_clean` ,`user_password`) VALUES ('$username', '$usernameclean', '$password')"; - $result=OC_DB::query($query); - return ($result)?true:false; - } - + return self::$class_type->createUser($username,$password); } /** @@ -91,22 +65,7 @@ class OC_USER { * */ public static function login($username,$password){ - global $CONFIG_DBTABLEPREFIX; - - $password=sha1($password); - $usernameclean=strtolower($username); - $username=OC_DB::escape($username); - $usernameclean=OC_DB::escape($usernameclean); - $query = "SELECT user_id FROM {$CONFIG_DBTABLEPREFIX}users WHERE user_name_clean = '$usernameclean' AND user_password = '$password' LIMIT 1"; - $result=OC_DB::select($query); - if(isset($result[0]) && isset($result[0]['user_id'])){ - $_SESSION['user_id']=$result[0]['user_id']; - $_SESSION['username']=$username; - $_SESSION['username_clean']=$usernameclean; - return true; - }else{ - return false; - } + return self::$class_type->login($username,$password); } /** @@ -114,12 +73,7 @@ class OC_USER { * */ public static function logoutLisener(){ - if(isset($_GET['logoutbutton']) && isset($_SESSION['username'])){ - OC_LOG::event($_SESSION['username'],2,''); - $_SESSION['user_id']=false; - $_SESSION['username']=''; - $_SESSION['username_clean']=''; - } + return self::$class_type->logoutLisener(); } /** @@ -127,7 +81,7 @@ class OC_USER { * */ public static function isLoggedIn(){ - return (isset($_SESSION['user_id']) && $_SESSION['user_id'])?true:false; + return self::$class_type->isLoggedIn(); } /** @@ -135,15 +89,7 @@ class OC_USER { * */ public static function createGroup($groupname){ - global $CONFIG_DBTABLEPREFIX; - if(OC_USER::getgroupid($groupname,true)==0){ - $groupname=OC_DB::escape($groupname); - $query="INSERT INTO `{$CONFIG_DBTABLEPREFIX}groups` (`group_name`) VALUES ('$groupname')"; - $result=OC_DB::query($query); - return ($result)?true:false; - }else{ - return false; - } + return self::$class_type->createGroup($groupname); } /** @@ -151,23 +97,7 @@ class OC_USER { * */ public static function getUserId($username,$nocache=false){ - 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 - return $_SESSION['user_id_cache'][$usernameclean]; - } - $usernameclean=OC_DB::escape($usernameclean); - $query="SELECT user_id FROM {$CONFIG_DBTABLEPREFIX}users WHERE user_name_clean = '$usernameclean'"; - $result=OC_DB::select($query); - if(!is_array($result)){ - return 0; - } - if(isset($result[0]) && isset($result[0]['user_id'])){ - $_SESSION['user_id_cache'][$usernameclean]=$result[0]['user_id']; - return $result[0]['user_id']; - }else{ - return 0; - } + return self::$class_type->getUserId($username,$nocache=false); } /** @@ -175,22 +105,7 @@ class OC_USER { * */ public static function getGroupId($groupname,$nocache=false){ - 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]; - } - $groupname=OC_DB::escape($groupname); - $query="SELECT group_id FROM {$CONFIG_DBTABLEPREFIX}groups WHERE group_name = '$groupname'"; - $result=OC_DB::select($query); - if(!is_array($result)){ - return 0; - } - if(isset($result[0]) && isset($result[0]['group_id'])){ - $_SESSION['group_id_cache'][$groupname]=$result[0]['group_id']; - return $result[0]['group_id']; - }else{ - return 0; - } + return self::$class_type->getGroupId($groupname,$nocache=false); } /** @@ -198,18 +113,7 @@ class OC_USER { * */ public static function getGroupName($groupid,$nocache=false){ - global $CONFIG_DBTABLEPREFIX; - if($nocache and $name=array_search($groupid,$_SESSION['group_id_cache'])){//try to use cached value to save an sql query - return $name; - } - $groupid=(integer)$groupid; - $query="SELECT group_name FROM {$CONFIG_DBTABLEPREFIX}groups WHERE group_id = '$groupid' LIMIT 1"; - $result=OC_DB::select($query); - if(isset($result[0]) && isset($result[0]['group_name'])){ - return $result[0]['group_name']; - }else{ - return 0; - } + return self::$class_type->getGroupName($groupid,$nocache=false); } /** @@ -217,21 +121,7 @@ class OC_USER { * */ public static function inGroup($username,$groupname){ - global $CONFIG_DBTABLEPREFIX; - - $userid=OC_USER::getuserid($username); - $groupid=OC_USER::getgroupid($groupname); - if($groupid>0 and $userid>0){ - $query="SELECT * FROM {$CONFIG_DBTABLEPREFIX}user_group WHERE group_id = '$groupid' AND user_id = '$userid';"; - $result=OC_DB::select($query); - if(isset($result[0]) && isset($result[0]['user_group_id'])){ - return true; - }else{ - return false; - } - }else{ - return false; - } + return self::$class_type->inGroup($username,$groupname); } /** @@ -239,25 +129,7 @@ class OC_USER { * */ public static function addToGroup($username,$groupname){ - global $CONFIG_DBTABLEPREFIX; - - if(!OC_USER::ingroup($username,$groupname)){ - $userid=OC_USER::getuserid($username); - $groupid=OC_USER::getgroupid($groupname); - if($groupid!=0 and $userid!=0){ - $query="INSERT INTO `{$CONFIG_DBTABLEPREFIX}user_group` (`user_id` ,`group_id`) VALUES ('$userid', '$groupid');"; - $result=OC_DB::query($query); - if($result){ - return true; - }else{ - return false; - } - }else{ - return false; - } - }else{ - return true; - } + return self::$class_type->addToGroup($username,$groupname); } public static function generatePassword(){ @@ -269,19 +141,7 @@ class OC_USER { * */ public static function getUserGroups($username){ - global $CONFIG_DBTABLEPREFIX; - - $userid=OC_USER::getuserid($username); - $query = "SELECT group_id FROM {$CONFIG_DBTABLEPREFIX}user_group WHERE user_id = '$userid'"; - $result=OC_DB::select($query); - $groups=array(); - if(is_array($result)){ - foreach($result as $group){ - $groupid=$group['group_id']; - $groups[]=OC_USER::getgroupname($groupid); - } - } - return $groups; + return self::$class_type->getUserGroups($username); } /** @@ -289,17 +149,7 @@ class OC_USER { * */ public static function setPassword($username,$password){ - global $CONFIG_DBTABLEPREFIX; - - $password=sha1($password); - $userid=OC_USER::getuserid($username); - $query = "UPDATE {$CONFIG_DBTABLEPREFIX}users SET user_password = '$password' WHERE user_id ='$userid'"; - $result=OC_DB::query($query); - if($result){ - return true; - }else{ - return false; - } + return self::$class_type->setPassword($username,$password); } /** @@ -307,20 +157,39 @@ class OC_USER { * */ public static function checkPassword($username,$password){ - global $CONFIG_DBTABLEPREFIX; + return self::$class_type->checkPassword($username,$password); + } +} - $password=sha1($password); - $usernameclean=strtolower($username); - $username=OC_DB::escape($username); - $usernameclean=OC_DB::escape($usernameclean); - $query = "SELECT user_id FROM '{$CONFIG_DBTABLEPREFIX}users' WHERE user_name_clean = '$usernameclean' AND user_password = '$password' LIMIT 1"; - $result=OC_DB::select($query); - if(isset($result[0]) && isset($result[0]['user_id']) && $result[0]['user_id']>0){ - return true; - }else{ - return false; +/* + * Funtion to set the User Authentication Module + */ +function set_OC_USER() { + global $CONFIG_BACKEND; + if (isset($CONFIG_BACKEND)) { + switch($CONFIG_BACKEND) { + case "mysql": + require_once 'User/database.php'; + OC_USER::$class_type = new OC_USER_Database(); + break; + case "sqlite": + require_once 'User/database.php'; + OC_USER::$class_type = new OC_USER_Database(); + break; + case "ldap": + require_once 'User/ldap.php'; + OC_USER::$class_type = new OC_USER_LDAP(); + break; + default: + require_once 'User/database.php'; + OC_USER::$class_type = new OC_USER_Database(); + break; } } + else { + require_once 'User/database.php'; + OC_USER::$class_type = new OC_USER_Database(); + } } - +set_OC_USER(); ?> \ No newline at end of file -- 2.39.5