From 859fca21b066918db424f3660ee57eca85f9b797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 2 Sep 2009 11:19:40 +0000
Subject: [PATCH] =?UTF-8?q?-=20Bugfix=20bei=20Zeilenumbr=C3=BCchen=20in=20?=
 =?UTF-8?q?Newseintr=C3=A4gen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/freifaecher/pinboardverwaltung.php | 2 +-
 cis/private/lehre/pinboardverwaltung.php       | 2 +-
 cis/private/tools/newsverwaltung.php           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cis/private/freifaecher/pinboardverwaltung.php b/cis/private/freifaecher/pinboardverwaltung.php
index 173c3e165..20b6e6e00 100644
--- a/cis/private/freifaecher/pinboardverwaltung.php
+++ b/cis/private/freifaecher/pinboardverwaltung.php
@@ -90,7 +90,7 @@
 		$news->news_id = $news_id;
 		$news->betreff = trim((isset($_REQUEST['betreff']) ? $_REQUEST['betreff']:''));
 		$news->verfasser =trim((isset($_REQUEST['verfasser']) ? $_REQUEST['verfasser']:$user));
-		$news->text = trim((isset($_REQUEST['text']) ? $_REQUEST['text']:''));
+		$news->text = str_replace("\r\n","<br>",trim((isset($_REQUEST['text']) ? $_REQUEST['text']:'')));
 		
 		$news->studiengang_kz='0';
 		$news->semester='0';
diff --git a/cis/private/lehre/pinboardverwaltung.php b/cis/private/lehre/pinboardverwaltung.php
index 8501c363a..9a42ad844 100644
--- a/cis/private/lehre/pinboardverwaltung.php
+++ b/cis/private/lehre/pinboardverwaltung.php
@@ -94,7 +94,7 @@
 		$news->news_id = $news_id;
 		$news->betreff = trim(isset($_REQUEST['betreff']) ? $_REQUEST['betreff']:'');
 		$news->verfasser =trim(isset($_REQUEST['verfasser']) ? $_REQUEST['verfasser']:$user);
-		$news->text = trim(isset($_REQUEST['text']) ? $_REQUEST['text']:'');
+		$news->text = str_replace("\r\n","<br>",trim(isset($_REQUEST['text']) ? $_REQUEST['text']:''));
 
 		$news->studiengang_kz=(isset($_REQUEST['course_id'])?$_REQUEST['course_id']:(isset($_REQUEST['studiengang_kz'])?$_REQUEST['studiengang_kz']:0));
 		$news->semester=(isset($_REQUEST['term_id'])?$_REQUEST['term_id']:(isset($_REQUEST['semester'])?$_REQUEST['semester']:null));
diff --git a/cis/private/tools/newsverwaltung.php b/cis/private/tools/newsverwaltung.php
index a35c667e2..0a6fa3c19 100644
--- a/cis/private/tools/newsverwaltung.php
+++ b/cis/private/tools/newsverwaltung.php
@@ -88,7 +88,7 @@
 		$news->news_id = $news_id;
 		$news->betreff = trim((isset($_REQUEST['betreff']) ? $_REQUEST['betreff']:''));
 		$news->verfasser =trim((isset($_REQUEST['verfasser']) ? $_REQUEST['verfasser']:$user));
-		$news->text = trim((isset($_REQUEST['text']) ? $_REQUEST['text']:''));
+		$news->text = str_replace("\r\n","<br>",trim((isset($_REQUEST['text']) ? $_REQUEST['text']:'')));
 		
 		$news->studiengang_kz=(isset($_REQUEST['course_id'])?$_REQUEST['course_id']:(isset($_REQUEST['studiengang_kz'])?$_REQUEST['studiengang_kz']:'0'));
 		$news->semester=(isset($_REQUEST['term_id'])?$_REQUEST['term_id']:(isset($_REQUEST['semester'])?$_REQUEST['semester']:null));
@@ -317,7 +317,7 @@
 				</td>
 			  </tr>
 			  <tr>
-			  	<td><textarea class="TextBox" style="color:black;background-color:#FFFCF2;border : 1px solid Black;width: 99%; heigth: 166px;"   name="text" rows="10" cols="100" maxlength="1999"><?php if(isset($news_id) && $news_id != "") echo mb_eregi_replace("<br>", "\r\n", $news->text); ?></textarea></td>
+			  	<td><textarea class="TextBox" style="color:black;background-color:#FFFCF2;border : 1px solid Black;width: 99%; heigth: 166px;"   name="text" rows="10" cols="100" maxlength="1999"><?php if(isset($news_id) && $news_id != "") echo str_replace("<br>", "\r\n", $news->text); ?></textarea></td>
 			  </tr>
 			  <tr>
 			  	<td id="error" class="error">&nbsp;<?php echo $error; ?></td>