- ';
-
- return $error_msg;
- }
-
- if ($password && $verify_password) {
- $password_hash = hash('sha256', $password);
- $user = exec_stmt('SELECT user_id, profile_picture FROM user WHERE user_id = ? AND password_hash = ?', 'is', $user_id, $password_hash)->fetch_assoc();
-
- if ($user == null) {
- $error_msg = '
-
- Username and/or Password are invalid!
-
- ';
-
- return $error_msg;
- }
-
- // Hardcoded prevention of deleting the owner's profile picture
- if (!empty($user['profile_picture']) && $user['profile_picture'] != '2025.jpg')
- delete_file($_ENV['PROFILE_IMAGES_FQ_PATH'] . $user['profile_picture']);
-
- exec_stmt('DELETE FROM user WHERE user_id = ?', 'i', $user_id);
- logout();
- } else if ($_SESSION['role_id'] <= admin) {
- $user = exec_stmt('SELECT user_id, profile_picture FROM user WHERE user_id = ?', 'i', $user_id)->fetch_assoc();
-
- if ($user['user_id'] == 2025) {
- $error_msg = '
-
- Cannot delete the owner!
-
- ';
-
- return $error_msg;
- }
-
- // Hardcoded prevention of deleting the owner's profile picture
- if (!empty($user['profile_picture']) && $user['profile_picture'] != '2025.jpg')
- delete_file($_ENV['PROFILE_IMAGES_FQ_PATH'] . $user['profile_picture']);
-
- exec_stmt('DELETE FROM user WHERE user_id = ?', 'i', $user_id);
- }
-}
diff --git a/functions/article_functions.php b/functions/article_functions.php
deleted file mode 100644
index 1d96181..0000000
--- a/functions/article_functions.php
+++ /dev/null
@@ -1,134 +0,0 @@
-query('SELECT article_id FROM article ORDER BY published_at DESC');
- $ids = [];
-
- while ($row = $results->fetch_assoc())
- $ids[] = $row['article_id'];
-
- return $ids;
-}
-
-function article_ids_by_oldest()
-{
- $conn = get_connection();
- $results = $conn->query('SELECT article_id FROM article ORDER BY published_at ASC');
- $ids = [];
-
- while ($row = $results->fetch_assoc())
- $ids[] = $row['article_id'];
-
- return $ids;
-}
-
-function articles_ids_by_author($author_id)
-{
- $results = exec_stmt('SELECT article_id FROM article WHERE author_id = ? ORDER BY published_at DESC', 'i', $author_id);
- $ids = [];
-
- while ($row = $results->fetch_assoc())
- $ids[] = $row['article_id'];
-
- return $ids;
-}
-
-function article_tags()
-{
- $conn = get_connection();
- $results = $conn->query('SELECT * FROM tags');
- $tags = [];
-
- while ($row = $results->fetch_assoc())
- $tags[] = $row;
-
- return $tags;
-}
-
-function article_ids_by_tag($tag)
-{
- $results = exec_stmt('SELECT article_id FROM article WHERE article.article_id IN ( SELECT article_tags.article_id FROM article_tags INNER JOIN tags ON article_tags.tag_id = tags.tag_id WHERE tag = ?) ORDER BY published_at DESC', 's', $tag);
- $ids = [];
-
- while ($row = $results->fetch_assoc())
- $ids[] = $row['article_id'];
-
- return $ids;
-}
-
-function create_article($author_id, $title, $excerpt, $tags, $markdown_file_contents)
-{
- $id = exec_stmt('INSERT INTO article (author_id, title, excerpt, published_at) VALUES (?, ?, ?, CURRENT_TIMESTAMP)', 'iss', $author_id, $title, $excerpt);
-
- $path = $_ENV['ARTICLES_FQ_PATH'] . $id . '/';
- mkdir($path);
-
- $fs = fopen($path . 'article.md', 'a');
- fwrite($fs, $markdown_file_contents);
- fclose($fs);
-
- if (count($tags) > 0) {
- $tag_insert_stmt = 'INSERT INTO article_tags (article_id, tag_id) VALUES ';
- $types = '';
- for ($i = 0; $i < count($tags); $i++) {
- $tag_insert_stmt .= '(' . $id . ', ?)';
-
- if ($i < count($tags) - 1)
- $tag_insert_stmt .= ', ';
-
- $types .= 'i';
- }
-
- exec_stmt($tag_insert_stmt, $types, ...$tags);
- }
-
- return $id;
-}
-
-function update_article($article_id, $title, $excerpt, $tags, $markdown_file_contents)
-{
- exec_stmt('UPDATE article SET title = ?, excerpt = ?, updated_at = CURRENT_TIMESTAMP WHERE article_id = ?', 'ssi', $title, $excerpt, $article_id);
-
- $path = $_ENV['ARTICLES_FQ_PATH'] . $article_id . '/';
- $fs = fopen($path . 'article.md', 'w');
- fwrite($fs, $markdown_file_contents);
- fclose($fs);
-
- exec_stmt('DELETE from article_tags WHERE article_id = ?', 'i', $article_id);
-
- if (count($tags) > 0) {
- $tag_insert_stmt = 'INSERT INTO article_tags (article_id, tag_id) VALUES ';
- $types = '';
- for ($i = 0; $i < count($tags); $i++) {
- $tag_insert_stmt .= '(' . $article_id . ', ?)';
-
- if ($i < count($tags) - 1)
- $tag_insert_stmt .= ', ';
-
- $types .= 'i';
- }
-
- exec_stmt($tag_insert_stmt, $types, ...$tags);
- }
-}
-
-function delete_article($article_id)
-{
- exec_stmt('DELETE FROM article_tags WHERE article_id = ?', 'i', $article_id);
- exec_stmt('DELETE FROM article WHERE article_id = ?', 'i', $article_id);
-
- delete_dir($_ENV['ARTICLES_FQ_PATH'] . $article_id . '/');
-}
-
-function delete_articles_by_author($author_id)
-{
- exec_stmt('DELETE FROM article WHERE author_id = ?', 'i', $author_id);
-}
-
-function increment_read_counter($article_id)
-{
- exec_stmt('UPDATE article SET read_count = read_count + 1 WHERE article_id = ?', 'i', $article_id);
-}
diff --git a/functions/functions.php b/functions/core.php
similarity index 92%
rename from functions/functions.php
rename to functions/core.php
index e0c703d..21041fd 100644
--- a/functions/functions.php
+++ b/functions/core.php
@@ -1,11 +1,30 @@
' . $excerpt . '
';
-
$client = new PostmarkClient($_ENV['POSTMARK_API_TOKEN']);
$client->sendEmail(
diff --git a/functions/db.php b/functions/db.php
index 913114e..0c0b64b 100644
--- a/functions/db.php
+++ b/functions/db.php
@@ -1,7 +1,7 @@
safeLoad();
// Use environment variables for the database password and IP address.
diff --git a/functions/init.php b/functions/init.php
index 917c977..381cd26 100644
--- a/functions/init.php
+++ b/functions/init.php
@@ -5,10 +5,12 @@ header("Content-Security-Policy: default-src 'self' localhost:7477; font-src 'se
// Initialize Composer.
require_once 'vendor/autoload.php';
require_once 'db.php';
-require_once 'account_functions.php';
+require_once 'user.php';
+require_once 'post.php';
+require_once 'spaces.php';
// Load environment variables.
-$dotenv = Dotenv\Dotenv::createImmutable(__DIR__ . '/../');
+$dotenv = Dotenv\Dotenv::createImmutable('/home/jashton/dev/me/weave.space/.env');
$dotenv->safeLoad();
// Set SESSION variable.
@@ -21,9 +23,8 @@ if (!isset($_SESSION['initialized'])) {
}
define('owner', 1);
-define('admin', 2);
-define('contributor', 3);
-define('reader', 4);
+define('developer', 2);
+define('user', 3);
// Update the database and cookies to keep the user logged in.
if (isset($_SESSION['user_id'])) {
diff --git a/functions/post.php b/functions/post.php
new file mode 100644
index 0000000..a983650
--- /dev/null
+++ b/functions/post.php
@@ -0,0 +1,805 @@
+topicId = $topicId;
+ $this->name = $name;
+ }
+
+ public function getId(): int
+ {
+ return $this->topicId;
+ }
+
+ public function getName(): string
+ {
+ return $this->name;
+ }
+}
+
+// -- Post Data Models (as previously defined, with setReadCount in Post) --
+class Post
+{
+ private Space $space;
+ private Author $author;
+ private int $postTypeId;
+ private ?string $title;
+ private ?string $slug;
+ private int $readCount;
+ private ?DateTime $createdAt;
+ private ?DateTime $updatedAt;
+ private ?DateTime $status;
+ private bool $published;
+
+ public function __construct($postArray)
+ {
+ $this->postId = $postArray['postId'];
+ $this->author = $postArray['authorId'];
+ $this->postTypeId = $postArray['postType'];
+ $this->title = $postArray['title'];
+ $this->slug = $postArray['slug'];
+ $this->readCount = 0;
+ $this->status = $postArray['status'];
+ }
+
+ public function getPostId(): int
+ {
+ return $this->postId;
+ }
+
+ public function getAuthor(): Author
+ {
+ return $this->author;
+ }
+
+ public function getPostTypeId(): int
+ {
+ return $this->postTypeId;
+ }
+
+ public function getTitle(): ?string
+ {
+ return $this->title;
+ }
+
+ public function getSlug(): ?string
+ {
+ return $this->slug;
+ }
+
+ public function getReadCount(): int
+ {
+ return $this->readCount;
+ }
+
+ public function getCreatedAt(): ?DateTime
+ {
+ return $this->createdAt;
+ }
+
+ public function getUpdatedAt(): ?DateTime
+ {
+ return $this->updatedAt;
+ }
+
+ public function getStatus(): ?DateTime
+ {
+ return $this->status;
+ }
+
+ public function isPublished(): bool
+ {
+ return $this->published;
+ }
+
+ public function incrementReadCount(): void
+ {
+ $this->readCount++;
+ }
+
+ public function setSlug(?string $slug): void
+ {
+ $this->slug = $slug;
+ }
+
+ public function setStatus(?string $status): void
+ {
+ $this->status = $status;
+ }
+
+ public function setPublished(bool $published): void
+ {
+ $this->published = $published;
+ }
+
+ public function setReadCount(int $count): void
+ {
+ $this->readCount = $count;
+ }
+}
+
+class Essay extends Post
+{
+ private ?string $markdown;
+ private ?string $excerpt;
+ private ?array $files;
+
+ public function __construct(int $postId, Author $author, ?string $title = null, ?string $slug = null, ?string $markdown = null, ?string $excerpt = null, ?array $files = null, ?DateTime $createdAt = null, ?DateTime $updatedAt = null, ?DateTime $publishedAt = null, bool $published = true)
+ {
+ parent::__construct($postId, $author, 1, $title, $slug, $createdAt, $updatedAt, $publishedAt, $published);
+ $this->markdown = $markdown;
+ $this->excerpt = $excerpt;
+ $this->files = $files;
+ }
+
+ public function getMarkdown(): ?string
+ {
+ return $this->markdown;
+ }
+
+ public function getExcerpt(): ?string
+ {
+ return $this->excerpt;
+ }
+
+ public function getFiles(): ?array
+ {
+ return $this->files;
+ }
+
+ public function setMarkdown(?string $markdown): void
+ {
+ $this->markdown = $markdown;
+ }
+
+ public function setExcerpt(?string $excerpt): void
+ {
+ $this->excerpt = $excerpt;
+ }
+
+ public function setFiles(?array $files): void
+ {
+ $this->files = $files;
+ }
+}
+
+class Moment extends Post
+{
+ private ?string $caption;
+ private ?array $images;
+
+ public function __construct(int $postId, Author $author, ?string $caption = null, ?array $images = null, ?DateTime $createdAt = null, ?DateTime $updatedAt = null, ?DateTime $publishedAt = null, bool $published = true)
+ {
+ parent::__construct($postId, $author, 2, null, null, $createdAt, $updatedAt, $publishedAt, $published);
+ $this->caption = $caption;
+ $this->images = $images;
+ }
+
+ public function getCaption(): ?string
+ {
+ return $this->caption;
+ }
+
+ public function getImages(): ?array
+ {
+ return $this->images;
+ }
+
+ public function setCaption(?string $caption): void
+ {
+ $this->caption = $caption;
+ }
+
+ public function setImages(?array $images): void
+ {
+ $this->images = $images;
+ }
+}
+
+class Thought extends Post
+{
+ private ?string $thought;
+
+ public function __construct(int $postId, Author $author, ?string $thought = null, ?DateTime $createdAt = null, ?DateTime $updatedAt = null, ?DateTime $publishedAt = null, bool $published = true)
+ {
+ parent::__construct($postId, $author, 3, null, null, $createdAt, $updatedAt, $publishedAt, $published);
+ $this->thought = $thought;
+ }
+
+ public function getThought(): ?string
+ {
+ return $this->thought;
+ }
+
+ public function setThought(?string $thought): void
+ {
+ $this->thought = $thought;
+ }
+}
+
+// -- Repository for Topics --
+class TopicRepository
+{
+ // No $conn property needed as exec_stmt handles connection
+
+ public function __construct()
+ {
+ // Constructor is now empty
+ }
+
+ public function getAllTopics(): array
+ {
+ $result = exec_stmt('SELECT topic_id, topic FROM topics ORDER BY topic ASC', ''); // No params
+ $topics = [];
+ if ($result instanceof mysqli_result) {
+ while ($row = $result->fetch_assoc()) {
+ $topics[] = new Topic((int) $row['topic_id'], $row['topic']);
+ }
+ $result->free();
+ } else {
+ // exec_stmt for SELECT should return mysqli_result. If not, it's an issue with exec_stmt or query.
+ error_log('TopicRepository::getAllTopics expected mysqli_result, got something else.');
+ }
+ return $topics;
+ }
+
+ public function findById(int $topicId): ?Topic
+ {
+ $result = exec_stmt('SELECT topic_id, topic FROM topics WHERE topic_id = ?', 'i', $topicId);
+ if ($result instanceof mysqli_result) {
+ if ($row = $result->fetch_assoc()) {
+ $result->free();
+ return new Topic((int) $row['topic_id'], $row['topic']);
+ }
+ $result->free();
+ }
+ return null;
+ }
+
+ public function findByName(string $name): ?Topic
+ {
+ $result = exec_stmt('SELECT topic_id, topic FROM topics WHERE topic = ?', 's', $name);
+ if ($result instanceof mysqli_result) {
+ if ($row = $result->fetch_assoc()) {
+ $result->free();
+ return new Topic((int) $row['topic_id'], $row['topic']);
+ }
+ $result->free();
+ }
+ return null;
+ }
+
+ public function findOrCreate(string $name): Topic
+ {
+ $topic = $this->findByName($name);
+ if ($topic) {
+ return $topic;
+ }
+
+ // topics.topic_id is AUTO_INCREMENT, so exec_stmt should return the new ID.
+ $newTopicId = exec_stmt('INSERT INTO topics (topic) VALUES (?)', 's', $name);
+
+ if (is_numeric($newTopicId) && $newTopicId > 0) {
+ return new Topic((int) $newTopicId, $name);
+ }
+ // If $newTopicId is 0 or not numeric, insert failed or exec_stmt behavior is unexpected.
+ throw new \RuntimeException('Failed to create topic or retrieve its ID: ' . $name);
+ }
+}
+
+// -- Repository for Posts --
+class PostRepository
+{
+ private TopicRepository $topicRepository;
+ private string $essayContentPath;
+
+ public function __construct(TopicRepository $topicRepository, string $essayContentPath)
+ {
+ $this->topicRepository = $topicRepository;
+ $this->essayContentPath = rtrim($essayContentPath, '/') . '/';
+ }
+
+ private function getAuthorFromDb(int $authorId): ?Author
+ {
+ $result = exec_stmt('SELECT user_id, username, profile_picture, bio, website FROM user WHERE user_id = ?', 'i', $authorId);
+ if ($result instanceof mysqli_result) {
+ $authorData = $result->fetch_assoc();
+ $result->free();
+ if ($authorData) {
+ return new Author(
+ (int) $authorData['user_id'],
+ $authorData['username'],
+ $authorData['profile_picture'],
+ $authorData['bio'],
+ $authorData['website']
+ );
+ }
+ } else {
+ error_log('PostRepository::getAuthorFromDb expected mysqli_result for author ID: ' . $authorId);
+ }
+ error_log('Author not found with ID: ' . $authorId);
+ return null;
+ }
+
+ private function hydratePost(array $row): ?Post
+ {
+ $author = $this->getAuthorFromDb((int) $row['author_id']);
+ if (!$author)
+ return null;
+
+ $postId = (int) $row['post_id'];
+ $postTypeId = (int) $row['post_type'];
+ $title = $row['title'];
+ $slug = $row['slug'];
+ $readCount = (int) $row['read_count'];
+ $createdAt = $row['created_at'] ? new DateTime($row['created_at']) : null;
+ $updatedAt = $row['updated_at'] ? new DateTime($row['updated_at']) : null;
+ $publishedAt = $row['published_at'] ? new DateTime($row['published_at']) : null;
+ $published = (bool) $row['published'];
+ $post = null;
+
+ switch ($postTypeId) {
+ case 1: // Essay
+ $markdown = $this->getEssayMarkdown($postId);
+ $post = new Essay($postId, $author, $title, $slug, $markdown, $row['excerpt'], null, $createdAt, $updatedAt, $publishedAt, $published);
+ break;
+ case 2: // Moment
+ $post = new Moment($postId, $author, $row['excerpt'], null, $createdAt, $updatedAt, $publishedAt, $published);
+ break;
+ case 3: // Thought
+ $post = new Thought($postId, $author, $row['excerpt'], $createdAt, $updatedAt, $publishedAt, $published);
+ break;
+ default:
+ error_log('Unknown post type ID: ' . $postTypeId);
+ return null;
+ }
+ if ($post)
+ $post->setReadCount($readCount);
+ return $post;
+ }
+
+ // File operations remain unchanged as they don't use the DB connection directly
+ private function getEssayMarkdown(int $postId): ?string
+ { /* ... same as before ... */
+ $filePath = $this->essayContentPath . $postId . '/article.md';
+ if (file_exists($filePath) && is_readable($filePath)) {
+ return file_get_contents($filePath);
+ }
+ return null;
+ }
+
+ private function saveEssayMarkdown(int $postId, string $markdownContent): bool
+ { /* ... same as before ... */
+ $dirPath = $this->essayContentPath . $postId . '/';
+ if (!is_dir($dirPath)) {
+ if (!mkdir($dirPath, 0755, true)) {
+ error_log('Failed to create directory: ' . $dirPath);
+ return false;
+ }
+ }
+ $filePath = $dirPath . 'article.md';
+ if (file_put_contents($filePath, $markdownContent) === false) {
+ error_log('Failed to write markdown file: ' . $filePath);
+ return false;
+ }
+ return true;
+ }
+
+ private function deleteEssayContentDirectory(int $postId): bool
+ { /* ... same as before ... */
+ $dirPath = $this->essayContentPath . $postId . '/';
+ if (!is_dir($dirPath))
+ return true;
+ $files = new RecursiveIteratorIterator(
+ new RecursiveDirectoryIterator($dirPath, RecursiveDirectoryIterator::SKIP_DOTS),
+ RecursiveIteratorIterator::CHILD_FIRST
+ );
+ foreach ($files as $fileinfo) {
+ $todo = ($fileinfo->isDir() ? 'rmdir' : 'unlink');
+ if (!@$todo($fileinfo->getRealPath())) {
+ error_log("Failed to {$todo} {$fileinfo->getRealPath()}");
+ return false;
+ }
+ }
+ if (!@rmdir($dirPath)) {
+ error_log("Failed to remove main directory {$dirPath}");
+ return false;
+ }
+ return true;
+ }
+
+ public function findById(int $postId): ?Post
+ {
+ $result = exec_stmt('SELECT * FROM posts WHERE post_id = ?', 'i', $postId);
+ if ($result instanceof mysqli_result) {
+ $row = $result->fetch_assoc();
+ $result->free();
+ return $row ? $this->hydratePost($row) : null;
+ }
+ error_log('PostRepository::findById expected mysqli_result for post ID: ' . $postId);
+ return null;
+ }
+
+ public function getPostIds(string $orderBy = 'published_at', string $direction = 'DESC'): array
+ {
+ // Basic validation for orderBy and direction
+ $orderBy = preg_replace('/[^a-zA-Z0-9_]/', '', $orderBy); // Basic sanitization
+ $direction = strtoupper($direction) === 'ASC' ? 'ASC' : 'DESC';
+
+ $sql = "SELECT post_id FROM posts ORDER BY $orderBy $direction";
+ $result = exec_stmt($sql, '');
+ $ids = [];
+ if ($result instanceof mysqli_result) {
+ while ($row = $result->fetch_assoc())
+ $ids[] = (int) $row['post_id'];
+ $result->free();
+ } else {
+ error_log('Error in getPostIds: Expected mysqli_result.');
+ }
+ return $ids;
+ }
+
+ public function getAllPosts(string $orderBy = 'published_at', string $direction = 'DESC'): array
+ {
+ $orderBy = preg_replace('/[^a-zA-Z0-9_]/', '', $orderBy);
+ $direction = strtoupper($direction) === 'ASC' ? 'ASC' : 'DESC';
+
+ $sql = "SELECT * FROM posts ORDER BY $orderBy $direction";
+ $result = exec_stmt($sql, '');
+ $posts = [];
+ if ($result instanceof mysqli_result) {
+ while ($row = $result->fetch_assoc()) {
+ if ($postObject = $this->hydratePost($row))
+ $posts[] = $postObject;
+ }
+ $result->free();
+ } else {
+ error_log('Error in getAllPosts: Expected mysqli_result.');
+ }
+ return $posts;
+ }
+
+ public function getPostIdsByAuthor(int $authorId, string $orderBy = 'published_at', string $direction = 'DESC'): array
+ {
+ $orderBy = preg_replace('/[^a-zA-Z0-9_]/', '', $orderBy);
+ $direction = strtoupper($direction) === 'ASC' ? 'ASC' : 'DESC';
+
+ $sql = "SELECT post_id FROM posts WHERE author_id = ? ORDER BY $orderBy $direction";
+ $result = exec_stmt($sql, 'i', $authorId);
+ $ids = [];
+ if ($result instanceof mysqli_result) {
+ while ($row = $result->fetch_assoc())
+ $ids[] = (int) $row['post_id'];
+ $result->free();
+ } else {
+ error_log('Error in getPostIdsByAuthor: Expected mysqli_result.');
+ }
+ return $ids;
+ }
+
+ public function getPostsByAuthor(int $authorId, string $orderBy = 'published_at', string $direction = 'DESC'): array
+ {
+ $orderBy = preg_replace('/[^a-zA-Z0-9_.]/', '', $orderBy); // Allow dot for aliased columns
+ $direction = strtoupper($direction) === 'ASC' ? 'ASC' : 'DESC';
+
+ $sql = "SELECT * FROM posts WHERE author_id = ? ORDER BY $orderBy $direction";
+ $result = exec_stmt($sql, 'i', $authorId);
+ $posts = [];
+ if ($result instanceof mysqli_result) {
+ while ($row = $result->fetch_assoc()) {
+ if ($postObject = $this->hydratePost($row))
+ $posts[] = $postObject;
+ }
+ $result->free();
+ } else {
+ error_log('Error in getPostsByAuthor: Expected mysqli_result.');
+ }
+ return $posts;
+ }
+
+ public function getPostIdsByTopicName(string $topicName, string $orderBy = 'p.published_at', string $direction = 'DESC'): array
+ {
+ $orderBy = preg_replace('/[^a-zA-Z0-9_.]/', '', $orderBy);
+ $direction = strtoupper($direction) === 'ASC' ? 'ASC' : 'DESC';
+
+ $sql = "SELECT p.post_id FROM posts p
+ INNER JOIN post_topics pt ON p.post_id = pt.post_id
+ INNER JOIN topics t ON pt.topic_id = t.topic_id
+ WHERE t.topic = ?
+ ORDER BY $orderBy $direction";
+ $result = exec_stmt($sql, 's', $topicName);
+ $ids = [];
+ if ($result instanceof mysqli_result) {
+ while ($row = $result->fetch_assoc())
+ $ids[] = (int) $row['post_id'];
+ $result->free();
+ } else {
+ error_log('Error in getPostIdsByTopicName: Expected mysqli_result.');
+ }
+ return $ids;
+ }
+
+ public function getPostsByTopicName(string $topicName, string $orderBy = 'p.published_at', string $direction = 'DESC'): array
+ {
+ $orderBy = preg_replace('/[^a-zA-Z0-9_.]/', '', $orderBy);
+ $direction = strtoupper($direction) === 'ASC' ? 'ASC' : 'DESC';
+
+ $sql = "SELECT p.* FROM posts p
+ INNER JOIN post_topics pt ON p.post_id = pt.post_id
+ INNER JOIN topics t ON pt.topic_id = t.topic_id
+ WHERE t.topic = ?
+ ORDER BY $orderBy $direction";
+ $result = exec_stmt($sql, 's', $topicName);
+ $posts = [];
+ if ($result instanceof mysqli_result) {
+ while ($row = $result->fetch_assoc()) {
+ if ($postObject = $this->hydratePost($row))
+ $posts[] = $postObject;
+ }
+ $result->free();
+ } else {
+ error_log('Error in getPostsByTopicName: Expected mysqli_result.');
+ }
+ return $posts;
+ }
+
+ private function updatePostTopics(int $postId, array $topicNames): void
+ {
+ // Delete existing topics for the post
+ // exec_stmt returns 0 for successful DELETE. No direct success check here.
+ exec_stmt('DELETE FROM post_topics WHERE post_id = ?', 'i', $postId);
+
+ if (empty($topicNames))
+ return;
+
+ // Batch insert is harder with this exec_stmt. Doing one by one.
+ // This is inefficient but simpler with the current exec_stmt.
+ foreach ($topicNames as $name) {
+ $topicObj = $this->topicRepository->findOrCreate(trim($name));
+ // post_topics has no auto-increment, exec_stmt will return 0 for success.
+ exec_stmt('INSERT INTO post_topics (post_id, topic_id) VALUES (?, ?)', 'ii', $postId, $topicObj->getId());
+ }
+ }
+
+ public function createPost(Post $post, array $topicNames = []): ?Post
+ {
+ // WARNING: No transaction possible with the provided exec_stmt for multi-step operations.
+ // Each exec_stmt is its own transaction.
+ try {
+ $sql = 'INSERT INTO posts (post_id, author_id, post_type, title, slug, read_count, created_at, updated_at, published_at, published, excerpt)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
+
+ $postIdVal = $post->getPostId();
+ $authorId = $post->getAuthor()->getUserId();
+ $postTypeId = $post->getPostTypeId();
+ $title = $post->getTitle();
+ $slug = $post->getSlug();
+ $readCount = $post->getReadCount();
+ $createdAtDb = $post->getCreatedAt() ? $post->getCreatedAt()->format('Y-m-d H:i:s') : (new DateTime())->format('Y-m-d H:i:s');
+ $updatedAtDb = $post->getUpdatedAt() ? $post->getUpdatedAt()->format('Y-m-d H:i:s') : (new DateTime())->format('Y-m-d H:i:s');
+ $publishedAtDb = $post->getPublishedAt() ? $post->getPublishedAt()->format('Y-m-d H:i:s') : null;
+ $published = (int) $post->isPublished();
+ $excerpt = null;
+ if ($post instanceof Essay)
+ $excerpt = $post->getExcerpt();
+ elseif ($post instanceof Moment)
+ $excerpt = $post->getCaption();
+ elseif ($post instanceof Thought)
+ $excerpt = $post->getThought();
+
+ // For INSERT on `posts` (no auto-increment PK), exec_stmt returns 0 on success.
+ $insertResult = exec_stmt(
+ $sql,
+ 'iiississsis',
+ $postIdVal,
+ $authorId,
+ $postTypeId,
+ $title,
+ $slug,
+ $readCount,
+ $createdAtDb,
+ $updatedAtDb,
+ $publishedAtDb,
+ $published,
+ $excerpt
+ );
+
+ // We can't reliably check $insertResult for success of this specific insert.
+ // Assume success if no PHP error/exception was thrown by exec_stmt (though it doesn't throw).
+
+ if ($post instanceof Essay && $post->getMarkdown() !== null) {
+ if (!$this->saveEssayMarkdown($postIdVal, $post->getMarkdown())) {
+ // Rollback is not possible. Log error.
+ error_log('Failed to save essay markdown for post ID: ' . $postIdVal . '. DB insert was separate.');
+ // Potentially delete the created post record if consistency is critical, but that's complex.
+ }
+ }
+ $this->updatePostTopics($postIdVal, $topicNames); // Also not part of a transaction
+ return $this->findById($postIdVal);
+ } catch (\Exception $e) { // Catch any exceptions from our code, not exec_stmt
+ error_log("Error creating post (ID: {$post->getPostId()}): " . $e->getMessage());
+ return null;
+ }
+ }
+
+ public function updatePost(Post $post, array $topicNames = []): ?Post
+ {
+ // WARNING: No transaction possible.
+ try {
+ $sql = 'UPDATE posts SET author_id = ?, post_type = ?, title = ?, slug = ?,
+ updated_at = CURRENT_TIMESTAMP, published_at = ?, published = ?, excerpt = ?
+ WHERE post_id = ?';
+
+ $authorId = $post->getAuthor()->getUserId();
+ $postTypeId = $post->getPostTypeId();
+ $title = $post->getTitle();
+ $slug = $post->getSlug();
+ $publishedAtDb = $post->getPublishedAt() ? $post->getPublishedAt()->format('Y-m-d H:i:s') : null;
+ $published = (int) $post->isPublished();
+ $postIdVal = $post->getPostId();
+ $excerpt = null;
+ if ($post instanceof Essay)
+ $excerpt = $post->getExcerpt();
+ elseif ($post instanceof Moment)
+ $excerpt = $post->getCaption();
+ elseif ($post instanceof Thought)
+ $excerpt = $post->getThought();
+
+ // exec_stmt returns 0 for successful UPDATE.
+ exec_stmt(
+ $sql,
+ 'iisssisi',
+ $authorId,
+ $postTypeId,
+ $title,
+ $slug,
+ $publishedAtDb,
+ $published,
+ $excerpt,
+ $postIdVal
+ );
+
+ if ($post instanceof Essay && $post->getMarkdown() !== null) {
+ if (!$this->saveEssayMarkdown($postIdVal, $post->getMarkdown())) {
+ error_log('Failed to save essay markdown for post ID: ' . $postIdVal . ' during update.');
+ }
+ }
+ $this->updatePostTopics($postIdVal, $topicNames);
+ return $this->findById($postIdVal);
+ } catch (\Exception $e) {
+ error_log("Error updating post (ID: {$post->getPostId()}): " . $e->getMessage());
+ return null;
+ }
+ }
+
+ /**
+ * Deletes a post.
+ * WARNING: Due to exec_stmt, this is not a transactional operation.
+ * Success of individual DB deletions is not reliably checkable.
+ * This method attempts the operations and logs errors.
+ * Consider changing return type to void as boolean success is ambiguous.
+ */
+ public function deletePost(int $postId): void
+ {
+ try {
+ $postDataResult = exec_stmt('SELECT post_type FROM posts WHERE post_id = ?', 'i', $postId);
+ $postType = null;
+ if ($postDataResult instanceof mysqli_result && $row = $postDataResult->fetch_assoc()) {
+ $postType = (int) $row['post_type'];
+ $postDataResult->free();
+ }
+
+ exec_stmt('DELETE FROM post_topics WHERE post_id = ?', 'i', $postId);
+ exec_stmt('DELETE FROM posts WHERE post_id = ?', 'i', $postId);
+ // Cannot reliably check if the above deletes were successful or affected rows.
+
+ if ($postType === 1) { // Essay
+ if (!$this->deleteEssayContentDirectory($postId)) {
+ error_log('Failed to delete essay content directory for post ID: ' . $postId);
+ }
+ }
+ } catch (\Exception $e) {
+ error_log("Error during deletePost for ID $postId: " . $e->getMessage());
+ // Depending on desired behavior, re-throw or handle
+ }
+ }
+
+ /**
+ * Deletes posts by author.
+ * WARNING: Not transactional. Returns void as count of deleted posts cannot be reliably obtained from exec_stmt.
+ */
+ public function deletePostsByAuthor(int $authorId): void
+ {
+ try {
+ $result = exec_stmt('SELECT post_id, post_type FROM posts WHERE author_id = ?', 'i', $authorId);
+ $postsToDelete = [];
+ if ($result instanceof mysqli_result) {
+ while ($row = $result->fetch_assoc())
+ $postsToDelete[] = $row;
+ $result->free();
+ } else {
+ error_log("Failed to fetch posts for deletion by author ID: $authorId");
+ return; // Exit if we can't get the list of posts
+ }
+
+ foreach ($postsToDelete as $postInfo) {
+ if ((int) $postInfo['post_type'] === 1) { // Essay
+ if (!$this->deleteEssayContentDirectory((int) $postInfo['post_id'])) {
+ error_log('Failed to delete essay content for post ' . $postInfo['post_id'] . ' during mass delete by author.');
+ }
+ }
+ // Handle Moment image deletion if any
+ }
+
+ // Must delete from child table `post_topics` first if no ON DELETE CASCADE, or if ensuring order.
+ // This is more complex with joins if exec_stmt doesn't handle it well.
+ // Simpler: iterate and delete topics for each post_id, or a broader delete.
+ foreach ($postsToDelete as $postInfo) {
+ exec_stmt('DELETE FROM post_topics WHERE post_id = ?', 'i', (int) $postInfo['post_id']);
+ }
+ exec_stmt('DELETE FROM posts WHERE author_id = ?', 'i', $authorId);
+ // Cannot get actual deleted count.
+ } catch (\Exception $e) {
+ error_log("Error deleting posts by author (ID: $authorId): " . $e->getMessage());
+ }
+ }
+
+ /**
+ * Increments read count for a post.
+ * WARNING: Success of the UPDATE is not reliably checkable with current exec_stmt.
+ */
+ public function incrementReadCount(int $postId): void
+ {
+ // exec_stmt returns 0 for successful UPDATE.
+ exec_stmt('UPDATE posts SET read_count = read_count + 1 WHERE post_id = ?', 'i', $postId);
+ // No easy way to confirm success with current exec_stmt.
+ }
+}
+
+// Example Usage (Illustrative - this would go in your controller/logic files)
+
+/*
+ * $topicRepo = new TopicRepository();
+ * // Ensure $_ENV['ESSAY_CONTENT_PATH'] is set in your environment/config
+ * $essayPath = $_ENV['ESSAY_CONTENT_PATH'] ?? '/path/to/your/site/public/essays';
+ * $postRepo = new PostRepository($topicRepo, $essayPath);
+ *
+ * // --- Fetching Posts ---
+ * // $allPosts = $postRepo->getAllPosts('created_at', 'DESC');
+ * // $post123 = $postRepo->findById(123);
+ * // if ($post123 instanceof Essay) {
+ * // echo "Essay Title: " . $post123->getTitle() . "\n";
+ * // }
+ *
+ * // --- Creating a new Essay ---
+ * // $author = $userRepo->findAuthorById(1); // Assuming a UserRepo or similar for authors
+ * // if ($author) {
+ * // $newEssayId = 1001; // Must be unique, not auto-incremented in schema
+ * // $newEssay = new Essay(
+ * // $newEssayId, $author, "My New OOP Essay", "my-new-oop-essay",
+ * // "# Hello World\n\nThis is markdown content.", "An excerpt about the essay."
+ * // );
+ * // $createdPost = $postRepo->createPost($newEssay, ['PHP', 'OOP', 'Refactoring']);
+ * // if ($createdPost) {
+ * // echo "Created Post ID: " . $createdPost->getPostId() . "\n";
+ * // } else {
+ * // echo "Failed to create post.\n";
+ * // }
+ * // }
+ *
+ * // No explicit $dbConnection->close(); needed as exec_stmt handles its own connections.
+ */
diff --git a/functions/space.php b/functions/space.php
new file mode 100644
index 0000000..0c04474
--- /dev/null
+++ b/functions/space.php
@@ -0,0 +1,78 @@
+spaceId = $spaceId ?? randomId(2);
+ $this->name = $name;
+ $this->description = $description;
+ $this->members = $members;
+ $this->posts[] = $posts;
+ $this->parent = $parent;
+
+ /* $stmt = 'INSERT INTO spaces (spaceId, name, description, parentSpaceIdk)'; */
+ }
+
+ public static function retrieveFromDB(int $space, ?int $user): ?Space
+ {
+ if ($user) {
+ $stmt = 'SELECT * FROM spaceMembers WHERE space = ? AND user = ?';
+ $isMember = exec_stmt($stmt, 'ii', $space, $user)->fetch_assoc();
+ if (!$isMember)
+ return null;
+ } else {
+ $stmt = 'SELECT visibility FROM space WHERE id = ?';
+ $isOpen = exec_stmt($stmt, 'i', $space);
+ if (!$isOpen)
+ return null;
+ }
+
+ $stmt = 'SELECT * FROM space WHERE id = ?';
+ $space = exec_stmt($stmt, 'i', $space)->fetch_assoc();
+
+ if (!empty($space['parentSpace']))
+ $parent = Space::retrieveFromDB($space['parentSpace'], $user);
+ else
+ $parent = null;
+
+ $stmt = 'SELECT user FROM spaceMembers WHERE space = ?';
+ $members = exec_stmt($stmt, 'i', $space)->fetch_assoc();
+
+ $stmt = 'SELECT post FROM spacePosts WHERE space = ?';
+ $posts = exec_stmt($stmt, 'i', $space)->fetch_assoc();
+
+ return new Space($space['id'], $space['name'], $space['description'], $members, $posts, $parent);
+ }
+
+ public function __toString()
+ {
+ echo 'todo: this should be JSON';
+ }
+
+ public function getId(): int
+ {
+ return $this->spaceId;
+ }
+
+ public function getName(): string
+ {
+ return $this->name;
+ }
+
+ public function getDescription(): string
+ {
+ return $this->description;
+ }
+}
diff --git a/functions/todo_functions.php b/functions/todo_functions.php
deleted file mode 100644
index feba1b3..0000000
--- a/functions/todo_functions.php
+++ /dev/null
@@ -1,69 +0,0 @@
-todo_id = $todo_id;
-// $this->user_id = $user_id;
-// $this->task = $task;
-// $this->description = $description;
-// $this->priority = $priority;
-// $this->due_date = $due_date;
-// $this->category = $category;
-// $this->status = $status;
-// $this->created_at = $created_at;
-// $this->update_at = $update_at;
-// $this->completed_at = $completed_at;
-// $this->is_recurring = $is_recurring;
-// $this->recurrence_rule = $recurrence_rule;
-// $this->reminder_at = $reminder_at;
-// }
-// }
-
-function change_status($todo_id, $status)
-{
- exec_stmt('UPDATE todos SET status = ? WHERE todo_id = ?', 'si', $status, $todo_id);
-}
-
-function create_todo($todo)
-{
- exec_stmt('INSERT INTO todos (title, description, priority, due_date, category, status) VALUES (?,?,?,?,?,?)', 'ssssss', $todo['title'], $todo['description'], $todo['priority'], $todo['due_date'], $todo['category'], 'open');
-}
-function update_todo($todo_id, $todo)
-{
- exec_stmt('UPDATE todos SET title = ? WHERE todo_id = ?', 'si', $todo['title'], $todo_id);
- exec_stmt('UPDATE todos SET description = ? WHERE todo_id = ?', 'si', $todo['description'], $todo_id);
- exec_stmt('UPDATE todos SET priority = ? WHERE todo_id = ?', 'si', $todo['priority'], $todo_id);
- exec_stmt('UPDATE todos SET due_date = ? WHERE todo_id = ?', 'si', $todo['due_date'], $todo_id);
- exec_stmt('UPDATE todos SET category = ? WHERE todo_id = ?', 'si', $todo['category'], $todo_id);
- exec_stmt('UPDATE todos SET status = ? WHERE todo_id = ?', 'si', $todo['status'], $todo_id);
-}
diff --git a/functions/user.php b/functions/user.php
new file mode 100644
index 0000000..ff7fa6f
--- /dev/null
+++ b/functions/user.php
@@ -0,0 +1,371 @@
+username = $username;
+ $this->password = $password;
+ }
+
+ public function getUsername(): string
+ {
+ return $this->username;
+ }
+
+ public function getPassword(): string
+ {
+ return $this->password;
+ }
+}
+
+class User
+{
+ private int $userId;
+ private string $username;
+ private ?DateTime $createdAt;
+ private ?DateTime $lastActive;
+ private bool $isActive;
+ private ?string $profilePicture;
+ private ?string $bio;
+ private ?string $website;
+
+ public function __construct(int $userId, string $username, ?string $profilePicture = null, ?string $bio = null, ?string $website = null, ?mysqli $db = null)
+ {
+ // Basic XSS prevention on construction (can be enhanced)
+ $username = htmlspecialchars($username, ENT_QUOTES, 'UTF-8');
+ $bio = htmlspecialchars($bio ?? '', ENT_QUOTES, 'UTF-8');
+ $website = htmlspecialchars($website ?? '', ENT_QUOTES, 'UTF-8');
+ $profilePicture = htmlspecialchars($profilePicture ?? 'default-profile.png', ENT_QUOTES, 'UTF-8');
+
+ // Basic SQL injection prevention (should primarily rely on prepared statements)
+ if (preg_match('/[\'";\-\_]/', $username) || preg_match('/[\'";\-\_]/', $bio) || preg_match('/[\'";\-\_]/', $website) || preg_match('/[\'";\-\_]/', $profilePicture)) {
+ throw new InvalidArgumentException('Invalid characters in user data.');
+ }
+
+ $this->userId = $userId;
+ $this->username = $username;
+ $this->profilePicture = $profilePicture;
+ $this->bio = $bio;
+ $this->website = $website;
+ $this->createdAt = new DateTime();
+ $this->lastActive = null;
+ $this->isActive = false;
+
+ if ($db) {
+ $stmt = $db->prepare('INSERT INTO user (user_id, username, profile_picture, bio, website) VALUES (?, ?, ?, ?, ?)');
+ if ($stmt) {
+ $stmt->bind_param('issss', $this->userId, $this->username, $this->profilePicture, $this->bio, $this->website);
+ $stmt->execute();
+ $stmt->close();
+ } else {
+ error_log('Error preparing statement: ' . $db->error);
+ }
+ } else {
+ // Consider logging or throwing an exception if no database connection is provided
+ error_log('Database connection not provided during User creation.');
+ }
+ }
+
+ public static function exists(int $id)
+ {
+ $stmt = 'SELECT count(username) FROM user WHERE id = ?';
+ echo pretty_dump(exec_stmt($stmt, 'i', $id)->fetch_assoc());
+ }
+
+ public static function login(LoginCredentials $credentials, ?mysqli $db): ?User
+ {
+ if (!$db) {
+ error_log('Database connection not provided for login.');
+ return null;
+ }
+ $username = $credentials->getUsername();
+ $password = $credentials->getPassword();
+
+ $stmt = $db->prepare('SELECT user_id, username, password_hash, profile_picture, bio, website FROM user WHERE username = ?');
+ if ($stmt) {
+ $stmt->bind_param('s', $username);
+ $stmt->execute();
+ $result = $stmt->get_result();
+ $user = $result->fetch_assoc();
+ $stmt->close();
+
+ if ($user && hash('sha256', $password) === $user['password_hash']) {
+ return new User(
+ (int) $user['user_id'],
+ $user['username'],
+ $user['profile_picture'],
+ $user['bio'],
+ $user['website']
+ );
+ }
+ } else {
+ error_log('Error preparing statement: ' . $db->error);
+ }
+ return null;
+ }
+
+ public static function logout(): void
+ {
+ foreach (array_keys($_SESSION) as $key) {
+ unset($_SESSION[$key]);
+ }
+ // Consider destroying the session cookie as well: session_destroy();
+ header('Location: .'); // Redirect to the homepage or login page
+ exit();
+ }
+
+ public function getUserId(): int
+ {
+ return $this->userId;
+ }
+
+ public function getUsername(): string
+ {
+ return $this->username;
+ }
+
+ public function getCreatedAt(): ?DateTime
+ {
+ return $this->createdAt;
+ }
+
+ public function getLastActive(): ?DateTime
+ {
+ return $this->lastActive;
+ }
+
+ public function isActive(): bool
+ {
+ return $this->isActive;
+ }
+
+ public function getProfilePicture(): ?string
+ {
+ return $this->profilePicture;
+ }
+
+ public function getBio(): ?string
+ {
+ return $this->bio;
+ }
+
+ public function getWebsite(): ?string
+ {
+ return $this->website;
+ }
+
+ public function setLastActive(?DateTime $lastActive): void
+ {
+ $this->lastActive = $lastActive;
+ }
+
+ public function setIsActive(bool $isActive): void
+ {
+ $this->isActive = $isActive;
+ }
+
+ public function toggleActive(?mysqli $db): bool
+ {
+ if (!$db) {
+ error_log('Database connection not provided for toggleActive.');
+ return false;
+ }
+ $this->isActive = !$this->isActive;
+ $stmt = $db->prepare('UPDATE user SET is_active = ? WHERE user_id = ?');
+ if ($stmt) {
+ $stmt->bind_param('ii', (int) $this->isActive, $this->userId);
+ $result = $stmt->execute();
+ $stmt->close();
+ return $result;
+ } else {
+ error_log('Error preparing statement: ' . $db->error);
+ return false;
+ }
+ }
+
+ public function updateUsername(string $newUsername, ?mysqli $db): bool
+ {
+ $newUsername = htmlspecialchars($newUsername, ENT_QUOTES, 'UTF-8');
+ if (preg_match('/[\'";\-\_]/', $newUsername)) {
+ throw new InvalidArgumentException('Invalid characters in username.');
+ }
+ if (!$db) {
+ error_log('Database connection not provided for updateUsername.');
+ return false;
+ }
+ $stmt = $db->prepare('UPDATE user SET username = ? WHERE user_id = ?');
+ if ($stmt) {
+ $stmt->bind_param('si', $newUsername, $this->userId);
+ $result = $stmt->execute();
+ $stmt->close();
+ if ($result) {
+ $this->username = $newUsername;
+ return true;
+ }
+ } else {
+ error_log('Error preparing statement: ' . $db->error);
+ }
+ return false;
+ }
+
+ public function updatePassword(string $newPassword, ?mysqli $db): bool
+ {
+ $newPasswordHash = hash('sha256', $newPassword);
+ if (!$db) {
+ error_log('Database connection not provided for updatePassword.');
+ return false;
+ }
+ $stmt = $db->prepare('UPDATE user SET password_hash = ? WHERE user_id = ?');
+ if ($stmt) {
+ $stmt->bind_param('si', $newPasswordHash, $this->userId);
+ $result = $stmt->execute();
+ $stmt->close();
+ return $result;
+ } else {
+ error_log('Error preparing statement: ' . $db->error);
+ }
+ return false;
+ }
+
+ public function updateProfilePicture(?string $newProfilePicture, ?mysqli $db): bool
+ {
+ $newProfilePicture = htmlspecialchars($newProfilePicture ?? 'default-profile.png', ENT_QUOTES, 'UTF-8');
+ if (preg_match('/[\'";\-\_]/', $newProfilePicture)) {
+ throw new InvalidArgumentException('Invalid characters in profile picture filename.');
+ }
+ if (!$db) {
+ error_log('Database connection not provided for updateProfilePicture.');
+ return false;
+ }
+ $stmt = $db->prepare('UPDATE user SET profile_picture = ? WHERE user_id = ?');
+ if ($stmt) {
+ $stmt->bind_param('si', $newProfilePicture, $this->userId);
+ $result = $stmt->execute();
+ $stmt->close();
+ if ($result) {
+ $this->profilePicture = $newProfilePicture;
+ return true;
+ }
+ } else {
+ error_log('Error preparing statement: ' . $db->error);
+ }
+ return false;
+ }
+
+ public function followUser(int $followingUserId, bool $notify = false, ?mysqli $db): bool
+ {
+ if (!$db) {
+ error_log('Database connection not provided for followUser.');
+ return false;
+ }
+ $stmt = $db->prepare('INSERT INTO follows (follower_user_id, following_user_id, notify_user) VALUES (?, ?, ?)');
+ if ($stmt) {
+ $stmt->bind_param('iii', $this->userId, $followingUserId, (int) $notify);
+ $result = $stmt->execute();
+ $stmt->close();
+ return $result;
+ } else {
+ error_log('Error preparing statement: ' . $db->error);
+ return false;
+ }
+ }
+
+ public function getFollowers(?mysqli $db): array
+ {
+ if (!$db) {
+ error_log('Database connection not provided for getFollowers.');
+ return [];
+ }
+ $stmt = $db->prepare('SELECT u.user_id, u.username, u.profile_picture, u.bio, u.website FROM follows f JOIN user u ON f.follower_user_id = u.user_id WHERE f.following_user_id = ?');
+ if ($stmt) {
+ $stmt->bind_param('i', $this->userId);
+ $stmt->execute();
+ $result = $stmt->get_result();
+ $followers = [];
+ while ($row = $result->fetch_assoc()) {
+ $followers[] = new User(
+ (int) $row['user_id'],
+ $row['username'],
+ $row['profile_picture'],
+ $row['bio'],
+ $row['website']
+ );
+ }
+ $stmt->close();
+ return $followers;
+ } else {
+ error_log('Error preparing statement: ' . $db->error);
+ return [];
+ }
+ }
+
+ public function getFollowing(?mysqli $db): array
+ {
+ if (!$db) {
+ error_log('Database connection not provided for getFollowing.');
+ return [];
+ }
+ $stmt = $db->prepare('SELECT u.user_id, u.username, u.profile_picture, u.bio, u.website FROM follows f JOIN user u ON f.following_user_id = u.user_id WHERE f.follower_user_id = ?');
+ if ($stmt) {
+ $stmt->bind_param('i', $this->userId);
+ $stmt->execute();
+ $result = $stmt->get_result();
+ $following = [];
+ while ($row = $result->fetch_assoc()) {
+ $following[] = new User(
+ (int) $row['user_id'],
+ $row['username'],
+ $row['profile_picture'],
+ $row['bio'],
+ $row['website']
+ );
+ }
+ $stmt->close();
+ return $following;
+ } else {
+ error_log('Error preparing statement: ' . $db->error);
+ return [];
+ }
+ }
+
+ // Static method to fetch a User by ID (example using mysqli)
+ public static function findById(int $userId, ?mysqli $db): ?User
+ {
+ if (!$db) {
+ error_log('Database connection not provided for findById.');
+ return null;
+ }
+ $stmt = $db->prepare('SELECT user_id, username, profile_picture, bio, website FROM user WHERE user_id = ?');
+ if ($stmt) {
+ $stmt->bind_param('i', $userId);
+ $stmt->execute();
+ $result = $stmt->get_result();
+ $user = $result->fetch_assoc();
+ $stmt->close();
+ if ($user) {
+ return new User(
+ (int) $user['user_id'],
+ $user['username'],
+ $user['profile_picture'],
+ $user['bio'],
+ $user['website']
+ );
+ }
+ } else {
+ error_log('Error preparing statement: ' . $db->error);
+ }
+ return null;
+ }
+}
+
+class Author extends User {}
diff --git a/index.php b/index.php
index 5dd1fe8..51da717 100644
--- a/index.php
+++ b/index.php
@@ -1,15 +1,15 @@
Vintage Coding
Intentional Craftsmanship Over Ephemeral Trends
@@ -30,5 +30,5 @@ function home_content()
';
- return $content;
+ return $content;
}
diff --git a/scripts/dummy_data.sql b/scripts/dummy_data.sql
deleted file mode 100644
index ac688c2..0000000
--- a/scripts/dummy_data.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-USE vintagecoding;
-
-INSERT INTO user (user_id, username, email, password_hash, role_id, profile_picture)
- VALUES (5749248, 'jsmith', 'jsmith@email.com', 'f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b', 4, '2025.jpg'),
- (5789203, 'dummy', 'dummy@iamdumb.com', 'f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b', 4, '2025.jpg'),
- (5723948, 'writer', 'writer@something.com', 'f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b', 3, '5723948.jpg')
-;
-
-INSERT INTO article (author_id, title, excerpt, published_at)
- VALUES (2025, 'Testing vintagecoding.net', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas a mauris sit amet dui pellentesque sodales. Pellentesque non viverra leo, et congue metus.', CURRENT_TIMESTAMP),
- (5723948, 'Something Else', 'Here goes some random crap. Lorem ipsum akdfljskjlag IDK what to put here. I am just filling the space requirement. Blah blah blah blah, what does this look like? Is vintagecoding.net cool?', CURRENT_TIMESTAMP)
-;
-
-INSERT INTO article_tags (article_id, tag_id) VALUES (21, 2), (21, 6);
diff --git a/scripts/init.cypher b/scripts/init.cypher
deleted file mode 100644
index 5a17b2b..0000000
--- a/scripts/init.cypher
+++ /dev/null
@@ -1,209 +0,0 @@
-CREATE
- (owner:Role {name: 'Owner'}),
- (developer:Role {name: 'Developer'}),
- (user:Role {name: 'User'}),
- (essay:essay_postType {name: 'Essay'}),
- (moment:essay_postType {name: 'Moment'}),
- (thought:essay_postType {name: 'Thought'}),
- (web_dev:essay_postCategory {name: 'Web-dev'}),
- (devlog:essay_postCategory {name: 'Devlog'}),
- (published:essay_postStatus {name: 'Published'}),
- (draft:essay_postStatus {name: 'Draft'}),
- (open:SpaceType {name: 'Open'}),
- (public:SpaceType {name: 'Public'}),
- (shared:SpaceType {name: 'Shared'}),
- (private:SpaceType {name: 'Private'}),
- (open_space:Space
- {
- name: 'Open Space',
- description: 'World Wide access, no account required.',
- created_at: datetime()
- })-
- [:SPACE_TYPE]->
- (open),
- (public_space:Space
- {
- name: 'Public Space',
- description: 'Available to everyone with an account.',
- created_at: datetime()
- })-
- [:SPACE_TYPE]->
- (public),
- (shared_space:Space
- {
- name: 'Dummy Shared Space',
- description: 'Dummy shared space. Weird.',
- created_at: datetime()
- })-
- [:SPACE_TYPE]->
- (shared),
- (owner_space:Space
- {
- name: 'Owner Space',
- description: 'My space. Wait. Is that what this is?',
- created_at: datetime()
- })-
- [:SPACE_TYPE]->
- (private),
- (dummy_space:Space
- {
- name: 'Dummy Space',
- description: 'Dummy space. Weird.',
- created_at: datetime()
- })-
- [:SPACE_TYPE]->
- (private),
- (owner_user:User
- {
- username: 'joshashton',
- email: 'me@joshashton.dev',
- password_hash:
- '057ba03d6c44104863dc7361fe4578965d1887360f90a0895882e58a6248fc86',
- created_at: datetime(),
- profile_picture: '2025.jpg'
- })-
- [:USER_TYPE]->
- (owner),
- (owner_user)-[:USER_TYPE]->(developer),
- (owner_user)-[:USER_TYPE]->(user),
- (owner_user)-[:SPACE_MEMBER]->(open_space),
- (owner_user)-[:SPACE_MEMBER]->(owner_space),
- (owner_user)-[:SPACE_MEMBER]->(shared_space),
- (dummy_user:User
- {
- username: 'dummy',
- email: 'joshuatashton@gmail.com',
- password_hash:
- '057ba03d6c44104863dc7361fe4578965d1887360f90a0895882e58a6248fc86',
- created_at: datetime(),
- profile_picture: '2025.jpg'
- })-
- [:USER_TYPE]->
- (user),
- (dummy_user)-[:FOLLOWS {start_at: datetime()}]->(owner_user),
- (dummy_user)-[:SPACE_MEMBER]->(open_space),
- (dummy_user)-[:SPACE_MEMBER]->(dummy_space),
- (dummy_user)-[:SPACE_MEMBER]->(shared_space),
- (essay_post:Post
- {
- title: 'Building vintagecoding.net',
- view_count: 0,
- excerpt:
- 'Follow the journey of the creation of vintagecoding.net, where I discuss roadblocks and solutions. Hello world!',
- content:
- "
-#### Overview:
-This site is built in PHP with MariaDB and a Golang HTTP server. Composer is being used to supply the following PHP packages:
-
-- `vlucas/phpdotenv`
-- `erusev/parsedown`
-- `wildbit/postmark-php`
-
----
-#### 19/03/2025 - Foundations:
-Tonight, I [pushed](https://github.com/quaxlyqueen/vintagecoding.net/tree/5af0547864f730091c98d64cc18014bc69d0a041) the first major feature implementation. The database is designed, and a component has been created for article cards, and markdown parsing into HTML for the articles themselves.
-
----
-#### 20/03/2025 - Refining UX:
-Just now, I [pushed](https://github.com/quaxlyqueen/vintagecoding.net/tree/c0fc9e9d0053975837ae48fa1db93b5095d33146) the second major feature implementation. I've narrowed in on the database design with small tweaks, setup some dynamic page loading on articles.php, created a navigation bar, a dark/light mode button, and styled everything up. It's shaping up pretty well!
-
-There's a lot more work to be done. The entire login system needs to be implemented, user homepages, account management, admin panels, the article composer...the list goes on.
-
----
-#### 25/03/2025 - Account Management:
-Just now, I [pushed](https://github.com/quaxlyqueen/vintagecoding.net/tree/9a45075010434a4dedd0c5d48a78ff6be3bcfddc) the third major feature implementation: account management! Not the most exciting thing ever, but it is important for the long term success of this project. With that completed, v0.0.9 is completed! Though I prematurely labeled the commit v0.1.0...But in any case there's a lot to go before release.
-
-There is now a sign up and login user flow, a user page with basic settings, and authorization for accessing things like the article composer. Oh yeah, I got a basic version of that running in [this commit](https://github.com/quaxlyqueen/vintagecoding.net/tree/0a27cd1f5cd02735d06a64090a05937a5d6bcf3a) a few hours ago.
-
-Two major tasks remain prior to v0.1.0. First, I still need to finish implementing the image upload on new sign ups (and for changing a profile picture), but that should be relatively minor. Second, I need to use author information to flesh out article pages.
-
-I'm now setting my sights on v0.2.0, and the myriad of features I'm planning on implementing for that. It'll be the account and customization overhaul. Tools for the owner and administrator(s), enabling users to request their role to be changed to contributor or administrator, user home pages with their own custom CSS, the ability to theme the site however they please, and mobile support! I'm excited just thinking about it. It'll require a MAJOR overhaul of the CSS, but thanks to the minimalist aesthetic, the CSS file is only a few hundred disorganized lines.
-
-I've put maybe 30 hours into this project so far. I'm not sure if that's good or bad, but not getting crazy with the CSS has saved a **ton** of time. And, I really like how it's looking. I'm really excited about this project and I am giddy to see how much I can get implemented by the release on 25/05/2025 -- two months! I'm starting an *unpaid* internship tomorrow, so I probably won't have the time to put 30 hours a week into this. For now, I'm just excited to see what the future holds.
-
----
-#### 01/04/2025 - Basic Security & Administration:
-Earlier today, I [pushed](https://github.com/quaxlyqueen/vintagecoding.net/tree/cec9091ee01839b133ecbbc5616463a759837dda) a major security fix along with getting CI/CD setup, and last night I [pushed](https://github.com/quaxlyqueen/vintagecoding.net/tree/b9bb620ae01134431ff1941e7577ba58eee84e42) a secure overhaul of the 'Remember Me' functionality. I didn't write about it then, but a few days ago I also [pushed](https://github.com/quaxlyqueen/vintagecoding.net/tree/ff7e799b7fd2822cf27e0afe47274de222b2b508) the image upload along with a image cropper. Still buggy as hell, but its a start. And a couple days ago I [committed](https://github.com/quaxlyqueen/vintagecoding.net/tree/e6735a9a206a207b6fab704785451a6309944ddd) admin functionality to manage users and articles. I would've thought I'd slow down, but I'm just trucking along.
-
-Specifically, the 'Remember Me' functionality is now using a token system, a randomly generated 1024 bit string, associated with the user ID and hashed values of both the remote address and (if used) forwarded for headers. If these don't match what is stored in the database, this should mean that the client browser/device is not the original browser/device used to create the token.
-
-For the other security fix, I converted all of the `mysqli` statements to prepared statements. This is to mitigate the risk of SQL Injection attacks. Particularly since this site is live (though I'm not promoting it so it is still 'unreleased'), it is important to ensure that despite the lack of sensitive information, would-be attackers are unable to access user information, gain admin access, or compromise the server in any way.
-
-Onto the user home pages! Here's a general breakdown of what I have in mind. Every user has a homepage that they can customize the CSS for. Effectively, give the users a place to make their own. Eventually even change the layout and structure of their page. For now, the page is going to have some pretty simple information: a list of articles written by the user, the number of articles they have read, and the number their articles have been read. More is to come in the future, but that's a long way out.
-
----
-#### 08/04/2025 - Image Cropping & Editing Articles:
-Yesterday, I [pushed](https://github.com/quaxlyqueen/vintagecoding.net/tree/e5b3e048b8dc6731fa383778c26eba47186e5310) an update to the image cropper. In other words, it *actually* works now lol. I was driving home from class and I just realized that I needed to both offset the position from the window to the image, and scale the coordinates based on the size of the image. And just a moment ago, I [pushed](https://github.com/quaxlyqueen/vintagecoding.net/tree/e829e2e56695af5b77074f926c8d0c270e501f4b) editing articles. And here and there, I've worked on some basic Cross Site Scripting preventative measures, honeypots on signup to help prevent bots, and basic mobile responsiveness.
-
-With some work being done with security now, I'm having second thoughts about allowing users to have custom CSS on their homepages. I'll punt that off till later.
-
-All in all, things are going smoothly! I'm pretty proud of what I've built so far, and it has been quite educational. From prepared SQL statements, to XSS, form processing, and secure 'remember me' functionality. I'm not sure how much this site will be used by anyone else, and if that is the case I'll eventually just use this as a personal blog.
-
----
-#### 12/04/2025 - Enhanced Markdown Editing Experience:
-This was my first foray into the world of AJAX. I just [pushed](https://github.com/quaxlyqueen/vintagecoding.net/tree/fb35e9322647878386bcc3be572cd404b38fd91b) the implementation of a markdown preview while composing or editing articles. The possibilities are **very** exciting, I'm already thinking of other places that the AJAX would be useful for.
-
-Next, I'm looking to introduce Vim motions to the site, for general navigation and also for article composition and editing. It'll be an interesting challenge I think, and I could use the JavaScript practice.
-
-I haven't said this previously, but I am *loving* PHP. Such a joy to work with, and pair that with AJAX for a very interactive experience? Phenomenal DX. I've been looking at an interesting project, [NativePHP](https://nativephp.com), that I'd like to eventually use for another project.
- "
- })-
- [:STATUS]->
- (published),
- (essay_post)-[:POST_TYPE]->(essay),
- (essay_post)-[:POST_CATEGORY]->(web_dev),
- (essay_post)-[:POST_CATEGORY]->(devlog),
- (essay_post)-[:IN_SPACE]->(open_space),
- (owner_user)-[:WRITTEN {created_at: datetime(), updated_at: datetime()}]->
- (essay_post),
- (moment_post:Post
- {
- media_filepath: 'moments/open.png',
- text_content:
- 'A hub for everything. A social network and messaging hub. A documentation hub. A photos and video hub. A note taking and task management hub. A private hub. An AI hub. Welcome to the.hub.'
- })-
- [:STATUS]->
- (published),
- (moment_post)-[:POST_TYPE]->(moment),
- (moment_post)-[:POST_CATEGORY]->(devlog),
- (moment_post)-[:IN_SPACE]->(shared_space),
- (moment_post_2:Post
- {
- media_filepath: 'moments/test.png',
- text_content:
- 'Here is a photo from a hike I went on a while back. Nothing quite beats the look over a long trail.'
- })-
- [:STATUS]->
- (published),
- (moment_post_2)-[:POST_TYPE]->(moment),
- (moment_post_2)-[:POST_CATEGORY]->(devlog),
- (moment_post_2)-[:IN_SPACE]->(shared_space),
- (owner_user)-[:WRITTEN {created_at: datetime(), updated_at: datetime()}]->
- (moment_post_2),
- (thought_post:Post
- {
- content:
- 'I wonder if this is really smart or really dumb. Guess we will see...'
- })-
- [:STATUS]->
- (published),
- (thought_post)-[:POST_TYPE]->(thought),
- (thought_post)-[:POST_CATEGORY]->(devlog),
- (thought_post)-[:IN_SPACE]->(owner_space),
- (owner_user)-[:WRITTEN {created_at: datetime(), updated_at: datetime()}]->
- (thought_post),
- (thought_post_2:Post
- {content: 'I wonder if it was a bad idea to share my idea with Izzi.'})-
- [:STATUS]->
- (draft),
- (thought_post_2)-[:POST_TYPE]->(thought),
- (thought_post_2)-[:POST_CATEGORY]->(devlog),
- (thought_post_2)-[:IN_SPACE]->(owner_space),
- (owner_user)-[:WRITTEN {created_at: datetime(), updated_at: datetime()}]->
- (thought_post_2),
- (thought_post_3:Post {content: 'Hello cruel world!'})-[:STATUS]->(published),
- (thought_post_3)-[:POST_TYPE]->(thought),
- (thought_post_3)-[:POST_CATEGORY]->(devlog),
- (thought_post_3)-[:IN_SPACE]->(public_space),
- (owner_user)-[:WRITTEN {created_at: datetime(), updated_at: datetime()}]->
- (thought_post_3);
diff --git a/scripts/init.sql b/scripts/init.sql
deleted file mode 100644
index e2620a9..0000000
--- a/scripts/init.sql
+++ /dev/null
@@ -1,130 +0,0 @@
-CREATE DATABASE vintagecoding;
-USE vintagecoding;
-
-CREATE TABLE roles (
- role_id INT PRIMARY KEY AUTO_INCREMENT,
- role VARCHAR(16) NOT NULL
-);
-
-INSERT INTO roles (role)
- VALUES ('owner'), ('developer'), ('user');
-
-CREATE TABLE user (
- user_id INT PRIMARY KEY,
- username VARCHAR(32) NOT NULL UNIQUE,
- email VARCHAR(64) NOT NULL UNIQUE,
- password_hash VARCHAR(256) NOT NULL,
- role_id INT NOT NULL,
- created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- last_active TIMESTAMP DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
- is_active BOOLEAN DEFAULT FALSE,
- profile_picture VARCHAR(256),
- bio VARCHAR(256),
- website VARCHAR(64),
- FOREIGN KEY (role_id) REFERENCES roles (role_id) ON DELETE CASCADE
-);
-
-INSERT INTO user (user_id, username, email, password_hash, role_id, profile_picture)
- VALUES (1, 'quaxlyqueen', 'me@joshashton.dev', '057ba03d6c44104863dc7361fe4578965d1887360f90a0895882e58a6248fc86', 1, '2025.jpg');
-
-CREATE TABLE remember_user (
- token VARCHAR(128) PRIMARY KEY,
- user_id INT NOT NULL,
- remote_addr VARCHAR(64) NOT NULL,
- http_forward VARCHAR(64),
- created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- FOREIGN KEY (user_id) REFERENCES user (user_id) ON DELETE CASCADE
-); -- TODO: Need cron job to auto-delete after 30 days of inactivity
-
-CREATE TABLE post_types (
- post_type_id INT PRIMARY KEY AUTO_INCREMENT,
- post_type VARCHAR(16)
-);
-
-INSERT INTO post_types (post_type)
- VALUES ('article'), ('moment'), ('thought');
-
-CREATE TABLE post (
- post_id INT PRIMARY KEY,
- author_id INT NOT NULL,
- post_type INT NOT NULL,
- title VARCHAR(26) NOT NULL,
- slug VARCHAR(32),
- read_count INT DEFAULT 0,
- created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- published_at TIMESTAMP DEFAULT NULL,
- published BOOLEAN DEFAULT TRUE,
- excerpt VARCHAR(256),
- FOREIGN KEY (author_id) REFERENCES user(user_id) ON DELETE CASCADE,
- FOREIGN KEY (post_type) REFERENCES post_types(post_type_id)
-);
-
-INSERT INTO post (author_id, post_type, title, excerpt, published_at)
- VALUES (1, 1, 'Building vintagecoding.net', 'A devlog of the creation of vintagecoding.net and a test at the formatting of post cards and posts. Let the great experiment begin!', CURRENT_TIMESTAMP);
-
-CREATE TABLE categories (
- category_id INT PRIMARY KEY AUTO_INCREMENT,
- category VARCHAR(16) NOT NULL
-);
-
-INSERT INTO categories (category)
- VALUES ('web-dev'), ('devlog');
-
-CREATE TABLE post_categories (
- post_id INT NOT NULL,
- category_id INT NOT NULL,
- PRIMARY KEY (post_id, category_id),
- FOREIGN KEY (post_id) REFERENCES post(post_id) ON DELETE CASCADE,
- FOREIGN KEY (category_id) REFERENCES categories(category_id) ON DELETE CASCADE
-);
-
-INSERT INTO post_tags (post_id, tag_id) VALUES (1, 1), (1, 2);
-
-CREATE TABLE follows (
- follower_user_id INT NOT NULL,
- following_user_id INT NOT NULL,
- notify_user BOOLEAN DEFAULT FALSE,
- followed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (follower_user_id, following_user_id),
- FOREIGN KEY (follower_user_id) REFERENCES user(user_id) ON DELETE CASCADE,
- FOREIGN KEY (following_user_id) REFERENCES user(user_id) ON DELETE CASCADE
-);
-
-CREATE TABLE space_types (
- space_type_id INT PRIMARY KEY AUTO_INCREMENT,
- space_type VARCHAR(16)
-);
-
-INSERT INTO space_types (space_type)
- VALUES ('open', 'public', 'shared', 'private');
-
-CREATE TABLE spaces (
- space_id INT PRIMARY KEY AUTO_INCREMENT,
- space_type INT NOT NULL,
- name VARCHAR(64) NOT NULL,
- slug VARCHAR(64) UNIQUE,
- description TEXT,
- parent_space_id INT DEFAULT NULL,
- created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- FOREIGN KEY (parent_space_id) REFERENCES spaces(space_id) ON DELETE SET NULL,
- FOREIGN KEY (space_type) REFERENCES space_types(space_type_id)
-);
-
-CREATE TABLE space_posts (
- post_id INT NOT NULL,
- space_id INT NOT NULL,
- PRIMARY KEY (post_id, space_id),
- FOREIGN KEY (post_id) REFERENCES post(post_id) ON DELETE CASCADE,
- FOREIGN KEY (space_id) REFERENCES spaces(space_id) ON DELETE CASCADE
-);
-
-CREATE TABLE space_members (
- space_id INT NOT NULL,
- user_id INT NOT NULL,
- added_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (space_id, user_id),
- FOREIGN KEY (space_id) REFERENCES spaces(space_id) ON DELETE CASCADE,
- FOREIGN KEY (user_id) REFERENCES user(user_id) ON DELETE CASCADE
-);
diff --git a/scripts/init_db.sh b/scripts/init_db.sh
deleted file mode 100755
index fbbb69c..0000000
--- a/scripts/init_db.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-ARGS_COUNT=$#
-help () {
- echo "CLI Tool used to initialize the database for vintagecoding.net."
- echo "With no arguments, it creates the application user in MariaDB,"
- echo "and creates the following tables:"
- echo "- roles (populated);"
- echo "- tags (populated);"
- echo "- user;"
- echo "- articles;"
- echo "- article_tags;"
- echo ""
- echo "The following flags are accepted:"
- echo " init_db.sh { --help | -h }"
- echo " init_db.sh { --delete | -d } { --verbose | -v }"
-}
-
-if [[ $ARGS_COUNT > 0 ]]; then
- if [[ "$1" == "--help" || "$1" == "-h" ]]; then
- help
- exit
- fi
-
- # Delete the existing database and start over.
- if [[ "$1" == "--delete" || "$1" == "-d" ]]; then
- if [[ "$2" == "--verbose" || "$2" == "-v" ]]; then
- echo "Deleting the existing database vintagecoding..."
- fi
- echo "vintage user pw"
- mariadb -u vintage -p -e "DROP DATABASE vintagecoding;"
-
- if [[ "$2" == "--verbose" || "$2" == "-v" ]]; then
- echo "Deleting the vintage user..."
- fi
- echo "root user pw"
- mariadb -u root -p -e "DROP USER vintage@localhost;"
-
- if [[ "$2" == "--verbose" || "$2" == "-v" ]]; then
- echo "Creating the vintage user..."
- fi
- echo "root user pw"
- mariadb -u root -p < setup.sql;
-
- if [[ "$2" == "--verbose" || "$2" == "-v" ]]; then
- echo "Creating (and populating enum/static data) tables..."
- fi
- echo "vintage user pw"
- mariadb -u vintage -p < init.sql;
-
- exit
- fi
-fi
-
-#mariadb -u root -p < setup.sql;
-mariadb -u vintage -p < init.sql;
diff --git a/scripts/setup.sql b/scripts/setup.sql
deleted file mode 100644
index b0dece4..0000000
--- a/scripts/setup.sql
+++ /dev/null
@@ -1,3 +0,0 @@
---This must be ran as the root user in MariaDB
-CREATE USER vintage@localhost IDENTIFIED BY 'changeme';
-GRANT ALL PRIVILEGES ON vintagecoding.* TO vintage@localhost IDENTIFIED BY 'changeme';
diff --git a/spaces.php b/spaces.php
new file mode 100644
index 0000000..f7b3103
--- /dev/null
+++ b/spaces.php
@@ -0,0 +1,47 @@
+' . $space->getId() . '
+ ';
+
+ return $html;
+}
diff --git a/todo.php b/todo.php
deleted file mode 100644
index f3a6698..0000000
--- a/todo.php
+++ /dev/null
@@ -1,29 +0,0 @@
-
-