From cdf1603c3afb264d81daae4c714899ea505b7702 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Thu, 4 Nov 2010 22:58:51 +1100 Subject: Fixed minor bug in config.php Added ZIP support. Cleaned functions. --- inc/config.php | 10 ++++-- inc/functions.php | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 3 deletions(-) (limited to 'inc') diff --git a/inc/config.php b/inc/config.php index 44dc60ec..9d09c53c 100644 --- a/inc/config.php +++ b/inc/config.php @@ -40,7 +40,7 @@ define('ERROR_NOMOVE', 'The server failed to handle your upload.'); define('ERROR_FILEEXT', 'Unsupported image format.'); define('ERR_INVALIDIMG','Invalid image.'); - define('ERR_FILSIZE', 'The file was too large.'); + define('ERR_FILESIZE', 'Maximum file size: %maxsz%
Your file\'s size: %sz%'); define('ERR_MAXSIZE', 'The file was too big.'); // For resizing, max values @@ -53,6 +53,10 @@ define('MAX_WIDTH', 10000); define('MAX_HEIGHT', MAX_WIDTH); + 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 :( @@ -63,7 +67,7 @@ define('REDRAW_GIF', false); // Display the aspect ratio in a post's file info - define('SHOW_RATIO', false); + define('SHOW_RATIO', true); define('DIR_IMG', 'src/'); define('DIR_THUMB', 'thumb/'); @@ -92,7 +96,7 @@ 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, '/')) . ')$/'); - if(!defined(IS_INSTALLATION)) { + if(!defined('IS_INSTALLATION')) { 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."); diff --git a/inc/functions.php b/inc/functions.php index b465488c..2454abb2 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1,4 +1,55 @@ 'Multi-disk zip archives not supported.', + 'ZIPARCHIVE::ER_RENAME' => 'Renaming temporary file failed.', + 'ZIPARCHIVE::ER_CLOSE' => 'Closing zip archive failed', + 'ZIPARCHIVE::ER_SEEK' => 'Seek error', + 'ZIPARCHIVE::ER_READ' => 'Read error', + 'ZIPARCHIVE::ER_WRITE' => 'Write error', + 'ZIPARCHIVE::ER_CRC' => 'CRC error', + 'ZIPARCHIVE::ER_ZIPCLOSED' => 'Containing zip archive was closed', + 'ZIPARCHIVE::ER_NOENT' => 'No such file.', + 'ZIPARCHIVE::ER_EXISTS' => 'File already exists', + 'ZIPARCHIVE::ER_OPEN' => 'Can\'t open file', + 'ZIPARCHIVE::ER_TMPOPEN' => 'Failure to create temporary file.', + 'ZIPARCHIVE::ER_ZLIB' => 'Zlib error', + 'ZIPARCHIVE::ER_MEMORY' => 'Memory allocation failure', + 'ZIPARCHIVE::ER_CHANGED' => 'Entry has been changed', + 'ZIPARCHIVE::ER_COMPNOTSUPP' => 'Compression method not supported.', + 'ZIPARCHIVE::ER_EOF' => 'Premature EOF', + 'ZIPARCHIVE::ER_INVAL' => 'Invalid argument', + 'ZIPARCHIVE::ER_NOZIP' => 'Not a zip archive', + 'ZIPARCHIVE::ER_INTERNAL' => 'Internal error', + 'ZIPARCHIVE::ER_INCONS' => 'Zip archive inconsistent', + 'ZIPARCHIVE::ER_REMOVE' => 'Can\'t remove file', + 'ZIPARCHIVE::ER_DELETED' => 'Entry has been deleted', + ); + $errmsg = 'unknown'; + foreach ($zipFileFunctionsErrors as $constName => $errorMessage) { + if (defined($constName) and constant($constName) === $errno) { + return 'Zip File Function error: '.$errorMessage; + } + } + return 'Zip File Function error: unknown'; + } + + function sprintf3($str, $vars, $delim = '%') { + $replaces = array(); + foreach($vars as $k => $v) { + $replaces[$delim . $k . $delim] = $v; + } + return str_replace(array_keys($replaces), + array_values($replaces), $str); + } + + function commaize($n) { + $n = strval($n); + return (intval($n) < 1000) ? $n : commaize(substr($n, 0, -3)) . ',' . substr($n, -3); + } + function sql_open() { global $sql; $sql = @mysql_connect(MY_SERVER, MY_USER, MY_PASSWORD) or error('Database error.'); @@ -15,6 +66,58 @@ } } + function post($post, $OP) { + global $sql; + if($OP) { + mysql_query( + sprintf("INSERT INTO `posts` VALUES ( NULL, NULL, '%s', '%s', '%s', '%s', '%s', '%d', '%d', '%s', '%d', '%d', '%s', '%d', '%d', '%d', '%s', '%s', '%s', '%s' )", + $post['subject'], + $post['email'], + $post['name'], + $post['trip'], + $post['body'], + time(), + time(), + $post['thumb'], + $post['thumbwidth'], + $post['thumbheight'], + $post['file'], + $post['width'], + $post['height'], + $post['filesize'], + $post['filename'], + $post['filehash'], + $post['password'], + mysql_real_escape_string($_SERVER['REMOTE_ADDR']) + ), $sql) or error(mysql_error($sql)); + return mysql_insert_id($sql); + } else { + mysql_query( + sprintf("INSERT INTO `posts` VALUES ( NULL, '%d', '%s', '%s', '%s', '%s', '%s', '%d', '%d', '%s', '%d', '%d', '%s', '%d', '%d', '%d', '%s', '%s', '%s', '%s' )", + $post['thread'], + $post['subject'], + $post['email'], + $post['name'], + $post['trip'], + $post['body'], + time(), + time(), + $post['has_file']?$post['thumb']:null, + $post['has_file']?$post['thumbwidth']:null, + $post['has_file']?$post['thumbheight']:null, + $post['has_file']?$post['file']:null, + $post['has_file']?$post['width']:null, + $post['has_file']?$post['height']:null, + $post['has_file']?$post['filesize']:null, + $post['has_file']?$post['filename']:null, + $post['has_file']?$post['filehash']:null, + $post['password'], + mysql_real_escape_string($_SERVER['REMOTE_ADDR']) + ), $sql) or error(mysql_error($sql)); + return mysql_insert_id($sql); + } + } + function index($page) { global $sql, $board; -- cgit v1.3