mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
blizzz 2017-06-14 10:32:14 +02:00 committed by GitHub
parent b76e43e0a3 2bbd5147e7
commit f3f3d077ae
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/user_ldap/appinfo/app.php
View File

@ -60,9 +60,3 @@ if(count($configPrefixes) > 0) {
'\OCA\User_LDAP\Helper',
'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);
}

4
apps/user_ldap/templates/settings.php
View File

@ -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-1"><?php p($l->t('Advanced'));?></a></li>
</ul>
<?php if(OCP\App::isEnabled('user_webdavauth')) {
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>');
}
<?php
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>');
}