12 files changed, 112 insertions, 12 deletions

@@ -50,7 +50,7 @@ class BBCode
                 $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'] = '<DIV STYLE="display: none">{CONTENT}</DIV>';
+                $this->bbcodes['hidden'] = '<SPAN STYLE="display: none">{CONTENT}</SPAN>';
 
                 $this->init = true;
         }
@@ -71,7 +71,7 @@ while ($getcomments3[$i] = mysql_fetch_array($getcomments2))
                                                                 'USERNAME' => (($website != '') ? '<A HREF="http://' . $website . '">' . $username . '</A>' : $username),
                                                                 'DATE' => date("F dS Y \a\\t g:i:s a",strtotime($getcomments3[$i]['posttime'])),
                                                                 'ID' => $getcomments3[$i]['id'],
-                                                                'TEXT' => parseBBCode($getcomments3[$i]['comment'])));
+                                                                'TEXT' => parseText($getcomments3[$i]['comment'])));
         }
         $i++;
 }
@@ -124,7 +124,7 @@ function postBlogPost($title,$author,$tags,$content)
         $upconf = "UPDATE config SET value = \"" . date('md') . "\" WHERE name = \"lastUpdate\"";
         $upconf2 = mysql_query($upconf);
 
-        preg_match_all('|<a\s[^>]*href="([^"]+)"|i', parseBBCode($content), $matches);
+        preg_match_all('|<a\s[^>]*href="([^"]+)"|i', parseText($content), $matches);
 
         foreach ($matches[1] as $link)
         {
@@ -0,0 +1,36 @@
+<?php
+/*
+       444444444  
+      4::::::::4  
+     4:::::::::4  
+    4::::44::::4  
+   4::::4 4::::4   Four Island
+  4::::4  4::::4  
+ 4::::4   4::::4   Written and maintained by Starla Insigna
+4::::444444::::444
+4::::::::::::::::4  includes/parsers.php
+4444444444:::::444
+          4::::4   Please do not use, reproduce or steal the
+          4::::4   contents of this file without explicit
+          4::::4   permission from Hatkirby.
+        44::::::44
+        4::::::::4
+        4444444444
+*/
+
+if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
+
+require('headerproc.php');
+
+include('includes/bbcode.php');
+include('includes/smilies.php');
+
+function parseText($text)
+{
+        $text = parseBBCode($text);
+        $text = parseSmilies($text);
+
+        return $text;
+}
+
+?>
@@ -0,0 +1,64 @@
+<?php
+/*
+       444444444  
+      4::::::::4  
+     4:::::::::4  
+    4::::44::::4  
+   4::::4 4::::4   Four Island
+  4::::4  4::::4  
+ 4::::4   4::::4   Written and maintained by Starla Insigna
+4::::444444::::444
+4::::::::::::::::4  includes/smilies.php
+4444444444:::::444
+          4::::4   Please do not use, reproduce or steal the
+          4::::4   contents of this file without explicit
+          4::::4   permission from Hatkirby.
+        44::::::44
+        4::::::::4
+        4444444444
+*/
+
+if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
+
+require('headerproc.php');
+
+class Smilies
+{
+        var $init = false;
+        var $smilies;
+
+        function init()
+        {
+                $this->smilies[':)'] = '001_smile.gif';
+
+                $this->init = true;
+        }
+
+        function parseSmilies($text)
+        {
+                if (!$this->init)
+                {
+                        $this->init();
+                }
+
+                foreach ($this->smilies as $name => $value)
+                {
+                        $text = str_replace($name, '<IMG SRC="http://fourisland.com/theme/images/smilies/' . $value . '" ALT="' . $name . '" />', $text);
+                }
+
+                return $text;
+        }
+}
+
+function parseSmilies($text)
+{
+        global $smilies;
+        if (!isset($smilies))
+        {
+                $smilies = new Smilies();
+        }
+
+        return $smilies->parseSmilies($text);
+}
+
+?>
@@ -27,7 +27,7 @@ include('includes/db.php');
 include('includes/template.php');
 include('includes/mantainence.php');
 include('includes/session.php');
-include('includes/bbcode.php');
+include('includes/parsers.php');
 include('includes/xmlrpc/xmlrpc.inc');
 include('includes/specialdates.php');
 include('includes/functions.php');
@@ -240,7 +240,7 @@ if (isLoggedIn())
                                                                         'TITLE' => $getdraft3['title'],
                                                                         'AUTHOR' => $getdraft3['author'],
                                                                         'RATING' => 0,
-                                                                        'TEXT' => parseBBCode($getdraft3['text'])));
+                                                                        'TEXT' => parseText($getdraft3['text'])));
 
                                 $tags = getTags($getdraft3['id'], 'draft');
                                 foreach ($tags as $tag)
@@ -342,7 +342,7 @@ if (isLoggedIn())
                                                                         'TITLE' => $getpending3['title'],
                                                                         'AUTHOR' => $getpending3['author'],
                                                                         'RATING' => 0,
-                                                                        'TEXT' => parseBBCode($getpending3['text'])));  
+                                                                        'TEXT' => parseText($getpending3['text'])));    
 
                                 $tags = getTags($getpending3['id'], 'pending');
                                 foreach ($tags as $tag)
@@ -554,7 +554,7 @@ if (isLoggedIn())
                                 $template->add('ID', $_GET['id']);
                                 $template->add('USERNAME', $getcomment3['author']);
                                 $template->add('CODEDEMAIL', md5(strtolower($getuser3['email'])));
-                                $template->add('TEXT', parseBBCode($getcomment3['comment']));
+                                $template->add('TEXT', parseText($getcomment3['comment']));
                                 $template->add('DATE', date("F dS Y \a\\t g:i:s a",strtotime($getcomment3['pubDate'])));
                         } else {
                                 $template = new FITemplate('msg');
@@ -72,7 +72,7 @@ if (isset($_GET['post']))
                                                         'TITLE' => $getpost3['title'],
                                                         'AUTHOR' => $getpost3['author'],
                                                         'RATING' => $getpost3['rating'],
-                                                        'TEXT' => parseBBCode($getpost3['text'])));
+                                                        'TEXT' => parseText($getpost3['text'])));
 
                 $tags = getTags($getpost3['id']);
                 foreach ($tags as $tag)
@@ -112,7 +112,7 @@ if (isset($_GET['submit']))
 
         if ($getrss3['id'] == $_GET['id'])
         {
-                $template->adds_block('COMPLETE', array(        'RSS' => parseBBCode($getrss3['rss']),
+                $template->adds_block('COMPLETE', array(        'RSS' => parseText($getrss3['rss']),
                                                                 'AUTHOR' => $getrss3['author'],
                                                                 'DATE' => date("F dS Y \a\\t g:i:s a",strtotime($getrss3['date'])),
                                                                 'OPTION1' => $getpoll3['option1'],
@@ -68,7 +68,7 @@ while ($getpost3 = mysql_fetch_array($getpost2))
                                                         'PLURALCOMMENT' => (isset($plural) ? $plural : ''),
                                                         'COMMENTS' => $comText,
                                                         'RATING' => $getpost3['rating'],
-                                                        'TEXT' => parseBBCode($getpost3['text'])));
+                                                        'TEXT' => parseText($getpost3['text'])));
 
         $tags = getTags($getpost3['id']);
         foreach ($tags as $tag)
@@ -232,7 +232,7 @@ foreach ($items as $key => $value)
 
                         <link>http://fourisland.com/blog/<?php echo($value['slug']); ?>/</link>
 
-                        <description><?php echo(stripslashes(htmlentities(parseBBCode($value['text'])))); ?></description>
+                        <description><?php echo(stripslashes(htmlentities(parseText($value['text'])))); ?></description>
 
                         <pubDate><?php echo(date('D, d M Y H:i:s O',$value['sortDate'])); ?></pubDate>
                 </item>
@@ -260,7 +260,7 @@ foreach ($items as $key => $value)
 
                         <link>http://fourisland.com/<?php echo($value['url']); ?>#comment-<?php echo($value['id']); ?></link>
 
-                        <description><?php echo(stripslashes(htmlentities(parseBBCode($value['comment'])))); ?></description>
+                        <description><?php echo(stripslashes(htmlentities(parseText($value['comment'])))); ?></description>
 
                         <pubDate><?php echo(date('D, d M Y H:i:s O',$value['sortDate'])); ?></pubDate>
                 </item>