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..57f8fc0 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); } diff --git a/src/index.php b/src/index.php index 801fb0c..801e3b0 100755 --- a/src/index.php +++ b/src/index.php @@ -80,8 +80,8 @@ $posts = array_reverse($database->getPosts()); foreach($posts as $post) { echo '
'; echo '
'; - echo '' . $post["user.name"] . ''; - echo '
@' . $post["user.handle"] . ''; + echo $post["user.name"] . ': ' . $post["persona.name"] . ''; + echo '
@' . $post["user.handle"] . '@' . $post["persona.handle"] . ''; echo '
'; echo '

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

';