kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Merge 4.5

Browse Source 
Conflicts:
	inc/display.php
	templates/post_reply.html
	templates/post_thread.html
This commit is contained in:
czaks 2014-07-06 01:24:16 +02:00
commit 6a3dbe5c98
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -7,7 +7,7 @@ vichan is a free light-weight, fast, highly configurable and user-friendly
imageboard software package. It is written in PHP and has few dependencies. imageboard software package. It is written in PHP and has few dependencies.
vichan is a fork of [Tinyboard](http://tinyboard.org/), a great imageboard package, actively vichan is a fork of [Tinyboard](http://tinyboard.org/), a great imageboard package, actively
building on it and adding a lot of features and another improvements. building on it and adding a lot of features and other improvements.
Support and announcements: https://int.vichan.net/devel/ Support and announcements: https://int.vichan.net/devel/

24
inc/functions.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /*
* Copyright (c) 2010-2013 Tinyboard Development Group * Copyright (c) 2010-2014 Tinyboard Development Group
*/ */
if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) { if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
@ -546,6 +546,28 @@ function file_write($path, $data, $simple = false, $skip_purge = false) {
if (!fclose($fp)) if (!fclose($fp))
error('Unable to close file: ' . $path); error('Unable to close file: ' . $path);
/**
* Create gzipped file.
*
* When writing into a file foo.bar and the size is larger or equal to 1
* KiB, this also produces the gzipped version foo.bar.gz
*
* This is useful with nginx with gzip_static on.
*/
if ($config['gzip_static']) {
$gzpath = "$path.gz";
if ($bytes & ~0x3ff) { // if ($bytes >= 1024)
if (file_put_contents($gzpath, gzencode($data), $simple ? 0 : LOCK_EX) === false)
error("Unable to write to file: $gzpath");
if (!touch($gzpath, filemtime($path), fileatime($path)))
error("Unable to touch file: $gzpath");
}
else {
@unlink($gzpath);
}
}
if (!$skip_purge && isset($config['purge'])) { if (!$skip_purge && isset($config['purge'])) {
// Purge cache // Purge cache
if (basename($path) == $config['file_index']) { if (basename($path) == $config['file_index']) {