summary refs log tree commit diff stats
path: root/theme
diff options
context:
space:
mode:
authorStarla Insigna <starla4444@gmail.com>2010-12-11 14:05:05 -0500
committerStarla Insigna <starla4444@gmail.com>2010-12-11 14:05:05 -0500
commit74db7a24d9c2230b104979f4e4981c57ff73de71 (patch)
tree3059bb0a955a662cd9e04208eb6276071cea4c8a /theme
parent9efe4feaf5e19e51a18a229a6db36c5508e9faea (diff)
downloadfourisland-74db7a24d9c2230b104979f4e4981c57ff73de71.tar.gz
fourisland-74db7a24d9c2230b104979f4e4981c57ff73de71.tar.bz2
fourisland-74db7a24d9c2230b104979f4e4981c57ff73de71.zip
Made Four Island 2 a little more sane
I spent the last few hours sanitizing the database and fixing huge bugs in the code. Among the changes made were:
- "Theoretically related posts" have been removed due to the lack of FULLTEXT index support in InnoDB tables
- Removed tons of stripslashes() calls that were used to remove slashes from records before I realized (while doing all of this work) that magic_quotes_gpc was on for some reason. I mean, like, come on!
- Replaced all non-library uses of htmlentities() with htmlspecialchars(), which basically does the same thing except it doesn't mangle Unicode.
- Completely eradicated polls.
Note that this does mean that all database backups prior to December 11th 2010 are now incompatible with Four Island.
Diffstat (limited to 'theme')
-rwxr-xr-xtheme/admin/header.tpl5
-rwxr-xr-xtheme/admin/welcome.tpl4
-rwxr-xr-xtheme/header.tpl13
-rwxr-xr-xtheme/layouts/4.5/headers.php3
-rwxr-xr-xtheme/layouts/4.5/layout.tpl1
-rwxr-xr-xtheme/layouts/4.5/navigation.css11
-rwxr-xr-xtheme/layouts/4.5/style.css1
-rwxr-xr-xtheme/layouts/6.2/layout.tpl7
-rwxr-xr-xtheme/layouts/7/layout.tpl7
-rwxr-xr-xtheme/layouts/subtle/layout.tpl7
10 files changed, 1 insertions, 58 deletions
diff --git a/theme/admin/header.tpl b/theme/admin/header.tpl index 62beb89..6def3fe 100755 --- a/theme/admin/header.tpl +++ b/theme/admin/header.tpl
@@ -22,7 +22,6 @@
22 <ul id="mainNav"> 22 <ul id="mainNav">
23 <li><a href="/admin/"<!--HOMEACTIVECAT-->>DASHBOARD</a></li> 23 <li><a href="/admin/"<!--HOMEACTIVECAT-->>DASHBOARD</a></li>
24 <li><a href="/admin/posts.php"<!--POSTSACTIVECAT-->>POSTS</a></li> 24 <li><a href="/admin/posts.php"<!--POSTSACTIVECAT-->>POSTS</a></li>
25 <li><a href="/admin/polls.php"<!--POLLSACTIVECAT-->>POLLS</a></li>
26 <li><a href="/admin/quotes.php"<!--QUOTESACTIVECAT-->>QUOTES</a></li> 25 <li><a href="/admin/quotes.php"<!--QUOTESACTIVECAT-->>QUOTES</a></li>
27 <li><a href="/admin/links.php"<!--LINKSACTIVECAT-->>LINKS</a></li> 26 <li><a href="/admin/links.php"<!--LINKSACTIVECAT-->>LINKS</a></li>
28 <li class="logout"><a href="/">FOUR ISLAND</a></li> 27 <li class="logout"><a href="/">FOUR ISLAND</a></li>
@@ -43,10 +42,6 @@
43 <li><a href="/admin/pending.php"<!--PENDINGACTIVE-->>Manage Pending Posts</a></li> 42 <li><a href="/admin/pending.php"<!--PENDINGACTIVE-->>Manage Pending Posts</a></li>
44 <li><a href="/admin/comments.php"<!--COMMENTSACTIVE-->>Moderate Comments</a></li> 43 <li><a href="/admin/comments.php"<!--COMMENTSACTIVE-->>Moderate Comments</a></li>
45 <!--END POSTSISACTIVECAT--> 44 <!--END POSTSISACTIVECAT-->
46 <!--BEGIN POLLSISACTIVECAT-->
47 <li><a href="/admin/newPoll.php"<!--NEWPOLLACTIVE-->>Write a new poll</a></li>
48 <li><a href="/admin/polls.php"<!--POLLSACTIVE-->>Manage Polls</a></li>
49 <!--END POLLSISACTIVECAT-->
50 <!--BEGIN QUOTESISACTIVECAT--> 45 <!--BEGIN QUOTESISACTIVECAT-->
51 <li><a href="/admin/quotes.php"<!--QUOTESACTIVE-->>Manage Quotes</a></li> 46 <li><a href="/admin/quotes.php"<!--QUOTESACTIVE-->>Manage Quotes</a></li>
52 <li><a href="/admin/modquotes.php"<!--MODQUOTESACTIVE-->>Moderate Quotes</a></li> 47 <li><a href="/admin/modquotes.php"<!--MODQUOTESACTIVE-->>Moderate Quotes</a></li>
diff --git a/theme/admin/welcome.tpl b/theme/admin/welcome.tpl index dc4e246..6c37c93 100755 --- a/theme/admin/welcome.tpl +++ b/theme/admin/welcome.tpl
@@ -9,9 +9,5 @@
9</p> 9</p>
10 10
11<p> 11<p>
12 There are <!--POLLS--> polls.
13</p>
14
15<p>
16 There are <!--QUOTES--> quotes, including <!--FLAGGED--> flagged quotes. There are also <!--MODCOM--> unmoderated quotes. 12 There are <!--QUOTES--> quotes, including <!--FLAGGED--> flagged quotes. There are also <!--MODCOM--> unmoderated quotes.
17</p> 13</p>
diff --git a/theme/header.tpl b/theme/header.tpl index 014e34b..bd1df91 100755 --- a/theme/header.tpl +++ b/theme/header.tpl
@@ -53,12 +53,6 @@
53 <!--BEGIN CREATE_HATNAV--> 53 <!--BEGIN CREATE_HATNAV-->
54 </ul> 54 </ul>
55 <!--END CREATE_HATNAV--> 55 <!--END CREATE_HATNAV-->
56
57 <div class="module rounded sidebar">
58 <h3>Poll of the Week</h3>
59
60 <!--POTW-->
61 </div>
62 56
63 <div class="module rounded sidebar"> 57 <div class="module rounded sidebar">
64 <h3>Affiliates</h3> 58 <h3>Affiliates</h3>
@@ -125,13 +119,6 @@
125 </a> 119 </a>
126 </li> 120 </li>
127 121
128 <li<!--POLLACTIVE-->>
129 <a href="/poll/">
130 <img src="/theme/images/icons/overlays.png" alt="Polls" />
131 <span>Polls</span>
132 </a>
133 </li>
134
135 <li<!--QUOTESACTIVE-->> 122 <li<!--QUOTESACTIVE-->>
136 <a href="/quotes/"> 123 <a href="/quotes/">
137 <img src="/theme/images/icons/16-file-page.png" alt="Quotes" /> 124 <img src="/theme/images/icons/16-file-page.png" alt="Quotes" />
diff --git a/theme/layouts/4.5/headers.php b/theme/layouts/4.5/headers.php index bb5a179..ee84e2d 100755 --- a/theme/layouts/4.5/headers.php +++ b/theme/layouts/4.5/headers.php
@@ -73,9 +73,6 @@ body.webs div#banner {
73body.quotes div#banner { 73body.quotes div#banner {
74 background-image: url("/theme/images/headers/quotes.png"); 74 background-image: url("/theme/images/headers/quotes.png");
75} 75}
76body.poll div#banner {
77 background-image: url("/theme/images/headers/potw.png");
78}
79/* AID-Based Headers */ 76/* AID-Based Headers */
80<?php 77<?php
81} 78}
diff --git a/theme/layouts/4.5/layout.tpl b/theme/layouts/4.5/layout.tpl index 27abd83..bb43e95 100755 --- a/theme/layouts/4.5/layout.tpl +++ b/theme/layouts/4.5/layout.tpl
@@ -45,7 +45,6 @@ AudioPlayer.setup("http://fourisland.com/theme/js/audio-player/player.swf", {
45 <LI id="bannernav-projects"><A HREF="http://projects.fourisland.com/"><B><SPAN>Projects</SPAN></B></A></LI> 45 <LI id="bannernav-projects"><A HREF="http://projects.fourisland.com/"><B><SPAN>Projects</SPAN></B></A></LI>
46 <LI id="bannernav-fourm"><A HREF="/fourm/"><B><SPAN>Fourm</SPAN></B></A></LI> 46 <LI id="bannernav-fourm"><A HREF="/fourm/"><B><SPAN>Fourm</SPAN></B></A></LI>
47 <LI id="bannernav-wiki"><A HREF="/wiki/"><B><SPAN>Wiki</SPAN></B></A></LI> 47 <LI id="bannernav-wiki"><A HREF="/wiki/"><B><SPAN>Wiki</SPAN></B></A></LI>
48 <LI id="bannernav-poll"><A HREF="/poll/"><B><SPAN>Poll</SPAN></B></A></LI>
49 <LI id="bannernav-quotes"><A HREF="/quotes/"><B><SPAN>Quotes</SPAN></B></A></LI> 48 <LI id="bannernav-quotes"><A HREF="/quotes/"><B><SPAN>Quotes</SPAN></B></A></LI>
50 <LI id="bannernav-<!--LOWERLOGDATA-->"><A HREF="/fourm/ucp.php?mode=log<!--LOGDATA-->&amp;redirect=<!--REDIRPAGE-->&amp;sid=<!--SID-->"><B><SPAN>Log<!--LOGDATA--></SPAN></B></A></LI> 49 <LI id="bannernav-<!--LOWERLOGDATA-->"><A HREF="/fourm/ucp.php?mode=log<!--LOGDATA-->&amp;redirect=<!--REDIRPAGE-->&amp;sid=<!--SID-->"><B><SPAN>Log<!--LOGDATA--></SPAN></B></A></LI>
51 <!--BEGIN PANEL--> 50 <!--BEGIN PANEL-->
diff --git a/theme/layouts/4.5/navigation.css b/theme/layouts/4.5/navigation.css index 4d3156b..386ac26 100755 --- a/theme/layouts/4.5/navigation.css +++ b/theme/layouts/4.5/navigation.css
@@ -89,15 +89,6 @@ ul#bannernav li#bannernav-webs a:hover {
89 background-image: url("/theme/images/Links_ro.gif"); 89 background-image: url("/theme/images/Links_ro.gif");
90} 90}
91 91
92ul#bannernav li#bannernav-poll a {
93 background-image: url("/theme/images/Poll.gif");
94}
95
96body.poll ul#bannernav li#bannernav-poll a,
97ul#bannernav li#bannernav-poll a:hover {
98 background-image: url("/theme/images/Poll_ro.gif");
99}
100
101ul#bannernav li#bannernav-quotes a { 92ul#bannernav li#bannernav-quotes a {
102 background-image: url("/theme/images/Quotes.gif"); 93 background-image: url("/theme/images/Quotes.gif");
103} 94}
@@ -170,4 +161,4 @@ body.fourm ul#bannernav li#bannernav-search input {
170 margin-top: 0px; 161 margin-top: 0px;
171 font-size: 1.1em !important; 162 font-size: 1.1em !important;
172 margin-left: 28px; 163 margin-left: 28px;
173} 164}
diff --git a/theme/layouts/4.5/style.css b/theme/layouts/4.5/style.css index a8b9306..7e8c2c4 100755 --- a/theme/layouts/4.5/style.css +++ b/theme/layouts/4.5/style.css
@@ -17,7 +17,6 @@ body.fourm div#content {
17} 17}
18 18
19body.fourm div#wrap, 19body.fourm div#wrap,
20body.poll div#wrap,
21body.quotes div#wrap, 20body.quotes div#wrap,
22body.admin div#wrap { 21body.admin div#wrap {
23 background-image: url(/theme/images/bg_body.gif); 22 background-image: url(/theme/images/bg_body.gif);
diff --git a/theme/layouts/6.2/layout.tpl b/theme/layouts/6.2/layout.tpl index 6ba1d1e..d0991ff 100755 --- a/theme/layouts/6.2/layout.tpl +++ b/theme/layouts/6.2/layout.tpl
@@ -66,13 +66,6 @@ AudioPlayer.setup("http://fourisland.com/theme/js/audio-player/player.swf", {
66 </A> 66 </A>
67 </LI> 67 </LI>
68 68
69 <LI<!--POLLACTIVE-->>
70 <A HREF="/poll/">
71 <IMG SRC="/theme/images/icons/overlays.png" ALT="Polls">
72 <SPAN>Polls</SPAN>
73 </A>
74 </LI>
75
76 <LI<!--QUOTESACTIVE-->> 69 <LI<!--QUOTESACTIVE-->>
77 <A HREF="/quotes/"> 70 <A HREF="/quotes/">
78 <IMG SRC="/theme/images/icons/16-file-page.png" ALT="Quotes"> 71 <IMG SRC="/theme/images/icons/16-file-page.png" ALT="Quotes">
diff --git a/theme/layouts/7/layout.tpl b/theme/layouts/7/layout.tpl index 2cacae5..5f722a3 100755 --- a/theme/layouts/7/layout.tpl +++ b/theme/layouts/7/layout.tpl
@@ -146,13 +146,6 @@ AudioPlayer.setup("http://fourisland.com/theme/js/audio-player/player.swf", {
146 </a> 146 </a>
147 </li> 147 </li>
148 148
149 <li<!--POLLACTIVE-->>
150 <a href="/poll/">
151 <img src="/theme/images/icons/overlays.png" alt="Polls" />
152 <span>Polls</span>
153 </a>
154 </li>
155
156 <li<!--QUOTESACTIVE-->> 149 <li<!--QUOTESACTIVE-->>
157 <a href="/quotes/"> 150 <a href="/quotes/">
158 <img src="/theme/images/icons/16-file-page.png" alt="Quotes" /> 151 <img src="/theme/images/icons/16-file-page.png" alt="Quotes" />
diff --git a/theme/layouts/subtle/layout.tpl b/theme/layouts/subtle/layout.tpl index ac57aa7..227c87b 100755 --- a/theme/layouts/subtle/layout.tpl +++ b/theme/layouts/subtle/layout.tpl
@@ -58,13 +58,6 @@ AudioPlayer.setup("http://fourisland.com/theme/js/audio-player/player.swf", {
58 </a> 58 </a>
59 </li> 59 </li>
60 60
61 <li<!--POLLACTIVE-->>
62 <a href="/poll/">
63 <img src="/theme/images/icons/overlays.png" alt="Polls" />
64 <span>Polls</span>
65 </a>
66 </li>
67
68 <li<!--QUOTESACTIVE-->> 61 <li<!--QUOTESACTIVE-->>
69 <a href="/quotes/"> 62 <a href="/quotes/">
70 <img src="/theme/images/icons/16-file-page.png" alt="Quotes" /> 63 <img src="/theme/images/icons/16-file-page.png" alt="Quotes" />