Changeset 3026 for trac

Timestamp:

08/22/05 11:00:57 (8 years ago)

Author:

hauma

Message:

• Incorporated suggestion from argh@…
• Fixed behaviour for external links.

File:

• trac/trunk/wiki-macros/redirect.py (modified) (1 diff)

trac/trunk/wiki-macros/redirect.py

@@ -20 +20 @@
 
     if args:
-        link = fmt._expand_module_link(args)
-        if link[0] != None:
-            out.write('<div class="system-message">')
-            out.write('<strong>Redirect: </strong>')
-            out.write('You are redirected to ')
-            out.write('<a href="' + link[0] + '">')
-            out.write(args)
-            out.write('</a>')
-            out.write('.')
-            if shouldRedirect:
-                out.write('Since redirection doesn\'t seem to work, please click ')
-                out.write('<a href="' + link[0] + '">')
-                out.write('here')
-                out.write('</a>')
-                out.write('.')
+        link, _, missing, _ = fmt._expand_module_link(args)
 
-            out.write('</div>')
+    if not link and not missing:
+        # This is an external non-trac link
+        link = args
 
-            if shouldRedirect:
-                out.write('<form id="redirect" method="POST" action="' + link[0] + '">')
-                out.write('<input type="hidden" name="redirectedfrom" value="' + curpage + '">')
-                out.write('</form>')
+    if link and not missing:
+        out.write('<div class="system-message">')
+        out.write('<strong>Redirect: </strong>')
+        out.write("This page is an alias for the real page located at ")
+        out.write('<a href="')
+        out.write(link)
+        out.write('">')
+        out.write(args)
+        out.write('</a>')
+        out.write('</div>')
 
-                out.write(NL)
-                out.write('<script language="JavaScript">' + NL)
-                out.write('document.forms["redirect"].submit();' + NL)
-                # out.write('document.location="' + link[0] + '?redirectedfrom=' + curpage + '";' + NL)
-                out.write('</script>' + NL)
-        else:
-            out.write('<div class="system-message">')
-            out.write('<strong>Redirection Error: </strong>')
-            out.write('Redirection target not found.')
-            out.write('</div>')
+        if shouldRedirect:
+            out.write('<form id="redirect" method="POST" action="' + link + '">')
+            out.write('<input type="hidden" name="redirectedfrom" value="' + curpage + '">')
+            out.write('</form>')
+
+            out.write(NL)
+            out.write('<script language="JavaScript">' + NL)
+            out.write('document.forms["redirect"].submit();' + NL)
+            out.write('</script>' + NL)
+
+    elif link and missing:
+        # Internal link to a non-existing page
+        out.write('<div class="system-message">')
+        out.write('<strong>Redirection Error: </strong>')
+        out.write('Redirection target not found: ')
+        out.write('<a href="')
+        out.write(link)
+        out.write('">')
+        out.write(args)
+        out.write('</a>')
+        out.write('</div>')
 
     else:
+        # No arguments given to the redirect macro
         out.write('<div class="system-message">')
         out.write('<strong>Redirection Error: </strong>')