Merge OpenOLAT 10.2 to OpenOLAT default branch with 7a18e96fa65147840dfa99617cd05ecefeee9a30

src/main/java/org/olat/core/gui/control/navigation/callback/AdminSecurityCallback.java

@@ -22,6 +22,7 @@ package org.olat.core.gui.control.navigation.callback;
 
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.control.navigation.SiteSecurityCallback;
+import org.olat.core.util.UserSession;
 
 /**
  * <h3>Description:</h3>
@@ -38,8 +39,10 @@ public class AdminSecurityCallback implements SiteSecurityCallback {
 	 */
 	@Override
 	public boolean isAllowedToLaunchSite(UserRequest ureq) {
-		return ureq != null && ureq.getUserSession() != null
-				&& ureq.getUserSession().getRoles() != null
-				&& ureq.getUserSession().getRoles().isOLATAdmin();
+		if(ureq == null) return false;
+		UserSession usess = ureq.getUserSession();
+		return usess != null
+				&& usess.getRoles() != null
+				&& usess.getRoles().isOLATAdmin();
 	}
 }

src/main/java/org/olat/instantMessaging/InstantMessagingUserToolExtension.java

@@ -27,7 +27,7 @@ import org.olat.admin.user.tools.UserToolExtension;
 import org.olat.core.CoreSpringFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.control.WindowControl;
-import org.olat.core.id.Roles;
+import org.olat.core.util.UserSession;
 
 /**
  * 
@@ -64,8 +64,9 @@ public class InstantMessagingUserToolExtension extends UserToolExtension {
 
 	@Override
 	public UserTool createUserTool(UserRequest ureq, WindowControl wControl, Locale locale) {
-		Roles roles = ureq.getUserSession().getRoles();		
-		if(roles.isGuestOnly() || roles.isInvitee()) {
+		if(ureq == null) return null;
+		UserSession usess = ureq.getUserSession();
+		if(usess == null || usess.getRoles() == null || usess.getRoles().isGuestOnly() || usess.getRoles().isInvitee()) {
 			return null;
 		}
 		return new InstantMessagingUserTool(wControl);

src/main/java/org/olat/login/LoginAuthprovidersController.java

@@ -141,10 +141,13 @@ public class LoginAuthprovidersController extends MainLayoutBasicController impl
 		contentBorn.contextPut("browserWarningOn", bwo ? Boolean.TRUE : Boolean.FALSE);
 		
 		// prepare login
-		if (provider == null)	provider = loginModule.getDefaultProviderName();
+		if (provider == null) {
+			provider = loginModule.getDefaultProviderName();
+		}
 		AuthenticationProvider authProvider = loginModule.getAuthenticationProvider(provider);
-		if (authProvider == null)
+		if (authProvider == null) {
 			throw new AssertException("Invalid authentication provider: " + provider);
+		}
 		
 		//clean-up controllers
 		if(authController != null) {

src/main/java/org/olat/login/LoginModule.java

@@ -190,7 +190,7 @@ public class LoginModule extends AbstractSpringModule {
 	public AuthenticationProvider getAuthenticationProvider(String provider) {
 		AuthenticationProvider authenticationProvider = null;
 		for(AuthenticationProvider authProvider:authenticationProviders) {
-			if(authProvider.getName().equals(provider)) {
+			if(authProvider.getName().equalsIgnoreCase(provider)) {
 				authenticationProvider = authProvider;
 			}
 		}