Index: lams_openid/web/index.jsp =================================================================== diff -u -r29546ca4b5a3f8426cd68af3e9022cf57f36037e -r577361b2f9a829e73591c4594a943fc5ef77b2ef --- lams_openid/web/index.jsp (.../index.jsp) (revision 29546ca4b5a3f8426cd68af3e9022cf57f36037e) +++ lams_openid/web/index.jsp (.../index.jsp) (revision 577361b2f9a829e73591c4594a943fc5ef77b2ef) @@ -1,10 +1,15 @@ <%@ include file="config.jsp" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-lams" prefix="lams" %> <%@ page import="org.verisign.joid.consumer.OpenIdFilter" %> <%@ page import="org.verisign.joid.util.UrlUtils" %> <%@ page import="org.lamsfoundation.lams.util.HashUtil" %> +<%@ page import="org.lamsfoundation.lams.util.Configuration" %> +<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> <%@ page import="java.util.Date" %> <%@ page import="java.net.URLEncoder" %> +<%= Configuration.getAsBoolean(ConfigurationKeys.LDAP_ENCRYPT_PASSWORD_FROM_BROWSER) %> <% boolean blacklisted = true; boolean error = false; @@ -59,6 +64,57 @@ + + + + + @@ -72,16 +128,10 @@
-
-

LAMS - Learning Activity Management System

-
-

Login Using OpenID

- - <% - if(request.getParameter("signin") != null && blacklisted == true && error == false){ - %> - -

+ <% + if(request.getParameter("signin") != null && blacklisted == true && error == false){ + %> +

Sorry, that OpenID provider is not part of the trusted list. Please try one of the following:
<% for(int i=0; i

- <% - } else if (error == true) { - %> -

- <%=errorMessage %> -

- <% - } - %> -

-
- Login here using your personal OpenID URL. For example: someone.yahoo.com -
-
- If you have not done this before, you will be taken to a registration page after you have been authenticated through your OpenID provider. -
-
- Don't have an OpenID? Go - get - one. + <% + } else if (error == true) { + %> +

+ <%=errorMessage %>

+ <% + } + %> +
+

LAMS - Learning Activity Management System

+ <%try{%> + /www/news.html + + <%}catch(Exception e){}%> +
+
+
+ +
+

Version <%= Configuration.get(ConfigurationKeys.VERSION) %>

- <% - if(loggedInAs != null && ret != null && ret.equals("yes")) - { - // We have authentication, construct login request - String loginRequestURL = LAMS_SERVER_URL + "/openid/LoginUsingOpenId?"; - //loginRequestURL += "&uid=" + URLEncoder.encode(loggedInAs, "UTF8"); - loginRequestURL += "&method=none"; - loginRequestURL += "&ts=" + timestamp; - loginRequestURL += "&sid=" + LAMS_SERVER_ID; - loginRequestURL += "&hash=" + hash; - loginRequestURL += "&courseid=" + URLEncoder.encode(courseID, "UTF8"); - loginRequestURL += "&courseName=" + URLEncoder.encode(courseName, "UTF8"); - loginRequestURL += "&country=" + GROUP_COUNTRY_ISO_CODE; - loginRequestURL += "&lang=" + GROUP_LANG_ISO_CODE; - loginRequestURL += "&requestSrc=¬ifyCloseURL=&lsid="; - response.sendRedirect(loginRequestURL); - } - %> +

Login

-
-
- - Login with your OpenID URL: -
-
+
+ +
+ + + +

Username: + +

+

Password: + +

+ + +
+ +
+
+

 Or login/sign-up using OpenID

+ +

+ Login here using your personal OpenID URL. For example: someone.myopenid.com. + If you have not done this before, you will be taken to a registration page after you have been authenticated through your OpenID provider. +
+
+ Don't have an OpenID? Go + get + one. +

+ + <% + if(loggedInAs != null && ret != null && ret.equals("yes")) + { + // We have authentication, construct login request + String loginRequestURL = LAMS_SERVER_URL + "/openid/LoginUsingOpenId?"; + //loginRequestURL += "&uid=" + URLEncoder.encode(loggedInAs, "UTF8"); + loginRequestURL += "&method=none"; + loginRequestURL += "&ts=" + timestamp; + loginRequestURL += "&sid=" + LAMS_SERVER_ID; + loginRequestURL += "&hash=" + hash; + loginRequestURL += "&courseid=" + URLEncoder.encode(courseID, "UTF8"); + loginRequestURL += "&courseName=" + URLEncoder.encode(courseName, "UTF8"); + loginRequestURL += "&country=" + GROUP_COUNTRY_ISO_CODE; + loginRequestURL += "&lang=" + GROUP_LANG_ISO_CODE; + loginRequestURL += "&requestSrc=¬ifyCloseURL=&lsid="; + response.sendRedirect(loginRequestURL); + } + %> + +
+
+ + Login with your OpenID URL: +
+
+
+ +

+ Click your OpenID provider below and/or enter your OpenID in the field above: +

+

+ + + + + + + + + +
+