[Pkg-owncloud-commits] [owncloud] 222/394: Show conflict warning when user_ldap and user_webdavauth are enabled

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit d5328585ddf970ab6093ce73a56bd1aa8ea7df75
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Fri Dec 14 00:29:15 2012 +0100

    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 0eec782..ce3079d 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 30fbf68..a760577 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 30c5c17..f3f41fb 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git