Set version to 3.1.1

SMTP protocol dictates that all lines are supposed to be separated
with CRLF and not LF (even on LF-based systems). This change ensures
that even if the original byte string message is using `\n` for line
separators, the SMTP protocol will still work properly.

This resolves sabnzbd#1669

Fix code formatting

.git-blame-ignore-revs

@@ -1,43 +0,0 @@
-# `git blame` master ignore list.
-#
-# This file contains a list of git hashes of revisions to be ignored
-# by `git blame`. These revisions are considered "unimportant" in
-# that they are unlikely to be what you are interested in when blaming.
-# They are typically expected to be formatting-only changes.
-#
-# It can be used for `git blame` using `--ignore-revs-file` or by
-# setting `blame.ignoreRevsFile` in the `git config`[1].
-#
-# Ignore these commits when reporting with blame. Calling
-#
-#   git blame --ignore-revs-file .git-blame-ignore-revs
-#
-# will tell `git blame` to ignore changes made by these revisions when
-# assigning blame, as if the change never happened.
-#
-# You can enable this as a default for your local repository by
-# running
-#
-#   git config blame.ignoreRevsFile .git-blame-ignore-revs
-#
-# This will probably be automatically picked by your IDE
-# (VSCode+GitLens and JetBrains products are confirmed to do this).
-#
-# Important: if you are switching to a branch without this file,
-# `git blame` will fail with an error.
-#
-# GitHub also excludes the commits listed below from its "Blame"
-# views[2][3].
-#
-# [1]: https://git-scm.com/docs/git-blame#Documentation/git-blame.txt-blameignoreRevsFile
-# [2]: https://github.blog/changelog/2022-03-24-ignore-commits-in-the-blame-view-beta/
-# [3]: https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
-
-
-# Black changes
-465a88154152fb0607a63fa24c8446bff43ec886
-f06891926661986fff52d6eb4b4cb120c71972d1
-9bcbcaefdfecc85aedfd8e2f8aaa1ca7f959404e
-433dcab02b29f7bd3827e237434034deecc1b549
-9f6a9f991222efccc87b45a701086c95629c67b6
-f89114ca7e1b20bf8e645ecd0b52b707ec857aa9

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,31 +0,0 @@
-name: Bug report
-description: >
-  Did you discover a bug in SABnzbd? Report it here!
-  If you are not 100% certain this is a bug please go to our forums, Reddit or Discord server first.
-labels:
-  - Support
-body:
-  - type: input
-    attributes:
-      label: SABnzbd version
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Operating system
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Using Docker image
-      options:
-        - linuxserver
-        - hotio
-        - binhex
-        - Other
-  - type: textarea
-    attributes:
-      label: Description
-      description: Include error logs directly or link to extended logs on https://pastebin.com/
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Support forum
-    url: https://forums.sabnzbd.org/
-    about: Support questions can be asked on our forums, Reddit or Discord server.
-  - name: Discord
-    url: https://discord.sabnzbd.org
-    about: Support questions can be asked on our forums, Reddit or Discord server.
-  - name: Reddit - r/sabnzbd
-    url: https://www.reddit.com/r/sabnzbd
-    about: Support questions can be asked on our forums, Reddit or Discord server.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,10 +0,0 @@
-name: Feature request
-description: What new feature would you like to have added to SABnzbd?
-labels:
-  - Support
-body:
-  - type: textarea
-    attributes:
-      label: Description
-    validations:
-      required: true

.github/renovate.json

@@ -1,47 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base",
-    ":disableDependencyDashboard"
-  ],
-  "schedule": [
-    "before 8am on Monday"
-  ],
-  "baseBranches": ["develop", "feature/uvicorn"],
-  "pip_requirements": {
-    "fileMatch": [
-      "requirements.txt",
-      "tests/requirements.txt",
-      "builder/requirements.txt",
-      "builder/release-requirements.txt"
-    ]
-  },
-  "ignorePaths": [],
-  "ignoreDeps": [
-    "jaraco.text",
-    "jaraco.context",
-    "jaraco.collections",
-    "sabctools",
-    "paho-mqtt",
-    "werkzeug",
-    "tavern" 
-  ],
-  "packageRules": [
-    {
-      "matchManagers": ["github-actions"],
-      "matchPackageNames": ["windows", "macos"],
-      "enabled": false
-    },
-    {
-      "matchPackagePatterns": [
-        "*"
-      ],
-      "groupName": "all dependencies",
-      "groupSlug": "all",
-      "separateMajorMinor": false,
-      "automerge": true
-    }
-  ],
-  "automergeStrategy": "squash",
-  "platformAutomerge": true
-}

.github/stale.yml

@@ -0,0 +1,23 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 21
+
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - "Feature request"
+  - "Work in progress"
+  - "Bug"
+
+# Label to use when marking an issue as stale
+staleLabel: "Stale"
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/black.yml

@@ -0,0 +1,20 @@
+name: Black Code Formatter
+on: [push, pull_request]
+
+jobs:
+  black:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Black Code Formatter
+      uses: lgeiger/black-action@v1.0.1
+      with:
+          args: >
+            SABnzbd.py
+            sabnzbd
+            scripts
+            tools
+            tests
+            --line-length=120
+            --target-version=py35
+            --check

.github/workflows/build_release.yml

@@ -1,256 +0,0 @@
-name: Build binaries and source distribution
-
-on: [push, pull_request]
-
-# Setting PYTHONNODEBUGRANGES reduces binary size
-env:
-  PYTHONNODEBUGRANGES: 1
-
-jobs:
-  build_windows:
-    name: Build Windows binary (${{ matrix.architecture }})
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - architecture: x64
-            runs-on: windows-2022
-          - architecture: arm64
-            runs-on: windows-11-arm
-
-    runs-on: ${{ matrix.runs-on }}
-    timeout-minutes: 15
-    steps:
-    - uses: actions/checkout@v6
-    - name: Set up Python
-      uses: actions/setup-python@v6
-      with:
-        python-version: "3.14"
-        architecture: ${{ matrix.architecture }}
-        cache: pip
-        cache-dependency-path: "**/requirements.txt"
-    - name: Install Python dependencies
-      # Without dependencies to make sure everything is covered in the requirements.txt
-      run: |
-        python --version
-        python -m pip install --upgrade pip wheel
-        pip install --upgrade -r requirements.txt --no-dependencies
-        pip install --upgrade -r builder/requirements.txt --no-dependencies
-    - name: Build Windows standalone binary
-      id: windows_binary
-      run: python builder/package.py binary
-    - name: Upload Windows standalone binary (unsigned)
-      uses: actions/upload-artifact@v6
-      id: upload-unsigned-binary
-      with:
-        path: "*-win*-bin.zip"
-        name: Windows standalone binary (${{ matrix.architecture }})
-    - name: Sign Windows standalone binary
-      uses: signpath/github-action-submit-signing-request@v2
-      if: contains(github.ref, 'refs/tags/')
-      with:
-        api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
-        organization-id: ${{ secrets.SIGNPATH_ORG_ID }}
-        project-slug: "sabnzbd"
-        artifact-configuration-slug: "sabnzbd-binary"
-        signing-policy-slug: "release-signing"
-        github-artifact-id: ${{ steps.upload-unsigned-binary.outputs.artifact-id }}
-        wait-for-completion: true
-        output-artifact-directory: "signed"
-    - name: Upload Windows standalone binary (signed)
-      uses: actions/upload-artifact@v6
-      if: contains(github.ref, 'refs/tags/')
-      with:
-        name: Windows standalone binary (${{ matrix.architecture }}, signed)
-        path: "signed"
-    - name: Build Windows installer
-      if: matrix.architecture == 'x64'
-      run: python builder/package.py installer
-    - name: Upload Windows installer
-      if: matrix.architecture == 'x64'
-      uses: actions/upload-artifact@v6
-      id: upload-unsigned-installer
-      with:
-        path: "*-win-setup.exe"
-        name: Windows installer (${{ matrix.architecture }})
-    - name: Sign Windows installer
-      if: matrix.architecture == 'x64' && contains(github.ref, 'refs/tags/')
-      uses: signpath/github-action-submit-signing-request@v2
-      with:
-        api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
-        organization-id: ${{ secrets.SIGNPATH_ORG_ID }}
-        project-slug: "sabnzbd"
-        artifact-configuration-slug: "sabnzbd-installer"
-        signing-policy-slug: "release-signing"
-        github-artifact-id: ${{ steps.upload-unsigned-installer.outputs.artifact-id }}
-        wait-for-completion: true
-        output-artifact-directory: "signed"
-    - name: Upload Windows installer (signed)
-      if: matrix.architecture == 'x64' && contains(github.ref, 'refs/tags/')
-      uses: actions/upload-artifact@v6
-      with:
-        name: Windows installer (${{ matrix.architecture }}, signed)
-        path: "signed/*-win-setup.exe"
-
-  build_macos:
-    name: Build macOS binary
-    runs-on: macos-14
-    timeout-minutes: 15
-    env:
-      # We need the official Python, because the GA ones only support newer macOS versions
-      # The deployment target is picked up by the Python build tools automatically
-      # If updated, make sure to also set LSMinimumSystemVersion in SABnzbd.spec
-      PYTHON_VERSION: "3.14.2"
-      MACOSX_DEPLOYMENT_TARGET: "10.15"
-      # We need to force compile for universal2 support
-      CFLAGS: -arch x86_64 -arch arm64
-      ARCHFLAGS: -arch x86_64 -arch arm64
-    steps:
-    - uses: actions/checkout@v6
-    - name: Set up Python
-      # Only use this for the caching of pip packages!
-      uses: actions/setup-python@v6
-      with:
-        python-version: "3.14"
-        cache: pip
-        cache-dependency-path: "**/requirements.txt"
-    - name: Cache Python download
-      id: cache-python-download
-      uses: actions/cache@v5
-      with:
-        path: ~/python.pkg
-        key: cache-macOS-Python-${{ env.PYTHON_VERSION }}
-    - name: Get Python from python.org
-      if: steps.cache-python-download.outputs.cache-hit != 'true'
-      run: curl https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macos11.pkg -o ~/python.pkg
-    - name: Install Python
-      run: sudo installer -pkg ~/python.pkg -target /
-    - name: Install Python dependencies
-      # We have to manually compile some modules as they don't automatically fetch universal2 binaries
-      run: |
-        python3 --version
-        pip3 install --upgrade pip wheel
-        pip3 install --upgrade -r requirements.txt --no-binary cffi,CT3,PyYAML,charset_normalizer --no-dependencies
-        pip3 install --upgrade -r builder/requirements.txt --no-dependencies
-    - name: Import macOS codesign certificates
-      # Taken from https://github.com/Apple-Actions/import-codesign-certs/pull/27 (comments)
-      env:
-        CERTIFICATES_P12: ${{ secrets.CERTIFICATES_P12 }}
-        CERTIFICATES_P12_PASSWORD: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
-        MACOS_KEYCHAIN_TEMP_PASSWORD: ${{ secrets.MACOS_KEYCHAIN_TEMP_PASSWORD }}
-      if: env.CERTIFICATES_P12
-      run: |
-        echo $CERTIFICATES_P12 | base64 --decode > certificate.p12
-        security create-keychain -p "$MACOS_KEYCHAIN_TEMP_PASSWORD" build.keychain
-        security default-keychain -s build.keychain
-        security unlock-keychain -p "$MACOS_KEYCHAIN_TEMP_PASSWORD" build.keychain
-        security set-keychain-settings -lut 21600 build.keychain
-        security import certificate.p12 -k build.keychain -P "$CERTIFICATES_P12_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productsign -T /usr/bin/xcrun
-        security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_KEYCHAIN_TEMP_PASSWORD" build.keychain
-    - name: Build source distribution
-      # Run this on macOS so the line endings are correct by default
-      run: python builder/package.py source
-    - name: Upload source distribution
-      uses: actions/upload-artifact@v6
-      with:
-        path: "*-src.tar.gz"
-        name: Source distribution
-    - name: Build macOS binary
-      env:
-        SIGNING_AUTH: ${{ secrets.SIGNING_AUTH }}
-        NOTARIZATION_USER: ${{ secrets.NOTARIZATION_USER }}
-        NOTARIZATION_PASS: ${{ secrets.NOTARIZATION_PASS }}
-      run: |
-        python3 builder/package.py app
-        python3 builder/make_dmg.py
-    - name: Upload macOS binary
-      uses: actions/upload-artifact@v6
-      with:
-        path: "*-macos.dmg"
-        name: macOS binary
-
-  build-snap:
-    name: Build Snap Packages (${{ matrix.linux_arch }})
-    timeout-minutes: 30
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            linux_arch: x64
-          - os: ubuntu-24.04-arm
-            linux_arch: arm64
-
-    steps:
-      - uses: actions/checkout@v6
-      - name: Cache par2cmdline-turbo tarball
-        uses: actions/cache@v5
-        id: cache-par2cmdline
-        # Clearing the cache in case of new version requires manual clearing in GitHub!
-        with:
-          path: snap/par2cmdline.tar.gz
-          key: cache-par2cmdline
-      - name: Download par2cmdline-turbo tarball
-        if: steps.cache-par2cmdline.outputs.cache-hit != 'true'
-        run: |
-          PAR2_TARBALL=$(curl -sL https://api.github.com/repos/animetosho/par2cmdline-turbo/releases/latest | jq -r '.tarball_url')
-          curl -o snap/par2cmdline.tar.gz -L "$PAR2_TARBALL"
-      - uses: snapcore/action-build@v1
-        name: Build snap
-        id: snapcraft
-      - name: Test snap installation
-        run: |
-          sudo snap install --dangerous *.snap
-          sudo snap connect sabnzbd:removable-media
-          # Basic smoke test - check that the binary exists and can show help
-          timeout 10s snap run sabnzbd --help || true
-          sudo snap remove sabnzbd
-      - name: Upload snap
-        uses: actions/upload-artifact@v6
-        with:
-          name: Snap package (${{ matrix.linux_arch }})
-          path: ${{ steps.snapcraft.outputs.snap }}
-      - name: Publish snap
-        uses: snapcore/action-publish@v1
-        if: contains(github.ref, 'refs/tags/')
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_TOKEN }}
-        with:
-          store_login: ${{ secrets.SNAP_TOKEN }}
-          snap: ${{ steps.snapcraft.outputs.snap }}
-          release: stable
-
-  release:
-    name: Prepare Release
-    runs-on: ubuntu-latest
-    needs: [build_windows, build_macos]
-    steps:
-      - uses: actions/checkout@v6
-      - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.14"
-          cache: pip
-          cache-dependency-path: "builder/release-requirements.txt"
-      - name: Download Source distribution artifact
-        uses: actions/download-artifact@v7
-        with:
-          name: Source distribution
-      - name: Download macOS artifact
-        uses: actions/download-artifact@v7
-        with:
-          name: macOS binary
-      - name: Download Windows artifacts
-        uses: actions/download-artifact@v7
-        with:
-          pattern: ${{ (contains(github.ref, 'refs/tags/')) && '*signed*' || '*Windows*' }}
-          merge-multiple: true
-      - name: Prepare official release
-        env:
-          AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
-          REDDIT_TOKEN: ${{ secrets.REDDIT_TOKEN }}
-        run: |
-          pip3 install -r builder/release-requirements.txt
-          python3 builder/release.py

.github/workflows/integration_testing.yml

@@ -1,63 +0,0 @@
-name: CI Tests
-
-on: [push, pull_request]
-
-jobs:
-  black:
-    name: Black Code Formatter
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - name: Black Code Formatter
-        uses: lgeiger/black-action@master
-        with:
-          args: >
-            SABnzbd.py
-            sabnzbd
-            scripts
-            tools
-            builder
-            builder/SABnzbd.spec
-            tests
-            --line-length=120
-            --target-version=py39
-            --check
-            --diff
-
-  test:
-    name: Test ${{ matrix.name }} - Python ${{ matrix.python-version }}
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 20
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13", "3.14" ]
-        name: ["Linux"]
-        os: [ubuntu-latest]
-        include:
-          - name: macOS
-            os: macos-latest
-            python-version: "3.14"
-          - name: Windows
-            os: windows-2022
-            python-version: "3.14"
-
-    steps:
-    - uses: actions/checkout@v6
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v6
-      with:
-        python-version: ${{ matrix.python-version }}
-        cache: pip
-        cache-dependency-path: "**/requirements.txt"
-    - name: Install system dependencies
-      if: runner.os == 'Linux'
-      run: sudo apt-get install unrar 7zip par2
-    - name: Install Python dependencies
-      run: |
-        python --version
-        python -m pip install --upgrade pip wheel
-        pip install --upgrade -r requirements.txt --no-dependencies
-        pip install --upgrade -r tests/requirements.txt
-    - name: Test SABnzbd
-      run: pytest -s

.github/workflows/stale.yml

@@ -1,33 +0,0 @@
-name: "Close and lock old issues"
-on:
-  schedule:
-    - cron: "30 1 * * *"
-  workflow_dispatch:
-
-jobs:
-  stale:
-    name: "Close stale issues"
-    if: github.repository_owner == 'sabnzbd'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v10
-        with:
-          days-before-stale: 21
-          days-before-close: 7
-          stale-issue-label: "Stale"
-          stale-issue-message: >
-            This issue has been automatically marked as stale because it has not had
-            recent activity. It will be closed if no further activity occurs. Thank you
-            for your contributions.
-          exempt-issue-labels: "Feature request, Work in progress, Bug"
-
-  lock:
-    name: "Lock old issues"
-    if: github.repository_owner == 'sabnzbd'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v6
-        with:
-          log-output: true
-          issue-inactive-days: 60
-          pr-inactive-days: 60

.github/workflows/translations.yml

@@ -7,37 +7,27 @@ on:
 
 jobs:
   translations:
-    name: Update translatable texts
     runs-on: ubuntu-latest
-    env:
-      TX_TOKEN: ${{ secrets.TX_TOKEN }}
     steps:
-      - uses: actions/checkout@v6
-        with:
-          token: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
+      - uses: actions/checkout@master
       - name: Generate translatable texts
         run: |
           python3 tools/extract_pot.py
+      - name: Install Transifex client
+        # Sudo is needed to link the "tx"-command
+        run: |
+          sudo -H python3 -m pip install setuptools wheel
+          sudo -H python3 -m pip install transifex-client
       - name: Push/pull Transifex translations
-        if: env.TX_TOKEN
-        # Add --translation to the push command in order to update Transifex using local translation edits
-        # However, this prevents modifying existing translations in Transifex as they will be overwritten by the push!
         run: |
-          curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
-          ./tx push --source 
-          ./tx pull --all --force
-      - name: Compile translations to validate them
-        run: |
-          python3 tools/make_mo.py
+          tx push --source --parallel
+          tx pull --all --force --parallel
+        env:
+          TX_TOKEN: ${{ secrets.TX_TOKEN }}
       - name: Push translatable and translated texts back to repo
-        uses: stefanzweifel/git-auto-commit-action@v7.1.0
-        if: env.TX_TOKEN
+        uses: stefanzweifel/git-auto-commit-action@master
         with:
-          commit_message: |
-            Update translatable texts
-            [skip ci]
+          commit_message: Update translatable texts
           commit_user_name: SABnzbd Automation
           commit_user_email: bugs@sabnzbd.org
           commit_author: SABnzbd Automation <bugs@sabnzbd.org>
-          file_pattern: "po/*.pot po/*.po"
-          push_options: --force

.gitignore

@@ -31,9 +31,6 @@ SABnzbd-*/
 *.wp[ru]
 .idea
 
-# VScode
-.vscode/
-
 # Testing folders
 .cache
 .xprocess

.lgtm.yml

@@ -0,0 +1,7 @@
+path_classifiers:
+  oldinterfaces:
+    - interfaces/smpl
+    - interfaces/Plush
+  library:
+    - "*knockout*"
+    - "**/*min*"

.travis.yml

@@ -0,0 +1,48 @@
+matrix:
+  include:
+  # On Linux we test all supported Python versions
+  # On macOS we only test the semi-recent version that is included
+  - os: linux
+    language: python
+    python: "3.5"
+  - os: linux
+    language: python
+    python: "3.6"
+  - os: linux
+    language: python
+    python: "3.7"
+  - os: linux
+    language: python
+    python: "3.8"
+  - os: linux
+    language: python
+    python: "3.9-dev"
+  - os: osx
+    addons:
+      chrome: stable
+    env:
+      - HOMEBREW_NO_AUTO_UPDATE=1
+
+install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      LATEST_CHROMEDRIVER=$(curl -s https://chromedriver.storage.googleapis.com/LATEST_RELEASE) &&
+      wget --no-verbose -O /tmp/chromedriver.zip https://chromedriver.storage.googleapis.com/$LATEST_CHROMEDRIVER/chromedriver_mac64.zip &&
+      sudo unzip /tmp/chromedriver.zip chromedriver -d /usr/local/bin/;
+    else
+      sudo add-apt-repository ppa:jcfp -y;
+      sudo apt-get update -q;
+      sudo apt-get install unrar p7zip-full par2 chromium-chromedriver -y;
+      ln -s /usr/lib/chromium-browser/chromedriver ~/bin/chromedriver;
+    fi;
+  - python3 --version
+  - python3 -m pip install --upgrade pip wheel
+  - python3 -m pip install --upgrade -r requirements.txt
+  - python3 -m pip install --upgrade -r tests/requirements.txt
+
+script:
+  - python3 -m pytest -s
+
+notifications:
+  email:
+    on_success: never
+    on_failure: change

.tx/config

@@ -1,23 +1,24 @@
 [main]
 host = https://www.transifex.com
 
-[o:sabnzbd:p:sabnzbd-translations:r:po-main-sabnzbd-pot--develop]
+[sabnzbd-translations.po-main-sabnzbd-pot--develop]
 file_filter = po/main/<lang>.po
 minimum_perc = 0
 source_file = po/main/SABnzbd.pot
 source_lang = en
 type = PO
 
-[o:sabnzbd:p:sabnzbd-translations:r:po-email-sabemail-pot--develop]
+[sabnzbd-translations.po-email-sabemail-pot--develop]
 file_filter = po/email/<lang>.po
 minimum_perc = 0
 source_file = po/email/SABemail.pot
 source_lang = en
 type = PO
 
-[o:sabnzbd:p:sabnzbd-translations:r:po-nsis-sabnsis-pot--develop]
+[sabnzbd-translations.po-nsis-sabnsis-pot--develop]
 file_filter = po/nsis/<lang>.po
 minimum_perc = 0
 source_file = po/nsis/SABnsis.pot
 source_lang = en
 type = PO
+

COPYRIGHT.txt

@@ -1,7 +1,7 @@
 
-(c) Copyright 2007-2025 by The SABnzbd-Team (sabnzbd.org)
+(c) Copyright 2007-2020 by "The SABnzbd-team" <team@sabnzbd.org>
 
-The SABnzbd-Team is:
+The SABnzbd-team is:
 
 Active team:
     Safihre

INSTALL.txt

@@ -1,10 +1,10 @@
-                                    SABnzbd
+                            SABnzbd 3.1.0
 
 -------------------------------------------------------------------------------
 0) LICENSE
 -------------------------------------------------------------------------------
 
-(c) Copyright 2007-2025 by The SABnzbd-Team (sabnzbd.org)
+(c) Copyright 2007-2020 by "The SABnzbd-team" <team@sabnzbd.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -41,7 +41,7 @@ Use the "Help" button in the web-interface to be directed to the Help Wiki.
 -------------------------------------------------------------------------------
 3) INSTALL pre-built macOS binaries
 -------------------------------------------------------------------------------
-Download the DMG file, mount and drag the SABnzbd icon to Applications.
+Download the DMG file, mount and drag the SABnzbd icon to Programs.
 Just like you do with so many apps.
 
 -------------------------------------------------------------------------------
@@ -52,10 +52,10 @@ Specific guides to install from source are available for Windows and macOS:
     https://sabnzbd.org/wiki/installation/install-macos
     https://sabnzbd.org/wiki/installation/install-from-source-windows
 
-Only Python 3.9 and above is supported.
+Only Python 3.5 and above is supported.
 
 On Linux systems you need to install:
-    par2 unrar python3-setuptools python3-pip
+    par2 unrar unzip python3-setuptools python3-pip
 
 On non-X86 platforms, for which PyPI does not provide all pre-compiled packages,
 you also need to install these development libraries (exact names might differ per platform):

ISSUES.txt

@@ -14,15 +14,15 @@
   For these the server blocking method is not very favourable.
   There is an INI-only option that will limit blocks to 1 minute.
       no_penalties = 1
-  See: https://sabnzbd.org/wiki/configuration/3.4/special
+  See: https://sabnzbd.org/wiki/configuration/3.1/special
 
-- Some third-party utilities try to probe SABnzbd API in such a way that you will
+- Some third-party utilties try to probe SABnzbd API in such a way that you will
   often see warnings about unauthenticated access.
   If you are sure these probes are harmless, you can suppress the warnings by
   setting the option "api_warnings" to 0.
-  See: https://sabnzbd.org/wiki/configuration/3.4/special
+  See: https://sabnzbd.org/wiki/configuration/3.1/special
 
-- On macOS you may encounter downloaded files with foreign characters.
+- On OSX you may encounter downloaded files with foreign characters.
   The par2 repair may fail when the files were created on a Windows system.
   The problem is caused by the PAR2 utility and we cannot fix this now.
   This does not apply to files inside RAR files.
@@ -33,14 +33,25 @@
   We cannot solve this problem, because the Operating System (read Windows)
   prevents the removal.
 
+- Memory usage can sometimes have high peaks. This makes using SABnzbd on very low
+  memory systems (e.g. a NAS device or a router) a challenge.
+  In particular on Synology (SynoCommunity) the device may report that SABnzbd is using
+  a lot of memory even when idle. In this case the memory is usually not actually used by
+  SABnzbd and will be available if required by other apps or the system. More information
+  can be found in the discussion here: https://github.com/SynoCommunity/spksrc/issues/2856
+
+- SABnzbd is not compatible with some software firewall versions.
+  The Microsoft Windows Firewall works fine, but remember to tell this
+  firewall that SABnzbd is allowed to talk to other computers.
+
 - When SABnzbd cannot send notification emails, check your virus scanner,
   firewall or security suite. It may be blocking outgoing email.
 
-- When you are using external drives or network shares on macOS or Linux
+- When you are using external drives or network shares on OSX or Linux
   make sure that the drives are mounted.
   The operating system will simply redirect your files to alternative locations.
   You may have trouble finding the files when mounting the drive later.
-  On macOS, SABnzbd will not create new folders in /Volumes.
+  On OSX, SABnzbd will not create new folders in /Volumes.
   The result will be a failed job that can be retried once the volume has been mounted.
 
 - If you use a mounted drive as "temporary download folder", it must be present when SABnzbd
@@ -48,3 +59,8 @@
   You can make SABnzbd wait for a mount of the "temporary download folder" by setting
   Config->Special->wait_for_dfolder to 1.
   SABnzbd will appear to hang until the drive is mounted.
+
+- If you experience speed-drops to KB/s when using a VPN, try setting the number of connections
+  to your servers to a total of 7. There is a CPU-usage reduction feature in SABnzbd that
+  gets confused by the way some VPN's handle the state of a connection. Below 8 connections
+  this feature is not active.

LICENSE.txt

@@ -1,4 +1,4 @@
-(c) Copyright 2007-2025 by The SABnzbd-Team (sabnzbd.org)
+(c) Copyright 2007-2020 by "The SABnzbd-team" <team@sabnzbd.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

PKG-INFO

@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: SABnzbd
+Version: 3.1.1
+Summary: SABnzbd-3.1.1
+Home-page: https://sabnzbd.org
+Author: The SABnzbd Team
+Author-email: team@sabnzbd.org
+License: GNU General Public License 2 (GPL2 or later)
+Description: Fully automated Usenet Binary Downloader
+Platform: posix

README.md

@@ -1,8 +1,10 @@
 SABnzbd - The automated Usenet download tool
 ============================================
 
-[![License](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
-[![Join our Discord](https://img.shields.io/discord/976737547558461480?color=7289DA&label=Discord&logo=Discord&logoColor=white)](https://discord.sabnzbd.org)
+[![Travis CI](https://travis-ci.org/sabnzbd/sabnzbd.svg?branch=develop)](https://travis-ci.org/sabnzbd/sabnzbd)
+[![AppVeryor](https://ci.appveyor.com/api/projects/status/github/sabnzbd/sabnzbd?svg=true&branch=develop)](https://ci.appveyor.com/project/Safihre/sabnzbd)
+[![Snap Status](https://build.snapcraft.io/badge/sabnzbd/sabnzbd.svg)](https://snapcraft.io/sabnzbd)
+[![License](https://img.shields.io/badge/license-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
 
 SABnzbd is an Open Source Binary Newsreader written in Python.
 
@@ -16,8 +18,8 @@ If you want to know more you can head over to our website: https://sabnzbd.org.
 
 SABnzbd has a few dependencies you'll need before you can get running. If you've previously run SABnzbd from one of the various Linux packages, then you likely already have all the needed dependencies. If not, here's what you're looking for:
 
-- `python` (Python 3.9 and above, often called `python3`)
-- Python modules listed in `requirements.txt`. Install with `python3 -m pip install -r requirements.txt -U`
+- `python` (Python 3.5 and higher, often called `python3`)
+- Python modules listed in `requirements.txt`
 - `par2` (Multi-threaded par2 installation guide can be found [here](https://sabnzbd.org/wiki/installation/multicore-par2))
 - `unrar` (make sure you get the "official" non-free version of unrar)
 
@@ -66,12 +68,3 @@ Conditions:
 - Bugfixes created specifically for a release branch are done there (because they are specific, they're not cherry-picked to `develop`).
 - Bugfixes done on `develop` may be cherry-picked to a release branch.
 - We will not release a 1.0.2 if a 1.1.0 has already been released.
-
-## Privacy Policy
-
-This program will not transfer any information to other networked systems unless
-specifically requested by the user or the person installing or operating it.
-
-## Code Signing Policy
-
-For our Windows release, free code signing is provided by [SignPath.io](https://signpath.io), certificate by [SignPath Foundation](https://signpath.org).

README.mkd

@@ -1,52 +1,66 @@
-Release Notes - SABnzbd 4.6.0 Beta 2
+Release Notes - SABnzbd 3.1.1
 =========================================================
 
-This is the second beta release of version 4.6.
+## Changes and bugfixes since 3.1.1
+- Enforce CRLF line endings on outgoing email messages.
+- Queue Repair would fail if Rating is enabled.
+- It was not possible to set directory-settings to empty values.
+- Deobfuscate-during-download was not triggered.
+- Failed to start on Python 3.5 with HTTPS enabled.
+- Could show traceback when formatting error/warnings messages.
+- Windows/macOS: improve handling of program restart.
 
-## New features in 4.6.0
-
-* Added support for NNTP Pipelining which eliminates idle waiting between
-  requests, significantly improving speeds on high-latency connections.
-  Read more here: https://sabnzbd.org/wiki/advanced/nntp-pipelining
-* Dynamically increase Assembler limits on faster connections.
-* Improved disk speed measurement in Status window.
-* Enable `verify_xff_header` by default.
-* Reduce delays between jobs during post-processing.
-* If a download only has `.nzb` files inside, the new downloads
-  will include the name of the original download.
-* Dropped support for Python 3.8.
-* Windows: Added Windows ARM (portable) release.
-
-## Bug fixes since 4.5.0
-
-* `Check before download` could get stuck or fail to reject.
-* No error was shown in case NZB upload failed.
-* Correct mobile layout if `Full Width` is enabled.
-* Aborted Direct Unpack could result in no files being unpacked.
-* Windows: Tray icon disappears after Explorer restart.
-* macOS: Slow to start on some network setups.
+## Changes since 3.0.2
+- Added option to automatically deobfuscate final filenames: after unpacking, 
+  detect and rename obfuscated or meaningless filenames to the job name, 
+  similar to the `Deobfuscate.py` post-processing script. 
+- Switched to Transifex as our translations platform:
+  Help us translate SABnzbd in your language! Add untranslated texts or 
+  improved existing translations here: https://sabnzbd.org/wiki/translate
+- Redesigned job availability-check to be more efficient and reliable.
+- Scheduled readouts of RSS-feeds would fail silently, they now show a warning.
+- Skip repair on Retry if all sets were previously successfully verified.
+- Passwords included in the filename no longer have to be at the end.
+- Restore limit on length of foldernames (`max_foldername_length`).
+- Added password input box on the Add NZB screen. 
+- Clear error if `Complete Folder` is set as a subfolder of the `Temporary Folder`.
+- Show warning that Pyton 3.5 support will be dropped after 3.1.0.
+- Windows/macOS: update UnRar to 5.91 and MultiPar to 1.3.1.0.
+- Windows: retry `Access Denied` when renaming files on Windows. 
 
+## Bugfixes since 3.0.2
+- Assembler crashes could occur due to race condition in `ArticleCache`.
+- On HTTP-redirects the scheme/hostname/port were ignored when behind a proxy.
+- Strip slash of the end of `url_base` as it could break other code.
+- `Temporary Folder` with unicode characters could result in duplicate unpacking.
+- Unpacking with a relative folder set for a category could fail.
+- Existing files were not parsed when retrying a job.
+- Reading attributes when retrying a job could result in crash.
+- Paused priority of pre-queue script was ignored.
+- Duplicate Detection did not check filenames in History.
+- Downloaded bytes could show as exceeding the total bytes of a job.
+- Filtering of history by category would not filter jobs in post-processing.
+- Windows: non-Latin languages were displayed incorrectly in the installer.
+- Windows: could fail to create folders on some network shares.
+- Windows: folders could end in a period, breaking Windows Explorer.
 
 ## Upgrade notices
-
-* You can directly upgrade from version 3.0.0 and newer.
-* Upgrading from older versions will require performing a `Queue repair`.
-* Downgrading from version 4.2.0 or newer to 3.7.2 or older will require
-  performing a `Queue repair` due to changes in the internal data format.
+- Jobs that failed on versions before 3.1.x, will throw an error about the 
+  attribute file failing to load when they are retried on 3.1.0+. This error 
+  can be ignored.
+- When upgrading from 2.x.x or older the queue will be converted. Job order,
+  settings and data will be preserved, but if you decide to go back to 2.x.x
+  your queue cannot be downgraded again. But you can restore the jobs by going
+  to the Status page and running Queue Repair.
 
 ## Known problems and solutions
-
-* Read `ISSUES.txt` or https://sabnzbd.org/wiki/introduction/known-issues
-
-## Code Signing Policy
-
-Windows code signing is provided by SignPath.io using a SignPath Foundation certificate.
+- Read the file "ISSUES.txt"
 
 ## About
+  SABnzbd is an open-source cross-platform binary newsreader.
+  It simplifies the process of downloading from Usenet dramatically, thanks
+  to its web-based user interface and advanced built-in post-processing options
+  that automatically verify, repair, extract and clean up posts downloaded
+  from Usenet.
 
-SABnzbd is an open-source cross-platform binary newsreader.
-It simplifies the process of downloading from Usenet dramatically, thanks to its web-based
-user interface and advanced built-in post-processing options that automatically verify, repair,
-extract and clean up posts downloaded from Usenet.
-
-(c) Copyright 2007-2025 by The SABnzbd-Team (sabnzbd.org)
+  (c) Copyright 2007-2020 by "The SABnzbd-team" \<team@sabnzbd.org\>

appveyor.yml

@@ -0,0 +1,14 @@
+environment:
+  # We only test the latest Python version
+  matrix:
+    - PYTHON: "C:\\Python38-x64"
+
+install:
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - python --version
+  - python -m pip install --upgrade pip wheel
+  - python -m pip install --upgrade -r requirements.txt
+  - python -m pip install --upgrade -r tests/requirements.txt
+
+build_script:
+  - python -m pytest -s

builder/SABnzbd.spec

@@ -1,179 +0,0 @@
-# -*- mode: python -*-
-import os
-import sys
-
-from PyInstaller.building.api import EXE, COLLECT, PYZ
-from PyInstaller.building.build_main import Analysis
-from PyInstaller.building.osx import BUNDLE
-from PyInstaller.utils.hooks import collect_data_files, collect_submodules
-
-from builder.constants import EXTRA_FILES, EXTRA_FOLDERS, RELEASE_VERSION, RELEASE_VERSION_TUPLE
-
-# Add extra files in the PyInstaller-spec
-extra_pyinstaller_files = []
-
-# Add hidden imports
-extra_hiddenimports = ["Cheetah.DummyTransaction", "cheroot.ssl.builtin", "certifi"]
-extra_hiddenimports.extend(collect_submodules("apprise"))
-extra_hiddenimports.extend(collect_submodules("babelfish.converters"))
-extra_hiddenimports.extend(collect_submodules("guessit.data"))
-
-# Add platform specific stuff
-if sys.platform == "darwin":
-    extra_hiddenimports.extend(["objc", "PyObjCTools"])
-    # macOS folders
-    EXTRA_FOLDERS += ["macos/par2/", "macos/unrar/", "macos/7zip/"]
-    # Add NZB-icon file
-    extra_pyinstaller_files.append(("builder/macos/image/nzbfile.icns", "."))
-    # Version information is set differently on macOS
-    version_info = None
-else:
-    # Build would fail on non-Windows
-    from PyInstaller.utils.win32.versioninfo import (
-        VSVersionInfo,
-        FixedFileInfo,
-        StringFileInfo,
-        StringTable,
-        StringStruct,
-        VarFileInfo,
-        VarStruct,
-    )
-
-    # Windows
-    extra_hiddenimports.extend(["win32timezone", "winrt.windows.foundation.collections"])
-    EXTRA_FOLDERS += ["win/par2/", "win/unrar/", "win/7zip/"]
-    EXTRA_FILES += ["portable.cmd"]
-
-    # Detailed instructions are in the PyInstaller documentation
-    # We don't include the alpha/beta/rc in the counters
-    version_info = VSVersionInfo(
-        ffi=FixedFileInfo(
-            filevers=RELEASE_VERSION_TUPLE,
-            prodvers=RELEASE_VERSION_TUPLE,
-            mask=0x3F,
-            flags=0x0,
-            OS=0x40004,
-            fileType=0x1,
-            subtype=0x0,
-            date=(0, 0),
-        ),
-        kids=[
-            StringFileInfo(
-                [
-                    StringTable(
-                        "040904B0",
-                        [
-                            StringStruct("Comments", f"SABnzbd {RELEASE_VERSION}"),
-                            StringStruct("CompanyName", "The SABnzbd-Team"),
-                            StringStruct("FileDescription", f"SABnzbd {RELEASE_VERSION}"),
-                            StringStruct("FileVersion", RELEASE_VERSION),
-                            StringStruct("LegalCopyright", "The SABnzbd-Team"),
-                            StringStruct("ProductName", f"SABnzbd {RELEASE_VERSION}"),
-                            StringStruct("ProductVersion", RELEASE_VERSION),
-                        ],
-                    )
-                ]
-            ),
-            VarFileInfo([VarStruct("Translation", [1033, 1200])]),
-        ],
-    )
-
-# Process the extra-files and folders
-for file_item in EXTRA_FILES:
-    extra_pyinstaller_files.append((file_item, "."))
-for folder_item in EXTRA_FOLDERS:
-    extra_pyinstaller_files.append((folder_item, folder_item))
-
-# Add babelfish data files
-extra_pyinstaller_files.extend(collect_data_files("babelfish"))
-extra_pyinstaller_files.extend(collect_data_files("guessit"))
-extra_pyinstaller_files.extend(collect_data_files("apprise"))
-extra_pyinstaller_files.extend(collect_data_files("dateutil"))
-
-pyi_analysis = Analysis(
-    ["SABnzbd.py"],
-    datas=extra_pyinstaller_files,
-    hiddenimports=extra_hiddenimports,
-    excludes=["ujson", "FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter", "pydoc", "pydoc_data.topics"],
-    module_collection_mode={"apprise.plugins": "py"},
-)
-
-pyz = PYZ(pyi_analysis.pure, pyi_analysis.zipped_data)
-
-codesign_identity = os.environ.get("SIGNING_AUTH")
-if not codesign_identity:
-    # PyInstaller needs specifically None, not just an empty value
-    codesign_identity = None
-
-# macOS specific parameters are ignored on other platforms
-exe = EXE(
-    pyz,
-    pyi_analysis.scripts,
-    [],
-    exclude_binaries=True,
-    name="SABnzbd",
-    console=False,
-    append_pkg=False,
-    icon="icons/sabnzbd.ico",
-    contents_directory=".",
-    version=version_info,
-    target_arch="universal2",
-    entitlements_file="builder/macos/entitlements.plist",
-    codesign_identity=codesign_identity,
-)
-
-coll = COLLECT(exe, pyi_analysis.binaries, pyi_analysis.zipfiles, pyi_analysis.datas, name="SABnzbd")
-
-# We need to run again for the console-app
-if sys.platform == "win32":
-    # Enable console=True for this one
-    console_exe = EXE(
-        pyz,
-        pyi_analysis.scripts,
-        [],
-        exclude_binaries=True,
-        name="SABnzbd-console",
-        append_pkg=False,
-        icon="icons/sabnzbd.ico",
-        contents_directory=".",
-        version=version_info,
-    )
-
-    console_coll = COLLECT(
-        console_exe,
-        pyi_analysis.binaries,
-        pyi_analysis.zipfiles,
-        pyi_analysis.datas,
-        name="SABnzbd-console",
-    )
-
-# Build the APP on macOS
-if sys.platform == "darwin":
-    info_plist = {
-        "NSUIElement": 1,
-        "NSPrincipalClass": "NSApplication",
-        "CFBundleShortVersionString": RELEASE_VERSION,
-        "NSHumanReadableCopyright": "The SABnzbd-Team",
-        "CFBundleIdentifier": "org.sabnzbd.sabnzbd",
-        "CFBundleDocumentTypes": [
-            {
-                "CFBundleTypeExtensions": ["nzb"],
-                "CFBundleTypeIconFile": "nzbfile.icns",
-                "CFBundleTypeMIMETypes": ["text/nzb"],
-                "CFBundleTypeName": "NZB File",
-                "CFBundleTypeRole": "Viewer",
-                "LSTypeIsPackage": 0,
-                "NSPersistentStoreTypeKey": "Binary",
-            }
-        ],
-        "LSMinimumSystemVersion": "10.13",
-        "LSEnvironment": {"LANG": "en_US.UTF-8", "LC_ALL": "en_US.UTF-8"},
-    }
-
-    app = BUNDLE(
-        coll,
-        name="SABnzbd.app",
-        icon="builder/macos/image/sabnzbdplus.icns",
-        bundle_identifier="org.sabnzbd.sabnzbd",
-        info_plist=info_plist,
-    )

builder/constants.py

@@ -1,79 +0,0 @@
-#!/usr/bin/python3 -OO
-# Copyright 2008-2025 by The SABnzbd-Team (sabnzbd.org)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-import os
-import platform
-import re
-
-# Constants
-VERSION_FILE = "sabnzbd/version.py"
-APPDATA_FILE = "linux/org.sabnzbd.sabnzbd.appdata.xml"
-
-# To draft a release or not to draft a release?
-ON_GITHUB_ACTIONS = os.environ.get("CI", False)
-RELEASE_THIS = "refs/tags/" in os.environ.get("GITHUB_REF", "")
-
-# Import version.py without the sabnzbd overhead
-with open(VERSION_FILE) as version_file:
-    exec(version_file.read())
-RELEASE_VERSION = __version__
-
-# Pre-releases are longer than 6 characters (e.g. 3.1.0Beta1 vs 3.1.0, but also 3.0.11)
-PRERELEASE = len(RELEASE_VERSION) > 5
-
-# Parse the version info for Windows file properties information
-version_regexed = re.search(r"(\d+)\.(\d+)\.(\d+)([a-zA-Z]*)(\d*)", RELEASE_VERSION)
-RELEASE_VERSION_TUPLE = (int(version_regexed.group(1)), int(version_regexed.group(2)), int(version_regexed.group(3)), 0)
-RELEASE_VERSION_BASE = f"{RELEASE_VERSION_TUPLE[0]}.{RELEASE_VERSION_TUPLE[1]}.{RELEASE_VERSION_TUPLE[2]}"
-
-# Define release name
-RELEASE_NAME = "SABnzbd-%s" % RELEASE_VERSION
-RELEASE_TITLE = "SABnzbd %s" % RELEASE_VERSION
-RELEASE_SRC = RELEASE_NAME + "-src.tar.gz"
-RELEASE_WIN_BIN_X64 = RELEASE_NAME + "-win64-bin.zip"
-RELEASE_WIN_BIN_ARM64 = RELEASE_NAME + "-win-arm64-bin.zip"
-RELEASE_WIN_INSTALLER = RELEASE_NAME + "-win-setup.exe"
-RELEASE_MACOS = RELEASE_NAME + "-macos.dmg"
-RELEASE_README = "README.mkd"
-
-# Detect architecture
-RELEASE_WIN_BIN = RELEASE_WIN_BIN_X64
-if platform.machine() == "ARM64":
-    RELEASE_WIN_BIN = RELEASE_WIN_BIN_ARM64
-
-# Used in package.py and SABnzbd.spec
-EXTRA_FILES = [
-    RELEASE_README,
-    "README.txt",
-    "INSTALL.txt",
-    "LICENSE.txt",
-    "GPL2.txt",
-    "GPL3.txt",
-    "COPYRIGHT.txt",
-    "ISSUES.txt",
-]
-EXTRA_FOLDERS = [
-    "scripts/",
-    "licenses/",
-    "locale/",
-    "email/",
-    "interfaces/Glitter/",
-    "interfaces/wizard/",
-    "interfaces/Config/",
-    "scripts/",
-    "icons/",
-]

builder/macos/entitlements.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-	<true/>
-</dict>
-</plist>

builder/make_dmg.py

@@ -1,206 +0,0 @@
-#!/usr/bin/python3 -OO
-# Copyright 2008-2025 by The SABnzbd-Team (sabnzbd.org)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-import os
-from constants import RELEASE_VERSION
-
-
-# We need to call dmgbuild from command-line, so here we can setup how
-if __name__ == "__main__":
-    # Check for DMGBuild
-    try:
-        import dmgbuild
-    except Exception:
-        print("Requires dmgbuild-module, use pip install dmgbuild")
-        exit()
-
-    # Make sure we are in the src folder
-    if not os.path.exists("builder"):
-        raise FileNotFoundError("Run from the main SABnzbd source folder: python builder/package.py")
-
-    # Check if signing is possible
-    authority = os.environ.get("SIGNING_AUTH")
-
-    # Extract version info and set DMG path
-    # Create sub-folder to upload later
-    release = RELEASE_VERSION
-    prod = "SABnzbd-" + release
-    fileDmg = prod + "-macos.dmg"
-
-    # Path to app file
-    apppath = "dist/SABnzbd.app"
-
-    # Copy Readme
-    readmepath = os.path.join(apppath, "Contents/Resources/README.txt")
-
-    # Path to background and the icon
-    backgroundpath = "builder/macos/image/sabnzbd_new_bg.png"
-    iconpath = "builder/macos/image/sabnzbdplus.icns"
-
-    # Make DMG
-    print("Building DMG")
-    dmgbuild.build_dmg(
-        filename=fileDmg,
-        volume_name=prod,
-        settings_file="builder/make_dmg.py",
-        defines={"app": apppath, "readme": readmepath, "background": backgroundpath, "iconpath": iconpath},
-    )
-
-    # Resign APP
-    if authority:
-        print("Siging DMG")
-        os.system('codesign --deep -f -i "org.sabnzbd.SABnzbd" -s "%s" "%s"' % (authority, fileDmg))
-        print("Signed!")
-    else:
-        print("Signing skipped, missing SIGNING_AUTH.")
-    exit()
-
-
-### START OF DMGBUILD SETTINGS
-### COPIED AND MODIFIED FROM THE EXAMPLE ONLINE
-application = defines.get("app", "AppName.app")
-readme = defines.get("readme", "ReadMe.rtf")
-appname = os.path.basename(application)
-
-# .. Basics ....................................................................
-
-# Volume format (see hdiutil create -help)
-format = defines.get("format", "UDBZ")
-
-# Volume size (must be large enough for your files)
-size = defines.get("size", "100M")
-
-# Files to include
-files = [application, readme]
-
-# Symlinks to create
-symlinks = {"Applications": "/Applications"}
-
-# Volume icon
-#
-# You can either define icon, in which case that icon file will be copied to the
-# image, *or* you can define badge_icon, in which case the icon file you specify
-# will be used to badge the system's Removable Disk icon
-#
-badge_icon = defines.get("iconpath", "")
-
-# Where to put the icons
-icon_locations = {readme: (70, 160), appname: (295, 220), "Applications": (510, 220)}
-
-# .. Window configuration ......................................................
-
-# Window position in ((x, y), (w, h)) format
-window_rect = ((100, 100), (660, 360))
-
-# Background
-#
-# This is a STRING containing any of the following:
-#
-#    #3344ff          - web-style RGB color
-#    #34f             - web-style RGB color, short form (#34f == #3344ff)
-#    rgb(1,0,0)       - RGB color, each value is between 0 and 1
-#    hsl(120,1,.5)    - HSL (hue saturation lightness) color
-#    hwb(300,0,0)     - HWB (hue whiteness blackness) color
-#    cmyk(0,1,0,0)    - CMYK color
-#    goldenrod        - X11/SVG named color
-#    builtin-arrow    - A simple built-in background with a blue arrow
-#    /foo/bar/baz.png - The path to an image file
-#
-# Other color components may be expressed either in the range 0 to 1, or
-# as percentages (e.g. 60% is equivalent to 0.6).
-background = defines.get("background", "builtin-arrow")
-
-show_status_bar = False
-show_tab_view = False
-show_toolbar = False
-show_pathbar = False
-show_sidebar = False
-sidebar_width = 0
-
-# Select the default view; must be one of
-#
-#    'icon-view'
-#    'list-view'
-#    'column-view'
-#    'coverflow'
-#
-default_view = "icon-view"
-
-# General view configuration
-show_icon_preview = False
-
-# Set these to True to force inclusion of icon/list view settings (otherwise
-# we only include settings for the default view)
-include_icon_view_settings = "auto"
-include_list_view_settings = "auto"
-
-# .. Icon view configuration ...................................................
-
-arrange_by = None
-grid_offset = (0, 0)
-grid_spacing = 50
-scroll_position = (0, 0)
-label_pos = "bottom"  # or 'right'
-text_size = 16
-icon_size = 64
-
-# .. List view configuration ...................................................
-
-# Column names are as follows:
-#
-#   name
-#   date-modified
-#   date-created
-#   date-added
-#   date-last-opened
-#   size
-#   kind
-#   label
-#   version
-#   comments
-#
-list_icon_size = 16
-list_text_size = 12
-list_scroll_position = (0, 0)
-list_sort_by = "name"
-list_use_relative_dates = True
-list_calculate_all_sizes = (False,)
-list_columns = ("name", "date-modified", "size", "kind", "date-added")
-list_column_widths = {
-    "name": 300,
-    "date-modified": 181,
-    "date-created": 181,
-    "date-added": 181,
-    "date-last-opened": 181,
-    "size": 97,
-    "kind": 115,
-    "label": 100,
-    "version": 75,
-    "comments": 300,
-}
-list_column_sort_directions = {
-    "name": "ascending",
-    "date-modified": "descending",
-    "date-created": "descending",
-    "date-added": "descending",
-    "date-last-opened": "descending",
-    "size": "descending",
-    "kind": "ascending",
-    "label": "ascending",
-    "version": "ascending",
-    "comments": "ascending",
-}

builder/package.py

@@ -1,511 +0,0 @@
-#!/usr/bin/python3 -OO
-# Copyright 2008-2025 by The SABnzbd-Team (sabnzbd.org)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-import glob
-import re
-import sys
-import os
-import tempfile
-import time
-import shutil
-import subprocess
-import tarfile
-import urllib.request
-import urllib.error
-import configobj
-import packaging.version
-
-from constants import (
-    RELEASE_VERSION,
-    RELEASE_VERSION_TUPLE,
-    VERSION_FILE,
-    RELEASE_README,
-    RELEASE_NAME,
-    RELEASE_WIN_BIN,
-    RELEASE_WIN_INSTALLER,
-    ON_GITHUB_ACTIONS,
-    RELEASE_THIS,
-    RELEASE_SRC,
-    EXTRA_FILES,
-    EXTRA_FOLDERS,
-)
-
-
-# Support functions
-def safe_remove(path):
-    """Remove file without errors if the file doesn't exist
-    Can also handle folders
-    """
-    if os.path.exists(path):
-        if os.path.isdir(path):
-            shutil.rmtree(path)
-        else:
-            os.remove(path)
-
-
-def delete_files_glob(glob_pattern: str, allow_no_matches: bool = False):
-    """Delete one file or set of files from wild-card spec.
-    We expect to match at least 1 file, to force expected behavior"""
-    if files_to_remove := glob.glob(glob_pattern):
-        for path in files_to_remove:
-            if os.path.exists(path):
-                os.remove(path)
-    else:
-        if not allow_no_matches:
-            raise FileNotFoundError(f"No files found that match '{glob_pattern}'")
-
-
-def run_external_command(command: list[str], print_output: bool = True, **kwargs):
-    """Wrapper to ease the use of calling external programs"""
-    process = subprocess.Popen(command, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kwargs)
-    output, _ = process.communicate()
-    ret = process.wait()
-    if (output and print_output) or ret != 0:
-        print(output)
-    if ret != 0:
-        raise RuntimeError("Command returned non-zero exit code %s!" % ret)
-    return output
-
-
-def run_git_command(parms):
-    """Run git command, raise error if it failed"""
-    return run_external_command(["git"] + parms)
-
-
-def patch_version_file(release_name):
-    """Patch in the Git commit hash, but only when this is
-    an unmodified checkout
-    """
-    git_output = run_git_command(["log", "-1"])
-    for line in git_output.split("\n"):
-        if "commit " in line:
-            commit = line.split(" ")[1].strip()
-            break
-    else:
-        raise TypeError("Commit hash not found")
-
-    with open(VERSION_FILE, "r") as ver:
-        version_file = ver.read()
-
-    version_file = re.sub(r'__baseline__\s*=\s*"[^"]*"', '__baseline__ = "%s"' % commit, version_file)
-    version_file = re.sub(r'__version__\s*=\s*"[^"]*"', '__version__ = "%s"' % release_name, version_file)
-
-    with open(VERSION_FILE, "w") as ver:
-        ver.write(version_file)
-
-
-def test_macos_min_version(binary_path: str):
-    # Skip check if nothing was set
-    if macos_min_version := os.environ.get("MACOSX_DEPLOYMENT_TARGET"):
-        # Skip any arm64 specific files
-        if "arm64" in binary_path:
-            print(f"Skipping arm64 binary {binary_path}")
-            return
-
-        # Check minimum macOS version is at least mac OS10.13
-        # We only check the x86_64 since for arm64 it's always macOS 11+
-        print(f"Checking if binary supports macOS {macos_min_version} and above: {binary_path}")
-        otool_output = run_external_command(
-            [
-                "otool",
-                "-arch",
-                "x86_64",
-                "-l",
-                binary_path,
-            ],
-            print_output=False,
-        )
-
-        # Parse the output for LC_BUILD_VERSION minos
-        # The output is very large, so that's why we enumerate over it
-        req_version = packaging.version.parse(macos_min_version)
-        bin_version = None
-        lines = otool_output.split("\n")
-        for line_nr, line in enumerate(lines):
-            if "LC_VERSION_MIN_MACOSX" in line:
-                # Display the version in the next lines
-                bin_version = packaging.version.parse(lines[line_nr + 2].split()[1])
-            elif "minos" in line:
-                bin_version = packaging.version.parse(line.split()[1])
-
-            if bin_version and bin_version > req_version:
-                raise ValueError(f"{binary_path} requires {bin_version}, we want {req_version}")
-            else:
-                # We got the information we need
-                break
-        else:
-            print(lines)
-            raise RuntimeError(f"Could not determine minimum macOS version for {binary_path}")
-    else:
-        print(f"Skipping macOS version check, MACOSX_DEPLOYMENT_TARGET not set")
-
-
-def test_sab_binary(binary_path: str):
-    """Wrapper to have a simple start-up test for the binary"""
-    with tempfile.TemporaryDirectory() as config_dir:
-        sabnzbd_process = subprocess.Popen(
-            [binary_path, "--browser", "0", "--logging", "2", "--config", config_dir],
-            text=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,
-        )
-
-        # Wait for SAB to respond
-        base_url = "http://127.0.0.1:8080/"
-        for _ in range(30):
-            try:
-                urllib.request.urlopen(base_url, timeout=1).read()
-                break
-            except Exception:
-                time.sleep(1)
-        else:
-            # Print console output and give some time to print
-            print(sabnzbd_process.stdout.read())
-            time.sleep(1)
-            raise urllib.error.URLError("Could not connect to SABnzbd")
-
-        # Open a number of API calls and pages, to see if we are really up
-        pages_to_test = [
-            "",
-            "wizard",
-            "config",
-            "config/server",
-            "config/categories",
-            "config/scheduling",
-            "config/rss",
-            "config/general",
-            "config/folders",
-            "config/switches",
-            "config/sorting",
-            "config/notify",
-            "config/special",
-            "api?mode=version",
-        ]
-        for url in pages_to_test:
-            print("Testing: %s%s" % (base_url, url))
-            if b"500 Internal Server Error" in urllib.request.urlopen(base_url + url, timeout=1).read():
-                raise RuntimeError("Crash in %s" % url)
-
-        # Parse API-key so we can do a graceful shutdown
-        sab_config = configobj.ConfigObj(os.path.join(config_dir, "sabnzbd.ini"))
-        urllib.request.urlopen(base_url + "shutdown/?apikey=" + sab_config["misc"]["api_key"], timeout=10)
-        sabnzbd_process.wait()
-
-        # Print logs for verification
-        with open(os.path.join(config_dir, "logs", "sabnzbd.log"), "r") as log_file:
-            # Wait after printing so the output is nicely displayed in case of problems
-            print(log_text := log_file.read())
-            time.sleep(5)
-
-            # Make sure no extra errors/warnings were reported
-            if "ERROR" in log_text or "WARNING" in log_text:
-                raise RuntimeError("Warning or error reported during execution")
-
-
-if __name__ == "__main__":
-    # Was any option supplied?
-    if len(sys.argv) < 2:
-        raise TypeError("Please specify what to do")
-
-    # Make sure we are in the src folder
-    if not os.path.exists("builder"):
-        raise FileNotFoundError("Run from the main SABnzbd source folder: python builder/package.py")
-
-    # Check if we have the needed certificates
-    try:
-        import certifi
-    except ImportError:
-        raise FileNotFoundError("Need certifi module")
-
-    # Patch release file
-    patch_version_file(RELEASE_VERSION)
-
-    # Rename release notes file
-    safe_remove("README.txt")
-    shutil.copyfile(RELEASE_README, "README.txt")
-
-    # Compile translations
-    if not os.path.exists("locale"):
-        run_external_command([sys.executable, "tools/make_mo.py"])
-
-        # Check again if translations exist, fail otherwise
-        if not os.path.exists("locale"):
-            raise FileNotFoundError("Failed to compile language files")
-
-    if "binary" in sys.argv:
-        # Must be run on Windows
-        if sys.platform != "win32":
-            raise RuntimeError("Binary should be created on Windows")
-
-        # Make sure we remove any existing build-folders
-        safe_remove("build")
-        safe_remove("dist")
-
-        # Remove any leftovers
-        safe_remove(RELEASE_NAME)
-        safe_remove(RELEASE_WIN_BIN)
-
-        # Run PyInstaller and check output
-        shutil.copyfile("builder/SABnzbd.spec", "SABnzbd.spec")
-        run_external_command([sys.executable, "-O", "-m", "PyInstaller", "SABnzbd.spec"])
-
-        shutil.copytree("dist/SABnzbd-console", "dist/SABnzbd", dirs_exist_ok=True)
-        safe_remove("dist/SABnzbd-console")
-
-        # Remove unwanted DLL's
-        shutil.rmtree("dist/SABnzbd/Pythonwin")
-        delete_files_glob("dist/SABnzbd/api-ms-win*.dll", allow_no_matches=True)
-        delete_files_glob("dist/SABnzbd/ucrtbase.dll", allow_no_matches=True)
-
-        # Test the release
-        test_sab_binary("dist/SABnzbd/SABnzbd.exe")
-
-        # Create the archive
-        run_external_command(["win/7zip/7za.exe", "a", RELEASE_WIN_BIN, "SABnzbd"], cwd="dist")
-        shutil.move(f"dist/{RELEASE_WIN_BIN}", RELEASE_WIN_BIN)
-
-    if "installer" in sys.argv:
-        # Check if we have the dist folder
-        if not os.path.exists("dist/SABnzbd/SABnzbd.exe"):
-            raise FileNotFoundError("SABnzbd executable not found, run binary creation first")
-
-        # Check if we have a signed version
-        if os.path.exists(f"signed/{RELEASE_WIN_BIN}"):
-            print("Using signed version of SABnzbd binaries")
-            safe_remove("dist/SABnzbd")
-            run_external_command(["win/7zip/7za.exe", "x", "-odist", f"signed/{RELEASE_WIN_BIN}"])
-
-            # Make sure it exists
-            if not os.path.exists("dist/SABnzbd/SABnzbd.exe"):
-                raise FileNotFoundError("SABnzbd executable not found, signed zip extraction failed")
-        elif RELEASE_THIS:
-            raise FileNotFoundError("Signed SABnzbd executable not found, required for release!")
-        else:
-            print("Using unsigned version of SABnzbd binaries")
-
-        # Compile NSIS translations
-        safe_remove("NSIS_Installer.nsi")
-        safe_remove("NSIS_Installer.nsi.tmp")
-        shutil.copyfile("builder/win/NSIS_Installer.nsi", "NSIS_Installer.nsi")
-        run_external_command([sys.executable, "tools/make_mo.py", "nsis"])
-
-        # Run NSIS to build installer
-        run_external_command(
-            [
-                "makensis.exe",
-                "/V3",
-                "/DSAB_VERSION=%s" % RELEASE_VERSION,
-                "/DSAB_VERSIONKEY=%s" % ".".join(map(str, RELEASE_VERSION_TUPLE)),
-                "/DSAB_FILE=%s" % RELEASE_WIN_INSTALLER,
-                "NSIS_Installer.nsi.tmp",
-            ]
-        )
-
-    if "app" in sys.argv:
-        # Must be run on macOS
-        if sys.platform != "darwin":
-            raise RuntimeError("App should be created on macOS")
-
-        # Who will sign and notarize this?
-        authority = os.environ.get("SIGNING_AUTH")
-        notarization_user = os.environ.get("NOTARIZATION_USER")
-        notarization_pass = os.environ.get("NOTARIZATION_PASS")
-
-        # We need to sign all the included binaries before packaging them
-        # Otherwise the signature of the main application becomes invalid
-        if authority:
-            files_to_sign = [
-                "macos/par2/par2",
-                "macos/unrar/unrar",
-                "macos/unrar/arm64/unrar",
-                "macos/7zip/7zz",
-            ]
-            for file_to_sign in files_to_sign:
-                # Make sure it supports the macOS versions we want first
-                test_macos_min_version(file_to_sign)
-
-                # Then sign in
-                print("Signing %s with hardened runtime" % file_to_sign)
-                run_external_command(
-                    [
-                        "codesign",
-                        "--deep",
-                        "--force",
-                        "--timestamp",
-                        "--options",
-                        "runtime",
-                        "--entitlements",
-                        "builder/macos/entitlements.plist",
-                        "-s",
-                        authority,
-                        file_to_sign,
-                    ],
-                    print_output=False,
-                )
-                print("Signed %s!" % file_to_sign)
-
-        # Run PyInstaller and check output
-        shutil.copyfile("builder/SABnzbd.spec", "SABnzbd.spec")
-        run_external_command([sys.executable, "-O", "-m", "PyInstaller", "SABnzbd.spec"])
-
-        # Make sure we created a fully universal2 release when releasing or during CI
-        if RELEASE_THIS or ON_GITHUB_ACTIONS:
-            for bin_to_check in glob.glob("dist/SABnzbd.app/**/*.so", recursive=True):
-                print("Checking if binary is universal2: %s" % bin_to_check)
-                file_output = run_external_command(["file", bin_to_check], print_output=False)
-                # Make sure we have both arm64 and x86
-                if not ("x86_64" in file_output and "arm64" in file_output):
-                    raise RuntimeError("Non-universal2 binary found!")
-
-                # Make sure it supports the macOS versions we want
-                test_macos_min_version(bin_to_check)
-
-        # Only continue if we can sign
-        if authority:
-            # We use PyInstaller to sign the main SABnzbd executable and the SABnzbd.app
-            files_already_signed = [
-                "dist/SABnzbd.app/Contents/MacOS/SABnzbd",
-                "dist/SABnzbd.app",
-            ]
-            for file_to_check in files_already_signed:
-                print("Checking signature of %s" % file_to_check)
-                sign_result = run_external_command(
-                    [
-                        "codesign",
-                        "-dv",
-                        "-r-",
-                        file_to_check,
-                    ],
-                    print_output=False,
-                ) + run_external_command(
-                    [
-                        "codesign",
-                        "--verify",
-                        "--deep",
-                        file_to_check,
-                    ],
-                    print_output=False,
-                )
-                if authority not in sign_result or "adhoc" in sign_result or "invalid" in sign_result:
-                    raise RuntimeError("Signature of %s seems invalid!" % file_to_check)
-
-            # Always notarize, as newer macOS versions don't allow any code without it
-            if notarization_user and notarization_pass:
-                # Prepare zip to upload to notarization service
-                print("Creating zip to send to Apple notarization service")
-                # We need to use ditto, otherwise the signature gets lost!
-                notarization_zip = RELEASE_NAME + ".zip"
-                run_external_command(
-                    ["ditto", "-c", "-k", "--sequesterRsrc", "--keepParent", "dist/SABnzbd.app", notarization_zip]
-                )
-
-                # Upload to Apple
-                print("Sending zip to Apple notarization service")
-                upload_result = run_external_command(
-                    [
-                        "xcrun",
-                        "notarytool",
-                        "submit",
-                        notarization_zip,
-                        "--apple-id",
-                        notarization_user,
-                        "--team-id",
-                        authority,
-                        "--password",
-                        notarization_pass,
-                        "--wait",
-                    ],
-                )
-
-                # Check if success
-                if "status: accepted" not in upload_result.lower():
-                    raise RuntimeError("Failed to notarize..")
-
-                # Staple the notarization!
-                print("Approved! Stapling the result to the app")
-                run_external_command(["xcrun", "stapler", "staple", "dist/SABnzbd.app"])
-            else:
-                print("Notarization skipped, NOTARIZATION_USER or NOTARIZATION_PASS missing.")
-        else:
-            print("Signing skipped, missing SIGNING_AUTH.")
-
-        # Test the release, as the very last step to not mess with any release code
-        test_sab_binary("dist/SABnzbd.app/Contents/MacOS/SABnzbd")
-
-    if "source" in sys.argv:
-        # Prepare Source distribution package.
-        # We assume the sources are freshly cloned from the repo
-        # Make sure all source files are Unix format
-        src_folder = "srcdist"
-        safe_remove(src_folder)
-        os.mkdir(src_folder)
-
-        # Remove any leftovers
-        safe_remove(RELEASE_SRC)
-
-        # Add extra files and folders need for source dist
-        EXTRA_FOLDERS.extend(["sabnzbd/", "po/", "linux/", "tools/", "tests/"])
-        EXTRA_FILES.extend(["SABnzbd.py", "requirements.txt"])
-
-        # Copy all folders and files to the new folder
-        for source_folder in EXTRA_FOLDERS:
-            shutil.copytree(source_folder, os.path.join(src_folder, source_folder), dirs_exist_ok=True)
-
-        # Copy all files
-        for source_file in EXTRA_FILES:
-            shutil.copyfile(source_file, os.path.join(src_folder, source_file))
-
-        # Make sure all line-endings are correct
-        for input_filename in glob.glob("%s/**/*.*" % src_folder, recursive=True):
-            base, ext = os.path.splitext(input_filename)
-            if ext.lower() not in (".py", ".txt", ".css", ".js", ".tmpl", ".sh", ".cmd"):
-                continue
-            print(input_filename)
-
-            with open(input_filename, "rb") as input_data:
-                data = input_data.read()
-            data = data.replace(b"\r", b"")
-            with open(input_filename, "wb") as output_data:
-                output_data.write(data)
-
-        # Create tar.gz file for source distro
-        with tarfile.open(RELEASE_SRC, "w:gz") as tar_output:
-            for root, dirs, files in os.walk(src_folder):
-                for _file in files:
-                    input_path = os.path.join(root, _file)
-                    if sys.platform == "win32":
-                        tar_path = input_path.replace("srcdist\\", RELEASE_NAME + "/").replace("\\", "/")
-                    else:
-                        tar_path = input_path.replace("srcdist/", RELEASE_NAME + "/")
-                    tarinfo = tar_output.gettarinfo(input_path, tar_path)
-                    tarinfo.uid = 0
-                    tarinfo.gid = 0
-                    if _file in ("SABnzbd.py", "Sample-PostProc.sh", "make_mo.py", "msgfmt.py"):
-                        # Force Linux/macOS scripts as executable
-                        tarinfo.mode = 0o755
-                    else:
-                        tarinfo.mode = 0o644
-
-                    with open(input_path, "rb") as f:
-                        tar_output.addfile(tarinfo, f)
-
-        # Remove source folder
-        safe_remove(src_folder)
-
-    # Reset!
-    run_git_command(["reset", "--hard"])
-    run_git_command(["clean", "-f"])

builder/release-requirements.txt

@@ -1,2 +0,0 @@
-PyGithub==2.8.1
-praw==7.8.1

builder/release.py

@@ -1,272 +0,0 @@
-#!/usr/bin/python3 -OO
-# Copyright 2008-2025 by The SABnzbd-Team (sabnzbd.org)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-import hashlib
-import json
-import os
-import re
-import xml.etree.ElementTree as ET
-
-import github
-import praw
-
-from constants import (
-    RELEASE_VERSION,
-    RELEASE_VERSION_BASE,
-    PRERELEASE,
-    RELEASE_SRC,
-    RELEASE_WIN_BIN_X64,
-    RELEASE_WIN_BIN_ARM64,
-    RELEASE_WIN_INSTALLER,
-    RELEASE_MACOS,
-    RELEASE_README,
-    RELEASE_THIS,
-    RELEASE_TITLE,
-    APPDATA_FILE,
-    ON_GITHUB_ACTIONS,
-)
-
-# Verify we have all assets
-files_to_check = (
-    RELEASE_SRC,
-    RELEASE_WIN_BIN_X64,
-    RELEASE_WIN_BIN_ARM64,
-    RELEASE_WIN_INSTALLER,
-    RELEASE_MACOS,
-    RELEASE_README,
-)
-for file_to_check in files_to_check:
-    if not os.path.exists(file_to_check):
-        raise RuntimeError("Not all release files are present!")
-print("All release files are present")
-
-# Verify that appdata file is updated
-if not isinstance(ET.parse(APPDATA_FILE).find(f"./releases/release[@version='{RELEASE_VERSION_BASE}']"), ET.Element):
-    release_missing = f"Could not find {RELEASE_VERSION_BASE} in {APPDATA_FILE}"
-    if RELEASE_THIS:
-        raise RuntimeError(release_missing)
-    elif ON_GITHUB_ACTIONS:
-        print(f"::warning file={APPDATA_FILE},title=Missing release::{release_missing}")
-    else:
-        print(release_missing)
-
-# Calculate hashes for Synology release
-with open(RELEASE_SRC, "rb") as inp_file:
-    source_data = inp_file.read()
-
-print("---- Synology spksrc digest hashes ---- ")
-print(RELEASE_SRC, "SHA1", hashlib.sha1(source_data).hexdigest())
-print(RELEASE_SRC, "SHA256", hashlib.sha256(source_data).hexdigest())
-print(RELEASE_SRC, "MD5", hashlib.md5(source_data).hexdigest())
-print("----")
-
-# Check if tagged as release and check for token
-gh_token = os.environ.get("AUTOMATION_GITHUB_TOKEN", "")
-if RELEASE_THIS and gh_token:
-    gh_obj = github.Github(auth=github.Auth.Token(gh_token))
-    gh_repo = gh_obj.get_repo("sabnzbd/sabnzbd")
-
-    # Read the release notes
-    with open(RELEASE_README, "r") as readme_file:
-        readme_data = readme_file.read()
-
-    # We have to manually check if we already created this release
-    for release in gh_repo.get_releases():
-        if release.tag_name == RELEASE_VERSION:
-            gh_release = release
-            print("Found existing release %s" % gh_release.name)
-            break
-    else:
-        # Did not find it, so create the release, use the GitHub tag we got as input
-        print("Creating GitHub release SABnzbd %s" % RELEASE_VERSION)
-        gh_release = gh_repo.create_git_release(
-            tag=RELEASE_VERSION,
-            name=RELEASE_TITLE,
-            message=readme_data,
-            draft=True,
-            prerelease=PRERELEASE,
-        )
-
-    # Fetch existing assets, as overwriting is not allowed by GitHub
-    gh_assets = gh_release.get_assets()
-
-    # Upload the assets
-    for file_to_check in files_to_check:
-        if os.path.exists(file_to_check):
-            # Check if this file was previously uploaded
-            if gh_assets.totalCount:
-                for gh_asset in gh_assets:
-                    if gh_asset.name == file_to_check:
-                        print("Removing existing asset %s " % gh_asset.name)
-                        gh_asset.delete_asset()
-            # Upload the new one
-            print("Uploading %s to release %s" % (file_to_check, gh_release.name))
-            gh_release.upload_asset(file_to_check)
-
-    # Check if we now have all files
-    gh_new_assets = gh_release.get_assets()
-    if gh_new_assets.totalCount:
-        all_assets = [gh_asset.name for gh_asset in gh_new_assets]
-
-        # Check if we have all files, using set-comparison
-        if set(files_to_check) == set(all_assets):
-            print("All assets present, releasing %s" % RELEASE_VERSION)
-            # Publish release
-            gh_release.update_release(
-                tag_name=RELEASE_VERSION,
-                name=RELEASE_TITLE,
-                message=readme_data,
-                draft=False,
-                prerelease=PRERELEASE,
-            )
-
-    # Update the website
-    gh_repo_web = gh_obj.get_repo("sabnzbd/sabnzbd.github.io")
-    # Check if the branch already exists, only create one if it doesn't
-    skip_website_update = False
-    try:
-        gh_repo_web.get_branch(RELEASE_VERSION)
-        print("Branch %s on sabnzbd/sabnzbd.github.io already exists, skipping update" % RELEASE_VERSION)
-        skip_website_update = True
-    except github.GithubException:
-        # Create a new branch to have the changes
-        sb = gh_repo_web.get_branch("master")
-        print("Creating branch %s on sabnzbd/sabnzbd.github.io" % RELEASE_VERSION)
-        new_branch = gh_repo_web.create_git_ref(ref="refs/heads/" + RELEASE_VERSION, sha=sb.commit.sha)
-
-    # Update the files
-    if not skip_website_update:
-        # We need bytes version to interact with GitHub
-        RELEASE_VERSION_BYTES = RELEASE_VERSION.encode()
-
-        # Get all the version files
-        latest_txt = gh_repo_web.get_contents("latest.txt")
-        latest_txt_items = latest_txt.decoded_content.split()
-        new_latest_txt_items = latest_txt_items[:2]
-        config_yml = gh_repo_web.get_contents("_config.yml")
-        if PRERELEASE:
-            # If it's a pre-release, we append to current version in latest.txt
-            new_latest_txt_items.extend([RELEASE_VERSION_BYTES, latest_txt_items[1]])
-            # And replace in _config.yml
-            new_config_yml = re.sub(
-                b"latest_testing: '[^']*'",
-                b"latest_testing: '%s'" % RELEASE_VERSION_BYTES,
-                config_yml.decoded_content,
-            )
-        else:
-            # New stable release, replace the version
-            new_latest_txt_items[0] = RELEASE_VERSION_BYTES
-            # And replace in _config.yml
-            new_config_yml = re.sub(
-                b"latest_testing: '[^']*'",
-                b"latest_testing: ''",
-                config_yml.decoded_content,
-            )
-            new_config_yml = re.sub(
-                b"latest_stable: '[^']*'",
-                b"latest_stable: '%s'" % RELEASE_VERSION_BYTES,
-                new_config_yml,
-            )
-            # Also update the wiki-settings, these only use x.x notation
-            new_config_yml = re.sub(
-                b"wiki_version: '[^']*'",
-                b"wiki_version: '%s'" % RELEASE_VERSION_BYTES[:3],
-                new_config_yml,
-            )
-
-        # Update the files
-        print("Updating latest.txt")
-        gh_repo_web.update_file(
-            "latest.txt",
-            "Release %s: latest.txt" % RELEASE_VERSION,
-            b"\n".join(new_latest_txt_items),
-            latest_txt.sha,
-            RELEASE_VERSION,
-        )
-        print("Updating _config.yml")
-        gh_repo_web.update_file(
-            "_config.yml",
-            "Release %s: _config.yml" % RELEASE_VERSION,
-            new_config_yml,
-            config_yml.sha,
-            RELEASE_VERSION,
-        )
-
-        # Create pull-request
-        print("Creating pull request in sabnzbd/sabnzbd.github.io for the update")
-        update_pr = gh_repo_web.create_pull(
-            title="Release %s" % RELEASE_VERSION,
-            base="master",
-            body="Automated update of release files",
-            head=RELEASE_VERSION,
-        )
-
-        # Merge pull-request
-        print("Merging pull request in sabnzbd/sabnzbd.github.io for the update")
-        update_pr.merge(merge_method="squash")
-
-    # Only with GitHub success we proceed to Reddit
-    if reddit_token := os.environ.get("REDDIT_TOKEN", ""):
-        # Token format (without whitespace):
-        # {
-        #     "client_id":"XXX",
-        #     "client_secret":"XXX",
-        #     "user_agent":"SABnzbd release script",
-        #     "username":"Safihre",
-        #     "password":"XXX"
-        # }
-        credentials = json.loads(reddit_token)
-        reddit = praw.Reddit(**credentials)
-
-        subreddit_sabnzbd = reddit.subreddit("sabnzbd")
-        subreddit_usenet = reddit.subreddit("usenet")
-
-        # Read the release notes
-        with open(RELEASE_README, "r") as readme_file:
-            readme_lines = readme_file.readlines()
-
-        # Put the download link after the title
-        readme_lines[2] = "## https://sabnzbd.org/downloads\n\n"
-
-        # Use the header in the readme as title
-        title = readme_lines[0]
-        release_notes_text = "".join(readme_lines[2:])
-        print("Posting release notes to Reddit")
-
-        # Only stable releases to r/usenet
-        if not PRERELEASE:
-            # Get correct flair-id (required by r/usenet)
-            for flair in subreddit_usenet.flair.link_templates.user_selectable():
-                if flair["flair_text"] == "News":
-                    print("Posting to r/usenet")
-                    submission = subreddit_usenet.submit(
-                        title, selftext=release_notes_text, flair_id=flair["flair_template_id"]
-                    )
-                    break
-            else:
-                raise ValueError("Could not locate flair_text for posting to r/usenet")
-
-        # Post always to r/SABnzbd
-        print("Posting to r/sabnzbd")
-        subreddit_sabnzbd.submit(title, selftext=release_notes_text)
-
-    else:
-        print("Missing REDDIT_TOKEN")
-
-else:
-    print("To push release to GitHub, first tag the commit.")
-    print("Or missing the AUTOMATION_GITHUB_TOKEN, cannot push to GitHub without it.")

builder/requirements.txt

@@ -1,19 +0,0 @@
-# Basic build requirements
-# Note that not all sub-dependencies are listed, but only ones we know could cause trouble
-pyinstaller==6.17.0
-packaging==25.0
-pyinstaller-hooks-contrib==2025.10
-altgraph==0.17.5
-wrapt==2.0.1
-setuptools==80.9.0
-
-# For the Windows build
-pefile==2024.8.26; sys_platform == 'win32'
-pywin32-ctypes==0.2.3; sys_platform == 'win32'
-
-# For the macOS build
-dmgbuild==1.6.6; sys_platform == 'darwin'
-mac-alias==2.2.3; sys_platform == 'darwin'
-macholib==1.16.4; sys_platform == 'darwin'
-ds-store==1.3.2; sys_platform == 'darwin'
-PyNaCl==1.6.1; sys_platform == 'darwin'

builder/win/NSIS_Installer.nsi

@@ -1,442 +0,0 @@
-; -*- coding: utf-8 -*-
-;
-; Copyright 2008-2015 The SABnzbd-Team (sabnzbd.org)
-;
-; This program is free software; you can redistribute it and/or
-; modify it under the terms of the GNU General Public License
-; as published by the Free Software Foundation; either version 2
-; of the License, or (at your option) any later version.
-;
-; This program is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.
-;
-; You should have received a copy of the GNU General Public License
-; along with this program; if not, write to the Free Software
-; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-Unicode true
-
-!addplugindir builder\win\nsis\Plugins
-!addincludedir builder\win\nsis\Include
-
-!include "MUI2.nsh"
-!include "registerExtension.nsh"
-!include "FileFunc.nsh"
-!include "LogicLib.nsh"
-!include "WinVer.nsh"
-!include "nsProcess.nsh"
-!include "x64.nsh"
-!include "servicelib.nsh"
-!include "StdUtils.nsh"
-
-;------------------------------------------------------------------
-;
-; Macro for removing existing and the current installation
-; It shared by the installer and the uninstaller.
-;
-!define RemovePrev "!insertmacro RemovePrev"
-!macro RemovePrev idir
-  ; Remove the whole dir
-  ; Users should not be putting stuff here!
-  RMDir /r "${idir}"
-!macroend
-
-!define RemovePrevShortcuts "!insertmacro RemovePrevShortcuts"
-!macro RemovePrevShortcuts
-  ; Remove shortcuts, starting with current user ones (from old installs)
-  SetShellVarContext current
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - SafeMode.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - Documentation.url"
-  RMDir  "$SMPROGRAMS\$MUI_TEMP"
-  Delete "$SMPROGRAMS\Startup\SABnzbd.lnk"
-  Delete "$DESKTOP\SABnzbd.lnk"
-
-  SetShellVarContext all
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - SafeMode.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - Documentation.url"
-  RMDir  "$SMPROGRAMS\$MUI_TEMP"
-  Delete "$SMPROGRAMS\Startup\SABnzbd.lnk"
-  Delete "$DESKTOP\SABnzbd.lnk"
-!macroend
-
-;------------------------------------------------------------------
-; Define names of the product
-  Name "SABnzbd ${SAB_VERSION}"
-  VIProductVersion "${SAB_VERSIONKEY}"
-  VIFileVersion "${SAB_VERSIONKEY}"
-
-  VIAddVersionKey "Comments" "SABnzbd ${SAB_VERSION}"
-  VIAddVersionKey "CompanyName" "The SABnzbd-Team"
-  VIAddVersionKey "FileDescription" "SABnzbd ${SAB_VERSION}"
-  VIAddVersionKey "FileVersion" "${SAB_VERSION}"
-  VIAddVersionKey "LegalCopyright" "The SABnzbd-Team"
-  VIAddVersionKey "ProductName" "SABnzbd ${SAB_VERSION}"
-  VIAddVersionKey "ProductVersion" "${SAB_VERSION}"
-
-  OutFile "${SAB_FILE}"
-  InstallDir "$PROGRAMFILES\SABnzbd"
-
-;------------------------------------------------------------------
-; Some default compiler settings (uncomment and change at will):
-  SetCompress auto ; (can be off or force)
-  SetDatablockOptimize on ; (can be off)
-  CRCCheck on ; (can be off)
-  AutoCloseWindow false ; (can be true for the window go away automatically at end)
-  ShowInstDetails hide ; (can be show to have them shown, or nevershow to disable)
-  SetDateSave off ; (can be on to have files restored to their original date)
-  WindowIcon on
-  SpaceTexts none
-
-
-;------------------------------------------------------------------
-; Vista/Win7 redirects $SMPROGRAMS to all users without this
-  RequestExecutionLevel admin
-  FileErrorText "If you have no admin rights, try to install into a user directory."
-
-;------------------------------------------------------------------
-;Variables
-  Var MUI_TEMP
-  Var STARTMENU_FOLDER
-  Var PREV_INST_DIR
-
-;------------------------------------------------------------------
-;Interface Settings
-
-  !define MUI_ABORTWARNING
-
-  ;Show all languages, despite user's codepage
-  !define MUI_LANGDLL_ALLLANGUAGES
-
-  !define MUI_ICON "dist\SABnzbd\icons\sabnzbd.ico"
-
-
-;--------------------------------
-;Pages
-
-  !insertmacro MUI_PAGE_LICENSE "dist\SABnzbd\LICENSE.txt"
-  !define MUI_COMPONENTSPAGE_NODESC
-  !insertmacro MUI_PAGE_COMPONENTS
-
-  !insertmacro MUI_PAGE_DIRECTORY
-
-  ;Start Menu Folder Page Configuration
-  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
-  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\SABnzbd"
-  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-  !define MUI_STARTMENUPAGE_DEFAULTFOLDER "SABnzbd"
-  ;Remember the installer language
-  !define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
-  !define MUI_LANGDLL_REGISTRY_KEY "Software\SABnzbd"
-  !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
-
-  !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
-
-  !insertmacro MUI_PAGE_INSTFILES
-  !define MUI_FINISHPAGE_RUN
-  !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
-  !define MUI_FINISHPAGE_RUN_TEXT $(MsgRunSAB)
-  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
-  !define MUI_FINISHPAGE_SHOWREADME_TEXT $(MsgShowRelNote)
-  !define MUI_FINISHPAGE_LINK $(MsgSupportUs)
-  !define MUI_FINISHPAGE_LINK_LOCATION "https://sabnzbd.org/donate"
-
-  !insertmacro MUI_PAGE_FINISH
-
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !define MUI_UNPAGE_COMPONENTSPAGE_NODESC
-  !insertmacro MUI_UNPAGE_COMPONENTS
-  !insertmacro MUI_UNPAGE_INSTFILES
-
-
-;------------------------------------------------------------------
-; Run as user-level at end of install
-Function PageFinishRun
-  ; Check if SABnzbd service is installed
-  !insertmacro SERVICE "installed" "SABnzbd" ""
-  Pop $0 ;response
-  ${If} $0 == true
-    ; Service is installed, start the service
-    !insertmacro SERVICE "start" "SABnzbd" ""
-  ${Else}
-    ; Service not installed, run executable as user
-    ${StdUtils.ExecShellAsUser} $0 "$INSTDIR\SABnzbd.exe" "" ""
-  ${EndIf}
-FunctionEnd
-
-
-;------------------------------------------------------------------
-; Set supported languages
-;
-; If you edit this list you also need to edit apireg.py in SABnzbd!
-;
-  !insertmacro MUI_LANGUAGE "English" ;first language is the default language
-  !insertmacro MUI_LANGUAGE "French"
-  !insertmacro MUI_LANGUAGE "German"
-  !insertmacro MUI_LANGUAGE "Dutch"
-  !insertmacro MUI_LANGUAGE "Finnish"
-  !insertmacro MUI_LANGUAGE "Polish"
-  !insertmacro MUI_LANGUAGE "Swedish"
-  !insertmacro MUI_LANGUAGE "Danish"
-  !insertmacro MUI_LANGUAGE "Italian"
-  !insertmacro MUI_LANGUAGE "Norwegian"
-  !insertmacro MUI_LANGUAGE "Romanian"
-  !insertmacro MUI_LANGUAGE "Spanish"
-  !insertmacro MUI_LANGUAGE "PortugueseBR"
-  !insertmacro MUI_LANGUAGE "Serbian"
-  !insertmacro MUI_LANGUAGE "Turkish"
-  !insertmacro MUI_LANGUAGE "Hebrew"
-  !insertmacro MUI_LANGUAGE "Russian"
-  !insertmacro MUI_LANGUAGE "Czech"
-  !insertmacro MUI_LANGUAGE "SimpChinese"
-
-
-;------------------------------------------------------------------
-;Reserve Files
-  ;If you are using solid compression, files that are required before
-  ;the actual installation should be stored first in the data block,
-  ;because this will make your installer start faster.
-
-  !insertmacro MUI_RESERVEFILE_LANGDLL
-
-
-;------------------------------------------------------------------
-; SECTION main program
-;
-Section "SABnzbd" SecDummy
-
-  SetOutPath "$INSTDIR"
-  SetShellVarContext all
-
-  DetailPrint $(MsgShutting)
-
-  ;------------------------------------------------------------------
-  ; Shutdown any running service
-
-  !insertmacro SERVICE "stop" "SABnzbd" ""
-
-  ;------------------------------------------------------------------
-  ; Terminate SABnzbd.exe
-  loop:
-    ${nsProcess::FindProcess} "SABnzbd.exe" $R0
-    StrCmp $R0 0 0 endcheck
-    ${nsProcess::CloseProcess} "SABnzbd.exe" $R0
-    Sleep 500
-    Goto loop
-  endcheck:
-  ${nsProcess::Unload}
-
-  ;------------------------------------------------------------------
-  ; Make sure old versions are gone (reg-key already read in onInt)
-  StrCmp $PREV_INST_DIR "" noPrevInstallRemove
-    ${RemovePrev} "$PREV_INST_DIR"
-    Goto continueSetupAfterRemove
-
-  ;------------------------------------------------------------------
-  ; Add firewall rules for new installs
-  noPrevInstallRemove:
-    liteFirewallW::AddRule "$INSTDIR\SABnzbd.exe" "SABnzbd"
-    liteFirewallW::AddRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"
-
-  continueSetupAfterRemove:
-
-  ; add files / whatever that need to be installed here.
-  File /r "dist\SABnzbd\*"
-
-  ;------------------------------------------------------------------
-  ; Add to registry
-  WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd" "" "$INSTDIR"
-  WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd" "Installer Language" "$(MsgLangCode)"
-  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "DisplayName" "SABnzbd ${SAB_VERSION}"
-  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "UninstallString" '"$INSTDIR\uninstall.exe"'
-  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "DisplayVersion" '${SAB_VERSION}'
-  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "Publisher" 'The SABnzbd-Team'
-  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "HelpLink" 'https://forums.sabnzbd.org/'
-  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "URLInfoAbout" 'https://sabnzbd.org/wiki/'
-  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "URLUpdateInfo" 'https://sabnzbd.org/'
-  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "Comments" 'The automated Usenet download tool'
-  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "DisplayIcon" '$INSTDIR\icons\sabnzbd.ico'
-
-  WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "EstimatedSize"  40674
-  WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "NoRepair" -1
-  WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "NoModify" -1
-
-  WriteRegStr HKEY_CURRENT_USER "Software\Classes\AppUserModelId\SABnzbd" "DisplayName" "SABnzbd"
-  WriteRegStr HKEY_CURRENT_USER "Software\Classes\AppUserModelId\SABnzbd" "IconUri" '$INSTDIR\icons\sabnzbd16_32.ico'
-
-  ; write out uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-    ;Create shortcuts
-    CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\SABnzbd.lnk" "$INSTDIR\SABnzbd.exe"
-    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\SABnzbd - SafeMode.lnk" "$INSTDIR\SABnzbd.exe" "--server 127.0.0.1:8080 -b1 --no-login"
-    WriteINIStr "$SMPROGRAMS\$STARTMENU_FOLDER\SABnzbd - Documentation.url" "InternetShortcut" "URL" "https://sabnzbd.org/wiki/"
-    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-  !insertmacro MUI_STARTMENU_WRITE_END
-SectionEnd ; end of default section
-
-Section $(MsgIcon) desktop
-  CreateShortCut "$DESKTOP\SABnzbd.lnk" "$INSTDIR\SABnzbd.exe"
-SectionEnd ; end of desktop icon section
-
-Section $(MsgAssoc) assoc
-  ${registerExtension} "$INSTDIR\icons\nzb.ico" "$INSTDIR\SABnzbd.exe" ".nzb" "NZB File"
-  ${RefreshShellIcons}
-SectionEnd ; end of file association section
-
-Section /o $(MsgRunAtStart) startup
-  CreateShortCut "$SMPROGRAMS\Startup\SABnzbd.lnk" "$INSTDIR\SABnzbd.exe" "-b0"
-SectionEnd ;
-
-;------------------------------------------------------------------
-Function .onInit
-  ; We need to modify the dir here for X64
-  ${If} ${RunningX64}
-      StrCpy $INSTDIR "$PROGRAMFILES64\SABnzbd"
-  ${Else}
-      MessageBox MB_OK|MB_ICONSTOP $(MsgOnly64bit)
-      Abort
-  ${EndIf}
-
-  ; Python 3.9 no longer supports Windows 7
-  ${If} ${AtMostWin8}
-      MessageBox MB_OK|MB_ICONSTOP $(MsgNoWin7)
-      Abort
-  ${EndIf}
-
-  ;------------------------------------------------------------------
-  ; Change settings based on if SAB was already installed
-  ReadRegStr $PREV_INST_DIR HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd" ""
-  StrCmp $PREV_INST_DIR "" noPrevInstall
-    ; We want to use the user's custom dir if he used one
-    StrCmp $PREV_INST_DIR "$PROGRAMFILES\SABnzbd" noSpecialDir
-      StrCmp $PREV_INST_DIR "$PROGRAMFILES64\SABnzbd" noSpecialDir
-        ; Set what the user had before
-        StrCpy $INSTDIR "$PREV_INST_DIR"
-    noSpecialDir:
-
-    ;------------------------------------------------------------------
-    ; Check what the user has currently set for install options
-    SetShellVarContext current
-    IfFileExists "$SMPROGRAMS\Startup\SABnzbd.lnk" 0 endCheckStartupCurrent
-      SectionSetFlags ${startup} 1
-    endCheckStartupCurrent:
-    SetShellVarContext all
-    IfFileExists "$SMPROGRAMS\Startup\SABnzbd.lnk" 0 endCheckStartup
-      SectionSetFlags ${startup} 1
-    endCheckStartup:
-
-    SetShellVarContext current
-    IfFileExists "$DESKTOP\SABnzbd.lnk" endCheckDesktop 0
-      ; If not present for current user, first check all user folder
-      SetShellVarContext all
-      IfFileExists "$DESKTOP\SABnzbd.lnk" endCheckDesktop 0
-        SectionSetFlags ${desktop} 0 ; SAB is installed but desktop-icon not, so uncheck it
-    endCheckDesktop:
-    SetShellVarContext all
-
-    Push $1
-    ReadRegStr $1 HKCR ".nzb" ""  ; read current file association
-    StrCmp "$1" "NZB File" noPrevInstall 0
-      SectionSetFlags ${assoc} 0 ; Uncheck it when it wasn't checked before
-  noPrevInstall:
-
-  ;--------------------------------
-  ; Display language chooser
-  !insertmacro MUI_LANGDLL_DISPLAY
-
-  ;------------------------------------------------------------------
-  ; Tell users about the service change
-  ;
-  !insertmacro SERVICE "installed" "SABHelper" ""
-  Pop $0 ;response
-  ${If} $0 == true
-    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION $(MsgServChange) IDOK removeservices IDCANCEL exitinstall
-    exitinstall:
-      Abort
-    removeservices:
-        !insertmacro SERVICE "delete" "SABHelper" ""
-        !insertmacro SERVICE "delete" "SABnzbd" ""
-  ${EndIf}
-
-FunctionEnd
-
-;--------------------------------
-; begin uninstall settings/section
-UninstallText $(MsgUninstall)
-
-Section "un.$(MsgDelProgram)" Uninstall
-;make sure sabnzbd.exe isn't running..if so shut it down
-  DetailPrint $(MsgShutting)
-  ${nsProcess::KillProcess} "SABnzbd.exe" $R0
-  ${nsProcess::Unload}
-
-  ; add delete commands to delete whatever files/registry keys/etc you installed here.
-  Delete "$INSTDIR\uninstall.exe"
-  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd"
-  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd"
-  DeleteRegKey HKEY_CURRENT_USER "Software\Classes\AppUserModelId\SABnzbd"
-  DeleteRegKey HKEY_CURRENT_USER "Software\SABnzbd"
-
-  ${RemovePrev} "$INSTDIR"
-  ${RemovePrevShortcuts}
-
-  ; Remove firewall entries
-  liteFirewallW::RemoveRule "$INSTDIR\SABnzbd.exe" "SABnzbd"
-  liteFirewallW::RemoveRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"
-
-  ${unregisterExtension} ".nzb" "NZB File"
-  ${RefreshShellIcons}
-
-SectionEnd ; end of uninstall section
-
-Section /o "un.$(MsgDelSettings)" DelSettings
-  DetailPrint "Uninstall settings $LOCALAPPDATA"
-  Delete "$LOCALAPPDATA\sabnzbd\sabnzbd.ini"
-  RMDir /r "$LOCALAPPDATA\sabnzbd"
-SectionEnd
-
-; eof
-
-;--------------------------------
-;Language strings
-  LangString MsgShowRelNote ${LANG_ENGLISH} "Show Release Notes"
-
-  LangString MsgRunSAB      ${LANG_ENGLISH} "Run SABnzbd"
-
-  LangString MsgSupportUs   ${LANG_ENGLISH} "Support the project, Donate!"
-
-  LangString MsgServChange  ${LANG_ENGLISH} "The SABnzbd Windows Service changed in SABnzbd 3.0.0. $\nYou will need to reinstall the SABnzbd service. $\n$\nClick `OK` to remove the existing services or `Cancel` to cancel this upgrade."
-
-  LangString MsgOnly64bit   ${LANG_ENGLISH} "SABnzbd only supports 64-bit Windows."
-
-  LangString MsgNoWin7      ${LANG_ENGLISH} "SABnzbd only supports Windows 8.1 and above."
-
-  LangString MsgShutting    ${LANG_ENGLISH} "Shutting down SABnzbd"
-
-  LangString MsgUninstall   ${LANG_ENGLISH} "This will uninstall SABnzbd from your system"
-
-  LangString MsgRunAtStart  ${LANG_ENGLISH} "Run at startup"
-
-  LangString MsgIcon        ${LANG_ENGLISH} "Desktop Icon"
-
-  LangString MsgAssoc       ${LANG_ENGLISH} "NZB File association"
-
-  LangString MsgDelProgram  ${LANG_ENGLISH} "Delete Program"
-
-  LangString MsgDelSettings ${LANG_ENGLISH} "Delete Settings"
-
-  LangString MsgLangCode    ${LANG_ENGLISH} "en"
-
-Function un.onInit
-  !insertmacro MUI_UNGETLANGUAGE
-FunctionEnd

builder/win/nsis/Include/StdUtils.nsh

@@ -1,501 +0,0 @@
-#################################################################################
-# StdUtils plug-in for NSIS
-# Copyright (C) 2004-2018 LoRd_MuldeR <MuldeR2@GMX.de>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# http://www.gnu.org/licenses/lgpl-2.1.txt
-#################################################################################
-
-# DEVELOPER NOTES:
-# - Please see "https://github.com/lordmulder/stdutils/" for news and updates!
-# - Please see "Docs\StdUtils\StdUtils.html" for detailed function descriptions!
-# - Please see "Examples\StdUtils\StdUtilsTest.nsi" for usage examples!
-
-#################################################################################
-# FUNCTION DECLARTIONS
-#################################################################################
-
-!ifndef ___STDUTILS__NSH___
-!define ___STDUTILS__NSH___
-
-!define StdUtils.Time             '!insertmacro _StdU_Time'          #time(), as in C standard library
-!define StdUtils.GetMinutes       '!insertmacro _StdU_GetMinutes'    #GetSystemTimeAsFileTime(), returns the number of minutes
-!define StdUtils.GetHours         '!insertmacro _StdU_GetHours'      #GetSystemTimeAsFileTime(), returns the number of hours
-!define StdUtils.GetDays          '!insertmacro _StdU_GetDays'       #GetSystemTimeAsFileTime(), returns the number of days
-!define StdUtils.Rand             '!insertmacro _StdU_Rand'          #rand(), as in C standard library
-!define StdUtils.RandMax          '!insertmacro _StdU_RandMax'       #rand(), as in C standard library, with maximum value
-!define StdUtils.RandMinMax       '!insertmacro _StdU_RandMinMax'    #rand(), as in C standard library, with minimum/maximum value
-!define StdUtils.RandList         '!insertmacro _StdU_RandList'      #rand(), as in C standard library, with list support
-!define StdUtils.RandBytes        '!insertmacro _StdU_RandBytes'     #Generates random bytes, returned as Base64-encoded string
-!define StdUtils.FormatStr        '!insertmacro _StdU_FormatStr'     #sprintf(), as in C standard library, one '%d' placeholder
-!define StdUtils.FormatStr2       '!insertmacro _StdU_FormatStr2'    #sprintf(), as in C standard library, two '%d' placeholders
-!define StdUtils.FormatStr3       '!insertmacro _StdU_FormatStr3'    #sprintf(), as in C standard library, three '%d' placeholders
-!define StdUtils.ScanStr          '!insertmacro _StdU_ScanStr'       #sscanf(), as in C standard library, one '%d' placeholder
-!define StdUtils.ScanStr2         '!insertmacro _StdU_ScanStr2'      #sscanf(), as in C standard library, two '%d' placeholders
-!define StdUtils.ScanStr3         '!insertmacro _StdU_ScanStr3'      #sscanf(), as in C standard library, three '%d' placeholders
-!define StdUtils.TrimStr          '!insertmacro _StdU_TrimStr'       #Remove whitspaces from string, left and right
-!define StdUtils.TrimStrLeft      '!insertmacro _StdU_TrimStrLeft'   #Remove whitspaces from string, left side only
-!define StdUtils.TrimStrRight     '!insertmacro _StdU_TrimStrRight'  #Remove whitspaces from string, right side only
-!define StdUtils.RevStr           '!insertmacro _StdU_RevStr'        #Reverse a string, e.g. "reverse me" <-> "em esrever"
-!define StdUtils.ValidFileName    '!insertmacro _StdU_ValidFileName' #Test whether string is a valid file name - no paths allowed
-!define StdUtils.ValidPathSpec    '!insertmacro _StdU_ValidPathSpec' #Test whether string is a valid full(!) path specification
-!define StdUtils.ValidDomainName  '!insertmacro _StdU_ValidDomain'   #Test whether string is a valid host name or domain name
-!define StdUtils.StrToUtf8        '!insertmacro _StdU_StrToUtf8'     #Convert string from Unicode (UTF-16) or ANSI to UTF-8 bytes
-!define StdUtils.StrFromUtf8      '!insertmacro _StdU_StrFromUtf8'   #Convert string from UTF-8 bytes to Unicode (UTF-16) or ANSI
-!define StdUtils.SHFileMove       '!insertmacro _StdU_SHFileMove'    #SHFileOperation(), using the FO_MOVE operation
-!define StdUtils.SHFileCopy       '!insertmacro _StdU_SHFileCopy'    #SHFileOperation(), using the FO_COPY operation
-!define StdUtils.AppendToFile     '!insertmacro _StdU_AppendToFile'  #Append contents of an existing file to another file
-!define StdUtils.ExecShellAsUser  '!insertmacro _StdU_ExecShlUser'   #ShellExecute() as NON-elevated user from elevated installer
-!define StdUtils.InvokeShellVerb  '!insertmacro _StdU_InvkeShlVrb'   #Invokes a "shell verb", e.g. for pinning items to the taskbar
-!define StdUtils.ExecShellWaitEx  '!insertmacro _StdU_ExecShlWaitEx' #ShellExecuteEx(), returns the handle of the new process
-!define StdUtils.WaitForProcEx    '!insertmacro _StdU_WaitForProcEx' #WaitForSingleObject(), e.g. to wait for a running process
-!define StdUtils.GetParameter     '!insertmacro _StdU_GetParameter'  #Get the value of a specific command-line option
-!define StdUtils.TestParameter    '!insertmacro _StdU_TestParameter' #Test whether a specific command-line option has been set
-!define StdUtils.ParameterCnt     '!insertmacro _StdU_ParameterCnt'  #Get number of command-line tokens, similar to argc in main()
-!define StdUtils.ParameterStr     '!insertmacro _StdU_ParameterStr'  #Get the n-th command-line token, similar to argv[i] in main()
-!define StdUtils.GetAllParameters '!insertmacro _StdU_GetAllParams'  #Get complete command-line, but without executable name
-!define StdUtils.GetRealOSVersion '!insertmacro _StdU_GetRealOSVer'  #Get the *real* Windows version number, even on Windows 8.1+
-!define StdUtils.GetRealOSBuildNo '!insertmacro _StdU_GetRealOSBld'  #Get the *real* Windows build number, even on Windows 8.1+
-!define StdUtils.GetRealOSName    '!insertmacro _StdU_GetRealOSStr'  #Get the *real* Windows version, as a "friendly" name
-!define StdUtils.GetOSEdition     '!insertmacro _StdU_GetOSEdition'  #Get the Windows edition, i.e. "workstation" or "server"
-!define StdUtils.GetOSReleaseId   '!insertmacro _StdU_GetOSRelIdNo'  #Get the Windows release identifier (on Windows 10)
-!define StdUtils.GetOSReleaseName '!insertmacro _StdU_GetOSRelIdStr' #Get the Windows release (on Windows 10), as a "friendly" name
-!define StdUtils.VerifyOSVersion  '!insertmacro _StdU_VrfyRealOSVer' #Compare *real* operating system to an expected version number
-!define StdUtils.VerifyOSBuildNo  '!insertmacro _StdU_VrfyRealOSBld' #Compare *real* operating system to an expected build number
-!define StdUtils.HashText         '!insertmacro _StdU_HashText'      #Compute hash from text string (CRC32, MD5, SHA1/2/3, BLAKE2)
-!define StdUtils.HashFile         '!insertmacro _StdU_HashFile'      #Compute hash from file (CRC32, MD5, SHA1/2/3, BLAKE2)
-!define StdUtils.NormalizePath    '!insertmacro _StdU_NormalizePath' #Simplifies the path to produce a direct, well-formed path
-!define StdUtils.GetParentPath    '!insertmacro _StdU_GetParentPath' #Get parent path by removing the last component from the path
-!define StdUtils.SplitPath        '!insertmacro _StdU_SplitPath'     #Split the components of the given path
-!define StdUtils.GetDrivePart     '!insertmacro _StdU_GetDrivePart'  #Get drive component of path
-!define StdUtils.GetDirectoryPart '!insertmacro _StdU_GetDirPart'    #Get directory component of path
-!define StdUtils.GetFileNamePart  '!insertmacro _StdU_GetFNamePart'  #Get file name component of path
-!define StdUtils.GetExtensionPart '!insertmacro _StdU_GetExtnPart'   #Get file extension component of path
-!define StdUtils.TimerCreate      '!insertmacro _StdU_TimerCreate'   #Create a new event-timer that will be triggered periodically
-!define StdUtils.TimerDestroy     '!insertmacro _StdU_TimerDestroy'  #Destroy a running timer created with TimerCreate()
-!define StdUtils.ProtectStr       '!insertmacro _StdU_PrtctStr'      #Protect a given String using Windows' DPAPI
-!define StdUtils.UnprotectStr     '!insertmacro _StdU_UnprtctStr'    #Unprotect a string that was protected via ProtectStr()
-!define StdUtils.GetLibVersion    '!insertmacro _StdU_GetLibVersion' #Get the current StdUtils library version (for debugging)
-!define StdUtils.SetVerbose       '!insertmacro _StdU_SetVerbose'    #Enable or disable "verbose" mode (for debugging)
-
-
-#################################################################################
-# MACRO DEFINITIONS
-#################################################################################
-
-!macro _StdU_Time out
-	StdUtils::Time /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetMinutes out
-	StdUtils::GetMinutes /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetHours out
-	StdUtils::GetHours /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetDays out
-	StdUtils::GetDays /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_Rand out
-	StdUtils::Rand /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_RandMax out max
-	push ${max}
-	StdUtils::RandMax /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_RandMinMax out min max
-	push ${min}
-	push ${max}
-	StdUtils::RandMinMax /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_RandList count max
-	push ${max}
-	push ${count}
-	StdUtils::RandList /NOUNLOAD
-!macroend
-
-!macro _StdU_RandBytes out count
-	push ${count}
-	StdUtils::RandBytes /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_FormatStr out format val
-	push `${format}`
-	push ${val}
-	StdUtils::FormatStr /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_FormatStr2 out format val1 val2
-	push `${format}`
-	push ${val1}
-	push ${val2}
-	StdUtils::FormatStr2 /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_FormatStr3 out format val1 val2 val3
-	push `${format}`
-	push ${val1}
-	push ${val2}
-	push ${val3}
-	StdUtils::FormatStr3 /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_ScanStr out format input default
-	push `${format}`
-	push `${input}`
-	push ${default}
-	StdUtils::ScanStr /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_ScanStr2 out1 out2 format input default1 default2
-	push `${format}`
-	push `${input}`
-	push ${default1}
-	push ${default2}
-	StdUtils::ScanStr2 /NOUNLOAD
-	pop ${out1}
-	pop ${out2}
-!macroend
-
-!macro _StdU_ScanStr3 out1 out2 out3 format input default1 default2 default3
-	push `${format}`
-	push `${input}`
-	push ${default1}
-	push ${default2}
-	push ${default3}
-	StdUtils::ScanStr3 /NOUNLOAD
-	pop ${out1}
-	pop ${out2}
-	pop ${out3}
-!macroend
-
-!macro _StdU_TrimStr var
-	push ${var}
-	StdUtils::TrimStr /NOUNLOAD
-	pop ${var}
-!macroend
-
-!macro _StdU_TrimStrLeft var
-	push ${var}
-	StdUtils::TrimStrLeft /NOUNLOAD
-	pop ${var}
-!macroend
-
-!macro _StdU_TrimStrRight var
-	push ${var}
-	StdUtils::TrimStrRight /NOUNLOAD
-	pop ${var}
-!macroend
-
-!macro _StdU_RevStr var
-	push ${var}
-	StdUtils::RevStr /NOUNLOAD
-	pop ${var}
-!macroend
-
-!macro _StdU_ValidFileName out test
-	push `${test}`
-	StdUtils::ValidFileName /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_ValidPathSpec out test
-	push `${test}`
-	StdUtils::ValidPathSpec /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_ValidDomain out test
-	push `${test}`
-	StdUtils::ValidDomainName /NOUNLOAD
-	pop ${out}
-!macroend
-
-
-!macro _StdU_StrToUtf8 out str
-	push `${str}`
-	StdUtils::StrToUtf8 /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_StrFromUtf8 out trnc str
-	push ${trnc}
-	push `${str}`
-	StdUtils::StrFromUtf8 /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_SHFileMove out from to hwnd
-	push `${from}`
-	push `${to}`
-	push ${hwnd}
-	StdUtils::SHFileMove /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_SHFileCopy out from to hwnd
-	push `${from}`
-	push `${to}`
-	push ${hwnd}
-	StdUtils::SHFileCopy /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_AppendToFile out from dest offset maxlen
-	push `${from}`
-	push `${dest}`
-	push ${offset}
-	push ${maxlen}
-	StdUtils::AppendToFile /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_ExecShlUser out file verb args
-	push `${file}`
-	push `${verb}`
-	push `${args}`
-	StdUtils::ExecShellAsUser /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_InvkeShlVrb out path file verb_id
-	push "${path}"
-	push "${file}"
-	push ${verb_id}
-	StdUtils::InvokeShellVerb /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_ExecShlWaitEx out_res out_val file verb args
-	push `${file}`
-	push `${verb}`
-	push `${args}`
-	StdUtils::ExecShellWaitEx /NOUNLOAD
-	pop ${out_res}
-	pop ${out_val}
-!macroend
-
-!macro _StdU_WaitForProcEx out handle
-	push `${handle}`
-	StdUtils::WaitForProcEx /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetParameter out name default
-	push `${name}`
-	push `${default}`
-	StdUtils::GetParameter /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_TestParameter out name
-	push `${name}`
-	StdUtils::TestParameter /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_ParameterCnt out
-	StdUtils::ParameterCnt /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_ParameterStr out index
-	push ${index}
-	StdUtils::ParameterStr /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetAllParams out truncate
-	push `${truncate}`
-	StdUtils::GetAllParameters /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetRealOSVer out_major out_minor out_spack
-	StdUtils::GetRealOsVersion /NOUNLOAD
-	pop ${out_major}
-	pop ${out_minor}
-	pop ${out_spack}
-!macroend
-
-!macro _StdU_GetRealOSBld out
-	StdUtils::GetRealOsBuildNo /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetRealOSStr out
-	StdUtils::GetRealOsName /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_VrfyRealOSVer out major minor spack
-	push `${major}`
-	push `${minor}`
-	push `${spack}`
-	StdUtils::VerifyRealOsVersion /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_VrfyRealOSBld out build
-	push `${build}`
-	StdUtils::VerifyRealOsBuildNo /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetOSEdition out
-	StdUtils::GetOsEdition /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetOSRelIdNo out
-	StdUtils::GetOsReleaseId /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetOSRelIdStr out
-	StdUtils::GetOsReleaseName /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_HashText out type text
-	push `${type}`
-	push `${text}`
-	StdUtils::HashText /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_HashFile out type file
-	push `${type}`
-	push `${file}`
-	StdUtils::HashFile /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_NormalizePath out path
-	push `${path}`
-	StdUtils::NormalizePath /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetParentPath out path
-	push `${path}`
-	StdUtils::GetParentPath /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_SplitPath out_drive out_dir out_fname out_ext path
-	push `${path}`
-	StdUtils::SplitPath /NOUNLOAD
-	pop ${out_drive}
-	pop ${out_dir}
-	pop ${out_fname}
-	pop ${out_ext}
-!macroend
-
-!macro _StdU_GetDrivePart out path
-	push `${path}`
-	StdUtils::GetDrivePart /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetDirPart out path
-	push `${path}`
-	StdUtils::GetDirectoryPart /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetFNamePart out path
-	push `${path}`
-	StdUtils::GetFileNamePart /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetExtnPart out path
-	push `${path}`
-	StdUtils::GetExtensionPart /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_TimerCreate out callback interval
-	GetFunctionAddress ${out} ${callback}
-	push ${out}
-	push ${interval}
-	StdUtils::TimerCreate /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_TimerDestroy out timer_id
-	push ${timer_id}
-	StdUtils::TimerDestroy /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_PrtctStr out dpsc salt text
-	push `${dpsc}`
-	push `${salt}`
-	push `${text}`
-	StdUtils::ProtectStr /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_UnprtctStr out trnc salt data
-	push `${trnc}`
-	push `${salt}`
-	push `${data}`
-	StdUtils::UnprotectStr /NOUNLOAD
-	pop ${out}
-!macroend
-
-!macro _StdU_GetLibVersion out_ver out_tst
-	StdUtils::GetLibVersion /NOUNLOAD
-	pop ${out_ver}
-	pop ${out_tst}
-!macroend
-
-!macro _StdU_SetVerbose enable
-	Push ${enable}
-	StdUtils::SetVerboseMode /NOUNLOAD
-!macroend
-
-
-#################################################################################
-# MAGIC NUMBERS
-#################################################################################
-
-!define StdUtils.Const.ShellVerb.PinToTaskbar     0
-!define StdUtils.Const.ShellVerb.UnpinFromTaskbar 1
-!define StdUtils.Const.ShellVerb.PinToStart       2
-!define StdUtils.Const.ShellVerb.UnpinFromStart   3
-
-!endif # !___STDUTILS__NSH___

builder/win/nsis/Include/nsProcess.nsh

@@ -1,28 +0,0 @@
-!define nsProcess::FindProcess `!insertmacro nsProcess::FindProcess`
-
-!macro nsProcess::FindProcess _FILE _ERR
-	nsProcess::_FindProcess /NOUNLOAD `${_FILE}`
-	Pop ${_ERR}
-!macroend
-
-
-!define nsProcess::KillProcess `!insertmacro nsProcess::KillProcess`
-
-!macro nsProcess::KillProcess _FILE _ERR
-	nsProcess::_KillProcess /NOUNLOAD `${_FILE}`
-	Pop ${_ERR}
-!macroend
-
-!define nsProcess::CloseProcess `!insertmacro nsProcess::CloseProcess`
-
-!macro nsProcess::CloseProcess _FILE _ERR
-	nsProcess::_CloseProcess /NOUNLOAD `${_FILE}`
-	Pop ${_ERR}
-!macroend
-
-
-!define nsProcess::Unload `!insertmacro nsProcess::Unload`
-
-!macro nsProcess::Unload
-	nsProcess::_Unload
-!macroend

builder/win/nsis/Include/registerExtension.nsh

@@ -1,53 +0,0 @@
-!define registerExtension "!insertmacro registerExtension"
-!define unregisterExtension "!insertmacro unregisterExtension"
-!define SHCNE_ASSOCCHANGED 0x8000000
-!define SHCNF_IDLIST 0
-
-; Source = http://nsis.sourceforge.net/File_Association
-; Patched for SABnzbd by swi-tch
-
-!macro registerExtension icon executable extension description
-       Push "${icon}"  ; "full path to icon.ico"
-       Push "${executable}"  ; "full path to my.exe"
-       Push "${extension}"   ;  ".mkv"
-       Push "${description}" ;  "MKV File"
-       Call registerExtension
-!macroend
-
-; back up old value of .opt
-Function registerExtension
-!define Index "Line${__LINE__}"
-  pop $R0 ; ext name
-  pop $R1
-  pop $R2
-  pop $R3
-  push $1
-  push $0
-  DeleteRegKey HKEY_CURRENT_USER "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R1"
-  WriteRegStr HKCR $R1 "" $R0
-	WriteRegStr HKCR $R0 "" $R0
-	WriteRegStr HKCR "$R0\shell" "" "open"
-	WriteRegStr HKCR "$R0\DefaultIcon" "" "$R3,0"
-  WriteRegStr HKCR "$R0\shell\open\command" "" '"$R2" "%1"'
-  WriteRegStr HKCR "$R0\shell\edit" "" "Edit $R0"
-  WriteRegStr HKCR "$R0\shell\edit\command" "" '"$R2" "%1"'
-  pop $0
-  pop $1
-!undef Index
-System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
-FunctionEnd
-
-!macro unregisterExtension extension description
-       Push "${extension}"   ;  ".mkv"
-       Push "${description}"   ;  "MKV File"
-       Call un.unregisterExtension
-!macroend
-
-Function un.unregisterExtension
-  pop $R1 ; description
-  pop $R0 ; extension
-!define Index "Line${__LINE__}"
-  DeleteRegKey HKCR $R0
-!undef Index
-System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
-FunctionEnd

builder/win/nsis/Include/servicelib.nsh

@@ -1,411 +0,0 @@
-; NSIS SERVICE LIBRARY - servicelib.nsh
-; Version 1.8.1 - Jun 21th, 2013
-; Questions/Comments - dselkirk@hotmail.com
-;
-; Description:
-;   Provides an interface to window services
-;
-; Inputs:
-;   action     - systemlib action ie. create, delete, start, stop, pause,
-;              continue, installed, running, status
-;   name       - name of service to manipulate
-;   param      - action parameters; usage: var1=value1;var2=value2;...etc.
-;                 (don't forget to add a ';' after the last value!)
-;
-; Actions:
-;   create     - creates a new windows service
-;              Parameters:
-;                path        - path to service executable
-;                autostart   - automatically start with system ie. 1|0
-;                interact    - interact with the desktop ie. 1|0
-;                depend      - service dependencies
-;                user        - user that runs the service
-;                password    - password of the above user
-;                display     - display name in service's console
-;                description - Description of service
-;                starttype   - start type (supersedes autostart)
-;                servicetype - service type (supersedes interact)
-;
-;   delete     - deletes a windows service
-;   start      - start a stopped windows service
-;   stop       - stops a running windows service
-;   pause      - pauses a running windows service
-;   continue   - continues a paused windows service
-;   installed  - is the provided service installed
-;              Parameters:
-;                action      - if true then invokes the specified action
-;   running    - is the provided service running
-;              Parameters:
-;                action      - if true then invokes the specified action
-;   status     - check the status of the provided service
-;
-; Usage:
-;   Method 1:
-;     Push "action"
-;     Push "name"
-;     Push "param"
-;     Call Service
-;     Pop $0 ;response
-;
-;   Method 2:
-;     !insertmacro SERVICE "action" "name" "param"
-;
-; History:
-;   1.0 - 09/15/2003 - Initial release
-;   1.1 - 09/16/2003 - Changed &l to i, thx brainsucker
-;   1.2 - 02/29/2004 - Fixed documentation.
-;   1.3 - 01/05/2006 - Fixed interactive flag and pop order (Kichik)
-;   1.4 - 12/07/2006 - Added display and depend, fixed datatypes (Vitoco)
-;   1.5 - 06/25/2008 - Added description of service.(DeSafe.com/liuqixing#gmail.com)
-;   1.5.1 - 06/12/2009 - Added use of __UNINSTALL__
-;   1.6 - 08/02/2010 - Fixed description implementation (Anders)
-;   1.7 - 04/11/2010 - Added get running service process id (Nico)
-;   1.8 - 24/03/2011 - Added starttype and servicetype (Sergius)
-;   1.8.1 - 21/06/2013 - Added dynamic ASCII & Unicode support (Zinthose)
-
-!ifndef SERVICELIB
-  !define SERVICELIB
-
-  !define SC_MANAGER_ALL_ACCESS         0x3F
-  !define SC_STATUS_PROCESS_INFO        0x0
-  !define SERVICE_ALL_ACCESS            0xF01FF
-
-  !define SERVICE_CONTROL_STOP          1
-  !define SERVICE_CONTROL_PAUSE         2
-  !define SERVICE_CONTROL_CONTINUE      3
-
-  !define SERVICE_STOPPED               0x1
-  !define SERVICE_START_PENDING         0x2
-  !define SERVICE_STOP_PENDING          0x3
-  !define SERVICE_RUNNING               0x4
-  !define SERVICE_CONTINUE_PENDING      0x5
-  !define SERVICE_PAUSE_PENDING         0x6
-  !define SERVICE_PAUSED                0x7
-
-  !define SERVICE_KERNEL_DRIVER         0x00000001
-  !define SERVICE_FILE_SYSTEM_DRIVER    0x00000002
-  !define SERVICE_WIN32_OWN_PROCESS     0x00000010
-  !define SERVICE_WIN32_SHARE_PROCESS   0x00000020
-  !define SERVICE_INTERACTIVE_PROCESS   0x00000100
-
-
-  !define SERVICE_BOOT_START            0x00000000
-  !define SERVICE_SYSTEM_START          0x00000001
-  !define SERVICE_AUTO_START            0x00000002
-  !define SERVICE_DEMAND_START          0x00000003
-  !define SERVICE_DISABLED              0x00000004
-
-  ## Added by Zinthose for Native Unicode Support
-  !ifdef NSIS_UNICODE
-    !define APITAG "W"
-  !else
-    !define APITAG "A"
-  !endif
-
-  !macro SERVICE ACTION NAME PARAM
-    Push '${ACTION}'
-    Push '${NAME}'
-    Push '${PARAM}'
-    !ifdef __UNINSTALL__
-        Call un.Service
-    !else
-        Call Service
-    !endif
-  !macroend
-
-  !macro FUNC_GETPARAM
-    Push $0
-    Push $1
-    Push $2
-    Push $3
-    Push $4
-    Push $5
-    Push $6
-    Push $7
-    Exch 8
-    Pop $1 ;name
-    Exch 8
-    Pop $2 ;source
-    StrCpy $0 ""
-    StrLen $7 $2
-    StrCpy $3 0
-    lbl_loop:
-      IntCmp $3 $7 0 0 lbl_done
-      StrLen $4 "$1="
-      StrCpy $5 $2 $4 $3
-      StrCmp $5 "$1=" 0 lbl_next
-      IntOp $5 $3 + $4
-      StrCpy $3 $5
-      lbl_loop2:
-        IntCmp $3 $7 0 0 lbl_done
-        StrCpy $6 $2 1 $3
-        StrCmp $6 ";" 0 lbl_next2
-        IntOp $6 $3 - $5
-        StrCpy $0 $2 $6 $5
-        Goto lbl_done
-        lbl_next2:
-        IntOp $3 $3 + 1
-        Goto lbl_loop2
-      lbl_next:
-      IntOp $3 $3 + 1
-      Goto lbl_loop
-    lbl_done:
-    Pop $5
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Exch 2
-    Pop $6
-    Pop $7
-    Exch $0
-  !macroend
-
-  !macro CALL_GETPARAM VAR NAME DEFAULT LABEL
-    Push $1
-    Push ${NAME}
-    Call ${UN}GETPARAM
-    Pop $6
-    StrCpy ${VAR} "${DEFAULT}"
-    StrCmp $6 "" "${LABEL}" 0
-    StrCpy ${VAR} $6
-  !macroend
-
-  !macro FUNC_SERVICE UN
-    Push $0
-    Push $1
-    Push $2
-    Push $3
-    Push $4
-    Push $5
-    Push $6
-    Push $7
-    Exch 8
-    Pop $1 ;param
-    Exch 8
-    Pop $2 ;name
-    Exch 8
-    Pop $3 ;action
-    ;$0 return
-    ;$4 OpenSCManager
-    ;$5 OpenService
-
-    StrCpy $0 "false"
-    System::Call 'advapi32::OpenSCManager${APITAG}(n, n, i ${SC_MANAGER_ALL_ACCESS}) i.r4'
-    IntCmp $4 0 lbl_done
-    StrCmp $3 "create" lbl_create
-    System::Call 'advapi32::OpenService${APITAG}(i r4, t r2, i ${SERVICE_ALL_ACCESS}) i.r5'
-    IntCmp $5 0 lbl_done
-
-    lbl_select:
-    StrCmp $3 "delete" lbl_delete
-    StrCmp $3 "start" lbl_start
-    StrCmp $3 "stop" lbl_stop
-    StrCmp $3 "pause" lbl_pause
-    StrCmp $3 "continue" lbl_continue
-    StrCmp $3 "installed" lbl_installed
-    StrCmp $3 "running" lbl_running
-    StrCmp $3 "status" lbl_status
-    StrCmp $3 "processid" lbl_processid
-    Goto lbl_done
-
-    ; create service
-    lbl_create:
-      Push $R1 ;depend
-      Push $R2 ;user
-      Push $R3 ;password
-      Push $R4 ;servicetype/interact
-      Push $R5 ;starttype/autostart
-      Push $R6 ;path
-      Push $R7 ;display
-      Push $R8 ;description
-
-      !insertmacro CALL_GETPARAM $R1 "depend" "n" "lbl_depend"
-        StrCpy $R1 't "$R1"'
-      lbl_depend:
-      StrCmp $R1 "n" 0 lbl_machine ;old name of depend param
-      !insertmacro CALL_GETPARAM $R1 "machine" "n" "lbl_machine"
-        StrCpy $R1 't "$R1"'
-      lbl_machine:
-
-      !insertmacro CALL_GETPARAM $R2 "user" "n" "lbl_user"
-        StrCpy $R2 't "$R2"'
-      lbl_user:
-
-      !insertmacro CALL_GETPARAM $R3 "password" "n" "lbl_password"
-        StrCpy $R3 't "$R3"'
-      lbl_password:
-
-      !insertmacro CALL_GETPARAM $R4 "interact" "${SERVICE_WIN32_OWN_PROCESS}" "lbl_interact"
-        StrCpy $6 ${SERVICE_WIN32_OWN_PROCESS}
-        IntCmp $R4 0 +2
-        IntOp $6 $6 | ${SERVICE_INTERACTIVE_PROCESS}
-        StrCpy $R4 $6
-      lbl_interact:
-
-      !insertmacro CALL_GETPARAM $R4 "servicetype" "$R4" "lbl_servicetype"
-      lbl_servicetype:
-
-      !insertmacro CALL_GETPARAM $R5 "autostart" "${SERVICE_DEMAND_START}" "lbl_autostart"
-        StrCpy $6 ${SERVICE_DEMAND_START}
-        IntCmp $R5 0 +2
-        StrCpy $6 ${SERVICE_AUTO_START}
-        StrCpy $R5 $6
-      lbl_autostart:
-
-      !insertmacro CALL_GETPARAM $R5 "starttype" "$R5" "lbl_starttype"
-      lbl_starttype:
-
-      !insertmacro CALL_GETPARAM $R6 "path" "n" "lbl_path"
-      lbl_path:
-
-      !insertmacro CALL_GETPARAM $R7 "display" "$2" "lbl_display"
-      lbl_display:
-
-      !insertmacro CALL_GETPARAM $R8 "description" "$2" "lbl_description"
-      lbl_description:
-
-      System::Call 'advapi32::CreateService${APITAG}(i r4, t r2, t R7, i ${SERVICE_ALL_ACCESS}, \
-                                             i R4, i R5, i 0, t R6, n, n, $R1, $R2, $R3) i.r6'
-
-      ; write description of service (SERVICE_CONFIG_DESCRIPTION)
-      System::Call 'advapi32::ChangeServiceConfig2${APITAG}(ir6,i1,*t "$R8")i.R7'
-      strcmp $R7 "error" 0 lbl_descriptioncomplete
-      WriteRegStr HKLM "SYSTEM\CurrentControlSet\Services\$2" "Description" $R8
-      lbl_descriptioncomplete:
-
-      Pop $R8
-      Pop $R7
-      Pop $R6
-      Pop $R5
-      Pop $R4
-      Pop $R3
-      Pop $R2
-      Pop $R1
-      StrCmp $6 0 lbl_done lbl_good
-
-    ; delete service
-    lbl_delete:
-      System::Call 'advapi32::DeleteService(i r5) i.r6'
-      StrCmp $6 0 lbl_done lbl_good
-
-    ; start service
-    lbl_start:
-      System::Call 'advapi32::StartService${APITAG}(i r5, i 0, i 0) i.r6'
-      StrCmp $6 0 lbl_done lbl_good
-
-    ; stop service
-    lbl_stop:
-      Push $R1
-      System::Call '*(i,i,i,i,i,i,i) i.R1'
-      System::Call 'advapi32::ControlService(i r5, i ${SERVICE_CONTROL_STOP}, i $R1) i'
-      System::Free $R1
-      Pop $R1
-      StrCmp $6 0 lbl_done lbl_good
-
-    ; pause service
-    lbl_pause:
-      Push $R1
-      System::Call '*(i,i,i,i,i,i,i) i.R1'
-      System::Call 'advapi32::ControlService(i r5, i ${SERVICE_CONTROL_PAUSE}, i $R1) i'
-      System::Free $R1
-      Pop $R1
-      StrCmp $6 0 lbl_done lbl_good
-
-    ; continue service
-    lbl_continue:
-      Push $R1
-      System::Call '*(i,i,i,i,i,i,i) i.R1'
-      System::Call 'advapi32::ControlService(i r5, i ${SERVICE_CONTROL_CONTINUE}, i $R1) i'
-      System::Free $R1
-      Pop $R1
-      StrCmp $6 0 lbl_done lbl_good
-
-    ; is installed
-    lbl_installed:
-      !insertmacro CALL_GETPARAM $7 "action" "" "lbl_good"
-        StrCpy $3 $7
-        Goto lbl_select
-
-    ; is service running
-    lbl_running:
-      Push $R1
-      System::Call '*(i,i,i,i,i,i,i) i.R1'
-      System::Call 'advapi32::QueryServiceStatus(i r5, i $R1) i'
-      System::Call '*$R1(i, i.r6)'
-      System::Free $R1
-      Pop $R1
-      IntFmt $6 "0x%X" $6
-      StrCmp $6 ${SERVICE_RUNNING} 0 lbl_done
-      !insertmacro CALL_GETPARAM $7 "action" "" "lbl_good"
-        StrCpy $3 $7
-        Goto lbl_select
-
-    lbl_status:
-      Push $R1
-      System::Call '*(i,i,i,i,i,i,i) i.R1'
-      System::Call 'advapi32::QueryServiceStatus(i r5, i $R1) i'
-      System::Call '*$R1(i, i .r6)'
-      System::Free $R1
-      Pop $R1
-      IntFmt $6 "0x%X" $6
-      StrCpy $0 "running"
-      IntCmp $6 ${SERVICE_RUNNING} lbl_done
-      StrCpy $0 "stopped"
-      IntCmp $6 ${SERVICE_STOPPED} lbl_done
-      StrCpy $0 "start_pending"
-      IntCmp $6 ${SERVICE_START_PENDING} lbl_done
-      StrCpy $0 "stop_pending"
-      IntCmp $6 ${SERVICE_STOP_PENDING} lbl_done
-      StrCpy $0 "running"
-      IntCmp $6 ${SERVICE_RUNNING} lbl_done
-      StrCpy $0 "continue_pending"
-      IntCmp $6 ${SERVICE_CONTINUE_PENDING} lbl_done
-      StrCpy $0 "pause_pending"
-      IntCmp $6 ${SERVICE_PAUSE_PENDING} lbl_done
-      StrCpy $0 "paused"
-      IntCmp $6 ${SERVICE_PAUSED} lbl_done
-      StrCpy $0 "unknown"
-      Goto lbl_done
-
-    lbl_processid:
-      Push $R1
-      Push $R2
-      System::Call '*(i,i,i,i,i,i,i,i,i) i.R1'
-      System::Call '*(i 0) i.R2'
-      System::Call "advapi32::QueryServiceStatusEx(i r5, i ${SC_STATUS_PROCESS_INFO}, i $R1, i 36, i $R2) i"
-      System::Call "*$R1(i,i,i,i,i,i,i, i .r0)"
-      System::Free $R2
-      System::Free $R1
-      Pop $R2
-      Pop $R1
-      Goto lbl_done
-
-    lbl_good:
-    StrCpy $0 "true"
-    lbl_done:
-    IntCmp $5 0 +2
-    System::Call 'advapi32::CloseServiceHandle(i r5) n'
-    IntCmp $4 0 +2
-    System::Call 'advapi32::CloseServiceHandle(i r4) n'
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Exch 3
-    Pop $5
-    Pop $7
-    Pop $6
-    Exch $0
-  !macroend
-
-  Function Service
-    !insertmacro FUNC_SERVICE ""
-  FunctionEnd
-
-  Function GetParam
-    !insertmacro FUNC_GETPARAM
-  FunctionEnd
-
-  !undef APITAG
-!endif

email/badfetch-en.tmpl

@@ -1,7 +1,7 @@
 ##
 ## Bad URL Fetch Email template for SABnzbd
 ## This a Cheetah template
-## Documentation: https://sabnzbd.org/wiki/extra/email-templates
+## Documentation: http://sabnzbd.wikidot.com/email-templates
 ##
 ## Newlines and whitespace are significant!
 ##

email/email-en.tmpl

@@ -1,7 +1,7 @@
 ##
 ## Default Email template for SABnzbd
 ## This a Cheetah template
-## Documentation: https://sabnzbd.org/wiki/extra/email-templates
+## Documentation: http://sabnzbd.wikidot.com/email-templates
 ##
 ## Newlines and whitespace are significant!
 ##

email/rss-en.tmpl

@@ -1,7 +1,7 @@
 ##
 ## RSS Email template for SABnzbd
 ## This a Cheetah template
-## Documentation: https://sabnzbd.org/wiki/extra/email-templates
+## Documentation: http://sabnzbd.wikidot.com/email-templates
 ##
 ## Newlines and whitespace are significant!
 ##

interfaces/Config/templates/_inc_footer_uc.tmpl

@@ -12,13 +12,13 @@
                     <div class="modal-body">
                     </div>
                     <div class="modal-footer">
-
+                        <!--#if not $nt#-->
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="show_hidden_folders"> <span>$T('hiddenFolders')</span>
+                                <input type="checkbox" id="show_hidden_folders"> <span>$T('systemFolders')</span>
                             </label>
                         </div>
-
+                        <!--#end if#-->
                         <button type="button" class="btn btn-danger" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span> $T('cancel')</button>
                         <button type="button" class="btn btn-default" id="filebrowser_modal_accept"><span class="glyphicon glyphicon-ok"></span> $T('rss-accept')</button>
                     </div>

interfaces/Config/templates/_inc_header_uc.tmpl

@@ -4,7 +4,7 @@
     #set global $root = '../../'#
 #end if#
 <!DOCTYPE HTML>
-<html lang="$active_lang" #if $rtl#dir="rtl"#end if#>
+<html lang="$active_lang">
 <head>
     <title>
         SABnzbd $T('menu-config')
@@ -34,9 +34,6 @@
     <link rel="stylesheet" type="text/css" href="${root}staticcfg/bootstrap/css/bootstrap.min.css?v=$version" />
     <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/chartist.min.css" />
     <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/style.css?v=$version" />
-    <!--#if $color_scheme not in ('Light', '') #-->
-    <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/${color_scheme}.css?v=$version"/>
-    <!--#end if#-->
 
     <link rel="shortcut icon" href="${root}staticcfg/ico/favicon.ico?v=$version" />
 
@@ -70,7 +67,27 @@
     <script type="text/javascript" src="${root}staticcfg/js/script.js?v=$version"></script>
     <script type="text/javascript">
         // Set default functions for the autocomplete everywhere
-
+        \$.extend(\$.fn.typeahead.defaults, {
+            source: function (query, process) {
+                // If there's no seperator, it must be a relative path
+                if(query.split(folderSeperator).length < 2 && this.\$element.data('initialdir')) {
+                    query  = this.\$element.data('initialdir') + folderSeperator + query;
+                }
+                // Get info from the API
+                return \$.get(folderBrowseUrl + '&compact=1&term=' + query, function (data) {
+                    return process(data);
+                });
+            },
+            updater: function(item) {
+                // Is it a relative path?
+                if(item.indexOf(this.\$element.data('initialdir')) === 0) {
+                    // Remove start
+                    return item.replace(this.\$element.data('initialdir')+folderSeperator, '');
+                }
+                // Full path
+                return item
+            }
+        })
 
         // to top right away
         if(window.location.hash) {
@@ -92,7 +109,7 @@
                 <span class="icon-bar"></span>
             </button>
 
-            <a class="navbar-logo navbar-logo-small" href="${root}" title="$T('Home')" data-placement="bottom">
+            <a class="navbar-logo navbar-logo-small" href="${root}" title="$T('Home')">
                 #include $webdir + "/staticcfg/images/logo-small.svg"#
             </a>
         </div>
@@ -164,7 +181,7 @@
                     </a>
                 </li>
                 <li>
-                    <a href="$help_uri" target="_blank">
+                    <a href="$helpuri$help_uri" target="_blank">
                         <span class="glyphicon glyphicon-question-sign"></span>
                         <strong>$T('menu-help')</strong>
                     </a>

interfaces/Config/templates/config.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Config"#-->
-<!--#set global $help_uri = $confighelpuri + "configure"#-->
+<!--#set global $help_uri="configuration/3.1/configure"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#from sabnzbd.encoding import CODEPAGE#-->
@@ -9,7 +9,7 @@
             <tbody>
                 <tr>
                     <th scope="row">$T('version'): </th>
-                    <td>$version [<a href="https://github.com/sabnzbd/sabnzbd/commit/$build" target="_blank">$build</a>]</td>
+                    <td>$version [$build]</td>
                 </tr>
                 <tr>
                     <th scope="row">$T('uptime'): </th>
@@ -25,31 +25,59 @@
                 </tr>
                 <tr>
                     <th scope="row">$T('pythonVersion'): </th>
-                    <td>$sys.version [$CODEPAGE]</td>
+                    <td>$sys.version[:120] [$CODEPAGE]</td>
                 </tr>
                 <tr>
                     <th scope="row">OpenSSL:</th>
-                    <td>$ssl_version</td>
-                </tr>
-                <!--#if not $windows and not $macos#-->
-                <tr>
-                    <th scope="row">Par2cmdline-turbo:</th>
                     <td>
-                        <!--#if $have_par2_turbo#-->
+                        $ssl_version
+                    </td>
+                </tr>
+                <!--#if not $certificate_validation#-->
+                <tr>
+                    <th scope="row"></th>
+                    <td>
+                        <span class="label label-danger">$T('warning')</span> $T('explain-nosslcontext')
+                    </td>
+                </tr>
+                <!--#end if#-->
+                <!--#if not $nt and not $darwin#-->
+                <tr>
+                    <th scope="row">$T('opt-multicore-par2')</th>
+                    <td>
+                        <!--#if $have_mt_par2#-->
                         <span class="glyphicon glyphicon-ok"></span>
                         <!--#else#-->
-                        <span class="label label-warning">$T('notAvailable')</span> $T('explain-getpar2turbo')<br>
-                        <a href="https://sabnzbd.org/wiki/installation/par2cmdline-turbo" target="_blank">https://sabnzbd.org/wiki/installation/par2cmdline-turbo</a>
+                        <span class="label label-warning">$T('notAvailable')</span> $T('explain-getpar2mt')
+                        <a href="${helpuri}installation/multicore-par2" target="_blank">${helpuri}installation/multicore-par2</a>
                         <!--#end if#-->
                     </td>
                 </tr>
                 <!--#end if#-->
+                <!--#if not $have_sabyenc#-->
+                <tr>
+                    <th scope="row">SABYenc:</th>
+                    <td>
+                        <span class="label label-danger">$T('notAvailable')</span>
+                        <a href="$helpuri$help_uri#no_sabyenc" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+                    </td>
+                </tr>
+                <!--#end if#-->
+                <!--#if not $have_unzip and not $have_7zip #-->
+                <tr>
+                    <th scope="row">$T('opt-enable_unzip'):</th>
+                    <td>
+                        <span class="label label-warning">$T('notAvailable')</span>
+                        <a href="${helpuri}installation/install-off-modules#toc8" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+                    </td>
+                </tr>
+                <!--#end if#-->
                 <!--#if not $have_7zip #-->
                 <tr>
                     <th scope="row">$T('opt-enable_7zip'):</th>
                     <td>
                         <span class="label label-warning">$T('notAvailable')</span>
-                        <a href="https://sabnzbd.org/wiki/installation/install-off-modules#toc8" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+                        <a href="${helpuri}installation/install-off-modules#toc8" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
                     </td>
                 </tr>
                 <!--#end if#-->
@@ -78,8 +106,8 @@
                     <td><a href="https://github.com/sabnzbd/sabnzbd" target="_blank">https://github.com/sabnzbd/sabnzbd</a></td>
                 </tr>
                 <tr>
-                    <th scope="row">$T('menu-live-chat') </th>
-                    <td><a href="https://sabnzbd.org/live-chat/" target="_blank">https://sabnzbd.org/live-chat/</a> (IRC &amp; Discord)</td>
+                    <th scope="row">$T('menu-irc') </th>
+                    <td><a href="irc://irc.synirc.net/#sabnzbd"><i>#sabnzbd</i> on <i>irc.synirc.net</i></a> $T('or') (<a href="http://sabnzbd.org/live-chat/" target="_blank">webchat</a>)</td>
                 </tr>
                 <tr>
                     <th scope="row">$T('menu-issues') </th>
@@ -95,8 +123,8 @@
 </div>
 
 <div class="colmask">
-    <div class="padding">
-        <h5 class="copyright">Copyright &copy; 2007-2025 by The SABnzbd-Team (<a href="https://sabnzbd.org/" target="_blank">sabnzbd.org</a>)</h5>
+    <div class="padding alt">
+        <h5 class="copyright">Copyright &copy; 2007-2020 The SABnzbd Team &lt;<a href="mailto:team@sabnzbd.org">team@sabnzbd.org</a>&gt;</h5>
         <p class="copyright"><small>$T('yourRights')</small></p>
     </div>
 

interfaces/Config/templates/config_cat.tmpl

@@ -1,16 +1,15 @@
 <!--#set global $pane="Categories"#-->
-<!--#set global $help_uri = $confighelpuri + "categories"#-->
+<!--#set global $help_uri="configuration/3.1/categories"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
     <div class="section">
-        <div class="padTable">
-            <a class="main-helplink" href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+        <div class="padTable"> <a class="main-helplink" href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
             <p>$T('explain-catTags2')<br/>$T('explain-catTags')</p>
             <hr>
             <h5 class="darkred"><strong>$T('explain-relFolder'):</strong> <span class="path">$defdir</span></h5>
             <!--#for $cur, $slot in enumerate($slotinfo)#-->
                 <!--#set $cansort = $slot.name != '*' and $slot.name != ''#-->
-                <form action="save" method="post" <!--#if $cansort#-->class="sorting-row"<!--#end if#-->>
+                <form action="save" method="get" <!--#if $cansort#-->class="sorting-row"<!--#end if#-->>
                     <table class="catTable">
                         <!--#if $cur == 0#-->
                         <tr>
@@ -105,29 +104,29 @@
 </div>
 <script type="text/javascript" src="${root}staticcfg/js/jquery-ui.min.js"></script>
 <script type="text/javascript">
-    jQuery(document).ready(function() {
-        jQuery('.delCat').click(function() {
-            var theForm = jQuery(this).closest("form");
+    \$(document).ready(function() {
+        \$('.delCat').click(function() {
+            var theForm = \$(this).closest("form");
             theForm.attr("action", "delete").submit();
         });
 
         // Add autocomplete and file-browser
-        jQuery('.fileBrowserSmall').typeahead({appendTo: 'body'}).fileBrowser();
+        \$('.fileBrowserSmall').typeahead().fileBrowser();
 
         // Make categories sortable
-        jQuery('.padTable').sortable({
+        \$('.padTable').sortable({
             items: '.sorting-row',
             containment: '.colmask',
             axis: 'y',
             update: function(event, ui) {
-                jQuery('.Categories form.sorting-row').each(function(index, elm) {
+                \$('.Categories form.sorting-row').each(function(index, elm) {
                     // Update order of all elements
-                    if(index !== elm.order.value) {
+                    if(index != elm.order.value) {
                         elm.order.value = index
                         // Submit changed order
                         var data = {}
-                        jQuery(elm).extractFormDataTo(data);
-                        jQuery.ajax({
+                        \$(elm).extractFormDataTo(data);
+                        \$.ajax({
                             type: "GET",
                             url: window.location.pathname + 'save',
                             data: data,

interfaces/Config/templates/config_folders.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Folders"#-->
-<!--#set global $help_uri = $confighelpuri + "folders"#-->
+<!--#set global $help_uri="configuration/3.1/folders"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -10,11 +10,10 @@
     </div>
     <form action="saveDirectories" method="post" name="fullform" class="fullform" autocomplete="off">
     <input type="hidden" id="apikey" name="apikey" value="$apikey" />
-    <input type="hidden" name="output" value="json" />
     <input type="hidden" id="ajax" name="ajax" value="1" />
     <div class="section">
         <div class="col2">
-            <h3>$T('userFolders') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('userFolders') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <p>$T('explain-folderConfig')</p>
         </div><!-- /col2 -->
         <div class="col1">
@@ -29,26 +28,15 @@
                 </div>
                 <div class="field-pair advanced-settings">
                     <label class="config" for="download_free">$T('opt-download_free')</label>
-                    <input type="text" name="download_free" id="download_free" value="$download_free" class="smaller_input" />
+                    <input type="text" name="download_free" id="download_free" value="$download_free" class="smaller_input"  />
                     <span class="desc">$T('explain-download_free')</span>
                 </div>
                 <div class="field-pair">
                     <label class="config" for="complete_dir">$T('opt-complete_dir')</label>
                     <input type="text" name="complete_dir" id="complete_dir" value="$complete_dir" data-initialdir="$my_home" />
-                    <a class="btn btn-default" href="${root}config/sorting/"><span class="glyphicon glyphicon-sort-by-alphabet"></span> $T('cmenu-sorting')</a>
-                    <span class="desc">$T('explain-complete_dir') <br/> $T('explain-complete_dir-sorting')</span>
+                    <span class="desc">$T('explain-complete_dir')</span>
                 </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="complete_free">$T('opt-complete_free')</label>
-                    <input type="text" name="complete_free" id="complete_free" value="$complete_free" class="smaller_input" />
-                    <span class="desc">$T('explain-download_free') <br>$T('explain-complete_free')</span>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="fulldisk_autoresume">$T('opt-fulldisk_autoresume')</label>
-                    <input type="checkbox" name="fulldisk_autoresume" id="fulldisk_autoresume" value="1" <!--#if int($fulldisk_autoresume) > 0 then 'checked="checked"' else ""#--> />
-                    <span class="desc">$T('explain-fulldisk_autoresume')</span>
-                </div>
-                <!--#if not $windows#-->
+                <!--#if not $nt#-->
                 <div class="field-pair advanced-settings">
                     <label class="config" for="permissions">$T('opt-permissions')</label>
                     <input type="text" name="permissions" id="permissions" value="$permissions" class="smaller_input" />
@@ -58,7 +46,7 @@
                 <div class="field-pair">
                     <label class="config" for="dirscan_dir">$T('opt-dirscan_dir')</label>
                     <input type="text" name="dirscan_dir" id="dirscan_dir" value="$dirscan_dir" data-initialdir="$my_home" />
-                    <span class="desc">$T('explain-dirscan_dir').replace(".nzb", $file_exts)</span>
+                    <span class="desc">$T('explain-dirscan_dir')</span>
                 </div>
                 <div class="field-pair advanced-settings">
                     <label class="config" for="dirscan_speed">$T('opt-dirscan_speed')</label>
@@ -77,7 +65,7 @@
                 </div>
                 <div class="field-pair advanced-settings">
                     <label class="config" for="password_file">$T('opt-password_file')</label>
-                    <input type="text" name="password_file" id="password_file" value="$password_file" class="fileBrowserField" data-initialdir="$my_home" data-files="1" />
+                    <input type="text" name="password_file" id="password_file" value="$password_file" />
                     <span class="desc">$T('explain-password_file')</span>
                 </div>
                 <div class="field-pair">
@@ -91,7 +79,7 @@
     </div><!-- /section -->
     <div class="section advanced-settings">
         <div class="col2">
-            <h3>$T('systemFolders') <a href="$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('systemFolders') <a href="$helpuri$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <p>$T('explain-folderConfig')</p>
         </div><!-- /col2 -->
         <div class="col1">
@@ -105,15 +93,9 @@
                     <span class="desc">$T('explain-admin_dir1')</span>
                     <span class="desc">$T('explain-admin_dir2')</span>
                 </div>
-                <div class="field-pair">
-                    <label class="config" for="backup_dir">$T('opt-backup_dir')</label>
-                    <input type="text" name="backup_dir" id="backup_dir" value="$backup_dir" data-initialdir="$my_home" />
-                    <span class="desc">$T('explain-backup_dir')</span>
-                </div>
                 <div class="field-pair">
                     <label class="config" for="log_dir">$T('opt-log_dir')</label>
                     <input type="text" name="log_dir" id="log_dir" value="$log_dir" data-initialdir="$my_lcldata" />
-                    <a class="btn btn-default" id="purge_log_files" href="${root}"><span class="glyphicon glyphicon-trash"></span> $T('purge_log_files')</a>
                     <span class="desc">$T('explain-log_dir')</span>
                 </div>
                 <div class="field-pair">
@@ -133,19 +115,7 @@
 <script type="text/javascript">
     jQuery(document).ready(function() {
         // Add autocomplete and file-browser
-        jQuery('.col1 input[name$="_dir"], #password_file').typeahead().fileBrowser();
-
-        jQuery('#purge_log_files').click(function () {
-            if ( confirm("$T('confirm')") ) {
-                $.ajax({
-                    type: "POST",
-                    url: "../../api",
-                    data: {mode: 'config', name: 'purge_log_files', output: 'json', apikey: jQuery('#apikey').val()}
-                })
-            } else {
-                return false;
-            }
-        })
+        \$('.col1 input[name$="_dir"]').typeahead().fileBrowser();
     })
 </script>
 <!--#include $webdir + "/_inc_footer_uc.tmpl"#-->

interfaces/Config/templates/config_general.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="General"#-->
-<!--#set global $help_uri = $confighelpuri + "general"#-->
+<!--#set global $help_uri="configuration/3.1/general"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -9,246 +9,218 @@
         </label>
     </div>
     <form action="saveGeneral" method="post" name="fullform" class="fullform" autocomplete="off">
-        <input type="hidden" id="apikey" name="apikey" value="$apikey" />
-        <input type="hidden" id="ajax" name="ajax" value="1" />
-        <input type="hidden" name="output" value="json" />
-        <div class="section">
-            <div class="col2">
-                <h3>$T('webServer') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-                <p><b>$T('restartRequired')</b></p>
-            </div><!-- /col2 -->
-            <div class="col1">
-                <fieldset>
-                    <div class="field-pair">
-                        <label class="config" for="host">$T('opt-host')</label>
-                        <input type="text" name="host" id="host" value="$host" />
-                        <span class="desc">$T('explain-host')</span>
+    <input type="hidden" id="apikey" name="apikey" value="$apikey" />
+    <input type="hidden" id="ajax" name="ajax" value=1 />
+    <div class="section">
+        <div class="col2">
+            <h3>$T('webServer') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <p><b>$T('restartRequired')</b></p>
+        </div><!-- /col2 -->
+        <div class="col1">
+            <fieldset>
+                <div class="field-pair">
+                    <label class="config" for="host">$T('opt-host')</label>
+                    <input type="text" name="host" id="host" value="$host" />
+                    <span class="desc">$T('explain-host')</span>
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="port">$T('opt-port')</label>
+                    <input type="number" name="port" id="port" value="$port" size="8" data-original="$port" />
+                    <span class="desc">$T('explain-port')</span>
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="enable_https">$T('opt-enable_https')</label>
+                    <input type="checkbox" name="enable_https" id="enable_https" value="1" <!--#if int($enable_https) > 0 then 'checked="checked" data-original="1"' else ""#-->/>
+                    <span class="desc">$T('explain-enable_https')</span>
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="web_dir">$T('opt-web_dir')</label>
+                    <select name="web_dir" id="web_dir">
+                    <!--#for $webline in $web_list#-->
+                        <!--#if $webline.lower() == $web_dir.lower()#-->
+                            <option value="$webline" selected="selected">$webline</option>
+                        <!--#else#-->
+                            <option value="$webline">$webline</option>
+                        <!--#end if#-->
+                    <!--#end for#-->
+                    </select>
+                    <span class="desc">$T('explain-web_dir')&nbsp;&nbsp;<a href="$caller_url">$caller_url</a></span>
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="language">$T('opt-language')</label>
+                    <select name="language" id="language" class="select">
+                    <!--#for $webline in $lang_list#-->
+                        <!--#if $webline[0].lower() == $language.lower()#-->
+                            <option value="$webline[0]" selected="selected">$webline[1]</option>
+                        <!--#else#-->
+                            <option value="$webline[0]">$webline[1]</option>
+                        <!--#end if#-->
+                    <!--#end for#-->
+                    </select>
+                    <span class="desc">$T('explain-language')</span>
+                    <div class="alert alert-info alert-translate">
+                       $T('explain-ask-language') <a href="https://sabnzbd.org/wiki/translate" target="_blank" class="alert-link">https://sabnzbd.org/wiki/translate</a>
                     </div>
-                    <div class="field-pair">
-                        <label class="config" for="port">$T('opt-port')</label>
-                        <input type="number" name="port" id="port" value="$port" size="8" data-original="$port" min="0" max="65535" />
-                        <span class="desc">$T('explain-port')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="enable_https">$T('opt-enable_https')</label>
-                        <input type="checkbox" name="enable_https" id="enable_https" value="1" <!--#if int($enable_https) > 0 then 'checked="checked" data-original="1"' else ""#-->/>
-                        <span class="desc">$T('explain-enable_https')</span>
-                        <span class="desc"><span class="label label-warning">$T('warning').upper()</span> $T('explain-enable_https_warning')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="web_dir">$T('opt-web_dir')</label>
-                        <select name="web_dir" id="web_dir">
-                        <!--#for $webline in $web_list#-->
-                            <!--#if $webline.lower() == $web_dir.lower()#-->
-                                <option value="$webline" selected="selected">$webline</option>
-                            <!--#else#-->
-                                <option value="$webline">$webline</option>
-                            <!--#end if#-->
-                        <!--#end for#-->
-                        </select>
-                        <span class="desc">$T('explain-web_dir')&nbsp;&nbsp;<a href="$caller_url">$caller_url</a></span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="language">$T('opt-language')</label>
-                        <select name="language" id="language" class="select">
-                        <!--#for $webline in $lang_list#-->
-                            <!--#if $webline[0].lower() == $language.lower()#-->
-                                <option value="$webline[0]" selected="selected">$webline[1]</option>
-                            <!--#else#-->
-                                <option value="$webline[0]">$webline[1]</option>
-                            <!--#end if#-->
-                        <!--#end for#-->
-                        </select>
-                        <span class="desc">$T('explain-language')</span>
-                        <div class="alert alert-info alert-translate">
-                           $T('explain-ask-language') <a href="https://sabnzbd.org/wiki/translate" target="_blank" class="alert-link">https://sabnzbd.org/wiki/translate</a>
-                        </div>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <h5 class="darkred nomargin">$T('base-folder'): <span class="path">$my_lcldata</span></h5>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="https_port">$T('opt-https_port')</label>
-                        <input type="number" name="https_port" id="https_port" value="$https_port" size="8" data-original="$https_port" min="0" max="65535" />
-                        <span class="desc">$T('explain-https_port')</span>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="https_cert">$T('opt-https_cert')</label>
-                        <input type="text" name="https_cert" id="https_cert" value="$https_cert" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
-                        <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
-                            <span class="glyphicon glyphicon-repeat"></span>
-                        </button>
-                        <span class="desc">$T('explain-https_cert')</span>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="https_key">$T('opt-https_key')</label>
-                        <input type="text" name="https_key" id="https_key" value="$https_key" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
-                        <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
-                            <span class="glyphicon glyphicon-repeat"></span>
-                        </button>
-                        <span class="desc">$T('explain-https_key')</span>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="https_chain">$T('opt-https_chain')</label>
-                        <input type="text" name="https_chain" id="https_chain" value="$https_chain" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
-                        <span class="desc">$T('explain-https_chain')</span>
-                    </div>
-                    <div class="field-pair">
-                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                        <button class="btn btn-default sabnzbd_restart"><span class="glyphicon glyphicon-refresh"></span> $T('button-restart') SABnzbd</button>
-                    </div>
-                </fieldset>
-            </div>
+                </div>
+                <div class="field-pair advanced-settings">
+                    <h5 class="darkred nomargin">$T('base-folder'): <span class="path">$my_lcldata</span></h5>
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="https_port">$T('opt-https_port')</label>
+                    <input type="number" name="https_port" id="https_port" value="$https_port" size="8" data-original="$https_port" />
+                    <span class="desc">$T('explain-https_port')</span>
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="https_cert">$T('opt-https_cert')</label>
+                    <input type="text" name="https_cert" id="https_cert" value="$https_cert" />
+                    <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
+                        <span class="glyphicon glyphicon-repeat"></span>
+                    </button>
+                    <span class="desc">$T('explain-https_cert')</span>
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="https_key">$T('opt-https_key')</label>
+                    <input type="text" name="https_key" id="https_key" value="$https_key" />
+                    <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
+                        <span class="glyphicon glyphicon-repeat"></span>
+                    </button>
+                    <span class="desc">$T('explain-https_key')</span>
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="https_chain">$T('opt-https_chain')</label>
+                    <input type="text" name="https_chain" id="https_chain" value="$https_chain" />
+                    <span class="desc">$T('explain-https_chain')</span>
+                </div>
+                <div class="field-pair">
+                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                    <button class="btn btn-default sabnzbd_restart"><span class="glyphicon glyphicon-refresh"></span> $T('button-restart') SABnzbd</button>
+                </div>
+            </fieldset>
         </div>
-        <div class="section">
-            <div class="col2">
-                <h3>$T('security') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-                <p><b>$T('restartRequired')</b></p>
-            </div><!-- /col2 -->
-            <div class="col1">
-                <fieldset>
-                    <!-- Tricks to avoid browser auto-fill, fixed on-submit with javascript -->
-                    <div class="field-pair">
-                        <label class="config" for="${pid}_wu">$T('opt-web_username')</label>
-                        <input type="text" name="${pid}_wu" id="${pid}_wu" value="$username" data-hide="username" />
-                        <span class="desc">$T('explain-web_username')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="${pid}_wp">$T('opt-web_password')</label>
-                        <input type="text" name="${pid}_wp" id="${pid}_wp" value="$password" data-hide="password" />
-                        <span class="desc">$T('explain-web_password')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="inet_exposure">$T('opt-inet_exposure')</label>
-                            <select name="inet_exposure" id="inet_exposure" class="select">
-                                <optgroup label="API">
-                                    <option value="0" <!--#if $inet_exposure == 0 then 'selected="selected"' else ""#-->>$T('inet-local')</option>
-                                    <option value="1" <!--#if $inet_exposure == 1 then 'selected="selected"' else ""#-->>$T('inet-nzb')</option>
-                                    <option value="2" <!--#if $inet_exposure == 2 then 'selected="selected"' else ""#-->>$T('inet-api')</option>
-                                    <option value="3" <!--#if $inet_exposure == 3 then 'selected="selected"' else ""#-->>$T('inet-fullapi')</option>
-                                </optgroup>
-                                <optgroup label="$T('inet-fullapi') &amp; $T('opt-web_dir')">
-                                    <option value="4" <!--#if $inet_exposure == 4 then 'selected="selected"' else ""#-->>$T('inet-ui')</option>
-                                    <option value="5" <!--#if $inet_exposure == 5 then 'selected="selected"' else ""#-->>$T('inet-ui') - $T('inet-external_login')</option>
-                                </optgroup>
-                            </select>
-                        <span class="desc">$T('explain-inet_exposure')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="apikey_display">$T('opt-apikey')</label>
-                        <input type="text" id="apikey_display" value="$apikey" readonly />
-                        <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$apikey" ><span class="glyphicon glyphicon-qrcode"></span></button>
-                        <button class="btn btn-default generate_key" id="generate_new_apikey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
-                        <span class="desc">$T('explain-apikey')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="nzbkey">$T('opt-nzbkey')</label>
-                        <input type="text" id="nzbkey" value="$nzb_key" readonly />
-                        <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$nzb_key" ><span class="glyphicon glyphicon-qrcode"></span></button>
-                        <button class="btn btn-default generate_key" id="generate_new_nzbkey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
-                        <span class="desc">$T('explain-nzbkey')</span>
-                    </div>
-                    <div class="field-pair">
-                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    </div>
-                </fieldset>
-            </div><!-- /col1 -->
-        </div><!-- /section -->
-        <div class="section">
-            <div class="col2">
-                <h3>$T('cmenu-switches') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-            </div><!-- /col2 -->
-            <div class="col1">
-                <fieldset>
-                    <div class="field-pair">
-                        <label class="config" for="auto_browser">$T('opt-auto_browser')</label>
-                        <input type="checkbox" name="auto_browser" id="auto_browser" value="1" <!--#if int($auto_browser) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-auto_browser')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="check_new_rel">$T('opt-check_new_rel')</label>
-                        <select name="check_new_rel" id="check_new_rel">
-                            <option value="0" <!--#if $check_new_rel == 0 then 'selected="selected"' else ""#--> >$T('off')</option>
-                            <option value="1" <!--#if $check_new_rel == 1 then 'selected="selected"' else ""#--> >$T('on')</option>
-                            <option value="2" <!--#if $check_new_rel == 2 then 'selected="selected"' else ""#--> >$T('also-test')</option>
+    </div>
+    <div class="section">
+        <div class="col2">
+            <h3>$T('security') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <p><b>$T('restartRequired')</b></p>
+        </div><!-- /col2 -->
+        <div class="col1">
+            <fieldset>
+                <!-- Tricks to avoid browser auto-fill, fixed on-submit with javascript -->
+                <div class="field-pair">
+                    <label class="config" for="${pid}_wu">$T('opt-web_username')</label>
+                    <input type="text" name="${pid}_wu" id="${pid}_wu" value="$username" data-hide="username" />
+                    <span class="desc">$T('explain-web_username')</span>
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="${pid}_wp">$T('opt-web_password')</label>
+                    <input type="text" name="${pid}_wp" id="${pid}_wp" value="$password" data-hide="password" />
+                    <span class="desc">$T('explain-web_password')</span>
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="inet_exposure">$T('opt-inet_exposure')</label>
+                        <select name="inet_exposure" id="inet_exposure" class="select">
+                            <optgroup label="API">
+                                <option value="0" <!--#if $inet_exposure == 0 then 'selected="selected"' else ""#-->>$T('inet-local')</option>
+                                <option value="1" <!--#if $inet_exposure == 1 then 'selected="selected"' else ""#-->>$T('inet-nzb')</option>
+                                <option value="2" <!--#if $inet_exposure == 2 then 'selected="selected"' else ""#-->>$T('inet-api')</option>
+                                <option value="3" <!--#if $inet_exposure == 3 then 'selected="selected"' else ""#-->>$T('inet-fullapi')</option>
+                            </optgroup>
+                            <optgroup label="$T('inet-fullapi') &amp; $T('opt-web_dir')">
+                                <option value="4" <!--#if $inet_exposure == 4 then 'selected="selected"' else ""#-->>$T('inet-ui')</option>
+                                <option value="5" <!--#if $inet_exposure == 5 then 'selected="selected"' else ""#-->>$T('inet-ui') - $T('inet-external_login')</option>
+                            </optgroup>
                         </select>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="enable_https_verification">$T('opt-enable_https_verification')</label>
-                        <input type="checkbox" name="enable_https_verification" id="enable_https_verification" value="1" <!--#if int($enable_https_verification) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-enable_https_verification')</span>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="socks5_proxy_url">$T('opt-socks5_proxy_url')</label>
-                        <input type="text" name="socks5_proxy_url" id="socks5_proxy_url" value="$socks5_proxy_url" autocomplete="off" placeholder="socks5://user:pass@hostname:port" />
-                        <span class="desc">$T('explain-socks5_proxy_url') <br/>$T('readwiki')</span>
-                    </div>
-                    <div class="field-pair">
-                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    </div>
-                </fieldset>
-            </div><!-- /col1 -->
-        </div><!-- /section -->
-        <div class="section">
-            <div class="col2">
-                <h3>$T('tuning') <a href="$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-            </div><!-- /col2 -->
-            <div class="col1">
-                <fieldset>
-                    <div class="field-pair value-and-select">
-                        <label class="config" for="bandwidth_max_value">$T('opt-bandwidth_max')</label>
-                        <input type="number" name="bandwidth_max_value" id="bandwidth_max_value" class="smaller_input" />
-                        <select name="bandwidth_max_dropdown" id="bandwidth_max_dropdown">
-                            <option value="">B/s</option>
-                            <option value="K">KB/s</option>
-                            <option value="M" selected>MB/s</option>
-                        </select>
-                        <input type="hidden" name="bandwidth_max" id="bandwidth_max" value="$bandwidth_max" />
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="bandwidth_perc">$T('opt-bandwidth_perc')</label>
-                        <input type="number" name="bandwidth_perc" id="bandwidth_perc" value="$bandwidth_perc" step="10" min="0" max="100"/>
-                        <span class="desc">$T('explain-bandwidth_perc')</span>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="cache_limit">$T('opt-cache_limitstr')</label>
-                        <input type="text" name="cache_limit" id="cache_limit" value="$cache_limit" class="smaller_input" />
-                        <span class="desc">$T('explain-cache_limitstr').replace("64M", "256M").replace("128M", "512M")</span>
-                    </div>
-                    <div class="field-pair">
-                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    </div>
-                </fieldset>
-            </div><!-- /col1 -->
-        </div><!-- /section -->
-    </form>
+                    <span class="desc">$T('explain-inet_exposure').replace('. ','.<br><span class="label label-warning">'+$T('warning').upper()+'</span> ')</span>
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="local_ranges">$T('opt-local_ranges')</label>
+                    <input type="text" name="local_ranges" id="local_ranges" value="$local_ranges" />
+                    <span class="desc">$T('explain-local_ranges')</span>
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="apikey_display">$T('opt-apikey')</label>
+                    <input type="text" id="apikey_display" class="fileBrowserField" value="$apikey" readonly />
+                    <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$apikey" ><span class="glyphicon glyphicon-qrcode"></span></button>
+                    <button class="btn btn-default generate_key" id="generate_new_apikey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
+                    <span class="desc">$T('explain-apikey')</span>
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="nzbkey">$T('opt-nzbkey')</label>
+                    <input type="text" id="nzbkey" class="fileBrowserField" value="$nzb_key" readonly />
+                    <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$nzb_key" ><span class="glyphicon glyphicon-qrcode"></span></button>
+                    <button class="btn btn-default generate_key" id="generate_new_nzbkey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
+                    <span class="desc">$T('explain-nzbkey')</span>
+                </div>
+                <div class="field-pair">
+                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                </div>
+            </fieldset>
+        </div><!-- /col1 -->
+    </div><!-- /section -->
+    <div class="section">
+        <div class="col2">
+            <h3>$T('cmenu-switches') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+        </div><!-- /col2 -->
+        <div class="col1">
+            <fieldset>
+                <div class="field-pair">
+                    <label class="config" for="auto_browser">$T('opt-auto_browser')</label>
+                    <input type="checkbox" name="auto_browser" id="auto_browser" value="1" <!--#if int($auto_browser) > 0 then 'checked="checked"' else ""#--> />
+                    <span class="desc">$T('explain-auto_browser')</span>
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="check_new_rel">$T('opt-check_new_rel')</label>
+                    <select name="check_new_rel" id="check_new_rel">
+                        <option value="0" <!--#if $check_new_rel == 0 then 'selected="selected"' else ""#--> >$T('off')</option>
+                        <option value="1" <!--#if $check_new_rel == 1 then 'selected="selected"' else ""#--> >$T('on')</option>
+                        <option value="2" <!--#if $check_new_rel == 2 then 'selected="selected"' else ""#--> >$T('also-test')</option>
+                    </select>
+                    <span class="desc">$T('explain-check_new_rel')</span>
+                </div>
+                <div class="field-pair advanced-settings <!--#if int($certificate_validation) == 0 then "disabled" else ""#-->">
+                    <label class="config" for="enable_https_verification">$T('opt-enable_https_verification')</label>
+                    <input type="checkbox" name="enable_https_verification" id="enable_https_verification" value="1" <!--#if int($enable_https_verification) > 0 then 'checked="checked"' else ""#--> <!--#if int($certificate_validation) == 0 then "disabled=\"disabled\"" else ""#--> />
+                    <span class="desc">$T('explain-enable_https_verification')</span>
+                </div>
+                <div class="field-pair">
+                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                </div>
+            </fieldset>
+        </div><!-- /col1 -->
+    </div><!-- /section -->
+    <div class="section">
+        <div class="col2">
+            <h3>$T('tuning') <a href="$helpuri$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+        </div><!-- /col2 -->
+        <div class="col1">
+            <fieldset>
+                <div class="field-pair value-and-select">
+                    <label class="config" for="bandwidth_max_value">$T('opt-bandwidth_max')</label>
+                    <input type="number" name="bandwidth_max_value" id="bandwidth_max_value" class="smaller_input" />
+                    <select name="bandwidth_max_dropdown" id="bandwidth_max_dropdown">
+                        <option value="">B/s</option>
+                        <option value="K">KB/s</option>
+                        <option value="M" selected>MB/s</option>
+                    </select>
+                    <input type="hidden" name="bandwidth_max" id="bandwidth_max" value="$bandwidth_max" />
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="bandwidth_perc">$T('opt-bandwidth_perc')</label>
+                    <input type="number" name="bandwidth_perc" id="bandwidth_perc" value="$bandwidth_perc" step="10" min="0" max="100"/>
+                    <span class="desc">$T('explain-bandwidth_perc')</span>
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="cache_limit">$T('opt-cache_limitstr')</label>
+                    <input type="text" name="cache_limit" id="cache_limit" value="$cache_limit" class="smaller_input" />
+                    <span class="desc">$T('explain-cache_limitstr').replace("64M", "256M").replace("128M", "512M")</span>
+                </div>
+                <div class="field-pair">
+                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                </div>
+            </fieldset>
+        </div><!-- /col1 -->
+    </div><!-- /section -->
 
-    <form action="uploadConfig" method="post" name="fullform" class="fullform" autocomplete="off" enctype="multipart/form-data">
-        <input type="hidden" name="apikey" value="$apikey" />
-        <input type="hidden" name="ajax" value="1" />
-        <input type="hidden" name="output" value="json" />
-        <div class="section">
-            <div class="col2">
-                <h3>$T('backup') <a href="$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-            </div><!-- /col2 -->
-            <div class="col1">
-                <fieldset>
-                    <div class="field-pair">
-                        <label class="config" for="create_backup">$T('create-backup')</label>
-                        <span class="desc"><button class="btn btn-default createBackup" type="button" id="create_backup"><span class="glyphicon glyphicon glyphicon-import"></span> $T('create-backup')</button></span>
-                        <span class="desc">$T('explain-create_backup')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="config_backup_file">$T('restore-backup')</label>
-                        <input type="file" accept=".zip" name="config_backup_file" id="config_backup_file" />
-                        <span class="desc">$T('restartRequired')</span>
-                    </div>
-                    <div class="field-pair">
-                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-open"></span> $T('restore-backup')</button>
-                    </div>
-                </fieldset>
-            </div>
-        </div>
     </form>
 </div><!-- /colmask -->
 
@@ -263,102 +235,98 @@
 </div>
 
 <script type="text/javascript">
-jQuery(document).ready(function(){
+\$(document).ready(function(){
     // Show the message about translating when it's non-English
     function hideOrShowTranslate() {
-        if(jQuery('#language').val() === 'en') {
-            jQuery('.alert-translate').hide()
+        if(\$('#language').val() == 'en') {
+            \$('.alert-translate').hide()
         } else {
-            jQuery('.alert-translate').show()
+            \$('.alert-translate').show()
         }
     }
-    jQuery('#language').on('change', function() {
+    \$('#language').on('change', function() {
         // Show message
         hideOrShowTranslate()
         // Re-load page on submit
-        jQuery('.fullform').submit(function() {
+        \$('.fullform').submit(function() {
             // Skip the fancy stuff, just submit
             this.submit()
         })
-        // No JSON response
-        jQuery('#ajax').val('')
+        // No JSON reponse
+        \$('#ajax').val('')
     })
     hideOrShowTranslate()
 
     // Highlight in case user is not safe
     // So when exposed to internet and no password, no external limit or no username/password
-    var safeCheck = jQuery('#host, #inet_exposure, #${pid}_wu, #${pid}_wp')
+    var safeCheck = \$('#host, #local_ranges, #inet_exposure, #${pid}_wu, #${pid}_wp')
     function checkSafety() {
-        if(jQuery('#host').val() !== 'localhost' && jQuery('#host').val() !== '127.0.0.1') {
+        if(\$('#host').val() != 'localhost' && \$('#host').val() != '127.0.0.1') {
             // No limitation on local-network
-            if(jQuery('#inet_exposure').val() > 3) {
+            if(!\$('#local_ranges').val() || \$('#inet_exposure').val() > 3) {
                 // And no username and password?
-                if(!jQuery('#${pid}_wu').val() || !jQuery('#${pid}_wp').val()) {
+                if(!\$('#${pid}_wu').val() || !\$('#${pid}_wp').val()) {
                     // Add warning icon if not there already
-                    if(!jQuery('.host-warning').length) {
+                    if(!\$('.host-warning').length) {
                         safeCheck.after('<span class="glyphicon glyphicon-alert host-warning"></span>')
-                        jQuery('.host-warning').tooltip({'title': '$T('checkSafety')'})
-                        safeCheck.addClass('host-warning-highlight')
+                        \$('.host-warning').tooltip({'title': '$T('checkSafety')'})
                     }
                     return
                 }
             }
         }
         // Remove warnings
-        jQuery('.host-warning').remove()
+        \$('.host-warning').remove()
         safeCheck.removeClass('host-warning-highlight')
     }
     checkSafety()
     safeCheck.on('change', checkSafety)
 
     // Click functions
-    jQuery('#apikey, #nzbkey').click(function () { jQuery(this).select() });
+    \$('#apikey, #nzbkey').click(function () { \$(this).select() });
 
-    jQuery('#generate_new_apikey').click(function () {
-      if (confirm("$T('confirm')")) {
+    \$('#generate_new_apikey').click(function () {
+      if (confirm("$T('Plush-confirm')")) {
         $.ajax({
           type: "POST",
           url: "../../api",
-          data: {mode:'config', name:'set_apikey', apikey: jQuery('#apikey').val()},
+          data: {mode:'config', name:'set_apikey', apikey: \$('#apikey').val()},
           success: function(msg){
-            jQuery('#apikey').val(msg);
+            \$('#apikey').val(msg);
             document.location = document.location;
           }
         });
       }
     });
-    jQuery('#generate_new_nzbkey').click(function () {
-      if (confirm("$T('confirm')")) {
+    \$('#generate_new_nzbkey').click(function () {
+      if (confirm("$T('Plush-confirm')")) {
         $.ajax({
           type: "POST",
           url: "../../api",
-          data: { mode:'config', name:'set_nzbkey', apikey: jQuery('#apikey').val() },
+          data: { mode:'config', name:'set_nzbkey', apikey: \$('#apikey').val() },
           success: function(msg){
-            jQuery('#nzbkey').val(msg);
+            \$('#nzbkey').val(msg);
             document.location = document.location;
           }
         });
       }
     });
 
-    // Add autocomplete and file-browser
-    jQuery('.fileBrowserField').typeahead().fileBrowser();
-
-    jQuery('.show_qrcode').click(function (e) {
+    \$('.show_qrcode').click(function (e) {
         // Show in modal
-        jQuery('#modal_qr .modal-dialog').width(330)
-        jQuery('#modal_qr .modal-body').html('').qrcode({
+        \$('#modal_qr .modal-dialog').width(330)
+        \$('#modal_qr .modal-body').html('').qrcode({
             "size": 280,
             "color": "#3a3",
-            "text": jQuery(this).attr('rel')
+            "text": \$(this).attr('rel')
         });
-        jQuery('#modal_qr').modal('show');
+        \$('#modal_qr').modal('show');
 
         // No save on this button click
         e.preventDefault();
     });
 
-    jQuery('.generate_cert').click(function(e) {
+    \$('.generate_cert').click(function(e) {
         if(!confirm('$T('explain-new-cert')')) {
             return;
         }
@@ -367,7 +335,7 @@ jQuery(document).ready(function(){
         $.ajax({
             type: "POST",
             url: "../../api",
-            data: { mode: 'config', name: 'regenerate_certs', apikey: jQuery('#apikey').val() },
+            data: { mode: 'config', name: 'regenerate_certs', apikey: \$('#apikey').val() },
             success: function(msg) {
                 do_restart()
             }
@@ -377,44 +345,30 @@ jQuery(document).ready(function(){
     })
 
     // Only allow re-generate if default certs
-    if(jQuery('#https_cert').val() !== '$def_https_cert_file') {
-        jQuery('.generate_cert').attr('disabled', 'disabled')
+    if(\$('#https_cert').val() != 'server.cert') {
+        \$('.generate_cert').attr('disabled', 'disabled')
     }
 
     // Parse the text
-    var bandwidthLimit = jQuery('#bandwidth_max').val()
+    var bandwidthLimit = \$('#bandwidth_max').val()
     if(bandwidthLimit) {
         var bandwithLimitNumber = parseFloat(bandwidthLimit)
         var bandwithLimitText = bandwidthLimit.replace(/[^a-zA-Z]+/g, '');
         if(bandwithLimitNumber) {
-            jQuery('#bandwidth_max_value').val(bandwithLimitNumber)
-            jQuery('#bandwidth_max_dropdown').val(bandwithLimitText)
+            \$('#bandwidth_max_value').val(bandwithLimitNumber)
+            \$('#bandwidth_max_dropdown').val(bandwithLimitText)
         }
     }
 
     // Update the value
-    jQuery('#bandwidth_max_value, #bandwidth_max_dropdown').on('change', function() {
-        if(jQuery('#bandwidth_max_value').val()) {
-            jQuery('#bandwidth_max').val(jQuery('#bandwidth_max_value').val() + jQuery('#bandwidth_max_dropdown').val())
+    \$('#bandwidth_max_value, #bandwidth_max_dropdown').on('change', function() {
+        if(\$('#bandwidth_max_value').val()) {
+            \$('#bandwidth_max').val(\$('#bandwidth_max_value').val() + \$('#bandwidth_max_dropdown').val())
         } else {
-            jQuery('#bandwidth_max').val('')
+            \$('#bandwidth_max').val('')
         }
     })
 
-    jQuery('#create_backup').click(function () {
-        $.ajax({
-          type: "POST",
-          url: "../../api",
-          data: {mode:'config', name:'create_backup', output:'json', apikey: jQuery('#apikey').val()},
-          success: function(data) {
-              if(data.value.result) {
-                  alert("$T('backup'):\n" + data.value.message)
-              } else {
-                  alert("$T('button-failed')")
-              }
-          }
-        });
-    });
 });
 </script>
 

interfaces/Config/templates/config_notify.tmpl

@@ -1,49 +1,44 @@
 <!--#set global $pane="Email"#-->
-<!--#set global $help_uri = $confighelpuri + "notifications"#-->
+<!--#set global $help_uri="configuration/3.1/notifications"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
-<!--#import apprise#-->
-
 <!--#def show_notify_checkboxes($section_label)#-->
     <!--#for $type in $notify_types#-->
         <div class="field-pair">
             <label class="config wide" for="${section_label}_prio_$type">
                 $T($notify_types[$type]).replace('/', ' / ')
             </label>
-            <input type="checkbox" name="${section_label}_prio_$type" id="${section_label}_prio_$type" value="1" <!--#if $getVar($section_label + '_prio_' + $type) then 'checked="checked"' else ""#--> />
+            <input type="checkbox" name="${section_label}_prio_$type" id="${section_label}_prio_$type" value="1" <!--#if int($getVar($section_label + '_prio_' + $type)) > 0 then 'checked="checked"' else ""#--> />
         </div>
     <!--#end for#-->
 <!--#end def#-->
 
 <!--#def show_cat_box($section_label)#-->
-    <div class="col2-cats" <!--#if $getVar($section_label + '_enable') then '' else 'style="display:none"'#-->>
+    <div class="col2-cats" <!--#if int($getVar($section_label + '_enable')) > 0 then '' else 'style="display:none"'#-->>
         <hr>
         <b>$T('affectedCat')</b><br/>
-        <select name="${section_label}_cats" multiple="multiple" class="multiple_cats" size="$len($categories)">
+        <select name="${section_label}_cats" multiple="multiple" class="multiple_cats">
             <!--#for $ct in $categories#-->
                 <option value="$ct" <!--#if $ct in $getVar($section_label + '_cats') then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
             <!--#end for#-->
         </select>
-        <p>$T('defaultNotifiesAll')</p>
     </div>
 <!--#end def#-->
 
 <div class="colmask">
-    <form action="saveNotify" method="post" name="fullform" class="fullform" autocomplete="off">
+    <form action="saveEmail" method="post" name="fullform" class="fullform" autocomplete="off">
     <input type="hidden" id="apikey" name="apikey" value="$apikey" />
-    <input type="hidden" name="output" value="json" />
     <input type="hidden" id="ajax" name="ajax" value="1" />
     <div class="section" id="email">
         <div class="col2">
-            <h3>$T('cmenu-email') <a href="$help_uri#toc0" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('cmenu-email') <a href="$helpuri$help_uri#toc0" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <div class="col2-cats" <!--#if int($email_endjob) > 0 then '' else 'style="display:none"'#-->>
                 <b>$T('affectedCat')</b><br/>
-                <select name="email_cats" multiple="multiple" class="multiple_cats" size="$len($categories)">
+                <select name="email_cats" multiple="multiple" class="multiple_cats">
                     <!--#for $ct in $categories#-->
                         <option value="$ct" <!--#if $ct in $email_cats then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
                     <!--#end for#-->
                 </select>
-                <p>$T('defaultNotifiesAll')</p>
             </div>
         </div>
         <div class="col1">
@@ -58,12 +53,12 @@
                 </div>
                 <div class="field-pair">
                     <label class="config" for="email_full">$T('opt-email_full')</label>
-                    <input type="checkbox" name="email_full" id="email_full" value="1" <!--#if $email_full then 'checked="checked"' else ""#--> />
+                    <input type="checkbox" name="email_full" id="email_full" value="1" <!--#if int($email_full) > 0 then 'checked="checked"' else ""#--> />
                     <span class="desc">$T('explain-email_full')</span>
                 </div>
                 <div class="field-pair">
                     <label class="config" for="email_rss">$T('opt-email_rss')</label>
-                    <input type="checkbox" name="email_rss" id="email_rss" value="1" <!--#if $email_rss then 'checked="checked"' else ""#--> />
+                    <input type="checkbox" name="email_rss" id="email_rss" value="1" <!--#if int($email_rss) > 0 then 'checked="checked"' else ""#--> />
                     <span class="desc">$T('explain-email_rss')</span>
                 </div>
                 <div class="field-pair">
@@ -107,12 +102,12 @@
             <h3>$T('section-NC')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="ncenter_enable" id="ncenter_enable" value="1" <!--#if $ncenter_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="ncenter_enable" id="ncenter_enable" value="1" <!--#if int($ncenter_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="ncenter_enable"> $T('opt-ncenter_enable')</label></td>
                 </tr>
             </table>
         </div>
-        <div class="col1" <!--#if $ncenter_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($ncenter_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('ncenter')
                 <div class="field-pair no-field-pair-bg">
@@ -126,19 +121,19 @@
        </div>
     </div>
     <!--#end if#-->
-    <!--#if $windows#-->
+    <!--#if $nt#-->
     <div class="section">
         <div class="col2">
             <h3>$T('section-AC')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="acenter_enable" id="acenter_enable" value="1" <!--#if $acenter_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="acenter_enable" id="acenter_enable" value="1" <!--#if int($acenter_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="acenter_enable"> $T('opt-acenter_enable')</label></td>
                 </tr>
             </table>
             $show_cat_box('acenter')
         </div>
-        <div class="col1" <!--#if $acenter_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($acenter_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('acenter')
                 <div class="field-pair no-field-pair-bg">
@@ -155,16 +150,16 @@
     <!--#if $have_ntfosd#-->
     <div class="section">
         <div class="col2">
-            <h3>$T('section-OSD') <a href="$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('section-OSD') <a href="$helpuri$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="ntfosd_enable" id="ntfosd_enable" value="1" <!--#if $ntfosd_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="ntfosd_enable" id="ntfosd_enable" value="1" <!--#if int($ntfosd_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="ntfosd_enable"> $T('opt-ntfosd_enable')</label></td>
                 </tr>
             </table>
             $show_cat_box('ntfosd')
         </div>
-        <div class="col1" <!--#if $ntfosd_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($ntfosd_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('ntfosd')
                 <div class="field-pair no-field-pair-bg">
@@ -178,64 +173,19 @@
        </div>
     </div>
     <!--#end if#-->
-    <div class="section" id="apprise">
-        <div class="col2">
-            <h3>Apprise <a href="$help_uri#apprise" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-            <table>
-                <tr>
-                    <td><input type="checkbox" name="apprise_enable" id="apprise_enable" value="1" <!--#if $apprise_enable then 'checked="checked"' else ""#--> /></td>
-                    <td><label for="apprise_enable"> $T('opt-apprise_enable')</label></td>
-                </tr>
-            </table>
-            <p>$T('explain-apprise_enable')</p>
-            <p>$T('version'): ${apprise.__version__}</p>
-
-            $show_cat_box('apprise')
-        </div>
-        <div class="col1" <!--#if $apprise_enable then '' else 'style="display:none"'#-->>
-            <fieldset>
-                <div class="field-pair">
-                    <label class="config" for="apprise_urls">$T('opt-apprise_urls')</label>
-                    <input type="text" name="apprise_urls" id="apprise_urls" value="$apprise_urls" />
-                    <span class="desc">$T('explain-apprise_urls')</span>
-                </div>
-                <div class="field-pair">
-                    <span class="desc">$T('explain-apprise_extra_urls')</span>
-                </div>
-                <!--#set $section_label = 'apprise'#-->
-                <!--#for $type in $notify_types#-->
-                    <div class="field-pair">
-                        <label class="config" for="${section_label}_target_${type}">
-                            $T($notify_types[$type]).replace('/', ' / ')
-                        </label>
-                        <input type="checkbox" name="${section_label}_target_${type}_enable" id="${section_label}_target_${type}_enable" value="1" <!--#if $getVar($section_label + '_target_' + $type + '_enable') then 'checked="checked"' else ""#--> />
-                        <input type="text" name="${section_label}_target_${type}" id="${section_label}_target_${type}" value="$getVar($section_label + '_target_' + $type)"  placeholder="$T('opt-apprise_urls')" />
-                    </div>
-                <!--#end for#-->
-
-                <div class="field-pair no-field-pair-bg">
-                   <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                   <button class="btn btn-default" type="button" id="test_apprise"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
-                </div>
-                <div class="field-pair result-box">
-                    <div class="alert"></div>
-                </div>
-           </fieldset>
-       </div>
-    </div>
     <div class="section" id="nscript">
         <div class="col2">
-            <h3>$T('section-NScript') <a href="$help_uri#nscript" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('section-NScript')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="nscript_enable" id="nscript_enable" value="1" <!--#if $nscript_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="nscript_enable" id="nscript_enable" value="1" <!--#if int($nscript_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="nscript_enable"> $T('opt-nscript_enable')</label></td>
                 </tr>
             </table>
-            <em>$T('explain-nscript_enable')</em><br><a href="$help_uri#nscript" target="_blank">$T('readwiki')</a>
+            <em>$T('explain-nscript_enable')</em><br><a href="$helpuri$help_uri#nscript" target="_blank">$T('readwiki')</a>
             $show_cat_box('nscript')
         </div>
-        <div class="col1" <!--#if $nscript_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($nscript_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
                     <label class="config" for="nscript_script">$T('opt-nscript_script')</label>
@@ -249,7 +199,7 @@
                 <div class="field-pair">
                     <label class="config" for="nscript_parameters">$T('opt-nscript_parameters')</label>
                     <input type="text" name="nscript_parameters" id="nscript_parameters" value="$nscript_parameters" />
-                    <span class="desc">$T('Optional') - $T('readwiki')</span>
+                    <span class="desc">$T('Optional') - $T('explain-nscript_parameters')</span>
                 </div>
                 $show_notify_checkboxes('nscript')
                 <div class="field-pair no-field-pair-bg">
@@ -267,14 +217,14 @@
             <h3>$T('section-Prowl')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="prowl_enable" id="prowl_enable" value="1" <!--#if $prowl_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="prowl_enable" id="prowl_enable" value="1" <!--#if int($prowl_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="prowl_enable"> $T('opt-prowl_enable')</label></td>
                 </tr>
             </table>
             <em>$T('explain-prowl_enable')</em>
             $show_cat_box('prowl')
         </div>
-        <div class="col1" <!--#if $prowl_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($prowl_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
                     <label class="config" for="prowl_apikey">$T('opt-prowl_apikey')</label>
@@ -313,14 +263,14 @@
             <h3>$T('section-Pushover')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="pushover_enable" id="pushover_enable" value="1" <!--#if $pushover_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="pushover_enable" id="pushover_enable" value="1" <!--#if int($pushover_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="pushover_enable"> $T('opt-pushover_enable')</label></td>
                 </tr>
             </table>
             <em>$T('explain-pushover_enable')</em>
             $show_cat_box('pushover')
         </div>
-        <div class="col1" <!--#if $pushover_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($pushover_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
                     <label class="config" for="pushover_token">$T('opt-pushover_token')</label>
@@ -378,14 +328,14 @@
             <h3>$T('section-Pushbullet')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="pushbullet_enable" id="pushbullet_enable" value="1" <!--#if $pushbullet_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="pushbullet_enable" id="pushbullet_enable" value="1" <!--#if int($pushbullet_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="pushbullet_enable"> $T('opt-pushbullet_enable')</label></td>
                 </tr>
             </table>
             <em>$T('explain-pushbullet_enable')</em>
             $show_cat_box('pushbullet')
         </div>
-        <div class="col1" <!--#if $pushbullet_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($pushbullet_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
                     <label class="config" for="pushbullet_apikey">$T('opt-pushbullet_apikey')</label>
@@ -414,24 +364,24 @@
 </div><!-- /colmask -->
 
 <script type="text/javascript">
-jQuery(document).ready(function(){
+\$(document).ready(function(){
     // Expand on enable
-    jQuery('.col2 input[name$="enable"]').change(function() {
+    \$('.col2 input[name$="enable"]').change(function() {
         if(this.checked) {
-            jQuery(this).parents('.section').find('.col1').show()
-            jQuery(this).parents('.col2').find('.col2-cats').show()
+            \$(this).parents('.section').find('.col1').show()
+            \$(this).parents('.col2').find('.col2-cats').show()
         } else {
-            jQuery(this).parents('.section').find('.col1').hide()
-            jQuery(this).parents('.col2').find('.col2-cats').hide()
+            \$(this).parents('.section').find('.col1').hide()
+            \$(this).parents('.col2').find('.col2-cats').hide()
         }
-        jQuery('form').submit()
+        \$('form').submit()
         addRowColor()
     })
-    jQuery('#email_endjob').change(function() {
-        if(jQuery(this).val() > 0) {
-            jQuery(this).parents('.section').find('.col2-cats').show()
+    \$('#email_endjob').change(function() {
+        if(\$(this).val() > 0) {
+            \$(this).parents('.section').find('.col2-cats').show()
         } else {
-            jQuery(this).parents('.section').find('.col2-cats').hide()
+            \$(this).parents('.section').find('.col2-cats').hide()
         }
     })
 
@@ -440,27 +390,27 @@ jQuery(document).ready(function(){
     **/
     function testNotification(buttonObj) {
         // Confirm?
-        if(jQuery(buttonObj).attr('rel')) {
-            if(!confirm(jQuery(buttonObj).attr('rel'))) return false;
+        if(\$(buttonObj).attr('rel')) {
+            if(!confirm(\$(buttonObj).attr('rel'))) return false;
         }
         // Disable button and get the data
-        jQuery(buttonObj).attr("disabled", "disabled")
-        jQuery(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
+        \$(buttonObj).attr("disabled", "disabled")
+        \$(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
         var data = { mode: buttonObj.id, apikey: '$apikey', output: 'json' };
-        jQuery(buttonObj).parents('.section').extractFormDataTo(data);
+        \$(buttonObj).parents('.section').extractFormDataTo(data);
 
         // Clear up the box
-        resultBox = jQuery(buttonObj).parents('.section').find('.result-box .alert');
+        resultBox = \$(buttonObj).parents('.section').find('.result-box .alert');
 
         // Get the request
-        jQuery.ajax({
+        \$.ajax({
             type: "GET",
             url: "../../api",
             data: data
         }).then(function(data) {
             // Remove disabled and make the box
-            jQuery(buttonObj).removeAttr("disabled")
-            jQuery(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
+            \$(buttonObj).removeAttr("disabled")
+            \$(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
             resultBox.removeClass('alert-success alert-danger').show()
             if(data.status) {
                 resultBox.addClass('alert-success')
@@ -473,7 +423,7 @@ jQuery(document).ready(function(){
             }
         })
     }
-    jQuery('#test_email, #test_notif, #test_windows, #test_apprise, #test_pushbullet, #test_pushover, #test_prowl, #test_osd, #test_nscript').click(function () {
+    \$('#test_email, #test_notif, #test_windows, #test_pushbullet, #test_pushover, #test_prowl, #test_osd, #test_nscript').click(function () {
         testNotification(this)
     })
 });

interfaces/Config/templates/config_rss.tmpl

@@ -1,30 +1,29 @@
 <!--#set global $pane="RSS"#-->
-<!--#set global $help_uri = $confighelpuri + "rss"#-->
+<!--#set global $help_uri="configuration/3.1/rss"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
-<!--#import html#-->
 <div class="colmask">
     <!--#if not $active_feed#-->
     <div class="section">
         <div class="padTable">
-            <a class="main-helplink" href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+            <a class="main-helplink" href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
             <p>$T('explain-RSS')</p>
             <form action="add_rss_feed" method="post" autocomplete="off">
                 <input type="hidden" name="apikey" value="$apikey" />
-                <table class="catTable addRssTable">
+                <table class="catTable">
                     <tr>
                         <th>&nbsp;</th>
                         <th>$T('name')</th>
-                        <th>$T('feed') URLs</th>
+                        <th>$T('feed') URL</th>
                         <th>&nbsp;</th>
                     </tr>
                     <tr class="even">
                         <td>
                             <input type="checkbox" name="enable" value="1" checked />
                         </td>
-                        <td class="new-feed-title">
-                            <input type="text" name="feed" value="$feed" />
+                        <td>
+                            <input type="text" name="feed" class="smaller_input" value="$feed" />
                         </td>
-                        <td class="new-feed-url">
+                        <td>
                             <input type="text" name="uri" placeholder="$T('addMultipleFeeds')" />
                         </td>
                         <td class="nowrap">
@@ -46,21 +45,20 @@
                         <!--#set $odd = False#-->
                         <!--#for $feed_item in $feeds#-->
                             <!--#set $odd = not $odd#-->
-                            <!--#set $feed_item_html = html.escape($feed_item)#-->
                             <tr class="data-row <!--#if $odd then " alt " else " "#-->">
                                 <td class="chk">
-                                    <input type="checkbox" class="toggleFeedCheckbox" name="enable" value="1" <!--#if int($rss[$feed_item]['enable']) !=0 then 'checked="checked"' else ""#--> rel="$feed_item_html" />
+                                    <input type="checkbox" class="toggleFeedCheckbox" name="enable" value="1" <!--#if int($rss[$feed_item]['enable']) !=0 then 'checked="checked"' else ""#--> rel="$feed_item" />
                                 </td>
                                 <td class="title">
                                     <a href="?feed=$rss[$feed_item]['link']" class="subscription-title path feed <!--#if int($rss[$feed_item]['enable']) != 0 then 'feed_enabled' else 'feed_disabled'#-->">
-                                         $feed_item_html
+                                         $feed_item
                                     </a>
                                 </td>
                                 <td class="controls">
-                                    <button type="button" class="btn btn-default testFeed" rel="$feed_item_html"><span class="glyphicon glyphicon-sort"></span> $T('button-preFeed')</button>
+                                    <button type="button" class="btn btn-default testFeed" rel="$feed_item"><span class="glyphicon glyphicon-sort"></span> $T('button-preFeed')</button>
                                     <input type="hidden" name="uri" value="$rss[$feed_item]['uris']" />
-                                    <button type="button" class="btn btn-default editFeed" rel="$feed_item_html"><span class="glyphicon glyphicon-pencil"></span> $T('rss-edit')</button>
-                                    <button type="button" class="btn btn-default delFeed" rel="$feed_item_html"><span class="glyphicon glyphicon-trash"></span></button>
+                                    <button type="button" class="btn btn-default editFeed" rel="$feed_item"><span class="glyphicon glyphicon-pencil"></span> $T('Edit')</button>
+                                    <button type="button" class="btn btn-default delFeed" rel="$feed_item"><span class="glyphicon glyphicon-trash"></span></button>
                                 </td>
                             </tr>
                             <!--#for $uri_index, $uri in enumerate($rss[$feed_item]['uri'])#-->
@@ -92,7 +90,7 @@
                         <label class="config narrow" for="rss_rate">$T('opt-rss_rate')</label>
                         <input type="number" name="rss_rate" id="rss_rate" value="$rss_rate" min="15" max="1440" />
                         <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> $T('button-save')</button>
-                        <span class="config narrow">&nbsp;&nbsp;$T('rss-nextscan'): $rss_next</span>
+                        <span class="config narrow">&nbsp;&nbsp;$T('Next scan at:')&nbsp;$rss_next</span>
                         <span class="desc narrow">$T('explain-rss_rate')</span>
                     </div>
                 </fieldset>
@@ -102,13 +100,13 @@
     </div>
     <!--#end if#-->
     <!--#if $active_feed#-->
-    <!--#set $feed = html.unescape($active_feed)#-->
+    <!--#set $feed = $active_feed#-->
     <div class="section rss-section">
         <div class="padTable">
-            <a class="main-helplink" href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+            <a class="main-helplink" href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
             <h2 class="nomargin activeRSS">
                 <a href="${root}config/rss/">$T('cmenu-rss')</a> &raquo;
-                $active_feed
+                <a href="$rss[$active_feed]['uri']" onclick="window.open(this.href); return false;">$active_feed</a>
             </h2>
             <!--#if $error#-->
             <div class="alert alert-danger">
@@ -118,7 +116,7 @@
             <!--#end if#-->
             <form action="upd_rss_feed" method="post">
                 <input type="hidden" name="apikey" value="$apikey" />
-                <input type="hidden" name="feed" value="$active_feed" />
+                <input type="hidden" name="feed" value="$feed" />
                 <input type="hidden" name="uri" value="$rss[$feed]['uris']" />
                 <table class="catTable">
                     <thead>
@@ -210,7 +208,7 @@
             <form action="upd_rss_filter" method="post">
                 <input type="hidden" name="apikey" value="$apikey" />
                 <input type="hidden" name="index" value="$rss[$feed]['filtercount']" />
-                <input type="hidden" name="feed" value="$active_feed" />
+                <input type="hidden" name="feed" value="$feed" />
                 <table class="catTable">
                     <tbody>
                         <tr>
@@ -286,7 +284,7 @@
                 <form action="upd_rss_filter" method="post" autocomplete="off">
                     <input type="hidden" name="apikey" value="$apikey" />
                     <input type="hidden" name="index" value="$fnum" />
-                    <input type="hidden" name="feed" value="$active_feed" />
+                    <input type="hidden" name="feed" value="$feed" />
                     <table class="catTable">
                         <tbody>
                             <tr class="<!--#if $odd then " alt " else " "#--> <!--#if $filter[3]!="A" and $filter[3]!="S" then 'disabled_options_rule' else ""#-->">
@@ -302,8 +300,8 @@
                                         <option value="M" <!--#if $filter[3]=="M" then 'selected="selected"' else ""#-->> $T('rss-must')</option>
                                         <option value="R" <!--#if $filter[3]=="R" then 'selected="selected"' else ""#-->> $T('rss-reject')</option>
                                         <option value="C" <!--#if $filter[3]=="C" then 'selected="selected"' else ""#-->> $T('rss-mustcat')</option>
-                                        <option value=">" <!--#if $filter[3]=="&gt;" then 'selected="selected"' else ""#-->> $T('rss-atleast')</option>
-                                        <option value="<" <!--#if $filter[3]=="&lt;" then 'selected="selected"' else ""#-->> $T('rss-atmost')</option>
+                                        <option value=">" <!--#if $filter[3]==">" then 'selected="selected"' else ""#-->> $T('rss-atleast')</option>
+                                        <option value="<" <!--#if $filter[3]=="<" then 'selected="selected"' else ""#-->> $T('rss-atmost')</option>
                                         <option value="F" <!--#if $filter[3]=="F" then 'selected="selected"' else ""#-->> $T('rss-from')</option>
                                         <option value="S" <!--#if $filter[3]=="S" then 'selected="selected"' else ""#-->> $T('rss-from-show') ($T('rss-accept'))</option>
                                     </select>
@@ -363,13 +361,13 @@
             <!--#end for#-->
             <form action="download_rss_feed" method="post">
                 <input type="hidden" name="apikey" value="$apikey" />
-                <input type="hidden" name="feed" value="$active_feed" />
+                <input type="hidden" name="feed" value="$feed" />
                 <div class="padding">
-                    <button type="button" class="btn btn-default testFeed" rel="$active_feed"><span class="glyphicon glyphicon-sort"></span> $T('button-preFeed')</button>
+                    <button type="button" class="btn btn-default testFeed" rel="$feed"><span class="glyphicon glyphicon-sort"></span> $T('button-preFeed')</button>
                     <button type="submit" class="btn btn-default Save"><span class="glyphicon glyphicon-forward"></span> $T('button-forceFeed')</button>
                     <button type="button" class="btn btn-default cleanFeed"><span class="glyphicon glyphicon-trash"></span> $T('button-clear') $T('rss-done')</button>
                     <!--#if $evalButton#-->
-                      <button type="button" class="btn btn-default evalFeed" rel="$active_feed"><span class="glyphicon glyphicon-ok-circle"></span> $T('button-evalFeed')</button>
+                      <button type="button" class="btn btn-default evalFeed" rel="$feed"><span class="glyphicon glyphicon-ok-circle"></span> $T('button-evalFeed')</button>
                     <!--#end if#-->
                 </div>
             </form>
@@ -402,7 +400,7 @@
                     <tr class="infoTableSeperator">
                         <td>
                             <form action="download" method="get">
-                                <input type="hidden" value="$active_feed" name="feed" />
+                                <input type="hidden" value="$feed" name="feed" />
                                 <input type="hidden" name="apikey" value="$apikey" />
                                 <input type="hidden" name="url" value="$job['url']" />
                                 <input type="hidden" name="nzbname" value="$job['nzbname']" />
@@ -446,7 +444,7 @@
                     <tr class="infoTableSeperator">
                         <td>
                             <form action="download" method="get">
-                                <input type="hidden" value="$active_feed" name="feed" />
+                                <input type="hidden" value="$feed" name="feed" />
                                 <input type="hidden" name="apikey" value="$apikey" />
                                 <input type="hidden" name="url" value="$job['url']" />
                                 <input type="hidden" name="nzbname" value="$job['nzbname']" />
@@ -475,28 +473,24 @@
         <div class="tab-pane padTable" id="rss-tab-done">
             <!--#if $downloaded#-->
             <form action="clean_rss_jobs" method="post">
-                <input type="hidden" value="$active_feed" name="feed" />
+                <input type="hidden" value="$feed" name="feed" />
                 <input type="hidden" name="apikey" value="$apikey" />
                 <table class="catTable">
                     <thead>
                         <tr>
                             <th class="default-sort">$T('rss-added')</th>
-                            <th>$T('rss-filter')</th>
                             <th>$T('size')</th>
                             <th width="60%">$T('sort-title')</th>
                             <th>$T('category')</th>
-                            <th>$T('nzo-age')</th>
                             <th>$T('source')</th>
                         </tr>
                     </thead>
                     <!--#for $job in $downloaded#-->
                         <tr class="infoTableSeperator">
                             <td data-sort-value="$job['time_downloaded_ms']">$job['time_downloaded']</td>
-                            <td>$job['rule'] $job['skip']</td>
                             <td data-sort-value="$job['size']">$job['size_units']</td>
                             <td>$job['title']</td>
                             <td>$job['cat']</td>
-                            <td data-sort-value="$job['age_ms']">$job['age']</td>
                             <td data-sort-value="$job['baselink']" title="$job['baselink']">
                                 <!--#if not $job['infourl']#-->
                                 <div class="favicon source-icon" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></div>
@@ -514,80 +508,56 @@
         </div>
         <!--#end if#-->
     </div>
+
 </div>
 <!-- /colmask -->
-
-<form method="post" action="save_rss_feed" class="modal fade" id="rss_edit_modal">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h4 class="modal-title">$T('Edit') <span id="feed_edit_name_label"></span></h4>
-            </div>
-            <div class="modal-body">
-                <div class="form-group">
-                    <label for="feed_edit_new_name">$T('name')</label>
-                    <input type="text" class="form-control" name="feed_new_name" id="feed_edit_new_name" placeholder="$T('name')" size="">
-                </div>
-                <div class="form-group">
-                    <label for="feed_edit_url">$T('feed') URLs</label>
-                    <input type="text" class="form-control" name="uri" id="feed_edit_url" placeholder="$T('feed') URLs" size="">
-                    <span class="help-block">$T('addMultipleFeeds')</span>
-                </div>
-                <input type="hidden" name="feed" id="feed_edit_old_name" />
-                <input type="hidden" name="apikey" value="$apikey" />
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-danger" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span> $T('cancel')</button>
-                <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> $T('rss-accept')</button>
-            </div>
-        </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-</form><!-- /.modal -->
-
 <script type="text/javascript" src="${root}staticcfg/js/jquery.tablesort.min.js"></script>
 <script type="text/javascript">
 function urlencode(str) {
     return encodeURIComponent(str).replace(/!/g, '%21').replace(/'/g, '%27').replace(/\(/g, '%28').replace(/\)/g, '%29').replace(/\*/g, '%2A').replace(/%20/g, '+');
 }
 
-jQuery(document).ready(function(){
-    jQuery('.favicon').each(function(i, theContainer) {
+\$(document).ready(function(){
+    \$('.favicon').each(function(i, theContainer) {
         // Easy favicon grabber
-        var favUrl = '//' + jQuery(theContainer).data('domain') + '/favicon.ico'
+        var favUrl = '//' + \$(theContainer).data('domain') + '/favicon.ico'
 
         // Does the image exist? Otherwise place a glyphicon
         var testFavImg = new Image();
         testFavImg.src = favUrl;
         testFavImg.onerror = function (evt){
-            jQuery(theContainer).append('<span class="glyphicon glyphicon-list"></span>')
+            \$(theContainer).append('<span class="glyphicon glyphicon-list"></span>')
         }
     })
 
-    jQuery('.tabs a').click(function (e) {
+    \$('.tabs a').click(function (e) {
         e.preventDefault()
-        jQuery(this).tab('show')
+        \$(this).tab('show')
     })
 
-    jQuery('.editFeed').click(function(){
-        var oldURI = jQuery(this).prev().val();
-        var whichFeed = jQuery(this).attr("rel");
-
-        // Fill the values
-        jQuery('#feed_edit_name_label').text(whichFeed)
-        jQuery('#feed_edit_old_name').val(whichFeed)
-        jQuery('#feed_edit_new_name').val(whichFeed)
-        jQuery('#feed_edit_url').val(oldURI)
-
-        // Show the modal
-        jQuery('#rss_edit_modal').modal('show');
+    \$('.editFeed').click(function(){
+        var oldURI = \$(this).prev().val();
+        var newURI = prompt("$T('feed') URL. \n$T('addMultipleFeeds').", oldURI );
+        if(newURI != "" && newURI !== null) {
+            var whichFeed = \$(this).attr("rel");
+            var isEnabled = \$('.toggleFeedCheckbox[rel="'+whichFeed+'"]').attr('checked') == "checked"? 1 : 0;
+            \$.ajax({
+              type: "POST",
+              url: "save_rss_feed",
+              data: {feed: whichFeed, uri: newURI, enable: isEnabled, apikey: "$apikey" }
+            }).done(function( msg ) {
+              location.reload();
+            });
+        } else {
+            return false;
+        }
     });
 
-    jQuery('.delFeed').click(function(e){
+    \$('.delFeed').click(function(e){
         e.preventDefault();
         if ( confirm("$T('confirm')") ) {
-            var whichFeed = jQuery(this).attr("rel");
-            jQuery.ajax({
+            var whichFeed = \$(this).attr("rel");
+            \$.ajax({
                 type: "POST",
                 url: "del_rss_feed",
                 data: {feed: whichFeed, apikey: "$apikey" }
@@ -600,9 +570,9 @@ jQuery(document).ready(function(){
         }
     });
 
-    jQuery('.toggleFeedCheckbox').click(function(){
-        var whichFeed = jQuery(this).attr("rel");
-        jQuery.ajax({
+    \$('.toggleFeedCheckbox').click(function(){
+        var whichFeed = \$(this).attr("rel");
+        \$.ajax({
             type: "POST",
             url: "toggle_rss_feed",
             data: {feed: whichFeed, apikey: "$apikey" }
@@ -615,34 +585,34 @@ jQuery(document).ready(function(){
     });
 
     // Only the Accept filter needs all the options
-    jQuery('form[action="upd_rss_filter"]').find('select[name="filter_type"]').change(function() {
-        jQuery(this).parent().parent().find('select:not([name="filter_type"])').attr('disabled', jQuery(this).val() !== "A" && jQuery(this).val() !== "S")
+    \$('form[action="upd_rss_filter"]').find('select[name="filter_type"]').change(function() {
+        \$(this).parent().parent().find('select:not([name="filter_type"])').attr('disabled', \$(this).val() != "A" && \$(this).val() != "S")
     })
     // Trigger on-load for all
-    jQuery('.disabled_options_rule').find('td select:not([name="filter_type"])').attr('disabled', true)
+    \$('.disabled_options_rule').find('td select:not([name="filter_type"])').attr('disabled', true)
 
     function setActiveIcon(objButton) {
         // Let's make it look like things are happening!
-        jQuery(objButton).attr('disabled', true)
-        jQuery(objButton).find('span').remove()
-        jQuery(objButton).prepend('<span class="glyphicon glyphicon-transfer"></span>')
+        \$(objButton).attr('disabled', true)
+        \$(objButton).find('span').remove()
+        \$(objButton).prepend('<span class="glyphicon glyphicon-transfer"></span>')
     }
 
     // Enable sorting and set default
-    if (jQuery('#rss-tab-matched table').length) {
-        jQuery('#rss-tab-matched table').tablesort().data('tablesort').sort(jQuery('#rss-tab-matched th.default-sort'), 'desc');
+    if (\$('#rss-tab-matched table').length) {
+        \$('#rss-tab-matched table').tablesort().data('tablesort').sort(\$('#rss-tab-matched th.default-sort'), 'desc');
     }
-    if (jQuery('#rss-tab-not-matched table').length) {
-        jQuery('#rss-tab-not-matched table').tablesort().data('tablesort').sort(jQuery('#rss-tab-not-matched th.default-sort'), 'desc');
+    if (\$('#rss-tab-not-matched table').length) {
+        \$('#rss-tab-not-matched table').tablesort().data('tablesort').sort(\$('#rss-tab-not-matched th.default-sort'), 'desc');
     }
-    if (jQuery('#rss-tab-done table').length) {
-        jQuery('#rss-tab-done table').tablesort().data('tablesort').sort(jQuery('#rss-tab-done th.default-sort'), 'desc');
+    if (\$('#rss-tab-done table').length) {
+        \$('#rss-tab-done table').tablesort().data('tablesort').sort(\$('#rss-tab-done th.default-sort'), 'desc');
     }
 
-    jQuery('.testFeed').click(function(){
+    \$('.testFeed').click(function(){
         setActiveIcon(this)
-        var whichFeed = jQuery(this).attr("rel");
-        jQuery.ajax({
+        var whichFeed = \$(this).attr("rel");
+        \$.ajax({
             type: "POST",
             url: "test_rss_feed",
             data: {feed: whichFeed, apikey: "$apikey" }
@@ -654,34 +624,34 @@ jQuery(document).ready(function(){
         });
     });
 
-    jQuery('.cleanFeed').click(function(){
+    \$('.cleanFeed').click(function(){
         setActiveIcon(this)
-        var theForm = jQuery(this).closest("form");
+        var theForm = \$(this).closest("form");
         theForm.attr("action", "clean_rss_jobs").submit();
     });
 
-    jQuery('.evalFeed').click(function(){
+    \$('.evalFeed').click(function(){
         setActiveIcon(this)
-        var theForm = jQuery(this).closest("form");
+        var theForm = \$(this).closest("form");
         theForm.attr("action", "eval_rss_feed").submit();
     });
 
-    jQuery('.delFilter').click(function(){
-        var theForm = jQuery(this).closest("form");
+    \$('.delFilter').click(function(){
+        var theForm = \$(this).closest("form");
         theForm.attr("action", "del_rss_filter").submit();
     });
 
-    jQuery('form[action="download"]').ajaxForm({
+    \$('form[action="download"]').ajaxForm({
         datatype: 'json',
         beforeSubmit: function (_, form) {
-            jQuery(form).find('button').attr("disabled", "disabled")
+            \$(form).find('button').attr("disabled", "disabled")
             // Remove icon and add new one
-            jQuery(form).find('button span').remove()
-            jQuery(form).find('button').prepend('<span class="glyphicon glyphicon-transfer"></span>')
+            \$(form).find('button span').remove()
+            \$(form).find('button').prepend('<span class="glyphicon glyphicon-transfer"></span>')
         },
         success: function (_, _, _, form) {
             // Set success
-            jQuery(form).find('button').html('<span class="glyphicon glyphicon-ok"></span> $T('rss-added')')
+            \$(form).find('button').html('<span class="glyphicon glyphicon-ok"></span> $T('rss-added')')
         }
     });
 

interfaces/Config/templates/config_scheduling.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Scheduling"#-->
-<!--#set global $help_uri = $confighelpuri + "scheduling"#-->
+<!--#set global $help_uri="configuration/3.1/scheduling"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <%
@@ -15,7 +15,7 @@ else:
 <div class="colmask">
     <div class="section">
         <div class="col2">
-            <h3>$T('addSchedule') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('addSchedule') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
         </div><!-- /col2 -->
         <form action="addSchedule" method="post" autocomplete="off">
         <input type="hidden" id="apikey" name="apikey" value="$apikey" />
@@ -50,7 +50,7 @@ else:
                     <select name="action" id="action">
                         <optgroup label="$T('sch-action')">
                             <!--#for $action in $actions#-->
-                                <option value="$action" data-action="" data-noarg="<!--#if $action == 'speedlimit' then 0 else 1#-->">$actions_lng[$action]</option>
+                                <option value="$action" data-action="" data-noarg="<!--#if $action is 'speedlimit' then 0 else 1#-->">$actions_lng[$action]</option>
                             <!--#end for#-->
                         </optgroup>
                         <optgroup label="$T('cmenu-servers')">
@@ -112,32 +112,32 @@ else:
     </div><!-- /section -->
 </div><!-- /colmask -->
 <script type="text/javascript">
-    jQuery('#action').on('change', function() {
+    \$('#action').on('change', function() {
         // Set the action
-        jQuery('#arguments').val((jQuery(this).find('option:selected').data('action')))
+        \$('#arguments').val((\$(this).find('option:selected').data('action')))
 
         // Is it speedlimit?
-        if(jQuery(this).find('option:selected').val() === 'speedlimit') {
-            jQuery('#hidden_arguments').show()
-            jQuery('#hidden_arguments input').attr('placeholder', 'Bytes/s, "1M" = 1 MB/s, "500K" = 500 KB/s')
+        if(\$(this).find('option:selected').val() == 'speedlimit') {
+            \$('#hidden_arguments').show()
+            \$('#hidden_arguments input').attr('placeholder', 'Bytes/s, "1M" = 1 MB/s, "500K" = 500 KB/s')
         } else {
-            jQuery('#hidden_arguments').hide()
-            jQuery('#hidden_arguments input').attr('placeholder', '')
+            \$('#hidden_arguments').hide()
+            \$('#hidden_arguments input').attr('placeholder', '')
         }
 
         /* Arguments - since we only have speedlimit with arguments, disabled for now
-        if(jQuery(this).find('option:selected').data('noarg')) {
-            jQuery('#hidden_arguments').hide()
+        if(\$(this).find('option:selected').data('noarg')) {
+            \$('#hidden_arguments').hide()
         } else {
-            jQuery('#hidden_arguments').show()
+            \$('#hidden_arguments').show()
         }*/
     })
 
-    jQuery('[name="schedenabled"]').click(function() {
-        jQuery.ajax({
+    \$('[name="schedenabled"]').click(function() {
+        \$.ajax({
             type: "POST",
             url: "toggleSchedule",
-            data: {line: jQuery(this).val(), apikey: "$apikey" }
+            data: {line: \$(this).val(), apikey: "$apikey" }
         }).done(function() {
             // Let us leave!
             formWasSubmitted = true;

interfaces/Config/templates/config_server.tmpl

@@ -1,25 +1,51 @@
 <!--#set global $pane="Servers"#-->
-<!--#set global $help_uri = $confighelpuri + "servers"#-->
+<!--#set global $help_uri="configuration/3.1/servers"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
+<!--
+    We need to find how many months we have recorded so far, so we
+    loop over all the dates to find the lowest value and then use
+    this to calculate the date-selector and maximum value per month.
+-->
 <!--#import json#-->
 <!--#import datetime#-->
+<!--#import sabnzbd.misc#-->
+
+<!--#set month_names = [$T('January'), $T('February'), $T('March'), $T('April'), $T('May'), $T('June'), $T('July'), $T('August'), $T('September'), $T('October'), $T('November'), $T('December')] #-->
+<!--#set min_date = datetime.date.today()#-->
+<!--#set max_data_all = {}#-->
+
+<!--#for $server in $servers #-->
+    <!--#if 'amounts' in $server#-->
+        <!--#set max_data_server = {}#-->
+        <!--#for date in $server['amounts'][4]#-->
+            <!--#set split_date = $date.split('-')#-->
+            <!--#set min_date = min(min_date, datetime.date(int(split_date[0]), int(split_date[1]), 1))#-->
+
+            <!--#set month_date = $date[:7]#-->
+            <!--#if $month_date not in $max_data_server#-->
+                <!--#set max_data_server[$month_date] = 0#-->
+             <!--#end if#-->
+             <!--#set max_data_server[$month_date] = max(max_data_server[$month_date], $server['amounts'][4][$date])#-->
+        <!--#end for#-->
+
+        <!--#for month_date in max_data_server#-->
+            <!--#if $month_date not in $max_data_all#-->
+                <!--#set max_data_all[$month_date] = 0#-->
+             <!--#end if#-->
+             <!--#set max_data_all[$month_date] = max(max_data_all[$month_date], max_data_server[$month_date])#-->
+        <!--#end for#-->
+    <!--#end if#-->
+<!--#end for#-->
+
+<!--#set months_recorded = list(sabnzbd.misc.monthrange(min_date, datetime.date.today()))#-->
+<!--#$months_recorded.reverse()#-->
 
 <script type="text/javascript">
-    // Define variable needed for the server-statistics
-    var serverBandwithData = {}
-    var serverArticleTries = {}
-    var serverArticleFailed = {}
-
-    // Keep track of all used hostnames
-    var hostnames = ""
+    // Define variable needed for the server-plots
+    var serverData = {}
 </script>
 
-<div class="server-frame">
-    <a href="#">&times;</a>
-    <iframe></iframe>
-</div>
-
 <div class="colmask">
     <div class="padding alt section">
         <button type="button" class="btn btn-default" id="addServerButton"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
@@ -27,57 +53,60 @@
             <input type="checkbox" id="advanced-settings-button" name="advanced-settings-button"> $T('button-advanced')
         </label>
 
+        <!--#if $months_recorded#-->
         <div class="advanced-buttonSeperator"></div>
-        <div class="chart-selector-container" title="$T('selectedDates')" data-placement="bottom">
+        <div class="chart-selector-container" title="$T('srv-bandwidth')">
             <span class="glyphicon glyphicon-signal"></span>
-            <!--#set today = datetime.date.today()#-->
-            <input type="date" name="chart-start" id="chart-start" value="<!--#echo (today-datetime.timedelta(days=30)).strftime('%Y-%m-%d')#-->"> -
-            <input type="date" name="chart-end" id="chart-end" value="<!--#echo today.strftime('%Y-%m-%d')#-->">
+            <select name="chart-selector" id="chart-selector">
+                <!--#for $cur_date in months_recorded#-->
+                    <!--#set month_date = '%d-%02d' % ($cur_date.year, $cur_date.month)#-->
+                    <!--#if $month_date not in $max_data_all#-->
+                        <!--#set max_data_all[$month_date] = 0#-->
+                     <!--#end if#-->
+                    <option value="$month_date" data-max="$max_data_all[$month_date]">$month_names[$cur_date.month-1] $cur_date.year</option>
+                <!--#end for#-->
+            </select>
         </div>
+        <!--#end if#-->
     </div>
     <div class="section" id="addServerContent" style="display: none;">
         <div class="col2">
-            <h3>$T('addServer') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('addServer') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
         </div>
         <div class="col1">
             <form action="addServer" method="post" autocomplete="off" onsubmit="removeObfuscation();">
                 <input type="hidden" name="apikey" value="$apikey" />
-                <input type="hidden" name="output" value="json" />
                 <fieldset>
                     <div class="field-pair">
                         <label class="config" for="enable">$T('srv-enable')</label>
                         <input type="checkbox" name="enable" id="enable" value="1" checked="checked" />
                         <span class="desc">$T('srv-enable')</span>
                     </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="displayname">$T('srv-displayname')</label>
-                        <input type="text" name="displayname" id="displayname" />
-                    </div>
                     <div class="field-pair">
                         <label class="config" for="host">$T('srv-host')</label>
                         <input type="text" name="host" id="host" required />
                     </div>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
                         <label class="config" for="port">$T('srv-port')</label>
-                        <input type="number" name="port" id="port" size="8" value="563" min="0" max="65535" />
+                        <input type="number" name="port" id="port" size="8" value="119" min="0" />
                     </div>
                     <div class="field-pair">
                         <label class="config" for="ssl">$T('srv-ssl')</label>
-                        <input type="checkbox" name="ssl" id="ssl" value="1" checked />
+                        <input type="checkbox" name="ssl" id="ssl" value="1" />
                         <span class="desc">$T('explain-ssl')</span>
                     </div>
                     <!-- Tricks to avoid browser auto-fill, fixed on-submit with javascript -->
                     <div class="field-pair">
-                        <label class="config" for="${pid}_000">$T('srv-username')</label>
-                        <input type="text" name="${pid}_000" id="${pid}_000" data-hide="username" />
+                        <label class="config" for="${pid}_00">$T('srv-username')</label>
+                        <input type="text" name="${pid}_00" id="${pid}_00" data-hide="username" />
                     </div>
                     <div class="field-pair">
-                        <label class="config" for="${pid}_001">$T('srv-password')</label>
-                        <input type="text" name="${pid}_001" id="${pid}_001" data-hide="password" />
+                        <label class="config" for="${pid}_01">$T('srv-password')</label>
+                        <input type="text" name="${pid}_01" id="${pid}_01" data-hide="password" />
                     </div>
                     <div class="field-pair">
                         <label class="config" for="connections">$T('srv-connections')</label>
-                        <input type="number" name="connections" id="connections" min="1" max="500" value="8" required />
+                        <input type="number" name="connections" id="connections" min="1" max="100" value="8" required />
                     </div>
                     <div class="field-pair">
                         <label class="config" for="priority">$T('srv-priority')</label>
@@ -91,26 +120,25 @@
                         <label class="config" for="timeout">$T('srv-timeout')</label>
                         <input type="number" name="timeout" id="timeout" min="20" max="240" /> <i>$T('seconds')</i>
                     </div>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair <!--#if int($certificate_validation) == 0 then "disabled" else ""#--> advanced-settings">
                         <label class="config" for="ssl_verify">$T('opt-ssl_verify')</label>
-                        <select name="ssl_verify" id="ssl_verify">
-                            <option value="3" selected>$T('ssl_verify-strict')</option>
-                            <option value="2">$T('ssl_verify-medium')</option>
-                            <option value="1">$T('ssl_verify-minimal')</option>
+                        <select name="ssl_verify" id="ssl_verify" <!--#if int($certificate_validation) == 0 then "disabled=\"disabled\"" else ""#-->>
+                            <option value="2" selected>$T('ssl_verify-strict')</option>
+                            <option value="1">$T('ssl_verify-normal')</option>
                             <option value="0">$T('ssl_verify-disabled')</option>
                         </select>
-                        <span class="desc">$T('explain-ssl_verify').replace('-', '<br/>-')</span>
+                        <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="ssl_ciphers">$T('opt-ssl_ciphers')</label>
                         <input type="text" name="ssl_ciphers" id="ssl_ciphers" />
                         <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
-                        <a href="https://sabnzbd.org/wiki/advanced/ssl-ciphers" target="_blank">https://sabnzbd.org/wiki/advanced/ssl-ciphers</a></span>
+                        <a href="${helpuri}advanced/ssl-ciphers" target="_blank">${helpuri}advanced/ssl-ciphers</a></span>
                     </div>
                     <div class="field-pair advanced-settings">
-                        <label class="config" for="required">$T('srv-required')</label>
-                        <input type="checkbox" name="required" id="required" value="1" />
-                        <span class="desc">$T('explain-required')</span>
+                        <label class="config" for="send_group">$T('srv-send_group')</label>
+                        <input type="checkbox" name="send_group" id="send_group" value="1" />
+                        <span class="desc">$T('srv-explain-send_group')</span>
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="optional">$T('srv-optional')</label>
@@ -118,27 +146,15 @@
                         <span class="desc">$T('explain-optional')</span>
                     </div>
                     <div class="field-pair advanced-settings">
-                        <label class="config" for="pipelining_requests">$T('srv-pipelining_requests')</label>
-                        <input type="number" name="pipelining_requests" id="pipelining_requests" min="1" max="20" value="1" />
-                        <span class="desc">$T('explain-pipelining_requests')<br>$T('readwiki')
-                        <a href="https://sabnzbd.org/wiki/advanced/nntp-pipelining" target="_blank">https://sabnzbd.org/wiki/advanced/nntp-pipelining</a></span>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="expire_date">$T('srv-expire_date')</label>
-                        <input type="date" name="expire_date" id="expire_date" />
-                        <span class="desc">$T('srv-explain-expire_date')</span>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="quota">$T('swtag-quota')</label>
-                        <input type="text" name="quota" id="quota" class="smaller_input" />
-                        <span class="desc">$T('srv-explain-quota')</span>
+                        <label class="config" for="displayname">$T('srv-displayname')</label>
+                        <input type="text" name="displayname" id="displayname" />
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="notes">$T('srv-notes')</label>
                         <textarea name="notes" id="notes" rows="3" cols="50"></textarea>
                     </div>
                     <div class="field-pair no-field-pair-bg">
-                        <button class="btn btn-default addNewServer" disabled data-toggle="tooltip" data-placement="top" title="$T('wizard-test-server-required')"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
+                        <button class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
                         <button class="btn btn-default testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button>
                     </div>
                     <div class="field-pair result-box">
@@ -149,19 +165,18 @@
         </div>
     </div>
 
-    <!--#set $prio_colors = ["#59cc33", "#26a69a", "#3366cc", "#7f33cc", "#cc33a6", "#f39c12", "#cc3333", "#8d6e63"] #-->
+    <!--#set $prio_colors = ["#59cc33", "#3366cc","#7f33cc", "#cc33a6", "#cc3333"] #-->
     <!--#set $cur_prio_color = -1 #-->
     <!--#set $last_prio = -1 #-->
     <!--#for $cur, $server in enumerate($servers) #-->
         <form action="saveServer" method="post" class="fullform" autocomplete="off">
             <input type="hidden" name="apikey" value="$apikey" />
-            <input type="hidden" name="output" value="json" />
             <input type="hidden" name="server" value="$server['name']" />
-            <input type="hidden" name="ajax" value=1 />
+            <input type="hidden" id="ajax" name="ajax" value=1 />
 
             <div class="section <!--#if int($server['enable']) == 0 then 'server-disabled' else ""#-->">
                 <div class="col2 <!--#if int($server['enable']) == 0 then 'server-disabled' else ""#-->">
-                    <h3 title="$server['displayname']">$server['displayname'] <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                    <h3>$server['displayname'] <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
                     <!--#if int($server['enable']) != 0 #-->
                         <!--#if $last_prio != $server['priority'] and $cur_prio_color+1 < len($prio_colors) #-->
                             <!--#set $cur_prio_color = $cur_prio_color+1 #-->
@@ -178,24 +193,17 @@
                     </table>
                     <button type="button" class="btn btn-default showserver"><span class="glyphicon glyphicon-pencil"></span> $T('showDetails')</button>
                     <button type="button" class="btn btn-default clrServer"><span class="glyphicon glyphicon-remove"></span> $T('button-clrServer')</button>
-                    <!--#if $server['notes'] #-->
-                    <p>$server['notes'].replace('\n', '<br>')</p>
-                    <!--#end if#-->
                 </div>
                 <div class="col1" style="display:none;">
                     <input type="hidden" name="enable" id="enable$cur" value="$int($server['enable'])" />
                     <fieldset>
-                        <div class="field-pair advanced-settings">
-                            <label class="config" for="displayname$cur">$T('srv-displayname')</label>
-                            <input type="text" name="displayname" id="displayname$cur" value="$server['displayname']" />
-                        </div>
                         <div class="field-pair">
                             <label class="config" for="host$cur">$T('srv-host')</label>
                             <input type="text" name="host" id="host$cur" value="$server['host']" required />
                         </div>
-                        <div class="field-pair advanced-settings">
+                        <div class="field-pair">
                             <label class="config" for="port$cur">$T('srv-port')</label>
-                            <input type="number" name="port" id="port$cur" value="$server['port']" size="8" min="0" max="65535" required />
+                            <input type="number" name="port" id="port$cur" value="$server['port']" size="8" min="0" required />
                         </div>
                         <div class="field-pair">
                             <label class="config" for="ssl$cur">$T('srv-ssl')</label>
@@ -213,7 +221,7 @@
                         </div>
                         <div class="field-pair">
                             <label class="config" for="connections$cur">$T('srv-connections')</label>
-                            <input type="number" name="connections" id="connections$cur" value="$server['connections']" min="1" max="500" required />
+                            <input type="number" name="connections" id="connections$cur" value="$server['connections']" min="1" max="100" required />
                         </div>
                         <div class="field-pair">
                             <label class="config" for="priority$cur">$T('srv-priority')</label>
@@ -228,26 +236,20 @@
                             <input type="number" name="timeout" id="timeout$cur" value="$server['timeout']" min="20" max="240" required /> <i>$T('seconds')</i>
                         </div>
 
-                        <div class="field-pair advanced-settings">
+                        <div class="field-pair <!--#if int($certificate_validation) == 0 then "disabled" else ""#--> advanced-settings">
                             <label class="config" for="ssl_verify$cur">$T('opt-ssl_verify')</label>
-                            <select name="ssl_verify" id="ssl_verify$cur">
-                                <option value="3" <!--#if $server['ssl_verify'] == 3 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
-                                <option value="2" <!--#if $server['ssl_verify'] == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-medium')</option>
-                                <option value="1" <!--#if $server['ssl_verify'] == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-minimal')</option>
+                            <select name="ssl_verify" id="ssl_verify$cur" <!--#if int($certificate_validation) == 0 then "disabled=\"disabled\"" else ""#-->>
+                                <option value="2" <!--#if $server['ssl_verify'] == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
+                                <option value="1" <!--#if $server['ssl_verify'] == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-normal')</option>
                                 <option value="0" <!--#if $server['ssl_verify'] == 0 then 'selected="selected"' else ""#--> >$T('ssl_verify-disabled')</option>
                             </select>
-                            <span class="desc">$T('explain-ssl_verify').replace('-', '<br/>-')</span>
+                            <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
                         </div>
                         <div class="field-pair advanced-settings">
-                            <label class="config" for="ssl_ciphers$cur">$T('opt-ssl_ciphers')</label>
-                            <input type="text" name="ssl_ciphers" id="ssl_ciphers$cur" value="$server['ssl_ciphers']" />
+                            <label class="config" for="ssl_ciphers">$T('opt-ssl_ciphers')</label>
+                            <input type="text" name="ssl_ciphers" id="ssl_ciphers" value="$server['ssl_ciphers']" />
                             <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
-                            <a href="https://sabnzbd.org/wiki/advanced/ssl-ciphers" target="_blank">https://sabnzbd.org/wiki/advanced/ssl-ciphers</a></span>
-                        </div>
-                        <div class="field-pair advanced-settings">
-                            <label class="config" for="required$cur">$T('srv-required')</label>
-                            <input type="checkbox" name="required" id="required$cur" value="1" <!--#if int($server['required']) != 0 then 'checked="checked"' else ""#--> />
-                            <span class="desc">$T('explain-required')</span>
+                            <a href="${helpuri}advanced/ssl-ciphers" target="_blank">${helpuri}advanced/ssl-ciphers</a></span>
                         </div>
                         <div class="field-pair advanced-settings">
                             <label class="config" for="optional$cur">$T('srv-optional')</label>
@@ -255,26 +257,19 @@
                             <span class="desc">$T('explain-optional')</span>
                         </div>
                         <div class="field-pair advanced-settings">
-                            <label class="config" for="pipelining_requests$cur">$T('srv-pipelining_requests')</label>
-                            <input type="number" name="pipelining_requests" id="pipelining_requests$cur" value="$server['pipelining_requests']" min="1" max="20" required />
-                            <span class="desc">$T('explain-pipelining_requests')<br>$T('readwiki')
-                            <a href="https://sabnzbd.org/wiki/advanced/nntp-pipelining" target="_blank">https://sabnzbd.org/wiki/advanced/nntp-pipelining</a></span>
+                            <label class="config" for="send_group$cur">$T('srv-send_group')</label>
+                            <input type="checkbox" name="send_group" id="send_group$cur" value="1" <!--#if int($server['send_group']) != 0 then 'checked="checked"' else ""#--> />
+                            <span class="desc">$T('srv-explain-send_group')</span>
                         </div>
                         <div class="field-pair advanced-settings">
-                            <label class="config" for="expire_date$cur">$T('srv-expire_date')</label>
-                            <input type="date" name="expire_date" id="expire_date$cur"  value="$server['expire_date']" />
-                            <span class="desc">$T('srv-explain-expire_date')</span>
-                        </div>
-                        <div class="field-pair advanced-settings">
-                            <label class="config" for="quota$cur">$T('swtag-quota')</label>
-                            <input type="text" name="quota" id="quota$cur" value="$server['quota']" class="smaller_input" />
-                            <span class="desc">$T('srv-explain-quota')</span>
+                            <label class="config" for="displayname$cur">$T('srv-displayname')</label>
+                            <input type="text" name="displayname" id="displayname$cur" value="$server['displayname']" />
                         </div>
                         <div class="field-pair advanced-settings">
                             <label class="config" for="notes$cur">$T('srv-notes')</label>
                             <textarea name="notes" id="notes$cur" rows="3" cols="50">$server['notes']</textarea>
                         </div>
-                        <div class="field-pair no-field-pair-bg">
+                        <div class="field-pair">
                             <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                             <button class="btn btn-default testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button>
                             <button class="btn btn-default delServer"><span class="glyphicon glyphicon-trash"></span> $T('button-delServer')</button>
@@ -287,38 +282,19 @@
                 <div class="col1" style="display:block;">
                     <!--#if 'amounts' in $server#-->
                         <div class="server-amounts-text">
-                            <p>
-                                <b>$T('srv-bandwidth'):</b><br/>
-                                $T('total'): $(server['amounts'][0])B<br/>
-                                $T('today'): $(server['amounts'][3])B<br/>
-                                $T('thisWeek'): $(server['amounts'][2])B<br/>
-                                $T('thisMonth'): $(server['amounts'][1])B<br/>
-                                $T('selectedDates'): <span id="server-bandwith-value-${cur}"></span>
-                            </p>
-
-                            <p title="$T('readwiki')">
-                                <b>$T('srv-article-availability'):</b><br/>
-                                $T('selectedDates'): <span id="server-article-value-${cur}"></span><br/>
-                                <a href="https://sabnzbd.org/not-complete" id="server-article-not-complete-${cur}" target="_blank">https://sabnzbd.org/not-complete</a>
-                            </p>
-                            <!--#if $server['expire_date']#-->
-                            <p><b>$T('srv-expire_date'):</b> $(server['expire_date'])</p>
-                            <!--#end if#-->
-                            <!--#if $server['quota']#-->
-                            <p><b>$T('quota-left'):</b> $(server['quota_left'])</p>
-                            <!--#end if#-->
+                            <b>$T('srv-bandwidth'):</b><br/>
+                            $T('total'): $(server['amounts'][0])B<br/>
+                            $T('today'): $(server['amounts'][3])B<br/>
+                            $T('thisWeek'): $(server['amounts'][2])B<br/>
+                            $T('thisMonth'): $(server['amounts'][1])B<br/>
+                            <span id="server-data-label-${cur}"></span>: <span id="server-data-value-${cur}"></span>
                         </div>
-                        <div class="server-chart" data-serverid="${cur}">
+                        <div class="server-chart" data-serverid="${cur}"s>
                             <div id="server-chart-${cur}" class="ct-chart"></div>
                         </div>
                         <script type="text/javascript">
                             // Server data
-                            serverBandwithData[${cur}] = <!--#echo json.dumps($server['amounts'][4])#-->
-                            serverArticleTries[${cur}] = <!--#echo json.dumps($server['amounts'][5])#-->
-                            serverArticleFailed[${cur}] = <!--#echo json.dumps($server['amounts'][6])#-->
-                            <!--#if int($server['enable']) != 0#-->
-                            hostnames += ",$server['host']"
-                            <!--#end if#-->
+                            serverData[${cur}] = <!--#echo json.dumps($server['amounts'][4])#-->
                         </script>
                     <!--#end if#-->
                 </div>
@@ -355,94 +331,58 @@
     }
 
     function showCharts() {
-        // Get the constants
-        const startDate = new Date(jQuery('#chart-start').val())
-        const endDate = new Date(jQuery('#chart-end').val())
-        const oneDay = 24 * 60 * 60 * 1000
-        const nrDays = Math.round((endDate-startDate)/oneDay)
+        // This month
+        var theMonth = \$('#chart-selector').val()
+        var thisDay = new Date()
 
-        // Show only maximum 10 labels to avoid cluttering
-        const labelStep = Math.round(nrDays/10)
+        // What month are we doing?
+        var inputDate = new Date(theMonth+'-01')
+        var baseDate = new Date(inputDate.getUTCFullYear(), inputDate.getUTCMonth(), 1)
+        var maxDaysInMonth = new Date(baseDate.getFullYear(), baseDate.getMonth()+1, 0).getDate()
 
-        // Save largest value
-        var maxBandwith = 0
+        // Set the new maximum
+        chartOptions.axisY.high = \$('#chart-selector :selected').data('max');
+        chartOptions.axisY.low = 0
 
         // For each chart
-        jQuery('.server-chart').each(function(j, elemn) {
-            const server_id = jQuery(elemn).data('serverid')
-            var totalBandwithThisRange = 0
-            var totalArticlesTriedThisRange = 0
-            var totalArticlesFailedThisRange = 0
+        \$('.server-chart').each(function(i, elemn) {
+            var server_id = \$(elemn).data('serverid')
 
             // Fill the data array
             var data = {
                 labels: [],
                 series: [[]]
             };
-
-            for(var i = 0; i < nrDays+1; i++) {
-                // Update the date
-                const checkDate = new Date(startDate)
-                checkDate.setDate(checkDate.getDate() + i);
-
+            var totalThisMonth = 0
+            for(var i = 1; i < maxDaysInMonth+1; i++) {
                 // Add X-label
-                if(i % labelStep === 0) {
-                    data['labels'].push(checkDate.getDate())
+                if(i % 3 == 1) {
+                    data['labels'].push(i)
                 } else {
                     data['labels'].push(NaN)
                 }
 
-                // Date we can check in the array
-                const dateCheck = toFormattedDate(checkDate)
+                // Get formatted date
+                baseDate.setDate(i)
+                var dateCheck = toFormattedDate(baseDate)
 
                 // Add data if we have it
-                if(dateCheck in serverBandwithData[server_id]) {
-                    data['series'][0].push(serverBandwithData[server_id][dateCheck])
-                    totalBandwithThisRange += serverBandwithData[server_id][dateCheck]
-                    maxBandwith = Math.max(maxBandwith, serverBandwithData[server_id][dateCheck])
+                if(dateCheck in serverData[server_id]) {
+                    data['series'][0].push(serverData[server_id][dateCheck])
+                    totalThisMonth += serverData[server_id][dateCheck]
+                } else if(thisDay.getYear() == baseDate.getYear() && thisDay.getMonth() == baseDate.getMonth() && thisDay.getDate() < i) {
+                    data['series'][0].push(NaN)
                 } else {
                     data['series'][0].push(0)
                 }
-
-                // Article stats
-                if(dateCheck in serverArticleTries[server_id]) {
-                    totalArticlesTriedThisRange += serverArticleTries[server_id][dateCheck]
-                    totalArticlesFailedThisRange += serverArticleFailed[server_id][dateCheck]
-                }
             }
 
             // Update the text value
-            jQuery('#server-bandwith-value-' + server_id).text(filesize(totalBandwithThisRange, {round: 1}))
-
-            // Calculate article success ratio, if available
-            var articleRatio = Math.round(100 * (1 - totalArticlesFailedThisRange/totalArticlesTriedThisRange))
-
-            // If values were missing
-            if(!isNaN(articleRatio)) {
-                // Use filesize to convert to unit-display
-                jQuery('#server-article-value-' + server_id).text('$T("srv-articles-tried")'.replace('%f', articleRatio).replace('%d', filesize(totalArticlesTriedThisRange, {unix: true, round: 0, spacer: "", base: 1})))
-                // If we have a low value, we link them to the website
-                if(articleRatio > 60) jQuery('#server-article-not-complete-' + server_id).hide()
-            } else {
-                jQuery('#server-article-value-' + server_id).text('$T("notAvailable")')
-                jQuery('#server-article-not-complete-' + server_id).hide()
-            }
-
-            // Save bandwidth data in a very ugly way, but we need to do this
-            // so we can calculate the maximum Y-axis for all graphs
-            jQuery(elemn).data("chart-data", data)
-        })
-
-        // Set the maximum
-        chartOptions.axisY.high = maxBandwith
-        chartOptions.axisY.low = 0
-
-        // Update all the axis with the largest value and draw the graph
-        jQuery('.server-chart').each(function(j, elemn) {
-            const server_id = jQuery(elemn).data('serverid')
+            \$('#server-data-label-' + server_id).text(\$('#chart-selector :selected').text())
+            \$('#server-data-value-' + server_id).text(filesize(totalThisMonth, {round: 1}))
 
             // Show the chart
-            chart = new Chartist.Line('#server-chart-'+server_id, jQuery(elemn).data("chart-data"), chartOptions)
+            chart = new Chartist.Line('#server-chart-'+server_id, data, chartOptions);
             chart.on('created', function(context) {
                 // Make sure to add this as the first child so it's at the bottom
                 context.svg.elem('rect', {
@@ -451,18 +391,14 @@
                     width: context.chartRect.width(),
                     height: context.chartRect.height()+2,
                     fill: 'none',
-                    stroke: '#b9b9b9',
+                    stroke: '#B9B9B9',
                     'stroke-width': '1px'
                 }, '', context.svg, true)
-                jQuery('#server-chart-'+server_id+' .ct-label.ct-vertical').each(function(index, elmn) {
+                \$('#server-chart-'+server_id+' .ct-label.ct-vertical').each(function(index, elmn) {
                     elmn.innerHTML = filesize(elmn.innerHTML, {round: 1}).replace(' ','')
                 })
             });
         })
-
-        // Limit input to sensible values
-        jQuery('#chart-start').attr("max", jQuery('#chart-end').val())
-        jQuery('#chart-end').attr("min", jQuery('#chart-start').val())
     }
 
     // Need to mitigate timezone effects!
@@ -475,21 +411,21 @@
     /**
         When finished loading
     **/
-    jQuery(document).ready(function(){
-        // Initialize tooltips
-        jQuery('[data-toggle="tooltip"]').tooltip()
-        
-        // Reload form in case we change items that make the servers appear different
-        jQuery('input[name="priority"], input[name="displayname"], textarea[name="notes"]').on('change', function(event) {
-            var parentForm = jQuery(event.target).parents("form")
-            parentForm.unbind("submit")
-            parentForm.find('input[name="ajax"]').val('')
+    \$(document).ready(function(){
+        // Exception when change of priority, reload
+        \$('input[name="priority"], input[name="displayname"]').on('change', function() {
+            \$('.fullform').submit(function() {
+                // No ajax this time
+                \$('input[name="ajax"]').val('')
+                // Skip the fancy stuff, just submit
+                this.submit()
+            })
         })
 
         /**
             Update charts when changed
         **/
-        jQuery('#chart-start, #chart-end').on('change', function(elemn) {
+        \$('#chart-selector').on('change', function(elemn) {
             showCharts()
 
             // Lets us leave (needs to be called after the change event)
@@ -504,16 +440,16 @@
         /**
             Click events
         **/
-        jQuery('.showserver').click(function () {
-            if(jQuery(this).parent().hasClass('server-disabled')) {
-                jQuery(this).parent().parent().toggleClass('server-disabled')
+        \$('.showserver').click(function () {
+            if(\$(this).parent().hasClass('server-disabled')) {
+                \$(this).parent().parent().toggleClass('server-disabled')
             }
-            jQuery(this).parent().next().toggle();
-            jQuery(this).parent().next().next().toggle();
-            if (jQuery(this).text().indexOf("$T('showDetails')") > 0) {
-                jQuery(this).html(jQuery(this).html().replace("$T('showDetails')", "$T('hideDetails')"));
+            \$(this).parent().next().toggle();
+            \$(this).parent().next().next().toggle();
+            if (\$(this).text().indexOf("$T('showDetails')") > 0) {
+                \$(this).html(\$(this).html().replace("$T('showDetails')", "$T('hideDetails')"));
             } else {
-                jQuery(this).html(jQuery(this).html().replace("$T('hideDetails')", "$T('showDetails')"));
+                \$(this).html(\$(this).html().replace("$T('hideDetails')", "$T('showDetails')"));
                 // Recalculate the charts if changed while details were open
                 showCharts()
             }
@@ -521,24 +457,24 @@
             addRowColor()
         });
 
-        jQuery('#addServerButton').click(function(){
-            jQuery('#addServerContent').show();
+        \$('#addServerButton').click(function(){
+            \$('#addServerContent').show();
             // Add coloring
             addRowColor()
         });
 
-        jQuery('[name="ssl"]').click(function() {
+        \$('[name="ssl"]').click(function() {
             // Use CSS transitions to do some highlighting
-            var portBox = jQuery(this).parent().parent().find('[name="port"]')
+            var portBox = \$(this).parent().parent().find('[name="port"]')
             if(this.checked) {
                 // Enabled SSL change port when not already a custom port
-                if(portBox.val() === '119') {
+                if(portBox.val() == '119') {
                     portBox.val('563')
                     portBox.addClass('port-highlight')
                 }
             } else {
                 // Remove SSL port
-                if(portBox.val() === '563') {
+                if(portBox.val() == '563') {
                     portBox.val('119')
                     portBox.addClass('port-highlight')
                 }
@@ -547,16 +483,16 @@
         })
 
         // Testing servers
-        jQuery('.testServer').click(function(event){
+        \$('.testServer').click(function(event){
             removeObfuscation()
-            var theButton = jQuery(this)
+            var theButton = \$(this)
             var resultBox = theButton.parents('.col1').find('.result-box .alert');
             theButton.attr("disabled", "disabled")
             theButton.find('span').toggleClass('glyphicon-sort glyphicon-refresh spin-glyphicon')
-            jQuery.ajax({
+            \$.ajax({
                 type: "POST",
                 url: "../../api",
-                data: "mode=config&name=test_server&" + jQuery(this).parents('form:first').serialize()
+                data: "mode=config&output=json&name=test_server&" + \$(this).parents('form:first').serialize()
             }).then(function(data) {
                 // Let's replace the link
                 msg = data.value.message.replace('https://sabnzbd.org/certificate-errors', '<a href="https://sabnzbd.org/certificate-errors" class="alert-link" target="_blank">https://sabnzbd.org/certificate-errors</a>')
@@ -567,37 +503,20 @@
                 theButton.removeAttr("disabled")
                 theButton.find('span').toggleClass('glyphicon-sort glyphicon-refresh spin-glyphicon')
 
-                // Success or not?
+                // Succes or not?
                 if(data.value.result) {
                     resultBox.addClass('alert-success')
                     resultBox.prepend('<span class="glyphicon glyphicon-ok-sign"></span> ')
-
-                    // Allow adding the new server if we are in the new-server section
-                    if(theButton.parents("form[action='addServer']").length) {
-                        jQuery(".addNewServer").removeAttr("disabled")
-                        jQuery(".addNewServer").removeAttr("data-toggle")
-                        jQuery(".addNewServer").removeAttr("title")
-                        jQuery(".addNewServer").tooltip("destroy")
-                    }
                 } else {
                     resultBox.addClass('alert-danger')
                     resultBox.prepend('<span class="glyphicon glyphicon-exclamation-sign"></span> ')
-
-                    // Disable the adding of new server, just to be sure
-                    if(theButton.parents("form[action='addServer']").length) {
-                        jQuery(".addNewServer").attr("disabled", "disabled")
-                        jQuery(".addNewServer").attr("data-toggle", "tooltip")
-                        jQuery(".addNewServer").attr("data-placement", "top")
-                        jQuery(".addNewServer").attr("title", "$T('wizard-test-server-required')")
-                        jQuery(".addNewServer").tooltip()
-                    }
                 }
             });
         });
 
-        jQuery('.delServer').click(function(){
-            if( confirm("$T('confirm')") ) {
-                jQuery(this).parents('form:first').attr('action','delServer').submit();
+        \$('.delServer').click(function(){
+            if( confirm("$T('Plush-confirm')") ) {
+                \$(this).parents('form:first').attr('action','delServer').submit();
                 // Let us leave!
                 formWasSubmitted = true;
                 formHasChanged = false;
@@ -606,9 +525,9 @@
             return false;
         });
 
-        jQuery('.clrServer').click(function(){
-            if( confirm("$T('confirm')") ) {
-                jQuery(this).parents('form:first').attr('action','clrServer').submit();
+        \$('.clrServer').click(function(){
+            if( confirm("$T('Plush-confirm')") ) {
+                \$(this).parents('form:first').attr('action','clrServer').submit();
                 // Let us leave!
                 formWasSubmitted = true;
                 formHasChanged = false;
@@ -617,9 +536,9 @@
             return false;
         });
 
-        jQuery('.toggleServerCheckbox').click(function(){
-            var whichServer = jQuery(this).attr("name");
-            jQuery.ajax({
+        \$('.toggleServerCheckbox').click(function(){
+            var whichServer = \$(this).attr("name");
+            \$.ajax({
                 type: "POST",
                 url: "toggleServer",
                 data: {server: whichServer, apikey: "$apikey" }
@@ -630,35 +549,6 @@
                 setTimeout(function() { location.reload(); }, 100)
             });
         });
-
-        // Show text-ad if there is space
-        if((jQuery("body").width() - jQuery("#content").width())/2 > (jQuery('.Servers .server-frame').width() + 40)) {
-            // Do not show if dismissed previously
-            if(localStorage.getItem("server-frame-hide-$version") === null) {
-                // Let the page on the server tell us if we need to show
-                function receiveMessage(event) {
-                    // Check origin of message for security reasons
-                    if(event.origin === 'https://sabnzbd.org') {
-                        if(event.data === 'show_server') {
-                            jQuery('.Servers .server-frame').show()
-                            jQuery('.Servers .server-frame a').click(function () {
-                                localStorage.setItem("server-frame-hide-$version", "hide")
-                                jQuery('.Servers .server-frame').hide()
-                            })
-                        }
-                        if(event.data === 'hide_server') {
-                            // Hide and don't load anymore until the next release
-                            jQuery('.Servers .server-frame').hide()
-                            localStorage.setItem("server-frame-hide-$version", "hide")
-                        }
-                    }
-                }
-                window.addEventListener("message", receiveMessage, false);
-
-                // NOTE: The hash-part cannot be seen by the server, so we don't know which hostnames you use!
-                jQuery('.Servers .server-frame iframe').attr("src", "https://sabnzbd.org/servers#$active_lang" + hostnames)
-            }
-        }
     });
 </script>
 

interfaces/Config/templates/config_special.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Special"#-->
-<!--#set global $help_uri = $confighelpuri + "special"#-->
+<!--#set global $help_uri="configuration/3.1/special"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -10,7 +10,7 @@
         </div>
         <div class="section">
             <div class="col2">
-                <h3>$T('sptag-boolean') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('sptag-boolean') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -33,7 +33,7 @@
         </div><!-- /section -->
         <div class="section">
             <div class="col2">
-                <h3>$T('sptag-entries') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('sptag-entries') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>

interfaces/Config/templates/config_switches.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Switches"#-->
-<!--#set global $help_uri = $confighelpuri + "switches"#-->
+<!--#set global $help_uri="configuration/3.1/switches"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -11,13 +11,21 @@
     <form action="saveSwitches" method="post" name="fullform" class="fullform" autocomplete="off">
         <input type="hidden" id="apikey" name="apikey" value="$apikey" />
         <input type="hidden" id="ajax" name="ajax" value="1" />
-        <input type="hidden" name="output" value="json" />
         <div class="section advanced-settings">
             <div class="col2">
-                <h3>$T('swtag-server') <a href="$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-server') <a href="$helpuri$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
+                    <div class="field-pair">
+                        <label class="config" for="load_balancing">$T('opt-load_balancing')</label>
+                        <select name="load_balancing" id="load_balancing">
+                            <option value="0" <!--#if $load_balancing == 0 then 'selected="selected"' else ""#--> >$T('no-load-balancing')</option>
+                            <option value="1" <!--#if $load_balancing == 1 then 'selected="selected"' else ""#--> >$T('load-balancing')</option>
+                            <option value="2" <!--#if $load_balancing == 2 then 'selected="selected"' else ""#--> >$T('load-balancing-happy-eyeballs')</option>
+                        </select>
+                        <span class="desc">$T('explain-load_balancing')</span>
+                    </div>
                     <div class="field-pair">
                         <label class="config" for="max_art_tries">$T('opt-max_art_tries')</label>
                         <input type="number" name="max_art_tries" id="max_art_tries" value="$max_art_tries" min="2" max="2000" />
@@ -37,11 +45,11 @@
         </div><!-- /section -->
         <div class="section">
             <div class="col2">
-                <h3>$T('swtag-queue') <a href="$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-queue') <a href="$helpuri$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
                         <label class="config" for="pre_script">$T('opt-pre_script')</label>
                         <select name="pre_script" id="pre_script">
                         <!--#for $sc in $scripts#-->
@@ -54,22 +62,9 @@
                         </select>
                         <span class="desc">$T('explain-pre_script')</span>
                     </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="end_queue_script">$T('opt-end_queue_script')</label>
-                        <select name="end_queue_script" id="end_queue_script">
-                        <!--#for $sc in $scripts#-->
-                            <!--#if $sc.lower() == $end_queue_script.lower()#-->
-                                <option value="$sc" selected="selected">$Tspec($sc)</option>
-                            <!--#else#-->
-                                <option value="$sc">$Tspec($sc)</option>
-                            <!--#end if#-->
-                        <!--#end for#-->
-                        </select>
-                        <span class="desc">$T('explain-end_queue_script')</span>
-                    </div>
                     <div class="field-pair">
                         <label class="config" for="propagation_delay">$T('opt-propagation_delay')</label>
-                        <input type="number" name="propagation_delay" id="propagation_delay" value="$propagation_delay" min="0" /> <i>$T('minutes')</i>
+                        <input type="number" name="propagation_delay" id="propagation_delay" value="$propagation_delay" /> <i>$T('minutes')</i>
                         <span class="desc">$T('explain-propagation_delay')</span>
                     </div>
                     <div class="field-pair advanced-settings">
@@ -93,48 +88,38 @@
                             <option value="0" <!--#if int($no_dupes) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
                             <option value="4" <!--#if int($no_dupes) == 4 then 'selected="selected"' else ""#--> >$T('nodupes-tag')</option>
                             <option value="2" <!--#if int($no_dupes) == 2 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="3" <!--#if int($no_dupes) == 3 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
+                            <option value="3" <!--#if int($no_dupes) == 3 then 'selected="selected"' else ""#--> >$T('nodupes-fail')</option>
                             <option value="1" <!--#if int($no_dupes) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-ignore')</option>
                         </select>
-                        <span class="desc">
-                            $T('explain-no_dupes')<br>
-                            <a href="https://sabnzbd.org/wiki/duplicate-detection" target="_blank">https://sabnzbd.org/wiki/duplicate-detection</a>
-                        </span>
+                        <span class="desc">$T('explain-no_dupes')</span>
                     </div>
                     <div class="field-pair">
-                        <label class="config" for="no_smart_dupes">$T('opt-no_smart_dupes')</label>
-                        <select name="no_smart_dupes" id="no_smart_dupes">
-                            <option value="0" <!--#if int($no_smart_dupes) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
-                            <option value="4" <!--#if int($no_smart_dupes) == 4 then 'selected="selected"' else ""#--> >$T('nodupes-tag')</option>
-                            <option value="2" <!--#if int($no_smart_dupes) == 2 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="3" <!--#if int($no_smart_dupes) == 3 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
-                            <option value="1" <!--#if int($no_smart_dupes) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-ignore')</option>
+                        <label class="config" for="no_series_dupes">$T('opt-no_series_dupes')</label>
+                        <select name="no_series_dupes" id="no_series_dupes">
+                            <option value="0" <!--#if int($no_series_dupes) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
+                            <option value="4" <!--#if int($no_series_dupes) == 4 then 'selected="selected"' else ""#--> >$T('nodupes-tag')</option>
+                            <option value="2" <!--#if int($no_series_dupes) == 2 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
+                            <option value="3" <!--#if int($no_series_dupes) == 3 then 'selected="selected"' else ""#--> >$T('nodupes-fail')</option>
+                            <option value="1" <!--#if int($no_series_dupes) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-ignore')</option>
                         </select>
-                        <span class="desc">
-                            $T('explain-no_smart_dupes')<br>
-                            <a href="https://sabnzbd.org/wiki/duplicate-detection" target="_blank">https://sabnzbd.org/wiki/duplicate-detection</a>
-                        </span>
+                        <span class="desc">$T('explain-no_series_dupes')</span>
                     </div>
                     <div class="field-pair advanced-settings">
-                        <label class="config" for="dupes_propercheck">$T('opt-dupes_propercheck')</label>
-                        <input type="checkbox" name="dupes_propercheck" id="dupes_propercheck" value="1" <!--#if int($dupes_propercheck) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-dupes_propercheck')</span>
+                        <label class="config" for="series_propercheck">$T('opt-series_propercheck')</label>
+                        <input type="checkbox" name="series_propercheck" id="series_propercheck" value="1" <!--#if int($series_propercheck) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-series_propercheck')</span>
                     </div>
                     <div class="field-pair">
                         <label class="config" for="pause_on_pwrar">$T('opt-pause_on_pwrar')</label>
                         <select name="pause_on_pwrar" id="pause_on_pwrar">
                             <option value="0" <!--#if int($pause_on_pwrar) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
                             <option value="1" <!--#if int($pause_on_pwrar) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="2" <!--#if int($pause_on_pwrar) == 2 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
+                            <option value="2" <!--#if int($pause_on_pwrar) == 2 then 'selected="selected"' else ""#--> >$T('abort')</option>
                         </select>
                         <span class="desc">$T('explain-pause_on_pwrar')</span>
                     </div>
                     <div class="field-pair">
                         <label class="config" for="unwanted_extensions">$T('opt-unwanted_extensions')</label>
-                        <select name="unwanted_extensions_mode" id="unwanted_extensions_mode">
-                            <option value="0" <!--#if int($unwanted_extensions_mode) == 0 then 'selected="selected"' else ""#--> >$T('unwanted_extensions_blacklist')</option>
-                            <option value="1" <!--#if int($unwanted_extensions_mode) == 1 then 'selected="selected"' else ""#--> >$T('unwanted_extensions_whitelist')</option>
-                        </select>
                         <input type="text" name="unwanted_extensions" id="unwanted_extensions" value="$unwanted_extensions"/>
                         <span class="desc">$T('explain-unwanted_extensions')</span>
                     </div>
@@ -143,7 +128,7 @@
                         <select name="action_on_unwanted_extensions" id="action_on_unwanted_extensions">
                             <option value="0" <!--#if int($action_on_unwanted_extensions) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
                             <option value="1" <!--#if int($action_on_unwanted_extensions) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="2" <!--#if int($action_on_unwanted_extensions) == 2 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
+                            <option value="2" <!--#if int($action_on_unwanted_extensions) == 2 then 'selected="selected"' else ""#--> >$T('abort')</option>
                         </select>
                         <span class="desc">$T('explain-action_on_unwanted_extensions')</span>
                     </div>
@@ -151,15 +136,14 @@
                         <label class="config" for="auto_sort">$T('opt-auto_sort')</label>
                         <select name="auto_sort" id="auto_sort">
                             <option value="">$T('default')</option>
-                            <option value="remaining asc" <!--#if $auto_sort == "remaining asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortRemaining')</option>
-                            <option value="avg_age desc" <!--#if $auto_sort == "avg_age desc" then 'selected="selected"' else ""#--> >$T('Glitter-sortAgeAsc')</option>
-                            <option value="avg_age asc" <!--#if $auto_sort == "avg_age asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortAgeDesc')</option>
+                            <option value="avg_age asc" <!--#if $auto_sort == "avg_age asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortAgeAsc')</option>
+                            <option value="avg_age desc" <!--#if $auto_sort == "avg_age desc" then 'selected="selected"' else ""#--> >$T('Glitter-sortAgeDesc')</option>
                             <option value="name asc" <!--#if $auto_sort == "name asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortNameAsc')</option>
                             <option value="name desc" <!--#if $auto_sort == "name desc" then 'selected="selected"' else ""#--> >$T('Glitter-sortNameDesc')</option>
                             <option value="size asc" <!--#if $auto_sort == "size asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortSizeAsc')</option>
                             <option value="size desc" <!--#if $auto_sort == "size desc" then 'selected="selected"' else ""#--> >$T('Glitter-sortSizeDesc')</option>
                         </select>
-                        <span class="desc">$T('explain-auto_sort') $T('explain-auto_sort_remaining')</span>
+                        <span class="desc">$T('explain-auto_sort')</span>
                     </div>
                     <div class="field-pair">
                         <label class="config" for="direct_unpack">$T('opt-direct_unpack')</label>
@@ -175,7 +159,7 @@
         </div><!-- /section -->
         <div class="section">
             <div class="col2">
-                <h3>$T('swtag-pp') <a href="$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-pp') <a href="$helpuri$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -189,16 +173,16 @@
                         <input type="checkbox" name="enable_all_par" id="enable_all_par" value="1" <!--#if int($enable_all_par) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-enable_all_par').replace('. ', '.<br/>')</span>
                     </div>
-                    <!--#if not $windows#-->
+                    <!--#if not $nt#-->
                     <div class="field-pair advanced-settings <!--#if not $have_nice then "disabled" else "" #-->">
                         <label class="config" for="nice">$T('opt-nice')</label>
                         <input type="text" name="nice" id="nice" value="$nice" <!--#if not $have_nice then 'readonly="readonly" disabled="disabled"' else "" #--> />
-                        <span class="desc">$T('readwiki')</span>
+                        <span class="desc">$T('explain-nice')</span>
                     </div>
                     <div class="field-pair advanced-settings <!--#if not $have_ionice then "disabled" else "" #-->">
                         <label class="config" for="ionice">$T('opt-ionice')</label>
                         <input type="text" name="ionice" id="ionice" value="$ionice" <!--#if not $have_ionice then 'readonly="readonly" disabled="disabled"' else "" #--> />
-                        <span class="desc">$T('readwiki')</span>
+                        <span class="desc">$T('explain-ionice')</span>
                     </div>
                     <!--#else#-->
                     <div class="field-pair advanced-settings">
@@ -210,13 +194,13 @@
                             <option value="2" <!--#if int($win_process_prio) == 2 then 'selected="selected"' else ""#-->>$T('win_process_prio-low')</option>
                             <option value="1" <!--#if int($win_process_prio) == 1 then 'selected="selected"' else ""#-->>$T('win_process_prio-idle')</option>
                         </select>
-                        <span class="desc">$T('readwiki')</span>
+                        <span class="desc">$T('explain-win_process_prio')</span>
                     </div>
                     <!--#end if#-->
                     <div class="field-pair advanced-settings">
                         <label class="config" for="par_option">$T('opt-par_option')</label>
                         <input type="text" name="par_option" id="par_option" value="$par_option" />
-                        <span class="desc">$T('readwiki')</span>
+                        <span class="desc">$T('explain-par_option')</span>
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="sfv_check">$T('opt-sfv_check')</label>
@@ -243,6 +227,11 @@
                         <input type="checkbox" name="script_can_fail" id="script_can_fail" value="1" <!--#if int($script_can_fail) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-script_can_fail')</span>
                     </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="new_nzb_on_failure">$T('opt-new_nzb_on_failure')</label>
+                        <input type="checkbox" name="new_nzb_on_failure" id="new_nzb_on_failure" value="1" <!--#if int($new_nzb_on_failure) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-new_nzb_on_failure')</span>
+                    </div>
                     <div class="field-pair">
                         <label class="config" for="ignore_samples">$T('opt-ignore_samples')</label>
                         <input type="checkbox" name="ignore_samples" id="ignore_samples" value="1" <!--#if int($ignore_samples) > 0 then 'checked="checked"' else ""#--> />
@@ -251,7 +240,12 @@
                     <div class="field-pair">
                         <label class="config" for="deobfuscate_final_filenames">$T('opt-deobfuscate_final_filenames')</label>
                         <input type="checkbox" name="deobfuscate_final_filenames" id="deobfuscate_final_filenames" value="1" <!--#if int($deobfuscate_final_filenames) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-deobfuscate_final_filenames') $T('explain-deobfuscate_final_filenames-ext')</span>
+                        <span class="desc">$T('explain-deobfuscate_final_filenames')</span>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="enable_meta">$T('opt-enable_meta')</label>
+                        <input type="checkbox" name="enable_meta" id="enable_meta" value="1" <!--#if int($enable_meta) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-enable_meta').replace('. ', '.<br/>')</span>
                     </div>
                     <div class="field-pair">
                         <label class="config" for="cleanup_list">$T('opt-cleanup_list')</label>
@@ -259,17 +253,16 @@
                         <span class="desc">$T('explain-cleanup_list')</span>
                     </div>
                     <div class="field-pair">
-                        <label class="config" for="history_retention_option">$T('opt-history_retention')</label>
-                        <select name="history_retention_option" id="history_retention_option">
-                            <option value="all" <!--#if $auto_sort == "all" then 'selected="selected"' else ""#-->>$T('history_retention-all')</option>
-                            <option value="number-archive" <!--#if $history_retention_option == "number-archive" then 'selected="selected"' else ""#-->>$T('history_retention-number-archive')</option>
-                            <option value="number-delete" <!--#if $history_retention_option == "number-delete" then 'selected="selected"' else ""#-->>$T('history_retention-number-delete')</option>
-                            <option value="days-archive" <!--#if $history_retention_option == "days-archive" then 'selected="selected"' else ""#-->>$T('history_retention-days-archive')</option>
-                            <option value="days-delete" <!--#if $history_retention_option == "days-delete" then 'selected="selected"' else ""#-->>$T('history_retention-days-delete')</option>
-                            <option value="all-archive" <!--#if $history_retention_option == "all-archive" then 'selected="selected"' else ""#-->>$T('history_retention-archive')</option>
-                            <option value="all-delete" <!--#if $history_retention_option == "all-delete" then 'selected="selected"' else ""#-->>$T('history_retention-none')</option>
+                        <label class="config" for="history_retention_select">$T('opt-history_retention')</label>
+                        <input type="hidden" name="history_retention" id="history_retention" value="$history_retention">
+                        <select name="history_retention_select" id="history_retention_select">
+                            <option value="0">$T('history_retention-all')</option>
+                            <option value="n">$T('history_retention-number')</option>
+                            <option value="d">$T('history_retention-days')</option>
+                            <option value="-1">$T('history_retention-none')</option>
                         </select>
-                        <input type="number" id="history_retention_number" name="history_retention_number" min="1" value="$history_retention_number">
+                        <input type="number" id="history_retention_number" name="history_retention_number" min="1">
+                        <span class="desc">$T('explain-history_retention').replace('. ', '.<br/>')</span>
                     </div>
                     <div class="field-pair">
                         <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
@@ -280,7 +273,7 @@
         </div><!-- /section -->
         <div class="section advanced-settings">
             <div class="col2">
-                <h3>$T('swtag-naming') <a href="$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-naming') <a href="$helpuri$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -294,17 +287,12 @@
                         <input type="checkbox" name="replace_spaces" id="replace_spaces" value="1" <!--#if int($replace_spaces) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-replace_spaces')</span>
                     </div>
-                    <div class="field-pair">
-                        <label class="config" for="replace_underscores">$T('opt-replace_underscores')</label>
-                        <input type="checkbox" name="replace_underscores" id="replace_underscores" value="1" <!--#if int($replace_underscores) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-replace_underscores')</span>
-                    </div>
                     <div class="field-pair">
                         <label class="config" for="replace_dots">$T('opt-replace_dots')</label>
                         <input type="checkbox" name="replace_dots" id="replace_dots" value="1" <!--#if int($replace_dots) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-replace_dots')</span>
                     </div>
-                    <!--#if not $windows#-->
+                    <!--#if not $nt#-->
                     <div class="field-pair">
                         <label class="config" for="sanitize_safe">$T('opt-sanitize_safe')</label>
                         <input type="checkbox" name="sanitize_safe" id="sanitize_safe" value="1" <!--#if int($sanitize_safe) > 0 then 'checked="checked"' else ""#--> />
@@ -320,7 +308,7 @@
         </div><!-- /section -->
         <div class="section">
             <div class="col2">
-                <h3>$T('swtag-quota') <a href="$help_uri#toc5" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-quota') <a href="$helpuri$help_uri#toc5" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -355,33 +343,199 @@
                 </fieldset>
             </div><!-- /col1 -->
         </div><!-- /section -->
+        <div class="section">
+            <div class="col2">
+                <h3>$T('swtag-indexing') <a href="$helpuri$help_uri#toc6" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            </div><!-- /col2 -->
+            <div class="col1">
+                <fieldset>
+                    <div class="field-pair">
+                        <label class="config" for="rating_enable">$T('opt-rating_enable')</label>
+                        <input type="checkbox" name="rating_enable" id="rating_enable" value="1" <!--#if int($rating_enable) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-rating_enable').replace('. ', '.<br/>')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="rating_api_key">$T('opt-rating_api_key')</label>
+                        <input type="text" name="rating_api_key" id="rating_api_key" value="$rating_api_key" />
+                        <span class="desc">$T('explain-rating_api_key')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="rating_filter_enable">$T('opt-rating_filter_enable')</label>
+                        <input type="checkbox" name="rating_filter_enable" id="rating_filter_enable" value="1" <!--#if int($rating_filter_enable) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-rating_filter_enable')</span>
+                    </div>
+                    <div class="field-pair" id="rating_filter_abort">
+                        <label class="config">$T('opt-rating_filter_abort_if')</label>
+                        <div class="rating-filter">
+                            <p>
+                                <label for="rating_filter_abort_video">$T('opt-rating_filter_video')</label>
+                                <select name="rating_filter_abort_video" id="rating_filter_abort_video">
+                                    <option value="0" <!--#if $rating_filter_abort_video == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
+                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_abort_video == $val then 'selected="selected"' else ""#--> >$val $T('orLess')</option><!--#end for#-->
+                                </select>
+                            </p>
+                            <p>
+                                <label for="rating_filter_abort_audio">$T('opt-rating_filter_audio')</label>
+                                <select name="rating_filter_abort_audio" id="rating_filter_abort_audio">
+                                    <option value="0" <!--#if $rating_filter_abort_audio == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
+                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_abort_audio == $val then 'selected="selected"' else ""#--> >$val $T('orLess')</option><!--#end for#-->
+                                </select>
+                            </p>
+                            <p>
+                                <span>
+                                    <input type="checkbox" value="1" id="rating_filter_abort_encrypted" name="rating_filter_abort_encrypted" <!--#if int($rating_filter_abort_encrypted) > 0 then 'checked="checked"' else ""#--> />
+                                    <label for="rating_filter_abort_encrypted">$T('opt-rating_filter_passworded')</label>
+                                </span>
+                                <span>
+                                    <input type="checkbox" value="1" id="rating_filter_abort_encrypted_confirm" name="rating_filter_abort_encrypted_confirm" <!--#if int($rating_filter_abort_encrypted_confirm) > 0 then 'checked="checked"' else ""#--> />
+                                    <label for="rating_filter_abort_encrypted_confirm">$T('opt-rating_filter_confirmed')</label>
+                                </span>
+                            </p>
+                            <p>
+                                <span>
+                                    <input type="checkbox" value="1" id="rating_filter_abort_spam" name="rating_filter_abort_spam" <!--#if int($rating_filter_abort_spam) > 0 then 'checked="checked"' else ""#--> />
+                                    <label for="rating_filter_abort_spam">$T('opt-rating_filter_spam')</label>
+                                </span>
+                                <span>
+                                    <input type="checkbox" value="1" id="rating_filter_abort_spam_confirm" name="rating_filter_abort_spam_confirm" <!--#if int($rating_filter_abort_spam_confirm) > 0 then 'checked="checked"' else ""#--> />
+                                    <label for="rating_filter_abort_spam_confirm">$T('opt-rating_filter_confirmed')</label>
+                                </span>
+                            </p>
+                            <p>
+                                <input type="checkbox" value="1" id="rating_filter_abort_downvoted" name="rating_filter_abort_downvoted" <!--#if int($rating_filter_abort_downvoted) > 0 then 'checked="checked"' else ""#--> />
+                                <label for="rating_filter_abort_downvoted">$T('opt-rating_filter_downvoted')</label>
+                            </p>
+                            <p>
+                                <label for="rating_filter_abort_keywords">$T('opt-rating_filter_keywords')</label>
+                                <input type="text" name="rating_filter_abort_keywords" id="rating_filter_abort_keywords" value="$rating_filter_abort_keywords"/>
+                                <span class="desc">$T('explain-rating_filter_keywords')</span>
+                            </p>
+                        </div>
+                    </div>
+                    <div class="field-pair" id="rating_filter_pause">
+                        <label class="config">$T('opt-rating_filter_pause_if')</label>
+                        <div class="rating-filter">
+                            <p>
+                                <label for="rating_filter_pause_video">$T('opt-rating_filter_video')</label>
+                                <select name="rating_filter_pause_video" id="rating_filter_pause_video">
+                                    <option value="0" <!--#if $rating_filter_pause_video == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
+                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_pause_video == $val then 'selected="selected"' else ""#--> >$val $T('orLess')</option><!--#end for#-->
+                                </select>
+                            </p>
+                            <p>
+                                <label for="rating_filter_pause_audio">$T('opt-rating_filter_audio')</label>
+                                <select name="rating_filter_pause_audio" id="rating_filter_pause_audio">
+                                    <option value="0" <!--#if $rating_filter_pause_audio == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
+                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_pause_audio == $val then 'selected="selected"' else ""#--> >$val $T('orLess') </option><!--#end for#-->
+                                </select>
+                            </p>
+                            <p>
+                                <span>
+                                    <input type="checkbox" value="1" id="rating_filter_pause_encrypted" name="rating_filter_pause_encrypted" <!--#if int($rating_filter_pause_encrypted) > 0 then 'checked="checked"' else ""#--> />
+                                    <label for="rating_filter_pause_encrypted">$T('opt-rating_filter_passworded')</label>
+                                </span>
+                                <span>
+                                    <input type="checkbox" value="1" id="rating_filter_pause_encrypted_confirm" name="rating_filter_pause_encrypted_confirm" <!--#if int($rating_filter_pause_encrypted_confirm) > 0 then 'checked="checked"' else ""#--> />
+                                    <label for="rating_filter_pause_encrypted_confirm">$T('opt-rating_filter_confirmed')</label>
+                                </span>
+                            </p>
+                            <p>
+                                <span>
+                                    <input type="checkbox" value="1" id="rating_filter_pause_spam" name="rating_filter_pause_spam" <!--#if int($rating_filter_pause_spam) > 0 then 'checked="checked"' else ""#--> />
+                                    <label for="rating_filter_pause_spam">$T('opt-rating_filter_spam')</label>
+                                </span>
+                                <span>
+                                    <input type="checkbox" value="1" id="rating_filter_pause_spam_confirm" name="rating_filter_pause_spam_confirm" <!--#if int($rating_filter_pause_spam_confirm) > 0 then 'checked="checked"' else ""#--> />
+                                    <label for="rating_filter_pause_spam_confirm">$T('opt-rating_filter_confirmed')</label>
+                                </span>
+                            </p>
+                            <p>
+                                <input type="checkbox" value="1" id="rating_filter_pause_downvoted" name="rating_filter_pause_downvoted" <!--#if int($rating_filter_pause_downvoted) > 0 then 'checked="checked"' else ""#--> />
+                                <label for="rating_filter_pause_downvoted">$T('opt-rating_filter_downvoted')</label>
+                            </p>
+                            <p>
+                                <label for="rating_filter_pause_keywords">$T('opt-rating_filter_keywords')</label>
+                                <input type="text" name="rating_filter_pause_keywords" id="rating_filter_pause_keywords" value="$rating_filter_pause_keywords"/>
+                                <span class="desc">$T('explain-rating_filter_keywords')</span>
+                            </p>
+                        </div>
+                    </div>
+                    <div class="field-pair">
+                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                    </div>
+                </fieldset>
+            </div><!-- /col1 -->
+        </div><!-- /section -->
     </form>
 </div><!-- /colmask -->
 
 <script type="text/javascript">
-jQuery(document).ready(function() {
-    jQuery('#history_retention_option').on('change', updateHistoryRetention)
-    function updateHistoryRetention() {
-        var retention_option = jQuery('#history_retention_option').val()
-        var retention_number = jQuery('#history_retention_number')
+\$(document).ready(function() {
+    if (!\$('#rating_filter_enable').is(":checked")) {
+        \$("#rating_filter_abort").hide();
+        \$("#rating_filter_pause").hide();
+    }
+    \$('#rating_filter_enable').change(function () {
+        if (\$(this).is(":checked")) {
+            \$("#rating_filter_abort").show();
+            \$("#rating_filter_pause").show();
+        }
+        else {
+            \$("#rating_filter_abort").hide();
+            \$("#rating_filter_pause").hide();
+        }
+    });
 
-        if(retention_option === "number-archive" || retention_option === "number-delete") {
-            retention_number.show()
-            retention_number.attr('placeholder', '$T('history_retention-limit')')
-        } else if(retention_option === "days-archive" || retention_option === "days-delete") {
-            retention_number.show()
-            retention_number.attr('placeholder', '$T('days').capitalize()')
-        } else {
+    \$('#history_retention_select, #history_retention_number').on('change', updateHistoryRetention)
+    function updateHistoryRetention() {
+        var retention_setting = \$('#history_retention')
+        var retention_select = \$('#history_retention_select').val()
+        var retention_number = \$('#history_retention_number')
+        // Keep all or keep none
+        if(retention_select == "0" || retention_select == "-1") {
             retention_number.hide()
             retention_number.val('')
             retention_number.attr('placeholder', '')
+            retention_setting.val(retention_select)
+        } else {
+            retention_number.show()
+            // Days or number?
+            if(retention_select.indexOf("d") !== -1) {
+                retention_number.attr('placeholder', '$T('days').capitalize()')
+                if(retention_number.val()) {
+                    retention_setting.val(retention_number.val() + 'd')
+                } else if(parseInt(retention_setting.val()) > 0) {
+                    retention_number.val(parseInt(retention_setting.val()))
+                }
+            } else {
+                retention_number.attr('placeholder', '$T('history_retention-limit')')
+                if(retention_number.val()) {
+                    retention_setting.val(retention_number.val())
+                } else if(parseInt(retention_setting.val()) > 0) {
+                    retention_number.val(parseInt(retention_setting.val()))
+                }
+            }
         }
     }
-    updateHistoryRetention()
+    // Set the history-retention settig
+    var retention_setting_value = \$('#history_retention').val()
+    if(parseInt(retention_setting_value) > 0) {
+        // Days or number?
+        if(retention_setting_value.indexOf("d") !== -1) {
+            \$('#history_retention_select').val("d")
+        } else {
+            \$('#history_retention_select').val("n")
+        }
+        \$('#history_retention_number').val(parseInt(retention_setting_value))
+    } else {
+        // Keep all or keep none
+        \$('#history_retention_select').val(retention_setting_value)
+        \$('#history_retention_number').hide()
+    }
 
-    jQuery('.restoreDefaults').click(function(e) {
+    \$('.restoreDefaults').click(function(e) {
         // Get section name
-        var sectionName = jQuery(this).parents('.section').find('.col2 h3').text().trim()
+        var sectionName = \$(this).parents('.section').find('.col2 h3').text().trim()
 
         // Confirm?
         if(!confirm("$T('explain-restoreDefaults') \""+sectionName+"\"\n$T('confirm')")) return false
@@ -389,11 +543,11 @@ jQuery(document).ready(function() {
 
         // Need to get all the input values, so same way as saving normally
         var key_container = {}
-        jQuery(this).parents('.section').extractFormDataTo(key_container);
+        \$(this).parents('.section').extractFormDataTo(key_container);
         key_container = Object.keys(key_container)
 
         // Send request
-        jQuery.ajax({
+        \$.ajax({
             type: "GET",
             url: "../../api",
             data: "mode=set_config_default&apikey=${apikey}&output=json&keyword=" + key_container.join('&keyword=')

interfaces/Config/templates/login/main.tmpl

@@ -1,4 +1,3 @@
-<!DOCTYPE HTML>
 <html lang="$active_lang">
 <head>
     <title>SABnzbd - $T('login')</title>
@@ -16,9 +15,6 @@
 
     <link rel="stylesheet" type="text/css" href="../staticcfg/bootstrap/css/bootstrap.min.css?v=$version" />
     <link rel="stylesheet" type="text/css" href="../staticcfg/css/login.css?v=$version" />
-    <!--#if $color_scheme not in ('Light', '') #-->
-    <link rel="stylesheet" type="text/css" href="../staticcfg/css/${color_scheme}.css?v=$version"/>
-    <!--#end if#-->
 
     <script type="text/javascript" src="../staticcfg/js/jquery-3.5.1.min.js?v=$version"></script>
     <script type="text/javascript" src="../staticcfg/bootstrap/js/bootstrap.min.js?v=$version"></script>
@@ -37,8 +33,8 @@
                 <div class="alert alert-danger" role="alert">$error</div>
                 <!--#end if#-->
 
-                <input type="text" class="form-control" name="username" placeholder="$T('srv-username')" autocomplete="username" required autofocus>
-                <input type="password" class="form-control" name="password" placeholder="$T('srv-password')" autocomplete="current-password" required>
+                <input type="text" class="form-control" name="username" placeholder="$T('srv-username')" required autofocus>
+                <input type="password" class="form-control" name="password" placeholder="$T('srv-password')" required>
 
                 <button class="btn btn-default"><span class="glyphicon glyphicon-circle-arrow-right"></span> $T('login') </button>
 
@@ -51,16 +47,16 @@
         </div>
         <script type="text/javascript">
             // Tooltip
-            jQuery('[data-toggle="tooltip"]').tooltip()
+            \$('[data-toggle="tooltip"]').tooltip()
             // Try-catch in case somebody disabled localstorage
             try {
                 // Set what was done previously
-                jQuery('input[type="checkbox"]').prop('checked', localStorage.getItem("remember_me") === 'true')
+                \$('input[type="checkbox"]').prop('checked', localStorage.getItem("remember_me") === 'true')
                 // Store if we change something
-                jQuery('input[type="checkbox"]').on('change', function() {
-                    localStorage.setItem("remember_me", jQuery(this).is(':checked'));
+                \$('input[type="checkbox"]').on('change', function() {
+                    localStorage.setItem("remember_me", \$(this).is(':checked'));
                 })
             } catch(err) { }
         </script>
     </body>
- </html>
+ </html>

interfaces/Config/templates/staticcfg/css/Auto.css

@@ -1 +0,0 @@
-@import url('Night.css') screen and (prefers-color-scheme: dark);

interfaces/Config/templates/staticcfg/css/Night.css

@@ -1,298 +0,0 @@
-body {
-    background-color: black;
-    color: #EBEBEB !important;
-}
-
-a:not(.btn) {
-    color: #63a7e1;
-}
-
-.btn {
-    box-shadow: 1px 1px 1px rgba(255, 255, 255, .1) !important;
-}
-
-.btn:not(.btn-danger),
-.btn-default,
-input,
-select,
-textarea,
-.advanced-button,
-.list-group-item  {
-    border-color: #252525 !important;
-}
-
-#addFeed,
-#addFeedContent,
-.section {
-    border-bottom: 1px solid #555555;
-}
-
-.col2 p,
-.col2-cats {
-    color: #AAA;
-}
-
-.col2 h3 {
-    background: none repeat scroll 0 0 #555555;
-}
-
-.catTable,
-.dropdown-menu,
-.dropdown-menu .divider,
-.even,
-.Key tr:nth-child(odd),
-.language:hover,
-.navbar-default .navbar-nav>.open>a,
-.navbar-default .navbar-nav>.open>a:focus,
-.navbar-default .navbar-nav>.open>a:hover,
-.navbar-default .navbar-nav>li>a.active,
-.navbar-default .navbar-nav>li>a:hover,
-.navbar-default .navbar-nav>li>a:focus,
-.navbar-logo:hover,
-.quoteBlock,
-.server-disabled,
-#serverResponse,
-.table>tbody>tr:nth-child(odd),
-.table-striped>tbody>tr:nth-child(odd),
-ul.tabs li.active a,
-select[disabled],
-select:hover {
-    background-color: #444444 !important;
-    color: #EBEBEB !important;
-}
-
-.failed {
-    color: #ff3333 !important;
-}
-
-#rightGreyText,
-small {
-    color: #c7c7c7 !important;
-}
-
-.Categories form.sorting-row:nth-child(2n-1) tr,
-.advanced-button,
-.advanced-buttonSeperator,
-.alt,
-.infoTableSeperator.alt,
-.btn:not(.btn-danger),
-.btn-default.disabled:active,
-.btn-default.disabled:focus,
-.btn-default.disabled:hover,
-a.btn.btn-default,
-select.form-control,
-.form-control[disabled],
-.input-group-addon,
-#inner,
-.navbar-default,
-.search-box input,
-.select,
-.table-striped>tbody>tr:nth-child(even),
-.table>tbody>tr:nth-child(even),
-.tab-pane tr:nth-child(odd),
-textarea,
-ul.tabs a.active,
-a.list-group-item,
-.dropdown-menu>li>a,
-input[type="text"],
-input[type="email"],
-input[type="url"],
-input[type="date"],
-input[type="number"],
-input[type="password"],
-input[disabled],
-textarea,
-select {
-    background-color: #555555;
-    color: #EBEBEB;
-}
-
-.btn:hover:not(.btn-danger),
-.btn-default:hover,
-.tab-content .catTable tr:hover td,
-input:hover,
-textarea:hover,
-a.list-group-item:hover,
-select:hover,
-textarea:hover,
-input[type="date"]:hover,
-input[type="datetime"]:hover,
-input[type="datetime-local"]:hover,
-input[type="email"]:hover,
-input[type="month"]:hover,
-input[type="number"]:hover,
-input[type="password"]:hover,
-input[type="search"]:hover,
-input[type="tel"]:hover,
-input[type="text"]:hover,
-input[type="time"]:hover,
-input[type="url"]:hover,
-input[type="week"]:hover,
-textarea:focus,
-select:focus,
-input[type="date"]:focus,
-input[type="datetime"]:focus,
-input[type="datetime-local"]:focus,
-input[type="email"]:focus,
-input[type="month"]:focus,
-input[type="number"]:focus,
-input[type="password"]:focus,
-input[type="search"]:focus,
-input[type="tel"]:focus,
-input[type="text"]:focus,
-input[type="time"]:focus,
-input[type="url"]:focus,
-input[type="week"]:focus {
-    background-color: #666;
-    color: #EBEBEB;
-}
-
-.btn-default:focus,
-.form-control:focus,
-input:focus,
-textarea:focus,
-select:focus {
-    border-color: #707070 !important;
-    outline: initial !important;
-    box-shadow: 0 0 0 0.25rem rgba(255, 255, 255, 0.3) !important;
-}
-
-.modal-backdrop {
-    background-color: #262626 !important;
-}
-
-.Key tr {
-    border: none;
-}
-
-.table>tbody>tr>td,
-.table>tbody>tr>th,
-.infoTableSeperator,
-.modal-footer,
-.data-row {
-    border-top: 1px solid #555555;
-}
-
-hr {
-    border-top: 1px solid #555555;
-}
-
-.btn-danger {
-    border-color: #7b2b28;
-}
-
-.tab-content .catTable tbody,
-ul.tabs a,
-.colmask,
-#subscriptions,
-.RSS form[action="add_rss_feed"] tr:nth-child(even),
-.Config .table {
-    border: 1px solid #555555;
-}
-
-.Categories form:first-of-type tr:last-of-type,
-.default,
-.dropdown-menu>li>a:focus,
-.dropdown-menu>li>a:hover {
-    background-color: #696969;
-}
-
-.activeRSS,
-.activeRSS a,
-.activeRSS a:visited,
-.btn-default,
-.checkbox label,
-.feed-row td,
-.help-block,
-#content,
-.navbar-default .navbar-nav>li>a,
-.navbar-default .navbar-nav>li>a>.glyphicon,
-.path,
-.Servers .ct-label,
-.time,
-.main-restarting.in,
-#search-dropdown .dropdown-header,
-ul.tabs a,
-a.wizard-advanced-settings,
-.quoteBlock a,
-a.main-helplink,
-col2 h3 a,
-.text-center a,
-.text-center a:hover {
-    color: #EBEBEB;
-}
-
-.container,
-#content {
-    background-color: unset !important;
-}
-
-#content>div.colmask>div:nth-child(3) {
-    border-bottom: 1px solid #555555 !important;
-}
-
-.Servers .ct-series-a .ct-line,
-.Servers .ct-series-a .ct-point {
-    stroke: #EBEBEB;
-}
-
-#inner,
-.colmask {
-    background-color: #303030;
-}
-
-.modal-header {
-    background-color: #3C3C3C;
-}
-
-.modal-content,
-.modal-body,
-.modal-footer {
-    background-color: #727272;
-}
-
-#modal_qr .modal-body {
-    background-color: #EBEBEB;
-}
-
-.form-signin .btn.btn-default {
-    color: black;
-}
-
-.rss-icon-svg {
-    fill: white;
-}
-
-.rss-symbol {
-    fill: #555555;
-}
-
-::placeholder {
-    color: #EBEBEB !important;
-    opacity: 0.5;
-}
-
-.tooltip-inner {
-    background-color: #E4E4E4 !important;
-    color: #000 !important;
-}
-/* for login */
-.tooltip.bottom .tooltip-arrow {
-    border-bottom-color: #E4E4E4 !important;
-}
-/* config>general - host-warning */
-.tooltip.top .tooltip-arrow {
-    border-top-color: #E4E4E4 !important;
-}
-
-.tooltip.left .tooltip-arrow {
-    border-left-color: #E4E4E4 !important;
-}
-
-.tooltip.right .tooltip-arrow {
-    border-right-color: #E4E4E4 !important;
-}
-
-.Special .glyphicon-asterisk {
-    color: #E4E4E4 !important;
-}

interfaces/Config/templates/staticcfg/css/login.css

@@ -7,10 +7,7 @@ body {
     border-radius: 0 !important;
 }
 
-.btn,
-.btn:hover,
-.btn:active,
-.btn:focus {
+.btn, .btn:hover, .btn:active, .btn:focus {
     box-shadow: 1px 1px 1px rgba(0,0,0,.1) !important;
     background-color: white !important;
 }
@@ -41,7 +38,7 @@ body {
 }
 
 .text-center a:hover {
-    color: black;
+    color: black !important;
 }
 
 .form-signin .alert {

interfaces/Config/templates/staticcfg/css/style.css

@@ -19,7 +19,6 @@ body {
     float: left;
     overflow: visible;
     border: 1px solid #dfdede;
-    border-bottom: none !important;
     background-color: #FFF;
     width: 100%
 }
@@ -90,20 +89,15 @@ body {
     display: block;
     position: static;
     float: right;
-    color: black;
+    color: black !important;
     padding: 0px;
     font-size: 1.2em;
 }
 .example {
     background-color: #fefeee;
 }
-.presets strong {
-    display: inline-block;
-    width: 75px;
-}
 .presets {
     margin-bottom: -6px;
-    max-width: 60%;
 }
 .presets input {
     margin: 2px 0;
@@ -145,9 +139,6 @@ label.wide,
     font-size: 12px;
     font-style: italic;
 }
-.desc .btn {
-    font-style: normal;
-}
 .desc.narrow {
     margin: 0 0 0 200px!important;
 }
@@ -165,9 +156,6 @@ input[type="checkbox"]+.desc {
     color: #666;
     margin: 1em 0;
 }
-.col2 p {
-    margin-left: 3px;
-}
 .field-pair {
     padding: 6px;
     clear: both;
@@ -181,8 +169,8 @@ input[type="checkbox"]+.desc {
     background-color: #F8F8F8;
 }
 .field-pair:last-child,
-.field-pair.no-field-pair-bg {
-    background-color: transparent !important;
+.no-field-pair-bg {
+    background-color: transparent;
 }
 .alt,
 .infoTableSeperator.alt {
@@ -229,38 +217,10 @@ input[type='checkbox'] {
     padding: 0;
     margin-left: 5px;
 }
-textarea:hover,
-input[type="date"]:hover,
-input[type="datetime"]:hover,
-input[type="datetime-local"]:hover,
-input[type="email"]:hover,
-input[type="month"]:hover,
-input[type="number"]:hover,
-input[type="password"]:hover,
-input[type="search"]:hover,
-input[type="tel"]:hover,
-input[type="text"]:hover,
-input[type="time"]:hover,
-input[type="url"]:hover,
-input[type="week"]:hover,
-textarea:focus,
-input[type="date"]:focus,
-input[type="datetime"]:focus,
-input[type="datetime-local"]:focus,
-input[type="email"]:focus,
-input[type="month"]:focus,
-input[type="number"]:focus,
-input[type="password"]:focus,
-input[type="search"]:focus,
-input[type="tel"]:focus,
-input[type="text"]:focus,
-input[type="time"]:focus,
-input[type="url"]:focus,
-input[type="week"]:focus {
+textarea:hover, input[type="date"]:hover, input[type="datetime"]:hover, input[type="datetime-local"]:hover, input[type="email"]:hover, input[type="month"]:hover, input[type="number"]:hover, input[type="password"]:hover, input[type="search"]:hover, input[type="tel"]:hover, input[type="text"]:hover, input[type="time"]:hover, input[type="url"]:hover, input[type="week"]:hover, textarea:focus, input[type="date"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="email"]:focus, input[type="month"]:focus, input[type="number"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="text"]:focus, input[type="time"]:focus, input[type="url"]:focus, input[type="week"]:focus {
     background-color: #fffff0;
     border: 1px solid #aaa;
 }
-
 .col1 input[type='checkbox'] {
     position: absolute;
     top: auto!important;
@@ -363,49 +323,6 @@ tr.separator {
     margin: 5px;
 }
 
-.Sorting .explain-pattern {
-    border: none;
-    width: 100%;
-}
-.Sorting .pattern-table {
-    border:1px solid #ccc;
-}
-.Sorting .sorter-switch {
-    margin-right: 0.2em;
-}
-.Sorting .sorter-switch-container {
-    margin: 10px 0px;
-    height: 1.5em;
-    display: block;
-}
-.Sorting .sorter-placeholder {
-    position: relative;
-}
-.Sorting .sorter-placeholder:after {
-    content: "\e034";
-    font-family: "Glyphicons Halflings";
-    background: unset;
-    text-align: center;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    height: 30px;
-    border-radius: 15px;
-    border: 1px dashed #444;
-}
-.Sorting .glyphicon-option-vertical {
-    margin-top: 1.5em;
-    margin-right: 0.2em;
-    cursor: move;
-}
-.Sorting form:not(.sorting-row) .glyphicon-option-vertical {
-    visibility: hidden;
-}
-.Sorting .sorting-quick-setup {
-    padding: 1.5em 2em 3em
-}
-
 .RSS .rss-section input[type="text"] {
     max-width: 180px;
 }
@@ -501,9 +418,6 @@ tr.separator {
 .align-center {
     text-align: center;
 }
-.valign-top {
-    vertical-align: top;
-}
 .nowrap {
     white-space: nowrap;
 }
@@ -636,31 +550,26 @@ tr.separator {
     padding-right: 13px;
 }
 /* --  */
-.RSS .addRssTable,
-.RSS .addRssTable input[type="text"] {
-    width: 100%;
-}
-.RSS .addRssTable .new-feed-title {
-    max-width: 250px;
-}
-.RSS .addRssTable .new-feed-url {
-    width: 70%;
-}
 h2.activeRSS {
     margin-bottom: 10px;
 }
-.activeRSS a,
-.activeRSS a:visited {
+.activeRSS a, .activeRSS a:visited {
+    text-decoration: none;
     color: #000;
-    text-decoration: underline !important;
+}
+.activeRSS a:hover {
+    color: #4b4742;
+}
+.activeRSS a:first-of-type {
+    text-decoration: underline!important;
 }
 .favicon {
-    background-position: center center !important;
-    background-size: 22px 22px;
+    background-position: center center!important;
+    background-size: 16px 16px;
     opacity: 1;
     top: -1px;
-    height: 22px;
-    width: 22px;
+    height: 16px;
+    width: 16px;
     float: left;
     margin: 0 6px 0 2px;
     text-align: center;
@@ -680,7 +589,6 @@ h2.activeRSS {
 }
 #subscriptions {
     border: 1px solid #E5E5E5;
-    width: 100%;
 }
 .data-row {
     border-top: 1px solid #E5E5E5;
@@ -692,7 +600,6 @@ h2.activeRSS {
 #subscriptions .chk {
     padding: 8px 5px 5px;
     vertical-align: middle;
-    width: 40px;
 }
 #subscriptions .title {
     font-weight: bold;
@@ -700,11 +607,10 @@ h2.activeRSS {
     width: auto;
 }
 #subscriptions .favicon {
-    margin-left: 7px;
-    margin-top: -2px;
+    margin-left: 8px;
 }
-#subscriptions .glyphicon {
-    margin-top: 3px;
+.ie6 .subscription-title {
+    width: 20em;
 }
 .subscription-title,
 .subscription-title:hover {
@@ -810,6 +716,41 @@ ul.tabs li.active a {
 .checkbox-days label {
     padding: 2px 20px;
 }
+.rating-filter  {
+    float:  left;
+}
+.rating-filter p  {
+    margin:  0 0 10px 0;
+}
+.rating-filter select  {
+    vertical-align: middle;
+}
+.rating-filter input  {
+    vertical-align: middle;
+     margin-top: -1px;
+}
+.rating-filter label  {
+    display: inline-block;
+     padding-left: 0px;
+     width: 100px;
+}
+.rating-filter input[type="checkbox"]  {
+    display: inline;
+}
+.rating-filter input[type="checkbox"] + label  {
+    padding-left: 20px;
+    padding-top: 5px;
+     width: auto;
+}
+.rating-filter p > span:first-child  {
+    float: left;
+     width: 130px;
+}
+.rating-filter .desc  {
+    display: block;
+     margin: 0px;
+     padding-left: 103px;
+}
 
 /** EDITS 2015 **/
 * {
@@ -854,7 +795,6 @@ input[type="submit"]:hover {
 input[type="text"],
 input[type="email"],
 input[type="url"],
-input[type="date"],
 input[type="number"],
 input[type="password"],
 textarea,
@@ -867,7 +807,6 @@ select {
     vertical-align:middle;
     max-width: 100%;
     min-height: 34px;
-    min-width: 55px;
     font-size: 13px;
     background-color: white;
 }
@@ -1014,7 +953,7 @@ input[type="checkbox"] {
 }
 */
 .navbar-default .navbar-nav>li>a {
-    color: black;
+    color: black !important;
 }
 
 .navbar-default .navbar-nav>li>a:hover,
@@ -1051,32 +990,6 @@ input[type="checkbox"] {
     margin: 10px 0px;
 }
 
-.Servers .server-frame {
-    position: relative;
-    width: 220px;
-    height: 325px;
-    margin-bottom: -325px;
-    left: -240px;
-    display: none;
-}
-
-.Servers .server-frame a {
-    color: black !important;
-    text-decoration: none !important;
-    opacity: 0.8;
-    font-size: 2em;
-    font-family: arial, sans-serif !important;
-    position: absolute;
-    right: 5px;
-    top: -5px;
-}
-
-.Servers .server-frame iframe {
-    width: 100%;
-    height: 100%;
-    border: 0;
-}
-
 .Servers .col2 .label {
     margin-top: 8px;
     font-size: 0.85em;
@@ -1181,10 +1094,6 @@ input[type="checkbox"] {
     font-size: 1.2em;
 }
 
-.host-warning-highlight {
-    border-color: #F0AD4E !important;
-}
-
 .fileBrowser .glyphicon {
     margin-right: 2px;
     top: 1px;
@@ -1226,6 +1135,7 @@ input[type="checkbox"] {
 }
 .value-and-select select {
     min-width: 30px;
+    margin-top: 1px;
 }
 
 .dotOne, .dotTwo, .dotThree {
@@ -1262,31 +1172,6 @@ input[type="checkbox"] {
     100% { transform: rotate(359deg); }
 }
 
-/***
-    RTL Fixes
-***/
-html[dir="rtl"] .col1 input[type='checkbox'],
-html[dir="rtl"] .col2 h3 a {
-    left: 5px;
-}
-
-html[dir="rtl"] .modal-header .close {
-    float: left;
-}
-
-html[dir="rtl"] .field-pair {
-    position: relative;
-}
-
-html[dir="rtl"] .Sorting .presets.float-left,
-html[dir="rtl"] .checkbox-days {
-    float: none;
-}
-
-html[dir="rtl"] .Scheduling form[action="addSchedule"] input[type="checkbox"] {
-    right: 5px;
-}
-
 @media screen and (min-width: 1200px) {
     .Categories input[name="dir"] {
         max-width: 240px !important;
@@ -1357,12 +1242,6 @@ html[dir="rtl"] .Scheduling form[action="addSchedule"] input[type="checkbox"] {
         padding: 0px 15px 10px;
         width: inherit;
     }
-    .Sorting .glyphicon-option-vertical {
-        display: none;
-    }
-    .Sorting .sorter h3 {
-        cursor: move;
-    }
 }
 
 @media screen and (max-width: 768px) {

interfaces/Config/templates/staticcfg/js/script.js

@@ -60,7 +60,6 @@
         // Initialize
         this.element = $(element);
         this.initialDir = null;
-        this.showFiles = false;
         this.currentBrowserPath = null;
         this.currentRequest = null;
         this.fileBrowserDialog = $('#filebrowser_modal .modal-body');
@@ -100,11 +99,6 @@
             this.initialDir = this.element.data('initialdir') + folderSeperator + this.element.val();
         }
 
-        // Are we selecting files or folders
-        if(this.element.data('files')) {
-            this.showFiles = true
-        }
-
         // Browse
         this.browse(this.initialDir , folderBrowseUrl);
 
@@ -115,13 +109,13 @@
                 // Remove start
                 self.currentBrowserPath = self.currentBrowserPath.replace(self.element.data('initialdir')+folderSeperator, '');
                 // If it's identical to the initial dir the replacement won't work
-                if(self.currentBrowserPath === self.element.data('initialdir')) {
+                if(self.currentBrowserPath == self.element.data('initialdir')) {
                     self.currentBrowserPath = '';
                 }
             }
 
             // Changed?
-            if(self.element.val() !== self.currentBrowserPath) {
+            if(self.element.val() != self.currentBrowserPath) {
                 self.element.val(self.currentBrowserPath);
                 formHasChanged = true;
             }
@@ -150,20 +144,12 @@
         // Still loading
         if (this.currentRequest) this.currentRequest.abort();
 
-        // Show hidden folders
-        var params = { name: path}
-        if($('#show_hidden_folders').is(':checked')) {
-            params['show_hidden_folders'] = "1"
-        }
-
-        // Show files?
-        if(this.showFiles) {
-            params['show_files'] = "1"
-        }
+        // Show hidden folders on Linux?
+        var extraHidden = $('#show_hidden_folders').is(':checked') ? '&show_hidden_folders=1' : '';
 
         // Get current folders
         this.currentBrowserPath = path;
-        this.currentRequest = $.getJSON(endpoint, params, function (data) {
+        this.currentRequest = $.getJSON(endpoint + extraHidden, { name: path }, function (data) {
             // Clean
             self.fileBrowserDialog.empty();
 
@@ -171,27 +157,17 @@
             var list = $('<div class="list-group">').appendTo(self.fileBrowserDialog);
             $.each(data.paths, function (i, entry) {
                 // Title for first one
-                if(i === 0) {
+                if(i == 0) {
                     self.fileBrowserDialog.prepend($('<h4>').text(entry.current_path))
                     return
                 }
                 // Regular link
                 link = $('<a class="list-group-item" href="javascript:void(0)" />').click(function () {
-                    // Are we looking for files and did we select a file?
-                    if(self.showFiles && !entry.dir) {
-                        // Trigger selection
-                        self.currentBrowserPath = entry.path
-                        $('#filebrowser_modal_accept').click()
-                    } else {
-                        self.browse(entry.path, endpoint);
-                    }
-                }).text(entry.name);
-
+                    self.browse(entry.path, endpoint); }
+                ).text(entry.name);
                 // Back image
-                if(entry.name === '..') {
+                if(entry.name == '..') {
                     $('<span class="glyphicon glyphicon-arrow-left"></span> ').prependTo(link);
-                } else if(!entry.dir) {
-                    $('<span class="glyphicon glyphicon-file"></span> ').prependTo(link);
                 } else {
                     $('<span class="glyphicon glyphicon-folder-open"></span> ').prependTo(link);
                 }
@@ -227,12 +203,7 @@ $.fn.extractFormDataTo = function(target) {
     var selects = $("select", this);
 
     selects.each(function (i,elem) {
-        if (elem.selectedOptions.length > 1) {
-            // Handle <select multiple="multiple">
-            target[elem.name] = Array.from(elem.selectedOptions).map(({ value }) => value).toString();
-        } else {
-            target[elem.name] = elem.value;
-        }
+        target[elem.name] = elem.value;
     });
 
     return this;
@@ -244,7 +215,7 @@ $.fn.extractFormDataTo = function(target) {
  * (c) 2015 SABnzbd Team, Inc. All rights reserved.
  */
 function config_success() {
-    $('.saveButton[disabled=disabled]').each(function () {
+    $('.saveButton').each(function () {
         $(this).removeAttr("disabled").html('<span class="glyphicon glyphicon-ok"></span> '+configTranslate.saveChanges);
     });
     // Let us leave!
@@ -252,7 +223,7 @@ function config_success() {
     formHasChanged = false;
 }
 function config_failure() {
-    $('.saveButton[disabled=disabled]').each(function () {
+    $('.saveButton').each(function () {
         $(this).removeAttr("disabled").addClass('btn-danger').html('<span class="glyphicon glyphicon-remove"></span> '+configTranslate.failed);
     });
     // Can't go yet..
@@ -262,9 +233,8 @@ function do_restart() {
     // Show overlay
     $('.main-restarting').show()
 
-    // Check if we need redirect
-    // Uses == on purpose, because val() returns string and data() returns int!
-    var switchedHTTPS = ($('#enable_https').is(':checked') === ($('#enable_https').data('original') === undefined))
+    // What template
+    var switchedHTTPS = ($('#enable_https').is(':checked') == ($('#enable_https').data('original') === undefined))
     var portsUnchanged  = ($('#port').val() == $('#port').data('original')) && ($('#https_port').val() == $('#https_port').data('original'))
 
     // Are we on settings page or did nothing change?
@@ -273,7 +243,7 @@ function do_restart() {
         var urlTotal = window.location.origin + urlBase
     } else {
         // Protocol and port depend on http(s) setting
-        if($('#enable_https').is(':checked') && (window.location.protocol === 'https:' || !$('#https_port').val())) {
+        if($('#enable_https').is(':checked') && (window.location.protocol == 'https:' || !$('#https_port').val())) {
             // Https on and we visited this page from HTTPS
             var urlProtocol = 'https:';
             var urlPort = $('#https_port').val() ? $('#https_port').val() : $('#port').val();
@@ -291,16 +261,16 @@ function do_restart() {
     $('.main-restarting .restarting-url').text(urlTotal)
 
     // Initiate restart
-    $.ajax({ url: '../../api?mode=restart&apikey=' + sabSession,
+    $.ajax({ url: '../../config/restart?apikey=' + sabSession,
         complete: function() {
             // Keep counter of failures
-            var loopCounter = 0;
+            var failureCounter = 0;
 
             // Now we try until we can connect
-            setInterval(function() {
-                loopCounter = loopCounter+1;
-                // We skip the first one so we give it time to shutdown
-                if(loopCounter < 2) {
+            var refreshInterval = setInterval(function() {
+                // We skip the first one
+                if(failureCounter == 0) {
+                    failureCounter = failureCounter+1;
                     return
                 }
                 $.ajax({ url: urlTotal,
@@ -309,20 +279,21 @@ function do_restart() {
                         location.href = urlTotal;
                     },
                     error: function(status, text) {
-                        // Too many failures and we give up
-                        if(loopCounter >= 10) {
+                        failureCounter = failureCounter+1;
+                        // Too many failuers and we give up
+                        if(failureCounter >= 6) {
                             // If the port has changed 'Access-Control-Allow-Origin' header will not allow
-                            // us to check if the server is back up. So after 10 failures (20 sec) we redirect
+                            // us to check if the server is back up. So after 7 failures we redirect
                             // anyway in the hopes it works anyway..
                             location.href = urlTotal;
                         }
                     }
                 })
-            }, 2000)
+            }, 4000)
 
             // Exception if we go from HTTPS to HTTP
             // (this is not allowed by browsers and all of the above will be ignored)
-            if(window.location.protocol !== urlProtocol) {
+            if(window.location.protocol != urlProtocol) {
                 // Saftey redirect after 20 sec
                 setTimeout(function() {
                     location.href = urlTotal;
@@ -332,7 +303,7 @@ function do_restart() {
     });
 }
 
-// Remove obfuscation
+// Remove obfusication
 function removeObfuscation() {
     $('input[data-hide]').each(function(index, objInput) {
         $(objInput).attr('name', $(objInput).data('hide'))
@@ -348,36 +319,6 @@ function addRowColor() {
     })
 }
 
-// Set default functions for the autocomplete everywhere
-jQuery.extend(jQuery.fn.typeahead.defaults, {
-    source: function (query, process) {
-        // If there's no separator, it must be a relative path
-        if(query.split(folderSeperator).length < 2 && this.$element.data('initialdir')) {
-            query  = this.$element.data('initialdir') + folderSeperator + query;
-        }
-        var params = { compact: "1", name: query }
-        if($('#show_hidden_folders').is(':checked')) {
-            params['show_hidden_folders'] = "1"
-        }
-        if(this.$element.data('files')) {
-            params['show_files'] = "1"
-        }
-        // Get info from the API
-        return jQuery.get(folderBrowseUrl, params, function (data) {
-            return process(data["paths"]);
-        });
-    },
-    updater: function(item) {
-        // Is it a relative path?
-        if(item.indexOf(this.$element.data('initialdir')) === 0) {
-            // Remove start
-            return item.replace(this.$element.data('initialdir') + folderSeperator, '');
-        }
-        // Full path
-        return item
-    }
-})
-
 $(document).ready(function () {
     /**
         Restart function
@@ -405,9 +346,8 @@ $(document).ready(function () {
         datatype: 'json',
         // But first remove Obfuscation!
         beforeSerialize: removeObfuscation,
-        beforeSubmit: function (arr, form, options) {
-            // Only in the current form
-            form.find('.saveButton').each(function () {
+        beforeSubmit: function () {
+            $('.saveButton').each(function () {
                 $(this).attr("disabled", "disabled").removeClass('btn-danger').html('<span class="glyphicon glyphicon-transfer"></span> ' + configTranslate.saving);
             });
         },
@@ -468,7 +408,7 @@ $(document).ready(function () {
     $('input[type="checkbox"]').parents('label').addClass('config-hover')
 
     // Disable sections
-    var checkDisabled = '#enable_tv_sorting, #enable_movie_sorting, #enable_date_sorting'
+    var checkDisabled = '#rating_enable, #enable_tv_sorting, #enable_movie_sorting, #enable_date_sorting'
 
     $(checkDisabled).on('change', function() {
         $(this).parent().nextAll().toggleClass('disabled')
@@ -484,15 +424,12 @@ $(document).ready(function () {
         $('.advanced-settings').toggle()
         addRowColor()
     })
-    if(localStorage.getItem('advanced-settings') === 'true') {
+    if(localStorage.getItem('advanced-settings') == 'true') {
         $('.advanced-settings').show()
         $('#advanced-settings-button').prop('checked', true)
         addRowColor()
     }
     addRowColor()
-
-    // Add tooltips
-    jQuery('[title]').tooltip()
 });
 
 /*

interfaces/Glitter/licenses/LICENSE-CC.txt

@@ -9,7 +9,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE B
 
 1. Definitions
 
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("syncing") will be considered an Adaptation for the purpose of this License.
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
    2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License.
    3. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
    4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
@@ -44,7 +44,7 @@ The above rights may be exercised in all media and formats whether now known or
 
 5. Representations, Warranties and Disclaimer
 
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
 
 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 

interfaces/Glitter/templates/history.tmpl

@@ -0,0 +1 @@
+  

interfaces/Glitter/templates/include_history.tmpl

@@ -1,33 +1,17 @@
-<div class="history" id="history-tab">
-    <div class="history-header">
-        <h2>$T('menu-history') <small data-bind="visible: history.showArchive()">($T('archive'))</small></h2>
-        <a href="#" data-bind="click: history.showMultiEdit, visible: hasHistory()">
-            <span class="glyphicon glyphicon-tasks" data-tooltip="true" data-placement="left" title="$T('Glitter-multiOperations')"></span>
-        </a>
-    </div>
+<div class="history" id="history-tab" data-bind="visible: hasHistory() || displayTabbed()" style="display: none">
+    <h2>$T('menu-history')</h2>
     <table class="table table-hover history-table paginated">
         <thead>
             <tr>
                 <th style="width: 25px;"></th>
                 <th></th>
-                <th class="table-status-header" data-bind="css: { 'table-header-status-smaller' : extraHistoryColumns().length }"></th>
-                <!-- ko foreach: extraHistoryColumns -->
-                <th class="table-header-extra"></th>
-                <!-- /ko -->
+                <th class="table-status-header" data-bind="css: { 'table-header-status-smaller' : extraHistoryColumn }"></th>
+                <th class="table-header-extra" data-bind="css: { 'table-extra-header-visible' : extraHistoryColumn }"></th>
                 <th style="width: 130px;"></th>
                 <th style="width: 60px;"></th>
             </tr>
         </thead>
-        <!-- ko if: !hasHistory() -->
-        <tbody class="no-downloads">
-            <tr>
-                <td colspan="6" data-bind="attr: { 'colspan': 5 + extraHistoryColumns().length }">
-                    <span>$T('empty')</span>
-                </td>
-            </tr>
-        </tbody>
-        <!-- /ko -->
-        <tbody data-bind="foreach: history.historyItems, visible: hasHistory()" style="display: none;">
+        <tbody data-bind="foreach: history.historyItems">
             <tr class="history-item" data-bind="css: {'history-failed-download':failed()}">
                 <td>
                     <div data-bind="visible: processingWaiting()">
@@ -55,24 +39,111 @@
                         </span>
                     </div>
                 </td>
-                <td class="name">
+                <td class="name" data-bind="css: { 'name-has-ratings' : historyStatus.has_rating }">
                     <div class="row-wrap-text">
                         <a class="retry-buttontext" href="#" data-bind="visible: (failed() && canRetry()), click: retry">$T('button-retry')</a>
                         <span data-bind="text: historyStatus.name, attr: { 'title': historyStatus.name() }"></span>
                     </div>
+
+                    <!-- ko if: historyStatus.has_rating -->
+                    <div class="dropdown history-ratings">
+                        <a href="#" class="name-icons hover-button" data-toggle="dropdown" onclick="keepOpen(this)">
+                            <span class="glyphicon glyphicon-thumbs-up"></span> <span data-bind="text: historyStatus.rating_avg_vote_up"></span>
+                            <span class="glyphicon glyphicon-thumbs-down"></span> <span data-bind="text: historyStatus.rating_avg_vote_down"></span>
+                        </a>
+                        <ul class="dropdown-menu history-ratings-menu">
+                            <li>
+                                <form class="history-ratings-basic">
+                                    <label>
+                                        <input type="radio" value="up" data-bind="attr: { 'name': 'ratings-status-'+nzo_id, 'checked': historyStatus.rating_user_vote() == 1 }, event: { change: setUserVote }" />
+                                        <span class="glyphicon glyphicon-thumbs-up"></span>
+                                        <span data-bind="text: historyStatus.rating_avg_vote_up"></span>
+                                    </label>
+                                    <label>
+                                        <input type="radio" value="down" data-bind="attr: { 'name': 'ratings-status-'+nzo_id, 'checked': historyStatus.rating_user_vote() == 2 }, event: { change: setUserVote }" />
+                                        <span class="glyphicon glyphicon-thumbs-down"></span>
+                                        <span data-bind="text: historyStatus.rating_avg_vote_down"></span>
+                                    </label>
+                                    <label>
+                                        <span class="glyphicon glyphicon-facetime-video"></span>
+                                        <select name="ratings-video" data-bind="value: historyStatus.rating_user_video, event: { change: setUserRating }, disable: historyStatus.rating_user_video">
+                                            <option value="">&nbsp;</option>
+                                            <option value="1">1</option>
+                                            <option value="2">2</option>
+                                            <option value="3">3</option>
+                                            <option value="4">4</option>
+                                            <option value="5">5</option>
+                                            <option value="6">6</option>
+                                            <option value="7">7</option>
+                                            <option value="8">8</option>
+                                            <option value="9">9</option>
+                                            <option value="10">10</option>
+                                        </select>
+                                    </label>
+                                    <label>
+                                        <span class="glyphicon glyphicon-volume-up"></span>
+                                        <select name="ratings-audio" data-bind="value: historyStatus.rating_user_audio, event: { change: setUserRating }, disable: historyStatus.rating_user_audio">
+                                            <option value="">&nbsp;</option>
+                                            <option value="1">1</option>
+                                            <option value="2">2</option>
+                                            <option value="3">3</option>
+                                            <option value="4">4</option>
+                                            <option value="5">5</option>
+                                            <option value="6">6</option>
+                                            <option value="7">7</option>
+                                            <option value="8">8</option>
+                                            <option value="9">9</option>
+                                            <option value="10">10</option>
+                                        </select>
+                                    </label>
+                                    <!-- ko if: historyStatus.url_info -->
+                                    <a href="#" target="_blank" data-bind="attr: { 'href':historyStatus.url_info }" title="$T('Glitter-openInfoURL')"><span class="glyphicon glyphicon-globe"></span></a>
+                                    <!-- /ko -->
+                                </form>
+                            </li>
+                            <li class="divider"></li>
+                            <li>
+                                <form class="history-ratings-report" data-bind="submit: setUserReport">
+                                    <strong>$T('report')</strong>
+                                    <br />
+                                    <label>
+                                        <input type="radio" name="rating_flag" value="spam" /> $T('spam')
+                                    </label>
+                                    <br />
+                                    <label>
+                                        <input type="radio" name="rating_flag" value="encrypted" /> $T('encrypted')
+                                    </label>
+                                    <br />
+                                    <label>
+                                        <input type="radio" name="rating_flag" value="expired" /> $T('expired')
+                                        <select name="ratings-report-expired-server" class="ratings-report-hidden form-control" data-bind="options: \$parent.servers, optionsText: 'host', optionsValue: 'host', optionsCaption: '$T('nzo-all')'"></select>
+                                    </label>
+                                    <br />
+                                    <label>
+                                        <input type="radio" name="rating_flag" value="other" /> $T('otherProblem')
+                                        <input type="text" class="form-control ratings-report-hidden" name="ratings-report-other" />
+                                    </label>
+                                    <br />
+                                    <label>
+                                        <input type="radio" name="rating_flag" value="comment" /> $T('comment')
+                                        <input type="text" class="form-control ratings-report-hidden" name="ratings-report-comment" />
+                                    </label>
+                                    <br />
+                                    <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> $T('send')</button>
+                                </form>
+                            </li>
+                        </ul>
+                    </div>
+                    <!-- /ko -->
                 </td>
                 <td class="status row-wrap-text" data-bind="text: statusText()" onclick="showDetails(this)"></td>
-                <!-- ko foreach: parent.parent.extraHistoryColumns -->
                 <td class="row-extra-text" onclick="showDetails(this)">
-                    <div class="row-wrap-text" data-bind="text: \$parent.showColumn(\$data)"></div>
+                    <div class="row-wrap-text" data-bind="text: extraText">
+                    </div>
                 </td>
-                <!-- /ko -->
                 <td class="history-completedon row-wrap-text" data-bind="text: completedOn(), attr: { 'data-timestamp': completed }" onclick="showDetails(this)"></td>
                 <td class="delete">
-                    <label data-bind="visible: parent.isMultiEditing()">
-                        <input type="checkbox" name="multiedit" title="$T('Glitter-multiSelect')" data-bind="click: parent.addMultiEdit, attr: { 'id': 'multiedit_' + id } " />
-                    </label>
-                    <div class="dropdown" data-bind="visible: !parent.isMultiEditing()">
+                    <div class="dropdown">
                         <a href="#" data-toggle="dropdown" data-bind="click: updateAllHistoryInfo">
                             <span class="caret"></span>
                         </a>
@@ -83,20 +154,13 @@
                                     <div class="col-sm-2">$T('name')</div>
                                     <div class="col-sm-10" data-bind="text: historyStatus.name"></div>
                                 </div>
-                                <div class="row" data-bind="visible: historyStatus.time_added">
-                                    <div class="col-sm-2">$T('rss-added')</div>
-                                    <div class="col-sm-10" data-bind="text: timeAdded(), attr: { 'data-timestamp': historyStatus.time_added }"></div>
-                                </div>
                                 <div class="row">
                                     <div class="col-sm-2">$T('post-Completed')</div>
                                     <div class="col-sm-10" data-bind="text: completedOn, attr: { 'data-timestamp': completed }"></div>
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-2">$T('status')</div>
-                                    <div class="col-sm-10">
-                                        <span data-bind="text: glitterTranslate.status[historyStatus.status()] ? glitterTranslate.status[historyStatus.status()] : statusText()"></span>
-                                        <a href="#" class="mark-completed-link" data-bind="visible: failed(), click: markAsCompleted" title="$T('button-mark-completed')"><span class="glyphicon glyphicon-ok"></span> $T('post-Completed')</a>
-                                    </div>
+                                    <div class="col-sm-10" data-bind="text: glitterTranslate.status[historyStatus.status()] ? glitterTranslate.status[historyStatus.status()] : statusText()"></div>
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-2">$T('size')</div>
@@ -110,7 +174,7 @@
                                     <div class="col-sm-2">$T('srv-password')</div>
                                     <div class="col-sm-10" data-bind="text: historyStatus.password"></div>
                                 </div>
-                                <div class="row" data-bind="visible: historyStatus.storage() || historyStatus.path()">
+                                <div class="row">
                                     <div class="col-sm-2">$T('msg-path')</div>
                                     <div class="col-sm-10" data-bind="text: historyStatus.storage() == '' ? historyStatus.path : historyStatus.storage"></div>
                                 </div>
@@ -124,7 +188,7 @@
                         </div>
                         <!-- /ko -->
                     </div>
-                    <a href="#" data-bind="click: parent.triggerRemoveDownload">
+                    <a href="#" data-bind="click: deleteSlot">
                         <span class="hover-button glyphicon glyphicon-trash" data-bind="css: { 'glyphicon-stop' : processingDownload() == 2, disabled : processingDownload() == 1 }, attr: { title: processingDownload() == 2 ? '$T('abort')' : '$T('nzo-delete')' }"></span>
                     </a>
                 </td>
@@ -146,24 +210,9 @@
     </ul>
 
     <div class="multioperations-selector" id="history-options">
-        <a href="#" class="hover-button history-archive" title="$T('showArchive') / $T('showAllHis')" data-tooltip="true" data-placement="top" data-bind="click: history.toggleShowArchive, css: { 'history-options-show-failed': history.showArchive }"><svg viewBox="6 6 36 36" height="14" width="14" class="archive-icon"><path d="M41.09 10.45l-2.77-3.36c-.56-.66-1.39-1.09-2.32-1.09h-24c-.93 0-1.76.43-2.31 1.09l-2.77 3.36c-.58.7-.92 1.58-.92 2.55v25c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-25c0-.97-.34-1.85-.91-2.55zm-17.09 24.55l-11-11h7v-4h8v4h7l-11 11zm-13.75-25l1.63-2h24l1.87 2h-27.5z"/></svg></a>
-        <a href="#" class="hover-button" title="$T('showFailedHis') / $T('showAllHis')" data-tooltip="true" data-placement="top" data-bind="click: history.toggleShowFailed, css: { 'history-options-show-failed': history.showFailed }"><span class="glyphicon glyphicon-exclamation-sign"></span></a>
-        <a href="#" class="hover-button" title="$T('link-retryAll')" data-tooltip="true" data-placement="top" data-bind="click: history.retryAllFailed"><span class="glyphicon glyphicon-repeat"></span></a>
-        <a href="#" class="hover-button" title="$T('button-mark-completed')" data-bind="visible: (history.isMultiEditing() && hasHistory()), click: history.doMultiMarkCompleted" data-tooltip="true" data-placement="top"><span class="glyphicon glyphicon-ok"></span></a>
-
-        <div data-bind="visible: (history.isMultiEditing() && hasHistory())">
-            <span class="label label-default" data-bind="text: history.multiEditItems().length">0</span>
-            <label for="multiedit-checkall-history">
-                <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall-history" title="$T('Glitter-checkAll')" data-bind="click: history.checkAllJobs" data-tooltip="true" data-placement="top" />
-            </label>
-        </div>
-
-        <a href="#" class="hover-button" title="$T('nzo-delete')" data-bind="visible: (history.isMultiEditing() && hasHistory()), click: history.doMultiDelete"  data-tooltip="true" data-placement="top">
-            <span class="glyphicon glyphicon-trash"></span>
-        </a>
-        <a href="#modal-purge-history" class="hover-button" title="$T('purgeHist')" data-bind="visible: !(history.isMultiEditing() && hasHistory())" data-toggle="modal" data-tooltip="true" data-placement="top">
-            <span class="glyphicon glyphicon-trash"></span>
-        </a>
+        <a href="#" class="hover-button" title="$T('link-retryAll')" data-tooltip="true" data-placement="left" data-bind="click: history.retryAllFailed"><span class="glyphicon glyphicon-repeat"></span></a>
+        <a href="#" class="hover-button" title="$T('showAllHis') / $T('showFailedHis')" data-tooltip="true" data-placement="left" data-bind="click: history.toggleShowFailed, css: { 'history-options-show-failed': history.showFailed }"><span class="glyphicon glyphicon-exclamation-sign"></span></a>
+        <a href="#modal-purge-history" class="hover-button" title="$T('purgeHist')" data-toggle="modal" data-tooltip="true" data-placement="left"><span class="glyphicon glyphicon-trash"></span></a>
     </div>
 
     <div class="info-container history-info">
@@ -172,4 +221,4 @@
         <span data-bind="text: history.downloadedMonth"></span>B $T('Glitter-thisMonth')
         <span data-bind="text: history.downloadedTotal"></span>B $T('Glitter-total')
     </div>
-</div>
+</div>

interfaces/Glitter/templates/include_menu.tmpl

@@ -43,7 +43,7 @@
                         <button type="button" class="btn btn-default navbar-btn dropdown-toggle" data-toggle="dropdown" onclick="keepOpen(this)">
                             <span class="caret"></span>
                         </button>
-                        <a href="#" class="max-speed-input-clear hover-button" data-bind="click: clearSpeedLimit, visible:(speedLimit() < 100 && speedLimit() > 0)" style="display: none;">
+                        <a href="#" class="max-speed-input-clear hover-button" data-bind="click: clearSpeedLimit, visible:(speedLimit() != 100)" style="display: none;">
                             <span class="glyphicon glyphicon-link"></span>
                         </a>
                         <div class="dropdown-menu max-speed-input">
@@ -81,7 +81,7 @@
             <li data-tooltip="true" data-placement="bottom" title="SABnzbd $T('menu-config')">
                 <a href="./config/"><span class="glyphicon glyphicon-cog"></span></a>
             </li>
-            <li class="dropdown main-menu-link" data-bind="css: { 'active-on-queue-finish-menu': finishaction()}">
+            <li class="dropdown main-menu-link" data-bind="css: { 'active-on-queue-finish-menu': onQueueFinish()}">
                 <a href="#" data-toggle="dropdown"  onclick="keepOpen(this)">
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
@@ -102,14 +102,23 @@
                     <li class="divider"></li>
                     <li class="dropdown-header"><span class="glyphicon glyphicon-off"></span> $T('Glitter-onFinish'):</li>
                     <li>
-                        <select data-bind="value: finishaction, event: { change: setOnQueueFinish }" class="form-control">
+                        <select data-bind="value: onQueueFinish, event: { change: setOnQueueFinish }" class="form-control">
                             <option value=""></option>
-                            <option value="shutdown_program">$T('shutdownSab')</option>
-                            <!--#if $power_options#-->
-                            <option value="shutdown_pc">$T('shutdownPc')</option>
-                            <option value="standby_pc">$T('standbyPc')</option>
-                            <option value="hibernate_pc">$T('hibernatePc')</option>
-                            <!--#end if#-->
+                            <optgroup label="$T('eoq-actions')">
+                                <option value="shutdown_program">$T('shutdownSab')</option>
+                                <!--#if $power_options#-->
+                                <option value="shutdown_pc">$T('shutdownPc')</option>
+                                <option value="standby_pc">$T('standbyPc')</option>
+                                <option value="hibernate_pc">$T('hibernatePc')</option>
+                                <!--#end if#-->
+                            </optgroup>
+                            <optgroup label="$T('eoq-scripts')" data-bind="visible: queue.scriptsList().length > 1">
+                                <!-- ko foreach: queue.scriptsList -->
+                                    <!-- ko if: \$data != glitterTranslate.noneText -->
+                                        <option data-bind="text: \$data, attr: { value: 'script_'+\$data } " ></option>
+                                    <!-- /ko -->
+                                <!-- /ko -->
+                            </optgroup>
                         </select>
                     </li>
                 </ul>

interfaces/Glitter/templates/include_messages.tmpl

@@ -26,15 +26,13 @@
             <!-- /ko -->
             <!-- ko foreach: allMessages -->
                 <tr>
-                    <td class="table-messages-label" data-bind="attr: { 'colspan': 1 + !\$data.hasOwnProperty('clear') }">
+                    <td class="table-messages-label">
                         <span class="label" data-bind="css: 'label-' + css, text: type"></span>
                         <span class="queue-message-text" data-bind="html: text"></span>
                     </td>
-                    <!-- ko if: \$data.hasOwnProperty("clear") -->
                     <td class="table-messages-remove">
-                        <a href="#" data-bind="click: clear"  class="hover-button"><span class="glyphicon glyphicon-remove"></span></a>
+                        <!-- ko if: \$data.hasOwnProperty("clear") --><a href="#" data-bind="click: clear"  class="hover-button"><span class="glyphicon glyphicon-remove"></span></a><!-- /ko -->
                     </td>
-                    <!-- /ko -->
                 </tr>
             <!-- /ko -->
             <!-- ko if: !hasMessages() && displayTabbed() -->

interfaces/Glitter/templates/include_overlays.tmpl

@@ -1,17 +1,13 @@
 <!--#from sabnzbd.constants import VALID_ARCHIVES, VALID_NZB_FILES#-->
 <!--#set $file_exts = ', '.join(VALID_NZB_FILES + VALID_ARCHIVES)#-->
-<!-- Notification box -->
+<!-- Notifcation box -->
 <div class="main-notification-box" style="display: none">
     <div class="main-notification-box-uploading">
         <span class="glyphicon glyphicon-open"></span> $T('Glitter-notification-uploading') <span class="main-notification-box-file-count"></span>
     </div>
 
-    <div class="main-notification-box-uploading-failed">
-        <span class="glyphicon glyphicon-exclamation-sign"></span> $T('Glitter-notification-upload-failed').replace('%s', '') <span class="main-notification-box-file-count"></span>
-    </div>
-
     <div class="main-notification-box-queue-repair">
-        <span class="glyphicon glyphicon-wrench"></span> $T('Glitter-repairQueue')
+        <span class="glyphicon glyphicon glyphicon-wrench"></span> $T('Glitter-repairQueue')
     </div>
 
     <div class="main-notification-box-disconnect">
@@ -89,99 +85,74 @@
                 </ul>
                 <div class="tab-content">
                     <div class="tab-pane fade in active" id="options-status">
-                        <div class="row" data-bind="visible: statusInfo.active_socks5_proxy">
-                            <div class="col-sm-6">$T('opt-socks5_proxy_url') &nbsp </div>
-                            <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: statusInfo.active_socks5_proxy"></div>
-                            <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
-                        </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-localIP4') &nbsp; </div>
+                            <div class="col-sm-6">$T('dashboard-localIP4')</div>
                             <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.localipv4() ? '$T('dashboard-connectionError')' : statusInfo.localipv4(), css: { 'options-bad-status' : !statusInfo.localipv4() }"></div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-publicIP4') &nbsp; </div>
+                            <div class="col-sm-6">$T('dashboard-publicIP4')</div>
                             <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.publicipv4() ? '$T('dashboard-connectionError')' : statusInfo.publicipv4(), css: { 'options-bad-status ' : !statusInfo.publicipv4() }"></div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-IP6') &nbsp; </div>
+                            <div class="col-sm-6">$T('dashboard-IP6')</div>
                             <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: statusInfo.ipv6"></div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-NameserverDNS') &nbsp; </div>
-                            <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.dnslookup() ? '$T('dashboard-connectionError')' : 'OK', css: { 'options-bad-status' : !statusInfo.dnslookup() }"></div>
+                            <div class="col-sm-6">$T('dashboard-NameserverDNS')</div>
+                            <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.dnslookup() ? '$T('dashboard-connectionError')' : statusInfo.dnslookup(), css: { 'options-bad-status' : (statusInfo.dnslookup() != 'OK') }"></div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <hr/>
                         <div class="row">
-                            <div class="col-sm-6">$T('cache') &nbsp; </div>
+                            <div class="col-sm-6">$T('cache')</div>
                             <div class="col-sm-6">
                                 <span data-bind="text: cacheSize"></span> (<span data-bind="text: cacheArticles"></span> $T('Glitter-articles'))
                             </div>
                         </div>
-                        <div class="row" data-bind="visible: statusInfo.loadavg()">
-                            <div class="col-sm-6">$T('dashboard-loadavg') &nbsp; </div>
-                            <div class="col-sm-6">
-                                <span data-bind="text: statusInfo.loadavg"></span>
-                            </div>
-                        </div>
-                        <div class="row" data-bind="visible: statusInfo.delayed_assembler() > 5">
-                            <div class="col-sm-6">$T('dashboard-delayed') &nbsp; </div>
-                            <div class="col-sm-6">
-                                <span data-bind="visible: statusInfo.delayed_assembler() > 5">$T('dashboard-delayed-disk')</span>
-                                <small data-bind="visible: statusInfo.delayed_assembler() > 5">(<span data-bind="text: statusInfo.delayed_assembler"></span>x)</small>
-                            </div>
-                        </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-systemPerformance') &nbsp; </div>
-                            <div class="col-sm-6 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
+                            <div class="col-sm-6">$T('dashboard-systemPerformance')</div>
+                            <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.pystone"></span>
-                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest') (~10 $T('seconds'))"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small title="$cpumodel $cpusimd" data-tooltip="true">$cpumodel $cpusimd</small>
+                                <a href="#" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
+                                <small data-bind="truncatedText: statusInfo.cpumodel, length: 25, attr: { 'data-original-title': statusInfo.cpumodel }" data-tooltip="true"></small>
                             </div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-downloadDirSpeed') &nbsp; </div>
-                            <div class="col-sm-6 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
+                            <div class="col-sm-6">$T('dashboard-downloadDirSpeed')</div>
+                            <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.downloaddirspeed()"></span> MB/s
-                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest') (~10 $T('seconds'))"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small data-bind="text: statusInfo.downloaddir, attr: { 'data-original-title': statusInfo.downloaddir }" data-tooltip="true"></small>
+                                <a href="#" class="diskspeed-button" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
+                                <small>(<span data-bind="truncatedText: statusInfo.downloaddir, length: 24, attr: { 'data-original-title': statusInfo.downloaddir }" data-tooltip="true"></span>)</small>
                             </div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-completeDirSpeed') &nbsp; </div>
-                            <div class="col-sm-6 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
+                            <div class="col-sm-6">$T('dashboard-completeDirSpeed')</div>
+                            <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.completedirspeed()"></span> MB/s
-                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest') (~10 $T('seconds'))"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small data-bind="text: statusInfo.completedir, attr: { 'data-original-title': statusInfo.completedir }" data-tooltip="true"></small>
+                                <a href="#" class="diskspeed-button" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
+                                <small>(<span data-bind="truncatedText: statusInfo.completedir, length: 24, attr: { 'data-original-title': statusInfo.completedir }" data-tooltip="true"></span>)</small>
                             </div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-internetBandwidth') &nbsp; </div>
+                            <div class="col-sm-6">$T('dashboard-internetBandwidth')</div>
                             <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.internetbandwidth()"></span> MB/s
-                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest') (~10 $T('seconds'))"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small><span data-bind="text: statusInfo.internetbandwidth()*8"></span> Mbps</small>
+                                <a href="#" class="diskspeed-button" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
+                                <small>(<span data-bind="text: statusInfo.internetbandwidth()*8"></span> Mbps)</small>
                             </div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
-                        <div class="row">
-                            <div class="col-sm-6">$T('platform') &nbsp; </div>
-                            <div class="col-sm-6">
-                                $platform
-                            </div>
-                        </div>
                         <div class="row test-download">
-                            <div class="col-sm-6">$T('dashboard-testDownload') &nbsp; </div>
+                            <div class="col-sm-6">$T('dashboard-testDownload')</div>
                             <div class="col-sm-6">
                                 <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="100MB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 100 MB</a>
-                                <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="1000MB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 1 GB</a>
-                                <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="10GB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 10 GB</a>
+                                <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="1000MB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 1000 MB</a>
                             </div>
                         </div>
                         <hr />
@@ -197,14 +168,14 @@
                         </div>
                         <div class="row options-function-box">
                             <div class="col-sm-6">
-                                <a href="./api?mode=showlog&apikey=$apikey" target="_blank" class="btn btn-default" data-tooltip="true" data-placement="top" title="$T('Glitter-logText')">
+                                <a href="./status/showlog?apikey=$apikey" target="_blank" class="btn btn-default" data-tooltip="true" data-placement="top" title="$T('Glitter-logText')">
                                     <span class="glyphicon glyphicon-file"></span> $T('link-showLog')
                                 </a>
                             </div>
                             <div class="col-sm-6">
                                 <div class="input-group" data-tooltip="true" data-placement="top" title="$T('logging')">
                                     <span class="input-group-addon"><span class="glyphicon glyphicon-comment"></span></span>
-                                    <select class="form-control" data-bind="value: loglevel">
+                                    <select class="form-control" data-bind="value: statusInfo.loglevel">
                                         <option value="0">$T('log-errWarn')</option>
                                         <option value="1">$T('log-info')</option>
                                         <option value="2">$T('log-debug')</option>
@@ -235,26 +206,17 @@
                                 </div>
                                 <div class="row" data-bind="visible: serverssl">
                                     <div class="col-sm-6">$T('srv-ssl')</div>
-                                    <div class="col-sm-6 col-dot-overflow">
-                                        <span class="glyphicon glyphicon-ok"></span>
-                                        <span data-bind="text: serversslinfo"></span>
+                                    <div class="col-sm-6">
+                                        <span class="glyphicon glyphicon-ok"></span> <span data-bind="text: serversslinfo"></span>
                                     </div>
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-6"># $T('connections')</div>
                                     <div class="col-sm-6">
                                         <span data-bind="text: serverconnections().length"></span> /
-                                        <span data-bind="text: servertotalconn"></span><br>
-                                        <!-- ko if: serveripaddress() -->
-                                        <span data-bind="text: servercanonname"></span><br>
-                                        <span data-bind="text: serveripaddress"></span>
-                                        <!-- /ko -->
+                                        <span data-bind="text: servertotalconn"></span>
                                     </div>
                                 </div>
-                                <div class="row">
-                                    <div class="col-sm-6">$T('Glitter-speed')</div>
-                                    <div class="col-sm-6"><span data-bind="text: serverbps"></span>B/s</div>
-                                </div>
                                 <div class="row" data-bind="visible: servererror()">
                                     <div class="col-sm-12">
                                         <div class="alert alert-danger">
@@ -264,11 +226,11 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="row" data-bind="visible: serverwarning()">
+                                <div class="row" data-bind="visible: !isFinite(serveractiveconn())">
                                     <div class="col-sm-12">
                                         <div class="alert alert-warning">
                                             <span class="glyphicon glyphicon-info-sign"></span>
-                                            <span data-bind="text: serverwarning()"></span>
+                                            <span data-bind="text: serveractiveconn()"></span>
                                         </div>
                                     </div>
                                 </div>
@@ -317,8 +279,8 @@
                                 <tr>
                                     <td><span class="glyphicon glyphicon-folder-open"></span></td>
                                     <td class="row-wrap-text"><strong data-bind="html: \$data"></strong></td>
-                                    <td><a href="#" data-bind="click: \$root.folderProcess" data-action="add_orphan" class="hover-button" data-tooltip="true" data-placement="left" title="$T('Glitter-backToQueue')"><span class="glyphicon glyphicon-plus-sign"></span></a></td>
-                                    <td><a href="#" data-bind="click: \$root.folderProcess" data-action="delete_orphan" class="hover-button" data-tooltip="true" data-placement="left" title="$T('Glitter-deleteJobAndFolders')"><span class="glyphicon glyphicon-trash"></span></a></td>
+                                    <td><a href="#" data-bind="click: \$root.folderProcess" data-action="add" class="hover-button" data-tooltip="true" data-placement="left" title="$T('Glitter-backToQueue')"><span class="glyphicon glyphicon-plus-sign"></span></a></td>
+                                    <td><a href="#" data-bind="click: \$root.folderProcess" data-action="delete" class="hover-button" data-tooltip="true" data-placement="left" title="$T('Glitter-deleteJobAndFolders')"><span class="glyphicon glyphicon-trash"></span></a></td>
                                 </tr>
                             </tbody>
                         </table>
@@ -380,6 +342,7 @@
                                     </select>
                                 </div>
                             </div>
+                            <div class="options-switch"></div>
                             <div class="form-group">
                                 <label class="col-sm-6 control-label">$T('Glitter-dateFormat')</label>
                                 <div class="col-sm-4">
@@ -404,7 +367,8 @@
                                     <span class="label label-warning">&gt; 1200 pixels</span>
                                 </label>
                                 <div class="col-sm-4">
-                                    <select name="general-extra-column" class="form-control-multiselect form-control" data-bind="selectedOptions: extraQueueColumns" multiple="true">
+                                    <select name="general-extra-column" class="form-control" data-bind="value: extraQueueColumn">
+                                        <option value="">$T('none')</option>
                                         <option value="category">$T('category')</option>
                                         <option value="priority">$T('priority')</option>
                                         <option value="processing">$T('swtag-pp')</option>
@@ -419,7 +383,8 @@
                                     <span class="label label-warning">&gt; 1200 pixels</span>
                                 </label>
                                 <div class="col-sm-4">
-                                    <select name="general-extra-column" class="form-control-multiselect form-control" data-bind="selectedOptions: extraHistoryColumns" multiple="true">
+                                    <select name="general-extra-column" class="form-control" data-bind="value: extraHistoryColumn">
+                                        <option value="">$T('none')</option>
                                         <option value="category">$T('category')</option>
                                         <option value="size">$T('size')</option>
                                         <option value="speed">$T('Glitter-speed')</option>
@@ -434,14 +399,6 @@
                                     <input type="checkbox" name="displayCompact" value="true" data-bind="checked: displayCompact" />
                                 </div>
                             </div>
-                            <div class="form-group form-checkbox">
-                                <label class="col-sm-6 control-label">
-                                    $T("Glitter-displayFullWidth")
-                                </label>
-                                <div class="col-sm-4">
-                                    <input type="checkbox" name="displayFullWidth" value="true" data-bind="checked: displayFullWidth" />
-                                </div>
-                            </div>
                             <div class="form-group form-checkbox">
                                 <label class="col-sm-6 control-label">
                                     $T("Glitter-displayTabbed")
@@ -466,16 +423,6 @@
                                     <input type="checkbox" name="confirmDeleteHistory" value="true" data-bind="checked: confirmDeleteHistory" />
                                 </div>
                             </div>
-                            <div class="form-group form-checkbox">
-                                <label class="col-sm-6 control-label">
-                                    $T("Glitter-keyboardShortcuts")
-                                    <span class="glyphicon glyphicon-question-sign" data-tooltip="true" data-placement="top" data-html="true"
-                                        data-original-title="P: $T('link-pause')<br>A: $T('Glitter-addNZB')<br>S: $T('Glitter-statusInterfaceOptions')<br>C: $T('menu-config')<br>$T('Glitter-keyboardShortcuts-arrows')"></span>
-                                </label>
-                                <div class="col-sm-4">
-                                    <input type="checkbox" name="keyboardShortcuts" value="true" data-bind="checked: keyboardShortcuts" />
-                                </div>
-                            </div>
                         </form>
                     </div>
                 </div>
@@ -487,14 +434,14 @@
 
 <div id="modal-add-nzb" class="modal fade" tabindex="-1">
     <div class="modal-dialog">
-        <form class="modal-content" data-bind="submit: addNZB">
+        <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
                 <h4 class="modal-title">$T('Glitter-addNZB')</h4>
             </div>
             <div class="modal-body form-horizontal">
                 <div class="row">
-                    <div class="col-sm-6">
+                    <form data-bind="submit: addNZBFromURL" class="col-sm-6">
                         <fieldset>
                             <legend class="row-wrap-text">$T('Glitter-addFromURL')</legend>
                             <div class="input-group" data-tooltip="true" data-placement="bottom" title="$file_exts">
@@ -504,8 +451,8 @@
                                 </span>
                             </div>
                         </fieldset>
-                    </div>
-                    <div class="col-sm-6">
+                    </form>
+                    <form data-bind="submit: addNZBFromFileForm" class="col-sm-6">
                         <fieldset>
                             <legend class="row-wrap-text">$T('Glitter-addFromFile')</legend>
                             <div class="input-group" data-tooltip="true" data-placement="bottom" title="$file_exts">
@@ -519,7 +466,7 @@
                                 </span>
                             </div>
                         </fieldset>
-                    </div>
+                    </form>
                 </div>
                 <div class="clearfix"></div>
                 <hr />
@@ -538,42 +485,34 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label">$T('category')</label>
                     <div class="col-sm-6">
-                        <select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText', optionsCaption: ''"></select>
+                        <select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText',"></select>
                         <span class="glyphicon glyphicon-tag"></span>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-4 control-label">$T('priority')</label>
                     <div class="col-sm-6">
-                        <!-- This list is different from the one during download! -->
-                        <select name="Priority" class="form-control">
-                            <option value=""></option>
-                            <option value="2">$T('pr-force')</option>
-                            <option value="1">$T('pr-high')</option>
-                            <option value="0">$T('pr-normal')</option>
-                            <option value="-1">$T('pr-low')</option>
-                            <option value="-2" >$T('pr-paused')</option>
-                        </select>
+                        <select name="Priority" class="form-control" data-bind="options: queue.priorityOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '$T('default')'"></select>
                         <span class="glyphicon glyphicon-sort-by-attributes-alt"></span>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-4 control-label">$T('swtag-pp')</label>
                     <div class="col-sm-6">
-                        <select name="Processing" class="form-control" data-bind="options: queue.processingOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: ''"></select>
+                        <select name="Processing" class="form-control" data-bind="options: queue.processingOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '$T('default')'"></select>
                         <span class="glyphicon glyphicon-check"></span>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-4 control-label">$T('eoq-scripts')</label>
                     <div class="col-sm-6">
-                        <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '', optionsValue: 'scriptValue', optionsText: 'scriptText', enable: (queue.scriptsList().length > 1)"></select>
+                        <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '$T('default')', enable: (queue.scriptsList().length > 1)"></select>
                         <span class="glyphicon glyphicon-flash"></span>
                     </div>
                 </div>
                 <div class="clearfix"></div>
             </div>
-        </form>
+        </div>
     </div>
 </div>
 
@@ -645,59 +584,6 @@
     </div>
 </div>
 
-<div id="modal-delete-queue-job" class="modal modal-delete-job fade" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h4 class="modal-title row-wrap-text">$T('removeNZB-Files')</h4>
-            </div>
-            <form data-bind="submit: queue.removeDownloads">
-                <div class="modal-body">
-                    $T('confirm-delete')
-
-                    <ul data-bind="foreach: queue.deleteItems">
-                        <li data-bind="text: name"></li>
-                    </ul>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">$T('cancel')</button>
-                    <button type="submit" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> $T('nzo-delete')</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
-
-<div id="modal-delete-history-job" class="modal modal-delete-job fade" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h4 class="modal-title row-wrap-text">$T('nzo-delete')</h4>
-            </div>
-            <form data-bind="submit: history.removeDownloads">
-                <div class="modal-body">
-                    $T('confirm-delete')
-
-                    <ul data-bind="foreach: history.deleteItems">
-                        <li data-bind="text: historyStatus.name"></li>
-                    </ul>
-                </div>
-                <div class="modal-footer">
-                     <div class="checkbox" data-bind="visible: !history.showArchive()">
-                        <label>
-                            <input type="checkbox" data-bind="checked: history.permanentlyDelete"> <span>$T('permanently-delete')</span>
-                        </label>
-                    </div>
-                    <button type="button" class="btn btn-default" data-dismiss="modal">$T('cancel')</button>
-                    <button type="submit" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> $T('nzo-delete')</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
-
 <div id="modal-retry-job" class="modal modal-small fade" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content">
@@ -728,9 +614,6 @@
                             </div>
                         </div>
                     </fieldset>
-                    <fieldset>
-                        $T('Glitter-retryNoChecks')
-                    </fieldset>
                 </div>
                 <div class="modal-footer">
                     <button class="btn btn-default"><span class="glyphicon glyphicon-repeat"></span> $T('button-retry')</button>
@@ -778,13 +661,13 @@
                             <td><a href="https://github.com/sabnzbd/sabnzbd" target="_blank">https://github.com/sabnzbd/sabnzbd/</a></td>
                         </tr>
                         <tr>
-                            <td><strong>$T('menu-live-chat'):</strong></td>
+                            <td><strong>$T('menu-irc'):</strong></td>
                             <td><a href="https://sabnzbd.org/live-chat" target="_blank">https://sabnzbd.org/live-chat</a></td>
                         </tr>
                     </tbody>
                 </table>
                 <hr/>
-                <p><small>Copyright &copy; 2007-2025 by The SABnzbd-Team (<a href="https://sabnzbd.org/" target="_blank">sabnzbd.org</a>)<br/>$T('yourRights') </small></p>
+                <p><small>Copyright (C) 2007-2020 The SABnzbd Team &lt;team@sabnzbd.org&gt;<br/>$T('yourRights') </small></p>
             </div>
         </div>
     </div>
@@ -803,18 +686,11 @@
                 <button type="button" class="btn btn-danger" data-bind="click: history.emptyHistory" data-action="history-purge-completed"><span class="glyphicon glyphicon-floppy-saved"></span> $T('purgeCompl')</button><hr />
                 <button type="button" class="btn btn-danger" data-bind="click: history.emptyHistory" data-action="history-purge-page"><span class="glyphicon glyphicon-check"></span> $T('purgePage') <span class="label label-default" data-bind="text: history.historyItems().length"></span></button>
             </div>
-            <div class="modal-footer">
-                <div class="checkbox">
-                    <label>
-                        <input type="checkbox" data-bind="checked: history.permanentlyDelete"> <span>$T('permanently-delete')</span>
-                    </label>
-                </div>
-            </div>
         </div>
     </div>
 </div>
 
-<div id="modal-custom-pause" class="modal modal-small fade" tabindex="-1">
+<div id="modal_custom_pause" class="modal modal-small fade" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">

interfaces/Glitter/templates/include_queue.tmpl

@@ -9,16 +9,22 @@
             </a>
         </div>
         <!-- /ko -->
+        <!--#if $loadavg#-->
+        <div class="info-container-box" title="$T('ft-sysload') - $T('menu-config') &#10140; $T('cmenu-special') &#10140; show_sysload">
+            <span class="glyphicon glyphicon-record"></span>
+            <span data-bind="text: systemLoad"></span>
+        </div>
+        <!--#end if#-->
         <!-- ko if: (queueDataLeft() != '')  -->
         <div class="info-container-box">
             <span class="glyphicon glyphicon-save"></span>
             <span data-bind="text: queueDataLeft"></span> $T('Glitter-left')
         </div>
         <!-- /ko -->
-        <!-- ko if: (parseInt(quotaLimit()) != 0)  -->
+        <!-- ko if: (quotaLimit() != 0)  -->
         <div class="info-container-box">
             <span data-bind="css: { 'queue-error-info' : (parseInt(quotaLimitLeft())<=0) }">
-                <span class="glyphicon glyphicon-log-in"></span> <span data-bind="text: quotaLimitLeft"></span> / <span data-bind="text: quotaLimit"></span> $T('quota-left')
+                <span class="glyphicon glyphicon-log-in"></span> <span data-bind="text: quotaLimitLeft"></span>B / <span data-bind="text: quotaLimit"></span>B $T('quota-left')
             </span>
         </div>
         <!-- /ko -->
@@ -46,7 +52,6 @@
                 <span class="glyphicon glyphicon-tasks" data-tooltip="true" data-placement="left" title="$T('Glitter-multiOperations')"></span>
             </a>
             <ul class="dropdown-menu">
-                <li><a href="#" data-action="sortRemainingAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortRemaining')</a></li>
                 <li><a href="#" data-action="sortAgeAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortAgeAsc')</a></li>
                 <li><a href="#" data-action="sortAgeDesc" data-bind="click: queue.queueSorting">$T('Glitter-sortAgeDesc')</a></li>
                 <li><a href="#" data-action="sortNameAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortNameAsc')</a></li>
@@ -62,10 +67,8 @@
             <tr>
                 <th style="width: 25px;"></th>
                 <th></th>
-                <!-- ko foreach: extraQueueColumns -->
-                <th class="table-header-extra"></th>
-                <!-- /ko -->
-                <th class="table-header-progress" data-bind="css: { 'table-header-progress-smaller' : extraQueueColumns().length }"></th>
+                <th class="table-header-extra" data-bind="css: { 'table-extra-header-visible' : extraQueueColumn }"></th>
+                <th class="table-header-progress" data-bind="css: { 'table-header-progress-smaller' : extraQueueColumn }"></th>
                 <th style="width: 85px;"></th>
                 <th style="width: 60px;"></th>
             </tr>
@@ -73,7 +76,7 @@
         <!-- ko if: !hasQueue() -->
         <tbody class="no-downloads">
             <tr>
-                <td colspan="6" data-bind="attr: { 'colspan': 5 + extraQueueColumns().length }">
+                <td colspan="6">
                     <a href="#modal-add-nzb" class="hover-button" data-toggle="modal">
                         <span title="$T('Glitter-dragAndDrop')" data-tooltip="true"><span class="glyphicon glyphicon-plus-sign"></span> $T('Glitter-addNZB')</span>
                     </a>
@@ -104,7 +107,7 @@
                     <form data-bind="submit: editingNameSubmit">
                         <input type="text" data-bind="value: nameForEdit, visible: editingName(), hasfocus: editingName" />
                     </form>
-                    <div class="name-icons direct-unpack hover-button" data-bind="visible: direct_unpack() && !editingName()">
+                    <div class="name-icons direct-unpack hover-button" data-bind="visible: direct_unpack">
                         <span class="glyphicon glyphicon-compressed"></span> <span data-bind="text: direct_unpack"></span>
                     </div>
                     <div class="name-options" data-bind="visible: !editingName(), css: { disabled: isGrabbing() }">
@@ -115,11 +118,10 @@
                         <small data-bind="text: avg_age"></small>
                     </div>
                 </td>
-                <!-- ko foreach: parent.parent.extraQueueColumns -->
                 <td class="row-extra-text">
-                    <div class="row-wrap-text" data-bind="text: \$parent.showColumn(\$data)"></div>
+                    <div class="row-wrap-text" data-bind="text: extraText">
+                    </div>
                 </td>
-                <!-- /ko -->
                 <td class="progress-indicator">
                     <div class="progress">
                         <div class="progress-bar progress-bar-info" data-bind="attr: { 'style': 'width: ' + percentage() + '%; background-color: ' + progressColor() + ';' }">
@@ -157,13 +159,13 @@
                             </li>
                             <li title="$T('eoq-scripts')" data-tooltip="true" data-placement="left">
                                 <span class="glyphicon glyphicon-flash"></span>
-                                <select name="Post-processing" class="form-control" data-bind="options: parent.scriptsList, value: script, optionsValue: 'scriptValue', optionsText: 'scriptText', event: { change: changeScript }, enable: (parent.scriptsList().length > 1)"></select>
+                                <select name="Post-processing" class="form-control" data-bind="options: parent.scriptsList, value: script, event: { change: changeScript }, enable: (parent.scriptsList().length > 1)"></select>
                             </li>
                         </ul>
                         <!-- /ko -->
                     </div>
                     <!-- /ko -->
-                    <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: parent.triggerRemoveDownload"><span class="glyphicon glyphicon-trash"></span></a>
+                    <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: removeDownload"><span class="glyphicon glyphicon-trash"></span></a>
                 </td>
             </tr>
         </tbody>
@@ -171,28 +173,22 @@
 
     <form class="multioperations-selector" data-bind="visible: (hasQueue() && queue.isMultiEditing())" style="display: none;">
         <div class="add-nzb-inputbox add-nzb-inputbox-small add-nzb-inputbox-options">
-            <label for="multiedit-checkall-queue">
-                <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall-queue" title="$T('Glitter-checkAll')" data-bind="click: queue.checkAllJobs" data-tooltip="true" data-placement="top" />
+            <label for="multiedit-checkall">
+                <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall" title="$T('Glitter-checkAll')" data-bind="click: queue.checkAllJobs" data-tooltip="true" data-placement="top" />
             </label>
-            <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: queue.doMultiDelete" data-tooltip="true" data-placement="top">
+            <a href="#" class="hover-button" data-bind="click: queue.doMultiDelete">
                 <span class="glyphicon glyphicon-trash"></span>
             </a>
         </div>
         <div class="add-nzb-inputbox add-nzb-inputbox-small">
-            <label for="multiedit-play" data-bind="event: { mousedown: queue.handleMultiEditStatusMouseDown }">
+            <label for="multiedit-play">
                 <input type="radio" name="multiedit-status" value="resume" id="multiedit-play" data-bind="event: { change: queue.doMultiEditUpdate }" />
                 <span class="glyphicon glyphicon-play" title="$T('link-resume')" data-tooltip="true" data-placement="top"></span>
             </label>
-            <label for="multiedit-pause" data-bind="event: { mousedown: queue.handleMultiEditStatusMouseDown }">
+            <label for="multiedit-pause">
                 <input type="radio" name="multiedit-status" value="pause" id="multiedit-pause" data-bind="event: { change: queue.doMultiEditUpdate }" />
                 <span class="glyphicon glyphicon-pause" title="$T('link-pause')" data-tooltip="true" data-placement="top"></span>
             </label>
-            <a href="#" class="hover-button" title="$T('Glitter-top')" data-bind="click: queue.doMultiMoveToTop" data-tooltip="true" data-placement="top">
-                <span class="glyphicon glyphicon-chevron-up"></span>
-            </a>
-            <a href="#" class="hover-button" title="$T('Glitter-bottom')" data-bind="click: queue.doMultiMoveToBottom" data-tooltip="true" data-placement="top">
-                <span class="glyphicon glyphicon-chevron-down"></span>
-            </a>
             <span class="label label-default" data-bind="text: queue.multiEditItems().length">0</span>
         </div>
         <div class="add-nzb-inputbox-clear"></div>
@@ -210,7 +206,7 @@
         </div>
         <div class="add-nzb-inputbox" data-tooltip="true" data-placement="top" title="$T('eoq-scripts')">
             <span class="glyphicon glyphicon-flash"></span>
-            <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsValue: 'scriptValue', optionsText: 'scriptText', optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
+            <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
         </div>
         <div class="clearfix"></div>
     </form>
@@ -227,4 +223,4 @@
             <span data-bind="text: page"></span>
         </li>
     </ul>
-</div>
+</div>

interfaces/Glitter/templates/main.tmpl

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--#set $active_lang=$active_lang.replace('_', '-').lower()#-->
-<html lang="$active_lang" <!--#if $rtl#-->dir="rtl"<!--#end if#--> id="sabnzbd" data-bind="filedrop: { overlaySelector: '.main-filedrop', onFileDrop: addNZBFromFile }">
+<html lang="$active_lang" id="sabnzbd" data-bind="filedrop: { overlaySelector: '.main-filedrop', onFileDrop: addNZBFromFile }">
     <head>
         <!--
                 Glitter V2
@@ -36,7 +36,7 @@
         <link rel="stylesheet" type="text/css" href="./static/bootstrap/css/bootstrap.min.css?v=$version" />
         <link rel="stylesheet" type="text/css" href="./static/stylesheets/glitter.css?v=$version" />
         <link rel="stylesheet" type="text/css" href="./static/stylesheets/glitter.mobile.css?v=$version" media="all and (max-width: 768px)" />
-        <!--#if $color_scheme not in ('Light', '') #-->
+        <!--#if $color_scheme not in ('Default', '') #-->
         <link rel="stylesheet" type="text/css" href="./static/stylesheets/colorschemes/${color_scheme}.css?v=$version"/>
         <!--#end if#-->
 
@@ -52,21 +52,28 @@
             var glitterTranslate = new Object();
             glitterTranslate.paused = "$T('post-Paused')";
             glitterTranslate.left = "$T('Glitter-left')";
-            glitterTranslate.clearOrphanWarning = "$T('Glitter-clearOrphanWarning')";
+            glitterTranslate.clearWarn = "$T('Glitter-confirmClearWarnings')";
             glitterTranslate.pausePromptFail = "$T('Glitter-pausePromptFail')"
             glitterTranslate.pauseFor = "$T('pauseFor')"
             glitterTranslate.minutes = "$T('mins')"
             glitterTranslate.shutdown = "$T('shutdownOK?')";
             glitterTranslate.restart = "$T('explain-Restart') $T('explain-needNewLogin')".replace(/\<br(\s*\/|)\>/g, '\n');
             glitterTranslate.repair = "$T('explain-Repair')".replace(/<br \/>/g, "\n").replace(/&quot;/g,'"');
-            glitterTranslate.confirm = "$T('confirm')";
-            glitterTranslate.markComplete = "$T('button-mark-completed')";
-            glitterTranslate.renameAbort = "$T('Glitter-confirmAbortDirectUnpack')\n$T('confirm')";
+            glitterTranslate.removeDown = "$T('Glitter-confirmClearDownloads')";
+            glitterTranslate.removeDow1 = "$T('Glitter-confirmClear1Download')";
             glitterTranslate.retryAll = "$T('link-retryAll')?";
             glitterTranslate.fetch = "$T('Glitter-fetch')";
+            glitterTranslate.encrypted = "$T('Glitter-encrypted')";
+            glitterTranslate.duplicate = "$T('Glitter-duplicate')";
+            glitterTranslate.tooLarge = "$T('Glitter-tooLarge')";
+            glitterTranslate.unwanted = "$T('Glitter-unwanted')";
+            glitterTranslate.incomplete = "$T('Glitter-incomplete')";
+            glitterTranslate.filtered = "$T('Glitter-filtered')";
+            glitterTranslate.waitSec = "$T('Glitter-waitSec')";
             glitterTranslate.checking = "$T('post-Checking')";
             glitterTranslate.misingArt = "$T('missingArt')";
-            glitterTranslate.fetchingURL = "$T('Glitter-addFromURL')"
+            glitterTranslate.noSelect = "$T('Glitter-noSelect')";
+            glitterTranslate.sendThanks = "$T('Glitter-sendThanks')";
             glitterTranslate.chooseFile = "$T('Glitter-chooseFile')";
             glitterTranslate.orphanedJobsMsg = "$T('explain-orphans')";
             glitterTranslate.useCache = "$T('explain-cache_limitstr').replace("64M", "256M").replace("128M", "512M")";
@@ -94,9 +101,7 @@
             glitterTranslate.status['Repair'] = "$T('stage-repair')";
             glitterTranslate.status['Filejoin'] = "$T('stage-filejoin')";
             glitterTranslate.status['Unpack'] = "$T('stage-unpack')";
-            glitterTranslate.status['Deobfuscate'] = "$T('stage-deobfuscate')";
             glitterTranslate.status['Script'] = "$T('stage-script')";
-            glitterTranslate.status['RSS'] = "$T('stage-rss')";
             glitterTranslate.status['Source'] = "$T('stage-source')";
             glitterTranslate.status['Servers'] = "$T('stage-servers')";
             glitterTranslate.status['INFO'] = "$T('log-info')".replace('+', '').toUpperCase();
@@ -117,16 +122,14 @@
             glitterTranslate.priority['Stop'] = "$T('pr-stop')";
         </script>
 
-        <!-- Inclusion is faster than external scripts. We load momentJS locale separately so failure won't break anything -->
+        <!-- Inclusion is faster than external scripts. We load momentJS locale seperatly so failure won't break anything -->
         <script type="text/javascript">
             <!--#include raw $webdir + "/static/javascripts/jquery-3.5.1.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/jquery-ui.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/jquery.peity.min.js"#-->
-            <!--#include raw $webdir + "/static/javascripts/jquery.hotkeys.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/moment-2.26.0.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/knockout-3.5.1.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/knockout-extensions.js"#-->
-            <!--#include raw $webdir + "/static/javascripts/search-query-parser.js"#-->
             <!--#include raw $webdir + "/static/bootstrap/js/bootstrap.min.js"#-->
             <!--#include $webdir + "/static/javascripts/glitter.js"#-->
         </script>
@@ -146,10 +149,10 @@
                         <a href="#queue-tab" data-toggle="tab">$T('menu-queue') <span class="badge" data-bind="text: queue.totalItems"></span></a>
                     </li>
                     <li>
-                        <a href="#history-tab" data-toggle="tab">$T('menu-history') <span class="badge badge-info" data-bind="text: history.ppItems, visible: history.ppItems"></span><span class="badge" data-bind="text: history.totalItems"></span></a>
+                        <a href="#history-tab" data-toggle="tab">$T('menu-history')<span class="badge" data-bind="text: history.totalItems"></span></a>
                     </li>
                     <li>
-                        <a href="#queue-messages" data-toggle="tab">$T('warnings') <span class="badge" data-bind="text: hasMessages, css: { 'badge-warning':  hasMessages() }"></span></a>
+                        <a href="#queue-messages" data-toggle="tab">$T('warnings')<span class="badge" data-bind="text: hasMessages, css: { 'badge-warning':  hasMessages() }"></span></a>
                     </li>
                 </ul>
             </div>

interfaces/Glitter/templates/nzo.tmpl

@@ -0,0 +1 @@
+  

interfaces/Glitter/templates/queue.tmpl

@@ -0,0 +1,40 @@
+<!--#if $paused#-->
+    <!--#if $pause_int != '0' #-->
+        <!--#from math import floor#-->
+
+        <!--#set pauseSplit = $pause_int.split(':')#-->
+        <!--#set seconds = int(pauseSplit[0]) * 60 + int(pauseSplit[1])#-->
+        <!--#set hours = floor(seconds/3600)#-->
+        <!--#set minutes = floor((seconds - hours * 3600) / 60)#-->
+        <!--#set seconds = seconds - minutes * 60 - hours * 3600#-->
+
+        <!--#if seconds < 10 #-->
+            <!--#set seconds = '0' + str(int(seconds)) #-->
+        <!--#else#-->
+            <!--#set seconds = str(int(seconds)) #-->
+        <!--#end if#-->
+
+        <!--#if (minutes < 10) & (hours > 0) #-->
+            <!--#set minutes = '0' + str(int(minutes)) #-->
+        <!--#else#-->
+            <!--#set minutes = str(int(minutes)) #-->
+        <!--#end if#-->
+
+        <!--#if hours > 0 #-->
+            <!--#set timeString = str(int(hours)) + ":" + minutes + ":" + seconds#-->
+        <!--#else#-->
+            <!--#set timeString = minutes + ":" + seconds#-->
+        <!--#end if#-->
+    <!--#end if#-->
+
+    $T('post-Paused') <!--#if $pause_int != '0' #-->($timeString) <!--#end if#-->
+    <!--#if float($mbleft) > 0#-->
+        - $sizeleft $T('Glitter-left')
+    <!--#end if#-->
+    - SABnzbd
+<!--#else if float($mbleft) < 0.1#-->
+    SABnzbd
+<!--#else#-->
+    ${speed}B/s - $sizeleft $T('Glitter-left') - SABnzbd
+<!--#end if#-->
+|||<!--#echo "%.0f" % float($kbpersec)#-->

interfaces/Glitter/templates/static/javascripts/glitter.basic.js

@@ -1,6 +1,7 @@
 /**
     Base variables and functions
 **/
+var fadeOnDeleteDuration = 400; // ms after deleting a row
 var isMobile = (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase()));
 
 // To avoid problems when localStorage is disabled
@@ -24,7 +25,7 @@ if(isMobile) {
 }
 
 // Basic API-call
-function callAPI(data, timeout = 10000) {
+function callAPI(data) {
     // Fill basis var's
     data.output = "json";
     data.apikey = apiKey;
@@ -33,12 +34,65 @@ function callAPI(data, timeout = 10000) {
         type: "GET",
         cache: false,
         data: data,
-        timeout: timeout
+        timeout: 10000 // Wait a little longer on mobile connections
     });
 
     return $.when(ajaxQuery);
 }
 
+// Special API call
+function callSpecialAPI(url, data) {
+    // Did we get input?
+    if(data == undefined) data = {};
+    // Fill basis var's
+    data.output = "json";
+    data.apikey = apiKey;
+    var ajaxQuery = $.ajax({
+        url: url,
+        type: "GET",
+        cache: false,
+        data: data
+    });
+
+    return $.when(ajaxQuery);
+}
+
+/**
+    Handle visibility changes so we
+    do only incremental update when not visible
+**/
+var pageIsVisible = true;
+// Set the name of the hidden property and the change event for visibility
+var hidden, visibilityChange;
+if(typeof document.hidden !== "undefined") { // Opera 12.10 and Firefox 18 and later support
+    hidden = "hidden";
+    visibilityChange = "visibilitychange";
+} else if(typeof document.mozHidden !== "undefined") {
+    hidden = "mozHidden";
+    visibilityChange = "mozvisibilitychange";
+} else if(typeof document.msHidden !== "undefined") {
+    hidden = "msHidden";
+    visibilityChange = "msvisibilitychange";
+} else if(typeof document.webkitHidden !== "undefined") {
+    hidden = "webkitHidden";
+    visibilityChange = "webkitvisibilitychange";
+}
+
+// Set the global visibility
+function handleVisibilityChange() {
+    if(document[hidden]) {
+        pageIsVisible = false;
+    } else {
+        pageIsVisible = true;
+    }
+}
+
+// Add event listener only for supported browsers
+if(typeof document.addEventListener !== "undefined" && typeof document[hidden] !== "undefined") {
+    // Handle page visibility change
+    document.addEventListener(visibilityChange, handleVisibilityChange, false);
+}
+
 /***
     GENERAL FUNCTIONS
 ***/
@@ -58,11 +112,11 @@ function convertHTMLtoText(htmltxt) {
 // Function to re-write 0:09:21=>9:21, 0:10:10=>10:10, 0:00:30=>0:30
 function rewriteTime(timeString) {
     // Remove "0:0" from start
-    if(timeString.substring(0,3) === '0:0') {
+    if(timeString.substring(0,3) == '0:0') {
         timeString = timeString.substring(3)
     }
     // Remove "0:" from start
-    else if(timeString.substring(0,2) === '0:') {
+    else if(timeString.substring(0,2) == '0:') {
         timeString = timeString.substring(2)
     }
     return timeString
@@ -71,13 +125,13 @@ function rewriteTime(timeString) {
 // How to display the date-time?
 function displayDateTime(inDate, outFormat, inFormat) {
     // What input?
-    if(inDate === '') {
+    if(inDate == '') {
         var theMoment = moment()
     } else {
         var theMoment = moment.utc(inDate, inFormat)
     }
     // Special format or regular format?
-    if(outFormat === 'fromNow') {
+    if(outFormat == 'fromNow') {
         return theMoment.fromNow()
     } else {
         return theMoment.local().format(outFormat)
@@ -155,7 +209,7 @@ function setCheckAllState(checkSelector, rangeSelector) {
     var nrChecks = allChecks.filter(":checked");
     if(nrChecks.length === 0) {
         $(checkSelector).prop({'checked': false, 'indeterminate': false})
-    } else if(nrChecks.length === allChecks.length) {
+    } else if(nrChecks.length == allChecks.length) {
         $(checkSelector).prop({'checked': true, 'indeterminate': false})
     } else {
         $(checkSelector).prop({'checked': false, 'indeterminate': true})
@@ -210,13 +264,18 @@ function showNotification(notiName, notiTimeout, fileCounter) {
     // Remove after timeout
     if(notiTimeout) {
         setTimeout(function() {
-            hideNotification();
+            hideNotification(true);
         }, notiTimeout)
     }
 }
 
 // Hide notification
-function hideNotification() {
-    // Hide the box with effect
-    $('.main-notification-box').fadeOut()
+function hideNotification(fadeItOut) {
+    // Hide the box with or without effect
+    if(fadeItOut) {
+        $('.main-notification-box').fadeOut()
+    } else {
+        $('.main-notification-box').hide()
+    }
+
 }

interfaces/Glitter/templates/static/javascripts/glitter.filelist.pagination.js

@@ -4,9 +4,6 @@ function Fileslisting(parent) {
     self.parent = parent;
     self.fileItems = ko.observableArray([]);
 
-    // Prevent flash of unstyled content when deleting items
-    self.fileItems.extend({ rateLimit: 50 })
-
     // Need to reserve these names to be overwritten
     self.filelist_name = ko.observable();
     self.filelist_password = ko.observable();
@@ -33,17 +30,42 @@ function Fileslisting(parent) {
         $('#modal-item-files').modal('show');
 
         // Stop updating on closing of the modal
-        $('#modal-item-files').on('hidden.bs.modal', function () {
+        $('#modal-item-files').on('hidden.bs.modal', function() {
             self.removeUpdate();
         })
     }
 
+    // Move to top and bottom buttons
+    self.moveButton = function (item,event) {
+        var targetRow, sourceRow, tbody;
+        sourceRow = $(event.currentTarget).parents("tr").filter(":first");
+        tbody = sourceRow.parents("tbody").filter(":first");
+        ko.utils.domData.set(sourceRow[0], "ko_sourceIndex", ko.utils.arrayIndexOf(sourceRow.parent().children(), sourceRow[0]));
+        sourceRow = sourceRow.detach();
+        if ($(event.currentTarget).is(".buttonMoveToTop")) {
+            // we are moving to the top
+            targetRow = tbody.children(".files-done").filter(":last");
+        } else {
+            //we are moving to the bottom
+            targetRow = tbody.children(".files-sortable").filter(":last");
+        }
+        if(targetRow.length < 1 ){
+        // we found an edge case and need to do something special
+            targetRow = tbody.children(".files-sortable").filter(":first");
+            sourceRow.insertBefore(targetRow[0]);
+        } else {
+            sourceRow.insertAfter($(targetRow[0]));
+        }
+        tbody.sortable('option', 'update').call(tbody[0],null, { item: sourceRow });
+    };
+
     // Trigger update
     self.triggerUpdate = function() {
         // Call API
         callAPI({
             mode: 'get_files',
-            value: self.currentItem.id
+            value: self.currentItem.id,
+            limit: 5
         }).then(function(response) {
             // When there's no files left we close the modal and the update will be stopped
             // For example when the job has finished downloading
@@ -57,7 +79,7 @@ function Fileslisting(parent) {
             $.each(response.files, function(index, slot) {
                 // Existing or updating?
                 var existingItem = ko.utils.arrayFirst(self.fileItems(), function(i) {
-                    return i.nzf_id() === slot.nzf_id;
+                    return i.nzf_id() == slot.nzf_id;
                 });
 
                 if(existingItem) {
@@ -76,7 +98,7 @@ function Fileslisting(parent) {
             }
 
             // Check if we show/hide completed
-            if(localStorageGetItem('showCompletedFiles') === 'No') {
+            if(localStorageGetItem('showCompletedFiles') == 'No') {
                 $('.item-files-table tr.files-done').hide();
                 $('#filelist-showcompleted').removeClass('hover-button')
             }
@@ -102,57 +124,39 @@ function Fileslisting(parent) {
     self.move = function(event) {
         // How much did we move?
         var nrMoves = event.sourceIndex - event.targetIndex;
-        var direction = (nrMoves > 0 ? 'up' : 'down')
+        var direction = (nrMoves > 0 ? 'Up' : 'Down')
 
-        callAPI({
-            mode: 'move_nzf_bulk',
-            name: direction,
-            value: self.currentItem.id,
-            nzf_ids: event.item.nzf_id(),
-            size: Math.abs(nrMoves)
-        }).then(function() {
-            // Refresh all the files
-            self.loadFiles(self.currentItem)
-        })
-    };
+        // We have to create the data-structure before, to be able to use the name as a key
+        var dataToSend = {};
+        dataToSend[event.item.nzf_id()] = 'on';
+        dataToSend['apikey'] = apiKey;
+        dataToSend['action_key'] = direction;
+        dataToSend['action_size'] = Math.abs(nrMoves);
 
-    // Move to top and bottom buttons
-    self.moveButton = function (item, event) {
-        // Up or down?
-        var direction = "bottom"
-        if ($(event.currentTarget).is(".buttonMoveToTop")) {
-            // we are moving to the top
-            direction = "top"
-        }
-
-        callAPI({
-            mode: 'move_nzf_bulk',
-            name: direction,
-            value: self.currentItem.id,
-            nzf_ids: item.nzf_id()
-        }).then(function() {
-            // Refresh all the files
-            self.loadFiles(self.currentItem)
-        })
+        // Activate with this weird URL "API"
+        callSpecialAPI("./nzb/" + self.currentItem.id + "/bulk_operation/", dataToSend)
     };
 
     // Remove selected files
     self.removeSelectedFiles = function() {
+        // We have to create the data-structure before, to be able to use the name as a key
+        var dataToSend = {};
+        dataToSend['apikey'] = apiKey;
+        dataToSend['action_key'] = 'Delete';
+
         // Get all selected ones
-        var nzfIds = []
         $('.item-files-table input:checked:not(:disabled)').each(function() {
             // Add this item
-            nzfIds.push($(this).prop('name'))
+            dataToSend[$(this).prop('name')] = 'on';
         })
 
-        callAPI({
-            mode: 'queue',
-            name: 'delete_nzf',
-            value: self.currentItem.id,
-            value2: nzfIds.join()
-        }).then(function() {
-            // Refresh all the files
-            self.loadFiles(self.currentItem)
+        // Activate with this weird URL "API"
+        callSpecialAPI("./nzb/" + self.currentItem.id + "/bulk_operation/", dataToSend).then(function() {
+            // Fade it out
+            $('.item-files-table input:checked:not(:disabled)').parents('tr').fadeOut(fadeOnDeleteDuration, function() {
+                // Set state of the check-all
+                setCheckAllState('#modal-item-files .multioperations-selector input[type="checkbox"]', '#modal-item-files .files-sortable input')
+            })
         })
     }
 
@@ -217,8 +221,8 @@ function FileslistingModel(parent, data) {
     self.nzf_id = ko.observable(data.nzf_id);
     self.file_age = ko.observable(data.age);
     self.mb = ko.observable(data.mb);
-    self.canselect = ko.observable(data.status !== "finished" && data.status !== "queued");
-    self.isdone =  ko.observable(data.status === "finished");
+    self.canselect = ko.observable(data.status != "finished" && data.status != "queued");
+    self.isdone =  ko.observable(data.status == "finished");
     self.percentage = ko.observable(self.isdone() ? fixPercentages(100) : fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)));
 
     // Update internally
@@ -227,8 +231,8 @@ function FileslistingModel(parent, data) {
         self.nzf_id(data.nzf_id)
         self.file_age(data.age)
         self.mb(data.mb)
-        self.canselect(data.status !== "finished" && data.status !== "queued")
-        self.isdone(data.status === "finished")
+        self.canselect(data.status != "finished" && data.status != "queued")
+        self.isdone(data.status == "finished")
         // Data is given in MB, would always show 0% for small files even if completed
         self.percentage(self.isdone() ? fixPercentages(100) : fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)))
     }
@@ -266,7 +270,7 @@ function paginationModel(parent) {
         // Return object for adding
         return {
             page: pageNr,
-            isCurrent: pageNr === self.currentPage(),
+            isCurrent: pageNr == self.currentPage(),
             isDots: false,
             onclick: function(data) {
                 self.moveToPage(data.page);
@@ -294,7 +298,7 @@ function paginationModel(parent) {
             self.nrPages(1)
             self.currentStart(0);
 
-            // Are we on next page? Bad!
+            // Are we on next page?
             if(self.currentPage() > 1) {
                 // Force full update
                 parent.parent.refresh(true);
@@ -302,6 +306,9 @@ function paginationModel(parent) {
 
             // Move to current page
             self.currentPage(1);
+
+            // Force full update
+            parent.parent.refresh(true);
         } else {
             // Calculate number of pages needed
             var newNrPages = Math.ceil(parent.totalItems() / parent.paginationLimit())
@@ -356,7 +363,7 @@ function paginationModel(parent) {
             }
 
             // Change of number of pages?
-            if(newNrPages !== self.nrPages()) {
+            if(newNrPages != self.nrPages()) {
                 // Update
                 self.nrPages(newNrPages);
             }

interfaces/Glitter/templates/static/javascripts/glitter.history.js

@@ -8,18 +8,12 @@ function HistoryListModel(parent) {
     // Variables
     self.lastUpdate = 0;
     self.historyItems = ko.observableArray([])
-    self.showFailed = ko.observable(false).extend({ persist: 'historyShowFailed' });
-    self.showArchive = ko.observable(false).extend({ persist: 'historyShowArchive' });
-    self.permanentlyDelete = ko.observable(false).extend({ persist: 'permanentlyDelete' });
+    self.showFailed = ko.observable(false);
     self.isLoading = ko.observable(false).extend({ rateLimit: 100 });
-    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 400, method: "notifyWhenChangesStop" } });
+    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 200, method: "notifyWhenChangesStop" } });
     self.paginationLimit = ko.observable(10).extend({ persist: 'historyPaginationLimit' });
     self.totalItems = ko.observable(0);
-    self.deleteItems = ko.observableArray([]);
-    self.ppItems = ko.observable(0);
     self.pagination = new paginationModel(self);
-    self.isMultiEditing = ko.observable(false).extend({ persist: 'historyIsMultiEditing' });
-    self.multiEditItems = ko.observableArray([]);
 
     // Download history info
     self.downloadedToday = ko.observable();
@@ -46,7 +40,7 @@ function HistoryListModel(parent) {
         var newItems = [];
         $.each(data.slots, function(index, slot) {
             var existingItem = ko.utils.arrayFirst(self.historyItems(), function(i) {
-                return i.historyStatus.nzo_id() === slot.nzo_id;
+                return i.historyStatus.nzo_id() == slot.nzo_id;
             });
             // Set index in the results
             slot.index = index
@@ -62,7 +56,7 @@ function HistoryListModel(parent) {
         });
 
         // Remove all items
-        if(itemIds.length === self.paginationLimit()) {
+        if(itemIds.length == self.paginationLimit()) {
             // Replace it, so only 1 Knockout DOM-update!
             self.historyItems(newItems);
             newItems = [];
@@ -71,7 +65,7 @@ function HistoryListModel(parent) {
             $.each(itemIds, function() {
                 var id = this.toString();
                 self.historyItems.remove(ko.utils.arrayFirst(self.historyItems(), function(i) {
-                    return i.historyStatus.nzo_id() === id;
+                    return i.historyStatus.nzo_id() == id;
                 }));
             });
         }
@@ -85,7 +79,7 @@ function HistoryListModel(parent) {
             if(self.parent.queue.multiEditItems().length > 0) {
                 $.each(newItems, function() {
                     var currentItem = this;
-                    self.parent.queue.multiEditItems.remove(function(inList) { return inList.id === currentItem.id; })
+                    self.parent.queue.multiEditItems.remove(function(inList) { return inList.id == currentItem.nzo_id; })
                 })
             }
         }
@@ -99,7 +93,6 @@ function HistoryListModel(parent) {
             History information
         ***/
         self.totalItems(data.noofslots);
-        self.ppItems(data.ppslots)
         self.downloadedToday(data.day_size);
         self.downloadedWeek(data.week_size);
         self.downloadedMonth(data.month_size);
@@ -117,44 +110,20 @@ function HistoryListModel(parent) {
                 value: newValue
             })
         }
-        // Update pagination and counters
-        self.parent.refresh(true)
     });
 
-    self.triggerRemoveDownload = function(items) {
-        // Show and fill modal
-        self.deleteItems.removeAll()
-
-        // Single or multiple items?
-        if(items.length) {
-            ko.utils.arrayPushAll(self.deleteItems, items)
-        } else {
-            self.deleteItems.push(items)
-        }
-
-        // Show modal or delete right away
-        if(self.parent.confirmDeleteHistory()) {
-            // Open modal if desired
-            $('#modal-delete-history-job').modal("show")
-        } else {
-            // Otherwise just submit right away
-            $('#modal-delete-history-job form').submit()
-        }
-    }
-
     // Retry a job
     self.retryJob = function(form) {
         // Adding a extra retry file happens through this special function
         var data = new FormData();
-        data.append("mode", "retry");
         data.append("nzbfile", $(form.nzbFile)[0].files[0]);
-        data.append("value", $('#modal-retry-job input[name="retry_job_id"]').val());
+        data.append("job", $('#modal-retry-job input[name="retry_job_id"]').val());
         data.append("password", $('#retry_job_password').val());
         data.append("apikey", apiKey);
 
         // Add
         $.ajax({
-            url: "./api",
+            url: "./retry_pp",
             type: "POST",
             cache: false,
             processData: false,
@@ -169,28 +138,28 @@ function HistoryListModel(parent) {
         form.reset()
     }
 
-    // Searching in history (rate-limited in declaration)
+    // Searching in history (rate-limited in decleration)
     self.searchTerm.subscribe(function() {
+        // Make sure we refresh
+        self.lastUpdate = 0
+        self.parent.refresh();
         // Go back to page 1
-        if(self.pagination.currentPage() !== 1) {
-            // This forces a refresh
+        if(self.pagination.currentPage() != 1) {
             self.pagination.moveToPage(1);
-        } else {
-            // Make sure we refresh
-            self.parent.refresh(true);
         }
     })
 
     // Clear searchterm
     self.clearSearchTerm = function(data, event) {
         // Was it escape key or click?
-        if(event.type === 'mousedown' || (event.keyCode && event.keyCode === 27)) {
+        if(event.type == 'mousedown' || (event.keyCode && event.keyCode == 27)) {
             // Set the loader so it doesn't flicker and then switch
             self.isLoading(true)
             self.searchTerm('');
+            self.parent.refresh()
         }
         // Was it click and the field is empty? Then we focus on the field
-        if(event.type === 'mousedown' && self.searchTerm() === '') {
+        if(event.type == 'mousedown' && self.searchTerm() == '') {
             $(event.target).parents('.search-box').find('input[type="text"]').focus()
             return;
         }
@@ -200,17 +169,10 @@ function HistoryListModel(parent) {
 
     // Toggle showing failed
     self.toggleShowFailed = function(data, event) {
+        // Set the loader so it doesn't flicker and then switch
+        self.isLoading(true)
         self.showFailed(!self.showFailed())
-        // Force hide tooltip so it doesn't linger
-        $('#history-options a').tooltip('hide')
-        // Force refresh
-        self.parent.refresh(true)
-    }
-
-    // Toggle showing archive
-    self.toggleShowArchive = function(data, event) {
-        self.showArchive(!self.showArchive())
-        // Force hide tooltip so it doesn't linger
+        // Forde hide tooltip so it doesn't linger
         $('#history-options a').tooltip('hide')
         // Force refresh
         self.parent.refresh(true)
@@ -232,34 +194,36 @@ function HistoryListModel(parent) {
 
     // Empty history options
     self.emptyHistory = function(data, event) {
+        // Make sure no flickering
+        self.isLoading(true)
+
         // What event?
         var whatToRemove = $(event.target).data('action');
-        var skipArchive = $('#modal-purge-history input[type="checkbox"]').prop("checked")
         var del_files, value;
 
         // Purge failed
-        if(whatToRemove === 'history-purge-failed') {
+        if(whatToRemove == 'history-purge-failed') {
             del_files = 0;
             value = 'failed';
         }
         // Also remove files
-        if(whatToRemove === 'history-purgeremove-failed') {
+        if(whatToRemove == 'history-purgeremove-failed') {
             del_files = 1;
             value = 'failed';
         }
         // Remove completed
-        if(whatToRemove === 'history-purge-completed') {
+        if(whatToRemove == 'history-purge-completed') {
             del_files = 0;
             value = 'completed';
         }
         // Remove the ones on this page
-        if(whatToRemove === 'history-purge-page') {
+        if(whatToRemove == 'history-purge-page') {
             // List all the ID's
             var strIDs = '';
             $.each(self.historyItems(), function(index) {
                 // Only append when it's a download that can be deleted
                 if(!this.processingDownload() && !this.processingWaiting()) {
-                    strIDs = strIDs + this.id + ',';
+                    strIDs = strIDs + this.nzo_id + ',';
                 }
             })
             // Send the command
@@ -267,7 +231,6 @@ function HistoryListModel(parent) {
                 mode: 'history',
                 name: 'delete',
                 del_files: 1,
-                archive: (!skipArchive) * 1,
                 value: strIDs
             }).then(function() {
                 // Clear search, refresh and hide
@@ -282,197 +245,13 @@ function HistoryListModel(parent) {
         callAPI({
             mode: 'history',
             name: 'delete',
-            del_files: del_files,
-            archive: (!skipArchive) * 1,
-            value: value
+            value: value,
+            del_files: del_files
         }).then(function() {
             self.parent.refresh();
             $("#modal-purge-history").modal('hide');
         });
     };
-
-    // Show the input checkbox
-    self.showMultiEdit = function() {
-        self.isMultiEditing(!self.isMultiEditing())
-        self.multiEditItems.removeAll();
-        $('.history-table input[name="multiedit"], #multiedit-checkall-history').prop({'checked': false, 'indeterminate': false})
-    }
-
-    // Add to the list
-    self.addMultiEdit = function(item, event) {
-        // Is it a shift-click?
-        if(event.shiftKey) {
-            checkShiftRange('.history-table input[name="multiedit"]');
-        }
-
-        // Add or remove from the list?
-        if(event.currentTarget.checked) {
-            // Add item
-            self.multiEditItems.push(item);
-        } else {
-            // Go over them all to know which one to remove
-            self.multiEditItems.remove(function(inList) { return inList.id == item.id; })
-        }
-
-        // Update check-all buton state
-        setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
-        return true;
-    }
-
-    // Check all
-    self.checkAllJobs = function(item, event) {
-        // Get which ones we care about
-        var allChecks = $('.history-table input[name="multiedit"]').filter(':not(:disabled):visible');
-
-        // We need to re-evaltuate the state of this check-all
-        // Otherwise the 'inderterminate' will be overwritten by the click event!
-        setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
-
-        // Now we can check what happend
-        // For when some are checked, or all are checked (but not partly)
-        if(event.target.indeterminate || (event.target.checked && !event.target.indeterminate)) {
-            var allActive = allChecks.filter(":checked")
-            // First remove the from the list
-            if(allActive.length == self.multiEditItems().length) {
-                // Just remove all
-                self.multiEditItems.removeAll();
-                // Remove the check
-                allActive.prop('checked', false)
-            } else {
-                // Remove them seperate
-                allActive.each(function() {
-                    // Go over them all to know which one to remove
-                    var item = ko.dataFor(this)
-                    self.multiEditItems.remove(function(inList) { return inList.id == item.id; })
-                    // Remove the check of this one
-                    this.checked = false;
-                })
-            }
-        } else {
-            // None are checked, so check and add them all
-            allChecks.prop('checked', true)
-            allChecks.each(function() { self.multiEditItems.push(ko.dataFor(this)) })
-            event.target.checked = true
-        }
-        // Set state of all the check-all's
-        setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
-        return true;
-    }
-
-    // Remove downloads from history
-    self.removeDownloads = function(form) {
-        // Hide modal and show notification
-        $('#modal-delete-history-job').modal("hide")
-        showNotification('.main-notification-box-removing')
-
-        var strIDsPP = '';
-        var strIDsHistory = '';
-        $.each(self.deleteItems(), function(index) {
-            // Split in jobs that need post-processing aborted, and jobs that need to be deleted
-            if(this.processingDownload() === 2) {
-                strIDsPP = strIDsPP + this.id + ',';
-                // These items should not be listed in the deletedItems later on
-                // as active post-processing aren't removed from the history output
-                self.deleteItems.remove(this)
-            } else {
-                strIDsHistory = strIDsHistory + this.id + ',';
-            }
-        })
-
-        // Trigger post-processing aborting
-        if(strIDsPP !== "") {
-            callAPI({
-                mode: 'cancel_pp',
-                value: strIDsPP
-            }).then(function(response) {
-                // Only hide and refresh
-                self.parent.refresh();
-                hideNotification()
-            });
-        }
-        if(strIDsHistory !== "") {
-            var skipArchive = $('#modal-delete-history-job input[type="checkbox"]').prop("checked")
-
-            // Permanently delete if we are on the Archive page
-            if(self.showArchive()) skipArchive = true
-
-            callAPI({
-                mode: 'history',
-                name: 'delete',
-                del_files: 1,
-                archive: (!skipArchive) * 1,
-                value: strIDsHistory
-            }).then(function(response) {
-                self.historyItems.removeAll(self.deleteItems());
-                self.multiEditItems.removeAll(self.deleteItems())
-                self.parent.refresh();
-                hideNotification()
-            });
-        }
-    };
-
-    // Delete all selected
-    self.doMultiDelete = function() {
-        // Anything selected?
-        if(self.multiEditItems().length < 1) return;
-
-        // Trigger modal
-        self.triggerRemoveDownload(self.multiEditItems())
-    }
-
-    // Mark jobs as completed
-    self.markAsCompleted = function(items) {
-        // Confirm
-        if(!confirm(glitterTranslate.markComplete)) {
-            return
-        }
-        // Single or multiple items?
-        var strIDs = '';
-        if(items.length) {
-            $.each(items, function(index) {
-                strIDs = strIDs + this.id + ',';
-            })
-        } else {
-            strIDs = items.id
-        }
-
-        // Send the API call
-        callAPI({
-            mode: 'history',
-            name: 'mark_as_completed',
-            value: strIDs
-        }).then(function(response) {
-            // Force refresh to update the UI
-            self.parent.refresh(true);
-        });
-    }
-
-    // Mark all selected as completed
-    self.doMultiMarkCompleted = function() {
-        // Anything selected?
-        if(self.multiEditItems().length < 1) return;
-
-        // Mark them
-        self.markAsCompleted(self.multiEditItems());
-    }
-
-    // Focus on the confirm button
-    $('#modal-delete-history-job').on("shown.bs.modal", function() {
-        $('#modal-delete-history-job .btn[type="submit"]').focus()
-    })
-
-    // On change of page we need to check all those that were in the list!
-    self.historyItems.subscribe(function() {
-        // We need to wait until the unit is actually finished rendering
-        setTimeout(function() {
-            $.each(self.multiEditItems(), function(index) {
-                $('#multiedit_' + this.id).prop('checked', true);
-            })
-
-            // Update check-all buton state
-            setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
-        }, 100)
-    }, null, "arrayChange")
 }
 
 /**
@@ -486,7 +265,7 @@ function HistoryModel(parent, data) {
     // If we update the full set every time it uses lot of CPU
     // The Status/Actionline/scriptline/completed we do update every time
     // When clicked on the more-info button we load the rest again
-    self.id = data.nzo_id;
+    self.nzo_id = data.nzo_id;
     self.index = data.index;
     self.updateAllHistory = false;
     self.hasDropdown = ko.observable(false);
@@ -523,14 +302,14 @@ function HistoryModel(parent, data) {
 
     // Waiting?
     self.processingWaiting = ko.pureComputed(function() {
-        return(self.status() === 'Queued')
+        return(self.status() == 'Queued')
     })
 
     // Processing or done?
     self.processingDownload = ko.pureComputed(function() {
         var status = self.status();
         // When we can cancel
-        if (status === 'Extracting' || status === 'Verifying' || status === 'Repairing' || status === 'Running') {
+        if (status === 'Extracting' || status === 'Verifying' || status == 'Repairing' || status === 'Running') {
             return 2
         }
         // These cannot be cancelled
@@ -554,17 +333,17 @@ function HistoryModel(parent, data) {
         return self.script_line();
     });
 
-    // Extra history columns
-    self.showColumn = function(param) {
+    // Extra history column
+    self.extraText = ko.pureComputed(function() {
         // Picked anything?
-        switch(param) {
+        switch(self.parent.parent.extraHistoryColumn()) {
             case 'speed':
                 // Anything to calculate?
                 if(self.historyStatus.bytes() > 0 && self.historyStatus.download_time() > 0) {
                     try {
                         // Extract the Download section
                         var downloadLog = ko.utils.arrayFirst(self.historyStatus.stage_log(), function(item) {
-                            return item.name() === 'Download'
+                            return item.name() == 'Download'
                         });
                         // Extract the speed
                         return downloadLog.actions()[0].match(/(\S*\s\S+)(?=<br\/>)/)[0]
@@ -573,25 +352,20 @@ function HistoryModel(parent, data) {
                 return;
             case 'category':
                 // Exception for *
-                if(self.historyStatus.category() === "*")
+                if(self.historyStatus.category() == "*")
                     return glitterTranslate.defaultText
                 return self.historyStatus.category();
             case 'size':
                 return self.historyStatus.size();
         }
         return;
-    };
+    })
 
     // Format completion time
     self.completedOn = ko.pureComputed(function() {
         return displayDateTime(self.completed(), parent.parent.dateFormat(), 'X')
     });
 
-    // Format time added
-    self.timeAdded = ko.pureComputed(function() {
-        return displayDateTime(self.historyStatus.time_added(), parent.parent.dateFormat(), 'X')
-    });
-
     // Subscribe to retryEvent so we can load the password
     self.canRetry.subscribe(function() {
         self.updateAllHistory = true;
@@ -600,18 +374,13 @@ function HistoryModel(parent, data) {
     // Re-try button
     self.retry = function() {
         // Set JOB-id
-        $('#modal-retry-job input[name="retry_job_id"]').val(self.id)
+        $('#modal-retry-job input[name="retry_job_id"]').val(self.nzo_id)
         // Set password
         $('#retry_job_password').val(self.historyStatus.password())
         // Open modal
         $('#modal-retry-job').modal("show")
     };
 
-    // Mark as completed button
-    self.markAsCompleted = function() {
-        parent.markAsCompleted(self);
-    };
-
     // Update information only on click
     self.updateAllHistoryInfo = function(data, event) {
         // Show
@@ -648,4 +417,137 @@ function HistoryModel(parent, data) {
             return false;
         })
     }
+
+    // Delete button
+    self.deleteSlot = function(item, event) {
+        // Confirm?
+        if(!self.parent.parent.confirmDeleteHistory() || confirm(glitterTranslate.removeDow1)) {
+            // Are we still processing and it can be stopped?
+            if(item.processingDownload() == 2) {
+                callAPI({
+                    mode: 'cancel_pp',
+                    value: self.nzo_id
+                })
+                // All we can do is wait
+            } else {
+                // Delete the item
+                callAPI({
+                    mode: 'history',
+                    name: 'delete',
+                    del_files: 1,
+                    value: self.nzo_id
+                }).then(function(response) {
+                    if(response.status) {
+                        // Fade and remove
+                        $(event.currentTarget).parent().parent().fadeOut(fadeOnDeleteDuration, function() {
+                            // Make sure no flickering (if there are more items left) and then remove
+                            self.parent.isLoading(self.parent.totalItems() > 1)
+                            self.parent.historyItems.remove(self);
+                            self.parent.parent.refresh();
+                        })
+                    }
+                });
+            }
+
+        }
+    };
+
+    // User voting
+    self.setUserVote = function(item, event) {
+        // Send vote
+        callAPI({
+            mode: 'queue',
+            name: 'rating',
+            type: 'vote',
+            setting: $(event.target).val(),
+            value: self.nzo_id
+        }).then(function(response) {
+            // Update all info
+            self.updateAllHistory = true;
+            self.parent.parent.refresh(true)
+        })
+    }
+
+    // User rating
+    self.setUserRating = function(item, event) {
+        // Audio or video
+        var changeWhat = 'audio';
+        if($(event.target).attr('name') == 'ratings-video') {
+            changeWhat = 'video';
+        }
+
+        // Only on user-event, not the auto-fired ones
+        if(!event.originalEvent) return;
+
+        // Send vote
+        callAPI({
+            mode: 'queue',
+            name: 'rating',
+            type: changeWhat,
+            setting: $(event.target).val(),
+            value: self.nzo_id
+        }).then(function(response) {
+            // Update all info
+            self.updateAllHistory = true;
+            self.parent.parent.refresh(true)
+        })
+    }
+
+    // User comment
+    self.setUserReport = function(form) {
+        // What are we reporting?
+        var userReport = $(form).find('input[name="rating_flag"]:checked').val();
+        var userDetail = '';
+
+        // Anything selected?
+        if(!userReport) {
+            alert(glitterTranslate.noSelect)
+            return;
+        }
+
+        // Extra info?
+        if(userReport == 'comment') userDetail = $(form).find('input[name="ratings-report-comment"]').val();
+        if(userReport == 'other') userDetail = $(form).find('input[name="ratings-report-other"]').val();
+
+        // Exception for servers
+        if(userReport == 'expired') {
+            // Which server?
+            userDetail = $(form).find('select[name="ratings-report-expired-server"]').val();
+
+            // All?
+            if(userDetail == "") {
+                // Loop over all servers
+                $.each(parent.parent.servers, function(index, server) {
+                    // Set timeout because simultanious requests don't work (yet)
+                    setTimeout(function() {
+                        submitUserReport(server.name)
+                    }, index * 1500)
+                })
+
+            } else {
+                // Just the one server
+                submitUserReport(userDetail)
+            }
+        } else {
+            submitUserReport(userDetail)
+        }
+
+        // After all, close it
+        form.reset();
+        $(form).parent().parent().dropdown('toggle');
+        alert(glitterTranslate.sendThanks)
+
+        function submitUserReport(theDetail) {
+            // Send note
+            callAPI({
+                mode: 'queue',
+                name: 'rating',
+                type: 'flag',
+                setting: userReport,
+                detail: theDetail,
+                value: self.nzo_id
+            })
+        }
+        return false
+    }
 }

interfaces/Glitter/templates/static/javascripts/glitter.queue.js

@@ -6,6 +6,8 @@ function QueueListModel(parent) {
     var self = this;
     self.parent = parent;
     self.dragging = false;
+    self.rawCatList = [];
+    self.rawScriptList = [];
 
     // Because SABNZB returns the name
     // But when you want to set Priority you need the number..
@@ -32,13 +34,12 @@ function QueueListModel(parent) {
     // External var's
     self.queueItems = ko.observableArray([]);
     self.totalItems = ko.observable(0);
-    self.deleteItems = ko.observableArray([]);
-    self.isMultiEditing = ko.observable(false).extend({ persist: 'queueIsMultiEditing' });
+    self.isMultiEditing = ko.observable(false);
     self.isLoading = ko.observable(false).extend({ rateLimit: 100 });
     self.multiEditItems = ko.observableArray([]);
     self.categoriesList = ko.observableArray([]);
     self.scriptsList = ko.observableArray([]);
-    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 400, method: "notifyWhenChangesStop" } });
+    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 200, method: "notifyWhenChangesStop" } });
     self.paginationLimit = ko.observable(20).extend({ persist: 'queuePaginationLimit' });
     self.pagination = new paginationModel(self);
 
@@ -65,6 +66,31 @@ function QueueListModel(parent) {
             return i.id;
         });
 
+        // Did the category-list change?
+        // Otherwise KO will send updates to all <select> for every refresh()
+        if(self.rawCatList != data.categories.toString()) {
+            // Reformat categories
+            self.categoriesList($.map(data.categories, function(cat) {
+                // Default?
+                if(cat == '*') return { catValue: '*', catText: glitterTranslate.defaultText };
+                return { catValue: cat, catText: cat };
+            }))
+            // Update
+            self.rawCatList = data.categories.toString();
+        }
+
+        // Did the script-list change?
+        if(self.rawScriptList != data.scripts.toString()) {
+            // Reformat script-list
+            self.scriptsList($.map(data.scripts, function(script) {
+                // Default?
+                if(script == 'None') return glitterTranslate.noneText;
+                return script;
+            }))
+            // Update
+            self.rawScriptList = data.scripts.toString();
+        }
+
         // Set limit
         self.totalItems(data.noofslots);
 
@@ -75,7 +101,7 @@ function QueueListModel(parent) {
         $.each(data.slots, function() {
             var item = this;
             var existingItem = ko.utils.arrayFirst(self.queueItems(), function(i) {
-                return i.id === item.nzo_id;
+                return i.id == item.nzo_id;
             });
 
             if(existingItem) {
@@ -88,7 +114,7 @@ function QueueListModel(parent) {
         });
 
         // Remove all items if there's any
-        if(itemIds.length === self.paginationLimit()) {
+        if(itemIds.length == self.paginationLimit()) {
             // Replace it, so only 1 Knockout DOM-update!
             self.queueItems(newItems);
             newItems = [];
@@ -97,7 +123,7 @@ function QueueListModel(parent) {
             $.each(itemIds, function() {
                 var id = this.toString();
                 self.queueItems.remove(ko.utils.arrayFirst(self.queueItems(), function(i) {
-                    return i.id === id;
+                    return i.id == id;
                 }));
             });
         }
@@ -148,27 +174,6 @@ function QueueListModel(parent) {
 
     }
 
-    self.triggerRemoveDownload = function(items) {
-        // Show and fill modal
-        self.deleteItems.removeAll()
-
-        // Single or multiple items?
-        if(items.length) {
-            ko.utils.arrayPushAll(self.deleteItems, items)
-        } else {
-            self.deleteItems.push(items)
-        }
-
-        // Show modal or delete right away
-        if(self.parent.confirmDeleteQueue()) {
-            // Open modal if desired
-            $('#modal-delete-queue-job').modal("show")
-        } else {
-            // Otherwise just submit right away
-            $('#modal-delete-queue-job form').submit()
-        }
-    }
-
     // Save pagination state
     self.paginationLimit.subscribe(function(newValue) {
         // Save in config if global
@@ -180,8 +185,6 @@ function QueueListModel(parent) {
                 value: newValue
             })
         }
-        // Update pagination and counters
-        self.parent.refresh(true)
     });
 
     // Do we show search box. So it doesn't dissapear when nothing is found
@@ -191,25 +194,24 @@ function QueueListModel(parent) {
 
     // Searching in queue (rate-limited in decleration)
     self.searchTerm.subscribe(function() {
+        // Refresh now
+        self.parent.refresh();
         // Go back to page 1
-        if(self.pagination.currentPage() !== 1) {
-            // This forces a refresh
+        if(self.pagination.currentPage() != 1) {
             self.pagination.moveToPage(1);
-        } else {
-            // Refresh now
-            self.parent.refresh();
         }
     })
 
     // Clear searchterm
     self.clearSearchTerm = function(data, event) {
         // Was it escape key or click?
-        if(event.type === 'mousedown' || (event.keyCode && event.keyCode === 27)) {
+        if(event.type == 'mousedown' || (event.keyCode && event.keyCode == 27)) {
             self.isLoading(true)
             self.searchTerm('');
+            self.parent.refresh()
         }
         // Was it click and the field is empty? Then we focus on the field
-        if(event.type === 'mousedown' && self.searchTerm() === '') {
+        if(event.type == 'mousedown' && self.searchTerm() == '') {
             $(event.target).parents('.search-box').find('input[type="text"]').focus()
             return;
         }
@@ -224,17 +226,13 @@ function QueueListModel(parent) {
         // What action?
         var sort, dir;
         switch($(event.currentTarget).data('action')) {
-            case 'sortRemainingAsc':
-                sort = 'remaining';
-                dir = 'asc';
-                break;
             case 'sortAgeAsc':
                 sort = 'avg_age';
-                dir = 'desc';
+                dir = 'asc';
                 break;
             case 'sortAgeDesc':
                 sort = 'avg_age';
-                dir = 'asc';
+                dir = 'desc';
                 break;
             case 'sortNameAsc':
                 sort = 'name';
@@ -276,7 +274,7 @@ function QueueListModel(parent) {
         // Reset form and remove all checked ones
         $form[0].reset();
         self.multiEditItems.removeAll();
-        $('.queue-table input[name="multiedit"], #multiedit-checkall-queue').prop({'checked': false, 'indeterminate': false})
+        $('.delete input[name="multiedit"], #multiedit-checkall').prop({'checked': false, 'indeterminate': false})
 
         // Is the multi-edit in view?
         if(($form.offset().top + $form.outerHeight(true)) > ($(window).scrollTop()+$(window).height())) {
@@ -306,7 +304,7 @@ function QueueListModel(parent) {
         }
 
         // Update check-all buton state
-        setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
+        setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
         return true;
     }
 
@@ -317,7 +315,7 @@ function QueueListModel(parent) {
 
         // We need to re-evaltuate the state of this check-all
         // Otherwise the 'inderterminate' will be overwritten by the click event!
-        setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
+        setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
 
         // Now we can check what happend
         // For when some are checked, or all are checked (but not partly)
@@ -349,7 +347,7 @@ function QueueListModel(parent) {
             self.doMultiEditUpdate()
         }
         // Set state of all the check-all's
-        setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
+        setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
         return true;
     }
 
@@ -366,160 +364,93 @@ function QueueListModel(parent) {
         var newStatus = $('.multioperations-selector input[name="multiedit-status"]:checked').val()
 
         // List all the ID's
-        var strIDs = '';
+        var  strIDs = '';
         $.each(self.multiEditItems(), function(index) {
             strIDs = strIDs + this.id + ',';
         })
 
-        // All non-category updates need to only happen after a category update
-        function nonCatUpdates() {
-            if(newScript !== '') {
-                callAPI({
-                    mode: 'change_script',
-                    value: strIDs,
-                    value2: newScript
-                })
-            }
-            if(newPrior !== '') {
-                callAPI({
-                    mode: 'queue',
-                    name: 'priority',
-                    value: strIDs,
-                    value2: newPrior
-                })
-            }
-            if(newProc !== '') {
-                callAPI({
-                    mode: 'change_opts',
-                    value: strIDs,
-                    value2: newProc
-                })
-            }
-            if(newStatus) {
-                callAPI({
-                    mode: 'queue',
-                    name: newStatus,
-                    value: strIDs
-                })
-            }
-
-            // Wat a little and do the refresh
-            // Only if anything changed!
-            if(newStatus || newProc !== '' || newPrior !== '' || newScript !== '' || newCat !== '') {
-                setTimeout(parent.refresh, 100)
-            }
-        }
-
         // What is changed?
-        if(newCat !== '') {
+        if(newCat != '') {
             callAPI({
                 mode: 'change_cat',
                 value: strIDs,
                 value2: newCat
-            }).then(nonCatUpdates)
-        } else {
-            nonCatUpdates()
+            })
+        }
+        if(newScript != '') {
+            callAPI({
+                mode: 'change_script',
+                value: strIDs,
+                value2: newScript
+            })
+        }
+        if(newPrior != '') {
+            callAPI({
+                mode: 'queue',
+                name: 'priority',
+                value: strIDs,
+                value2: newPrior
+            })
+        }
+        if(newProc != '') {
+            callAPI({
+                mode: 'change_opts',
+                value: strIDs,
+                value2: newProc
+            })
+        }
+        if(newStatus) {
+            callAPI({
+                mode: 'queue',
+                name: newStatus,
+                value: strIDs
+            })
         }
 
-    }
-
-    // Handle mousedown to capture state before change
-    self.handleMultiEditStatusMouseDown = function(item, event) {
-        var clickedValue = $(event.currentTarget).find("input").val();
-
-        // If this radio was already selected (same value as previous), clear it
-        if ($('.multioperations-selector input[name="multiedit-status"]:checked').val() === clickedValue) {
-            // Clear all radio buttons in this group after the click finished
-            // Hacky, but it works
-            setTimeout(function () {
-                $('.multioperations-selector input[name="multiedit-status"]').prop('checked', false);
-            }, 200)
+        // Wat a little and do the refresh
+        // Only if anything changed!
+        if(newStatus || newProc != '' || newPrior != '' || newScript != '' || newCat != '') {
+            setTimeout(parent.refresh, 100)
         }
-        return true;
     }
 
-    // Remove downloads from queue
-    self.removeDownloads = function(form) {
-        // Hide modal and show notification
-        $('#modal-delete-queue-job').modal("hide")
-        showNotification('.main-notification-box-removing')
-
-        var strIDs = '';
-        $.each(self.deleteItems(), function(index) {
-            strIDs = strIDs + this.id + ',';
-        })
-
-        callAPI({
-            mode: 'queue',
-            name: 'delete',
-            del_files: 1,
-            value: strIDs
-        }).then(function(response) {
-            self.queueItems.removeAll(self.deleteItems());
-            self.multiEditItems.removeAll(self.deleteItems())
-            self.parent.refresh();
-            hideNotification()
-        });
-    };
-
-    // Delete all selected
+    // Selete all selected
     self.doMultiDelete = function() {
         // Anything selected?
         if(self.multiEditItems().length < 1) return;
 
-        // Trigger modal
-        self.triggerRemoveDownload(self.multiEditItems())
-    }
+        // Need confirm
+        if(!self.parent.confirmDeleteQueue() || confirm(glitterTranslate.removeDown)) {
+            // List all the ID's
+            var strIDs = '';
+            $.each(self.multiEditItems(), function(index) {
+                strIDs = strIDs + this.id + ',';
+            })
 
-    // Move all selected to top
-    self.doMultiMoveToTop = function() {
-        // Anything selected?
-        if(self.multiEditItems().length < 1) return;
+            // Show notification
+            showNotification('.main-notification-box-removing-multiple', 0, self.multiEditItems().length)
 
-        // Move each item to the top, starting from the last one in the sorted list
-        var arrayList = self.multiEditItems()
-        var movePromises = [];
-        for(var i = arrayList.length - 1; i >= 0; i--) {
-            movePromises.push(callAPI({
-                mode: "switch",
-                value: arrayList[i].id,
-                value2: 0
-            }));
+            // Remove
+            callAPI({
+                mode: 'queue',
+                name: 'delete',
+                del_files: 1,
+                value: strIDs
+            }).then(function(response) {
+                if(response.status) {
+                    // Make sure the queue doesnt flicker and then fade-out
+                    self.isLoading(true)
+                    $('.delete input:checked').parents('tr').fadeOut(fadeOnDeleteDuration)
+                    self.parent.refresh()
+                    // Empty it
+                    self.multiEditItems.removeAll();
+                    // Hide notification
+                    hideNotification(true)
+                }
+            })
         }
-
-        // Wait for all moves to complete then refresh
-        Promise.all(movePromises).then(function() {
-            self.parent.refresh();
-        });
     }
 
-    // Move all selected to bottom
-    self.doMultiMoveToBottom = function() {
-        // Anything selected?
-        if(self.multiEditItems().length < 1) return;
-
-        // Move each item to the bottom, starting from the first one in the sorted list
-        var arrayList = self.multiEditItems()
-        var movePromises = [];
-        for(var i = 0; i < arrayList.length; i++) {
-            movePromises.push(callAPI({
-                mode: "switch",
-                value: arrayList[i].id,
-                value2: self.totalItems() - 1
-            }));
-        }
-
-        // Wait for all moves to complete then refresh
-        Promise.all(movePromises).then(function() {
-            self.parent.refresh();
-        });
-    }
-
-    // Focus on the confirm button
-    $('#modal-delete-queue-job').on("shown.bs.modal", function() {
-        $('#modal-delete-queue-job .btn[type="submit"]').focus()
-    })
-
     // On change of page we need to check all those that were in the list!
     self.queueItems.subscribe(function() {
         // We need to wait until the unit is actually finished rendering
@@ -529,7 +460,7 @@ function QueueListModel(parent) {
             })
 
             // Update check-all buton state
-            setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
+            setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
         }, 100)
     }, null, "arrayChange")
 }
@@ -549,8 +480,8 @@ function QueueModel(parent, data) {
     self.index = ko.observable(data.index);
     self.status = ko.observable(data.status);
     self.labels = ko.observableArray(data.labels);
-    self.isGrabbing = ko.observable(data.status === 'Grabbing' || data.avg_age === '-')
-    self.isFetchingBlocks = data.status === 'Fetching' || data.priority === 'Repair' // No need to update
+    self.isGrabbing = ko.observable(data.status == 'Grabbing' || data.avg_age == '-')
+    self.isFetchingBlocks = data.status == 'Fetching' || data.priority == 'Repair' // No need to update
     self.totalMB = ko.observable(parseFloat(data.mb));
     self.remainingMB = ko.observable(parseFloat(data.mbleft))
     self.missingMB = ko.observable(parseFloat(data.mbmissing))
@@ -561,7 +492,7 @@ function QueueModel(parent, data) {
     self.priority = ko.observable(parent.priorityName[data.priority]);
     self.script = ko.observable(data.script);
     self.unpackopts = ko.observable(parseInt(data.unpackopts)) // UnpackOpts fails if not parseInt'd!
-    self.pausedStatus = ko.observable(data.status === 'Paused');
+    self.pausedStatus = ko.observable(data.status == 'Paused');
     self.timeLeft = ko.observable(data.timeleft);
 
     // Initially empty
@@ -572,7 +503,7 @@ function QueueModel(parent, data) {
     // Color of the progress bar
     self.progressColor = ko.computed(function() {
         // Checking
-        if(self.status() === 'Checking') {
+        if(self.status() == 'Checking') {
             return '#58A9FA'
         }
         // Check for missing data, the value is arbitrary! (2%)
@@ -580,7 +511,7 @@ function QueueModel(parent, data) {
             return '#F8A34E'
         }
         // Set to grey, only when not Force download
-        if((self.parent.parent.downloadsPaused() && self.priority() !== 2) || self.pausedStatus()) {
+        if((self.parent.parent.downloadsPaused() && self.priority() != 2) || self.pausedStatus()) {
             return '#B7B7B7'
         }
         // Nothing
@@ -589,9 +520,6 @@ function QueueModel(parent, data) {
 
     // MB's
     self.progressText = ko.pureComputed(function() {
-        if(self.isGrabbing()) {
-            return glitterTranslate.fetchingURL
-        }
         return (self.totalMB() - self.remainingMB()).toFixed(0) + " MB / " + (self.totalMB() * 1).toFixed(0) + " MB";
     })
 
@@ -604,22 +532,23 @@ function QueueModel(parent, data) {
         return self.name()
     })
     self.missingText = ko.pureComputed(function() {
-        // Check for missing data, can show 0 if article-size is smaller than 500K, but we accept that
-        if(self.missingMB()) {
+        // Check for missing data, the value is arbitrary! (1%)
+        if(self.missingMB()/self.totalMB() > 0.01) {
             return self.missingMB().toFixed(0) + ' MB ' + glitterTranslate.misingArt
         }
+        return;
     })
     self.statusText = ko.computed(function() {
         // Checking
-        if(self.status() === 'Checking') {
+        if(self.status() == 'Checking') {
             return glitterTranslate.checking
         }
         // Grabbing
-        if(self.status() === 'Grabbing') {
+        if(self.status() == 'Grabbing') {
             return glitterTranslate.fetch
         }
         // Pausing status
-        if((self.parent.parent.downloadsPaused() && self.priority() !== 2) || self.pausedStatus()) {
+        if((self.parent.parent.downloadsPaused() && self.priority() != 2) || self.pausedStatus()) {
             return glitterTranslate.paused;
         }
         // Just the time
@@ -629,7 +558,7 @@ function QueueModel(parent, data) {
     // Icon to better show force-priority
     self.queueIcon = ko.computed(function() {
         // Force comes first
-        if(self.priority() === 2) {
+        if(self.priority() == 2) {
             return 'glyphicon-forward'
         }
         if(self.pausedStatus()) {
@@ -638,29 +567,30 @@ function QueueModel(parent, data) {
         return 'glyphicon-pause'
     })
 
-    // Extra queue columns
-    self.showColumn = function(param) {
-        switch(param) {
+    // Extra queue column
+    self.extraText = ko.pureComputed(function() {
+        // Picked anything?
+        switch(self.parent.parent.extraQueueColumn()) {
             case 'category':
                 // Exception for *
-                if(self.category() === "*")
+                if(self.category() == "*")
                     return glitterTranslate.defaultText
                 return self.category();
             case 'priority':
                 // Onload-exception
-                if(self.priority() === undefined) return;
-                return ko.utils.arrayFirst(self.parent.priorityOptions(), function(item) { return item.value === self.priority()}).name;
+                if(self.priority() == undefined) return;
+                return ko.utils.arrayFirst(self.parent.priorityOptions(), function(item) { return item.value == self.priority()}).name;
             case 'processing':
                 // Onload-exception
-                if(self.unpackopts() === undefined) return;
-                return ko.utils.arrayFirst(self.parent.processingOptions(), function(item) { return item.value === self.unpackopts()}).name;
+                if(self.unpackopts() == undefined) return;
+                return ko.utils.arrayFirst(self.parent.processingOptions(), function(item) { return item.value == self.unpackopts()}).name;
             case 'scripts':
                 return self.script();
             case 'age':
                 return self.avg_age();
         }
         return;
-    };
+    })
 
     // Every update
     self.updateFromData = function(data) {
@@ -669,7 +599,7 @@ function QueueModel(parent, data) {
         self.password(data.password);
         self.index(data.index);
         self.status(data.status)
-        self.isGrabbing(data.status === 'Grabbing' || data.avg_age === '-')
+        self.isGrabbing(data.status == 'Grabbing' || data.avg_age == '-')
         self.totalMB(parseFloat(data.mb));
         self.remainingMB(parseFloat(data.mbleft));
         self.missingMB(parseFloat(data.mbmissing))
@@ -680,12 +610,12 @@ function QueueModel(parent, data) {
         self.priority(parent.priorityName[data.priority]);
         self.script(data.script);
         self.unpackopts(parseInt(data.unpackopts)) // UnpackOpts fails if not parseInt'd!
-        self.pausedStatus(data.status === 'Paused');
+        self.pausedStatus(data.status == 'Paused');
         self.timeLeft(data.timeleft);
 
         // Did the label-list change?
         // Otherwise KO will send updates to all texts during refresh()
-        if(self.rawLabels !== data.labels.toString()) {
+        if(self.rawLabels != data.labels.toString()) {
             // Update
             self.labels(data.labels);
             self.rawLabels = data.labels.toString();
@@ -710,37 +640,9 @@ function QueueModel(parent, data) {
         self.editingName(true)
         self.nameForEdit(self.name())
 
-        // Select the input
-        const $input = $(event.target).parents('.name').find('input');
-        $input.select();
-
-        // Add Tab/Shift+Tab navigation
-        $input.off('keydown.tabnav').on('keydown.tabnav', function (e) {
-            if (e.key === 'Tab') {
-                e.preventDefault();
-
-                // Find all rename inputs that are currently visible
-                const inputs = $('.queue-table input[type="text"]');
-                const currentIndex = inputs.index(this);
-                let nextIndex = e.shiftKey ? currentIndex - 1 : currentIndex + 1;
-
-                // Wrap around
-                if (nextIndex >= inputs.length) nextIndex = 0;
-                if (nextIndex < 0) nextIndex = inputs.length - 1;
-
-                // Simulate clicking Rename on the next row
-                const $nextRow = inputs.eq(nextIndex).closest('tr');
-                $nextRow.find('.hover-button[title="Rename"]').click();
-
-                // Delay focusing to wait for new input to appear
-                setTimeout(() => {
-                    const $nextInput = $('.queue-table input[type="text"]').eq(nextIndex);
-                    $nextInput.focus().select();
-                }, 50);
-            }
-        });
-    };
-
+        // Select
+        $(event.target).parents('.name').find('input').select()
+    }
 
     // Catch the submit action
     self.editingNameSubmit = function() {
@@ -750,10 +652,7 @@ function QueueModel(parent, data) {
     // Do on change
     self.nameForEdit.subscribe(function(newName) {
         // Anything change or empty?
-        if(!newName || self.name() === newName) return;
-
-        // Rename would abort Direct Unpack, so ask if user is sure
-        if(self.direct_unpack() && !confirm(glitterTranslate.renameAbort)) return;
+        if(!newName || self.name() == newName) return;
 
         // Send rename
         callAPI({
@@ -794,6 +693,8 @@ function QueueModel(parent, data) {
         })
     }
     self.changeScript = function(item) {
+        // Not on empty handlers
+        if(!item.script() || parent.scriptsList().length <= 1) return;
         callAPI({
             mode: 'change_script',
             value: item.id,
@@ -822,5 +723,32 @@ function QueueModel(parent, data) {
         })
     }
 
+    // Remove 1 download from queue
+    self.removeDownload = function(item, event) {
+        // Confirm and remove
+        if(!self.parent.parent.confirmDeleteQueue() || confirm(glitterTranslate.removeDow1)) {
+            var itemToDelete = this;
 
-}
+            // Show notification
+            showNotification('.main-notification-box-removing')
+
+            callAPI({
+                mode: 'queue',
+                name: 'delete',
+                del_files: 1,
+                value: item.id
+            }).then(function(response) {
+                // Fade and remove
+                $(event.currentTarget).parent().parent().fadeOut(fadeOnDeleteDuration, function() {
+                    // Make sure no flickering (if there are more items left) and then remove
+                    self.parent.isLoading(self.parent.totalItems() > 1)
+                    parent.queueItems.remove(itemToDelete);
+                    parent.multiEditItems.remove(function(inList) { return inList.id == itemToDelete.id; })
+                    self.parent.parent.refresh();
+                    // Hide notifcation
+                    hideNotification(true)
+                })
+            });
+        }
+    };
+}

interfaces/Glitter/templates/static/javascripts/jquery.hotkeys.min.js

@@ -1,12 +0,0 @@
-/*
- * jQuery Hotkeys Plugin
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- *
- * Based upon the plugin by Tzury Bar Yochay:
- * https://github.com/tzuryby/jquery.hotkeys
- *
- * Original idea by:
- * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
- */
-!function(c){function e(e){var o,f;"string"==typeof e.data&&(e.data={keys:e.data}),e.data&&e.data.keys&&"string"==typeof e.data.keys&&(o=e.handler,f=e.data.keys.toLowerCase().split(" "),e.handler=function(a){if(this===a.target||!(/textarea|select/i.test(a.target.nodeName)||c.hotkeys.options.filterTextInputs&&-1<c.inArray(a.target.type,c.hotkeys.textAcceptingInputTypes))){var s="keypress"!==a.type&&c.hotkeys.specialKeys[a.which],e=String.fromCharCode(a.which).toLowerCase(),r="",t={};c.each(["alt","ctrl","shift"],function(e,t){a[t+"Key"]&&s!==t&&(r+=t+"+")}),a.metaKey&&!a.ctrlKey&&"meta"!==s&&(r+="meta+"),a.metaKey&&"meta"!==s&&-1<r.indexOf("alt+ctrl+shift+")&&(r=r.replace("alt+ctrl+shift+","hyper+")),s?t[r+s]=!0:(t[r+e]=!0,t[r+c.hotkeys.shiftNums[e]]=!0,"shift+"===r&&(t[c.hotkeys.shiftNums[e]]=!0));for(var i=0,n=f.length;i<n;i++)if(t[f[i]])return o.apply(this,arguments)}})}c.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",10:"return",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",59:";",61:"=",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"},shiftNums:{"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(",0:")","-":"_","=":"+",";":": ","'":'"',",":"<",".":">","/":"?","\\":"|"},textAcceptingInputTypes:["text","password","number","email","url","range","date","month","week","time","datetime","datetime-local","search","color","tel"],options:{filterTextInputs:!0}},c.each(["keydown","keyup","keypress"],function(){c.event.special[this]={add:e}})}(jQuery||this.jQuery||window.jQuery);

interfaces/Glitter/templates/static/javascripts/knockout-extensions.js

@@ -1,3 +1,15 @@
+ko.bindingHandlers.truncatedText = {
+    update: function(element, valueAccessor, allBindingsAccessor) {
+        var value = ko.utils.unwrapObservable(valueAccessor());
+        if (!value) return
+        var length = ko.utils.unwrapObservable(allBindingsAccessor().length) || ko.bindingHandlers.truncatedText.defaultLength,
+            truncatedValue = value.length > length ? convertHTMLtoText(value.substring(0, Math.min(value.length, length))) + "…" : convertHTMLtoText(value);
+        ko.bindingHandlers.html.update(element, function() {
+            return truncatedValue;
+        });
+    },
+    defaultLength: 15
+};
 ko.bindingHandlers.truncatedTextCenter = {
     update: function(element, valueAccessor, allBindingsAccessor) {
         var value = ko.utils.unwrapObservable(valueAccessor())

interfaces/Glitter/templates/static/javascripts/search-query-parser.js

@@ -1,317 +0,0 @@
-/*!
- * search-search-query-parser.js
- * Copyright(c) 2014-2019
- * MIT Licensed
- *
- * Modified for SABnzbd use!
- * Adapted to use without NPM.
- */
-
-function search_query_parse(string, options) {
-    // Set a default options object when none is provided
-    if (!options) {
-        options = {offsets: true};
-    } else {
-        // If options offsets was't passed, set it to true
-        options.offsets = (typeof options.offsets === 'undefined' ? true : options.offsets)
-    }
-
-    if (!string) {
-        string = '';
-    }
-
-    // When no keywords or ranges set, treat as a simple string
-    else if (!options.keywords && !options.ranges && !options.tokenize) {
-        return string;
-    }
-    // Otherwise parse the advanced query syntax
-    else {
-        // Our object to store the query object
-        var query = {text: []};
-        // When offsets is true, create their array
-        if (options.offsets) {
-            query.offsets = [];
-        }
-        var exclusion = {};
-        var terms = [];
-        // Get a list of search terms respecting single and double quotes
-        var regex = /(\S+:'(?:[^'\\]|\\.)*')|(\S+:"(?:[^"\\]|\\.)*")|\S+|\S+:\S+/g;
-        /*
-        Removed exclusion matching for SABnzbd, original regex:
-        var regex = /(\S+:'(?:[^'\\]|\\.)*')|(\S+:"(?:[^"\\]|\\.)*")|(-?"(?:[^"\\]|\\.)*")|(-?'(?:[^'\\]|\\.)*')|\S+|\S+:\S+/g;
-        See: https://github.com/sabnzbd/sabnzbd/issues/2342
-         */
-        var match;
-        while ((match = regex.exec(string)) !== null) {
-            var term = match[0];
-            var sepIndex = term.indexOf(':');
-            if (sepIndex !== -1) {
-                var split = term.split(':'),
-                    key = term.slice(0, sepIndex),
-                    val = term.slice(sepIndex + 1);
-                // Strip surrounding quotes
-                val = val.replace(/^\"|\"$|^\'|\'$/g, '');
-                // Strip backslashes respecting escapes
-                val = (val + '').replace(/\\(.?)/g, function (s, n1) {
-                    switch (n1) {
-                        case '\\':
-                            return '\\';
-                        case '0':
-                            return '\u0000';
-                        case '':
-                            return '';
-                        default:
-                            return n1;
-                    }
-                });
-                terms.push({
-                    keyword: key,
-                    value: val,
-                    offsetStart: match.index,
-                    offsetEnd: match.index + term.length
-                });
-            } else {
-                var isExcludedTerm = false;
-                /*
-                    Removed for SABnzbd
-                    See: https://github.com/sabnzbd/sabnzbd/issues/2342
-
-                if (term[0] === '-') {
-                    isExcludedTerm = true;
-                    term = term.slice(1);
-                }
-                */
-
-                // Strip surrounding quotes
-                term = term.replace(/^\"|\"$|^\'|\'$/g, '');
-                // Strip backslashes respecting escapes
-                term = (term + '').replace(/\\(.?)/g, function (s, n1) {
-                    switch (n1) {
-                        case '\\':
-                            return '\\';
-                        case '0':
-                            return '\u0000';
-                        case '':
-                            return '';
-                        default:
-                            return n1;
-                    }
-                });
-
-                if (isExcludedTerm) {
-                    if (exclusion['text']) {
-                        if (exclusion['text'] instanceof Array) {
-                            exclusion['text'].push(term);
-                        } else {
-                            exclusion['text'] = [exclusion['text']];
-                            exclusion['text'].push(term);
-                        }
-                    } else {
-                        // First time seeing an excluded text term
-                        exclusion['text'] = term;
-                    }
-                } else {
-                    terms.push({
-                        text: term,
-                        offsetStart: match.index,
-                        offsetEnd: match.index + term.length
-                    });
-                }
-            }
-        }
-        // Reverse to ensure proper order when pop()'ing.
-        terms.reverse();
-        // For each search term
-        var term;
-        while (term = terms.pop()) {
-            // When just a simple term
-            if (term.text) {
-                // We add it as pure text
-                query.text.push(term.text);
-                // When offsets is true, push a new offset
-                if (options.offsets) {
-                    query.offsets.push(term);
-                }
-            }
-            // We got an advanced search syntax
-            else {
-                var key = term.keyword;
-                // Check if the key is a registered keyword
-                options.keywords = options.keywords || [];
-                var isKeyword = false;
-                var isExclusion = false;
-                if (!/^-/.test(key)) {
-                    isKeyword = !(-1 === options.keywords.indexOf(key));
-                } else if (key[0] === '-') {
-                    var _key = key.slice(1);
-                    isKeyword = !(-1 === options.keywords.indexOf(_key))
-                    if (isKeyword) {
-                        key = _key;
-                        isExclusion = true;
-                    }
-                }
-
-                // Check if the key is a registered range
-                options.ranges = options.ranges || [];
-                var isRange = !(-1 === options.ranges.indexOf(key));
-                // When the key matches a keyword
-                if (isKeyword) {
-                    // When offsets is true, push a new offset
-                    if (options.offsets) {
-                        query.offsets.push({
-                            keyword: key,
-                            value: term.value,
-                            offsetStart: isExclusion ? term.offsetStart + 1 : term.offsetStart,
-                            offsetEnd: term.offsetEnd
-                        });
-                    }
-
-                    var value = term.value;
-                    // When value is a thing
-                    if (value.length) {
-                        // Get an array of values when several are there
-                        var values = value.split(',');
-                        if (isExclusion) {
-                            if (exclusion[key]) {
-                                // ...many times...
-                                if (exclusion[key] instanceof Array) {
-                                    // ...and got several values this time...
-                                    if (values.length > 1) {
-                                        // ... concatenate both arrays.
-                                        exclusion[key] = exclusion[key].concat(values);
-                                    } else {
-                                        // ... append the current single value.
-                                        exclusion[key].push(value);
-                                    }
-                                }
-                                // We saw that keyword only once before
-                                else {
-                                    // Put both the current value and the new
-                                    // value in an array
-                                    exclusion[key] = [exclusion[key]];
-                                    exclusion[key].push(value);
-                                }
-                            }
-                            // First time we see that keyword
-                            else {
-                                // ...and got several values this time...
-                                if (values.length > 1) {
-                                    // ...add all values seen.
-                                    exclusion[key] = values;
-                                }
-                                // Got only a single value this time
-                                else {
-                                    // Record its value as a string
-                                    if (options.alwaysArray) {
-                                        // ...but we always return an array if option alwaysArray is true
-                                        exclusion[key] = [value];
-                                    } else {
-                                        // Record its value as a string
-                                        exclusion[key] = value;
-                                    }
-                                }
-                            }
-                        } else {
-                            // If we already have seen that keyword...
-                            if (query[key]) {
-                                // ...many times...
-                                if (query[key] instanceof Array) {
-                                    // ...and got several values this time...
-                                    if (values.length > 1) {
-                                        // ... concatenate both arrays.
-                                        query[key] = query[key].concat(values);
-                                    } else {
-                                        // ... append the current single value.
-                                        query[key].push(value);
-                                    }
-                                }
-                                // We saw that keyword only once before
-                                else {
-                                    // Put both the current value and the new
-                                    // value in an array
-                                    query[key] = [query[key]];
-                                    query[key].push(value);
-                                }
-                            }
-                            // First time we see that keyword
-                            else {
-                                // ...and got several values this time...
-                                if (values.length > 1) {
-                                    // ...add all values seen.
-                                    query[key] = values;
-                                }
-                                // Got only a single value this time
-                                else {
-                                    if (options.alwaysArray) {
-                                        // ...but we always return an array if option alwaysArray is true
-                                        query[key] = [value];
-                                    } else {
-                                        // Record its value as a string
-                                        query[key] = value;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                // The key allows a range
-                else if (isRange) {
-                    // When offsets is true, push a new offset
-                    if (options.offsets) {
-                        query.offsets.push(term);
-                    }
-
-                    var value = term.value;
-                    // Range are separated with a dash
-                    var rangeValues = value.split('-');
-                    // When both end of the range are specified
-                    // keyword:XXXX-YYYY
-                    query[key] = {};
-                    if (2 === rangeValues.length) {
-                        query[key].from = rangeValues[0];
-                        query[key].to = rangeValues[1];
-                    }
-                        // When pairs of ranges are specified
-                    // keyword:XXXX-YYYY,AAAA-BBBB
-                    else if (!rangeValues.length % 2) {
-                    }
-                        // When only getting a single value,
-                    // or an odd number of values
-                    else {
-                        query[key].from = value;
-                    }
-                } else {
-                    // We add it as pure text
-                    var text = term.keyword + ':' + term.value;
-                    query.text.push(text);
-
-                    // When offsets is true, push a new offset
-                    if (options.offsets) {
-                        query.offsets.push({
-                            text: text,
-                            offsetStart: term.offsetStart,
-                            offsetEnd: term.offsetEnd
-                        });
-                    }
-                }
-            }
-        }
-
-        // Concatenate all text terms if any
-        if (query.text.length) {
-            if (!options.tokenize) {
-                query.text = query.text.join(' ').trim();
-            }
-        }
-        // Just remove the attribute text when it's empty
-        else {
-            delete query.text;
-        }
-
-        // Return forged query object
-        query.exclude = exclusion;
-        return query;
-    }
-
-}
-

interfaces/Glitter/templates/static/stylesheets/colorschemes/Auto.css

@@ -1 +0,0 @@
-@import url('Night.css') screen and (prefers-color-scheme: dark);

interfaces/Glitter/templates/static/stylesheets/colorschemes/Night.css

@@ -55,10 +55,6 @@ legend,
     opacity: 0.7;
 }
 
-.form-control[disabled] {
-    opacity: 0.65;
-}
-
 .progress {
     background-color: #DADADA;
 }
@@ -69,10 +65,6 @@ legend,
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
 }
 
-.main-notification-box-uploading-failed {
-    color: #F95151;
-}
-
 .container,
 .modal-body,
 .modal-footer {
@@ -98,8 +90,7 @@ legend,
 .nav-tabs>li.active>a,
 .nav-tabs>li.active>a:focus,
 .nav-tabs>li.active>a:hover,
-.nav-tabs>li>a:hover,
-.nav-tabs>li>a:focus {
+.nav-tabs>li>a:hover {
     background-color: #ddd;
     color: #555 !important;
     box-shadow: 0px -1px 1px 1px rgba(0,0,0,0.15);
@@ -135,21 +126,11 @@ select.form-control,
 .main-content .btn-default,
 .modal-body .btn-default,
 .modal-footer .btn-default,
-.btn-default.disabled:hover,
-.btn-default.disabled:active,
-.btn-default.disabled:focus,
-.form-control[disabled],
 #modal-options .options-function-box .input-group-addon {
     background-color: #555555;
     color: #EBEBEB;
 }
 
-.btn-default:not(.navbar-btn):hover,
-select:hover,
-input:hover {
-    background-color: #666666;
-}
-
 /* Needed to force the text-color */
 .table-striped>tbody>tr:nth-child(odd)>td,
 .table>tbody>tr:nth-child(odd)>td,
@@ -176,8 +157,6 @@ tbody>tr:last-child td,
 input,
 input.form-control,
 .input-group-addon,
-.search-box input:focus,
-.search-box input:valid,
 select.form-control,
 #modal-options .table-server-connections th,
 .main-content .btn-default,
@@ -210,8 +189,7 @@ tbody .caret {
 .info-container,
 #modal-options .options-status-box small,
 #modal-options #options-status small,
-#modal-options .tab-content h4,
-h2 small {
+#modal-options .tab-content h4 {
     color: #D6D6D6;
 }
 
@@ -270,18 +248,16 @@ hr {
     border-top: none;
 }
 
-.form-control:focus,
-input[type="submit"]:focus,
-button:focus {
-    box-shadow: 0 0 0 0.25rem rgba(255, 255, 255, 0.3) !important;
-    outline: initial;
+/* Placeholders - Will not work if grouped! */
+::-webkit-input-placeholder {
+   color: #EBEBEB !important;
 }
 
-.archive-icon {
-    fill: #EBEBEB;
+::-moz-placeholder {
+   color: #EBEBEB !important;
+   opacity: 1 !important;
 }
 
-::placeholder {
-    color: #EBEBEB !important;
-    opacity: 0.5 !important;
+:-ms-input-placeholder {
+   color: #EBEBEB !important;
 }

interfaces/Glitter/templates/static/stylesheets/glitter.css

@@ -23,7 +23,6 @@ h2 {
 .sparkline-container svg {
     margin: 10px 15px 8px;
     float: left;
-    cursor: pointer;
 }
 
 .main-navbar .sparkline {
@@ -442,7 +441,7 @@ tbody>tr>td:last-child {
 .container-tabbed #queue-tab,
 .container-tabbed #queue-tab,
 .container-tabbed #queue-messages,
-.container-tabbed .history-header h2,
+.container-tabbed .history h2,
 .container-tabbed .queue h2,
 .history-queue-swicher {
     display: none;
@@ -494,10 +493,6 @@ tbody>tr>td:last-child {
     background-color: #d9534f !important;
 }
 
-.history-queue-swicher .badge-info {
-    background-color: #58A9FA !important;
-}
-
 .history-queue-swicher .badge {
     margin-left: 4px;
 }
@@ -690,10 +685,6 @@ tbody.no-downloads tr td {
     border-bottom: 1px solid #F0F0F0 !important;
 }
 
-tbody.no-downloads tr td>span {
-    opacity: 0.7;
-}
-
 tbody.no-downloads tr td a {
     line-height: 2em;
     font-size: 1.5em;
@@ -860,7 +851,7 @@ tr.queue-item>td:first-child>a {
 }
 
 .multioperations-selector .add-nzb-inputbox {
-    width: 19%;
+    width: 20%;
     float: left;
 }
 
@@ -871,7 +862,7 @@ tr.queue-item>td:first-child>a {
 }
 
 .multioperations-selector .add-nzb-inputbox-small {
-    width: 115px;
+    width: 80px;
     float: right;
     padding-left: 0;
     padding-top: 12px;
@@ -994,27 +985,8 @@ tr.queue-item>td:first-child>a {
     position: relative;
 }
 
-.history-header {
+.history h2 {
     clear: left;
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-}
-
-.history-header a {
-    align-self: center;
-    margin-right: 2px;
-    font-size: 12px;
-}
-
-.container-tabbed .history-header {
-    display: inline;
-}
-
-.container-tabbed .history-header a {
-    position: absolute;
-    right: 0;
-    top: 10px;
 }
 
 .history-table {
@@ -1036,6 +1008,10 @@ tr.queue-item>td:first-child>a {
     font-weight: bold;
 }
 
+.history-table td.name.name-has-ratings .row-wrap-text {
+    max-width: calc(100% - 80px) ;
+}
+
 .history-failed-download:hover .retry-button .glyphicon:before,
 .retry-button:hover .glyphicon:before {
     content: " \e030 ";
@@ -1097,16 +1073,86 @@ tr.queue-item>td:first-child>a {
     font-weight: bold;
 }
 
-.mark-completed-link {
-    font-weight: bold !important;
-    color: #28a745 !important;
-    text-decoration: underline;
-    margin-left: 10px;
-}
-
 .history-status-hidden {
     display: none;
 }
+
+.history-ratings {
+    display: inline-block;
+}
+
+.history-ratings.open a {
+    opacity: 1;
+}
+
+.history-ratings .name-icons {
+    float: none !important;
+}
+
+.history-ratings-menu {
+    width: 300px;
+    padding: 10px;
+    margin-top: 4px !important;
+}
+
+.history-ratings-menu .divider {
+    background-color: black;
+}
+
+.history-ratings-menu label {
+    margin-right: 12px;
+    font-weight: normal;
+}
+
+.history-ratings-basic input[type="radio"] {
+    display: none;
+}
+
+.history-ratings-basic input[type="radio"]+span {
+    opacity: 0.6;
+    cursor: pointer;
+    font-size: 1.3em;
+    font-weight: bold;
+    top: 3px;
+    margin-left: 3px;
+}
+
+.history-ratings-basic input[type="radio"]+span+span {
+    opacity: 0.3;
+}
+
+.history-ratings-basic input[type="radio"]:checked+span,
+.history-ratings-basic input[type="radio"]:checked+span+span {
+    opacity: 1;
+}
+
+.history-ratings-basic .history-ratings-spacer {
+    margin-left: 10px;
+}
+
+.history-ratings-basic select {
+    margin-left: 3px;
+    background-color: transparent;
+    border: 1px solid #ccc;
+}
+
+.history-ratings-basic select:disabled {
+    background-color: #F5F5F5;
+}
+
+.history-ratings-report label {
+    width: 100%;
+}
+
+.history-ratings-report .ratings-report-hidden {
+    display: none;
+}
+
+.history-ratings-report input[type="radio"]:checked+input,
+.history-ratings-report input[type="radio"]:checked+select {
+    display: block;
+}
+
 #history-options {
     margin-top: 0;
     margin-left: 10px;
@@ -1114,29 +1160,11 @@ tr.queue-item>td:first-child>a {
 }
 
 #history-options .hover-button {
-    padding: 7px;
+    padding: 7px 8px 7px 8px;
     line-height: 1.428571429;
     display: inline-block;
 }
 
-#history-options .hover-button.history-archive {
-    line-height: 1em;
-    vertical-align: middle;
-}
-
-#history-options div {
-    display: inline-block;
-    vertical-align: middle;
-    margin-left: 5px;
-}
-
-#history-options input[name="multieditCheckAll"] {
-    vertical-align: middle;
-    position: relative;
-    top: -2px;
-    margin-left: 8px;
-} 
-
 #history-options .hover-button span {
     top: 2px;
 }
@@ -1203,10 +1231,6 @@ tr.queue-item>td:first-child>a {
     color:  red !important;
 }
 
-.history-options-show-failed .archive-icon {
-    fill: #2bbd43;
-}
-
 .processing-download {
     width: 16px;
     height: 18px;
@@ -1345,12 +1369,6 @@ tr.queue-item>td:first-child>a {
     padding-top: 3px;
 }
 
-#modal-options .col-dot-overflow {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
 #modal-options #options-status .glyphicon:not(.glyphicon-comment) {
     margin-right: 5px;
     margin-left: 3px;
@@ -1542,34 +1560,6 @@ input[name="nzbURL"] {
     transition : border 500ms ease-out;
 }
 
-/* DELETE MODAL */
-.modal-delete-job ul {
-    margin-top: 10px;
-}
-
-.modal-delete-job li {
-    word-break: break-all;
-}
-
-.modal-delete-job .checkbox {
-    float: left;
-    margin: 8px 5px 0px;
-}
-
-#modal-purge-history .checkbox {
-    margin: 0;
-}
-
-.modal-delete-job .checkbox input,
-#modal-purge-history .checkbox input {
-    margin-top: 3px;
-}
-
-.modal-delete-job .checkbox input+span,
-#modal-purge-history .checkbox input+span {
-    font-weight: bold;
-}
-
 /* HELP MODAL */
 
 #modal-help .modal-body {
@@ -1745,6 +1735,7 @@ input[name="nzbURL"] {
 .container-compact .search-box .form-control {
     height: 28px;
 }
+
 .container-compact,
 .container-compact .dropdown-menu,
 .container-compact .btn,
@@ -1770,9 +1761,6 @@ input[name="nzbURL"] {
 .container-compact .form-control {
     height: 29px;
 }
-.container-compact .form-control-multiselect {
-    height: 60px;
-}
 .container-compact .modal-header {
     padding: 5px 12px;
 }
@@ -1852,22 +1840,18 @@ input[name="nzbURL"] {
     padding-top: 5px;
 }
 
-.container-full-width .container {
-    width: calc(100% - 60px);
-}
-
 /***
     Dynamic sizing
 ***/
 @media screen and (min-width: 1200px) {
-    .queue-table .table-header-extra,
-    .history-table .table-header-extra {
-        width: 6%;
+    .queue-table .table-extra-header-visible,
+    .history-table .table-extra-header-visible {
+        width: 10%;
     }
 
     .queue-table .table-header-progress-smaller,
     .history-table .table-header-progress-smaller {
-        width: 25%;
+        width: 35%;
     }
 
     #options-interface .label {
@@ -1963,6 +1947,10 @@ input[name="nzbURL"] {
     #feedback-slider {
         display: none;
     }
+
+    .glyphicon-facetime-video {
+        top: 2px;
+    }
 }
 
 @media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:portrait) {
@@ -1985,45 +1973,6 @@ input[name="nzbURL"] {
     }
 }
 
-/***
-    RTL Fixes
-***/
-
-html[dir="rtl"] .navbar-nav {
-    padding-right: 0;
-}
-
-html[dir="rtl"] .queue h2,
-html[dir="rtl"] .history h2 {
-    float: right;
-}
-
-html[dir="rtl"] .dropdown-menu {
-    text-align: right;
-    direction: rtl;
-}
-
-html[dir="rtl"] .speedlimit-dropdown,
-html[dir="rtl"] .progress-indicator,
-html[dir="rtl"] #modal-item-filelist,
-html[dir="rtl"] #modal-item-files .modal-title,
-html[dir="rtl"] .info-container-box,
-html[dir="rtl"] .queue-table,
-html[dir="rtl"] .history-table {
-    direction: ltr;
-}
-
-html[dir="rtl"] .search-box a {
-    right: initial;
-    left: 8px;
-}
-
-html[dir="rtl"] .navbar-logo,
-html[dir="rtl"] .info-container,
-html[dir="rtl"] .modal-header .close,
-html[dir="rtl"] #modal-options .modal-header a {
-    float: left;
-}
 
 /***
     Bootstrap overwrites
@@ -2041,6 +1990,7 @@ a:focus {
     text-decoration: none;
 }
 
+.glyphicon-volume-up,
 .glyphicon-trash {
     top: 2px;
 }
@@ -2109,6 +2059,15 @@ a:focus {
     content: '';
 }
 
+.history-ratings-menu:after {
+    right: inherit !important;
+    left: 23px;
+}
+.history-ratings-menu:before {
+    right: inherit !important;
+    left: 22px;
+}
+
 .open > .dropdown-menu {
     opacity: 1;
     visibility: visible;

interfaces/Glitter/templates/static/stylesheets/glitter.mobile.css

@@ -7,10 +7,6 @@
     padding-right: 8px;
 }
 
-.container-full-width .container {
-    width: 100%;
-}
-
 .main-navbar {
     margin-top: 0;
     padding: 0;
@@ -167,7 +163,7 @@ tr.queue-item>td:first-child>a {
 }
 
 .multioperations-selector .add-nzb-inputbox-small {
-    width: 115px;
+    width: 72px;
 }
 
 .multioperations-selector .add-nzb-inputbox-clear {
@@ -184,6 +180,14 @@ tr.queue-item>td:first-child>a {
     min-width: 0px;
 }
 
+.history-table .history-ratings {
+    display: none;
+}
+
+.name-has-ratings .row-wrap-text {
+    max-width: calc(100% - 1px) !important;
+}
+
 .history-table .delete .dropdown-menu {
     width: 100%;
     left: 0;

interfaces/Glitter/templates/status.tmpl

@@ -0,0 +1 @@
+  

interfaces/Plush/README.txt

@@ -0,0 +1,106 @@
+
+Plush for SABnzbd 0.6.x | Feb. 21 2010
+assembled by pairofdimes - see LICENSE-CC.txt
+https://forums.sabnzbd.org contributions welcome
+
+======================
+THANKS TO CONTRIBUTORS
+
+Unmentioned imagery provided by: inpheaux, injectx, real_scud, jbw, sbultez, rAf
+
+==============
+LIBRARIES USED
+
+jQuery
+http://jquery.com
+Copyright (c) 2010 John Resig
+See LICENSE-MIT & LICENSE-GPL
+
+jQuery UI
+http://jqueryui.com/about
+Copyright (c) 2010 jQuery UI Team
+See LICENSE-MIT & LICENSE-GPL
+(includes files in templates/static/stylesheets/jqueryui/*)
+
+Sizzle CSS Selector Engine
+http://sizzlejs.com/
+Copyright (c) 2010 The Dojo Foundation
+See LICENSE-MIT, LICENSE-BSD, & LICENSE-GPL
+
+jQuery ColorBox
+http://colorpowered.com/colorbox/
+Copyright (c) 2009 Jack Moore
+See LICENSE-MIT
+
+jQuery Cookie
+http://www.stilbuero.de
+Copyright (c) 2006 Klaus Hartl
+See LICENSE-MIT & LICENSE-GPL
+
+jQuery hoverIntent
+http://cherne.net/brian/resources/jquery.hoverIntent.html
+Brian Cherne
+See LICENSE-MIT & LICENSE-GPL
+
+jQuery Live Query
+http://plugins.jquery.com/project/livequery
+Copyright (c) 2007 Brandon Aaron
+See LICENSE-MIT & LICENSE-GPL
+
+jQuery Pagination (with modifications from pairofdimes, where noted)
+http://plugins.jquery.com/project/pagination
+Author: Gabriel Birke, Describe Europe Ltd.
+See LICENSE-MIT & LICENSE-GPL
+
+jQuery Superfish
+http://users.tpg.com.au/j_birch/plugins/superfish
+Copyright (c) 2008 Joel Birch
+See LICENSE-MIT & LICENSE-GPL
+
+jQuery Table Drag & Drop
+http://www.isocra.com/2008/02/table-drag-and-drop-jquery-plugin
+Copyright (c) 2008 Denis Howlett
+See LICENSE-MIT & LICENSE-GPL
+
+WebToolkit
+http://www.webtoolkit.info/ajax-file-upload.html
+Copyright (c) 2006-2008 www.webtoolkit.info
+See LICENSE-GPL3 & LICENSE-WebToolkit
+
+www.AjaxLoad.info generated:
+templates/static/images/plush-default/loading-*.gif
+
+Nuvola Icon Set
+http://www.icon-king.com/?p=15
+Copyright (c) 2003-2004 David Vignoni
+See LICENSE-LGPL
+
+The following image is composed of graphics from the Nuvola icon set:
+templates/static/stylesheets/colorschemes/gold/images/sprite-config.png
+The above image was generated by http://spritegen.website-performance.org/
+
+templates/static/stylesheets/colorschemes/gold/images/colorbox-*.png comes from jQuery ColorBox plugin -- See LICENSE-MIT
+
+
+========================
+SPRITE GENERATION METHOD
+
+There are two sprite images, sprite-config.png and sprite-main.png, which are used to reduce the number of connections when loading Plush. Here is how to go about modifying these as easily as possible. This is oriented for the main sprite, but works the same for the config sprite.
+
+1. Extract images/plush-default-split.tar.gz
+2. Pop your new images into /plush-default-split/main/
+3. Zip up main/ (not config/)
+4. Head on over to http://spritegen.website-performance.org/
+5a. Upload the main.zip
+5b. Set Horizontal Offset & Vertical Offset to something like 150px (prevents bleeding)
+5c. Check "Compress Image with OptiPNG"
+5d. Change Class Prefix from "sprite-" to "sprite_"
+5e. Click "Create Sprite Image & CSS"
+6. You are now provided with an image and CSS
+6a. Download the image, rename to sprite-main.png, place in images/plush-default replacing what is there
+6b. Copy/paste the generated CSS definitions in the textarea, replace what is in plush-default.css
+6c. Change the generated .sprite_topright_queue position: "background-position: right" (instead of 0)
+6d. Open queue.tmpl, find <div class="sprite_progress_done", and reset "-1299px" to the new offset (from 6b)
+7. Re-archive the split folder, unix command: tar -czf plush-default-split.tar.gz plush-default-split
+7a. Make sure to remove any Thumbs.db or .DS_Store files beforehand
+8. Of course, test changes

interfaces/Plush/licenses/LICENSE-BSD.txt

@@ -0,0 +1,18 @@
+<OWNER> = Regents of the University of California
+<ORGANIZATION> = University of California, Berkeley
+<YEAR> = 1998
+
+In the original BSD license, both occurrences of the phrase "COPYRIGHT HOLDERS AND CONTRIBUTORS" in the disclaimer read "REGENTS AND CONTRIBUTORS".
+
+Here is the license template:
+
+Copyright (c) <YEAR>, <OWNER>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+    * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

interfaces/Plush/licenses/LICENSE-CC.txt

@@ -0,0 +1,63 @@
+http://creativecommons.org/licenses/by/3.0/
+http://creativecommons.org/licenses/by/3.0/legalcode
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License.
+   3. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+   4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+   5. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+   6. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+   7. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+   8. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+   9. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+   4. to Distribute and Publicly Perform Adaptations.
+   5.
+
+      For the avoidance of doubt:
+         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(b), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(b), as requested.
+   2. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4 (b) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+   3. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.

interfaces/Plush/licenses/LICENSE-GPL.txt

@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

interfaces/Plush/licenses/LICENSE-GPL3.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.