Commit graph

1076 commits

Author SHA1 Message Date
Shish
c208a3715c mark static functions as static 2017-03-10 16:14:56 +00:00
jgen
d62304cf70 more linting 2017-03-09 22:28:48 -08:00
jgen
d0b0c7f93d More linting with PHPDoc comments 2017-03-09 21:58:14 -08:00
Scrutinizer Auto-Fixer
9a906d4ecf Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-03-09 09:27:52 +00:00
jgen
ede2fcf4eb More linting and fixing 2017-03-08 23:52:31 -08:00
jgen
17307820e8 Add some PHPdoc comments as suggested by Scrutinizier 2017-03-08 23:02:26 -08:00
im-mi
c1083bbea1 Fixed comment-delete code-injection vulnerability 2016-09-14 17:42:32 -04:00
Shish
bcef3fbc8f have tag sanitisation process ignore tags which are too long, fixes #565 2016-08-29 09:21:23 +01:00
im-mi
36b66f4c23 html_escape data-tags for tags that contain single quotes 2016-08-29 00:26:55 -04:00
Shish
7be951b271 Convert tags from user-supplied string to array once, on input
This results in a fuckton of refactoring and code cancelling out
other code -- we no longer have a whole bunch of places trying
to support string params and array params, and doing their own
esaping and unescaping, never being quite sure if the data they've
been passed is escaped or not.

Also adds a bunch of type hinting, since we can now know what
data we're dealing with better.
2016-07-30 22:11:49 +01:00
Shish
b533a43428 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2016-07-11 13:01:05 +01:00
Shish
c14a36079c add option to force a specific base url 2016-07-11 13:00:54 +01:00
Shish
b6ad316d20 linting 2016-07-03 12:07:54 +01:00
Shish
cb73a0caa0 let's stop being php5.2 compatible 2016-06-19 23:23:34 +01:00
Shish
6febdec7b5 more explicit variable types 2016-06-19 23:05:57 +01:00
Shish
dc10a18086 lots of minor doc tweaks, type hints, etc 2016-06-19 17:41:40 +01:00
Shish
d185fd354b fix wildcard search for mysql 2016-06-19 12:14:44 +01:00
Shish
e0d3d53479 stub mb_ functions 2016-06-19 12:12:48 +01:00
Shish
4577ff70ef more linty bits 2016-06-18 19:26:56 +01:00
Shish
cfd3a9d248 lint fixes 2016-06-18 19:00:56 +01:00
Shish
0ff6da6d3c Merge #555 2016-06-18 15:16:47 +01:00
Shish
b76ee95c76 fix and use get_all_html_headers() 2016-06-18 12:25:54 +01:00
Daku
861862a3e1 password compat lib is now autoloaded with composer 2016-06-18 06:28:48 +01:00
Daku
543600dc0e make sure main css/js files are always loaded after libs 2016-06-18 06:28:31 +01:00
Daku
dd105e174e images aren't always jpg, so don't force jpg
all the handle_* exts use this as well, which can cause issues
2016-06-18 06:20:46 +01:00
Daku
2070034d0d move securimage to composer + update lib 2016-06-18 06:20:43 +01:00
Daku
d5a58916f7 get recaptcha lib with composer + fixes #498 2016-06-18 06:17:07 +01:00
Daku
895df8c22b load flexihash via composer 2016-06-18 06:16:28 +01:00
Daku
36264d3f6e stop caching css/js from disabled exts 2016-06-18 06:16:10 +01:00
Daku
e740d03101 generate seperate css/js cache files for libs & core files 2016-06-18 06:16:08 +01:00
Shish
bfa1dc20c0 fix mysql 2016-06-07 01:50:56 +01:00
Shish
8e8a3da790 support single wildcard 2016-06-07 01:39:23 +01:00
Shish
dc83d4ace7 lots of deduping for searching 2016-06-07 01:34:38 +01:00
Shish
7f2609f727 dedupe searching a bit 2016-06-07 00:19:41 +01:00
Shish
525fd20540 Merge pull request #548 from DakuTree/fix-wildcards
Fix wildcard tag bugs
2016-06-06 23:18:51 +01:00
Shish
43eed32958 Merge pull request #551 from shish/contact-link
Have contact_link support http: and mailto:
2016-06-06 12:37:27 +01:00
Shish
aeeaabb22e allow both http: and mailto: contact links 2016-06-06 12:12:25 +01:00
Daku
61acb24875 fixes #547 -> multi-tag searches not working with wildcard when wildcard matches more than 1 tag
is there a better way to do this?
2016-05-22 18:35:37 +01:00
Daku
3b171ffc5a fix single tag wildcard searches returning duplicate results if image has more than one match 2016-05-22 17:58:09 +01:00
Daku
44876a58d9 we should be using bool_escape instead... 2016-05-22 16:17:31 +01:00
Daku
32dbdccd00 has_children uses Y/N, not TRUE/FALSE 2016-05-10 21:15:50 +01:00
Daku
6d1c7c414b mysql < 5.6 has terrible subquery optimization, using EXISTS / JOIN fixes this 2015-12-04 11:38:44 +00:00
Shish
ac9dc1b8d8 Merge pull request #523 from DakuTree/patch-tagevent
Move tag sanitization, alias resolving & tag parsing from set_tags > TagSetEvent
2015-10-26 19:22:08 +00:00
Shish
28e1cb30ea Merge pull request #528 from CrandellWS/develop
merge start of material theme
2015-10-26 13:49:56 +00:00
William Crandell
b7114a142e Hotfix for better block id character filtering 2015-10-26 09:20:09 -04:00
Shish
b9f6b44301 bump 2015-10-26 12:14:36 +00:00
Shish
7b0933ea54 merge develop, fix conflicts, bump 2015-10-26 12:13:17 +00:00
Shish
f8cb2e96e4 only check min < val < max if min and max are defined 2015-10-19 07:19:53 +01:00
Shish
4971fa9337 empty bool = false 2015-10-19 07:11:41 +01:00
Shish
e9a1bebe76 how did this ever not break everything? x_x 2015-10-19 06:58:47 +01:00
Daku
600011219f update docs 2015-10-08 19:25:38 +01:00
Daku
43d0a297b8 move metatag parsing to after set_tags is sent, rather than before 2015-10-08 18:58:52 +01:00
Daku
b11041898b Tag::explode instead of explode
this fixes the off chance that an empty tag could be passed
2015-10-08 18:28:00 +01:00
Daku
744989a983 Tag::explode should now remove duplicate tags 2015-10-08 18:25:03 +01:00
Daku
6ff80ab2c8 move tag sanitization, alias checking & tag parsing to TagSetEvent 2015-10-08 18:22:20 +01:00
Shish
d30665d274 more deduping 2015-09-27 21:09:27 +01:00
Shish
1ac88e8923 more comments 2015-09-27 12:38:48 +01:00
Shish
cdcd762a52 more comments 2015-09-27 02:17:44 +01:00
Shish
793bc3614b loooooooads of artists refactoring and tidying 2015-09-27 01:03:58 +01:00
Shish
e482f97955 more clamping 2015-09-26 19:53:15 +01:00
Shish
7f20b0527e remove trailing commas from schema definitions in create_table() 2015-09-24 23:16:51 +01:00
Shish
6919431c49 performance 2015-09-20 23:20:51 +01:00
Shish
90cd823ece fix liveness testing, and comments tests 2015-09-20 20:05:06 +01:00
Shish
49a6083b8b fix 2015-09-20 20:04:16 +01:00
Shish
ec484c1144 more phpunit-ing 2015-09-20 20:04:13 +01:00
Shish
9af5995dcc PHPUnit proof of concept 2015-09-20 20:03:29 +01:00
Shish
5a466bfac3 include config modification data in JS/CSS caches 2015-09-20 20:02:39 +01:00
Shish
e4b4bf2c8f better sql logging 2015-09-20 20:02:24 +01:00
Shish
35a4f385b3 phpstorm tidying 2015-09-12 11:43:28 +01:00
Daku
9490e4aae2 fix endless loop when checking for subdirectory
is there any reason why this was only checking for "." & ".." ?
2015-08-12 06:43:38 +01:00
Daku
b2d8b41388 spaces > tabs 2015-08-12 06:12:53 +01:00
Daku
ef6a7289bb if alias is negative and has multiple tags, make sure each tag becomes negative 2015-08-12 06:11:21 +01:00
Shish
e5511ec801 wtf, php 2015-08-09 15:40:57 +01:00
Shish
0ef8db8371 not all requests have remote_addr 2015-08-09 12:20:37 +01:00
Shish
df56213ec3 allow exts to mark themselves as not supporting sqlite 2015-08-08 22:23:27 +01:00
Shish
a7d0158848 more sqlite support 2015-08-08 22:19:10 +01:00
Shish
cef7257ec8 abstract unique index creation 2015-08-08 22:18:38 +01:00
Shish
45d090054b set_default_bool should take a bool, always 2015-08-08 22:18:25 +01:00
Shish
fa2f17817e scrutinizing 2015-08-04 13:53:58 +01:00
Shish
d2d2a9b73a try checking for property of object rather than class? 2015-08-04 12:37:35 +01:00
Shish
654b282ab7 allow BASE_HREF to be defined explicitly 2015-08-03 15:49:38 +01:00
Shish
7762b2c703 do InitExtEvent in bootstrap, before user exists 2015-08-03 15:49:38 +01:00
Shish
83435e3266 set cookies on Page object 2015-08-03 15:49:36 +01:00
Shish
eb246ef1ee count_execs is legacy code from adodb anyway... remove another global 2015-08-02 21:31:55 +01:00
Shish
ec5d9bb6f4 more sensible naming 2015-08-02 21:23:45 +01:00
Shish
6e56224b8d rename final private global 2015-08-02 21:19:22 +01:00
Shish
669fd800d0 move all event stuff together 2015-08-02 20:54:41 +01:00
Shish
3ad8fe4a93 inline add_event_listener to save some layers and loops 2015-08-02 20:43:53 +01:00
Shish
18490ed488 more global removal 2015-08-02 20:39:41 +01:00
Shish
e2b6f2c2dd global management 2015-08-02 19:41:06 +01:00
Shish
c6cf4fa339 hiphop is no more, hhvm can handle defines 2015-08-02 19:40:57 +01:00
Shish
90e86b99ae page->set_code() to set HTTP status 2015-08-02 19:40:57 +01:00
Shish
0b385d05af wibble init into a separate bootstrap file, for more unit-testability 2015-08-02 19:40:57 +01:00
Shish
21a1b176c6 separate router from index.php 2015-08-01 16:36:07 +01:00
Shish
3d5172e235 stand-alone router mode 2015-08-01 16:23:33 +01:00
Shish
e3cb33efb9 remove single-use var 2015-08-01 16:22:42 +01:00
Shish
aed08d3c12 revert a little 2015-08-01 16:15:36 +01:00
Shish
ab4c558126 php cli server uses its own request thing 2015-08-01 15:24:58 +01:00
Shish
53f19120d2 check for set vars in get_base_href 2015-08-01 14:55:53 +01:00
Shish
35d762bc32 Also update programatic check 2015-08-01 13:42:40 +01:00
Shish
e5e7f891e2 scrutinizer suggestions 2015-07-21 01:20:53 +01:00
Shish
9508bec8d3 whyyyyy 2015-07-21 01:00:13 +01:00
Shish
7064e9ffcd merge 2015-07-20 23:49:33 +01:00
Shish
f3c9f57e62 Merge pull request #491 from shish/more_https
More https
2015-07-20 23:28:21 +01:00
Shish
2b6f3b7266 better asserting 2015-07-19 19:04:35 +01:00
Shish
90539a32bc validate_input() function 2015-07-19 14:46:28 +01:00
Shish
06d8c7a879 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2015-07-12 22:40:34 +01:00
Shish
feecdd4d13 support for changing usernames 2015-07-12 22:14:57 +01:00
Shish
88fead6ba6 connect to search accelerator for 2-100x speedup on heavy queries 2015-07-12 22:12:05 +01:00
Shish
cabc600207 show all html headers on the front page, so autocomplete can work 2015-07-04 12:25:23 +01:00
Shish
10e7dd27d4 remove trailing commas from schema definitions in create_table() 2015-07-02 12:38:33 +01:00
jgen
f73e0e6884 argh 2015-06-01 18:00:46 -07:00
jgen
4bf56364eb Missed one use of $headers. Was used in only one other place. Also, change the function so that if anyone else uses it in the future it doesn't throw warnings. 2015-06-01 17:57:34 -07:00
Shish
4fd3d1a024 argh php 2015-06-01 11:23:04 +01:00
Shish
8d2b97b72f more https support, and dedupe get_image/thumb_link 2015-06-01 11:09:19 +01:00
jgen
56b9117a20 Merge branch 'master' into develop 2015-05-31 22:43:49 -07:00
jgen
718cfa0bcf Scrutinizer-ci has fixed this now. 2015-05-31 21:28:11 -07:00
Shish
2aea79ac35 merge common parts of handle_archive and bulk_add 2015-05-24 16:08:46 +01:00
Shish
1779f97cac strip RTL from tags 2015-04-26 15:32:04 +01:00
Daku
598df41b1d set default in display, not build to avoid errors 2015-04-18 10:42:08 +01:00
Daku
be18140944 added option to hide random link on paginator (only post/list should show now) 2015-04-18 10:41:32 +01:00
Daku
05cfbde372 .tables only works with the SQLite3 CLI program
http://www.sqlite.org/faq.html#q7
2015-04-18 10:39:48 +01:00
Daku
b81d457bf7 DEBUG_SQL isn't defined during install, use quotes to avoid errors 2015-04-18 10:38:39 +01:00
Shish
55c3fd8f38 show PHP version (particularly useful when debugging php vs hhvm) 2015-04-18 10:31:24 +01:00
Shish
1703cd9caa bump 2015-03-13 09:49:25 +00:00
Shish
f5c4321322 bump 2015-03-13 09:48:54 +00:00
jgen
3511711008 Should be consistent about using the int_escape method. 2015-03-12 23:12:06 -07:00
jgen
8e3fc1da9f Change generated links to be aware of HTTPS. 2015-02-02 00:13:05 -08:00
Shish
eae385f4c0 bump 2015-01-24 17:11:25 +00:00
Shish
cbbc0bab26 version bump 2015-01-24 17:10:23 +00:00
Shish
edde7848b8 add mp3 to thumbless filetypes, see #454 2015-01-24 16:44:27 +00:00
Shish
217559dc22 set statement_timeout for postgres 2014-12-31 13:16:00 +00:00
Shish
caa2691bb9 Merge pull request #468 from jgen/develop
Allow Shimmie to work with older versions of FFmpeg
2014-12-17 13:44:25 +00:00
Shish
7bcf2fc29e Merge pull request #465 from shish/min_space_config
Turn MIN_FREE_SPACE into a userspace config option
2014-12-17 13:41:55 +00:00
Shish
c0279565f4 Merge pull request #462 from shish/bypass_comment_checks
Allow admins to bypass comment checks (rate limit etc)
2014-12-17 13:40:06 +00:00
jgen
95b94bd115 Some minor linting. 2014-12-14 16:06:31 -08:00
Shish
40734ef711 turn MIN_FREE_SPACE into a userspace config option 2014-12-07 13:54:47 +00:00
Shish
9abcadffb6 throw Ex() -> throw new Ex(); 2014-12-07 13:20:36 +00:00
Shish
316f7ff858 Give a better error if User::class has been screwed up somehow 2014-12-07 03:44:17 +00:00
Shish
88f1df9ca6 HIPHOP is no longer supported (it's HHVM now, and HHVM supports PDO params anyway) 2014-12-07 01:10:12 +00:00
Shish
5ab8f9e5e2 log sets and deletes in CACHE_DEBUG mode 2014-12-06 23:50:56 +00:00
Shish
4d6e6ade1c version bump 2014-12-06 23:48:03 +00:00
Shish
b3931dd403 version bump 2014-12-06 23:47:17 +00:00
Shish
010b0620df add a user flag for bypassing comment checks 2014-11-30 13:52:29 +00:00
Shish
c0dfd9adc0 a little extra consistency in cache variable names 2014-11-26 13:09:49 +00:00
Shish
4721d666cd log time spent waiting for database queries 2014-11-26 13:09:22 +00:00
Shish
1c60942730 log hit/miss when DEBUG_CACHE is on 2014-11-26 13:07:30 +00:00
Shish
dfba656355 die more explicitly when memcache is missing (PHP is terrible) 2014-11-24 02:21:45 +00:00
Shish
f873d2304d Check event handler exists before calling it, in case the cache is out of date. Fixes #442 2014-08-24 11:33:05 +01:00
Daku
14f682da75 avoid errors if tag exceeds limit + flash message showing the problem tag 2014-06-20 00:39:29 +01:00