mirror of
https://github.com/nextcloud/server.git
synced 2024-08-30 17:57:26 +02:00
Merge pull request #5207 from nextcloud/ldap-remove-userwebdavauth-check
remove check, user_webdavauth is not an app anymore for long
This commit is contained in:
commit
f3f3d077ae
@ -60,9 +60,3 @@ if(count($configPrefixes) > 0) {
|
|||||||
'\OCA\User_LDAP\Helper',
|
'\OCA\User_LDAP\Helper',
|
||||||
'loginName2UserName'
|
'loginName2UserName'
|
||||||
);
|
);
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
@ -66,9 +66,7 @@ style('user_ldap', 'settings');
|
|||||||
<li class="ldapSettingsTabs"><a href="#ldapSettings-2"><?php p($l->t('Expert'));?></a></li>
|
<li class="ldapSettingsTabs"><a href="#ldapSettings-2"><?php p($l->t('Expert'));?></a></li>
|
||||||
<li class="ldapSettingsTabs"><a href="#ldapSettings-1"><?php p($l->t('Advanced'));?></a></li>
|
<li class="ldapSettingsTabs"><a href="#ldapSettings-1"><?php p($l->t('Advanced'));?></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<?php if(OCP\App::isEnabled('user_webdavauth')) {
|
<?php
|
||||||
print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'</p>');
|
|
||||||
}
|
|
||||||
if(!function_exists('ldap_connect')) {
|
if(!function_exists('ldap_connect')) {
|
||||||
print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>');
|
print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>');
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user