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

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Browse Source 
Conflicts:
	js/post-hover.js
This commit is contained in:
czaks 2013-08-17 16:21:40 -04:00
commit bf119b7abd
4 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inc/functions.php
View File

@ -953,6 +953,8 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) {
// Delete posts and maybe replies // Delete posts and maybe replies
while ($post = $query->fetch(PDO::FETCH_ASSOC)) { while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
event('delete', $post);
if (!$post['thread']) { if (!$post['thread']) {
// Delete thread HTML page // Delete thread HTML page
file_unlink($board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $post['id'])); file_unlink($board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $post['id']));
@ -1509,10 +1511,12 @@ function markup(&$body, $track_cites = false) {
$modifiers = extract_modifiers($body); $modifiers = extract_modifiers($body);
$body = preg_replace('@<tinyboard ([\w\s]+)>(.+?)</tinyboard>@us', '', $body); $body = preg_replace('@<tinyboard (?!escape )([\w\s]+)>(.+?)</tinyboard>@us', '', $body);
$body = preg_replace('@<(tinyboard) escape ([\w\s]+)>@i', '<$1 $2>', $body);
if (isset($modifiers['raw html']) && $modifiers['raw html'] == '1') if (isset($modifiers['raw html']) && $modifiers['raw html'] == '1') {
return $body; return array();
}
$body = str_replace("\r", '', $body); $body = str_replace("\r", '', $body);
$body = utf8tohtml($body); $body = utf8tohtml($body);
@ -1658,7 +1662,7 @@ function markup(&$body, $track_cites = false) {
} }
function escape_markup_modifiers($string) { function escape_markup_modifiers($string) {
return preg_replace('@<tinyboard ([\w\s]+)>@m', '<tinyboard escape $1>', $string); return preg_replace('@<(tinyboard) ([\w\s]+)>@mi', '<$1 escape $2>', $string);
} }
function utf8tohtml($utf8) { function utf8tohtml($utf8) {

28
js/expand-all-images.js Normal file
View File

@ -0,0 +1,28 @@
/*
* expand-all-images.js
* https://github.com/savetheinternet/Tinyboard/blob/master/js/expand-all-images.js
*
* Adds an "Expand all images" button to the top of the page.
*
* Released under the MIT license
* Copyright (c) 2012-2013 Michael Save <savetheinternet@tinyboard.org>
*
* Usage:
* $config['additional_javascript'][] = 'js/jquery.min.js';
* $config['additional_javascript'][] = 'js/inline-expanding.js';
* $config['additional_javascript'][] = 'js/expand-all-images.js';
*
*/
onready(function(){
$('hr:first').before('<div id="expand-all-images" style="text-align:right"><a class="unimportant" href="javascript:void(0)"></a></div>');
$('div#expand-all-images a')
.text(_('Expand all images'))
.click(function() {
$('a img.post-image').each(function() {
if (!$(this).parent()[0].dataset.expanded)
$(this).parent().click();
});
$(this).parent().remove();
});
});

1
js/post-hover.js
View File

@ -110,6 +110,7 @@ onready(function(){
} }
$post = $('[data-board="' + board + '"] div.post#reply_' + id + ', [data-board="' + board + '"]div#thread_' + id); $post = $('[data-board="' + board + '"] div.post#reply_' + id + ', [data-board="' + board + '"]div#thread_' + id);
if(hovering && $post.length > 0) { if(hovering && $post.length > 0) {
start_hover($link); start_hover($link);
} }

1
post.php
View File

@ -432,6 +432,7 @@ if (isset($_POST['delete'])) {
error('GeoIP not available: ' . geoip_db_filename(GEOIP_COUNTRY_EDITION)); error('GeoIP not available: ' . geoip_db_filename(GEOIP_COUNTRY_EDITION));
} }
if ($country_code = @geoip_country_code_by_name($_SERVER['REMOTE_ADDR'])) { if ($country_code = @geoip_country_code_by_name($_SERVER['REMOTE_ADDR'])) {
if (!in_array(strtolower($country_code), array('eu', 'ap', 'o1', 'a1', 'a2')))
$post['body'] .= "\n<tinyboard flag>" . strtolower($country_code) . "</tinyboard>" . $post['body'] .= "\n<tinyboard flag>" . strtolower($country_code) . "</tinyboard>" .
"\n<tinyboard flag alt>" . @geoip_country_name_by_name($_SERVER['REMOTE_ADDR']) . "</tinyboard>"; "\n<tinyboard flag alt>" . @geoip_country_name_by_name($_SERVER['REMOTE_ADDR']) . "</tinyboard>";
} }