From 0d41663ec30eacece1b32327926554a1216c9f08 Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Thu, 26 Oct 2006 12:28:50 +0000
Subject: [PATCH] fixed language selection bug added unittest to
 CryptoBoxPlugin

---
 pythonrewrite/bin/CryptoBoxPlugin.py          | 15 +++++++++++++++
 pythonrewrite/bin/WebInterfaceSites.py        | 13 ++++++++-----
 pythonrewrite/bin/unittests.CryptoBoxTools.py |  2 +-
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/pythonrewrite/bin/CryptoBoxPlugin.py b/pythonrewrite/bin/CryptoBoxPlugin.py
index 599439f..7f96c6b 100644
--- a/pythonrewrite/bin/CryptoBoxPlugin.py
+++ b/pythonrewrite/bin/CryptoBoxPlugin.py
@@ -118,3 +118,18 @@ class CryptoBoxPlugin:
 		except KeyError, TypeError:
 			return self.rank
 
+
+	def getTestClass(self):
+		import imp
+		pl_file = os.path.join(self.pluginDir, "unittests.py")
+		if os.access(pl_file, os.R_OK) and os.path.isfile(pl_file):
+			try:
+				return getattr(imp.load_source("unittests_%s" % self.getName(), pl_file), "unittests")
+			except AttributeError:
+				pass
+		try:
+			self.cbox.log.info("could not load unittests for plugin: %s" % self.getName())
+		except AttributeError:
+			pass
+		return None
+
diff --git a/pythonrewrite/bin/WebInterfaceSites.py b/pythonrewrite/bin/WebInterfaceSites.py
index 78fd975..97cd85f 100755
--- a/pythonrewrite/bin/WebInterfaceSites.py
+++ b/pythonrewrite/bin/WebInterfaceSites.py
@@ -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:
diff --git a/pythonrewrite/bin/unittests.CryptoBoxTools.py b/pythonrewrite/bin/unittests.CryptoBoxTools.py
index cb27257..10daf4e 100755
--- a/pythonrewrite/bin/unittests.CryptoBoxTools.py
+++ b/pythonrewrite/bin/unittests.CryptoBoxTools.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.4
 
 import unittest
 import CryptoBoxTools