Wiki2Go 1.17.5 → 1.22.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 (108) hide show
  1. data/bin/Wiki2Go_firewall_blacklist.rb +8 -0
  2. data/bin/Wiki2Go_make_cvs_repository.rb +1 -0
  3. data/bin/Wiki2Go_make_site.rb +1 -2
  4. data/bin/Wiki2Go_update_site.rb +1 -2
  5. data/lib/Web2Go/CGIRequest.rb +8 -2
  6. data/lib/Web2Go/CGIResponse.rb +17 -14
  7. data/lib/Web2Go/MockRequest.rb +12 -2
  8. data/lib/Web2Go/MockResponse.rb +10 -7
  9. data/lib/Web2Go/WebrickRequest.rb +106 -101
  10. data/lib/Web2Go/WebrickResponse.rb +4 -8
  11. data/lib/Wiki2Go/BlackList.rb +48 -25
  12. data/lib/Wiki2Go/DotGraphics.rb +1 -1
  13. data/lib/Wiki2Go/FileStorage.rb +266 -266
  14. data/lib/Wiki2Go/HTMLFormatter.rb +28 -0
  15. data/lib/Wiki2Go/Install/config/chonqed_blacklist.txt +418 -0
  16. data/lib/Wiki2Go/Install/config/passwords +1 -1
  17. data/lib/Wiki2Go/Install/config/url_blacklist.txt +3855 -0
  18. data/lib/Wiki2Go/Install/make_repository.rb +32 -26
  19. data/lib/Wiki2Go/Install/make_site.rb +197 -111
  20. data/lib/Wiki2Go/Install/site/error.html +1 -1
  21. data/lib/Wiki2Go/Install/site/robots.txt +10 -1
  22. data/lib/Wiki2Go/Install/site/style.css +129 -64
  23. data/lib/Wiki2Go/Install/templates/admin.htm +1 -1
  24. data/lib/Wiki2Go/Install/templates/admin_pages/edit.txt +2 -1
  25. data/lib/Wiki2Go/Install/templates/admin_pages/format_for_fck.txt +31 -0
  26. data/lib/Wiki2Go/Install/templates/admin_pages/passwords.txt +1 -1
  27. data/lib/Wiki2Go/Install/templates/edit.htm +62 -46
  28. data/lib/Wiki2Go/Install/templates/full_footer.htm +31 -33
  29. data/lib/Wiki2Go/Install/templates/header.htm +0 -1
  30. data/lib/Wiki2Go/Install/templates/menu.htm +29 -0
  31. data/lib/Wiki2Go/Install/templates/pagelist.htm +46 -43
  32. data/lib/Wiki2Go/Install/templates/simple_footer.htm +20 -16
  33. data/lib/Wiki2Go/Install/templates/versionlist.htm +52 -40
  34. data/lib/Wiki2Go/Install/templates/view.htm +46 -29
  35. data/lib/Wiki2Go/Install/templates/wikiedit.htm +63 -0
  36. data/lib/Wiki2Go/Install/wiki/delete.png +0 -0
  37. data/lib/Wiki2Go/Install/wiki/style.css +133 -63
  38. data/lib/Wiki2Go/LineFormatter.rb +345 -197
  39. data/lib/Wiki2Go/Page.rb +16 -3
  40. data/lib/Wiki2Go/PrivateWikiConfig.rb +5 -5
  41. data/lib/Wiki2Go/PublicWikiConfig.rb +83 -37
  42. data/lib/Wiki2Go/ReadWriteWikiConfig.rb +8 -8
  43. data/lib/Wiki2Go/Server.rb +6 -1
  44. data/lib/Wiki2Go/SpamFilter.rb +32 -41
  45. data/lib/Wiki2Go/Web.rb +10 -3
  46. data/lib/Wiki2Go/Wiki2Go.rb +301 -94
  47. data/lib/Wiki2Go/Wiki2GoConfig.rb +87 -6
  48. data/lib/Wiki2Go/Wiki2GoServlet.rb +66 -12
  49. data/lib/Wiki2Go/WikiFormatter.rb +60 -30
  50. data/lib/Wiki2Go/cgi/diff.rb +20 -0
  51. data/lib/Wiki2Go/cgi/secure/log_rss.rb +21 -0
  52. data/lib/Wiki2Go/cgi/sidebyside.rb +20 -0
  53. data/lib/Wiki2Go/cgi/wikiedit.rb +20 -0
  54. data/lib/Wiki2Go/firewall_blacklist.rb +88 -0
  55. data/test/All.rb +5 -2
  56. data/test/TestBlackList.rb +70 -14
  57. data/test/TestConfig.rb +5 -5
  58. data/test/TestDiff.rb +95 -0
  59. data/test/TestFormatter.rb +14 -16
  60. data/test/TestHTMLFormatter.rb +37 -0
  61. data/test/TestInstall.rb +70 -27
  62. data/test/TestLineFormatter.rb +71 -15
  63. data/test/TestRSS.rb +8 -7
  64. data/test/TestRepository.rb +50 -0
  65. data/test/TestServer.rb +3 -8
  66. data/test/TestSpamFilter.rb +33 -1
  67. data/test/TestStorage.rb +11 -0
  68. data/test/TestWeb.rb +2 -2
  69. data/test/TestWiki2Go.rb +766 -166
  70. data/test/TestWiki2GoServlet.rb +1122 -524
  71. data/test/UnitTestFiles.rb +7 -3
  72. data/test/Wiki2GoConfigForTest.rb +40 -6
  73. data/test/checksite.rb +17 -50
  74. data/test/test_firewall_blacklist.rb +131 -0
  75. data/test/test_page.rb +45 -0
  76. data/test/testdata/Registration.rbl.txt +7 -0
  77. data/test/testdata/config/url_blacklist.txt +38822 -0
  78. data/test/testdata/expected_changes.html +1 -2
  79. data/test/testdata/expected_edit.html +108 -59
  80. data/test/testdata/expected_full_rss.xml +2 -2
  81. data/test/testdata/expected_out.html +97 -61
  82. data/test/testdata/expected_put.html +88 -53
  83. data/test/testdata/expected_save.html +88 -52
  84. data/test/testdata/expected_savehtml.html +88 -52
  85. data/test/testdata/expected_search.html +68 -53
  86. data/test/testdata/expected_upload.html +88 -53
  87. data/test/testdata/expected_versions.html +97 -82
  88. data/test/testdata/expected_view.html +97 -61
  89. data/test/testdata/firewall/iptables.config +37 -0
  90. data/test/testdata/firewall/user_blacklist.txt +162 -0
  91. data/test/testdata/logs/wiki.log +652 -0
  92. data/test/testdata/logs/wiki.log.0 +113 -0
  93. data/test/testdata/logs/wiki.log.1 +113 -0
  94. data/test/testdata/logs/wiki.log.2 +113 -0
  95. data/test/testdata/logs/wiki.log.3 +115 -0
  96. data/test/testdata/logs/wiki.log.4 +5 -0
  97. data/test/testdata/logs/wiki.log.5 +7 -0
  98. data/test/testdata/logs/wiki.log.6 +5 -0
  99. data/test/testdata/logs/wiki.log.7 +118 -0
  100. data/test/testdata/logs/wiki.log.8 +12 -0
  101. data/test/testdata/site/html/Xpday/rss.xml +53 -103
  102. data/test/testdata/texts/Bugs/FrontPage.txt +6 -0
  103. data/test/testdata/texts/Bugs/NoHidden.spam +17850 -0
  104. data/test/testdata/texts/Bugs/PairProgrammingParties.spam +102 -0
  105. data/test/testdata/texts/Bugs/PairProgrammingParties.txt +99 -0
  106. metadata +53 -7
  107. data/test/TestMail.rb +0 -29
  108. data/test/gc.log +0 -2
data/test/testdata/expected_save.html CHANGED
@@ -1,66 +1,102 @@
1
1
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2
2
  <HTML>
3
3
  <HEAD>
4
- <BASE href="http://localhost/">
5
4
  <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
6
5
  <META http-equiv="Pragma" content="no-cache">
7
6
  <META name="Author" content="Pascal Van Cauwenberghe">
8
7
  <META name="Keywords" content="ruby,wiki">
9
8
  <LINK rel="stylesheet" href="/html/Xpday/style.css" type="text/css">
10
9
  <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/Xpday/rss.xml">
11
- <TITLE>Xpday-FrontPagename</TITLE>
10
+ <TITLE>
11
+
12
+ Xpday
13
+ -
14
+
15
+ FrontPagename
16
+ </TITLE>
12
17
  </HEAD>
13
18
  <BODY>
14
- <div id="container">
15
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
16
- <TR>
17
- <TD>
18
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
19
- <TR>
20
- <TD><h1><a href="/search/Xpday?text=test">FrontPagename</a></h1>
21
- </TD>
22
- <td align="right"><a href="/view/Xpday/FrontPage">Home</a></td>
23
- </TR>
24
- </TABLE>
25
- <TABLE border="0" cellpadding="8" cellspacing="0" width="100%" class="Body">
26
- <TR>
27
- <TD width="100%">
28
- <a href="/view/Xpday/FrontPage">FrontPage</a>
29
- </TD>
30
- </TR>
31
- </TABLE>
32
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
33
- <TR>
34
- <TD width="50%"><a href="/changes/Xpday">Recent changes</a></TD>
35
- <TD width="50%"><a href="/edit/Xpday/test">Edit this page</a></TD>
36
- </TR>
37
- <TR>
38
- <TD width="50%">
39
- <FORM action="/search/Xpday" method="post" id="form1" name="form1">
40
- Search: <INPUT name="text" size="30" ID="Text1">
41
- </FORM>
42
- </TD>
43
- <TD width="50%">
44
-
45
- </TD>
46
- </TR>
47
- <TR>
48
- <TD colspan="2"></TD>
49
- </TR>
50
- <TR>
51
- <td>Changed on DATE by unknown
52
- <a href="/html/Xpday/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
53
- </td>
54
- <TD align="right">
55
- Contact the site administrator: <a href="/view/Xpday/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
56
- <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost/view/Xpday/test">
57
- <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
58
- </TD>
59
- </TR>
19
+ <table id="container">
20
+ <tr>
21
+ <td colspan="2" id="header">
22
+ <TABLE border="0" cellpadding="0" cellspacing="0" width="95%" class="Header">
23
+ <TR>
24
+ <TD><h1><a href="/search/Xpday?text=test" rel="nofollow">FrontPagename</a>
25
+
26
+ </h1>
27
+ </TD>
28
+ <td align="right"><a href="/view/Xpday/FrontPage">Home</a></td>
29
+ </TR>
30
+ </TABLE>
31
+ </td>
32
+ </tr>
33
+ <tr>
34
+ <td id="menu" valign="top" nowrap>
35
+
36
+ <ul>
37
+ <li>
38
+ <a href="/versions/Xpday/test" rel="nofollow">Page&nbsp;History</a>
39
+ </li>
40
+ <li>
41
+ <a href="/sidebyside/Xpday/test" rel="nofollow">What&nbsp;changed?</a>
42
+ </li>
43
+ <li>
44
+ <a href="/diff/Xpday/test" rel="nofollow">Diff</a>
45
+ </li>
46
+ <li>
47
+ <a href="/wikiedit/Xpday/test" rel="nofollow">Edit&nbsp;this&nbsp;page</a>
48
+ </li>
49
+ </ul>
50
+ <hr>
51
+
52
+ <ul>
53
+ <li>
54
+ <a href="/changes/Xpday" rel="nofollow">Recent&nbsp;changes</a>
55
+ </li>
56
+ <li>
57
+ <a href="/html/Xpday/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
58
+ </li>
59
+ </ul>
60
+ </td>
61
+ <td id="body" width="100%" valign="top">
62
+ <a href="/view/Xpday/FrontPage">FrontPage</a>
63
+ </td>
64
+ </tr>
65
+ <tr>
66
+ <td colspan="2" id="footer">
67
+ <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
68
+ <TR>
69
+ <TD width="50%">
70
+
71
+ <a href="/sidebyside/Xpday/test" rel="nofollow">Changed</a>
72
+ on
73
+ DATE
74
+ by
75
+ <a href="/search/Xpday?text=unknown" rel="nofollow">unknown</a>
76
+
77
+ </TD>
78
+ <TD width="50%" align="right">
79
+ Contact the site administrator:
80
+ <a href="/view/Xpday/MailFormattingRules" rel="nofollow" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
81
+ </TD>
82
+ </TR>
83
+ <tr><td colspan="2"><hr></td></tr>
84
+ <tr>
85
+ <td><FORM action="/search/Xpday" method="post" id="search" name="search">
86
+ Search for <INPUT name="text" size="30" ID="Text1"> <input type="submit" name="Go" value="Go">
87
+ </FORM>
88
+ </td>
89
+ <td>
90
+
91
+ </td>
92
+ </tr>
60
93
  </TABLE>
61
- </TD>
62
- </TR>
63
- </TABLE>
64
- </div>
94
+ </td>
95
+ </tr>
96
+ </table>
97
+ <span style="float:right">
98
+ <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost/view/Xpday/test">
99
+ <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
100
+ </span>
65
101
  </BODY>
66
102
  </HTML>
data/test/testdata/expected_savehtml.html CHANGED
@@ -1,66 +1,102 @@
1
1
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2
2
  <HTML>
3
3
  <HEAD>
4
- <BASE href="http://localhost/">
5
4
  <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
6
5
  <META http-equiv="Pragma" content="no-cache">
7
6
  <META name="Author" content="Pascal Van Cauwenberghe">
8
7
  <META name="Keywords" content="ruby,wiki">
9
8
  <LINK rel="stylesheet" href="/html/Xpday/style.css" type="text/css">
10
9
  <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/Xpday/rss.xml">
11
- <TITLE>Xpday-Frontpagename</TITLE>
10
+ <TITLE>
11
+
12
+ Xpday
13
+ -
14
+
15
+ Frontpagename
16
+ </TITLE>
12
17
  </HEAD>
13
18
  <BODY>
14
- <div id="container">
15
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
16
- <TR>
17
- <TD>
18
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
19
- <TR>
20
- <TD><h1><a href="/search/Xpday?text=test">Frontpagename</a></h1>
21
- </TD>
22
- <td align="right"><a href="/Xpday/FrontPage.html">Home</a></td>
23
- </TR>
24
- </TABLE>
25
- <TABLE border="0" cellpadding="8" cellspacing="0" width="100%" class="Body">
26
- <TR>
27
- <TD width="100%">
28
- <a href="/Xpday/FrontPage.html">FrontPage</a>
29
- </TD>
30
- </TR>
31
- </TABLE>
32
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
33
- <TR>
34
- <TD width="50%"><a href="/Xpday/recent_changes.html">Recent changes</a></TD>
35
- <TD width="50%"><a href="/edit/Xpday/test">Edit this page</a></TD>
36
- </TR>
37
- <TR>
38
- <TD width="50%">
39
- <FORM action="/search/Xpday" method="post" id="form1" name="form1">
40
- Search: <INPUT name="text" size="30" ID="Text1">
41
- </FORM>
42
- </TD>
43
- <TD width="50%">
44
-
45
- </TD>
46
- </TR>
47
- <TR>
48
- <TD colspan="2"></TD>
49
- </TR>
50
- <TR>
51
- <td>Changed on DATE by unknown
52
- <a href="/html/Xpday/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
53
- </td>
54
- <TD align="right">
55
- Contact the site administrator: <a href="/Xpday/MailFormattingRules.html" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
56
- <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost/Xpday/test.html">
57
- <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
58
- </TD>
59
- </TR>
19
+ <table id="container">
20
+ <tr>
21
+ <td colspan="2" id="header">
22
+ <TABLE border="0" cellpadding="0" cellspacing="0" width="95%" class="Header">
23
+ <TR>
24
+ <TD><h1><a href="/search/Xpday?text=test" rel="nofollow">Frontpagename</a>
25
+
26
+ </h1>
27
+ </TD>
28
+ <td align="right"><a href="/Xpday/FrontPage.html">Home</a></td>
29
+ </TR>
30
+ </TABLE>
31
+ </td>
32
+ </tr>
33
+ <tr>
34
+ <td id="menu" valign="top" nowrap>
35
+
36
+ <ul>
37
+ <li>
38
+ <a href="/versions/Xpday/test" rel="nofollow">Page&nbsp;History</a>
39
+ </li>
40
+ <li>
41
+ <a href="/sidebyside/Xpday/test" rel="nofollow">What&nbsp;changed?</a>
42
+ </li>
43
+ <li>
44
+ <a href="/diff/Xpday/test" rel="nofollow">Diff</a>
45
+ </li>
46
+ <li>
47
+ <a href="/wikiedit/Xpday/test" rel="nofollow">Edit&nbsp;this&nbsp;page</a>
48
+ </li>
49
+ </ul>
50
+ <hr>
51
+
52
+ <ul>
53
+ <li>
54
+ <a href="/Xpday/recent_changes.html" rel="nofollow">Recent&nbsp;changes</a>
55
+ </li>
56
+ <li>
57
+ <a href="/html/Xpday/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
58
+ </li>
59
+ </ul>
60
+ </td>
61
+ <td id="body" width="100%" valign="top">
62
+ <a href="/Xpday/FrontPage.html">FrontPage</a>
63
+ </td>
64
+ </tr>
65
+ <tr>
66
+ <td colspan="2" id="footer">
67
+ <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
68
+ <TR>
69
+ <TD width="50%">
70
+
71
+ <a href="/sidebyside/Xpday/test" rel="nofollow">Changed</a>
72
+ on
73
+ DATE
74
+ by
75
+ <a href="/search/Xpday?text=unknown" rel="nofollow">unknown</a>
76
+
77
+ </TD>
78
+ <TD width="50%" align="right">
79
+ Contact the site administrator:
80
+ <a href="/Xpday/MailFormattingRules.html" rel="nofollow" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
81
+ </TD>
82
+ </TR>
83
+ <tr><td colspan="2"><hr></td></tr>
84
+ <tr>
85
+ <td><FORM action="/search/Xpday" method="post" id="search" name="search">
86
+ Search for <INPUT name="text" size="30" ID="Text1"> <input type="submit" name="Go" value="Go">
87
+ </FORM>
88
+ </td>
89
+ <td>
90
+
91
+ </td>
92
+ </tr>
60
93
  </TABLE>
61
- </TD>
62
- </TR>
63
- </TABLE>
64
- </div>
94
+ </td>
95
+ </tr>
96
+ </table>
97
+ <span style="float:right">
98
+ <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost/Xpday/test.html">
99
+ <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
100
+ </span>
65
101
  </BODY>
66
102
  </HTML>
data/test/testdata/expected_search.html CHANGED
@@ -1,67 +1,82 @@
1
1
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2
2
  <HTML>
3
3
  <HEAD>
4
- <BASE href="http://localhost/">
5
4
  <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
6
5
  <META http-equiv="Pragma" content="no-cache">
7
6
  <META name="Author" content="Pascal Van Cauwenberghe">
8
7
  <META name="Keywords" content="ruby,wiki">
9
8
  <LINK rel="stylesheet" href="/html/Xpday/style.css" type="text/css">
10
9
  <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/Xpday/rss.xml">
11
- <TITLE>Search for 'Benelux'</TITLE>
10
+ <TITLE>
11
+ Search for 'Benelux'
12
+ </TITLE>
12
13
  </HEAD>
13
14
  <BODY>
14
- <div id="container">
15
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
16
- <TR>
17
- <TD>
18
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
19
- <TR>
20
- <TD><H1>Search for 'Benelux'</H1></TD>
21
- <td align="right"><a href="/view/Xpday/FrontPage">Home</a></td>
22
- </TR>
23
- </TABLE>
24
- <TABLE border="0" cellpadding="0" cellspacing="8" width="100%" class="Body">
25
- <TR>
26
- <TD width="100%">
27
- <TABLE border="0" width="100%">
28
- <TR>
29
- <td>
30
- <table class="topiclist">
31
-
32
- <tr class="even">
33
- <td class="date">08/03/2005</td>
34
- <td class="topic"><a href="/view/Xpday/FrontPage">homepage</a></td>
35
- <td class="author">pvc</td>
36
-
37
- </tr>
38
-
39
- </table>
40
- </td>
41
- </TR>
42
- </TABLE>
43
- </TD>
44
- </TR>
45
- </TABLE>
46
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer" ID="Table1">
47
- <TR>
48
- <TD width="50%"><a href="/changes/Xpday">Recent changes</a></TD>
49
- <TD width="50%">
50
- <FORM action="/search/Xpday" method="post" id="form1" name="form1">
51
- Search: <INPUT name="text" size="30" ID="Text1">
52
- </FORM>
53
- </TD>
54
- </TR>
55
- <TR>
56
- <td><a href="/html/Xpday/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep informed"></a></td>
57
- <TD align="right">
58
- Contact the site administrator: <a href="/view/Xpday/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
59
- </TD>
60
- </TR>
15
+ <table id="container">
16
+ <TR>
17
+ <TD colspan="2" id="header">
18
+ <TABLE border="0" cellpadding="0" cellspacing="0" width="95%" class="Header">
19
+ <TR>
20
+ <TD><H1>Search for 'Benelux'</H1>
21
+ </TD>
22
+ <td align="right"><a href="/view/Xpday/FrontPage">Home</a></td>
23
+ </TR>
24
+ </TABLE>
25
+ </TD>
26
+ </TR>
27
+ <tr>
28
+ <td id="menu" valign="top" nowrap>
29
+
30
+ <ul>
31
+ <li>
32
+ <a href="/changes/Xpday" rel="nofollow">Recent&nbsp;changes</a>
33
+ </li>
34
+ <li>
35
+ <a href="/html/Xpday/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
36
+ </li>
37
+ </ul>
38
+ </td>
39
+ <td id="body" width="100%" valign="top">
40
+ <table class="topiclist">
41
+
42
+ <tr class="even">
43
+ <td class="date">08/03/2005</td>
44
+ <td class="topic"><a href="/view/Xpday/FrontPage">homepage</a></td>
45
+ <td class="author"><a href="/search/Xpday?text=pvc" rel="nofollow">pvc</a></td>
46
+ <td class="author"><a href="/versions/Xpday/FrontPage" rel="nofollow">History</a></td>
47
+
48
+ </tr>
49
+
50
+ </table>
51
+ </td>
52
+ </tr>
53
+ <tr>
54
+ <td colspan="2" id="footer">
55
+ <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
56
+ <TR>
57
+ <TD width="50%">
58
+
59
+ &nbsp;
60
+
61
+ </TD>
62
+ <TD width="50%" align="right">
63
+ Contact the site administrator:
64
+ <a href="/view/Xpday/MailFormattingRules" rel="nofollow" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
65
+ </TD>
66
+ </TR>
67
+ <tr><td colspan="2"><hr></td></tr>
68
+ <tr>
69
+ <td><FORM action="/search/Xpday" method="post" id="search" name="search">
70
+ Search for <INPUT name="text" size="30" ID="Text1"> <input type="submit" name="Go" value="Go">
71
+ </FORM>
72
+ </td>
73
+ <td>
74
+
75
+ </td>
76
+ </tr>
61
77
  </TABLE>
62
- </TD>
63
- </TR>
64
- </TABLE>
65
- </div>
78
+ </td>
79
+ </tr>
80
+ </table>
66
81
  </BODY>
67
82
  </HTML>
data/test/testdata/expected_upload.html CHANGED
@@ -1,69 +1,104 @@
1
1
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2
2
  <HTML>
3
3
  <HEAD>
4
- <BASE href="http://localhost/">
5
4
  <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
6
5
  <META http-equiv="Pragma" content="no-cache">
7
6
  <META name="Author" content="Pascal Van Cauwenberghe">
8
7
  <META name="Keywords" content="ruby,wiki">
9
8
  <LINK rel="stylesheet" href="/html/Xpday/style.css" type="text/css">
10
9
  <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/Xpday/rss.xml">
11
- <TITLE>Xpday-simple</TITLE>
10
+ <TITLE>
11
+
12
+ Xpday
13
+ -
14
+
15
+ simple
16
+ </TITLE>
12
17
  </HEAD>
13
18
  <BODY>
14
- <div id="container">
15
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
16
- <TR>
17
- <TD>
18
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
19
- <TR>
20
- <TD><h1><a href="/search/Xpday?text=UploadPage">simple</a></h1>
21
- </TD>
22
- <td align="right"><a href="/view/Xpday/FrontPage">Home</a></td>
23
- </TR>
24
- </TABLE>
25
- <TABLE border="0" cellpadding="8" cellspacing="0" width="100%" class="Body">
26
- <TR>
27
- <TD width="100%">
28
- A simple page\n
29
- <p>
19
+ <table id="container">
20
+ <tr>
21
+ <td colspan="2" id="header">
22
+ <TABLE border="0" cellpadding="0" cellspacing="0" width="95%" class="Header">
23
+ <TR>
24
+ <TD><h1><a href="/search/Xpday?text=UploadPage" rel="nofollow">simple</a>
25
+
26
+ </h1>
27
+ </TD>
28
+ <td align="right"><a href="/view/Xpday/FrontPage">Home</a></td>
29
+ </TR>
30
+ </TABLE>
31
+ </td>
32
+ </tr>
33
+ <tr>
34
+ <td id="menu" valign="top" nowrap>
35
+
36
+ <ul>
37
+ <li>
38
+ <a href="/versions/Xpday/UploadPage" rel="nofollow">Page&nbsp;History</a>
39
+ </li>
40
+ <li>
41
+ <a href="/sidebyside/Xpday/UploadPage" rel="nofollow">What&nbsp;changed?</a>
42
+ </li>
43
+ <li>
44
+ <a href="/diff/Xpday/UploadPage" rel="nofollow">Diff</a>
45
+ </li>
46
+ <li>
47
+ <a href="/wikiedit/Xpday/UploadPage" rel="nofollow">Edit&nbsp;this&nbsp;page</a>
48
+ </li>
49
+ </ul>
50
+ <hr>
51
+
52
+ <ul>
53
+ <li>
54
+ <a href="/changes/Xpday" rel="nofollow">Recent&nbsp;changes</a>
55
+ </li>
56
+ <li>
57
+ <a href="/html/Xpday/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
58
+ </li>
59
+ </ul>
60
+ </td>
61
+ <td id="body" width="100%" valign="top">
62
+ A simple page\n
30
63
  <hr>
31
64
  <a href="/html/Xpday/brol.txt" target="_blank">brol.txt</a>
32
- </TD>
33
- </TR>
34
- </TABLE>
35
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
36
- <TR>
37
- <TD width="50%"><a href="/changes/Xpday">Recent changes</a></TD>
38
- <TD width="50%"><a href="/edit/Xpday/UploadPage">Edit this page</a></TD>
39
- </TR>
40
- <TR>
41
- <TD width="50%">
42
- <FORM action="/search/Xpday" method="post" id="form1" name="form1">
43
- Search: <INPUT name="text" size="30" ID="Text1">
44
- </FORM>
45
- </TD>
46
- <TD width="50%">
47
-
48
- </TD>
49
- </TR>
50
- <TR>
51
- <TD colspan="2"></TD>
52
- </TR>
53
- <TR>
54
- <td>Changed on DATE by unknown
55
- <a href="/html/Xpday/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
56
- </td>
57
- <TD align="right">
58
- Contact the site administrator: <a href="/view/Xpday/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
59
- <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost/view/Xpday/UploadPage">
60
- <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
61
- </TD>
62
- </TR>
65
+ </td>
66
+ </tr>
67
+ <tr>
68
+ <td colspan="2" id="footer">
69
+ <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
70
+ <TR>
71
+ <TD width="50%">
72
+
73
+ <a href="/sidebyside/Xpday/UploadPage" rel="nofollow">Changed</a>
74
+ on
75
+ DATE
76
+ by
77
+ <a href="/search/Xpday?text=unknown" rel="nofollow">unknown</a>
78
+
79
+ </TD>
80
+ <TD width="50%" align="right">
81
+ Contact the site administrator:
82
+ <a href="/view/Xpday/MailFormattingRules" rel="nofollow" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
83
+ </TD>
84
+ </TR>
85
+ <tr><td colspan="2"><hr></td></tr>
86
+ <tr>
87
+ <td><FORM action="/search/Xpday" method="post" id="search" name="search">
88
+ Search for <INPUT name="text" size="30" ID="Text1"> <input type="submit" name="Go" value="Go">
89
+ </FORM>
90
+ </td>
91
+ <td>
92
+
93
+ </td>
94
+ </tr>
63
95
  </TABLE>
64
- </TD>
65
- </TR>
66
- </TABLE>
67
- </div>
96
+ </td>
97
+ </tr>
98
+ </table>
99
+ <span style="float:right">
100
+ <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost/view/Xpday/UploadPage">
101
+ <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
102
+ </span>
68
103
  </BODY>
69
104
  </HTML>