From 2a944121f8157f23c6a5d00e68cf0071277802c8 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Sat, 19 May 2012 15:59:19 +0200
Subject: #48 keep symbols in text messages

---
 includes/pages/user_questions.php | 84 +++++++++++++++++++--------------------
 includes/sys_page.php             |  4 +-
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/includes/pages/user_questions.php b/includes/pages/user_questions.php
index e30663f7..d23b4e96 100644
--- a/includes/pages/user_questions.php
+++ b/includes/pages/user_questions.php
@@ -1,50 +1,50 @@
 <?php
 function user_questions() {
-	global $user;
+  global $user;
 
-	if (!isset ($_REQUEST['action'])) {
-		$open_questions = "";
-		$questions = sql_select("SELECT * FROM `Questions` WHERE `AID`=0 AND `UID`=" . sql_escape($user['UID']));
-		foreach ($questions as $question)
-			$open_questions .= '<tr><td>' . str_replace("\n", '<br />', $question['Question']) . '</td><td><a href="' . page_link_to("user_questions") . '&action=delete&id=' . $question['QID'] . '">Löschen</a></td><tr>';
+  if (!isset ($_REQUEST['action'])) {
+    $open_questions = "";
+    $questions = sql_select("SELECT * FROM `Questions` WHERE `AID`=0 AND `UID`=" . sql_escape($user['UID']));
+    foreach ($questions as $question)
+      $open_questions .= '<tr><td>' . str_replace("\n", '<br />', $question['Question']) . '</td><td><a href="' . page_link_to("user_questions") . '&action=delete&id=' . $question['QID'] . '">Löschen</a></td><tr>';
 
-		$answered_questions = "";
-		$questions = sql_select("SELECT * FROM `Questions` WHERE `AID`>0 AND `UID`=" . sql_escape($user['UID']));
-		foreach ($questions as $question) {
-			$answered_questions .= '<tr><td>' . str_replace("\n", '<br />', $question['Question']) . '</td>';
-			$answered_questions .= '<td>' . UID2Nick($question['AID']) . '</td><td>' . str_replace("\n", '<br />', $question['Answer']) . '</td>';
-			$answered_questions .= '<td><a href="' . page_link_to("user_questions") . '&action=delete&id=' . $question['QID'] . '">Löschen</a></td><tr>';
-		}
+    $answered_questions = "";
+    $questions = sql_select("SELECT * FROM `Questions` WHERE `AID`>0 AND `UID`=" . sql_escape($user['UID']));
+    foreach ($questions as $question) {
+      $answered_questions .= '<tr><td>' . str_replace("\n", '<br />', $question['Question']) . '</td>';
+      $answered_questions .= '<td>' . UID2Nick($question['AID']) . '</td><td>' . str_replace("\n", '<br />', $question['Answer']) . '</td>';
+      $answered_questions .= '<td><a href="' . page_link_to("user_questions") . '&action=delete&id=' . $question['QID'] . '">Löschen</a></td><tr>';
+    }
 
-		return template_render('../templates/user_questions.html', array (
-			'link' => page_link_to("user_questions"),
-			'open_questions' => $open_questions,
-			'answered_questions' => $answered_questions
-		));
-	} else {
-		switch ($_REQUEST['action']) {
-			case 'ask' :
-				$question = trim(preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['question'])));
-				if ($question != "") {
-					sql_query("INSERT INTO `Questions` SET `UID`=" . sql_escape($user['UID']) . ", `Question`='" . sql_escape($question) . "'");
-					header("Location: " . page_link_to("user_questions"));
-				} else
-					return error("Gib eine Frage ein!", true);
-				break;
-			case 'delete' :
-				if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
-					$id = $_REQUEST['id'];
-				else
-					return error("Incomplete call, missing Question ID.", true);
+    return template_render('../templates/user_questions.html', array (
+      'link' => page_link_to("user_questions"),
+      'open_questions' => $open_questions,
+      'answered_questions' => $answered_questions
+    ));
+  } else {
+    switch ($_REQUEST['action']) {
+      case 'ask' :
+        $question = strip_request_item_nl('question');
+        if ($question != "") {
+          sql_query("INSERT INTO `Questions` SET `UID`=" . sql_escape($user['UID']) . ", `Question`='" . sql_escape($question) . "'");
+          header("Location: " . page_link_to("user_questions"));
+        } else
+          return error("Gib eine Frage ein!", true);
+        break;
+      case 'delete' :
+        if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
+          $id = $_REQUEST['id'];
+        else
+          return error("Incomplete call, missing Question ID.", true);
 
-				$question = sql_select("SELECT * FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1");
-				if (count($question) > 0 && $question[0]['UID'] == $user['UID']) {
-					sql_query("DELETE FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1");
-					header("Location: " . page_link_to("user_questions"));
-				} else
-					return error("No question found.", true);
-				break;
-		}
-	}
+        $question = sql_select("SELECT * FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1");
+        if (count($question) > 0 && $question[0]['UID'] == $user['UID']) {
+          sql_query("DELETE FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1");
+          header("Location: " . page_link_to("user_questions"));
+        } else
+          return error("No question found.", true);
+        break;
+    }
+  }
 }
 ?>
\ No newline at end of file
diff --git a/includes/sys_page.php b/includes/sys_page.php
index c423155f..2e39ff43 100644
--- a/includes/sys_page.php
+++ b/includes/sys_page.php
@@ -29,14 +29,14 @@ function test_request_int($name) {
  * Gibt den gefilterten REQUEST Wert mit Zeilenumbrüchen zurück
  */
 function strip_request_item_nl($name) {
-	return preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}+\n]{1,})/ui", '', strip_tags($_REQUEST[$name]));
+	return preg_replace("/([^\p{L}\p{S}\p{P}\p{Z}\p{N}+\n]{1,})/ui", '', strip_tags($_REQUEST[$name]));
 }
 
 /**
  * Entfernt unerwünschte Zeichen
  */
 function strip_item($item) {
-	return preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}+]{1,})/ui", '', strip_tags($item));
+	return preg_replace("/([^\p{L}\p{S}\p{P}\p{Z}\p{N}+]{1,})/ui", '', strip_tags($item));
 }
 
 /**
-- 
cgit v1.2.3-70-g09d2