Wiki2Go 1.15.1 → 1.16.0

data/lib/Wiki2Go/Install/make_site.rb

@@ -6,7 +6,7 @@ require 'optparse'
 require "uri"
 
 require 'rubygems'
-WIKI2GO_VERSION = '1.15.0'
+WIKI2GO_VERSION = '1.16.0'
 require_gem "Wiki2Go","~>#{WIKI2GO_VERSION}"
 
 require 'Wiki2Go/PublicWikiConfig'
@@ -115,7 +115,7 @@ module Wiki2Go
         set_owner(configuration.directory,configuration.user)
         File.umask(oldmask)
         puts "Installed."
-        puts "Include #{configuration.directory}/config/site.conf in your Apache configuration"
+        puts "Include '#{configuration.directory}/config/site.conf' in your Apache configuration"
         puts "  and restart Apache to activate your wiki."
       end
     end
@@ -316,14 +316,11 @@ module Wiki2Go
       template = <<-TEMPLATE_END
 #!/usr/bin/env ruby
 
-#
+# Select which version of Wiki2Go is used. 
 require 'rubygems'
 require_gem "Wiki2Go","~>#{WIKI2GO_VERSION}"
 require "Wiki2Go/#{baseconfig}"
 
-# Uncomment if you want to add 'dot' graphics to your page (see http://www.graphviz.org)
-# require 'Wiki2Go/DotGraphics'
-
 class CgiOptions < Wiki2Go::#{baseconfig}
 
   def initialize
@@ -353,8 +350,19 @@ class CgiOptions < Wiki2Go::#{baseconfig}
     @subsite = '#{config.subsite}'
     
     # Uncomment if you want to add 'dot' graphics to your page (see http://www.graphviz.org)
-    # The path must point to the 'dot' exexcutable
-    # add_processor('GRAPH',Wiki2Go::DotGraphics.new('/usr/bin/'))
+    # The path must point to the 'dot' executable
+    # enable_dot_graphics('/usr/bin/')
+
+    # Uncomment if you want to add Ruby syntax highlighting
+    # You also need to include the html/ruby.css stylesheet in your template
+    # enable_syntax_highlighting
+
+    # If you want to enable CVS commit/update support for your wiki, uncomment the following line
+    #  and fill in the CVSROOT and the name of the module as parameters
+    # The CVS repository and module must exist and the webserver user must have commit access to it
+    # You need to have the rscm 0.3 gem installed  
+    # use_repository('MYCVSROOT','mymodule')
+
   end  
 
 end
@@ -393,6 +401,7 @@ TEMPLATE_END
       mkdir_p(File.join(dest,'html'),{ :mode => 0775})
       source = File.join(config.source_dir,'site','.')
       cp_r source,dest
+      Dir["#{dest}/**/CVS"].each { |name| rm_r name }
     end
 
     def Install.do_make_wiki(config)

data/lib/Wiki2Go/Install/site/ruby.css

@@ -0,0 +1,18 @@
+.ruby .normal {}
+.ruby .comment { color: #005; font-style: italic; }
+.ruby .keyword { color: #A00; font-weight: bold; }
+.ruby .method { color: #077; }
+.ruby .class { color: #074; }
+.ruby .module { color: #050; }
+.ruby .punct { color: #447; font-weight: bold; }
+.ruby .symbol { color: #099; }
+.ruby .string { color: #944; background: #FFE; }
+.ruby .char { color: #F07; }
+.ruby .ident { color: #004; }
+.ruby .constant { color: #07F; }
+.ruby .regex { color: #B66; background: #FEF; }
+.ruby .number { color: #F99; }
+.ruby .attribute { color: #7BB; }
+.ruby .global { color: #7FB; }
+.ruby .expr { color: #227; }
+.ruby .escape { color: #277; }

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

@@ -32,6 +32,7 @@
                               <div class="menuheading"><%= formatter.admin_link("","Home")%></div>
                               <ul>
                                 <li><%= formatter.admin_link("regenerate","Regenerate&nbsp;HTML")%></li>
+                                <li><%= formatter.admin_link("editfiles","Edit&nbsp;Files")%></li>
                                 <li><%= formatter.admin_link("passwords","Passwords")%></li>
                               </ul>
                               <div class="menuheading">SPAM&nbsp;filter</div>
@@ -39,6 +40,16 @@
                                 <li><%= formatter.admin_link("greylist","Greylist")%></li>
                                 <li><%= formatter.admin_link("update_blacklist","Update&nbsp;Blacklist")%></li>
                               </ul>
+                              <div class="menuheading">Repository</div>
+                              <ul>
+                                <li><%= formatter.admin_link("update_site","Update&nbsp;Site")%></li>
+                                <li><%= formatter.admin_link("commit_site","Commit&nbsp;Site")%></li>
+                                <li><%= formatter.admin_link("update_conflicts","Update&nbsp;Conflicts")%></li>
+                              </ul>
+                              <div class="menuheading">Logs</div>
+                              <ul>
+                                <li><%= formatter.admin_link("show_log","Show&nbsp;Log")%></li>
+                              </ul>
                               </TD>
                                 <TD width="100%" valign="top">$BODY$</TD>
                             </TR>

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

@@ -0,0 +1,21 @@
+<%
+   output = ''
+   
+   doit = @request.parameter('update',nil)
+   comment = @request.parameter('comment','no comment')
+  
+   if doit then
+     commit_log = @config.commit_to_repository(comment)
+     commit_log = commit_log.collect { |line|  CGI::escapeHTML(line) }
+     output = commit_log.join("<br>#{$/}")
+   end
+%>
+
+<h3>Commit Site</h3>
+<form action="<%= File.join(@web.script_prefix,'admin','commit_site')%>" method="get">
+Comment: <input name="comment" value="">
+<button type="submit" name="update" value="update">
+Commit site changes to repository
+</button>
+</form>
+<%= output %>

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

@@ -0,0 +1,33 @@
+<%
+
+   file = @request.parameter('file',nil)
+   
+   content = 'EMPTY'
+   if !file.nil? then
+     filename = File.join(@config.root_directory,file)
+     if File.exists?(filename)
+       content = IO::read(filename)
+     end
+     
+     doit = @request.parameter('update',nil)
+     if !doit.nil? then
+       content = @request.parameter('text',nil)
+       if !content.nil? then
+          File::open(filename,File::CREAT|File::WRONLY) do |f|
+            f.puts content
+          end
+       end
+     end
+   end
+   
+%>
+<h3>Edit File</h3>
+<form action="<%= File.join(@web.script_prefix,'admin','edit')%>" method="post">
+  <input type="hidden" name="file" value="<%= file %>">
+  <textarea name="text" rows="35" cols="96"><%= content %></textarea><br>
+  <button type="submit" name="update" value="update">
+    Save file
+  </button>&nbsp;<input type="reset" value=" Undo changes ">
+</form>
+
+

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

@@ -0,0 +1,33 @@
+<%
+
+   def edit_file(filename)
+     "<a href=\"#{ File.join(@web.script_prefix,'admin','edit')}?file=#{CGI::escape(filename)}\">#{filename}</a>"
+   end
+%>
+
+<%
+   all_files = []
+   
+   Dir.chdir(@config.root_directory)
+   files = Dir.glob('**/*')
+   
+   all_files = files.find_all { |name| File.file?(File.join(@config.root_directory,name)) && name !~ /CVS/ }.sort
+   all_files = all_files.reject do |name|
+      name =~ /\.png$/ || name =~ /\.jpg$/ || name =~ /\.gif$/ || name =~ /\.pdf$/ || name =~ /\.xls$/ 
+   end
+ 
+   odd = false
+%>
+
+<h3>Site files</h3>
+
+<% 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>
+    <% end %>
+  </table>
+<% end %>

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

@@ -1,44 +1,24 @@
 <%
+require 'Wiki2Go/SpamFilter'
 
-greylist = File.join(@config.root_directory,'config','greylist.txt')
-exists = File.exists?(greylist)
+spamfilter = Wiki2Go::SpamFilter.new(@config)
 
-selected_line = @request.parameter('selected_line','').strip
+author = @request.parameter('author','').strip
+url    = @request.parameter('url','').strip
 
-lines = [] 
-if File.exists?(greylist) then
-  pwdfile = File.open(greylist,'r') do |f|
-   lines = f.readlines
-  end
+if !@request.parameter('accept').nil? && !author.empty? then
+  @config.log("Accept #{author} and url '#{url}'")
+  spamfilter.remove_from_greylist(author,url)
 end
 
-if exists && (!@request.parameter('accept').nil? || !@request.parameter('blacklist').nil?) && !selected_line.empty? then
-  @config.log("Accept #{selected_line}")
-  lines = lines.collect { |line| 
-    if line.strip == selected_line then
-       @config.log("Remove line #{line}") 
-       nil
-    else
-      line 
-    end  
-  }
-  lines = lines.compact
-  pwdfile = File.open(greylist,'w') do |f|
-    f.puts lines
-  end
-end
-
-if !@request.parameter('blacklist').nil? && !selected_line.empty? then
-  user , url = selected_line.split(' ')
-  blacklist = @config.storage.load_blacklist('user')
-  blacklist.add(user)
-  @config.storage.save_list(blacklist)
-  
-  blacklist = @config.storage.load_blacklist('url')
-  blacklist.add(url.gsub(/\\\./,'.'))
-  @config.storage.save_list(blacklist)
+if !@request.parameter('blacklist').nil? && !author.empty? then
+  @config.errorlog("Blacklist user '#{author}' and URL '#{url}'")
+  spamfilter.remove_from_greylist(author,url)
+  spamfilter.blacklist_user(author)
+  spamfilter.blacklist_url(url)
 end
 
+supects = spamfilter.greylist_suspects
 
 %>
 <h3>Manage greylist</h3>
@@ -46,10 +26,10 @@ end
 <tr><th>Name</th><th>URL</th><th>&nbsp;</th><th>&nbsp;</th></tr>
 <%
   odd = false 
-  lines.each do |line|
+  supects.each do |suspect|
     style = (odd ? "odd" : "even")
     odd = !odd
-    name,url = line.split(' ') 
+    name,url = suspect.user,suspect.url 
     clean_url = 'http' + url.gsub(/\\\./,'.')
 %>
 <tr class="<%= style%>">
@@ -58,12 +38,14 @@ end
 <td>
 <form  action="<%= File.join(@web.script_prefix,'admin','greylist')%>" method="GET">
 <input type="submit" name="accept" value="Accept">
-<input type="hidden" name="selected_line" value="<%= line %>">
+<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">
-<input type="hidden" name="selected_line" value="<%= line %>">
+<input type="hidden" name="author" value="<%= name %>">
+<input type="hidden" name="url" value="<%= clean_url %>">
 <input type="submit" name="blacklist" value="Blacklist">
 </form>
 </td>

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

@@ -0,0 +1,21 @@
+<%
+   output = ''
+   
+   doit = @request.parameter('show',nil)
+  
+   if doit then
+     logfile = @config.logfile
+     File.open(logfile,File::RDONLY) do |f|
+       output = f.read
+     end
+   end
+%>
+
+<h3>View log</h3>
+<form action="<%= File.join(@web.script_prefix,'admin','show_log')%>" method="get">
+<button type="submit" name="show" value="show">
+Show logfile
+</button>
+</form>
+<%= CGI::escapeHTML(output).gsub(/\n/,"<br>\n") %>
+

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

@@ -0,0 +1,38 @@
+<%
+
+   def edit_file(filename)
+     "<a href=\"#{ File.join(@web.script_prefix,'admin','edit')}?file=#{CGI::escape(filename)}\">#{filename}</a>"
+   end
+   
+   def contains_conflict_marker(name)
+     content = IO::read(File.join(@config.root_directory,name))
+     return content =~ /<{7,7}/ && content =~ />{7,7}/ && content =~ /={7,7}/
+   end
+%>
+
+<%
+   clashed = []
+   
+   Dir.chdir(@config.root_directory)
+   files = Dir.glob('**/*')
+   
+   all_files = files.find_all { |name| File.file?(File.join(@config.root_directory,name)) && name !~ /CVS/ }
+   
+   
+   clashed = all_files.find_all {|name| contains_conflict_marker(name) }.sort   
+   odd = false
+%>
+
+<h3>Update Conflicts</h3>
+
+<% if clashed.length > 0 then %>
+  <hr>
+  <table class="topiclist"><caption>Clashed</caption>
+    <% clashed.each do |file|
+       style = (odd ? "odd" : "even")
+       odd = !odd
+    %>
+      <tr class="<%= style%>"><td><%= edit_file(file) %></td></tr>
+    <% end %>
+  </table>
+<% end %>

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

@@ -0,0 +1,49 @@
+<%
+   output = ''
+   
+   doit = @request.parameter('update',nil)
+  
+   updated = []
+   clashed = []
+   if doit then
+     updated,clashed = @config.update_from_repository
+   end
+   
+   def edit_file(filename)
+     "<a href=\"#{ File.join(@web.script_prefix,'admin','edit')}?file=#{CGI::escape(filename)}\">#{filename}</a>"
+   end
+   
+   odd = false
+   
+%>
+
+<h3>Update Site</h3>
+<form action="<%= File.join(@web.script_prefix,'admin','update_site')%>" method="get">
+  <button type="submit" name="update" value="update">
+    Update the site from repository
+  </button>
+</form>
+
+<% if updated.length > 0 then %>
+  <hr>
+  <table class="topiclist"><caption>Updated</caption>
+    <% updated.each do |file|
+       style = (odd ? "odd" : "even")
+       odd = !odd
+    %>
+      <tr class="<%= style %>"><td><%= edit_file(file) %></td></tr>
+    <% end %>
+  </table>
+<% end %>
+
+<% if clashed.length > 0 then %>
+  <hr>
+  <table class="topiclist"><caption>Clashed</caption>
+    <% clashed.each do |file|
+       style = (odd ? "odd" : "even")
+       odd = !odd
+    %>
+      <tr class="<%= style%>"><td><%= edit_file(file) %></td></tr>
+    <% end %>
+  </table>
+<% end %>

data/lib/Wiki2Go/Install/wiki/ruby.css

@@ -0,0 +1,18 @@
+.ruby .normal {}
+.ruby .comment { color: #005; font-style: italic; }
+.ruby .keyword { color: #A00; font-weight: bold; }
+.ruby .method { color: #077; }
+.ruby .class { color: #074; }
+.ruby .module { color: #050; }
+.ruby .punct { color: #447; font-weight: bold; }
+.ruby .symbol { color: #099; }
+.ruby .string { color: #944; background: #FFE; }
+.ruby .char { color: #F07; }
+.ruby .ident { color: #004; }
+.ruby .constant { color: #07F; }
+.ruby .regex { color: #B66; background: #FEF; }
+.ruby .number { color: #F99; }
+.ruby .attribute { color: #7BB; }
+.ruby .global { color: #7FB; }
+.ruby .expr { color: #227; }
+.ruby .escape { color: #277; }

data/lib/Wiki2Go/LineFormatter.rb

@@ -0,0 +1,504 @@
+
+#!/usr/bin/ruby
+
+require 'erb'
+require 'cgi'
+require 'English'
+
+module Wiki2Go
+
+  class LineFormatter
+
+    attr_reader :config
+
+    def initialize(web,storage,config,generate_html,editable)
+      @web = web
+      @storage = storage
+      @config = config
+      @in_table = false
+      @bullets = Array.new
+      @pre_line = ""
+      @post_line = ""
+      @generate_html = generate_html
+      @editable      = editable
+      @absolute_urls = false
+    end
+
+    public
+
+    def format_line(line)
+      @added_bullets = false
+      line = escape_wiki_markers(line)
+      line = format_wiki_markup(line)
+      line = format_table(line)
+      line = remove_markers(line)
+      if !@added_bullets then
+        emit_bullets
+      end
+
+      return formatted_output(line)
+    end
+
+    def formatting_done
+      emit_bullets
+      @pre_line
+    end
+
+
+    def absolute_url
+      return @web.base_url + view_page_url(@web.name,@web.current_page)
+    end
+
+    def absolute_url_of_topic(topic)
+      return @web.base_url + view_page_url(@web.name,topic)
+    end
+
+    def edit_link(subwiki,page,name)
+      if @editable then
+        return name + edit_this_link(subwiki,page,"?")
+      else
+        return name 
+      end
+    end
+
+    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>"
+      else
+        return "" 
+      end
+    end
+
+    def save_this_link(subwiki,page)
+      if @editable then
+        return join(@web.script_prefix,"save"+@web.script_extension,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)
+    end
+
+    def removespam_url(user)
+      return join(@web.script_prefix,'removespam'+@web.script_extension,@web.name,'') + '?user=' + user
+    end
+
+    def version_url(page)
+      return join(@web.script_prefix,'versions'+@web.script_extension,@web.name,page)
+    end
+
+    def save_url
+      verb_url('save')
+    end
+
+    def search_link(desc)
+      return "<a href=\"#{search_url + "?text="+desc}\">#{desc}</a>"
+    end
+
+    def search_link2(desc,name)
+      return "<a href=\"#{search_url + "?text="+desc}\">#{name}</a>"
+    end
+
+    def search_url
+      return join(@web.script_prefix,'search'+@web.script_extension,@web.name)
+    end
+
+    def changes_url
+      if @generate_html then 
+        return join(@web.name,'recent_changes.html') 
+      else
+        return join(@web.script_prefix,'changes'+@web.script_extension,@web.name)
+      end
+    end
+
+    def changes_link(desc)
+      return "<a href=\"#{changes_url}\">#{desc}</a>"
+    end
+
+    def view_page_url(subwiki,page)
+      if @generate_html then 
+        return join(subwiki,page + ".html") 
+      else
+        return join(@web.script_prefix,"view" + @web.script_extension,subwiki,page)
+      end
+    end
+
+     def view_url(subwiki,page)
+      if @absolute_urls then
+        return File.join(@web.base_url,view_page_url(subwiki,page))
+      else
+        return view_page_url(subwiki,page)
+      end
+    end
+
+    
+
+    def view_link(subwiki,page,name)
+      if subwiki == @web.name then
+        return "<a href=\"#{view_url(subwiki,page)}\">#{name}</a>"
+      else
+        return "<a href=\"#{view_url(subwiki,page)}\">#{subwiki}:#{name}</a>"
+      end
+    end
+
+    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)
+        if subwiki == @web.name then
+          return "<a href=\"#{url}\">#{name}</a>"
+        else
+          return "<a href=\"#{url}\">#{subwiki}:#{name}</a>"
+        end
+      else 
+        return edit_link(subwiki,page,name)
+      end
+    end
+    
+    def view_version_link(subwiki,page,name,parameters=nil)
+      return "<a href=\"#{view_version_url(subwiki,page)+query_string(parameters)}\">#{name}</a>"
+    end
+
+    def view_version_url(subwiki,page)
+      return join(@web.script_prefix,"view" + @web.script_extension,subwiki,page)
+    end
+
+    def query_string(parameters)
+      return "" if parameters.nil?
+      return "?" + parameters.collect { |key,value| key + '=' + value}.sort.join('&')
+    end
+
+    def version_link(page,name)
+      return "<a href=\"#{version_url(page)}\">#{name}</a>"
+    end
+
+    def admin_link(page,name)
+      return "<a href=\"#{join(@web.script_prefix,'admin' + @web.script_extension,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) )
+        return redirected_url
+      else
+        return url
+      end
+    end
+
+    def redirect_link(label,url)
+      if @config.redirect_url?(@web,url) then
+        redirected_url = redirect_url(url)
+        return "<a href=\"#{redirected_url}\" rel=\"nofollow\" target=\"_blank\">#{label}</a>"
+      else
+        return "<a href=\"#{url}\" target=\"_blank\">#{label}</a>"
+      end
+
+    end
+
+
+    def resource_url(name)
+      if @absolute_urls then
+        File.join(@web.base_url,'html',@web.name,name)
+      else
+        File.join('html',@web.name,name)
+      end
+    end
+
+    def encode_mail_to(addr) 
+
+      addr =~ /(.*)@(.*)/ ;
+      name = $1 ;
+      site = $2 ;
+
+      return  "<a href=\"#{view_url(@web.name,"MailFormattingRules")}\" onmouseover=\"this.href='mai' + 'lto:' + '#{name}' + '&#64;' + '#{site}'\">#{name}</a>" 
+    end
+
+    alias :encodeMailTo :encode_mail_to
+
+    private
+
+
+    def append(before,match,after)
+      result = ''
+      result += before if !before.nil?
+      result += match if !match.nil?
+      result += after if !after.nil?
+      result
+    end
+
+    def format_tag(text)
+      text = text.gsub(/"((http|ftp|gopher|news|https)\:[^"]*)"/) { externalUrl($1) }
+
+      return '<' + text + '>'
+    end
+
+
+    def format_wiki_markup(line)
+      if line =~ /^(.*)\{\!(.*)\!\}(.*)$/im then
+        before,match,after = $1,$2,$3
+        return append(format_wiki_markup(before),match,format_wiki_markup(after))
+      elsif line =~ /^(.*)<(\S.*)\>(.*)$/ then
+        before,match,after = $1,$2,$3
+        line =  append(format_wiki_markup(before),escape_url_markers(format_tag(match)),format_wiki_markup(after))
+      elsif line =~ /^(.*)\{\%([^\}]*)\%\}(.*)$/ then
+        before,match,after = $1,$2,$3
+        line = append(format_wiki_markup(before),escape_url_markers(format_dynamic_link(match)),format_wiki_markup(after))
+      elsif line =~ /^(.*)\{([^\}]*)\}(.*)$/ then
+        before,match,after = $1,$2,$3
+        line = append(format_wiki_markup(before),escape_url_markers(format_forced_link(match)),format_wiki_markup(after))
+      elsif line =~ /^(.*)\%([^\%]*)\%(.*)$/ then
+        before,match,after = $1,$2,$3
+        line = append(format_wiki_markup(before),escape_url_markers(format_forced_link(match)),format_wiki_markup(after))
+      elsif line =~ /^(.*)((http|ftp|gopher|news|https)\:\/\/(\w|\/|\.|_|-|\?|\=|&|;|\~|#|,)+)(.*)$/ then
+        before,match,after = $1,$2,$5
+        line = append(format_wiki_markup(before),escape_url_markers(external_link(match)),format_wiki_markup(after))
+      elsif line =~ /^(.*)mailto\:([a-zA-Z0-9\-\_\.]+@[a-zA-Z0-9\-\_\.]+)(.*)$/ then
+        before,match,after = $1,$2,$3
+        line = append(format_wiki_markup(before),escape_url_markers(encode_mail_to(match)),format_wiki_markup(after))          
+      else
+        line = format_brackets(line)
+        line = format_entities(line)
+        line = recognize_wiki_words(line)
+      end
+      line = format_bullets(line)
+      line = format_markup(line)
+      return line
+    end    
+
+    def formatted_output(line)
+      output = @pre_line + line + @post_line
+      @pre_line = ""
+      @post_line = ""
+      return output
+    end
+
+
+    def escape_wiki_markers(line)
+      line = line.gsub(/%%/,"&percent;")
+      line = line.gsub(/\{\{/,"&openingbrace;")
+      line = line.gsub(/\}\}/,"&closingbrace;")
+    end
+
+    def escape_url_markers(line)
+      line = line.gsub(/%/ ,'&percent;')
+      line = line.gsub(/\{/,'&openingbrace;')
+      line = line.gsub(/\}/,'&closingbrace;')
+      line = line.gsub(/~/ ,'&tilde;')
+      line = line.gsub(/\*/,'&asterisk;')
+      line = line.gsub(/_/ ,'&underscore;')
+      return line
+    end
+
+    def remove_markers(line)
+      line = line.gsub(/&percent;/,"%")
+      line = line.gsub(/&openingbrace;/,"{")
+      line = line.gsub(/&closingbrace;/,"}")
+      line = line.gsub(/&tilde;/,"~")
+      line = line.gsub(/&asterisk;/,"*")
+      line = line.gsub(/&underscore;/,"_")
+      return line
+    end
+
+
+    def format_brackets(line)
+      line = line.gsub(/</,"&lt\;") ;
+      line = line.gsub(/>/,"&gt\;") ;
+      return line
+    end
+
+    def format_entities(line)
+      line = line.gsub(/\~/,"&tilde;") ;
+      line = line.gsub(/&(\w+)\;/,"~\\1\;") ;
+      line = line.gsub(/&(#\d+)\;/,"~\\1\;") ;
+      line = line.gsub(/&/,"&amp\;") ;
+      line = line.gsub(/~/,"&") ;
+      line = line.gsub(/\t/,"   ") ;
+      return line
+    end
+
+    def format_markup(line)
+      line = line.gsub(/\*\*([^\*]*)\*\*/,"<h2>\\1<\/h2>")
+      line = line.gsub(/\*([^\*]+)\*/,"<STRONG>\\1<\/STRONG>")
+      line = line.gsub(/\b_([^_]*)_/,"<EM>\\1<\/EM>")
+      line = line.gsub(/^---+/,"<hr>")
+      return line
+    end
+
+    def format_bullets(line)
+      line = line.gsub(/^([\s]{3,99})\*(.*)$/) { add_bullet($1,$2,'u') } 
+      line = line.gsub(/^([\s]{3,99})(\d)+\.?(.*)$/) { add_bullet($1,$3,'o') } 
+      return line
+    end
+
+    def format_table(line)
+      if @in_table then
+        replacement = "</table>"
+      else
+        replacement = '<table class="wikitable" >'
+      end
+      if line.gsub!(/^(\|-+\|)/,replacement) then
+        @in_table = ! @in_table
+      elsif line.gsub!(/^\|\((.+)\)-+\|/,'<table class="\1" >') then
+        @in_table = true
+      end
+      if @in_table then
+        line = line.gsub(/^\|/,"<tr><td>")
+        line = line.gsub(/\|\s*$/,"<\/td><\/tr>")
+        line = line.gsub(/\|/,"<\/td><td>")
+      end
+      return line
+
+    end
+
+    def recognize_wiki_words(line)
+      line = line.gsub(/(^|[^\w\.])([A-Z]+[a-z0-9]+[A-Z]+[a-zA-Z0-9]*)/) { $1 + internalLink($2) }
+
+    end
+
+    def external_link(url)
+      if url =~ /([^\/]+)\.(gif|jpg|jpeg|png)$/i then
+        alt = $1
+        return "<img src=\"#{url}\" alt=\"#{alt}\">"
+      else
+        return redirect_link(url,url)
+      end
+    end      
+
+    def externalUrl(url)
+      return '"' + redirect_url(url) + (@config.redirect_url?(@web,url) ? '" rel="nofollow"' : '"') +' target="_blank"'
+    end      
+
+    def format_forced_link(link)
+      if ! link.gsub!(/^([^%@]+)@(http[^%]+)$/) { labelLink($1,$2) } then
+        link.gsub!(/^(([^\%@]+)@)?(([^\%:]+):)?([^%]+)$/) { mega_link($2,$4,$5,@web.name) }
+      end
+      link
+    end
+
+    def format_dynamic_link(link)
+      return link.gsub(/^(([^\%@]+)@)?(([^\%:]+):)?([^%]+)$/) { dynamic_link($2,$4,$5,@web.name) }
+    end
+
+    def labelLink(label,url)
+      return redirect_link(label,url)
+    end
+
+    def internalLink(page)
+      return internalSubwikiNamedLink(@web.name,page,page) 
+    end
+
+    def mega_link(name,subwiki,page,default_wiki)
+      name = page if name.nil? || name.empty?
+      subwiki = default_wiki if subwiki.nil? || subwiki.empty?
+      internalSubwikiNamedLink(subwiki,page,name)
+    end
+
+    def dynamic_link(name,subwiki,page,default_wiki)
+      name = page if name.nil? || name.empty?
+      subwiki = default_wiki if subwiki.nil? || subwiki.empty?
+      perform_link(subwiki,page+'.rbl',name)
+    end
+
+    def internalSubwikiNamedLink(subwiki,page,name)
+      if subwiki == "xpnl" then
+        return "<a href=\"http://www.xpnl.org/Wiki/#{page}\" target=\"_blank\">xpnl:#{page}</a>"
+      elsif subwiki == 'xpbe' then
+        return "<a href=\"http://wiki.xp.be/Xpbe/#{page}.html\" target=\"_blank\">xpbe:#{page}</a>"
+      elsif subwiki == "wiki" then
+        return "<a href=\"http://c2.com/cgi/wiki?#{page}\" target=\"_blank\">wiki:#{page}</a>"
+      elsif subwiki == "book" then
+        return "<a href=\"http://bookshelved.org/cgi-bin/wiki.pl?#{page}\" target=\"_blank\">book:#{page}</a>"
+      elsif subwiki == "wiki2go" then
+        return "<a href=\"http://wiki2go.nayima.be/Wiki2Go/#{page}.html\" target=\"_blank\">wiki2go:#{page}</a>"
+      elsif subwiki =~ /^isbn$/i then
+        name = "ISBN " + page if page == name
+        return "<a href=\"http://www.amazon.co.uk/exec/obidos/ASIN/#{page}/#{@config.amazon_affiliate}\" target=\"_blank\">#{name}</a>"
+      elsif page =~ /^isbn(.+)$/i then
+        name = "ISBN " + $1 if page == name
+        return "<a href=\"http://www.amazon.co.uk/exec/obidos/ASIN/#{$1}/#{@config.amazon_affiliate}\" target=\"_blank\">#{name}</a>"
+      elsif page =~ /\./ then
+        return resource_link(subwiki,page,name)
+      elsif @storage.exists?(File.join(subwiki,page)) then
+        return view_link(subwiki,page,name)
+      else
+        return edit_link(subwiki,page,name)
+      end
+    end
+
+    def resource_link(subwiki,page,name)
+      if page =~ /^(.+)\.(gif|jpg|jpeg|png)$/i then
+        filename = $1
+        alt_label = name
+        if page == name || url?(name) then
+          alt_label = filename
+        end
+        image_link = "<img src=\"#{resource_url(page)}\" border=0 alt=\"#{alt_label}\" >"
+        if url?(name) then
+          return redirect_link(image_link,name)
+        else
+          return image_link
+        end
+      elsif page =~ /^(.*)\.rbl$/i then
+        page_name = $1
+        if page == name then
+          name = page_name
+        end
+        return perform_link(subwiki,page,name)
+      elsif page =~ /^(.+)\.html?$/i then
+        return "<a href=\"#{resource_url(page)}\">#{name}</a>"
+      else
+        return "<a href=\"#{resource_url(page)}\" target=\"_blank\">#{name}</a>"
+      end
+    end
+
+    def add_bullet(prefix,text,code)
+      @added_bullets = true
+      depth = prefix.length / 3
+      result = ""
+      bullet_depth = @bullets.length
+      if depth > bullet_depth then
+        bullet_depth.upto(depth-1) do
+          result += "<#{code}l>" 
+          @bullets.push(code)
+        end
+      elsif depth < bullet_depth then
+        bullet_depth.downto(depth+1) do
+          bullet = @bullets.pop
+          result += "</#{bullet}l>"
+        end
+      elsif @bullets.last != code then
+        bullet = @bullets.pop
+        result += "</#{bullet}l>" 
+        result += "<#{code}l>" 
+        @bullets.push(code)
+      end
+      return result + "<li>#{text}"
+    end
+
+    def emit_bullets
+      while ! @bullets.empty?
+        bullet = @bullets.pop
+        @pre_line += "</#{bullet}l>" 
+      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    
+
+  end
+
+end