diff --git a/docs/api/comment.php b/docs/api/comment.php index cf6b4b0..5e67a91 100644 --- a/docs/api/comment.php +++ b/docs/api/comment.php @@ -1,88 +1,92 @@ 1024) { - getOut($postType,$postId); - } - if (is_uploaded_file($_FILES['file']['tmp_name'])) { - $fid = bin2hex(random_bytes(16)); +function post_handler() +{ + global $ref; + global $username; + global $db; + if (!$username || !array_key_exists('post', $_POST)) { + return; + } - $type = pathinfo($_FILES['file']['name'], PATHINFO_EXTENSION); - - $type = strtolower($type); + $postie = $_POST['post']; + $postType = (array_key_exists('type', $_POST)) ? $_POST['type'] : 'root'; + $postId = (array_key_exists('id', $_POST)) ? $_POST['id'] : 'root'; - $mime = mime_content_type('test' . $type); + if (strlen($postie) < 1 || strlen($postie) > 1024) { + getOut($postType, $postId); + } + if (is_uploaded_file($_FILES['file']['tmp_name'])) { + $fid = bin2hex(random_bytes(16)); - $legal = ['png','gif','jpeg','jpg','mp4','webm','mp3','wav']; + $type = pathinfo($_FILES['file']['name'], PATHINFO_EXTENSION); - if (in_array($type, $legal)) { - move_uploaded_file($_FILES['file']['tmp_name'], $_SERVER["DOCUMENT_ROOT"] . '/../docs/pic/' . $fid . '.' . $type); - $postie .= "\nhttps://" . $_SERVER['HTTP_HOST'] . '/pic/' . $fid . '.' . $type; - } - } + $type = strtolower($type); - $poid = bin2hex(random_bytes(16)); - - $stmt = $db->prepare("SELECT * FROM comment WHERE username = ? ORDER BY date DESC"); - $stmt->execute([ - $username - ]); - $userposts = $stmt->fetchAll(PDO::FETCH_DEFAULT); + $mime = mime_content_type('test' . $type); - if ($userposts[0]['date'] - (microtime(true) - $ref) > -3) { - echo "You have been rate limited."; - return; - } + $legal = ['png','gif','jpeg','jpg','mp4','webm','mp3','wav']; + if (in_array($type, $legal)) { + move_uploaded_file($_FILES['file']['tmp_name'], $_SERVER["DOCUMENT_ROOT"] . '/../docs/pic/' . $fid . '.' . $type); + $postie .= "\nhttps://" . $_SERVER['HTTP_HOST'] . '/pic/' . $fid . '.' . $type; + } + } + + $poid = bin2hex(random_bytes(16)); + + $stmt = $db->prepare("SELECT * FROM comment WHERE username = ? ORDER BY date DESC"); + $stmt->execute([ + $username + ]); + $userposts = $stmt->fetchAll(PDO::FETCH_DEFAULT); + + if ($userposts[0]['date'] - (microtime(true) - $ref) > -3) { + echo "You have been rate limited."; + return; + } + + $stmt = $db->prepare("INSERT INTO main.comment (username, targetType, targetId, date, content, id) VALUES (?,?,?,?,?,?)"); + $stmt->execute([$username,$postType,$postId,microtime(true) - $ref,$postie,$poid]); + + $postieP = "https://nbg.dervland.net/comment.php?id=" . $poid; + + + $user10 = ':system'; + if ($postType == 'user') { + $postie = "A user commented on your wall: " . $postieP; $stmt = $db->prepare("INSERT INTO main.comment (username, targetType, targetId, date, content, id) VALUES (?,?,?,?,?,?)"); - $stmt->execute([$username,$postType,$postId,microtime(true) - $ref,$postie,$poid]); + $stmt->execute([$user10,'notification',$postId,microtime(true) - $ref,$postie,bin2hex(random_bytes(16))]); + } elseif ($postType == 'comment') { + $stmt = $db->prepare("SELECT * FROM comment WHERE id = ? ORDER BY date DESC"); + $stmt->execute([ + $postId + ]); + $posts1 = $stmt->fetchAll(PDO::FETCH_DEFAULT); - $postieP = "https://nbg.dervland.net/comment.php?id=" . $poid; + $posts2 = $posts1[0]['username']; + $postie = "A user replied to your post: " . $postieP; + $stmt = $db->prepare("INSERT INTO main.comment (username, targetType, targetId, date, content, id) VALUES (?,?,?,?,?,?)"); + $stmt->execute([$user10,'notification',$posts2,microtime(true) - $ref,$postie,bin2hex(random_bytes(16))]); + } - $user10 = ':system'; - if ($postType == 'user') { - $postie = "A user commented on your wall: " . $postieP; - $stmt = $db->prepare("INSERT INTO main.comment (username, targetType, targetId, date, content, id) VALUES (?,?,?,?,?,?)"); - $stmt->execute([$user10,'notification',$postId,microtime(true) - $ref,$postie,bin2hex(random_bytes(16))]); - } else if ($postType == 'comment') { - $stmt = $db->prepare("SELECT * FROM comment WHERE id = ? ORDER BY date DESC"); - $stmt->execute([ - $postId - ]); - $posts1 = $stmt->fetchAll(PDO::FETCH_DEFAULT); - - $posts2 = $posts1[0]['username']; + getOut($postType, $postId); +} - $postie = "A user replied to your post: " . $postieP; - $stmt = $db->prepare("INSERT INTO main.comment (username, targetType, targetId, date, content, id) VALUES (?,?,?,?,?,?)"); - $stmt->execute([$user10,'notification',$posts2,microtime(true) - $ref,$postie,bin2hex(random_bytes(16))]); - } - - getOut($postType,$postId); - } - - post_handler(); -?> +post_handler(); diff --git a/docs/api/followjson.php b/docs/api/followjson.php index d69a2db..9a0923c 100644 --- a/docs/api/followjson.php +++ b/docs/api/followjson.php @@ -1,16 +1,17 @@ prepare("SELECT * FROM main.follow"); - $stmt->execute([]); - $result = $stmt->fetchAll(PDO::FETCH_DEFAULT); - $result = array_reverse($result,true); +require(__DIR__ . "/../../libs/page.php"); - echo json_encode($result); - } +function get_handler() +{ + global $db; - get_handler(); -?> + $stmt = $db->prepare("SELECT * FROM main.follow"); + $stmt->execute([]); + $result = $stmt->fetchAll(PDO::FETCH_DEFAULT); + $result = array_reverse($result, true); + + echo json_encode($result); +} + +get_handler(); diff --git a/docs/auth.php b/docs/auth.php index 1f995db..2c5d301 100644 --- a/docs/auth.php +++ b/docs/auth.php @@ -1,5 +1,5 @@ diff --git a/docs/comment.php b/docs/comment.php index 4935cb9..1abcdda 100644 --- a/docs/comment.php +++ b/docs/comment.php @@ -1,11 +1,11 @@ +require(__DIR__ . "/../libs/page.php"); +require(__DIR__ . "/../libs/form.php"); +require(__DIR__ . "/../libs/comment.php"); + +$ref = 1732684297; + +page_header(); +comments("comment", $_GET['id']); +page_footer(); diff --git a/docs/css/main.css b/docs/css/main.css index 1c3ddf8..99edeba 100755 --- a/docs/css/main.css +++ b/docs/css/main.css @@ -134,7 +134,8 @@ pre { padding: 10px; margin-bottom: 10px; align-items: center; - width: var(--elem-width); + flex-wrap: wrap; + width: var(--elem-width); border-radius: var(--border-radius); } @@ -186,12 +187,16 @@ iframe { border: none; } +.header a { + width: 60px; +} + .header a, .clickie { text-decoration: none; color: inherit; font-weight: bold; margin: 5px; -display: flex; + display: flex; flex-direction: column; align-items: center; justify-content: center; diff --git a/docs/index.php b/docs/index.php index 1d30edc..0549365 100644 --- a/docs/index.php +++ b/docs/index.php @@ -1,13 +1,13 @@ 0)) { ?> +page_header(); +if (!is_null($username)) { + //comments("root","root"); +} +if (!($_GET['page'] > 0)) { ?> - diff --git a/docs/login.php b/docs/login.php index 74546e8..42e42bf 100755 --- a/docs/login.php +++ b/docs/login.php @@ -1,55 +1,60 @@ prepare("SELECT * FROM main.auth WHERE UPPER(username) LIKE UPPER(?)"); - $stmt->execute([$user]); - - $result = $stmt->fetch(PDO::FETCH_ASSOC); - - if (!$result) return 'Username does not exist.'; - - $verified = password_verify($pass,$result['password']); - - if (!$verified) return 'Password is wrong.'; - - $token = bin2hex(random_bytes(32)); - - $stmt = $db->prepare("INSERT INTO main.token (username, token) VALUES (?, ?)"); - $stmt->execute([$user,$token]); - - setcookie("token", $token, time()+3600*24); - - if (isset($_GET['next'])) { - $gett = htmlspecialchars($_GET['next'] . '?token=' . $token); - echo ""; - page_footer(); - die(); - } - - header("Location: /"); +require(__DIR__ . "/../libs/page.php"); +require(__DIR__ . "/../libs/form.php"); + +function post_handler() +{ + global $db; + + // there is 100% a better way to do this but i need to test + if (!array_key_exists('pass', $_POST) || !array_key_exists('user', $_POST)) { + return ''; + } + + $user = $_POST['user']; + $pass = $_POST['pass']; + + $stmt = $db->prepare("SELECT * FROM main.auth WHERE UPPER(username) LIKE UPPER(?)"); + $stmt->execute([$user]); + + $result = $stmt->fetch(PDO::FETCH_ASSOC); + + if (!$result) { + return 'Username does not exist.'; + } + + $verified = password_verify($pass, $result['password']); + + if (!$verified) { + return 'Password is wrong.'; + } + + $token = bin2hex(random_bytes(32)); + + $stmt = $db->prepare("INSERT INTO main.token (username, token) VALUES (?, ?)"); + $stmt->execute([$user,$token]); + + setcookie("token", $token, time() + 3600 * 24); + + if (isset($_GET['next'])) { + $gett = htmlspecialchars($_GET['next'] . '?token=' . $token); + echo ""; + page_footer(); die(); } - page_header(); - - $form_message = post_handler(); - - form("Log in (Register?)", $form_message, array( - array('key' => 'Username', 'type' => 'text', 'name' => 'user', 'default' => ''), - array('key' => 'Password', 'type' => 'password', 'name' => 'pass', 'default' => '') - )); + header("Location: /"); + die(); +} - page_footer(); -?> +page_header(); + +$form_message = post_handler(); + +form("Log in (Register?)", $form_message, array( + array('key' => 'Username', 'type' => 'text', 'name' => 'user', 'default' => ''), + array('key' => 'Password', 'type' => 'password', 'name' => 'pass', 'default' => '') +)); + +page_footer(); diff --git a/docs/logout.php b/docs/logout.php index 17121a8..6829b22 100755 --- a/docs/logout.php +++ b/docs/logout.php @@ -1,13 +1,12 @@ $value ) - { - setcookie( $key, FALSE ); - } - header("Location: /"); - die(); + +require(__DIR__ . "/../libs/page.php"); +page_header(); +if (isset($_COOKIE)) { + foreach ($_COOKIE as $key => $value) { + setcookie($key, false); } - page_footer(); -?> + header("Location: /"); + die(); +} +page_footer(); diff --git a/docs/meta.php b/docs/meta.php index f7df91c..ba9c6f2 100644 --- a/docs/meta.php +++ b/docs/meta.php @@ -1,61 +1,63 @@ prepare("SELECT * FROM main.user WHERE UPPER(username) LIKE UPPER(?)"); //weirdly, this requires a schema name - $stmt->execute([$user]); - - $result = $stmt->fetch(PDO::FETCH_ASSOC); - - $stmt = $db->prepare("SELECT * FROM main.follow WHERE target = ?"); - $stmt->execute([$user]); - - $following = $stmt->fetchAll(PDO::FETCH_DEFAULT); - - $stmt = $db->prepare("SELECT * FROM main.follow WHERE username = ?"); - $stmt->execute([$user]); - - $followers = $stmt->fetchAll(PDO::FETCH_DEFAULT); +require(__DIR__ . "/../libs/page.php"); +require(__DIR__ . "/../libs/form.php"); +require(__DIR__ . "/../libs/comment.php"); + +$roles = array(); + +page_header(); + +// this is a mess +function get_handler() +{ + global $db; + global $username; + global $user; + global $bio; + global $followers; + global $following; + global $roles; + + // there is 100% a better way to do this but i need to test + if (!array_key_exists('id', $_GET)) { + die(); } - get_handler(); - //todo: rewrite + + $user = $_GET['id']; + + if (array_key_exists('type', $_GET)) { + $type = $_GET['type']; + if ($type == 'follow') { + follow(); + } elseif ($type == 'settings') { + settings(); + } + } + + $stmt = $db->prepare("SELECT * FROM main.user WHERE UPPER(username) LIKE UPPER(?)"); //weirdly, this requires a schema name + $stmt->execute([$user]); + + $result = $stmt->fetch(PDO::FETCH_ASSOC); + + $stmt = $db->prepare("SELECT * FROM main.follow WHERE target = ?"); + $stmt->execute([$user]); + + $following = $stmt->fetchAll(PDO::FETCH_DEFAULT); + + $stmt = $db->prepare("SELECT * FROM main.follow WHERE username = ?"); + $stmt->execute([$user]); + + $followers = $stmt->fetchAll(PDO::FETCH_DEFAULT); +} +get_handler(); +//todo: rewrite ?>

Following

- +
@@ -69,14 +71,15 @@
-

Followers

- +
@@ -90,9 +93,9 @@
- - diff --git a/docs/notif.php b/docs/notif.php index e6f2323..e96fee3 100644 --- a/docs/notif.php +++ b/docs/notif.php @@ -1,11 +1,11 @@ +require(__DIR__ . "/../libs/page.php"); +require(__DIR__ . "/../libs/form.php"); +require(__DIR__ . "/../libs/comment.php"); + +$ref = 1732684297; + +page_header(); +comments("notification", $username, true); +page_footer(); diff --git a/docs/register.php b/docs/register.php index 94425dc..d99c4ed 100755 --- a/docs/register.php +++ b/docs/register.php @@ -1,58 +1,61 @@ 0) { - return 'Username contains invalid characters.'; - } - - if (strlen($user) < 1 || strlen($user) > 32) { - return 'Username is too long or short.'; - } - - $stmt = $db->prepare("SELECT username FROM main.auth WHERE UPPER(username) LIKE UPPER(?)"); - $stmt->execute([$user]); - - $result = $stmt->fetch(PDO::FETCH_ASSOC); - - if ($result) return 'Username is taken.'; - - $hashed = password_hash($pass, PASSWORD_DEFAULT); - - $stmt = $db->prepare("INSERT INTO main.auth (username, password) VALUES (?, ?)"); - $stmt->execute([$user,$hashed]); - - header("Location: /"); - die(); + +require(__DIR__ . "/../libs/page.php"); +require(__DIR__ . "/../libs/form.php"); + +function post_handler() +{ + global $db; + + // there is 100% a better way to do this but i need to test + if (!array_key_exists('pass', $_POST) || !array_key_exists('user', $_POST) || !array_key_exists('pass2', $_POST)) { + return ''; } - page_header(); - - $form_message = post_handler(); - - form("Join", $form_message, array( - array('key' => 'Username', 'type' => 'text', 'name' => 'user', 'default' => ''), - array('key' => 'Password', 'type' => 'password', 'name' => 'pass', 'default' => ''), - array('key' => 'Password (again)', 'type' => 'password', 'name' => 'pass2', 'default' => '') - )); - - page_footer(); -?> + $user = $_POST['user']; + $pass = $_POST['pass']; + $pass2 = $_POST['pass2']; + + preg_match("/[^A-Za-z0-9\-\_]/", $user, $matches); + + if ($pass != $pass2) { + return 'Passwords are not the same.'; + } + + if (isset($matches) && count($matches) > 0) { + return 'Username contains invalid characters.'; + } + + if (strlen($user) < 1 || strlen($user) > 32) { + return 'Username is too long or short.'; + } + + $stmt = $db->prepare("SELECT username FROM main.auth WHERE UPPER(username) LIKE UPPER(?)"); + $stmt->execute([$user]); + + $result = $stmt->fetch(PDO::FETCH_ASSOC); + + if ($result) { + return 'Username is taken.'; + } + + $hashed = password_hash($pass, PASSWORD_DEFAULT); + + $stmt = $db->prepare("INSERT INTO main.auth (username, password) VALUES (?, ?)"); + $stmt->execute([$user,$hashed]); + + header("Location: /"); + die(); +} + +page_header(); + +$form_message = post_handler(); + +form("Join", $form_message, array( + array('key' => 'Username', 'type' => 'text', 'name' => 'user', 'default' => ''), + array('key' => 'Password', 'type' => 'password', 'name' => 'pass', 'default' => ''), + array('key' => 'Password (again)', 'type' => 'password', 'name' => 'pass2', 'default' => '') +)); + +page_footer(); diff --git a/docs/stats.php b/docs/stats.php index da658ce..a8902c0 100755 --- a/docs/stats.php +++ b/docs/stats.php @@ -1,42 +1,52 @@ $b) ? -1 : 1; - } +require(__DIR__ . "/../libs/page.php"); +require(__DIR__ . "/../libs/form.php"); +require(__DIR__ . "/../libs/comment.php"); - page_header(); +function cmp($a, $b) +{ + if ($a == $b) { + return 0; + } + return ($a > $b) ? -1 : 1; +} - function get_handler() { - $api = file_get_contents("https://nbg.dervland.net/node/top?ref=" . $_GET['ref']); - $pr = json_decode($api); - - foreach ($pr as $usern => $rr) { ?> -
-
- -
-
+page_header(); +?> + + + + + $rr) { ?> +
+
+ +
+
- + - -
-
-
-
Power:
-
- +
+
+
+
Power:
+
+ - + diff --git a/docs/tou.php b/docs/tou.php index cedbb9d..22ebae6 100755 --- a/docs/tou.php +++ b/docs/tou.php @@ -1,6 +1,6 @@
diff --git a/docs/user.php b/docs/user.php index 33d6b6d..29abb7c 100755 --- a/docs/user.php +++ b/docs/user.php @@ -1,98 +1,105 @@ prepare("SELECT * FROM main.user WHERE UPPER(username) LIKE UPPER(?)"); //weirdly, this requires a schema name - $stmt->execute([$user]); - - $result = $stmt->fetch(PDO::FETCH_ASSOC); - - $bio = isset($result) ? $result['bio'] : 'This user has not set a bio.'; - - $stmt = $db->prepare("SELECT * FROM main.follow WHERE target = ?"); - $stmt->execute([$user]); - - $following = $stmt->fetchAll(PDO::FETCH_DEFAULT); - - $stmt = $db->prepare("SELECT * FROM main.follow WHERE username = ?"); - $stmt->execute([$user]); - - $followers = $stmt->fetchAll(PDO::FETCH_DEFAULT); - - $stmt = $db->prepare("SELECT * FROM main.role WHERE username = ?"); - $stmt->execute([$user]); - - $roles = $stmt->fetchAll(PDO::FETCH_DEFAULT); +require(__DIR__ . "/../libs/page.php"); +require(__DIR__ . "/../libs/form.php"); +require(__DIR__ . "/../libs/comment.php"); + +$roles = array(); + +page_header(); + +// this is a mess +function get_handler() +{ + global $db; + global $username; + global $user; + global $bio; + global $followers; + global $following; + global $roles; + + // there is 100% a better way to do this but i need to test + if (!array_key_exists('id', $_GET)) { + die(); } - - function follow() { - global $db; - global $username; - global $user; - - $stmt = $db->prepare("SELECT * FROM main.follow WHERE username = ? AND target = ?"); + + $user = $_GET['id']; + + if (array_key_exists('type', $_GET)) { + $type = $_GET['type']; + if ($type == 'follow') { + follow(); + } elseif ($type == 'settings') { + settings(); + } + } + + $stmt = $db->prepare("SELECT * FROM main.user WHERE UPPER(username) LIKE UPPER(?)"); //weirdly, this requires a schema name + $stmt->execute([$user]); + + $result = $stmt->fetch(PDO::FETCH_ASSOC); + + $bio = isset($result) ? $result['bio'] : 'This user has not set a bio.'; + + $stmt = $db->prepare("SELECT * FROM main.follow WHERE target = ?"); + $stmt->execute([$user]); + + $following = $stmt->fetchAll(PDO::FETCH_DEFAULT); + + $stmt = $db->prepare("SELECT * FROM main.follow WHERE username = ?"); + $stmt->execute([$user]); + + $followers = $stmt->fetchAll(PDO::FETCH_DEFAULT); + + $stmt = $db->prepare("SELECT * FROM main.role WHERE username = ?"); + $stmt->execute([$user]); + + $roles = $stmt->fetchAll(PDO::FETCH_DEFAULT); +} + +function follow() +{ + global $db; + global $username; + global $user; + + $stmt = $db->prepare("SELECT * FROM main.follow WHERE username = ? AND target = ?"); + $stmt->execute([$user,$username]); + + $result = $stmt->fetch(PDO::FETCH_ASSOC); + + if (is_null($username)) { + return; + } + + if ($result) { + $stmt = $db->prepare("DELETE FROM main.follow WHERE username = ? AND target = ?"); + $stmt->execute([$user,$username]); + } else { + $stmt = $db->prepare("INSERT INTO main.follow (username,target) VALUES (?,?)"); $stmt->execute([$user,$username]); - - $result = $stmt->fetch(PDO::FETCH_ASSOC); - - if (is_null($username)) return; - - if ($result) { - $stmt = $db->prepare("DELETE FROM main.follow WHERE username = ? AND target = ?"); - $stmt->execute([$user,$username]); - } else { - $stmt = $db->prepare("INSERT INTO main.follow (username,target) VALUES (?,?)"); - $stmt->execute([$user,$username]); - } } - function settings() { - global $db; - global $username; - global $user; - - if (is_null($username)) return; - - $stmt = $db->prepare("DELETE FROM main.user WHERE username = ?"); - $stmt->execute([$username]); - - $stmt = $db->prepare("INSERT INTO main.user (username,bio) VALUES (?,?)"); - $stmt->execute([$username,$_POST['desc']]); - - move_uploaded_file($_FILES['avatar']['tmp_name'], $_SERVER["DOCUMENT_ROOT"] . '/../docs/pfp/' . $username . '.png'); +} +function settings() +{ + global $db; + global $username; + global $user; + + if (is_null($username)) { + return; } - - get_handler(); + + $stmt = $db->prepare("DELETE FROM main.user WHERE username = ?"); + $stmt->execute([$username]); + + $stmt = $db->prepare("INSERT INTO main.user (username,bio) VALUES (?,?)"); + $stmt->execute([$username,$_POST['desc']]); + + move_uploaded_file($_FILES['avatar']['tmp_name'], $_SERVER["DOCUMENT_ROOT"] . '/../docs/pfp/' . $username . '.png'); +} + +get_handler(); ?>
@@ -120,5 +125,5 @@ Replies diff --git a/libs/form.php b/libs/form.php index 9247b91..362227d 100755 --- a/libs/form.php +++ b/libs/form.php @@ -1,5 +1,6 @@ +function form($title, $form_message, $inputs, $action = '') +{ ?>

@@ -8,7 +9,7 @@ + foreach ($inputs as $kv) { ?> diff --git a/libs/markdown.php b/libs/markdown.php index 3938d17..eec5fd0 100755 --- a/libs/markdown.php +++ b/libs/markdown.php @@ -1,43 +1,44 @@
$1
', - '
$1
', - '
$1
', - //'https://studio.penguinmod.com/?#$2', - //'
$1
', - '$0', - '@$1', - '$2', - '$2', - '$2', - '', - '
  • $2
    • ', - '

    $2

    ', - '$4', - '$2' - ); - - $text = preg_replace($search, $replace, $text); - - return $text; - } +function markdown($text) +{ + $search = array( + '~(https://[^.]+\.dervland\.net/[^\s<]+\.(png|jpg|jpeg|gif))~i', + '~(https://[^.]+\.dervland\.net/[^\s<]+\.(mp3|wav))~i', + '~(https://[^.]+\.dervland\.net/[^\s<]+\.(webm|mp4))~i', + //'~(https://studio\.penguinmod\.com/[^\s
    $1
    ', + '
    $1
    ', + '
    $1
    ', + //'https://studio.penguinmod.com/?#$2', + //'
    $1
    ', + '$0', + '@$1', + '$2', + '$2', + '$2', + '', + '
  • $2
    • ', + '

    $2

    ', + '$4', + '$2' + ); + + $text = preg_replace($search, $replace, $text); + + return $text; +} ?> diff --git a/libs/page.php b/libs/page.php index d87096b..81f7494 100755 --- a/libs/page.php +++ b/libs/page.php @@ -1,43 +1,45 @@ prepare("SELECT * FROM comment WHERE targetType = ? AND targetId = ? ORDER BY date DESC"); - $stmt->execute([ - "notification", - $username, - ]); - - $posts2 = $stmt->fetchAll(PDO::FETCH_DEFAULT); + $stmt = $db->prepare("SELECT * FROM comment WHERE targetType = ? AND targetId = ? ORDER BY date DESC"); + $stmt->execute([ + "notification", + $username, + ]); - $edge = count($posts2); - ?> - - - - BiglyChat - - + $posts2 = $stmt->fetchAll(PDO::FETCH_DEFAULT); + $edge = count($posts2); + ?> + + + + BiglyChat + + - - -
    - BiglyChat - - Home - Mail - Leave - - Join - -
    - - - - + +
    + BiglyChat + + Wall + Mail + Users + Leave + + Join +Users + +
    + + + + diff --git a/scripts/init.php b/scripts/init.php index 3eeccfc..7d27613 100755 --- a/scripts/init.php +++ b/scripts/init.php @@ -1,11 +1,11 @@ exec($sql); - - echo "Database was set up."; -?> + +require(__DIR__ . "/../libs/test_secret.php"); + +global $db; + +$sql = file_get_contents('../scripts/init.sql', true); + +$db->exec($sql); + +echo "Database was set up.";