Change openid urls

[geekigeeki.git] / geekigeeki.py
diff --git a/geekigeeki.py b/geekigeeki.py

index 7700585b975aefeda856cefd643d4276f66cb1d0..4a7ffea7e6250f80fe59a09e9053cf11f4128b4e 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -110,8 +110,9 @@ def emit_header(mtime=None, mime_type="text/html"):
          # Prevent caching when the wiki engine gets updated
          mtime = max(mtime, os.stat(__file__).st_mtime)
          print("Last-Modified: " + strftime("%a, %d %b %Y %H:%M:%S GMT", gmtime(mtime)))
-    if mime_type:
-        print("Content-type: " + mime_type + "; charset=utf-8")
+    else:
+        print("Cache-Control: must-revalidate, max-age=0")
+    print("Content-type: " + mime_type + "; charset=utf-8")
      print('')
  
  def send_guru(msg_text, msg_type):
@@ -474,8 +475,8 @@ class WikiFormatter:
              | (?P<hurl>  \[\[[^\]]+\]\])
  
              # Inline HTML
-            | (?P<html>             <(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])\b )
-            | (?P<htmle> ( /\s*> | </(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])> ) )
+            | (?P<html>             <(br|hr|small|div|span|form|iframe|input|textarea|a|img|h[1-5])\b )
+            | (?P<htmle> ( /\s*> | </(br|hr|small|div|span|form|iframe|input|textarea|a|img|h[1-5])> ) )
              | (?P<ent>   [<>&] )
  
              # Auto links (LEGACY)
@@ -493,8 +494,6 @@ class WikiFormatter:
              | (?P<tr>    ^\s*\|\|(=|)\s*)
              | (?P<tre>   \s*\|\|(=|)\s*$)
              | (?P<td>    \s*\|\|(=|)\s*)
-
-            # TODO: highlight search words (look at referrer)
            )""", re.VERBOSE)
          pre_re = re.compile("""(?:
                (?P<pre>\s*\}\}\})
@@ -569,14 +568,12 @@ class Page:
              return True
          return False
  
-    def get_raw_body(self, default=None):
+    def get_raw_body(self):
          try:
              return open(self._filename(), 'rb').read()
          except IOError, err:
              if err.errno == errno.ENOENT:
-                if default is None:
-                    default = '//[[%s?a=edit|Describe %s]]//' % (self.page_name, self.page_name)
-                return default
+                return ''
              if err.errno == errno.EISDIR:
                  return self.format_dir()
              raise err
@@ -646,7 +643,7 @@ class Page:
          if title_done: return
  
          # HEAD
-        emit_header(self._mtime())
+        emit_header(name and self._mtime())
          print('<!doctype html>\n<html lang="en">')
          print("<head><title>%s: %s</title>" % (config_get('site_name', "Unconfigured Wiki"), text))
          print(' <meta charset="UTF-8">')
@@ -721,13 +718,16 @@ class Page:
              link_inline(footer, kvargs = {
                  'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%Y-%m-%dT%I:%M:%S%p'), localtime(self._mtime()))
              })
-        print("</body></html>")
+        print('</body></html>')
  
      def send_naked(self, kvargs=None):
          if self.can_read():
-            WikiFormatter(self.get_raw_body(), kvargs).print_html()
+            body = self.get_raw_body()
+            if not body:
+                body = "//[[%s?a=edit|Describe %s]]//" % (self.page_name, self.page_name)
+            WikiFormatter(body, kvargs).print_html()
          else:
-            send_guru("Read access denied by ACLs", "notice")
+            send_guru('Read access denied by ACLs', 'notice')
  
      def send(self):
          #css foo.css
@@ -759,7 +759,7 @@ class Page:
              return
  
          if preview is None:
-            preview = self.get_raw_body(default='')
+            preview = self.get_raw_body()
  
          link_inline("sys/EditPage", kvargs = {
              'EDIT_BODY': cgi.escape(preview),