@@ -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 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 | } |
@@ -171,8 +171,8 @@ discard block |
||
| 171 | 171 | static::PW_ID => strval($uid), |
| 172 | 172 | static::PW_NAME => $userName, |
| 173 | 173 | static::PW_PASS => $this->mode->createHash($password), |
| 174 | - static::PW_GROUP => empty($user->getGroup()) ? $uid : $user->getGroup() , |
|
| 175 | - static::PW_CLASS => empty($user->getClass()) ? Interfaces\IWorkClasses::CLASS_USER : strval($user->getClass()) , |
|
| 174 | + static::PW_GROUP => empty($user->getGroup()) ? $uid : $user->getGroup(), |
|
| 175 | + static::PW_CLASS => empty($user->getClass()) ? Interfaces\IWorkClasses::CLASS_USER : strval($user->getClass()), |
|
| 176 | 176 | static::PW_STATUS => $this->transformFromIntToString($user->getStatus()), |
| 177 | 177 | static::PW_DISPLAY => empty($displayName) ? $userName : $displayName, |
| 178 | 178 | static::PW_DIR => $directory, |
@@ -221,12 +221,12 @@ discard block |
||
| 221 | 221 | foreach ($passwordLines as &$line) { |
| 222 | 222 | if ($line[static::PW_NAME] == $userName) { |
| 223 | 223 | // REFILL |
| 224 | - $line[static::PW_GROUP] = !empty($user->getGroup()) ? $user->getGroup() : $line[static::PW_GROUP] ; |
|
| 225 | - $line[static::PW_CLASS] = !empty($user->getClass()) ? strval($user->getClass()) : $line[static::PW_CLASS] ; |
|
| 224 | + $line[static::PW_GROUP] = !empty($user->getGroup()) ? $user->getGroup() : $line[static::PW_GROUP]; |
|
| 225 | + $line[static::PW_CLASS] = !empty($user->getClass()) ? strval($user->getClass()) : $line[static::PW_CLASS]; |
|
| 226 | 226 | $line[static::PW_STATUS] = $this->transformFromIntToString($user->getStatus()); |
| 227 | - $line[static::PW_DISPLAY] = !empty($displayName) ? $displayName : $line[static::PW_DISPLAY] ; |
|
| 228 | - $line[static::PW_DIR] = !empty($directory) ? $directory : $line[static::PW_DIR] ; |
|
| 229 | - $line[static::PW_EXTRA] = !empty($user->getExtra()) ? $this->extraParser->compact($user->getExtra()) : $line[static::PW_EXTRA] ; |
|
| 227 | + $line[static::PW_DISPLAY] = !empty($displayName) ? $displayName : $line[static::PW_DISPLAY]; |
|
| 228 | + $line[static::PW_DIR] = !empty($directory) ? $directory : $line[static::PW_DIR]; |
|
| 229 | + $line[static::PW_EXTRA] = !empty($user->getExtra()) ? $this->extraParser->compact($user->getExtra()) : $line[static::PW_EXTRA]; |
|
| 230 | 230 | } |
| 231 | 231 | } |
| 232 | 232 | |
@@ -188,8 +188,8 @@ |
||
| 188 | 188 | foreach ($groupLines as &$line) { |
| 189 | 189 | if ($line[static::GRP_ID] == $group->getGroupId()) { |
| 190 | 190 | // REFILL |
| 191 | - $line[static::GRP_NAME] = !empty($groupName) ? $groupName : $line[static::GRP_NAME] ; |
|
| 192 | - $line[static::GRP_DESC] = !empty($groupDesc) ? $groupDesc : $line[static::GRP_DESC] ; |
|
| 191 | + $line[static::GRP_NAME] = !empty($groupName) ? $groupName : $line[static::GRP_NAME]; |
|
| 192 | + $line[static::GRP_DESC] = !empty($groupDesc) ? $groupDesc : $line[static::GRP_DESC]; |
|
| 193 | 193 | $line[static::GRP_STATUS] = $group->getGroupStatus(); |
| 194 | 194 | $line[static::GRP_PARENTS] = $this->compactStr($group->getGroupParents()); |
| 195 | 195 | $line[static::GRP_EXTRA] = $this->extraParser->compact($group->getGroupExtra()); |
@@ -284,8 +284,8 @@ discard block |
||
| 284 | 284 | $newUserPass = [ |
| 285 | 285 | static::PW_NAME => $userName, |
| 286 | 286 | static::PW_ID => $uid, |
| 287 | - static::PW_GROUP => empty($user->getGroup()) ? $uid : $user->getGroup() , |
|
| 288 | - static::PW_CLASS => empty($user->getClass()) ? Interfaces\IWorkClasses::CLASS_USER : $user->getClass() , |
|
| 287 | + static::PW_GROUP => empty($user->getGroup()) ? $uid : $user->getGroup(), |
|
| 288 | + static::PW_CLASS => empty($user->getClass()) ? Interfaces\IWorkClasses::CLASS_USER : $user->getClass(), |
|
| 289 | 289 | static::PW_STATUS => $this->transformFromIntToString($user->getStatus()), |
| 290 | 290 | static::PW_DISPLAY => empty($displayName) ? $userName : $displayName, |
| 291 | 291 | static::PW_DIR => $directory, |
@@ -375,12 +375,12 @@ discard block |
||
| 375 | 375 | $oldName = $line[static::PW_NAME]; |
| 376 | 376 | $line[static::PW_NAME] = $userName; |
| 377 | 377 | } |
| 378 | - $line[static::PW_GROUP] = !empty($user->getGroup()) ? $user->getGroup() : $line[static::PW_GROUP] ; |
|
| 379 | - $line[static::PW_CLASS] = !empty($user->getClass()) ? $user->getClass() : $line[static::PW_CLASS] ; |
|
| 378 | + $line[static::PW_GROUP] = !empty($user->getGroup()) ? $user->getGroup() : $line[static::PW_GROUP]; |
|
| 379 | + $line[static::PW_CLASS] = !empty($user->getClass()) ? $user->getClass() : $line[static::PW_CLASS]; |
|
| 380 | 380 | $line[static::PW_STATUS] = $this->transformFromIntToString($user->getStatus()); |
| 381 | - $line[static::PW_DISPLAY] = !empty($displayName) ? $displayName : $line[static::PW_DISPLAY] ; |
|
| 382 | - $line[static::PW_DIR] = !empty($directory) ? $directory : $line[static::PW_DIR] ; |
|
| 383 | - $line[static::PW_EXTRA] = !empty($user->getExtra()) ? $this->extraParser->compact($user->getExtra()) : $line[static::PW_EXTRA] ; |
|
| 381 | + $line[static::PW_DISPLAY] = !empty($displayName) ? $displayName : $line[static::PW_DISPLAY]; |
|
| 382 | + $line[static::PW_DIR] = !empty($directory) ? $directory : $line[static::PW_DIR]; |
|
| 383 | + $line[static::PW_EXTRA] = !empty($user->getExtra()) ? $this->extraParser->compact($user->getExtra()) : $line[static::PW_EXTRA]; |
|
| 384 | 384 | } |
| 385 | 385 | } |
| 386 | 386 | |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | public function explosion(string $input): array |
| 26 | 26 | { |
| 27 | - return $this->expandName($input,IFile::SEPARATOR); |
|
| 27 | + return $this->expandName($input, IFile::SEPARATOR); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | /** |