@@ -201,8 +201,8 @@ |
||
201 | 201 | foreach ($groupLines as &$line) { |
202 | 202 | if ($line[static::GRP_ID] == $group->getGroupId()) { |
203 | 203 | // REFILL |
204 | - $line[static::GRP_NAME] = !empty($groupName) ? $groupName : $line[static::GRP_NAME] ; |
|
205 | - $line[static::GRP_DESC] = !empty($groupDesc) ? $groupDesc : $line[static::GRP_DESC] ; |
|
204 | + $line[static::GRP_NAME] = !empty($groupName) ? $groupName : $line[static::GRP_NAME]; |
|
205 | + $line[static::GRP_DESC] = !empty($groupDesc) ? $groupDesc : $line[static::GRP_DESC]; |
|
206 | 206 | $line[static::GRP_STATUS] = $group->getGroupStatus(); |
207 | 207 | $line[static::GRP_PARENTS] = $this->compactStr($group->getGroupParents()); |
208 | 208 | $line[static::GRP_EXTRA] = $this->extraParser->compact($group->getGroupExtra()); |
@@ -314,8 +314,8 @@ discard block |
||
314 | 314 | $newUserPass = [ |
315 | 315 | static::PW_NAME => $userName, |
316 | 316 | static::PW_ID => $uid, |
317 | - static::PW_GROUP => empty($user->getGroup()) ? $uid : $user->getGroup() , |
|
318 | - static::PW_CLASS => empty($user->getClass()) ? acc_interfaces\IProcessClasses::CLASS_USER : $user->getClass() , |
|
317 | + static::PW_GROUP => empty($user->getGroup()) ? $uid : $user->getGroup(), |
|
318 | + static::PW_CLASS => empty($user->getClass()) ? acc_interfaces\IProcessClasses::CLASS_USER : $user->getClass(), |
|
319 | 319 | static::PW_STATUS => $this->transformFromIntToString($user->getStatus()), |
320 | 320 | static::PW_DISPLAY => empty($displayName) ? $userName : $displayName, |
321 | 321 | static::PW_DIR => $directory, |
@@ -415,12 +415,12 @@ discard block |
||
415 | 415 | $oldName = $line[static::PW_NAME]; |
416 | 416 | $line[static::PW_NAME] = $userName; |
417 | 417 | } |
418 | - $line[static::PW_GROUP] = !empty($user->getGroup()) ? $user->getGroup() : $line[static::PW_GROUP] ; |
|
419 | - $line[static::PW_CLASS] = !empty($user->getClass()) ? $user->getClass() : $line[static::PW_CLASS] ; |
|
418 | + $line[static::PW_GROUP] = !empty($user->getGroup()) ? $user->getGroup() : $line[static::PW_GROUP]; |
|
419 | + $line[static::PW_CLASS] = !empty($user->getClass()) ? $user->getClass() : $line[static::PW_CLASS]; |
|
420 | 420 | $line[static::PW_STATUS] = $this->transformFromIntToString($user->getStatus()); |
421 | - $line[static::PW_DISPLAY] = !empty($displayName) ? $displayName : $line[static::PW_DISPLAY] ; |
|
422 | - $line[static::PW_DIR] = !empty($directory) ? $directory : $line[static::PW_DIR] ; |
|
423 | - $line[static::PW_EXTRA] = !empty($user->getExtra()) ? $this->extraParser->compact($user->getExtra()) : $line[static::PW_EXTRA] ; |
|
421 | + $line[static::PW_DISPLAY] = !empty($displayName) ? $displayName : $line[static::PW_DISPLAY]; |
|
422 | + $line[static::PW_DIR] = !empty($directory) ? $directory : $line[static::PW_DIR]; |
|
423 | + $line[static::PW_EXTRA] = !empty($user->getExtra()) ? $this->extraParser->compact($user->getExtra()) : $line[static::PW_EXTRA]; |
|
424 | 424 | } |
425 | 425 | } |
426 | 426 |
@@ -186,8 +186,8 @@ discard block |
||
186 | 186 | static::PW_ID => strval($uid), |
187 | 187 | static::PW_NAME => $userName, |
188 | 188 | static::PW_PASS => $this->mode->createHash($password), |
189 | - static::PW_GROUP => empty($user->getGroup()) ? $uid : $user->getGroup() , |
|
190 | - static::PW_CLASS => empty($user->getClass()) ? acc_interfaces\IProcessClasses::CLASS_USER : strval($user->getClass()) , |
|
189 | + static::PW_GROUP => empty($user->getGroup()) ? $uid : $user->getGroup(), |
|
190 | + static::PW_CLASS => empty($user->getClass()) ? acc_interfaces\IProcessClasses::CLASS_USER : strval($user->getClass()), |
|
191 | 191 | static::PW_STATUS => $this->transformFromIntToString($user->getStatus()), |
192 | 192 | static::PW_DISPLAY => empty($displayName) ? $userName : $displayName, |
193 | 193 | static::PW_DIR => $directory, |
@@ -246,12 +246,12 @@ discard block |
||
246 | 246 | foreach ($passwordLines as &$line) { |
247 | 247 | if ($line[static::PW_NAME] == $userName) { |
248 | 248 | // REFILL |
249 | - $line[static::PW_GROUP] = !empty($user->getGroup()) ? $user->getGroup() : $line[static::PW_GROUP] ; |
|
250 | - $line[static::PW_CLASS] = !empty($user->getClass()) ? strval($user->getClass()) : $line[static::PW_CLASS] ; |
|
249 | + $line[static::PW_GROUP] = !empty($user->getGroup()) ? $user->getGroup() : $line[static::PW_GROUP]; |
|
250 | + $line[static::PW_CLASS] = !empty($user->getClass()) ? strval($user->getClass()) : $line[static::PW_CLASS]; |
|
251 | 251 | $line[static::PW_STATUS] = $this->transformFromIntToString($user->getStatus()); |
252 | - $line[static::PW_DISPLAY] = !empty($displayName) ? $displayName : $line[static::PW_DISPLAY] ; |
|
253 | - $line[static::PW_DIR] = !empty($directory) ? $directory : $line[static::PW_DIR] ; |
|
254 | - $line[static::PW_EXTRA] = !empty($user->getExtra()) ? $this->extraParser->compact($user->getExtra()) : $line[static::PW_EXTRA] ; |
|
252 | + $line[static::PW_DISPLAY] = !empty($displayName) ? $displayName : $line[static::PW_DISPLAY]; |
|
253 | + $line[static::PW_DIR] = !empty($directory) ? $directory : $line[static::PW_DIR]; |
|
254 | + $line[static::PW_EXTRA] = !empty($user->getExtra()) ? $this->extraParser->compact($user->getExtra()) : $line[static::PW_EXTRA]; |
|
255 | 255 | } |
256 | 256 | } |
257 | 257 |
@@ -48,7 +48,7 @@ |
||
48 | 48 | return null; |
49 | 49 | } |
50 | 50 | |
51 | - if (!$this->passMode->checkHash(isset($params['password']) ? strval($params['password']): '', $record->pass)) { |
|
51 | + if (!$this->passMode->checkHash(isset($params['password']) ? strval($params['password']) : '', $record->pass)) { |
|
52 | 52 | return null; |
53 | 53 | } |
54 | 54 | return $record; |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | 'password' => strval($params['password'] ?: '') |
40 | 40 | ])) |
41 | 41 | ? $this->getDataOnly($userName) |
42 | - : null ; |
|
42 | + : null; |
|
43 | 43 | } catch (MapperException $ex) { |
44 | 44 | throw new AccountsException($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 AccountsException($ex->getMessage(), $ex->getCode(), $ex); |
57 | 57 | } |