diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2012-12-14 00:29:15 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-12-14 12:03:15 +0100 |
| commit | 5cbe8d637b14995a66f829caad054132c7745701 (patch) | |
| tree | babb7c814fef70afd1bbef24e69e767f438dbb68 /apps | |
| parent | a871e300e21a27edec6d65bd1dd4f54455161215 (diff) | |
| download | nextcloud-server-5cbe8d637b14995a66f829caad054132c7745701.tar.gz nextcloud-server-5cbe8d637b14995a66f829caad054132c7745701.zip | |
Show conflict warning when user_ldap and user_webdavauth are enabled
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/user_ldap/appinfo/app.php | 3 | ||||
| -rw-r--r-- | apps/user_ldap/appinfo/info.xml | 4 | ||||
| -rw-r--r-- | apps/user_ldap/css/settings.css | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php index 0eec7829a4a..ce3079da0ba 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 30fbf687dbe..a7605775274 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 30c5c175c9b..f3f41fb2d8b 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 |