summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/templates
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2012-12-14 00:29:48 +0100
committerArthur Schiwon <blizzz@owncloud.com>2012-12-14 12:03:21 +0100
commitb54390f432047dd13b24159107e5bd0351859d55 (patch)
treec13f5859e84a01fae02992373b081af5c02d0825 /apps/user_ldap/templates
parent5cbe8d637b14995a66f829caad054132c7745701 (diff)
downloadnextcloud-server-b54390f432047dd13b24159107e5bd0351859d55.tar.gz
nextcloud-server-b54390f432047dd13b24159107e5bd0351859d55.zip
Show conflict warning when user_ldap and user_webdavauth are enabled
Diffstat (limited to 'apps/user_ldap/templates')
-rw-r--r--apps/user_ldap/templates/settings.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index d10062c1d9d..470f0684847 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -4,6 +4,10 @@
<li><a href="#ldapSettings-1">LDAP Basic</a></li>
<li><a href="#ldapSettings-2">Advanced</a></li>
</ul>
+ <?php if(OCP\App::isEnabled('user_webdavauth')) {
+ echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them.').'</p>';
+ }
+ ?>
<fieldset id="ldapSettings-1">
<p><label for="ldap_host"><?php echo $l->t('Host');?></label><input type="text" id="ldap_host" name="ldap_host" value="<?php echo $_['ldap_host']; ?>" title="<?php echo $l->t('You can omit the protocol, except you require SSL. Then start with ldaps://');?>"></p>
<p><label for="ldap_base"><?php echo $l->t('Base DN');?></label><input type="text" id="ldap_base" name="ldap_base" value="<?php echo $_['ldap_base']; ?>" title="<?php echo $l->t('You can specify Base DN for users and groups in the Advanced tab');?>" /></p>