webservices/sharing-gallery
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fixed qr code

Browse Source
This commit is contained in:
Marc Wäckerlin
2017-03-01 14:36:08 +00:00
parent 51eec30759
commit 3b8fba5d45
4 changed files with 459 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
etc/authentication.php
View File

@@ -23,12 +23,11 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
ldap_start_tls($ldapconn)
or error_die($ldapconn, "cannot start LDAP TLS");
if ($ldapbind = @ldap_bind($ldapconn, $checkuser.'='.$tstusername.','.$ldapbase, $password)) {
$search = ldap_search($ldapconn, $ldapbase, $checkuser.'='.$tstusername, array('mail\
', 'cn'));
$search = ldap_search($ldapconn, $ldapbase, $checkuser.'='.$tstusername, array('mail', 'cn'));
$data = ldap_get_entries($ldapconn, $search);
ldap_close($ldapconn);
$username = $tstusername;
$email = array('count' => 1, 0 => $username.'@'.$_SERVER[HTTP_HOST]);
$email = array('count' => 1, 0 => $username.'@'.$_SERVER['HTTP_HOST']);
$fullname = $username;
if ($data['count']==1) {
if (isset($data[0]['mail']))
@@ -36,6 +35,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
if (isset($data[0]['cn'][0]))
$fullname = $data[0]['cn'][0];
}
error_log(print_r($data, true));
} else {
error_log("user login failed: ".$checkuser.'='.$tstusername.','.$ldapbase);
error_log(ldap_error($ldapconn));
@@ -43,4 +43,4 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
basicAuth();
}
}
?>
?>