@@ -155,8 +155,8 @@ |
||
| 155 | 155 | foreach ($groupLines as &$line) { |
| 156 | 156 | if ($line[IAccessGroups::GRP_ID] == $group->getGroupId()) { |
| 157 | 157 | // REFILL |
| 158 | - $line[IAccessGroups::GRP_NAME] = !empty($groupName) ? $groupName : $line[IAccessGroups::GRP_NAME] ; |
|
| 159 | - $line[IAccessGroups::GRP_DESC] = !empty($groupDesc) ? $groupDesc : $line[IAccessGroups::GRP_DESC] ; |
|
| 158 | + $line[IAccessGroups::GRP_NAME] = !empty($groupName) ? $groupName : $line[IAccessGroups::GRP_NAME]; |
|
| 159 | + $line[IAccessGroups::GRP_DESC] = !empty($groupDesc) ? $groupDesc : $line[IAccessGroups::GRP_DESC]; |
|
| 160 | 160 | $line[IAccessGroups::GRP_STATUS] = $group->getGroupStatus(); |
| 161 | 161 | $line[IAccessGroups::GRP_PARENTS] = $this->compactStr($group->getGroupParents()); |
| 162 | 162 | } |
@@ -155,8 +155,8 @@ discard block |
||
| 155 | 155 | static::PW_ID => strval($uid), |
| 156 | 156 | static::PW_NAME => $userName, |
| 157 | 157 | static::PW_PASS => $this->mode->hash($password), |
| 158 | - static::PW_GROUP => empty($user->getGroup()) ? $uid : $user->getGroup() , |
|
| 159 | - static::PW_CLASS => empty($user->getClass()) ? Interfaces\IAccessClasses::CLASS_USER : strval($user->getClass()) , |
|
| 158 | + static::PW_GROUP => empty($user->getGroup()) ? $uid : $user->getGroup(), |
|
| 159 | + static::PW_CLASS => empty($user->getClass()) ? Interfaces\IAccessClasses::CLASS_USER : strval($user->getClass()), |
|
| 160 | 160 | static::PW_STATUS => $this->transformFromIntToString($user->getStatus()), |
| 161 | 161 | static::PW_DISPLAY => empty($displayName) ? $userName : $displayName, |
| 162 | 162 | static::PW_DIR => $directory, |
@@ -208,11 +208,11 @@ discard block |
||
| 208 | 208 | foreach ($passwordLines as &$line) { |
| 209 | 209 | if ($line[static::PW_NAME] == $userName) { |
| 210 | 210 | // REFILL |
| 211 | - $line[static::PW_GROUP] = !empty($user->getGroup()) ? $user->getGroup() : $line[static::PW_GROUP] ; |
|
| 212 | - $line[static::PW_CLASS] = !empty($user->getClass()) ? strval($user->getClass()) : $line[static::PW_CLASS] ; |
|
| 211 | + $line[static::PW_GROUP] = !empty($user->getGroup()) ? $user->getGroup() : $line[static::PW_GROUP]; |
|
| 212 | + $line[static::PW_CLASS] = !empty($user->getClass()) ? strval($user->getClass()) : $line[static::PW_CLASS]; |
|
| 213 | 213 | $line[static::PW_STATUS] = $this->transformFromIntToString($user->getStatus()); |
| 214 | - $line[static::PW_DISPLAY] = !empty($displayName) ? $displayName : $line[static::PW_DISPLAY] ; |
|
| 215 | - $line[static::PW_DIR] = !empty($directory) ? $directory : $line[static::PW_DIR] ; |
|
| 214 | + $line[static::PW_DISPLAY] = !empty($displayName) ? $displayName : $line[static::PW_DISPLAY]; |
|
| 215 | + $line[static::PW_DIR] = !empty($directory) ? $directory : $line[static::PW_DIR]; |
|
| 216 | 216 | } |
| 217 | 217 | } |
| 218 | 218 | |