diff --git a/Makefile b/Makefile index b57960b..ec3db14 100644 --- a/Makefile +++ b/Makefile @@ -12,3 +12,6 @@ docker-run: data/ FORCE: cp -r src/data ./ chmod 777 data + +docker-run-dev: data/ src/ + docker run -v $(current_dir)src/:/var/www/html/ -v $(current_dir)data/:/var/www/html/data/ -p 8080:80 snuffler/snuffler-web:dev \ No newline at end of file diff --git a/src/inc/database.php b/src/inc/database.php index 2860e86..da03ecb 100755 --- a/src/inc/database.php +++ b/src/inc/database.php @@ -102,7 +102,7 @@ class DataBase extends SQLite3 { function addPersona($userid, $handle, $name, $about=NULL, $colour=NULL) { $id = hexdec(uniqid()); - $sql = "INSERT INTO personas (id, userid, handle, name, colour) VALUES ('$id', '$userid', '$handle', '$about', '$colour');"; + $sql = "INSERT INTO personas (id, userid, handle, name, about, colour) VALUES ('$id', '$userid', '$handle', '$name', '$about', '$colour');"; $ret = $this->exec($sql); if(!$ret) { die($this->lastErrorMsg()); @@ -125,6 +125,9 @@ class DataBase extends SQLite3 { return false; } $dbhash = $ret[0]; + if(!$dbhash) { + return false; + } return password_verify($password, $dbhash); } @@ -192,5 +195,19 @@ class DataBase extends SQLite3 { } return $array; } + + function getPersonas($userid=NULL) { + if(!$userid) { + $userid = $this->getAuthedUserId(); + } + $sql = "SELECT * FROM personas AS persona WHERE userid='$userid' ORDER BY name;"; + + $ret = $this->query($sql); + $array = array(); + while ($row = $ret->fetchArray(SQLITE3_ASSOC)) { + array_push($array, $row); + } + return $array; + } } ?> diff --git a/src/index.php b/src/index.php index 801fb0c..572542d 100755 --- a/src/index.php +++ b/src/index.php @@ -55,12 +55,16 @@ if(!$database) { } else { ?> LOG OUT -
+
- + getPersonas(); + foreach($personas as $persona) { + echo ""; + } + ?>
@@ -80,8 +84,8 @@ $posts = array_reverse($database->getPosts()); foreach($posts as $post) { echo '
'; echo ''; echo '

' . $post["post.text"] . '

'; diff --git a/src/post.php b/src/post.php new file mode 100644 index 0000000..e69d9c0 --- /dev/null +++ b/src/post.php @@ -0,0 +1,14 @@ +getAuthedUserId(); +$persid = $_POST['persona']; // TODO: CHECK OWNERSHIP! (db schema?) +if($userid) { + $db->addPost($_POST['text'], $userid, $persid); +} +header("Location: /"); +?>