Fixes for KH 3.3 - to do with case file names

This commit is contained in:
Deon George
2012-11-27 12:26:56 +11:00
parent fc2ffd7bad
commit ea1346447f
88 changed files with 21 additions and 20 deletions

View File

@@ -0,0 +1,28 @@
<?php defined('SYSPATH') or die('No direct access allowed.');
/**
* This class overrides Kohana's Auth so that we can login to TSM
*
* @package PTA/Modifications
* @subpackage Auth
* @category Overrides
* @author Deon George
* @copyright (c) 2010 phpTSMadmin Development Team
* @license http://phptsmadmin.sf.net/license.html
*/
class Auth_ORM extends Kohana_Auth_ORM {
// Override Kohana Auth requirement to have a hash_key
public function hash($str) {
switch ($this->_config['hash_method']) {
case '' : return $str;
case 'md5': return md5($str);
default: return hash_hmac($this->_config['hash_method'], $str, $this->_config['hash_key']);
}
}
// Override Kohana logged_in() - if we can get the user, we are logged in.
public function logged_in($role = NULL, $all_required = TRUE) {
return NULL !== $this->get_user();
}
}
?>

View File

@@ -0,0 +1,39 @@
<?php defined('SYSPATH') or die('No direct access allowed.');
/**
* OSB Auth driver.
*
* @package PTA
* @subpackage Account
* @category Auth
* @author Deon George
* @copyright (c) phpTSMadmin Development Team
* @license http://phptsmadmin.sf.net/license.html
*/
class Auth_TSM extends Auth_ORM {
/**
* Logs a user in.
*
* @param string username
* @param string password
* @param boolean enable autologin
* @return boolean
*/
protected function _login($user, $password, $remember) {
if ( ! is_object($user))
{
$username = $user;
// Load the user
$user = ORM::factory('ADMIN')
->where('ADMIN_NAME','=',strtoupper($username))
->cached(0)
->find();
return $user->loaded();
}
return FALSE;
}
}
?>