From 90719f4deb17c8d89d74a7b9872764c1df081f6d Mon Sep 17 00:00:00 2001
From: root
Date: Mon, 17 Feb 2014 20:25:04 +0100
Subject: fixed database setup

---
 www/check.php    | 20 --------------------
 www/invite.php   |  8 ++++++--
 www/register.php |  9 +++++++--
 www/setup.php    | 20 ++++++++++++++++++++
 4 files changed, 33 insertions(+), 24 deletions(-)
 delete mode 100644 www/check.php
 create mode 100644 www/setup.php

diff --git a/www/check.php b/www/check.php
deleted file mode 100644
index 2ff5f52..0000000
--- a/www/check.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?
-$cleartext_password="password";
-$salt = uniqid(mt_rand(), true);
-$password = "$salt"."$cleartext_password";
-$hash_password = md5($password);
-for($i=0;$i<15000;$i++)
-	$hash_password = md5($hash_password);
-
-$db = new SQLite3("../database/sqlite.db");
-
-if($db->exec("CREATE TABLE IF NOT EXISTS user (id INTEGER PRIMARY KEY, name TEXT UIQUE, senpai INTEGER, key TEXT, status INTEGER, invites INTEGER, salt TEXT, password TEXT, email TEXT UNIQUE);") && $db->exec("BEGIN TRANSACTION; INSERT INTO user (id, name, senpai, key, status, invites, salt, password, email) VALUES (NULL, 'admin', 0, '11111', 1, 5, '$salt', '$hash_password', 'admin@iamfabulous.de'); COMMIT;")) {
-	echo "Success!";
-} else {
-	echo "Failure! :( <br>";
-	echo "Salt: $salt, password: $hash_password";
-}
-
-//	INSERT INT0 user (id, name, salt, password, status, invites, email, senpai, key) VALUES (NULL, 'admin', '$salt', '$hash_password', 1, 5, 'admin@iamfabulous.de', 0, '11111');
-
-//	COMMIT;")
diff --git a/www/invite.php b/www/invite.php
index 4a055e3..f77e6f6 100644
--- a/www/invite.php
+++ b/www/invite.php
@@ -41,8 +41,12 @@ if($_SERVER['REQUEST_METHOD'] == 'POST') {
 
 //		$db->exec("INSERT INT0 user (id, name, senpai, key, status, email) VALUES (NULL, '$id', '$key', 0, '$safe_email');");
 //		$db->exec("UPDATE user SET invites='$invite' WHERE id='$id';");
-		if($db->exec("INSERT INTO user (id, name, senpai, key, status, email) VALUES (NULL, NULL, '$id', '$key', 0, '$safe_email');") && $db->exec("UPDATE user SET invites='$invite' WHERE id='$id';"))
-		{
+		if($db->exec("
+			BEGIN TRANSACTION;
+			INSERT INTO user (id, name, senpai, key, status, email) VALUES (NULL, NULL, '$id', '$key', 0, '$safe_email');
+			UPDATE user SET invites='$invite' WHERE id='$id';
+			COMMIT;
+		")){
 			header("Refresh: 0; /invite?reason=success");
 		} else {
 			header("Refresh: 0; /invite?reason=database");
diff --git a/www/register.php b/www/register.php
index 53fb35c..69362ec 100644
--- a/www/register.php
+++ b/www/register.php
@@ -53,8 +53,13 @@ if($_SERVER['REQUEST_METHOD'] == 'POST') {
 		for($i=0;$i<15000;$i++)
 			$hash_password = md5($hash_password);
 
-	        if($db->exec("UPDATE user SET name='$safe_name', salt='$salt', password='$hash_password', status=1, invites=5 WHERE email='$safe_email';") && $db->exec("CREATE TABLE $safe_name (id INTEGER PRIMARY KEY, folder INTEGER, name TEXT, typ TEXT, public TEXT);") && $db->exec("INSERT INTO $safe_name (id, folder, name, typ, public) VALUES (NULL, 0, '/', 'FOLDER', 'HIDDEN');")
-		){
+	        if($db->exec("
+			BEGIN TRANSACTION;
+			UPDATE user SET name='$safe_name', salt='$salt', password='$hash_password', status=1, invites=5 WHERE email='$safe_email';
+			CREATE TABLE $safe_name (id INTEGER PRIMARY KEY, folder INTEGER, name TEXT, typ TEXT, public TEXT);
+			INSERT INTO $safe_name (id, folder, name, typ, public) VALUES (NULL, 0, '/', 'FOLDER', 'HIDDEN');
+			COMMIT;
+		")){
 			$_SESSION["login"] = true;
 			$_SESSION["username"] = $name;
 			header("Refresh: 0; /?reason=registration");
diff --git a/www/setup.php b/www/setup.php
new file mode 100644
index 0000000..2ff5f52
--- /dev/null
+++ b/www/setup.php
@@ -0,0 +1,20 @@
+<?
+$cleartext_password="password";
+$salt = uniqid(mt_rand(), true);
+$password = "$salt"."$cleartext_password";
+$hash_password = md5($password);
+for($i=0;$i<15000;$i++)
+	$hash_password = md5($hash_password);
+
+$db = new SQLite3("../database/sqlite.db");
+
+if($db->exec("CREATE TABLE IF NOT EXISTS user (id INTEGER PRIMARY KEY, name TEXT UIQUE, senpai INTEGER, key TEXT, status INTEGER, invites INTEGER, salt TEXT, password TEXT, email TEXT UNIQUE);") && $db->exec("BEGIN TRANSACTION; INSERT INTO user (id, name, senpai, key, status, invites, salt, password, email) VALUES (NULL, 'admin', 0, '11111', 1, 5, '$salt', '$hash_password', 'admin@iamfabulous.de'); COMMIT;")) {
+	echo "Success!";
+} else {
+	echo "Failure! :( <br>";
+	echo "Salt: $salt, password: $hash_password";
+}
+
+//	INSERT INT0 user (id, name, salt, password, status, invites, email, senpai, key) VALUES (NULL, 'admin', '$salt', '$hash_password', 1, 5, 'admin@iamfabulous.de', 0, '11111');
+
+//	COMMIT;")
-- 
cgit v1.2.3