Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v
diff -u -r1.32.2.4 -r1.32.2.5
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	24 Jul 2007 00:46:17 -0000	1.32.2.4
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	30 Aug 2007 02:38:45 -0000	1.32.2.5
@@ -82,14 +82,12 @@
 	private static Logger log = Logger.getLogger(IndexAction.class);
 	private static IUserManagementService service;
 	private Integer state;
-	private String idpId = null;
 	
 	@SuppressWarnings("unchecked")
 	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
 		
 		String stateParam = WebUtil.readStrParam(request, "state");
 		state = (stateParam.equals("active")?OrganisationState.ACTIVE:OrganisationState.ARCHIVED);
-		idpId = request.getHeader("Shib-Identity-Provider");
 		
 		log.debug("User:"+request.getRemoteUser());
 		// only set header links if we are displaying 'active' organisations; i.e., on the index page
@@ -274,16 +272,15 @@
 		}
 		// get external lessons
 		List extLessons = service.findByProperty(LessonFederation.class, "org", org);
-		List<IndexLinkBean> lessonLinks = new ArrayList<IndexLinkBean>();
 		if (extLessons != null) {
 			for (int i=0; i<extLessons.size(); i++) {
+				List<IndexLinkBean> lessonLinks = new ArrayList<IndexLinkBean>();
 				LessonFederation lessonFed = (LessonFederation)extLessons.get(i);
 				String fedServerUrl = lessonFed.getFedServer().getUrl();
 				String url = null;
 				String shibUrlArgs = "(" + lessonFed.getExtLessonId() + ", "
 					+ "'" + getURLNoPath(fedServerUrl) + "', " 
-					+ "'" + Configuration.get(ConfigurationKeys.SHIB_IDP_SSO_HANDLER) + "', "
-					+ "'" + idpId + "')";
+					+ "'" + Configuration.get(ConfigurationKeys.SHIB_IDP_SSO_HANDLER) + "')";
 				
 				if (state.equals(OrganisationState.ACTIVE)) {
 					if(contains(roles,Role.ROLE_LEARNER)) {
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v
diff -u -r1.20.2.7 -r1.20.2.8
--- lams_central/web/includes/javascript/openUrls.js	24 Jul 2007 04:08:50 -0000	1.20.2.7
+++ lams_central/web/includes/javascript/openUrls.js	30 Aug 2007 02:38:45 -0000	1.20.2.8
@@ -116,11 +116,11 @@
 			}
 		}
 		
-		function openFedMonitorLesson( lessonId, fedServerHost, localIdPHandler, providerId )
+		function openFedMonitorLesson( lessonId, fedServerHost, localIdPHandler )
 		{
 			var target = fedServerHost+'/lams/shibmonitor?lessonID='+lessonId;
 			var shire = fedServerHost+'/Shibboleth.sso/SAML/POST';
-			var url = localIdPHandler+'?target='+target+'&shire='+shire+'&providerId='+providerId;
+			var url = localIdPHandler+'?target='+target+'&shire='+shire+'&providerId=';
 			
 			if(isMac)
 			{
@@ -192,11 +192,11 @@
 			}
 		}
 		
-		function openFedLearner( lessonId, fedServerHost, localIdPHandler, providerId )
+		function openFedLearner( lessonId, fedServerHost, localIdPHandler )
 		{
 			var target = fedServerHost+'/lams/shiblearner?lessonID='+lessonId;
 			var shire = fedServerHost+'/Shibboleth.sso/SAML/POST';
-			var url = localIdPHandler+'?target='+target+'&shire='+shire+'&providerId='+providerId;
+			var url = localIdPHandler+'?target='+target+'&shire='+shire;
 			
 			if(isMac)
 			{
@@ -237,11 +237,11 @@
 			}
 		}
 		
-		function openFedExportPortfolio( lessonId, fedServerHost, localIdPHandler, providerId )
+		function openFedExportPortfolio( lessonId, fedServerHost, localIdPHandler )
 		{
 			var target = fedServerHost+'/lams/shibexportportfolio?lessonID='+lessonId;
 			var shire = fedServerHost+'/Shibboleth.sso/SAML/POST';
-			var url = localIdPHandler+'?target='+target+'&shire='+shire+'&providerId='+providerId;
+			var url = localIdPHandler+'?target='+target+'&shire='+shire+'&providerId=';
 			
 			if(isMac)
 			{