--- a/lib/templates.py	Sat Dec 27 20:23:39 2008 -0500
+++ b/lib/templates.py	Sun Dec 28 12:24:02 2008 -0500
@@ -3,17 +3,25 @@
 from os import environ
 
 def get_curl():
-	return urljoin( 'http://' + environ["HTTP_HOST"] + environ["REQUEST_URI"], 'add.py')
+	url = "http"
+	if environ["HTTPS"] == 'on':
+		url += "s"
+	url += "://" + environ["HTTP_HOST"]
+	uri = environ["REQUEST_URI"]
+	url += uri[:uri.find('?')]
+	return url
 
 class Template:
-	def __init__(self, template, prefs):
+	def __init__(self, template, prefs, status = "msg", status_msg = ""):
 		self.tproc = TemplateProcessor()
 		self.tmpl = TemplateManager().prepare(template)
-    		self.tproc.set("remote_user", prefs["fullname"])
-    		self.tproc.set("kw_size", prefs['keywords_box'])
-    		self.tproc.set("kw_sort", prefs['keywords_sort'])
-    		self.tproc.set("kw_reverse", prefs['keywords_reverse'])
-    		self.tproc.set("curl", get_curl())
+    		self.set("remote_user", prefs["fullname"])
+    		self.set("kw_size", prefs['keywords_box'])
+    		self.set("kw_sort", prefs['keywords_sort'])
+    		self.set("kw_reverse", prefs['keywords_reverse'])
+    		self.set("curl", get_curl())
+		self.set("status", status)
+		self.set("status_msg", status_msg)
 	def set(self, name, variable):
 		self.tproc.set(name, variable)
 	def process(self):