smiley filter

diff --git a/boot.php b/boot.php
index 451a622c0be5847d1518d4b512c4cdf4ee4407b3..c4bdb1187e6fc33a2ba89a630e84f80a9672c717 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1589,4 +1589,25 @@ if(! function_exists('linkify')) {
 function linkify($s) {
        $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' <a href="$1" >$1</a>', $s);
        return($s);
+}}
+
+if(! function_exists('smilies')) {
+function smilies($s) {
+       $a = get_app();
+
+       return str_replace(
+       array( ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'),
+       array(
+               '<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
+               '<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
+               '<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
+               '<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":(" />',
+               '<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
+               '<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
+               '<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />',
+               '<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />',
+               '<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
+               '<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
+               '<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />'
+       ), $s);
 }}
\ No newline at end of file

diff --git a/images/smiley-cool.gif b/images/smiley-cool.gif
new file mode 100644 (file)
index 0000000..ba90cc3
Binary files /dev/null and b/images/smiley-cool.gif differ

diff --git a/images/smiley-cry.gif b/images/smiley-cry.gif
new file mode 100644 (file)
index 0000000..74d897a
Binary files /dev/null and b/images/smiley-cry.gif differ

diff --git a/images/smiley-embarassed.gif b/images/smiley-embarassed.gif
new file mode 100644 (file)
index 0000000..963a96b
Binary files /dev/null and b/images/smiley-embarassed.gif differ

diff --git a/images/smiley-foot-in-mouth.gif b/images/smiley-foot-in-mouth.gif
new file mode 100644 (file)
index 0000000..16f68cc
Binary files /dev/null and b/images/smiley-foot-in-mouth.gif differ

diff --git a/images/smiley-frown.gif b/images/smiley-frown.gif
new file mode 100644 (file)
index 0000000..716f55e
Binary files /dev/null and b/images/smiley-frown.gif differ

diff --git a/images/smiley-innocent.gif b/images/smiley-innocent.gif
new file mode 100644 (file)
index 0000000..334d49e
Binary files /dev/null and b/images/smiley-innocent.gif differ

diff --git a/images/smiley-kiss.gif b/images/smiley-kiss.gif
new file mode 100644 (file)
index 0000000..4efd549
Binary files /dev/null and b/images/smiley-kiss.gif differ

diff --git a/images/smiley-laughing.gif b/images/smiley-laughing.gif
new file mode 100644 (file)
index 0000000..1606c11
Binary files /dev/null and b/images/smiley-laughing.gif differ

diff --git a/images/smiley-money-mouth.gif b/images/smiley-money-mouth.gif
new file mode 100644 (file)
index 0000000..ca2451e
Binary files /dev/null and b/images/smiley-money-mouth.gif differ

diff --git a/images/smiley-sealed.gif b/images/smiley-sealed.gif
new file mode 100644 (file)
index 0000000..b33d3cc
Binary files /dev/null and b/images/smiley-sealed.gif differ

diff --git a/images/smiley-smile.gif b/images/smiley-smile.gif
new file mode 100644 (file)
index 0000000..e6a9e60
Binary files /dev/null and b/images/smiley-smile.gif differ

diff --git a/images/smiley-surprised.gif b/images/smiley-surprised.gif
new file mode 100644 (file)
index 0000000..cb99cdd
Binary files /dev/null and b/images/smiley-surprised.gif differ

diff --git a/images/smiley-tongue-out.gif b/images/smiley-tongue-out.gif
new file mode 100644 (file)
index 0000000..2075dc1
Binary files /dev/null and b/images/smiley-tongue-out.gif differ

diff --git a/images/smiley-undecided.gif b/images/smiley-undecided.gif
new file mode 100644 (file)
index 0000000..bef7e25
Binary files /dev/null and b/images/smiley-undecided.gif differ

diff --git a/images/smiley-wink.gif b/images/smiley-wink.gif
new file mode 100644 (file)
index 0000000..9faf1af
Binary files /dev/null and b/images/smiley-wink.gif differ

diff --git a/images/smiley-yell.gif b/images/smiley-yell.gif
new file mode 100644 (file)
index 0000000..648e6e8
Binary files /dev/null and b/images/smiley-yell.gif differ

diff --git a/mod/display.php b/mod/display.php
index ec036de625b69caa04218401067c000b1a51fedb..36916161920114d2cf9aac04293bf6bf74f6f54e 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -249,7 +249,7 @@ function display_content(&$a) {
                                '$osparkle' => $osparkle,
                                '$thumb' => $profile_avatar,
                                '$title' => $item['title'],
-                               '$body' => bbcode($item['body']),
+                               '$body' => smilies(bbcode($item['body'])),
                                '$ago' => relative_date($item['created']),
                                '$lock' => $lock,
                                '$location' => $location,

diff --git a/mod/network.php b/mod/network.php
index c52bb74fc5735a2df7ee7973fc5ef08dcc9e9194..43c55b8e3f4dee124e16a27e94aec165be6fa430 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -292,7 +292,7 @@ function network_content(&$a, $update = 0) {
                                '$osparkle' => $osparkle,
                                '$sparkle' => $sparkle,
                                '$title' => $item['title'],
-                               '$body' => bbcode($item['body']),
+                               '$body' => smilies(bbcode($item['body'])),
                                '$ago' => relative_date($item['created']),
                                '$lock' => $lock,
                                '$location' => $location,

diff --git a/mod/profile.php b/mod/profile.php
index d09e0187b2c4780d87a19cd0b478567063f5e697..a431f4bdd8aee5c7fbdf92dd91834a157eec4ece 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -388,7 +388,7 @@ function profile_content(&$a, $update = 0) {
                                '$thumb' => $profile_avatar,
                                '$sparkle' => $sparkle,
                                '$title' => $item['title'],
-                               '$body' => bbcode($item['body']),
+                               '$body' => smilies(bbcode($item['body'])),
                                '$ago' => relative_date($item['created']),
                                '$lock' => $lock,
                                '$location' => $location,