From f8526df99dedcf3d078eb905d237cfa47b59024f Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Fri, 20 Jun 2008 02:28:36 +0000
Subject: [PATCH] fixed webcam URLs fixed template syntax fixed mail text
 encoding

---
 fotokiste/fotokiste/controllers.py          | 9 ++++-----
 fotokiste/fotokiste/templates/ausloeser.kid | 2 +-
 fotokiste/fotokiste/templates/mailtext.kid  | 2 +-
 fotokiste/fotokiste/templates/senden.kid    | 2 +-
 fotokiste/fotokiste/templates/start.kid     | 4 ++--
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/fotokiste/fotokiste/controllers.py b/fotokiste/fotokiste/controllers.py
index aa9de02..96efef6 100644
--- a/fotokiste/fotokiste/controllers.py
+++ b/fotokiste/fotokiste/controllers.py
@@ -19,10 +19,8 @@ import re
 import datetime
 
 IMAGE_STORE = os.path.join(tempfile.gettempdir(), "fotokiste.jpg")
-VIDEO_URL = "http://krake:8081/?action=stream"
-# Netzwerk-Problem beim xen-Switch ... - erstmal nur ein Standardbild
-#SNAPSHOT_URL = "http://krake:8081/?action=snapshot"
-SNAPSHOT_URL = "http://localhost:8080/static/images/fotokiste-default.jpg"
+VIDEO_URL = "http://webcam.glasmensch.org/?action=stream"
+SNAPSHOT_URL = "http://webcam.glasmensch.org/?action=snapshot"
 ALLOWED_MAILADDRESS_CHARACTERS = "\w._%@-"
 ALLOWED_MAILTEXT_CHARACTERS = "\w@_\-\.\s\n\#\(\)\[\]\{\}\|\>\<\,\+/\'\"\?\!\:=%\$^&\*"
 MAIL_ADDRESS_REGEX = r"^[a-zA-Z0-9._%-]+@[a-zA-Z0-9._%-]+\.[a-zA-Z]{2,6}$"
@@ -94,7 +92,8 @@ def send_mail(address, text):
     #mail_gen = email.Generator.Generator(mail_flat)
     #mail_gen.flatten(body)
     mail = email.MIMEMultipart.MIMEMultipart()
-    mail_text = email.MIMEText.MIMEText(text + signature)
+    mail_text = email.MIMEText.MIMEText((unicode(text) +
+            unicode(signature, 'latin-1')).encode('utf-8'), _charset='utf-8')
     mail_pict = email.MIMEImage.MIMEImage(picture, "jpeg")
     mail_pict.add_header("Content-Disposition",
             'attachment; filename="%s"' % MAIL_ATTACHMENT_FILENAME)
diff --git a/fotokiste/fotokiste/templates/ausloeser.kid b/fotokiste/fotokiste/templates/ausloeser.kid
index 4e92b93..b0ed806 100644
--- a/fotokiste/fotokiste/templates/ausloeser.kid
+++ b/fotokiste/fotokiste/templates/ausloeser.kid
@@ -10,7 +10,7 @@
 
    
     <div id="live_pic"><img src="../static/images/fotokiste-default.png"
-        py:attr="src=${video_url}"/></div>
+        py:attrs="src=video_url"/></div>
 
 </body>
 </html>
diff --git a/fotokiste/fotokiste/templates/mailtext.kid b/fotokiste/fotokiste/templates/mailtext.kid
index a4c39da..3f7c69c 100644
--- a/fotokiste/fotokiste/templates/mailtext.kid
+++ b/fotokiste/fotokiste/templates/mailtext.kid
@@ -10,7 +10,7 @@
 <table> 
     <tr><td>
             <div id="mail_pic"><img src="../static/images/fotokiste-default.png"
-                py:attr="src=${tg.url('/get_current_shot')}"/></div>
+                py:attrs="src=tg.url('/get_current_shot')"/></div>
         <form action="${tg.url('/ausloeser')}" method="post">
             <input type="submit" name="senden" value="Zur&uuml;ck" />
         </form>
diff --git a/fotokiste/fotokiste/templates/senden.kid b/fotokiste/fotokiste/templates/senden.kid
index 7130b97..18811c2 100644
--- a/fotokiste/fotokiste/templates/senden.kid
+++ b/fotokiste/fotokiste/templates/senden.kid
@@ -9,7 +9,7 @@
 
    
     <div id="mail_pic"><img src="../static/images/fotokiste-default.png"
-        py:attr="src=${tg.url('/get_current_shot')}"/></div>
+        py:attrs="src=tg.url('/get_current_shot')"/></div>
 
     <div id="mail_info">
         <form action="${tg.url('/mailtext')}" method="post">
diff --git a/fotokiste/fotokiste/templates/start.kid b/fotokiste/fotokiste/templates/start.kid
index 60bd74c..ff2a7c7 100644
--- a/fotokiste/fotokiste/templates/start.kid
+++ b/fotokiste/fotokiste/templates/start.kid
@@ -11,7 +11,7 @@
       <tr>
           <td>
               <div id="live_pic"><img src="../static/images/fotokiste-default.png"
-                  py:attr="src=${video_url}"/></div>
+                  py:attrs="src=video_url"/></div>
           </td>
           <td valign="center">
               <!-- TODO: einfach nur ein weiterfuehrendes Icon - kein Formular -->
@@ -31,7 +31,7 @@
                   <img py:if="picture" py:strip="False"
                   title="${picture.title}" width="50" height="64"
                   src="../static/images/platzhalter.jpg"
-                  py:attr="${tg.url('/static/images/platzhalter.jpg')}"
+                  py:attrs="src=tg.url('/static/images/platzhalter.jpg')"
                   TODO="${picture.url}" />
               </td> 
           </tr>