tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-04-03 Vanessa Gil <vanessa.gil@artica.es> 

* include/functions_groups.php:
	  godmode/users/configure_user.php: Fixed bug creating users.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5886 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-04-03 14:07:42 +00:00
parent bd0ab88357
commit 12af21cb24
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-04-03 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_groups.php:
godmode/users/configure_user.php: Fixed bug creating users.
2012-04-03 Dario Rodriguez <dario.rodriguez@artica.es> 2012-04-03 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/menu.php, * godmode/menu.php,

1
pandora_console/godmode/users/configure_user.php
View File

@ -125,7 +125,6 @@ if ($create_user) {
$values['comments'] = (string) get_parameter ('comments'); $values['comments'] = (string) get_parameter ('comments');
$values['is_admin'] = (int) get_parameter ('is_admin', 0); $values['is_admin'] = (int) get_parameter ('is_admin', 0);
$values['language'] = get_parameter ('language', 'default'); $values['language'] = get_parameter ('language', 'default');
$values['created by'] = $config['id_user'];
if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) { if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
$values['id_skin'] = (int) get_parameter ('skin', 0); $values['id_skin'] = (int) get_parameter ('skin', 0);
} }

5
pandora_console/include/functions_groups.php
View File

@ -588,7 +588,10 @@ function groups_get_users ($id_group, $filter = false) {
$result = $resulta; $result = $resulta;
else else
$result = array_merge($resulta,$resultb); $result = array_merge($resulta,$resultb);
if ($result === false)
return array ();
//This removes stale users from the list. This can happen if switched to another auth scheme //This removes stale users from the list. This can happen if switched to another auth scheme
//(internal users still exist) or external auth has users removed/inactivated from the list (eg. LDAP) //(internal users still exist) or external auth has users removed/inactivated from the list (eg. LDAP)
$retval = array (); $retval = array ();