From b01b95194ee3c25cbe9e915f1c188726ba2db7f2 Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Mon, 19 Jan 2015 20:16:06 +0100
Subject: Allow non specific cookies

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

(limited to 'searx/webapp.py')

diff --git a/searx/webapp.py b/searx/webapp.py
index 7c3eddee8..f04d9276a 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -470,6 +470,8 @@ def preferences():
         lang = request.cookies['language']
 
     blocked_engines = []
+    
+    resp = make_response(redirect(url_for('index')))
 
     if request.method == 'GET':
         blocked_engines = request.cookies.get('blocked_engines', '').split(',')
@@ -502,8 +504,8 @@ def preferences():
                     blocked_engines.append(engine_name)
             elif pd_name == 'theme':
                 theme = pd if pd in themes else default_theme
-
-        resp = make_response(redirect(url_for('index')))
+            else:
+                resp.set_cookie(pd_name, pd, max_age=cookie_max_age)
 
         user_blocked_engines = request.cookies.get('blocked_engines', '').split(',')  # noqa
 
@@ -555,6 +557,7 @@ def preferences():
                   autocomplete_backends=autocomplete_backends,
                   shortcuts={y: x for x, y in engine_shortcuts.items()},
                   themes=themes,
+                  cookies=request.cookies,
                   theme=get_current_theme_name())
 
 
-- 
cgit v1.2.3


From 1a24fd9c5205112d855be1a3e5d450b39baa22fc Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Mon, 19 Jan 2015 21:23:22 +0100
Subject: Add cookies to every requests

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

(limited to 'searx/webapp.py')

diff --git a/searx/webapp.py b/searx/webapp.py
index f04d9276a..ca681f0aa 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -292,6 +292,7 @@ def index():
     if not request.args and not request.form:
         return render(
             'index.html',
+            cookies=request.cookies,
         )
 
     try:
@@ -299,6 +300,7 @@ def index():
     except:
         return render(
             'index.html',
+            cookies=request.cookies,
         )
 
     search.results, search.suggestions,\
@@ -387,6 +389,7 @@ def index():
         answers=search.answers,
         infoboxes=search.infoboxes,
         theme=get_current_theme_name(),
+        cookies=request.cookies,
         favicons=global_favicons[themes.index(get_current_theme_name())]
     )
 
@@ -396,6 +399,7 @@ def about():
     """Render about page"""
     return render(
         'about.html',
+        cookies=request.cookies,
     )
 
 
@@ -615,6 +619,7 @@ def stats():
     return render(
         'stats.html',
         stats=stats,
+        cookies=request.cookies,
     )
 
 
-- 
cgit v1.2.3


From 393d24ba50e8f71a948adabb675ead10c96f46b9 Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Mon, 19 Jan 2015 22:26:48 +0100
Subject: Flake8

---
 searx/webapp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'searx/webapp.py')

diff --git a/searx/webapp.py b/searx/webapp.py
index ca681f0aa..639780a48 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -474,7 +474,7 @@ def preferences():
         lang = request.cookies['language']
 
     blocked_engines = []
-    
+
     resp = make_response(redirect(url_for('index')))
 
     if request.method == 'GET':
-- 
cgit v1.2.3


From 816a2c5cbefb73468b31316a007b59b8b8a23654 Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Tue, 20 Jan 2015 16:29:54 +0100
Subject: Move cookies in render()

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

(limited to 'searx/webapp.py')

diff --git a/searx/webapp.py b/searx/webapp.py
index 639780a48..df5cc5812 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -277,6 +277,8 @@ def render(template_name, override_theme=None, **kwargs):
 
     kwargs['template_name'] = template_name
 
+    kwargs['cookies'] = request.cookies
+
     return render_template(
         '{}/{}'.format(kwargs['theme'], template_name), **kwargs)
 
@@ -292,7 +294,6 @@ def index():
     if not request.args and not request.form:
         return render(
             'index.html',
-            cookies=request.cookies,
         )
 
     try:
@@ -300,7 +301,6 @@ def index():
     except:
         return render(
             'index.html',
-            cookies=request.cookies,
         )
 
     search.results, search.suggestions,\
@@ -389,7 +389,6 @@ def index():
         answers=search.answers,
         infoboxes=search.infoboxes,
         theme=get_current_theme_name(),
-        cookies=request.cookies,
         favicons=global_favicons[themes.index(get_current_theme_name())]
     )
 
@@ -399,7 +398,6 @@ def about():
     """Render about page"""
     return render(
         'about.html',
-        cookies=request.cookies,
     )
 
 
@@ -561,7 +559,6 @@ def preferences():
                   autocomplete_backends=autocomplete_backends,
                   shortcuts={y: x for x, y in engine_shortcuts.items()},
                   themes=themes,
-                  cookies=request.cookies,
                   theme=get_current_theme_name())
 
 
@@ -619,7 +616,6 @@ def stats():
     return render(
         'stats.html',
         stats=stats,
-        cookies=request.cookies,
     )
 
 
-- 
cgit v1.2.3