Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit e9d90d06 authored by Mathieu Brunot's avatar Mathieu Brunot Committed by GitHub
Browse files

Merge branch 'master' into feature/accessibility

parents a51b2b6c 4e029b02

searx/plugins/tracker_url_remover.py

+5 −7
Original line number Diff line number Diff line
@@ -39,16 +39,14 @@ def on_result(request, search, result): 
        return True

    parsed_query = parse_qsl(query)



    changed = False

    changes = 0

    for i, (param_name, _) in enumerate(list(parsed_query)):

        for reg in regexes:

            if reg.match(param_name):

                parsed_query.pop(i)

                changed = True

                break



        if changed:

                parsed_query.pop(i - changes)

                changes += 1

                result['parsed_url'] = result['parsed_url']._replace(query=urlencode(parsed_query))

                result['url'] = urlunparse(result['parsed_url'])

                break



    return True

searx/templates/oscar/results.html

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
                <span class="result_header text-muted form-inline pull-left suggestion_item">{{ _('Try searching for:') }}</span>

                {% for correction in corrections %}

                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-left suggestion_item">

                        <input type="hidden" name="q" value="{{ query_prefix + correction }}">

                        <button type="submit" class="btn btn-default btn-xs">{{ correction }}</button>

                        <input type="hidden" name="q" value="{{ correction.url }}">

                        <button type="submit" class="btn btn-default btn-xs">{{ correction.title }}</button>

                    </form>

                {% endfor %}

            </div>

searx/templates/simple/results.html

+2 −2
Original line number Diff line number Diff line
@@ -95,13 +95,13 @@ 
      {% for correction in corrections %}

      <div class="left">

	<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation">

          <input type="hidden" name="q" value="{{ correction }}">

          <input type="hidden" name="q" value="{{ correction.url }}">

          <input type="hidden" name="time_range" value="{{ time_range }}">

          <input type="hidden" name="language" value="{{ current_language }}">

          <input type="hidden" name="safesearch" value="{{ safesearch }}">

          <input type="hidden" name="theme" value="{{ theme }}">

          {% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit }}" >{% endif %}

          <input type="submit" value="{{ correction }}">

          <input type="submit" value="{{ correction.title }}">

	</form>

      </div>

      {% endfor %}

searx/webapp.py

+7 −1
Original line number Diff line number Diff line
@@ -610,6 +610,12 @@ def index(): 
                          'title': suggestion

                          },

                          result_container.suggestions)



    correction_urls = list(map(lambda correction: {

                               'url': raw_text_query.changeSearchQuery(correction).getFullQuery(),

                               'title': correction

                               },

                               result_container.corrections))

    #

    return render(

        'results.html',
@@ -622,7 +628,7 @@ def index(): 
        advanced_search=advanced_search,

        suggestions=suggestion_urls,

        answers=result_container.answers,

        corrections=result_container.corrections,

        corrections=correction_urls,

        infoboxes=result_container.infoboxes,

        paging=result_container.paging,

        unresponsive_engines=result_container.unresponsive_engines,