Overview
Comment: | You should be able to get the session object again, using a singleton |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA1: |
ed012f894ff7cd7d398679b28d1bc331 |
User & Date: | bohwaz on 2020-12-13 00:28:37 |
Other Links: | branch diff | manifest | tags |
Context
2020-12-13
| ||
00:30 | Refactor homepage controller check-in: 4f7a33917e user: bohwaz tags: dev | |
00:28 | You should be able to get the session object again, using a singleton check-in: ed012f894f user: bohwaz tags: dev | |
2020-12-12
| ||
17:21 | More progress on migration to files and web pages check-in: ba3e9fabe2 user: bohwaz tags: dev | |
Changes
Modified src/include/lib/Garradin/Membres/Session.php from [5a5c51b77f] to [ede47cc742].
︙ | ︙ | |||
22 23 24 25 26 27 28 29 30 31 32 33 34 35 | { // Personalisation de la config de UserSession protected $cookie_name = 'gdin'; protected $remember_me_cookie_name = 'gdinp'; protected $remember_me_expiry = '+3 months'; const MINIMUM_PASSWORD_LENGTH = 8; static public function checkPasswordValidity($password) { if (strlen($password) < self::MINIMUM_PASSWORD_LENGTH) { throw new UserException(sprintf('Le mot de passe doit faire au moins %d caractères.', self::MINIMUM_PASSWORD_LENGTH)); } | > > > > > > > > > > > > > > > > > > > > > > > > > > > | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | { // Personalisation de la config de UserSession protected $cookie_name = 'gdin'; protected $remember_me_cookie_name = 'gdinp'; protected $remember_me_expiry = '+3 months'; const MINIMUM_PASSWORD_LENGTH = 8; static protected $_instance = null; static public function getInstance() { return self::$_instance ?: self::$_instance = new self; } public function __clone() { throw new \LogicException('Cannot clone'); } public function __construct() { if (self::$_instance !== null) { throw new \LogicException('Wrong call, use getInstance'); } $url = parse_url(ADMIN_URL); parent::__construct(DB::getInstance(), [ 'cookie_domain' => $url['host'], 'cookie_path' => preg_replace('!/admin/$!', '/', $url['path']), 'cookie_secure' => (\Garradin\PREFER_HTTPS >= 2) ? true : false, ]); } static public function checkPasswordValidity($password) { if (strlen($password) < self::MINIMUM_PASSWORD_LENGTH) { throw new UserException(sprintf('Le mot de passe doit faire au moins %d caractères.', self::MINIMUM_PASSWORD_LENGTH)); } |
︙ | ︙ | |||
52 53 54 55 56 57 58 | if ($called !== null) { return $return['is_compromised']; } return parent::isPasswordCompromised($password); } | < < < < < < < < < < < < | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | if ($called !== null) { return $return['is_compromised']; } return parent::isPasswordCompromised($password); } protected function getUserForLogin($login) { $champ_id = Config::getInstance()->get('champ_identifiant'); // Ne renvoie un membre que si celui-ci a le droit de se connecter $query = 'SELECT m.id, m.%1$s AS login, m.passe AS password, m.secret_otp AS otp_secret FROM membres AS m |
︙ | ︙ |