RubyGems - Wiki2Go - Versions diffs - 1.14.0 - Mend

Wiki2Go 1.14.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (67) hide show

data/bin/Wiki2GoServer.rb +11 -0
data/bin/Wiki2Go_make_site.rb +10 -0
data/bin/Wiki2Go_make_wiki.rb +10 -0
data/bin/Wiki2Go_update_site.rb +10 -0
data/lib/Web2Go/CGIRequest.rb +99 -0
data/lib/Web2Go/CGIResponse.rb +64 -0
data/lib/Web2Go/ERB_Interpreter.rb +47 -0
data/lib/Web2Go/MockCookie.rb +17 -0
data/lib/Web2Go/MockRequest.rb +131 -0
data/lib/Web2Go/MockResponse.rb +35 -0
data/lib/Web2Go/Web2Go.rb +0 -0
data/lib/Web2Go/WebrickRequest.rb +124 -0
data/lib/Web2Go/WebrickResponse.rb +50 -0
data/lib/Wiki2Go.rb +2 -0
data/lib/Wiki2Go/BlackList.rb +52 -0
data/lib/Wiki2Go/DotGraphics.rb +69 -0
data/lib/Wiki2Go/FileStorage.rb +267 -0
data/lib/Wiki2Go/GreyList.rb +88 -0
data/lib/Wiki2Go/Install/config/chonqed_blacklist.txt +4743 -0
data/lib/Wiki2Go/Install/config/passwords +1 -0
data/lib/Wiki2Go/Install/make_site.rb +515 -0
data/lib/Wiki2Go/Install/site/error.html +77 -0
data/lib/Wiki2Go/Install/site/html/admin.css +135 -0
data/lib/Wiki2Go/Install/site/html/xml.gif +0 -0
data/lib/Wiki2Go/Install/site/robots.txt +13 -0
data/lib/Wiki2Go/Install/site/style.css +135 -0
data/lib/Wiki2Go/Install/templates/admin.htm +48 -0
data/lib/Wiki2Go/Install/templates/admin_pages/admin.txt +1 -0
data/lib/Wiki2Go/Install/templates/admin_pages/greylist.txt +72 -0
data/lib/Wiki2Go/Install/templates/admin_pages/passwords.txt +67 -0
data/lib/Wiki2Go/Install/templates/admin_pages/regenerate.txt +26 -0
data/lib/Wiki2Go/Install/templates/admin_pages/removespam.txt +19 -0
data/lib/Wiki2Go/Install/templates/admin_pages/update.txt +13 -0
data/lib/Wiki2Go/Install/templates/edit.htm +74 -0
data/lib/Wiki2Go/Install/templates/pagelist.htm +82 -0
data/lib/Wiki2Go/Install/templates/rss.xml +11 -0
data/lib/Wiki2Go/Install/templates/versionlist.htm +84 -0
data/lib/Wiki2Go/Install/templates/view.htm +72 -0
data/lib/Wiki2Go/Install/wiki/style.css +135 -0
data/lib/Wiki2Go/Page.rb +69 -0
data/lib/Wiki2Go/PrivateWikiConfig.rb +27 -0
data/lib/Wiki2Go/PublicWikiConfig.rb +52 -0
data/lib/Wiki2Go/ReadWriteWikiConfig.rb +23 -0
data/lib/Wiki2Go/Server.rb +94 -0
data/lib/Wiki2Go/SpamFilter.rb +95 -0
data/lib/Wiki2Go/UrlFinder.rb +26 -0
data/lib/Wiki2Go/Web.rb +185 -0
data/lib/Wiki2Go/WebrickServlet.rb +211 -0
data/lib/Wiki2Go/WhiteList.rb +29 -0
data/lib/Wiki2Go/Wiki2Go.rb +274 -0
data/lib/Wiki2Go/Wiki2GoConfig.rb +144 -0
data/lib/Wiki2Go/Wiki2GoServlet.rb +197 -0
data/lib/Wiki2Go/WikiFormatter.rb +597 -0
data/lib/Wiki2Go/WikiLogFile.rb +43 -0
data/lib/Wiki2Go/cgi/changes.rb +20 -0
data/lib/Wiki2Go/cgi/display.rb +20 -0
data/lib/Wiki2Go/cgi/edit.rb +20 -0
data/lib/Wiki2Go/cgi/redirect.rb +20 -0
data/lib/Wiki2Go/cgi/save.rb +20 -0
data/lib/Wiki2Go/cgi/search.rb +20 -0
data/lib/Wiki2Go/cgi/secure/admin.rb +20 -0
data/lib/Wiki2Go/cgi/secure/generate_static.rb +20 -0
data/lib/Wiki2Go/cgi/secure/removespam.rb +20 -0
data/lib/Wiki2Go/cgi/upload.rb +20 -0
data/lib/Wiki2Go/cgi/versions.rb +20 -0
data/lib/Wiki2Go/cgi/view.rb +20 -0
metadata +113 -0

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

@@ -0,0 +1,67 @@
+<%
+passwords = File.join(@config.root_directory,'config','passwords')
+exists = File.exists?(passwords)
+user = @request.parameter('user','').strip
+user_pwd = @request.parameter('password','').strip
+if !@request.parameter('add').nil? && !user.empty? && !user_pwd.empty? then
+   command = "htpasswd -b #{!exists ? '-c' : '' } #{passwords} #{user} #{user_pwd}"
+   output = system(command)
+   result = $?
+   @config.log("Execute command '#{command}' => #{result}")
+end
+lines = []
+if File.exists?(passwords) then
+  pwdfile = File.open(passwords,'r') do |f|
+   lines = f.readlines
+  end
+end
+if exists && !@request.parameter('remove').nil? && !user.empty? then
+  regex = Regexp.new("^#{user}:")
+  lines = lines.collect { |line|
+    if line =~ regex then
+       @config.log("Remove line #{line}")
+       nil
+    else
+      line
+    end
+  }
+  lines = lines.compact
+  pwdfile = File.open(passwords,'w') do |f|
+    f.puts lines
+  end
+end
+%>
+<h3>Manage passwords</h3>
+<table class="topiclist">
+<tr><th>Name</th><th>Password</th><th>&nbsp;</th></tr>
+<%
+  odd = false
+  lines.each do |line|
+    style = (odd ? "odd" : "even")
+    odd = !odd
+    name,pwd = line.split(':')
+%>
+<tr class="<%= style%>"><td><%= name%></td><td><%= pwd %></td>
+<td>
+<form  action="<%= File.join(@web.script_prefix,'admin','passwords')%>" method="GET">
+<input type="submit" name="remove" value="Delete">
+<input type="hidden" name="user" value="<%= name %>">
+</form>
+</td>
+</tr>
+<% end %>
+</table>
+<form action="<%= File.join(@web.script_prefix,'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>
+<tr><td colspan=2><input type="submit" name="add" value="Add"></td></tr>
+</table>
+</form>

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

@@ -0,0 +1,26 @@
+<%
+  require 'Wiki2Go/Wiki2Go'
+  output = ''
+  subwiki = @request.params['wiki']
+  if !subwiki.nil? && subwiki.size > 0 then
+    subwiki = subwiki[0]
+    wiki = Wiki2Go::Wiki.new(@config)
+    pageweb = Wiki2Go::Web.new(@web.server,@web.port,@web.script_prefix,"regenerate",subwiki,'')
+    output = wiki.generate_html(pageweb)
+  end
+  storage = @config.storage
+  if @config.multi_wiki then
+    subwikis = storage.wikis
+  else
+    subwikis = [ '' ]
+  end
+%>
+<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>
+<% end %>
+</ul>
+<hr>
+<%= output %>

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

@@ -0,0 +1,19 @@
+<%
+username = ''
+bad_user = @request.params['bad_user']
+if !bad_user.nil? && bad_user.length > 0 then
+  username = bad_user
+end
+%>
+<h3>Remove spam</h3>
+<% if username.length > 0 then %>
+Remove spam added by <%= username %>
+<% end %>
+<form action="<%= File.join(@web.script_prefix,'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>
+</table>
+</form>

data/lib/Wiki2Go/Install/templates/admin_pages/update.txt ADDED Viewed

@@ -0,0 +1,13 @@
+<%
+   require 'FileUtils'
+   FileUtils.cd (@config.root_directory) {
+     command = "cvs update -d -R"
+     output = system(command)
+     result = $?
+   }
+   @config.log("Execute command '#{command}' => #{result}")
+%>
+<h3>CVS Update</h3>
+Result = <%= result %><br>
+Output = <%= output %>

data/lib/Wiki2Go/Install/templates/edit.htm ADDED Viewed

@@ -0,0 +1,74 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <BASE href="<%= current.web.base_url %>">
+        <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+        <META http-equiv="Pragma" content="no-cache">
+        <META name="Author" content="Pascal Van Cauwenberghe">
+        <META name="Keywords" content="ruby,wiki">
+        <LINK rel="stylesheet" href="<%= current.format.resource_url('style.css')%>" type="text/css">
+        <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="<%= current.format.resource_url('rss.xml')%>">
+                <TITLE>Edit
+                    <%= current.web.name %>
+                    -
+                    <%= current.web.current_page %>
+                </TITLE>
+    </HEAD>
+    <BODY>
+        <div id="container">
+            <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
+                <TR>
+                    <TD>
+                        <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
+                            <TR>
+                                <TD><H1>Edit
+                                        <%= current.format.search_link(current.web.current_page) %>
+                                    </H1>
+                                </TD>
+                                <td align="right"><%= current.format.view_link(current.web.name,"FrontPage","Home") %></td>
+                            </TR>
+                        </TABLE>
+                        <table border="0" cellpadding="0" cellspacing="0" width="100%" class="Body">
+                            <tr>
+                                <td width="100%">
+                                    <form action="<%= current.format.save_url %>" method="POST" id="form2" name="form2">
+                                        <p align="left">Edit the page in the text area.
+                                            <br>
+                                            To quit without changing the page,
+                                            <%= current.format.view_link(current.web.name,current.web.current_page,'click here to return to '+ current.web.current_page) %>
+                                        </p>
+<% if current.web.secure then %>
+                                        <p>Page name: <input type="text" name="title" value="<%= current.page.name %>" size="64"></p>
+<% else %>
+                                        <p>Author name: <input type="text" name="author" value="<%= current.web.alias %>" size="64"><input type="checkbox" name="remember_me" value="on" checked>Remember me</p>
+<% end %>
+                                        <p align="center"><textarea name="text" rows="35" cols="96">$TEXT$</textarea><br>
+                                            <input type="submit" value=" Save " name="save"><input type="reset" value=" Undo changes "> </p>
+                                    </form>
+                                    <p align="left"><em>Don't forget to follow the <a href="http://wiki2go.nayima.be/Wiki2Go/TextFormattingRules.html" target="_blank">TextFormatting rules</a></em></p>
+                                </td>
+                            </tr>
+                        </table>
+                        <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer" ID="Table1">
+                            <TR>
+                                <TD width="50%"><%= current.format.changes_link('Recent changes')%></TD>
+                                <TD width="50%">
+                                    <FORM action="<%= current.format.search_url %>" method="post" id="form1" name="form1">
+                                        Search: <INPUT name="text" size="30" ID="Text1">
+                                    </FORM>
+                                </TD>
+                            </TR>
+                            <TR>
+                                <td><a href="<%= current.format.resource_url('rss.xml')%>"><img src="html/xml.gif" 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>
+             </TR>
+           </TABLE>
+         </TD>
+       </TR>
+     </TABLE>
+    </div>
+  </BODY>
+</HTML>

data/lib/Wiki2Go/Install/templates/pagelist.htm ADDED Viewed

@@ -0,0 +1,82 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <BASE href="<%= current.web.base_url %>">
+        <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+        <META http-equiv="Pragma" content="no-cache">
+        <META name="Author" content="Pascal Van Cauwenberghe">
+        <META name="Keywords" content="ruby,wiki">
+        <LINK rel="stylesheet" href="<%= current.format.resource_url('style.css')%>" type="text/css">
+        <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="<%= current.format.resource_url('rss.xml')%>">
+    <TITLE><%= current.title %></TITLE>
+    </HEAD>
+    <BODY>
+        <div id="container">
+            <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
+                <TR>
+                    <TD>
+                        <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
+                            <TR>
+                                <TD><H1><%= current.title %></H1></TD>
+                                <td align="right"><%= current.format.view_link(current.web.name,"FrontPage","Home")%></td>
+                            </TR>
+                        </TABLE>
+                        <TABLE border="0" cellpadding="0" cellspacing="8" width="100%" class="Body">
+                            <TR>
+                                <TD width="100%">
+                                    <TABLE border="0" width="100%">
+                                        <TR>
+                                            <td>
+                                                <table class="topiclist">
+<%
+    odd = false
+    lastdate = ""
+    current.pages.each do | topic |
+      style = (odd ? "odd" : "even")
+      odd = !odd
+      thisdate =  topic.lastmodified.strftime("%d/%m/%Y")
+%>
+                                    <tr class="<%= style %>">
+                                        <td class="date"><%= (thisdate != lastdate ? thisdate : '&nbsp;') %></td>
+                                        <td class="topic"><%= current.format.view_link(current.web.name,topic.title,topic.name)%></td>
+                                        <td class="author"><%= topic.alias %><%= topic.author != topic.alias ? ' (' + topic.author + ')' : '' %></td>
+<% if current.web.secure %>
+<td class="topic">
+<a href="<%= current.format.removespam_url(topic.author) %>">SPAM!</a>
+</td>
+<% end %>
+                                    </tr>
+<%
+      lastdate = thisdate
+    end
+%>
+                                                </table>
+                                            </td>
+                                        </TR>
+                                    </TABLE>
+                                </TD>
+                            </TR>
+                        </TABLE>
+                        <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
+                            <TR>
+                                <TD width="50%"><%= current.format.changes_link('Recent changes')%></TD>
+                                <TD width="50%">
+                                    <FORM action="<%= current.format.search_url %>" method="post" id="form1" name="form1">
+                                        Search: <INPUT name="text" size="30" ID="Text1">
+                                    </FORM>
+                                </TD>
+                            </TR>
+                            <TR>
+                                <td><a href="<%= current.format.resource_url('rss.xml')%>"><img src="html/xml.gif" 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>
+                            </TR>
+                        </TABLE>
+                    </TD>
+                </TR>
+            </TABLE>
+        </div>
+    </BODY>
+</HTML>

data/lib/Wiki2Go/Install/templates/rss.xml ADDED Viewed

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<rss version="2.0" >
+	<channel>
+		<title>$WEB$ wiki</title>
+		<link>$BASEURL$</link>
+		<description>$WEB$ wiki</description>
+		<language>en-us</language>
+		<pubDate>$DATE$</pubDate>
+		<lastBuildDate>$DATE$</lastBuildDate>
+		<docs>http://backend.userland.com/rss</docs>

data/lib/Wiki2Go/Install/templates/versionlist.htm ADDED Viewed

@@ -0,0 +1,84 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <BASE href="<%= current.web.base_url %>">
+        <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+        <META http-equiv="Pragma" content="no-cache">
+        <META name="Author" content="Pascal Van Cauwenberghe">
+        <META name="Keywords" content="ruby,wiki">
+        <LINK rel="stylesheet" href="<%= current.format.resource_url('style.css')%>" type="text/css">
+        <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="<%= current.format.resource_url('rss.xml')%>">
+    <TITLE><%= current.title %></TITLE>
+    </HEAD>
+    <BODY>
+        <div id="container">
+            <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
+                <TR>
+                    <TD>
+                        <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
+                            <TR>
+                                <TD><H1><%= current.title %></H1></TD>
+                                <td align="right"><%= current.format.view_link(current.web.name,"FrontPage","Home")%></td>
+                            </TR>
+                        </TABLE>
+                        <TABLE border="0" cellpadding="0" cellspacing="8" width="100%" class="Body">
+                            <TR>
+                                <TD width="100%">
+                                    <TABLE border="0" width="100%">
+                                        <TR>
+                                            <td>
+                                                <table class="topiclist">
+<%
+    odd = false
+    lastdate = ""
+    version_id = current.pages.length
+    current.pages.each do | topic |
+      version_id -= 1
+      style = (odd ? "odd" : "even")
+      odd = !odd
+      thisdate =  topic.lastmodified.strftime("%d/%m/%Y")
+%>
+                                    <tr class="<%= style %>">
+                                        <td class="date"><%= (thisdate != lastdate ? thisdate : '&nbsp;') %></td>
+                                        <td class="author"><%= topic.author %></td>
+                                        <td><%= current.format.view_version_link(current.web.name,topic.title,"view",{'version' => version_id.to_s})%></td>
+<% if current.web.secure %>
+<td class="topic">
+<a href="<%= current.format.removespam_url(topic.author) %>">SPAM!</a>
+</td>
+<% end %>
+                                    </tr>
+<%
+      lastdate = thisdate
+    end
+%>
+                                                </table>
+                                            </td>
+                                        </TR>
+                                    </TABLE>
+                                </TD>
+                            </TR>
+                        </TABLE>
+                        <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer" ID="Table1">
+                            <TR>
+                                <TD width="50%"><%= current.format.changes_link('Recent changes')%></TD>
+                                <TD width="50%">
+                                    <FORM action="<%= current.format.search_url %>" method="post" id="form1" name="form1">
+                                        Search: <INPUT name="text" size="30" ID="Text1">
+                                    </FORM>
+                                </TD>
+                            </TR>
+                            <TR>
+                                <td><a href="<%= current.format.resource_url('rss.xml')%>"><img src="html/xml.gif" 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>
+                            </TR>
+                        </TABLE>
+                    </TD>
+                </TR>
+            </TABLE>
+        </div>
+    </BODY>
+</HTML>

data/lib/Wiki2Go/Install/templates/view.htm ADDED Viewed

@@ -0,0 +1,72 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <BASE href="<%= current.web.base_url %>">
+        <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+        <META http-equiv="Pragma" content="no-cache">
+        <META name="Author" content="Pascal Van Cauwenberghe">
+        <META name="Keywords" content="ruby,wiki">
+        <LINK rel="stylesheet" href="<%= current.format.resource_url('style.css')%>" type="text/css">
+        <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="<%= current.format.resource_url('rss.xml')%>">
+        <TITLE><%= current.web.name %>-<%= current.page.name %></TITLE>
+    </HEAD>
+    <BODY>
+        <div id="container">
+            <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
+                <TR>
+                    <TD>
+                        <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
+                            <TR>
+                                <TD><h1><%= current.format.search_link2(current.web.current_page,current.page.name) %></h1>
+                                </TD>
+                                <td align="right"><%= current.format.view_link(current.web.name,"FrontPage","Home")%></td>
+                            </TR>
+                        </TABLE>
+                        <TABLE border="0" cellpadding="8" cellspacing="0" width="100%" class="Body">
+                            <TR>
+                                <TD width="100%">
+<%= current.text %>
+                                </TD>
+                            </TR>
+                        </TABLE>
+                        <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
+                            <TR>
+                                <TD width="50%"><%= current.format.changes_link('Recent changes')%></TD>
+                                <TD width="50%"><%= current.format.edit_this_link(current.web.name,current.web.current_page,'Edit this page')%></TD>
+                            </TR>
+                            <TR>
+                                <TD width="50%">
+                                    <FORM action="<%= current.format.search_url %>" method="post" id="form1" name="form1">
+                                        Search: <INPUT name="text" size="30" ID="Text1">
+                                    </FORM>
+                                </TD>
+                                <TD width="50%">
+                                <% if current.web.secure %>
+                                <FORM METHOD="POST" ACTION="<%= current.format.verb_url('upload') %>" ENCTYPE="multipart/form-data">
+                                File: <INPUT TYPE="FILE" NAME="FILE" ID="File">
+                                <INPUT TYPE="SUBMIT" VALUE="Send" ID="SendFile" NAME="SendFile">
+                                </FORM>
+                                <% end %>
+                                </TD>
+                            </TR>
+                            <TR><TD colspan="2"></TD></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/xml.gif" 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="http://www.w3.org/Icons/valid-html401" alt="Verify if layout is correct!" height="31" width="88"></a>
+                                </TD>
+                            </TR>
+                        </TABLE>
+                    </TD>
+                </TR>
+            </TABLE>
+        </div>
+    </BODY>
+</HTML>