Merge branch 'develop' into stable

README.md

@@ -15,6 +15,10 @@ Use at your own risk.
 ![Create a wishlist](/includes/assets/img/wishlist-create.png "Create a wishlist")
 ![Add a product](/includes/assets/img/wishlist-product-add.png "Add a product")
 
+## Installation
+1. Download the latest [release](https://github.com/grandeljay/wishthis/releases) and upload all files to your server
+1. Follow the instructions of the installer
+
 ## Contributing
 Install dependencies
 ```

includes/assets/css/default.css

@@ -12,3 +12,10 @@
 .ui.modal > .actions {
 	text-align: inherit;
 }
+
+/**
+ * Progress
+ */
+.ui.progress.nolabel:last-child {
+	margin: 0;
+}

includes/assets/js/default.js

@@ -1,9 +1,4 @@
 $(function() {
-    /**
-     * URL Parameter
-     */
-    const urlParams = new URLSearchParams(window.location.search);
-
     /**
      * Fomantic UI
      */
@@ -20,6 +15,11 @@ $(function() {
 });
 
 function wishlistRefresh() {
+    /**
+     * URL Parameter
+     */
+    const urlParams = new URLSearchParams(window.location.search);
+
     $('.ui.dropdown.wishlists').api({
         action: 'get wishlists',
         method: 'GET',

includes/assets/js/wishlist-view.js

@@ -9,9 +9,11 @@ $(function() {
 
         if (wishlistValue) {
             $('.wishlist-view').removeClass('disabled');
+            $('.wishlist-share').removeClass('disabled');
             $('.wishlist-delete button').removeClass('disabled');
         } else {
             $('.wishlist-view').addClass('disabled');
+            $('.wishlist-share').addClass('disabled');
             $('.wishlist-delete button').addClass('disabled');
         }
     });

includes/classes/database.php

@@ -26,7 +26,7 @@ class Database
         $this->pdo = new \PDO($dsn, $this->user, $this->password, $options);
     }
 
-    public function query(string $query)
+    public function query(string $query): mixed
     {
         return $this->pdo->query(
             $query,

includes/classes/options.php

@@ -40,4 +40,18 @@ class Options
 
         return $value;
     }
+
+    public function setOption(string $key, string $value): void
+    {
+        try {
+            $option = $this->database->query('UPDATE `options`
+                                                 SET `value`
+                                               WHERE `key` = ' . $key . '
+            ;');
+
+            $value = $option['value'] ?? '';
+        } catch (\Throwable $th) {
+            //throw $th;
+        }
+    }
 }

includes/classes/page.php

@@ -10,7 +10,7 @@ use wishthis\User;
 
 class Page
 {
-    private string $language = 'en';
+    public string $language = 'en';
 
     /**
      * __construct
@@ -18,13 +18,15 @@ class Page
      * @param string $filepath The filepath (__FILE__) of the page.
      * @param string $title    The HTML title of the page.
      */
-    public function __construct(string $filepath, public string $title = 'wishthis')
+    public function __construct(string $filepath, public string $title = 'wishthis', public int $power = 0)
     {
         $this->name = pathinfo($filepath, PATHINFO_FILENAME);
 
         /**
          * Session
          */
+        global $user;
+
         $disableRedirect = array(
             'home',
             'login',
@@ -35,6 +37,14 @@ class Page
             header('Location: /?page=login');
             die();
         }
+
+        /**
+         * Power
+         */
+        if ($user->power < $this->power) {
+            header('Location: /?page=power&required=' . $this->power);
+            die();
+        }
     }
 
     public function header(): void
@@ -162,7 +172,7 @@ class Page
                     </div>
                 </div>
                 <?php global $options; ?>
-                <?php if ($options->updateAvailable && $user && $user->isLoggedIn()) { ?>
+                <?php if ($options->updateAvailable && $user && 100 === $user->power) { ?>
                     <a class="item" href="/?page=update">
                         <i class="upload icon"></i> Update
                     </a>
@@ -195,7 +205,9 @@ class Page
                     </div>
 
                     <div class="ui inverted link list">
-                        <a class="item" href="https://github.com/grandeljay/wishthis" target="_blank"><i class="big github icon"></i></a>
+                        <a class="item" href="https://github.com/grandeljay/wishthis" target="_blank">
+                            <i class="big github icon"></i>
+                        </a>
                     </div>
                 </div>
             </div>

includes/classes/user.php

@@ -13,14 +13,29 @@ namespace wishthis;
 class User
 {
     public int $id;
+    public int $power = 0;
 
     public function __construct(int $id = -1)
     {
         if (-1 === $id) {
+            if (isset($_SESSION['user']['id'])) {
                 $this->id = $_SESSION['user']['id'];
+            }
         } else {
             $this->id = $id;
         }
+
+        if (!isset($this->id)) {
+            return;
+        }
+
+        global $database;
+
+        $user = $database->query('SELECT * FROM `users`
+                                   WHERE `id` = ' . $this->id . ';')
+                         ->fetch();
+
+        $this->power = $user['power'];
     }
 
     /**

includes/pages/install.php

@@ -101,7 +101,7 @@ switch ($step) {
         $database->query('CREATE TABLE `users` (
             `id`       int          PRIMARY KEY AUTO_INCREMENT,
             `email`    varchar(64)  NOT NULL UNIQUE,
-            `password` varchar(128) NOT NULL
+            `password` varchar(128) NOT NULL INDEX
         );');
 
         /**
@@ -122,7 +122,7 @@ switch ($step) {
         $database->query('CREATE TABLE `products` (
             `id`       int          NOT NULL PRIMARY KEY AUTO_INCREMENT,
             `wishlist` int          NOT NULL,
-            `url`      VARCHAR(255) NOT NULL,
+            `hash`     VARCHAR(255) NOT NULL INDEX,
             FOREIGN KEY (`wishlist`)
                 REFERENCES `wishlists` (`id`)
                 ON DELETE CASCADE

includes/pages/login.php

@@ -11,13 +11,25 @@ use wishthis\Page;
 $page = new page(__FILE__, 'Login');
 
 if (isset($_POST['email'], $_POST['password'])) {
+    $email    = $_POST['email'];
+    $password = sha1($_POST['password']);
+
+    $database->query('UPDATE `users`
+                         SET `last_login` = NOW()
+                       WHERE `email` = "' . $email . '"
+                         AND `password` = "' . $password . '"
+    ;');
     $user = $database->query(
         'SELECT * FROM `users`
-         WHERE `email` = "' . $_POST['email'] . '"
+         WHERE `email` = "' . $email . '"
-         AND `password` = "' . sha1($_POST['password']) . '";'
+         AND `password` = "' . $password . '";'
     )->fetch();
 
+    if (false === $user) {
+        # code...
+    } else {
         $_SESSION['user'] = $user;
+    }
 }
 
 if (isset($_SESSION['user'])) {

includes/pages/logout.php

@@ -10,7 +10,12 @@ use wishthis\Page;
 
 $page = new page(__FILE__, 'Logout');
 
-session_destroy();
+if (PHP_SESSION_ACTIVE === session_status()) {
+    session_destroy();
+
+    header('Location: /?page=logout');
+    die();
+}
 
 $page->header();
 $page->navigation();

includes/pages/power.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * power.php
+ *
+ * @author Jay Trees <github.jay@grandel.anonaddy.me>
+ */
+
+use wishthis\Page;
+
+$page = new page(__FILE__, 'Insufficient power');
+$page->header();
+$page->navigation();
+?>
+
+<main>
+    <div class="ui container">
+        <h1 class="ui header"><?= $page->title ?></h1>
+
+        <div class="ui segment">
+            <h2 class="ui header">Restricted access</h2>
+            <p>
+                You do not have enough power to view this page.
+                You need <strong><?= $_GET['required'] ?></strong> to see this page, but only have <strong><?= $user->power ?></strong>.
+            </p>
+        </div>
+    </div>
+</main>
+
+<?php
+$page->footer();
+?>

includes/pages/register.php

@@ -11,10 +11,19 @@ use wishthis\Page;
 $page = new page(__FILE__, 'Register');
 
 if (isset($_POST['email'], $_POST['password'])) {
+    $users = $database->query('SELECT * FROM `users`;')->fetchAll();
+
+    if (0 === count($users)) {
+        $database->query('INSERT INTO `users`
+            (`email`, `password`, `power`) VALUES
+            ("' . $_POST['email'] . '", "' . sha1($_POST['password']) . '", 100)
+        ;');
+    } else {
         $database->query('INSERT INTO `users`
             (`email`, `password`) VALUES
             ("' . $_POST['email'] . '", "' . sha1($_POST['password']) . '")
         ;');
+    }
 
     header('Location: /?page=login');
     die();

includes/pages/update.php

@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * home.php
+ *
+ * @author Jay Trees <github.jay@grandel.anonaddy.me>
+ */
+
+use wishthis\{Page, User};
+
+$page = new page(__FILE__, 'Update', 100);
+$page->header();
+$page->navigation();
+
+/**
+ * Update
+ */
+if ('POST' === $_SERVER['REQUEST_METHOD']) {
+    /** Current version is below 0.2.0 */
+    if (-1 === version_compare($options->version, '0.2.0')) {
+        $database->query('ALTER TABLE `users`
+                                  ADD `last_login` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `password`,
+                                  ADD `power`      BOOLEAN  NOT NULL DEFAULT 0                 AFTER `last_login`
+        ;');
+        $database->query('UPDATE `users`
+                             SET `power` = 100
+                           WHERE `id` = ' . $user->id .
+        ';');
+        $database->query('ALTER TABLE `users` ADD INDEX(`password`);');
+
+        $database->query('ALTER TABLE `wishlists`
+                                  ADD `hash` VARCHAR(128) NOT NULL AFTER `name`
+        ;');
+        $database->query('ALTER TABLE `wishlists` ADD INDEX(`hash`);');
+
+        $database->query('INSERT INTO `options` (`key`, `value`) VALUES ("version", "' . VERSION . '");');
+
+        // Use this for future versions since it didn't existsin 0.1.0
+        // $options->setOption('version', VERSION);
+    }
+
+    header('Location: /?page=home');
+    die();
+}
+?>
+
+<main>
+    <div class="ui container">
+        <h1 class="ui header"><?= $page->title ?></h1>
+
+        <div class="ui segment">
+            <h2 class="ui header">New version detected</h2>
+            <p>Thank you for updating to <strong>v<?= VERSION ?></strong>!</p>
+            <p>There have been some changes in the database, please run the updater.</p>
+            <div class="ui icon warning message">
+                <i class="exclamation triangle icon"></i>
+                <div class="content">
+                    <div class="header">
+                        Use at own risk
+                    </div>
+                    <p>Be sure to make backups before proceeding.</p>
+                </div>
+            </div>
+            <form class="ui form" method="post">
+                <button class="ui orange button" type="submit">
+                    <i class="upload icon"></i>
+                    Run the updater
+                </button>
+            </form>
+        </div>
+    </div>
+</main>
+
+<?php
+$page->footer();
+?>

includes/pages/wishlist-create.php

@@ -12,8 +12,15 @@ $page = new page(__FILE__, 'Create a wishlist');
 
 if (isset($_POST['name'])) {
     $database->query('INSERT INTO `wishlists`
-        (`user`, `name`) VALUES
+        (
-        (' . $_SESSION['user']['id'] . ', "' . $_POST['name'] . '")
+            `user`,
+            `name`,
+            `hash`
+        ) VALUES (
+            ' . $_SESSION['user']['id'] . ',
+            "' . $_POST['name'] . '",
+            "' . time() . $_SESSION['user']['id'] . $_POST['name'] . '"
+        )
     ;');
 
     header('Location: /?page=wishlist-product-add');

includes/pages/wishlist-product-add.php

@@ -18,7 +18,6 @@ if (isset($_POST['url'], $_POST['wishlist'])) {
 $page = new page(__FILE__, 'Add a product');
 $page->header();
 $page->navigation();
-$user = new User();
 ?>
 <main>
     <div class="ui container">

includes/pages/wishlist-view.php

@@ -19,9 +19,10 @@ $products = array();
  * Get wishlist products
  */
 if (isset($_GET['wishlist'])) {
-    $user = new User();
+    $wishlist = $database->query('SELECT * FROM `wishlists`
-    $wishlist = $_GET['wishlist'];
+                                   WHERE `id` = "' . $_GET['wishlist'] . '"')
-    $products = $user->getProducts($wishlist);
+                         ->fetch();
+    $products = $user->getProducts($_GET['wishlist']);
 }
 
 /**
@@ -59,10 +60,10 @@ if (isset($_POST['wishlist_delete_id'])) {
                 <h2 class="ui header">Options</h1>
                 <p>Wishlist related options.</p>
 
-                <button class="ui small labeled icon button disabled">
+                <a class="ui small labeled icon button wishlist-share disabled" href="/?wishlist=<?= $wishlist['hash'] ?? '' ?>" target="_blank">
                     <i class="share icon"></i>
                     Share
-                </button>
+                </a>
 
                 <form class="ui form wishlist-delete" method="post" style="display: inline-block;">
                     <input type="hidden" name="wishlist_delete_id" />

includes/pages/wishlist.php

@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * wishlist.php
+ *
+ * @author Jay Trees <github.jay@grandel.anonaddy.me>
+ */
+
+use wishthis\{Page, User};
+use Embed\Embed;
+
+$page = new page(__FILE__, 'Wishlist');
+$page->header();
+$page->navigation();
+
+$wishlist = $database->query('SELECT * FROM `wishlists`
+                                      WHERE `hash` = "' . $_GET['wishlist'] . '"')
+                     ->fetch();
+
+$products = $user->getProducts($wishlist['id']);
+?>
+
+<main>
+    <div class="ui container">
+        <h1 class="ui header"><?= $page->title ?></h1>
+
+        <div class="ui segment">
+            <h2 class="ui header"><?= $wishlist['name'] ?></h2>
+        </div>
+
+        <?php if (!empty($products)) { ?>
+            <div class="ui three column grid">
+
+                <?php foreach ($products as $product) { ?>
+                    <?php
+                    /**
+                     * @link https://github.com/oscarotero/Embed
+                     */
+                    $embed = new Embed();
+                    $info  = $embed->get($product['url']);
+                    ?>
+                        <div class="column">
+                            <div class="ui fluid card">
+
+                                <?php if ($info->image) { ?>
+                                    <div class="image">
+                                        <img src="<?= $info->image ?>" />
+                                    </div>
+                                <?php } ?>
+
+                                <div class="content">
+                                    <?php if ($info->title) { ?>
+                                        <div class="header">
+                                            <?php if ($info->url) { ?>
+                                                <a href="<?= $info->url ?>" target="_blank"><?= $info->title ?></a>
+                                            <?php } else { ?>
+                                                <?= $info->title ?>
+                                            <?php } ?>
+                                        </div>
+                                    <?php } ?>
+
+                                    <?php if ($info->keywords) { ?>
+                                        <div class="meta">
+                                            <?= $info->keywords ?>
+                                        </div>
+                                    <?php } ?>
+
+                                    <?php if ($info->description) { ?>
+                                        <div class="description">
+                                            <?= $info->description ?>
+                                        </div>
+                                    <?php } ?>
+                                </div>
+                                <div class="extra content">
+                                    <?php if ($info->publishedTime) { ?>
+                                        <span class="right floated">
+                                            <?= $info->publishedTime ?>
+                                        </span>
+                                    <?php } ?>
+                                    <?php if ($info->favicon) { ?>
+                                        <?php if ($info->providerName) { ?>
+                                            <img src="<?= $info->favicon ?>"
+                                                 title="<?= $info->providerName ?>"
+                                                 alt="<?= $info->providerName ?>"
+                                            />
+                                        <?php } else { ?>
+                                            <img src="<?= $info->favicon ?>" />
+                                        <?php } ?>
+                                    <?php } ?>
+                                </div>
+
+                            </div>
+                        </div>
+                <?php } ?>
+
+            </div>
+        <?php } else { ?>
+            <?php if (isset($_GET['wishlist'])) { ?>
+                <div class="ui icon message">
+                    <i class="info circle icon"></i>
+                    <div class="content">
+                        <div class="header">
+                            Empty
+                        </div>
+                        <p>The selected wishlist seems to be empty.</p>
+                        <a class="ui mini button" href="/?page=wishlist-product-add">Add a product</a>
+                    </div>
+                </div>
+            <?php } else { ?>
+                <div class="ui icon message">
+                    <i class="info circle icon"></i>
+                    <div class="content">
+                        <div class="header">
+                            No wishlist selected
+                        </div>
+                        <p>Select a wishlist to see it's products.</p>
+                    </div>
+                </div>
+            <?php } ?>
+        <?php } ?>
+    </div>
+</main>
+
+<?php
+$page->footer();
+?>

index.php

@@ -6,8 +6,6 @@
  * @author Jay Trees <github.jay@grandel.anonaddy.me>
  */
 
-$version_new = '0.1.0';
-
 /**
  * Include
  */
@@ -55,6 +53,11 @@ if (
  */
 session_start();
 
+/**
+ * User
+ */
+$user = new wishthis\User();
+
 /**
  * API
  */
@@ -72,12 +75,21 @@ if (!$options) {
 /**
  * Update
  */
+define('VERSION', '0.2.0');
+
 if ($options) {
-    if (-1 === version_compare($options->version, $version_new)) {
+    if (-1 === version_compare($options->version, VERSION)) {
         $options->updateAvailable = true;
     }
 }
 
+/**
+ * Wishlist
+ */
+if (!isset($_GET['page']) && isset($_GET['wishlist'])) {
+    $page = 'wishlist';
+}
+
 /**
  * Page
  */
@@ -94,5 +106,6 @@ if (file_exists($pagePath)) {
     <h1>Not found</h1>
     <p>The requested URL was not found on this server.</p>
     <?php
+    echo $pagePath;
     die();
 }