From 32512856b47f1cf13f141bedc116e61511814934 Mon Sep 17 00:00:00 2001
From: asciimoo <asciimoo@gmail.com>
Date: Tue, 31 Dec 2013 02:09:24 +0100
Subject: [mod][fix] using base_url instead of hostname in settings.py

---
 searx/webapp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'searx/webapp.py')

diff --git a/searx/webapp.py b/searx/webapp.py
index 6ac0046f1..c95cae2c2 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -165,8 +165,8 @@ def opensearch():
         method = 'get'
     if request.is_secure:
         scheme = 'https'
-    if settings.hostname:
-        hostname = '{0}://{1}/'.format(scheme,settings.hostname)
+    if settings.base_url:
+        hostname = settings.base_url
     else:
         hostname = url_for('index', _external=True, _scheme=scheme)
     ret = opensearch_xml.format(method=method, host=hostname)
-- 
cgit v1.2.3


From 1df697305c4fc2e2de980efd41fb0f9a3c002091 Mon Sep 17 00:00:00 2001
From: asciimoo <asciimoo@gmail.com>
Date: Wed, 1 Jan 2014 22:16:53 +0100
Subject: [enh] preferences added

---
 searx/webapp.py | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

(limited to 'searx/webapp.py')

diff --git a/searx/webapp.py b/searx/webapp.py
index c95cae2c2..e06b985d1 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -124,29 +124,47 @@ def index():
         response.headers.add('Content-Disposition', 'attachment;Filename=searx_-_{0}.csv'.format('_'.join(query.split())))
         return response
 
-    template = render('results.html'
-                        ,results=results
-                        ,q=request_data['q']
-                        ,selected_categories=selected_categories
-                        ,number_of_results=len(results)
-                        ,suggestions=suggestions
-                        )
-    resp = make_response(template)
-    resp.set_cookie('categories', ','.join(selected_categories))
+    return render('results.html'
+                 ,results=results
+                 ,q=request_data['q']
+                 ,selected_categories=selected_categories
+                 ,number_of_results=len(results)
+                 ,suggestions=suggestions
+                 )
 
-    return resp
 
 @app.route('/about', methods=['GET'])
 def about():
     global categories
     return render('about.html', categs=categories.items())
 
+
+@app.route('/preferences', methods=['GET', 'POST'])
+def preferences():
+
+    if request.method=='POST':
+        selected_categories = []
+        for pd_name,pd in request.form.items():
+            if pd_name.startswith('category_'):
+                category = pd_name[9:]
+                if not category in categories:
+                    continue
+                selected_categories.append(category)
+        if selected_categories:
+            template = render('preferences.html', selected_categories=selected_categories)
+            resp = make_response(template)
+            resp.set_cookie('categories', ','.join(selected_categories))
+            return resp
+    return render('preferences.html')
+
+
 @app.route('/stats', methods=['GET'])
 def stats():
     global categories
     stats = get_engines_stats()
     return render('stats.html', stats=stats)
 
+
 @app.route('/robots.txt', methods=['GET'])
 def robots():
     return Response("""User-agent: *
@@ -155,6 +173,7 @@ Allow: /about
 Disallow: /stats
 """, mimetype='text/plain')
 
+
 @app.route('/opensearch.xml', methods=['GET'])
 def opensearch():
     global opensearch_xml
-- 
cgit v1.2.3


From d2898b08187101aad477ef48c8ea7518cee8b925 Mon Sep 17 00:00:00 2001
From: asciimoo <asciimoo@gmail.com>
Date: Wed, 1 Jan 2014 23:04:13 +0100
Subject: [enh] preferences redirection

---
 searx/webapp.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'searx/webapp.py')

diff --git a/searx/webapp.py b/searx/webapp.py
index e06b985d1..b7e2a4674 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -22,7 +22,7 @@ if __name__ == "__main__":
     from sys import path
     path.append(os.path.realpath(os.path.dirname(os.path.realpath(__file__))+'/../'))
 
-from flask import Flask, request, render_template, url_for, Response, make_response
+from flask import Flask, request, render_template, url_for, Response, make_response, redirect
 from searx.engines import search, categories, engines, get_engines_stats
 from searx import settings
 import json
@@ -151,8 +151,7 @@ def preferences():
                     continue
                 selected_categories.append(category)
         if selected_categories:
-            template = render('preferences.html', selected_categories=selected_categories)
-            resp = make_response(template)
+            resp = make_response(redirect('/'))
             resp.set_cookie('categories', ','.join(selected_categories))
             return resp
     return render('preferences.html')
-- 
cgit v1.2.3