Wiki2Go 1.16.1 → 1.17.0

data/lib/Wiki2Go/Install/templates/admin_pages/editfiles.txt

@@ -1,33 +1,78 @@
 <%
+   require 'Wiki2Go/WikiFormatter'
+   
+   @formatter = Wiki2Go::Formatter.new(@web,@config.storage,@config,true,@config.editable?(@web))
+
+   def show_directory(dirname,label)
+     "<a href=\"#{ @formatter.make_verb_url('admin','editfiles')}?dir=#{CGI::escape(dirname)}\">&gt;#{label}</a>"
+   end
 
-   def edit_file(filename)
-     "<a href=\"#{ File.join(@web.script_prefix,'admin','edit')}?file=#{CGI::escape(filename)}\">#{filename}</a>"
+   def up_directory(dirname)
+     "<a href=\"#{ @formatter.make_verb_url('admin','editfiles')}?dir=#{CGI::escape(dirname)}\">..</a>"
+   end
+   
+   def edit_file(filename,label)
+     "<a href=\"#{ @formatter.make_verb_url('admin','edit')}?file=#{CGI::escape(filename)}\">#{label}</a>"
    end
 %>
 
 <%
    all_files = []
    
-   Dir.chdir(@config.root_directory)
-   files = Dir.glob('**/*')
+   dir = @request.parameter('dir','')
+
+   Dir.chdir(File.join(@config.root_directory,dir))
    
-   all_files = files.find_all { |name| File.file?(File.join(@config.root_directory,name)) && name !~ /CVS/ }.sort
-   all_files = all_files.reject do |name|
+   if dir.length > 0 then
+     up = File.expand_path(File.join('..'))
+     up = up[@config.root_directory.length,up.length-@config.root_directory.length]
+   else
+     up = nil
+   end
+   
+   files = Dir.glob('*')
+   
+   all_files = files.reject do |name|
+      File.directory?(name) ||
       name =~ /\.png$/ || name =~ /\.jpg$/ || name =~ /\.gif$/ || name =~ /\.pdf$/ || name =~ /\.xls$/ 
    end
+   all_files = all_files.sort
+   
+   directories = files.reject do |name|
+      name =~ /CVS/ || !File.directory?(name)
+   end
  
+   directories = directories.sort
+   
    odd = false
 %>
 
 <h3>Site files</h3>
 
+  <h4><%= dir %></h4>
+  <table class="topiclist">
+<% 
+  if !up.nil? then
+%>
+    <tr class="odd"><td><%= up_directory(up) %></td></tr>
+<%
+  end    
+%>
+    <% directories.each do |directory|
+       style = (odd ? "odd" : "even")
+       odd = !odd
+    %>
+      <tr class="<%= style%>"><td><%= show_directory(File.join(dir,directory),directory) %></td></tr>
+    <% end %>
+  </table>
+
 <% if all_files.length > 0 then %>
   <table class="topiclist">
     <% all_files.each do |file|
        style = (odd ? "odd" : "even")
        odd = !odd
     %>
-      <tr class="<%= style%>"><td><%= edit_file(file) %></td></tr>
+      <tr class="<%= style%>"><td><%= edit_file(File.join(dir,file),file) %></td></tr>
     <% end %>
   </table>
 <% end %>

data/lib/Wiki2Go/Install/templates/admin_pages/greylist.txt

@@ -1,5 +1,8 @@
 <%
-require 'Wiki2Go/SpamFilter'
+  require 'Wiki2Go/SpamFilter'
+  require 'Wiki2Go/WikiFormatter'
+   
+  formatter = Wiki2Go::Formatter.new(@web,@config.storage,@config,true,@config.editable?(@web))
 
 spamfilter = Wiki2Go::SpamFilter.new(@config)
 
@@ -36,14 +39,14 @@ supects = spamfilter.greylist_suspects
 <td><%= name%></td>
 <td><a href="<%= clean_url %>" target="_blank"><%= clean_url %></a></td>
 <td>
-<form  action="<%= File.join(@web.script_prefix,'admin','greylist')%>" method="GET">
+<form  action="<%= formatter.make_verb_url('admin','greylist')%>" method="GET">
 <input type="submit" name="accept" value="Accept">
 <input type="hidden" name="author" value="<%= name %>">
 <input type="hidden" name="url" value="<%= clean_url %>">
 </form>
 </td>
 <td>
-<form  action="<%= File.join(@web.script_prefix,'admin','greylist')%>" method="GET">
+<form  action="<%= formatter.make_verb_url('admin','greylist')%>" method="GET">
 <input type="hidden" name="author" value="<%= name %>">
 <input type="hidden" name="url" value="<%= clean_url %>">
 <input type="submit" name="blacklist" value="Blacklist">

data/lib/Wiki2Go/Install/templates/admin_pages/passwords.txt

@@ -1,4 +1,7 @@
 <%
+   require 'Wiki2Go/WikiFormatter'
+   
+   formatter = Wiki2Go::Formatter.new(@web,@config.storage,@config,true,@config.editable?(@web))
 
 passwords = File.join(@config.root_directory,'config','passwords')
 exists = File.exists?(passwords)
@@ -50,7 +53,7 @@ end
 %>
 <tr class="<%= style%>"><td><%= name%></td><td><%= pwd %></td>
 <td>
-<form  action="<%= File.join(@web.script_prefix,'admin','passwords')%>" method="GET">
+<form  action="<%= formatter.make_verb_url('admin','passwords')%>" method="GET">
 <input type="submit" name="remove" value="Delete">
 <input type="hidden" name="user" value="<%= name %>">
 </form>
@@ -58,7 +61,7 @@ end
 </tr>
 <% end %>
 </table>
-<form action="<%= File.join(@web.script_prefix,'admin','passwords')%>" method="GET">
+<form action="<%= formatter.make_verb_url('admin','passwords')%>" method="GET">
 <table>
 <tr><td>Name</td><td><input name="user" value="<%= user %>"></td></tr>
 <tr><td>Password</td><td><input name="password" value="<%= user_pwd %>"></td></tr>

data/lib/Wiki2Go/Install/templates/admin_pages/regenerate.txt

@@ -1,5 +1,8 @@
 <%
   require 'Wiki2Go/Wiki2Go'
+  require 'Wiki2Go/WikiFormatter'
+   
+  formatter = Wiki2Go::Formatter.new(@web,@config.storage,@config,true,@config.editable?(@web))
 
   output = ''
   subwiki = @request.params['wiki']
@@ -20,7 +23,7 @@
 %>
 <ul>
 <% subwikis.each do |subwiki| %>
-<li><a href="<%= File.join(@web.script_prefix,'admin','regenerate') %>?wiki=<%= subwiki %>">Generate static HTML for '<%= (subwiki.empty? ? '&lt;whole site&gt;' : subwiki) %>'</a>
+<li><a href="<%= formatter.make_verb_url('admin','regenerate') %>?wiki=<%= subwiki %>">Generate static HTML for '<%= (subwiki.empty? ? '&lt;whole site&gt;' : subwiki) %>'</a>
 <% end %>
 </ul>
 <hr>

data/lib/Wiki2Go/Install/templates/admin_pages/removespam.txt

@@ -1,4 +1,7 @@
 <%
+   require 'Wiki2Go/WikiFormatter'
+   
+   formatter = Wiki2Go::Formatter.new(@web,@config.storage,@config,true,@config.editable?(@web))
 
 username = ''
 bad_user = @request.params['bad_user']
@@ -11,7 +14,7 @@ end
 <% if username.length > 0 then %>
 Remove spam added by <%= username %>
 <% end %>
-<form action="<%= File.join(@web.script_prefix,'admin','removespam')%>" method="GET">
+<form action="<%= formatter.make_verb_url('admin','removespam')%>" method="GET">
 <table>
 <tr><td>Name</td><td><input name="bad_user" value="<%= username%>"></td></tr>
 <tr><td colspan=2><input type="submit" name="Erase" value="Erase"></td></tr>

data/lib/Wiki2Go/Install/templates/admin_pages/show_log.txt

@@ -1,4 +1,8 @@
 <%
+   require 'Wiki2Go/WikiFormatter'
+   
+   formatter = Wiki2Go::Formatter.new(@web,@config.storage,@config,true,@config.editable?(@web))
+
    output = ''
    
    doit = @request.parameter('show',nil)
@@ -12,7 +16,7 @@
 %>
 
 <h3>View log</h3>
-<form action="<%= File.join(@web.script_prefix,'admin','show_log')%>" method="get">
+<form action="<%= formatter.make_verb_url('admin','show_log')%>" method="get">
 <button type="submit" name="show" value="show">
 Show logfile
 </button>

data/lib/Wiki2Go/Install/templates/admin_pages/update_blacklist.txt

@@ -1,6 +1,9 @@
 <%
   require 'Wiki2Go/SpamFilter'
   require 'cgi'
+  require 'Wiki2Go/WikiFormatter'
+   
+  formatter = Wiki2Go::Formatter.new(@web,@config.storage,@config,true,@config.editable?(@web))
   
   output = ''
   doit = @request.parameter('update',nil)
@@ -11,7 +14,7 @@
   end
 %>
 <h3>Download the blacklist from http://blacklist.chongqed.org/index.html</h3>
-<form action="<%= File.join(@web.script_prefix,'admin','update_blacklist')%>" method="get">
+<form action="<%= formatter.make_verb_url('admin','update_blacklist')%>" method="get">
 <input type="submit" name="update" value="Download">
 </form>
 <%= CGI::escapeHTML(output).gsub(/\n/,'<br>') %>

data/lib/Wiki2Go/Install/templates/admin_pages/update_conflicts.txt

@@ -1,7 +1,10 @@
 <%
+   require 'Wiki2Go/WikiFormatter'
+   
+   formatter = Wiki2Go::Formatter.new(@web,@config.storage,@config,true,@config.editable?(@web))
 
    def edit_file(filename)
-     "<a href=\"#{ File.join(@web.script_prefix,'admin','edit')}?file=#{CGI::escape(filename)}\">#{filename}</a>"
+     "<a href=\"#{ formatter.make_verb_url('admin','edit')}?file=#{CGI::escape(filename)}\">#{filename}</a>"
    end
    
    def contains_conflict_marker(name)

data/lib/Wiki2Go/Install/templates/admin_pages/update_site.txt

@@ -1,4 +1,8 @@
 <%
+   require 'Wiki2Go/WikiFormatter'
+   
+   formatter = Wiki2Go::Formatter.new(@web,@config.storage,@config,true,@config.editable?(@web))
+
    output = ''
    
    doit = @request.parameter('update',nil)
@@ -18,7 +22,7 @@
 %>
 
 <h3>Update Site</h3>
-<form action="<%= File.join(@web.script_prefix,'admin','update_site')%>" method="get">
+<form action="<%= formatter.make_verb_url('admin','update_site')%>" method="get">
   <button type="submit" name="update" value="update">
     Update the site from repository
   </button>

data/lib/Wiki2Go/Install/templates/full_footer.htm

@@ -23,12 +23,12 @@
   </TR>
   <TR>
     <td>Changed on <%= current.page.lastmodified.strftime("%d/%m/%Y") %> by <%= current.page.alias%>
-      <a href="<%= current.format.resource_url('rss.xml')%>"><img src="html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
+      <a href="<%= current.format.resource_url('rss.xml')%>"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
     </td>
     <TD align="right">
       Contact the site administrator: <%= current.format.encodeMailTo(current.config.site_admin) %>
       <a target="_blank" href="http://validator.w3.org/check?uri=<%= current.format.absolute_url %>">
-      <img border="0" src="html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
+      <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
     </TD>
   </TR>
 </TABLE>

data/lib/Wiki2Go/Install/templates/simple_footer.htm

@@ -8,7 +8,7 @@
     </TD>
   </TR>
   <TR>
-    <td><a href="<%= current.format.resource_url('rss.xml')%>"><img src="html/rssLogo.png" width="36" height="14" border="0" alt="Keep informed"></a></td>
+    <td><a href="<%= current.format.resource_url('rss.xml')%>"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep informed"></a></td>
     <TD align="right">
       Contact the site administrator: <%= current.format.encodeMailTo(current.config.site_admin) %>
     </TD>

data/lib/Wiki2Go/LineFormatter.rb

@@ -41,16 +41,37 @@ module Wiki2Go
 
     def formatting_done
       emit_bullets
-      @pre_line
+      result =@pre_line 
+      @pre_line = ''
+      result
+    end
+
+    # Return the path to the script verb, with the right extension and parameters
+    # * verb = name of the verb (view, edit,...)
+    # * parameters = further parameters: web.name, web.current_page, ...
+    def make_verb_url(verb,*parameters)
+      make_url(@web.script_prefix,verb + @web.script_extension,*parameters)
     end
 
+    # Return the path to the given resource. Nil and empty parameters are ignored
+    # The generated url is relative to the root of the site
+    def make_url(*parameters)
+      result = @web.subsite.empty? ? '' : ('/' + @web.subsite)
+      parameters.each do |name|
+        if !name.nil? and !name.empty? then
+          result += '/' 
+          result += name
+        end
+      end
+      result.squeeze('/')
+    end
 
     def absolute_url
-      return @web.base_url + view_page_url(@web.name,@web.current_page)
+      absolute_url_of_topic(@web.current_page)
     end
 
     def absolute_url_of_topic(topic)
-      return @web.base_url + view_page_url(@web.name,topic)
+      return @web.base_url.chop + view_page_url(@web.name,topic)
     end
 
     def edit_link(subwiki,page,name)
@@ -63,7 +84,7 @@ module Wiki2Go
 
     def edit_this_link(subwiki,page,name)
       if @editable then
-        return "<a href=\"#{join(@web.script_prefix,"edit"+@web.script_extension,subwiki,page)}\">#{name}</a>"
+        return "<a href=\"#{make_verb_url('edit',subwiki,page)}\">#{name}</a>"
       else
         return "" 
       end
@@ -71,22 +92,22 @@ module Wiki2Go
 
     def save_this_link(subwiki,page)
       if @editable then
-        return join(@web.script_prefix,"save"+@web.script_extension,subwiki,page) 
+        return make_verb_url('save',subwiki,page) 
       else
         return page 
       end
     end
 
     def verb_url(verb)
-      return join(@web.script_prefix,verb+@web.script_extension,@web.name,@web.current_page)
+      return make_verb_url(verb,@web.name,@web.current_page)
     end
 
     def removespam_url(user)
-      return join(@web.script_prefix,'removespam'+@web.script_extension,@web.name,'') + '?user=' + user
+      return make_verb_url('removespam',@web.name,'') + '?user=' + user
     end
 
     def version_url(page)
-      return join(@web.script_prefix,'versions'+@web.script_extension,@web.name,page)
+      return make_verb_url('versions',@web.name,page)
     end
 
     def save_url
@@ -102,14 +123,14 @@ module Wiki2Go
     end
 
     def search_url
-      return join(@web.script_prefix,'search'+@web.script_extension,@web.name)
+      return make_verb_url('search',@web.name)
     end
 
     def changes_url
       if @generate_html then 
-        return join(@web.name,'recent_changes.html') 
+        return make_url(@web.name,'recent_changes.html') 
       else
-        return join(@web.script_prefix,'changes'+@web.script_extension,@web.name)
+        return make_verb_url('changes',@web.name)
       end
     end
 
@@ -119,15 +140,15 @@ module Wiki2Go
 
     def view_page_url(subwiki,page)
       if @generate_html then 
-        return join(subwiki,page + ".html") 
+        return make_url(subwiki,page + ".html") 
       else
-        return join(@web.script_prefix,"view" + @web.script_extension,subwiki,page)
+        return make_verb_url('view',subwiki,page)
       end
     end
 
      def view_url(subwiki,page)
       if @absolute_urls then
-        return File.join(@web.base_url,view_page_url(subwiki,page))
+        return @web.base_url.chop + view_page_url(subwiki,page)
       else
         return view_page_url(subwiki,page)
       end
@@ -145,7 +166,7 @@ module Wiki2Go
 
     def perform_link(subwiki,page,name)
       if @storage.exists?(File.join(subwiki,page)) then
-        url = join(@web.script_prefix,"view" + @web.script_extension,subwiki,page)
+        url = make_verb_url('view',subwiki,page)
         if subwiki == @web.name then
           return "<a href=\"#{url}\">#{name}</a>"
         else
@@ -161,7 +182,7 @@ module Wiki2Go
     end
 
     def view_version_url(subwiki,page)
-      return join(@web.script_prefix,"view" + @web.script_extension,subwiki,page)
+      return make_verb_url('view',subwiki,page)
     end
 
     def query_string(parameters)
@@ -174,13 +195,13 @@ module Wiki2Go
     end
 
     def admin_link(page,name)
-      return "<a href=\"#{join(@web.script_prefix,'admin' + @web.script_extension,page)}\">#{name}</a>"
+      return "<a href=\"#{make_verb_url('admin',page)}\">#{name}</a>"
     end
 
 
     def redirect_url(url)
       if @config.redirect_url?(@web,url) then
-        redirected_url = join(@web.script_prefix,"redirect",@web.name + "?url=" + CGI::escape(url) )
+        redirected_url = make_verb_url('redirect',@web.name) + "?url=" + CGI::escape(url) 
         return redirected_url
       else
         return url
@@ -200,9 +221,9 @@ module Wiki2Go
 
     def resource_url(name)
       if @absolute_urls then
-        File.join(@web.base_url,'html',@web.name,name)
+        @web.base_url.chop + make_url('html',@web.name,name)
       else
-        File.join('html',@web.name,name)
+        make_url('html',@web.name,name)
       end
     end
 
@@ -484,17 +505,6 @@ module Wiki2Go
       end
     end
 
-    def join(*dirs)
-      result = ""
-      dirs.each do |name|
-        if !name.nil? and name.length > 0 then
-          result += '/' unless result.length == 0
-          result += name
-        end
-      end
-      return result.squeeze('/')
-    end
-
     def url?(name)
       name =~ /(http|ftp|gopher|news|https)\:(\w|\/|\.|_|-|\?|\=|&|;|\~|#|,)+/
     end    

data/lib/Wiki2Go/Web.rb

@@ -81,9 +81,6 @@ module Wiki2Go
       else
         url = "http://#{@server}:#{@port}/"
       end
-      if !@subsite.empty? then
-        url += @subsite + '/' 
-      end
       url
     end
 
@@ -113,7 +110,7 @@ module Wiki2Go
     def Web.from_request(request,config)
       server = request.host
       port   = request.port
-      before,verb = Web.parse_scriptpath(request.server_variable['SCRIPT_NAME'],config)
+      before,verb = Web.parse_scriptpath(request.script_name,config)
       web,page = Web.parse_path(request.path,config.multi_wiki)
       web = Web.new(server,port,config.subsite,before,verb,web,page,request)
       return web
@@ -124,24 +121,6 @@ module Wiki2Go
       return ($1.nil? ? "" : $1)
     end
 
-    def read_env(env)
-      @secure = env.has_key?("AUTH_TYPE")
-
-      user = env['REMOTE_USER']
-      if user.nil? or user.empty? then
-        user = env['REMOTE_ADDR']
-        begin
-#          addr = Resolv.getname(user)
-          if !addr.nil? and !addr.empty? then
-            user = addr
-          end
-        rescue
-        end
-      end
-      @user = user      
-    end
-
-
     private
 
     def Web.parse_url(path,verb,config)

data/lib/Wiki2Go/Wiki2GoServlet.rb

@@ -42,11 +42,10 @@ module Wiki2Go
 
     def perform_save(req,res,wikiweb)
 
-      content = req.parameter('text')
+      content = req.parameter('text','')
       name    = req.parameter('title',wikiweb.current_page)
       author = req.parameter('author') 
       remember_me = req.parameter('remember_me')
-      #      @config.log("Author = #{author}, remember = #{remember_me}")
 
       if !author.nil? && author.length > 0 then # !wikiweb.secure && 
         wikiweb.alias = author
@@ -138,7 +137,6 @@ module Wiki2Go
       wiki = Wiki2Go::Wiki.new(@config)
 
       res.content_type = "text/html"
-      @config.log("Generate static in servlet for #{wikiweb.inspect}")
       res.body = wiki.generate_html(wikiweb)
       true
     end
@@ -148,7 +146,16 @@ module Wiki2Go
       uploaded_file = req.uploaded_file('FILE')
       wiki = Wiki2Go::Wiki.new(@config)
 
-      redirect_to = wiki.upload(wikiweb,uploaded_file.filename,uploaded_file.content) 
+      filename = uploaded_file.filename
+      if filename =~ /\\/ then
+        filename = filename.split('\\').pop
+      end
+
+      if filename =~ /\// then
+        filename = filename.split('/').pop
+      end
+
+      redirect_to = wiki.upload(wikiweb,filename,uploaded_file.content) 
       res.redirect_to = redirect_to
       res.content_type = "text/html"
       res.body = "Redirect to #{redirect_to}"

data/test/TestFormatter.rb

@@ -64,10 +64,10 @@ END_OF_INPUT
     formatter.config.allow_dynamic_pages
 
     formatted = formatter.format_page("{%DynamicPage%}")
-    assert_equal("<a href=\"view/Xpday/DynamicPage.rbl\">DynamicPage</a>",formatted)
+    assert_equal("<a href=\"/view/Xpday/DynamicPage.rbl\">DynamicPage</a>",formatted)
 
     formatted = formatter.format_page("{%Click here...@DynamicPage%}")
-    assert_equal("<a href=\"view/Xpday/DynamicPage.rbl\">Click here...</a>",formatted)
+    assert_equal("<a href=\"/view/Xpday/DynamicPage.rbl\">Click here...</a>",formatted)
   end
   
 
@@ -82,7 +82,7 @@ END_OF_INPUT
     assert_equal("<pre>\r\n a SomeLink AnotherLink Nolink \r\n</PRE>",formatted)
 
     formatted = formatter.format_page(" a SomeLink AnotherLink Nolink ")
-    assert_equal(" a <a href=\"view/Xpday/SomeLink\">SomeLink</a> <a href=\"view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
+    assert_equal(" a <a href=\"/view/Xpday/SomeLink\">SomeLink</a> <a href=\"/view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
 
   end
 
@@ -133,14 +133,14 @@ END_OF_EXPECTED
   def test_view_link
     formatter = makeFormatter
     formatted = formatter.view_link("Xpday", "aPage", "aLabel")
-    assert_equal('<a href="view/Xpday/aPage">aLabel</a>',formatted)
+    assert_equal('<a href="/view/Xpday/aPage">aLabel</a>',formatted)
     
   end
 
   def test_view_link_with_parameters
     formatter = makeFormatter
     formatted = formatter.view_version_link("Xpday", "aPage", "aLabel", { 'version' => '2' , 'user' => 'firstuser', 'firstparam' => 'value' })
-    assert_equal('<a href="view/Xpday/aPage?firstparam=value&user=firstuser&version=2">aLabel</a>',formatted)
+    assert_equal('<a href="/view/Xpday/aPage?firstparam=value&user=firstuser&version=2">aLabel</a>',formatted)
     
   end
 
@@ -168,13 +168,13 @@ END_OF_EXPECTED
   def test_combine_links_and_formatting
     formatter = makeFormatter
     formatted = formatter.format_page("*{link@http://wiki2go.nayima.be}*")
-    assert_equal('<STRONG><a href="redirect/Xpday?url=http%3A%2F%2Fwiki2go.nayima.be" rel="nofollow" target="_blank">link</a></STRONG>',formatted)
+    assert_equal('<STRONG><a href="/redirect/Xpday?url=http%3A%2F%2Fwiki2go.nayima.be" rel="nofollow" target="_blank">link</a></STRONG>',formatted)
 
     formatted = formatter.format_page('*<a href="http://wiki2go.nayima.be">link</a>*')
-    assert_equal('<STRONG><a href="redirect/Xpday?url=http%3A%2F%2Fwiki2go.nayima.be" rel="nofollow" target="_blank">link</a></STRONG>',formatted)
+    assert_equal('<STRONG><a href="/redirect/Xpday?url=http%3A%2F%2Fwiki2go.nayima.be" rel="nofollow" target="_blank">link</a></STRONG>',formatted)
 
     formatted = formatter.format_page("   * *{link@http://wiki2go.nayima.be}*")
-    assert_equal('<ul><li> <STRONG><a href="redirect/Xpday?url=http%3A%2F%2Fwiki2go.nayima.be" rel="nofollow" target="_blank">link</a></STRONG></ul>',formatted)
+    assert_equal('<ul><li> <STRONG><a href="/redirect/Xpday?url=http%3A%2F%2Fwiki2go.nayima.be" rel="nofollow" target="_blank">link</a></STRONG></ul>',formatted)
   end
 
  
@@ -192,8 +192,8 @@ END_OF_INPUT
     expected = <<END_OF_EXPECTED
 <table class="wikitable" >
 <tr><td> <STRONG>When</STRONG>     </td><td> <STRONG>Where</STRONG>                                   </td><td> <STRONG>What</STRONG>       </td><td> <STRONG>Who</STRONG>   </td></tr> 
-<tr><td> 23/02/2005 </td><td> <a href="redirect/Xpday?url=http%3A%2F%2Fwww.engels.nl%2F" rel="nofollow" target="_blank">Engels, Rotterdam</a> </td><td> Check out location </td><td> </td></tr> 
-<tr><td> 13/05/2005 </td><td> <a href="view/Xpday/MastBosch">MastBosch</a>, Breda </td><td> Agile Systems annual meeting + XP Day re-kickstart </td><td> </td></tr> 
+<tr><td> 23/02/2005 </td><td> <a href="/redirect/Xpday?url=http%3A%2F%2Fwww.engels.nl%2F" rel="nofollow" target="_blank">Engels, Rotterdam</a> </td><td> Check out location </td><td> </td></tr> 
+<tr><td> 13/05/2005 </td><td> <a href="/view/Xpday/MastBosch">MastBosch</a>, Breda </td><td> Agile Systems annual meeting + XP Day re-kickstart </td><td> </td></tr> 
 <tr><td> 17/05/2005 21:00 </td><td> Skype </td><td> Standup </td><td> Marc, Rob, Nynke, Vera, Pascal </td></tr> 
 <tr><td> <STRONG>28/06/2005</STRONG> 21:00 </td><td> Skype </td><td> Standup </td><td> </td></tr> 
 </table> 
@@ -257,7 +257,7 @@ END_OF_CONTENT
 
   def tag_test_expected
     return <<-END_OF_CONTENT
-This is a test of a long tag <a href="redirect/Xpday?url=http%3A%2F%2Fwww.microsoft.com\" rel=\"nofollow\" target=\"_blank\">
+This is a test of a long tag <a href="/redirect/Xpday?url=http%3A%2F%2Fwww.microsoft.com\" rel=\"nofollow\" target=\"_blank\">
     That should not be changed
 END_OF_CONTENT