From f61a6c42c554a3c387d9c65ce56beedb3ca4195e Mon Sep 17 00:00:00 2001
From: HipsterCat <tasty@hipstercat.fr>
Date: Wed, 28 Nov 2018 23:13:12 +0100
Subject: [PATCH] Added possible base_url

---
 web/context_processor.py    |  6 +++++-
 web/templates/feeds.html    |  2 +-
 web/templates/homepage.html |  2 +-
 web/templates/setup.html    |  4 ++--
 web/templates/template.html |  4 ++--
 web/views.py                | 12 ++++++------
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/web/context_processor.py b/web/context_processor.py
index 595d86a..deafcc0 100644
--- a/web/context_processor.py
+++ b/web/context_processor.py
@@ -7,5 +7,9 @@ def BASE_URL(request):
     else:
         scheme = 'http://'
     fullhost = request.get_host()
-    base = fullhost.split(":")[0]
+    port = fullhost.split(":")[1]
+    if port == 80 or port == 443:
+        base = fullhost.split(":")[0]
+    else:
+        base = fullhost
     return {'BASE_URL': scheme + base, }
\ No newline at end of file
diff --git a/web/templates/feeds.html b/web/templates/feeds.html
index 4109b2c..67b3315 100644
--- a/web/templates/feeds.html
+++ b/web/templates/feeds.html
@@ -19,7 +19,7 @@
 
                 <div id="collapse{{ feed.id }}" class="collapse" aria-labelledby="heading{{ feed.id }}" data-parent="#accordionExample">
                   <div class="card-body">
-                    <code>{{ BASE_URL }}/{{ feed.uurl }}.rss</code>
+                    <code>{{ BASE_URL }}{% url 'rss' uurl=feed.uurl %}</code>
                     <p><a class="btn btn-danger" href="{% url 'feed_delete' feed.id %}">Delete</a></p>
                   </div>
                 </div>
diff --git a/web/templates/homepage.html b/web/templates/homepage.html
index a937ba6..9eeb3c4 100644
--- a/web/templates/homepage.html
+++ b/web/templates/homepage.html
@@ -5,7 +5,7 @@
         <div class="col-lg-12 text-center">
             <h1 class="mt-5">Generate RSS out of any website</h1>
             {% if error %}<div class="alert alert-danger" role="alert">{{ error }}</div>{% endif %}
-            <form action="/" method="post">
+            <form action="{% url 'homepage' %}" method="post">
                 {% csrf_token %}
                 <div class="form-group">
                     <input type="text" class="form-control" name="url" id="url" placeholder="http://" {% if url %}value="{{ url }}"{% endif %}>
diff --git a/web/templates/setup.html b/web/templates/setup.html
index d55179e..12e276c 100644
--- a/web/templates/setup.html
+++ b/web/templates/setup.html
@@ -29,7 +29,7 @@
                 <code style="display:block" id="link-selector"></code>
             </li>
             <li>
-                <form action="/newfeed" method="post">
+                <form action="{% url 'newfeed' %}" method="post">
                     {% csrf_token %}
                     <input type="hidden" id="url" name="url" value="{{ url }}">
                     <input type="hidden" id="element" name="element" value="">
@@ -44,7 +44,7 @@
         </ul>
     </div>
     <!-- /#sidebar-wrapper -->
-    <iframe id="preview" style="width:100%" src="/iframe/{{ url }}"></iframe>
+    <iframe id="preview" style="width:100%" src="{% url 'iframe' url=url %}"></iframe>
     <script>
         $(function() {
             function handleResize() {
diff --git a/web/templates/template.html b/web/templates/template.html
index e0b9832..4074f18 100644
--- a/web/templates/template.html
+++ b/web/templates/template.html
@@ -26,14 +26,14 @@
     <!-- Navigation -->
     <nav class="navbar navbar-expand-lg navbar-dark bg-dark static-top">
       <div class="container">
-        <a class="navbar-brand" href="/">HRSS</a>
+        <a class="navbar-brand" href="{% url 'homepage' %}">HRSS</a>
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
         </button>
         <div class="collapse navbar-collapse" id="navbarResponsive">
           <ul class="navbar-nav ml-auto">
             <li class="nav-item">
-              <a class="nav-link" href="/">New
+              <a class="nav-link" href="{% url 'homepage' %}">New
                 <span class="sr-only">(current)</span>
               </a>
             </li>
diff --git a/web/views.py b/web/views.py
index 5108639..38d66e2 100644
--- a/web/views.py
+++ b/web/views.py
@@ -68,7 +68,7 @@ def homepage(request):
         if "url" in request.POST and request.POST["url"]:
             url = request.POST["url"]
             if is_valid_url(url):
-                return redirect("/setup/"+url)
+                return redirect("setup", url=url)
             else:
                 return render(request, 'homepage.html', {"url": url, "error": url+" is not a valid URL."})
     return render(request, 'homepage.html')
@@ -77,7 +77,7 @@ def setup(request, url):
     if is_valid_url(url):
         return render(request, 'setup.html', {"url": url})
     else:
-        return redirect("/")
+        return redirect("homepage")
 
 
 def newfeed(request):
@@ -110,9 +110,9 @@ def newfeed(request):
         feed = Feed(url=url, element=element, title=title, content=content, date=date, author=author, link=link)
         feed.save()
 
-        return redirect("/feeds")
+        return redirect("feeds")
     else:
-        return redirect("/")
+        return redirect("homepage")
 
 def feeds(request):
     feeds = Feed.objects.all()
@@ -124,11 +124,11 @@ def feed_delete(request, id):
         if not request.get_host() == "hrss.hipstercat.fr:443":
             Feed.objects.get(pk=id).delete()
             logger.info("Removed feed ID "+id)
-            return redirect("/feeds")
+            return redirect("feeds")
         else:
             return HttpResponse("Deleting is disabled on demo website.", status=403)
     except ObjectDoesNotExist:
-        return redirect("/feeds")
+        return redirect("feeds")
 
 def rss(request, uurl):
     try: