Commit graph

14473 commits

Author SHA1 Message Date
Roland Häder
d9c22c7f3e
Continued a bit:
- converted some else if to elseif (only PHP)
- converted some space -> tab (intending)

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder
c2d8738285
added spaces (coding convention)
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:51:54 +01:00
Roland Häder
951006dd10
more spaces + some curly spaces added
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:51:54 +01:00
Roland Häder
41a36606c6
added spaces + some curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:50:19 +01:00
Roland Häder
0cd241bcbe
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:44:40 +01:00
Roland Häder
720e7d6034
curly braces + spaces added
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:21 +01:00
Roland Häder
15c77beee2
added missing spaces/curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:21 +01:00
Roland Häder
9cb100228a
addec curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
5f71da5862
added more curly braces + spaces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
958c24e9f3
spaces -> tab + added spaces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
cc83e9d72a
fixed curly brace (opps)
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
6a3dc8b286
added more curly braces + fixed one
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
3ad0fd442e
Continued:
- added missing spaces/curly braces
- some more usage of dbm::is_result()
- 2 oppsite if() statements can be mored to else
- added more TODOs for type-hinting

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
c6ef84a964
Continued:
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
  long time around in PHP) anything can be handled over to the method/function.

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
6a171a96aa
Opps ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:47 +01:00
Roland Häder
3849e7c9ff
added more curly braces + a bit more usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:47 +01:00
Roland Häder
55e2411f07
even more added
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Roland Häder
108a2ccbd5
added more spaces/curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Roland Häder
5471dd79e8
added missing curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Roland Häder
92901d8626
more curly braces added + dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Roland Häder
4adf74b06c
more coding convention applied
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Roland Häder
0b6336edb0
unified most db upgrades:
- common way is to check on result ($r mostly) of db upgrade
- on success, return UPDATE_SUCCESS
- on failure, return UPDATE_FAILED

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Roland Häder
63e4750b4a
more coding convention applied:
- added curly braces
- added spaces where needed
- $r only needs to be tested with dbm::is_result()
- made SQL keywords all uper-case

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Roland Häder
1c6535c0b4
applied coding convention:
- replaced space -> tab (code indenting)
- added curly braces
- used dbm::is_result() if $r is no result (may happen)

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Tobias Diekershoff
909e1e055f Merge pull request #3228 from annando/1702-detect-server
Server type detection is improved
2017-03-18 09:10:03 +01:00
Michael
f3bcf63d46 Standards and some logging improvements 2017-03-17 19:25:01 +00:00
Michael
87771cf617 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
Conflicts:
	include/discover_poco.php
2017-03-17 15:53:19 +00:00
rabuzarus
3cef98caf6 Merge pull request #3226 from annando/1702-only-worker
The worker is now the only background processing system
2017-03-17 13:22:23 +01:00
rabuzarus
1dd839c2c2 Merge pull request #3240 from annando/bugfix-dba
Bugfix: When a query fails we mustn't use the result value.
2017-03-17 13:20:56 +01:00
Michael
24a57020b9 Better version transformation for nodeinfo and statistics.json 2017-03-16 21:34:53 +00:00
Michael
58bf1c50af Bugfix: When a query fails we mustn't use the result value. 2017-03-16 09:23:12 +00:00
Michael
4812f4c0f9 Without only the worker queue we don't need the deliverq anymore. 2017-03-16 07:30:59 +00:00
Michael
a211c8cb77 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-16 05:51:22 +00:00
rabuzarus
6fdc219143 Merge pull request #3227 from annando/1703-pdo
We now support PDO
2017-03-16 00:25:16 +01:00
rabuzarus
b4bad92657 Merge pull request #3239 from Hypolite/issue/#3194-2
Fix wrong deferred function name
2017-03-15 19:53:16 +01:00
Hypolite Petovan
35ba3cce70 Fix wrong deferred function name 2017-03-15 14:42:34 -04:00
Michael
88a69b93d5 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 2017-03-15 13:56:17 +00:00
Michael
8decd15565 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-15 13:55:43 +00:00
rabuzarus
b8e8c96386 Merge pull request #3236 from annando/bugfix-feed
Bugfix for pull request 3216: Feed items were mixed
2017-03-15 12:18:49 +01:00
Michael
dc3fcf0487 Standard stuff 2017-03-15 06:00:22 +00:00
Michael
35ec1c8f26 Bugfix for pull request 3216 - feed items were mixed 2017-03-14 21:14:09 +00:00
Michael
187a81f159 Merge remote-tracking branch 'upstream/develop' into develop 2017-03-14 21:13:02 +00:00
Michael Vogel
e57bd5fe55 Merge pull request #3233 from rabuzarus/20170314_-_pagination
limit pagination page buttons to  max 10
2017-03-14 20:05:29 +01:00
rabuzarus
0143369e54 limit pagination page buttons to max 10 2017-03-14 18:31:03 +01:00
Michael Vogel
a7e8e86800 Merge pull request #3221 from strk/remember-openid
Fix "remember me" cookie for OpenID logins
2017-03-14 16:30:15 +01:00
Michael
0d32f0be46 One forgotten standard 2017-03-14 15:18:56 +00:00
Michael
f73389dd12 Standard stuff 2017-03-14 15:17:21 +00:00
rabuzarus
3061a37b4f Merge pull request #3232 from Hypolite/issue/#3194-2
frio: Revert guid truncation for scrollToItem() and improve dropItem()
2017-03-14 13:04:47 +01:00
fabrixxm
fa3490ba5b Merge pull request #3224 from annando/1702-no-old_pager
The old pager is now removed
2017-03-14 10:29:03 +01:00
Michael
43ceb72196 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-14 07:26:15 +00:00