Commit graph

2545 commits

Author SHA1 Message Date
Shish
659ef7dac9 update dependencies 2019-11-14 18:24:09 +00:00
Shish
962f6073ff sqlite requires limit/offset, offset/limit is treated as a syntax error 2019-11-11 16:53:11 +00:00
Shish
6486bb95da name_to_id 2019-11-11 16:43:42 +00:00
Shish
247cfcbd77 Avoid shadowing global variable
When we aren't referencing the current `global $user`, we should give it
a different name to avoid confusion
2019-11-11 16:43:42 +00:00
Shish
bde49c4f5e paged ip bans 2019-11-11 12:52:11 +00:00
Shish
418f5484ed show types 2019-11-08 18:54:32 +00:00
Shish
1a4a76c324 php... 2019-11-05 00:19:31 +00:00
Shish
15e61c5bf4 restore strtotime, for +4 months etc 2019-11-05 00:16:26 +00:00
Shish
c7d90c2df7 nits 2019-11-04 01:04:12 +00:00
Shish
7601140825 missed a spot 2019-11-04 01:03:47 +00:00
Shish
f79eafc91e format 2019-11-04 00:42:06 +00:00
Shish
d17e207984 Have get_arg never return null
90% of places assume it will never return null, and they will break in
weird ways if it does return null
2019-11-04 00:40:10 +00:00
Shish
fc7da5114f fixes 2019-11-03 23:43:35 +00:00
Shish
954158ad43 typo 2019-11-03 23:32:55 +00:00
Shish
503d93a28e syntax 2019-11-03 23:29:29 +00:00
Shish
bcf7947837 use timestamps for bans, consistency at last /o/ 2019-11-03 23:17:09 +00:00
Shish
f15a95b4de more version 2019-11-03 19:49:52 +00:00
Shish
539dd66fe8 ipban version 2019-11-03 19:43:39 +00:00
Shish
ee948352a5 defaults 2019-11-03 19:25:51 +00:00
Shish
0e660f5aba mysql... 2019-11-03 19:15:09 +00:00
Shish
c41378f0b9 text can't have default in mysql... 2019-11-03 19:11:48 +00:00
Shish
494ba15a70 log every ext version change 2019-11-03 19:04:57 +00:00
Shish
c58a13ae88 formatting 2019-11-03 18:28:38 +00:00
Shish
427acc55a0 Merge branch 'master' of https://github.com/shish/shimmie2 2019-11-03 18:28:16 +00:00
Shish
6bc33ee691 Drop SCORE_DATETIME/NOW - all the databases we care about now support TIMESTAMP/CURRENT_TIMESTAMP 2019-11-03 18:28:05 +00:00
Shish
e2cac352f5 start of ban types 2019-11-03 17:53:52 +00:00
Shish
0fab821d77 set DB timeout to a large number for upgrades 2019-11-03 17:53:41 +00:00
Shish
1210498e41 fix typo in image flag setting 2019-11-03 17:21:58 +00:00
Shish
2f23a11096 manual db upgrade command 2019-11-03 17:21:05 +00:00
Shish
031c441e47 split DatabaseUpgrade into a separate event from InitExt 2019-11-03 17:21:05 +00:00
Shish
ee3754ae79 Merge branch 'master' of https://github.com/shish/shimmie2 2019-11-03 16:28:00 +00:00
Shish
ac5546c6ef remove more old comments 2019-11-03 16:22:59 +00:00
Shish
b568933f45 remove extension metadata comments (we have metadata objects now) 2019-11-02 20:19:09 +00:00
Shish
55c6854003 formatting 2019-11-02 19:57:34 +00:00
Matthew Barbour
6b22f6da3f Cleanup 2019-11-01 23:55:23 -05:00
Matthew Barbour
6e320a090e Better help page nav system integration 2019-11-01 23:55:16 -05:00
Matthew Barbour
1565b8570b Added disapproving controls to approval extension 2019-11-01 23:55:08 -05:00
Matthew Barbour
4dfb2761ab More approval enable option consequences 2019-11-01 23:49:01 -05:00
Matthew Barbour
5f89420fab Approval enable option 2019-11-01 23:49:01 -05:00
Matthew Barbour
c2d6f1a5fa New "Approval" extension 2019-11-01 23:47:53 -05:00
Matthew Barbour
016fb6be65 Small fixes and corrections 2019-11-01 23:47:53 -05:00
Matthew Barbour
c17c84f15f Fixed searching issues on event log page 2019-10-18 16:36:06 +01:00
Matthew Barbour
3efa76c6a2 Added set_timeout to database and engine 2019-10-18 16:34:12 +01:00
Matthew Barbour
702f098ea6 Added create_image permission check to upload menu code 2019-10-18 16:32:46 +01:00
Matthew Barbour
9907c02a11 Resolved transaction issue 2019-10-18 16:32:33 +01:00
Matthew Barbour
0a30ec6cfa Added favorite bulk actions 2019-10-18 16:30:55 +01:00
Matthew Barbour
ed17a631d0 Added extension documentation link image 2019-10-18 16:30:30 +01:00
Matthew Barbour
51563017c8 Transcode config constants migrated to own file, added enabled option for future feature 2019-10-18 16:29:58 +01:00
Matthew Barbour
4897063adc Added trash link 2019-10-18 16:29:44 +01:00
Matthew Barbour
04b1754893 Fixed bulk add's KEY 2019-10-18 16:27:32 +01:00
Matthew Barbour
aa5c8c81e0 Added lower() to some tag lookups
Removed a duplicate include line
2019-10-18 16:27:23 +01:00
Matthew Barbour
f594e9066e Added image flag 2019-10-18 16:27:04 +01:00
Matthew Barbour
6b030c00eb Constants for index config 2019-10-18 16:26:11 +01:00
Matthew Barbour
d605e0e572 Added cron_admin permission 2019-10-17 14:26:14 -05:00
matthew
40269a6f4a Cron uploader enhancements and bug fixes 2019-10-10 10:16:15 -05:00
Shish
b6b16b9804 media-rescan also accepts hash 2019-10-04 21:10:00 +01:00
Shish
5b2e9e44a2 note a TODO 2019-10-04 21:08:33 +01:00
Shish
134d2c029c limit results by default (ideally we'd have a --limit flag...) 2019-10-04 21:02:16 +01:00
Shish
32662af1ac start of bulk actions cli 2019-10-04 20:50:49 +01:00
Shish
fee0a845bb media-rescan CLI command 2019-10-04 20:50:36 +01:00
Shish
577d5c572a search from CLI for integration with other unix tools 2019-10-04 20:48:59 +01:00
Shish
4564fd4092 by_id_or_hash for more elegant CLI use 2019-10-04 20:48:21 +01:00
Shish
30698fefdc remove a bunch of dead variables and things 2019-10-02 11:23:57 +01:00
Shish
e08cdb1638 make Cache its own thing, separate from Database 2019-10-02 10:49:32 +01:00
Shish
842df41951 make dbq html work 2019-10-02 10:23:35 +01:00
Shish
8f688fd2c6 lints 2019-10-02 10:10:47 +01:00
Shish
794e4ebb7d merge 2019-10-01 10:44:52 +01:00
Shish
ce61b7dc40 truncate filenames to 64 chars at upload time 2019-09-30 18:05:35 +01:00
Shish
a7bddb1dac get rid of is_admin, fixes #676 2019-09-29 19:01:09 +01:00
Shish
160f673060 consistent class naming 2019-09-29 17:48:21 +01:00
Shish
54067f02a4 fix merge 2019-09-29 15:44:59 +01:00
Shish
e6a402cd4e Merge branch 'custom_ratings' into develop 2019-09-29 14:41:14 +01:00
Shish
f5119b20a3 formatting 2019-09-29 14:32:51 +01:00
Shish
a6bb15d859 formatting 2019-09-29 14:30:55 +01:00
Shish
56e247faf5 remove duplicate import 2019-09-29 14:24:56 +01:00
Matthew Barbour
de68691fc3 ExtensionInfo for user config 2019-09-29 14:22:04 +01:00
Matthew Barbour
b43e425f95 Changed omitted related tags (like tagme) to be powered by a setting, allowing any performance-impacting (or just not useful in this context) tags to be omitted
Further tag list performance improvements
TagListConfig constants
2019-09-29 14:22:04 +01:00
matthew
cf8ed3b134 Added UserLoginEvent 2019-09-29 14:21:23 +01:00
Matthew Barbour
73b784266e Moved user config stuff into an extension 2019-09-29 14:20:40 +01:00
matthew
120cdb49a6 Added $user_config global based on existing config object for storing user-specific settings.
Added event to the user page so that extensions can hook into it, providing user-specific setting controls
2019-09-29 14:19:52 +01:00
Matthew Barbour
88e6e68d79 Changed omitted related tags (like tagme) to be powered by a setting, allowing any performance-impacting (or just not useful in this context) tags to be omitted
Further tag list performance improvements
TagListConfig constants
2019-09-26 15:46:28 +01:00
Matthew Barbour
8606c70437 Changed related tags queries to run more efficiently, filter out the starting tags, and filter out any tags starting with tagme, rather than just tagme. 2019-09-26 15:43:48 +01:00
Matthew Barbour
8f95d23828 Removed mass tagger extension 2019-09-26 15:41:51 +01:00
Shish
33fff87f39
Merge pull request #680 from sanmadjack/ext_info
Proposed extension info change to allow getting info for unloaded ext…
2019-09-26 15:37:16 +01:00
Daniel Oaks
05082c8f11 Only show 'Tags' block when there's a tag to put in it 2019-09-14 15:59:31 +10:00
Matthew Barbour
651b1632b1
Update main.php 2019-09-09 08:13:25 -05:00
Shish
ba20d8d5af filter non-ascii domains 2019-09-08 17:13:20 +01:00
Shish
9341c408b9 allow randomness to be limited, because sql's OFFSET N is O(n) 2019-09-08 17:13:20 +01:00
Matthew Barbour
4dce3a2f07
Update theme.php 2019-08-14 09:07:45 -05:00
Matthew Barbour
ac6ded877f Added dependency support for extensions
Separated a few extensions that had multiple extension classes in the same file
2019-08-07 16:32:44 -05:00
Matthew Barbour
744dcd63e1 EmoticonListInfo 2019-08-07 16:06:55 -05:00
matthew
1e60c8720c Set unrated and unknown as reserved ratings 2019-08-07 15:50:37 -05:00
Matthew Barbour
0506adbf30 Adjusted rating setting migration 2019-08-07 15:50:37 -05:00
matthew
a019786895 Merge remote-tracking branch 'origin/bugfixes' into custom_ratings 2019-08-07 15:50:36 -05:00
Matthew Barbour
85b883ed7a Moved user config stuff into an extension 2019-08-07 15:50:34 -05:00
matthew
0fa2adfdd5 Added $user_config global based on existing config object for storing user-specific settings.
Added event to the user page so that extensions can hook into it, providing user-specific setting controls
2019-08-07 15:50:02 -05:00
Matthew Barbour
ee3f53e108 Changed related tags queries to run more efficiently, filter out the starting tags, and filter out any tags starting with tagme, rather than just tagme. 2019-08-07 15:50:01 -05:00
Matthew Barbour
e065c8b789 Set column defaults 2019-08-07 15:50:00 -05:00
matthew
aa5a04fbd3 Further adjusting tests for user config
Renamed Rating to ImageRating to prevent test system from trying to make an extension of it
2019-08-07 15:49:59 -05:00
Matthew Barbour
b2193cb6f1 Adjusted rating array usage 2019-08-07 15:49:57 -05:00
Matthew Barbour
5e87dff033 Adjustments to rating upgrade 2019-08-07 15:49:57 -05:00
Matthew Barbour
91b46d6598 Moved user config stuff into an extension 2019-08-07 15:49:56 -05:00
Matthew Barbour
40be8f045a Changed to use user_config extension 2019-08-07 15:49:27 -05:00
Matthew Barbour
68ee4d0e77 Custom rating support, user rating filter settings 2019-08-07 15:49:26 -05:00
Matthew Barbour
8f0aa8a4ca Added $user_config global based on existing config object for storing user-specific settings.
Added event to the user page so that extensions can hook into it, providing user-specific setting controls
2019-08-07 15:48:18 -05:00
matthew
8e3b8a7a1b Merge remote-tracking branch 'upstream/develop' into custom_ratings 2019-08-07 15:48:17 -05:00
Matthew Barbour
de98e86938 ExtensionInfo conversions what have I done 2019-08-07 15:40:01 -05:00
Matthew Barbour
3d1b964812 Proposed extension info change to allow getting info for unloaded extensions 2019-08-07 15:34:11 -05:00
Matthew Barbour
a18589ee0a Help extension
Provides foundation for help pages that are generated from loaded extensions, starting with comprehensive search documentation. Addresses #522
2019-08-05 09:03:49 -05:00
Matthew Barbour
00464d2579 Implemented a nav link generating system so that extension power what shows up in the menus rather than being hard-coded in the themes. 2019-08-05 09:01:20 -05:00
Matthew Barbour
972b68bdd3 Setup constants 2019-08-05 09:00:23 -05:00
Matthew Barbour
5ceb6f4193
Update main.php 2019-08-01 08:40:15 -05:00
Matthew Barbour
7d110f11b6 TagCategories config constant 2019-08-01 08:10:38 -05:00
Matthew Barbour
dd6c3b2321 Added window title option to post title extension 2019-08-01 08:10:30 -05:00
Matthew Barbour
c3f2d2e1bd New post titles extension, resolves #19 2019-08-01 08:10:24 -05:00
Matthew Barbour
45df025e7d Bulk action permission constant 2019-08-01 08:09:00 -05:00
Matthew Barbour
cb1e9c0075 Permissions to constants 2019-08-01 08:07:05 -05:00
matthew
d16dfe24f2 media extension adjustments 2019-07-31 15:08:56 +01:00
Shish
d57b624079 Merge commit '38cc05c' into develop 2019-07-31 14:58:24 +01:00
Shish
a0b1c82d0d function to clear event listeners 2019-07-19 10:25:07 +01:00
Shish
eb3cc73bce make pages >500 visible to logged-in users 2019-07-19 10:24:17 +01:00
Shish
c5aba18470 s/is_admin/can(perform_bulk_actions)/ 2019-07-08 20:35:10 +01:00
matthew
38cc05cf37 Fixed issue with merge's duplicate hash check 2019-07-08 08:07:18 -05:00
matthew
7991e981ca Revert "Update main.php"
This reverts commit 0eeede7977f69c1e3a60d778de771f08eed4fc38.
2019-07-08 08:07:17 -05:00
Matthew Barbour
f2496b99f6 fix for resize arg isssue 2019-07-08 08:07:17 -05:00
Matthew Barbour
9ce5a05840 Update main.php 2019-07-08 08:07:16 -05:00
Matthew Barbour
58948a90fb Fixed a constant reference 2019-07-08 08:07:15 -05:00
Matthew Barbour
d2d6c433e6 Make the media admin block look a little nicer 2019-07-08 08:07:14 -05:00
Matthew Barbour
8638a16694 Added table-building support to SetupBlock to allow easily building cleaner setup controls 2019-07-08 08:07:13 -05:00
Matthew Barbour
4065540f0e Added SCORE sql constants 2019-07-08 08:07:12 -05:00
Matthew Barbour
a0c0b6e3d1 Various fixes 2019-07-08 08:07:11 -05:00
Matthew Barbour
ae6126d388 Changed upgrade code to use SCORE stuff 2019-07-08 08:07:10 -05:00
Matthew Barbour
b1db833d51 Added additional media properties to the images table, video, audio, length, and lossless.
Added new event to handle fetching media properties like height, width, and the newly added fields, and admin controls to manually scan files for their properties.
Added a search terms content:video and content:audio to search for images that do (or do not) have those flags.
2019-07-08 08:07:09 -05:00
Matthew Barbour
a41e99d1af Renamed graphics extension to media extension 2019-07-08 08:07:08 -05:00
Matthew Barbour
0c16d3e78c Fixed some extension references 2019-07-08 08:07:08 -05:00
Matthew Barbour
7cc725fbc1 Moved graphics engine constants to their own class 2019-07-08 08:07:07 -05:00
Matthew Barbour
3753a1b6d6 Update main.php 2019-07-08 08:07:06 -05:00
Matthew Barbour
b0e12f6a6c Update main.php 2019-07-08 08:07:05 -05:00
Matthew Barbour
18656db7c8 Update main.php
Testing a CI issue
2019-07-08 08:07:04 -05:00
Matthew Barbour
e98e63f836 Adjusted graphic extension settings 2019-07-08 08:07:03 -05:00
Matthew Barbour
3859e27839 New Graphics extension
Added constants to several extensions
2019-07-08 08:07:02 -05:00
Shish
3dce134fe9 better error for >500 pages 2019-07-08 11:10:35 +01:00
Shish
bcf07946fb fix more pairs 2019-07-07 22:59:22 +01:00
Shish
38df37a9aa limit 500 pages of search results in speed hax mode 2019-07-07 19:23:48 +01:00
Shish
e27ff02bb7 two columns 2019-07-07 16:02:33 +01:00
Shish
4136b1bb6b manually pull parts out of 57f2a50fb7 2019-07-07 11:16:47 +01:00
matthew
c906df6956 Added iterator_map and iterator_map_to_array
Moved the path join/sanitize to pollyfills
2019-07-07 11:11:57 +01:00
matthew
490f1f97ed Updated pools bulk action for generator 2019-07-07 11:11:48 +01:00
matthew
d64603674e Added ability to use generators with database queries.
Adapted bulk actions to use generators.
2019-07-07 11:10:40 +01:00
Shish
2935db9d6d take out category-autocomplete pending performance tweaks 2019-07-06 11:27:05 +01:00
Shish
b158901f53 add ban-reason to bulk actions delete 2019-07-05 19:20:37 +01:00
Shish
22f3532035 support for themes where .shm-thumb is not directly an A tag 2019-07-05 19:20:10 +01:00
matthew
dbfa995ba5 Changed create pool bulk action to default to the currently searched strings 2019-07-05 19:16:52 +01:00
Matthew Barbour
4116bda066 Adjusted admin delete by query to bypass trash 2019-07-05 19:02:18 +01:00
matthew
558d154e85 Fixed issue with trash item detection 2019-07-05 19:01:55 +01:00
Matthew Barbour
c4111cc948 Added shortcut-key support to bulk action extension 2019-07-05 18:37:25 +01:00
Matthew Barbour
a82fb56063 Added force flag to image deletion event to override trash extension 2019-07-05 18:31:31 +01:00
matthew
1bd9238b17 Additional trash stuff 2019-07-05 18:29:45 +01:00
Matthew Barbour
32d37254f7 New trash extension. For undelete-type stuff. 2019-07-05 18:29:44 +01:00
Matthew Barbour
02e2786cca Added missing constant 2019-07-05 17:39:25 +01:00
matthew
a7188a452b Fixed issue with setup block checkbox generator 2019-07-05 17:39:15 +01:00
Matthew Barbour
c16d55995b Added table-building support to SetupBlock to allow easily building cleaner setup controls 2019-07-05 17:38:12 +01:00
Matthew Barbour
9ca800d1c4 Added bulk action support to pools extension 2019-07-05 17:31:27 +01:00
Matthew Barbour
8794258072 pgsql automatically creates indexes on unique columns, so the manually created indexes on those columns are redundant on that database. This will remove tham. 2019-07-05 16:55:36 +01:00
Matthew Barbour
dfeb3bf5df Added a database upgrade that adds a tag_id,image_id index to image_tags, and lengthens the filename field to 255 characters. 64 was ridiculous.
Also added a substr to the filename for the merge code so it won't error when it's a long name
2019-07-05 16:55:25 +01:00
matthew
80e614b53e Added relationship set event.
Adjusted relationship set statements for betteer accuracy
2019-07-05 16:46:03 +01:00
Matthew Barbour
ac1196dee1 Added lower to tag_categories search 2019-07-05 16:25:03 +01:00
Matthew Barbour
8d567e9553 Changed autocomplete to escape _ and %, lowercase the tags, and also query for tag names that are preceded by categories to address #630 2019-07-05 16:25:03 +01:00
Matthew Barbour
3fc0ba3a63 Added DATBASE_TIMEOUT constant to allow customizing database wait time 2019-07-05 16:25:03 +01:00
Matthew Barbour
1a7fa4663e Added search_terms to the bulk action event 2019-07-05 16:25:03 +01:00
matthew
f12e2891e5 Added button element to input[button]-related css statements 2019-07-05 16:25:03 +01:00
Matthew Barbour
a7c978c8d2 Added poster attribute to video element so thumbnail can show until video is loaded 2019-07-05 16:25:03 +01:00
Matthew Barbour
de6d6a0515 Added new FILE page mode that allows sending files to the browser with these improvements:
Reads the file and outputs it in chunks rather than all at once, reducing the amount of memory needed to very little, even for very very large files.
Supports http request ranges so that only parts of the file will be returned if requested. This allows in-browser video players to seek to arbitrary points in the video without needing to download the whole file.
Makes use of flush during send to allow the browser to being receiving file data immediately, allowing streamable video formats to begin playing before the server has finished sending the data. This could also be used in the future to add a transmission rate limiter.
Has early-disconnect detection, to terminate sending file data if the client browser has disconnected or aborted (for instance, a user starts a video, then seeks to near the middle, the first request of data will be terminated rather than continuing to process the file).
2019-07-05 16:25:03 +01:00
Shish
c24a6e9b97 formatting pass 2019-06-21 09:12:44 +01:00
Matthew Barbour
1370afec72 Moved database driver constants to DatabaseDriver 2019-06-20 10:47:15 -05:00
Matthew Barbour
d128dfa78e Added lower indexes for postgresql to tags.tag and users.name to speed up queries for them using lower() 2019-06-20 10:07:43 -05:00
Matthew Barbour
a834d1f814 Resolved issue with bulk rater 2019-06-19 23:41:55 -05:00
Matthew Barbour
921ec9a7bb Adjusted cron upload for new merged flag, and to make sure tags merge properly 2019-06-19 20:20:52 -05:00
Matthew Barbour
5eb4a66ab7 Added merged indicator to DataUploadEvent and ImageAddEvent
Changed merge process so that the ID of the merged image can make it back through the event chanin
2019-06-19 20:19:38 -05:00
Matthew Barbour
5a30ce1c83 Reverted removal of latter tag write 2019-06-19 18:59:51 -05:00
Matthew Barbour
826c623538 PageMode constants 2019-06-18 21:04:31 -05:00
matthew
123089bfbf Merge remote-tracking branch 'upstream/develop' into bugfixes
# Conflicts:
#	core/imageboard/image.php
2019-06-18 13:31:04 -05:00
Matthew Barbour
014a4c2cd2 Added extension constant lists to resize and rotate extensions so that they weren't rendering their controls ont he wrong image types 2019-06-18 13:25:45 -05:00
Shish
6313ebc339 LIMIT 1 when fetching a wiki page 2019-06-16 19:39:28 +01:00
Shish
1d10baa719 only sql-escape if we're going to the database, not the accelerator 2019-06-16 19:25:40 +01:00
Shish
e232811e8c silence errors from a broken client 2019-06-16 19:12:44 +01:00
Matthew Barbour
1fe18e7573 Missed a dir name 2019-06-15 12:52:22 -05:00
Matthew Barbour
8b531c04a2 removed SQLERROR escape from cron uploader, not necessary now that it is individualizing transactions.
Change cron uploader to use constants for dir and config names
2019-06-15 12:51:04 -05:00
Matthew Barbour
ab9389007f Changed key-generation process for cron upload so it doesn't endlessly generate new keys before the user first hits the same buttons in settings. 2019-06-15 11:51:03 -05:00
Matthew Barbour
ed9bd5e788 Fix in ExtensionAuthor 2019-06-15 11:29:35 -05:00
Matthew Barbour
37fe743f65 Changed "images" and "thumbs" usages to constants 2019-06-15 11:20:11 -05:00
Matthew Barbour
0202597f88 Added lock file usage to cron uploader to prevent concurrent runs.
Changed extension manager to allow author to be a comma-separated list.
2019-06-15 11:19:51 -05:00
Matthew Barbour
e940d87c22 Added image_id null check to resize's data upload event, to prevent an error when merging is enabled 2019-06-15 11:19:38 -05:00
Matthew Barbour
6f501a6e74 Database driver constants 2019-06-14 13:38:47 -05:00
Matthew Barbour
444de26ce3 Added warning for webp thumbnails 2019-06-14 13:34:21 -05:00
Matthew Barbour
8950d27d64 Changed upload to detect unrecognized files so that it doesn't just blankly refresh when the type isn't handled 2019-06-14 13:01:49 -05:00
Matthew Barbour
58acb71282 Change imagemagick commands to return the error output
Added ico to transcode extension
2019-06-14 13:01:24 -05:00
Matthew Barbour
ed4b6bc4a0 Updated handle_ico to use new common image thumbnailing and to inherit DataHandlerExtension 2019-06-14 13:00:59 -05:00
Matthew Barbour
e854b6d884 Custom rating changes 2019-06-14 09:47:14 -05:00
Matthew Barbour
1b76366dd9 Cleaned up some of the new image processing code, added documentation 2019-06-14 09:41:55 -05:00
Matthew Barbour
b522d68736 Custom rating support 2019-06-14 08:05:30 -05:00
Shish
44fcc3a1e9 rm some dead code 2019-06-14 13:52:27 +01:00
Shish
064b24ffc1 formatting pass 2019-06-14 13:47:50 +01:00
Shish
d1102cd635 Merge from sanmadjack:develop 2019-06-14 13:46:55 +01:00
Shish
f078b283bd pull a bunch of small fixes from #659 2019-06-14 13:16:58 +01:00
Matthew Barbour
6006a83229 Added <label> to extension name in extension manager so the name can also be clicked to enable/disable an extension 2019-06-13 18:18:51 +01:00
Matthew Barbour
68c3e5ea42 Changed cron upload so that an unrecognised file type results in an error instead of a success 2019-06-13 18:17:16 +01:00
Matthew Barbour
1aa0225652 Adjustments to transcoding to allow psd transcoding to actually work
Changed resize extension to run later in the extension stack
Little fixes
2019-06-13 11:45:34 -05:00
Matthew Barbour
3269d32378 Added transcode extension to allow admins to convert images to other types (for instance, converting PNG to more efficient lossless webps, not that I made this just so I could do that). It also allows uploading image formats that aren't compatible with the web, such as TIFF and PSD, by automatically transcoding them to a supported fele format. 2019-06-12 17:54:06 -05:00
Matthew Barbour
a1512975b6 This should have been checked in with the header bytes change, provides the actual type detection 2019-06-12 17:51:15 -05:00
Matthew Barbour
cb24ac69ab Changes to cron upload:
Added transaction handling so that subsequent errors don't result in images that have already moved to the uploaded folder from being wiped from the database.
Changed output folders to use subfolders based on the timestamp of the current run. This is to prevent writing over files in the error folder that happen to have the same name and path, effectively losing the data.
Added additional error and information logging, and a final count of imported/merged/failed.
2019-06-12 17:50:00 -05:00
Matthew Barbour
b27904a7e0 Changes to bulk actions, passing full ID arrays instead of chunked image arrays
Changed the bulk actions to have a separate identifier from the button name
2019-06-12 17:46:24 -05:00
Matthew Barbour
97f60b3ea5 Better error handling for GD code 2019-06-12 17:40:43 -05:00
Matthew Barbour
97abeb5254 Added option to detect file type based on header bytes 2019-06-12 17:35:11 -05:00
Matthew Barbour
8f73b35fbb Added OnTagTermParse to rating extension
Updated an install step to be pgsql compatible
2019-06-11 09:59:06 -05:00
Matthew Barbour
8f3c20134f Added <label> to extension name in extension manager so the name can also be clicked to enable/disable an extension 2019-06-11 09:08:16 -05:00
Matthew Barbour
f2fb040a5b Moved ImageResizeException to the core space so that the core space image resize code can use it 2019-06-11 09:06:47 -05:00
Matthew Barbour
e2d04ca58c Merge remote-tracking branch 'upstream/develop' into develop 2019-06-11 08:50:27 -05:00
Matthew Barbour
4410baeb9c Changed cron upload so that an unrecognised file type results in an error instead of a success 2019-06-09 14:17:13 -05:00
Matthew Barbour
eb4292316d Added webp upload and thumbnailing support
Bug fixes and consolidation of various thumbnail and resize functionality
Changed resize/rotate extensions to use replace image event
Added content-disposition header to image responses to provide a human-friendly filename when saving
Added more bulk thumbnail regeneration tools
Tweaks to bulk actions to correct totals when batching items
2019-06-09 14:14:04 -05:00
Shish
e77f7de7f9 Fixes for tag / source history 2019-06-09 08:32:01 +01:00
Matthew Barbour
49cb6f7233 Added thumb_scaling option for generating high-dpi thumbnails 2019-06-06 14:12:13 -05:00
Matthew Barbour
8612a07a5a cleanup 2019-06-05 19:37:07 -05:00
Matthew Barbour
66df295ec1 Bulk action extension 2019-06-05 18:16:15 -05:00
matthew
8741529590 Enabled rating extension for pgsql 2019-06-03 08:58:39 -05:00
matthew
aef455949b Added escape to cron upload to stop the process when a transaction-breaking error occurs. 2019-06-02 13:38:25 -05:00
matthew
38badf7e45 Changed cron import to output imported/failed files to subdirectories matching the imported file's original subdirectory 2019-06-02 13:34:24 -05:00
matthew
5a2f893667 Changed cron upload new image tagging to work with tag event's requirement for tags to not be empty. 2019-06-01 12:17:38 -05:00
matthew
3e2a0ea3b5 Brought cron upload tag handling inline with everything else 2019-06-01 12:12:36 -05:00
matthew
e92ac10349 Removed unset line so it doesn't do it twice. 2019-06-01 12:08:07 -05:00
matthew
63a69e4258 Change to correct issue with my change to prevent cron uploader from throwing warnings. Now using array_pop so that position in the array doesn't matter. 2019-06-01 12:02:58 -05:00
root
23392b6b91 Removed a test line 2019-06-01 10:07:01 -05:00
root
98bc7c7df1 Corrected issue preventing cron upload from generating key 2019-06-01 10:04:16 -05:00
Shish
d387469fdb Use RecursiveDirectoryIterator for cron_uploader consistently, should fix #652 2019-06-01 08:13:07 +01:00
Shish
8e90279c11 Fixes for cron uploader, fixes #650 2019-06-01 07:51:02 +01:00
Shish
bf473f6d51 more lint fixes 2019-05-29 18:23:29 +01:00
Shish
8a49b1e80e remove unmaintained chatbox / amazon_s3 exts 2019-05-28 20:28:05 +01:00
Shish
2396ae2ef9 fix a bunch of lints 2019-05-28 20:27:23 +01:00
Shish
93cc732d39 fix tests 2019-05-28 19:00:23 +01:00
Shish
34b05cca7c PSR-2. I'm not a huge fan, but ugly consistency beats no consistency... 2019-05-28 17:59:38 +01:00
Shish
5ec3e89884 php7.1 all the things 2019-05-28 17:31:20 +01:00
Shish
445687111e Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2019-05-26 16:25:36 +01:00
Shish
b91f20875a put upload block on every page 2019-05-26 16:15:43 +01:00
Shish
6175b36cc9 don't show uploader name in RSS feed, halve the number of queries 2019-05-26 10:37:26 +01:00
Shish
3d326344a9 don't show refine block for heavy queries 2019-05-26 10:35:26 +01:00
Shish
a0588bd8f8 empty list rather than 404 for invalid autocompletes 2019-05-21 23:12:52 +01:00
Shish
037b1f0f70 log mass deletion count in advance 2019-04-28 09:53:53 +01:00
Shish
bef1628b08 also block autocomplete for % / _ 2019-04-26 10:31:23 +01:00
Shish
bc45944ac9 flashier tnc 2019-04-26 10:15:32 +01:00
Shish
65dc3898c0 common tags / common source fields 2019-04-26 10:15:32 +01:00
Shish
b2b4317203 sync with python rss_images 2019-04-26 10:15:32 +01:00
Shish
80c84f3248 More detailed login logging 2019-04-26 10:15:32 +01:00
Shish
629f155187 don't autocomplete searches with ==0 or >32 characters 2019-04-26 10:12:40 +01:00
Shish
4c70258352 typos 2019-04-16 20:41:13 +01:00
Shish
c2834aad96 regular implode() for shell commands 2019-02-24 08:29:33 +00:00
Shish
2acbba9d02 influxdb-friendly statsd format 2019-02-22 21:26:42 +00:00
Shish
ffd5fbb4af fully customisable IP ban 2019-02-22 21:24:53 +00:00
Shish
a588a0cfc5 show the right IPs 2019-02-22 21:05:53 +00:00
Shish
a8dfc9277b Show logged event IPs on user page 2019-02-22 21:04:09 +00:00
Shish
7abf1aa591 custom ipban message 2019-02-22 19:58:04 +00:00
Shish
d918f058bf core imageboard events 2019-02-22 19:57:55 +00:00
Shish
60a28af000 s/implode/Tag::implode/ 2019-02-02 12:07:33 +00:00
Shish
eb24fa0b21 tweaks 2019-02-02 12:05:59 +00:00
Shish
ead3a5a588 php7 assertions, no strings 2019-01-06 10:40:39 +00:00
Shish
c9ccb22951 make handle_static its own extension 2018-11-11 17:38:32 +00:00
Shish
b95cbe4666 skip r34 comic bits by default 2018-11-10 14:15:07 +00:00
Shish
16d0abb546 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2018-11-10 13:10:22 +00:00
Shish
cc23528459 subdirs for tag_list caches, as those get huge... 2018-11-10 13:10:14 +00:00
Shish
c74bd58207 sort image reports by id (newest first) 2018-11-10 12:03:05 +00:00
Shish
7a7dc86cfc Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2018-11-10 11:57:13 +00:00
Shish
9e795f41a7 use vendor JS directly instead of copy-pasting 2018-11-07 15:12:13 +00:00
Shish
f772b30301 fix some tests 2018-11-07 15:12:09 +00:00
Shish
fc6fb3c6b8 use current protocol for niceurl test, see #632 2018-11-06 00:02:07 +00:00
Shish
9d3f4ea4b3 move ext-specific js into that ext 2018-11-05 23:12:18 +00:00
Shish
c0699ce236 s/mime_content_type/getMimeType/, fixes #633 2018-11-05 19:52:55 +00:00
Shish
b93026ac1d dedupe 'og:' meta tags 2018-11-05 19:17:42 +00:00
Shish
55e0e32395 Let the client choose the protocol for QR images (see #477) 2018-11-05 17:52:21 +00:00
Shish
4b37a38857 viewports argh 2018-09-09 10:58:18 +01:00
Shish
a7a7c0dd47 handle ffmpeg thumbnailing in a slightly more sane way 2018-09-09 10:57:28 +01:00
Shish
1ed888611a drop support for video without ffmpeg 2018-09-09 10:21:56 +01:00
Rudolf M. Schreier
2ae760b62e Add missing escaping of ffmpeg shell command during video thumbnail generation 2018-08-14 11:23:09 +02:00
Shish
9f3bf7d2e1 force-desktop toggle 2018-07-26 00:28:08 +01:00
Shish
24276390b4 autocomplete only for search boxes again 2018-07-26 00:27:56 +01:00
Shish
bd6b2289b1 image-info box should avoid wrapping 2018-07-26 00:27:39 +01:00
Shish
dbc430e3d5 link to main and backup image 2018-07-26 00:26:46 +01:00
Shish
dd8a90414f leave it to the theme to link to the image 2018-07-26 00:26:23 +01:00
Shish
97a03d8f83 paginated user list 2018-07-22 19:23:34 +01:00
Shish
d48e34030d time and message searching in the log 2018-07-22 15:08:53 +01:00
Shish
f31dabce20 show number of up/down votes on user page 2018-07-20 01:29:38 +01:00
Shish
e809a72155 log autocomplete errors instead of alerting 2018-07-20 00:48:03 +01:00
Shish
639a1bc3cd format text for image reports 2018-07-20 00:37:43 +01:00
Shish
8ea25a4e90 .autocomplete_tags as the class to indicate we want tag autocompletion 2018-07-20 00:32:49 +01:00
Shish
c75e7060e6 hide by default 2018-07-19 22:17:19 +01:00
Shish
1b372b2575 typo 2018-07-19 20:09:36 +01:00
Shish
8768284602 add r34 ext 2018-07-19 19:55:28 +01:00
Shish
d91b0ec218 regen thumbnail from cli 2018-07-19 19:53:20 +01:00
Shish
9b0edcf449 also don't even follow links from deep search pages 2018-07-19 08:51:19 +01:00
Shish
71445fdf96 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2018-07-17 01:15:27 +01:00
Shish
4c73b27d1e tell google to stop indexing /post/list/-cake%20-pie/34342 2018-07-15 20:34:52 +01:00
Shish
c9d7bd1ae3 delete cached thumb blocks after replacing images 2018-06-20 03:08:40 +01:00
Shish
60d693d323 use svg-sanitize to sanitize SVG files 2018-02-20 22:06:50 +00:00
Shish
bc68137797 use svg-sanitize to sanitize SVG files 2018-02-20 22:00:24 +00:00
Shish
cf95e28144 firefox complains about invalid email in an email field 2017-10-28 20:28:23 +01:00
Shish
7d478a809c this is PHP :( 2017-09-21 15:35:13 +01:00
Shish
977c3db1e3 PHP7 type annotations 2017-09-21 05:21:42 +01:00
Shish
df3f061533 PHPUnit 6 2017-09-21 04:16:36 +01:00
Shish
8a4616bc7d Merge branch 'develop' 2017-09-18 23:56:40 +01:00
Shish
236b444ccd fix test 2017-09-17 19:38:44 +01:00
Shish
186ea55348 safety 2017-09-17 19:11:51 +01:00
Shish
5763b77e2b strnorm 2017-09-17 19:10:10 +01:00
Shish
2c0e49507e limit / offset 2017-09-17 19:06:10 +01:00
Shish
47ff7f185e Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2017-09-17 19:00:40 +01:00
Shish
860e828c3e Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2017-09-17 18:59:59 +01:00
Shish
a32bc6448c make user list slightly more useful 2017-09-17 18:59:48 +01:00
Shish
cdbb4e8c7b add resize/script.js 2017-09-17 15:09:25 +01:00
Shish
408b45e4cc Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2017-08-24 10:17:47 +01:00
Shish
473c0f0bcb explicitly mark some block types as ignored when calculating 404ness 2017-08-24 10:17:24 +01:00
Shish
d875ab66a1 60 second post-list cache 2017-08-22 01:05:18 +01:00
im-mi
08f1475007 Fixed bookmarklets on imageboards running gelbooru 2017-08-06 20:30:38 -04:00
Shish
3c3529a4cc don't respond to autocomplete requests for blank string 2017-07-20 23:29:17 +01:00
Shish
8fcf721045 use image link for video 2017-07-20 23:28:55 +01:00
Shish
d105644d1b use php sorting for alphabetic tag list, as utf8 sort ignores punctuation 2017-06-08 09:36:59 +01:00
Shish
9f4caaddea remove some unused variables 2017-06-01 20:44:26 +01:00
Shish
53c6f6df30 bulk thumb regen 2017-06-01 20:44:17 +01:00
Shish
2666d83579 fix URL for video fallback flash player 2017-06-01 20:44:02 +01:00
jgen
fc7d96b530 Another location where $tags should be an array instead of a string. 2017-05-14 22:18:44 -07:00
jgen
cf5aacaddf Use empty array instead of array with empty string. (Thanks Shish!) 2017-05-14 14:00:20 -07:00
jgen
3ffb2da91c More checking to ensure tags is an array. 2017-05-13 23:18:47 -07:00
jgen
7ebe301ffd Check if already an array before exploding. 2017-05-13 18:01:31 -07:00
jgen
f492c6c2c3 Ensure that the Image object tag_array and the metadata array tags are always arrays. 2017-05-12 00:57:50 -07:00
jgen
c0e87ae2ae Fix issue with archive handler if no add_status method. 2017-05-11 23:43:10 -07:00
John Brooks
f934baa207 bulk_add_csv: Run Tag::explode() on the tags before passing them to handlers
Fixes #575
2017-04-23 02:21:39 +00:00
im-mi
495776cac1 Fixed bookmarklet when logged in on imageboards running gelbooru 2017-03-23 20:46:30 -04:00
Daku
acba60e7aa remove extra newline 2017-03-18 00:49:08 +00:00
Daku
2b62cc8171 loading SVG via <img> instead of <object> to stop inline JS execution 2017-03-18 00:13:16 +00:00
jgen
204ea1d239 And more linting. 2017-03-12 17:13:32 -07:00
Scrutinizer Auto-Fixer
1caef6d633 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-03-12 23:45:38 +00:00
jgen
7bd581b530 Scrutinizer commets. 2017-03-12 14:29:35 -07:00
Shish
44bead8b92 Merge pull request #603 from jgen/develop
PHP Version check in the code should use a configurable value.
2017-03-12 16:13:02 +00:00
Shish
7968f336fd Merge pull request #601 from DakuTree/develop
Updated/removed various libs + tweaks
2017-03-12 16:12:01 +00:00
jgen
ec4111430d More linting. 2017-03-12 00:29:10 -08:00
jgen
8de816d7dd Some more linting via PHPDoc comments. 2017-03-12 00:18:26 -08:00
jgen
ebab9eddeb Merge branch 'master' into merge-from-master
Conflicts:
	ext/tag_list/theme.php
2017-03-11 00:52:16 -08:00
Daku
f9d0c83d5b .audio > .audio_image (.audio is used for modernizr) 2017-03-10 19:18:35 +00:00
Daku
6fc3d51014 use HTML5 audio player, jsmediatags lib, default volume for audio/video 2017-03-10 19:16:54 +00:00
Daku
e07556c62d make sure video isn't bigger than container + linting 2017-03-10 18:26:07 +00:00
Daku
12d73c28a8 remove getID3 lib 2017-03-10 18:16:56 +00:00
Daku
84e86c4930 use mime_content_type instead of getID3 + use proper MP4 mimetype 2017-03-10 18:03:59 +00:00
jgen
9e7787de0c From Scrutinizer: The case 'r' would never be reached due to the default appearing before it. 2017-03-09 22:55:32 -08: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
jgen
c379420a1f #597: Fix for XSS issue in chatbox extension. 2017-03-08 01:14:11 -08:00
Shish
e43b1b3aed Merge branch 'tag-tables' of git://github.com/im-mi/shimmie2 into im-mi-tag-tables 2016-10-10 14:19:57 +01:00
Shish
4b9278d09b Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2016-10-09 22:33:25 +01:00
Shish
623d34f20b Merge pull request #589 from im-mi/searchable-random-list
Searchable random list
2016-10-09 22:26:28 +01:00
Shish
7548c66a0b Merge pull request #578 from im-mi/enhance-zoom
Enhance zoom
2016-10-09 22:21:39 +01:00
im-mi
d5fd6f6821 url_escape tag info link tag 2016-09-28 10:26:13 -04:00
Shish
3daa83223e Merge pull request #588 from im-mi/arrow-key-nav-ignore-modifiers
Ignore arrow key navigation when modifier keys held
2016-09-26 15:22:06 -05:00
Shish
af0aa98649 Merge pull request #586 from im-mi/image-info-tweaks
Image info tweaks
2016-09-26 15:21:46 -05:00
im-mi
8805f0dd18 Remove get_ico page
It's no longer needed because ICO now uses Image->get_image_link()
2016-09-26 11:18:06 -04:00
im-mi
e6dd1b492c Sanitize ratings 2016-09-25 15:26:36 -04:00
im-mi
d4fda00dd9 Check for existence of POST var tag_edit__owner before using it 2016-09-25 15:26:36 -04:00
im-mi
05da5d0b4f Use Image->get_image_link() on ICO files 2016-09-25 15:26:36 -04:00
im-mi
1dd0dfc591 Read ICO header with proper sign
Fixes width/height being read incorrectly when >= 128
2016-09-25 10:17:46 -04:00
Shish
9c062f3385 case-insensitive wiki pages 2016-09-24 16:17:14 +01:00
im-mi
f763fc1356 React appropriately when there are no random list search results 2016-09-23 12:31:02 -04:00
im-mi
3bebe77add Made the random list searchable 2016-09-23 12:21:40 -04:00
im-mi
891e52f4b9 Ignore arrow key navigation when modifier keys held 2016-09-23 12:09:40 -04:00
im-mi
a49c5745b0 Use html_escape instead of htmlspecialchars 2016-09-14 18:08:12 -04:00
im-mi
c1083bbea1 Fixed comment-delete code-injection vulnerability 2016-09-14 17:42:32 -04:00
im-mi
3e52e332de Only show image rater if user can rate 2016-09-13 02:10:48 -04:00
im-mi
4dcee0eede Removed trailing period from "Parent: None." for consistency 2016-09-11 23:42:34 -04:00
im-mi
001a1176cc Show image rating in image info box even when not logged in 2016-09-11 23:42:34 -04:00
im-mi
e110b558b8 Hide the rating editor outside of edit mode 2016-09-11 23:42:34 -04:00
Shish
7efff25dcc Merge pull request #585 from im-mi/pool-placeholder-text
Don't use javascript for pool search placeholder
2016-09-07 23:49:19 +01:00
im-mi
e8c6f655b0 Don't use javascript for pool search placeholder 2016-09-07 08:43:34 -04:00
Shish
d36338d4c4 Merge pull request #582 from im-mi/minor-html-fixes
Minor html fixes
2016-09-07 10:31:25 +01:00
im-mi
58096e10c8 Fix tag list clipboard spacing
This brings back the original behavior of having spaces between the columns when the tag list gets copied to the clipboard (tested in Chrome, Edge, and Firefox).

One caveat: Edge now adds multiple spaces.
2016-09-06 22:10:09 -04:00
im-mi
73ff0e669d Use generic NavBlock instead of "Index" block on pool pages 2016-09-06 09:25:08 -04:00
im-mi
5919112477 Use tables for tag lists 2016-09-06 06:08:33 -04:00
im-mi
e5cfea028a Fixed mass source set's broken dialog 2016-09-03 14:43:56 -04:00
im-mi
91fea63319 Removed stray end tag 2016-09-03 14:26:24 -04:00
im-mi
ac53fe52de Removed obsolete language specification from <script> 2016-09-03 14:26:24 -04:00
im-mi
10d47409ad Added doctype to home page 2016-09-03 14:26:24 -04:00
im-mi
d39b084537 Properly end attribute list of tag on upload form 2016-09-03 14:26:24 -04:00
im-mi
d9903a969d Added zoom support to svg 2016-09-03 05:36:15 -04:00
im-mi
17f71094f2 Use the size of the outermost svg element
... in case there are nested svg elements.
2016-09-03 05:36:14 -04:00
Shish
3051334d8f be explicit that variables are variables 2016-09-02 16:19:02 +01:00
Shish
e96a5e1109 Merge pull request #579 from im-mi/fix-ico-256-256
Fix .ico when size is 256 x 256
2016-09-02 15:50:46 +01:00
im-mi
15ffdff387 Fix .ico when size is 256 x 256 2016-09-02 05:33:16 -04:00
im-mi
d2540a9619 Use CSS for mass tagger button styling 2016-09-02 05:30:00 -04:00
im-mi
49d6fa99da Clear the mass tagger's selection on load
.. in case it was autocompleted by the browser.
2016-09-02 05:29:59 -04:00
im-mi
35d2f8682c Don't save zoom mode cookie upon window resize 2016-09-02 01:14:53 -04:00
im-mi
84dbc3abff Re-apply zoom upon window resize 2016-09-02 01:12:35 -04:00
im-mi
f26fc5925b Added zoom support to ico 2016-09-02 01:12:34 -04:00
im-mi
eeb0c2b974 Only allow click-to-zoom on img 2016-09-02 01:12:33 -04:00
im-mi
b554e7505b Added zoom support to webm 2016-09-02 00:38:31 -04:00
Shish
29bdc5da22 Merge pull request #576 from im-mi/fix-pool-description-code-injection
Update pool description formatter (code injection vulnerability)
2016-09-01 11:18:37 +01:00
im-mi
10e8fc50d3 Fix "starts-with" header in tag list when escaping required
This fixes the "starts-with" headers* on the tags/alphabetic page. Before, the headers would be wrong if they started with an escaped character.

This also escapes the resulting header so that it no longer generates invalid HTML in such cases.

* Note that these headers are only visible when paged tag lists is disabled.
2016-09-01 03:33:17 -04:00
im-mi
bb64d12d9d Use TextFormattingEvent instead of raw BBCode formatter 2016-09-01 00:35:52 -04:00