1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-24 07:30:10 +01:00
Commit Graph

622 Commits

Author SHA1 Message Date
czaks
26884e8e11 Merge 4.5
Conflicts:
	post.php
2014-06-20 23:35:45 +02:00
Techan
eb2a468a09 Improve protection from displaying errors to visitors 2014-06-20 23:07:07 +02:00
czaks
b12612ac57 fix sql error as reported by a Romanian anon 2014-06-14 18:33:55 +02:00
Fredrick Brennan
9b3f8421fc Fix displaying bans 2014-05-14 13:51:49 -04:00
czaks
dafe0d5896 Merge branch 'master' of github.com:vichan-devel/Tinyboard into staging 2014-05-04 00:19:45 +02:00
czaks
8d4104feb0 restore php5.3 compatibility. thx for Kihokki for reporting that 2014-05-03 23:58:24 +02:00
czaks
211c1acec9 actually fix this bug 2014-05-02 19:32:18 +02:00
czaks
9416587d40 fix a bug with multiple images; thanks to saiko of tahta.ch for reporting it 2014-05-02 18:58:21 +02:00
Fredrick Brennan
042e7b9c59 Deprecate postControls(), per-file deletion and spoilering 2014-04-30 17:18:35 -04:00
copypaste
c483e1258c multiimage posting 2014-04-27 15:48:47 +02:00
czaks
a9c35844c7 fix themes resetting the board 2014-04-21 15:38:18 +02:00
czaks
b33e8cb10d fix previous commit 2014-04-19 23:06:59 +02:00
ctrlcctrlv
465986d06c use all boards for search.php if boards are not specified 2014-04-19 23:03:23 +02:00
kaf
f83c87b623 Added: /pol/-like flags based on a953229de7
Conflicts:
	inc/config.php
	templates/post_form.html
2014-04-19 18:48:17 +02:00
czaks
2d34274672 fix posting of ı and İ, possibly a bit more xD 2014-04-18 14:38:05 +02:00
czaks
5a73af9ea1 add a webm posthandler 2014-04-06 21:54:22 +02:00
czaks
2a41c37fee fix link_prefix. thanks to anon on http://tinyboard.org/demo/mod.php?/sup/res/1210.html 2014-03-13 22:39:32 +01:00
czaks
75cca1ffb2 fix previous commit 2014-02-24 15:29:26 +01:00
czaks
58615845ad allow basic commenting of locale string 2014-02-23 19:01:41 +01:00
czaks
9c30e380d8 actually fix prevous commit 2014-02-23 18:54:31 +01:00
czaks
0354b9a5e3 finally fix i18n strings in config.php 2014-02-23 18:49:04 +01:00
czaks
cbf44d4d75 cleanup: don't trigger rebuild code; fail silently (boardlink race fix; I will test it a bit) 2014-02-18 20:42:19 +01:00
czaks
c5dfc2937c fix double quoting in links. thanks STI for reporting that 2014-01-17 00:30:04 +01:00
czaks
d6b8447233 revise 4chan api support 2013-12-28 19:46:50 +01:00
czaks
62fe8571e2 json api: fix building of catalog.json (NB: this puts extra load on server; we can try to make it lighter) 2013-12-28 18:03:49 +01:00
czaks
f5657caf24 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
Conflicts:
	inc/config.php
	install.php
	post.php
	stylesheets/style.css
2013-11-11 21:54:35 +01:00
Michael Foster
9fb63b053f new event: markup-url 2013-10-04 20:13:58 +10:00
Michael Foster
964bb83300 OK, now it is secure. 2013-09-23 14:23:42 +10:00
Michael Foster
9cf6814776 Fix secure tripcode hardening 2013-09-23 12:53:44 +10:00
Michael Foster
699279d84a Hardened secure tripcode? 2013-09-23 12:41:27 +10:00
Michael Foster
a9b7f9b1bc begin implementation of in-built ban appealing 2013-09-21 12:51:23 +10:00
czaks
8ca495e5b8 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
Conflicts:
	inc/config.php
2013-09-17 19:12:19 -04:00
Michael Foster
57e4292e9d Improvements to showing post in ban 2013-09-18 08:56:04 +10:00
Michael Foster
3471f7c668 Optionally show post user was banned for 2013-09-18 08:47:34 +10:00
czaks
6cb7eb939e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	install.php
	js/quick-reply.js
	post.php
	templates/index.html
2013-09-17 10:43:44 -04:00
Michael Foster
3e57bb04d7 Begin upgrade to much better bans table. DO NOT PULL YET; It won't work. 2013-09-17 09:15:24 +10:00
Michael Foster
4cd2389655 lol 2013-09-15 05:48:37 +10:00
Michael Foster
32c999346f Remove $config['url_regex']; 2013-09-15 05:46:08 +10:00
Michael Foster
104e2bce6d Combine ban checking into single SQL query. Messy/inefficient query, but good enough. 2013-09-10 16:20:54 +10:00
Michael Foster
6f62499160 Bugfix: Undefined $cached (when caching is disabled) 2013-09-09 19:19:11 +10:00
Michael Foster
eea4e42609 Add ability to create custom user/permissions groups 2013-09-09 01:33:51 +10:00
Michael Foster
d80af7d077 Bugfix: Sometimes caching here fucks up. Not really sure why yet. 2013-09-08 13:35:02 +10:00
Michael Foster
55dc5cedc3 Steal make_comment_hex() from plainib 2013-09-07 12:50:32 +10:00
Michael Foster
ecda7abe92 bugfix lol 2013-09-07 00:04:22 +10:00
Michael Foster
f309e4037c Better and faster basic flood prevention, while merging it into $config['filters']. 2013-09-06 23:09:18 +10:00
Michael Foster
7f0de93608 Cleaner check to make sure inc/ files aren't accessed directly. 2013-09-06 20:12:04 +10:00
czaks
069f1def9b Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
2013-09-01 11:25:19 -04:00
Michael Foster
b51fc38783 Some SQL and indexes improvements 2013-09-01 02:04:42 +10:00
Michael Foster
d166fc70bd Fix \t in posts (editing posts, and HTML Tidy) 2013-08-31 13:23:29 +10:00
Michael Foster
46d41cd2a7 More track_cites work 2013-08-30 15:00:33 +10:00
Michael Foster
343803afb9 More $config['debug'] improvements to time-related stuff 2013-08-30 08:39:11 +10:00
czaks
8de81d176c Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
2013-08-29 07:33:19 -04:00
Michael Foster
738179c766 HTML Tidy bug fix: broken attributes, and preserve whitespace properly 2013-08-29 21:24:38 +10:00
Michael Foster
471525a58b HTML Tidy fixes: UTF-8, preserving whitespace, keep attributes literal, don't wrap text 2013-08-29 21:05:03 +10:00
Michael Foster
8144e517e9 Don't set arbitrary cache timeouts for DNS stuff 2013-08-29 20:40:39 +10:00
Michael Foster
a8e3754375 Minor $config['try_smarter'] work 2013-08-29 18:55:25 +10:00
Michael Foster
7b817eea11 Fix markup again. And add the option to repair fucked up nesting (and more) with HTML Tidy ($config['markup_repair_tidy']) 2013-08-29 15:56:36 +10:00
Michael Foster
334e69b69f Remove old code 2013-08-29 13:32:55 +10:00
Michael Foster
3545e2406e Perforamnce: Much more efficient >>X and >>>/board/X 2013-08-29 13:31:02 +10:00
Michael Foster
577a8b991d Performance: Use only one query for validating >>X links in posts 2013-08-29 12:52:31 +10:00
czaks
b95840adcb Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/functions.php
2013-08-28 20:34:06 -04:00
Michael Foster
90eb8f1f37 redundant ORDER BY 2013-08-29 08:41:36 +10:00
Michael Foster
8257773807 $config['debug']: Show time initializing Tinyboard (before $debug was created) 2013-08-29 08:30:21 +10:00
Michael Foster
3fbd051737 Record time started (in milliseconds) at the very beginning of inc/functions.php, even when $config['debug'] is disabled (because we can't tell, yet). Gets a more accurate time for page generation. 2013-08-29 08:25:15 +10:00
Michael Foster
aa27a22f7c wtf? duplicate code 2013-08-29 08:17:32 +10:00
czaks
8503e65858 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/functions.php
	install.php
	stylesheets/dark_roach.css
2013-08-28 12:41:36 -04:00
Michael Foster
7a4e481333 Huge bugfix: Old tracked cites where not being purged correctly. Recommend query: "TRUNCATE TABLE cites;" to start over 2013-08-28 22:30:56 +10:00
Michael Foster
a7ac3339de DNS(): Cache NXDOMAIN 2013-08-28 17:00:41 +10:00
ctrlcctrlv
753b67aa71 Hopefully fix spam filter problems caused by noko 50 (thanks to savetheinternet) 2013-08-27 23:44:59 +00:00
ctrlcctrlv
97a56a7ec1 Fix try_smarter with deletePost 2013-08-22 17:08:26 +00:00
ctrlcctrlv
c7a1ee3121 Bug: deleting posts doesn't rebuld index 2013-08-22 16:51:28 +00:00
Michael Foster
d92b138762 Accidentally merged noko50 stuff 2013-08-21 22:53:48 +10:00
Michael Foster
11fa73e4d1 automatically initialize $config['api'] 2013-08-21 22:44:23 +10:00
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