--- clcms.py	2006-01-30 11:50:23.000000000 +0100
+++ /home/jfader/DEVELOPMENT/websites/clcms/clcms-0.3/bin/clcms.py	2006-01-26 16:33:53.000000000 +0100
@@ -69,7 +69,7 @@
     # replace links and image refs
     #simple_link_p = re.compile('[^\"]http://.*')
     adv_link_p = re.compile('\[\[(.*)\]\[(.*)\]\]')
-    img_p = re.compile('(\{.{0,}?\})')
+    img_p = re.compile('\{\{(.*)\}\{(.*)\}\}')
     adv_m = adv_link_p.search(line)
     #simple_m = simple_link_p.search(line)
     if adv_m:
@@ -77,9 +77,9 @@
     #elif simple_m:
     #    line = line[:simple_m.start()] + "<a href=\"" + line[simple_m.start():simple_m.end()] + "\">" + line[simple_m.start():simple_m.end()] + "</a>"
 
-    img_m = img_p.findall(line)
+    img_m = img_p.search(line)
     if img_m:
-        line ="<img src=\"" + img_m[1][1:-1] +"\" width=\"" + img_m[0][2:-1] +"\" alt=\"" +  img_m[2][1:-1] +"\">"
+        line = line[:img_m.start()] + "<img src=\"" + escape_url(line[img_m.start(1):img_m.end(1)]) + "\" alt=\"" + line[img_m.start(2):img_m.end(2)] + "\" />" + line[img_m.end():]
     
     return line + "\n"