From fae747ef03d31e1e74c769720ead204350b7e718 Mon Sep 17 00:00:00 2001
From: Roland Mas <lolando@debian.org>
Date: Wed, 22 Jun 2011 17:20:37 +0000
Subject: [PATCH] Merged from 5.1 (up to 2011-05-06)

---
 .../php-pear-HTTP_WebDAV_Server.spec                        |  2 +-
 src/www/forum/admin/monitor.php                             | 13 ++++++++-----
 src/www/my/rmproject.php                                    |  2 +-
 tests/scripts/fusionforge-build-and-test-rpm.sh             |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/3rd-party/php-pear-HTTP_WebDAV_Server/php-pear-HTTP_WebDAV_Server.spec b/3rd-party/php-pear-HTTP_WebDAV_Server/php-pear-HTTP_WebDAV_Server.spec
index 7bfe24f..5568684 100644
--- a/3rd-party/php-pear-HTTP_WebDAV_Server/php-pear-HTTP_WebDAV_Server.spec
+++ b/3rd-party/php-pear-HTTP_WebDAV_Server/php-pear-HTTP_WebDAV_Server.spec
@@ -34,7 +34,7 @@ pear -q -c pearrc \
 
 %install
 rm -rf %{buildroot}
-#pear channel-update pear.php.net
+pear channel-update pear.php.net
 pear -c pearrc install --nodeps --packagingroot %{buildroot} %{SOURCE0}
 
 # Clean up unnecessary files
diff --git a/src/www/forum/admin/monitor.php b/src/www/forum/admin/monitor.php
index 3346ea7..ac775cf 100644
--- a/src/www/forum/admin/monitor.php
+++ b/src/www/forum/admin/monitor.php
@@ -52,14 +52,17 @@ users,forum_monitored_forums fmf where fmf.user_id=users.user_id and
 fmf.forum_id =$1 order by users.user_id',
 			array ($group_forum_id));
 
-$head=array();
-$head[]='User';
-$head[]='Email';
-$head[]='Realname';
+if ($res && db_numrows($res) == 0) {
+	echo '<p class="information">'._('No Monitoring Users').'</p>';
+	forum_footer(array());
+	exit;
+}
+
+$tableHeaders = array(_('User'), _('Email'), _('Realname'));
 
 $j=0;
 
-echo $HTML->listTableTop($head);
+echo $HTML->listTableTop($tableHeaders);
 
 while ($arr=db_fetch_array($res)) {
 
diff --git a/src/www/my/rmproject.php b/src/www/my/rmproject.php
index 5c45378..e59a900 100644
--- a/src/www/my/rmproject.php
+++ b/src/www/my/rmproject.php
@@ -69,7 +69,7 @@ if (getStringFromRequest('confirm')) {
 
 	if (!$group->removeUser($user_id)) {
 		exit_error($group->getErrorMessage(),'my');
-	} else {                    
+	} else {
 		session_redirect("/my/");
 	}
 
diff --git a/tests/scripts/fusionforge-build-and-test-rpm.sh b/tests/scripts/fusionforge-build-and-test-rpm.sh
index c251017..4ffa2e6 100755
--- a/tests/scripts/fusionforge-build-and-test-rpm.sh
+++ b/tests/scripts/fusionforge-build-and-test-rpm.sh
@@ -96,7 +96,7 @@ ssh root@$HOST "ln -s gforge /usr/share/src"
 
 sleep 5
 [ ! -e "/tmp/timedhosts.txt" ] || scp -p /tmp/timedhosts.txt root@$HOST:/var/cache/yum/timedhosts.txt
-ssh root@$HOST "yum install -y --skip-broken fusionforge fusionforge-plugin-scmsvn fusionforge-plugin-online_help fusionforge-plugin-extratabs fusionforge-plugin-authldap fusionforge-plugin-scmgit fusionforge-plugin-blocks"
+ssh root@$HOST "yum install -y --skip-broken fusionforge fusionforge-plugin-scmsvn fusionforge-plugin-online_help fusionforge-plugin-extratabs fusionforge-plugin-ldapextauth fusionforge-plugin-scmgit fusionforge-plugin-blocks"
 scp -p root@$HOST:/var/cache/yum/timedhosts.txt /tmp/timedhosts.txt || true
 ssh root@$HOST '(echo [core];echo use_ssl=no) > /etc/gforge/config.ini.d/zzz-builbot.ini'
 ssh root@$HOST "cd /root/tests/func; CONFIGURED=true CONFIG_PHP=config.php.buildbot DB_NAME=$DB_NAME php db_reload.php"
-- 
2.1.4