commit 71cda6d1b7bf5366b2afc0659179f72623becbd0
parent 659fdc49ed45fa5eb01a04d0b02fcd9052cc6ee5
Author: MTRNord <mtrnord1@gmail.com>
Date: Sun, 30 Nov 2014 15:34:25 +0100
update login db connection
Diffstat:
7 files changed, 57 insertions(+), 31 deletions(-)
diff --git a/core/backend/admin/user/login/check_auth.php b/core/backend/admin/user/login/check_auth.php
@@ -4,9 +4,15 @@
* authokay boolean
* authinfo Integer/String if (authokay) { the userid } else { the reason because the auth faild}
*/
+
$authokay = false;
- $verbindung = mysql_connect ("localhost","db_acess", "raspberry") or die ("keine Verbindung möglich. Benutzername oder Passwort sind falsch");
- mysql_select_db("login_sec") or die("db geht nicht");
+ include('../../../../config/connect.db.inc.php');
+ //Check if Database connection established
+ if (mysqli_connect_errno()) {
+ printf("Verbindung fehlgeschlagen: %s\n", mysqli_connect_error());
+ exit();
+ }
+
if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
$ip = $_SERVER['HTTP_CLIENT_IP'];
} elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
@@ -16,8 +22,8 @@
}
$hash=hash('sha512',$_SERVER['HTTP_USER_AGENT'].$ip);
$abfrage = "SELECT id, hash,vaildtime,userid FROM cookiedata WHERE hash = '$hash'";
- $ergebnis = mysql_query($abfrage);
- while($row = mysql_fetch_object($ergebnis)){
+ $ergebnis = mysqli_query($connection, $abfrage);
+ while($row = mysqli_fetch_object($connection, $ergebnis)){
if ($row->hash == $hash){
$id_db = $row->id;
$expirtaion_time=$row->vaildtime;
@@ -27,7 +33,7 @@
$cookie = hash('sha512',$hash.$userid.$expirtaion_time);
if ($expirtaion_time< time()) {
$loeschen = "DELETE FROM acess_data WHERE id = '$id_db'";
- $loesch = mysql_query($loeschen);
+ $loesch = mysqli_query($connection, $loeschen);
$authinfo = 'cookie timeout';
}else{
if ($_COOKIE["acess"] == $cookie) {
diff --git a/core/backend/admin/user/login/del_token.php b/core/backend/admin/user/login/del_token.php
@@ -1,8 +1,12 @@
<?php
$token = $_GET['token'];
- $verbindung = mysql_connect ("localhost","db_acess", "raspberry") or die ("keine Verbindung möglich. Benutzername oder Passwort sind falsch");
- mysql_select_db("login_sec") or die("db geht nicht");
+ include('../../../../config/connect.db.inc.php');
+ //Check if Database connection established
+ if (mysqli_connect_errno()) {
+ printf("Verbindung fehlgeschlagen: %s\n", mysqli_connect_error());
+ exit();
+ }
$loeschen = "DELETE FROM hashtoken WHERE token = '$token'";
- $loesch = mysql_query($loeschen);
+ $loesch = mysqli_query($connection, $loeschen);
header("Location: ./login.php");
?>
diff --git a/core/backend/admin/user/login/login.php b/core/backend/admin/user/login/login.php
@@ -30,12 +30,16 @@
<body>
<div id='token' style="display:none">
<?php
- $verbindung = mysql_connect ("localhost","db_acess", "localhost") or die ("keine Verbindung möglich. Benutzername oder Passwort sind falsch");
- mysql_select_db("login_sec") or die("db geht nicht");
+ include('../../../../config/connect.db.inc.php');
+ //Check if Database connection established
+ if (mysqli_connect_errno()) {
+ printf("Verbindung fehlgeschlagen: %s\n", mysqli_connect_error());
+ exit();
+ }
$token = hash('sha512',rand().time());
$time = time();
$eintrag = "INSERT INTO hashtoken(token, time)VALUES('$token', '$time')";
- $eintragen = mysql_query($eintrag);
+ $eintragen = mysqli_query($connection, $eintrag);
print($token);
?>
</div>
diff --git a/core/backend/admin/user/login/login_handling.php b/core/backend/admin/user/login/login_handling.php
@@ -9,13 +9,17 @@
$user = $_GET['username'];
$hash = $_GET['hash'];
$ga_token_input = $_GET['ga_token'];
- $verbindung = mysql_connect ("localhost","db_acess", "raspberry") or die ("keine Verbindung möglich. Benutzername oder Passwort sind falsch");
- mysql_select_db("login_sec") or die("db geht nicht");
+ include('../../../../config/connect.db.inc.php');
+ //Check if Database connection established
+ if (mysqli_connect_errno()) {
+ printf("Verbindung fehlgeschlagen: %s\n", mysqli_connect_error());
+ exit();
+ }
$token_vaild = false;
$abfrage = "SELECT time,vaild_sec,token FROM hashtoken WHERE token = '$token'";
- $ergebnis = mysql_query($abfrage);
+ $ergebnis = mysqli_query($connection, $abfrage);
- while($row = mysql_fetch_object($ergebnis)){
+ while($row = mysqli_fetch_object($connection, $ergebnis)){
$token_vaild = true;
$creat_time = $row->time;
$vaild_sec = $row->vaild_sec;
@@ -28,11 +32,11 @@
die_back('timeout');
}
$loeschen = "DELETE FROM hashtoken WHERE token = '$token'";
- $loesch = mysql_query($loeschen);
+ $loesch = mysqli_query($connection, $loeschen);
$user_exist = false;
$abfrage = "SELECT name,passwdhash,id,ga_secret FROM user WHERE name = '$user'";
- $ergebnis = mysql_query($abfrage);
- while($row = mysql_fetch_object($ergebnis)){
+ $ergebnis = mysqli_query($connection, $abfrage);
+ while($row = mysqli_fetch_object($connection, $ergebnis)){
$user_exist = true;
$passwdhash = $row->passwdhash;
$userid = $row->id;
@@ -60,8 +64,8 @@
$vorhanden = false;
$abfrage = "SELECT id, hash FROM cookiedata WHERE hash = '$hash'";
- $ergebnis = mysql_query($abfrage);
- while($row = mysql_fetch_object($ergebnis)){
+ $ergebnis = mysqli_query($connection, $abfrage);
+ while($row = mysqli_fetch_object($connection, $ergebnis)){
if ($row->hash == $hash){
$id_cookie = $row->id;
$vorhanden =true;
@@ -72,11 +76,11 @@
$cookie = hash('sha512',$hash.$userid.$expiration_time);
if ($vorhanden){
$aendern = "UPDATE cookiedata Set hash = '$hash', userid = '$userid', vaildtime = '$expiration_time' cookie_hash = '$cookie' WHERE id = '$id_cookie'";
- $update = mysql_query($aendern);
+ $update = mysqli_query($connection, $aendern);
print("update");
} else {
$eintrag = "INSERT INTO cookiedata (hash, userid, vaildtime, cookie_hash) VALUES ('$hash', '$userid', '$expiration_time', '$cookie')";
- $eintragen = mysql_query($eintrag);
+ $eintragen = mysqli_query($connection, $eintrag);
print("new");
}
diff --git a/core/backend/admin/user/login/register_handling.php b/core/backend/admin/user/login/register_handling.php
@@ -8,10 +8,14 @@
$ga_secret = $g->generateSecret();
$username = $_POST['username'];
$passwdhash = hash('sha512',$_POST['passwd'].$username);
- $verbindung = mysql_connect ("localhost","db_acess", "raspberry") or die ("keine Verbindung möglich. Benutzername oder Passwort sind falsch");
- mysql_select_db("login_sec") or die("db geht nicht");
+ include('../../../../config/connect.db.inc.php');
+ //Check if Database connection established
+ if (mysqli_connect_errno()) {
+ printf("Verbindung fehlgeschlagen: %s\n", mysqli_connect_error());
+ exit();
+ }
$eintrag = "INSERT INTO user(name, passwdhash, ga_secret)VALUES('$username', '$passwdhash', '$ga_secret')";
- $eintragen = mysql_query($eintrag);
+ $eintragen = mysqli_query($connection, $eintrag);
print("registiert<br/>");
//*
print "this is your secret for the GoogleAuthenticator: <div id='secret' style='visibility:hidden'>$ga_secret</div> \n";
diff --git a/core/backend/admin/user/login/secret.php b/core/backend/admin/user/login/secret.php
@@ -11,12 +11,16 @@
}
include_once('./GoogleAuthenticator.php');
$g = new GoogleAuthenticator();
- $verbindung = mysql_connect ("localhost","db_acess", "raspberry") or die ("keine Verbindung möglich. Benutzername oder Passwort sind falsch");
- mysql_select_db("login_sec") or die("db geht nicht");
+ include('../../../../config/connect.db.inc.php');
+ //Check if Database connection established
+ if (mysqli_connect_errno()) {
+ printf("Verbindung fehlgeschlagen: %s\n", mysqli_connect_error());
+ exit();
+ }
$user_exist = false;
$abfrage = "SELECT name,ga_secret FROM user WHERE id = '$authinfo'";
- $ergebnis = mysql_query($abfrage);
- while($row = mysql_fetch_object($ergebnis)){
+ $ergebnis = mysqli_query($connection, $abfrage);
+ while($row = mysqli_fetch_object($connection, $ergebnis)){
$user_exist = true;
$username = $row->name;
$ga_secret = $row->ga_secret;
diff --git a/install/generate_configs.php b/install/generate_configs.php
@@ -23,7 +23,7 @@ $filename = '../core/config/connect.db.inc.php';
// #Serverpfad
$db_address = $_POST["db_address"];
$var_str_sp = var_export($db_address, true);
- $var_sp = "<?php\n\n\$db_servername = $var_str_sp;\n";
+ $var_sp = "<?php\n\n\$db_serveraddress = $var_str_sp;\n";
// Schreibe $somecontent in die geöffnete Datei.
if (!fwrite($handle, $var_sp)) {
@@ -71,7 +71,7 @@ $filename = '../core/config/connect.db.inc.php';
print "Fertig, in Datei $filename wurde $var_str_dbn geschrieben";
print "</br>";
// #Funktion der Datenbank
- if (!fwrite($handle, '$connection = mysqli_connect($db_servername, $db_username, $db_password) or die ("Verbindung war nicht möglich");')) {
+ if (!fwrite($handle, '$connection = mysqli_connect($db_serveraddress, $db_username, $db_password) or die ("Verbindung war nicht möglich");')) {
print "Kann in die Datei $filename nicht schreiben";
exit;
}
