Show conflict warning when user_ldap and user_webdavauth are enabled

diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 0eec7829a4a7cb2b6d529a169a976db172dc8511..ce3079da0ba9a5dd598147ab478dced10000b38f 100644 (file)
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -42,3 +42,6 @@ $entry = array(
 );
 
 OCP\Backgroundjob::addRegularTask('OCA\user_ldap\lib\Jobs', 'updateGroups');
+if(OCP\App::isEnabled('user_webdavauth')) {
+       OCP\Util::writeLog('user_ldap', 'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour', OCP\Util::WARN);
+}

diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index 30fbf687dbedbbb76925caee3b3ec90da2a1c4c8..a7605775274a9494bd7eb4859175bdfd1159d8bf 100644 (file)
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -2,7 +2,9 @@
 <info>
        <id>user_ldap</id>
        <name>LDAP user and group backend</name>
-       <description>Authenticate Users by LDAP</description>
+       <description>Authenticate users and groups by LDAP resp. Active Directoy.
+
+       This app is not compatible to the WebDAV user backend.</description>
        <licence>AGPL</licence>
        <author>Dominik Schmidt and Arthur Schiwon</author>
        <require>4.9</require>

diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 30c5c175c9b3b25d53c627f07ff74fd6b8d07bae..f3f41fb2d8bea101c1b5b29acf8464938ad90f36 100644 (file)
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -7,4 +7,9 @@
 #ldap fieldset input {
        width: 70%;
        display: inline-block;
+}
+
+.ldapwarning {
+       margin-left: 1.4em;
+       color: #FF3B3B;
 }
\ No newline at end of file