Merge branch 'develop' into rewrites/coding-convention-split2

added spaces + used x ()

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge pull request #3280 from annando/issue-3142-2

Issue 3142: mcrypt is no more (as well as phpseclib)

Standards ...

More mcrypt is removed

Documentation added

Issue 3142: mcrypt is no more (as well as phpseclib)

Continued with CR:
- added spaces as requested
- removed parentheses from include/require calls as they are no functions

Signed-off-by: Roland Haeder <roland@mxchange.org>

space-time contines ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

space-time!

Signed-off-by: Roland Haeder <roland@mxchange.org>

Continued a bit:
- converted multiple single-line comments into one multi-line comment
- added spaces (space-time!)

Signed-off-by: Roland Haeder <roland@mxchange.org>

added space, marked rest 86 occurrences in todos.txt

Signed-off-by: Roland Haeder <roland@mxchange.org>

added spaces, marked in todos.txt as usual

Signed-off-by: Roland Haeder <roland@mxchange.org>

$tagged is being initialized but not written to until the foreach() loop is
being executed. Maybe here is old-lost code anyway?

Signed-off-by: Roland Haeder <roland@mxchange.org>

Continued a bit:
- added 'array' type-hint which is valid for many versions back
- added spaces as requested by CR
- removed $a = get_app(); call, $a was no longer needed here

Signed-off-by: Roland Haeder <roland@mxchange.org>

Continued a bit:
- recommended way is to use foreach() instead of own looping through arrays
- even when you need the index:
<?php
foreach ($someArray as $key => $value) {
// Handle $key/$value somehow
}
?>

Signed-off-by: Roland Haeder <roland@mxchange.org>

added spaces (space-time!) and TODO that x() is maybe proper way?

Signed-off-by: Roland Haeder <roland@mxchange.org>

Continued a bit:
- removed parentheses from include/require as they are no functions
- added type-hint for $a which is unused btw.

Signed-off-by: Roland Haeder <roland@mxchange.org>

fixed parser error

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge pull request #3277 from annando/issue-3142

Replaces mcrypt with phpsec.

We don't need this include anymore

Now it's openssl - and no copy&paste failure anymore

Test with OpenSSL

whoops, parser error fixed

Signed-off-by: Roland Haeder <roland@mxchange.org>

it is space-time! ;-)

Signed-off-by: Roland Haeder <roland@mxchange.org>

merged 2 if() into one three times

Signed-off-by: Roland Haeder <roland@mxchange.org>

merged 2 if() into one as requested by CR

Signed-off-by: Roland Haeder <roland@mxchange.org>

added spaces + removed parentheses (include/require are no functions)

Signed-off-by: Roland Haeder <roland@mxchange.org>

added spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

removed old-lost code by CR request

Signed-off-by: Roland Haeder <roland@mxchange.org>

Please use x() correctly:

<?php
if (x($someArray, 'element')) {
// Do something
}
?>

Signed-off-by: Roland Haeder <roland@mxchange.org>

Continued a bit:
- added spaces / curly braces
- converted multiple single-line comments into one multi-line comment
- used more dbm::is_result()
- include/require are no functions, let's not abuse them ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

space to the rescue ... ;-) CR request

Signed-off-by: Roland Haeder <roland@mxchange.org>

it is ... SPACE TIME! ;-)

Signed-off-by: Roland Haeder <roland@mxchange.org>

Replaces mcrypt with phpsec.

removed old-lost code by CR request + spaces added ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

removed commented-out by CR request + it is ... SPACE TIME! ;-)

Signed-off-by: Roland Haeder <roland@mxchange.org>

spaces added according code convention and CR + fixed tzpo in function name (opps)

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge pull request #3275 from tobiasd/20170327-es

ES translation THX Albert

Merge pull request #3276 from annando/issue-2959

Reestablish the communication with Mastodon

Doing some Hypolyzation

Reestablish the communication with Mastodon

ES translation THX Albert

Merge pull request #3271 from Hypolite/issue/#3189

Fix Diaspora code blocks being mangled

Merge pull request #3272 from annando/issue-2364

Only import new OStatus posts if they are from our followers

Prevent Hypolite from doing comments about standards ;-)

Only import new OStatus posts if they are from our followers

Improve babel page display for diaspora2bb mode

- Fix formatting

Fix Diaspora code blocks being mangled

- Remove whitespace removal code from `diaspora2bb()`
- Add code block skipping the HTML transforms removing whitespace in
`htm2bbcode()`

Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

Merge pull request #3270 from annando/1703-no-spam

The "spam" libary is not in use, so we remove it completely

library/oauth.php is not in use as well.

The "spam" libary is not in use, so we remove it completely

Merge pull request #3269 from annando/1703-nodeinfo

We now return basic system data via nodeinfo at every time.

Remove parendingsdas

We now return basic system data via nodeinfo at every time.

Merge pull request #3267 from annando/issue-3248

Issue 3248: Make communityhome work again.

Issue 3248: Make communityhome work again.

Merge branch 'develop' of https://github.com/friendica/friendica into develop

used ltrim() for removing (any) trailing space

Signed-off-by: Roland Haeder <roland@mxchange.org>

added spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge pull request #3251 from rabuzarus/20170320_-_fix_fbrowser

Bugfix: fbrowser did insert 2 Pictures instead of only 1

Remove the AjaxUpload element when jot modal is closed

Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

Merge pull request #3265 from annando/1703-remove-linefeeds

Remove unneeded linefeeds in HTML output

Merge pull request #3257 from annando/1703-gcontact

Improved gcontact handling

Remove unneeded linefeeds

Remove the "call by reference"

strange that this curly brace didn't make it in. now it is, thanks to @annando

Signed-off-by: Roland Haeder <roland@mxchange.org>

some spaces ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

Use of exceptions

Merge pull request #3263 from annando/1601-api-statuses-lookup

More GNU Social compatibility for the API

Merge pull request #3264 from annando/1703-avoid-api-error

Avoid API error when calling "/api/friendica/profile/show"

Avoid API error when calling "/api/friendica/profile/show"

and without self:: ;-(

Signed-off-by: Roland Haeder <roland@mxchange.org>

there is already $this->backend around, needs renaming

Signed-off-by: Roland Haeder <roland@mxchange.org>

fixed another parser error, opps

Signed-off-by: Roland Haeder <roland@mxchange.org>

Opps, fixed parser error. indending was confusing here

+ added much more curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>

rewrote for() loop to foreach() + added curly braces/spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

Continued:
- added curly braces/spaces
- converted multiple single-line comments into one multi-line comment

Signed-off-by: Roland Haeder <roland@mxchange.org>

Convention:
- comment blocks with 2 stars at beinging are doc-tags, with only star is a
  regular multi-line comment
- added curly braces + spaces
- removed TODO, there needs to be a way of writing this better than using @

Signed-off-by: Roland Haeder <roland@mxchange.org>

was a bit confusing for me or I was not sleeping to much ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

don't kill when no result is found, this may break communication, thanks to @annando explaining it

Signed-off-by: Roland Haeder <roland@mxchange.org>

PHP5 does not support native type-hints, except `array` + used dbm::is_result()

Signed-off-by: Roland Haeder <roland@mxchange.org>

fixed indending + closed own internal todo: better usage of x()

removed todo

Signed-off-by: Roland Haeder <roland@mxchange.org>

closed internal TODO, added parentheses as this is a minimized if/else block

Signed-off-by: Roland Haeder <roland@mxchange.org>

added a space

Signed-off-by: Roland Haeder <roland@mxchange.org>

Continued:
- added spaces
- made a code block even

Signed-off-by: Roland Haeder <roland@mxchange.org>

Continued:
- used dbm::is_result() to avoid E_WARNING when false is returned
- added curly braces + some spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

added spaces and curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>

Continued:
- added curly braces/spaces
- changed lower-case SQL keywords to upper-case
- used dbm::is_result() instead of count() (avoids warning in case of false is
  returned)

Signed-off-by: Roland Haeder <roland@mxchange.org>

removed old-lost code + internal TODO closed

Signed-off-by: Roland Haeder <roland@mxchange.org>

merged 2 if() into one, closes internal TODO

Signed-off-by: Roland Haeder <roland@mxchange.org>

removed parentheses, added curly ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

removed TODO, one day this all needs refacturizing ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

rewrote to static approach and if() condition can be simplified.

Signed-off-by: Roland Haeder <roland@mxchange.org>

removed parentheses and indended it for better readability

Signed-off-by: Roland Haeder <roland@mxchange.org>

added spaces/curly braces and TODO for better using trim()

Signed-off-by: Roland Haeder <roland@mxchange.org>

removed old-lost code

Signed-off-by: Roland Haeder <roland@mxchange.org>

changed "and" -> && according to CR

Signed-off-by: Roland Haeder <roland@mxchange.org>