angel views in english complete

1 files changed, 18 insertions, 30 deletions

diff --git a/includes/pages/user_questions.php b/includes/pages/user_questions.php
index e9a9d503..0ed1339c 100644
--- a/includes/pages/user_questions.php
+++ b/includes/pages/user_questions.php
@@ -5,53 +5,41 @@ function questions_title() {
 
 function user_questions() {
   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>';
-
-    $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>';
-
+  
+  if (! isset($_REQUEST['action'])) {
+    $open_questions = sql_select("SELECT * FROM `Questions` WHERE `AID`=0 AND `UID`=" . sql_escape($user['UID']));
+    
+    $answered_questions = sql_select("SELECT * FROM `Questions` WHERE `AID`>0 AND `UID`=" . sql_escape($user['UID']));
+    foreach ($answered_questions as &$question) {
       $answer_user_source = User($question['AID']);
-      if($answer_user_source === false)
-        engelsystem_error("Unable to load user.");
-
-      $answered_questions .= '<td>' . User_Nick_render($answer_user_source) . '</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>';
+      if ($answer_user_source === false)
+        engelsystem_error(_("Unable to load user."));
+      $question['answer_user'] = User_Nick_render($answer_user_source);
     }
-
-    return template_render('../templates/user_questions.html', array (
-      'link' => page_link_to("user_questions"),
-      'open_questions' => $open_questions,
-      'answered_questions' => $answered_questions
-    ));
+    
+    return Questions_view($open_questions, $answered_questions, page_link_to("user_questions") . '&action=ask');
   } else {
     switch ($_REQUEST['action']) {
-      case 'ask' :
+      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) . "'");
           redirect(page_link_to("user_questions"));
         } else
-          return error("Gib eine Frage ein!", true);
+          return error(_("Please enter a question!"), true);
         break;
-      case 'delete' :
-        if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
+      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 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");
           redirect(page_link_to("user_questions"));
         } else
-          return error("No question found.", true);
+          return error(_("No question found."), true);
         break;
     }
   }