Merge pull request #2 from pomf/master

e;

17 files changed, 159 insertions, 772 deletions

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..1c43324
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "moe"]
+	path = moe
+	url = https://github.com/pomf/moe
+[submodule "php"]
+	path = php
+	url = https://github.com/pomf/pomf-php
diff --git a/.travis.yml b/.travis.yml
index 73bf6c4..d851b4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ install:
 - nvm ls-remote
 - nvm install stable
 - nvm use stable
-- npm install
 script:
 - make 
 
diff --git a/Makefile b/Makefile
index 2addcd5..96b3118 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,62 @@
-all: mkdirs swig htmlmin min-css min-js copy
+INSTALL="install"
+TAR="tar"
+GREP="grep"
+NODE="node"
+NPM="npm"
+DESTDIR="./dist"
+PKG_VERSION := $( $(GREP) -Po '(?<="version": ")[^"]*' )
+TMPDIR := $(shell mktemp -d)
+
+all: builddirs npm_dependencies swig htmlmin min-css min-js copy-img copy-php
 
 swig:
-	@node node_modules/swig/bin/swig.js render -j dist.json templates/faq.swig > dist/faq.html 
-	@node node_modules/swig/bin/swig.js render -j dist.json templates/index.swig > dist/index.html 
-	@node node_modules/swig/bin/swig.js render -j dist.json templates/tools.swig > dist/tools.html 
+	$(NODE) node_modules/swig/bin/swig.js render -j dist.json templates/faq.swig > $(CURDIR)/build/faq.html 
+	$(NODE) node_modules/swig/bin/swig.js render -j dist.json templates/index.swig > $(CURDIR)/build/index.html 
+	$(NODE) node_modules/swig/bin/swig.js render -j dist.json templates/tools.swig > $(CURDIR)/build/tools.html 
 
 htmlmin:
-	@node node_modules/htmlmin/bin/htmlmin dist/index.html -o dist/index.html 
-	@node node_modules/htmlmin/bin/htmlmin dist/faq.html -o dist/faq.html 
-	@node node_modules/htmlmin/bin/htmlmin dist/tools.html -o dist/tools.html 
-	
-
-mkdirs:
-	@mkdir -p ./dist/img
+	$(NODE) node_modules/htmlmin/bin/htmlmin $(CURDIR)/build/index.html -o $(CURDIR)/build/index.html 
+	$(NODE) node_modules/htmlmin/bin/htmlmin $(CURDIR)/build/faq.html -o $(CURDIR)/build/faq.html 
+	$(NODE) node_modules/htmlmin/bin/htmlmin $(CURDIR)/build/tools.html -o $(CURDIR)/build/tools.html 
 
+installdirs:
+	mkdir -p $(DESTDIR)/ $(DESTDIR)/img $(DESTDIR)/classes $(DESTDIR)/includes
+	
 min-css:
-	@node ./node_modules/.bin/cleancss --s0 ./static/css/pomf.css > ./dist/pomf.min.css
+	$(NODE) ./node_modules/.bin/cleancss --s0 ./static/css/pomf.css > $(CURDIR)/build/pomf.min.css
 
 min-js:
-	@echo "// @source https://github.com/pomf/pomf/tree/master/static/js" >> ./dist/pomf.min.js 
-	@echo "// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat" >> ./dist/pomf.min.js
-	@node ./node_modules/.bin/uglifyjs  --screw-ie8 ./static/js/app.js >> ./dist/pomf.min.js 
-	@echo "// @license-end" >> ./dist/pomf.min.js
-
-copy:
-	@cp -r ./php/* ./dist/
-	@cp  ./static/img/*.png ./dist/img
-	@cp  ./static/img/favicon.ico ./dist/favicon.ico
-
+	echo "// @source https://github.com/pomf/pomf/tree/master/static/js" > $(CURDIR)/build/pomf.min.js 
+	echo "// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat" >> $(CURDIR)/build/pomf.min.js
+	$(NODE) ./node_modules/.bin/uglifyjs  --screw-ie8 ./static/js/app.js >> $(CURDIR)/build/pomf.min.js 
+	echo "// @license-end" >> $(CURDIR)/build/pomf.min.js
+
+copy-img:
+	cp -v ./static/img/*.png $(CURDIR)/build/img/
+	cp -vT ./static/img/favicon.ico $(CURDIR)/build/favicon.ico
+
+copy-php:
+	cp -rv ./php/* $(CURDIR)/build/
+
+install: installdirs
+	cp -rv $(CURDIR)/build/* $(DESTDIR)/
+
+dist:
+	DESTDIR=$(TMPDIR)/pomf-$(PKGVERSION)
+	export DESTDIR
+	install
+	$(TAR) cJf pomf-$(PKG_VERSION).tar.xz $(DESTDIR)
+	rm -rf $(TMPDIR)
+	
+clean:
+	rm -rvf $(CURDIR)/node_modules 
+	rm -rvf $(CURDIR)/build
+	
+uninstall:
+	rm -rvf $(DESTDIR)/
+	
+npm_dependencies:
+	$(NPM) install
 
+builddirs:
+	mkdir -p $(CURDIR)/build $(CURDIR)/build/img $(CURDIR)/build/classes $(CURDIR)/build/includes
diff --git a/README.md b/README.md
index df781f5..0b7d9a3 100644
--- a/README.md
+++ b/README.md
@@ -41,13 +41,17 @@ Node, or NPM. So we'll just assume you already have them all running well.
 
 Assuming you already have Node and NPM working, compilation is easy. Use the
 following shell code:
-
-    git clone https://github.com/pomf/pomf
-    cd pomf/
-    npm install
-    make
-
-After this, the pomf site is now compressed and set up inside `dist/`.
+```bash
+git clone --recursive https://github.com/pomf/pomf
+cd pomf/
+make
+make install
+```
+OR
+```bash
+make install DESTDIR=/desired/path/for/site
+```
+After this, the pomf site is now compressed and set up inside `dist/`, or, if specified, `DESTDIR`.
 
 ## Configuring
 
@@ -65,6 +69,29 @@ option for nginx webserver is `client_max_body_size`.
 
 Example nginx configs can be found in confs/.
 
+## Using SQLite as DB engine
+
+We need to create the SQLite database before it may be used by pomf.
+Fortunately, this is incredibly simple.  
+
+First create a directory for the database, e.g. `mkdir /var/db/pomf`.  
+Then, create a new SQLite database from the schema, e.g. `sqlite3 /var/db/pomf/pomf.sq3 -init /home/pomf/sqlite_schema.sql`.
+Then, finally, ensure the permissions are correct, e.g.
+```bash
+chown nginx:nginx /var/db/pomf
+chmod 0750 /var/db/pomf
+chmod 0640 /var/db/pomf/pomf.sq3
+```
+
+Finally, edit `php/includes/settings.inc.php` to indicate this is the database engine you would like to use.  Make the changes outlined below
+```php
+define('POMF_DB_CONN', '[stuff]'); ---> define('POMF_DB_CONN', 'sqlite:/var/db/pomf/pomf.sq3');`
+define('POMF_DB_USER', '[stuff]'); ---> define('POMF_DB_USER', null);
+define('POMF_DB_PASS', '[stuff]'); ---> define('POMF_DB_PASS', null);
+```
+
+*NOTE: The directory where the SQLite database is stored, must be writable by the web server user*
+
 ### Apache
 
 If you are running Apache and want to compress your output when serving files,
@@ -75,6 +102,40 @@ add to your `.htaccess` file:
 Remember to enable `deflate_module` and `filter_module` modules in your Apache
 configuration file.
 
+### Migrating from MySQL to SQLite
+ ,
+Compared to SQLite, MySQL is relatively complicated to administer, brings in many unneeded dependencies, and consumes more resources.  Additonally, as a network service, poorly configured installations have the potential
+to pose a security risk.
+
+For these reasons, you may wish to use SQLite rather than MySQL.
+
+Fortunately, it is incredibly simple to migrate your database.  This may be done on a live server, if you desire, and requires zero downtime.
+
+The process described below involves running these commands on a live server.  Nothing done here affects your main site, until running the very last command, which is done after verifying there are no issues.  
+
+No changes described here are destructive, and are easily reverted.  They only have the potential to cause uploading to fail gracefully, and will not affect downloading.
+
+Run the following commands as root, to dump your database, and make a SQLite database with the contents.  
+```bash
+mkdir /var/db/pomf
+wget -O /tmp/m2s https://github.com/dumblob/mysql2sqlite/raw/master/mysql2sqlite.sh
+mysqldump -u OLD_DB_USER -p OLD_DB_PASS pomf | sh /tmp/m2s | sqlite3 /var/db/pomf/sq3
+rm /tmp/m2s
+chown -R nginx:nginx /var/db/pomf #replace user as appropriate
+chmod 0750 /var/db/pomf && chmod 0640 /var/db/pomf/sq3
+```
+Edit the file `php/includes/settings.inc.php`, in your **source directory**, making the changes outlined below.  Note, changing the second two lines is optional, as they are simply ignored when using SQLite.
+```php
+define('POMF_DB_CONN', '[stuff]'); ---> define('POMF_DB_CONN', 'sqlite:/var/db/pomf/pomf.sq3');`
+define('POMF_DB_USER', '[stuff]'); ---> define('POMF_DB_USER', null);
+define('POMF_DB_PASS', '[stuff]'); ---> define('POMF_DB_PASS', null);
+```
+Then, run `make DESTDIR=/path/to/main_site/testing_dir` (note the *testing_dir* component) to rebuild the website, and copy it into place, in a new testing subdirectory.
+
+Now, navigate to this subdirectory in your web browser, e.g. https://try.pantsu.cat/testing_dir, and verify that uploading works fine.  If so, excellent!  You may rerun `make DESTDIR=/path/to/main_site` to update your main site.
+
+All done! You may disable or uninstall MySQL if you wish.
+
 ## Getting help
 
 The Pomf community gathers on IRC. You can also email the maintainer for help.
diff --git a/moe b/moe
new file mode 160000
+Subproject 922e8031f2d424bc3f4a25a4a3dafde32ec46e3
diff --git a/schema.sql b/mysql_schema.sql
index 154f095..154f095 100644
--- a/schema.sql
+++ b/mysql_schema.sql
diff --git a/package.json b/package.json
index 5635692..d0d0c6d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pomf",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "Kawaii file host",
   "homepage": "https://pantsu.cat/",
   "repository": {
diff --git a/php b/php
new file mode 160000
+Subproject 5abbc323d7f64df5fcf16255db79de339dc7256
diff --git a/php/classes/Response.class.php b/php/classes/Response.class.php
deleted file mode 100755
index fac7db5..0000000
--- a/php/classes/Response.class.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * The Response class is a do-it-all for getting responses out in different
- * formats.
- *
- * @todo Create sub-classes to split and extend this god object.
- */
-class Response
-{
-    /**
-     * Indicates response type used for routing.
-     *
-     * Valid strings are 'csv', 'html', 'json' and 'text'.
-     *
-     * @var string $type Response type
-     */
-    private $type;
-
-    /**
-     * Indicates requested response type.
-     *
-     * Valid strings are 'csv', 'html', 'json', 'gyazo' and 'text'.
-     *
-     * @param string|null $response_type Response type
-     */
-    public function __construct($response_type = null)
-    {
-        switch ($response_type) {
-            case 'csv':
-                header('Content-Type: text/csv; charset=UTF-8');
-                $this->type = $response_type;
-                break;
-            case 'html':
-                header('Content-Type: text/html; charset=UTF-8');
-                $this->type = $response_type;
-                break;
-            case 'json':
-                header('Content-Type: application/json; charset=UTF-8');
-                $this->type = $response_type;
-                break;
-            case 'gyazo':
-                // Deprecated API since version 2.0.0, fallback to similar text API
-                header('Content-Type: text/plain; charset=UTF-8');
-                $this->type = 'text';
-                break;
-            case 'text':
-                header('Content-Type: text/plain; charset=UTF-8');
-                $this->type = $response_type;
-                break;
-            default:
-                header('Content-Type: application/json; charset=UTF-8');
-                $this->type = 'json';
-                $this->error(400, 'Invalid response type. Valid options are: csv, html, json, text.');
-                break;
-        }
-    }
-
-    /**
-     * Routes error messages depending on response type.
-     *
-     * @param int $code HTTP status code number.
-     * @param int $desc Descriptive error message.
-     * @return void
-     */
-    public function error($code, $desc)
-    {
-        $response = null;
-
-        switch ($this->type) {
-            case 'csv':
-                $response = $this->csvError($desc);
-                break;
-            case 'html':
-                $response = $this->htmlError($code, $desc);
-                break;
-            case 'json':
-                $response = $this->jsonError($code, $desc);
-                break;
-            case 'text':
-                $response = $this->textError($code, $desc);
-                break;
-        }
-
-        http_response_code(500); // "500 Internal Server Error"
-        echo $response;
-    }
-
-    /**
-     * Routes success messages depending on response type.
-     *
-     * @param mixed[] $files
-     * @return void
-     */
-    public function send($files)
-    {
-        $response = null;
-
-        switch ($this->type) {
-            case 'csv':
-                $response = $this->csvSuccess($files);
-                break;
-            case 'html':
-                $response = $this->htmlSuccess($files);
-                break;
-            case 'json':
-                $response = $this->jsonSuccess($files);
-                break;
-            case 'text':
-                $response = $this->textSuccess($files);
-                break;
-        }
-
-        http_response_code(200); // "200 OK". Success.
-        echo $response;
-    }
-
-    /**
-     * Indicates with CSV body the request was invalid.
-     *
-     * @deprecated 2.1.0 Will be renamed to camelCase format.
-     * @param int $description Descriptive error message.
-     * @return string Error message in CSV format.
-     */
-    private static function csvError($description)
-    {
-        return '"error"'."\r\n"."\"$description\""."\r\n";
-    }
-
-    /**
-     * Indicates with CSV body the request was successful.
-     *
-     * @deprecated 2.1.0 Will be renamed to camelCase format.
-     * @param mixed[] $files
-     * @return string Success message in CSV format.
-     */
-    private static function csvSuccess($files)
-    {
-        $result = '"name","url","hash","size"'."\r\n";
-        foreach ($files as $file) {
-            $result .= '"'.$file['name'].'"'.','.
-                       '"'.$file['url'].'"'.','.
-                       '"'.$file['hash'].'"'.','.
-                       '"'.$file['size'].'"'."\r\n";
-        }
-
-        return $result;
-    }
-
-    /**
-     * Indicates with HTML body the request was invalid.
-     *
-     * @deprecated 2.1.0 Will be renamed to camelCase format.
-     * @param int $code HTTP status code number.
-     * @param int $description Descriptive error message.
-     * @return string Error message in HTML format.
-     */
-    private static function htmlError($code, $description)
-    {
-        return '<p>ERROR: ('.$code.') '.$description.'</p>';
-    }
-
-    /**
-     * Indicates with HTML body the request was successful.
-     *
-     * @deprecated 2.1.0 Will be renamed to camelCase format.
-     * @param mixed[] $files
-     * @return string Success message in HTML format.
-     */
-    private static function htmlSuccess($files)
-    {
-        $result = '';
-
-        foreach ($files as $file) {
-            $result .=  '<a href="'.$file['url'].'">'.$file['url'].'</a><br>';
-        }
-
-        return $result;
-    }
-
-    /**
-     * Indicates with JSON body the request was invalid.
-     *
-     * @deprecated 2.1.0 Will be renamed to camelCase format.
-     * @param int $code HTTP status code number.
-     * @param int $description Descriptive error message.
-     * @return string Error message in pretty-printed JSON format.
-     */
-    private static function jsonError($code, $description)
-    {
-        return json_encode(array(
-            'success' => false,
-            'errorcode' => $code,
-            'description' => $description,
-        ), JSON_PRETTY_PRINT);
-    }
-
-    /**
-     * Indicates with JSON body the request was successful.
-     *
-     * @deprecated 2.1.0 Will be renamed to camelCase format.
-     * @param mixed[] $files
-     * @return string Success message in pretty-printed JSON format.
-     */
-    private static function jsonSuccess($files)
-    {
-        return json_encode(array(
-            'success' => true,
-            'files' => $files,
-        ), JSON_PRETTY_PRINT);
-    }
-
-    /**
-     * Indicates with plain text body the request was invalid.
-     *
-     * @deprecated 2.1.0 Will be renamed to camelCase format.
-     * @param int $code HTTP status code number.
-     * @param int $description Descriptive error message.
-     * @return string Error message in plain text format.
-     */
-    private static function text_error($code, $description)
-    {
-        return 'ERROR: ('.$code.') '.$description;
-    }
-
-    /**
-     * Indicates with plain text body the request was successful.
-     *
-     * @deprecated 2.1.0 Will be renamed to camelCase format.
-     * @param mixed[] $files
-     * @return string Success message in plain text format.
-     */
-    private static function text_success($files)
-    {
-        $result = '';
-
-        foreach ($files as $file) {
-            $result .= $file['url']."\n";
-        }
-
-        return $result;
-    }
-}
diff --git a/php/classes/UploadException.class.php b/php/classes/UploadException.class.php
deleted file mode 100755
index 8c9e4f6..0000000
--- a/php/classes/UploadException.class.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Returns a human readable error description for file upload errors.
- *
- * @author Dan Brown <danbrown@php.net>
- * @author Michiel Thalen
- * @copyright Copyright © 1997 - 2016 by the PHP Documentation Group
- * @license
- * UploadException is licensed under a Creative Commons Attribution 3.0 License
- * or later.
- *
- * Based on a work at
- * https://secure.php.net/manual/en/features.file-upload.errors.php#89374.
- *
- * You should have received a copy of the Creative Commons Attribution 3.0
- * License with this program. If not, see
- * <https://creativecommons.org/licenses/by/3.0/>.
- */
-
-
-class UploadException extends Exception
-{
-    public function __construct($code)
-    {
-        $message = $this->codeToMessage($code);
-        parent::__construct($message, 500);
-    }
-
-    private function codeToMessage($code)
-    {
-        switch ($code) {
-            case UPLOAD_ERR_INI_SIZE:
-                $message = 'The uploaded file exceeds the upload_max_filesize directive in php.ini';
-                break;
-            case UPLOAD_ERR_FORM_SIZE:
-                $message = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was '.
-                           'specified in the HTML form';
-                break;
-            case UPLOAD_ERR_PARTIAL:
-                $message = 'The uploaded file was only partially uploaded';
-                break;
-            case UPLOAD_ERR_NO_FILE:
-                $message = 'No file was uploaded';
-                break;
-            case UPLOAD_ERR_NO_TMP_DIR:
-                $message = 'Missing a temporary folder';
-                break;
-            case UPLOAD_ERR_CANT_WRITE:
-                $message = 'Failed to write file to disk';
-                break;
-            case UPLOAD_ERR_EXTENSION:
-                $message = 'File upload stopped by extension';
-                break;
-
-            default:
-                $message = 'Unknown upload error';
-                break;
-        }
-
-        return $message;
-    }
-}
diff --git a/php/classes/UploadedFile.class.php b/php/classes/UploadedFile.class.php
deleted file mode 100644
index 03b7429..0000000
--- a/php/classes/UploadedFile.class.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-class UploadedFile
-{
-    /* Public attributes */
-    public $name;
-    public $mime;
-    public $size;
-    public $tempfile;
-    public $error;
-
-    /**
-     * SHA-1 checksum
-     *
-     * @deprecated 2.1.0 To be replaced with SHA-256 hashing.
-     * @var string 40 digit hexadecimal hash (160 bits)
-     */
-    private $sha1;
-
-    /**
-     * Generates the SHA-1 or returns the cached SHA-1 hash for the file.
-     *
-     * @return string|false $sha1
-     */
-    public function getSha1()
-    {
-        if (!$this->sha1) {
-            $this->sha1 = sha1_file($this->tempfile);
-        }
-
-        return $this->sha1;
-    }
-}
diff --git a/php/grill.php b/php/grill.php
deleted file mode 100644
index 5984b12..0000000
--- a/php/grill.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$images = array(
-    'img/2.png',
-    'img/3.png',
-    'img/4.png',
-    'img/5.png',
-    'img/6.png',
-    'img/7.png',
-    'img/8.png',
-    'img/9.png',
-    'img/10.png',
-);
-
-if (headers_sent() === false) {
-    header('Location: '.$images[array_rand($images)], true, 303);
-}
diff --git a/php/includes/database.inc.php b/php/includes/database.inc.php
deleted file mode 100644
index 7a1d4f9..0000000
--- a/php/includes/database.inc.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * Prepares a PDO connection between Pomf and a database server.
- *
- * @copyright Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-require_once 'settings.inc.php';
-
-/* NOTE: we don't have to unref the PDO because we're not long-running */
-$db = new PDO(POMF_DB_CONN, POMF_DB_USER, POMF_DB_PASS);
diff --git a/php/includes/settings.inc.php b/php/includes/settings.inc.php
deleted file mode 100644
index 6e70569..0000000
--- a/php/includes/settings.inc.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * User configurable settings for Pomf.
- *
- * @copyright Copyright (c) 2013, 2014 Peter Lejeck <peter.lejeck@gmail.com>
- * @copyright Copyright (c) 2015 cenci0 <alchimist94@gmail.com>
- * @copyright Copyright (c) 2015, 2016 the Pantsu.cat developers
- * <hostmaster@pantsu.cat>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/**
- * PDO connection socket
- *
- * Database connection to use for communication. Currently, MySQL is the only
- * DSN prefix supported.
- *
- * @see http://php.net/manual/en/ref.pdo-mysql.connection.php PHP manual for
- * PDO_MYSQL DSN.
- * @param string POMF_DB_CONN DSN:host|unix_socket=hostname|path;dbname=database
- */
-define('POMF_DB_CONN', 'mysql:unix_socket=/tmp/mysql.sock;dbname=pomf');
-
-/**
- * PDO database login credentials
- */
-
-/** @param string POMF_DB_NAME Database username */
-define('POMF_DB_USER', 'pomf');
-/** @param string POMF_DB_PASS Database password */
-define('POMF_DB_PASS', '***');
-
-/**
- * File system location where to store uploaded files
- *
- * @param string Path to directory with trailing delimiter
- */
-define('POMF_FILES_ROOT', '/mnt/pantsu/http/files/');
-
-/**
- * Maximum number of iterations while generating a new filename
- *
- * Pomf uses an algorithm to generate random filenames. Sometimes a file may
- * exist under a randomly generated filename, so we count tries and keep trying.
- * If this value is exceeded, we give up trying to generate a new filename.
- *
- * @param int POMF_FILES_RETRIES Number of attempts to retry
- */
-define('POMF_FILES_RETRIES', 15);
-
-/**
- * The length of generated filename (without file extension)
- *
- * @param int POMF_FILES_LENGTH Number of random alphabetical ASCII characters
- * to use
- */
-define('POMF_FILES_LENGTH', 6);
-
-/**
- * URI to prepend to links for uploaded files
- *
- * @param string POMF_URL URI with trailing delimiter
- */
-define('POMF_URL', 'https://i.pantsu.cat/');
-
-/**
- * URI for filename generation 
- *
- * @param string characters to be used in generateName()
- */
-define('ID_CHARSET', 'abcdefghijklmnopqrstuvwxyz');
-
-
-/**
- * Filtered mime types
- * @param string[] $FILTER_MIME allowed/blocked mime types
- */
-$FILTER_MIME = array("");
-/**
- * Filter mode: whitelist (true) or blacklist (false)
- * @param bool $FILTER_MODE mime type filter mode
- */
-$FILTER_MODE = false;
-/**
- * Double dot file extensions
- *
- * Pomf keeps the last file extension for the uploaded file. In other words, an
- * uploaded file with `.tar.gz` extension will be given a random filename which
- * ends in `.gz` unless configured here to ignore discards for `.tar.gz`.
- *
- * @param string[] $doubledots Array of double dot file extensions strings
- * without the first prefixing dot
- */
-$doubledots = array_map('strrev', array(
-    'tar.gz',
-    'tar.bz',
-    'tar.bz2',
-    'tar.xz',
-    'user.js',
-));
diff --git a/php/upload.php b/php/upload.php
deleted file mode 100644
index 503ea0f..0000000
--- a/php/upload.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-
-/**
- * Handles POST uploads, generates filenames, moves files around and commits
- * uploaded metadata to database.
- */
-
-require_once 'classes/Response.class.php';
-require_once 'classes/UploadException.class.php';
-require_once 'classes/UploadedFile.class.php';
-require_once 'includes/database.inc.php';
-
-/**
- * Generates a random name for the file, retrying until we get an unused one.
- *
- * @param UploadedFile $file
- *
- * @return string
- */
-function generateName($file)
-{
-    global $db;
-    global $doubledots;
-
-    // We start at N retries, and --N until we give up
-    $tries = POMF_FILES_RETRIES;
-    $length = POMF_FILES_LENGTH;
-    $ext = pathinfo($file->name, PATHINFO_EXTENSION);
-
-    // Check if extension is a double-dot extension and, if true, override $ext
-    $revname = strrev($file->name);
-    foreach ($doubledots as $ddot) {
-        if (stripos($revname, $ddot) === 0) {
-            $ext = strrev($ddot);
-        }
-    }
-
-    do {
-        // Iterate until we reach the maximum number of retries
-        if ($tries-- === 0) {
-            throw new Exception('Gave up trying to find an unused name',
-                500); // HTTP status code "500 Internal Server Error"
-        }
-
-        $chars = ID_CHARSET; 
-        $name = '';
-        for ($i = 0; $i < $length; ++$i) {
-            $name .= $chars[mt_rand(0, strlen($chars))]; 
-        }
-
-        // Add the extension to the file name
-        if (isset($ext) && $ext !== '') {
-            $name .= '.'.strip_tags($ext);
-        }
-
-        // Check if a file with the same name does already exist in the database
-        $q = $db->prepare('SELECT COUNT(filename) FROM files WHERE filename = (:name)');
-        $q->bindValue(':name', $name, PDO::PARAM_STR);
-        $q->execute();
-        $result = $q->fetchColumn();
-    // If it does, generate a new name
-    } while ($result > 0);
-
-    return $name;
-}
-
-/**
- * Handles the uploading and db entry for a file.
- *
- * @param UploadedFile $file
- *
- * @return array
- */
-function uploadFile($file)
-{
-    global $db;
-    global $FILTER_MODE;
-    global $FILTER_MIME;
-
-    // Handle file errors
-    if ($file->error) {
-        throw new UploadException($file->error);
-    }
-
-    // Check if mime type is blocked
-    if (!empty($FILTER_MIME)) {
-        if ($FILTER_MODE == true) { //whitelist mode
-            if (!in_array($file->mime, $FILTER_MIME)) {
-          	    throw new UploadException(UPLOAD_ERR_EXTENSION);
-       		}
-        } else { //blacklist mode
-            if (in_array($file->mime, $FILTER_MIME)) {
-            throw new UploadException(UPLOAD_ERR_EXTENSION);
-            }
-        }
-    }
-
-
-    // Check if a file with the same hash and size (a file which is the same)
-    // does already exist in the database; if it does, return the proper link
-    // and data. PHP deletes the temporary file just uploaded automatically.
-    $q = $db->prepare('SELECT filename, COUNT(*) AS count FROM files WHERE hash = (:hash) '.
-                      'AND size = (:size)');
-    $q->bindValue(':hash', $file->getSha1(), PDO::PARAM_STR);
-    $q->bindValue(':size', $file->size,       PDO::PARAM_INT);
-    $q->execute();
-    $result = $q->fetch();
-    if ($result['count'] > 0) {
-        return array(
-            'hash' => $file->getSha1(),
-            'name' => $file->name,
-            'url' => POMF_URL.$result['filename'],
-            'size' => $file->size,
-        );
-    }
-
-    // Generate a name for the file
-    $newname = generateName($file);
-
-    // Store the file's full file path in memory
-    $uploadFile = POMF_FILES_ROOT . $newname;
-
-    // Attempt to move it to the static directory
-    if (!move_uploaded_file($file->tempfile, $uploadFile)) {
-        throw new Exception('Failed to move file to destination',
-            500); // HTTP status code "500 Internal Server Error"
-    }
-
-    // Need to change permissions for the new file to make it world readable
-    if (!chmod($uploadFile, 0644)) {
-        throw new Exception('Failed to change file permissions',
-            500); // HTTP status code "500 Internal Server Error"
-    }
-
-    // Add it to the database
-    // 'expire' support is deprecated since version 2.1.0. It may be
-    // removed in a future release.
-    $q = $db->prepare('INSERT INTO files (hash, originalname, filename, size, date, '.
-                      'expire, delid) VALUES (:hash, :orig, :name, :size, :date, '.
-                      ':exp, :del)');
-
-    // Common parameters binding
-    $q->bindValue(':hash', $file->getSha1(),       PDO::PARAM_STR);
-    $q->bindValue(':orig', strip_tags($file->name), PDO::PARAM_STR);
-    $q->bindValue(':name', $newname,                PDO::PARAM_STR);
-    $q->bindValue(':size', $file->size,             PDO::PARAM_INT);
-    $q->bindValue(':date', date('Y-m-d'),           PDO::PARAM_STR);
-    $q->bindValue(':exp',  null,                    PDO::PARAM_STR); // Deprecated since version 2.1.0
-    $q->bindValue(':del',  sha1($file->tempfile),   PDO::PARAM_STR);
-    $q->execute();
-
-    return array(
-        'hash' => $file->getSha1(),
-        'name' => $file->name,
-        'url' => POMF_URL.$newname,
-        'size' => $file->size,
-    );
-}
-
-/**
- * Reorder files array by file.
- *
- * @param  $_FILES
- *
- * @return array
- */
-function diverseArray($files)
-{
-    $result = array();
-
-    foreach ($files as $key1 => $value1) {
-        foreach ($value1 as $key2 => $value2) {
-            $result[$key2][$key1] = $value2;
-        }
-    }
-
-    return $result;
-}
-
-/**
- * Reorganize the $_FILES array into something saner.
- *
- * @param  $_FILES
- *
- * @return array
- */
-function refiles($files)
-{
-    $result = array();
-    $files = diverseArray($files);
-
-    foreach ($files as $file) {
-        $f = new UploadedFile();
-        $f->name = $file['name'];
-        $f->mime = $file['type'];
-        $f->size = $file['size'];
-        $f->tempfile = $file['tmp_name'];
-        $f->error = $file['error'];
-        // 'expire' doesn't exist neither in $_FILES nor in UploadedFile;
-        // it was never implemented and has been deprecated since version 2.1.0.
-        //$f->expire   = $file['expire'];
-        $result[] = $f;
-    }
-
-    return $result;
-}
-
-$type = isset($_GET['output']) ? $_GET['output'] : 'json';
-$response = new Response($type);
-
-if (isset($_FILES['files'])) {
-    $uploads = refiles($_FILES['files']);
-
-    try {
-        foreach ($uploads as $upload) {
-            $res[] = uploadFile($upload);
-        }
-        $response->send($res);
-    } catch (Exception $e) {
-        $response->error($e->getCode(), $e->getMessage());
-    }
-} else {
-    $response->error(400, 'No input file(s)');
-}
diff --git a/sqlite_schema.sql b/sqlite_schema.sql
new file mode 100644
index 0000000..414719c
--- /dev/null
+++ b/sqlite_schema.sql
@@ -0,0 +1,16 @@
+PRAGMA synchronous = OFF;
+PRAGMA journal_mode = MEMORY;
+BEGIN TRANSACTION;
+CREATE TABLE `files` (
+  `id` integer  NOT NULL PRIMARY KEY AUTOINCREMENT
+,  `hash` char(40) default NULL
+,  `originalname` varchar(255) default NULL
+,  `filename` varchar(30) default NULL
+,  `size` integer  default NULL
+,  `date` date default NULL
+,  `expire` date default NULL
+,  `delid` char(40) default NULL
+,  `user` integer  default '0'
+,  `dir` integer default '0'
+);
+END TRANSACTION;
diff --git a/static/js/app.js b/static/js/app.js
index 1b65fc0..e9e755a 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-document.addEventListener('DOMContentLoaded', function() {
+document.addEventListener('DOMContentLoaded', function () {
 
   function addRow(file) {
     var row = document.createElement('li');
@@ -35,8 +35,8 @@ document.addEventListener('DOMContentLoaded', function() {
 
     var progressBar = document.createElement('progress');
     progressBar.className = 'file-progress';
-    progressBar.setAttribute("max", "100");
-    progressBar.setAttribute("value", "0");
+    progressBar.setAttribute('max', '100');
+    progressBar.setAttribute('value', '0');
 
     row.appendChild(name);
     row.appendChild(progressBar);
@@ -53,7 +53,7 @@ document.addEventListener('DOMContentLoaded', function() {
 
     if (evt.lengthComputable) {
       var progressPercent = Math.floor((evt.loaded / evt.total) * 100);
-      bar.setAttribute("value", progressPercent);
+      bar.setAttribute('value', progressPercent);
       percentIndicator.textContent = progressPercent + '%';
     }
   }
@@ -64,8 +64,8 @@ document.addEventListener('DOMContentLoaded', function() {
     var row = xhr.row;
     var percentIndicator = xhr.percent;
 
-    percentIndicator.style.visibility = "hidden";
-    bar.style.visibility = "hidden";
+    percentIndicator.style.visibility = 'hidden';
+    bar.style.visibility = 'hidden';
     row.removeChild(bar);
     row.removeChild(percentIndicator);
     var respStatus = xhr.status;
@@ -78,7 +78,7 @@ document.addEventListener('DOMContentLoaded', function() {
     if (respStatus === 200) {
       var response = JSON.parse(xhr.responseText);
       if (response.success) {
-        link.textContent = response.files[0].url.replace(/.*?:\/\//g, "");
+        link.textContent = response.files[0].url.replace(/.*?:\/\//g, '');
         link.href = response.files[0].url;
         url.appendChild(link);
       } else {
@@ -99,11 +99,11 @@ document.addEventListener('DOMContentLoaded', function() {
     var xhr = new XMLHttpRequest();
     xhr.open('POST', '/upload.php');
 
-    xhr["row"] = row;
-    xhr["bar"] = bar;
-    xhr["percent"] = percentIndicator;
-    xhr.upload["bar"] = bar;
-    xhr.upload["percent"] = percentIndicator;
+    xhr['row'] = row;
+    xhr['bar'] = bar;
+    xhr['percent'] = percentIndicator;
+    xhr.upload['bar'] = bar;
+    xhr.upload['percent'] = percentIndicator;
 
     xhr.addEventListener('load', handleUploadComplete, false);
     xhr.upload.onprogress = handleUploadProgress;
@@ -121,8 +121,9 @@ document.addEventListener('DOMContentLoaded', function() {
   function handleDrag(state, element, evt) {
     stopDefaultEvent(evt);
     if (state.dragCount == 1) {
-      element.textContent = "Drop it here~";
+      element.textContent = 'Drop it here~';
     }
+
     state.dragCount += 1;
   }
 
@@ -130,7 +131,7 @@ document.addEventListener('DOMContentLoaded', function() {
     stopDefaultEvent(evt);
     state.dragCount -= 1;
     if (state.dragCount == 0) {
-      element.textContent = "Select or drop file(s)";
+      element.textContent = 'Select or drop file(s)';
     }
   }