@@ -51,14 +51,14 @@ |
||
51 | 51 | { |
52 | 52 | $ln = strlen($input); |
53 | 53 | # pass is too long and salt too short |
54 | - $salt = (strlen($this->salt) < ($ln*5)) |
|
54 | + $salt = (strlen($this->salt) < ($ln * 5)) |
|
55 | 55 | ? str_repeat($this->salt, 5) |
56 | - : $this->salt ; |
|
56 | + : $this->salt; |
|
57 | 57 | return substr($salt, $ln, $ln) |
58 | - . substr($input,0, intval($ln/2)) |
|
59 | - . substr($salt,$ln*2, $ln) |
|
60 | - . substr($input, intval($ln/2)) |
|
61 | - . substr($salt,$ln*3, $ln); |
|
58 | + . substr($input, 0, intval($ln / 2)) |
|
59 | + . substr($salt, $ln * 2, $ln) |
|
60 | + . substr($input, intval($ln / 2)) |
|
61 | + . substr($salt, $ln * 3, $ln); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | /** |
@@ -33,7 +33,7 @@ |
||
33 | 33 | public function setExpirationNotice($class, int $nextChange): void |
34 | 34 | { |
35 | 35 | if ($class && is_object($class) && $class instanceof IExpire) { |
36 | - $class->setExpireNotice( $this->shallExpire($nextChange)); |
|
36 | + $class->setExpireNotice($this->shallExpire($nextChange)); |
|
37 | 37 | } |
38 | 38 | } |
39 | 39 |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | 'password' => $params['password'] ?: '' |
40 | 40 | ])) |
41 | 41 | ? $this->getDataOnly($userName) |
42 | - : null ; |
|
42 | + : null; |
|
43 | 43 | } catch (MapperException $ex) { |
44 | 44 | throw new AuthSourcesException($ex->getMessage(), $ex->getCode(), $ex); |
45 | 45 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $record = clone $this->record; |
52 | 52 | $record->name = $userName; |
53 | 53 | $record->load(); |
54 | - return (empty($record->getAuthId())) ? null : $record ; |
|
54 | + return (empty($record->getAuthId())) ? null : $record; |
|
55 | 55 | } catch (MapperException $ex) { |
56 | 56 | throw new AuthSourcesException($ex->getMessage(), $ex->getCode(), $ex); |
57 | 57 | } |
@@ -45,7 +45,7 @@ |
||
45 | 45 | if (empty($record)) { |
46 | 46 | return null; |
47 | 47 | } |
48 | - if (!$this->passMode->checkHash(isset($params['password']) ? strval($params['password']): '', $record->pass)) { |
|
48 | + if (!$this->passMode->checkHash(isset($params['password']) ? strval($params['password']) : '', $record->pass)) { |
|
49 | 49 | return null; |
50 | 50 | } |
51 | 51 | return $record; |
@@ -270,8 +270,8 @@ discard block |
||
270 | 270 | $newUserPass = [ |
271 | 271 | static::PW_NAME => $userName, |
272 | 272 | static::PW_ID => $uid, |
273 | - static::PW_GROUP => empty($user->getGroup()) ? $uid : $user->getGroup() , |
|
274 | - static::PW_CLASS => empty($user->getClass()) ? Interfaces\IWorkClasses::CLASS_USER : $user->getClass() , |
|
273 | + static::PW_GROUP => empty($user->getGroup()) ? $uid : $user->getGroup(), |
|
274 | + static::PW_CLASS => empty($user->getClass()) ? Interfaces\IWorkClasses::CLASS_USER : $user->getClass(), |
|
275 | 275 | static::PW_STATUS => $this->transformFromIntToString($user->getStatus()), |
276 | 276 | static::PW_DISPLAY => empty($displayName) ? $userName : $displayName, |
277 | 277 | static::PW_DIR => $directory, |
@@ -359,11 +359,11 @@ discard block |
||
359 | 359 | $oldName = $line[static::PW_NAME]; |
360 | 360 | $line[static::PW_NAME] = $userName; |
361 | 361 | } |
362 | - $line[static::PW_GROUP] = !empty($user->getGroup()) ? $user->getGroup() : $line[static::PW_GROUP] ; |
|
363 | - $line[static::PW_CLASS] = !empty($user->getClass()) ? $user->getClass() : $line[static::PW_CLASS] ; |
|
362 | + $line[static::PW_GROUP] = !empty($user->getGroup()) ? $user->getGroup() : $line[static::PW_GROUP]; |
|
363 | + $line[static::PW_CLASS] = !empty($user->getClass()) ? $user->getClass() : $line[static::PW_CLASS]; |
|
364 | 364 | $line[static::PW_STATUS] = $this->transformFromIntToString($user->getStatus()); |
365 | - $line[static::PW_DISPLAY] = !empty($displayName) ? $displayName : $line[static::PW_DISPLAY] ; |
|
366 | - $line[static::PW_DIR] = !empty($directory) ? $directory : $line[static::PW_DIR] ; |
|
365 | + $line[static::PW_DISPLAY] = !empty($displayName) ? $displayName : $line[static::PW_DISPLAY]; |
|
366 | + $line[static::PW_DIR] = !empty($directory) ? $directory : $line[static::PW_DIR]; |
|
367 | 367 | } |
368 | 368 | } |
369 | 369 |
@@ -173,8 +173,8 @@ |
||
173 | 173 | foreach ($groupLines as &$line) { |
174 | 174 | if ($line[static::GRP_ID] == $group->getGroupId()) { |
175 | 175 | // REFILL |
176 | - $line[static::GRP_NAME] = !empty($groupName) ? $groupName : $line[static::GRP_NAME] ; |
|
177 | - $line[static::GRP_DESC] = !empty($groupDesc) ? $groupDesc : $line[static::GRP_DESC] ; |
|
176 | + $line[static::GRP_NAME] = !empty($groupName) ? $groupName : $line[static::GRP_NAME]; |
|
177 | + $line[static::GRP_DESC] = !empty($groupDesc) ? $groupDesc : $line[static::GRP_DESC]; |
|
178 | 178 | $line[static::GRP_STATUS] = $group->getGroupStatus(); |
179 | 179 | $line[static::GRP_PARENTS] = $this->compactStr($group->getGroupParents()); |
180 | 180 | } |
@@ -156,8 +156,8 @@ discard block |
||
156 | 156 | static::PW_ID => strval($uid), |
157 | 157 | static::PW_NAME => $userName, |
158 | 158 | static::PW_PASS => $this->mode->createHash($password), |
159 | - static::PW_GROUP => empty($user->getGroup()) ? $uid : $user->getGroup() , |
|
160 | - static::PW_CLASS => empty($user->getClass()) ? Interfaces\IWorkClasses::CLASS_USER : strval($user->getClass()) , |
|
159 | + static::PW_GROUP => empty($user->getGroup()) ? $uid : $user->getGroup(), |
|
160 | + static::PW_CLASS => empty($user->getClass()) ? Interfaces\IWorkClasses::CLASS_USER : strval($user->getClass()), |
|
161 | 161 | static::PW_STATUS => $this->transformFromIntToString($user->getStatus()), |
162 | 162 | static::PW_DISPLAY => empty($displayName) ? $userName : $displayName, |
163 | 163 | static::PW_DIR => $directory, |
@@ -205,11 +205,11 @@ discard block |
||
205 | 205 | foreach ($passwordLines as &$line) { |
206 | 206 | if ($line[static::PW_NAME] == $userName) { |
207 | 207 | // REFILL |
208 | - $line[static::PW_GROUP] = !empty($user->getGroup()) ? $user->getGroup() : $line[static::PW_GROUP] ; |
|
209 | - $line[static::PW_CLASS] = !empty($user->getClass()) ? strval($user->getClass()) : $line[static::PW_CLASS] ; |
|
208 | + $line[static::PW_GROUP] = !empty($user->getGroup()) ? $user->getGroup() : $line[static::PW_GROUP]; |
|
209 | + $line[static::PW_CLASS] = !empty($user->getClass()) ? strval($user->getClass()) : $line[static::PW_CLASS]; |
|
210 | 210 | $line[static::PW_STATUS] = $this->transformFromIntToString($user->getStatus()); |
211 | - $line[static::PW_DISPLAY] = !empty($displayName) ? $displayName : $line[static::PW_DISPLAY] ; |
|
212 | - $line[static::PW_DIR] = !empty($directory) ? $directory : $line[static::PW_DIR] ; |
|
211 | + $line[static::PW_DISPLAY] = !empty($displayName) ? $displayName : $line[static::PW_DISPLAY]; |
|
212 | + $line[static::PW_DIR] = !empty($directory) ? $directory : $line[static::PW_DIR]; |
|
213 | 213 | } |
214 | 214 | } |
215 | 215 |