Shish
c2b4210777
Merge branch 'develop' of https://github.com/shish/shimmie2 into develop
2017-09-21 14:08:14 +01:00
Shish
4ea721f681
underp
2017-09-21 14:04:53 +01:00
Shish
6aa704d04c
better image counting
2017-09-21 05:49:10 +01:00
Shish
2628c2c5d9
Merge branch 'develop' of https://github.com/shish/shimmie2 into develop
2017-09-21 05:25:48 +01:00
Shish
6e914ff4e7
use just hash for flexihash lookup
2017-09-21 05:25:45 +01:00
Shish
977c3db1e3
PHP7 type annotations
2017-09-21 05:21:42 +01:00
Shish
c7ca2f4154
un-bundle context.php
2017-09-21 05:00:59 +01:00
Shish
117e018eb6
branch off 2.7 for php7
2017-09-19 00:04:51 +01:00
Shish
d8e75ddf7c
bump
2017-09-18 23:57:03 +01:00
Shish
1566ff7eaa
un-confuse phpunit
2017-09-17 19:37:30 +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
408b45e4cc
Merge branch 'develop' of https://github.com/shish/shimmie2 into develop
2017-08-24 10:17:47 +01:00
Shish
abe473ffd6
count blank header as null
2017-08-24 10:17:39 +01:00
Shish
473c0f0bcb
explicitly mark some block types as ignored when calculating 404ness
2017-08-24 10:17:24 +01:00
Shish
35bd51e513
use 'count()' + result->get_one() to count images, rather than 'select *' + result->rowcount()...
2017-08-23 00:42:19 +01:00
Shish
5a6728209a
improve cache logging
2017-08-22 01:04:33 +01:00
Shish
2f083f7608
more useful memcached error messages
2017-06-08 09:37:38 +01:00
Shish
94ec37029a
stub more mb_ functions
2017-06-08 09:37:21 +01:00
Shish
2f557326df
die if caching modules are missing, don't silently fall back to NoCache
2017-05-30 02:13:11 +01:00
Shish
4e5af70093
re-stub mb_strlen (see #615 )
2017-05-29 11:09:28 +01:00
Shish
843d7fae24
merge
2017-05-29 10:19:55 +01:00
Shish
8828fdfd05
log SQL query times in DEBUG_SQL mode
2017-05-29 10:19:11 +01:00
Shish
51e165aecf
Add separate memcached cache
2017-05-29 10:18:11 +01:00
Shish
684efedcfd
Log what URL query caused invalid search queries
2017-05-29 10:16:32 +01: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
Thomas Hori
d1306cfb2d
Move Tag::explode call into add_image call so that $result is unaffected.
2017-04-26 14:08:06 +01:00
Thomas Hori
1625bd68e3
Fix error upon bulk add.
...
Fixes "PHP Fatal error: Uncaught TypeError: Argument 2 passed to
TagSetEvent::__construct() must be of the type array, string given"
upon bulk add.
2017-04-25 17:48:34 +01:00
Shish
8ef13db69c
bump develop
2017-03-27 18:15:16 +01:00
Shish
807d44d644
Version bump
2017-03-27 18:14:11 +01:00
jgen
b053be5d88
More linting.
2017-03-12 14:53:49 -07:00
jgen
a5a89dc08d
mb_strlen and mb_internal_encoding have been in core PHP since version 4.0.6
...
mb_strtolower has been in core PHP since version 4.3.0
2017-03-12 14:43:19 -07:00
jgen
7bd581b530
Scrutinizer commets.
2017-03-12 14:29:35 -07:00
jgen
8de816d7dd
Some more linting via PHPDoc comments.
2017-03-12 00:18:26 -08:00
jgen
fb3cc1832f
Use triple equals, because PHP.
2017-03-11 23:19:37 -08:00
jgen
2691a6bbdc
Change PHP version check to use a configuration constant, rather than a hardcoded version in the code.
...
(As it seems this hardcoded version number is easy to forget about, and then it doesn't actually get updated..)
2017-03-11 18:34:36 -08:00
Shish
10863d4c4b
import imageboard to avoid warnings
2017-03-10 16:15:31 +00:00
Shish
c208a3715c
mark static functions as static
2017-03-10 16:14:56 +00:00
jgen
d62304cf70
more linting
2017-03-09 22:28:48 -08:00
jgen
d0b0c7f93d
More linting with PHPDoc comments
2017-03-09 21:58:14 -08:00
Scrutinizer Auto-Fixer
9a906d4ecf
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-03-09 09:27:52 +00:00
jgen
ede2fcf4eb
More linting and fixing
2017-03-08 23:52:31 -08:00
jgen
17307820e8
Add some PHPdoc comments as suggested by Scrutinizier
2017-03-08 23:02:26 -08:00
im-mi
c1083bbea1
Fixed comment-delete code-injection vulnerability
2016-09-14 17:42:32 -04:00
Shish
bcef3fbc8f
have tag sanitisation process ignore tags which are too long, fixes #565
2016-08-29 09:21:23 +01:00
im-mi
36b66f4c23
html_escape data-tags for tags that contain single quotes
2016-08-29 00:26:55 -04:00
Shish
7be951b271
Convert tags from user-supplied string to array once, on input
...
This results in a fuckton of refactoring and code cancelling out
other code -- we no longer have a whole bunch of places trying
to support string params and array params, and doing their own
esaping and unescaping, never being quite sure if the data they've
been passed is escaped or not.
Also adds a bunch of type hinting, since we can now know what
data we're dealing with better.
2016-07-30 22:11:49 +01:00
Shish
b533a43428
Merge branch 'develop' of https://github.com/shish/shimmie2 into develop
2016-07-11 13:01:05 +01:00
Shish
c14a36079c
add option to force a specific base url
2016-07-11 13:00:54 +01:00
Shish
b6ad316d20
linting
2016-07-03 12:07:54 +01:00
Shish
cb73a0caa0
let's stop being php5.2 compatible
2016-06-19 23:23:34 +01:00
Shish
6febdec7b5
more explicit variable types
2016-06-19 23:05:57 +01:00
Shish
dc10a18086
lots of minor doc tweaks, type hints, etc
2016-06-19 17:41:40 +01:00
Shish
d185fd354b
fix wildcard search for mysql
2016-06-19 12:14:44 +01:00
Shish
e0d3d53479
stub mb_ functions
2016-06-19 12:12:48 +01:00
Shish
4577ff70ef
more linty bits
2016-06-18 19:26:56 +01:00
Shish
cfd3a9d248
lint fixes
2016-06-18 19:00:56 +01:00
Shish
0ff6da6d3c
Merge #555
2016-06-18 15:16:47 +01:00
Shish
b76ee95c76
fix and use get_all_html_headers()
2016-06-18 12:25:54 +01:00
Daku
861862a3e1
password compat lib is now autoloaded with composer
2016-06-18 06:28:48 +01:00
Daku
543600dc0e
make sure main css/js files are always loaded after libs
2016-06-18 06:28:31 +01:00
Daku
dd105e174e
images aren't always jpg, so don't force jpg
...
all the handle_* exts use this as well, which can cause issues
2016-06-18 06:20:46 +01:00
Daku
2070034d0d
move securimage to composer + update lib
2016-06-18 06:20:43 +01:00
Daku
d5a58916f7
get recaptcha lib with composer + fixes #498
2016-06-18 06:17:07 +01:00
Daku
895df8c22b
load flexihash via composer
2016-06-18 06:16:28 +01:00
Daku
36264d3f6e
stop caching css/js from disabled exts
2016-06-18 06:16:10 +01:00
Daku
e740d03101
generate seperate css/js cache files for libs & core files
2016-06-18 06:16:08 +01:00
Shish
bfa1dc20c0
fix mysql
2016-06-07 01:50:56 +01:00
Shish
8e8a3da790
support single wildcard
2016-06-07 01:39:23 +01:00
Shish
dc83d4ace7
lots of deduping for searching
2016-06-07 01:34:38 +01:00
Shish
7f2609f727
dedupe searching a bit
2016-06-07 00:19:41 +01:00
Shish
525fd20540
Merge pull request #548 from DakuTree/fix-wildcards
...
Fix wildcard tag bugs
2016-06-06 23:18:51 +01:00
Shish
43eed32958
Merge pull request #551 from shish/contact-link
...
Have contact_link support http: and mailto:
2016-06-06 12:37:27 +01:00
Shish
aeeaabb22e
allow both http: and mailto: contact links
2016-06-06 12:12:25 +01:00
Daku
61acb24875
fixes #547 -> multi-tag searches not working with wildcard when wildcard matches more than 1 tag
...
is there a better way to do this?
2016-05-22 18:35:37 +01:00
Daku
3b171ffc5a
fix single tag wildcard searches returning duplicate results if image has more than one match
2016-05-22 17:58:09 +01:00
Daku
44876a58d9
we should be using bool_escape instead...
2016-05-22 16:17:31 +01:00
Daku
32dbdccd00
has_children uses Y/N, not TRUE/FALSE
2016-05-10 21:15:50 +01:00
Daku
6d1c7c414b
mysql < 5.6 has terrible subquery optimization, using EXISTS / JOIN fixes this
2015-12-04 11:38:44 +00:00
Shish
ac9dc1b8d8
Merge pull request #523 from DakuTree/patch-tagevent
...
Move tag sanitization, alias resolving & tag parsing from set_tags > TagSetEvent
2015-10-26 19:22:08 +00:00
Shish
28e1cb30ea
Merge pull request #528 from CrandellWS/develop
...
merge start of material theme
2015-10-26 13:49:56 +00:00
William Crandell
b7114a142e
Hotfix for better block id character filtering
2015-10-26 09:20:09 -04:00
Shish
b9f6b44301
bump
2015-10-26 12:14:36 +00:00
Shish
7b0933ea54
merge develop, fix conflicts, bump
2015-10-26 12:13:17 +00:00
Shish
f8cb2e96e4
only check min < val < max if min and max are defined
2015-10-19 07:19:53 +01:00
Shish
4971fa9337
empty bool = false
2015-10-19 07:11:41 +01:00
Shish
e9a1bebe76
how did this ever not break everything? x_x
2015-10-19 06:58:47 +01:00
Daku
600011219f
update docs
2015-10-08 19:25:38 +01:00
Daku
43d0a297b8
move metatag parsing to after set_tags is sent, rather than before
2015-10-08 18:58:52 +01:00
Daku
b11041898b
Tag::explode instead of explode
...
this fixes the off chance that an empty tag could be passed
2015-10-08 18:28:00 +01:00
Daku
744989a983
Tag::explode should now remove duplicate tags
2015-10-08 18:25:03 +01:00
Daku
6ff80ab2c8
move tag sanitization, alias checking & tag parsing to TagSetEvent
2015-10-08 18:22:20 +01:00
Shish
d30665d274
more deduping
2015-09-27 21:09:27 +01:00
Shish
1ac88e8923
more comments
2015-09-27 12:38:48 +01:00
Shish
cdcd762a52
more comments
2015-09-27 02:17:44 +01:00
Shish
793bc3614b
loooooooads of artists refactoring and tidying
2015-09-27 01:03:58 +01:00
Shish
e482f97955
more clamping
2015-09-26 19:53:15 +01:00
Shish
7f20b0527e
remove trailing commas from schema definitions in create_table()
2015-09-24 23:16:51 +01:00
Shish
6919431c49
performance
2015-09-20 23:20:51 +01:00
Shish
90cd823ece
fix liveness testing, and comments tests
2015-09-20 20:05:06 +01:00