[Pkg-owncloud-commits] [owncloud] 11/69: Merge branch 'master' into type-hinting-sharing
David Prévot
taffit at moszumanska.debian.org
Sat May 10 16:20:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 66b1ad0a9be76a179155c8ce6a47310f93e8bb42
Merge: a9bf3df c591cf0
Author: Bart Visscher <bartv at thisnet.nl>
Date: Mon Apr 28 17:59:41 2014 +0200
Merge branch 'master' into type-hinting-sharing
Conflicts:
apps/files_sharing/lib/share/file.php
apps/files_sharing/tests/api.php
lib/private/share/share.php
.scrutinizer.yml | 2 +
apps/files/ajax/upload.php | 27 +-
apps/files/appinfo/remote.php | 20 +-
apps/files/css/files.css | 2 +-
apps/files/js/file-upload.js | 30 +-
apps/files/js/fileactions.js | 8 +-
apps/files/js/filelist.js | 163 +-
apps/files/js/files.js | 8 +-
apps/files/l10n/ar.php | 1 -
apps/files/l10n/ast.php | 2 +-
apps/files/l10n/bg_BG.php | 1 -
apps/files/l10n/bn_BD.php | 1 -
apps/files/l10n/ca.php | 3 -
apps/files/l10n/cs_CZ.php | 4 +-
apps/files/l10n/cy_GB.php | 1 -
apps/files/l10n/da.php | 3 -
apps/files/l10n/de.php | 4 +-
apps/files/l10n/de_CH.php | 1 -
apps/files/l10n/de_DE.php | 6 +-
apps/files/l10n/el.php | 5 +-
apps/files/l10n/en_GB.php | 6 +-
apps/files/l10n/eo.php | 1 -
apps/files/l10n/es.php | 4 +-
apps/files/l10n/es_AR.php | 3 -
apps/files/l10n/es_CL.php | 3 +-
apps/files/l10n/es_CR.php | 7 +
apps/files/l10n/es_MX.php | 3 -
apps/files/l10n/et_EE.php | 4 +-
apps/files/l10n/eu.php | 3 -
apps/files/l10n/fa.php | 1 -
apps/files/l10n/fi_FI.php | 5 +-
apps/files/l10n/fr.php | 4 +-
apps/files/l10n/gl.php | 4 +-
apps/files/l10n/he.php | 1 -
apps/files/l10n/hi.php | 1 -
apps/files/l10n/hr.php | 1 -
apps/files/l10n/hu_HU.php | 3 -
apps/files/l10n/ia.php | 2 +-
apps/files/l10n/id.php | 3 -
apps/files/l10n/is.php | 1 -
apps/files/l10n/it.php | 4 +-
apps/files/l10n/ja.php | 3 -
apps/files/l10n/ka_GE.php | 1 -
apps/files/l10n/km.php | 1 -
apps/files/l10n/ko.php | 3 -
apps/files/l10n/ku_IQ.php | 1 -
apps/files/l10n/lb.php | 1 -
apps/files/l10n/lt_LT.php | 3 -
apps/files/l10n/lv.php | 1 -
apps/files/l10n/mk.php | 2 -
apps/files/l10n/ms_MY.php | 1 -
apps/files/l10n/nb_NO.php | 3 -
apps/files/l10n/nl.php | 4 +-
apps/files/l10n/nn_NO.php | 1 -
apps/files/l10n/oc.php | 1 -
apps/files/l10n/or_IN.php | 7 +
apps/files/l10n/pa.php | 1 -
apps/files/l10n/pl.php | 4 +-
apps/files/l10n/pt_BR.php | 4 +-
apps/files/l10n/pt_PT.php | 3 -
apps/files/l10n/ro.php | 12 +-
apps/files/l10n/ru.php | 4 +-
apps/files/l10n/si_LK.php | 1 -
apps/files/l10n/sk_SK.php | 4 +-
apps/files/l10n/sl.php | 4 +-
apps/files/l10n/sq.php | 1 -
apps/files/l10n/sr.php | 1 -
apps/files/l10n/sr at latin.php | 1 -
apps/files/l10n/sv.php | 4 +-
apps/files/l10n/ta_LK.php | 1 -
apps/files/l10n/th_TH.php | 1 -
apps/files/l10n/tr.php | 6 +-
apps/files/l10n/ug.php | 1 -
apps/files/l10n/uk.php | 1 -
apps/files/l10n/vi.php | 1 -
apps/files/l10n/zh_CN.php | 3 -
apps/files/l10n/zh_HK.php | 3 +-
apps/files/l10n/zh_TW.php | 2 -
apps/files/lib/app.php | 11 +-
apps/files/lib/helper.php | 11 +-
apps/files/templates/index.php | 2 +-
apps/files/tests/ajax_rename.php | 82 -
apps/files/tests/js/filesSpec.js | 35 -
apps/files_encryption/hooks/hooks.php | 133 +-
apps/files_encryption/l10n/es_AR.php | 1 +
apps/files_encryption/l10n/pt_PT.php | 3 +
apps/files_encryption/l10n/sk_SK.php | 1 +
apps/files_encryption/l10n/zh_TW.php | 2 +
apps/files_encryption/lib/util.php | 102 +-
apps/files_encryption/tests/hooks.php | 26 +-
apps/files_encryption/tests/share.php | 51 +-
apps/files_encryption/tests/util.php | 8 +-
apps/files_encryption/tests/webdav.php | 20 +-
apps/files_external/css/settings.css | 7 +-
apps/files_external/l10n/ast.php | 1 +
apps/files_external/l10n/ca.php | 7 +
apps/files_external/l10n/cs_CZ.php | 7 +
apps/files_external/l10n/es_AR.php | 1 +
.../bg_BG.php => files_external/l10n/es_CL.php} | 2 +-
apps/files_external/l10n/et_EE.php | 5 +
apps/files_external/l10n/ia.php | 1 +
apps/files_external/l10n/sk_SK.php | 8 +
apps/files_external/l10n/sl.php | 5 +
apps/files_external/l10n/sv.php | 6 +-
apps/files_external/l10n/zh_HK.php | 1 +
apps/files_external/l10n/zh_TW.php | 1 +
apps/files_external/lib/config.php | 4 +-
apps/files_external/tests/mountconfig.php | 5 +-
apps/files_sharing/appinfo/app.php | 2 -
apps/files_sharing/appinfo/update.php | 127 +-
apps/files_sharing/appinfo/version | 2 +-
apps/files_sharing/css/public.css | 43 +-
apps/files_sharing/js/public.js | 8 +-
apps/files_sharing/l10n/bg_BG.php | 3 +-
apps/files_sharing/lib/api.php | 12 -
apps/files_sharing/lib/cache.php | 113 +-
apps/files_sharing/lib/helper.php | 73 +-
apps/files_sharing/lib/permissions.php | 4 +-
apps/files_sharing/lib/share/file.php | 145 +-
apps/files_sharing/lib/sharedstorage.php | 294 +-
apps/files_sharing/lib/updater.php | 77 +-
apps/files_sharing/lib/watcher.php | 2 +-
apps/files_sharing/tests/api.php | 104 +-
apps/files_sharing/tests/base.php | 12 +-
apps/files_sharing/tests/cache.php | 66 +-
apps/files_sharing/tests/permissions.php | 15 +-
apps/files_sharing/tests/updater.php | 55 +
apps/files_sharing/tests/watcher.php | 33 +-
apps/files_trashbin/js/trash.js | 8 +-
apps/files_trashbin/l10n/ar.php | 4 +-
apps/files_trashbin/l10n/ast.php | 5 +
apps/files_trashbin/l10n/bg_BG.php | 4 +-
apps/files_trashbin/l10n/ca.php | 4 +-
apps/files_trashbin/l10n/cs_CZ.php | 4 +-
apps/files_trashbin/l10n/cy_GB.php | 4 +-
apps/files_trashbin/l10n/da.php | 4 +-
apps/files_trashbin/l10n/de.php | 4 +-
apps/files_trashbin/l10n/de_CH.php | 4 +-
apps/files_trashbin/l10n/de_DE.php | 4 +-
apps/files_trashbin/l10n/el.php | 4 +-
apps/files_trashbin/l10n/en_GB.php | 4 +-
apps/files_trashbin/l10n/eo.php | 4 +-
apps/files_trashbin/l10n/es.php | 4 +-
apps/files_trashbin/l10n/es_AR.php | 4 +-
apps/files_trashbin/l10n/es_MX.php | 4 +-
apps/files_trashbin/l10n/et_EE.php | 4 +-
apps/files_trashbin/l10n/eu.php | 4 +-
apps/files_trashbin/l10n/fa.php | 4 +-
apps/files_trashbin/l10n/fi_FI.php | 4 +-
apps/files_trashbin/l10n/fr.php | 4 +-
apps/files_trashbin/l10n/gl.php | 4 +-
apps/files_trashbin/l10n/he.php | 4 +-
apps/files_trashbin/l10n/hu_HU.php | 4 +-
apps/files_trashbin/l10n/id.php | 4 +-
apps/files_trashbin/l10n/it.php | 4 +-
apps/files_trashbin/l10n/ja.php | 4 +-
apps/files_trashbin/l10n/ka_GE.php | 4 +-
apps/files_trashbin/l10n/ko.php | 4 +-
apps/files_trashbin/l10n/lt_LT.php | 4 +-
apps/files_trashbin/l10n/lv.php | 4 +-
apps/files_trashbin/l10n/mk.php | 4 +-
apps/files_trashbin/l10n/ms_MY.php | 4 +-
apps/files_trashbin/l10n/nb_NO.php | 4 +-
apps/files_trashbin/l10n/nl.php | 4 +-
apps/files_trashbin/l10n/nn_NO.php | 4 +-
apps/files_trashbin/l10n/pl.php | 4 +-
apps/files_trashbin/l10n/pt_BR.php | 4 +-
apps/files_trashbin/l10n/pt_PT.php | 4 +-
apps/files_trashbin/l10n/ru.php | 4 +-
apps/files_trashbin/l10n/sk_SK.php | 4 +-
apps/files_trashbin/l10n/sl.php | 4 +-
apps/files_trashbin/l10n/sq.php | 4 +-
apps/files_trashbin/l10n/sv.php | 4 +-
apps/files_trashbin/l10n/th_TH.php | 4 +-
apps/files_trashbin/l10n/uk.php | 4 +-
apps/files_trashbin/l10n/vi.php | 4 +-
apps/files_trashbin/l10n/zh_CN.php | 4 +-
apps/files_trashbin/l10n/zh_TW.php | 4 +-
apps/files_trashbin/lib/trashbin.php | 28 +-
apps/files_versions/l10n/ast.php | 2 +
apps/user_ldap/group_ldap.php | 11 +
apps/user_ldap/js/ldapFilter.js | 100 +
apps/user_ldap/js/settings.js | 100 +-
apps/user_ldap/l10n/af_ZA.php | 3 +-
apps/user_ldap/l10n/ast.php | 36 +-
apps/user_ldap/l10n/ca.php | 3 +
apps/user_ldap/l10n/cs_CZ.php | 1 +
apps/user_ldap/l10n/en_GB.php | 1 +
apps/user_ldap/l10n/es.php | 2 +
apps/user_ldap/l10n/es_AR.php | 7 +
apps/user_ldap/l10n/{af_ZA.php => es_CR.php} | 4 +-
apps/user_ldap/l10n/et_EE.php | 1 +
apps/user_ldap/l10n/ia.php | 3 +-
apps/user_ldap/l10n/{af_ZA.php => or_IN.php} | 4 +-
apps/user_ldap/l10n/ru.php | 2 +
apps/user_ldap/l10n/sk_SK.php | 5 +
apps/user_ldap/lib/access.php | 84 +-
apps/user_ldap/lib/connection.php | 3 +
apps/user_ldap/lib/ldap.php | 4 +-
apps/user_ldap/lib/proxy.php | 3 +
apps/user_ldap/lib/wizard.php | 5 +-
apps/user_ldap/lib/wizardresult.php | 4 +
apps/user_ldap/settings.php | 1 +
apps/user_ldap/templates/settings.php | 2 +-
config/.htaccess | 12 +
core/css/mobile.css | 13 +
core/css/styles.css | 114 +-
core/img/actions/add.png | Bin 111 -> 132 bytes
core/img/actions/add.svg | 5 +-
core/img/actions/close.png | Bin 181 -> 206 bytes
core/img/actions/close.svg | 5 +-
core/img/actions/delete-hover.png | Bin 222 -> 274 bytes
core/img/actions/delete-hover.svg | 2 +-
core/img/actions/delete.png | Bin 181 -> 243 bytes
core/img/actions/delete.svg | 4 +-
core/img/actions/download.png | Bin 162 -> 134 bytes
core/img/actions/download.svg | 3 +-
core/img/actions/upload.png | Bin 161 -> 144 bytes
core/img/actions/upload.svg | 6 +-
core/img/actions/view-close.png | Bin 295 -> 317 bytes
core/img/actions/view-close.svg | 5 +-
core/js/eventsource.js | 16 +-
core/js/jquery-1.10.0.js | 9800 ++++++++++++++++++++
core/js/jquery-migrate-1.2.1.js | 521 ++
core/js/js.js | 418 +-
core/js/oc-requesttoken.js | 5 +-
core/js/share.js | 51 +-
core/js/tags.js | 49 +-
core/l10n/af_ZA.php | 81 +-
core/l10n/ar.php | 1 -
core/l10n/ast.php | 3 +-
core/l10n/be.php | 1 -
core/l10n/bg_BG.php | 1 -
core/l10n/bn_BD.php | 1 -
core/l10n/ca.php | 2 +-
core/l10n/cs_CZ.php | 2 +-
core/l10n/cy_GB.php | 1 -
core/l10n/da.php | 1 -
core/l10n/de.php | 1 -
core/l10n/de_CH.php | 1 -
core/l10n/de_DE.php | 1 -
core/l10n/el.php | 7 +-
core/l10n/en_GB.php | 1 -
core/l10n/eo.php | 1 -
core/l10n/es.php | 1 -
core/l10n/es_AR.php | 6 +-
core/l10n/es_CL.php | 1 -
core/l10n/es_CR.php | 9 +
core/l10n/es_MX.php | 1 -
core/l10n/et_EE.php | 2 +-
core/l10n/eu.php | 1 -
core/l10n/fa.php | 1 -
core/l10n/fi_FI.php | 1 -
core/l10n/fr.php | 1 -
core/l10n/gl.php | 3 +-
core/l10n/he.php | 1 -
core/l10n/hr.php | 1 -
core/l10n/hu_HU.php | 1 -
core/l10n/ia.php | 93 +-
core/l10n/id.php | 1 -
core/l10n/is.php | 1 -
core/l10n/it.php | 1 -
core/l10n/ja.php | 1 -
core/l10n/ka_GE.php | 1 -
core/l10n/km.php | 1 -
core/l10n/ko.php | 1 -
core/l10n/lb.php | 1 -
core/l10n/lt_LT.php | 1 -
core/l10n/lv.php | 1 -
core/l10n/mk.php | 1 -
core/l10n/nb_NO.php | 1 -
core/l10n/nl.php | 1 -
core/l10n/nn_NO.php | 1 -
core/l10n/oc.php | 1 -
core/l10n/or_IN.php | 9 +
core/l10n/pa.php | 1 -
core/l10n/pl.php | 1 -
core/l10n/pt_BR.php | 1 -
core/l10n/pt_PT.php | 1 -
core/l10n/ro.php | 3 +-
core/l10n/ru.php | 1 -
core/l10n/si_LK.php | 1 -
core/l10n/sk_SK.php | 2 +-
core/l10n/sl.php | 2 +-
core/l10n/sq.php | 1 -
core/l10n/sr.php | 1 -
core/l10n/sr at latin.php | 1 -
core/l10n/sv.php | 5 +-
core/l10n/ta_LK.php | 1 -
core/l10n/te.php | 1 -
core/l10n/th_TH.php | 1 -
core/l10n/tr.php | 47 +-
core/l10n/uk.php | 8 +-
core/l10n/vi.php | 1 -
core/l10n/zh_CN.php | 1 -
core/l10n/zh_HK.php | 1 -
core/l10n/zh_TW.php | 6 +-
core/setup/controller.php | 2 +-
core/templates/layout.base.php | 2 +-
core/templates/layout.guest.php | 2 +-
core/templates/layout.user.php | 2 +-
l10n/ach/core.po | 106 +-
l10n/ach/files.po | 99 +-
l10n/ach/lib.po | 153 +-
l10n/ach/settings.po | 74 +-
l10n/ady/core.po | 106 +-
l10n/ady/files.po | 99 +-
l10n/ady/lib.po | 153 +-
l10n/ady/settings.po | 74 +-
l10n/af_ZA/core.po | 270 +-
l10n/af_ZA/files.po | 99 +-
l10n/af_ZA/lib.po | 155 +-
l10n/af_ZA/settings.po | 78 +-
l10n/af_ZA/user_ldap.po | 28 +-
l10n/ak/core.po | 106 +-
l10n/ak/files.po | 99 +-
l10n/ak/lib.po | 153 +-
l10n/ak/settings.po | 74 +-
l10n/am_ET/core.po | 106 +-
l10n/am_ET/files.po | 99 +-
l10n/am_ET/lib.po | 153 +-
l10n/am_ET/settings.po | 74 +-
l10n/ar/core.po | 106 +-
l10n/ar/files.po | 101 +-
l10n/ar/files_trashbin.po | 26 +-
l10n/ar/lib.po | 153 +-
l10n/ar/settings.po | 76 +-
l10n/ar/user_ldap.po | 4 +-
l10n/ast/core.po | 82 +-
l10n/ast/files.po | 103 +-
l10n/ast/files_external.po | 16 +-
l10n/ast/files_trashbin.po | 19 +-
l10n/ast/files_versions.po | 11 +-
l10n/ast/lib.po | 155 +-
l10n/ast/settings.po | 78 +-
l10n/ast/user_ldap.po | 75 +-
l10n/az/core.po | 106 +-
l10n/az/files.po | 99 +-
l10n/az/lib.po | 153 +-
l10n/az/settings.po | 74 +-
l10n/be/core.po | 106 +-
l10n/be/files.po | 99 +-
l10n/be/files_trashbin.po | 28 +-
l10n/be/lib.po | 153 +-
l10n/be/settings.po | 74 +-
l10n/be/user_ldap.po | 4 +-
l10n/bg_BG/core.po | 106 +-
l10n/bg_BG/files.po | 101 +-
l10n/bg_BG/files_sharing.po | 8 +-
l10n/bg_BG/files_trashbin.po | 28 +-
l10n/bg_BG/lib.po | 153 +-
l10n/bg_BG/settings.po | 74 +-
l10n/bg_BG/user_ldap.po | 4 +-
l10n/bn_BD/core.po | 106 +-
l10n/bn_BD/files.po | 101 +-
l10n/bn_BD/files_trashbin.po | 28 +-
l10n/bn_BD/lib.po | 153 +-
l10n/bn_BD/settings.po | 74 +-
l10n/bn_BD/user_ldap.po | 4 +-
l10n/bs/core.po | 106 +-
l10n/bs/files.po | 99 +-
l10n/bs/lib.po | 153 +-
l10n/bs/settings.po | 74 +-
l10n/ca/core.po | 108 +-
l10n/ca/files.po | 101 +-
l10n/ca/files_external.po | 30 +-
l10n/ca/files_trashbin.po | 28 +-
l10n/ca/lib.po | 155 +-
l10n/ca/settings.po | 86 +-
l10n/ca/user_ldap.po | 12 +-
l10n/cs_CZ/core.po | 81 +-
l10n/cs_CZ/files.po | 102 +-
l10n/cs_CZ/files_external.po | 31 +-
l10n/cs_CZ/files_trashbin.po | 28 +-
l10n/cs_CZ/lib.po | 139 +-
l10n/cs_CZ/settings.po | 83 +-
l10n/cs_CZ/user_ldap.po | 31 +-
l10n/cy_GB/core.po | 106 +-
l10n/cy_GB/files.po | 101 +-
l10n/cy_GB/files_trashbin.po | 28 +-
l10n/cy_GB/lib.po | 153 +-
l10n/cy_GB/settings.po | 74 +-
l10n/cy_GB/user_ldap.po | 4 +-
l10n/da/core.po | 106 +-
l10n/da/files.po | 101 +-
l10n/da/files_trashbin.po | 28 +-
l10n/da/lib.po | 153 +-
l10n/da/settings.po | 76 +-
l10n/da/user_ldap.po | 4 +-
l10n/de/core.po | 76 +-
l10n/de/files.po | 103 +-
l10n/de/files_trashbin.po | 28 +-
l10n/de/lib.po | 135 +-
l10n/de/settings.po | 76 +-
l10n/de/user_ldap.po | 4 +-
l10n/de_AT/core.po | 106 +-
l10n/de_AT/files.po | 99 +-
l10n/de_AT/lib.po | 153 +-
l10n/de_AT/settings.po | 74 +-
l10n/de_CH/core.po | 106 +-
l10n/de_CH/files.po | 101 +-
l10n/de_CH/files_trashbin.po | 28 +-
l10n/de_CH/lib.po | 153 +-
l10n/de_CH/settings.po | 74 +-
l10n/de_CH/user_ldap.po | 4 +-
l10n/de_DE/core.po | 76 +-
l10n/de_DE/files.po | 105 +-
l10n/de_DE/files_trashbin.po | 28 +-
l10n/de_DE/lib.po | 135 +-
l10n/de_DE/settings.po | 76 +-
l10n/de_DE/user_ldap.po | 4 +-
l10n/el/core.po | 113 +-
l10n/el/files.po | 104 +-
l10n/el/files_trashbin.po | 28 +-
l10n/el/lib.po | 156 +-
l10n/el/settings.po | 104 +-
l10n/el/user_ldap.po | 4 +-
l10n/en at pirate/core.po | 106 +-
l10n/en at pirate/files.po | 99 +-
l10n/en at pirate/lib.po | 153 +-
l10n/en at pirate/settings.po | 74 +-
l10n/en_GB/core.po | 108 +-
l10n/en_GB/files.po | 103 +-
l10n/en_GB/files_trashbin.po | 28 +-
l10n/en_GB/lib.po | 153 +-
l10n/en_GB/settings.po | 84 +-
l10n/en_GB/user_ldap.po | 8 +-
l10n/eo/core.po | 106 +-
l10n/eo/files.po | 101 +-
l10n/eo/files_trashbin.po | 28 +-
l10n/eo/lib.po | 153 +-
l10n/eo/settings.po | 74 +-
l10n/eo/user_ldap.po | 4 +-
l10n/es/core.po | 108 +-
l10n/es/files.po | 104 +-
l10n/es/files_trashbin.po | 26 +-
l10n/es/lib.po | 154 +-
l10n/es/settings.po | 79 +-
l10n/es/user_ldap.po | 33 +-
l10n/es_AR/core.po | 116 +-
l10n/es_AR/files.po | 101 +-
l10n/es_AR/files_encryption.po | 51 +-
l10n/es_AR/files_external.po | 16 +-
l10n/es_AR/files_trashbin.po | 28 +-
l10n/es_AR/lib.po | 153 +-
l10n/es_AR/settings.po | 139 +-
l10n/es_AR/user_ldap.po | 43 +-
l10n/es_CL/core.po | 106 +-
l10n/es_CL/files.po | 105 +-
l10n/es_CL/files_external.po | 16 +-
l10n/es_CL/files_trashbin.po | 28 +-
l10n/es_CL/lib.po | 153 +-
l10n/es_CL/settings.po | 74 +-
l10n/es_CL/user_ldap.po | 4 +-
l10n/{templates/core.pot => es_CR/core.po} | 102 +-
l10n/{ur => es_CR}/files.po | 103 +-
.../files_encryption.po} | 38 +-
l10n/{es_CL => es_CR}/files_external.po | 18 +-
l10n/{bg_BG => es_CR}/files_sharing.po | 12 +-
l10n/{ast => es_CR}/files_trashbin.po | 24 +-
l10n/{ast => es_CR}/files_versions.po | 19 +-
l10n/{ady => es_CR}/lib.po | 157 +-
l10n/{am_ET => es_CR}/settings.po | 78 +-
l10n/{es_CL => es_CR}/user_ldap.po | 12 +-
.../user_webdavauth.po} | 20 +-
l10n/es_MX/core.po | 106 +-
l10n/es_MX/files.po | 101 +-
l10n/es_MX/files_trashbin.po | 28 +-
l10n/es_MX/lib.po | 153 +-
l10n/es_MX/settings.po | 76 +-
l10n/es_MX/user_ldap.po | 4 +-
l10n/et_EE/core.po | 110 +-
l10n/et_EE/files.po | 101 +-
l10n/et_EE/files_external.po | 26 +-
l10n/et_EE/files_trashbin.po | 28 +-
l10n/et_EE/lib.po | 157 +-
l10n/et_EE/settings.po | 82 +-
l10n/et_EE/user_ldap.po | 30 +-
l10n/eu/core.po | 106 +-
l10n/eu/files.po | 101 +-
l10n/eu/files_trashbin.po | 28 +-
l10n/eu/lib.po | 153 +-
l10n/eu/settings.po | 76 +-
l10n/eu/user_ldap.po | 4 +-
l10n/eu_ES/core.po | 106 +-
l10n/eu_ES/files.po | 99 +-
l10n/eu_ES/lib.po | 153 +-
l10n/eu_ES/settings.po | 74 +-
l10n/fa/core.po | 106 +-
l10n/fa/files.po | 101 +-
l10n/fa/files_trashbin.po | 28 +-
l10n/fa/lib.po | 153 +-
l10n/fa/settings.po | 76 +-
l10n/fa/user_ldap.po | 4 +-
l10n/fi_FI/core.po | 108 +-
l10n/fi_FI/files.po | 106 +-
l10n/fi_FI/files_trashbin.po | 28 +-
l10n/fi_FI/lib.po | 163 +-
l10n/fi_FI/settings.po | 84 +-
l10n/fi_FI/user_ldap.po | 4 +-
l10n/fr/core.po | 78 +-
l10n/fr/files.po | 101 +-
l10n/fr/files_trashbin.po | 28 +-
l10n/fr/lib.po | 156 +-
l10n/fr/settings.po | 79 +-
l10n/fr/user_ldap.po | 4 +-
l10n/fr_CA/core.po | 106 +-
l10n/fr_CA/files.po | 99 +-
l10n/fr_CA/lib.po | 153 +-
l10n/fr_CA/settings.po | 74 +-
l10n/gl/core.po | 110 +-
l10n/gl/files.po | 101 +-
l10n/gl/files_trashbin.po | 28 +-
l10n/gl/lib.po | 155 +-
l10n/gl/settings.po | 78 +-
l10n/gl/user_ldap.po | 4 +-
l10n/he/core.po | 106 +-
l10n/he/files.po | 101 +-
l10n/he/files_trashbin.po | 28 +-
l10n/he/lib.po | 153 +-
l10n/he/settings.po | 74 +-
l10n/he/user_ldap.po | 4 +-
l10n/hi/core.po | 106 +-
l10n/hi/files.po | 101 +-
l10n/hi/files_trashbin.po | 28 +-
l10n/hi/lib.po | 153 +-
l10n/hi/settings.po | 74 +-
l10n/hi/user_ldap.po | 4 +-
l10n/hr/core.po | 106 +-
l10n/hr/files.po | 101 +-
l10n/hr/files_trashbin.po | 28 +-
l10n/hr/lib.po | 153 +-
l10n/hr/settings.po | 74 +-
l10n/hr/user_ldap.po | 4 +-
l10n/hu_HU/core.po | 106 +-
l10n/hu_HU/files.po | 101 +-
l10n/hu_HU/files_trashbin.po | 28 +-
l10n/hu_HU/lib.po | 155 +-
l10n/hu_HU/settings.po | 78 +-
l10n/hu_HU/user_ldap.po | 4 +-
l10n/hy/core.po | 106 +-
l10n/hy/files.po | 99 +-
l10n/hy/lib.po | 153 +-
l10n/hy/settings.po | 74 +-
l10n/ia/core.po | 291 +-
l10n/ia/files.po | 103 +-
l10n/ia/files_external.po | 16 +-
l10n/ia/files_trashbin.po | 28 +-
l10n/ia/lib.po | 173 +-
l10n/ia/settings.po | 88 +-
l10n/ia/user_ldap.po | 28 +-
l10n/id/core.po | 106 +-
l10n/id/files.po | 101 +-
l10n/id/files_trashbin.po | 28 +-
l10n/id/lib.po | 153 +-
l10n/id/settings.po | 76 +-
l10n/id/user_ldap.po | 4 +-
l10n/is/core.po | 106 +-
l10n/is/files.po | 101 +-
l10n/is/files_trashbin.po | 28 +-
l10n/is/lib.po | 153 +-
l10n/is/settings.po | 74 +-
l10n/is/user_ldap.po | 4 +-
l10n/it/core.po | 78 +-
l10n/it/files.po | 104 +-
l10n/it/files_trashbin.po | 28 +-
l10n/it/lib.po | 153 +-
l10n/it/settings.po | 80 +-
l10n/it/user_ldap.po | 4 +-
l10n/ja/core.po | 106 +-
l10n/ja/files.po | 101 +-
l10n/ja/files_trashbin.po | 28 +-
l10n/ja/lib.po | 153 +-
l10n/ja/settings.po | 76 +-
l10n/ja/user_ldap.po | 4 +-
l10n/jv/core.po | 106 +-
l10n/jv/files.po | 99 +-
l10n/jv/lib.po | 153 +-
l10n/jv/settings.po | 74 +-
l10n/ka_GE/core.po | 106 +-
l10n/ka_GE/files.po | 101 +-
l10n/ka_GE/files_trashbin.po | 28 +-
l10n/ka_GE/lib.po | 153 +-
l10n/ka_GE/settings.po | 74 +-
l10n/ka_GE/user_ldap.po | 4 +-
l10n/km/core.po | 108 +-
l10n/km/files.po | 101 +-
l10n/km/files_trashbin.po | 28 +-
l10n/km/lib.po | 155 +-
l10n/km/settings.po | 74 +-
l10n/km/user_ldap.po | 6 +-
l10n/kn/core.po | 106 +-
l10n/kn/files.po | 99 +-
l10n/kn/lib.po | 153 +-
l10n/kn/settings.po | 74 +-
l10n/ko/core.po | 106 +-
l10n/ko/files.po | 101 +-
l10n/ko/files_trashbin.po | 28 +-
l10n/ko/lib.po | 153 +-
l10n/ko/settings.po | 76 +-
l10n/ko/user_ldap.po | 4 +-
l10n/ku_IQ/core.po | 106 +-
l10n/ku_IQ/files.po | 101 +-
l10n/ku_IQ/files_trashbin.po | 28 +-
l10n/ku_IQ/lib.po | 153 +-
l10n/ku_IQ/settings.po | 74 +-
l10n/ku_IQ/user_ldap.po | 4 +-
l10n/lb/core.po | 106 +-
l10n/lb/files.po | 101 +-
l10n/lb/files_trashbin.po | 28 +-
l10n/lb/lib.po | 153 +-
l10n/lb/settings.po | 74 +-
l10n/lb/user_ldap.po | 4 +-
l10n/lt_LT/core.po | 106 +-
l10n/lt_LT/files.po | 101 +-
l10n/lt_LT/files_trashbin.po | 28 +-
l10n/lt_LT/lib.po | 153 +-
l10n/lt_LT/settings.po | 76 +-
l10n/lt_LT/user_ldap.po | 4 +-
l10n/lv/core.po | 106 +-
l10n/lv/files.po | 101 +-
l10n/lv/files_trashbin.po | 28 +-
l10n/lv/lib.po | 153 +-
l10n/lv/settings.po | 74 +-
l10n/lv/user_ldap.po | 4 +-
l10n/mk/core.po | 106 +-
l10n/mk/files.po | 101 +-
l10n/mk/files_trashbin.po | 28 +-
l10n/mk/lib.po | 153 +-
l10n/mk/settings.po | 76 +-
l10n/mk/user_ldap.po | 4 +-
l10n/ml/core.po | 106 +-
l10n/ml/files.po | 99 +-
l10n/ml/lib.po | 153 +-
l10n/ml/settings.po | 74 +-
l10n/ml_IN/core.po | 106 +-
l10n/ml_IN/files.po | 99 +-
l10n/ml_IN/lib.po | 153 +-
l10n/ml_IN/settings.po | 74 +-
l10n/mn/core.po | 106 +-
l10n/mn/files.po | 99 +-
l10n/mn/lib.po | 153 +-
l10n/mn/settings.po | 74 +-
l10n/ms_MY/core.po | 106 +-
l10n/ms_MY/files.po | 101 +-
l10n/ms_MY/files_trashbin.po | 28 +-
l10n/ms_MY/lib.po | 153 +-
l10n/ms_MY/settings.po | 74 +-
l10n/ms_MY/user_ldap.po | 4 +-
l10n/my_MM/core.po | 106 +-
l10n/my_MM/files.po | 99 +-
l10n/my_MM/lib.po | 153 +-
l10n/my_MM/settings.po | 74 +-
l10n/nb_NO/core.po | 106 +-
l10n/nb_NO/files.po | 101 +-
l10n/nb_NO/files_trashbin.po | 28 +-
l10n/nb_NO/lib.po | 153 +-
l10n/nb_NO/settings.po | 76 +-
l10n/nb_NO/user_ldap.po | 4 +-
l10n/nds/core.po | 106 +-
l10n/nds/files.po | 99 +-
l10n/nds/lib.po | 153 +-
l10n/nds/settings.po | 74 +-
l10n/ne/core.po | 106 +-
l10n/ne/files.po | 99 +-
l10n/ne/lib.po | 153 +-
l10n/ne/settings.po | 74 +-
l10n/nl/core.po | 108 +-
l10n/nl/files.po | 101 +-
l10n/nl/files_trashbin.po | 28 +-
l10n/nl/lib.po | 155 +-
l10n/nl/settings.po | 76 +-
l10n/nl/user_ldap.po | 4 +-
l10n/nn_NO/core.po | 106 +-
l10n/nn_NO/files.po | 101 +-
l10n/nn_NO/files_trashbin.po | 28 +-
l10n/nn_NO/lib.po | 153 +-
l10n/nn_NO/settings.po | 74 +-
l10n/nn_NO/user_ldap.po | 4 +-
l10n/nqo/core.po | 106 +-
l10n/nqo/files.po | 99 +-
l10n/nqo/lib.po | 153 +-
l10n/nqo/settings.po | 74 +-
l10n/oc/core.po | 106 +-
l10n/oc/files.po | 101 +-
l10n/oc/files_trashbin.po | 28 +-
l10n/oc/lib.po | 153 +-
l10n/oc/settings.po | 74 +-
l10n/oc/user_ldap.po | 4 +-
l10n/{templates/core.pot => or_IN/core.po} | 102 +-
l10n/{ur => or_IN}/files.po | 103 +-
.../files_encryption.po} | 38 +-
l10n/{es_CL => or_IN}/files_external.po | 18 +-
l10n/{bg_BG => or_IN}/files_sharing.po | 12 +-
l10n/{ast => or_IN}/files_trashbin.po | 24 +-
l10n/{ast => or_IN}/files_versions.po | 19 +-
l10n/{ady => or_IN}/lib.po | 157 +-
l10n/{am_ET => or_IN}/settings.po | 78 +-
l10n/{es_CL => or_IN}/user_ldap.po | 12 +-
.../user_webdavauth.po} | 20 +-
l10n/pa/core.po | 106 +-
l10n/pa/files.po | 101 +-
l10n/pa/files_trashbin.po | 28 +-
l10n/pa/lib.po | 153 +-
l10n/pa/settings.po | 74 +-
l10n/pa/user_ldap.po | 4 +-
l10n/pl/core.po | 108 +-
l10n/pl/files.po | 101 +-
l10n/pl/files_trashbin.po | 28 +-
l10n/pl/lib.po | 155 +-
l10n/pl/settings.po | 78 +-
l10n/pl/user_ldap.po | 4 +-
l10n/pt_BR/core.po | 78 +-
l10n/pt_BR/files.po | 101 +-
l10n/pt_BR/files_trashbin.po | 28 +-
l10n/pt_BR/lib.po | 156 +-
l10n/pt_BR/settings.po | 79 +-
l10n/pt_BR/user_ldap.po | 4 +-
l10n/pt_PT/core.po | 106 +-
l10n/pt_PT/files.po | 101 +-
l10n/pt_PT/files_encryption.po | 56 +-
l10n/pt_PT/files_trashbin.po | 28 +-
l10n/pt_PT/lib.po | 153 +-
l10n/pt_PT/settings.po | 76 +-
l10n/pt_PT/user_ldap.po | 4 +-
l10n/ro/core.po | 110 +-
l10n/ro/files.po | 122 +-
l10n/ro/files_trashbin.po | 28 +-
l10n/ro/lib.po | 153 +-
l10n/ro/settings.po | 153 +-
l10n/ro/user_ldap.po | 4 +-
l10n/ru/core.po | 106 +-
l10n/ru/files.po | 104 +-
l10n/ru/files_trashbin.po | 28 +-
l10n/ru/lib.po | 153 +-
l10n/ru/settings.po | 93 +-
l10n/ru/user_ldap.po | 33 +-
l10n/si_LK/core.po | 106 +-
l10n/si_LK/files.po | 101 +-
l10n/si_LK/files_trashbin.po | 28 +-
l10n/si_LK/lib.po | 153 +-
l10n/si_LK/settings.po | 74 +-
l10n/si_LK/user_ldap.po | 4 +-
l10n/sk/core.po | 106 +-
l10n/sk/files.po | 99 +-
l10n/sk/lib.po | 153 +-
l10n/sk/settings.po | 74 +-
l10n/sk_SK/core.po | 108 +-
l10n/sk_SK/files.po | 101 +-
l10n/sk_SK/files_encryption.po | 52 +-
l10n/sk_SK/files_external.po | 34 +-
l10n/sk_SK/files_trashbin.po | 28 +-
l10n/sk_SK/lib.po | 169 +-
l10n/sk_SK/settings.po | 102 +-
l10n/sk_SK/user_ldap.po | 16 +-
l10n/sl/core.po | 108 +-
l10n/sl/files.po | 101 +-
l10n/sl/files_external.po | 26 +-
l10n/sl/files_trashbin.po | 28 +-
l10n/sl/lib.po | 157 +-
l10n/sl/settings.po | 92 +-
l10n/sl/user_ldap.po | 4 +-
l10n/sq/core.po | 106 +-
l10n/sq/files.po | 101 +-
l10n/sq/files_trashbin.po | 28 +-
l10n/sq/lib.po | 153 +-
l10n/sq/settings.po | 74 +-
l10n/sq/user_ldap.po | 4 +-
l10n/sr/core.po | 106 +-
l10n/sr/files.po | 101 +-
l10n/sr/files_trashbin.po | 28 +-
l10n/sr/lib.po | 153 +-
l10n/sr/settings.po | 74 +-
l10n/sr/user_ldap.po | 4 +-
l10n/sr at latin/core.po | 106 +-
l10n/sr at latin/files.po | 101 +-
l10n/sr at latin/files_trashbin.po | 28 +-
l10n/sr at latin/lib.po | 153 +-
l10n/sr at latin/settings.po | 74 +-
l10n/sr at latin/user_ldap.po | 4 +-
l10n/su/core.po | 106 +-
l10n/su/files.po | 99 +-
l10n/su/lib.po | 153 +-
l10n/su/settings.po | 74 +-
l10n/sv/core.po | 113 +-
l10n/sv/files.po | 104 +-
l10n/sv/files_external.po | 23 +-
l10n/sv/files_trashbin.po | 28 +-
l10n/sv/lib.po | 156 +-
l10n/sv/settings.po | 84 +-
l10n/sv/user_ldap.po | 4 +-
l10n/sw_KE/core.po | 106 +-
l10n/sw_KE/files.po | 99 +-
l10n/sw_KE/lib.po | 153 +-
l10n/sw_KE/settings.po | 74 +-
l10n/ta_LK/core.po | 106 +-
l10n/ta_LK/files.po | 101 +-
l10n/ta_LK/files_trashbin.po | 28 +-
l10n/ta_LK/lib.po | 153 +-
l10n/ta_LK/settings.po | 74 +-
l10n/ta_LK/user_ldap.po | 4 +-
l10n/te/core.po | 106 +-
l10n/te/files.po | 99 +-
l10n/te/files_trashbin.po | 28 +-
l10n/te/lib.po | 153 +-
l10n/te/settings.po | 74 +-
l10n/te/user_ldap.po | 4 +-
l10n/templates/core.pot | 74 +-
l10n/templates/files.pot | 97 +-
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 2 +-
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_trashbin.pot | 12 +-
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 131 +-
l10n/templates/private.pot | 123 +-
l10n/templates/settings.pot | 72 +-
l10n/templates/user_ldap.pot | 24 +-
l10n/templates/user_webdavauth.pot | 2 +-
l10n/th_TH/core.po | 106 +-
l10n/th_TH/files.po | 101 +-
l10n/th_TH/files_trashbin.po | 28 +-
l10n/th_TH/lib.po | 153 +-
l10n/th_TH/settings.po | 74 +-
l10n/th_TH/user_ldap.po | 4 +-
l10n/tr/core.po | 124 +-
l10n/tr/files.po | 106 +-
l10n/tr/files_sharing.po | 6 +-
l10n/tr/files_trashbin.po | 4 +-
l10n/tr/lib.po | 167 +-
l10n/tr/settings.po | 84 +-
l10n/tr/user_ldap.po | 4 +-
l10n/tzm/core.po | 106 +-
l10n/tzm/files.po | 99 +-
l10n/tzm/lib.po | 153 +-
l10n/tzm/settings.po | 74 +-
l10n/ug/core.po | 106 +-
l10n/ug/files.po | 101 +-
l10n/ug/files_trashbin.po | 28 +-
l10n/ug/lib.po | 153 +-
l10n/ug/settings.po | 74 +-
l10n/ug/user_ldap.po | 4 +-
l10n/uk/core.po | 123 +-
l10n/uk/files.po | 103 +-
l10n/uk/files_trashbin.po | 28 +-
l10n/uk/lib.po | 153 +-
l10n/uk/settings.po | 84 +-
l10n/uk/user_ldap.po | 4 +-
l10n/ur/core.po | 106 +-
l10n/ur/files.po | 99 +-
l10n/ur/lib.po | 153 +-
l10n/ur/settings.po | 74 +-
l10n/ur_PK/core.po | 106 +-
l10n/ur_PK/files.po | 99 +-
l10n/ur_PK/files_trashbin.po | 28 +-
l10n/ur_PK/lib.po | 153 +-
l10n/ur_PK/settings.po | 74 +-
l10n/ur_PK/user_ldap.po | 4 +-
l10n/uz/core.po | 106 +-
l10n/uz/files.po | 99 +-
l10n/uz/lib.po | 153 +-
l10n/uz/settings.po | 74 +-
l10n/vi/core.po | 106 +-
l10n/vi/files.po | 101 +-
l10n/vi/files_trashbin.po | 28 +-
l10n/vi/lib.po | 153 +-
l10n/vi/settings.po | 74 +-
l10n/vi/user_ldap.po | 4 +-
l10n/zh_CN/core.po | 106 +-
l10n/zh_CN/files.po | 101 +-
l10n/zh_CN/files_trashbin.po | 28 +-
l10n/zh_CN/lib.po | 153 +-
l10n/zh_CN/settings.po | 76 +-
l10n/zh_CN/user_ldap.po | 4 +-
l10n/zh_HK/core.po | 106 +-
l10n/zh_HK/files.po | 105 +-
l10n/zh_HK/files_external.po | 16 +-
l10n/zh_HK/files_trashbin.po | 28 +-
l10n/zh_HK/lib.po | 153 +-
l10n/zh_HK/settings.po | 76 +-
l10n/zh_HK/user_ldap.po | 4 +-
l10n/zh_TW/core.po | 116 +-
l10n/zh_TW/files.po | 101 +-
l10n/zh_TW/files_encryption.po | 54 +-
l10n/zh_TW/files_external.po | 16 +-
l10n/zh_TW/files_trashbin.po | 28 +-
l10n/zh_TW/lib.po | 153 +-
l10n/zh_TW/settings.po | 185 +-
l10n/zh_TW/user_ldap.po | 4 +-
lib/base.php | 69 +-
lib/l10n/af_ZA.php | 1 +
lib/l10n/ca.php | 1 +
lib/l10n/cs_CZ.php | 10 +
lib/l10n/de.php | 18 +
lib/l10n/de_DE.php | 18 +
lib/l10n/el.php | 2 +-
lib/l10n/en_GB.php | 21 +
lib/l10n/es.php | 17 +
lib/l10n/{af_ZA.php => es_CR.php} | 6 -
lib/l10n/et_EE.php | 22 +
lib/l10n/fi_FI.php | 14 +
lib/l10n/fr.php | 17 +
lib/l10n/gl.php | 23 +-
lib/l10n/ia.php | 14 +-
lib/l10n/it.php | 21 +
lib/l10n/{af_ZA.php => or_IN.php} | 6 -
lib/l10n/pl.php | 18 +
lib/l10n/pt_BR.php | 21 +
lib/l10n/sk_SK.php | 20 +-
lib/l10n/sl.php | 14 +-
lib/l10n/sv.php | 18 +
lib/l10n/tr.php | 35 +-
lib/private/activitymanager.php | 2 +-
lib/private/api.php | 4 +-
lib/private/app.php | 19 +-
lib/private/appconfig.php | 1 +
.../middleware/security/securitymiddleware.php | 2 +-
lib/private/archive.php | 7 +-
lib/private/arrayparser.php | 13 +
lib/private/cache/file.php | 2 +-
.../sabre/aborteduploaddetectionplugin.php | 33 +-
lib/private/connector/sabre/directory.php | 56 +-
lib/private/connector/sabre/file.php | 81 +-
lib/private/connector/sabre/node.php | 169 +-
lib/private/connector/sabre/objecttree.php | 109 +-
lib/private/connector/sabre/quotaplugin.php | 35 +-
lib/private/contactsmanager.php | 7 +-
lib/private/filechunking.php | 7 +-
lib/private/files.php | 5 +-
lib/private/files/cache/scanner.php | 7 +-
lib/private/files/filesystem.php | 3 +
lib/private/files/mount/manager.php | 7 +
lib/private/files/mount/mount.php | 7 +
lib/private/files/storage/common.php | 3 +
lib/private/files/storage/local.php | 6 +-
lib/private/files/storage/mappedlocal.php | 3 +
lib/private/files/type/detection.php | 40 +-
lib/private/files/view.php | 54 +-
lib/private/geo.php | 12 +-
lib/private/group.php | 11 +
lib/private/group/group.php | 12 -
lib/private/group/manager.php | 6 -
lib/private/helper.php | 12 +-
lib/private/image.php | 6 +-
lib/private/json.php | 7 +-
lib/private/l10n.php | 33 +-
lib/private/migrate.php | 39 +-
lib/private/migration/content.php | 2 +-
lib/private/mimetypes.list.php | 215 +-
lib/private/ocs.php | 29 +-
lib/private/ocsclient.php | 17 +-
lib/private/preview.php | 16 +
lib/private/preview/movies.php | 37 +-
lib/private/request.php | 5 +-
lib/private/response.php | 2 +-
lib/private/route/cachingrouter.php | 3 +-
lib/private/route/route.php | 6 +
lib/private/route/router.php | 7 +
lib/private/search.php | 2 +-
lib/private/share/constants.php | 8 +-
lib/private/share/helper.php | 49 +
lib/private/share/share.php | 307 +-
lib/private/subadmin.php | 22 +-
lib/private/template.php | 27 +-
lib/private/templatelayout.php | 45 +-
lib/private/urlgenerator.php | 4 +-
lib/private/user.php | 11 +-
lib/private/user/database.php | 105 +-
lib/private/user/manager.php | 14 -
lib/private/util.php | 15 +-
lib/private/vobject.php | 59 +-
.../appframework/http/downloadresponse.php | 2 +-
lib/public/appframework/http/jsonresponse.php | 1 -
.../appframework/http/redirectresponse.php | 2 +-
lib/public/route/iroute.php | 6 +
lib/public/route/irouter.php | 6 +
lib/public/share.php | 23 +-
lib/public/template.php | 2 +-
lib/public/util.php | 21 +-
settings/admin.php | 6 +-
settings/css/settings.css | 1 +
settings/js/apps-custom.php | 4 +-
settings/l10n/af_ZA.php | 2 +
settings/l10n/ar.php | 1 -
settings/l10n/ast.php | 2 +
settings/l10n/ca.php | 6 +-
settings/l10n/cs_CZ.php | 7 +-
settings/l10n/da.php | 1 -
settings/l10n/de.php | 2 +-
settings/l10n/de_DE.php | 2 +-
settings/l10n/el.php | 29 +-
settings/l10n/en_GB.php | 10 +-
settings/l10n/es.php | 5 +-
settings/l10n/es_AR.php | 33 +-
settings/l10n/es_MX.php | 1 -
settings/l10n/et_EE.php | 8 +-
settings/l10n/eu.php | 1 -
settings/l10n/fa.php | 1 -
settings/l10n/fi_FI.php | 9 +-
settings/l10n/fr.php | 5 +-
settings/l10n/gl.php | 5 +-
settings/l10n/hu_HU.php | 1 -
settings/l10n/ia.php | 7 +
settings/l10n/id.php | 1 -
settings/l10n/it.php | 5 +-
settings/l10n/ja.php | 1 -
settings/l10n/ko.php | 1 -
settings/l10n/lt_LT.php | 1 -
settings/l10n/mk.php | 1 -
settings/l10n/nb_NO.php | 1 -
settings/l10n/nl.php | 2 +-
settings/l10n/pl.php | 2 +-
settings/l10n/pt_BR.php | 5 +-
settings/l10n/pt_PT.php | 1 -
settings/l10n/ro.php | 40 +
settings/l10n/ru.php | 9 +-
settings/l10n/sk_SK.php | 17 +-
settings/l10n/sl.php | 10 +-
settings/l10n/sv.php | 9 +-
settings/l10n/tr.php | 11 +-
settings/l10n/uk.php | 4 +
settings/l10n/zh_CN.php | 1 -
settings/l10n/zh_HK.php | 1 +
settings/l10n/zh_TW.php | 56 +-
settings/templates/admin.php | 21 +-
status.php | 2 +-
.../lib/appframework/http/DownloadResponseTest.php | 2 +-
tests/lib/appframework/http/JSONResponseTest.php | 7 -
.../lib/appframework/http/RedirectResponseTest.php | 2 +-
.../middleware/security/SecurityMiddlewareTest.php | 2 +-
.../sabre/aborteduploaddetectionplugin.php | 27 +-
tests/lib/connector/sabre/directory.php | 22 +-
tests/lib/connector/sabre/file.php | 77 +-
tests/lib/connector/sabre/objecttree.php | 15 +-
tests/lib/connector/sabre/quotaplugin.php | 23 +-
tests/lib/group/group.php | 2 +-
tests/lib/group/manager.php | 2 +-
tests/lib/helper.php | 12 +
tests/lib/share/helper.php | 54 +
tests/lib/template.php | 18 +-
tests/lib/user/manager.php | 2 +-
tests/lib/util.php | 25 +-
tests/startsessionlistener.php | 3 +
tests/testcleanuplistener.php | 36 +-
version.php | 4 +-
1045 files changed, 44739 insertions(+), 20544 deletions(-)
diff --cc apps/files_sharing/lib/share/file.php
index c375579,c0c9e0c..2c59bd3
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@@ -147,44 -152,49 +152,54 @@@ class OC_Share_Backend_File implements
}
/**
- * @param string $target
+ * @brief resolve reshares to return the correct source item
+ * @param array $source
+ * @return array source item
*/
- public static function getSource($target) {
- if ($target == '') {
- return false;
+ protected static function resolveReshares($source) {
+ if (isset($source['parent'])) {
+ $parent = $source['parent'];
+ while (isset($parent)) {
+ $query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+ $item = $query->execute(array($parent))->fetchRow();
+ if (isset($item['parent'])) {
+ $parent = $item['parent'];
+ } else {
+ $fileOwner = $item['uid_owner'];
+ break;
+ }
+ }
+ } else {
+ $fileOwner = $source['uid_owner'];
}
- $target = '/'.$target;
- $target = rtrim($target, '/');
- $pos = strpos($target, '/', 1);
- // Get shared folder name
- if ($pos !== false) {
- $folder = substr($target, 0, $pos);
- $source = \OCP\Share::getItemSharedWith('folder', $folder, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
- if ($source) {
- $source['path'] = $source['path'].substr($target, strlen($folder));
+ if (isset($fileOwner)) {
+ $source['fileOwner'] = $fileOwner;
+ } else {
+ \OCP\Util::writeLog('files_sharing', "No owner found for reshare", \OCP\Util::ERROR);
+ }
+
+ return $source;
+ }
+
++ /**
++ * @param string $target
++ * @param string $mountPoint
++ * @param string $itemType
++ * @return array|false source item
++ */
+ public static function getSource($target, $mountPoint, $itemType) {
-
+ if ($itemType === 'folder') {
+ $source = \OCP\Share::getItemSharedWith('folder', $mountPoint, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
+ if ($source && $target !== '') {
+ $source['path'] = $source['path'].'/'.$target;
}
} else {
- $source = \OCP\Share::getItemSharedWith('file', $target, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
+ $source = \OCP\Share::getItemSharedWith('file', $mountPoint, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
}
if ($source) {
- if (isset($source['parent'])) {
- $parent = $source['parent'];
- while (isset($parent)) {
- $query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
- $item = $query->execute(array($parent))->fetchRow();
- if (isset($item['parent'])) {
- $parent = $item['parent'];
- } else {
- $fileOwner = $item['uid_owner'];
- break;
- }
- }
- } else {
- $fileOwner = $source['uid_owner'];
- }
- $source['fileOwner'] = $fileOwner;
- return $source;
+ return self::resolveReshares($source);
}
+
\OCP\Util::writeLog('files_sharing', 'File source not found for: '.$target, \OCP\Util::DEBUG);
return false;
}
diff --cc lib/private/share/share.php
index d9425b7,c0ce3a1..21876bb
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@@ -668,14 -751,15 +752,15 @@@ class Share extends \OC\Share\Constant
/**
* Set the permissions of an item for a specific user or group
- * @param string Item type
- * @param string Item source
- * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
- * @param string User or group the item is being shared with
- * @param int CRUDS permissions
- * @return Returns true on success or false on failure
+ * @param string $itemType
+ * @param string $itemSource
+ * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+ * @param string $shareWith User or group the item is being shared with
+ * @param int $permissions CRUDS permissions
+ * @return boolean true on success or false on failure
*/
public static function setPermissions($itemType, $itemSource, $shareType, $shareWith, $permissions) {
+ $l = \OC_L10N::get('lib');
if ($item = self::getItems($itemType, $itemSource, $shareType, $shareWith,
\OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) {
// Check if this item is a reshare and verify that the permissions
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list