Skip to content

active error_log #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaxiReglisse wants to merge 2 commits into
base: master
Choose a base branch
from
Open

active error_log #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f98ea70
active error_log
Jun 30, 2016
088f1b0
pb indentation
MaxiReglisse Jun 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backend/userbackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public function __construct(TokenService $tokenService, $config, $backend=null)

$this->autoCreateUser = false;
$autoCreateUser = $config->getValue('user_servervars2', 'auto_create_user','false');
error_log('servervars2 - backend/userbackend.php autoCreateUser ' . $autoCreateUser);
if ($autoCreateUser !== 'false') {
$this->autoCreateUser = true;
}
Expand Down
19 changes: 10 additions & 9 deletions service/proxyuserandgroupservice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public function createUser($uid) {


public function provisionUser($uid, $tokens) {
error_log('servervars2 - service/proxyuserandgroupservice.php provisionUser uid ' . $uid);
if ( $this->isAutoCreateUser() ) {
$justCreatedUser = $this->createUser($uid);
}
Expand Down Expand Up @@ -129,23 +130,23 @@ public function updateGroup($user, $groupsArray) {
$uid = $user->getUID();

if (empty($groupsArray) && !empty($defaultGroups)) {
$groupsArray = $defaultGroups;
}
$groupsArray = $defaultGroups;
}

$naming = $this->groupNamingService;
$naming = $this->groupNamingService;

$groupNames = $this->getGroupNames($groupsArray, $naming);
$groupNames = $this->getGroupNames($groupsArray, $naming);


$rawOldGroupIds = $this->groupManager->getUserGroupIds( $user );
$oldGroupNames = $this->getOldGroupNames($rawOldGroupIds, $naming);
$oldGroupNames = $this->getOldGroupNames($rawOldGroupIds, $naming);


$toAddGrps = $this->getGroupNamesToAdd($groupNames, $oldGroupNames);
$toRemGrps = $this->getGroupNamesToRemove($groupNames, $oldGroupNames);
$toAddGrps = $this->getGroupNamesToAdd($groupNames, $oldGroupNames);
$toRemGrps = $this->getGroupNamesToRemove($groupNames, $oldGroupNames);

$this->addToGroup($user, $toAddGrps);
$this->removeFromGroup($user, $toRemGrps);
$this->addToGroup($user, $toAddGrps);
$this->removeFromGroup($user, $toRemGrps);

}

Expand Down