KumiSystems/moodle-auth_jwt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of unused global valiables

Browse source
This commit is contained in:
Dmitrii Metelkin 2016-08-27 16:06:35 +10:00
parent 336cd2862b
commit cbfbb5cb8a
1 changed files with 13 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
classes/core_userkey_manager.php
View file

@ -36,34 +36,6 @@ class core_userkey_manager implements userkey_manager_interface {
*/ */
const DEFAULT_KEY_LIFE_TIME_IN_SECONDS = 60; const DEFAULT_KEY_LIFE_TIME_IN_SECONDS = 60;
/**
* Generated user key.
*
* @var string
*/
protected $userkey;
/**
* User id.
*
* @var int
*/
protected $userid;
/**
* Shows if we need restrict user key by IP.
*
* @var null | bool
*/
protected $iprestriction = null;
/**
* Time when user key will be expired in unix stamp format.
*
* @var null | string
*/
protected $validuntil = null;
/** /**
* Config object. * Config object.
* *
@ -78,12 +50,6 @@ class core_userkey_manager implements userkey_manager_interface {
*/ */
public function __construct(\stdClass $config) { public function __construct(\stdClass $config) {
$this->config = $config; $this->config = $config;
if (isset($config->keylifetime) && (int)$config->keylifetime > 0) {
$this->validuntil = time() + $config->keylifetime;
} else {
$this->validuntil = time() + self::DEFAULT_KEY_LIFE_TIME_IN_SECONDS;
}
} }
/** /**
@ -97,23 +63,29 @@ class core_userkey_manager implements userkey_manager_interface {
public function create_key($userid, $allowedips = null) { public function create_key($userid, $allowedips = null) {
$this->delete_keys($userid); $this->delete_keys($userid);
if (isset($this->config->keylifetime) && (int)$this->config->keylifetime > 0) {
$validuntil = time() + $this->config->keylifetime;
} else {
$validuntil = time() + self::DEFAULT_KEY_LIFE_TIME_IN_SECONDS;
}
$iprestriction = null;
if (isset($this->config->iprestriction) && !empty($this->config->iprestriction)) { if (isset($this->config->iprestriction) && !empty($this->config->iprestriction)) {
if ($allowedips) { if ($allowedips) {
$this->iprestriction = $allowedips; $iprestriction = $allowedips;
} else { } else {
$this->iprestriction = getremoteaddr($this->iprestriction); $iprestriction = getremoteaddr(null);
} }
} }
$this->userkey = create_user_key( return create_user_key(
self::CORE_USER_KEY_MANAGER_SCRIPT, self::CORE_USER_KEY_MANAGER_SCRIPT,
$userid, $userid,
$userid, $userid,
$this->iprestriction, $iprestriction,
$this->validuntil $validuntil
); );
return $this->userkey;
} }
/** /**