From bbbd6b4a1122b4d8b8e03bde18d036419a4011ed Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Fri, 8 Dec 2017 04:25:20 +0000 Subject: [PATCH] etc/profile.d/ldap.sh --- etc/profile.d/ldap.sh | 2 +- www/dbq/dbq.php | 3 ++- www/dbq/etc/nginx.conf | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/etc/profile.d/ldap.sh b/etc/profile.d/ldap.sh index 318e1e29..b5f957d6 100644 --- a/etc/profile.d/ldap.sh +++ b/etc/profile.d/ldap.sh @@ -122,7 +122,7 @@ ldap_gup() { pass=${rec[0]} rec=("${rec[@]:1}") # shift for field in ${rec[@]}; do - echo $group $field $pass + echo $group $field:$pass done done diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php index e267fd94..666a1697 100644 --- a/www/dbq/dbq.php +++ b/www/dbq/dbq.php @@ -855,7 +855,8 @@ function dbq_logout(referrer='') { http.open("GET", url, true, '\\0', 'password'); http.onload = function() { if (!this.status || this.readyState != 4) return; - if (referrer) document.location = referrer; + if (referrer) { document.location = referrer; return; } + document.location = '/'; }; http.send(); diff --git a/www/dbq/etc/nginx.conf b/www/dbq/etc/nginx.conf index 8c79a80f..b17427d2 100644 --- a/www/dbq/etc/nginx.conf +++ b/www/dbq/etc/nginx.conf @@ -18,7 +18,7 @@ location ~ /\.ht { deny all; } #--------------------------------------------------------------# # All to index.php location @dbq { - try_files /index.php?$query_string =404; + try_files $uri /index.php?$query_string; } #--------------------------------------------------------------# -- 2.47.3