[Fusionforge-commits] FusionForge branch 6.0 updated. b3932de viewvc: support spaces

[Sylvain Beucler]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, 6.0 has been updated
       via  b3932de204fb3104ce18a2d8fb23ec80b7a87b04 (commit)
      from  1aba55b62b82a2d487ece51f7f0192d97e979788 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b3932de204fb3104ce18a2d8fb23ec80b7a87b04
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Jun 5 18:24:52 2015 +0200

    viewvc: support spaces

diff --git a/src/CHANGES b/src/CHANGES
index 3f27b5f..2cc274b 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -7,6 +7,7 @@ FusionForge 6.0.1:
 * Tracker: fix HTML entities in mail notifications (Inria)
 * Widgets: MyProjects: only display active projects (Inria)
 * SCM SVN: fix double-compression in ViewVC (Inria)
+* SCM SVN: support files with spaces in ViewVC (Inria)
 * Plugin scmhook: git commitemail: fix subject, handle special chars (Roland Mas, for Inria)
 * Plugin scmhook: fix hook deactivation (Inria)
 * Doc clean-up (Inria)
diff --git a/src/www/scm/viewvc.php b/src/www/scm/viewvc.php
index 52f620b..931c936 100644
--- a/src/www/scm/viewvc.php
+++ b/src/www/scm/viewvc.php
@@ -96,9 +96,10 @@ if ($external_scm) {
 		$server_script = '/authscm/'.$u->getUnixName().'/viewvc';
 	// pass the parameters passed to this script to the remote script in the same fashion
 	$protocol = forge_get_config('use_ssl', 'scmsvn')? 'https://' : 'http://';
+    $pathinfo = (isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '/');
+    $pathinfo = preg_replace('/ /', '%20', $pathinfo);
 	$script_url = $protocol . forge_get_config('scm_host') . $server_script
-		. (isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '/')
-		. '?' . $_SERVER["QUERY_STRING"];
+		. $pathinfo . '?' . $_SERVER["QUERY_STRING"];
 	if ($redirect) {
 		header("Location: $script_url");
 		exit(0);

-----------------------------------------------------------------------

Summary of changes:
 src/CHANGES            | 1 +
 src/www/scm/viewvc.php | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/CHANGES b/src/CHANGES
index 3f27b5f..2cc274b 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -7,6 +7,7 @@ FusionForge 6.0.1:
 * Tracker: fix HTML entities in mail notifications (Inria)
 * Widgets: MyProjects: only display active projects (Inria)
 * SCM SVN: fix double-compression in ViewVC (Inria)
+* SCM SVN: support files with spaces in ViewVC (Inria)
 * Plugin scmhook: git commitemail: fix subject, handle special chars (Roland Mas, for Inria)
 * Plugin scmhook: fix hook deactivation (Inria)
 * Doc clean-up (Inria)
diff --git a/src/www/scm/viewvc.php b/src/www/scm/viewvc.php
index 52f620b..931c936 100644
--- a/src/www/scm/viewvc.php
+++ b/src/www/scm/viewvc.php
@@ -96,9 +96,10 @@ if ($external_scm) {
 		$server_script = '/authscm/'.$u->getUnixName().'/viewvc';
 	// pass the parameters passed to this script to the remote script in the same fashion
 	$protocol = forge_get_config('use_ssl', 'scmsvn')? 'https://' : 'http://';
+    $pathinfo = (isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '/');
+    $pathinfo = preg_replace('/ /', '%20', $pathinfo);
 	$script_url = $protocol . forge_get_config('scm_host') . $server_script
-		. (isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '/')
-		. '?' . $_SERVER["QUERY_STRING"];
+		. $pathinfo . '?' . $_SERVER["QUERY_STRING"];
 	if ($redirect) {
 		header("Location: $script_url");
 		exit(0);


hooks/post-receive
-- 
FusionForge