[php-blog-cvs] jBlog jBlog_config.inc.php,1.2,1.3 jBlog_functions.inc.php,1.55,1.56

[<ste...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv23316

Modified Files:
	jBlog_config.inc.php jBlog_functions.inc.php 
Log Message:
emoticate and allow wiki style markup in comments


Index: jBlog_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jBlog_config.inc.php	4 Mar 2003 21:09:22 -0000	1.2
+++ jBlog_config.inc.php	11 Mar 2003 19:23:21 -0000	1.3
@@ -19,13 +19,20 @@
 
 // Put your emoticons here
 $jBlog["smiles"] = array(":'(" => $jBlog["jBlogHTTPPath"]."pixel/cry_smile.gif",
+                         ":-)"  => $jBlog["jBlogHTTPPath"]."pixel/regular_smile.gif",
+					     ":-O"  => $jBlog["jBlogHTTPPath"]."pixel/embaressed_smile.gif",
 					     ":O"  => $jBlog["jBlogHTTPPath"]."pixel/embaressed_smile.gif",
-                         ":)"  => $jBlog["jBlogHTTPPath"]."pixel/regular_smile.gif",
+                         ":-("  => $jBlog["jBlogHTTPPath"]."pixel/sad_smile.gif",
                          ":("  => $jBlog["jBlogHTTPPath"]."pixel/sad_smile.gif",
-						 "8)"  => $jBlog["jBlogHTTPPath"]."pixel/shades_smile.gif",
+                         ":)"  => $jBlog["jBlogHTTPPath"]."pixel/regular_smile.gif",
+						 "8-)"  => $jBlog["jBlogHTTPPath"]."pixel/shades_smile.gif",
+                         ":-D"  => $jBlog["jBlogHTTPPath"]."pixel/teeth_smile.gif",
                          ":D"  => $jBlog["jBlogHTTPPath"]."pixel/teeth_smile.gif",
+						 "8)"  => $jBlog["jBlogHTTPPath"]."pixel/shades_smile.gif",
+                         ":-P"  => $jBlog["jBlogHTTPPath"]."pixel/tounge_smile.gif",
+                         ";-)"  => $jBlog["jBlogHTTPPath"]."pixel/wink_smile.gif",
+                         ";)"  => $jBlog["jBlogHTTPPath"]."pixel/wink_smile.gif",
                          ":P"  => $jBlog["jBlogHTTPPath"]."pixel/tounge_smile.gif",
-                         ";)"  => $jBlog["jBlogHTTPPath"]."pixel/wink_smile.gif"
                         );
 
 

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- jBlog_functions.inc.php	11 Mar 2003 18:53:15 -0000	1.55
+++ jBlog_functions.inc.php	11 Mar 2003 19:23:21 -0000	1.56
@@ -361,7 +361,7 @@
     <tr>
     <td class="jBlog_comment">
     <a name="c<?=$comment['id']?>"></a>
-    <?=nl2br($comment['body'])?><br />
+    <?=nl2br(jBlog_markup_text(jBlog_emoticate($comment['body'])))?><br />
 	<div class="jBlog_comment_source">
     <?=$type?> <?=($link ? "<a href=\"$link\">$name</a>" : $name)?> on 
     <a href="<?=$PHP_SELF?>#comment<?=$comment['id']?>"><?=date("M d, h:i", $comment['timestamp'])?></a>