diff options
| author | Horus3 | 2014-02-19 23:27:55 +0100 |
|---|---|---|
| committer | Horus3 | 2014-02-19 23:27:55 +0100 |
| commit | b110f0a266041f035ff1aabe9d8472cddcc6ae5a (patch) | |
| tree | 098dc4dea011764167df29019c784b961526987b | |
| parent | b29e8aebeff94e8831cc0e9462c64ef4baf0643e (diff) | |
| parent | 4c597b669b77d17fa644621573a6ea45cdfbe084 (diff) | |
| download | files.iamfabulous.de-b110f0a266041f035ff1aabe9d8472cddcc6ae5a.tar.gz | |
Merge branch 'master' of git.iamfabulous.de:files.iamfabulous.de
| -rw-r--r-- | www/login.php | 6 | ||||
| -rw-r--r-- | www/setup.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/www/login.php b/www/login.php index ed73bdc..0c6aeb2 100644 --- a/www/login.php +++ b/www/login.php @@ -14,8 +14,8 @@ if($_SERVER['REQUEST_METHOD'] == 'POST') { $username = SQLite3::escapeString("$unsafe_username"); $passwort = SQLite3::escapeString("$unsafe_passwort"); - $db_check = new SQLite3("../database/sqlite.db"); - $salt_db = $db_check->query("SELECT salt FROM user WHERE name='$username';"); + $db = new SQLite3("../database/sqlite.db"); + $salt_db = $db->query("SELECT salt FROM user WHERE name='$username';"); while($salt_array = $salt_db->fetchArray(SQLITE3_NUM)){ foreach($salt_array as $firstelement){ $salt=$firstelement; @@ -27,7 +27,7 @@ if($_SERVER['REQUEST_METHOD'] == 'POST') { for($i=0;$i<15000;$i++) $hash_password = md5($hash_password); - $real_password_db = $db_check->query("SELECT password FROM user WHERE name='$username';"); + $real_password_db = $db->query("SELECT password FROM user WHERE name='$username';"); while($real_password_array = $real_password_db->fetchArray(SQLITE3_NUM)){ foreach($real_password_array as $secondelement){ $real_password=$secondelement; diff --git a/www/setup.php b/www/setup.php index a67bd54..660dc1b 100644 --- a/www/setup.php +++ b/www/setup.php @@ -35,8 +35,8 @@ if($bool){ if($db->exec(" BEGIN TRANSACTION; - 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); - INSERT INTO user (id, name, senpai, key, status, invites, salt, password, email) VALUES (NULL, 'admin', 0, '11111', 1, 5, '$salt', '$hash_password', '$email'); + CREATE TABLE IF NOT EXISTS user (id INTEGER PRIMARY KEY, name TEXT UIQUE, salt TEXT, password TEXT, email TEXT UNIQUE, invites INTEGER, senpai INTEGER, key TEXT, status INTEGER, register TEXT); + INSERT INTO user (id, name, senpai, key, status, invites, salt, password, email, register) VALUES (NULL, 'admin', 0, '11111', 1, 5, '$salt', '$hash_password', '$email', (SELECT datetime()) ); CREATE TABLE IF NOT EXISTS files (id INTEGER PRIMARY KEY, parent INTEGER, owner INTEGER, name TEXT, folder TEXT, mime TEXT, size INTEGER, share TEXT, extra TEXT, FOREIGN KEY(owner) REFERENCES user(id)); CREATE TABLE IF NOT EXISTS log (id INTEGER PRIMARY KEY, user INTEGER, login TEXT, FOREIGN KEY(user) REFERENCES user(id)); COMMIT;") |