From 2bbd5147e7d42cebbcdbf5676372b967b6017695 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon <blizzz@arthur-schiwon.de> Date: Thu, 1 Jun 2017 01:33:04 +0200 Subject: remove check, user_webdavauth is not an app anymore for long Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> --- apps/user_ldap/appinfo/app.php | 6 ------ apps/user_ldap/templates/settings.php | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'apps') diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php index 70e505c18af..df08a2acd70 100644 --- a/apps/user_ldap/appinfo/app.php +++ b/apps/user_ldap/appinfo/app.php @@ -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); -} diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index 58116b8c0e7..82e61cd5dcd 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -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>'); } -- cgit v1.2.3