1b85b75563
Currently removed, needs more testing
2018-06-21 20:42:58 +00:00
rabuzarus
22816c49a1
Merge develop into 201820_-_fix_mod_redir
2018-06-21 22:38:15 +02:00
rabuzarus
a119636cd5
fix redirection - works now with logged in users, remote users, guests and visitors
2018-06-21 22:37:05 +02:00
261d7435c0
Check for floats and enable native prepares
2018-06-21 20:33:27 +00:00
5656c0564a
We don't need to look $is_int there
2018-06-21 19:52:28 +00:00
c1059875bc
This fixes the problem with mixed variables in queries
2018-06-21 19:48:25 +00:00
Michael Vogel
4b0cf8d60f
Merge pull request #5267 from miqrogroove/patch-2
...
Allow for Integer Literals in PDO Database Driver
2018-06-21 18:51:01 +02:00
Hypolite Petovan
8a3cae686b
Merge pull request #5261 from annando/and-again-abstraction
...
And again the item abstraction - and a fix for issue 5252
2018-06-21 11:50:31 -04:00
miqrogroove
759dfe6bb1
Allow for Integer Literals in PDO Database Driver
...
This should fix things like "LIMIT ?"
2018-06-21 11:42:43 -04:00
Hypolite Petovan
88e532321f
Merge pull request #5265 from miqrogroove/patch-1
...
Workaround for Bugs in Class dba
2018-06-21 11:23:56 -04:00
miqrogroove
80e96bcf38
Workaround for Bugs in Class dba
2018-06-21 11:20:44 -04:00
d643e00d33
Standards and a new function to fetch content
2018-06-21 15:14:01 +00:00
Hypolite Petovan
019637123a
Merge pull request #5263 from miqrogroove/patch-1
...
Make Conversation Cleanup Configurable
2018-06-21 10:33:33 -04:00
miqrogroove
7f4bce67a8
Update DBClean.php
2018-06-21 08:27:36 -04:00
miqrogroove
d8646340c9
Update htconfig.md
2018-06-21 08:25:58 -04:00
miqrogroove
f2463e327a
Update DBClean.php
2018-06-21 07:52:56 -04:00
miqrogroove
cfe035f300
Update DBClean.php
2018-06-21 07:51:30 -04:00
miqrogroove
ab056f9ee5
Update htconfig.md
2018-06-21 07:49:59 -04:00
miqrogroove
62e61a75f7
Make Conversation Cleanup Configurable
2018-06-21 07:43:40 -04:00
5743bb0dae
Fix Issue 5252
2018-06-21 08:23:35 +00:00
81ac7c33da
Order search results by id
2018-06-21 07:46:06 +00:00
70af2cecf2
Some of the last direct SQL calls to the item table had been changed
2018-06-21 06:21:51 +00:00
Hypolite Petovan
e84c48b979
Merge pull request #5259 from rabuzarus/20180616_-_magic_auth_test_2
...
port hubzillas OpenWebAuth - don't initiate magic auth if the contact is allready authentificated
2018-06-20 20:15:14 -04:00
rabuzarus
02d96623f2
port hubzillas OpenWebAuth - don't initiate magic auth if the contact is allready authentificated
2018-06-21 02:08:54 +02:00
Hypolite Petovan
a5550b4702
Merge pull request #5253 from rabuzarus/20180616_-_magic_auth_test_2
...
Port hubzillas OpenWebAuth - remote authentification
2018-06-20 17:46:04 -04:00
rabuzarus
04fe3acb69
port hubzillas OpenWebAuth - fix method call
2018-06-20 23:29:36 +02:00
Hypolite Petovan
dd1e6dd4a5
Merge pull request #5258 from Quix0r/rewrites/curly-braces-is-result-usage-002-split1
...
Curly braces, whitespaces and duplicate method invocation fixed
2018-06-20 16:51:22 -04:00
8ad523fbc8
Continued a bit:
...
- removed/fixed whitespaces and mixture of spaces/tabs (some)
- added new-line character at end of files (POSIX-compilant)
- reverted some code which I had messed up (compared to upstream/develop)
- removed duplicate dba::update() invocation in src/Protocol/DFRN.php
- also removed no longer valid TODO
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-06-20 22:19:54 +02:00
f806fa91b1
Replace old database queries with the new ones
2018-06-20 22:02:17 +02:00
6cb26f884e
Fixes for composer:
...
- ./vendor/ is being prepared by executing `utils/composer.phar install`, no
need to have it around
- converted .gitignore to LF line-ending (more common over the whole project)
- no need to have them around ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-06-20 22:02:17 +02:00
7c048b5077
Opps, cutted this out by accident ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:17 +02:00
593d1feca6
was a bit confusing for me or I was not sleeping to much ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:17 +02:00
2d744fa189
PHP5 does not support native type-hints, except array + used dbm::is_result()
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:17 +02:00
506657ec42
removed TODO, one day this all needs refacturizing ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:17 +02:00
4ca26fd3bc
fixed comment and explained one
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:16 +02:00
1567eb0791
fixed another left-over ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-06-20 22:02:16 +02:00
a5dba628c4
old behaviour restored
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:16 +02:00
0e5daa86df
added curely branches + reverted back to old behaviour (may come back one day)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:16 +02:00
ad9bd7bb72
better comment added by @Hypolite
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:16 +02:00
852ef4021b
more spaces + some curly spaces added
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-06-20 22:02:16 +02:00
fe77e1b538
added more curly braces + a bit more usage of dbm::is_result()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-06-20 22:02:16 +02:00
f89b999659
was a bit confusing for me or I was not sleeping to much ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:15 +02:00
f0b05838cb
fixed comment and explained one
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:15 +02:00
22bbfdadd0
added more curly braces + spaces for #3254
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:15 +02:00
a95db714ca
added curely branches + reverted back to old behaviour (may come back one day)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:15 +02:00
63f5598766
better comment added by @Hypolite
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:15 +02:00
f2f12d6f50
Minor improvements:
...
- added spaces and curly braces
- added more TODOs as there really more to be done
- removed redundant braces from "return" keyword (no function)
- merged 2 nested if() into one single
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-06-20 22:02:15 +02:00
9cc0d5479b
old behaviour restored
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:15 +02:00
rabuzarus
3d1822996a
port hubzillas OpenWebAuth - fix another code standards violation
2018-06-20 20:16:36 +02:00
rabuzarus
9f493357f4
port hubzillas OpenWebAuth - fix wrong table name + fix wrong method name
2018-06-20 20:11:26 +02:00
