3 files changed, 41 insertions, 7 deletions

@@ -58,9 +58,10 @@ class BBCode
                 $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['thumb3'] = '<a href="/images/{CONTENT}"><img src="http://fourisland.com/thumb.php?file=images/{CONTENT}&amp;mode=scale&amp;by=260&amp;side=0" align="left" style="margin-right: 2em" alt="Image" /></a>';
-                $this->bbcodes['project'] = '<a href="http://projects.fourisland.com/projects/show/{CONTENT}">{CONTENT}</a>';
+                $this->bbcodes['project'] = '<a href="http://projects.fourisland.com/projects/show/{CONTENT}">{CONTENT}</a>';
                 $this->bbcodes['hr'] = '<hr size="2" color="black" />';
                 $this->bbcodes2['audio'] = '<p id="audioplayer_{CONTENT}">Click to download: <a href="{PARAM}">{CONTENT}</a></p><script>AudioPlayer.embed("audioplayer_{CONTENT}", {soundFile: "{PARAM}", titles: "{CONTENT}"});</script>';
+                $this->bbcodes['nosmilies'] = '{CONTENT}';
 
                 $this->init = true;
         }
@@ -85,11 +86,16 @@ class BBCode
                                 $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)
+                                if (strpos($this->bbcodes[$name], '<pre>') !== FALSE)
                                 {
                                         $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)));
                                 }
 
+                                if ($name == 'nosmilies')
+                                {
+                                        $to_parse = preg_replace('/\[emoticon\](..)\[\/emoticon\]/', '\1', $to_parse);
+                                }
+
                                 $value = str_replace('{CONTENT}', '\1', $value);
                                 $to_parse = preg_replace('/\[' . $name . ':' . $bbcode_uid . '\](.*)\[\/' . $name . ':' . $bbcode_uid . '\]/', $value, $to_parse);
                         }
@@ -28,8 +28,9 @@ include('includes/smilies.php');
 function parseText($text)
 {
         $text = htmlspecialchars($text);
+        $text = parseSmiliesFirstPass($text);
         $text = parseBBCode($text);
-        $text = parseSmilies($text);
+        $text = parseSmiliesSecondPass($text);
         $text = doAprilFoolsDay($text);
 
         return $text;
@@ -37,7 +37,7 @@ class Smilies
                 $this->init = true;
         }
 
-        function parseSmilies($text)
+        function parseSmiliesFirstPass($text)
         {
                 if (!$this->init)
                 {
@@ -46,14 +46,29 @@ class Smilies
 
                 foreach ($this->smilies as $name => $value)
                 {
-                        $text = str_replace($name, '<img src="http://fourisland.com/theme/images/smilies/' . $value . '" alt="' . $name . '" />', $text);
+                        $text = str_replace($name, '[emoticon]' . $name . '[/emoticon]', $text);
+                }
+
+                return $text;
+        }
+
+        function parseSmiliesSecondPass($text)
+        {
+                if (!$this->init)
+                {
+                        $this->init();
+                }
+
+                foreach ($this->smilies as $name => $value)
+                {
+                        $text = str_replace('[emoticon]' . $name . '[/emoticon]', '<img src="/theme/images/smilies/' . $value . '" alt="' . $name . '" />', $text);
                 }
 
                 return $text;
         }
 }
 
-function parseSmilies($text)
+function parseSmiliesFirstPass($text)
 {
         global $smilies;
         if (!isset($smilies))
@@ -61,7 +76,19 @@ function parseSmilies($text)
                 $smilies = new Smilies();
         }
 
-        return $smilies->parseSmilies($text);
+        return $smilies->parseSmiliesFirstPass($text);
 }
 
+function parseSmiliesSecondPass($text)
+{
+        global $smilies;
+        if (!isset($smilies))
+        {
+                $smilies = new Smilies();
+        }
+
+        return $smilies->parseSmiliesSecondPass($text);
+}
+
+
 ?>