From cc01c906ba63b3797bf2b9ef92a6854fe2ddbefb Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 29 Aug 2017 16:21:25 +0200
Subject: #336: Integration of symfony/http-foundation request

---
 includes/pages/user_atom.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'includes/pages/user_atom.php')

diff --git a/includes/pages/user_atom.php b/includes/pages/user_atom.php
index 98ace9cc..2991bdbf 100644
--- a/includes/pages/user_atom.php
+++ b/includes/pages/user_atom.php
@@ -1,6 +1,7 @@
 <?php
 
 use Engelsystem\Database\DB;
+use Engelsystem\Http\Request;
 
 /**
  * Publically available page to feed the news to feed readers
@@ -44,14 +45,15 @@ function user_atom()
  */
 function make_atom_entries_from_news($news_entries)
 {
+    $request = Request::getInstance();
     $html = '<?xml version="1.0" encoding="utf-8"?>
   <feed xmlns="http://www.w3.org/2005/Atom">
   <title>Engelsystem</title>
-  <id>' . $_SERVER['HTTP_HOST']
+  <id>' . $request->getHttpHost()
         . htmlspecialchars(preg_replace(
             '#[&?]key=[a-f\d]{32}#',
             '',
-            $_SERVER['REQUEST_URI']
+            $request->getRequestUri()
         ))
         . '</id>
   <updated>' . date('Y-m-d\TH:i:sP', $news_entries[0]['Datum']) . '</updated>' . "\n";
@@ -64,11 +66,12 @@ function make_atom_entries_from_news($news_entries)
 
 function make_atom_entry_from_news($news_entry)
 {
-    return '  <entry>
+    return '
+  <entry>
     <title>' . htmlspecialchars($news_entry['Betreff']) . '</title>
-    <link href="' . page_link_to_absolute('news_comments', ['nid' => $news_entry['ID']]) . '"/>
-      <id>' . preg_replace('#^https?://#', '', page_link_to_absolute('news')) . '-' . $news_entry['ID'] . '</id>
-      <updated>' . date('Y-m-d\TH:i:sP', $news_entry['Datum']) . '</updated>
+    <link href="' . page_link_to('news_comments', ['nid' => $news_entry['ID']]) . '"/>
+    <id>' . preg_replace('#^https?://#', '', page_link_to('news_comments', ['nid' => $news_entry['ID']])) . '</id>
+    <updated>' . date('Y-m-d\TH:i:sP', $news_entry['Datum']) . '</updated>
     <summary>' . htmlspecialchars($news_entry['Text']) . '</summary>
-    </entry>' . "\n";
+  </entry>' . "\n";
 }
-- 
cgit v1.2.3-54-g00ecf