kashire/lainchan
4
0
Fork 0
Code Issues 18 Pull Requests Releases Wiki Activity
3,127 Commits 3 Branches 26 Tags 120 MiB
8aff83bdd4
Commit Graph

313 Commits

Author SHA1 Message Date
czaks
de035f4a7e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	stylesheets/dark_roach.css
	stylesheets/style.css
 2013-08-20 18:22:37 -04:00
Michael Foster
e45ffb8592 custom timeouet for curl'ing upload urls 2013-08-19 18:54:10 +10:00
czaks
da1b7d087e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	install.php
 2013-08-18 13:16:31 -04:00
Michael Foster
740b710dd4 chmod(): images don't need +x lol 2013-08-19 01:54:14 +10:00
Michael Foster
154fbf5070 Huge bug: undoImage() was not working at all. This means lots of Tinyboard users probably have lone/permanent images. Working on Tinyboard-Tools script to remove all images/thumbs that don't belong. 2013-08-19 01:07:04 +10:00
Michael Foster
80804b9df6 Bugfix: $config['file_thumb'] being used incorrectly 2013-08-18 20:53:01 +10:00
czaks
bf119b7abd Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	js/post-hover.js
 2013-08-17 16:21:40 -04:00
Michael Foster
3a27060503 GeoIP: Ignore country codes that aren't country codes: ap (Asia/Pacific), EU, etc. 2013-08-18 01:06:13 +10:00
czaks
ca565d07c2 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/display.php
 2013-08-16 16:06:54 -04:00
Michael Foster
0d45fbc799 Add \n before post modifiers. Add flag alt for country flags. 2013-08-17 03:39:58 +10:00
czaks
146243c473 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
 2013-08-16 10:07:24 -04:00
Michael Foster
a9fe4ea2db Change flag_country to just flag 2013-08-16 22:12:25 +10:00
Michael Foster
4876a27232 Much better post modifiers: raw HTML, ban messages, etc. 2013-08-16 21:25:56 +10:00
Michael Foster
b666886416 A few modifications: 
1. Finally, clean up some of the crappy code in inc/display.php; no more extreme clutter. new Thread() and new Post() take an array as the first parameter now.

2. Poster country flags. Currently requires the "geoip" extension.

3. Give post images a classname. This was also long-overdue.
 2013-08-16 21:08:01 +10:00
czaks
4f855cf3b3 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
 2013-08-13 14:46:16 -04:00
Michael Foster
60b3cfc539 Upload via URL: Make sure we're not vulnerable to this buffer overflow exploit. http://www.exploit-db.com/exploits/24487/ 2013-08-13 00:07:23 +10:00
Michael Foster
6fdbe76f7b bugfix: sometimes this acts weird 2013-08-12 23:35:27 +10:00
Michael Foster
6a1e8e834b Fix last commit: add chmod() to fix some permissions derping 2013-08-12 23:06:58 +10:00
Michael Foster
0de0bc6ceb Optional: Allow uploading by URL 2013-08-12 22:51:46 +10:00
czaks
8534e2cc80 Merge branch 'noko50-new-dev11' of http://github.com/fallenPineapple/Tinyboard 
Conflicts:
	inc/functions.php
 2013-08-11 17:49:29 -04:00
czaks
fa9bf536c3 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	js/catalog-link.js
	post.php
	templates/banned.html
 2013-08-11 09:50:33 -04:00
Michael Foster
5836cd23d2 Critical bug: users could not report OP posts, only replies (thanks to ctrlcctrlv for finding this) 2013-08-11 21:22:25 +10:00
fallenPineapple
a4e97c32ec noko50 reply fix 2013-08-11 06:29:30 -04:00
fallenPineapple
12ee85beaf Adds "noko50" (View Last 50 Posts) pages. (Broken Reply) 2013-08-10 17:16:30 -04:00
ctrlcctrlv
52df2bd5fd Critical bug: users could not report OP posts, only replies 2013-08-09 17:53:23 +00:00
czaks
06d2dafa2a Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-04 23:31:53 -04:00
Michael Foster
f1e3c53d8d exiftool: -q needed twice to suppress warning messages 2013-08-04 23:15:01 -04:00
Michael Foster
c9fe458152 exiftool: -ignoreMinorErrors 2013-08-04 23:05:20 -04:00
Michael Foster
373fb99a7f Bugfix: exif_read_data() Incorrect APP1 Exif Identifier Code 2013-08-04 23:02:15 -04:00
czaks
7ed01737c7 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-04 01:00:23 -04:00
Michael Foster
a2b432cfb0 Some logic fixes. Don't strip exif twice. 2013-08-04 00:54:27 -04:00
Michael Foster
0387ae1b46 Use exiftool to patch bug for now. 2013-08-04 00:48:28 -04:00
czaks
f128811dd3 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 22:18:46 -04:00
Michael Foster
ac4306555b Fix for instances with old GraphicsMagick or ImageMagick versions (no -auto-orient). 2013-08-03 22:14:25 -04:00
root
1f5ce14f59 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 21:49:38 -04:00
Michael Foster
b373b39f44 Bugfix: gm and auto-orient thumbnailing 2013-08-03 21:47:24 -04:00
czaks
d79da75fa9 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 21:01:26 -04:00
Michael Foster
b67fc7d54e Only use identify if we have to 2013-08-03 20:50:37 -04:00
Michael Foster
5300ffadf1 Better image processing. Add support for GraphicsMagick (a fork of ImageMagick) and exiftool (for stripping EXIF metadata quickly). 2013-08-03 20:34:59 -04:00
czaks
a0855cdcf5 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
	inc/functions.php
	templates/generic_page.html
	templates/index.html
 2013-08-03 19:05:25 -04:00
Michael Foster
a3fbff2259 Update $config['try_smarter']. Should be working now. 2013-08-03 17:42:34 -04:00
Michael Foster
4fce9b63ae Major config.php cleanup and a few minor misc fixes. 2013-08-02 20:52:58 -04:00
czaks
1ed45ebe9e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	stylesheets/dark.css
	stylesheets/futaba+vichan.css
	stylesheets/miku.css
	stylesheets/stripes.css
	stylesheets/testorange.css
	stylesheets/wasabi.css
 2013-08-01 23:43:20 -04:00
Michael Foster
40ab2e0c17 Don't redraw image again after correcting image orientation; Correct image orientation with convert+gifsicle too 2013-08-01 21:28:16 -04:00
czaks
168a4d73cc Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-01 00:47:33 -04:00
Michael Foster
a052a791b5 Add optional database table prefix (issue #118; see issue comments for details) 2013-07-31 22:14:26 -04:00
czaks
83844b5e3e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/functions.php
 2013-07-31 21:03:13 -04:00
Michael Foster
328484bee7 SQL cleanup 2013-07-31 20:51:43 -04:00
czaks
b35ea55763 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	templates/thread.html
 2013-07-31 19:25:04 -04:00
Michael Foster
6bbe407e18 Markup modifiers: raw HTML 2013-07-31 19:18:55 -04:00
Michael Foster
6d52c8b428 Markup modifiers. Fix issue #66 (public ban message lost when rebuilding post body) 2013-07-31 18:59:54 -04:00
czaks
c0abd1d851 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 17:02:30 -04:00
Michael Foster
d692bce686 Fix issue #74. Note: This bug may break the display of certain filenames prior to upgrade. 2013-07-31 16:34:50 -04:00
czaks
55c7146d88 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
	inc/image.php
	js/expand.js
	js/hide-threads.js
	js/local-time.js
	js/smartphone-spoiler.js
	templates/header.html
	templates/index.html
	templates/main.js
	templates/page.html
	templates/post_reply.html
	templates/post_thread.html
	templates/thread.html
 2013-07-31 14:54:20 -04:00
Michael Foster
8e4c493a4c Issue #126 2013-07-31 12:05:19 -04:00
czaks
96bcf5dd1e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/functions.php
	inc/mod/pages.php
	install.php
	js/expand.js
	mod.php
 2013-07-31 02:30:44 -04:00
Michael Foster
42cba53887 Allow Unicode in board URIs. 2013-07-31 02:08:55 -04:00
Michael Foster
8efab06616 Upgrade to utf8mb4 charset for MySQL server versions above 5.5.3. Keep support for older versions. Fix charsets for multiple columns and tables. 2013-07-30 22:08:56 -04:00
Michael Foster
461084d400 MySQL's utf8 charset only supports up to 3-byte symbols. Insterting four byte symbols (U+010000 to U+10FFFF) can be done maliciously to break HTML mark-up. 
The ideal solution was to convert to MySQL's utf8mb4 charset, but then we would lose support for MySQL < 5.5.3. In this fix, incompatible characters are encoded as HTML numeric character references (eg. #65536) and just stripped from body_nommarkup.
 2013-07-30 16:41:10 -04:00
czaks
d11e9d752e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-28 20:51:43 -04:00
Michael Foster
bd8bd3c02e Fix for last commit 2013-07-28 20:46:00 -04:00
Michael Foster
57c8e4ee7c Strip combining characters from Unicode strings (eg. Zalgo) 2013-07-28 20:33:26 -04:00
czaks
805c729892 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-22 10:14:17 -04:00
Michael Foster
308f557fd5 Option to automatically strip EXIF metadata from JPEGs 2013-07-21 15:50:45 -04:00
czaks
97a22e57c1 Remove imgcaptcha, this code is unused in any of our forks and needs work to get here back. 
Revert "Merge branch 'imgcaptcha' of https://github.com/asiekierka/Tinyboard"

This reverts commit 49afb685c8, reversing
changes made to 2451a0f29c.

Conflicts:

	js/imgcaptcha.js
 2013-07-20 22:47:26 -04:00
czaks
9f323ae65f Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	templates/themes/sitemap/info.php
 2013-07-20 17:28:34 -04:00
Michael Foster
30dc892786 Only store video URLs in database, instead of the generated player HTML. 2013-07-19 18:36:12 -04:00
Michael Foster
0ba40a8fc2 I just realized that ImageMagick had a -auto-orient switch. No need for all that code. 2013-07-19 09:39:46 -04:00
czaks
fa66b96240 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	post.php
 2013-07-18 15:19:03 -04:00
Michael Foster
e4bd9a6886 Themes edit: Split "post" into two seperate actions: "post" (replies) and "post-thread". And add a $board variable. 2013-07-18 12:06:26 -04:00
czaks
7bdb96a16b Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	install.php
	templates/index.html
	templates/thread.html
 2013-07-16 13:02:13 -04:00
Michael Foster
c2dc25ac51 incrementSpamHash() was duplicated for some reason 2013-07-16 01:34:36 -04:00
czaks
24a520485d Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	templates/page.html
 2013-06-21 16:41:39 -04:00
czaks
c073967600 SPDY: send back updated thread/index after post 
Sets X-Associated-Content header, which is at least recognized
by Apache mod_spdy.
 2013-06-21 16:37:56 -04:00
Macil Tech
3eda5b0543 Adds image_hard_limit and reply_hard_limit options. 
Also reworks the numPosts() function and uses it elsewhere too.
 2013-06-18 12:21:41 -05:00
Marcin Łabanowski
fabba73ce4 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into HEAD 
Conflicts:
	mod.php
 2013-01-23 18:58:38 +01:00
Michael Save
a44e0571bc Automatically rotate and mirror images based on EXIF orientation (only compatiable with "convert" option selected at the moment) 2013-01-24 03:24:38 +11:00
Marcin Łabanowski
18ca523b18 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-01-21 13:17:13 +01:00
Michael Save
7a68fc9525 Copyright and license update for 2013. 2013-01-20 21:23:46 +11:00
Marcin Łabanowski
82fb733906 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-01-19 16:23:02 +01:00
Macil Tech
0da1c18a7f Add field_disable_subject and field_disable_reply_subject config options. 2013-01-19 01:37:48 -06:00
Michael
accc3992f3 Merge pull request #93 from Macil/image_reject_repost_in_thread 
Add image_reject_repost_in_thread option
 2013-01-18 23:03:16 -08:00
Macil Tech
67ab3760ba Removed redundant code in image processing. 
Both paths of the code here did the same thing.
 2013-01-19 00:39:29 -06:00
Macil Tech
91e8547b04 Add image_reject_repost_in_thread option 2013-01-19 00:25:24 -06:00
asiekierka
091216082a fixed to actually work 2012-12-22 18:16:09 +01:00
Michael Save
6a705fd8c2 Merge branch 'mod-rewrite' 
Conflicts:
	inc/lib/Twig/Extensions/Extension/Tinyboard.php
	install.php
	mod.php
	stylesheets/style.css
	templates/index.html
	templates/page.html
	templates/thread.html
 2012-08-27 02:28:04 +10:00
Michael Save
c919e73625 Temporary bugfix for incorrectly escaped email field 2012-08-27 02:18:31 +10:00
Michael Save
6775eebcfa $post['id'] 2012-05-27 20:55:56 +10:00
Michael Save
ad220b725d Bugfix: the number of successful passes for an anti-spam "hash" was often incorrectly incremented 2012-05-07 23:51:58 +10:00
Michael Save
9058d202ed Bugfix: the number of successful passes for an anti-spam "hash" was often incorrectly incremented 2012-05-07 23:51:15 +10:00
Michael Save
890b541191 custom capcode permissions 2012-05-07 18:22:20 +10:00
Michael Save
2082fcde24 Bugfix: with file uploading (introduced with last commit) 2012-05-05 18:12:11 +10:00
Michael Save
b5c7e30609 Bugfix: non-image file uploading 2012-05-05 18:11:45 +10:00
Michael Save
d6f5fc28ce Bugfix: with file uploading (introduced with last commit) 2012-04-20 19:48:11 +10:00
Michael Save
9286ec4928 Bugfix: with file uploading (introduced with last commit) 2012-04-20 19:47:25 +10:00
Michael Save
4c2066bc27 Bugfix: non-image file uploading 2012-04-20 19:04:53 +10:00
Michael Save
df97c559bd Bugfix: non-image file uploading 2012-04-20 19:04:37 +10:00
Michael Save
f48bfbf299 typo 2012-04-14 03:44:00 +10:00
Michael Save
1437a121f7 typo 2012-04-14 03:43:04 +10:00
Michael Save
51675e7a9b code cleanup 2012-04-13 00:18:19 +10:00