Created layout 7

The following changes were also made in this revision:

* All HTML was changed to XHTML and a !DOCTYPE was included to reflect this
* Rewrote quotes tracking system to be much less complicated and actually working
* Changed quotes rendering to look more like Chirpy than Rash
* Fixed comment textarea bug
* Rewrote a ton of CSS so it's not as bloated
* Added a JavaScript confirmation when deleting a comment
* AJAXified voting on the POTW
* AJAXified voting and flagging quotes
* AJAXified commenting
* AJAXified voting on posts
* Added DateFinder back after it was accidentally deleted in Layout 4.5

The following database changes must be performed as soon as possible:

* Fix title of NO <!DOCTYPE> post (the &lt; is missing the semicolon)
* Restore post Frasty Tha Snaman from a backup
* Reset "flag" field of all rows in "rash_quotes" to 0
* Remove the "vote" and "flag" columns of "rash_tracking"
* Rename the "quote_id" column of "rash_tracking" to "vote"

The following external code changes must also be performed as soon as possible:

* Add the following line to the end of the // Four Island block in The Fourm's functions.php:
  require('/svr/www/hatkirby/fourisland/main/includes/specialdates.php');

1 files changed, 38 insertions, 28 deletions

@@ -30,30 +30,33 @@ class BBCode
 
         function init()
         {
-                $this->bbcodes['b'] = '<B>{CONTENT}</B>';
-                $this->bbcodes['i'] = '<I>{CONTENT}</I>';
-                $this->bbcodes['u'] = '<U>{CONTENT}</U>';
-                $this->bbcodes['url'] = '<A HREF="{CONTENT}">{CONTENT}</A>';
-                $this->bbcodes2['url'] = '<A HREF="{PARAM}">{CONTENT}</A>';
-                $this->bbcodes['img'] = '<IMG SRC="{CONTENT}" ALT="Image">';
-                $this->bbcodes2['img'] = '<IMG SRC="{CONTENT}" ALT="{PARAM}" TITLE="{PARAM}">';
-                $this->bbcodes['big'] = '<BIG>{CONTENT}</BIG>';
-                $this->bbcodes['small'] = '<SMALL>{CONTENT}</SMALL>';
-                $this->bbcodes['ul'] = '<UL>{CONTENT}</UL>';
-                $this->bbcodes['ol'] = '<OL>{CONTENT}</OL>';
-                $this->bbcodes['li'] = '<LI>{CONTENT}</LI>';
-                $this->bbcodes['code'] = '<CODE>{CONTENT}</CODE>';
-                $this->bbcodes['pre'] = '<P><DIV CLASS="autosize"><DIV CLASS="bubble"><DIV CLASS="bquote"><BLOCKQUOTE><DIV><CODE>{CONTENT}</CODE></DIV></BLOCKQUOTE></DIV></DIV></DIV><DIV CLASS="cleardiv"></DIV>';
-                $this->bbcodes2['blog'] = '<A HREF="/blog/{PARAM}/">{CONTENT}</A>';
-                $this->bbcodes2['quote'] = '<A HREF="/quotes/{PARAM}.php">{CONTENT}</A>';
-                $this->bbcodes['ins'] = '<INS>{CONTENT}</INS>';
-                $this->bbcodes['del'] = '<DEL>{CONTENT}</DEL>';
-                $this->bbcodes['bquote'] = '<P><DIV CLASS="autosize"><DIV CLASS="bubble"><DIV CLASS="bquote"><BLOCKQUOTE><DIV>{CONTENT}</DIV></BLOCKQUOTE></DIV><CITE><STRONG>Anonymous</STRONG></CITE></DIV></DIV><DIV CLASS="cleardiv"></DIV>';
-                $this->bbcodes2['bquote'] = '<P><DIV CLASS="autosize"><DIV CLASS="bubble"><DIV CLASS="bquote"><BLOCKQUOTE><DIV>{CONTENT}</DIV></BLOCKQUOTE></DIV><CITE><STRONG>{PARAM}</STRONG></CITE></DIV></DIV><DIV CLASS="cleardiv"></DIV>';
-                $this->bbcodes2['abbr'] = '<ABBR TITLE="{PARAM}">{CONTENT}</ABBR>';
-                $this->bbcodes['hidden'] = '<SPAN STYLE="display: none">{CONTENT}</SPAN>';
-                $this->bbcodes['thumb'] = '<A HREF="/images/{CONTENT}"><IMG SRC="http://fourisland.com/thumb.php?file=images/{CONTENT}&amp;mode=scale&amp;by=521&amp;side=0" ALT="Image"></A>';
-                $this->bbcodes['thumb2'] = '<A HREF="/images/{CONTENT}"><IMG SRC="http://fourisland.com/thumb.php?file=images/{CONTENT}&amp;mode=scale&amp;by=260&amp;side=0" ALIGN="right" ALT="Image"></A>';
+                $this->bbcodes['b'] = '<strong>{CONTENT}</strong>';
+                $this->bbcodes['i'] = '<em>{CONTENT}</em>';
+                $this->bbcodes['u'] = '<u>{CONTENT}</u>';
+                $this->bbcodes['url'] = '<a href="{CONTENT}">{CONTENT}</a>';
+                $this->bbcodes2['url'] = '<a href="{PARAM}">{CONTENT}</a>';
+                $this->bbcodes['img'] = '<img src="{CONTENT}" alt="Image" />';
+                $this->bbcodes2['img'] = '<img src="{CONTENT}" alt="{PARAM}" title="{PARAM}" />';
+                $this->bbcodes['big'] = '<big>{CONTENT}</big>';
+                $this->bbcodes['small'] = '<small>{CONTENT}</small>';
+                $this->bbcodes['ul'] = '<ul>{CONTENT}</ul>';
+                $this->bbcodes['ol'] = '<ol>{CONTENT}</ol>';
+                $this->bbcodes['li'] = '<li>{CONTENT}</li>';
+                $this->bbcodes['code'] = '<code>{CONTENT}</code>';
+                $this->bbcodes['pre'] = '<pre><code>{CONTENT}</code></pre>';
+                $this->bbcodes['pref'] = '<pre>{CONTENT}</pre>';
+                $this->bbcodes2['blog'] = '<a href="/blog/{PARAM}/">{CONTENT}</a>';
+                $this->bbcodes['quote'] = '<a href="/quotes/{CONTENT}.php">#{CONTENT}</a>';
+                $this->bbcodes2['quote'] = '<a href="/quotes/{PARAM}.php">{CONTENT}</a>';
+                $this->bbcodes['ins'] = '<ins>{CONTENT}</ins>';
+                $this->bbcodes['del'] = '<del>{CONTENT}</del>';
+                $this->bbcodes['bquote'] = '<div class="bquote module unrounded"><blockquote>{CONTENT}</blockquote></div><cite><strong>Anonymous</strong></cite><div class="cleardiv"></div>';
+                $this->bbcodes2['bquote'] = '<div class="bquote module unrounded"><blockquote>{CONTENT}</blockquote></div><cite><strong>{PARAM}</strong></cite><div class="cleardiv"></div>';
+                $this->bbcodes2['abbr'] = '<abbr title="{PARAM}">{CONTENT}</abbr>';
+                $this->bbcodes['hidden'] = '<span style="display: none">{CONTENT}</span>';
+                $this->bbcodes['thumb'] = '<a href="/images/{CONTENT}"><img src="http://fourisland.com/thumb.php?file=images/{CONTENT}&amp;mode=scale&amp;by=521&amp;side=0" alt="Image" /></a>';
+                $this->bbcodes['thumb2'] = '<a href="/images/{CONTENT}"><img src="http://fourisland.com/thumb.php?file=images/{CONTENT}&amp;mode=scale&amp;by=260&amp;side=0" align="right" alt="Image" /></a>';
+                $this->bbcodes['project'] = '<a href="http://projects.fourisland.com/projects/show/{CONTENT}">{CONTENT}</a>';
 
                 $this->init = true;
         }
@@ -73,8 +76,15 @@ class BBCode
                         {
                                 $bbcode_uid = unique_id();
                                 $bbpos = strpos($to_parse, '[' . $name . ']');
-                                $to_parse = substr_replace($to_parse, '[' . $name . ':' . $bbcode_uid . ']', $bbpos, strlen($name) + 2);
-                                $to_parse = substr_replace($to_parse, '[/' . $name . ':' . $bbcode_uid . ']', strpos(substr($to_parse, $bbpos), '[/' . $name . ']') + $bbpos, strlen($name) + 3);
+                                $otag = '[' . $name . ':' . $bbcode_uid . ']';
+                                $ctag = '[/' . $name . ':' . $bbcode_uid . ']';
+                                $to_parse = substr_replace($to_parse, $otag, $bbpos, strlen($name) + 2);
+                                $to_parse = substr_replace($to_parse, $ctag, strpos(substr($to_parse, $bbpos), '[/' . $name . ']') + $bbpos, strlen($name) + 3);
+
+                                if (strpos($this->bbcodes[$name], '<pre>') !== -1)
+                                {
+                                        $to_parse = substr_replace($to_parse, str_replace('[br]', '', substr($to_parse, strpos($to_parse, $otag) + strlen($otag), strpos($to_parse, $ctag) - (strpos($to_parse, $otag) + strlen($otag)))), strpos($to_parse, $otag) + strlen($otag), strpos($to_parse, $ctag) - (strpos($to_parse, $otag) + strlen($otag)));
+                                }
 
                                 $value = str_replace('{CONTENT}', '\1', $value);
                                 $to_parse = preg_replace('/\[' . $name . ':' . $bbcode_uid . '\](.*)\[\/' . $name . ':' . $bbcode_uid . '\]/', $value, $to_parse);
@@ -96,13 +106,13 @@ class BBCode
                         }
                 }
 
-                return str_replace('[br]','<BR>',$to_parse);
+                return str_replace('[br]','<br />',$to_parse);
         }
 }
 
 function parseBBCode($text)
 {
-        global $bbcode;
+        static $bbcode;
         if (!isset($bbcode))
         {
                 $bbcode = new BBCode();