diff --git a/class-Sessionuser.php b/class-Sessionuser.php index 6e1bb52..855bf8d 100644 --- a/class-Sessionuser.php +++ b/class-Sessionuser.php @@ -1,147 +1,147 @@ . define_default('PASSWD_HASH_ALGO', 'sha1'); // Just something define_default('PASSWD_HASH_SALT', 'drGth'); // Just something define_default('PASSWD_HASH_PEPP', 'pw72kP'); // Just something define_default('COOKIE_HASH_ALGO', 'sha256'); // Just something define_default('COOKIE_HASH_SALT', 'daiads'); // Just something define_default('COOKIE_HASH_PEPP', '30s3-f'); // Just something /** * Sessionuser class */ class Sessionuser extends Queried { /** * Database table name */ const T = 'user'; /** * Database ID column name */ const ID = 'user_ID'; /** * Database UID column name */ const UID = 'user_uid'; /** * Database UID length in characters */ const UID_MAXLEN = 128; /** * Database activation status column name */ const IS_ACTIVE = 'user_active'; /** * Database password column name */ const PASSWORD = 'user_password'; /** * Database role column name */ const ROLE = 'user_role'; /** * Construct */ public function __construct() { $this->normalizeSessionuser(); } /** * Object normalization */ protected function normalizeSessionuser() { $this->integers( self::ID ) ->booleans( self::IS_ACTIVE ); } /** * Factory from login * - * @param $uid string + * @param $uid string * @param $password string - * @return query + * @return Query */ public static function factoryFromLogin( $uid, $password ) { return self::factoryFromUID( $uid ) - ->whereStr( self::PASSWORD, self::encryptPassword( $password ) ); + ->whereStr( self::PASSWORD, static::encryptPassword( $password ) ); } /** * Get Sessionuser ID * * @return int */ public function getSessionuserID() { return $this->get( self::ID ); } /** * Get Sessionuser UID * * @return string */ public function getSessionuserUID() { return $this->get( self::UID ); } /** * Get the role * * @return string */ public function getSessionuserRole() { return $this->get( self::ROLE ); } /** * Is active? * * @return bool */ public function isSessionuserActive() { return $this->get( self::IS_ACTIVE ); } /** * Generate the cookie token * * @return string */ public function generateSessionuserCookieToken() { return hash( COOKIE_HASH_ALGO, COOKIE_HASH_SALT . $this->get( self::PASSWORD ) . COOKIE_HASH_PEPP ); } /** * Encrypt the password * * @param $password string * @return string */ public static function encryptPassword( $password ) { $password = luser_input( $password, 500 ); return hash( PASSWD_HASH_ALGO, PASSWD_HASH_SALT . $password . PASSWD_HASH_PEPP ); } }