diff --git a/info.textgrid.middleware.tgauth.webauth/WebAuthN/TextGrid-WebAuth.php b/info.textgrid.middleware.tgauth.webauth/WebAuthN/TextGrid-WebAuth.php index e4dc93387565feea2cc2e3646d0b1e7e2ae0f0b1..3a74980c3711ee669ffa1d19f86e6500b087ed52 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 499e4eaecc59c7a8bf4b2dfaa95424456884986e..d14ad1fde0054a20571e7723d6f645f30631773b 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 f96aaebf5fc0acd822263c7ab99c5379db517d49..e508a1549cd07797af0bbc8361f5a7af5f112ad9 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 3ee49009a23a62a638e6e1ce905cf649997b7d7c..0eafd5b552e5cbd7a9e82c643992e3869d51e48b 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>