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

966 commits

Author SHA1 Message Date
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
Shish
9069b0c1fb Merge pull request #429 from DakuTree/patch-misc 
Pool updates + other misc tweaks.
 2014-06-09 21:05:19 +01:00
Shish
d067545969 Merge pull request #432 from DakuTree/patch-sqlfix 
Fix for #431 - Fix negative tags not working if they don't exist.
 2014-06-09 20:59:11 +01:00
Daku
5bd7369d7c Merge pull request #427 from shish/bcrypt 
Use bcrypt for password storage
 2014-06-05 18:00:19 +01:00
Daku
72fbafc271 fixes negative tags not working if they don't exist 
fixes #431
 2014-06-04 00:52:01 +01:00
Daku
77607e0c02 keep aspect ratio when created video thumbnail 2014-05-29 18:40:17 +01:00
Daku
aa0cf27e7e add theme name to cached css/js filename to avoid loading cached files of old theme after theme change 2014-05-29 18:37:49 +01:00
Shish
e259b8cd5a bcrypt had bugs before 5.3.7 2014-05-24 10:51:09 +01:00
Shish
1b655704f3 Merge remote branch 'yaoifox/patch-1' into develop 2014-05-24 10:18:10 +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
64e2565236 check for lowercase header if camelcase header doesn't exist 
fixes #423
 2014-05-19 07:32:16 +01: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
3b1513f791 Adding some more PHP Doc comments. 2014-04-28 20:37:31 -04:00
jgen
c682ccef69 Adding more PHP Doc comments to the config classes. 2014-04-28 20:12:31 -04:00
jgen
eb18790dc9 More comments. 2014-04-28 19:50:01 -04:00
jgen
86612bb1ff Adding more PHP Doc comments. 2014-04-28 17:36:11 -04:00
jgen
e37c5cb9d0 More linting! 2014-04-28 02:23:45 -04:00
jgen
8a2eb4b121 Fixing more PHP Doc related issues. 2014-04-27 19:29:36 -04:00
jgen
03b3cdcbd2 Updating/Fixing/Adding more comments with the PHP Doc style. 2014-04-27 18:59:01 -04:00
jgen
a703bb9854 Bump the version number. 2014-04-27 15:45:22 -04:00
jgen
4f51e942be Updating/Fixing/Adding more comments with the PHP Doc style. 2014-04-27 15:33:57 -04:00
jgen
4e9e5ca2be Fixing/adding/cleaning up the PHP Doc comments. 2014-04-26 05:01:49 -04:00
jgen
e6b1d514d1 Some more type hinting via the comments. 2014-04-25 23:22:34 -04:00
jgen
24371d8c34 Fix the PHP Doc comments. 2014-04-25 23:19:18 -04:00
jgen
8f60467848 This code doesn't seem to actually be used by anything at all. 2014-04-25 22:33:57 -04:00
jgen
5f2be45f68 Fix the PHPDoc comments on these. 2014-04-25 21:42:52 -04:00
jgen
5b5fd955b7 New exception type. 2014-04-25 16:07:30 -04:00
jgen
2706f72ce4 Update and fix the PHPDoc comments. 2014-04-24 19:08:23 -04:00
jgen
ab3f9850e4 Removing the closing PHP "?>" tag as per style guidelines. 2014-04-24 19:01:47 -04:00
jgen
993aacaea5 Update comment to reflect that a bug has been filed with PHP-analyzer. 2014-04-24 16:55:34 -04:00
jgen
c4dcba1e91 Explicitly check for the existence of these properties before attempting to use them. 2014-04-24 05:37:26 -04:00
jgen
7e41194b7f Shish you are too clever for scrutinizer-ci. 2014-04-24 05:29:02 -04:00
jgen
ce524e8729 This variable does exist, it is actually pulled from the database. Making it explicit for the linter. 2014-04-24 05:25:12 -04:00
jgen
f67220f64b From stack-overflow: The 'var' keyword is for declaring class variables in PHP4. It works in PHP5 but can raise an E_STRICT warning in from version 5.0.0 up to version 5.1.2, as it has been deprecated. 
Changing to public as that is really what these variables are anyways.
 2014-04-24 04:36:05 -04:00
jgen
67c087c30f From stack-overflow: The 'var' keyword is for declaring class variables in PHP4. It works in PHP5 but can raise an E_STRICT warning in from version 5.0.0 up to version 5.1.2, as it has been deprecated. 
Changing to public as that is really what these variables are anyways.
 2014-04-24 04:30:58 -04:00
jgen
dbe30ad37d Rename variable to make it more clear. 2014-04-24 01:36:30 -04:00
jgen
afc01fda5f Prevent scrutinizer-ci from complaining about these fall-thoughs. 2014-04-24 01:36:04 -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
e838fc2a03 Comment this in case someone else wonders why its there. 2014-04-19 04:17:58 -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
Shish
f72bfbb050 fix indentation 2014-04-06 20:47:01 +01: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
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
Shish
208e8de7f0 Merge pull request #382 from DakuTree/patch 
New metatags, fixes various PostgreSQL errors & misc tweaks.
 2014-03-08 15:33:58 +00:00
Shish
cf7f79194e Merge branch 'master' into develop 2014-03-07 08:28:03 +00:00
Shish
fa5ad5b77d bump the minimum PHP version, the README was updated but not the version check in the code. Fixes #383 2014-03-07 08:27:34 +00:00
Shish
faec25226a 'x ?: y' is a new PHP thing? 2014-03-06 09:14:03 +00:00
Daku
d675827173 order[=|:]random_#### metatag 
possible replacement for random_list ext?
 2014-02-24 19:54:15 +00:00
Daku
58c5746e9b speed: use isset rather than identical 2014-02-23 22:32:15 +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
7eb2bd9112 Trimming trailing blank space. 2014-02-22 15:42:09 -05:00
jgen
e6057c656f Re-order the events to ensure InitExtEvent() is fired off both with and without users. 2014-02-22 01:22:14 -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
74639cd6b2 Missing bracket. 2014-02-21 20:49:17 -05:00
jgen
43f59cc4c0 Fix un-necessary PHP Notices being generated in the error log files. 2014-02-21 20:36:19 -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
jgen
f4f94e6273 Merge pull request #379 from DakuTree/patch-2 
Misc tweaks/fixes (fixes/closes issue 17 & 323)
 2014-02-21 13:40:15 -05:00
jgen
7d90c20297 Cleaning up. 2014-02-19 16:16:01 -05:00
jgen
cb135d4763 Fix the Notice being generated. 2014-02-19 03:11:46 -05:00
jgen
a90f5bed8e This would be a good idea. 2014-02-19 02:50:10 -05:00
jgen
b570ef1573 Forgot a bracket. 2014-02-19 02:17:23 -05:00
jgen
2ca74a3b33 Expose methods to allow users of the database class to control when transactions occur. 2014-02-19 02:12:56 -05:00
jgen
ced3006915 At its finest. 2014-02-18 21:25:08 -05:00
jgen
892b323c4d 21st century debugging 2014-02-18 20:58:08 -05:00
jgen
741eb0f739 I too like to live dangerously. 2014-02-18 20:49:20 -05:00
Daku
857f7e4041 don't force hellban ext + add [Beta] tags 2014-02-18 07:24:26 +00:00
jgen
fe83e3d343 Adding comments to help explain the simpletest setup. 2014-02-17 13:59:41 -05:00
Daku
1909f9072e use mt_rand() instead of rand() 
rand() isn't so random on windows: http://tjl.co/blog/code/followup-php-rand-vs-mt_rand/
mt_rand() is also slightly faster
 2014-02-16 04:43:38 +00:00
Daku
629f9940c3 thumbnail border-color for post relationships 
also removed build_thumb_html from themes (mostly old versions of the default base function)
 2014-02-04 18:41:40 +00:00
Daku
b7778b54c9 add TagTermParseEvent for parsing tags during tagging 2014-02-01 09:36:10 +00:00
Shish
d7ce075a43 Merge pull request #367 from DakuTree/patch 
Metatag tweaks + Fix for issue 359 & 362.
 2014-01-25 06:58:35 -08:00
Daku
c07dc2e0ab use resolve_aliases rather than resolve_alias 2014-01-16 03:28:23 +00:00
Daku
ae4da2b410 add option for getMimeType to return list of extensions 2014-01-13 10:03:38 +00:00
Daku
7d49e21792 readability + moved stuff 2014-01-13 08:19:12 +00:00
Daku
152f5fbf26 add config option for default order 2014-01-13 08:19:11 +00:00
Daku
2c2f27ca64 add order metatag 
not too happy with how this works...but it does work
 2014-01-13 08:19:11 +00:00
Daku
9cae856df7 use the Content-Disposition header for filename & Content-Type for 
extension
if either doesn't exist, it will fallback to using pathinfo
 2014-01-13 08:19:01 +00:00
Daku
9f06a5c565 fix search not working properly for aliases to multiple tags 
fix issue 359
 2014-01-13 08:04:26 +00:00
Daku
25c286b71f add support for using : as a metatag seperator + updated docs 2014-01-02 14:00:24 +00:00
HungryFeline
7cf79171a8 Update extension.class.php 
Fix my previous commit. Also put the results of the tests into variables so we don't need to check them again.
 2014-01-01 18:25:28 +01:00
HungryFeline
fde6558a6f Don't silently ignore invalid URLs 
Scenario: Providing an invalid url via $_GET (wrong/missing extension or file isn't an image (also happens on download errors))
Behavior before: Silently redirect to index
Behavior after: Display error message
 2014-01-01 01:41:11 +01:00
Daku
3dd3101995 added option to set pool & source via tag 2013-12-30 08:15:10 +00:00
jgen
a5ea9ed743 Lets comment this rather tricky function. 2013-11-28 00:31:46 -05:00
jgen
bf4d434c86 Fixes for the installer. Display error messages on failures, as well as actually check for tables before installing. 2013-11-28 00:31:09 -05:00
jgen
5b1a99d0c5 Fixing missing $. (Thanks Shish!) 2013-10-05 14:28:02 -04:00
jgen
b01ca89220 Some more small speed related tweaks. 2013-10-04 17:53:26 -04:00
jgen
0512858bd4 Some more small tweaks for speed. 2013-10-04 17:17:42 -04:00
jgen
70428b2b5d Its better to pass to the right function. (Side note, this is why you always test your code) 2013-10-03 21:19:19 -04:00
jgen
393a9e60df No need to have HTML in the image thumb title. Derp. 2013-10-03 21:17:15 -04:00
jgen
2d041d468f Adding ability to specify the 'date' in the image thumbnail title (when you hover over the thumbnail). 2013-10-03 21:09:41 -04:00
jgen
1db371345e Merge branch 'master' of git://github.com/shish/shimmie2 2013-10-03 20:33:47 -04:00
Shish
67c026e8d8 unique request ID, for associating several log entries with one request 2013-09-12 16:29:38 +01:00
Shish
1b73dd4ddc add 'hellbanned' user class, with support from the comments extension 2013-09-09 13:41:08 +01:00
Shish
7c95981319 load thumbnails on demand is more trouble than it's worth 2013-09-08 23:21:06 +01:00
Shish
07304861f3 log IDs of things 2013-08-30 00:19:46 +01:00
Shish
7c140680b7 log args 2013-08-30 00:19:46 +01:00
Shish
12bc4a90f7 core-image -> core_image, for elasticsearch's sake 2013-08-30 00:19:46 +01:00
Shish
44deff21a8 Merge branch 'master' of https://github.com/shish/shimmie2 2013-08-05 20:37:40 +01:00
Shish
4fc1f2f217 save cached config when saving database config, fixes #311 2013-08-05 20:21:57 +01:00
Shish
e50d9c4dbb only sanitise when saving tags - when searching, '*' is important 2013-08-04 18:21:52 +01:00
Shish
8b22652aa0 resolve negative aliases 2013-08-04 18:19:23 +01:00
Shish
2b628a395f resolve_list -> resolve_aliases, to better describe what it actually does 2013-08-04 18:13:50 +01:00
Shish
7e89481105 have Tag::resolve_list always take an array 2013-08-04 18:11:02 +01:00
Shish
00e297c7d4 Merge pull request #317 from HungryFeline/patch-1 
Let the admin define how much space should be free
 2013-07-07 03:28:44 -07:00
Shish
39753fe7a9 Finish the process of removing $query from thumb links. (Forgot to remove $query from the thumb links) 2013-07-07 10:34:19 +01:00