lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3743 from hregis/develop_origin

Browse Source 
Fix: Parse error: syntax error, unexpected '}'
This commit is contained in:
Laurent Destailleur 2015-10-17 10:37:03 +02:00
commit 5db82b8869
1 changed files with 166 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/user/card.php
View File

@ -152,7 +152,7 @@ if (empty($reshook)) {
} }
} }
// Action Add user // Action Add user
if ($action == 'add' && $canadduser) { if ($action == 'add' && $canadduser) {
$error = 0; $error = 0;
@ -167,8 +167,7 @@ if (empty($reshook)) {
$action = "create"; // Go back to create page $action = "create"; // Go back to create page
} }
if (!empty($conf->file->main_limit_users)) // If option to limit users is set if (!empty($conf->file->main_limit_users)) { // If option to limit users is set
{
$nb = $object->getNbOfUsers("active"); $nb = $object->getNbOfUsers("active");
if ($nb >= $conf->file->main_limit_users) { if ($nb >= $conf->file->main_limit_users) {
$error ++; $error ++;
@ -251,13 +250,12 @@ if (empty($reshook)) {
} }
$action = "create"; // Go back to create page $action = "create"; // Go back to create page
} }
} }
} }
// Action add usergroup // Action add usergroup
if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield) if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield)
{ {
if ($group) if ($group)
{ {
$editgroup = new UserGroup($db); $editgroup = new UserGroup($db);
@ -493,9 +491,8 @@ if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield)
setEventMessage($object->error, 'errors'); setEventMessage($object->error, 'errors');
} }
} }
}
// Change password with a new generated one // Change password with a new generated one
if ((($action == 'confirm_password' && $confirm == 'yes') if ((($action == 'confirm_password' && $confirm == 'yes')
|| ($action == 'confirm_passwordsend' && $confirm == 'yes')) && $caneditpassword || ($action == 'confirm_passwordsend' && $confirm == 'yes')) && $caneditpassword
) { ) {
@ -519,7 +516,7 @@ if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield)
} }
} }
// Action initialisation donnees depuis record LDAP // Action initialisation donnees depuis record LDAP
if ($action == 'adduserldap') { if ($action == 'adduserldap') {
$selecteduser = $_POST['users']; $selecteduser = $_POST['users'];