Commit graph

3534 commits

Author SHA1 Message Date
rabuzarus 2fcbba9410 provide local time for notifications 2016-12-22 00:28:52 +01:00
rabuzarus 125d2f24dd frio: add profile link to the notifications url 2016-12-21 23:17:55 +01:00
Roland Häder b3d33ee1e6
More curly braces added, left some TODOs behind
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 23:17:47 +01:00
Roland Häder 59404e4eaf
More curly braces added, left some TODOs behind
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 23:17:36 +01:00
Roland Häder d3e666f71a
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 23:12:28 +01:00
Roland Häder d97b6a2eba
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 23:04:09 +01:00
Roland Häder d80b82c55d no need for this else block
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 22:53:32 +01:00
Roland Häder e6a4a736fc
no need for this else block
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 22:53:08 +01:00
Roland Häder 0436782e70
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 20:01:51 +01:00
Roland Häder 7f98c8086c added curly braces + space
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/events.php
2016-12-21 09:31:31 +01:00
Roland Häder bb37cac772 added curly braces + space
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-21 09:30:49 +01:00
Hypolite Petovan 47f88bd625 proxy mod: Standards bearer
- Enforced PSR-2 standards
- Normalized concatenation formatting
- Normalized string delimiters
- Normalized condition operators
- Collapsed directly nested conditions
- Used dvm::is_result
- Added comments
2016-12-21 09:15:20 +01:00
Hypolite Petovan 1f94cb9aac proxy: Simplify url extension extraction 2016-12-21 09:14:49 +01:00
Hypolite Petovan c0ec9c5907 proxy_url: Fix extension extraction for URLs containing a . after a ? 2016-12-21 09:14:09 +01:00
Roland Häder b580c23844 Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/proxy.php
2016-12-21 09:11:58 +01:00
Roland Häder 3befdc6920
used more App::get_baseurl() instead of get_app()->get_baseurl().
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:51:54 +01:00
Roland Häder 7c342600c3
used more App::get_baseurl() instead of get_app()->get_baseurl().
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:51:25 +01:00
Roland Häder 9814414b6a
used dbm::is_result() instead of count()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:39:06 +01:00
Roland Häder b4bc07fdcc
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:32:00 +01:00
Roland Häder 536f078ed4
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:31:05 +01:00
Hypolite Petovan e54ee2e509 Merge remote-tracking branch 'friendica/develop' into bug/proxy_url_extension
# Conflicts:
#	include/follow.php
2016-12-20 15:29:30 -05:00
Hypolite Petovan b2768d8f1c proxy mod: Standards bearer
- Enforced PSR-2 standards
- Normalized concatenation formatting
- Normalized string delimiters
- Normalized condition operators
- Collapsed directly nested conditions
- Used dvm::is_result
- Added comments
2016-12-20 15:23:08 -05:00
Roland Häder 52f14ffa5f
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:17:09 +01:00
Roland Häder 6e44acfed6
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:15:53 +01:00
Hypolite Petovan 6e929934c5 proxy: Simplify url extension extraction 2016-12-20 15:14:43 -05:00
Roland Häder b6d11f2129
Merge remote-tracking branch 'upstream/develop' into develop 2016-12-20 19:33:40 +01:00
Hypolite Petovan e8e1f9253d Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links
# Conflicts:
#	include/follow.php
2016-12-20 12:50:36 -05:00
Hypolite Petovan 4a7c3b9eef Diaspora: Fix class name case + add self 2016-12-20 12:44:15 -05:00
Roland Häder de689583e2 added more curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
2016-12-20 17:58:34 +01:00
Roland Häder 4b221d216e added more curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 17:57:40 +01:00
Michael Vogel 7141ce9163 Merge pull request #3030 from Hypolite/bug/proxy_url_extension
proxy_url: Fix extension extraction for URLs containing a . after a ?
2016-12-20 17:53:26 +01:00
Roland Häder 4805aa8fdb Don't cherry-pick:
- reverted dbm::is_result() to count()

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 16:28:23 +01:00
Michael 4aafbb09a5 The object type "photo" is deprecated and was replaced by "image"
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/like.php
	mod/photos.php
	mod/subthread.php
2016-12-20 16:00:23 +01:00
Roland Häder b9e4b9f274 Merge remote-tracking branch 'upstream/develop' into develop
Changes in #3034 were somehow conflicting. :-(

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/like.php
	mod/photos.php
	mod/subthread.php
2016-12-20 15:44:31 +01:00
Tobias Diekershoff cc16369b6f Merge pull request #3033 from annando/1612-object-type
The object type "photo" is deprecated and was replaced by "image"
2016-12-20 15:44:07 +01:00
Roland Häder 51716957b2 converted more to dbm::is_result() + added braces/space
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 15:37:27 +01:00
Roland Häder 4f26bee453 Changed $a->get_baseurl() to App::get_baseurl()
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:45:36 +01:00
Roland Häder 0e58bf6675 Changed $a->get_baseurl() to App::get_baseurl()
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:45:16 +01:00
Roland Häder d5f2d387bd Continued a bit:
- added more curly braces around conditional blocks
- added space between "if" and brace
- aligned "=>" (will do with more if wanted)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:42:33 +01:00
Roland Häder b69d82e64c Continued a bit:
- added more curly braces around conditional blocks
- added space between "if" and brace
- aligned "=>" (will do with more if wanted)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:42:10 +01:00
Roland Häder a883514604 Opps, forgot this ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:38:23 +01:00
Roland Häder c22878643b Opps, forgot this ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:38:11 +01:00
Roland Häder a25b628286 added curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:36:09 +01:00
Roland Häder 8d28135c59 added curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:35:18 +01:00
Roland Häder ace8f753ac added much more curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/events.php
	mod/network.php
	mod/suggest.php
	mod/uexport.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
2016-12-20 11:59:13 +01:00
Roland Häder e24c3a5b82 added much more curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:56:34 +01:00
Roland Häder 5f41375ad3 Continued:
- added curly braces + spaces
- added todo about testing empty/non-empty strings

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:41:20 +01:00
Roland Häder 51d352922a Continued:
- added curly braces + spaces
- added todo about testing empty/non-empty strings

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:39:53 +01:00
Roland Häder fc9dbc0899 added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:38:28 +01:00
Roland Häder 5588472f6d added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:38:16 +01:00
Roland Häder f3529e7dbc added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:36:27 +01:00
Roland Häder c86f09a894 added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:36:03 +01:00
Roland Häder 2e908ebbbf added more curly braces + fixed space->tab for code indentation.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:33:42 +01:00
Roland Häder c1845c97cc added more curly braces + fixed space->tab for code indentation.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:33:04 +01:00
Roland Häder 4780df394d added curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/notify.php
2016-12-20 11:28:39 +01:00
Roland Häder 507db84243 added curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:27:40 +01:00
Roland Häder fd0e2a9406 added curly braces + space between "if" and brace + initialized $result (was only within if() block but not outside of it)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:22:22 +01:00
Roland Häder 9c097c20dd added curly braces + space between "if" and brace + initialized $result (was only within if() block but not outside of it)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:21:32 +01:00
Roland Häder fa444f373c added curly braces + space between "if" and brace + added missing @param
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:19:23 +01:00
Roland Häder 4299cce719 added curly braces + space between "if" and brace + added missing @param
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:18:54 +01:00
Roland Häder e05a8e9974 added curly braces + space between "if" and brace + added TODO
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:15:15 +01:00
Roland Häder 40bdc5d33c added curly braces + space between "if" and brace + added TODO
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:14:30 +01:00
Roland Häder 6ab84bf520 added curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:04:53 +01:00
Roland Häder 92ad87590b added curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:04:29 +01:00
Roland Häder 40dc3774e4 Also here (was committed in other branch, too. :-( )
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:02:57 +01:00
Roland Häder 4dce3d8224 changed to this:
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:58:55 +01:00
Roland Häder a9bed1422e added more curyl braces + spaces between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:44:59 +01:00
Roland Häder be35349495 added more curyl braces + spaces between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:44:27 +01:00
Roland Häder 4dfe64bd5a Coding convention:
- added curly braces
- added space between "if" and brace
- also added TODO (old-lost code?)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:40:17 +01:00
Roland Häder 65e1cd728c Coding convention:
- added curly braces
- added space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:40:09 +01:00
Roland Häder 064b53e673 Coding convention:
- added curly braces
- added space between "if" and brace
- also added TODO (old-lost code?)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:39:06 +01:00
Roland Häder a5e4882e25 Coding convention:
- added curly braces
- added space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:35:28 +01:00
Roland Häder 5a90e7f822 Continued a bit:
- converted some bad checks to use dbm::is_result()
- added space between "if" and brace
- added curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:20:10 +01:00
Roland Häder abff6372dd Coding convention applied:
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/lock.php
2016-12-20 10:12:31 +01:00
Roland Häder fb676335db Coding convention applied:
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:10:33 +01:00
Michael 6e46987515 The object type "photo" is deprecated and was replaced by "image" 2016-12-20 07:10:47 +00:00
Hypolite Petovan 403d1f987f proxy_url: Fix extension extraction for URLs containing a . after a ? 2016-12-19 20:19:26 -05:00
Roland Häder dac1dbd3e9 Merge branch 'rewrites/dbm_is_result' into develop 2016-12-19 14:47:05 +01:00
Roland Häder a96eb3428d Used more dbm::is_result() instead of (!$r) or (!count($r)), still there are
more pending ...

Also put SQL table columns into back-ticks.

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-19 14:46:33 +01:00
Roland Häder 884f44ce94 *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-19 14:27:16 +01:00
Roland Häder 4615f39836 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-19 14:21:26 +01:00
Roland Häder ff569756ee Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object-reference-calls
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/follow.php
2016-12-19 09:40:34 +01:00
Thomas Willingham a58d8d2c71 This error message had me confused for about twenty minutes. I couldn't
figure out what was wrong with my imagick install that would make it give
me an orange button if it was installed.  Of course, the problem was that
it wasn't installed, and the message was worded badly.  This is a bit less
confusing.
2016-12-19 00:10:11 +00:00
Roland Häder a126db451c Convention: SQL keywords all upper-case, columns and table names (better) lower-cased and always in back-ticks.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:12:00 +01:00
Roland Häder 2c9d282136 Convention: SQL keywords all upper-case, columns and table names (better) lower-cased and always in back-ticks.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:11:25 +01:00
Roland Häder 9c564c4fd3 Again, static *OR* object-referencing calls? Blue or red pill?
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:06:20 +01:00
Roland Häder c43e9aa74e get_basepath() uses a lot $this (which means object-referenced calls, or
non-static calls). but still it is called statically in many places.

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:06:12 +01:00
Roland Häder 2eb3727542 Again, static *OR* object-referencing calls? Blue or red pill?
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:05:18 +01:00
Roland Häder b54c22666c get_basepath() uses a lot $this (which means object-referenced calls, or
non-static calls). but still it is called statically in many places.

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:03:06 +01:00
Roland Häder 378cbd9027 Continued with #3010:
- more reverts of $a->get_baseurl()
- you always do: function foo (&$a), please read my TODO why it is not so good.
- for now I have fixed this inconsistency (compared to other method signatures)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:59:13 +01:00
Roland Häder 8e1796bb1f Continued with #3010:
- more reverts of $a->get_baseurl()
- you always do: function foo (&$a), please read my TODO why it is not so good.
- for now I have fixed this inconsistency (compared to other method signatures)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:57:55 +01:00
Roland Häder ba3bc420ca Also reverted these + added spaces for nicer appearance.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:23:59 +01:00
Roland Häder 6cef88c24e Also reverted these + added spaces for nicer appearance.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:23:41 +01:00
Roland Häder a31acb5fda Opps, this has vanished by accident, thanks to @annando
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:41:16 +01:00
Roland Häder a85470b172 Opps, this has vanished by accident, thanks to @annando
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:36:32 +01:00
Roland Häder c75d6ad850 More dbm::is_result() instead of count()
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 12:03:02 +01:00
Roland Häder cee169997e Opps, no && and AND in same line (confusing, thanks to @annando)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 10:02:39 +01:00
Roland Häder 042ed17826 removed own debug lines (no more needed).
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:58:27 +01:00
Roland Häder 036edc2fd0 added extra spaces to make it look nice. #3010
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:56:27 +01:00
Roland Häder 46d383369c Cleanup for #3010 - added spaces, thanks to @annando .
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:41:33 +01:00