summaryrefslogtreecommitdiff
path: root/static/includes/settings.inc.php
diff options
context:
space:
mode:
authorcenci0 <alchimist94@gmail.com>2015-02-03 21:39:47 +0100
committercenci0 <alchimist94@gmail.com>2015-02-03 21:39:47 +0100
commit5b77a4eaab418836820b2a0bad7c88f0b88136a0 (patch)
tree5728296a2f09148c3818ca727238898a021530bd /static/includes/settings.inc.php
parentc359aa20cd0876e1e497aca1ff19e4c54287b6c2 (diff)
Minor code refactoring and updates
DATABASE UPDATE: `orginalname` renamed to `originalname` (run update.sql to update `files` table). Run `update.sql` to update your database, no data will be lost (if you don't update it, pomf won't work properly). `schema.sql` - `id`s are now unsigned to double the maximum number of supported indexes - `size` and `user` columns are unsigned too (we can't have a negative file size or a negative user id) `static/classes/Response.class.php` New class to manage responses and errors. Using a class for responses makes the code cleaner and easier to add new response type handlers in the future. - The response type is declared while a new variable is initialized and the `error` and `send` methods will print a proper output according to it - The header for the response is also set accordingly to the response type (`text/plain` for `csv`/`gyazo` output, `application/json` for `json` output) `static/classes/UploadException.class.php` `Exception` class extension to manage errors that may have occurred while uploading files to the server. This way every error is reported in detail. `static/includes/settings.inc.php` - `POMF_URL`: add an option to set the domain of the url to prepend to the newly generated filename (before it was hardcoded and it was `http://a.pomf.se/`) [this option is currently used only when the output is set to `gyazo`] `upload.php` - Add functions calls at the beginning to enable the output compression if possible (gzipped output) - Include new classes - `generate_name ()` --- The new name generation algorithm is basically the same of the old one, but it's easier to add/remove characters if needed (eg. lower-case letters isn't enough and you need to add capital-case letters or digits) --- Check directly the database instead of the filesystem to see if a generated filename is already in use - `upload_file ()` --- File errors generate a `UploadException` instead of a normal `Exception` --- Move common code outside the `if` to avoid useless code repetition (only the query is now inside the condition) --- Change file permissions of a file after moving it to the new directory (if the user didn't set a mask previouly these files wouldn't be world readable, we make sure they are) - `diverse_array ()` --- Function to reorder initial `$_FILES` array (easier to handle for `refiles`) - `refiles ()` --- Use a `foreach` cicle instead of a `for` one, easier to understand - Create a new response object and set its response type (`csv`, `gyazo` or default to `json`) - Edit response handling according to the new response class
Diffstat (limited to 'static/includes/settings.inc.php')
-rw-r--r--static/includes/settings.inc.php17
1 files changed, 5 insertions, 12 deletions
diff --git a/static/includes/settings.inc.php b/static/includes/settings.inc.php
index 70c7aec..cb152e8 100644
--- a/static/includes/settings.inc.php
+++ b/static/includes/settings.inc.php
@@ -1,26 +1,19 @@
<?php
-/**
- * PDO Connection data
- */
+
// PDO socket
// Or using socket would be even faster then 127.0.0.1 :3
define('POMF_DB_CONN', 'mysql:host=127.0.0.1;dbname=pomf');
-// PDO user
+// MySQL user and password
define('POMF_DB_USER', 'pomf');
-// PDO password
define('POMF_DB_PASS', '***');
-/**
- * File stuff
- */
// Root location of files
define('POMF_FILES_ROOT', '/mnt/disk1/pomf/files/');
-// How many times to retry when exists() before giving up
+// Maximum number of iterations while generating a new name
define('POMF_FILES_RETRIES', 15);
+// URL to prepend to output (include trailing slash)
+define('POMF_URL', 'http://a.pomf.se/');
-/**
- * Double-dot extensions
- */
$doubledots = array_map('strrev', array(
'tar.gz',
'tar.bz',