diff options
| author | Starla Insigna <hatkirby@fourisland.com> | 2008-12-17 21:00:03 -0500 |
|---|---|---|
| committer | Starla Insigna <hatkirby@fourisland.com> | 2008-12-17 21:00:03 -0500 |
| commit | c895d2f41b0737f8a2799d36beca087e6b642f05 (patch) | |
| tree | f6243c7c270bbec4f5e0d01547b2c6048cea200f /pages | |
| parent | e3ffdb84d705dd1a1000fa91a49cc6c58fc58e05 (diff) | |
| download | fourisland-c895d2f41b0737f8a2799d36beca087e6b642f05.tar.gz fourisland-c895d2f41b0737f8a2799d36beca087e6b642f05.tar.bz2 fourisland-c895d2f41b0737f8a2799d36beca087e6b642f05.zip | |
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.
Diffstat (limited to 'pages')
| -rwxr-xr-x | pages/admin.php | 6 | ||||
| -rwxr-xr-x | pages/blog.php | 2 | ||||
| -rwxr-xr-x | pages/poll.php | 2 | ||||
| -rwxr-xr-x | pages/welcome.php | 2 |
4 files changed, 6 insertions, 6 deletions
| 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()) | |||
| 240 | 'TITLE' => $getdraft3['title'], | 240 | 'TITLE' => $getdraft3['title'], |
| 241 | 'AUTHOR' => $getdraft3['author'], | 241 | 'AUTHOR' => $getdraft3['author'], |
| 242 | 'RATING' => 0, | 242 | 'RATING' => 0, |
| 243 | 'TEXT' => parseBBCode($getdraft3['text']))); | 243 | 'TEXT' => parseText($getdraft3['text']))); |
| 244 | 244 | ||
| 245 | $tags = getTags($getdraft3['id'], 'draft'); | 245 | $tags = getTags($getdraft3['id'], 'draft'); |
| 246 | foreach ($tags as $tag) | 246 | foreach ($tags as $tag) |
| @@ -342,7 +342,7 @@ if (isLoggedIn()) | |||
| 342 | 'TITLE' => $getpending3['title'], | 342 | 'TITLE' => $getpending3['title'], |
| 343 | 'AUTHOR' => $getpending3['author'], | 343 | 'AUTHOR' => $getpending3['author'], |
| 344 | 'RATING' => 0, | 344 | 'RATING' => 0, |
| 345 | 'TEXT' => parseBBCode($getpending3['text']))); | 345 | 'TEXT' => parseText($getpending3['text']))); |
| 346 | 346 | ||
| 347 | $tags = getTags($getpending3['id'], 'pending'); | 347 | $tags = getTags($getpending3['id'], 'pending'); |
| 348 | foreach ($tags as $tag) | 348 | foreach ($tags as $tag) |
| @@ -554,7 +554,7 @@ if (isLoggedIn()) | |||
| 554 | $template->add('ID', $_GET['id']); | 554 | $template->add('ID', $_GET['id']); |
| 555 | $template->add('USERNAME', $getcomment3['author']); | 555 | $template->add('USERNAME', $getcomment3['author']); |
| 556 | $template->add('CODEDEMAIL', md5(strtolower($getuser3['email']))); | 556 | $template->add('CODEDEMAIL', md5(strtolower($getuser3['email']))); |
| 557 | $template->add('TEXT', parseBBCode($getcomment3['comment'])); | 557 | $template->add('TEXT', parseText($getcomment3['comment'])); |
| 558 | $template->add('DATE', date("F dS Y \a\\t g:i:s a",strtotime($getcomment3['pubDate']))); | 558 | $template->add('DATE', date("F dS Y \a\\t g:i:s a",strtotime($getcomment3['pubDate']))); |
| 559 | } else { | 559 | } else { |
| 560 | $template = new FITemplate('msg'); | 560 | $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'])) | |||
| 72 | 'TITLE' => $getpost3['title'], | 72 | 'TITLE' => $getpost3['title'], |
| 73 | 'AUTHOR' => $getpost3['author'], | 73 | 'AUTHOR' => $getpost3['author'], |
| 74 | 'RATING' => $getpost3['rating'], | 74 | 'RATING' => $getpost3['rating'], |
| 75 | 'TEXT' => parseBBCode($getpost3['text']))); | 75 | 'TEXT' => parseText($getpost3['text']))); |
| 76 | 76 | ||
| 77 | $tags = getTags($getpost3['id']); | 77 | $tags = getTags($getpost3['id']); |
| 78 | foreach ($tags as $tag) | 78 | 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'])) | |||
| 112 | 112 | ||
| 113 | if ($getrss3['id'] == $_GET['id']) | 113 | if ($getrss3['id'] == $_GET['id']) |
| 114 | { | 114 | { |
| 115 | $template->adds_block('COMPLETE', array( 'RSS' => parseBBCode($getrss3['rss']), | 115 | $template->adds_block('COMPLETE', array( 'RSS' => parseText($getrss3['rss']), |
| 116 | 'AUTHOR' => $getrss3['author'], | 116 | 'AUTHOR' => $getrss3['author'], |
| 117 | 'DATE' => date("F dS Y \a\\t g:i:s a",strtotime($getrss3['date'])), | 117 | 'DATE' => date("F dS Y \a\\t g:i:s a",strtotime($getrss3['date'])), |
| 118 | 'OPTION1' => $getpoll3['option1'], | 118 | '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)) | |||
| 68 | 'PLURALCOMMENT' => (isset($plural) ? $plural : ''), | 68 | 'PLURALCOMMENT' => (isset($plural) ? $plural : ''), |
| 69 | 'COMMENTS' => $comText, | 69 | 'COMMENTS' => $comText, |
| 70 | 'RATING' => $getpost3['rating'], | 70 | 'RATING' => $getpost3['rating'], |
| 71 | 'TEXT' => parseBBCode($getpost3['text']))); | 71 | 'TEXT' => parseText($getpost3['text']))); |
| 72 | 72 | ||
| 73 | $tags = getTags($getpost3['id']); | 73 | $tags = getTags($getpost3['id']); |
| 74 | foreach ($tags as $tag) | 74 | foreach ($tags as $tag) |