Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-12 01:50:48 +01:00
Code Releases Wiki Activity

Merge branch 'sti'

Browse Source 
Conflicts:
	inc/config.php
	inc/functions.php
	post.php
This commit is contained in:
Paul Merrill 2010-11-04 05:16:13 -07:00
commit 4f8bd4da1f
4 changed files with 159 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/config.php
View File

@ -53,6 +53,10 @@
define('MAX_WIDTH', 10000); define('MAX_WIDTH', 10000);
define('MAX_HEIGHT', MAX_WIDTH); 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) Redraw the image using GD functions to strip any excess data (commonly ZIP archives)
WARNING: Very beta. Currently strips animated GIFs too :( WARNING: Very beta. Currently strips animated GIFs too :(
@ -63,7 +67,7 @@
define('REDRAW_GIF', false); define('REDRAW_GIF', false);
// Display the aspect ratio in a post's file info // Display the aspect ratio in a post's file info
define('SHOW_RATIO', false); define('SHOW_RATIO', true);
define('DIR_IMG', 'src/'); define('DIR_IMG', 'src/');
define('DIR_THUMB', 'thumb/'); 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, '/')) . ')$/'); 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_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_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_RES)) @mkdir(DIR_RES) or error("Couldn't create " . DIR_IMG . ". Install manually.");

52
inc/functions.php
View File

@ -24,6 +24,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) { function index($page) {
global $sql, $board; global $sql, $board;

152
post.php
View File

@ -96,7 +96,8 @@
$post['file_id'] = rand(0, 1000000000); $post['file_id'] = rand(0, 1000000000);
$post['file'] = DIR_IMG . $post['file_id'] . '.' . $post['extension']; $post['file'] = DIR_IMG . $post['file_id'] . '.' . $post['extension'];
$post['thumb'] = DIR_THUMB . $post['file_id'] . '.png'; $post['thumb'] = DIR_THUMB . $post['file_id'] . '.png';
if(!in_array($post['extension'], $allowed_ext)) error(ERROR_FILEEXT); $post['zip'] = $OP && $post['has_file'] && ALLOW_ZIP && $post['extension'] == 'zip' ? $post['file'] : false;
if(!($post['zip'] || in_array($post['extension'], $allowed_ext))) error(ERROR_FILEEXT);
} }
// Check string lengths // Check string lengths
@ -107,8 +108,6 @@
if(!(!$OP && $post['has_file']) && strlen($post['body']) < 1) error(ERROR_TOOSHORTBODY); if(!(!$OP && $post['has_file']) && strlen($post['body']) < 1) error(ERROR_TOOSHORTBODY);
if(strlen($post['password']) > 20) error(sprintf(ERROR_TOOLONG, 'password')); if(strlen($post['password']) > 20) error(sprintf(ERROR_TOOLONG, 'password'));
markup($post['body']); markup($post['body']);
if($post['has_file']) { if($post['has_file']) {
@ -117,6 +116,11 @@
// Move the uploaded file // Move the uploaded file
if(!@move_uploaded_file($_FILES['file']['tmp_name'], $post['file'])) error(ERROR_NOMOVE); if(!@move_uploaded_file($_FILES['file']['tmp_name'], $post['file'])) error(ERROR_NOMOVE);
if($post['zip']) {
$post['file'] = ZIP_IMAGE;
$post['extension'] = strtolower(substr($post['file'], strrpos($post['file'], '.') + 1));
}
$size = @getimagesize($post['file']); $size = @getimagesize($post['file']);
$post['width'] = $size[0]; $post['width'] = $size[0];
$post['height'] = $size[1]; $post['height'] = $size[1];
@ -137,7 +141,7 @@
$image = createimage($post['extension'], $post['file']); $image = createimage($post['extension'], $post['file']);
if(REDRAW_IMAGE) { if(REDRAW_IMAGE && !$post['zip']) {
switch($post['extension']) { switch($post['extension']) {
case 'jpg': case 'jpg':
case 'jpeg': case 'jpeg':
@ -161,7 +165,6 @@
// Create a thumbnail // Create a thumbnail
$thumb = resize($image, $post['width'], $post['height'], $post['thumb'], THUMB_WIDTH, THUMB_HEIGHT); $thumb = resize($image, $post['width'], $post['height'], $post['thumb'], THUMB_WIDTH, THUMB_HEIGHT);
$post['thumbwidth'] = $thumb['width']; $post['thumbwidth'] = $thumb['width'];
$post['thumbheight'] = $thumb['height']; $post['thumbheight'] = $thumb['height'];
} }
@ -172,54 +175,101 @@
sql_open(); sql_open();
mysql_safe_array($post); mysql_safe_array($post);
if($OP) { $id = post($post, $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' )", if($post['zip']) {
$post['subject'], // Open ZIP
$post['email'], $zip = zip_open($post['zip']);
$post['name'], // Read files
$post['trip'], while($entry = zip_read($zip)) {
$post['body'], $filename = basename(zip_entry_name($entry));
time(), $extension = strtolower(substr($filename, strrpos($filename, '.') + 1));
time(),
$post['thumb'], if(in_array($extension, $allowed_ext)) {
$post['thumbwidth'], if (zip_entry_open($zip, $entry, 'r')) {
$post['thumbheight'],
$post['file'], // Fake post
$post['width'], $dump_post = Array(
$post['height'], 'subject' => $post['subject'],
$post['filesize'], 'email' => $post['email'],
$post['filename'], 'name' => $post['name'],
$post['filehash'], 'trip' => $post['trip'],
$post['password'], 'body' => '',
mysql_real_escape_string($_SERVER['REMOTE_ADDR']) 'thread' => $id,
), $sql) or error(mysql_error($sql)); 'password' => '',
} else { 'has_file' => true,
mysql_query( 'file_id' => rand(0, 1000000000),
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' )", 'filename' => $filename
$post['thread'], );
$post['subject'],
$post['email'], $dump_post['file'] = DIR_IMG . $dump_post['file_id'] . '.' . $extension;
$post['name'], $dump_post['thumb'] = DIR_THUMB . $dump_post['file_id'] . '.png';
$post['trip'],
$post['body'], // Extract the image from the ZIP
time(), $fp = fopen($dump_post['file'], 'w+');
time(), fwrite($fp, zip_entry_read($entry, zip_entry_filesize($entry)));
$post['has_file']?$post['thumb']:null, fclose($fp);
$post['has_file']?$post['thumbwidth']:null,
$post['has_file']?$post['thumbheight']:null, $size = @getimagesize($dump_post['file']);
$post['has_file']?$post['file']:null, $dump_post['width'] = $size[0];
$post['has_file']?$post['width']:null, $dump_post['height'] = $size[1];
$post['has_file']?$post['height']:null,
$post['has_file']?$post['filesize']:null, // Check if the image is valid
$post['has_file']?$post['filename']:null, if($dump_post['width'] < 1 || $dump_post['height'] < 1) {
$post['has_file']?$post['filehash']:null, unlink($dump_post['file']);
$post['password'], } else {
mysql_real_escape_string($_SERVER['REMOTE_ADDR']) if($dump_post['width'] > MAX_WIDTH || $dump_post['height'] > MAX_HEIGHT) {
), $sql) or error(mysql_error($sql)); unlink($dump_post['file']);
error(ERR_MAXSIZE);
} else {
$dump_post['filehash'] = md5_file($dump_post['file']);
$dump_post['filesize'] = filesize($dump_post['file']);
$image = createimage($extension, $dump_post['file']);
$success = true;
if(REDRAW_IMAGE) {
switch($extension) {
case 'jpg':
case 'jpeg':
imagejpeg($image, $dump_post['file'], JPEG_QUALITY);
break;
case 'png':
imagepng($image, $dump_post['file'], 7);
break;
case 'gif':
if(REDRAW_GIF)
imagegif($image, $dump_post['file']);
break;
case 'bmp':
imagebmp($image, $dump_post['file']);
break;
default:
$success = false;
}
}
// Create a thumbnail
$thumb = resize($image, $dump_post['width'], $dump_post['height'], $dump_post['thumb'], THUMB_WIDTH, THUMB_HEIGHT);
$dump_post['thumbwidth'] = $thumb['width'];
$dump_post['thumbheight'] = $thumb['height'];
// Create the post
post($dump_post, false);
}
}
// Close the ZIP
zip_entry_close($entry);
}
}
}
zip_close($zip);
unlink($post['zip']);
} }
$id = mysql_insert_id($sql);
buildThread(($OP?$id:$post['thread'])); buildThread(($OP?$id:$post['thread']));
if(!$OP) { if(!$OP) {

BIN
src/zip.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB