Merge branch 'master' of https://github.com/owncloud/core into downstream-160614

23 files changed, 136 insertions, 13 deletions

diff --git a/apps/comments/l10n/ca.js b/apps/comments/l10n/ca.js
index a0d508f0afd..9ad9f962572 100644
--- a/apps/comments/l10n/ca.js
+++ b/apps/comments/l10n/ca.js
@@ -1,8 +1,23 @@
 OC.L10N.register(
     "comments",
     {
+    "Type in a new comment..." : "Escriu en un nou comentari...",
+    "Delete comment" : "Esborrar comentari",
+    "Post" : "Publica",
     "Cancel" : "Cancel·la",
+    "Edit comment" : "Editar comentari",
+    "[Deleted user]" : "[usuari Esborrat]",
+    "Comments" : "Comentaris",
+    "No other comments available" : "No hi han altres comentaris disponibles",
+    "More comments..." : "Més comentaris",
     "Save" : "Desa",
-    "Comment" : "Comentari"
+    "Allowed characters {count} of {max}" : "caracters Permessos {count} de {max}",
+    "{count} unread comments" : "{count} comentaris no llegits",
+    "Comment" : "Comentari",
+    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentaris</strong> per arxius <em>(sempre llistat en corrent)",
+    "You commented" : "Has comentat",
+    "%1$s commented" : "%1$s comentat",
+    "You commented on %2$s" : "Has comentat a %2$s",
+    "%1$s commented on %2$s" : "%1$s ha comentat a %2$s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/comments/l10n/ca.json b/apps/comments/l10n/ca.json
index 2bfdc24610b..f6df3abce3b 100644
--- a/apps/comments/l10n/ca.json
+++ b/apps/comments/l10n/ca.json
@@ -1,6 +1,21 @@
 { "translations": {
+    "Type in a new comment..." : "Escriu en un nou comentari...",
+    "Delete comment" : "Esborrar comentari",
+    "Post" : "Publica",
     "Cancel" : "Cancel·la",
+    "Edit comment" : "Editar comentari",
+    "[Deleted user]" : "[usuari Esborrat]",
+    "Comments" : "Comentaris",
+    "No other comments available" : "No hi han altres comentaris disponibles",
+    "More comments..." : "Més comentaris",
     "Save" : "Desa",
-    "Comment" : "Comentari"
+    "Allowed characters {count} of {max}" : "caracters Permessos {count} de {max}",
+    "{count} unread comments" : "{count} comentaris no llegits",
+    "Comment" : "Comentari",
+    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentaris</strong> per arxius <em>(sempre llistat en corrent)",
+    "You commented" : "Has comentat",
+    "%1$s commented" : "%1$s comentat",
+    "You commented on %2$s" : "Has comentat a %2$s",
+    "%1$s commented on %2$s" : "%1$s ha comentat a %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/comments/l10n/oc.js b/apps/comments/l10n/oc.js
index 7311b7fd7a4..94b99dfa366 100644
--- a/apps/comments/l10n/oc.js
+++ b/apps/comments/l10n/oc.js
@@ -1,8 +1,23 @@
 OC.L10N.register(
     "comments",
     {
+    "Type in a new comment..." : "Escriure un comentari novèl...",
+    "Delete comment" : "Suprimir lo comentari",
+    "Post" : "Mandar",
     "Cancel" : "Anullar",
+    "Edit comment" : "Modificar lo comentari",
+    "[Deleted user]" : "[Utilizaire suprimit]",
+    "Comments" : "Comentaris",
+    "No other comments available" : "Pas cap d'autre comentari",
+    "More comments..." : "Mai de comentaris...",
     "Save" : "Enregistrar",
-    "Comment" : "Comentar"
+    "Allowed characters {count} of {max}" : "{count} sus {max} caractèrs autorizats",
+    "{count} unread comments" : "{count} comentaris pas legits",
+    "Comment" : "Comentar",
+    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentaris</strong> pels fichièrs <em>(totjorn listats dins lo flux)</em>",
+    "You commented" : "Avètz comentat",
+    "%1$s commented" : "%1$s a comentat",
+    "You commented on %2$s" : "Avètz comentat %2$s",
+    "%1$s commented on %2$s" : "%1$s a comentat %2$s"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/comments/l10n/oc.json b/apps/comments/l10n/oc.json
index 21f0098bf30..229d863ffc1 100644
--- a/apps/comments/l10n/oc.json
+++ b/apps/comments/l10n/oc.json
@@ -1,6 +1,21 @@
 { "translations": {
+    "Type in a new comment..." : "Escriure un comentari novèl...",
+    "Delete comment" : "Suprimir lo comentari",
+    "Post" : "Mandar",
     "Cancel" : "Anullar",
+    "Edit comment" : "Modificar lo comentari",
+    "[Deleted user]" : "[Utilizaire suprimit]",
+    "Comments" : "Comentaris",
+    "No other comments available" : "Pas cap d'autre comentari",
+    "More comments..." : "Mai de comentaris...",
     "Save" : "Enregistrar",
-    "Comment" : "Comentar"
+    "Allowed characters {count} of {max}" : "{count} sus {max} caractèrs autorizats",
+    "{count} unread comments" : "{count} comentaris pas legits",
+    "Comment" : "Comentar",
+    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentaris</strong> pels fichièrs <em>(totjorn listats dins lo flux)</em>",
+    "You commented" : "Avètz comentat",
+    "%1$s commented" : "%1$s a comentat",
+    "You commented on %2$s" : "Avètz comentat %2$s",
+    "%1$s commented on %2$s" : "%1$s a comentat %2$s"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/federatedfilesharing/l10n/ar.js b/apps/federatedfilesharing/l10n/ar.js
index 451663a7b6b..799c279a416 100644
--- a/apps/federatedfilesharing/l10n/ar.js
+++ b/apps/federatedfilesharing/l10n/ar.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "federatedfilesharing",
     {
-    "Invalid Federated Cloud ID" : "معرّف السحابة المتحدة غير صالح"
+    "Invalid Federated Cloud ID" : "معرّف السحابة المتحدة غير صالح",
+    "Accept" : "قبول"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/federatedfilesharing/l10n/ar.json b/apps/federatedfilesharing/l10n/ar.json
index 630ab95f64b..2b2cb7401b1 100644
--- a/apps/federatedfilesharing/l10n/ar.json
+++ b/apps/federatedfilesharing/l10n/ar.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "Invalid Federated Cloud ID" : "معرّف السحابة المتحدة غير صالح"
+    "Invalid Federated Cloud ID" : "معرّف السحابة المتحدة غير صالح",
+    "Accept" : "قبول"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
\ No newline at end of file
diff --git a/apps/federatedfilesharing/l10n/oc.js b/apps/federatedfilesharing/l10n/oc.js
index d491a9eb1b7..fa9cb75d400 100644
--- a/apps/federatedfilesharing/l10n/oc.js
+++ b/apps/federatedfilesharing/l10n/oc.js
@@ -1,8 +1,10 @@
 OC.L10N.register(
     "federatedfilesharing",
     {
+    "Federated sharing" : "Federated sharing",
     "Invalid Federated Cloud ID" : "ID Federated Cloud incorrècte",
     "Sharing %s failed, because this item is already shared with %s" : "Lo partiment de %s a fracassat perque aqueste objècte es ja partejat amb %s",
+    "File is already shared with %s" : "Lo fichièr es ja partejat amb %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Lo partiment de %s a fracassat : impossible de trobar %s. Benlèu que lo servidor es momentanèament injonhable.",
     "Accept" : "Acceptar",
     "Decline" : "Refusar",
@@ -17,6 +19,6 @@ OC.L10N.register(
     "Share it:" : "Partejar :",
     "Add to your website" : "Apondre a vòstre site web",
     "Share with me via ownCloud" : "Partejatz amb ieu via ownCloud",
-    "HTML Code:" : "Còde HTML :"
+    "HTML Code:" : "Còdi HTML :"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/federatedfilesharing/l10n/oc.json b/apps/federatedfilesharing/l10n/oc.json
index 8047f9fc5bc..452df9dfbc5 100644
--- a/apps/federatedfilesharing/l10n/oc.json
+++ b/apps/federatedfilesharing/l10n/oc.json
@@ -1,6 +1,8 @@
 { "translations": {
+    "Federated sharing" : "Federated sharing",
     "Invalid Federated Cloud ID" : "ID Federated Cloud incorrècte",
     "Sharing %s failed, because this item is already shared with %s" : "Lo partiment de %s a fracassat perque aqueste objècte es ja partejat amb %s",
+    "File is already shared with %s" : "Lo fichièr es ja partejat amb %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Lo partiment de %s a fracassat : impossible de trobar %s. Benlèu que lo servidor es momentanèament injonhable.",
     "Accept" : "Acceptar",
     "Decline" : "Refusar",
@@ -15,6 +17,6 @@
     "Share it:" : "Partejar :",
     "Add to your website" : "Apondre a vòstre site web",
     "Share with me via ownCloud" : "Partejatz amb ieu via ownCloud",
-    "HTML Code:" : "Còde HTML :"
+    "HTML Code:" : "Còdi HTML :"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/federation/l10n/ar.js b/apps/federation/l10n/ar.js
new file mode 100644
index 00000000000..ab3d48c9856
--- /dev/null
+++ b/apps/federation/l10n/ar.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "federation",
+    {
+    "Server added to the list of trusted ownClouds" : "تمت إضافة الخادم إلى قائمة مضيفات ownCloud الموثوق بها",
+    "Server is already in the list of trusted servers." : "الخادم موجود بالفعل في قائمة مضيفات ownCloud الموثوق بها",
+    "No ownCloud server found" : "لم يتم العثور على خادم ownCloud",
+    "Could not add server" : "تعذَّرت إضافة خادم",
+    "Federation" : "الاتحاد",
+    "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "يتيح لك اتحاد مضيفات ownCloud الاتصال بخادمات ownCloud الأخرى الموثوق بها لتبادل دليل المستخدمين.  على سبيل المثال ، يتيح الاتحاد خدمة الإكمال التلقائي للمستخدمين الخارجيين لتمكين المشاركة في الاتحاد.",
+    "Add server automatically once a federated share was created successfully" : "أضف الخادم تلقائياً حال نجاح إنشاء حصة في الاتحاد",
+    "Trusted ownCloud Servers" : "خادمات ownCloud الموثوق بها",
+    "+ Add ownCloud server" : "+ أضف خادم ownCloud",
+    "ownCloud Server" : "خادم ownCloud"
+},
+"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/federation/l10n/ar.json b/apps/federation/l10n/ar.json
new file mode 100644
index 00000000000..dc62c5d54f9
--- /dev/null
+++ b/apps/federation/l10n/ar.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Server added to the list of trusted ownClouds" : "تمت إضافة الخادم إلى قائمة مضيفات ownCloud الموثوق بها",
+    "Server is already in the list of trusted servers." : "الخادم موجود بالفعل في قائمة مضيفات ownCloud الموثوق بها",
+    "No ownCloud server found" : "لم يتم العثور على خادم ownCloud",
+    "Could not add server" : "تعذَّرت إضافة خادم",
+    "Federation" : "الاتحاد",
+    "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "يتيح لك اتحاد مضيفات ownCloud الاتصال بخادمات ownCloud الأخرى الموثوق بها لتبادل دليل المستخدمين.  على سبيل المثال ، يتيح الاتحاد خدمة الإكمال التلقائي للمستخدمين الخارجيين لتمكين المشاركة في الاتحاد.",
+    "Add server automatically once a federated share was created successfully" : "أضف الخادم تلقائياً حال نجاح إنشاء حصة في الاتحاد",
+    "Trusted ownCloud Servers" : "خادمات ownCloud الموثوق بها",
+    "+ Add ownCloud server" : "+ أضف خادم ownCloud",
+    "ownCloud Server" : "خادم ownCloud"
+},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ar.js b/apps/files/l10n/ar.js
index ae180fca235..c6de04b886d 100644
--- a/apps/files/l10n/ar.js
+++ b/apps/files/l10n/ar.js
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "لا يوجد مساحة تخزين كافية، انت تقوم برفع {size1} ولكن المساحه المتوفره هي {size2}.",
     "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم",
     "Uploading..." : "ترفيع...",
+    "..." : "...",
     "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
     "Actions" : "* تطبيقات.\n* أنشطة.",
     "Download" : "تحميل",
diff --git a/apps/files/l10n/ar.json b/apps/files/l10n/ar.json
index 257aa4f1bb4..3e035b9657f 100644
--- a/apps/files/l10n/ar.json
+++ b/apps/files/l10n/ar.json
@@ -28,6 +28,7 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "لا يوجد مساحة تخزين كافية، انت تقوم برفع {size1} ولكن المساحه المتوفره هي {size2}.",
     "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم",
     "Uploading..." : "ترفيع...",
+    "..." : "...",
     "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
     "Actions" : "* تطبيقات.\n* أنشطة.",
     "Download" : "تحميل",
diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js
index 3299e21d293..97a5c5b7c84 100644
--- a/apps/files/l10n/cs_CZ.js
+++ b/apps/files/l10n/cs_CZ.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "Invalid directory." : "Neplatný adresář",
     "Files" : "Soubory",
     "All files" : "Všechny soubory",
+    "File could not be found" : "Soubor nelze nalézt",
     "Home" : "Domů",
     "Close" : "Zavřít",
     "Favorites" : "Oblíbené",
diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json
index 5e138e22596..e504862e0d3 100644
--- a/apps/files/l10n/cs_CZ.json
+++ b/apps/files/l10n/cs_CZ.json
@@ -19,6 +19,7 @@
     "Invalid directory." : "Neplatný adresář",
     "Files" : "Soubory",
     "All files" : "Všechny soubory",
+    "File could not be found" : "Soubor nelze nalézt",
     "Home" : "Domů",
     "Close" : "Zavřít",
     "Favorites" : "Oblíbené",
diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js
index ca13a127ad7..bf0b9b54503 100644
--- a/apps/files/l10n/es.js
+++ b/apps/files/l10n/es.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "Invalid directory." : "Directorio inválido.",
     "Files" : "Archivos",
     "All files" : "Todos los archivos",
+    "File could not be found" : "El archivo no se ha encontrado",
     "Home" : "Particular",
     "Close" : "Cerrar",
     "Favorites" : "Favoritos",
diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json
index fd70a4da0e6..d623ed90c96 100644
--- a/apps/files/l10n/es.json
+++ b/apps/files/l10n/es.json
@@ -19,6 +19,7 @@
     "Invalid directory." : "Directorio inválido.",
     "Files" : "Archivos",
     "All files" : "Todos los archivos",
+    "File could not be found" : "El archivo no se ha encontrado",
     "Home" : "Particular",
     "Close" : "Cerrar",
     "Favorites" : "Favoritos",
diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js
index 1121536e719..4696c49e99d 100644
--- a/apps/files/l10n/ru.js
+++ b/apps/files/l10n/ru.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "Invalid directory." : "Неверный каталог.",
     "Files" : "Файлы",
     "All files" : "Все файлы",
+    "File could not be found" : "Файл не может быть найден",
     "Home" : "Главная",
     "Close" : "Закрыть",
     "Favorites" : "Избранное",
diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json
index 41162bf5c92..49b7814c6a3 100644
--- a/apps/files/l10n/ru.json
+++ b/apps/files/l10n/ru.json
@@ -19,6 +19,7 @@
     "Invalid directory." : "Неверный каталог.",
     "Files" : "Файлы",
     "All files" : "Все файлы",
+    "File could not be found" : "Файл не может быть найден",
     "Home" : "Главная",
     "Close" : "Закрыть",
     "Favorites" : "Избранное",
diff --git a/apps/updatenotification/l10n/ar.js b/apps/updatenotification/l10n/ar.js
index 3052bb4a6e3..6e5bc4f0608 100644
--- a/apps/updatenotification/l10n/ar.js
+++ b/apps/updatenotification/l10n/ar.js
@@ -1,6 +1,16 @@
 OC.L10N.register(
     "updatenotification",
     {
-    "Updater" : "برنامج التحديث"
+    "Update notifications" : "إشعارات التحديث",
+    "{version} is available. Get more information on how to update." : "{version} متوفر.  أحصل على معلومات كيفية التحديث.",
+    "Updated channel" : "قناة محدَّثة.",
+    "ownCloud core" : "نواة ownCloud",
+    "Update for %1$s to version %2$s is available." : "التحديث من النسخة %1$s إلى %2$s متوفر.",
+    "Updater" : "برنامج التحديث",
+    "A new version is available: %s" : "توجد نسخة جديدة: %s",
+    "Open updater" : "فتح المحدِّث",
+    "Your version is up to date." : "النسخة لديك هي الأحدث.",
+    "Update channel:" : "قناة التحديث:",
+    "Notify members of the following groups about available updates:" : "إشعار أعضاء المجموعات التالية بتوفر التحديثات:"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/updatenotification/l10n/ar.json b/apps/updatenotification/l10n/ar.json
index e6b0f28e879..a7be834fc2a 100644
--- a/apps/updatenotification/l10n/ar.json
+++ b/apps/updatenotification/l10n/ar.json
@@ -1,4 +1,14 @@
 { "translations": {
-    "Updater" : "برنامج التحديث"
+    "Update notifications" : "إشعارات التحديث",
+    "{version} is available. Get more information on how to update." : "{version} متوفر.  أحصل على معلومات كيفية التحديث.",
+    "Updated channel" : "قناة محدَّثة.",
+    "ownCloud core" : "نواة ownCloud",
+    "Update for %1$s to version %2$s is available." : "التحديث من النسخة %1$s إلى %2$s متوفر.",
+    "Updater" : "برنامج التحديث",
+    "A new version is available: %s" : "توجد نسخة جديدة: %s",
+    "Open updater" : "فتح المحدِّث",
+    "Your version is up to date." : "النسخة لديك هي الأحدث.",
+    "Update channel:" : "قناة التحديث:",
+    "Notify members of the following groups about available updates:" : "إشعار أعضاء المجموعات التالية بتوفر التحديثات:"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
\ No newline at end of file
diff --git a/apps/updatenotification/l10n/sl.js b/apps/updatenotification/l10n/sl.js
index 8efd2561d12..12ba787e5e4 100644
--- a/apps/updatenotification/l10n/sl.js
+++ b/apps/updatenotification/l10n/sl.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "updatenotification",
     {
-    "Update notifications" : "Posodobite obvestila",
+    "Update notifications" : "Posodobi obvestila",
     "{version} is available. Get more information on how to update." : "Na voljo je nova različica {version}. Na voljo je več podrobnosti o nadgradnji.",
     "Updated channel" : "Posodobljen kanal",
     "Update for %1$s to version %2$s is available." : "Posodobitev %1$s na različico %2$s je na voljo.",
diff --git a/apps/updatenotification/l10n/sl.json b/apps/updatenotification/l10n/sl.json
index 2cda20b2a88..ecc0e3519d4 100644
--- a/apps/updatenotification/l10n/sl.json
+++ b/apps/updatenotification/l10n/sl.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Update notifications" : "Posodobite obvestila",
+    "Update notifications" : "Posodobi obvestila",
     "{version} is available. Get more information on how to update." : "Na voljo je nova različica {version}. Na voljo je več podrobnosti o nadgradnji.",
     "Updated channel" : "Posodobljen kanal",
     "Update for %1$s to version %2$s is available." : "Posodobitev %1$s na različico %2$s je na voljo.",
diff --git a/apps/user_ldap/lib/Proxy.php b/apps/user_ldap/lib/Proxy.php
index 4f6a04daad2..2af55430b7b 100644
--- a/apps/user_ldap/lib/Proxy.php
+++ b/apps/user_ldap/lib/Proxy.php
@@ -30,6 +30,7 @@ namespace OCA\User_LDAP;
 
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\Mapping\GroupMapping;
+use OCA\User_LDAP\User\Manager;
 
 abstract class Proxy {
 	static private $accesses = array();
@@ -72,7 +73,7 @@ abstract class Proxy {
 			$coreUserManager = \OC::$server->getUserManager();
 		}
 		$userManager =
-			new user\Manager($ocConfig, $fs, $log, $avatarM, new \OCP\Image(), $db, $coreUserManager);
+			new Manager($ocConfig, $fs, $log, $avatarM, new \OCP\Image(), $db, $coreUserManager);
 		$connector = new Connection($this->ldap, $configPrefix);
 		$access = new Access($connector, $this->ldap, $userManager);
 		$access->setUserMapper($userMap);