From b5543a6c6274607e1b8d1b767feb4ecad61a7a26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Mon, 27 Feb 2017 20:54:12 +0000
Subject: [PATCH] bugfixes after first tests

---
 etc/authentication.php | 15 ++++++++++-----
 etc/makefile.am        |  2 ++
 html/index.php         |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/etc/authentication.php b/etc/authentication.php
index 04118c7..d42e0a1 100644
--- a/etc/authentication.php
+++ b/etc/authentication.php
@@ -1,22 +1,27 @@
 <?php
 $realm = "MY REALM HERE";
 $ldaphost = "my.ldap.host";
+$ldaptls = "yes";
 $ldapbase = "dc=my,dc=server,dc=com";
-if (!isset($_SERVER['PHP_AUTH_USER'])) {
+function basicAuth() {
     header('WWW-Authenticate: Basic realm="'.$REALM.'"');
     header('HTTP/1.0 401 Unauthorized');
     exit;
+}
+if (!isset($_SERVER['PHP_AUTH_USER'])) {
+    basicAuth();
 } else {
-    $tstusername = ereg_replace('/^[a-z]/', '-', $_SERVER['PHP_AUTH_USER']);
+    $tstusername = preg_replace('/[^a-z]/', '-', $_SERVER['PHP_AUTH_USER']);
     $password = $_SERVER['PHP_AUTH_PW'];
     $ldapconn = ldap_connect($ldaphost, 389) 
         or error_die("connection to LDAP host failed");
     ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3)
         or error_die("failed to set LDAP protocol version 3");
-    ldap_start_tls($ldapconn)
-        or error_die($ldapconn, "cannot start LDAP TLS");
+    if ($ldaptls!="no" && $ldaptls!=0 && $ldaptlS)
+        ldap_start_tls($ldapconn)
+            or error_die($ldapconn, "cannot start LDAP TLS");
     $ldapbind = @ldap_bind($ldapconn, 'uid='.$tstusername.','.$ldapbase, $password)
-        or error_die("login failed for $username", '403 Forbidden');
+        or basicAuth();
     $username = $tstuserbname;
 }
 ?>
\ No newline at end of file
diff --git a/etc/makefile.am b/etc/makefile.am
index 1f2c7cd..e77075c 100644
--- a/etc/makefile.am
+++ b/etc/makefile.am
@@ -11,3 +11,5 @@
 pkgsysconfdir = ${PKGSYSCONFDIR}
 
 dist_pkgsysconf_DATA = settings.php authentication.php
+
+MAINTAINERCLEANFILES = makefile.in
diff --git a/html/index.php b/html/index.php
index 353701e..f24b4a9 100644
--- a/html/index.php
+++ b/html/index.php
@@ -59,7 +59,7 @@
    }
    function checkPath($pathToCheck) {
      global $imagepath, $subpath;
-     $fullpath = $imagepath.'/'.$pathToCheck
+     $fullpath = $imagepath.'/'.$pathToCheck;
      if ($fullpath==realpath($fullpath) && is_dir($fullpath)) {
        $subpath=$pathToCheck;
        $imagepath = $fullpath;