badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4675 commits 1 branch 0 tags 17 MiB
Commit graph

2250 commits

Author SHA1 Message Date
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
Shish
bcef3fbc8f have tag sanitisation process ignore tags which are too long, fixes #565 2016-08-29 09:21:23 +01:00
im-mi
1bab0051f1 html_escape tag info link 2016-08-29 09:11:13 +01:00
im-mi
84b4ac3893 html_escape tag info link 2016-08-29 01:19:11 -04:00
Shish
a68407e12e Merge pull request #573 from im-mi/patch-2 
Fix log info section name
 2016-08-20 14:57:35 +01:00
Shish
98254ef5bd Merge pull request #572 from im-mi/video-playback-options 
Added video playback options for autoplay and loop
 2016-08-20 14:57:16 +01:00
im-mi
980e3b686b Fix log info section name 2016-08-19 21:52:48 -04:00
im-mi
cce24f9e80 Added video playback options for autoplay and loop 2016-08-19 21:25:58 -04:00
im-mi
8fe9212882 Fixed assertion failure upon upload due to incorrect type check 2016-08-19 15:55:18 -04:00
im-mi
85a3cc0a7e Fall back to file extension from path 2016-08-16 11:34:01 -04:00
im-mi
3323a50ea5 Made a few parts less site-specific 2016-08-16 11:32:34 -04:00
im-mi
adf723ad23 Fixed bookmarklet on Danbooru2 2016-08-16 11:30:34 -04:00
im-mi
91d609a4c6 Make back button go to page bookmarklet was executed on 2016-08-16 11:29:26 -04:00
im-mi
b10144492a Added supported video file extensions to bookmarklet 2016-08-16 11:28:16 -04:00
im-mi
9ba6e3f7db Remove trailing variables from image address 2016-08-16 11:27:22 -04:00
im-mi
8f974fba73 Fixed uploading scaled images from Gelbooru when logged in 2016-08-16 11:26:32 -04:00
im-mi
b24977e110 Fixed tag corruption bug 
If there was no newline at the end of the input, then the last tag would get corrupted.
 2016-08-16 11:25:04 -04:00
Shish
89dffd569a and mass tagger 2016-07-30 23:41:42 +01:00
Shish
26b2cd5c16 derp 2016-07-30 23:06:42 +01:00
Shish
bed04a1230 assert that metadata['tags'] is an array 2016-07-30 23:02:14 +01:00
Shish
ffce1a4683 more hinting 2016-07-30 22:54:42 +01:00
Shish
b81e8a2db8 also explode tags on transload input 2016-07-30 22:45:44 +01: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
bc3e482247 more image report display options 2016-07-30 15:04:34 +01:00
Shish
8c8106c6a9 fix index var access 2016-07-03 11:48:08 +01:00
Shish
bb35421b05 Load AutoComplete before Home, so that the headers show up 2016-06-26 18:57:53 +01:00
Shish
6febdec7b5 more explicit variable types 2016-06-19 23:05:57 +01:00
Shish
f8b7909426 ExtensionInfo isn't private 2016-06-19 22:15:46 +01:00
Shish
333c74ba35 typo 2016-06-19 17:48:10 +01:00
Shish
dc10a18086 lots of minor doc tweaks, type hints, etc 2016-06-19 17:41:40 +01:00
Shish
edd3e49a2f mark wildcard test incomplete on pgsql / sqlite 2016-06-19 14:06:26 +01:00
Daku
a8d9f8ce5b make sure prev/next links aren't clipped outside the box 2016-06-19 11:56:41 +01:00
Daku
f973fcc9fa basic autocomplete support for metatags 2016-06-19 10:07:56 +01:00
Daku
03240220d4 make sure to get proper tag value + use selected tag if possible 2016-06-19 09:49:55 +01:00
Daku
862a84677f add docs column, showing what extensions have documentation 
previously it made every ext name into a link to /ext_doc, regardless if it had docs or not
 2016-06-19 05:05:12 +01:00
Daku
c0601640bf only show link if extension actually has documentation 2016-06-19 05:04:59 +01:00
Daku
5ae10473e3 closing tag is unneeded 2016-06-19 05:01:13 +01:00
Daku
6486a4757f js scrutinizer fixes 2016-06-19 05:00:09 +01:00
Daku
b75638cace get_last_insert_id requires param for pgsql support 2016-06-19 04:57:14 +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
24973ada17 don't run linter on ext/*/lib/* 2016-06-18 19:00:53 +01:00
Shish
0fd96fcdae remove incomplete and unmaintained bookmarks ext, see #532 2016-06-18 18:26:11 +01:00
Shish
06ee5347c7 https support for gravatars 2016-06-18 15:56:24 +01:00
Shish
0ff6da6d3c Merge #555 2016-06-18 15:16:47 +01:00
Daku
b5d56214cd fix case-insensitive autocomplete on postgres 2016-06-18 14:45:21 +01:00
Shish
20d0edb332 Merge pull request #556 from shish/html-headers 
fix and use get_all_html_headers()
 2016-06-18 14:05:44 +01:00
Daku
5d5b1d7059 this should be set to $res 2016-06-18 14:03:37 +01:00
Daku
56e5348470 autocomplete caching 
see 7dce8da850
 2016-06-18 13:20:07 +01:00
Daku
2546621c59 sort autocomplete by score + show score 2016-06-18 13:20:04 +01:00
Shish
cfc1268354 update non-layout.class.php uses of html_headers too 2016-06-18 12:49:46 +01:00
Daku
4bd9ee1c7f fix autocomplete search not looking correct on home page 2016-06-18 12:25:39 +01:00
Daku
6b6e4f04b6 html_headers should be properly sorted 2016-06-18 12:25:22 +01:00
Daku
2a747c8f2b move home css to style.css 2016-06-18 12:10:37 +01:00
Daku
559a4c7e40 move autocomplete js to script.js so it's cached 2016-06-18 11:58:41 +01:00
Daku
c59995c807 search button can sometimes be on same line as input 2016-06-18 11:47:04 +01:00
Daku
b6e181efb1 excess whitespace 2016-06-18 11:24:18 +01:00
Daku
a9e3ef26be space should always create new tag 2016-06-18 08:06:59 +01:00
Daku
1db62901be disallow spaces in tags 2016-06-18 07:41:59 +01:00
Daku
78c2731a12 move notes libs to ext folder, fix a few bugs 
it would be nice to take this out of beta, but it still has major issues with image resizing / unable to edit or delete notes
 2016-06-18 06:28:33 +01:00
Daku
9e7c318df0 notes ext code cleanup 
initial prep to fix & take the ext out of beta
 2016-06-18 06:27:44 +01:00
Daku
b9893cbbda $_POST["tags"] isn't always set 2016-06-18 06:27:41 +01:00
Daku
caed53de6a jQuery.cookie is deprecated so use js-cookie instead (+ composer), some js tweaking too 
Conflicts:
	ext/blotter/script.js
	ext/handle_pixel/script.js
	ext/index/script.js
	ext/pools/script.js
	lib/shimmie.js
 2016-06-18 06:27:32 +01:00
Daku
951323abcf default handle_video thumbgen to ffmpeg if ffmpeg in path & is_executable 2016-06-18 06:20:52 +01:00
Daku
b0daab8766 move from Jaris > MediaElement for <video> fallback + use composer 
also made it so the video element is no longer bigger than parent div
 2016-06-18 06:20:49 +01:00
Daku
ba6ab8fb16 move S3.lib to ext folder 
toggleable exts should really keep any libs they use in their own dir
 2016-06-18 06:17:15 +01:00
Daku
d5a58916f7 get recaptcha lib with composer + fixes #498 2016-06-18 06:17:07 +01:00
Daku
57fb4e0a34 grab tablesorter lib with composer 2016-06-18 06:17:04 +01:00
Daku
516488a625 load akismet via composer 
note: we should probably be using a more recent library for this, but there doesn't seem to be any general ones..
 2016-06-18 06:16:31 +01:00
Daku
f17812c64b working autocomplete 2016-06-18 06:16:21 +01:00
Daku
1bfec55690 tag lib for autocomplete 
--not added autocomplete yet
 2016-06-18 06:16:17 +01:00
Daku
a7021e190e Merge pull request #554 from shish/js-cookie-update 
migrate to a non-deprecated (and dependency-free) cookie library
 2016-06-18 03:34:12 +01:00
Shish
7dce8da850 caching for autocomplete 2016-06-18 01:19:34 +01:00
Shish
79648b04d2 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2016-06-18 01:18:29 +01:00
Shish
7bc9a73357 migrate to a non-deprecated (and dependency-free) cookie library 2016-06-18 00:00:02 +01:00
Shish
dda634b068 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2016-06-17 23:42:20 +01:00
Shish
76c2815b2b unit test bettering 2016-06-17 23:42:12 +01:00
Shish
57fa354842 fnmatch has a string length limit :| 2016-06-17 22:51:30 +01:00
Shish
190d8bd7d7 log api stats seperately 2016-06-17 22:48:28 +01:00
HungryFeline
94ba42fc70 Set ffmpeg's "overwrite output files" switch (-y) 
Regenerate thumbnail doesn't work since the output file already exists and ffmpeg expects the user to decide wether to replace the file or not. With the -y switch set, ffmpeg does so without asking.

https://ffmpeg.org/ffmpeg.html#Main-options
 2016-06-16 16:40:51 +02:00
Shish
3d05c2896a expand test cases 2016-06-07 01:56:05 +01:00
Shish
c41c9d680f search tests 2016-06-06 22:42:40 +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
Shish
8326ef631f Merge pull request #546 from DakuTree/fix-relationships 
Fix relationships ext checking for TRUE/FALSE instead of Y/N
 2016-05-22 18:11:57 +01:00
Daku
44876a58d9 we should be using bool_escape instead... 2016-05-22 16:17:31 +01:00
Shish
3e57f725d3 update ban message 2016-05-22 16:12:43 +01:00
Daku
a3296e18ae create index for has_children 2016-05-11 14:49:22 +01:00
Daku
32dbdccd00 has_children uses Y/N, not TRUE/FALSE 2016-05-10 21:15:50 +01:00
Matthew Barbour
898bcfae94 Fixes for bulk add results 2016-03-21 18:14:48 -05:00
Daku
9235025165 fix integrity constraint violations when mass-editting an image that already contains the new tag 2016-01-24 09:56:47 +00: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
William Crandell
7b8d8c2a2d chatbox bugfix 
might cause new bugs checking into this now
 2015-10-26 11:22:57 -04:00
William Crandell
b7114a142e Hotfix for better block id character filtering 2015-10-26 09:20:09 -04:00
Daniel Oaks
144ac6bd89 Fix the notes extension to work properly on dbs other than MySQL 2015-10-15 19:31:39 +10:00
Shish
3aed2abec7 don't complain if one image in a bulk revert doesn't exist 2015-10-12 19:17:16 +01:00
Daku
de761c11d7 speed: don't check tag for metatag if doesn't contain : or = 2015-10-08 19:20:40 +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
6ff80ab2c8 move tag sanitization, alias checking & tag parsing to TagSetEvent 2015-10-08 18:22:20 +01:00
Daku
23b9d7d8da improved metatag regex 2015-10-08 18:03:45 +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
80f5a016c2 or else 2015-09-27 11:01:59 +01:00
Shish
cdcd762a52 more comments 2015-09-27 02:17:44 +01:00
Shish
78c44c7067 more tidying shimmie api and user page 2015-09-27 02:00:02 +01:00
Shish
793bc3614b loooooooads of artists refactoring and tidying 2015-09-27 01:03:58 +01:00
Shish
b9a0278f6e clean up danbooru api code 2015-09-26 22:50:05 +01:00
Shish
ff13e58f8f clamp to a valid value 2015-09-26 20:03:30 +01:00
Shish
e482f97955 more clamping 2015-09-26 19:53:15 +01:00
Shish
5a8df90fd9 splitting up huge functions in ext/comment 2015-09-26 19:14:11 +01:00
Shish
8c1e3bc92a mark tests as public 2015-09-26 11:17:13 +01:00
Shish
c54e336695 mark tests as incomplete rather than commenting them out 2015-09-24 23:16:38 +01:00
Shish
c337abe280 skip tests for extensions who don't support the current db 2015-09-21 10:05:32 +01:00
Shish
98d71f527d test fix 2015-09-20 23:24:26 +01:00
Shish
82ab2a8305 faster tests 2015-09-20 23:10:33 +01:00
Shish
fc2bbefcb9 test all the things 2015-09-20 22:40:04 +01:00
Shish
13dfb8861f more tests 2015-09-20 21:20:28 +01:00
Shish
2600ef042b setup tests 2015-09-20 20:44:34 +01:00
Shish
7bfc959547 upload tests 2015-09-20 20:28:27 +01:00
Shish
ff8da5be8e word filter tests 2015-09-20 20:18:55 +01:00
Shish
90cd823ece fix liveness testing, and comments tests 2015-09-20 20:05:06 +01:00
Shish
0617079afb test 2015-09-20 20:04:16 +01:00
Shish
83a1336b76 more test 2015-09-20 20:04:16 +01:00
Shish
ec484c1144 more phpunit-ing 2015-09-20 20:04:13 +01:00
Shish
2d622cf908 put test svg in a file 2015-09-20 20:03:29 +01:00
Shish
9af5995dcc PHPUnit proof of concept 2015-09-20 20:03:29 +01:00
Shish
e3959e5ec8 remove simpletest 2015-09-20 20:03:29 +01:00
Shish
ba3a61052f timeout on varnish purger 2015-09-20 20:02:36 +01:00
Shish
ffc636515f remove dead code 2015-09-20 20:02:34 +01:00
Shish
147b47a78c add comment style 2015-09-20 20:02:30 +01:00
Shish
1fc5fb755a handle null in tag_editcloud 2015-09-20 13:20:26 +01:00
Shish
35a4f385b3 phpstorm tidying 2015-09-12 11:43:28 +01:00
Daku
a55306f4be don't throw no handler error if empty directory / directory doesn't exist 2015-08-12 06:58:44 +01:00
Daku
ebfcf9389e using links as block title doesn't play nice with .js, so specify ID 
blocks use title as ID, which will break if the title is a link
 2015-08-10 00:45:06 +01:00
Shish
9ff2ef390d make handle_404 handle blotter 2015-08-09 13:40:34 +01:00
Shish
e415bd3fca more database support 2015-08-09 12:20:43 +01:00
Shish
0ef8db8371 not all requests have remote_addr 2015-08-09 12:20:37 +01:00
Shish
a70ca33f96 fix typo 2015-08-08 23:04:36 +01:00
Shish
df56213ec3 allow exts to mark themselves as not supporting sqlite 2015-08-08 22:23:27 +01:00
Shish
65289ed9c8 skip to latest db 2015-08-08 22:18:54 +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
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
18490ed488 more global removal 2015-08-02 20:39:41 +01:00
Shish
c17250b6b9 there is no more purge unused tags 2015-08-02 19:41:06 +01:00
Shish
90e86b99ae page->set_code() to set HTTP status 2015-08-02 19:40:57 +01:00
Shish
e5e7f891e2 scrutinizer suggestions 2015-07-21 01:20:53 +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
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
1907dc29bc cache event log size for 600 seconds, not cache the value '600' forever... 2015-07-12 22:12:37 +01:00
Shish
9f9f2735f4 case-insensitive autocomplete 2015-07-04 12:26:29 +01:00
Shish
cabc600207 show all html headers on the front page, so autocomplete can work 2015-07-04 12:25:23 +01: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
jgen
6a6480181d Move zoom function inside closure so it isn't potentially knocked out by other functions (with same name) in global scope. 2015-06-01 15:38:04 -07:00
Shish
1aaaeb69fb fix merge 2015-06-01 16:00:03 +01:00
Shish
21d96db771 remove unused var 2015-06-01 10:50:26 +01:00
jgen
1c43fd9dc4 Remove duplicate 'class' attribute on html element. Fixed tag edit box so that auto complete works again. 2015-06-01 02:39:08 -07:00
jgen
edc9e07919 Only examine the headers if we actually have them. 2015-05-31 21:39:22 -07:00
Shish
2aea79ac35 merge common parts of handle_archive and bulk_add 2015-05-24 16:08:46 +01:00
Shish
9a28f0f51a split vote recounting on user deletion into chunks 2015-05-18 23:40:21 +01:00
Shish
bb490ac413 stop comment info from concealing comments 2015-04-26 12:54:54 +01:00
Shish
98c1c763aa show when tags/sources were set on the history pages 2015-04-26 12:45:32 +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
a7de21523f user confirm on mass source set 2015-04-18 10:40:02 +01:00
Daku
83c0c284ac fix first setup block positioning 2015-04-18 10:39:56 +01:00
Daku
b1ec0c434e move tag category css to it's own file 2015-04-18 10:39:42 +01:00
Daku
8c2d8df81d use html5 input types 
we would use type='url' for source but non-urls can be used as source too
 2015-04-18 10:39:34 +01:00
Daku
7166259cc5 autocomplete='off' for tag input 
this disables autocomplete/captilize on "most" mobile keyboards
autocompletejs still works with this off
 2015-04-18 10:39:22 +01:00
Daku
845543b2ba fixes #478 - import now uses AddAliasEvent rather than manually adding itself 2015-04-18 10:39:09 +01:00
Daku
6289402f2e make sure aliases.csv is downloaded, and not opened in browser 
SEE: http://stackoverflow.com/questions/6468517
 2015-04-18 10:38:57 +01:00
Shish
97a0aa7e4c give unread PM count a class, so custom themes can make it red if they wish 2015-04-18 10:31:24 +01:00
Shish
519749559f Merge pull request #481 from jgen/develop 
Fix XSS in arrowkey extension
 2015-03-13 08:37:08 +00:00
jgen
adec7e1763 Fix XSS vulnerability. 2015-03-12 23:12:27 -07:00
jgen
3511711008 Should be consistent about using the int_escape method. 2015-03-12 23:12:06 -07:00
Shish
bdbf95f2fa Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2015-02-08 04:28:03 +00:00
Shish
f92f286fa0 remove all reports from user 2015-02-08 04:27:54 +00:00
Shish
610b144fb2 minor CSS tweak 2015-02-07 22:29:07 +00:00
jgen
8e3fc1da9f Change generated links to be aware of HTTPS. 2015-02-02 00:13:05 -08:00
Shish
d523781481 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2015-01-30 03:54:31 +00:00
Shish
52dc36cfa6 str_getcsv rather than explode, for handling quotes 2015-01-30 03:53:58 +00:00
Shish
09d03d9036 allow dashes and underscores in static files, for apple-touch-icon 2015-01-25 22:58:25 +00:00
Shish
0d2d7eedd7 minor opt-in class to style 2015-01-25 06:55:37 +00:00
Shish
8eee2c0c92 logstash logger 2015-01-24 16:57:28 +00:00
Shish
67628816a4 Finally commit ext for purging varnish on-demand 2015-01-24 16:54:18 +00:00
Shish
b47e4aacb1 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2015-01-24 16:44:33 +00:00
Shish
67fc50e6c3 Merge pull request #475 from Diftraku/ouroboros_api 
Fix duplicate handling
 2015-01-24 08:41:06 -08:00
Shish
8dc27c6b97 home page mobile tweaks 2015-01-08 23:31:24 +00:00
Diftraku
3af95b5ebe Fix duplicate handling 
Now with 17% less fat:
* Moved validation logic into OuroborosPost for sanity
* Added sanity checks for OuroborosPost values
* Changed defaults to be more sane (mainly tags)
* OuroborosPost now accepts an MD5 hash along the metadata (like it
should!)
* Fixed dupe handling logic
 2015-01-05 13:47:53 +02:00
Shish
0fcfa49e75 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2014-12-18 14:38:37 +00:00
Shish
be4ae9da32 fix missing global (how did this pass tests? o.o) 2014-12-18 14:38:22 +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
d878526487 Button should say "Regenerate Thumbnail" for clarity. 2014-12-14 16:07:00 -08:00
jgen
95b94bd115 Some minor linting. 2014-12-14 16:06:31 -08:00
jgen
433d67453c This fixes issue #466. You can now optionally generate thumbnails for videos with the newer versions of FFmpeg that take into account the aspect ratio. 2014-12-14 15:22:44 -08:00
jgen
5012b15ce9 Comment as to why the default is to ignore the aspect ratio. 2014-12-14 15:20:47 -08:00
jgen
2ff036d250 Remove unused variables. 2014-12-14 15:19:59 -08:00
jgen
02efa180de Add a default option to ignore aspect ratio when creating a thumbnail with FFmpeg. 2014-12-13 16:54:21 -08:00
Shish
e1a7986239 Merge remote-tracking branch 'origin/master' into develop 2014-12-13 01:52:34 +00:00
Thasan
f2fc69cef4 Fixing "rating=safe" search bug 2014-12-13 03:23:44 +02:00
Shish
40734ef711 turn MIN_FREE_SPACE into a userspace config option 2014-12-07 13:54:47 +00:00
Shish
5d099c06f9 remove references to unused cache values 2014-12-06 23:51:58 +00:00
Shish
1bf3fba756 Merge branch 'develop' 2014-12-06 23:46:14 +00:00
Shish
8c1eb60367 Remove twitter_soc; any twitter ext will need to be different, fixes #395 2014-12-01 14:16:53 +00:00
Shish
a3880e2b49 Merge pull request #463 from shish/user_list_link 
add a link to the user list, fixes #460
 2014-12-01 14:04:04 +00:00
Shish
fcb7166b0c Merge pull request #461 from shish/dbtime 
Log time spent in database (and some other minor performance debugging tweaks)
 2014-12-01 14:03:28 +00:00
Shish
7f22f99aaa add a link to the user list, fixes #460 2014-11-30 15:42:43 +00:00
Shish
8511399076 bypass ban_words too 2014-11-30 13:52:29 +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
a846c16bd7 Merge pull request #457 from shish/show_bad_word_bans 
Show when a banned regex is invalid
 2014-11-10 23:57:17 +00:00
Shish
565b466721 Merge pull request #450 from DakuTree/patch-zipcheck 
Hide "Download All Images" if ZipArchive doesn't exist/not enabled - Fixes #441
 2014-10-15 18:33:30 +01:00
Shish
824d078ece Show when a banned regex is invalid 2014-10-15 18:31:06 +01:00
Shish
63a619d295 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2014-10-10 22:20:29 +01:00
Shish
ccfc22aa8b make block placement more explicit 2014-10-10 22:19:54 +01:00
Shish
a066c5ac0e regex for word filtering 2014-10-10 22:19:20 +01:00
Daku
693b18f50c fix "Image Only" not working with nice_urls disabled 2014-09-02 17:06:39 +01:00
Daku
1cb59572f9 Merge pull request #445 from shish/bbcode_anchor 
[anchor] bbcode tag, to make linking to parts of a page easier
 2014-08-30 13:37:01 +01:00
Shish
c651845401 make anchors visible in the page, not just in the markup 2014-08-30 13:18:14 +01:00
Daku
ab3366e518 Hide "Download All Images" if ZipArchive doesn't exist/not enabled 2014-08-26 16:16:15 +01:00
Daku
9719464c8b Merge pull request #448 from shish/theme_breakdown 
Make IndexTheme a little easier to customise
 2014-08-26 15:51:41 +01:00
Shish
fc4bd27529 simplify user_can_edit_user -- many nested if/else's to one if 2014-08-24 20:43:12 +01:00
Shish
9c71f59061 [anchor] bbcode tag, to make linking to parts of a page easier 2014-08-24 16:55:00 +01:00
Shish
50d40c1c81 give IndexTheme:display_page some sub-functions to make them easier to customise 2014-08-24 16:29:32 +01:00
Geosohh
3185af3280 Remove tags from images using mass_tagger 
Using negative tags removes them from the selected images.
 2014-07-29 19:11:29 -03:00
Geosohh
3d2c55a9d5 Fixed mass_tagger bug when selecting images with similar ids 
The mass_tagger extension behaves incorrectly if the id of an image is
the same as the ending of the id of another image.

Example:
Select image 143: var string == "143:"
Select image 113: var string == "143:113:"
Select image 43: var string == "1113:"
So either the wrong image will be tagged, or it will cause an error if
that image doesn't exist.
 2014-07-29 18:02:50 -03:00
Daku
b89dd52b47 bumped the tag char limit to 255 
there wasn't really much reason to have this so low, and this puts it to the same limit as other booru software
 2014-06-19 23:14:11 +01:00
Shish
9069b0c1fb Merge pull request #429 from DakuTree/patch-misc 
Pool updates + other misc tweaks.
 2014-06-09 21:05:19 +01:00
Pascal 'muhkuh2005' Borkenhagen
3468480864 Added check to initialize tags, when only categorized tags are available for image 2014-06-09 14:07:24 +00:00
Daku
5bd7369d7c Merge pull request #427 from shish/bcrypt 
Use bcrypt for password storage
 2014-06-05 18:00:19 +01:00
Daku
24f2741a50 rating_to_name no longer exists 
was removed in commit eadf1d9e87
 2014-06-01 21:56:33 +01:00
Daku
90232b0a4c rename "index" to "pool index" to help differentiate between the two index links 2014-05-31 18:20:57 +01:00
Daku
183a2c7ae6 docs + added pool:lastcreated metatag which uses the ID of the last pool created by the user 2014-05-30 16:04:12 +01:00
Daku
df6b9245ec optional setting to set pool order with the pool metatag 
example: pool:10:3 (pool #10 with order 3)
 2014-05-30 15:21:42 +01:00
Daku
77769d2c17 allow setting of image_order via add_post() 2014-05-30 15:21:32 +01:00
Daku
bca4fdffa5 make sure pool nav & manage pool show when needed 2014-05-30 14:41:03 +01:00
Daku
6a14360e7a option to use autoincrementing pool order when post is added 
rather than having everything default to 0 order
 2014-05-30 13:12:34 +01:00
Daku
1dc668ca41 main.php shouldn't be generating HTML.. 2014-05-30 11:55:53 +01:00
Daku
f228a8eb4f pools css should be in it's own folder, not the themes 2014-05-30 00:23:12 +01:00
Daku
1dada97adc prev link for pools 2014-05-30 00:22:04 +01:00
Daku
77607e0c02 keep aspect ratio when created video thumbnail 2014-05-29 18:40:17 +01:00
Shish
a3f9e12ea0 octal for permissions 2014-05-24 10:18:44 +01:00
Shish
1b655704f3 Merge remote branch 'yaoifox/patch-1' into develop 2014-05-24 10:18:10 +01:00
Shish
d5c5cfd428 Merge pull request #426 from DakuTree/patch-notesfix 
Fix for #422 + Fix Note Positioning
 2014-05-24 10:12:58 +01:00
Shish
eb51a9b639 migrate to bcrypt for password storage 2014-05-24 09:47:42 +01:00
Daku
36713803e3 Merge pull request #418 from jgen/develop 
Even more linting and cleaning!
 2014-05-23 23:24:32 +01:00
Daku
ae0a4725a0 avoid loading imgnotes until image is fully loaded 2014-05-23 21:46:13 +01:00
Daku
3d11df44a9 fix various bugs with notes ext 2014-05-23 20:48:11 +01:00
Daku
64e2565236 check for lowercase header if camelcase header doesn't exist 
fixes #423
 2014-05-19 07:32:16 +01:00
YaoiFox
349d7bfa4d curl --silent now 
curl --silent now
 2014-05-07 07:10:23 +02:00
YaoiFox
f5f48d8a0b Update main.php 2014-05-07 05:38:12 +02:00
YaoiFox
5f0642f349 some bug fixes to cron uploader 2014-05-07 05:30:44 +02:00
jgen
a58bdbdc62 More PHP Doc comments. 2014-04-29 17:45:13 -04:00
jgen
317028a63b More PHP Doc comments. 2014-04-29 01:33:03 -04:00
jgen
b3f9925839 PHPDoc all the things! 2014-04-28 18:22:57 -04:00
jgen
2a9f76d2f0 More comments, removing dead code, fixing small bugs. 2014-04-28 17:36:52 -04:00
jgen
eadf1d9e87 Remove dead code. 2014-04-28 17:18:51 -04:00
jgen
9f838c0c11 Clean all the things. 2014-04-28 03:32:43 -04:00
jgen
b56e390676 Lots of linting again. 2014-04-28 03:26:35 -04:00
jgen
158819cb28 Linting: These actually were bugs. 2014-04-28 03:16:09 -04:00
jgen
d4ac6ca451 Such linting, such wow. Much clean. 2014-04-28 02:56:58 -04:00
jgen
8fd532e5a8 More linting and removing dead code. 2014-04-28 02:43:49 -04:00
jgen
3cd8c33ed1 Convert Spaces -> Tabs 2014-04-28 02:24:19 -04:00
jgen
e37c5cb9d0 More linting! 2014-04-28 02:23:45 -04:00
jgen
022c162f40 More linting and fixing of comments and PHP Doc, types, etc. 2014-04-28 01:26:22 -04:00
jgen
a0a39784d4 Make webm videos auto-loop by default. 2014-04-28 00:57:49 -04:00
jgen
76fd27f87c Fixing/Cleaning more PHP Doc related issues. 2014-04-28 00:56:19 -04:00
jgen
8a2eb4b121 Fixing more PHP Doc related issues. 2014-04-27 19:29:36 -04:00
jgen
4f51e942be Updating/Fixing/Adding more comments with the PHP Doc style. 2014-04-27 15:33:57 -04:00
jgen
b1d123c960 Add more escaping to the shell command for ffmpeg. 2014-04-26 17:09:18 -04:00
jgen
2e4b53c3f4 Merge branch 'code_removal' of github.com:jgen/shimmie2 into develop 2014-04-26 16:55:11 -04:00
jgen
1ecf33e39d Merge branch 'video_thumb' of git://github.com/shish/shimmie2 into develop 2014-04-26 16:54:28 -04:00
jgen
86b6d12819 Merge branch 'linting' of github.com:jgen/shimmie2 into code_removal 2014-04-26 16:50:14 -04:00
jgen
95ba85ee43 This js file relies on functions defined in 'shimmie.js' which is all globed together when rendering a page. Adding an ignore line to scrutinizer to prevent false-positives. 2014-04-26 05:32:15 -04:00
jgen
a8dd045586 Combine these if statements into one to reduce the cyclomatic complexity. 2014-04-26 03:56:06 -04:00
jgen
42407116a8 Removing this file. 2014-04-26 03:33:20 -04:00
jgen
013222e4ee Code Removal: PHP has had JSON support directly baked into the language since 5.2.0 - there is no need to rely on an external library from 2006 for json support. 2014-04-26 03:31:02 -04:00
jgen
298344048c Make these functions public to prevent scrutinizer from complaining. 2014-04-26 00:27:16 -04:00
jgen
1ca3865a1c Removing the closing PHP "?>" tag as per style guidelines. (Also see: https://stackoverflow.com/questions/4410704/why-would-one-omit-the-close-tag ) 2014-04-25 22:54:51 -04:00
jgen
3e899710d7 Stop scrutinizer from complaining here. 2014-04-25 17:40:42 -04:00
jgen
c85630198f These variables where never defined depending on the execution path. 2014-04-25 17:40:14 -04:00
jgen
6f685ca227 Use the method from core/util to parse the bool from the DB instead. 2014-04-25 17:39:46 -04:00
jgen
3a1197256a Need to pull in the global $page variable for this method. 2014-04-25 17:39:06 -04:00
jgen
1e15c5e47a Explicitly declare this class variable 2014-04-25 17:38:25 -04:00
jgen
bcd3f991de Removing the closing PHP "?>" tag as per style guidelines. 2014-04-25 17:34:20 -04:00
jgen
b4e6c0b743 Explicitly check if we can actually find the image by Id. 2014-04-25 16:08:00 -04:00
jgen
478eb3a4cc Linting: Check for null return value, and throw an exception if null. 2014-04-25 15:39:00 -04:00
jgen
7ef68b15f9 Fix indentation. 2014-04-25 15:38:15 -04:00
jgen
b241390fa4 Removing the closing PHP "?>" tag as per style guidelines. 2014-04-24 22:34:45 -04:00
jgen
50686ac61e More linting, fix PHPDoc style. 2014-04-24 22:29:29 -04:00
jgen
daee99c1bc Removing the closing PHP "?>" tag as per style guidelines. 2014-04-24 22:28:53 -04:00
jgen
860af25550 Need to pull in the global $user variable. 2014-04-24 22:22:45 -04:00
jgen
4ec5a7ce52 Removing the closing PHP "?>" tag as per style guidelines. 2014-04-24 22:22:16 -04:00
jgen
780d5f8709 More linting. Explicitly declare these class variables, as well as comment out dead code. 2014-04-24 22:13:00 -04:00
jgen
6e4ae229ef Explicitly declare this class variable 2014-04-24 19:13:41 -04:00
jgen
4cc31df737 Update the comments to PHPDoc style guidelines. 2014-04-24 19:02:43 -04:00
jgen
ab3f9850e4 Removing the closing PHP "?>" tag as per style guidelines. 2014-04-24 19:01:47 -04:00
jgen
709366b70c Explicitly declare these class variables. 2014-04-24 18:44:46 -04:00
jgen
7b90331f02 Add missing semi-colon. 2014-04-24 16:56:04 -04:00
jgen
e2f5c7a6ec Check for null, just in case. 2014-04-24 05:09:38 -04:00
jgen
332c8538b7 Change the function syntax to quiet JSHint. 2014-04-24 04:46:23 -04:00
jgen
506e699f8a Not sure if we really need the triple equals. 2014-04-24 01:15:30 -04:00
jgen
866d39a68e The 'tags' box actually has a different ID. 2014-04-24 01:15:03 -04:00
jgen
51c145d5c9 Some more linting on the bookmarklet.js file. 2014-04-24 01:08:47 -04:00
jgen
4b90faf89d Even more linting of JS files. 2014-04-24 00:55:14 -04:00
jgen
a105090039 Some more JS linting. 2014-04-23 23:39:09 -04:00
jgen
887f963e17 Add the jshint comment to alter how scrutinzer-ci deals with the js. 2014-04-23 23:38:53 -04:00
jgen
b775c007cd Give these HTML headers some slight priority over the default value of 50. 2014-04-23 23:07:10 -04:00
jgen
a0ab3864c0 Push the headers for the chatbox even further down to make sure that jQuery is already loaded. 2014-04-23 23:01:51 -04:00
jgen
8cdf919827 More linting. This time of the JavaScript for the chat-box extension. 2014-04-23 22:43:42 -04:00
jgen
0bd031a269 Merge branch 'develop' of github.com:jgen/shimmie2 into linting 
Manually resolved conflicts:
	ext/chatbox/js/yshout.js
 2014-04-23 22:42:30 -04:00
jgen
21e1359b86 Avoid short open tag for PHP. 2014-04-20 05:07:26 -04:00
jgen
60980c8839 One more jQuery reference. 2014-04-20 05:04:45 -04:00
jgen
a7ba0f887b Again, the chatbox needs help from the jQuery migrate plugin. 2014-04-20 05:00:59 -04:00
jgen
2df54b911a Don't use short open tags for PHP as they are not turned on by default in production environments. 2014-04-20 05:00:34 -04:00
jgen
e2516fa5cf Chatbox should be fixed now. 
The chatbox extension actually needs some functionality that was removed from jQuery versions 1.9 and up. When Shimmie's version of jQuery was bumped up to 1.11 this actually broke the chatbox.
 2014-04-20 04:51:19 -04:00
jgen
880840623a Need to ensure that this html header is added last. 2014-04-20 04:36:25 -04:00
jgen
717401ccab Removing this as jQuery is already included in Shimmie now. 2014-04-20 04:35:33 -04:00
jgen
8b698e1b6f Revert this commit. 2014-04-20 04:29:11 -04:00
jgen
54362a49c6 Fix the broken chatbox issue. 2014-04-20 04:25:08 -04:00
jgen
57a390eaab Massive linting! 2014-04-19 23:38:42 -04:00
Shish
dc6653d3be Merge pull request #407 from jgen/hotfix/downtime_theme_edits 
Hotfix/downtime theme edits
 2014-04-20 00:30:57 +01:00
Shish
75c3d8e453 Merge pull request #409 from jgen/linting 
Linting
 2014-04-20 00:29:53 +01:00
jgen
c527ae91d6 More linting and cleanup. 2014-04-19 04:17:28 -04:00
jgen
be385deaab Clean up this js file as well. 2014-04-19 02:58:36 -04:00
jgen
28d83fda0d Even more linting and cleaning. 2014-04-19 02:33:34 -04:00
jgen
2da8c19a07 More linting! 2014-04-19 01:36:18 -04:00
jgen
bdf49b33cb Some more linting thanks to scrutinizer-ci 2014-04-19 01:18:49 -04:00
jgen
505a3e5233 Merge branch 'develop' of git://github.com/shish/shimmie2 into hotfix/downtime_theme_edits 2014-04-18 20:25:36 -04:00
jgen
71d7474476 Add <section> tags to the downtime page so that theme render correctly. 2014-04-18 20:21:50 -04:00
jgen
7fd655fc4e Added conditional message for IE users to download plugin from Google for webm. 2014-04-18 18:47:14 -04:00
jgen
b5d005710c Fix indentation (spaces -> tabs) 2014-04-18 02:10:10 -04:00
jgen
2f380f5d59 Video thumbs are working for webm files now. 2014-04-18 02:06:12 -04:00
jgen
273d386d22 Working on thumbnail support for video files. 2014-04-18 01:37:27 -04:00
Justin Brewer
f243092634 count("") == 1 2014-04-11 23:55:30 -04:00
Shish
6c9a4a3b86 A start on video thumbnailing; see #400 
Almost certainly not working yet; not tested, just committing so that
other people have something to work with and we aren't duplicating
effort
 2014-04-10 08:15:00 +01:00
Jeff Genovy
3a0da5df5a Merge pull request #399 from Diftraku/ouroboros_api 
Special chars in tags barf filter_var
 2014-04-09 22:33:05 -04:00
Diftraku
7ac61f4234 Special chars in tags barf filter_var 
Due to how FILTER_SANITIZE_STRING works, if you had special chars in
your tags (eg. <3 or !) the string would be cut before the offending
character(s) and in worst case, result in no tags passing to the API
 2014-04-10 04:11:43 +03:00
jgen
3c6b8b6fe6 Merge branch 'linting' of git://github.com/shish/shimmie2 into develop 
Conflicts:
	ext/resize/main.php
 2014-04-09 15:04:18 -04:00
Shish
f72bfbb050 fix indentation 2014-04-06 20:47:01 +01:00
Daku
f88ba20319 Merge pull request #393 from shish/resize_tweak 
pass already fetched image object into resize()
 2014-04-04 17:38:08 +01:00
Daku
2d25d43ecf Merge pull request #389 from HungryFeline/patch-1 
Redirect to default page if referer isn't set
 2014-04-04 17:30:19 +01:00
Shish
a0d1948a4f pass already fetched image object into resize(), rather than passing the ID to be re-fetched 2014-04-02 08:49:13 +01:00
jgen
1e49cc9122 More comments and fix undefined variables. 2014-04-01 22:02:36 -04:00
jgen
9b1c3db400 Slight re-word of the exception error message. 2014-04-01 21:43:12 -04:00
jgen
18b8e7912f Fix warning generated when an image doesn't have bits or channel info (and use sane defaults). 2014-04-01 21:42:40 -04:00
jgen
225d197790 Remove duplicate code. 2014-04-01 21:41:57 -04:00
jgen
749f846b79 Fix typo. 2014-04-01 20:33:36 -04:00
jgen
a442fbe409 Resizing images actually was broken, how nobody noticed I don't know. 2014-04-01 19:29:31 -04:00
Shish
c8aa3327a1 A bunch of small changes from scrutinizer-ci; some tidying, some actual bug fixes 2014-03-30 13:26:48 +01:00
Shish
db5aa56300 remove a bunch of dead code 2014-03-29 11:44:34 +00:00
HungryFeline
c215d6991a Redirect to default page if referer isn't set 
Instead of displaying `You should be redirected to <a href=""></a>`
 2014-03-27 09:57:43 +01:00
Shish
7a95325a5f Merge pull request #388 from DakuTree/patch 
Fixes issues 233 & 234.
 2014-03-26 10:41:31 +00:00
Daku
7837362711 make sure source is still used if provided 2014-03-26 08:26:21 +00:00
Daku
994652c3f7 make sure mass_tag_edit reads high > low id if default order is different 2014-03-26 08:05:05 +00:00
Shish
7b68d8ebfd use new-style constructors everywhere 2014-03-22 09:00:59 +00:00
Shish
da29912646 tidy up a bunch of lint errors 2014-03-17 22:05:37 +00:00
Daku
76526f371c Add option to use transloaded URL as source 
fixes #234
 2014-03-14 16:54:14 +00:00
Daku
5f3ff8db86 don't add "tagme" when trying to mass-edit to null 
fixes #233
 2014-03-13 23:29:47 +00:00
Daku
4351dc53c5 make sure all existing exts are converted to lowercase 2014-03-08 15:27:39 +00:00
Daku
258fda188e use different selector rather than hardcoding url 2014-03-08 15:20:50 +00:00
Daku
ddb6d32e29 fix fourm errors under postgresql 2014-03-02 21:59:19 +00:00
Daku
87065d08f6 use elseif 2014-03-02 21:58:45 +00:00
Daku
524ead8344 PostgreSQL doesn't return trimmed results for CHAR columns, so use VARCHAR instead 2014-03-02 21:07:25 +00:00
Daku
a863072bfb DATETIME > SCORE_DATETIME 
fixes #354
 2014-03-02 18:50:46 +00:00
Daku
53a7e23b64 various autocomplete tweaks 
* made limit for /api/internal/tag_list/complete optional (as this breaks the autocomplete on dbs with lots of tags)
* removed delay + minChars = 1 again (due to above change)
* first autocomplete tag is selected by default
* tab now works as a select button
* autocompleted tags will now be followed by a space (so the next tag can be instantly autocompleted)
 2014-02-28 02:03:41 +00:00
Daku
d675827173 order[=|:]random_#### metatag 
possible replacement for random_list ext?
 2014-02-24 19:54:15 +00:00
Daku
320a92289b have query use EXISTS rather than IN 
preferably we would have a table with image tag counts, but this works for now
 2014-02-24 01:50:31 +00:00
Daku
790cb0d7a9 [.+]tags metatag for tag_categories 
This is nowhere as near as fast as I'd like. Need to find a better query.
 2014-02-24 01:40:35 +00:00
Daku
bdb3255116 speed: lowercase ext on image insert 
avoids having to lowercase every build_thumb_html call
most extensions tend to match against their lowercase versions anyway
 2014-02-23 22:27:52 +00:00
jgen
cebc197fba Merge branch 'develop' of git://github.com/shish/shimmie2 2014-02-23 03:11:09 -05:00
jgen
6f59de4d45 Prevent an internal server error occurring when mincount is less than 1. 2014-02-23 02:51:33 -05:00
jgen
2b4ffb1e60 Argh. 2014-02-23 02:18:45 -05:00
jgen
38b494125c Postgres requires you to include the GROUP BY column in the SELECT columns. Should be okay since we don't care about other columns though. 2014-02-23 02:15:19 -05:00
jgen
cf35bf82a8 Postgres doesn't support the DATETIME field. 2014-02-22 23:30:58 -05:00
jgen
e30520a5ef Fixing typo. 2014-02-22 23:23:23 -05:00
jgen
9892d1f7fd PostgreSQL does not support INDEX() inside the CREATE TABLE method. You must create the index as a separate query. Fortunately MySQL also support this way of doing things as well. 2014-02-22 23:02:11 -05:00
jgen
3d1217a1be Trim trailing blank space. 2014-02-22 15:36:52 -05:00
jgen
96358f0bc0 Nevermind, it doesn't work. 2014-02-22 15:33:55 -05:00
jgen
2d0edde2b2 We can check that admin users see the "Add" button though. 2014-02-22 15:25:25 -05:00
jgen
d6f0213a9f Commenting out the alias tests due to consistent failing on TravisCI. 2014-02-22 15:19:06 -05:00
jgen
6efe56eddf Well, lets try this. 2014-02-22 03:10:59 -05:00
jgen
b229e114c2 Dump all the post data on failure. 2014-02-22 03:06:09 -05:00
jgen
f1aed15f32 die doesn't support commas 2014-02-22 02:59:17 -05:00
jgen
cbfc0580f6 Temporary for debugging. 2014-02-22 02:35:56 -05:00
jgen
ba0aef4f30 The Database class should really throw an error here. This will likely break the existing tests. 2014-02-22 00:40:14 -05:00
jgen
bbfba90ad4 Merge pull request #380 from DakuTree/patch-3 
Misc tweaks/fixes 2 (fixes #349)
 2014-02-21 13:40:52 -05:00