|
|
|
@ -89,7 +89,7 @@ class WebInterfaceSites:
|
|
|
|
|
else:
|
|
|
|
|
self.cbox.log.info("unknown user: %s" % str(user))
|
|
|
|
|
## wrong credentials: return "access denied"
|
|
|
|
|
cherrypy.response.headers["WWW-Authenticate"] = '''Basic realm="Test-Arena"'''
|
|
|
|
|
cherrypy.response.headers["WWW-Authenticate"] = '''Basic realm="CryptoBox"'''
|
|
|
|
|
cherrypy.response.status = 401
|
|
|
|
|
return self.__render("access_denied")
|
|
|
|
|
return _inner_wrapper
|
|
|
|
@ -242,10 +242,13 @@ class WebInterfaceSites:
|
|
|
|
|
## no language specified: check browser language
|
|
|
|
|
if not guess:
|
|
|
|
|
guess = self.__getPreferredBrowserLanguage(availLangs)
|
|
|
|
|
if not guess or \
|
|
|
|
|
not guess in availLangs or \
|
|
|
|
|
re.search(u'\W', guess):
|
|
|
|
|
self.cbox.log.info("invalid language choosen: %s" % guess)
|
|
|
|
|
## no preferred language or invalid language?
|
|
|
|
|
if not guess \
|
|
|
|
|
or not guess in availLangs \
|
|
|
|
|
or re.search(u'\W', guess):
|
|
|
|
|
## warn only for invalid languages
|
|
|
|
|
if not guess is None:
|
|
|
|
|
self.cbox.log.info("invalid language choosen: %s" % guess)
|
|
|
|
|
guess = self.prefs["WebSettings"]["Language"]
|
|
|
|
|
## maybe the language is still not valid
|
|
|
|
|
if not guess in availLangs:
|
|
|
|
|