Commit graph

293 commits

Author SHA1 Message Date
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
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
jgen
8e3fc1da9f Change generated links to be aware of HTTPS. 2015-02-02 00:13:05 -08:00
Shish
4721d666cd log time spent waiting for database queries 2014-11-26 13:09:22 +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
Shish
e259b8cd5a bcrypt had bugs before 5.3.7 2014-05-24 10:51:09 +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
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
24371d8c34 Fix the PHP Doc comments. 2014-04-25 23:19:18 -04:00
jgen
5f2be45f68 Fix the PHPDoc comments on these. 2014-04-25 21:42:52 -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
afc01fda5f Prevent scrutinizer-ci from complaining about these fall-thoughs. 2014-04-24 01:36:04 -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
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
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
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
cb135d4763 Fix the Notice being generated. 2014-02-19 03:11:46 -05: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
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
jgen
0512858bd4 Some more small tweaks for speed. 2013-10-04 17:17:42 -04:00
Shish
67c026e8d8 unique request ID, for associating several log entries with one request 2013-09-12 16:29:38 +01:00
Shish
7c140680b7 log args 2013-08-30 00:19:46 +01:00
HungryFeline
65fcbcb9ba Actually set the cookie prefix
When COOKIE_PREFIX was not shm (the default) the script tried to read cookies prefixed with the new prefix but the script was setting the old default prefix from before the constants were implemented.
2013-07-02 06:46:54 +02:00
HungryFeline
616aa3300a Don't check the certificate when transloading
This allows the download of images via https even if the cert is self-signed.
2013-07-02 04:44:27 +02:00
Shish
dbfd747dd3 remove more slashes 2013-02-06 08:36:30 +00:00
green-ponies
ef44d6ccf3 Fix for issue 263 - ReCAPTCHA private and public keys reversed. 2012-11-03 13:49:10 -04:00
Shish
d8c670eaa6 move yet more stuff out of index.php 2012-10-16 23:05:11 +01:00
Shish
38fea60056 handle CLI_LOG_LEVEL not being set 2012-10-16 22:58:24 +01:00
Shish
073b21aaa1 split up event listener loading, so parts can be called individually 2012-10-16 22:31:50 +01:00
velocity37
52718b0590 util.inc: Default to static extension lookup
Magic can return invalid results for video files, breaking their playback. Default to the static extension lookup to avoid this problem but still return application/octet-stream if nothing works.
2012-10-16 18:56:39 +01:00
velocity37
0663bf54a0 Grr... 2012-10-16 18:55:43 +01:00
velocity37
1bd6f9f0ba Update core/util.inc.php 2012-10-16 18:55:38 +01:00
velocity37
412dcd05af Add video MIME types 2012-10-16 18:55:00 +01:00
Shish
e3d385aee5 Merge branch 'master' of github.com:shish/shimmie2 2012-09-24 22:36:28 +01:00
Shish
ac812b4a2a danbooru api updates 2012-09-24 22:36:09 +01:00
Shish
65ce0ff4e4 check filename extension by lowercased version of itself 2012-09-22 23:24:19 +01:00