From 6c20b0ab03e86e16bdf63ac4da92449ca6efc014 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 5 Nov 2010 02:20:19 +1100 Subject: [PATCH] Remove excess --- inc/config.php | 76 +++++++++++++++++++--------------------------------------- post.php | 9 +++---- 2 files changed, 27 insertions(+), 58 deletions(-) diff --git a/inc/config.php b/inc/config.php index 6f07e640..7115c2dc 100644 --- a/inc/config.php +++ b/inc/config.php @@ -8,51 +8,38 @@ * your instance-config.php * */ - + // Database stuff define('MY_SERVER', 'localhost', true); define('MY_USER', '', true); define('MY_PASSWORD', '', true); define('MY_DATABASE', '', true); - + // The name of the session cookie (PHP's $_SESSION) define('SESS_COOKIE', 'imgboard', true); - + // Used to safely determine when the user was first seen, to prevent floods. // time() define('TIME_COOKIE', 'arrived', true); // HASH_COOKIE contains an MD5 hash of TIME_COOKIE+SALT for verification. define('HASH_COOKIE', 'hash', true); - + // How long should the cookies last (in seconds) define('COOKIE_EXPIRE', 15778463, true); //6 months - + define('SALT', 'wefaw98YHEWUFuo', true); - + // How many seconds before you can post, after the first visit define('LURKTIME', 30, true); - + // Max body length define('MAX_BODY', 1800, true); - + define('THREADS_PER_PAGE', 10, true); define('MAX_PAGES', 5, true); define('THREADS_PREVIEW', 5, true); - + // Error messages -<<<<<<< HEAD - define('ERROR_LURK', 'Lurk some more before posting.'); - define('ERROR_BOT', 'You look like a bot.'); - define('ERROR_TOOLONG', 'The %s field was too long.'); - define('ERROR_TOOLONGBODY', 'The body was too long.'); - define('ERROR_TOOSHORTBODY', 'The body was too short or empty.'); - define('ERROR_NOIMAGE', 'You must upload an image.'); - define('ERROR_NOMOVE', 'The server failed to handle your upload.'); - define('ERROR_FILEEXT', 'Unsupported image format.'); - define('ERR_INVALIDIMG','Invalid image.'); - define('ERR_FILESIZE', 'Maximum file size: %maxsz% bytes
Your file\'s size: %filesz% bytes'); - define('ERR_MAXSIZE', 'The file was too big.'); -======= define('ERROR_LURK', 'Lurk some more before posting.', true); define('ERROR_BOT', 'You look like a bot.', true); define('ERROR_TOOLONG', 'The %s field was too long.', true); @@ -64,26 +51,21 @@ define('ERR_INVALIDIMG','Invalid image.', true); define('ERR_FILESIZE', 'Maximum file size: %maxsz% bytes
Your file\'s size: %filesz% bytes', true); define('ERR_MAXSIZE', 'The file was too big.', true); ->>>>>>> 6cdaed486e6c373b52f639d3e92d7365242f6a89 - + // For resizing, max values define('THUMB_WIDTH', 200, true); define('THUMB_HEIGHT', 200, true); - + // Maximum image upload size in bytes define('MAX_FILESIZE', 10*1024*1024, true); // 10MB // Maximum image dimensions define('MAX_WIDTH', 10000, true); define('MAX_HEIGHT', MAX_WIDTH, true); - + define('ALLOW_ZIP', true, true); define('ZIP_IMAGE', 'src/zip.png', true); - - - define('ALLOW_ZIP', true); - define('ZIP_IMAGE', 'src/zip.png'); - - + + /** Redraw the image using GD functions to strip any excess data (commonly ZIP archives) WARNING: Very beta. Currently strips animated GIFs too :( @@ -92,50 +74,40 @@ // Redrawing configuration define('JPEG_QUALITY', 100, true); define('REDRAW_GIF', false, true); - + // Display the aspect ratio in a post's file info -<<<<<<< HEAD - define('SHOW_RATIO', true); -======= define('SHOW_RATIO', true, true); ->>>>>>> 6cdaed486e6c373b52f639d3e92d7365242f6a89 - + define('DIR_IMG', 'src/', true); define('DIR_THUMB', 'thumb/', true); define('DIR_RES', 'res/', true); - + // The root directory, including the trailing slash, for Tinyboard. // examples: '/', '/board/', '/chan/' define('ROOT', '/', true); define('POST_URL', ROOT . 'post.php', true); define('FILE_INDEX', 'index.html', true); define('FILE_PAGE', '%d.html', true); - + // Automatically convert things like "..." to Unicode characters ("�") define('AUTO_UNICODE', true, true); // Whether to turn URLs into functional links define('MARKUP_URLS', true, true); define('URL_REGEX', '/' . '(https?|ftp):\/\/' . '([\w\-]+\.)+[a-zA-Z]{2,6}' . '(\/([\w\-~\.#\/?=&;:+%]+))?' . '/', true); - + // Allowed file extensions $allowed_ext = Array('jpg', 'jpeg', 'bmp', 'gif', 'png', true); - + define('BUTTON_NEWTOPIC', 'New Topic', true); define('BUTTON_REPLY', 'New Reply', true); - + define('ALWAYS_NOKO', false, true); - + define('URL_MATCH', '/^' . (@$_SERVER['HTTPS']?'https':'http').':\/\/'.$_SERVER['HTTP_HOST'] . '(' . preg_quote(ROOT, '/') . '|' . preg_quote(ROOT, '/') . '' . preg_quote(FILE_INDEX, '/') . '|' . preg_quote(ROOT, '/') . '' . str_replace('%d', '\d+', preg_quote(FILE_PAGE, '/')) . ')$/', true); - + if(!defined('IS_INSTALLATION')) { -<<<<<<< HEAD - if(!file_exists(DIR_IMG)) @mkdir(DIR_IMG) or error("Couldn't create " . DIR_IMG . ". Install manually."); - if(!file_exists(DIR_THUMB)) @mkdir(DIR_THUMB) or error("Couldn't create " . DIR_IMG . ". Install manually."); - if(!file_exists(DIR_RES)) @mkdir(DIR_RES) or error("Couldn't create " . DIR_IMG . ". Install manually."); -======= if(!file_exists(DIR_IMG)) @mkdir(DIR_IMG) or error("Couldn't create " . DIR_IMG . ". Install manually.", true); if(!file_exists(DIR_THUMB)) @mkdir(DIR_THUMB) or error("Couldn't create " . DIR_IMG . ". Install manually.", true); if(!file_exists(DIR_RES)) @mkdir(DIR_RES) or error("Couldn't create " . DIR_IMG . ". Install manually.", true); ->>>>>>> 6cdaed486e6c373b52f639d3e92d7365242f6a89 } -?> +?> \ No newline at end of file diff --git a/post.php b/post.php index a69c7c8e..1c875f40 100644 --- a/post.php +++ b/post.php @@ -80,12 +80,9 @@ if($post['has_file']) { $size = $_FILES['file']['size']; if($size > MAX_FILESIZE) - error(sprintf3(ERR_FILESIZE, array( -<<<<<<< HEAD - 'sz'=>commaize($size), -======= - 'filesz'=>commaize($size), ->>>>>>> 6cdaed486e6c373b52f639d3e92d7365242f6a89 + error(sprintf3(ERR_FILESIZE, array( + 'sz'=>commaize($size), + 'filesz'=>commaize($size), 'maxsz'=>commaize(MAX_FILESIZE)))); }