Merge pull request #5057 from M-arcus/patch-2

[BUGFIX] .htaccess: Add file

[BUGFIX] .htaccess: Rename file

Revert "[BGUFIX] .htaccess: Add file"

This reverts commit 7e099bf9c0c2aaa21b7fe1cc4dd0ded9bb2e3420.

[BGUFIX] .htaccess: Add file

Fixes https://github.com/friendica/friendica/pull/5042#issuecomment-389218702

Merge pull request #5042 from Quix0r/rewrites/curly-braces-is-result-usage-002

Rewrites/curly braces is result usage 002

Added empty line after if() block (convention)

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

Fixes:
- used empty() instead of x()
- removed superflous count()

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

Fixed parser error

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

Continued:
- merged 2 if() into one with &&
- added TODO for possible rewrite (avoid "complex" code)

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

Cleanups:
- added empty lines
- removed old-lost commented out line

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

No direct $a->config['foo'] needed when Config::get() is around ...

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

Redis:
- added support for redis server:

// Required to actually have this cache driver active:
$a->config['system']['cache_driver'] = 'redis';

// ---- OPTIONAL/DEFAULT: ----
$a->config['system']['redis_host'] = '127.0.0.1';
$a->config['system']['redis_port'] = 6379;

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

Continued:
- you can directly use constant($var) instead of this switch()

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

Continued:
- system,worker_dont_fork may not be set, always set default to "false" to
  have it properly set as Config::get() may one day behave differently

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

Continued:
- return is a keyword, not a function, so don't add braces here

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

Continued:
- avoided else() block which reduces code complexibility
- used more x()
- added curly braces
- added known type-hints

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

Continued:
- used x() to make sure the array key is there, else an E_NOTICE is triggered
- added type-hints where it is safe

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

"pending" shouldn't be set as well by default ...

Urgent bugfix: Public contacts had been blocked automatically when created

Reshares had been detected falsely so that were rejected by Diaspora

Ensure that the link will be displayed correctly on Diaspora

Some corrections

Replace old database queries with the new ones

Continued:
- ops, another rebase-leftover fixed

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

Continued:
- moved to Config class

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

Continued:
- ops, did accidently modify composer.lock ... :-(

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

Windows' CRLF are looking strange under Linux, let's get rid of them/

Also let's ignore addons/ as it is optional and depend on if the webmaster
wants it or not.

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

General project change:
- cleaned up vendor/ as it is a "build" (means being locally recreated)
  directory and therefor should *NOT* be committed.
- updated composer.lock
- that is what would be updated now if vendor/ would be ignored, instead a lot
  files has been changed in vendor/
- people running `composer install` regulary will get (with the old way) a dirty
  working copy (version-controlled files being modified) and then cannot update

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

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 Haeder <roland@mxchange.org>

Opps, cutted this out by accident ...

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>

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

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

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

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

Continued:
- converted multiple single-line comments into one multi-line comment (please
  stop abusing programming languages!)
- added more TODO tags for type-hints (upcoming rewrite)
- opps, one space was only fixed in develop branch, not in this PR branch

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

fixed comment and explained one

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

added more curly braces + spaces for #3254

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

old behaviour restored

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

added curely branches + reverted back to old behaviour (may come back one day)

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

better comment added by @Hypolite

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

added spaces + some curly braces + some usage of dbm::is_result()

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

more spaces + some curly spaces added

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

added spaces + some curly braces + some usage of dbm::is_result()

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

added more curly braces + a bit more usage of dbm::is_result()

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

"pending" shouldn't be set as well by default ...

Urgent bugfix: Public contacts had been blocked automatically when created

Reshares had been detected falsely so that were rejected by Diaspora

Ensure that the link will be displayed correctly on Diaspora

Some corrections

Replace old database queries with the new ones

Continued:
- ops, another rebase-leftover fixed

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

Continued:
- ops, did accidently modify composer.lock ... :-(

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

Continued:
- renamed .htaccess -> .htaccess-dist and ignored .htaccess to allow local
  changes
- described /nbproject/private/ ignore (NetBeans IDE's private project data)

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

Fixes/cleanup:
- added missing curly braces (and some absent caused parser errors)
- <include|require>[_once] are keywords, so don't use them as such
- removed/added empty lines

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

Windows' CRLF are looking strange under Linux, let's get rid of them/

Also let's ignore addons/ as it is optional and depend on if the webmaster
wants it or not.

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

rewrote based on CR by @Annando, thank you. It is now clear to me.

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

LF fixed

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

General project change:
- cleaned up vendor/ as it is a "build" (means being locally recreated)
  directory and therefor should *NOT* be committed.
- updated composer.lock
- that is what would be updated now if vendor/ would be ignored, instead a lot
  files has been changed in vendor/
- people running `composer install` regulary will get (with the old way) a dirty
  working copy (version-controlled files being modified) and then cannot update

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

Continued:
- added spaces and curly braces
- added more TODOs as there really more to be done

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

Opps, added missing curly brace.

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

fixed parser error

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

Continued:
- added more curly braces
- replaced if (blaFoo()) { return true; } return false; with return blaFoo();
- added spaces

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

Continued:
- added curly braces/spaces
- added TODOs (type-hints, old-lost code)
- more usage of dbm::is_result()
- combined some if() return stuff into a simple return statement

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

added spaces + curly braces and TODOs for upcoming type-hint rewrite. Please
note that PHP5 allows 'array' as type-hint already (+ interface/class name).

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

Continued a bit:
- more spaces added
- more curly braces added
- let's use x($_FOO, 'bar') and not isset($_FOOT['bar'])

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

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 Haeder <roland@mxchange.org>

Opps, cutted this out by accident ...

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>

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

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>

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

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

fixed comment and explained one

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

added more curly braces + spaces for #3254

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

more usage of dbm::is_result() and sorted a bit statements

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

old behaviour restored

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

added curely branches + reverted back to old behaviour (may come back one day)

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

better comment added by @Hypolite

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

replaced some tabs -> spaces + added curly braces #3254

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

fixed curly braces + added more

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

it is documenation, right? :-)

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

added spaces + some curly braces + some usage of dbm::is_result()

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

more spaces + some curly spaces added

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

added spaces + some curly braces

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

added spaces + some curly braces

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

added spaces + some curly braces + some usage of dbm::is_result()

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

more spaces + some curly spaces added

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

added spaces + some curly braces

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

Merge pull request #5037 from Quix0r/rewrites/curly-braces-is-result-usage-001

Rewrites/curly braces is result usage 001

Beatification:
- added space after curly braces (MrPetovan)
- added TODO for possible rewrite candidate

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

reverted back ...

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

Fixes:
- brought back comment (ops)
- DBM is the class name (not dbm)

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

Ops, was redundant here.

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

No extra empty line here

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

Ops, one to much ...

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

added spaces + some curly braces + some usage of dbm::is_result()

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

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>

added more curly braces + a bit more usage of dbm::is_result()

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

Merge pull request #4996 from fabrixxm/docs-theme-dev

Docs: add a note on adding `use` on theme.php

Docs: add a note on adding `use` on theme.php

Merge pull request #4991 from annando/dbclean

dbclean settings are now available from the frontend

Text for translations