Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b88967b authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'lowercase-admin-username' into 'master' 

Lowercase admin username before checking  against input

See merge request !51
parents 9997dcd0 12f7ab6b

patches/002-login-without-domain.patch

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ diff --git files/LoginController.php files/LoginController-new.php 
+		$user = mb_strtolower($user, 'UTF-8');

+		$domain = $this->config->getSystemValue("mail_domain");

+		$domain_suffix = "@$domain";

+		$admin_username = $_ENV["NEXTCLOUD_ADMIN_USER"];

+		$admin_username = mb_strtolower($_ENV["NEXTCLOUD_ADMIN_USER"], 'UTF-8');

+		if (stristr($user, $domain_suffix) === FALSE && strcmp($user, $admin_username) != 0) {

+			$user = $user . $domain_suffix;

+		}