@@ -29,6 +29,7 @@ import os
2929from datetime import datetime, timedelta
3030from requests import get as http_get
3131from itertools import chain
32+from urllib import urlencode
3233from flask import (
3334 Flask, request, render_template, url_for, Response, make_response,
3435 redirect, send_from_directory
@@ -204,6 +205,18 @@ def url_for_theme(endpoint, override_theme=None, **values):
204205 return url_for(endpoint, **values)
205206
206207
208+def image_proxify(url):
209+
210+ if url.startswith('//'):
211+ url = 'https:' + url
212+
213+ if not settings['server'].get('image_proxy') and not request.cookies.get('image_proxy'):
214+ return url
215+
216+ return '{0}?{1}'.format(url_for('image_proxy'),
217+ urlencode(dict(url=url)))
218+
219+
207220def render(template_name, override_theme=None, **kwargs):
208221 blocked_engines = request.cookies.get('blocked_engines', '').split(',')
209222
@@ -250,6 +263,8 @@ def render(template_name, override_theme=None, **kwargs):
250263 # override url_for function in templates
251264 kwargs['url_for'] = url_for_theme
252265
266+ kwargs['image_proxify'] = image_proxify
267+
253268 kwargs['get_result_template'] = get_result_template
254269
255270 kwargs['theme'] = get_current_theme_name(override=override_theme)