From 9efae7c27c34ddf31cc95d3063775dec3f476176 Mon Sep 17 00:00:00 2001
From: Kristan Webb <kristan.webb@bbc.co.uk>
Date: Thu, 11 Jun 2020 14:34:29 +0100
Subject: [PATCH] Add Port option for MySql (#330)

---
 results/index.php              | 2 +-
 results/stats.php              | 2 +-
 results/telemetry.php          | 2 +-
 results/telemetry_settings.php | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/results/index.php b/results/index.php
index b15ba5b..a9dac38 100644
--- a/results/index.php
+++ b/results/index.php
@@ -81,7 +81,7 @@ 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);
+	$conn = new mysqli($MySql_hostname, $MySql_username, $MySql_password, $MySql_databasename, $MySql_port);
 	$q = $conn->prepare("select ispinfo,dl,ul,ping,jitter from speedtest_users where id=?");
 	$q->bind_param("i",$id);
 	$q->execute();
diff --git a/results/stats.php b/results/stats.php
index 834afed..1e6ff1c 100644
--- a/results/stats.php
+++ b/results/stats.php
@@ -69,7 +69,7 @@ if($stats_password=="PASSWORD"){
 	}else{
 		$conn=null;
 		if($db_type=="mysql"){
-			$conn = new mysqli($MySql_hostname, $MySql_username, $MySql_password, $MySql_databasename);
+			$conn = new mysqli($MySql_hostname, $MySql_username, $MySql_password, $MySql_databasename, $MySql_port);
 		}else if($db_type=="sqlite"){
 			$conn = new PDO("sqlite:$Sqlite_db_file");
 		} else if($db_type=="postgresql"){
diff --git a/results/telemetry.php b/results/telemetry.php
index 3163f54..5699777 100644
--- a/results/telemetry.php
+++ b/results/telemetry.php
@@ -31,7 +31,7 @@ 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");
+    $conn = new mysqli($MySql_hostname, $MySql_username, $MySql_password, $MySql_databasename, $MySql_port) 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");
diff --git a/results/telemetry_settings.php b/results/telemetry_settings.php
index c4e87a9..ad80cf3 100644
--- a/results/telemetry_settings.php
+++ b/results/telemetry_settings.php
@@ -13,6 +13,7 @@ $MySql_username="USERNAME";
 $MySql_password="PASSWORD";
 $MySql_hostname="DB_HOSTNAME";
 $MySql_databasename="DB_NAME";
+$MySql_port="3306";
 
 // Postgresql settings
 $PostgreSql_username="USERNAME";
@@ -22,4 +23,4 @@ $PostgreSql_databasename="DB_NAME";
 
 
 //IMPORTANT: DO NOT ADD ANYTHING BELOW THIS PHP CLOSING TAG, NOT EVEN EMPTY LINES!
-?>
+?>
\ No newline at end of file