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 @@ ' . str_replace("\n", '
', $question['Question']) . 'Löschen'; + 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 .= '' . str_replace("\n", '
', $question['Question']) . 'Löschen'; - $answered_questions = ""; - $questions = sql_select("SELECT * FROM `Questions` WHERE `AID`>0 AND `UID`=" . sql_escape($user['UID'])); - foreach ($questions as $question) { - $answered_questions .= '' . str_replace("\n", '
', $question['Question']) . ''; - $answered_questions .= '' . UID2Nick($question['AID']) . '' . str_replace("\n", '
', $question['Answer']) . ''; - $answered_questions .= 'Löschen'; - } + $answered_questions = ""; + $questions = sql_select("SELECT * FROM `Questions` WHERE `AID`>0 AND `UID`=" . sql_escape($user['UID'])); + foreach ($questions as $question) { + $answered_questions .= '' . str_replace("\n", '
', $question['Question']) . ''; + $answered_questions .= '' . UID2Nick($question['AID']) . '' . str_replace("\n", '
', $question['Answer']) . ''; + $answered_questions .= 'Löschen'; + } - 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)); } /**