Commit Graph

499 Commits

Author SHA1 Message Date
Michael Foster
a83715dcb0 single quotation marks please 2013-08-21 22:43:35 +10:00
Michael Foster
cbfafeea36 merge fail 2013-08-21 22:36:48 +10:00
ctrlcctrlv
ed142a5e5d ;_; 2013-08-21 22:35:19 +10:00
ctrlcctrlv
ecda099dfb Custom fields in API, read config.php for info. Non-4chan compatible fields removed. 2013-08-21 22:35:01 +10:00
ctrlcctrlv
01e906b1d3 Make it possible to disable API, disable it by default
Conflicts:
	inc/functions.php
2013-08-21 22:34:52 +10:00
K
0cb54b15dc Add support for 4chan-compatible json API.
Conflicts:
	inc/functions.php
2013-08-21 22:32:44 +10:00
ctrlcctrlv
c617603179 ;_; 2013-08-20 21:35:16 +00:00
ctrlcctrlv
8794fe0149 Delete JSON when thread deleted 2013-08-20 19:53:11 +00:00
ctrlcctrlv
8c081a4ab5 Oops, forgot to check if enabled at one point 2013-08-20 18:59:20 +00:00
ctrlcctrlv
3e9f4f101a Custom fields in API, read config.php for info. Non-4chan compatible fields removed. 2013-08-20 18:17:05 +00:00
ctrlcctrlv
a29a9324ea Make it possible to disable API, disable it by default 2013-08-20 16:53:05 +00: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
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
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
cff62b250c Bugfix: raw html posting 2013-08-18 04:49:56 +10:00
Michael Foster
28f366b686 keep casing of escape modifiers 2013-08-17 17:56:38 +10:00
Michael Foster
998002fd34 better modifier escaping again 2013-08-17 17:53:39 +10:00
Michael Foster
b2d5ec253b escape_markup_modifiers: make it case insensitive 2013-08-17 17:41:22 +10:00
Michael Foster
e7f25aa480 add delete event 2013-08-17 16:06:45 +10:00
czaks
3696ffd035 noko50 fix previous commit 2013-08-16 10:10:18 -04:00
czaks
8a4b7c3349 fix noko50 for new new Post and new Thread syntax 2013-08-16 10:09:37 -04: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
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
07b825c6d2 Don't create anti-bot stuff in buildThread() when asked to return HTML as a string. 2013-08-13 21:53:23 +10:00
Michael Foster
c6e629bf89 allow wordfilters to be callbacks 2013-08-13 01:53:23 +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
fallenPineapple
12ee85beaf Adds "noko50" (View Last 50 Posts) pages. (Broken Reply) 2013-08-10 17:16:30 -04:00
czaks
ebac98e207 critical fix for merge 4chanapi+try_smarter: make even pages work 2013-08-09 19:46:28 -04:00
czaks
0d8e2a65ab fix api issue 2013-08-05 06:09:15 -04:00
czaks
ea97efc8f3 that wasn't meant to be committed 2013-08-05 05:03:46 -04:00
czaks
6267876758 tinyboard special markup: allow content to span multiple lines 2013-08-05 05:02:37 -04:00
czaks
67daf109f2 fix Varnish compatibility when characters such as * are in use for a boardname 2013-08-05 04:51:48 -04:00
czaks
8ad36a851c fix Varnish compatibility when characters such as * are in use for a boardname 2013-08-04 22:12:21 -04:00
czaks
f494b34562 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/image.php
2013-08-04 21:17:38 -04:00
Michael Foster
acfda35648 gifsicle: redirect stdout to /dev/null but keep stderr going to stdout 2013-08-04 16:32:36 -04:00
Michael Foster
0f00f800b9 Use new shell_exec function for $config['dns_system'] host queries too 2013-08-04 05:03:21 -04:00
Michael Foster
6409ac6163 fix last commit 2013-08-04 04:49:21 -04:00
Michael Foster
0890557ebb Don't purge the ban list of expires bans every time somebody posts. Add a timer option. Less SQL queries when posting. 2013-08-04 04:48:13 -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
Michael Foster
486eccba2e shell_exec_error() fix 2013-08-03 21:53:09 -04:00
czaks
d79da75fa9 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 21:01:26 -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
f7d068536a EXPERIMENTAL: Try not to build pages when we shouldn't have to. 2013-08-03 07:50:25 -04:00
Michael Foster
c9684fc000 Better/working web config editor 2013-08-03 05:21:02 -04:00
Michael Foster
3ed15565b0 Why is this escaped? 2013-08-03 03:36:20 -04:00
Michael Foster
056a6001ac Erorr handling update 2013-08-03 02:01:52 -04:00
Michael Foster
1d37e81ade Better error handling/displaying with $config['debug'] and $config['verbose_errors'] 2013-08-03 00:22:28 -04:00
Michael Foster
4fce9b63ae Major config.php cleanup and a few minor misc fixes. 2013-08-02 20:52:58 -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
cefd5517ac Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 21:36:54 -04:00
czaks
232f4ff868 markup modifiers: make it even harder to escape 2013-07-31 21:27:50 -04:00
Michael Foster
ea2b8cce07 Bugfix: HTML injection in post editing (introduces and fixes yet another bug) 2013-07-31 21:24:17 -04:00
czaks
e93d5b2f8e Revert "markup modifiers: make it even harder to escape"
This reverts commit d7ea47a91f.
2013-07-31 21:22:57 -04:00
czaks
055c3a7382 Revert "facilitate using markup modifiers multiple times; make raw html not consume the whole post"
This reverts commit e7dd0bbc4a.
2013-07-31 21:22:32 -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
a5312ebe89 Allow public ban messages on raw HTML posts 2013-07-31 21:02:26 -04:00
Michael Foster
328484bee7 SQL cleanup 2013-07-31 20:51:43 -04:00
czaks
d7ea47a91f markup modifiers: make it even harder to escape 2013-07-31 20:13:19 -04:00
czaks
e7dd0bbc4a facilitate using markup modifiers multiple times; make raw html not consume the whole post 2013-07-31 20:11:11 -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
dc9df2b9b3 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 17:05:53 -04:00
Michael Foster
3a8736cdc0 Fix last commit 2013-07-31 17:04:36 -04:00
Michael Foster
c2a287cd14 Only run SQL query to count threads if we really need to 2013-07-31 17:02:42 -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
42e16e233a Javascript l10n: Work without $config['additional_javascript_compile'] 2013-07-31 06:54:53 -04:00
czaks
67db0a878a js i18n: finish implementation with addition of the compiled locale strings file to additional javascripts 2013-07-31 04:57:50 -04:00
czaks
3f98522ff2 i18n one more string in inc/functions.php 2013-07-31 04:56:42 -04:00
czaks
babeec8bb9 localise time values 2013-07-31 04:55:34 -04:00
Michael Foster
18516ff828 Rename $config['url_ads'] to $config['link_prefix'] 2013-07-31 03:43:01 -04:00
Marcin Łabanowski
3ef2c05bb2 url_ads: fix it not working 2013-07-31 03:39:20 -04:00
szalej
5bf53cb581 Update inc/functions.php
url ads
2013-07-31 03:39:15 -04:00
szalej
220609999a Update inc/functions.php
Hide Referrer (nullrefer.com)
2013-07-31 03:39:10 -04:00
czaks
ee23ec1e24 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 03:18:11 -04:00
Michael Foster
a2d8e4cf3e Previous commit comment fix 2013-07-31 03:13:51 -04:00
Michael Foster
37d769646b Markup/quote fix for multibyte 2013-07-31 03:12:06 -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
b22bcdecf9 Fix last commit: purge() issue 2013-07-31 02:19:58 -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
065a6f97c8 localise time values 2013-07-27 01:50:38 -04:00
czaks
ae99c6dd0d i18n one more string in inc/functions.php 2013-07-27 01:21:30 -04:00
czaks
5108bd1bf7 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/functions.php
2013-07-26 13:47:53 -04:00
Michael Foster
37d5846e4e Fix markup overlapping. Issue #124 2013-07-26 11:01:13 -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
84aaaabece Merge branch 'master' of https://github.com/kaja47/Tinyboard 2013-07-16 13:40:56 -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
aadb57f2a2 More ban stuff: Show whether or not user has "seen" a ban yet in the ban list and on IP address pages. Purge useless expired ban records. 2013-07-16 08:50:39 -04:00
Michael Foster
c8f30550af $config['require_ban_view']: Force users to view the "You are banned" page at least once before letting a ban disappear naturally. 2013-07-16 06:33:37 -04:00