From 4889911d4daf76aa4c5fec7a77dd4ea8243d6e3a Mon Sep 17 00:00:00 2001 From: Konrad Meier Date: Mon, 14 Nov 2011 15:26:33 +0100 Subject: merged the website login credentials for mysql to one file. --- Website/devconf.php | 6 +----- Website/insertdevice.php | 6 ++++-- Website/mutexSmartTest.php | 7 +------ Website/mutexTry.php | 5 +---- 4 files changed, 7 insertions(+), 17 deletions(-) (limited to 'Website') diff --git a/Website/devconf.php b/Website/devconf.php index 49e78d6..4f8cede 100644 --- a/Website/devconf.php +++ b/Website/devconf.php @@ -2,17 +2,13 @@ //Connection stuff //DB -$dbhost = 'localhost'; -$dbuser = 'root'; -$dbpass = 'randompasswordSQL'; +include 'dbconnection.php'; //Socket $port = 34500; $ip = 'localhost'; $conn = mysql_connect($dbhost, $dbuser, $dbpass) or die('Error connecting to mysql'); - -$dbname = 'gsmselftesting'; mysql_select_db($dbname); //End of connection stuff include 'mutexFunctions.php'; //mutex functions, isfree, lock and release diff --git a/Website/insertdevice.php b/Website/insertdevice.php index 1b83f65..7875891 100644 --- a/Website/insertdevice.php +++ b/Website/insertdevice.php @@ -1,6 +1,8 @@