From 1f312f39c9dd0b87d5a7f6eee68ca357a844fd00 Mon Sep 17 00:00:00 2001
From: cookie <cookie@29ba0400-6e00-0410-a75a-ca02368028f8>
Date: Mon, 21 Nov 2005 00:13:51 +0000
Subject: [PATCH] smilies werden wieder angezeigt

git-svn-id: svn://svn.cccv.de/engel-system@74 29ba0400-6e00-0410-a75a-ca02368028f8
---
 www-ssl/inc/funktion_user.php     | 8 +-------
 www-ssl/nonpublic/news_output.php | 4 +---
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/www-ssl/inc/funktion_user.php b/www-ssl/inc/funktion_user.php
index 573a59d8..660e55a1 100755
--- a/www-ssl/inc/funktion_user.php
+++ b/www-ssl/inc/funktion_user.php
@@ -29,15 +29,9 @@ function TID2Type($TID) {
 }
 
 
-function htmlescape($eckig) {
+function ReplaceSmilies($eckig) {
 
 	$neueckig = $eckig;
-	$neueckig = str_replace("&","&amp;",$neueckig);
-	$neueckig = str_replace("<","&lt;",$neueckig); 
-	$neueckig = str_replace(">","&gt;",$neueckig);
-
-	// replace smilies
-	
 	$neueckig = str_replace(";o))","<img src=\"./inc/smiles/icon_redface.gif\">",$neueckig);
 	$neueckig = str_replace(":-))","<img src=\"./inc/smiles/icon_redface.gif\">",$neueckig);
 	$neueckig = str_replace(";o)","<img src=\"./inc/smiles/icon_wind.gif\">",$neueckig);
diff --git a/www-ssl/nonpublic/news_output.php b/www-ssl/nonpublic/news_output.php
index 5fde6a74..459c332f 100755
--- a/www-ssl/nonpublic/news_output.php
+++ b/www-ssl/nonpublic/news_output.php
@@ -42,14 +42,12 @@ for ($n = 0 ; $n < $news_rows ; $n++) {
   // avatar anzeigen?
   echo DisplayAvatar (mysql_result($Erg, $n, "UID"));
   echo "</p>\n";
-  echo "<p class='answer'>". nl2br(mysql_result($Erg, $n, "Text"))."</p>\n";
+  echo "<p class='answer'>". ReplaceSmilies(nl2br(mysql_result($Erg, $n, "Text"))) ."</p>\n";
   $RefID=mysql_result($Erg, $n, "ID");
   $countSQL="SELECT COUNT(*) from news_comments where Refid = '$RefID'";
   $countErg = mysql_query($countSQL, $con);
   $countcom = mysql_result($countErg, 0, "COUNT(*)");
   echo "<p class='comment' align='right'><a href=\"./news_comments.php?nid=$RefID\">$countcom comments</a></p>\n\n";
-
-
 }
 
 echo "<div align=\"center\">\n\n";