[php-blog-cvs] serendipity/plugins/serendipity_event_emoticate serendipity_event_emoticate.php,1.15,1.16

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8782/plugins/serendipity_event_emoticate

Modified Files:
	serendipity_event_emoticate.php 
Log Message:
* remove goatse reference
* reduce number of preg calls


Index: serendipity_event_emoticate.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate/serendipity_event_emoticate.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_event_emoticate.php	18 Dec 2004 15:15:21 -0000	1.15
+++ serendipity_event_emoticate.php	21 Dec 2004 09:13:51 -0000	1.16
@@ -88,37 +88,31 @@
             $this->smilies = array(
                 ":'("  => serendipity_getTemplateFile('img/emoticons/cry.png'),
 
-                ':-)'  => serendipity_getTemplateFile('img/emoticons/smile.png'),
-                ':)'   => serendipity_getTemplateFile('img/emoticons/smile.png'),
+                ':\-?)'  => serendipity_getTemplateFile('img/emoticons/smile.png'),
 
                 ':|'   => serendipity_getTemplateFile('img/emoticons/normal.png'),
 
-                ':-O'  => serendipity_getTemplateFile('img/emoticons/eek.png'),
-                ':O'   => serendipity_getTemplateFile('img/emoticons/eek.png'),
-
-                ':-('  => serendipity_getTemplateFile('img/emoticons/sad.png'),
-                ':('   => serendipity_getTemplateFile('img/emoticons/sad.png'),
+                ':\-?O'  => serendipity_getTemplateFile('img/emoticons/eek.png'),
 
-                '8-)'  => serendipity_getTemplateFile('img/emoticons/cool.png'),
-                '8)'   => serendipity_getTemplateFile('img/emoticons/cool.png'),
+                ':\-?('  => serendipity_getTemplateFile('img/emoticons/sad.png'),
 
-                ':-D'  => serendipity_getTemplateFile('img/emoticons/laugh.png'),
-                ':D'   => serendipity_getTemplateFile('img/emoticons/laugh.png'),
+                '8\-?)'  => serendipity_getTemplateFile('img/emoticons/cool.png'),
 
-                ':-P'  => serendipity_getTemplateFile('img/emoticons/tongue.png'),
-                ':P'   => serendipity_getTemplateFile('img/emoticons/tongue.png'),
+                ':\-?D'  => serendipity_getTemplateFile('img/emoticons/laugh.png'),
 
-                ';-)'  => serendipity_getTemplateFile('img/emoticons/wink.png'),
-                ';)'   => serendipity_getTemplateFile('img/emoticons/wink.png'),
+                ':\-?P'  => serendipity_getTemplateFile('img/emoticons/tongue.png'),
 
-                '/-{ }-\\' => serendipity_getTemplateFile('img/emoticons/goatse.gif'),
-                '/-{}-\\'  => serendipity_getTemplateFile('img/emoticons/goatse.gif'),
+                ';\-?)'  => serendipity_getTemplateFile('img/emoticons/wink.png'),
             );
         }
 
         return $this->smilies;
     }
 
+    function humanReadableEmoticon($key) {
+        return str_replace('\-?', '-', $key);
+    }
+
     function generate_content(&$title) {
         $title = $this->title;
     }
@@ -128,7 +122,7 @@
         $s .= '<tr>';
         $i = 1;
         foreach($this->getEmoticons() as $key => $value) {
-            $s .= '<td style="text-align: center">' . $key . '</td><td><img src="'. $value .'"></td>' . "\n";
+            $s .= '<td style="text-align: center">' . $this->humanReadableEmoticon($key) . '</td><td><img src="'. $value .'"></td>' . "\n";
             if ($i++ % 7 == 0) $s .= '</tr><tr>';
         }
         $s .= '</tr>';