set result entry identifier earlier, i.e. before a continue for the same level can happen. otherwise  will always get the same value and we end up in an infinite loop
add unit test to make sure the infinite loop never comes back
fix rename of encryption keys
Fix copy conflict dialog translation

backport of fileexist template translations
with minor fixes
Repair broken parent link in the scanner
add some comments
remove unused argument
Fix public download link when zip download is disabled

When zip download is disabled, the public download action defined in
public.js is overridden by the one in fileactions.js because of the JS
loading order.

This quick fix prevents the override to happen when a download action is
already defined.

There are additional changes that were required to make the download
action icon work when registered from the public page.
Added max heartbeat interval to prevent integer overflow

When using big session timeout values, the interval value might overflow
and cause the setInterval() call to ping the server in a loop without
any delay.

This fix adds a maximum ping interval of 24 hours.
Merge pull request #9016 from owncloud/stable6-maxheartbeatinterval

[stable6] Added max heartbeat interval to prevent integer overflow
Merge pull request #8988 from owncloud/stable6_fix_encryption

Stable6 fix encryption
Merge pull request #9015 from owncloud/stable6-downloadwithdisabledzip

[stable6] Fix public download link when zip download is disabled
Add deprecation notice to load* functions

This functions are deprecated and/or removed since ownCloud 7. Additionally a issubdirectory check has been added here to prevent developers to use this function in a potentially insecure way.

Please review @karlitschek and others. Backport to stable5 and master requested.
Fix unit test
Merge pull request #9008 from owncloud/repair-parent-stable6

Repair broken parent link in the scanner - stable6
Merge pull request #9033 from owncloud/validate-dire

Add deprecation notice to load* functions
Merge pull request #8623 from owncloud/fix-8457

LDAP: fix possible infinite loop, that causes hanging wizard, fixes #8457
fix PHPdoc
add method to count groups on LDAP
LDAP Wizard: count users and groups with the power of paged search