Show conflict warning when user_ldap and user_webdavauth are enabled

remotes/origin/stable5
Arthur Schiwon 12 years ago
parent a871e300e2
commit 5cbe8d637b
  1. 3
      apps/user_ldap/appinfo/app.php
  2. 4
      apps/user_ldap/appinfo/info.xml
  3. 5
      apps/user_ldap/css/settings.css

@ -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);
}

@ -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>

@ -7,4 +7,9 @@
#ldap fieldset input {
width: 70%;
display: inline-block;
}
.ldapwarning {
margin-left: 1.4em;
color: #FF3B3B;
}
Loading…
Cancel
Save