[Pkg-owncloud-commits] [owncloud] 224/394: Also show a more prominent warning when php_ldap is not installed

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit 23a5c2887e98404e007a344baf65505a76a519c5
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Fri Dec 14 00:58:29 2012 +0100

    Also show a more prominent warning when php_ldap is not installed
---
 apps/user_ldap/templates/settings.php |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index b430e58..6ab0234 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -7,6 +7,9 @@
 		<?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>';
 		}
+		if(!function_exists('ldap_connect')) {
+			echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it.').'</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>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git