From f2589547283272cd6a25f2aab09512582dbc4a19 Mon Sep 17 00:00:00 2001
From: Martin Haase <martin.haase@daasi.de>
Date: Wed, 15 Feb 2012 17:06:13 +0000
Subject: [PATCH] cumulative minor mods
git-svn-id: https://textgridlab.org/svn/textgrid/trunk/middleware/tgauth@11983 7c539038-3410-0410-b1ec-0f2a7bf1c452
---
.../WebAuthN/TextGrid-WebAuth.php | 2 +-
.../WebAuthN/WebAuthN.php | 2 +-
.../WebAuthN/WebAuthN2.php | 2 +-
.../config_tgwebauth-dist.xml | 6 +++++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/info.textgrid.middleware.tgauth.webauth/WebAuthN/TextGrid-WebAuth.php b/info.textgrid.middleware.tgauth.webauth/WebAuthN/TextGrid-WebAuth.php
index e4dc933..3a74980 100644
--- a/info.textgrid.middleware.tgauth.webauth/WebAuthN/TextGrid-WebAuth.php
+++ b/info.textgrid.middleware.tgauth.webauth/WebAuthN/TextGrid-WebAuth.php
@@ -101,7 +101,7 @@ else if (isset ($_REQUEST["Sid"]) && strlen($_REQUEST["Sid"]) > 0 ) {
if (strlen ($missing) > 0) {
$util->printAuthFailure("Failure authenticating at TextGrid Community Account Server",
"Could not authenticate, no $missing provided. In case you forgot your password, please use the button below.",
- $_REQUEST["loginname"],
+ isset ($_REQUEST["loginname"]) ? $_REQUEST["loginname"] : "(null)",
null );
} else {
$util->printAuthFailure("Failure authenticating at TextGrid Community Account Server",
diff --git a/info.textgrid.middleware.tgauth.webauth/WebAuthN/WebAuthN.php b/info.textgrid.middleware.tgauth.webauth/WebAuthN/WebAuthN.php
index 499e4ea..d14ad1f 100644
--- a/info.textgrid.middleware.tgauth.webauth/WebAuthN/WebAuthN.php
+++ b/info.textgrid.middleware.tgauth.webauth/WebAuthN/WebAuthN.php
@@ -23,7 +23,7 @@ if ($authZinstance == null) {
</head>
<body>
-<h2>TextGridLab Login</h2>
+ <h2>TextGridLab Login <div style="color:red;">Wrong endpoint, basic Authentication possible yet!</div></h2>
<table border="1" rules="cols" cellpadding="4">
<tr>
<td align="center" valign="top">
diff --git a/info.textgrid.middleware.tgauth.webauth/WebAuthN/WebAuthN2.php b/info.textgrid.middleware.tgauth.webauth/WebAuthN/WebAuthN2.php
index f96aaeb..e508a15 100644
--- a/info.textgrid.middleware.tgauth.webauth/WebAuthN/WebAuthN2.php
+++ b/info.textgrid.middleware.tgauth.webauth/WebAuthN/WebAuthN2.php
@@ -72,7 +72,7 @@ function MachLeer () {
<td>If your school is not listed among the organizations on the
DFN-AAI page, or if you encounter problems during log-in, you are
welcome to <b>request a textgrid.de account</b> using the form
-on <a href="http://www.textgrid.de/beta/installation.html">http://www.textgrid.de/beta/installation.html</a>.
+on <a href="http://www.textgrid.de/1-0/registrierung.html">http://www.textgrid.de/beta/installation.html</a>.
</td>
</tr>
</table>
diff --git a/info.textgrid.middleware.tgauth.webauth/config_tgwebauth-dist.xml b/info.textgrid.middleware.tgauth.webauth/config_tgwebauth-dist.xml
index 3ee4900..0eafd5b 100644
--- a/info.textgrid.middleware.tgauth.webauth/config_tgwebauth-dist.xml
+++ b/info.textgrid.middleware.tgauth.webauth/config_tgwebauth-dist.xml
@@ -8,7 +8,7 @@
<key name="filter">(uid=${login})</key>
<key name="IDattribute">eduPersonPrincipalName</key>
<key name="name">TextGrid Community Authentication Server</key>
- </authn>
+ <key name="setAttributesDN">cn=Manager,dc=textgrid,dc=de</key> <key name="setAttributesPW">***secret</key> </authn>
<authz instance="rbac1">
<rbacbase>http://www.example.org/rbac1/</rbacbase>
<sessioncreator>
@@ -18,6 +18,10 @@
<setnamessecret>secret1</setnamessecret>
</authz>
<authz instance="rbac2">
+ <termsOfUse>
+ <version>1.0b</version>
+ <text>/var/Nutzungsordnung_en_200611.txt.html</text>
+ </termsOfUse>
<rbacbase>http://www.example.org/rbac2/</rbacbase>
<sessioncreator>
<user>user2</user>
--
GitLab