From 5cbe8d637b14995a66f829caad054132c7745701 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 14 Dec 2012 00:29:15 +0100
Subject: [PATCH] Show conflict warning when user_ldap and user_webdavauth are
enabled
---
apps/user_ldap/appinfo/app.php | 3 +++
apps/user_ldap/appinfo/info.xml | 4 +++-
apps/user_ldap/css/settings.css | 5 +++++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 0eec7829a4..ce3079da0b 100644
--- 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 30fbf687db..a760577527 100644
--- 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 30c5c175c9..f3f41fb2d8 100644
--- 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
--
GitLab