Fixed vulnerability in json.php caused my missing Content-Type header

to ensure docker image updates, we build the image once a week

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,5 +24,5 @@ Browser, OS, type of connection, unusual software, ...
 What should have happened
 
 ## Screenshots
-If necessary, add screenshots of the test. 
+If necessary, add screenshots of the test.
 F12 > Network screenshots can be particularly useful

.github/workflows/docker-publish.yml

@@ -0,0 +1,81 @@
+name: Docker
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+on:
+  schedule:
+    - cron: '30 20 * * Sun'
+  push:
+    branches: ["*"]
+    # Publish semver tags as releases.
+    tags: ["v*.*.*"]
+  pull_request:
+    branches: ["{{is_default_branch}}"]
+
+env:
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      # This is used to complete the identity challenge
+      # with sigstore/fulcio when running outside of PRs.
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Set up BuildKit Docker container builder to be able to build
+      # multi-platform images and export cache
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            # set latest tag for default branch
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.gitignore

@@ -1,2 +1,3 @@
 results/idObfuscation_salt.php
 backend/getIP_serverLocation.php
+db-dir/

Dockerfile

@@ -0,0 +1,43 @@
+FROM php:8-apache
+
+# Install extensions
+RUN apt-get update && apt-get install -y \
+    libfreetype6-dev \
+    libjpeg62-turbo-dev \
+    libpng-dev \
+    libpq-dev \
+    && docker-php-ext-install -j$(nproc) iconv \
+    && docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ \
+    && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
+    && docker-php-ext-install -j$(nproc) gd pdo pdo_mysql pdo_pgsql pgsql \
+    && rm -rf /var/lib/apt/lists/*
+
+# Prepare files and folders
+RUN mkdir -p /speedtest/
+
+# Copy sources
+COPY backend/ /speedtest/backend
+
+COPY results/*.php /speedtest/results/
+COPY results/*.ttf /speedtest/results/
+
+COPY *.js /speedtest/
+COPY favicon.ico /speedtest/
+
+COPY docker/servers.json /servers.json
+
+COPY docker/*.php /speedtest/
+COPY docker/entrypoint.sh /
+
+# Prepare default environment variables
+ENV TITLE=LibreSpeed
+ENV MODE=standalone
+ENV PASSWORD=password
+ENV TELEMETRY=false
+ENV ENABLE_ID_OBFUSCATION=false
+ENV REDACT_IP_ADDRESSES=false
+ENV WEBPORT=80
+
+# Final touches
+EXPOSE 80
+CMD ["bash", "/entrypoint.sh"]

README.md

@@ -4,13 +4,13 @@
 
 No Flash, No Java, No Websocket, No Bullshit.
 
-This is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers.
+This is a very lightweight speed test implemented in Javascript, using XMLHttpRequest and Web Workers.
 
 ## Try it
-[Take a Speedtest](https://speedtest.fdossena.com)
+[Take a speed test](https://librespeed.org)
 
 ## Compatibility
-All modern browsers are supported: IE11, latest Edge, latest Chrome, latest Firefox, latest Safari.  
+All modern browsers are supported: IE11, latest Edge, latest Chrome, latest Firefox, latest Safari.
 Works with mobile versions too.
 
 ## Features
@@ -23,33 +23,52 @@ Works with mobile versions too.
 * Results sharing (optional)
 * Multiple Points of Test (optional)
 
-![Screenshot](https://speedtest.fdossena.com/mpot_v6.gif)
+![Screenrecording of a running Speedtest](https://speedtest.fdossena.com/mpot_v6.gif)
 
 
 ## Server requirements
 * A reasonably fast web server with Apache 2 (nginx, IIS also supported)
-* PHP 5.4 (other backends also available)
-* MySQL database to store test results (optional, PostgreSQL and SQLite also supported)
+* PHP 5.4 or newer (other backends also available)
+* MySQL database to store test results (optional, Microsoft SQL Server, PostgreSQL and SQLite also supported)
 * A fast! internet connection
 
-## Installation videos
+## Installation
+Assuming you have PHP installed, the installation steps are quite simple.
+I set this up on a QNAP.
+For this example, I am using a folder called **speedtest** in my web share area.
+
+1. Choose one of the example-xxx.html files in `examples` folder as your index.html if the default index.html does not fit.
+2. Add: speedtest.js, speedtest_worker.js, and favicon.ico to your speedtest folder.
+3. Download all of the backend folder into speedtest/backend.
+4. Download all of the results folder into speedtest/results.
+5. Be sure your permissions allow execute (755).
+6. Visit YOURSITE/speedtest/index.html and voila!
+
+### Installation Video
+There is a more in-depth installation video here:
 * [Quick start installation guide for Ubuntu Server 19.04](https://fdossena.com/?p=speedtest/quickstart_v5_ubuntu.frag)
 
 ## Android app
 A template to build an Android client for your LibreSpeed installation is available [here](https://github.com/librespeed/speedtest-android).
 
+## CLI client
+A command line client is available [here](https://github.com/librespeed/speedtest-cli).
+
 ## Docker
-Please see the `docker` branch
+A docker image is available on [GitHub](https://github.com/librespeed/speedtest/pkgs/container/speedtest), check our [docker documentation](doc_docker.md) for more info about it.
+
+## Go backend
+A Go implementation is available in the [`speedtest-go`](https://github.com/librespeed/speedtest-go) repo, maintained by [Maddie Zhan](https://github.com/maddie).
 
 ## Node.js backend
-A Node.js implementation is available in the `node` branch, maintained by [dunklesToast](https://github.com/dunklesToast).
+A partial Node.js implementation is available in the `node` branch, developed by [dunklesToast](https://github.com/dunklesToast). It's not recommended to use at the moment.
 
 ## Donate
-[![Donate with Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/fdossena/donate)  
-[Donate with PayPal](https://www.paypal.me/sineisochronic)  
+[![Donate with Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/fdossena/donate)
+[Donate with PayPal](https://www.paypal.me/sineisochronic)
 
 ## License
-Copyright (C) 2016-2019 Federico Dossena
+Copyright (C) 2016-2022 Federico Dossena
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by

backend/empty.php

@@ -1,12 +1,14 @@
 <?php
-header( "HTTP/1.1 200 OK" );
-if(isset($_GET["cors"])){
+
+header('HTTP/1.1 200 OK');
+
+if (isset($_GET['cors'])) {
     header('Access-Control-Allow-Origin: *');
     header('Access-Control-Allow-Methods: GET, POST');
     header('Access-Control-Allow-Headers: Content-Encoding, Content-Type');
 }
-header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0, s-maxage=0");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-header("Connection: keep-alive");
-?>
+
+header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0, s-maxage=0');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Connection: keep-alive');

backend/garbage.php

@@ -1,31 +1,67 @@
 <?php
+
 // Disable Compression
 @ini_set('zlib.output_compression', 'Off');
 @ini_set('output_buffering', 'Off');
 @ini_set('output_handler', '');
-// Headers
-header('HTTP/1.1 200 OK');
-if(isset($_GET["cors"])){
-    header('Access-Control-Allow-Origin: *');
-    header('Access-Control-Allow-Methods: GET, POST');
+
+/**
+ * @return int
+ */
+function getChunkCount()
+{
+    if (
+        !array_key_exists('ckSize', $_GET)
+        || !ctype_digit($_GET['ckSize'])
+        || (int) $_GET['ckSize'] <= 0
+    ) {
+        return 4;
+    }
+
+    if ((int) $_GET['ckSize'] > 1024) {
+        return 1024;
+    }
+
+    return (int) $_GET['ckSize'];
 }
-// Download follows...
-header('Content-Description: File Transfer');
-header('Content-Type: application/octet-stream');
-header('Content-Disposition: attachment; filename=random.dat');
-header('Content-Transfer-Encoding: binary');
-// Never cache me
-header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0, s-maxage=0');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
+
+/**
+ * @return void
+ */
+function sendHeaders()
+{
+    header('HTTP/1.1 200 OK');
+
+    if (isset($_GET['cors'])) {
+        header('Access-Control-Allow-Origin: *');
+        header('Access-Control-Allow-Methods: GET, POST');
+    }
+
+    // Indicate a file download
+    header('Content-Description: File Transfer');
+    header('Content-Type: application/octet-stream');
+    header('Content-Disposition: attachment; filename=random.dat');
+    header('Content-Transfer-Encoding: binary');
+
+    // Cache settings: never cache this request
+    header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0, s-maxage=0');
+    header('Cache-Control: post-check=0, pre-check=0', false);
+    header('Pragma: no-cache');
+}
+
+// Determine how much data we should send
+$chunks = getChunkCount();
+
 // Generate data
-$data=openssl_random_pseudo_bytes(1048576);
+if (function_exists('random_bytes')) {
+    $data = random_bytes(1048576);
+} else {
+    $data = openssl_random_pseudo_bytes(1048576);
+}
+
 // Deliver chunks of 1048576 bytes
-$chunks=isset($_GET['ckSize']) ? intval($_GET['ckSize']) : 4;
-if(empty($chunks)){$chunks = 4;}
-if($chunks>1024){$chunks = 1024;}
-for($i=0;$i<$chunks;$i++){
+sendHeaders();
+for ($i = 0; $i < $chunks; $i++) {
     echo $data;
     flush();
 }
-?>

backend/getIP.php

@@ -1,59 +1,234 @@
 <?php
+
 /*
-	This script detects the client's IP address and fetches ISP info from ipinfo.io/
-	Output from this script is a JSON string composed of 2 objects: a string called processedString which contains the combined IP, ISP, Contry and distance as it can be presented to the user; and an object called rawIspInfo which contains the raw data from ipinfo.io (will be empty if isp detection is disabled).
-	Client side, the output of this script can be treated as JSON or as regular text. If the output is regular text, it will be shown to the user as is.
-*/
+ * This script detects the client's IP address and fetches ISP info from ipinfo.io/
+ * Output from this script is a JSON string composed of 2 objects: a string called processedString which contains the combined IP, ISP, Country and distance as it can be presented to the user; and an object called rawIspInfo which contains the raw data from ipinfo.io (will be empty if isp detection is disabled).
+ * Client side, the output of this script can be treated as JSON or as regular text. If the output is regular text, it will be shown to the user as is.
+ */
+
 error_reporting(0);
-$ip = "";
-header('Content-Type: application/json; charset=utf-8');
-if(isset($_GET["cors"])){
-    header('Access-Control-Allow-Origin: *');
-    header('Access-Control-Allow-Methods: GET, POST');
-}
-header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0, s-maxage=0');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
-    $ip = $_SERVER['HTTP_CLIENT_IP'];
-} elseif (!empty($_SERVER['X-Real-IP'])) {
-    $ip = $_SERVER['X-Real-IP'];
-} elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-    $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-    $ip = preg_replace("/,.*/", "", $ip); # hosts are comma-separated, client is first
-} else {
-    $ip = $_SERVER['REMOTE_ADDR'];
+
+define('API_KEY_FILE', 'getIP_ipInfo_apikey.php');
+define('SERVER_LOCATION_CACHE_FILE', 'getIP_serverLocation.php');
+
+require_once 'getIP_util.php';
+
+/**
+ * @param string $ip
+ *
+ * @return string|null
+ */
+function getLocalOrPrivateIpInfo($ip)
+{
+    // ::1/128 is the only localhost ipv6 address. there are no others, no need to strpos this
+    if ('::1' === $ip) {
+        return 'localhost IPv6 access';
+    }
+
+    // simplified IPv6 link-local address (should match fe80::/10)
+    if (stripos($ip, 'fe80:') === 0) {
+        return 'link-local IPv6 access';
+    }
+
+    // anything within the 127/8 range is localhost ipv4, the ip must start with 127.0
+    if (strpos($ip, '127.') === 0) {
+        return 'localhost IPv4 access';
+    }
+
+    // 10/8 private IPv4
+    if (strpos($ip, '10.') === 0) {
+        return 'private IPv4 access';
+    }
+
+    // 172.16/12 private IPv4
+    if (preg_match('/^172\.(1[6-9]|2\d|3[01])\./', $ip) === 1) {
+        return 'private IPv4 access';
+    }
+
+    // 192.168/16 private IPv4
+    if (strpos($ip, '192.168.') === 0) {
+        return 'private IPv4 access';
+    }
+
+    // IPv4 link-local
+    if (strpos($ip, '169.254.') === 0) {
+        return 'link-local IPv4 access';
+    }
+
+    return null;
 }
 
-$ip = preg_replace("/^::ffff:/", "", $ip);
+/**
+ * @return string
+ */
+function getIpInfoTokenString()
+{
+    if (
+        !file_exists(API_KEY_FILE)
+        || !is_readable(API_KEY_FILE)
+    ) {
+        return '';
+    }
 
-if ($ip == "::1") { // ::1/128 is the only localhost ipv6 address. there are no others, no need to strpos this
-    echo json_encode(['processedString' => $ip . " - localhost IPv6 access", 'rawIspInfo' => ""]);
-    die();
+    require API_KEY_FILE;
+
+    if (empty($IPINFO_APIKEY)) {
+        return '';
+    }
+
+    return '?token=' . $IPINFO_APIKEY;
 }
-if (stripos($ip, 'fe80:') === 0) { // simplified IPv6 link-local address (should match fe80::/10)
-    echo json_encode(['processedString' => $ip . " - link-local IPv6 access", 'rawIspInfo' => ""]);
-    die();
+
+/**
+ * @param string $ip
+ *
+ * @return array|null
+ */
+function getIspInfo($ip)
+{
+    $json = file_get_contents('https://ipinfo.io/' . $ip . '/json' . getIpInfoTokenString());
+    if (!is_string($json)) {
+        return null;
+    }
+
+    $data = json_decode($json, true);
+    if (!is_array($data)) {
+        return null;
+    }
+
+    return $data;
 }
-if (strpos($ip, '127.') === 0) { //anything within the 127/8 range is localhost ipv4, the ip must start with 127.0
-    echo json_encode(['processedString' => $ip . " - localhost IPv4 access", 'rawIspInfo' => ""]);
-    die();
+
+/**
+ * @param array|null $rawIspInfo
+ *
+ * @return string
+ */
+function getIsp($rawIspInfo)
+{
+    if (is_array($rawIspInfo)) {
+        /* variant with no token
+        has json like:
+        {
+            "ip": "xxx.xxx.xxx.xxx",
+            "hostname": "example.com",
+            "city": "Vienna",
+            "region": "Vienna",
+            "country": "AT",
+            "loc": "48.2085,16.3721",
+            "org": "ASxxxx T-Mobile Austria GmbH",
+            "postal": "nnnn",
+            "timezone": "Europe/Vienna",
+            "readme": "https://ipinfo.io/missingauth"
+        }
+        */
+        if (
+            array_key_exists('org', $rawIspInfo)
+            && is_string($rawIspInfo['org'])
+            && !empty($rawIspInfo['org'])
+        ) {
+            // Remove AS##### from ISP name, if present
+            return preg_replace('/AS\\d+\\s/', '', $rawIspInfo['org']);
+        }
+
+        /*
+        variant with valid token has json:
+        {
+            "ip": "xxx.xxx.xxx.xxx",
+            "hostname": "example.com",
+            "city": "Vienna",
+            "region": "Vienna",
+            "country": "AT",
+            "loc": "48.2085,16.3721",
+            "postal": "1010",
+            "timezone": "Europe/Vienna",
+            "asn": {
+                "asn": "ASxxxx",
+                "name": "T-Mobile Austria GmbH",
+                "domain": "t-mobile.at",
+                "route": "xxx.xxx.xxx.xxx/xx",
+                "type": "isp"
+            },
+            "company": {
+                "name": "XX",
+                "domain": "example.com",
+                "type": "isp"
+            },
+            "privacy": {
+                "vpn": true,
+                "proxy": false,
+                "tor": false,
+                "relay": false,
+                "hosting": false,
+                "service": ""
+            },
+            "abuse": {
+                "address": "...",
+                "country": "AT",
+                "email": "abuse@example.com",
+                "name": "XXX",
+                "network": "xxx.xxx.xxx.xxx-xxx.xxx.xxx.xxx",
+                "phone": ""
+            },
+            "domains": {
+                "total": 0,
+                "domains": [
+
+                ]
+            }
+            }
+         */
+        if (
+            array_key_exists('asn', $rawIspInfo)
+            && is_array($rawIspInfo['asn'])
+            && !empty($rawIspInfo['asn'])
+            && array_key_exists('name', $rawIspInfo['asn'])
+            && is_string($rawIspInfo['asn']['name'])
+        ) {
+            // Remove AS##### from ISP name, if present
+            return $rawIspInfo['asn']['name'];
+        }
+    }
+
+    return 'Unknown ISP';
 }
-if (strpos($ip, '10.') === 0) { // 10/8 private IPv4
-    echo json_encode(['processedString' => $ip . " - private IPv4 access", 'rawIspInfo' => ""]);
-    die();
-}
-if (preg_match('/^172\.(1[6-9]|2\d|3[01])\./', $ip) === 1) { // 172.16/12 private IPv4
-    echo json_encode(['processedString' => $ip . " - private IPv4 access", 'rawIspInfo' => ""]);
-    die();
-}
-if (strpos($ip, '192.168.') === 0) { // 192.168/16 private IPv4
-    echo json_encode(['processedString' => $ip . " - private IPv4 access", 'rawIspInfo' => ""]);
-    die();
-}
-if (strpos($ip, '169.254.') === 0) { // IPv4 link-local
-    echo json_encode(['processedString' => $ip . " - link-local IPv4 access", 'rawIspInfo' => ""]);
-    die();
+
+/**
+ * @return string|null
+ */
+function getServerLocation()
+{
+    $serverLoc = null;
+    if (
+        file_exists(SERVER_LOCATION_CACHE_FILE)
+        && is_readable(SERVER_LOCATION_CACHE_FILE)
+    ) {
+        require SERVER_LOCATION_CACHE_FILE;
+    }
+    if (is_string($serverLoc) && !empty($serverLoc)) {
+        return $serverLoc;
+    }
+
+    $json = file_get_contents('https://ipinfo.io/json' . getIpInfoTokenString());
+    if (!is_string($json)) {
+        return null;
+    }
+
+    $details = json_decode($json, true);
+    if (
+        !is_array($details)
+        || !array_key_exists('loc', $details)
+        || !is_string($details['loc'])
+        || empty($details['loc'])
+    ) {
+        return null;
+    }
+
+    $serverLoc = $details['loc'];
+    $cacheData = "<?php\n\n\$serverLoc = '" . addslashes($serverLoc) . "';\n";
+    file_put_contents(SERVER_LOCATION_CACHE_FILE, $cacheData);
+
+    return $serverLoc;
 }
 
 /**
@@ -66,89 +241,163 @@ if (strpos($ip, '169.254.') === 0) { // IPv4 link-local
  *
  * @return float [km]
  */
-function distance($latitudeFrom, $longitudeFrom, $latitudeTo, $longitudeTo) {
+function distance(
+    $latitudeFrom,
+    $longitudeFrom,
+    $latitudeTo,
+    $longitudeTo
+) {
     $rad = M_PI / 180;
     $theta = $longitudeFrom - $longitudeTo;
-    $dist = sin($latitudeFrom * $rad) * sin($latitudeTo * $rad) + cos($latitudeFrom * $rad) * cos($latitudeTo * $rad) * cos($theta * $rad);
+    $dist = sin($latitudeFrom * $rad)
+        * sin($latitudeTo * $rad)
+        + cos($latitudeFrom * $rad)
+        * cos($latitudeTo * $rad)
+        * cos($theta * $rad);
+
     return acos($dist) / $rad * 60 * 1.853;
 }
-function getIpInfoTokenString(){
-	$apikeyFile="getIP_ipInfo_apikey.php";
-	if(!file_exists($apikeyFile)) return "";
-	require $apikeyFile;
-	if(empty($IPINFO_APIKEY)) return "";
-	return "?token=".$IPINFO_APIKEY;
-}
-if (isset($_GET["isp"])) {
-    $isp = "";
-	$rawIspInfo=null;
-    try {
-        $json = file_get_contents("https://ipinfo.io/" . $ip . "/json".getIpInfoTokenString());
-        $details = json_decode($json, true);
-		$rawIspInfo=$details;
-        if (array_key_exists("org", $details)){
-            $isp .= $details["org"];
-			$isp=preg_replace("/AS\d{1,}\s/","",$isp); //Remove AS##### from ISP name, if present
-		}else{
-            $isp .= "Unknown ISP";
-		}
-		if (array_key_exists("country", $details)){
-			$isp .= ", " . $details["country"];
-		}
-        $clientLoc = NULL;
-        $serverLoc = NULL;
-        if (array_key_exists("loc", $details)){
-            $clientLoc = $details["loc"];
-		}
-        if (isset($_GET["distance"])) {
-            if ($clientLoc) {
-				$locFile="getIP_serverLocation.php";
-				$serverLoc=null;
-				if(file_exists($locFile)){
-					require $locFile;
-				}else{
-					$json = file_get_contents("https://ipinfo.io/json".getIpInfoTokenString());
-					$details = json_decode($json, true);
-					if (array_key_exists("loc", $details)){
-						$serverLoc = $details["loc"];
-					}
-					if($serverLoc){
-						$lf=fopen($locFile,"w");
-						fwrite($lf,chr(60)."?php\n");
-						fwrite($lf,'$serverLoc="'.addslashes($serverLoc).'";');
-						fwrite($lf,"\n");
-						fwrite($lf,"?".chr(62));
-						fclose($lf);
-					}
-				}
-                if ($serverLoc) {
-                    try {
-                        $clientLoc = explode(",", $clientLoc);
-                        $serverLoc = explode(",", $serverLoc);
-                        $dist = distance($clientLoc[0], $clientLoc[1], $serverLoc[0], $serverLoc[1]);
-                        if ($_GET["distance"] == "mi") {
-                            $dist /= 1.609344;
-                            $dist = round($dist, -1);
-                            if ($dist < 15)
-                                $dist = "<15";
-                            $isp .= " (" . $dist . " mi)";
-                        }else if ($_GET["distance"] == "km") {
-                            $dist = round($dist, -1);
-                            if ($dist < 20)
-                                $dist = "<20";
-                            $isp .= " (" . $dist . " km)";
-                        }
-                    } catch (Exception $e) {
-                        
-                    }
-                }
-            }
-        }
-    } catch (Exception $ex) {
-        $isp = "Unknown ISP";
+
+/**
+ * @param array|null $rawIspInfo
+ *
+ * @return string|null
+ */
+function getDistance($rawIspInfo)
+{
+    if (
+        !is_array($rawIspInfo)
+        || !array_key_exists('loc', $rawIspInfo)
+        || !isset($_GET['distance'])
+        || !in_array($_GET['distance'], ['mi', 'km'], true)
+    ) {
+        return null;
     }
-    echo json_encode(['processedString' => $ip . " - " . $isp, 'rawIspInfo' => $rawIspInfo]);
-} else {
-    echo json_encode(['processedString' => $ip, 'rawIspInfo' => ""]);
+
+    $unit = $_GET['distance'];
+    $clientLocation = $rawIspInfo['loc'];
+    $serverLocation = getServerLocation();
+
+    if (!is_string($serverLocation)) {
+        return null;
+    }
+
+    return calculateDistance(
+        $serverLocation,
+        $clientLocation,
+        $unit
+    );
 }
-?>
+
+/**
+ * @param string $clientLocation
+ * @param string $serverLocation
+ * @param string $unit
+ *
+ * @return string
+ */
+function calculateDistance($clientLocation, $serverLocation, $unit)
+{
+    list($clientLatitude, $clientLongitude) = explode(',', $clientLocation);
+    list($serverLatitude, $serverLongitude) = explode(',', $serverLocation);
+    $dist = distance(
+        $clientLatitude,
+        $clientLongitude,
+        $serverLatitude,
+        $serverLongitude
+    );
+
+    if ('mi' === $unit) {
+        $dist /= 1.609344;
+        $dist = round($dist, -1);
+        if ($dist < 15) {
+            $dist = '<15';
+        }
+
+        return $dist . ' mi';
+    }
+
+    if ('km' === $unit) {
+        $dist = round($dist, -1);
+        if ($dist < 20) {
+            $dist = '<20';
+        }
+
+        return $dist . ' km';
+    }
+
+    return null;
+}
+
+/**
+ * @return void
+ */
+function sendHeaders()
+{
+    header('Content-Type: application/json; charset=utf-8');
+
+    if (isset($_GET['cors'])) {
+        header('Access-Control-Allow-Origin: *');
+        header('Access-Control-Allow-Methods: GET, POST');
+    }
+
+    header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0, s-maxage=0');
+    header('Cache-Control: post-check=0, pre-check=0', false);
+    header('Pragma: no-cache');
+}
+
+/**
+ * @param string $ip
+ * @param string|null $ipInfo
+ * @param string|null $distance
+ * @param array|null $rawIspInfo
+ *
+ * @return void
+ */
+function sendResponse(
+    $ip,
+    $ipInfo = null,
+    $distance = null,
+    $rawIspInfo = null
+) {
+    $processedString = $ip;
+    if (is_string($ipInfo)) {
+        $processedString .= ' - ' . $ipInfo;
+    }
+
+    if (
+        is_array($rawIspInfo)
+        && array_key_exists('country', $rawIspInfo)
+    ) {
+        $processedString .= ', ' . $rawIspInfo['country'];
+    }
+    if (is_string($distance)) {
+        $processedString .= ' (' . $distance . ')';
+    }
+
+    sendHeaders();
+    echo json_encode([
+        'processedString' => $processedString,
+        'rawIspInfo' => $rawIspInfo ?: '',
+    ]);
+}
+
+$ip = getClientIp();
+
+$localIpInfo = getLocalOrPrivateIpInfo($ip);
+// local ip, no need to fetch further information
+if (is_string($localIpInfo)) {
+    sendResponse($ip, $localIpInfo);
+    exit;
+}
+
+if (!isset($_GET['isp'])) {
+    sendResponse($ip);
+    exit;
+}
+
+$rawIspInfo = getIspInfo($ip);
+$isp = getIsp($rawIspInfo);
+$distance = getDistance($rawIspInfo);
+
+sendResponse($ip, $isp, $distance, $rawIspInfo);

backend/getIP_ipInfo_apikey.php

@@ -1,3 +1,4 @@
 <?php
-$IPINFO_APIKEY=""; //put your token between the quotes if you have one
-?>
+
+// put your token between the quotes if you have one
+$IPINFO_APIKEY = '';

backend/getIP_util.php

@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @return string
+ */
+function getClientIp() {
+    if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+        $ip = $_SERVER['HTTP_CLIENT_IP'];
+    } elseif (!empty($_SERVER['HTTP_X_REAL_IP'])) {
+        $ip = $_SERVER['HTTP_X_REAL_IP'];
+    } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+        $ip = preg_replace('/,.*/', '', $ip); # hosts are comma-separated, client is first
+    } else {
+        $ip = $_SERVER['REMOTE_ADDR'];
+    }
+
+    return preg_replace('/^::ffff:/', '', $ip);
+}
+

doc.md

@@ -1,11 +1,11 @@
 # LibreSpeed
 
-> by Federico Dossena  
-> Version 5.1
+> by Federico Dossena
+> Version 5.2.4
 > [https://github.com/librespeed/speedtest/](https://github.com/librespeed/speedtest/)
 
 ## Introduction
-LibreSpeed is a Free and Open Source speedtest that you can host on your server(s), and users can run in their browser.
+LibreSpeed is a Free and Open Source speed test that you can host on your server(s), and users can run in their browser.
 
 __Features:__
 * Download test
@@ -30,7 +30,7 @@ The following browsers are officially supported:
 Client side, the test can use up to 500MB of RAM on very fast connections.
 
 ## Quick start guides
-These guides cover a simple single server installation of the Speedtest.
+These guides cover a simple single server installation of the speed test.
 
 * [Quick start installation guide for Ubuntu Server 19.04](https://fdossena.com/?p=speedtest/quickstart_v5_ubuntu.frag)
 
@@ -44,20 +44,20 @@ Server side, you'll need:
 * PHP 5.4 or newer, a 64-bit version is strongly recommended
 * OpenSSL and its PHP module (this is usually installed automatically by most distros)
 * If you want to store test results (telemetry), one of the following:
-    - MySQL/MariaDB and the mysqli PHP module
+    - MySQL/MariaDB and its PHP PDO module
     - PostgreSQL and its PHP PDO module
     - SQLite 3 and its PHP PDO module
 * If you want to enable results sharing:
     - FreeType 2 and its PHP module (this is usually installed automatically by most distros)
 
-Let's install the speedtest.
+Let's install the speed test.
 
 Put all files on your web server via FTP or by copying them directly. You can install it in the root, or in a subdirectory.
 
-__Important:__ The speedtest needs write permissions in the installation folder!
+__Important:__ The speed test needs write permissions in the installation folder!
 
 #### ipinfo.io
-The speedtest uses [ipinfo.io](https://ipinfo.io) to detect ISP and distance from server. This is completely optional and can be disabled if you want (see Speedtest settings), but it is enabled by default, and if you expect more than ~500 tests per day, you will need to sign up to [ipinfo.io](https://ipinfo.io) and edit `backend/getIP_ipInfo_apikey.php` to set your access token.
+The speed test uses [ipinfo.io](https://ipinfo.io) to detect ISP and distance from server. This is completely optional and can be disabled if you want (see speed test settings), but it is enabled by default, and if you expect more than ~500 tests per day, you will need to sign up to [ipinfo.io](https://ipinfo.io) and edit `backend/getIP_ipInfo_apikey.php` to set your access token.
 
 IpInfo.io has kindly offered free access to their APIs for users of this project; if you're interested, contact me at [info@fdossena.com](mailto:info@fdossena.com) and provide a description of what you intend to do with the project, and you'll get the API key.
 
@@ -109,22 +109,21 @@ A basic front-end for visualizing and searching tests by ID is available in `res
 A login is required to access the interface. __Important__: change the default password in `results/telemetry_settings.php`.
 
 #### The end
-Now that the test is installed, rename one of the examples to `index.html` and delete the other examples.  
-The best starting point for most people is `example-singleServer-gauges.html`. If you want to use telemetry and results sharing, use `example-singleServer-full.html` instead.
+Now that the test is installed, the default page uses telemetry and results sharing. If you want another index page, rename one of the examples to `index.html` and delete the other examples. The best starting point for most people is `example-singleServer-gauges.html`.
 
 If you're not using telemetry and results sharing, you can delete the `results` folder too.
 
 Details about the examples and how to make custom UIs will be discussed later. If you don't want to make a custom UI, feel free to modify the example and replace "LibreSpeed Example" with the name of your test.
 
 #### Privacy
-Telemetry contains personal information (according to GDPR defintion), therefore it is important to treat this data respectfully of national and international laws, especially if you plan to offer the service in the European Union.
+Telemetry contains personal information (according to GDPR definition), therefore it is important to treat this data respectfully of national and international laws, especially if you plan to offer the service in the European Union.
 
-`example-singleServer-full.html` and `example-multipleServers-full.html` both contain a privacy policy for the service: you MUST read it, change it if necessary, and add your email address for data deletion requests. __Failure to comply with GDPR regulations can get you in serious trouble.__
+Default `index.html` and `example-multipleServers-full.html` both contain a privacy policy for the service: you MUST read it, change it if necessary, and add your email address for data deletion requests. __Failure to comply with GDPR regulations can get you in serious trouble.__
 
 ### Multiple servers, PHP
-The speedtest can automatically choose between multiple test points and use the one with the lowest ping in a list.
+The speed test can automatically choose between multiple test points and use the one with the lowest ping in a list.
 
-Note that this is an advanced use case and it is recommended that you already know how to use the speedtest with a single server.
+Note that this is an advanced use case and it is recommended that you already know how to use the speed test with a single server.
 
 We must distinguish 2 types of servers:
 * __Frontend server__: hosts the UI, the JS files, and optionally telemetry and results sharing stuff. You only need 1 of these, and this is the server that your clients will first connect to.
@@ -137,51 +136,51 @@ Requirements:
 * Apache 2 (nginx and IIS also supported). A fast connection is not mandatory, but is still recommended
 * PHP 5.4 or newer
 * If you want to store test results (telemetry), one of the following:
-    - MySQL/MariaDB and the mysqli PHP module
+    - MySQL/MariaDB and its PHP PDO module
     - PostgreSQL and its PHP PDO module
     - SQLite 3 and its PHP PDO module
 * If you want to enable results sharing:
     - FreeType 2 and its PHP module (this is usually installed automatically by most distros)
 
-To install the speedtest frontend, copy the following files to your web server:
+To install the speed test frontend, copy the following files to your web server:
 * `speedtest.js`
 * `speedtest_worker.js`
 * Optionally, the `results` folder
 * One of the `multipleServers` examples (the best starting points are `example-multipleServers-pretty.html` if you don't want to use telemetry and results sharing, `example-multipleServers-full.html` if you want to use them). Rename the example you choose to `index.html`
 
-__Important:__ The speedtest needs write permissions in the installation folder!
+__Important:__ The speed test needs write permissions in the installation folder!
 
 ##### Server list
 Edit `index.html`, you will see a list of servers:
 ```js
 var SPEEDTEST_SERVERS=[
 	{
-		name:"Speedtest Demo Server 1", //user friendly name for the server
-		server:"//mpotdemo.fdossena.com/", //URL to the server. // at the beginning will be replaced with http:// or https:// automatically
-		dlURL:"garbage.php",  //path to download test on this server (garbage.php or replacement)
-		ulURL:"empty.php",  //path to upload test on this server (empty.php or replacement)
-		pingURL:"empty.php",  //path to ping/jitter test on this server (empty.php or replacement)
-		getIpURL:"getIP.php"  //path to getIP on this server (getIP.php or replacement)
+		"name":"Speed test Demo Server 1", //user friendly name for the server
+		"server":"//mpotdemo.fdossena.com/", //URL to the server. // at the beginning will be replaced with http:// or https:// automatically
+		"dlURL":"garbage.php",  //path to download test on this server (garbage.php or replacement)
+		"ulURL":"empty.php",  //path to upload test on this server (empty.php or replacement)
+		"pingURL":"empty.php",  //path to ping/jitter test on this server (empty.php or replacement)
+		"getIpURL":"getIP.php"  //path to getIP on this server (getIP.php or replacement)
 	},
 	{
-		name:"Speedtest Demo Server 2",
-		server:"//mpotdemo2.fdossena.com/",
-		dlURL:"garbage.php",
-		ulURL:"empty.php",
-		pingURL:"empty.php",
-		getIpURL:"getIP.php"
+		"name":"Speed test Demo Server 2",
+		"server":"//mpotdemo2.fdossena.com/",
+		"dlURL":"garbage.php",
+		"ulURL":"empty.php",
+		"pingURL":"empty.php",
+		"getIpURL":"getIP.php"
 	}
 	//add other servers here, comma separated
 ];
 ```
 
 Replace the demo servers with your test points. Each server in the list is an object containing:
-* `name`: user friendly name for this test point
-* `server`: URL to the server. If your server only supports HTTP or HTTPS, put http:// or https:// at the beginning, respectively; if it supports both, put // at the beginning and it will be replaced automatically
-* `dlURL`: path to the download test on this server (garbage.php or replacement)
-* `ulURL`: path to the upload test on this server (empty.php or replacement)
-* `pingURL`: path to the ping test on this server (empty.php or replacement)
-* `getIpURL`: path to getIP on this server (getIP.php or replacement)
+* `"name"`: user friendly name for this test point
+* `"server"`: URL to the server. If your server only supports HTTP or HTTPS, put http:// or https:// at the beginning, respectively; if it supports both, put // at the beginning and it will be replaced automatically
+* `"dlURL"`: path to the download test on this server (garbage.php or replacement)
+* `"ulURL"`: path to the upload test on this server (empty.php or replacement)
+* `"pingURL"`: path to the ping test on this server (empty.php or replacement)
+* `"getIpURL"`: path to getIP on this server (getIP.php or replacement)
 
 None of these parameters can be omitted.
 
@@ -191,6 +190,23 @@ __Important__: For HTTPS, all your servers must have valid certificates or the b
 
 __Important__: Don't use my demo servers, they're slow!
 
+If your list of servers changes often, you might not want to have it hardcoded in the HTML file. LibreSpeed can load the server list from a JSON file. To do this, edit `index.html` and replace the list of servers with this:
+```js
+var SPEEDTEST_SERVERS="your URL here";
+```
+
+The URL doesn't need to be complete, it can just point to a file in the current directory. The URL should point to a JSON file with the same format used above:
+```js
+[
+    {
+        "name":...
+    },
+    ...
+]
+```
+
+__Important:__ The same origin policy applies to which URLs you can and cannot load with this method. If possible, it's best to just point it to a file on the current server.
+
 ##### Telemetry and results sharing
 Telemetry is stored on the frontend server. The setup procedure is the same as the single server version.
 
@@ -204,10 +220,10 @@ Requirements:
 
 To install a backend, simply copy all the files in the `backend` folder to your backend server.
 
-__Important:__ The speedtest needs write permissions in the installation folder!
+__Important:__ The speed test needs write permissions in the installation folder!
 
 #### ipinfo.io
-The speedtest uses [ipinfo.io](https://ipinfo.io) to detect ISP and distance from server. This is completely optional and can be disabled if you want (see Speedtest settings), but it is enabled by default, and if you expect more than ~500 tests per day, you will need to sign up to [ipinfo.io](https://ipinfo.io) and edit `getIP_ipInfo_apikey.php` to set your access token.
+The speed test uses [ipinfo.io](https://ipinfo.io) to detect ISP and distance from server. This is completely optional and can be disabled if you want (see speed test settings), but it is enabled by default, and if you expect more than ~500 tests per day, you will need to sign up to [ipinfo.io](https://ipinfo.io) and edit `getIP_ipInfo_apikey.php` to set your access token.
 
 IpInfo.io has kindly offered free access to their APIs for users of this project; if you're interested, contact me at [info@fdossena.com](mailto:info@fdossena.com) and provide a description of what you intend to do with the project, and you'll get the API key.
 
@@ -223,14 +239,14 @@ __Single server:__
 * `example-singleServer-customSettings.html`: Same as `example-singleServer-pretty.html` but configures the test so that it only performs download and upload tests, and with a fixed length instead of automatic
 * `example-singleServer-gauges.html`: The most sophisticated example, with the same functionality as `example-singleServer-pretty.html` but adds gauges. This is also a good starting point, but the gauges may slow down underpowered devices
 * `example-singleServer-chart.html`: Shows how to use the test with the Chart.js library
-* `example-singleServer-full.html`: The most complete example. Based on `example-singleServer-gauges.html`, also enables telemetry and results sharing
+* default `index.html`: The most complete example. Based on `example-singleServer-gauges.html`, also enables telemetry and results sharing
 
 __Multiple servers:__
 * `example-multipleServers-pretty.html`: Same as `example-singleServer-pretty.html` but with multiple test points. Server selection is fully automatic
-* `example-multipleServers-full.html`: Same as `example-singleServer-full.html` but with multiple test points. Server selection is automatic but the server can be changed afterwards by the user
+* `example-multipleServers-full.html`: Same as default `index.html` but with multiple test points. Server selection is automatic but the server can be changed afterwards by the user
 
 ### Initialization
-To use the speedtest in your page, first you need to load it:
+To use the speed test in your page, first you need to load it:
 ```xml
 <script type="text/javascript" src="speedtest.js"></script>
 ```
@@ -254,7 +270,7 @@ s.onend=function(aborted){
 }
 ```
 
-The `onupdate` event handler will be called periodically by the test with data coming from the speedtest worker thread. The `data` argument is an object containing the following:
+The `onupdate` event handler will be called periodically by the test with data coming from the speed test worker thread. The `data` argument is an object containing the following:
 * __testState__: an integer between -1 and 5
     * `-1` = Test not started yet
     * `0` = Test starting
@@ -290,7 +306,7 @@ The `onupdate` event handler will be called periodically by the test with data c
 The `onend` event handler will be called at the end of the test (`onupdate` will be called first), with a boolean telling you if the test was aborted (either manually or because of an error) or if it ended normally.
 
 ### Test parameters
-Before starting the test, you can change some of the settings from their default values. You might want to do this to better adapt the speedtest to a specific scenario, such as a satellite connection. To change a setting, use
+Before starting the test, you can change some of the settings from their default values. You might want to do this to better adapt the speed test to a specific scenario, such as a satellite connection. To change a setting, use
 ```js
 s.setParameter("parameter_name",value);
 ```
@@ -345,7 +361,7 @@ __Main parameters:__
     * __Important:__ On Firefox, it is better to run the upload test last
 * __getIp_ispInfo__: if true, the server will try to get ISP info and pass it along with the IP address. This will add `isp=true` to the request to `url_getIp`. getIP.php accomplishes this using ipinfo.io
     * Default: `true`
-* __getIp_ispInfo_distance__: if true, the server will try to get an estimate of the distance from the client to the speedtest server. This will add a `distance` argument to the request to `url_getIp`. `__getIp_ispInfo__` must be enabled in order for this to work. getIP.php accomplishes this using ipinfo.io
+* __getIp_ispInfo_distance__: if true, the server will try to get an estimate of the distance from the client to the speed test server. This will add a `distance` argument to the request to `url_getIp`. `__getIp_ispInfo__` must be enabled in order for this to work. getIP.php accomplishes this using ipinfo.io
     * `km`: estimate distance in kilometers
     * `mi`: estimate distance in miles
     * not set: do not measure distance
@@ -404,7 +420,7 @@ __Advanced parameters:__ (Seriously, don't change these unless you know what you
 ### Multiple Points of Test
 If you want to use more than one test server, this is the time to add all your test points and select the best one. Skip this part if you don't want to use this feature.
 
-The best way to do this is to declare an array with all your servers, and give it to the speedtest:
+The best way to do this is to declare an array with all your servers, and give it to the speed test:
 ```js
 var SPEEDTEST_SERVERS=[
 	server1,
@@ -442,7 +458,7 @@ s.selectServer(function(server){
     //do something
 })
 ```
-The `selectServer` function is asynchronous in order to avoid freeing the UI, and it will run a callback function when it is done choosing the server with the lowest ping.  
+The `selectServer` function is asynchronous in order to avoid freeing the UI, and it will run a callback function when it is done choosing the server with the lowest ping.
 The `server` argument is the selected server, and you can display it in the UI if you want. __You cannot start the test until the selection is done!__
 
 You can also set the test point manually (for instance, from a combobox in the UI):
@@ -466,15 +482,15 @@ s.abort();
 When the test is finished, you can run it again if you want, or you can just destroy `s`.
 
 ## Implementation details
-The purpose of this section is to help developers who want to make changes to the inner workings of the speedtest.  
+The purpose of this section is to help developers who want to make changes to the inner workings of the speed test.
 It will be divided into 4 sections: `speedtest.js`, `speedtest_worker.js`, the `backend` files and the `results` files.
 
 ### `speedtest.js`
-This is the main interface between your webpage and the speedtest.
-It hides the speedtest web worker to the page, and provides many convenient functions to control the test.
+This is the main interface between your webpage and the speed test.
+It hides the speed test web worker to the page, and provides many convenient functions to control the test.
 
 You can think of this as a finite state machine. These are the states (use getState() to see them):
-* __0__: here you can change the speedtest settings (such as test duration) with the `setParameter("parameter",value)` function. From here you can either start the test using `start()` (goes to state 3) or you can add multiple test points using `addTestPoint(server)` or `addTestPoints(serverList)` (goes to state 1). Additionally, this is the perfect moment to set up callbacks for the `onupdate(data)` and `onend(aborted)` events.
+* __0__: here you can change the speed test settings (such as test duration) with the `setParameter("parameter",value)` function. From here you can either start the test using `start()` (goes to state 3) or you can add multiple test points using `addTestPoint(server)` or `addTestPoints(serverList)` (goes to state 1). Additionally, this is the perfect moment to set up callbacks for the `onupdate(data)` and `onend(aborted)` events.
 * __1__: here you can add test points. You only need to do this if you want to use multiple test points.
     A server is defined as an object like this:
     ```
@@ -489,16 +505,16 @@ You can think of this as a finite state machine. These are the states (use getSt
     ```
     While in state 1, you can only add test points, you cannot change the test settings. When you're done, use selectServer(callback) to select the test point with the lowest ping. This is asynchronous, when it's done, it will call your callback function and move to state 2. Calling setSelectedServer(server) will manually select a server and move to state 2.
 * __2__: test point selected, ready to start the test. Use `start()` to begin, this will move to state 3
-* __3__: test running. Here, your `onupdate` event calback will be called periodically, with data coming from the worker about speed and progress. A data object will be passed to your `onupdate` function, with the following items:
-        - `dlStatus`: download speed in mbps
-        - `ulStatus`: upload speed in mbps
+* __3__: test running. Here, your `onupdate` event callback will be called periodically, with data coming from the worker about speed and progress. A data object will be passed to your `onupdate` function, with the following items:
+        - `dlStatus`: download speed in Mbit/s
+        - `ulStatus`: upload speed in Mbit/s
         - `pingStatus`: ping in ms
         - `jitterStatus`: jitter in ms
         - `dlProgress`: progress of the download test as a float 0-1
         - `ulProgress`: progress of the upload test as a float 0-1
         - `pingProgress`: progress of the ping/jitter test as a float 0-1
         - `testState`: state of the test (-1=not started, 0=starting, 1=download test, 2=ping+jitter test, 3=upload test, 4=finished, 5=aborted)
-        - `clientIp`: IP address of the client performing the test (and optionally ISP and distance) 
+        - `clientIp`: IP address of the client performing the test (and optionally ISP and distance)
     At the end of the test, the `onend` function will be called, with a boolean specifying whether the test was aborted or if it ended normally.
     The test can be aborted at any time with `abort()`.
     At the end of the test, it will move to state 4
@@ -514,7 +530,7 @@ Change one of the test settings from their defaults.
 - parameter: string with the name of the parameter that you want to set
 - value: new value for the parameter
 
-Invalid values or nonexistant parameters will be ignored by the speedtest worker.
+Invalid values or nonexistant parameters will be ignored by the speed test worker.
 
 ##### addTestPoint(server)
 Add a test point (multiple points of test)
@@ -530,11 +546,16 @@ Add a test point (multiple points of test)
     }
     ```
 
-Note that this will add `mpot`:`true` to the parameters sent to the speedtest worker.
+Note that this will add `mpot`:`true` to the parameters sent to the speed test worker.
 
 ##### addTestPoints(list)
 Same as addTestPoint, but you can pass an array of servers
 
+##### loadServerList(url,result)
+Loads a list of servers from a JSON file pointed by the `url`.
+
+The process is asynchronous and the `result` function will be called when it's done. If the request succeeded, an array containing the list of loaded servers will be passed to the function, otherwise `null` will be passed.
+
 ##### getSelectedServer()
 Returns the selected server (multiple points of test)
 
@@ -553,14 +574,14 @@ Starts the test.
 
 Note (multiple points of test): the selected server will be added to the `telemetry_extra` string. If this string was already set, then `telemetry_extra` will be a JSON string containing both the server and the original string
 
-During the test, the `onupdate(data)` callback function will be called periodically with data from the worker.  
+During the test, the `onupdate(data)` callback function will be called periodically with data from the worker.
 At the end of the test, the `onend(aborted)` function will be called with a boolean telling you if the test was aborted or if it ended normally.
 
 ##### abort()
 Aborts the test while it's running.
 
 ### `speedtest_worker.js`
-This is where the actual speedtest code is. It receives the settings from the main thread, runs the test, and reports back the results.
+This is where the actual speed test code is. It receives the settings from the main thread, runs the test, and reports back the results.
 
 The worker accepts 3 commands:
 * `start`: starts the test. Optionally, test settings can be passed as a JSON string after the word start and a space
@@ -642,7 +663,7 @@ Access-Control-Allow-Headers: Content-Encoding, Content-Type
 This file stores telemetry information into the database.
 
 Data is passed as POST parameters:
-* `ispinfo`: ISP info (if enabled, empty strng otherwise)
+* `ispinfo`: ISP info (if enabled, empty string otherwise)
 * `extra`: the `telemetry_extra` string passed to the worker (if set, empty string otherwise)
 * `dl`: download speed
 * `ul`: upload speed
@@ -667,11 +688,11 @@ See the code for the implementation details, it's basically a bunch of bitwise o
 Simple UI to display and search test results. Not required to run the test.
 
 ## Alternative backends
-If for some reason you can't or don't want to use PHP, the speedtest can run with other backends, or even no backend (with limited functionality).
+If for some reason you can't or don't want to use PHP, the speed test can run with other backends, or even no backend (with limited functionality).
 
 You will need replacements for `backend/garbage.php` and `backend/empty.php` and optionally `backend/getIP.php`, and the test needs to know where to find them:
 ```js
-//Speedtest initialization
+//Speed test initialization
 var s=new Speedtest();
 ...
 //Custom backend
@@ -703,7 +724,7 @@ Your replacement can simply respond with the client's IP as plaintext or do some
 If you want to make your own backend, see the section on the implementation details of `getIP.php`.
 
 ### No backend
-The speedtest can run, albeit with limited functionality, using only a web server as backend, with no PHP or other server-side scripting.
+The speed test can run, albeit with limited functionality, using only a web server as backend, with no PHP or other server-side scripting.
 
 You will be able to run the download and upload test, but no IP, ISP and distance detection, no telemetry and results sharing, and only a single point of test.
 
@@ -719,14 +740,14 @@ s.setParameter("url_ping","backend/empty.dat");
 s.setParameter("test_order","P_D_U");
 ```
 
-This will point to our static files and set the test to only do ping/jitter, download and uplod tests.
+This will point to our static files and set the test to only do ping/jitter, download and upload tests.
 
 ## Troubleshooting
 These are the most common issues reported by users, and how to fix them. If you still need help, contact me at [info@fdossena.com](mailto:info@fdossena.com).
 
 #### Download test gives very low result
-Are garbage.php and empty.php (or your replacements) reachable?  
-Press F12, select network and start the test. Do you see errors? (cancelled requests are not errors)  
+Are garbage.php and empty.php (or your replacements) reachable?
+Press F12, select network and start the test. Do you see errors? (cancelled requests are not errors)
 If a small download starts, open it in a text editor. Does it say it's missing openssl_random_pseudo_bytes()? In this case, install OpenSSL (this is usually included when you install Apache and PHP on most distros).
 
 #### Upload test is inaccurate, and/or I see lag spikes
@@ -742,15 +763,15 @@ You're running the test on localhost, therefore it is trying to measure the spee
 Make sure your server is sending the `Connection:keep-alive` header
 
 #### The server is behind a load balancer, proxy, etc. and I get the wrong IP address
-Edit getIP.php and replace lines 14-23 with what is more appropriate in your scenario.  
+Edit getIP.php and replace lines 14-23 with what is more appropriate in your scenario.
 Example: `$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];`
 
 #### The results sharing just generates a blank image
-If the image doesn't display and the browser displays a broken image icon, FreeType2 is not installed or configured properly.  
+If the image doesn't display and the browser displays a broken image icon, FreeType2 is not installed or configured properly.
 If the image is blank, this usually happens because PHP can't find the font files inside the `results` folder. You can fix your PHP config or edit `results/index.php` and use absolute paths for the fonts. This is a [known issue with PHP](http://php.net/manual/en/function.imagefttext.php) and no real solution is known.
 
 #### My server is behind Cloudflare and I can't reach full speed on some of the tests
-This is not a speedtest related issue, as it can be replicated in virtually any HTTP file upload/download.  
+This is not a speed test related issue, as it can be replicated in virtually any HTTP file upload/download.
 Go to your domain's DNS settings and change "DNS and HTTP proxy (CDN)" to "DNS only", and wait for the settings to be applied (can take a few minutes).
 
 #### On Windows Server, using IIS, the upload test doesn't work, CORS errors are visible in the console
@@ -759,36 +780,36 @@ This is a configuration issue. Make a file called web.config in wwwroot and adap
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
   <system.webServer>
-    <cors enabled="true" failUnlistedOrigins="false"> 
-      <add origin="*"> 
+    <cors enabled="true" failUnlistedOrigins="false">
+      <add origin="*">
         <allowHeaders allowAllRequestedHeaders="true" />
-        <allowMethods> 
-          <add method="GET" /> 
-          <add method="POST" /> 
-          <add method="PUT" /> 
-          <add method="DELETE" /> 
-          <add method="OPTIONS" /> 
-        </allowMethods> 
+        <allowMethods>
+          <add method="GET" />
+          <add method="POST" />
+          <add method="PUT" />
+          <add method="DELETE" />
+          <add method="OPTIONS" />
+        </allowMethods>
         <exposeHeaders>
-        </exposeHeaders> 
+        </exposeHeaders>
       </add>
-    </cors> 
-  </system.webServer> 
+    </cors>
+  </system.webServer>
 </configuration>
 ```
 
 #### ID obfuscation doesn't work (incorrect output, blank results image)
-ID obfuscation only works on 64-bit PHP (requires PHP_INT_SIZE to be 8).  
+ID obfuscation only works on 64-bit PHP (requires PHP_INT_SIZE to be 8).
 Note that older versions of PHP 5 on Windows use PHP_INT_SIZE of 4, even if they're 64 bit. If you're in this situation, update your PHP install.
 
 Also, make sure that the web server has write permission on the `results` folder.
 
 ## Known bugs and limitations
 ### General
-* The ping/jitter test is measured by seeing how long it takes for an empty XHR to complete. It is not an acutal ICMP ping. Different browsers may also show different results, especially on very fast connections on slow devices.
+* The ping/jitter test is measured by seeing how long it takes for an empty XHR to complete. It is not an actual ICMP ping. Different browsers may also show different results, especially on very fast connections on slow devices.
 ### IE specific
 * The upload test is not precise on very fast connections with high latency (will probably be fixed by Edge 17)
-* On IE11, a same origin policy error is erroneously triggered under unknown conditions. Seems to be related to running the test from unusual URLs like a top level domain (for instance http://abc/speedtest). These are bugs in IE11's implementation of the same origin policy, not in the speedtest itself.
+* On IE11, a same origin policy error is erroneously triggered under unknown conditions. Seems to be related to running the test from unusual URLs like a top level domain (for instance http://abc/speedtest). These are bugs in IE11's implementation of the same origin policy, not in the speed test itself.
 * On IE11, under unknown circumstances, on some systems the test can only be run once, after which speedtest_worker.js will not be loaded by IE until the browser is restarted. This is a rare bug in IE11.
 ### Firefox specific
 * On some Linux systems with hardware acceleration turned off, the page rendering makes the browser lag, reducing the accuracy of the ping/jitter test, and potentially even the download and upload tests on very fast connections.
@@ -796,7 +817,7 @@ Also, make sure that the web server has write permission on the `results` folder
 ## Contributing
 Since this is an open source project, you can modify it.
 
-If you made some changes that you think should make it into the main project, send a Pull Request on GitHub, or contact me at [info@fdossena.com](mailto:info@fdossena.com).  
+If you made some changes that you think should make it into the main project, send a Pull Request on GitHub, or contact me at [info@fdossena.com](mailto:info@fdossena.com).
 We don't require you to use a specific coding convention, write the code however you want and we'll change the formatting if necessary.
 
 Donations are also appreciated: you can donate with [PayPal](https://www.paypal.me/sineisochronic) or [Liberapay](https://liberapay.com/fdossena/donate).

doc_docker.md

@@ -0,0 +1,148 @@
+A docker version of LibreSpeed is available here: [GitHub Packages](https://github.com/librespeed/speedtest/pkgs/container/speedtest)
+
+## Downloading docker image
+To download LibreSpeed from the docker repo, use this command:
+
+```
+docker pull ghcr.io/librespeed/speedtest
+```
+
+You will now have a new docker image called `librespeed/speedtest`.
+
+
+## Docker Compose
+To start the container using [docker compose](https://docs.docker.com/compose/) the following configuration can be used:
+
+```yml
+version: '3.7'
+services:
+  speedtest:
+    container_name: speedtest
+    image: ghcr.io/librespeed/speedtest:latest
+    restart: always
+    environment:
+      MODE: standalone
+      #TITLE: "LibreSpeed"
+      #TELEMETRY: "false"
+      #ENABLE_ID_OBFUSCATION: "false"
+      #REDACT_IP_ADDRESSES: "false"
+      #PASSWORD:
+      #EMAIL:
+      #DISABLE_IPINFO: "false"
+      #DISTANCE: "km"
+      #WEBPORT: 80
+    ports:
+      - "80:80" # webport mapping (host:container)
+```
+
+Please adjust the environment variables according to the intended operating mode.
+
+## Standalone mode
+If you want to install LibreSpeed on a single server, you need to configure it in standalone mode. To do this, set the `MODE` environment variable to `standalone`.
+
+The test can be accessed on port 80.
+
+Here's a list of additional environment variables available in this mode:
+* __`TITLE`__: Title of your speed test. Default value: `LibreSpeed`
+* __`TELEMETRY`__: Whether to enable telemetry or not. If enabled, you maybe want your data to be persisted. See below. Default value: `false`
+* __`ENABLE_ID_OBFUSCATION`__: When set to true with telemetry enabled, test IDs are obfuscated, to avoid exposing the database internal sequential IDs. Default value: `false`
+* __`REDACT_IP_ADDRESSES`__: When set to true with telemetry enabled, IP addresses and hostnames are redacted from the collected telemetry, for better privacy. Default value: `false`
+* __`PASSWORD`__: Password to access the stats page. If not set, stats page will not allow accesses.
+* __`EMAIL`__: Email address for GDPR requests. Must be specified when telemetry is enabled.
+* __`IPINFO_APIKEY`__: API key for ipinfo.io. Optional, but required if you expect to serve a large number of tests
+* __`DISABLE_IPINFO`__: If set to true, ISP info and distance will not be fetched from ipinfo.io. Default: value: `false`
+* __`DISTANCE`__: When `DISABLE_IPINFO` is set to false, this specifies how the distance from the server is measured. Can be either `km` for kilometers, `mi` for miles, or an empty string to disable distance measurement. Default value: `km`
+* __`WEBPORT`__: Allows choosing a custom port for the included web server. Default value: `80`. Note that you will have to expose it through docker with the -p argument
+
+If telemetry is enabled, a stats page will be available at `http://your.server/results/stats.php`, but a password must be specified.
+
+### Persist sqlite database
+
+Default DB driver is sqlite. The DB file is written to `/database/db.sql`.
+
+So if you want your data to be persisted over image updates, you have to mount a volume with `-v $PWD/db-dir:/database`.
+
+
+###### Example
+This command starts LibreSpeed in standalone mode, with the default settings, on port 80:
+
+```
+docker run -e MODE=standalone -p 80:80 -it ghcr.io/librespeed/speedtest
+```
+
+This command starts LibreSpeed in standalone mode, with telemetry, ID obfuscation and a stats password, on port 86:
+
+```
+docker run -e MODE=standalone -e TELEMETRY=true -e ENABLE_ID_OBFUSCATION=true -e PASSWORD="yourPasswordHere" -e WEBPORT=86 -p 86:86 -v $PWD/db-dir/:/database -it ghcr.io/librespeed/speedtest
+```
+
+## Multiple Points of Test
+For multiple servers, you need to set up 1+ LibreSpeed backends, and 1 LibreSpeed frontend.
+
+### Backend mode
+In backend mode, LibreSpeed provides only a test point with no UI. To do this, set the `MODE` environment variable to `backend`.
+
+The following backend files can be accessed on port 80: `garbage.php`, `empty.php`, `getIP.php`
+
+Here's a list of additional environment variables available in this mode:
+* __`IPINFO_APIKEY`__: API key for ipinfo.io. Optional, but required if you expect to serve a large number of tests
+
+###### Example:
+This command starts LibreSpeed in backend mode, with the default settings, on port 80:
+```
+docker run -e MODE=backend -p 80:80 -it ghcr.io/librespeed/speedtest
+```
+
+### Frontend mode
+In frontend mode, LibreSpeed serves clients the Web UI and a list of servers. To do this:
+* Set the `MODE` environment variable to `frontend`
+* Create a servers.json file with your test points. The syntax is the following:
+    ```
+    [
+        {
+            "name": "Friendly name for Server 1",
+            "server" :"//server1.mydomain.com/",
+            "dlURL" :"garbage.php",
+            "ulURL" :"empty.php",
+            "pingURL" :"empty.php",
+            "getIpURL" :"getIP.php"
+        },
+        {
+            "name": "Friendly name for Server 2",
+            "server" :"https://server2.mydomain.com/",
+            "dlURL" :"garbage.php",
+            "ulURL" :"empty.php",
+            "pingURL" :"empty.php",
+            "getIpURL" :"getIP.php"
+        },
+        ...more servers...
+    ]
+    ```
+    Note: if a server only supports HTTP or HTTPS, specify the protocol in the server field. If it supports both, just use `//`.
+* Mount this file to `/servers.json` in the container (example at the end of this file)
+
+The test can be accessed on port 80.
+
+Here's a list of additional environment variables available in this mode:
+* __`TITLE`__: Title of your speedtest. Default value: `LibreSpeed`
+* __`TELEMETRY`__: Whether to enable telemetry or not. Default value: `false`
+* __`ENABLE_ID_OBFUSCATION`__: When set to true with telemetry enabled, test IDs are obfuscated, to avoid exposing the database internal sequential IDs. Default value: `false`
+* __`REDACT_IP_ADDRESSES`__: When set to true with telemetry enabled, IP addresses and hostnames are redacted from the collected telemetry, for better privacy. Default value: `false`
+* __`PASSWORD`__: Password to access the stats page. If not set, stats page will not allow accesses.
+* __`EMAIL`__: Email address for GDPR requests. Must be specified when telemetry is enabled.
+* __`DISABLE_IPINFO`__: If set to true, ISP info and distance will not be fetched from ipinfo.io. Default: value: `false`
+* __`DISTANCE`__: When `DISABLE_IPINFO` is set to false, this specifies how the distance from the server is measured. Can be either `km` for kilometers, `mi` for miles, or an empty string to disable distance measurement. Default value: `km`
+* __`WEBPORT`__: Allows choosing a custom port for the included web server. Default value: `80`
+
+###### Example
+This command starts LibreSpeed in frontend mode, with a given `servers.json` file, and with telemetry, ID obfuscation, and a stats password:
+```
+docker run -e MODE=frontend -e TELEMETRY=true -e ENABLE_ID_OBFUSCATION=true -e PASSWORD="yourPasswordHere" -v $(pwd)/servers.json:/servers.json -p 80:80 -it ghcr.io/librespeed/speedtest
+```
+
+### Dual mode
+In dual mode, LibreSpeed operates as a standalone server that can also connect to other test points.
+To do this:
+* Set the `MODE` environment variable to `dual`
+* Follow the `servers.json` instructions for the frontend mode
+* The first server entry should be the local server, using the server endpoint address that a client can access.

docker/entrypoint.sh

@@ -0,0 +1,91 @@
+#!/bin/bash
+
+set -e
+set -x
+
+# Cleanup
+rm -rf /var/www/html/*
+
+# Copy frontend files
+cp /speedtest/*.js /var/www/html/
+
+# Copy favicon
+cp /speedtest/favicon.ico /var/www/html/
+
+# Set up backend side for standlone modes
+if [[ "$MODE" == "standalone" || "$MODE" == "dual" ]]; then
+  cp -r /speedtest/backend/ /var/www/html/backend
+  if [ ! -z "$IPINFO_APIKEY" ]; then
+    sed -i s/\$IPINFO_APIKEY\ =\ \'\'/\$IPINFO_APIKEY\ =\ \'$IPINFO_APIKEY\'/g /var/www/html/backend/getIP_ipInfo_apikey.php
+  fi
+fi
+
+if [ "$MODE" == "backend" ]; then
+  cp -r /speedtest/backend/* /var/www/html
+  if [ ! -z "$IPINFO_APIKEY" ]; then
+    sed -i s/\$IPINFO_APIKEY\ =\ \'\'/\$IPINFO_APIKEY\ =\ \'$IPINFO_APIKEY\'/g /var/www/html/getIP_ipInfo_apikey.php
+  fi
+fi
+
+# Set up index.php for frontend-only or standalone modes
+if [[ "$MODE" == "frontend" || "$MODE" == "dual" ]]; then
+  cp /speedtest/frontend.php /var/www/html/index.php
+elif [ "$MODE" == "standalone" ]; then
+  cp /speedtest/standalone.php /var/www/html/index.php
+fi
+
+# Apply Telemetry settings when running in standalone or frontend mode and telemetry is enabled
+if [[ "$TELEMETRY" == "true" && ( "$MODE" == "frontend" || "$MODE" == "standalone" || "$MODE" == "dual" ) ]]; then
+  cp -r /speedtest/results /var/www/html/results
+
+  if [ "$MODE" == "frontend" ]; then
+    mkdir /var/www/html/backend
+    cp /speedtest/backend/getIP_util.php /var/www/html/backend
+  fi
+
+  if  [ "$DB_TYPE" == "mysql" ]; then
+    sed -i 's/$db_type = '\''.*'\''/$db_type = '\'$DB_TYPE\''/g' /var/www/html/results/telemetry_settings.php
+    sed -i 's/$MySql_username = '\''.*'\''/$MySql_username = '\'$DB_USERNAME\''/g' /var/www/html/results/telemetry_settings.php
+    sed -i 's/$MySql_password = '\''.*'\''/$MySql_password = '\'$DB_PASSWORD\''/g' /var/www/html/results/telemetry_settings.php
+    sed -i 's/$MySql_hostname = '\''.*'\''/$MySql_hostname = '\'$DB_HOSTNAME\''/g' /var/www/html/results/telemetry_settings.php
+    sed -i 's/$MySql_databasename = '\''.*'\''/$MySql_databasename = '\'$DB_NAME\''/g' /var/www/html/results/telemetry_settings.php
+    if  [ "$DB_PORT" != "" ]; then
+      sed -i 's/$MySql_port = '\''.*'\''/$MySql_port = '\'$DB_PORT\''/g' /var/www/html/results/telemetry_settings.php
+    fi
+  elif  [ "$DB_TYPE" == "postgresql" ]; then
+    sed -i 's/$db_type = '\''.*'\''/$db_type = '\'$DB_TYPE\''/g' /var/www/html/results/telemetry_settings.php
+    sed -i 's/$PostgreSql_username = '\''.*'\''/$PostgreSql_username = '\'$DB_USERNAME\''/g' /var/www/html/results/telemetry_settings.php
+    sed -i 's/$PostgreSql_password = '\''.*'\''/$PostgreSql_password = '\'$DB_PASSWORD\''/g' /var/www/html/results/telemetry_settings.php
+    sed -i 's/$PostgreSql_hostname = '\''.*'\''/$PostgreSql_hostname = '\'$DB_HOSTNAME\''/g' /var/www/html/results/telemetry_settings.php
+    sed -i 's/$PostgreSql_databasename = '\''.*'\''/$PostgreSql_databasename = '\'$DB_NAME\''/g' /var/www/html/results/telemetry_settings.php
+  else
+    sed -i s/\$db_type\ =\ \'.*\'/\$db_type\ =\ \'sqlite\'\/g /var/www/html/results/telemetry_settings.php
+  fi
+
+  sed -i s/\$Sqlite_db_file\ =\ \'.*\'/\$Sqlite_db_file=\'\\\/database\\\/db.sql\'/g /var/www/html/results/telemetry_settings.php
+  sed -i s/\$stats_password\ =\ \'.*\'/\$stats_password\ =\ \'$PASSWORD\'/g /var/www/html/results/telemetry_settings.php
+
+  if [ "$ENABLE_ID_OBFUSCATION" == "true" ]; then
+    sed -i s/\$enable_id_obfuscation\ =\ .*\;/\$enable_id_obfuscation\ =\ true\;/g /var/www/html/results/telemetry_settings.php
+  fi
+
+  if [ "$REDACT_IP_ADDRESSES" == "true" ]; then
+    sed -i s/\$redact_ip_addresses\ =\ .*\;/\$redact_ip_addresses\ =\ true\;/g /var/www/html/results/telemetry_settings.php
+  fi
+
+  mkdir -p /database/
+  chown www-data /database/
+fi
+
+chown -R www-data /var/www/html/*
+
+# Allow selection of Apache port for network_mode: host
+if [ "$WEBPORT" != "80" ]; then
+  sed -i "s/^Listen 80\$/Listen $WEBPORT/g" /etc/apache2/ports.conf
+  sed -i "s/*:80>/*:$WEBPORT>/g" /etc/apache2/sites-available/000-default.conf
+fi
+
+echo "Done, Starting APACHE"
+
+# This runs apache
+apache2-foreground

docker/frontend.php

@@ -3,58 +3,69 @@
 <head>
 <link rel="shortcut icon" href="favicon.ico">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no" />
+<link rel="apple-touch-icon" href="favicon.ico">
+<meta name="apple-mobile-web-app-capable" content="yes">
 <meta charset="UTF-8" />
 <script type="text/javascript" src="speedtest.js"></script>
 <script type="text/javascript">
 function I(i){return document.getElementById(i);}
 
 //LIST OF TEST SERVERS. See documentation for details if needed
-var SPEEDTEST_SERVERS=[
-	{	//this is my demo server, remove it
-		name:"Speedtest Demo Server (Helsinki)", //user friendly name for the server
-		server:"//fi.openspeed.org/", //URL to the server. // at the beginning will be replaced with http:// or https:// automatically
-		dlURL:"garbage.php",  //path to download test on this server (garbage.php or replacement)
-		ulURL:"empty.php",  //path to upload test on this server (empty.php or replacement)
-		pingURL:"empty.php",  //path to ping/jitter test on this server (empty.php or replacement)
-		getIpURL:"getIP.php"  //path to getIP on this server (getIP.php or replacement)
-	},
-	{	//this is my demo server, remove it
-		name:"Old Speedtest Demo Server",
-		server:"//mpotdemo.fdossena.com/",
-		dlURL:"garbage.php",
-		ulURL:"empty.php",
-		pingURL:"empty.php",
-		getIpURL:"getIP.php"
-	}
-	//add other servers here, comma separated
-];
+var SPEEDTEST_SERVERS= <?= file_get_contents('/servers.json') ?: '[]' ?>;
 
-//INITIALIZE SPEEDTEST
-var s=new Speedtest(); //create speedtest object
-s.setParameter("telemetry_level","basic"); //enable telemetry
-s.addTestPoints(SPEEDTEST_SERVERS); //add list of servers
+//INITIALIZE SPEED TEST
+var s=new Speedtest(); //create speed test object
+<?php if(getenv("TELEMETRY")=="true"){ ?>
+s.setParameter("telemetry_level","basic");
+<?php } ?>
+<?php if(getenv("DISABLE_IPINFO")=="true"){ ?>
+s.setParameter("getIp_ispInfo",false);
+<?php } ?>
+<?php if(getenv("DISTANCE")){ ?>
+s.setParameter("getIp_ispInfo_distance","<?=getenv("DISTANCE") ?>");
+<?php } ?>
 
 //SERVER AUTO SELECTION
 function initServers(){
-	s.selectServer(function(server){
-		if(server!=null){ //at least 1 server is available
-			I("loading").className="hidden"; //hide loading message
-			//populate server list for manual selection
-			for(var i=0;i<SPEEDTEST_SERVERS.length;i++){
-				if(SPEEDTEST_SERVERS[i].pingT==-1) continue;
-				var option=document.createElement("option");
-				option.value=i;
-				option.textContent=SPEEDTEST_SERVERS[i].name;
-				if(SPEEDTEST_SERVERS[i]===server) option.selected=true;
-				I("server").appendChild(option);
-			}
-			//show test UI
-			I("testWrapper").className="visible";
-			initUI();
-		}else{ //no servers are available, the test cannot proceed
-			I("message").innerHTML="No servers available";
-		}
-	});
+    var noServersAvailable=function(){
+        I("message").innerHTML="No servers available";
+    }
+    var runServerSelect=function(){
+        s.selectServer(function(server){
+            if(server!=null){ //at least 1 server is available
+                I("loading").className="hidden"; //hide loading message
+                //populate server list for manual selection
+                for(var i=0;i<SPEEDTEST_SERVERS.length;i++){
+                    if(SPEEDTEST_SERVERS[i].pingT==-1) continue;
+                    var option=document.createElement("option");
+                    option.value=i;
+                    option.textContent=SPEEDTEST_SERVERS[i].name;
+                    if(SPEEDTEST_SERVERS[i]===server) option.selected=true;
+                    I("server").appendChild(option);
+                }
+                //show test UI
+                I("testWrapper").className="visible";
+                initUI();
+            }else{ //no servers are available, the test cannot proceed
+                noServersAvailable();
+            }
+        });
+    }
+    if(typeof SPEEDTEST_SERVERS === "string"){
+        //need to fetch list of servers from specified URL
+        s.loadServerList(SPEEDTEST_SERVERS,function(servers){
+            if(servers==null){ //failed to load server list
+                noServersAvailable();
+            }else{ //server list loaded
+                SPEEDTEST_SERVERS=servers;
+                runServerSelect();
+            }
+        });
+    }else{
+        //hardcoded server list
+        s.addTestPoints(SPEEDTEST_SERVERS);
+        runServerSelect();
+    }
 }
 
 var meterBk=/Trident.*rv:(\d+\.\d+)/i.test(navigator.userAgent)?"#EAEAEA":"#80808040";
@@ -103,7 +114,7 @@ function format(d){
 var uiData=null;
 function startStop(){
     if(s.getState()==3){
-		//speedtest is running, abort
+		//speed test is running, abort
 		s.abort();
 		data=null;
 		I("startStopBtn").className="";
@@ -367,16 +378,18 @@ function initUI(){
 		}
 	}
 </style>
-<title>LibreSpeed Example</title>
+<title><?= getenv('TITLE') ?: 'LibreSpeed Example' ?></title>
 </head>
 <body onload="initServers()">
-<h1>LibreSpeed Example</h1>
+<h1><?= getenv('TITLE') ?: 'LibreSpeed Example' ?></h1>
 <div id="loading" class="visible">
 	<p id="message"><span class="loadCircle"></span>Selecting a server...</p>
 </div>
 <div id="testWrapper" class="hidden">
 	<div id="startStopBtn" onclick="startStop()"></div>
-	<a class="privacy" href="#" onclick="I('privacyPolicy').style.display=''">Privacy</a>
+	<?php if(getenv("TELEMETRY")=="true"){ ?>
+        <a class="privacy" href="#" onclick="I('privacyPolicy').style.display=''">Privacy</a>
+	<?php } ?>
 	<div id="serverArea">
 		Server: <select id="server" onchange="s.setSelectedServer(SPEEDTEST_SERVERS[this.value])"></select>
 	</div>
@@ -398,13 +411,13 @@ function initUI(){
 				<div class="testName">Download</div>
 				<canvas id="dlMeter" class="meter"></canvas>
 				<div id="dlText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 			<div class="testArea">
 				<div class="testName">Upload</div>
 				<canvas id="ulMeter" class="meter"></canvas>
 				<div id="ulText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 		</div>
 		<div id="ipArea">
@@ -421,7 +434,7 @@ function initUI(){
 </div>
 <div id="privacyPolicy" style="display:none">
     <h2>Privacy Policy</h2>
-    <p>This HTML5 Speedtest server is configured with telemetry enabled.</p>
+    <p>This HTML5 speed test server is configured with telemetry enabled.</p>
     <h4>What data we collect</h4>
     <p>
         At the end of the test, the following data is collected and stored:
@@ -452,7 +465,7 @@ function initUI(){
     <h4>Data removal</h4>
     <p>
         If you want to have your information deleted, you need to provide either the ID of the test or your IP address. This is the only way to identify your data, without this information we won't be able to comply with your request.<br/><br/>
-        Contact this email address for all deletion requests: <a href="mailto:PUT@YOUR_EMAIL.HERE">TO BE FILLED BY DEVELOPER</a>.
+        Contact this email address for all deletion requests: <a href="mailto:<?=getenv("EMAIL") ?>"><?=getenv("EMAIL") ?></a>.
     </p>
     <br/><br/>
     <a class="privacy" href="#" onclick="I('privacyPolicy').style.display='none'">Close</a><br/>

docker/servers.json

@@ -0,0 +1,19 @@
+
+[
+	{
+		"name": "Example server 1 (HTTP and HTTPS)",
+		"server" :"//example1.mydomain.com/",
+		"dlURL" :"garbage.php",
+		"ulURL" :"empty.php",
+		"pingURL" :"empty.php",
+		"getIpURL" :"getIP.php"
+	},
+	{
+		"name": "Example server 2 (HTTPS only)",
+		"server" :"https://example2.mydomain.com/",
+		"dlURL" :"garbage.php",
+		"ulURL" :"empty.php",
+		"pingURL" :"empty.php",
+		"getIpURL" :"getIP.php"
+	}
+]

docker/standalone.php

@@ -0,0 +1,367 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no" />
+<link rel="apple-touch-icon" href="favicon.ico">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta charset="UTF-8" />
+<link rel="shortcut icon" href="favicon.ico">
+<script type="text/javascript" src="speedtest.js"></script>
+<script type="text/javascript">
+function I(i){return document.getElementById(i);}
+//INITIALIZE SPEED TEST
+var s=new Speedtest(); //create speed test object
+<?php if(getenv("TELEMETRY")=="true"){ ?>
+s.setParameter("telemetry_level","basic");
+<?php } ?>
+<?php if(getenv("DISABLE_IPINFO")=="true"){ ?>
+s.setParameter("getIp_ispInfo",false);
+<?php } ?>
+<?php if(getenv("DISTANCE")){ ?>
+s.setParameter("getIp_ispInfo_distance","<?=getenv("DISTANCE") ?>");
+<?php } ?>
+
+var meterBk=/Trident.*rv:(\d+\.\d+)/i.test(navigator.userAgent)?"#EAEAEA":"#80808040";
+var dlColor="#6060AA",
+	ulColor="#616161";
+var progColor=meterBk;
+
+//CODE FOR GAUGES
+function drawMeter(c,amount,bk,fg,progress,prog){
+	var ctx=c.getContext("2d");
+	var dp=window.devicePixelRatio||1;
+	var cw=c.clientWidth*dp, ch=c.clientHeight*dp;
+	var sizScale=ch*0.0055;
+	if(c.width==cw&&c.height==ch){
+		ctx.clearRect(0,0,cw,ch);
+	}else{
+		c.width=cw;
+		c.height=ch;
+	}
+	ctx.beginPath();
+	ctx.strokeStyle=bk;
+	ctx.lineWidth=12*sizScale;
+	ctx.arc(c.width/2,c.height-58*sizScale,c.height/1.8-ctx.lineWidth,-Math.PI*1.1,Math.PI*0.1);
+	ctx.stroke();
+	ctx.beginPath();
+	ctx.strokeStyle=fg;
+	ctx.lineWidth=12*sizScale;
+	ctx.arc(c.width/2,c.height-58*sizScale,c.height/1.8-ctx.lineWidth,-Math.PI*1.1,amount*Math.PI*1.2-Math.PI*1.1);
+	ctx.stroke();
+	if(typeof progress !== "undefined"){
+		ctx.fillStyle=prog;
+		ctx.fillRect(c.width*0.3,c.height-16*sizScale,c.width*0.4*progress,4*sizScale);
+	}
+}
+function mbpsToAmount(s){
+	return 1-(1/(Math.pow(1.3,Math.sqrt(s))));
+}
+function format(d){
+    d=Number(d);
+    if(d<10) return d.toFixed(2);
+    if(d<100) return d.toFixed(1);
+    return d.toFixed(0);
+}
+
+//UI CODE
+var uiData=null;
+function startStop(){
+    if(s.getState()==3){
+		//speed test is running, abort
+		s.abort();
+		data=null;
+		I("startStopBtn").className="";
+		initUI();
+	}else{
+		//test is not running, begin
+		I("startStopBtn").className="running";
+		I("shareArea").style.display="none";
+		s.onupdate=function(data){
+            uiData=data;
+		};
+		s.onend=function(aborted){
+            I("startStopBtn").className="";
+            updateUI(true);
+            if(!aborted){
+                //if testId is present, show sharing panel, otherwise do nothing
+                try{
+                    var testId=uiData.testId;
+                    if(testId!=null){
+                        var shareURL=window.location.href.substring(0,window.location.href.lastIndexOf("/"))+"/results/?id="+testId;
+                        I("resultsImg").src=shareURL;
+                        I("resultsURL").value=shareURL;
+                        I("testId").innerHTML=testId;
+                        I("shareArea").style.display="";
+                    }
+                }catch(e){}
+            }
+		};
+		s.start();
+	}
+}
+//this function reads the data sent back by the test and updates the UI
+function updateUI(forced){
+	if(!forced&&s.getState()!=3) return;
+	if(uiData==null) return;
+	var status=uiData.testState;
+	I("ip").textContent=uiData.clientIp;
+	I("dlText").textContent=(status==1&&uiData.dlStatus==0)?"...":format(uiData.dlStatus);
+	drawMeter(I("dlMeter"),mbpsToAmount(Number(uiData.dlStatus*(status==1?oscillate():1))),meterBk,dlColor,Number(uiData.dlProgress),progColor);
+	I("ulText").textContent=(status==3&&uiData.ulStatus==0)?"...":format(uiData.ulStatus);
+	drawMeter(I("ulMeter"),mbpsToAmount(Number(uiData.ulStatus*(status==3?oscillate():1))),meterBk,ulColor,Number(uiData.ulProgress),progColor);
+	I("pingText").textContent=format(uiData.pingStatus);
+	I("jitText").textContent=format(uiData.jitterStatus);
+}
+function oscillate(){
+	return 1+0.02*Math.sin(Date.now()/100);
+}
+//update the UI every frame
+window.requestAnimationFrame=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.msRequestAnimationFrame||(function(callback,element){setTimeout(callback,1000/60);});
+function frame(){
+	requestAnimationFrame(frame);
+	updateUI();
+}
+frame(); //start frame loop
+//function to (re)initialize UI
+function initUI(){
+	drawMeter(I("dlMeter"),0,meterBk,dlColor,0);
+	drawMeter(I("ulMeter"),0,meterBk,ulColor,0);
+	I("dlText").textContent="";
+	I("ulText").textContent="";
+	I("pingText").textContent="";
+	I("jitText").textContent="";
+	I("ip").textContent="";
+}
+</script>
+<style type="text/css">
+	html,body{
+		border:none; padding:0; margin:0;
+		background:#FFFFFF;
+		color:#202020;
+	}
+	body{
+		text-align:center;
+		font-family:"Roboto",sans-serif;
+	}
+	h1{
+		color:#404040;
+	}
+	#startStopBtn{
+		display:inline-block;
+		margin:0 auto;
+		color:#6060AA;
+		background-color:rgba(0,0,0,0);
+		border:0.15em solid #6060FF;
+		border-radius:0.3em;
+		transition:all 0.3s;
+		box-sizing:border-box;
+		width:8em; height:3em;
+		line-height:2.7em;
+		cursor:pointer;
+		box-shadow: 0 0 0 rgba(0,0,0,0.1), inset 0 0 0 rgba(0,0,0,0.1);
+	}
+	#startStopBtn:hover{
+		box-shadow: 0 0 2em rgba(0,0,0,0.1), inset 0 0 1em rgba(0,0,0,0.1);
+	}
+	#startStopBtn.running{
+		background-color:#FF3030;
+		border-color:#FF6060;
+		color:#FFFFFF;
+	}
+	#startStopBtn:before{
+		content:"Start";
+	}
+	#startStopBtn.running:before{
+		content:"Abort";
+	}
+	#test{
+		margin-top:2em;
+		margin-bottom:12em;
+	}
+	div.testArea{
+		display:inline-block;
+		width:16em;
+		height:12.5em;
+		position:relative;
+		box-sizing:border-box;
+	}
+	div.testArea2{
+		display:inline-block;
+		width:14em;
+		height:7em;
+		position:relative;
+		box-sizing:border-box;
+		text-align:center;
+	}
+	div.testArea div.testName{
+		position:absolute;
+		top:0.1em; left:0;
+		width:100%;
+		font-size:1.4em;
+		z-index:9;
+	}
+	div.testArea2 div.testName{
+        display:block;
+        text-align:center;
+        font-size:1.4em;
+	}
+	div.testArea div.meterText{
+		position:absolute;
+		bottom:1.55em; left:0;
+		width:100%;
+		font-size:2.5em;
+		z-index:9;
+	}
+	div.testArea2 div.meterText{
+        display:inline-block;
+        font-size:2.5em;
+	}
+	div.meterText:empty:before{
+		content:"0.00";
+	}
+	div.testArea div.unit{
+		position:absolute;
+		bottom:2em; left:0;
+		width:100%;
+		z-index:9;
+	}
+	div.testArea2 div.unit{
+		display:inline-block;
+	}
+	div.testArea canvas{
+		position:absolute;
+		top:0; left:0; width:100%; height:100%;
+		z-index:1;
+	}
+	div.testGroup{
+		display:block;
+        margin: 0 auto;
+	}
+	#shareArea{
+		width:95%;
+		max-width:40em;
+		margin:0 auto;
+		margin-top:2em;
+	}
+	#shareArea > *{
+		display:block;
+		width:100%;
+		height:auto;
+		margin: 0.25em 0;
+	}
+	#privacyPolicy{
+        position:fixed;
+        top:2em;
+        bottom:2em;
+        left:2em;
+        right:2em;
+        overflow-y:auto;
+        width:auto;
+        height:auto;
+        box-shadow:0 0 3em 1em #000000;
+        z-index:999999;
+        text-align:left;
+        background-color:#FFFFFF;
+        padding:1em;
+	}
+	a.privacy{
+        text-align:center;
+        font-size:0.8em;
+        color:#808080;
+        display:block;
+	}
+	@media all and (max-width:40em){
+		body{
+			font-size:0.8em;
+		}
+	}
+</style>
+<title><?= getenv('TITLE') ?: 'LibreSpeed Example' ?></title>
+</head>
+<body>
+<h1><?= getenv('TITLE') ?: 'LibreSpeed Example' ?></h1>
+<div id="testWrapper">
+	<div id="startStopBtn" onclick="startStop()"></div><br/>
+	<?php if(getenv("TELEMETRY")=="true"){ ?>
+        <a class="privacy" href="#" onclick="I('privacyPolicy').style.display=''">Privacy</a>
+	<?php } ?>
+	<div id="test">
+		<div class="testGroup">
+			<div class="testArea2">
+				<div class="testName">Ping</div>
+				<div id="pingText" class="meterText" style="color:#AA6060"></div>
+				<div class="unit">ms</div>
+			</div>
+			<div class="testArea2">
+				<div class="testName">Jitter</div>
+				<div id="jitText" class="meterText" style="color:#AA6060"></div>
+				<div class="unit">ms</div>
+			</div>
+		</div>
+		<div class="testGroup">
+			<div class="testArea">
+				<div class="testName">Download</div>
+				<canvas id="dlMeter" class="meter"></canvas>
+				<div id="dlText" class="meterText"></div>
+				<div class="unit">Mbit/s</div>
+			</div>
+			<div class="testArea">
+				<div class="testName">Upload</div>
+				<canvas id="ulMeter" class="meter"></canvas>
+				<div id="ulText" class="meterText"></div>
+				<div class="unit">Mbit/s</div>
+			</div>
+		</div>
+		<div id="ipArea">
+			<span id="ip"></span>
+		</div>
+		<div id="shareArea" style="display:none">
+			<h3>Share results</h3>
+			<p>Test ID: <span id="testId"></span></p>
+			<input type="text" value="" id="resultsURL" readonly="readonly" onclick="this.select();this.focus();this.select();document.execCommand('copy');alert('Link copied')"/>
+			<img src="" id="resultsImg" />
+		</div>
+	</div>
+	<a href="https://github.com/librespeed/speedtest">Source code</a>
+</div>
+<div id="privacyPolicy" style="display:none">
+    <h2>Privacy Policy</h2>
+    <p>This HTML5 speed test server is configured with telemetry enabled.</p>
+    <h4>What data we collect</h4>
+    <p>
+        At the end of the test, the following data is collected and stored:
+        <ul>
+            <li>Test ID</li>
+            <li>Time of testing</li>
+            <li>Test results (download and upload speed, ping and jitter)</li>
+            <li>IP address</li>
+            <li>ISP information</li>
+            <li>Approximate location (inferred from IP address, not GPS)</li>
+            <li>User agent and browser locale</li>
+            <li>Test log (contains no personal information)</li>
+        </ul>
+    </p>
+    <h4>How we use the data</h4>
+    <p>
+        Data collected through this service is used to:
+        <ul>
+            <li>Allow sharing of test results (sharable image for forums, etc.)</li>
+            <li>To improve the service offered to you (for instance, to detect problems on our side)</li>
+        </ul>
+        No personal information is disclosed to third parties.
+    </p>
+    <h4>Your consent</h4>
+    <p>
+        By starting the test, you consent to the terms of this privacy policy.
+    </p>
+    <h4>Data removal</h4>
+    <p>
+        If you want to have your information deleted, you need to provide either the ID of the test or your IP address. This is the only way to identify your data, without this information we won't be able to comply with your request.<br/><br/>
+        Contact this email address for all deletion requests: <a href="mailto:<?=getenv("EMAIL") ?>"><?=getenv("EMAIL") ?></a>.
+    </p>
+    <br/><br/>
+    <a class="privacy" href="#" onclick="I('privacyPolicy').style.display='none'">Close</a><br/>
+</div>
+<script type="text/javascript">setTimeout(function(){initUI()},100);</script>
+</body>
+</html>

examples/example-multipleServers-full.html

@@ -0,0 +1,490 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="shortcut icon" href="favicon.ico">
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no" />
+<meta charset="UTF-8" />
+<script type="text/javascript" src="speedtest.js"></script>
+<script type="text/javascript">
+function I(i){return document.getElementById(i);}
+
+//LIST OF TEST SERVERS. See documentation for details if needed
+var SPEEDTEST_SERVERS=[
+	{	//this server doesn't actually exist, remove it
+		name:"Example Server 1", //user friendly name for the server
+		server:"//test1.mydomain.com/", //URL to the server. // at the beginning will be replaced with http:// or https:// automatically
+		dlURL:"backend/garbage.php",  //path to download test on this server (garbage.php or replacement)
+		ulURL:"backend/empty.php",  //path to upload test on this server (empty.php or replacement)
+		pingURL:"backend/empty.php",  //path to ping/jitter test on this server (empty.php or replacement)
+		getIpURL:"backend/getIP.php"  //path to getIP on this server (getIP.php or replacement)
+	},
+	{	//this server doesn't actually exist, remove it
+		name:"Example Server 2", //user friendly name for the server
+		server:"//test2.example.com/", //URL to the server. // at the beginning will be replaced with http:// or https:// automatically
+		dlURL:"garbage.php",  //path to download test on this server (garbage.php or replacement)
+		ulURL:"empty.php",  //path to upload test on this server (empty.php or replacement)
+		pingURL:"empty.php",  //path to ping/jitter test on this server (empty.php or replacement)
+		getIpURL:"getIP.php"  //path to getIP on this server (getIP.php or replacement)
+	}
+	//add other servers here, comma separated
+];
+
+//INITIALIZE SPEEDTEST
+var s=new Speedtest(); //create speed test object
+s.setParameter("telemetry_level","basic"); //enable telemetry
+
+//SERVER AUTO SELECTION
+function initServers(){
+    var noServersAvailable=function(){
+        I("message").innerHTML="No servers available";
+    }
+    var runServerSelect=function(){
+        s.selectServer(function(server){
+            if(server!=null){ //at least 1 server is available
+                I("loading").className="hidden"; //hide loading message
+                //populate server list for manual selection
+                for(var i=0;i<SPEEDTEST_SERVERS.length;i++){
+                    if(SPEEDTEST_SERVERS[i].pingT==-1) continue;
+                    var option=document.createElement("option");
+                    option.value=i;
+                    option.textContent=SPEEDTEST_SERVERS[i].name;
+                    if(SPEEDTEST_SERVERS[i]===server) option.selected=true;
+                    I("server").appendChild(option);
+                }
+                //show test UI
+                I("testWrapper").className="visible";
+                initUI();
+            }else{ //no servers are available, the test cannot proceed
+                noServersAvailable();
+            }
+        });
+    }
+    if(typeof SPEEDTEST_SERVERS === "string"){
+        //need to fetch list of servers from specified URL
+        s.loadServerList(SPEEDTEST_SERVERS,function(servers){
+            if(servers==null){ //failed to load server list
+                noServersAvailable();
+            }else{ //server list loaded
+                SPEEDTEST_SERVERS=servers;
+                runServerSelect();
+            }
+        });
+    }else{
+        //hardcoded server list
+        s.addTestPoints(SPEEDTEST_SERVERS);
+        runServerSelect();
+    }
+}
+
+var meterBk=/Trident.*rv:(\d+\.\d+)/i.test(navigator.userAgent)?"#EAEAEA":"#80808040";
+var dlColor="#6060AA",
+	ulColor="#616161";
+var progColor=meterBk;
+
+//CODE FOR GAUGES
+function drawMeter(c,amount,bk,fg,progress,prog){
+	var ctx=c.getContext("2d");
+	var dp=window.devicePixelRatio||1;
+	var cw=c.clientWidth*dp, ch=c.clientHeight*dp;
+	var sizScale=ch*0.0055;
+	if(c.width==cw&&c.height==ch){
+		ctx.clearRect(0,0,cw,ch);
+	}else{
+		c.width=cw;
+		c.height=ch;
+	}
+	ctx.beginPath();
+	ctx.strokeStyle=bk;
+	ctx.lineWidth=12*sizScale;
+	ctx.arc(c.width/2,c.height-58*sizScale,c.height/1.8-ctx.lineWidth,-Math.PI*1.1,Math.PI*0.1);
+	ctx.stroke();
+	ctx.beginPath();
+	ctx.strokeStyle=fg;
+	ctx.lineWidth=12*sizScale;
+	ctx.arc(c.width/2,c.height-58*sizScale,c.height/1.8-ctx.lineWidth,-Math.PI*1.1,amount*Math.PI*1.2-Math.PI*1.1);
+	ctx.stroke();
+	if(typeof progress !== "undefined"){
+		ctx.fillStyle=prog;
+		ctx.fillRect(c.width*0.3,c.height-16*sizScale,c.width*0.4*progress,4*sizScale);
+	}
+}
+function mbpsToAmount(s){
+	return 1-(1/(Math.pow(1.3,Math.sqrt(s))));
+}
+function format(d){
+    d=Number(d);
+    if(d<10) return d.toFixed(2);
+    if(d<100) return d.toFixed(1);
+    return d.toFixed(0);
+}
+
+//UI CODE
+var uiData=null;
+function startStop(){
+    if(s.getState()==3){
+		//speed test is running, abort
+		s.abort();
+		data=null;
+		I("startStopBtn").className="";
+		I("server").disabled=false;
+		initUI();
+	}else{
+		//test is not running, begin
+		I("startStopBtn").className="running";
+		I("shareArea").style.display="none";
+		I("server").disabled=true;
+		s.onupdate=function(data){
+            uiData=data;
+		};
+		s.onend=function(aborted){
+            I("startStopBtn").className="";
+            I("server").disabled=false;
+            updateUI(true);
+            if(!aborted){
+                //if testId is present, show sharing panel, otherwise do nothing
+                try{
+                    var testId=uiData.testId;
+                    if(testId!=null){
+                        var shareURL=window.location.href.substring(0,window.location.href.lastIndexOf("/"))+"/results/?id="+testId;
+                        I("resultsImg").src=shareURL;
+                        I("resultsURL").value=shareURL;
+                        I("testId").innerHTML=testId;
+                        I("shareArea").style.display="";
+                    }
+                }catch(e){}
+            }
+		};
+		s.start();
+	}
+}
+//this function reads the data sent back by the test and updates the UI
+function updateUI(forced){
+	if(!forced&&s.getState()!=3) return;
+	if(uiData==null) return;
+	var status=uiData.testState;
+	I("ip").textContent=uiData.clientIp;
+	I("dlText").textContent=(status==1&&uiData.dlStatus==0)?"...":format(uiData.dlStatus);
+	drawMeter(I("dlMeter"),mbpsToAmount(Number(uiData.dlStatus*(status==1?oscillate():1))),meterBk,dlColor,Number(uiData.dlProgress),progColor);
+	I("ulText").textContent=(status==3&&uiData.ulStatus==0)?"...":format(uiData.ulStatus);
+	drawMeter(I("ulMeter"),mbpsToAmount(Number(uiData.ulStatus*(status==3?oscillate():1))),meterBk,ulColor,Number(uiData.ulProgress),progColor);
+	I("pingText").textContent=format(uiData.pingStatus);
+	I("jitText").textContent=format(uiData.jitterStatus);
+}
+function oscillate(){
+	return 1+0.02*Math.sin(Date.now()/100);
+}
+//update the UI every frame
+window.requestAnimationFrame=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.msRequestAnimationFrame||(function(callback,element){setTimeout(callback,1000/60);});
+function frame(){
+	requestAnimationFrame(frame);
+	updateUI();
+}
+frame(); //start frame loop
+//function to (re)initialize UI
+function initUI(){
+	drawMeter(I("dlMeter"),0,meterBk,dlColor,0);
+	drawMeter(I("ulMeter"),0,meterBk,ulColor,0);
+	I("dlText").textContent="";
+	I("ulText").textContent="";
+	I("pingText").textContent="";
+	I("jitText").textContent="";
+	I("ip").textContent="";
+}
+</script>
+<style type="text/css">
+	html,body{
+		border:none; padding:0; margin:0;
+		background:#FFFFFF;
+		color:#202020;
+	}
+	body{
+		text-align:center;
+		font-family:"Roboto",sans-serif;
+	}
+	h1{
+		color:#404040;
+	}
+	#loading{
+		background-color:#FFFFFF;
+		color:#404040;
+		text-align:center;
+	}
+	span.loadCircle{
+		display:inline-block;
+		width:2em;
+		height:2em;
+		vertical-align:middle;
+		background:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAAAP1BMVEUAAAB2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZyFzwnAAAAFHRSTlMAEvRFvX406baecwbf0casimhSHyiwmqgAAADpSURBVHja7dbJbQMxAENRahnN5lkc//5rDRAkDeRgHszXgACJoKiIiIiIiIiIiIiIiIiIiIj4HHspsrpAVhdVVguzrA4OWc10WcEqpwKbnBo0OU1Q5NSpsoJFTgOecrrdEag85DRgktNqfoEdTjnd7hrEHMEJvmRUYJbTYk5Agy6nau6Abp5Cm7mDBtRdPi9gyKdU7w4p1fsLvyqs8hl4z9/w3n/Hmr9WoQ65lAU4d7lMYOz//QboRR5jBZibLMZdAR6O/Vfa1PlxNr3XdS3HzK/HVPRu/KnLs8iAOh993VpRRERERMT/fAN60wwWaVyWwAAAAABJRU5ErkJggg==');
+		background-size:2em 2em;
+		margin-right:0.5em;
+		animation: spin 0.6s linear infinite;
+	}
+	@keyframes spin{
+		0%{transform:rotate(0deg);}
+		100%{transform:rotate(359deg);}
+	}
+	#startStopBtn{
+		display:inline-block;
+		margin:0 auto;
+		color:#6060AA;
+		background-color:rgba(0,0,0,0);
+		border:0.15em solid #6060FF;
+		border-radius:0.3em;
+		transition:all 0.3s;
+		box-sizing:border-box;
+		width:8em; height:3em;
+		line-height:2.7em;
+		cursor:pointer;
+		box-shadow: 0 0 0 rgba(0,0,0,0.1), inset 0 0 0 rgba(0,0,0,0.1);
+	}
+	#startStopBtn:hover{
+		box-shadow: 0 0 2em rgba(0,0,0,0.1), inset 0 0 1em rgba(0,0,0,0.1);
+	}
+	#startStopBtn.running{
+		background-color:#FF3030;
+		border-color:#FF6060;
+		color:#FFFFFF;
+	}
+	#startStopBtn:before{
+		content:"Start";
+	}
+	#startStopBtn.running:before{
+		content:"Abort";
+	}
+	#serverArea{
+		margin-top:1em;
+	}
+	#server{
+		font-size:1em;
+		padding:0.2em;
+	}
+	#test{
+		margin-top:2em;
+		margin-bottom:12em;
+	}
+	div.testArea{
+		display:inline-block;
+		width:16em;
+		height:12.5em;
+		position:relative;
+		box-sizing:border-box;
+	}
+	div.testArea2{
+		display:inline-block;
+		width:14em;
+		height:7em;
+		position:relative;
+		box-sizing:border-box;
+		text-align:center;
+	}
+	div.testArea div.testName{
+		position:absolute;
+		top:0.1em; left:0;
+		width:100%;
+		font-size:1.4em;
+		z-index:9;
+	}
+	div.testArea2 div.testName{
+        display:block;
+        text-align:center;
+        font-size:1.4em;
+	}
+	div.testArea div.meterText{
+		position:absolute;
+		bottom:1.55em; left:0;
+		width:100%;
+		font-size:2.5em;
+		z-index:9;
+	}
+	div.testArea2 div.meterText{
+        display:inline-block;
+        font-size:2.5em;
+	}
+	div.meterText:empty:before{
+		content:"0.00";
+	}
+	div.testArea div.unit{
+		position:absolute;
+		bottom:2em; left:0;
+		width:100%;
+		z-index:9;
+	}
+	div.testArea2 div.unit{
+		display:inline-block;
+	}
+	div.testArea canvas{
+		position:absolute;
+		top:0; left:0; width:100%; height:100%;
+		z-index:1;
+	}
+	div.testGroup{
+		display:block;
+        margin: 0 auto;
+	}
+	#shareArea{
+		width:95%;
+		max-width:40em;
+		margin:0 auto;
+		margin-top:2em;
+	}
+	#shareArea > *{
+		display:block;
+		width:100%;
+		height:auto;
+		margin: 0.25em 0;
+	}
+	#privacyPolicy{
+        position:fixed;
+        top:2em;
+        bottom:2em;
+        left:2em;
+        right:2em;
+        overflow-y:auto;
+        width:auto;
+        height:auto;
+        box-shadow:0 0 3em 1em #000000;
+        z-index:999999;
+        text-align:left;
+        background-color:#FFFFFF;
+        padding:1em;
+	}
+	a.privacy{
+        text-align:center;
+        font-size:0.8em;
+        color:#808080;
+        padding: 0 3em;
+	}
+    div.closePrivacyPolicy {
+        width: 100%;
+        text-align: center;
+    }
+    div.closePrivacyPolicy a.privacy {
+        padding: 1em 3em;
+    }
+	@media all and (max-width:40em){
+		body{
+			font-size:0.8em;
+		}
+	}
+	div.visible{
+		animation: fadeIn 0.4s;
+		display:block;
+	}
+	div.hidden{
+		animation: fadeOut 0.4s;
+		display:none;
+	}
+	@keyframes fadeIn{
+		0%{
+			opacity:0;
+		}
+		100%{
+			opacity:1;
+		}
+	}
+	@keyframes fadeOut{
+		0%{
+			display:block;
+			opacity:1;
+		}
+		100%{
+			display:block;
+			opacity:0;
+		}
+	}
+</style>
+<title>LibreSpeed Example</title>
+</head>
+<body onload="initServers()">
+<h1>LibreSpeed Example</h1>
+<div id="loading" class="visible">
+	<p id="message"><span class="loadCircle"></span>Selecting a server...</p>
+</div>
+<div id="testWrapper" class="hidden">
+	<div id="startStopBtn" onclick="startStop()"></div><br/>
+	<a class="privacy" href="#" onclick="I('privacyPolicy').style.display=''">Privacy</a>
+	<div id="serverArea">
+		Server: <select id="server" onchange="s.setSelectedServer(SPEEDTEST_SERVERS[this.value])"></select>
+	</div>
+	<div id="test">
+		<div class="testGroup">
+            <div class="testArea2">
+				<div class="testName">Ping</div>
+				<div id="pingText" class="meterText" style="color:#AA6060"></div>
+				<div class="unit">ms</div>
+			</div>
+			<div class="testArea2">
+				<div class="testName">Jitter</div>
+				<div id="jitText" class="meterText" style="color:#AA6060"></div>
+				<div class="unit">ms</div>
+			</div>
+		</div>
+		<div class="testGroup">
+			<div class="testArea">
+				<div class="testName">Download</div>
+				<canvas id="dlMeter" class="meter"></canvas>
+				<div id="dlText" class="meterText"></div>
+				<div class="unit">Mbit/s</div>
+			</div>
+			<div class="testArea">
+				<div class="testName">Upload</div>
+				<canvas id="ulMeter" class="meter"></canvas>
+				<div id="ulText" class="meterText"></div>
+				<div class="unit">Mbit/s</div>
+			</div>
+		</div>
+		<div id="ipArea">
+			<span id="ip"></span>
+		</div>
+		<div id="shareArea" style="display:none">
+			<h3>Share results</h3>
+			<p>Test ID: <span id="testId"></span></p>
+			<input type="text" value="" id="resultsURL" readonly="readonly" onclick="this.select();this.focus();this.select();document.execCommand('copy');alert('Link copied')"/>
+			<img src="" id="resultsImg" />
+		</div>
+	</div>
+	<a href="https://github.com/librespeed/speedtest">Source code</a>
+</div>
+<div id="privacyPolicy" style="display:none">
+    <h2>Privacy Policy</h2>
+    <p>This HTML5 speed test server is configured with telemetry enabled.</p>
+    <h4>What data we collect</h4>
+    <p>
+        At the end of the test, the following data is collected and stored:
+        <ul>
+            <li>Test ID</li>
+            <li>Time of testing</li>
+            <li>Test results (download and upload speed, ping and jitter)</li>
+            <li>IP address</li>
+            <li>ISP information</li>
+            <li>Approximate location (inferred from IP address, not GPS)</li>
+            <li>User agent and browser locale</li>
+            <li>Test log (contains no personal information)</li>
+        </ul>
+    </p>
+    <h4>How we use the data</h4>
+    <p>
+        Data collected through this service is used to:
+        <ul>
+            <li>Allow sharing of test results (sharable image for forums, etc.)</li>
+            <li>To improve the service offered to you (for instance, to detect problems on our side)</li>
+        </ul>
+        No personal information is disclosed to third parties.
+    </p>
+    <h4>Your consent</h4>
+    <p>
+        By starting the test, you consent to the terms of this privacy policy.
+    </p>
+    <h4>Data removal</h4>
+    <p>
+        If you want to have your information deleted, you need to provide either the ID of the test or your IP address. This is the only way to identify your data, without this information we won't be able to comply with your request.<br/><br/>
+        Contact this email address for all deletion requests: <a href="mailto:PUT@YOUR_EMAIL.HERE">TO BE FILLED BY DEVELOPER</a>.
+    </p>
+    <br/><br/>
+    <div class="closePrivacyPolicy">
+        <a class="privacy" href="#" onclick="I('privacyPolicy').style.display='none'">Close</a>
+    </div>
+    <br/>
+</div>
+</body>
+</html>

examples/example-multipleServers-pretty.html

@@ -10,21 +10,21 @@
 
 //LIST OF TEST SERVERS. See documentation for details if needed
 var SPEEDTEST_SERVERS=[
-	{	//this is my demo server, remove it
-		name:"Speedtest Demo Server (Helsinki)", //user friendly name for the server
-		server:"//fi.openspeed.org/", //URL to the server. // at the beginning will be replaced with http:// or https:// automatically
+	{	//this server doesn't actually exist, remove it
+		name:"Example Server 1", //user friendly name for the server
+		server:"//test1.mydomain.com/", //URL to the server. // at the beginning will be replaced with http:// or https:// automatically
+		dlURL:"backend/garbage.php",  //path to download test on this server (garbage.php or replacement)
+		ulURL:"backend/empty.php",  //path to upload test on this server (empty.php or replacement)
+		pingURL:"backend/empty.php",  //path to ping/jitter test on this server (empty.php or replacement)
+		getIpURL:"backend/getIP.php"  //path to getIP on this server (getIP.php or replacement)
+	},
+	{	//this server doesn't actually exist, remove it
+		name:"Example Server 2", //user friendly name for the server
+		server:"//test2.example.com/", //URL to the server. // at the beginning will be replaced with http:// or https:// automatically
 		dlURL:"garbage.php",  //path to download test on this server (garbage.php or replacement)
 		ulURL:"empty.php",  //path to upload test on this server (empty.php or replacement)
 		pingURL:"empty.php",  //path to ping/jitter test on this server (empty.php or replacement)
 		getIpURL:"getIP.php"  //path to getIP on this server (getIP.php or replacement)
-	},
-	{	//this is my demo server, remove it
-		name:"Old Speedtest Demo Server",
-		server:"//mpotdemo.fdossena.com/",
-		dlURL:"garbage.php",
-		ulURL:"empty.php",
-		pingURL:"empty.php",
-		getIpURL:"getIP.php"
 	}
 	//add other servers here, comma separated
 ];
@@ -32,7 +32,7 @@ var SPEEDTEST_SERVERS=[
 
 //INITIALIZE SPEEDTEST
 var s=new Speedtest(); //create speedtest object
-s.addTestPoints(SPEEDTEST_SERVERS); //add list of servers
+
 s.onupdate=function(data){ //callback to update data in UI
     I("ip").textContent=data.clientIp;
     I("dlText").textContent=(data.testState==1&&data.dlStatus==0)?"...":data.dlStatus;
@@ -46,13 +46,33 @@ s.onend=function(aborted){ //callback for test ended/aborted
 		initUI();
     }
 }
-function selectServer(){ //called when the page is fully loaded
-    I("startStopBtn").style.display="none"; //hide start/stop button during server selection
+function selectServer(){ //called after loading server list
     s.selectServer(function(server){ //run server selection. When the server has been selected, display it in the UI
-        I("startStopBtn").style.display=""; //show start/stop button again
-        I("serverId").textContent=server.name; //show name of test server
+        if(server==null){
+            I("serverId").textContent="No servers available";
+        }else{
+            I("startStopBtn").style.display=""; //show start/stop button again
+            I("serverId").textContent=server.name; //show name of test server
+        }
     });
 }
+function loadServers(){ //called when the page is fully loaded
+    I("startStopBtn").style.display="none"; //hide start/stop button during server selection
+    if(typeof SPEEDTEST_SERVERS === "string"){
+        //load servers from url
+        s.loadServerList(SPEEDTEST_SERVERS,function(servers){
+            //list loaded
+            SPEEDTEST_SERVERS=servers;
+            selectServer();
+        });
+    }else{
+        //hardcoded list of servers, already loaded
+        s.addTestPoints(SPEEDTEST_SERVERS);
+        selectServer();
+    }
+
+}
+
 
 
 function startStop(){ //start/stop button pressed
@@ -192,12 +212,12 @@ function I(id){return document.getElementById(id);}
 		<div class="testArea">
 			<div class="testName">Download</div>
 			<div id="dlText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 		<div class="testArea">
 			<div class="testName">Upload</div>
 			<div id="ulText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 	</div>
 	<div class="testGroup">
@@ -219,7 +239,7 @@ function I(id){return document.getElementById(id);}
 <a href="https://github.com/librespeed/speedtest">Source code</a>
 <script type="text/javascript">
     initUI();
-    selectServer();
+    loadServers();
 </script>
 </body>
 </html>

examples/example-singleServer-basic.html

@@ -29,7 +29,7 @@
             document.getElementById('ping').textContent = data.pingStatus + ' ms, ' + data.jitterStatus + ' ms jitter'
             document.getElementById('ip').textContent = data.clientIp
         }
-        s.start(); // start the speedtest with default settings
+        s.start(); // start the speed test with default settings
     </script>
 
 	<a href="https://github.com/librespeed/speedtest">Source code</a>

examples/example-singleServer-chart.html

@@ -250,7 +250,7 @@
         <br/>
         <a href="javascript:abortTest()" id="abortBtn">Abort</a>
     </div>
-    <a href="javascript:runTest()" id="startBtn">Run speedtest</a>
+    <a href="javascript:runTest()" id="startBtn">Run speed test</a>
     <br/><br/> Charts by <a href="http://www.chartjs.org/">Chart.js</a><br/><br/><a href="https://github.com/librespeed/speedtest">Source code</a>
 </body>
 </html>

examples/example-singleServer-customSettings.html

@@ -157,12 +157,12 @@ function I(id){return document.getElementById(id);}
 		<div class="testArea">
 			<div class="testName">Download</div>
 			<div id="dlText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 		<div class="testArea">
 			<div class="testName">Upload</div>
 			<div id="ulText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 	</div>
 </div>

examples/example-singleServer-gauges.html

@@ -242,13 +242,13 @@ function initUI(){
 				<div class="testName">Download</div>
 				<canvas id="dlMeter" class="meter"></canvas>
 				<div id="dlText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 			<div class="testArea">
 				<div class="testName">Upload</div>
 				<canvas id="ulMeter" class="meter"></canvas>
 				<div id="ulText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 		</div>
 		<div id="ipArea">

examples/example-singleServer-pretty.html

@@ -160,12 +160,12 @@ function I(id){return document.getElementById(id);}
 		<div class="testArea">
 			<div class="testName">Download</div>
 			<div id="dlText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 		<div class="testArea">
 			<div class="testName">Upload</div>
 			<div id="ulText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 	</div>
 	<div class="testGroup">

examples/example-singleServer-progressBar.html

@@ -180,12 +180,12 @@ function I(id){return document.getElementById(id);}
 		<div class="testArea">
 			<div class="testName">Download</div>
 			<div id="dlText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 		<div class="testArea">
 			<div class="testName">Upload</div>
 			<div id="ulText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 	</div>
 	<div class="testGroup">

index.html

@@ -258,8 +258,15 @@ function initUI(){
         text-align:center;
         font-size:0.8em;
         color:#808080;
-        display:block;
-	}
+        padding: 0 3em;
+    }
+    div.closePrivacyPolicy {
+        width: 100%;
+        text-align: center;
+    }
+    div.closePrivacyPolicy a.privacy {
+        padding: 1em 3em;
+    }
 	@media all and (max-width:40em){
 		body{
 			font-size:0.8em;
@@ -291,13 +298,13 @@ function initUI(){
 				<div class="testName">Download</div>
 				<canvas id="dlMeter" class="meter"></canvas>
 				<div id="dlText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 			<div class="testArea">
 				<div class="testName">Upload</div>
 				<canvas id="ulMeter" class="meter"></canvas>
 				<div id="ulText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 		</div>
 		<div id="ipArea">
@@ -314,7 +321,7 @@ function initUI(){
 </div>
 <div id="privacyPolicy" style="display:none">
     <h2>Privacy Policy</h2>
-    <p>This HTML5 Speedtest server is configured with telemetry enabled.</p>
+    <p>This HTML5 speed test server is configured with telemetry enabled.</p>
     <h4>What data we collect</h4>
     <p>
         At the end of the test, the following data is collected and stored:
@@ -348,7 +355,10 @@ function initUI(){
         Contact this email address for all deletion requests: <a href="mailto:PUT@YOUR_EMAIL.HERE">TO BE FILLED BY DEVELOPER</a>.
     </p>
     <br/><br/>
-    <a class="privacy" href="#" onclick="I('privacyPolicy').style.display='none'">Close</a><br/>
+    <div class="closePrivacyPolicy">
+        <a class="privacy" href="#" onclick="I('privacyPolicy').style.display='none'">Close</a>
+    </div>
+    <br/>
 </div>
 <script type="text/javascript">setTimeout(function(){initUI()},100);</script>
 </body>

results/idObfuscation.php

@@ -1,43 +1,72 @@
 <?php
-function getObfuscationSalt(){
-	$saltFile=dirname(__FILE__)."/idObfuscation_salt.php";
-	if(file_exists($saltFile)){
-		require $saltFile;
-	}else{
-		$bytes=openssl_random_pseudo_bytes(4);
-		$sf=fopen($saltFile,"w");
-		fwrite($sf,chr(60)."?php\n");
-		fwrite($sf,'$OBFUSCATION_SALT=0x'.bin2hex($bytes).";\n");
-		fwrite($sf,"?".chr(62));
-		fclose($sf);
-		require $saltFile;
-	}
-	return isset($OBFUSCATION_SALT)?$OBFUSCATION_SALT:0;
-}
-/*
-This is a simple reversible hash function I made for encoding and decoding test IDs.
-It is not cryptographically secure, don't use it to hash passwords or something!
-*/
-function obfdeobf($id,$dec){
-	$salt=getObfuscationSalt()&0xFFFFFFFF;
-	$id=$id&0xFFFFFFFF;
-	if($dec){
-		$id=$id^$salt;
-		$id=(($id&0xAAAAAAAA)>>1)|($id&0x55555555)<<1;
-		$id=(($id&0x0000FFFF)<<16)|(($id&0xFFFF0000)>>16);
-		return $id;
-	}else{
-		$id=(($id&0x0000FFFF)<<16)|(($id&0xFFFF0000)>>16);
-		$id=(($id&0xAAAAAAAA)>>1)|($id&0x55555555)<<1;
-		return $id^$salt;
-	}
-}
-function obfuscateId($id){
-	return str_pad(base_convert(obfdeobf($id+1,false),10,36),7,0,STR_PAD_LEFT);
-}
-function deobfuscateId($id){
-	return obfdeobf(base_convert($id,36,10),true)-1;
+
+define('ID_OBFUSCATION_SALT_FILE', __DIR__.'/idObfuscation_salt.php');
+
+/**
+ * @return string|int
+ */
+function getObfuscationSalt()
+{
+    if (!file_exists(ID_OBFUSCATION_SALT_FILE)) {
+        $bytes = openssl_random_pseudo_bytes(4);
+
+        $saltData = "<?php\n\n\$OBFUSCATION_SALT = 0x".bin2hex($bytes).";\n";
+        file_put_contents(ID_OBFUSCATION_SALT_FILE, $saltData);
+    }
+
+    if (
+        file_exists(ID_OBFUSCATION_SALT_FILE)
+        && is_readable(ID_OBFUSCATION_SALT_FILE)
+    ) {
+        require ID_OBFUSCATION_SALT_FILE;
+    }
+
+    return isset($OBFUSCATION_SALT) ? $OBFUSCATION_SALT : 0;
 }
 
-//IMPORTANT: DO NOT ADD ANYTHING BELOW THE PHP CLOSING TAG, NOT EVEN EMPTY LINES!
-?>
+/**
+ * This is a simple reversible hash function I made for encoding and decoding test IDs.
+ * It is not cryptographically secure, don't use it to hash passwords or something!
+ *
+ * @param int|string $id
+ * @param bool $dec
+ *
+ * @return int|string
+ */
+function obfdeobf($id, $dec)
+{
+    $salt = getObfuscationSalt() & 0xFFFFFFFF;
+    $id &= 0xFFFFFFFF;
+    if ($dec) {
+        $id ^= $salt;
+        $id = (($id & 0xAAAAAAAA) >> 1) | ($id & 0x55555555) << 1;
+        $id = (($id & 0x0000FFFF) << 16) | (($id & 0xFFFF0000) >> 16);
+
+        return $id;
+    }
+
+    $id = (($id & 0x0000FFFF) << 16) | (($id & 0xFFFF0000) >> 16);
+    $id = (($id & 0xAAAAAAAA) >> 1) | ($id & 0x55555555) << 1;
+
+    return $id ^ $salt;
+}
+
+/**
+ * @param int $id
+ *
+ * @return string
+ */
+function obfuscateId($id)
+{
+    return str_pad(base_convert(obfdeobf($id + 1, false), 10, 36), 7, 0, STR_PAD_LEFT);
+}
+
+/**
+ * @param string $id
+ *
+ * @return int
+ */
+function deobfuscateId($id)
+{
+    return obfdeobf(base_convert($id, 36, 10), true) - 1;
+}

results/index.php

@@ -1,164 +1,224 @@
 <?php
-$WATERMARK_TEXT="LibreSpeed";
+
+require_once 'telemetry_db.php';
 
 error_reporting(0);
-putenv('GDFONTPATH=' . realpath('.'));
-function tryFont($name){
-	$rp=realpath('.');
-	if(imageftbbox(12,0,$name,"M")[5]==0){
-		$name=$rp."/".$name.".ttf";
-		if(imageftbbox(12,0,$name,"M")[5]==0){
-			return null;
-		}
-	}
-	return $name;
-}
-function format($d){
-    if($d<10) return number_format($d,2,".","");
-    if($d<100) return number_format($d,1,".","");
-    return number_format($d,0,".","");
+putenv('GDFONTPATH='.realpath('.'));
+
+/**
+ * @param string $name
+ *
+ * @return string|null
+ */
+function tryFont($name)
+{
+    if (is_array(imageftbbox(12, 0, $name, 'M'))) {
+        return $name;
+    }
+
+    $fullPathToFont = realpath('.').'/'.$name.'.ttf';
+    if (is_array(imageftbbox(12, 0, $fullPathToFont, 'M'))) {
+        return $fullPathToFont;
+    }
+
+    return null;
 }
 
-$SCALE=1.25;
-$WIDTH=400*$SCALE;
-$HEIGHT=229*$SCALE;
-$im=imagecreatetruecolor($WIDTH,$HEIGHT);
-$BACKGROUND_COLOR=imagecolorallocate($im,255,255,255);
-$FONT_LABEL=tryFont("OpenSans-Semibold");
-$FONT_LABEL_SIZE=14*$SCALE;
-$FONT_LABEL_SIZE_BIG=16*$SCALE;
-$FONT_METER=tryFont("OpenSans-Light");
-$FONT_METER_SIZE=20*$SCALE;
-$FONT_METER_SIZE_BIG=22*$SCALE;
-$FONT_MEASURE=tryFont("OpenSans-Semibold");
-$FONT_MEASURE_SIZE=12*$SCALE;
-$FONT_MEASURE_SIZE_BIG=12*$SCALE;
-$FONT_ISP=tryFont("OpenSans-Semibold");
-$FONT_ISP_SIZE=9*$SCALE;
-$FONT_WATERMARK=tryFont("OpenSans-Light");
-$FONT_WATERMARK_SIZE=8*$SCALE;
-$TEXT_COLOR_LABEL=imagecolorallocate($im,40,40,40);
-$TEXT_COLOR_DL_METER=imagecolorallocate($im,96,96,170);
-$TEXT_COLOR_UL_METER=imagecolorallocate($im,96,96,96);
-$TEXT_COLOR_PING_METER=imagecolorallocate($im,170,96,96);
-$TEXT_COLOR_JIT_METER=imagecolorallocate($im,170,96,96);
-$TEXT_COLOR_MEASURE=imagecolorallocate($im,40,40,40);
-$TEXT_COLOR_ISP=imagecolorallocate($im,40,40,40);
-$TEXT_COLOR_WATERMARK=imagecolorallocate($im,160,160,160);
-$POSITION_Y_DL_LABEL=105*$SCALE;
-$POSITION_Y_UL_LABEL=105*$SCALE;
-$POSITION_Y_PING_LABEL=24*$SCALE;
-$POSITION_Y_JIT_LABEL=24*$SCALE;
-$POSITION_Y_DL_METER=143*$SCALE;
-$POSITION_Y_UL_METER=143*$SCALE;
-$POSITION_Y_PING_METER=60*$SCALE;
-$POSITION_Y_JIT_METER=60*$SCALE;
-$POSITION_Y_DL_MEASURE=169*$SCALE;
-$POSITION_Y_UL_MEASURE=169*$SCALE;
-$POSITION_Y_PING_MEASURE=60*$SCALE;
-$POSITION_Y_JIT_MEASURE=60*$SCALE;
-$POSITION_Y_ISP=205*$SCALE;
-$POSITION_X_DL=120*$SCALE;
-$POSITION_X_UL=280*$SCALE;
-$POSITION_X_PING=125*$SCALE;
-$POSITION_X_JIT=275*$SCALE;
-$POSITION_X_ISP=4*$SCALE;
-$SMALL_SEP=8*$SCALE;
-$SEPARATOR_Y=211*$SCALE;
-$SEPARATOR_COLOR=imagecolorallocate($im,192,192,192);
-$POSITION_Y_WATERMARK=223*$SCALE;
-$DL_TEXT="Download";
-$UL_TEXT="Upload";
-$PING_TEXT="Ping";
-$JIT_TEXT="Jitter";
-$MBPS_TEXT="Mbps";
-$MS_TEXT="ms";
+/**
+ * @param int|float $d
+ *
+ * @return string
+ */
+function format($d)
+{
+    if ($d < 10) {
+        return number_format($d, 2, '.', '');
+    }
+    if ($d < 100) {
+        return number_format($d, 1, '.', '');
+    }
 
-$id=$_GET["id"];
-include_once('telemetry_settings.php');
-require 'idObfuscation.php';
-if($enable_id_obfuscation) $id=deobfuscateId($id);
-$conn=null; $q=null;
-$ispinfo=null; $dl=null; $ul=null; $ping=null; $jit=null;
-if($db_type=="mysql"){
-	$conn = new mysqli($MySql_hostname, $MySql_username, $MySql_password, $MySql_databasename);
-	$q = $conn->prepare("select ispinfo,dl,ul,ping,jitter from speedtest_users where id=?");
-	$q->bind_param("i",$id);
-	$q->execute();
-	$q->bind_result($ispinfo,$dl,$ul,$ping,$jit);
-	$q->fetch();
-}else if($db_type=="sqlite"){
-	$conn = new PDO("sqlite:$Sqlite_db_file") or die();
-	$q=$conn->prepare("select ispinfo,dl,ul,ping,jitter from speedtest_users where id=?") or die();
-	$q->execute(array($id)) or die();
-	$row=$q->fetch() or die();
-	$ispinfo=$row["ispinfo"];
-	$dl=$row["dl"];
-	$ul=$row["ul"];
-	$ping=$row["ping"];
-	$jit=$row["jitter"];
-	$conn=null;
-}else if($db_type=="postgresql"){
-    $conn_host = "host=$PostgreSql_hostname";
-    $conn_db = "dbname=$PostgreSql_databasename";
-    $conn_user = "user=$PostgreSql_username";
-    $conn_password = "password=$PostgreSql_password";
-    $conn = new PDO("pgsql:$conn_host;$conn_db;$conn_user;$conn_password") or die();
-	$q=$conn->prepare("select ispinfo,dl,ul,ping,jitter from speedtest_users where id=?") or die();
-	$q->execute(array($id)) or die();
-	$row=$q->fetch() or die();
-	$ispinfo=$row["ispinfo"];
-	$dl=$row["dl"];
-	$ul=$row["ul"];
-	$ping=$row["ping"];
-	$jit=$row["jitter"];
-	$conn=null;
-}else die();
+    return number_format($d, 0, '.', '');
+}
 
-$dl=format($dl);
-$ul=format($ul);
-$ping=format($ping);
-$jit=format($jit);
+/**
+ * @param array $speedtest
+ *
+ * @return array
+ */
+function formatSpeedtestDataForImage($speedtest)
+{
+    // format values for the image
+    $speedtest['dl'] = format($speedtest['dl']);
+    $speedtest['ul'] = format($speedtest['ul']);
+    $speedtest['ping'] = format($speedtest['ping']);
+    $speedtest['jitter'] = format($speedtest['jitter']);
+    $speedtest['timestamp'] = $speedtest['timestamp'];
 
-$ispinfo=json_decode($ispinfo,true)["processedString"];
-$dash=strpos($ispinfo,"-");
-if(!($dash===FALSE)){
-	$ispinfo=substr($ispinfo,$dash+2);
-	$par=strrpos($ispinfo,"(");
-	if(!($par===FALSE)) $ispinfo=substr($ispinfo,0,$par);
-}else $ispinfo="";
+    $ispinfo = json_decode($speedtest['ispinfo'], true)['processedString'];
+    $dash = strpos($ispinfo, '-');
+    if ($dash !== false) {
+        $ispinfo = substr($ispinfo, $dash + 2);
+        $par = strrpos($ispinfo, '(');
+        if ($par !== false) {
+            $ispinfo = substr($ispinfo, 0, $par);
+        }
+    } else {
+        $ispinfo = '';
+    }
 
-$dlBbox=imageftbbox($FONT_LABEL_SIZE_BIG,0,$FONT_LABEL,$DL_TEXT);
-$ulBbox=imageftbbox($FONT_LABEL_SIZE_BIG,0,$FONT_LABEL,$UL_TEXT);
-$pingBbox=imageftbbox($FONT_LABEL_SIZE,0,$FONT_LABEL,$PING_TEXT);
-$jitBbox=imageftbbox($FONT_LABEL_SIZE,0,$FONT_LABEL,$JIT_TEXT);
-$dlMeterBbox=imageftbbox($FONT_METER_SIZE_BIG,0,$FONT_METER,$dl);
-$ulMeterBbox=imageftbbox($FONT_METER_SIZE_BIG,0,$FONT_METER,$ul);
-$pingMeterBbox=imageftbbox($FONT_METER_SIZE,0,$FONT_METER,$ping);
-$jitMeterBbox=imageftbbox($FONT_METER_SIZE,0,$FONT_METER,$jit);
-$mbpsBbox=imageftbbox($FONT_MEASURE_SIZE_BIG,0,$FONT_MEASURE,$MBPS_TEXT);
-$msBbox=imageftbbox($FONT_MEASURE_SIZE,0,$FONT_MEASURE,$MS_TEXT);
-$watermarkBbox=imageftbbox($FONT_WATERMARK_SIZE,0,$FONT_WATERMARK,$WATERMARK_TEXT);
-$POSITION_X_WATERMARK=$WIDTH-$watermarkBbox[4]-4*$SCALE;
+    $speedtest['ispinfo'] = $ispinfo;
 
-imagefilledrectangle($im, 0, 0, $WIDTH, $HEIGHT, $BACKGROUND_COLOR);
-imagefttext($im,$FONT_LABEL_SIZE_BIG,0,$POSITION_X_DL-$dlBbox[4]/2,$POSITION_Y_DL_LABEL,$TEXT_COLOR_LABEL,$FONT_LABEL,$DL_TEXT);
-imagefttext($im,$FONT_LABEL_SIZE_BIG,0,$POSITION_X_UL-$ulBbox[4]/2,$POSITION_Y_UL_LABEL,$TEXT_COLOR_LABEL,$FONT_LABEL,$UL_TEXT);
-imagefttext($im,$FONT_LABEL_SIZE,0,$POSITION_X_PING-$pingBbox[4]/2,$POSITION_Y_PING_LABEL,$TEXT_COLOR_LABEL,$FONT_LABEL,$PING_TEXT);
-imagefttext($im,$FONT_LABEL_SIZE,0,$POSITION_X_JIT-$jitBbox[4]/2,$POSITION_Y_JIT_LABEL,$TEXT_COLOR_LABEL,$FONT_LABEL,$JIT_TEXT);
-imagefttext($im,$FONT_METER_SIZE_BIG,0,$POSITION_X_DL-$dlMeterBbox[4]/2,$POSITION_Y_DL_METER,$TEXT_COLOR_DL_METER,$FONT_METER,$dl);
-imagefttext($im,$FONT_METER_SIZE_BIG,0,$POSITION_X_UL-$ulMeterBbox[4]/2,$POSITION_Y_UL_METER,$TEXT_COLOR_UL_METER,$FONT_METER,$ul);
-imagefttext($im,$FONT_METER_SIZE,0,$POSITION_X_PING-$pingMeterBbox[4]/2-$msBbox[4]/2-$SMALL_SEP/2,$POSITION_Y_PING_METER,$TEXT_COLOR_PING_METER,$FONT_METER,$ping);
-imagefttext($im,$FONT_METER_SIZE,0,$POSITION_X_JIT-$jitMeterBbox[4]/2-$msBbox[4]/2-$SMALL_SEP/2,$POSITION_Y_JIT_METER,$TEXT_COLOR_JIT_METER,$FONT_METER,$jit);
-imagefttext($im,$FONT_MEASURE_SIZE_BIG,0,$POSITION_X_DL-$mbpsBbox[4]/2,$POSITION_Y_DL_MEASURE,$TEXT_COLOR_MEASURE,$FONT_MEASURE,$MBPS_TEXT);
-imagefttext($im,$FONT_MEASURE_SIZE_BIG,0,$POSITION_X_UL-$mbpsBbox[4]/2,$POSITION_Y_UL_MEASURE,$TEXT_COLOR_MEASURE,$FONT_MEASURE,$MBPS_TEXT);
-imagefttext($im,$FONT_MEASURE_SIZE,0,$POSITION_X_PING+$pingMeterBbox[4]/2+$SMALL_SEP/2-$msBbox[4]/2,$POSITION_Y_PING_MEASURE,$TEXT_COLOR_MEASURE,$FONT_MEASURE,$MS_TEXT);
-imagefttext($im,$FONT_MEASURE_SIZE,0,$POSITION_X_JIT+$jitMeterBbox[4]/2+$SMALL_SEP/2-$msBbox[4]/2,$POSITION_Y_JIT_MEASURE,$TEXT_COLOR_MEASURE,$FONT_MEASURE,$MS_TEXT);
-imagefttext($im,$FONT_ISP_SIZE,0,$POSITION_X_ISP,$POSITION_Y_ISP,$TEXT_COLOR_ISP,$FONT_ISP,$ispinfo);
-imagefttext($im,$FONT_WATERMARK_SIZE,0,$POSITION_X_WATERMARK,$POSITION_Y_WATERMARK,$TEXT_COLOR_WATERMARK,$FONT_WATERMARK,$WATERMARK_TEXT);
-imagefilledrectangle($im, 0, $SEPARATOR_Y, $WIDTH, $SEPARATOR_Y, $SEPARATOR_COLOR);
-header('Content-Type: image/png');
-imagepng($im);
-imagedestroy($im);
+    return $speedtest;
+}
 
-?>
+/**
+ * @param array $speedtest
+ *
+ * @return void
+ */
+function drawImage($speedtest)
+{
+    // format values for the image
+    $data = formatSpeedtestDataForImage($speedtest);
+    $dl = $data['dl'];
+    $ul = $data['ul'];
+    $ping = $data['ping'];
+    $jit = $data['jitter'];
+    $ispinfo = $data['ispinfo'];
+    $timestamp = $data['timestamp'];
+
+    // initialize the image
+    $SCALE = 1.25;
+    $SMALL_SEP = 8 * $SCALE;
+    $WIDTH = 400 * $SCALE;
+    $HEIGHT = 229 * $SCALE;
+    $im = imagecreatetruecolor($WIDTH, $HEIGHT);
+    $BACKGROUND_COLOR = imagecolorallocate($im, 255, 255, 255);
+
+    // configure fonts
+    $FONT_LABEL = tryFont('OpenSans-Semibold');
+    $FONT_LABEL_SIZE = 14 * $SCALE;
+    $FONT_LABEL_SIZE_BIG = 16 * $SCALE;
+
+    $FONT_METER = tryFont('OpenSans-Light');
+    $FONT_METER_SIZE = 20 * $SCALE;
+    $FONT_METER_SIZE_BIG = 22 * $SCALE;
+
+    $FONT_MEASURE = tryFont('OpenSans-Semibold');
+    $FONT_MEASURE_SIZE = 12 * $SCALE;
+    $FONT_MEASURE_SIZE_BIG = 12 * $SCALE;
+
+    $FONT_ISP = tryFont('OpenSans-Semibold');
+    $FONT_ISP_SIZE = 9 * $SCALE;
+
+    $FONT_TIMESTAMP = tryFont("OpenSans-Light");
+    $FONT_TIMESTAMP_SIZE = 8 * $SCALE;
+
+    $FONT_WATERMARK = tryFont('OpenSans-Light');
+    $FONT_WATERMARK_SIZE = 8 * $SCALE;
+
+    // configure text colors
+    $TEXT_COLOR_LABEL = imagecolorallocate($im, 40, 40, 40);
+    $TEXT_COLOR_PING_METER = imagecolorallocate($im, 170, 96, 96);
+    $TEXT_COLOR_JIT_METER = imagecolorallocate($im, 170, 96, 96);
+    $TEXT_COLOR_DL_METER = imagecolorallocate($im, 96, 96, 170);
+    $TEXT_COLOR_UL_METER = imagecolorallocate($im, 96, 96, 96);
+    $TEXT_COLOR_MEASURE = imagecolorallocate($im, 40, 40, 40);
+    $TEXT_COLOR_ISP = imagecolorallocate($im, 40, 40, 40);
+    $SEPARATOR_COLOR = imagecolorallocate($im, 192, 192, 192);
+    $TEXT_COLOR_TIMESTAMP = imagecolorallocate($im, 160, 160, 160);
+    $TEXT_COLOR_WATERMARK = imagecolorallocate($im, 160, 160, 160);
+
+    // configure positioning or the different parts on the image
+    $POSITION_X_PING = 125 * $SCALE;
+    $POSITION_Y_PING_LABEL = 24 * $SCALE;
+    $POSITION_Y_PING_METER = 60 * $SCALE;
+    $POSITION_Y_PING_MEASURE = 60 * $SCALE;
+
+    $POSITION_X_JIT = 275 * $SCALE;
+    $POSITION_Y_JIT_LABEL = 24 * $SCALE;
+    $POSITION_Y_JIT_METER = 60 * $SCALE;
+    $POSITION_Y_JIT_MEASURE = 60 * $SCALE;
+
+    $POSITION_X_DL = 120 * $SCALE;
+    $POSITION_Y_DL_LABEL = 105 * $SCALE;
+    $POSITION_Y_DL_METER = 143 * $SCALE;
+    $POSITION_Y_DL_MEASURE = 169 * $SCALE;
+
+    $POSITION_X_UL = 280 * $SCALE;
+    $POSITION_Y_UL_LABEL = 105 * $SCALE;
+    $POSITION_Y_UL_METER = 143 * $SCALE;
+    $POSITION_Y_UL_MEASURE = 169 * $SCALE;
+
+    $POSITION_X_ISP = 4 * $SCALE;
+    $POSITION_Y_ISP = 205 * $SCALE;
+
+    $SEPARATOR_Y = 211 * $SCALE;
+
+    $POSITION_X_TIMESTAMP= 4 * $SCALE;
+    $POSITION_Y_TIMESTAMP = 223 * $SCALE;
+
+    $POSITION_Y_WATERMARK = 223 * $SCALE;
+
+    // configure labels
+    $MBPS_TEXT = 'Mbit/s';
+    $MS_TEXT = 'ms';
+    $PING_TEXT = 'Ping';
+    $JIT_TEXT = 'Jitter';
+    $DL_TEXT = 'Download';
+    $UL_TEXT = 'Upload';
+    $WATERMARK_TEXT = 'LibreSpeed';
+
+    // create text boxes for each part of the image
+    $mbpsBbox = imageftbbox($FONT_MEASURE_SIZE_BIG, 0, $FONT_MEASURE, $MBPS_TEXT);
+    $msBbox = imageftbbox($FONT_MEASURE_SIZE, 0, $FONT_MEASURE, $MS_TEXT);
+    $pingBbox = imageftbbox($FONT_LABEL_SIZE, 0, $FONT_LABEL, $PING_TEXT);
+    $pingMeterBbox = imageftbbox($FONT_METER_SIZE, 0, $FONT_METER, $ping);
+    $jitBbox = imageftbbox($FONT_LABEL_SIZE, 0, $FONT_LABEL, $JIT_TEXT);
+    $jitMeterBbox = imageftbbox($FONT_METER_SIZE, 0, $FONT_METER, $jit);
+    $dlBbox = imageftbbox($FONT_LABEL_SIZE_BIG, 0, $FONT_LABEL, $DL_TEXT);
+    $dlMeterBbox = imageftbbox($FONT_METER_SIZE_BIG, 0, $FONT_METER, $dl);
+    $ulBbox = imageftbbox($FONT_LABEL_SIZE_BIG, 0, $FONT_LABEL, $UL_TEXT);
+    $ulMeterBbox = imageftbbox($FONT_METER_SIZE_BIG, 0, $FONT_METER, $ul);
+    $watermarkBbox = imageftbbox($FONT_WATERMARK_SIZE, 0, $FONT_WATERMARK, $WATERMARK_TEXT);
+    $POSITION_X_WATERMARK = $WIDTH - $watermarkBbox[4] - 4 * $SCALE;
+
+    // put the parts together to draw the image
+    imagefilledrectangle($im, 0, 0, $WIDTH, $HEIGHT, $BACKGROUND_COLOR);
+    // ping
+    imagefttext($im, $FONT_LABEL_SIZE, 0, $POSITION_X_PING - $pingBbox[4] / 2, $POSITION_Y_PING_LABEL, $TEXT_COLOR_LABEL, $FONT_LABEL, $PING_TEXT);
+    imagefttext($im, $FONT_METER_SIZE, 0, $POSITION_X_PING - $pingMeterBbox[4] / 2 - $msBbox[4] / 2 - $SMALL_SEP / 2, $POSITION_Y_PING_METER, $TEXT_COLOR_PING_METER, $FONT_METER, $ping);
+    imagefttext($im, $FONT_MEASURE_SIZE, 0, $POSITION_X_PING + $pingMeterBbox[4] / 2 + $SMALL_SEP / 2 - $msBbox[4] / 2, $POSITION_Y_PING_MEASURE, $TEXT_COLOR_MEASURE, $FONT_MEASURE, $MS_TEXT);
+    // jitter
+    imagefttext($im, $FONT_LABEL_SIZE, 0, $POSITION_X_JIT - $jitBbox[4] / 2, $POSITION_Y_JIT_LABEL, $TEXT_COLOR_LABEL, $FONT_LABEL, $JIT_TEXT);
+    imagefttext($im, $FONT_METER_SIZE, 0, $POSITION_X_JIT - $jitMeterBbox[4] / 2 - $msBbox[4] / 2 - $SMALL_SEP / 2, $POSITION_Y_JIT_METER, $TEXT_COLOR_JIT_METER, $FONT_METER, $jit);
+    imagefttext($im, $FONT_MEASURE_SIZE, 0, $POSITION_X_JIT + $jitMeterBbox[4] / 2 + $SMALL_SEP / 2 - $msBbox[4] / 2, $POSITION_Y_JIT_MEASURE, $TEXT_COLOR_MEASURE, $FONT_MEASURE, $MS_TEXT);
+    // dl
+    imagefttext($im, $FONT_LABEL_SIZE_BIG, 0, $POSITION_X_DL - $dlBbox[4] / 2, $POSITION_Y_DL_LABEL, $TEXT_COLOR_LABEL, $FONT_LABEL, $DL_TEXT);
+    imagefttext($im, $FONT_METER_SIZE_BIG, 0, $POSITION_X_DL - $dlMeterBbox[4] / 2, $POSITION_Y_DL_METER, $TEXT_COLOR_DL_METER, $FONT_METER, $dl);
+    imagefttext($im, $FONT_MEASURE_SIZE_BIG, 0, $POSITION_X_DL - $mbpsBbox[4] / 2, $POSITION_Y_DL_MEASURE, $TEXT_COLOR_MEASURE, $FONT_MEASURE, $MBPS_TEXT);
+    // ul
+    imagefttext($im, $FONT_LABEL_SIZE_BIG, 0, $POSITION_X_UL - $ulBbox[4] / 2, $POSITION_Y_UL_LABEL, $TEXT_COLOR_LABEL, $FONT_LABEL, $UL_TEXT);
+    imagefttext($im, $FONT_METER_SIZE_BIG, 0, $POSITION_X_UL - $ulMeterBbox[4] / 2, $POSITION_Y_UL_METER, $TEXT_COLOR_UL_METER, $FONT_METER, $ul);
+    imagefttext($im, $FONT_MEASURE_SIZE_BIG, 0, $POSITION_X_UL - $mbpsBbox[4] / 2, $POSITION_Y_UL_MEASURE, $TEXT_COLOR_MEASURE, $FONT_MEASURE, $MBPS_TEXT);
+    // isp
+    imagefttext($im, $FONT_ISP_SIZE, 0, $POSITION_X_ISP, $POSITION_Y_ISP, $TEXT_COLOR_ISP, $FONT_ISP, $ispinfo);
+    // separator
+    imagefilledrectangle($im, 0, $SEPARATOR_Y, $WIDTH, $SEPARATOR_Y, $SEPARATOR_COLOR);
+    // timestamp
+    imagefttext($im, $FONT_TIMESTAMP_SIZE, 0, $POSITION_X_TIMESTAMP, $POSITION_Y_TIMESTAMP, $TEXT_COLOR_TIMESTAMP, $FONT_TIMESTAMP, $timestamp);
+    // watermark
+    imagefttext($im, $FONT_WATERMARK_SIZE, 0, $POSITION_X_WATERMARK, $POSITION_Y_WATERMARK, $TEXT_COLOR_WATERMARK, $FONT_WATERMARK, $WATERMARK_TEXT);
+
+    // send the image to the browser
+    header('Content-Type: image/png');
+    imagepng($im);
+}
+
+$speedtest = getSpeedtestUserById($_GET['id']);
+if (!is_array($speedtest)) {
+    exit(1);
+}
+
+drawImage($speedtest);

results/json.php

@@ -0,0 +1,62 @@
+<?php
+
+error_reporting(0);
+header('Content-Type: application/json; charset=utf-8');
+
+require_once 'telemetry_db.php';
+
+/**
+ * @param int|float $d
+ *
+ * @return string
+ */
+function format($d)
+{
+    if ($d < 10) {
+        return number_format($d, 2, '.', '');
+    }
+    if ($d < 100) {
+        return number_format($d, 1, '.', '');
+    }
+
+    return number_format($d, 0, '.', '');
+}
+
+/**
+ * @param array $speedtest
+ *
+ * @return array
+ */
+function formatSpeedtestData($speedtest)
+{
+    // format values for the image
+    $speedtest['dl'] = format($speedtest['dl']);
+    $speedtest['ul'] = format($speedtest['ul']);
+    $speedtest['ping'] = format($speedtest['ping']);
+    $speedtest['jitter'] = format($speedtest['jitter']);
+    $speedtest['timestamp'] = $speedtest['timestamp'];
+
+    $ispinfo = json_decode($speedtest['ispinfo'], true)['processedString'];
+    $dash = strpos($ispinfo, '-');
+    if ($dash !== false) {
+        $ispinfo = substr($ispinfo, $dash + 2);
+        $par = strrpos($ispinfo, '(');
+        if ($par !== false) {
+            $ispinfo = substr($ispinfo, 0, $par);
+        }
+    } else {
+        $ispinfo = '';
+    }
+
+    $speedtest['ispinfo'] = $ispinfo;
+
+    return $speedtest;
+}
+
+$speedtest = getSpeedtestUserById($_GET['id']);
+if (!is_array($speedtest)) {
+    echo '{}';
+} else {
+    $speedtest = formatSpeedtestData($speedtest);
+    echo json_encode(array('timestamp'=>$speedtest['timestamp'],'download'=>$speedtest['dl'],'upload'=>$speedtest['ul'],'ping'=>$speedtest['ping'],'jitter'=>$speedtest['jitter'],'ispinfo'=>$speedtest['ispinfo']));
+}

results/sanitycheck.php

@@ -0,0 +1,189 @@
+<?php
+require_once 'telemetry_settings.php';
+require_once 'telemetry_db.php';
+require_once '../backend/getIP_util.php';
+
+error_reporting(E_ALL);
+
+$pass="<span class='Pass'>Pass</span>";
+$failed="<span class='Failed'>failed</span>";
+$na="<span class='na'>N/A</span>";
+?>
+
+<html>
+<head>
+<title>Speed Test installation sanity check</title>
+<style>
+	table,th,td { border: 1px solid;}
+	.Pass   { color:green;}
+	.Failed { color:red;}
+	.na     { color:orange;}
+	.SectionHeading { font-style: italic;}
+</style>
+</head>
+<body>
+<table><tr><th>Item</th><th>Status</th><th>Comment</th></tr>
+<tr><td colspan="3" class='SectionHeading'>PHP extensions</td></tr>
+
+<tr><td>gd</td><td>
+<?php
+if(extension_loaded('gd')){
+	echo $pass;
+} else {
+	echo $failed;
+}
+?>
+</td><td>Used to render result images.</td></tr>
+
+<tr><td>openssl</td><td>
+<?php
+if(extension_loaded('openssl')){
+	echo $pass;
+} else {
+	echo $failed;
+}
+?>
+</td><td></td></tr>
+
+<tr><td>pdo_sqlsrv</td><td>
+<?php
+if(!isset($db_type) || $db_type != 'mssql'){
+	echo $na;
+}elseif(extension_loaded('pdo_sqlsrv')){
+	echo $pass;
+} else {
+	echo $failed;
+}
+?>
+</td><td>Only required if using MS SQL.</td></tr>
+
+<tr><td>pdo_mysql</td><td>
+<?php
+if(!isset($db_type) || $db_type != 'mysql'){
+	echo $na;
+}elseif(extension_loaded('pdo_mysql')){
+	echo $pass;
+} else {
+	echo $failed;
+}
+?>
+</td><td>Only required if using mysql.</td></tr>
+
+<tr><td>pdo_sqlite</td><td>
+<?php
+if(!isset($db_type) || $db_type != 'sqlite'){
+	echo $na;
+}elseif(extension_loaded('pdo_sqlite')){
+	echo $pass;
+} else {
+	echo $failed;
+}
+?>
+</td><td>Only required if using sqlite.</td></tr>
+
+
+<tr><td>pdo_pgsql</td><td>
+<?php
+if(!isset($db_type) || $db_type != 'postgresql'){
+	echo $na;
+}elseif(extension_loaded('pdo_pgsql')){
+	echo $pass;
+} else {
+	echo $failed;
+}
+?>
+</td><td>Only required if using postgresql.</td></tr>
+
+
+<tr><td colspan="3" class='SectionHeading'>Database check</td></tr>
+<tr><td>Connecting to DB</td><td>
+<?php
+	$pdo = getPdo(true);
+	if (($pdo instanceof PDO)) {
+		echo $pass;
+		echo "</td><td></td>";
+	} else {
+		echo $failed;
+		echo "</td><td>". htmlspecialchars($pdo) . "</td>";
+	}
+?>
+</tr>
+
+<tr><td>Insert into DB</td><td>
+<?php
+	$ip = getClientIp();
+	$ispinfo="";
+	$extra='{"DBTest":"This is a simple test of the database.  No speed test was done."}';
+	$ua = $_SERVER['HTTP_USER_AGENT'];
+	$lang = '';
+	if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+		$lang = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+	}
+
+	$dl=$ul=$ping=$jitter="";
+	$log="";
+
+	$insertResult = insertSpeedtestUser($ip, $ispinfo, $extra, $ua, $lang, $dl, $ul, $ping, $jitter, $log, true);
+	
+	if(($insertResult instanceof Exception)){
+		echo $failed;
+		echo "</td><td>";
+		echo htmlspecialchars($insertResult->getMessage()) . "</td>";
+	} else {
+		echo $pass;
+		echo "</td><td></td>";
+	}
+?>
+</tr>
+
+<tr><td>Read from DB</td><td>
+<?php
+	if(!($insertResult instanceof Exception)){
+		$QueryResult = getSpeedtestUserById($insertResult,true);
+		
+		if(($QueryResult instanceof Exception)){
+			echo $failed;
+			echo "</td><td>";
+			echo htmlspecialchars($insertResult->getMessage()) . "</td>";
+		} elseif(!is_array($QueryResult)) {
+			echo $failed;
+			echo "</td><td>Test result not retrieved from database.</td>";
+		} else {
+			echo $pass;
+			echo "</td><td></td>";
+		}
+	} else {
+		echo "</td><td>Insert failed so can't test reading inserted data</td>";
+	}
+?>
+</tr>
+
+</table>
+</body>
+</html>
+<?php
+/*
+$speedtests = getLatestSpeedtestUsers();
+print_r ($speedtests);
+
+
+echo '   ';
+print_r($pdo);
+if(!isset($pdo)){
+	echo 'got nothing';
+}
+if($pdo == false){
+	echo 'got a false';
+}
+if (!($pdo instanceof PDO)) {
+    echo 'not a PDO';
+}
+if (($pdo instanceof PDO)) {
+    echo 'is PDO';
+}
+
+
+$speedtest = getSpeedtestUserById(1);
+print_r ($speedtest);
+*/
+?>

results/stats.php

@@ -1,6 +1,10 @@
 <?php
 session_start();
 error_reporting(0);
+
+require 'telemetry_settings.php';
+require_once 'telemetry_db.php';
+
 header('Content-Type: text/html; charset=utf-8');
 header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0, s-maxage=0');
 header('Cache-Control: post-check=0, pre-check=0', false);
@@ -8,163 +12,158 @@ header('Pragma: no-cache');
 ?>
 <!DOCTYPE html>
 <html>
-<head>
-<title>LibreSpeed - Stats</title>
-<style type="text/css">
-	html,body{
-		margin:0;
-		padding:0;
-		border:none;
-		width:100%; min-height:100%;
-	}
-	html{
-		background-color: hsl(198,72%,35%);
-		font-family: "Segoe UI","Roboto",sans-serif;
-	}
-	body{
-		background-color:#FFFFFF;
-		box-sizing:border-box;
-		width:100%;
-		max-width:70em;
-		margin:4em auto;
-		box-shadow:0 1em 6em #00000080;
-		padding:1em 1em 4em 1em;
-		border-radius:0.4em;
-	}
-	h1,h2,h3,h4,h5,h6{
-		font-weight:300;
-		margin-bottom: 0.1em;
-	}
-	h1{
-		text-align:center;
-	}
-	table{
-		margin:2em 0;
-		width:100%;
-	}
-	table, tr, th, td {
-		border: 1px solid #AAAAAA;
-	}
-	th {
-		width: 6em;
-	}
-	td {
-		word-break: break-all;
-	}
-</style>
-</head>
-<body>
-<h1>LibreSpeed - Stats</h1>
-<?php
-include_once("telemetry_settings.php");
-require "idObfuscation.php";
-if($stats_password=="PASSWORD"){
-	?>
-		Please set $stats_password in telemetry_settings.php to enable access.
-	<?php
-}else if($_SESSION["logged"]===true){
-	if($_GET["op"]=="logout"){
-		$_SESSION["logged"]=false;
-		?><script type="text/javascript">window.location=location.protocol+"//"+location.host+location.pathname;</script><?php
-	}else{
-		$conn=null;
-		if($db_type=="mysql"){
-			$conn = new mysqli($MySql_hostname, $MySql_username, $MySql_password, $MySql_databasename);
-		}else if($db_type=="sqlite"){
-			$conn = new PDO("sqlite:$Sqlite_db_file");
-		} else if($db_type=="postgresql"){
-			$conn_host = "host=$PostgreSql_hostname";
-			$conn_db = "dbname=$PostgreSql_databasename";
-			$conn_user = "user=$PostgreSql_username";
-			$conn_password = "password=$PostgreSql_password";
-			$conn = new PDO("pgsql:$conn_host;$conn_db;$conn_user;$conn_password");
-		}else die();
-?>
-	<form action="stats.php" method="GET"><input type="hidden" name="op" value="logout" /><input type="submit" value="Logout" /></form>
-	<form action="stats.php" method="GET">
-		<h3>Search test results</h6>
-		<input type="hidden" name="op" value="id" />
-		<input type="text" name="id" id="id" placeholder="Test ID" value=""/>
-		<input type="submit" value="Find" />
-		<input type="submit" onclick="document.getElementById('id').value=''" value="Show last 100 tests" />
-	</form>
-	<?php
-		$q=null;
-		if($_GET["op"]=="id"&&!empty($_GET["id"])){
-			$id=$_GET["id"];
-			if($enable_id_obfuscation) $id=deobfuscateId($id);
-			if($db_type=="mysql"){
-				$q=$conn->prepare("select id,timestamp,ip,ispinfo,ua,lang,dl,ul,ping,jitter,log,extra from speedtest_users where id=?");
-				$q->bind_param("i",$id);
-				$q->execute();
-				$q->store_result();
-				$q->bind_result($id,$timestamp,$ip,$ispinfo,$ua,$lang,$dl,$ul,$ping,$jitter,$log,$extra);
-			} else if($db_type=="sqlite"||$db_type=="postgresql"){
-				$q=$conn->prepare("select id,timestamp,ip,ispinfo,ua,lang,dl,ul,ping,jitter,log,extra from speedtest_users where id=?");
-				$q->execute(array($id));
-			} else die();
-		}else{
-			if($db_type=="mysql"){
-				$q=$conn->prepare("select id,timestamp,ip,ispinfo,ua,lang,dl,ul,ping,jitter,log,extra from speedtest_users order by timestamp desc limit 0,100");
-				$q->execute();
-				$q->store_result();
-				$q->bind_result($id,$timestamp,$ip,$ispinfo,$ua,$lang,$dl,$ul,$ping,$jitter,$log,$extra);
-			} else if($db_type=="sqlite"||$db_type=="postgresql"){
-				$q=$conn->prepare("select id,timestamp,ip,ispinfo,ua,lang,dl,ul,ping,jitter,log,extra from speedtest_users order by timestamp desc limit 100");
-				$q->execute();
-			}else die();
-		}
-		while(true){
-			$id=null; $timestamp=null; $ip=null; $ispinfo=null; $ua=null; $lang=null; $dl=null; $ul=null; $ping=null; $jitter=null; $log=null; $extra=null;
-			if($db_type=="mysql"){
-				if(!$q->fetch()) break;
-			} else if($db_type=="sqlite"||$db_type=="postgresql"){
-				if(!($row=$q->fetch())) break;
-				$id=$row["id"];
-				$timestamp=$row["timestamp"];
-				$ip=$row["ip"];
-				$ispinfo=$row["ispinfo"];
-				$ua=$row["ua"];
-				$lang=$row["lang"];
-				$dl=$row["dl"];
-				$ul=$row["ul"];
-				$ping=$row["ping"];
-				$jitter=$row["jitter"];
-				$log=$row["log"];
-				$extra=$row["extra"];
-			}else die();
-	?>
-		<table>
-			<tr><th>Test ID</th><td><?=htmlspecialchars(($enable_id_obfuscation?(obfuscateId($id)." (deobfuscated: ".$id.")"):$id), ENT_HTML5, 'UTF-8') ?></td></tr>
-			<tr><th>Date and time</th><td><?=htmlspecialchars($timestamp, ENT_HTML5, 'UTF-8') ?></td></tr>
-			<tr><th>IP and ISP Info</th><td><?=$ip ?><br/><?=htmlspecialchars($ispinfo, ENT_HTML5, 'UTF-8') ?></td></tr>
-			<tr><th>User agent and locale</th><td><?=$ua ?><br/><?=htmlspecialchars($lang, ENT_HTML5, 'UTF-8') ?></td></tr>
-			<tr><th>Download speed</th><td><?=htmlspecialchars($dl, ENT_HTML5, 'UTF-8') ?></td></tr>
-			<tr><th>Upload speed</th><td><?=htmlspecialchars($ul, ENT_HTML5, 'UTF-8') ?></td></tr>
-			<tr><th>Ping</th><td><?=htmlspecialchars($ping, ENT_HTML5, 'UTF-8') ?></td></tr>
-			<tr><th>Jitter</th><td><?=htmlspecialchars($jitter, ENT_HTML5, 'UTF-8') ?></td></tr>
-			<tr><th>Log</th><td><?=htmlspecialchars($log, ENT_HTML5, 'UTF-8') ?></td></tr>
-			<tr><th>Extra info</th><td><?=htmlspecialchars($extra, ENT_HTML5, 'UTF-8') ?></td></tr>
-		</table>
-	<?php
-		}
-	?>
-<?php
-	}
-}else{
-	if($_GET["op"]=="login"&&$_POST["password"]===$stats_password){
-		$_SESSION["logged"]=true;
-		?><script type="text/javascript">window.location=location.protocol+"//"+location.host+location.pathname;</script><?php
-	}else{
-?>
-	<form action="stats.php?op=login" method="POST">
-		<h3>Login</h3>
-		<input type="password" name="password" placeholder="Password" value=""/>
-		<input type="submit" value="Login" />
-	</form>
-<?php
-	}
-}
-?>
-</body>
+    <head>
+        <title>LibreSpeed - Stats</title>
+        <style type="text/css">
+            html,body{
+                margin:0;
+                padding:0;
+                border:none;
+                width:100%; min-height:100%;
+            }
+            html{
+                background-color: hsl(198,72%,35%);
+                font-family: "Segoe UI","Roboto",sans-serif;
+            }
+            body{
+                background-color:#FFFFFF;
+                box-sizing:border-box;
+                width:100%;
+                max-width:70em;
+                margin:4em auto;
+                box-shadow:0 1em 6em #00000080;
+                padding:1em 1em 4em 1em;
+                border-radius:0.4em;
+            }
+            h1,h2,h3,h4,h5,h6{
+                font-weight:300;
+                margin-bottom: 0.1em;
+            }
+            h1{
+                text-align:center;
+            }
+            table{
+                margin:2em 0;
+                width:100%;
+            }
+            table, tr, th, td {
+                border: 1px solid #AAAAAA;
+            }
+            th {
+                width: 6em;
+            }
+            td {
+                word-break: break-all;
+            }
+            div {
+                margin: 1em 0;
+            }
+        </style>
+    </head>
+    <body>
+        <h1>LibreSpeed - Stats</h1>
+        <?php
+        if (!isset($stats_password) || $stats_password === 'PASSWORD') {
+            ?>
+                Please set $stats_password in telemetry_settings.php to enable access.
+            <?php
+        } elseif ($_SESSION['logged'] === true) {
+            if ($_GET['op'] === 'logout') {
+                $_SESSION['logged'] = false;
+                ?><script type="text/javascript">window.location=location.protocol+"//"+location.host+location.pathname;</script><?php
+            } else {
+                ?>
+                <form action="stats.php" method="GET"><input type="hidden" name="op" value="logout" /><input type="submit" value="Logout" /></form>
+                <form action="stats.php" method="GET">
+                    <h3>Search test results</h3>
+                    <input type="hidden" name="op" value="id" />
+                    <input type="text" name="id" id="id" placeholder="Test ID" value=""/>
+                    <input type="submit" value="Find" />
+                    <input type="submit" onclick="document.getElementById('id').value=''" value="Show last 100 tests" />
+                </form>
+                <?php
+                if ($_GET['op'] === 'id' && !empty($_GET['id'])) {
+                    $speedtest = getSpeedtestUserById($_GET['id']);
+                    $speedtests = [];
+                    if (false === $speedtest) {
+                        echo '<div>There was an error trying to fetch the speedtest result for ID "'.htmlspecialchars($_GET['id'], ENT_HTML5, 'UTF-8').'".</div>';
+                    } elseif (null === $speedtest) {
+                        echo '<div>Could not find a speedtest result for ID "'.htmlspecialchars($_GET['id'], ENT_HTML5, 'UTF-8').'".</div>';
+                    } else {
+                        $speedtests = [$speedtest];
+                    }
+                } else {
+                    $speedtests = getLatestSpeedtestUsers();
+                    if (false === $speedtests) {
+                        echo '<div>There was an error trying to fetch latest speedtest results.</div>';
+                    } elseif (empty($speedtests)) {
+                        echo '<div>Could not find any speedtest results in database.</div>';
+                    }
+                }
+                foreach ($speedtests as $speedtest) {
+                    ?>
+                    <table>
+                        <tr>
+                            <th>Test ID</th>
+                            <td><?= htmlspecialchars($speedtest['id_formatted'], ENT_HTML5, 'UTF-8') ?></td>
+                        </tr>
+                        <tr>
+                            <th>Date and time</th>
+                            <td><?= htmlspecialchars($speedtest['timestamp'], ENT_HTML5, 'UTF-8') ?></td>
+                        </tr>
+                        <tr>
+                            <th>IP and ISP Info</th>
+                            <td>
+                                <?= htmlspecialchars($speedtest['ip'], ENT_HTML5, 'UTF-8') ?><br/>
+                                <?= htmlspecialchars($speedtest['ispinfo'], ENT_HTML5, 'UTF-8') ?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>User agent and locale</th>
+                            <td><?= htmlspecialchars($speedtest['ua'], ENT_HTML5, 'UTF-8') ?><br/>
+                                <?= htmlspecialchars($speedtest['lang'], ENT_HTML5, 'UTF-8') ?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>Download speed</th>
+                            <td><?= htmlspecialchars($speedtest['dl'], ENT_HTML5, 'UTF-8') ?></td>
+                        </tr>
+                        <tr>
+                            <th>Upload speed</th>
+                            <td><?= htmlspecialchars($speedtest['ul'], ENT_HTML5, 'UTF-8') ?></td>
+                        </tr>
+                        <tr>
+                            <th>Ping</th>
+                            <td><?= htmlspecialchars($speedtest['ping'], ENT_HTML5, 'UTF-8') ?></td>
+                        </tr>
+                        <tr>
+                            <th>Jitter</th>
+                            <td><?= htmlspecialchars($speedtest['jitter'], ENT_HTML5, 'UTF-8') ?></td>
+                        </tr>
+                        <tr>
+                            <th>Log</th>
+                            <td><?= htmlspecialchars($speedtest['log'], ENT_HTML5, 'UTF-8') ?></td>
+                        </tr>
+                        <tr>
+                            <th>Extra info</th>
+                            <td><?= htmlspecialchars($speedtest['extra'], ENT_HTML5, 'UTF-8') ?></td>
+                        </tr>
+                    </table>
+                    <?php
+                }
+            }
+        } elseif ($_GET['op'] === 'login' && $_POST['password'] === $stats_password) {
+            $_SESSION['logged'] = true;
+            ?><script type="text/javascript">window.location=location.protocol+"//"+location.host+location.pathname;</script><?php
+        } else {
+            ?>
+            <form action="stats.php?op=login" method="POST">
+                <h3>Login</h3>
+                <input type="password" name="password" placeholder="Password" value=""/>
+                <input type="submit" value="Login" />
+            </form>
+            <?php
+        }
+        ?>
+    </body>
 </html>

results/telemetry.php

@@ -1,81 +1,43 @@
 <?php
-include_once('telemetry_settings.php');
-require 'idObfuscation.php';
 
-$ip=($_SERVER['REMOTE_ADDR']);
-$ispinfo=($_POST["ispinfo"]);
-$extra=($_POST["extra"]);
-$ua=($_SERVER['HTTP_USER_AGENT']);
-$lang=""; if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) $lang=($_SERVER['HTTP_ACCEPT_LANGUAGE']);
-$dl=($_POST["dl"]);
-$ul=($_POST["ul"]);
-$ping=($_POST["ping"]);
-$jitter=($_POST["jitter"]);
-$log=($_POST["log"]);
+require 'telemetry_settings.php';
+require_once 'telemetry_db.php';
+require_once '../backend/getIP_util.php';
 
-if($redact_ip_addresses){
-    $ip="0.0.0.0";
-    $ipv4_regex='/(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/';
-    $ipv6_regex='/(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/';
-    $hostname_regex='/"hostname":"([^\\\\"]|\\\\")*"/';
-    $ispinfo=preg_replace($ipv4_regex,"0.0.0.0",$ispinfo);
-    $ispinfo=preg_replace($ipv6_regex,"0.0.0.0",$ispinfo);
-    $ispinfo=preg_replace($hostname_regex,"\"hostname\":\"REDACTED\"",$ispinfo);
-    $log=preg_replace($ipv4_regex,"0.0.0.0",$log);
-    $log=preg_replace($ipv6_regex,"0.0.0.0",$log);
-    $log=preg_replace($hostname_regex,"\"hostname\":\"REDACTED\"",$log);
+$ip = getClientIp();
+$ispinfo = $_POST['ispinfo'];
+$extra = $_POST['extra'];
+$ua = $_SERVER['HTTP_USER_AGENT'];
+$lang = '';
+if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+    $lang = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+}
+$dl = $_POST['dl'];
+$ul = $_POST['ul'];
+$ping = $_POST['ping'];
+$jitter = $_POST['jitter'];
+$log = $_POST['log'];
+
+if (isset($redact_ip_addresses) && true === $redact_ip_addresses) {
+    $ip = '0.0.0.0';
+    $ipv4_regex = '/(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/';
+    $ipv6_regex = '/(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/';
+    $hostname_regex = '/"hostname":"([^\\\\"]|\\\\")*"/';
+    $ispinfo = preg_replace($ipv4_regex, '0.0.0.0', $ispinfo);
+    $ispinfo = preg_replace($ipv6_regex, '0.0.0.0', $ispinfo);
+    $ispinfo = preg_replace($hostname_regex, '"hostname":"REDACTED"', $ispinfo);
+    $log = preg_replace($ipv4_regex, '0.0.0.0', $log);
+    $log = preg_replace($ipv6_regex, '0.0.0.0', $log);
+    $log = preg_replace($hostname_regex, '"hostname":"REDACTED"', $log);
 }
 
 header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0, s-maxage=0');
 header('Cache-Control: post-check=0, pre-check=0', false);
 header('Pragma: no-cache');
 
-if($db_type=="mysql"){
-    $conn = new mysqli($MySql_hostname, $MySql_username, $MySql_password, $MySql_databasename) or die("1");
-    $stmt = $conn->prepare("INSERT INTO speedtest_users (ip,ispinfo,extra,ua,lang,dl,ul,ping,jitter,log) VALUES (?,?,?,?,?,?,?,?,?,?)") or die("2");
-    $stmt->bind_param("ssssssssss",$ip,$ispinfo,$extra,$ua,$lang,$dl,$ul,$ping,$jitter,$log) or die("3");
-	$stmt->execute() or die("4");
-    $stmt->close() or die("5");
-	$id=$conn->insert_id;
-	echo "id ".($enable_id_obfuscation?obfuscateId($id):$id);
-    $conn->close() or die("6");
-
-}elseif($db_type=="sqlite"){
-    $conn = new PDO("sqlite:$Sqlite_db_file") or die("1");
-    $conn->exec("
-        CREATE TABLE IF NOT EXISTS `speedtest_users` (
-        `id`    INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-		`ispinfo`    text,
-		`extra`    text,
-        `timestamp`     timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        `ip`    text NOT NULL,
-        `ua`    text NOT NULL,
-        `lang`  text NOT NULL,
-        `dl`    text,
-        `ul`    text,
-        `ping`  text,
-        `jitter`        text,
-        `log`   longtext
-        );
-    ");
-    $stmt = $conn->prepare("INSERT INTO speedtest_users (ip,ispinfo,extra,ua,lang,dl,ul,ping,jitter,log) VALUES (?,?,?,?,?,?,?,?,?,?)") or die("2");
-    $stmt->execute(array($ip,$ispinfo,$extra,$ua,$lang,$dl,$ul,$ping,$jitter,$log)) or die("3");
-	$id=$conn->lastInsertId();
-	echo "id ".($enable_id_obfuscation?obfuscateId($id):$id);
-    $conn = null;
-}elseif($db_type=="postgresql"){
-    // Prepare connection parameters for db connection
-    $conn_host = "host=$PostgreSql_hostname";
-    $conn_db = "dbname=$PostgreSql_databasename";
-    $conn_user = "user=$PostgreSql_username";
-    $conn_password = "password=$PostgreSql_password";
-    // Create db connection
-    $conn = new PDO("pgsql:$conn_host;$conn_db;$conn_user;$conn_password") or die("1");
-    $stmt = $conn->prepare("INSERT INTO speedtest_users (ip,ispinfo,extra,ua,lang,dl,ul,ping,jitter,log) VALUES (?,?,?,?,?,?,?,?,?,?)") or die("2");
-    $stmt->execute(array($ip,$ispinfo,$extra,$ua,$lang,$dl,$ul,$ping,$jitter,$log)) or die("3");
-	$id=$conn->lastInsertId();
-	echo "id ".($enable_id_obfuscation?obfuscateId($id):$id);
-    $conn = null;
+$id = insertSpeedtestUser($ip, $ispinfo, $extra, $ua, $lang, $dl, $ul, $ping, $jitter, $log);
+if (false === $id) {
+    exit(1);
 }
-else die("-1");
-?>
+
+echo 'id '.$id;

results/telemetry_db.php

@@ -0,0 +1,300 @@
+<?php
+
+require_once 'idObfuscation.php';
+
+define('TELEMETRY_SETTINGS_FILE', 'telemetry_settings.php');
+
+/**
+ * @return PDO|false
+ */
+function getPdo($returnErrorMessage = false)
+{
+    if (
+        !file_exists(TELEMETRY_SETTINGS_FILE)
+        || !is_readable(TELEMETRY_SETTINGS_FILE)
+    ) {
+		if($returnErrorMessage){
+			return 'missing TELEMETRY_SETTINGS_FILE';
+		}
+        return false;
+    }
+
+    require TELEMETRY_SETTINGS_FILE;
+
+    if (!isset($db_type)) {
+		if($returnErrorMessage){
+			return "db_type not set in '" . TELEMETRY_SETTINGS_FILE . "'";
+		}
+        return false;
+    }
+
+    $pdoOptions = [
+        PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
+    ];
+
+    try {
+        if ('mssql' === $db_type) {
+            if (!isset(
+                $MsSql_server,
+                $MsSql_databasename,
+				$MsSql_WindowsAuthentication
+            )) {
+				if($returnErrorMessage){
+					return "Required MSSQL database settings missing in '" . TELEMETRY_SETTINGS_FILE . "'";
+				}
+                return false;
+            }
+			
+			if (!$MsSql_WindowsAuthentication and
+			    !isset(
+						$MsSql_username,
+						$MsSql_password,
+						)
+				) {
+				if($returnErrorMessage){
+					return "Required MSSQL database settings missing in '" . TELEMETRY_SETTINGS_FILE . "'";
+				}
+                return false;
+            }
+            $dsn = 'sqlsrv:'
+                .'server='.$MsSql_server
+                .';Database='.$MsSql_databasename;
+			
+			if($MsSql_TrustServerCertificate === true){
+				$dsn = $dsn . ';TrustServerCertificate=1';
+			}
+			if($MsSql_TrustServerCertificate === false){
+				$dsn = $dsn . ';TrustServerCertificate=0';
+			}
+			
+			if($MsSql_WindowsAuthentication){
+				return new PDO($dsn, "", "", $pdoOptions);
+			} else {
+				return new PDO($dsn, $MySql_username, $MySql_password, $pdoOptions);
+			}
+        }
+
+        if ('mysql' === $db_type) {
+            if (!isset(
+                $MySql_hostname,
+                $MySql_port,
+                $MySql_databasename,
+                $MySql_username,
+                $MySql_password
+            )) {
+                if($returnErrorMessage){
+					return "Required mysql database settings missing in '" . TELEMETRY_SETTINGS_FILE . "'";
+				}
+				return false;
+            }
+
+            $dsn = 'mysql:'
+                .'host='.$MySql_hostname
+                .';port='.$MySql_port
+                .';dbname='.$MySql_databasename;
+
+            return new PDO($dsn, $MySql_username, $MySql_password, $pdoOptions);
+        }
+
+        if ('sqlite' === $db_type) {
+            if (!isset($Sqlite_db_file)) {
+				if($returnErrorMessage){
+					return "Required sqlite database settings missing in '" . TELEMETRY_SETTINGS_FILE . "'";
+				}
+                return false;
+            }
+
+            $pdo = new PDO('sqlite:'.$Sqlite_db_file, null, null, $pdoOptions);
+
+            $pdo->exec('
+                CREATE TABLE IF NOT EXISTS `speedtest_users` (
+                `id`    INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                `ispinfo`    text,
+                `extra`    text,
+                `timestamp`     timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                `ip`    text NOT NULL,
+                `ua`    text NOT NULL,
+                `lang`  text NOT NULL,
+                `dl`    text,
+                `ul`    text,
+                `ping`  text,
+                `jitter`        text,
+                `log`   longtext
+                );
+            ');
+
+            return $pdo;
+        }
+
+        if ('postgresql' === $db_type) {
+            if (!isset(
+                $PostgreSql_hostname,
+                $PostgreSql_databasename,
+                $PostgreSql_username,
+                $PostgreSql_password
+            )) {
+                if($returnErrorMessage){
+					return "Required postgresql database settings missing in '" . TELEMETRY_SETTINGS_FILE . "'";
+				}
+				return false;
+            }
+
+            $dsn = 'pgsql:'
+                .'host='.$PostgreSql_hostname
+                .';dbname='.$PostgreSql_databasename;
+
+            return new PDO($dsn, $PostgreSql_username, $PostgreSql_password, $pdoOptions);
+        }
+    } catch (Exception $e) {
+		if($returnErrorMessage){
+			return $e->getMessage();
+		}
+        return false;
+    }
+
+	if($returnErrorMessage){
+		return "db_type '" . $db_type . "' not supported";
+	}
+    return false;
+}
+
+/**
+ * @return bool
+ */
+function isObfuscationEnabled()
+{
+    require TELEMETRY_SETTINGS_FILE;
+
+    return
+        isset($enable_id_obfuscation)
+        && true === $enable_id_obfuscation;
+}
+
+/**
+ * @return string|false returns the id of the inserted column or false on error if returnErrorMessage is false or a error message if returnErrorMessage is true
+ */
+function insertSpeedtestUser($ip, $ispinfo, $extra, $ua, $lang, $dl, $ul, $ping, $jitter, $log, $returnExceptionOnError = false)
+{
+    $pdo = getPdo();
+    if (!($pdo instanceof PDO)) {
+		if($returnExceptionOnError){
+			return new Exception("Failed to get database connection object");
+		}
+        return false;
+    }
+
+    try {
+        $stmt = $pdo->prepare(
+            'INSERT INTO speedtest_users
+        (ip,ispinfo,extra,ua,lang,dl,ul,ping,jitter,log)
+        VALUES (?,?,?,?,?,?,?,?,?,?)'
+        );
+        $stmt->execute([
+            $ip, $ispinfo, $extra, $ua, $lang, $dl, $ul, $ping, $jitter, $log
+        ]);
+        $id = $pdo->lastInsertId();
+    } catch (Exception $e) {
+		if($returnExceptionOnError){
+			return $e;
+		}
+        return false;
+    }
+
+    if (isObfuscationEnabled()) {
+        return obfuscateId($id);
+    }
+
+    return $id;
+}
+
+/**
+ * @param int|string $id
+ *
+ * @return array|null|false|exception returns the speedtest data as array, null
+ *                          if no data is found for the given id or
+ *                          false or an exception if there was an error (based on returnExceptionOnError)
+ *
+ * @throws RuntimeException
+ */
+function getSpeedtestUserById($id,$returnExceptionOnError = false)
+{
+    $pdo = getPdo();
+    if (!($pdo instanceof PDO)) {
+		if($returnExceptionOnError){
+			return new Exception("Failed to get database connection object");
+		}
+        return false;
+    }
+
+    if (isObfuscationEnabled()) {
+        $id = deobfuscateId($id);
+    }
+
+    try {
+        $stmt = $pdo->prepare(
+            'SELECT
+            id, timestamp, ip, ispinfo, ua, lang, dl, ul, ping, jitter, log, extra
+            FROM speedtest_users
+            WHERE id = :id'
+        );
+        $stmt->bindValue(':id', $id, PDO::PARAM_INT);
+        $stmt->execute();
+        $row = $stmt->fetch(PDO::FETCH_ASSOC);
+    } catch (Exception $e) {
+		if($returnExceptionOnError){
+			return $e;
+		}
+        return false;
+    }
+
+    if (!is_array($row)) {
+        return null;
+    }
+
+    $row['id_formatted'] = $row['id'];
+    if (isObfuscationEnabled()) {
+        $row['id_formatted'] = obfuscateId($row['id']).' (deobfuscated: '.$row['id'].')';
+    }
+
+    return $row;
+}
+
+/**
+ * @return array|false
+ */
+function getLatestSpeedtestUsers()
+{
+    $pdo = getPdo();
+    if (!($pdo instanceof PDO)) {
+        return false;
+    }
+
+    require TELEMETRY_SETTINGS_FILE;
+	
+    try {
+		$sql = 'SELECT ';
+		
+		if('mssql' === $db_type) {$sql .= ' TOP(100) ';}
+		
+		$sql .= ' id, timestamp, ip, ispinfo, ua, lang, dl, ul, ping, jitter, log, extra
+            FROM speedtest_users
+            ORDER BY timestamp DESC ';
+			
+		if('mssql' !== $db_type) {$sql .= ' LIMIT 100 ';}
+		
+        $stmt = $pdo->query($sql);
+
+        $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+        foreach ($rows as $i => $row) {
+            $rows[$i]['id_formatted'] = $row['id'];
+            if (isObfuscationEnabled()) {
+                $rows[$i]['id_formatted'] = obfuscateId($row['id']).' (deobfuscated: '.$row['id'].')';
+            }
+        }
+    } catch (Exception $e) {
+        return false;
+    }
+
+    return $rows;
+}

results/telemetry_mssql.sql

@@ -0,0 +1,30 @@
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+CREATE TABLE [dbo].[speedtest_users](
+	[id] [bigint] IDENTITY(120,1) NOT NULL,
+	[timestamp] [datetime] NOT NULL,
+	[ip] [nvarchar](max) NOT NULL,
+	[ispinfo] [nvarchar](max) NULL,
+	[extra] [nvarchar](max) NULL,
+	[ua] [nvarchar](max) NOT NULL,
+	[lang] [nvarchar](max) NOT NULL,
+	[dl] [nvarchar](max) NULL,
+	[ul] [nvarchar](max) NULL,
+	[ping] [nvarchar](max) NULL,
+	[jitter] [nvarchar](max) NULL,
+	[log] [nvarchar](max) NULL,
+ CONSTRAINT [PK_speedtest_users] PRIMARY KEY CLUSTERED
+(
+	[id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[speedtest_users] ADD  CONSTRAINT [DF_speedtest_users_timestamp]  DEFAULT (getdate()) FOR [timestamp]
+GO
+
+

results/telemetry_mysql.sql

@@ -32,7 +32,7 @@ CREATE TABLE `speedtest_users` (
   `ping` text,
   `jitter` text,
   `log` longtext
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 --
 -- Indexes for dumped tables

results/telemetry_postgresql.sql

@@ -15,14 +15,14 @@ SET client_min_messages = warning;
 SET row_security = off;
 
 --
--- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: 
+-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner:
 --
 
 CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
 
 
 --
--- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: 
+-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner:
 --
 
 COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
@@ -68,7 +68,7 @@ CREATE SEQUENCE speedtest_users_id_seq
     CACHE 1;
 
 -- Commented out the following line because it assumes the user of the speedtest server, @bplower
--- ALTER TABLE speedtest_users_id_seq OWNER TO speedtest; 
+-- ALTER TABLE speedtest_users_id_seq OWNER TO speedtest;
 
 --
 -- Name: speedtest_users_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: speedtest

results/telemetry_settings.php

@@ -1,25 +1,35 @@
 <?php
 
-$db_type="mysql"; //Type of db: "mysql", "sqlite" or "postgresql"
-$stats_password="PASSWORD"; //password to login to stats.php. Change this!!!
-$enable_id_obfuscation=false; //if set to true, test IDs will be obfuscated to prevent users from guessing URLs of other tests
-$redact_ip_addresses=false; //if set to true, IP addresses will be redacted from IP and ISP info fields, as well as the log
+// Type of db: "mssql", "mysql", "sqlite" or "postgresql"
+$db_type = 'mysql';
+// Password to login to stats.php. Change this!!!
+$stats_password = 'PASSWORD';
+// If set to true, test IDs will be obfuscated to prevent users from guessing URLs of other tests
+$enable_id_obfuscation = false;
+// If set to true, IP addresses will be redacted from IP and ISP info fields, as well as the log
+$redact_ip_addresses = false;
 
 // Sqlite3 settings
-$Sqlite_db_file = "../../speedtest_telemetry.sql";
+$Sqlite_db_file = '../../speedtest_telemetry.sql';
+
+// mssql settings
+$MsSql_server = 'DB_HOSTNAME';
+$MsSql_databasename = 'DB_NAME';
+$MsSql_WindowsAuthentication = true;   #true or false
+$MsSql_username = 'USERNAME';          #not used if MsSql_WindowsAuthentication is true
+$MsSql_password = 'PASSWORD';          #not used if MsSql_WindowsAuthentication is true
+$MsSql_TrustServerCertificate = true;  #true, false or comment out for driver default
+#Download driver from https://docs.microsoft.com/en-us/sql/connect/php/download-drivers-php-sql-server?view=sql-server-ver16
 
 // Mysql settings
-$MySql_username="USERNAME";
-$MySql_password="PASSWORD";
-$MySql_hostname="DB_HOSTNAME";
-$MySql_databasename="DB_NAME";
+$MySql_username = 'USERNAME';
+$MySql_password = 'PASSWORD';
+$MySql_hostname = 'DB_HOSTNAME';
+$MySql_databasename = 'DB_NAME';
+$MySql_port = '3306';
 
 // Postgresql settings
-$PostgreSql_username="USERNAME";
-$PostgreSql_password="PASSWORD";
-$PostgreSql_hostname="DB_HOSTNAME";
-$PostgreSql_databasename="DB_NAME";
-
-
-//IMPORTANT: DO NOT ADD ANYTHING BELOW THIS PHP CLOSING TAG, NOT EVEN EMPTY LINES!
-?>
+$PostgreSql_username = 'USERNAME';
+$PostgreSql_password = 'PASSWORD';
+$PostgreSql_hostname = 'DB_HOSTNAME';
+$PostgreSql_databasename = 'DB_NAME';

speedtest.js

@@ -6,15 +6,15 @@
 */
 
 /*
-   This is the main interface between your webpage and the speedtest.
-   It hides the speedtest web worker to the page, and provides many convenient functions to control the test.
-   
+   This is the main interface between your webpage and the speed test.
+   It hides the speed test web worker to the page, and provides many convenient functions to control the test.
+
    The best way to learn how to use this is to look at the basic example, but here's some documentation.
-  
+
    To initialize the test, create a new Speedtest object:
     var s=new Speedtest();
    Now you can think of this as a finite state machine. These are the states (use getState() to see them):
-   - 0: here you can change the speedtest settings (such as test duration) with the setParameter("parameter",value) method. From here you can either start the test using start() (goes to state 3) or you can add multiple test points using addTestPoint(server) or addTestPoints(serverList) (goes to state 1). Additionally, this is the perfect moment to set up callbacks for the onupdate(data) and onend(aborted) events.
+   - 0: here you can change the speed test settings (such as test duration) with the setParameter("parameter",value) method. From here you can either start the test using start() (goes to state 3) or you can add multiple test points using addTestPoint(server) or addTestPoints(serverList) (goes to state 1). Additionally, this is the perfect moment to set up callbacks for the onupdate(data) and onend(aborted) events.
    - 1: here you can add test points. You only need to do this if you want to use multiple test points.
         A server is defined as an object like this:
         {
@@ -27,16 +27,16 @@
         }
         While in state 1, you can only add test points, you cannot change the test settings. When you're done, use selectServer(callback) to select the test point with the lowest ping. This is asynchronous, when it's done, it will call your callback function and move to state 2. Calling setSelectedServer(server) will manually select a server and move to state 2.
     - 2: test point selected, ready to start the test. Use start() to begin, this will move to state 3
-    - 3: test running. Here, your onupdate event calback will be called periodically, with data coming from the worker about speed and progress. A data object will be passed to your onupdate function, with the following items:
-            - dlStatus: download speed in mbps
-            - ulStatus: upload speed in mbps
+    - 3: test running. Here, your onupdate event callback will be called periodically, with data coming from the worker about speed and progress. A data object will be passed to your onupdate function, with the following items:
+            - dlStatus: download speed in Mbit/s
+            - ulStatus: upload speed in Mbit/s
             - pingStatus: ping in ms
             - jitterStatus: jitter in ms
             - dlProgress: progress of the download test as a float 0-1
             - ulProgress: progress of the upload test as a float 0-1
             - pingProgress: progress of the ping/jitter test as a float 0-1
             - testState: state of the test (-1=not started, 0=starting, 1=download test, 2=ping+jitter test, 3=upload test, 4=finished, 5=aborted)
-            - clientIp: IP address of the client performing the test (and optionally ISP and distance) 
+            - clientIp: IP address of the client performing the test (and optionally ISP and distance)
         At the end of the test, the onend function will be called, with a boolean specifying whether the test was aborted or if it ended normally.
         The test can be aborted at any time with abort().
         At the end of the test, it will move to state 4
@@ -46,10 +46,10 @@
 function Speedtest() {
   this._serverList = []; //when using multiple points of test, this is a list of test points
   this._selectedServer = null; //when using multiple points of test, this is the selected server
-  this._settings = {}; //settings for the speedtest worker
+  this._settings = {}; //settings for the speed test worker
   this._state = 0; //0=adding settings, 1=adding servers, 2=server selection done, 3=test running, 4=done
   console.log(
-    "LibreSpeed by Federico Dossena v5.1 - https://github.com/librespeed/speedtest"
+    "LibreSpeed by Federico Dossena v5.3.1 - https://github.com/librespeed/speedtest"
   );
 }
 
@@ -66,13 +66,13 @@ Speedtest.prototype = {
    * - parameter: string with the name of the parameter that you want to set
    * - value: new value for the parameter
    *
-   * Invalid values or nonexistant parameters will be ignored by the speedtest worker.
+   * Invalid values or nonexistant parameters will be ignored by the speed test worker.
    */
   setParameter: function(parameter, value) {
-    if (this._state != 0)
-      throw "You cannot change the test settings after adding server or starting the test";
+    if (this._state == 3)
+      throw "You cannot change the test settings while running the test";
     this._settings[parameter] = value;
-    if(parameter === "temeletry_extra"){
+    if(parameter === "telemetry_extra"){
         this._originalExtra=this._settings.telemetry_extra;
     }
   },
@@ -127,6 +127,40 @@ Speedtest.prototype = {
   addTestPoints: function(list) {
     for (var i = 0; i < list.length; i++) this.addTestPoint(list[i]);
   },
+  /**
+   * Load a JSON server list from URL (multiple points of test)
+   * url: the url where the server list can be fetched. Must be an array with objects containing the following elements:
+   *  {
+   *       "name": "User friendly name",
+   *       "server":"http://yourBackend.com/",   URL to your server. You can specify http:// or https://. If your server supports both, just write // without the protocol
+   *       "dlURL":"garbage.php"   path to garbage.php or its replacement on the server
+   *       "ulURL":"empty.php"   path to empty.php or its replacement on the server
+   *       "pingURL":"empty.php"   path to empty.php or its replacement on the server. This is used to ping the server by this selector
+   *       "getIpURL":"getIP.php"   path to getIP.php or its replacement on the server
+   *   }
+   * result: callback to be called when the list is loaded correctly. An array with the loaded servers will be passed to this function, or null if it failed
+   */
+  loadServerList: function(url,result) {
+    if (this._state == 0) this._state = 1;
+    if (this._state != 1) throw "You can't add a server after server selection";
+    this._settings.mpot = true;
+    var xhr = new XMLHttpRequest();
+    xhr.onload = function(){
+      try{
+        var servers=JSON.parse(xhr.responseText);
+        for(var i=0;i<servers.length;i++){
+          this._checkServerDefinition(servers[i]);
+        }
+        this.addTestPoints(servers);
+        result(servers);
+      }catch(e){
+        result(null);
+      }
+    }.bind(this);
+    xhr.onerror = function(){result(null);}
+    xhr.open("GET",url);
+    xhr.send();
+  },
   /**
    * Returns the selected server (multiple points of test)
    */
@@ -157,9 +191,9 @@ Speedtest.prototype = {
         throw "You can't select a server while the test is running";
     }
     if (this._selectServerCalled) throw "selectServer already called"; else this._selectServerCalled=true;
-    /*this function goes through a list of servers. For each server, the ping is measured, then the server with the function result is called with the best server, or null if all the servers were down.
+    /*this function goes through a list of servers. For each server, the ping is measured, then the server with the function selected is called with the best server, or null if all the servers were down.
      */
-    var select = function(serverList, result) {
+    var select = function(serverList, selected) {
       //pings the specified URL, then calls the function result. Result will receive a parameter which is either the time it took to ping the URL, or -1 if something went wrong.
       var PING_TIMEOUT = 2000;
       var USE_PING_TIMEOUT = true; //will be disabled on unsupported browsers
@@ -167,7 +201,7 @@ Speedtest.prototype = {
         //IE11 doesn't support XHR timeout
         USE_PING_TIMEOUT = false;
       }
-      var ping = function(url, result) {
+      var ping = function(url, rtt) {
         url += (url.match(/\?/) ? "&" : "?") + "cors=true";
         var xhr = new XMLHttpRequest();
         var t = new Date().getTime();
@@ -183,11 +217,11 @@ Speedtest.prototype = {
               if (d <= 0) d = p.duration;
               if (d > 0 && d < instspd) instspd = d;
             } catch (e) {}
-            result(instspd);
-          } else result(-1);
+            rtt(instspd);
+          } else rtt(-1);
         }.bind(this);
         xhr.onerror = function() {
-          result(-1);
+          rtt(-1);
         }.bind(this);
         xhr.open("GET", url);
         if (USE_PING_TIMEOUT) {
@@ -237,7 +271,7 @@ Speedtest.prototype = {
           )
             bestServer = serverList[i];
         }
-        result(bestServer);
+        selected(bestServer);
       }.bind(this);
       var nextServer = function() {
         if (i == serverList.length) {
@@ -296,13 +330,13 @@ Speedtest.prototype = {
         console.error("Speedtest onupdate event threw exception: " + e);
       }
       if (data.testState >= 4) {
+	  clearInterval(this.updater);
+        this._state = 4;
         try {
           if (this.onend) this.onend(data.testState == 5);
         } catch (e) {
           console.error("Speedtest onend event threw exception: " + e);
         }
-        clearInterval(this.updater);
-        this._state = 4;
       }
     }.bind(this);
     this.updater = setInterval(

speedtest_worker.js

@@ -60,11 +60,12 @@ var settings = {
 	garbagePhp_chunkSize: 100, // size of chunks sent by garbage.php (can be different if enable_quirks is active)
 	enable_quirks: true, // enable quirks for specific browsers. currently it overrides settings to optimize for specific browsers, unless they are already being overridden with the start command
 	ping_allowPerformanceApi: true, // if enabled, the ping test will attempt to calculate the ping more precisely using the Performance API. Currently works perfectly in Chrome, badly in Edge, and not at all in Firefox. If Performance API is not supported or the result is obviously wrong, a fallback is provided.
-	overheadCompensationFactor: 1.06, //can be changed to compensatie for transport overhead. (see doc.md for some other values)
+	overheadCompensationFactor: 1.06, //can be changed to compensate for transport overhead. (see doc.md for some other values)
 	useMebibits: false, //if set to true, speed will be reported in mebibits/s instead of megabits/s
 	telemetry_level: 0, // 0=disabled, 1=basic (results only), 2=full (results and timing) 3=debug (results+log)
 	url_telemetry: "results/telemetry.php", // path to the script that adds telemetry data to the database
-	telemetry_extra: "" //extra data that can be passed to the telemetry through the settings
+	telemetry_extra: "", //extra data that can be passed to the telemetry through the settings
+    forceIE11Workaround: false //when set to true, it will force the IE11 upload test on all browsers. Debug only
 };
 
 var xhr = null; // array of currently active xhr requests
@@ -403,8 +404,8 @@ function dlTest(done) {
 				var speed = totLoaded / (t / 1000.0);
 				if (settings.time_auto) {
 					//decide how much to shorten the test. Every 200ms, the test is shortened by the bonusT calculated here
-					var bonus = (6.4 * speed) / 100000;
-					bonusT += bonus > 800 ? 800 : bonus;
+					var bonus = (5.0 * speed) / 100000;
+					bonusT += bonus > 400 ? 400 : bonus;
 				}
 				//update status
 				dlStatus = ((speed * 8 * settings.overheadCompensationFactor) / (settings.useMebibits ? 1048576 : 1000000)).toFixed(2); // speed is multiplied by 8 to go from bytes to bits, overhead compensation is applied, then everything is divided by 1048576 or 1000000 to go to megabits/mebibits
@@ -422,7 +423,7 @@ function dlTest(done) {
 		200
 	);
 }
-// upload test, calls done function whent it's over
+// upload test, calls done function when it's over
 var ulCalled = false; // used to prevent multiple accidental calls to ulTest
 function ulTest(done) {
 	tverb("ulTest");
@@ -473,7 +474,7 @@ function ulTest(done) {
 						}
 					}
 					if (ie11workaround) {
-						// IE11 workarond: xhr.upload does not work properly, therefore we send a bunch of small 256k requests and use the onload event as progress. This is not precise, especially on fast connections
+						// IE11 workaround: xhr.upload does not work properly, therefore we send a bunch of small 256k requests and use the onload event as progress. This is not precise, especially on fast connections
 						xhr[i].onload = xhr[i].onerror = function() {
 							tverb("ul stream progress event (ie11wa)");
 							totLoaded += reqsmall.size;
@@ -523,7 +524,7 @@ function ulTest(done) {
 						xhr[i].send(req);
 					}
 				}.bind(this),
-				1
+				delay
 			);
 		}.bind(this);
 		// open streams
@@ -551,8 +552,8 @@ function ulTest(done) {
 					var speed = totLoaded / (t / 1000.0);
 					if (settings.time_auto) {
 						//decide how much to shorten the test. Every 200ms, the test is shortened by the bonusT calculated here
-						var bonus = (6.4 * speed) / 100000;
-						bonusT += bonus > 800 ? 800 : bonus;
+						var bonus = (5.0 * speed) / 100000;
+						bonusT += bonus > 400 ? 400 : bonus;
 					}
 					//update status
 					ulStatus = ((speed * 8 * settings.overheadCompensationFactor) / (settings.useMebibits ? 1048576 : 1000000)).toFixed(2); // speed is multiplied by 8 to go from bytes to bits, overhead compensation is applied, then everything is divided by 1048576 or 1000000 to go to megabits/mebibits