Merge pull request #19 from nextcloud/bugfix/noid/allow-to-login

Do not block the login page

Author: nickvergessen

lib/AppInfo/Application.php

@@ -44,8 +44,13 @@ public function register() {
 		$this->createNotificationOnFirstLogin();
 
 		Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
-		Util::addStyle('terms_of_service', 'overlay');
-		Util::addScript('terms_of_service', 'terms_of_service_user');
+
+		$request = $this->getContainer()->getServer()->getRequest();
+		if (!\OC::$CLI && strpos($request->getPathInfo(), '/login') !== 0
+			&& substr($request->getScriptName(), 0 - \strlen('/index.php')) === '/index.php') {
+			Util::addStyle('terms_of_service', 'overlay');
+			Util::addScript('terms_of_service', 'terms_of_service_user');
+		}
 	}
 
 	public function addStorageWrapper() {