From fd36e447f252851e2bb18d73c6fc6a994a329006 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 5 Nov 2010 03:17:05 +1100 Subject: Descriptive comment about ZIP uploads --- inc/config.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'inc/config.php') diff --git a/inc/config.php b/inc/config.php index 7115c2dc..9d1f260d 100644 --- a/inc/config.php +++ b/inc/config.php @@ -62,6 +62,10 @@ define('MAX_WIDTH', 10000, true); define('MAX_HEIGHT', MAX_WIDTH, true); + /* When you upload a ZIP as a file, all the images inside the archive + * get dumped into the thread as replies. + * Extremely beta and not recommended yet. + */ define('ALLOW_ZIP', true, true); define('ZIP_IMAGE', 'src/zip.png', true); -- cgit v1.3 From 6fc9db808747acf5a91caa65d65819d930f1b987 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 5 Nov 2010 03:18:05 +1100 Subject: ALLOW_ZIP defaults to false instead of true --- inc/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/config.php') diff --git a/inc/config.php b/inc/config.php index 9d1f260d..e5c0b42e 100644 --- a/inc/config.php +++ b/inc/config.php @@ -66,7 +66,7 @@ * get dumped into the thread as replies. * Extremely beta and not recommended yet. */ - define('ALLOW_ZIP', true, true); + define('ALLOW_ZIP', false, true); define('ZIP_IMAGE', 'src/zip.png', true); -- cgit v1.3 From f6abfa61c693b9b55937be0db0a54ca074349cc6 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 5 Nov 2010 20:32:40 +1100 Subject: Added a check to verify if .ZIP files are infact archives. --- inc/config.php | 1 + post.php | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'inc/config.php') diff --git a/inc/config.php b/inc/config.php index e5c0b42e..40ea923a 100644 --- a/inc/config.php +++ b/inc/config.php @@ -51,6 +51,7 @@ 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); + define('ERR_INVALIDZIP', 'Invalid archive!', true); // For resizing, max values define('THUMB_WIDTH', 200, true); diff --git a/post.php b/post.php index 1c875f40..e10f3b4e 100644 --- a/post.php +++ b/post.php @@ -121,6 +121,12 @@ if(!@move_uploaded_file($_FILES['file']['tmp_name'], $post['file'])) error(ERROR_NOMOVE); if($post['zip']) { + // Validate ZIP file + if(is_resource($zip = zip_open($post['zip']))) + zip_close($zip); + else + error(ERR_INVALIDZIP); + $post['file'] = ZIP_IMAGE; $post['extension'] = strtolower(substr($post['file'], strrpos($post['file'], '.') + 1)); } @@ -191,7 +197,6 @@ if(in_array($extension, $allowed_ext)) { if (zip_entry_open($zip, $entry, 'r')) { - // Fake post $dump_post = Array( 'subject' => $post['subject'], -- cgit v1.3 From 247772323ecb035885778c8a6cc8f83f60482c30 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 5 Nov 2010 20:43:18 +1100 Subject: Allowed change of root directory for systems where it is not the current directory. --- inc/config.php | 14 +++++++++++--- post.php | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'inc/config.php') diff --git a/inc/config.php b/inc/config.php index 40ea923a..397257fe 100644 --- a/inc/config.php +++ b/inc/config.php @@ -90,6 +90,11 @@ // The root directory, including the trailing slash, for Tinyboard. // examples: '/', '/board/', '/chan/' define('ROOT', '/', true); + + // If for some reason the folders and static HTML index files aren't in the current working direcotry, + // enter the directory path here. Otherwise, keep it false. + define('ROOT_FILE', false); + define('POST_URL', ROOT . 'post.php', true); define('FILE_INDEX', 'index.html', true); define('FILE_PAGE', '%d.html', true); @@ -105,11 +110,14 @@ 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(ROOT_FILE) { + chdir(ROOT_FILE); + } if(!defined('IS_INSTALLATION')) { 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); diff --git a/post.php b/post.php index e10f3b4e..a1d32f27 100644 --- a/post.php +++ b/post.php @@ -123,6 +123,7 @@ if($post['zip']) { // Validate ZIP file if(is_resource($zip = zip_open($post['zip']))) + // TODO: Check if it's not empty and has at least one (valid) image zip_close($zip); else error(ERR_INVALIDZIP); -- cgit v1.3