Guaranteed activation of external link blocking

This is a quickfix for the problem observed with external link blocking during certain history navigation actions (when the cached iframe content was loaded/restored before the viewer setup was completed). Since external link blocking doesn't depend on the translations (that are asynchronously loaded during the viewer setup) it can be performed unconditionally. However, the current dependence of `on_content_load()` on viewer setup has to be addressed too.
fixup! Fixed external links in the viewer iframe
2026-01-03 11:58:04 -05:00 · 2023-05-10 16:04:13 +04:00 · 2023-05-10 14:54:48 +04:00 · 2023-05-09 17:38:03 +04:00 · 2023-05-09 17:33:08 +04:00
35 changed files with 123 additions and 433 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:

 jobs:
  macOS:
-    runs-on: macos-11
+    runs-on: macos-12
    env:
      HOME: /Users/runner
    steps:
@@ -18,14 +18,11 @@ jobs:
      - name: Install packages
        run: |
          brew update
-          brew unlink python3
-          # upgrade from python@3.11.2_1 to python@3.11.3 fails to overwrite those
-          rm -f /usr/local/bin/2to3 /usr/local/bin/2to3-3.11 /usr/local/bin/idle3 /usr/local/bin/idle3.11 /usr/local/bin/pydoc3 /usr/local/bin/pydoc3.11 /usr/local/bin/python3 /usr/local/bin/python3-config /usr/local/bin/python3.11 /usr/local/bin/python3.11-config
          brew install pkg-config ninja meson

      - name: Install dependencies
        env:
-          ARCHIVE_NAME: deps2_macos_native_dyn_libkiwix.tar.xz
+          ARCHIVE_NAME: deps2_osx_native_dyn_libkiwix.tar.xz
        run: |
          wget -O- https://tmp.kiwix.org/ci/${{env.ARCHIVE_NAME}} | tar -xJ -C ${{env.HOME}}

@@ -57,19 +54,19 @@ jobs:
        include:
          - name: native_static
            target: native_static
-            image_variant: focal
+            image_variant: bionic
            lib_postfix: '/x86_64-linux-gnu'
          - name: native_dyn
            target: native_dyn
-            image_variant: focal
+            image_variant: bionic
            lib_postfix: '/x86_64-linux-gnu'
          - name: android_arm
            target: android_arm
-            image_variant: focal
+            image_variant: bionic
            lib_postfix: '/arm-linux-androideabi'
          - name: android_arm64
            target: android_arm64
-            image_variant: focal
+            image_variant: bionic
            lib_postfix: '/aarch64-linux-android'
          - name: win32_static
            target: win32_static
@@ -81,12 +78,22 @@ jobs:
            lib_postfix: '64'
    env:
      HOME: /home/runner
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    container:
-      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:37"
+      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:36"
    steps:
    - name: Checkout code
-      uses: actions/checkout@v3
+      shell: python
+      run: |
+        from subprocess import check_call
+        from os import environ
+        command = [
+          'git', 'clone',
+          'https://github.com/${{github.repository}}',
+          '--depth=1',
+          '--branch', '${{ github.head_ref || github.ref_name }}'
+        ]
+        check_call(command, cwd=environ['HOME'])
    - name: Install deps
      shell: bash
      run: |
@@ -109,6 +116,7 @@ jobs:
        if [[ "${{matrix.target}}" =~ android_.* ]]; then
          MESON_OPTION="$MESON_OPTION -Dstatic-linkage=true"
        fi
+        cd $HOME/libkiwix
        meson . build ${MESON_OPTION}
        cd build
        ninja
@@ -119,7 +127,7 @@ jobs:
      if: startsWith(matrix.target, 'native_')
      shell: bash
      run: |
-        cd build
+        cd $HOME/libkiwix/build
        meson test --verbose
        ninja coverage
      env:
@@ -130,4 +138,4 @@ jobs:
      if: startsWith(matrix.target, 'native_')
      uses: codecov/codecov-action@v3
      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
+        token: ${{ secrets.CODECOV_TOKEN }}
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -16,6 +16,7 @@ jobs:
          - ubuntu-kinetic
          - ubuntu-jammy
          - ubuntu-focal
+          - ubuntu-bionic
    steps:
      - uses: actions/checkout@v3

@@ -62,6 +63,14 @@ jobs:
          args: --no-sign
          ppa: ${{ steps.ppa.outputs.ppa }}

+      - uses: legoktm/gh-action-build-deb@ubuntu-bionic
+        if: matrix.distro == 'ubuntu-bionic'
+        name: Build package for ubuntu-bionic
+        id: build-ubuntu-bionic
+        with:
+          args: --no-sign
+          ppa: ${{ steps.ppa.outputs.ppa }}
+
      - uses: actions/upload-artifact@v3
        with:
          name: Packages for ${{ matrix.distro }}
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -1,21 +0,0 @@
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-# Set the version of Python and other tools you might need
-build:
-  os: ubuntu-22.04
-  tools:
-    python: "3.11"
-
-# Build documentation in the docs/ directory with Sphinx
-sphinx:
-  configuration: docs/conf.py
-
-# We recommend specifying your dependencies to enable reproducible builds:
-# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
-python:
-  install:
-  - requirements: docs/requirements.txt
--- a/48
+++ b/48
@@ -1,51 +1,3 @@
-libkiwix 13.0.0
-===============
-
- * This version is mainly a re-releasing of 12.1.0 with a new major version
-   as there is a API break in this version.
-
-libkiwix 12.1.1
-===============
-
- * Revert API break introduced in libkiwix 12.1.0
-
-libkiwix 12.1.0
-===============
-
- * Server:
-  - Introduce a `/nojs` endpoint to browse catalog and zim files with a browser without js (@juuz0 #897)
-  - Translate the viewer (@veloman-yunkan #871 #846)
-  - Display `mul` on tile when zim is multi-languages (@juuz0 #934)
-  - Suggestion links point to the `/content` endpoint (@veloman-yunkan #862)
-  - Correctly compress web fonts in http answers (@kelson42 #856)
-  - Correctly encode link in suggestions (@veloman-yunkan #859 #860 #963)
-  - Correctly encode url redirection (@veloman-yunkan #866 #890)
-  - Properly handle user language, through cookies and http headers (@veloman-yunkan #849 #869)
-  - Fix url encoding (@veloman-yunkan #870)
-  - Fix viewer for viewer for SeaMonkey (@veloman-yunkan #887)
-  - Make the downloader threadsafe (@mgautierfr #886)
-  - Add RSS feed in the main page (pointing to the catalog) (@juuz0 #882 #920)
-  - Correctly set the mimetype for json and ico (@veloman-yunkan #892)
-  - `count=-1` correspond to unlimited count (instead of 0) (@veloman-yunkan #894)
-  - Keep the navigation bar on top (@juuz0 #896)
-  - Make the viewer's iframe "safe" (@veloman-yunkan #906 #930)
-  - Correctly escape search link in XML Opds output (@veloman-yunkan #936)
-  - Store values needed for the viewer js in the url fragment instead of the query string (@juuz0 #907)
-  - Get rid of legacy OPDS API usage in the viewer (@veloman-yunkan #939)
-  - Fix charset encoding declaration in OPDS response MIME types (@veloman-yunkan #942)
-  - Fix PDF in the viewer (@veloman-yunkan #940)
-  - Fix external links handling in the viewer (@veloman-yunkan #959)
-  - Add tests of searching with accents (@mgautierfs #954)
- * Fix handling of missing illustration in the book (@veloman-yunkan #961)
- * Add support for multi languages zim files (@veloman-yunkan #904)
- * Fix includes for openbsd (@bentley #949)
- * Fix pathes in git to allow git clone on Windows (@adamlamar #868)
- * Switch to `main` as principal branch (instead of `master`) (@kelson42)
- * Remove libkiwix android publisher from the repository (@kelson42 #884)
- * Various fixes of meson and CI. (@mgautierfr @kelson42)
-
-
-
 libkiwix 12.0.0
 ===============

--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('libkiwix', 'cpp',
-  version : '13.0.0',
+  version : '12.0.0',
  license : 'GPLv3+',
  default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])

@@ -36,7 +36,7 @@ else
 endif

 libzim_dep = dependency('libzim', version : '>=8.1.0', static:static_deps)
-if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN', dependencies: libzim_dep)
+if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN')
  error('Libzim seems to be compiled without xapian. Xapian support is mandatory.')
 endif

--- a/src/book.cpp
+++ b/src/book.cpp
@@ -117,12 +117,11 @@ void Book::updateFromXml(const pugi::xml_node& node, const std::string& baseDir)
  m_articleCount = strtoull(ATTR("articleCount"), 0, 0);
  m_mediaCount = strtoull(ATTR("mediaCount"), 0, 0);
  m_size = strtoull(ATTR("size"), 0, 0) << 10;
-  const std::string faviconMimeType = ATTR("faviconMimeType");
-  const std::string faviconBase64EncodedData = ATTR("favicon");
-  if ( !faviconMimeType.empty() && !faviconBase64EncodedData.empty() ) {
+  std::string favicon_mimetype = ATTR("faviconMimeType");
+  if (! favicon_mimetype.empty()) {
    const auto favicon = std::make_shared<Illustration>();
-    favicon->data = base64_decode(faviconBase64EncodedData);
-    favicon->mimeType = faviconMimeType;
+    favicon->data = base64_decode(ATTR("favicon"));
+    favicon->mimeType = favicon_mimetype;
    favicon->url = ATTR("faviconUrl");
    m_illustrations.assign(1, favicon);
  }
--- a/src/library_dumper.cpp
+++ b/src/library_dumper.cpp
@@ -38,7 +38,6 @@ std::map<std::string, std::string> iso639_3 = {
  {"dty", "डोटेली"},
  {"eml", "emiliân-rumagnōl"},
  {"fbs", "српскохрватски"},
-  {"guw", "Gungbe"},
  {"hbs", "srpskohrvatski"},
  {"ido", "ido"},
  {"kbp", "kabɩyɛ"},
--- a/src/server/internalServer.cpp
+++ b/src/server/internalServer.cpp
@@ -19,7 +19,7 @@

 #include "internalServer.h"

-#ifndef _WIN32
+#ifdef __FreeBSD__
 #include <netinet/in.h>
 #endif

--- a/static/i18n_resources_list.txt
+++ b/static/i18n_resources_list.txt
@@ -5,7 +5,6 @@ skin/i18n/de.json
 skin/i18n/dga.json
 skin/i18n/el.json
 skin/i18n/en.json
-skin/i18n/fi.json
 skin/i18n/fr.json
 skin/i18n/he.json
 skin/i18n/hy.json
--- a/static/skin/i18n/bn.json
+++ b/static/skin/i18n/bn.json
@@ -11,8 +11,5 @@
 	"library-button-text": "স্বাগত পাতায় চলুন",
 	"home-button-text": "'{{BOOK_TITLE}}'-এর প্রধান পাতায় চলুন",
 	"searchbox-tooltip": "'{{BOOK_TITLE}}' অনুসন্ধান করুন",
-	"search": "অনুসন্ধান",
-	"welcome-to-kiwix-server": "কিউইক্স সার্ভারে স্বাগতম",
-	"download-links-title": "বই ডাউনলোড করুন",
-	"preview-book": "প্রাকদর্শন"
+	"search": "অনুসন্ধান"
 }
--- a/static/skin/i18n/dga.json
+++ b/static/skin/i18n/dga.json
@@ -1,11 +1,10 @@
 {
 	"@metadata": {
 		"authors": [
-			"Alhaji Yakubu",
-			"Amire80"
+			"Alhaji Yakubu"
 		]
 	},
-	"welcome-page-overzealous-filter": "Duoro kyebe. <a href=\"{{URL}}\">E na boɔra ka fo</a>?",
+	"welcome-page-overzealous-filter": "Duoro kyebe. E na boɔra ka fo <a href=\"?lang=\"></a>",
 	"search": "Bo",
 	"book-filtering-all-categories": "Zagre zaa",
 	"book-filtering-all-languages": "Kɔkɔrɛɛ zaa",
@@ -16,6 +15,7 @@
 	"hash-download-alt-text": "Tage bonmannaa",
 	"magnet-link-text": "Kurimaraa sobie",
 	"magnet-alt-text": "Tage kurimaraa",
+	"library-opds-feed": "Gamadie OPDS diibu",
 	"filter-by-tag": "Guy yi kpuli {{TAG}}",
 	"stop-filtering-by-tag": "Bare gyɛɛbo kpuli {{TAG}}"
 }
--- a/static/skin/i18n/el.json
+++ b/static/skin/i18n/el.json
@@ -1,11 +1,10 @@
 {
 	"@metadata": {
 		"authors": [
-			"Kelson",
 			"Norhorn"
 		]
 	},
-	"welcome-page-overzealous-filter": "Κανένα αποτέλεσμα. Θέλετε να <a href=\"{{URL}}\">επαναφέρετε το φίλτρο</a>;",
+	"welcome-page-overzealous-filter": "Κανένα αποτέλεσμα. Θέλετε να <a href=\"?lang=\">επαναφέρετε το φίλτρο</a>;",
 	"powered-by-kiwix-html": "Με την υποστήριξη by&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
 	"search": "Αναζήτηση",
 	"book-filtering-all-categories": "Όλες οι κατηγορίες",
--- a/static/skin/i18n/fi.json
+++ b/static/skin/i18n/fi.json
@@ -1,30 +0,0 @@
-{
-	"@metadata": {
-		"authors": [
-			"MITO",
-			"Nike",
-			"Pyscowicz"
-		]
-	},
-	"name": "suomi",
-	"suggest-full-text-search": "sisältää '{{{SEARCH_TERMS}}}'...",
-	"url-not-found": "Pyydettyä URL-osoitetta \"{{url}}\" ei löytynyt tältä palvelimelta.",
-	"400-page-title": "Virheellinen pyyntö",
-	"400-page-heading": "Virheellinen pyyntö",
-	"404-page-title": "Sisältöä ei löytynyt",
-	"404-page-heading": "Ei löytynyt",
-	"500-page-title": "Sisäinen palvelinvirhe",
-	"500-page-heading": "Sisäinen palvelinvirhe",
-	"library-button-text": "Siirry tervetulosivulle",
-	"home-button-text": "Siirry kirjan '{{BOOK_TITLE}}' etusivulle",
-	"random-page-button-text": "Siirry satunnaiselle sivulle",
-	"searchbox-tooltip": "Hae '{{BOOK_TITLE}}'",
-	"search": "Hae",
-	"book-filtering-all-categories": "Kaikki luokat",
-	"book-filtering-all-languages": "Kaikki kielet",
-	"download": "Lataa",
-	"torrent-download-link-text": "Torrent-tiedosto",
-	"filter-by-tag": "Suodata tunnisteen ”{{TAG}}” mukaan",
-	"download-links-title": "Lataa kirja",
-	"preview-book": "Esikatsele"
-}
--- a/static/skin/i18n/fr.json
+++ b/static/skin/i18n/fr.json
@@ -31,7 +31,7 @@
 	"random-page-button-text": "Aller à une page sélectionnée aléatoirement",
 	"searchbox-tooltip": "Rechercher « {{BOOK_TITLE}} »",
 	"confusion-of-tongues": "Deux livres ou plus dans des langues différentes participeraient à la recherche, ce qui pourrait conduire à des résultats confus.",
-	"welcome-page-overzealous-filter": "Aucun résultat. Souhaitez-vous <a href=\"{{URL}}\">réinitialiser le filtre</a> ?",
+	"welcome-page-overzealous-filter": "Aucun résultat. Souhaitez-vous <a href=\"?lang=\">réinitialiser le filtre</a> ?",
 	"powered-by-kiwix-html": "Propulsé par <a href=\"https://kiwix.org/\">Kiwix</a>",
 	"search": "Rechercher",
 	"book-filtering-all-categories": "Toutes les catégories",
@@ -46,12 +46,7 @@
 	"magnet-alt-text": "télécharger le lien Magnet",
 	"torrent-download-link-text": "Fichier torrent",
 	"torrent-download-alt-text": "télécharger le torrent",
-	"library-opds-feed-all-entries": "Flux OPDS de la bibliothèque – Toutes les entrées",
+	"library-opds-feed": "Flux OPDS de la bibliothèque",
 	"filter-by-tag": "Filtrer par la balise « {{TAG}} »",
-	"stop-filtering-by-tag": "Arrêter le filtrage par la balise « {{TAG}} »",
-	"library-opds-feed-parameterised": "Flux OPDS de la bibliothèque – Entrées correspondant à {{#LANG}} :\n ▪ Langue : {{LANG}} {{/LANG}}{{#CATEGORY}}\n ▪ Catégorie : {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\n ▪ Étiquette : {{TAG}} {{/TAG}}{{#Q}}\n ▪ Requête : {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "Bienvenue sur le Serveur Kiwix",
-	"download-links-heading": "Liens de téléchargement pour <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "Télécharger le livre",
-	"preview-book": "Aperçu"
+	"stop-filtering-by-tag": "Arrêter le filtrage par la balise « {{TAG}} »"
 }
--- a/static/skin/i18n/he.json
+++ b/static/skin/i18n/he.json
@@ -30,7 +30,7 @@
 	"random-page-button-text": "מעבר לדף שנבחר אקראית",
 	"searchbox-tooltip": "חיפוש \"{{BOOK_TITLE}}\"",
 	"confusion-of-tongues": "שני ספרים או יותר בשפות שונות ישתתפו בחיפוש, מה שעלול להוביל לתוצאות מבלבלות.",
-	"welcome-page-overzealous-filter": "אין תוצאות. האם <a href=\"{{URL}}\">לאפס את המסנן</a>?",
+	"welcome-page-overzealous-filter": "אין תוצאות. האם <a href=\"?lang=\">לאפס את המסנן</a>?",
 	"powered-by-kiwix-html": "מופעל על־ידי&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
 	"search": "חיפוש",
 	"book-filtering-all-categories": "כל הקטגוריות",
@@ -45,12 +45,7 @@
 	"magnet-alt-text": "הורדת magnet",
 	"torrent-download-link-text": "קובץ טורנט",
 	"torrent-download-alt-text": "הורדת טורנט",
-	"library-opds-feed-all-entries": "הזנת ספריית OPDS - כל הרשומות",
+	"library-opds-feed": "הזנת OPDS של ספרייה",
 	"filter-by-tag": "סינון לפי התג \"{{TAG}}\"",
-	"stop-filtering-by-tag": "להפסיק סינון לפי התג \"{{TAG}}\"",
-	"library-opds-feed-parameterised": "הזנת ספריית OPDS - רשומות שתואמות ל{{#LANG}}\nשפה: {{LANG}} {{/LANG}}{{#CATEGORY}}\nקטגוריה: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nתג: {{TAG}} {{/TAG}}{{#Q}}\nשאילתה: {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "ברוך בואך לשרת קיוויקס",
-	"download-links-heading": "הורדת קישורים עבור <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "הורדת ספר",
-	"preview-book": "תצוגה מקדימה"
+	"stop-filtering-by-tag": "להפסיק סינון לפי התג \"{{TAG}}\""
 }
--- a/static/skin/i18n/ia.json
+++ b/static/skin/i18n/ia.json
@@ -1,36 +1,10 @@
 {
 	"@metadata": {
 		"authors": [
-			"Kelson",
 			"McDutchie"
 		]
 	},
-	"name": "interlingua",
-	"suggest-full-text-search": "continente '{{{SEARCH_TERMS}}}'...",
-	"no-such-book": "Necun tal libro: {{BOOK_NAME}}",
-	"too-many-books": "Troppo de libros demandate ({{NB_BOOKS}}); le limite es {{LIMIT}}",
-	"no-book-found": "Necun libro corresponde al criterios de selection",
-	"url-not-found": "Le URL reuqestate \"{{url}}\" non ha essite trovate sur iste servitor.",
-	"suggest-search": "Facer un recerca in texto complete de <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
-	"random-article-failure": "Ups! Non poteva eliger un articulo aleatori :(",
-	"invalid-raw-data-type": "{{DATATYPE}} non es un request valide pro contento crude.",
-	"no-value-for-arg": "Necun valor fornite pro le argumento {{ARGUMENT}}",
-	"no-query": "Necun consulta fornite.",
-	"raw-entry-not-found": "Non pote trovar le entrata {{ENTRY}} del typo {{DATATYPE}}",
-	"400-page-title": "Requesta invalide",
-	"400-page-heading": "Requesta invalide",
-	"404-page-title": "Contento non trovate",
-	"404-page-heading": "Non trovate",
-	"500-page-title": "Error interne del servitor",
-	"500-page-heading": "Error interne del servitor",
-	"fulltext-search-unavailable": "Le recerca in texto complete es indisponibile",
-	"no-search-results": "Le motor de recerca in texto complete non es disponibile pro iste contento.",
-	"library-button-text": "Ir al pagina de benvenita",
-	"home-button-text": "Ir al pagina principal de ''{{BOOK_TITLE}}",
-	"random-page-button-text": "Ir a un pagina seligite aleatorimente",
-	"searchbox-tooltip": "Cercar '{{BOOK_TITLE}}'",
-	"confusion-of-tongues": "Duo o plus libros in differente linguas participarea in le recerca, lo que pote menar a resultatos confuse.",
-	"welcome-page-overzealous-filter": "Nulle resultato. Vole tu <a href=\"{{URL}}\">reinitialisar le filtro</a>?",
+	"welcome-page-overzealous-filter": "Nulle resultato. Vole tu <a href=\"?lang=\">reinitialisar le filtro</a>?",
 	"powered-by-kiwix-html": "Actionate per&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
 	"search": "Cercar",
 	"book-filtering-all-categories": "Tote le categorias",
@@ -45,12 +19,7 @@
 	"magnet-alt-text": "ligamine \"magnet\" de discargamento",
 	"torrent-download-link-text": "File Torrent",
 	"torrent-download-alt-text": "discargar Torrent",
-	"library-opds-feed-all-entries": "Fluxo OPDS del bibliotheca – Tote le entratas",
+	"library-opds-feed": "Fluxo OPDS del bibliotheca",
 	"filter-by-tag": "Filtrar per etiquetta \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Non plus filtrar per etiquetta \"{{TAG}}\"",
-	"library-opds-feed-parameterised": "Fluxo OPDS del bibliotheca – Entratas correspondente a {{#LANG}}\nLingua {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategoria: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nEtiquetta: {{TAG}} {{/TAG}}{{#Q}}\nConsulta: {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "Benvenite al servitor Kiwix",
-	"download-links-heading": "Discargar ligamines pro <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "Discargar libro",
-	"preview-book": "Previsualisation"
+	"stop-filtering-by-tag": "Non plus filtrar per etiquetta \"{{TAG}}\""
 }
--- a/static/skin/i18n/it.json
+++ b/static/skin/i18n/it.json
@@ -2,13 +2,12 @@
 	"@metadata": {
 		"authors": [
 			"Albano",
-			"Beta16",
-			"McDutchie"
+			"Beta16"
 		]
 	},
 	"name": "italiano",
 	"suggest-full-text-search": "contenente '{{{SEARCH_TERMS}}}'...",
-	"no-such-book": "Nessun libro con questo nome: {{BOOK_NAME}}",
+	"no-such-book": "Nessun libro del genere: {{BOOK_NAME}}",
 	"too-many-books": "Troppi libri richiesti ({{NB_BOOKS}}) dove il limite è {{LIMIT}}",
 	"no-book-found": "Nessun libro corrisponde ai criteri di selezione",
 	"url-not-found": "L'URL richiesto \"{{url}}\" non è stato trovato in questo server.",
@@ -28,7 +27,5 @@
 	"book-filtering-all-categories": "Tutte le categorie",
 	"book-filtering-all-languages": "Tutte le lingue",
 	"count-of-matching-books": "{{COUNT}} libro/i",
-	"download": "Scarica",
-	"download-links-title": "Scarica libro",
-	"preview-book": "Anteprima"
+	"download": "Scarica"
 }
--- a/static/skin/i18n/ja.json
+++ b/static/skin/i18n/ja.json
@@ -28,6 +28,5 @@
 	"magnet-link-text": "マグネットリンク",
 	"magnet-alt-text": "マグネットをダウンロード",
 	"torrent-download-link-text": "Torrentファイル",
-	"torrent-download-alt-text": "Torrentをダウンロード",
-	"preview-book": "プレビュー"
+	"torrent-download-alt-text": "Torrentをダウンロード"
 }
--- a/static/skin/i18n/ko.json
+++ b/static/skin/i18n/ko.json
@@ -14,6 +14,5 @@
 	"500-page-title": "내부 서버 오류",
 	"500-page-heading": "내부 서버 오류",
 	"fulltext-search-unavailable": "전문 검색을 사용할 수 없습니다",
-	"random-page-button-text": "무작위로 선택된 문서로 이동",
-	"preview-book": "미리 보기"
+	"random-page-button-text": "무작위로 선택된 문서로 이동"
 }
--- a/static/skin/i18n/lb.json
+++ b/static/skin/i18n/lb.json
@@ -1,7 +1,6 @@
 {
 	"@metadata": {
 		"authors": [
-			"Kelson",
 			"Robby",
 			"Volvox"
 		]
@@ -17,7 +16,7 @@
 	"home-button-text": "Gitt op d'Haaptsäit vun '{{BOOK_TITLE}}'",
 	"random-page-button-text": "Gitt op eng zoufälleg gewielte Säit",
 	"searchbox-tooltip": "No '{{BOOK_TITLE}}' sichen",
-	"welcome-page-overzealous-filter": "Kee Resultat. Wëllt Dir <a href=\"{{URL}}\">de Filter zrécksetzen</a>?",
+	"welcome-page-overzealous-filter": "Kee Resultat. Wëllt Dir <a href=\"?lang=\">de Filter zrécksetzen</a>?",
 	"search": "Sichen",
 	"book-filtering-all-categories": "All Kategorien",
 	"book-filtering-all-languages": "All Sproochen",
--- a/static/skin/i18n/mk.json
+++ b/static/skin/i18n/mk.json
@@ -1,8 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
-			"Bjankuloski06",
-			"Kelson"
+			"Bjankuloski06"
 		]
 	},
 	"name": "македонски",
@@ -30,7 +29,7 @@
 	"random-page-button-text": "Оди на случајно избрана страница",
 	"searchbox-tooltip": "Пребарај го „{{BOOK_TITLE}}“",
 	"confusion-of-tongues": "Во пребарувањето ќе учествуваат две или повеќе книги на различни јазици, што може да довете до збунувачки исход.",
-	"welcome-page-overzealous-filter": "Нема исход. Дали би сакале да го <a href=\"{{URL}}\">поништите филтерот</a>?",
+	"welcome-page-overzealous-filter": "Нема исход. Дали би сакале да го <a href=\"?lang=\">поништите филтерот</a>?",
 	"powered-by-kiwix-html": "Овозможено од&nbsp;<a href=\"https://kiwix.org\">Кивикс</a>",
 	"search": "Пребарај",
 	"book-filtering-all-categories": "Сите категории",
@@ -45,12 +44,7 @@
 	"magnet-alt-text": "преземи магнет",
 	"torrent-download-link-text": "Торентна податотека",
 	"torrent-download-alt-text": "преземи торент",
-	"library-opds-feed-all-entries": "Библиотечен тековник на OPDS — Сите ставки",
+	"library-opds-feed": "Библиотечен OPDS-тековник",
 	"filter-by-tag": "Филтрирај по ознаката „{{TAG}}“",
-	"stop-filtering-by-tag": "Запри филтрирање по ознаката „{{TAG}}“",
-	"library-opds-feed-parameterised": "Библиотечен тековник на OPDS — ставки што одговараат на {{#LANG}}\nЈазик: {{LANG}} {{/LANG}}{{#CATEGORY}}\nКатегорија: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nОзнака: {{TAG}} {{/TAG}}{{#Q}}\nБарање: {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "Добре дојдовте на Опслужувачот на Кивикс",
-	"download-links-heading": "Врски за преземање на <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "Преземи книга",
-	"preview-book": "Преглед"
+	"stop-filtering-by-tag": "Запри филтрирање по ознаката „{{TAG}}“"
 }
--- a/static/skin/i18n/nl.json
+++ b/static/skin/i18n/nl.json
@@ -1,7 +1,6 @@
 {
 	"@metadata": {
 		"authors": [
-			"Kelson",
 			"McDutchie",
 			"Vistaus"
 		]
@@ -10,7 +9,7 @@
 	"no-book-found": "Er zijn geen boeken die overeenkomen met de zoekcriteria",
 	"no-value-for-arg": "Er is geen waarde opgegeven bij {{ARGUMENT}}",
 	"no-query": "Er is geen zoekterm opgegeven.",
-	"welcome-page-overzealous-filter": "Geen resultaat. Wilt u <a href=\"{{URL}}\">het filter resetten</a>?",
+	"welcome-page-overzealous-filter": "Geen resultaat. Wilt u <a href=\"?lang=\">het filter resetten</a>?",
 	"powered-by-kiwix-html": "Mogelijk gemaakt door <a href=\"https://kiwix.org\">Kiwix</a>",
 	"search": "Zoeken",
 	"book-filtering-all-categories": "Alle categorieën",
@@ -25,6 +24,7 @@
 	"magnet-alt-text": "magnet-link van de download",
 	"torrent-download-link-text": "Torrent-bestand",
 	"torrent-download-alt-text": "torrent downloaden",
+	"library-opds-feed": "OPDS-feed van de bibliotheek",
 	"filter-by-tag": "Filteren op tag \"{{TAG}}\"",
 	"stop-filtering-by-tag": "Stoppen met filteren op tag \"{{TAG}}\""
 }
--- a/static/skin/i18n/nqo.json
+++ b/static/skin/i18n/nqo.json
@@ -1,7 +1,6 @@
 {
 	"@metadata": {
 		"authors": [
-			"Amire80",
 			"Lancine.kounfantoh.fofana"
 		]
 	},
@@ -30,21 +29,5 @@
 	"random-page-button-text": "ߕߊ߯ ߓߍ߲߬ߛߋ߲߬ߡߊ߬ ߞߐߜߍ߫ ߛߎߥߊ߲ߘߌߣߍ߲ ߠߎ߬ ߞߊ߲߬",
 	"searchbox-tooltip": "ߕߌߙߌ߲ߠߌ߲ {{BOOK_TITLE}}",
 	"confusion-of-tongues": "ߞߊ߬ߝߊ߫ ߝߌ߬ߟߊ߬ ߥߟߊ߫ ߦߙߌߞߊ ߞߊ߲߫ ߜߘߍ ߟߎ߬ ߘߐ߫߸ ߏ߬ ߟߎ߫ ߘߌߣߊ߬ ߕߘߍ߬ ߢߌߣߌ߲ߠߌ߲ ߘߐ߫߸ ߡߍ߲ ߠߎ߬ ߛߌ߫ ߞߣߐ߬ߝߟߌ ߟߊߘߏ߲߬ ߠߊ߫ ߞߐߝߟߌ ߘߐ߫.",
-	"welcome-page-overzealous-filter": "ߞߐߝߟߌ߫ ߕߴߦߋ߲߬. ߊ߬ ߝߐ߫ ߌ ߦߴߊ߬ ߝߍ߬ ߞߊ߬ <a href=\"{{URL}}\">ߛߍ߲ߛߍ߲ߟߊ߲ ߘߐߛߌ߰ ߕߎ߲߯</a>؟",
-	"search": "ߢߌߣߌ߲ߠߌ߲",
-	"book-filtering-all-categories": "ߦߌߟߡߊ ߟߎ߬ ߓߍ߯",
-	"book-filtering-all-languages": "ߞߊ߲ ߠߎ߬ ߓߍ߯",
-	"count-of-matching-books": "ߞߊ߬ߝߊ {{COUNT}}(ߟߎ߫)",
-	"download": "ߟߊ߬ߖߌ߰ߒ߬ߞߎ߲߬ߠߌ߲",
-	"direct-download-link-text": "ߒߕߋߟߋ߲ߡߊ߬",
-	"direct-download-alt-text": "ߟߊ߬ߖߌ߰ߒ߬ߞߎ߲߬ߠߌ߲߫ ߝߊ߲ߞߢߊ",
-	"hash-download-alt-text": "ߤߊߛ߭ ߟߊߖߌ߰ ߌ ߞߎ߲߬",
-	"magnet-link-text": "ߡߊߢߍߕ ߛߘߌ߬ߜߋ߲",
-	"magnet-alt-text": "ߡߊߢߍߕ ߟߊߖߌ߰ ߌ ߞߎ߲߬",
-	"torrent-download-link-text": "ߕߏߙߍ߲ߕ ߞߐߕߐ߮",
-	"torrent-download-alt-text": "ߕߏߙߍ߲ߕ ߟߊߖߌ߰ ߌ ߞߎ߲߬",
-	"welcome-to-kiwix-server": "ߌ ߣߌ߫ ߛߣߍ߫ ߞߥߌߞߛ ߡߊߛߐߟߊ߲ ߞߣߐ߫",
-	"download-links-heading": "<b><i>{{BOOK_TITLE}}</i></b> ߛߘߌ߬ߜߋ߲ ߠߊߖߌ߰ ߌ ߞߎ߲߬",
-	"download-links-title": "ߞߊ߬ߝߊ ߟߊߖߌ߰ ߌ ߞߎ߲߬",
-	"preview-book": "ߊ߬ ߘߐߜߍ߫ ߡߎߣߎ߲߬"
+	"welcome-page-overzealous-filter": "ߞߐߝߟߌ߫ ߕߴߦߋ߲߬. ߊ߬ ߝߐ߫ ߌ ߦߴߊ߬ ߝߍ߬ ߞߊ߬ <a href=\"?lang=\">ߛߍ߲ߛߍ߲ߟߊ߲ ߘߐߛߌ߰ ߕߎ߲߯</a>؟"
 }
--- a/static/skin/i18n/pl.json
+++ b/static/skin/i18n/pl.json
@@ -1,8 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
-			"Strebski",
-			"WaldiSt"
+			"Strebski"
 		]
 	},
 	"name": "Polski",
@@ -24,8 +23,5 @@
 	"library-button-text": "Przejdź do strony powitalnej",
 	"home-button-text": "Przejdź do głównej strony '{{BOOK_TITLE}}'",
 	"random-page-button-text": "Przejdź do losowo wybranej strony",
-	"searchbox-tooltip": "Szukaj '{{BOOK_TITLE}}'",
-	"welcome-to-kiwix-server": "Witamy na serwerze Kiwix",
-	"download-links-title": "Pobierz książkę",
-	"preview-book": "Podgląd"
+	"searchbox-tooltip": "Szukaj '{{BOOK_TITLE}}'"
 }
--- a/static/skin/i18n/qqq.json
+++ b/static/skin/i18n/qqq.json
@@ -45,9 +45,9 @@
 	"magnet-alt-text": "Hint for the icon of a magnet link",
 	"torrent-download-link-text": "Link text for downloading the torrent file",
 	"torrent-download-alt-text": "Hint for the icon of torrent download",
-	"library-opds-feed-all-entries": "Hint for the library OPDS feed for all entries",
 	"filter-by-tag": "Hint for a link that would load results filtered by a single tag",
 	"stop-filtering-by-tag": "Tooltip for the button that cancels filtering by tag",
+	"library-opds-feed-all-entries": "Hint for the library OPDS feed for all entries",
 	"library-opds-feed-parameterised": "Hint for the library OPDS feed for filtered entries",
 	"welcome-to-kiwix-server": "Title shown in browser's title bar/page tab",
 	"download-links-heading": "Heading for no-js download page",
--- a/static/skin/i18n/sc.json
+++ b/static/skin/i18n/sc.json
@@ -1,7 +1,6 @@
 {
 	"@metadata": {
 		"authors": [
-			"Kelson",
 			"L2212"
 		]
 	},
@@ -29,28 +28,5 @@
 	"home-button-text": "Bae a sa pàgina printzipale de '{{BOOK_TITLE}}'",
 	"random-page-button-text": "Bae a una pàgina seletzionada a manera casuale",
 	"searchbox-tooltip": "Chirca '{{BOOK_TITLE}}'",
-	"confusion-of-tongues": "Duos o prus libros in limbas diferentes diant pigare parte a sa chirca, cosa chi diat pòdere causare resurtados confusionosos.",
-	"welcome-page-overzealous-filter": "Perunu resurtadu. Boles <a href=\"{{URL}}\">resetare su filtru</a>?",
-	"powered-by-kiwix-html": "Alimentadu dae&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
-	"search": "Chirca",
-	"book-filtering-all-categories": "Totu sas categorias",
-	"book-filtering-all-languages": "Totu sas limbas",
-	"count-of-matching-books": "{{COUNT}} libru/os",
-	"download": "Iscàrriga",
-	"direct-download-link-text": "Diretu",
-	"direct-download-alt-text": "iscarrigamentu diretu",
-	"hash-download-link-text": "Hash SHA256",
-	"hash-download-alt-text": "hash de s'iscarrigamentu",
-	"magnet-link-text": "Ligàmene Magnet",
-	"magnet-alt-text": "ligàmene \"magnet\" de iscarrigamentu",
-	"torrent-download-link-text": "Documentu Torrent",
-	"torrent-download-alt-text": "iscàrriga su torrent",
-	"library-opds-feed-all-entries": "Flussu OPDS de sa biblioteca – Totu sos elementos",
-	"filter-by-tag": "Filtra pro eticheta \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Non filtres prus pro eticheta \"{{TAG}}\"",
-	"library-opds-feed-parameterised": "Flussu OPDS de sa biblioteca - elementos chi currispondet cun {{#LANG}}\nLimba: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategoria: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nEticheta: {{TAG}} {{/TAG}}{{#Q}}\nChirca: {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "Bene bènnidu a su serbidore de Kiwix",
-	"download-links-heading": "Ligàmenes de iscarrigamentu pro <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "Iscàrriga su libru",
-	"preview-book": "Antiprima"
+	"confusion-of-tongues": "Duos o prus libros in limbas diferentes diant pigare parte a sa chirca, cosa chi diat pòdere causare resurtados confusionosos."
 }
--- a/static/skin/i18n/skr-arab.json
+++ b/static/skin/i18n/skr-arab.json
@@ -1,26 +0,0 @@
-{
-	"@metadata": {
-		"authors": [
-			"Saraiki"
-		]
-	},
-	"name": "سرائیکی",
-	"400-page-title": "غلط ارداس",
-	"400-page-heading": "غلط ارداس",
-	"404-page-title": "مواد کائنی لبھیا",
-	"404-page-heading": "کائنی لبھا",
-	"500-page-title": "اندرلا سرور نقص",
-	"500-page-heading": "اندرلا سرور نقص",
-	"search": "ڳولو",
-	"book-filtering-all-categories": "ساریاں ونکیاں",
-	"book-filtering-all-languages": "ساریاں زباناں",
-	"count-of-matching-books": "{{COUNT}} کتاب(اں)",
-	"download": "ڈاؤن لوڈ",
-	"direct-download-link-text": "ڈائرکٹ",
-	"direct-download-alt-text": "ڈائرکٹ ڈاؤن لوڈ",
-	"hash-download-alt-text": "ڈاؤن لوڈ ہیش",
-	"torrent-download-link-text": "ٹورنٹ فائل",
-	"torrent-download-alt-text": "ٹورںٹ ݙاؤن لوڈ کرو",
-	"download-links-title": "کتاب ڈاؤن لوڈ کرو",
-	"preview-book": "پیشگی ݙکھالا"
-}
--- a/static/skin/i18n/sl.json
+++ b/static/skin/i18n/sl.json
@@ -1,8 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
-			"Eleassar",
-			"Kelson"
+			"Eleassar"
 		]
 	},
 	"name": "slovenščina",
@@ -30,7 +29,7 @@
 	"random-page-button-text": "Pojdite na naključno izbrano stran",
 	"searchbox-tooltip": "Poiščite »{{BOOK_TITLE}}«",
 	"confusion-of-tongues": "V iskanju bi bili uporabljeni dve ali več knjig v različnih jezikih, kar lahko pripelje do nejasnih zadetkov.",
-	"welcome-page-overzealous-filter": "Ni zadetkov. Želite <a href=\"{{URL}}\">ponastaviti filter</a>?",
+	"welcome-page-overzealous-filter": "Ni zadetkov. Želite <a href=\"?lang=\">ponastaviti filter</a>?",
 	"powered-by-kiwix-html": "Omogoča <a href=\"https://kiwix.org\">Kiwix</a>",
 	"search": "Išči",
 	"book-filtering-all-categories": "Vse kategorije",
@@ -45,12 +44,7 @@
 	"magnet-alt-text": "prenesi magnet",
 	"torrent-download-link-text": "Torrent datoteka",
 	"torrent-download-alt-text": "prenesi torrent",
-	"library-opds-feed-all-entries": "Knjižnični vir OPDS – Vsi vnosi",
+	"library-opds-feed": "Vir OPDS knjižnice",
 	"filter-by-tag": "Filtriraj po oznaki »{{TAG}}«",
-	"stop-filtering-by-tag": "Ustavi filtriranje po oznaki »{{TAG}}«",
-	"library-opds-feed-parameterised": "Knjižnični vir OPDS – vnosi, ki se ujemajo z {{#LANG}}\nJezik: {{LANG}} {{/LANG}}{{#CATEGORY}}\nKategorija: {{CATEGORY}} {{/CATEGORY}} {{#TAG}}\nOznaka: {{TAG}} {{/TAG}}{{#Q}}\nPoizvedba: {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "Pozdravljeni na strežniku Kiwix",
-	"download-links-heading": "Povezave za prenos za <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "Prenesi knjigo",
-	"preview-book": "Predogled"
+	"stop-filtering-by-tag": "Ustavi filtriranje po oznaki »{{TAG}}«"
 }
--- a/static/skin/i18n/sv.json
+++ b/static/skin/i18n/sv.json
@@ -30,28 +30,5 @@
 	"home-button-text": "Gå till huvudsidan för \"{{BOOK_TITLE}}\"",
 	"random-page-button-text": "Gå till en slumpmässigt utvald sida",
 	"searchbox-tooltip": "Sök efter \"{{BOOK_TITLE}}\"",
-	"confusion-of-tongues": "Två eller fler böcker på olika språk skulle delta i sökningen, vilket kan ge förvirrande resultat.",
-	"welcome-page-overzealous-filter": "Inga resultat. Vill du <a href=\"{{URL}}\">återställa filtret</a>?",
-	"powered-by-kiwix-html": "Drivs av&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
-	"search": "Sök",
-	"book-filtering-all-categories": "Alla kategorier",
-	"book-filtering-all-languages": "Alla språk",
-	"count-of-matching-books": "{{COUNT}} böcker",
-	"download": "Ladda ned",
-	"direct-download-link-text": "Direkt",
-	"direct-download-alt-text": "direktnedladdning",
-	"hash-download-link-text": "Sha256-hash",
-	"hash-download-alt-text": "ladda ned hash",
-	"magnet-link-text": "Magnetlänk",
-	"magnet-alt-text": "ladda ned magnet",
-	"torrent-download-link-text": "Torrent-fil",
-	"torrent-download-alt-text": "ladda ned torrent",
-	"library-opds-feed-all-entries": "Library OPDS Feed - Alla poster",
-	"filter-by-tag": "Filtrera efter taggen \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Sluta filtrera efter taggen \"{{TAG}}\"",
-	"library-opds-feed-parameterised": "Library OPDS Feed - poster som matchar {{#LANG}}\nSpråk: {{LANG}} {{/LANG}}{{#CATEGORY}}\nKategori: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTagg: {{TAG}} {{/TAG}}{{#Q}}\nFråga: {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "Välkommen till Kiwix Server",
-	"download-links-heading": "Nedladdningslänkar för <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "Ladda ned bok",
-	"preview-book": "Förhandsgranska"
+	"confusion-of-tongues": "Två eller fler böcker på olika språk skulle delta i sökningen, vilket kan ge förvirrande resultat."
 }
--- a/static/skin/i18n/zh-hant.json
+++ b/static/skin/i18n/zh-hant.json
@@ -1,7 +1,6 @@
 {
 	"@metadata": {
 		"authors": [
-			"Kelson",
 			"Kly",
 			"Winston Sung"
 		]
@@ -31,7 +30,7 @@
 	"random-page-button-text": "前往隨機選取頁面",
 	"searchbox-tooltip": "在{{BOOK_TITLE}}搜尋",
 	"confusion-of-tongues": "搜索裡有加入兩本或更多不同語言的書籍，這可能會導致混淆結果。",
-	"welcome-page-overzealous-filter": "沒有結果。您想要<a href=\"{{URL}}\">重新設定篩選</a>嗎？",
+	"welcome-page-overzealous-filter": "沒有結果。您想要<a href=\"?lang=\">重新設定篩選</a>嗎？",
 	"powered-by-kiwix-html": "由 <a href=\"https://kiwix.org\">Kiwix</a> 提供技術支援",
 	"search": "搜尋",
 	"book-filtering-all-categories": "所有分類",
@@ -46,12 +45,7 @@
 	"magnet-alt-text": "下載 magnet",
 	"torrent-download-link-text": "Torrent 檔案",
 	"torrent-download-alt-text": "下載 torrent",
-	"library-opds-feed-all-entries": "圖書館 OPDS 摘要 - 所有項目",
+	"library-opds-feed": "圖書館 OPDS 訊息來源",
 	"filter-by-tag": "依標籤「{{TAG}}」篩選",
-	"stop-filtering-by-tag": "停止依標籤「{{TAG}}」篩選",
-	"library-opds-feed-parameterised": "圖書館 OPDS 摘要 - 項目符合 {{#LANG}}\n語言：{{LANG}} {{/LANG}}{{#CATEGORY}}\n分類：{{CATEGORY}} {{/CATEGORY}}{{#TAG}}\n標籤：{{TAG}} {{/TAG}}{{#Q}}\n查詢：{{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "歡迎來到 Kiwix 伺服器",
-	"download-links-heading": "下載<b><i>{{BOOK_TITLE}}</i></b>的連結",
-	"download-links-title": "下載書籍",
-	"preview-book": "預覽"
+	"stop-filtering-by-tag": "停止依標籤「{{TAG}}」篩選"
 }
--- a/static/skin/languages.js
+++ b/static/skin/languages.js
@@ -14,9 +14,6 @@ const uiLanguages = [
  {
    "English": "en"
  },
-  {
-    "suomi": "fi"
-  },
  {
    "français": "fr"
  },
@@ -26,9 +23,6 @@ const uiLanguages = [
  {
    "Հայերեն": "hy"
  },
-  {
-    "interlingua": "ia"
-  },
  {
    "italiano": "it"
  },
--- a/static/skin/viewer.js
+++ b/static/skin/viewer.js
@@ -23,7 +23,7 @@ function userUrl2IframeUrl(url) {
 }

 function getBookFromUserUrl(url) {
-  if ( url == '' ) {
+  if ( url == '' || url.startsWith('catch/external?') ) {
    return null;
  }

@@ -54,22 +54,6 @@ function gotoRandomPage() {
  gotoUrl(`/random?content=${currentBook}`);
 }

-// URI-encodes only the specified special symbols (note, however, that '%' is
-// always considered a special symbol).
-function quasiUriEncode(s, specialSymbols) {
-  if ( specialSymbols.match(/[A-Za-z0-9]/) ) {
-    throw "Alphanumeric symbols cannot be special";
-  }
-
-  // Set's guarantee of iterating in insertion order ensures that
-  // all %s in s will be encoded first.
-  for ( const c of new Set('%' + specialSymbols) ) {
-    s = s.replaceAll(c, encodeURIComponent(c));
-  }
-
-  return s;
-}
-
 function performSearch() {
  const searchbox = document.getElementById('kiwixsearchbox');
  const q = encodeURIComponent(searchbox.value);
@@ -147,6 +131,10 @@ function iframeUrl2UserUrl(url, query) {
    return '';
  }

+  if ( url == `${root}/catch/external` ) {
+    return `catch/external${query}`;
+  }
+
  if ( url == `${root}/search` ) {
    return `search${query}`;
  }
@@ -220,30 +208,14 @@ function handle_visual_viewport_change() {
  contentIframe.height = wh - contentIframe.offsetTop - 4;
 }

-function setIframeUrl(path) {
-  try {
-    // Don't do anything if we are already at the requested URL.
-    // This is needed to break the infinite ping-pong played by
-    // handle_location_hash_change() and handle_content_url_change()
-    // (when either top-window or content window/iframe URL changes the other
-    // one is updated too).
-    if ( path == contentIframe.contentWindow.location.pathname )
-      return;
-  } catch ( error ) {
-    // This happens in Firefox when a PDF file is displayed in the iframe
-    // (sandboxing of the iframe content and cross-origin mismatch with the
-    // builtin PDF viewer result in preventing access to the attributes of
-    // contentIframe.contentWindow.location).
-    // Fall through and load the requested URL.
-  }
-  contentIframe.contentWindow.location.replace(path);
-}
-
 function handle_location_hash_change() {
  const hash = window.location.hash.slice(1);
  console.log("handle_location_hash_change: " + hash);
  updateCurrentBookIfNeeded(hash);
-  setIframeUrl(userUrl2IframeUrl(hash));
+  const iframeContentUrl = userUrl2IframeUrl(hash);
+  if ( iframeContentUrl != contentIframe.contentWindow.location.pathname ) {
+    contentIframe.contentWindow.location.replace(iframeContentUrl);
+  }
  updateSearchBoxForLocationChange();
  previousScrollTop = Infinity;
  history.replaceState(viewerState, null);
@@ -252,12 +224,16 @@ function handle_location_hash_change() {
 function handle_content_url_change() {
  const iframeLocation = contentIframe.contentWindow.location;
  console.log('handle_content_url_change: ' + iframeLocation.href);
-  document.title = contentIframe.contentDocument.title;
  const iframeContentUrl = iframeLocation.pathname;
  const iframeContentQuery = iframeLocation.search;
  const newHash = iframeUrl2UserUrl(iframeContentUrl, iframeContentQuery);
-  history.replaceState(viewerState, null, makeURL(location.search, newHash));
-  updateCurrentBookIfNeeded(newHash);
+  if ( newHash.startsWith('catch/external?') ) {
+    handleInterceptedExternalLink(newHash);
+  } else {
+    document.title = contentIframe.contentDocument.title;
+    history.replaceState(viewerState, null, makeURL(location.search, newHash));
+    updateCurrentBookIfNeeded(newHash);
+  }
 };

 ////////////////////////////////////////////////////////////////////////////////
@@ -275,10 +251,9 @@ function matchingAncestorElement(el, context, selector) {

 const block_path = `${root}/catch/external`;

-function blockLink(url) {
-  return viewerSettings.linkBlockingEnabled
-       ? block_path + "?source=" + encodeURIComponent(url)
-       : url;
+function blockLink(target) {
+  const encodedHref = encodeURIComponent(target.href);
+  target.setAttribute("href", block_path + "?source=" + encodedHref);
 }

 function isExternalUrl(url) {
@@ -295,15 +270,7 @@ function onClickEvent(e) {
  const target = matchingAncestorElement(e.target, iframeDocument, "a");
  if (target !== null && "href" in target) {
    if ( isExternalUrl(target.href) ) {
-      const possiblyBlockedLink = blockLink(target.href);
-      if ( e.ctrlKey || e.shiftKey ) {
-        // The link will be loaded in a new tab/window - update the link
-        // and let the browser handle the rest.
-        target.setAttribute("href", possiblyBlockedLink);
-      } else {
-        // Load the external URL in the viewer window (rather than iframe)
-        contentIframe.contentWindow.parent.location = possiblyBlockedLink;
-      }
+      return blockLink(target);
    }
  }
 }
@@ -342,6 +309,24 @@ function setup_external_link_blocker() {
  setupEventHandler(contentIframe.contentDocument, 'a', 'click', onClickEvent);
 }

+function getBlockedUrl(catchExternalUrl) {
+  const p = new URLSearchParams(catchExternalUrl.split('?')[1]);
+  return p.get('source');
+}
+
+function handleInterceptedExternalLink(catchExternalUrl) {
+  // The external link blocking page was loaded in the viewer iframe.
+  // We need to get rid of the viewer taskbar and load in the top frame either
+  // the external resource or, if running in --blockexternal mode, the
+  // confirmation page
+  const url = viewerSettings.linkBlockingEnabled
+            ? `${root}/` + catchExternalUrl
+            : getBlockedUrl(catchExternalUrl);
+  history.back(); // drop from the browsing history the state where the
+                  // external link catcher page is loaded in the iframe ...
+  window.location = url; // ... and load the target in the top frame instead
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // End of external link blocking
 ////////////////////////////////////////////////////////////////////////////////
@@ -402,13 +387,8 @@ function setupSuggestions() {
          const uriEncodedBookName = encodeURIComponent(currentBook);
          let url;
          if (data.value.kind == "path") {
-            // The double quote and backslash symbols are included in the list
-            // of special symbols to URI-encode so that the resulting URL can
-            // be safely quoted inside a dynamically executed piece of
-            // Javascript code a few lines later.
-            const path = htmlDecode(data.value.path);
-            const quasiUriEncodedPath = quasiUriEncode(path, '#?"\\');
-            url = `/content/${uriEncodedBookName}/${quasiUriEncodedPath}`;
+            const path = encodeURIComponent(htmlDecode(data.value.path));
+            url = `/content/${uriEncodedBookName}/${path}`;
          } else {
            const pattern = encodeURIComponent(htmlDecode(data.value.value));
            url = `/search?content=${uriEncodedBookName}&pattern=${pattern}`;
--- a/test/data/library.xml
+++ b/test/data/library.xml
@@ -32,7 +32,6 @@
        articleCount="284"
        mediaCount="2"
        size="123"
-        faviconMimeType="image/png;favicon_attribute_is_absent"
      ></book>
  <book
        id="charlesray"
@@ -49,6 +48,5 @@
        articleCount="284"
        mediaCount="2"
        size="556"
-        favicon="faviconMimeType_attribute_is_absent"
      ></book>
 </library>
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -73,7 +73,7 @@ const ResourceCollection resources200Compressible{
  { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/taskbar.css" },
  { STATIC_CONTENT,  "/ROOT%23%3F/skin/taskbar.css?cacheid=bbdaf425" },
  { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/viewer.js" },
-  { STATIC_CONTENT,  "/ROOT%23%3F/skin/viewer.js?cacheid=bb748367" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/viewer.js?cacheid=db02f59d" },
  { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/fonts/Poppins.ttf" },
  { STATIC_CONTENT,  "/ROOT%23%3F/skin/fonts/Poppins.ttf?cacheid=af705837" },
  { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/fonts/Roboto.ttf" },
@@ -147,7 +147,7 @@ const ResourceCollection resources200Uncompressible{
  { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/search_results.css" },
  { STATIC_CONTENT,  "/ROOT%23%3F/skin/search_results.css?cacheid=76d39c84" },
  { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/languages.js" },
-  { STATIC_CONTENT, "/ROOT%23%3F/skin/languages.js?cacheid=648526e1" },
+  { STATIC_CONTENT, "/ROOT%23%3F/skin/languages.js?cacheid=b00b12db" },

  { ZIM_CONTENT,     "/ROOT%23%3F/raw/zimfile/meta/Title" },
  { ZIM_CONTENT,     "/ROOT%23%3F/raw/zimfile/meta/Description" },
@@ -285,7 +285,7 @@ R"EXPECTEDRESULT(      href="/ROOT%23%3F/skin/index.css?cacheid=e4d76d16"
        src: url("/ROOT%23%3F/skin/fonts/Poppins.ttf?cacheid=af705837") format("truetype");
          src: url("/ROOT%23%3F/skin/fonts/Roboto.ttf?cacheid=84d10248") format("truetype");
    <script type="module" src="/ROOT%23%3F/skin/i18n.js?cacheid=2cf0f8c5" defer></script>
-    <script type="text/javascript" src="/ROOT%23%3F/skin/languages.js?cacheid=648526e1" defer></script>
+    <script type="text/javascript" src="/ROOT%23%3F/skin/languages.js?cacheid=b00b12db" defer></script>
    <script src="/ROOT%23%3F/skin/isotope.pkgd.min.js?cacheid=2e48d392" defer></script>
    <script src="/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3"></script>
    <script type="text/javascript" src="/ROOT%23%3F/skin/index.js?cacheid=07b06fca" defer></script>
@@ -311,8 +311,8 @@ R"EXPECTEDRESULT(                                <img src="${root}/skin/download
 R"EXPECTEDRESULT(    <link type="text/css" href="./skin/taskbar.css?cacheid=bbdaf425" rel="Stylesheet" />
    <link type="text/css" href="./skin/css/autoComplete.css?cacheid=08951e06" rel="Stylesheet" />
    <script type="module" src="./skin/i18n.js?cacheid=2cf0f8c5" defer></script>
-    <script type="text/javascript" src="./skin/languages.js?cacheid=648526e1" defer></script>
-    <script type="text/javascript" src="./skin/viewer.js?cacheid=bb748367" defer></script>
+    <script type="text/javascript" src="./skin/languages.js?cacheid=b00b12db" defer></script>
+    <script type="text/javascript" src="./skin/viewer.js?cacheid=db02f59d" defer></script>
    <script type="text/javascript" src="./skin/autoComplete.min.js?cacheid=1191aaaf"></script>
      const blankPageUrl = root + "/skin/blank.html?cacheid=6b1fa032";
            <img src="./skin/langSelector.svg?cacheid=00b59961">
@@ -1056,9 +1056,6 @@ R"EXPECTEDRESPONSE(const uiLanguages = [
  {
    "English": "en"
  },
-  {
-    "suomi": "fi"
-  },
  {
    "français": "fr"
  },
@@ -1068,9 +1065,6 @@ R"EXPECTEDRESPONSE(const uiLanguages = [
  {
    "Հայերեն": "hy"
  },
-  {
-    "interlingua": "ia"
-  },
  {
    "italiano": "it"
  },
--- a/test/server_search.cpp
+++ b/test/server_search.cpp
@@ -2,7 +2,6 @@
 #define CPPHTTPLIB_ZLIB_SUPPORT 1
 #include "./httplib.h"
 #include "gtest/gtest.h"
-#include "../src/tools/stringTools.h"

 #define SERVER_PORT 8101
 #include "server_testing_tools.h"
@@ -717,7 +716,7 @@ struct TestData

  std::string getPattern() const
  {
-    return kiwix::urlDecode(extractQueryValue("pattern"), true);
+    return extractQueryValue("pattern");
  }

  std::string getLang() const
@@ -1457,33 +1456,6 @@ TEST(ServerSearchTest, searchResults)
        { "▶", 40, false },
      }
    },
-
-    // Be sure that searching with accented query return the same things than non accented query.
-    {
-      /* query */          "pattern=j%C3%A0zz"
-                           "&books.filter.lang=eng"
-                           "&books.filter.title=Ray%20Charles",
-      /* start */            -1,
-      /* resultsPerPage */   5,
-      /* totalResultCount */ 44,
-      /* firstResultIndex */ 1,
-      /* results */ {
-        LARGE_SEARCH_RESULTS[0],
-        LARGE_SEARCH_RESULTS[1],
-        LARGE_SEARCH_RESULTS[2],
-        LARGE_SEARCH_RESULTS[3],
-        LARGE_SEARCH_RESULTS[4],
-      },
-
-      /* pagination */ {
-        { "1", 0,  true  },
-        { "2", 5,  false },
-        { "3", 10, false },
-        { "4", 15, false },
-        { "5", 20, false },
-        { "▶", 40, false },
-      }
-    },
  };

  ZimFileServer zfs(SERVER_PORT, ZimFileServer::DEFAULT_OPTIONS,
Author	SHA1	Message	Date
Veloman Yunkan	d9ba81028c	Guaranteed activation of external link blocking This is a quickfix for the problem observed with external link blocking during certain history navigation actions (when the cached iframe content was loaded/restored before the viewer setup was completed). Since external link blocking doesn't depend on the translations (that are asynchronously loaded during the viewer setup) it can be performed unconditionally. However, the current dependence of `on_content_load()` on viewer setup has to be addressed too.	2023-05-10 16:04:13 +04:00
Veloman Yunkan	bea9f736df	fixup! Fixed external links in the viewer iframe	2023-05-10 14:54:48 +04:00
Veloman Yunkan	a05d3fa65a	Respecting --blockexternal option of kiwix-serve	2023-05-09 17:38:03 +04:00
Veloman Yunkan	9c4c37f183	Fixed external links in the viewer iframe Before this fix clicking an external link in the viewer iframe had no effect (other than an error being reported in the browser dev tools console) because the attempt to navigate the top browser context was suppressed due to sandboxing. A workaround is to let the external link blocker page to be loaded in the viewer iframe and then detect that situation and handle it in the viewer JS code. This commit makes external links clickable but (temporarily) handles them by unconditionally displaying the confirmation page (as if kiwix-serve has been started with the --blockexternal option). This will be fixed shortly. A small defect is that the browsing history entry preceding the external resource access confirmation page is duplicated.	2023-05-09 17:33:08 +04:00