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

Fixed the create new remote user in Active Directory (enterprise). TICKET: #1845 

(cherry picked from commit 7b08fb47c1)
This commit is contained in:
mdtrooper 2015-02-26 12:27:18 +01:00
parent e0131eae65
commit 199ff770da
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/godmode/setup/setup_auth.php
View File

@ -85,6 +85,11 @@ for ($i = 2; $i <= 11; $i++) {
$table->rowclass[$i] = 'ldap'; $table->rowclass[$i] = 'ldap';
} }
// Set the rows autocreation for Active Directory
for ($i = 2; $i <= 5; $i++) {
$table->rowclass[$i] .= ' ' . 'ad';
}
// Hide fallback option when local authentication is selected. // Hide fallback option when local authentication is selected.
$table->rowstyle[1] = $config['auth'] == 'mysql' ? 'display: none;' : ''; $table->rowstyle[1] = $config['auth'] == 'mysql' ? 'display: none;' : '';
$table->rowclass[1] = 'remote'; $table->rowclass[1] = 'remote';

1
pandora_console/include/auth/mysql.php
View File

@ -234,6 +234,7 @@ function process_user_login_remote ($login, $pass, $api = false) {
// The user does not exist and can not be created // The user does not exist and can not be created
if ($config['autocreate_remote_users'] == 0 || is_user_blacklisted ($login)) { if ($config['autocreate_remote_users'] == 0 || is_user_blacklisted ($login)) {
$config["auth_error"] = "Ooops User not found in database or incorrect password"; $config["auth_error"] = "Ooops User not found in database or incorrect password";
return false; return false;
} }