From c895d2f41b0737f8a2799d36beca087e6b642f05 Mon Sep 17 00:00:00 2001
From: Starla Insigna <hatkirby@fourisland.com>
Date: Wed, 17 Dec 2008 21:00:03 -0500
Subject: Added an emoticon parsing system

I decided that, because I use the :) emoticon so often, I might as well replace it with an actual image. I've added a Smiley parsing system to
complement the BBCode parsing one.
---
 pages/admin.php   | 6 +++---
 pages/blog.php    | 2 +-
 pages/poll.php    | 2 +-
 pages/welcome.php | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'pages')

diff --git a/pages/admin.php b/pages/admin.php
index aff21cf..a171b6f 100755
--- a/pages/admin.php
+++ b/pages/admin.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');
diff --git a/pages/blog.php b/pages/blog.php
index d55f9a4..a03d3b1 100755
--- a/pages/blog.php
+++ b/pages/blog.php
@@ -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)
diff --git a/pages/poll.php b/pages/poll.php
index 2dee559..d9cce70 100755
--- a/pages/poll.php
+++ b/pages/poll.php
@@ -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'],
diff --git a/pages/welcome.php b/pages/welcome.php
index 6e06006..e224c8e 100755
--- a/pages/welcome.php
+++ b/pages/welcome.php
@@ -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)
-- 
cgit 1.4.1