[Fusionforge-commits] r15043 - in trunk/src/www/scm: . include
Franck VILLAUME
nerville at fusionforge.org
Sun Jan 29 19:32:15 CET 2012
Author: nerville
Date: 2012-01-29 19:32:14 +0100 (Sun, 29 Jan 2012)
New Revision: 15043
Modified:
trunk/src/www/scm/include/viewvc_utils.php
trunk/src/www/scm/viewvc.php
Log:
fix missing projet name tab
Modified: trunk/src/www/scm/include/viewvc_utils.php
===================================================================
--- trunk/src/www/scm/include/viewvc_utils.php 2012-01-29 18:09:33 UTC (rev 15042)
+++ trunk/src/www/scm/include/viewvc_utils.php 2012-01-29 18:32:14 UTC (rev 15043)
@@ -8,6 +8,24 @@
* Copyright (c) Xerox Corporation, CodeX / CodeX Team, 2001,2002. All Rights Reserved.
* http://codex.xerox.com
*
+ * Copyright 2012, Franck Villaume - TrivialDev
+ * http://fusionforge.org
+ *
+ * This file is part of FusionForge. FusionForge is free software;
+ * you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or (at your option)
+ * any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
* @version $ID$
*/
@@ -51,7 +69,7 @@
function viewcvs_execute($repos_name, $repos_type) {
$request_uri = getStringFromServer('REQUEST_URI');
$query_string = getStringFromServer('QUERY_STRING');
-
+ $query_string = preg_replace('/group_id=[0-9]+&/','',$query_string);
$viewcvs_path = forge_get_config('url_root').'/scm/viewvc';
// this is very important ...
Modified: trunk/src/www/scm/viewvc.php
===================================================================
--- trunk/src/www/scm/viewvc.php 2012-01-29 18:09:33 UTC (rev 15042)
+++ trunk/src/www/scm/viewvc.php 2012-01-29 18:32:14 UTC (rev 15043)
@@ -9,7 +9,8 @@
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://codex.xerox.com
*
- * Copyright 2010 (c), Franck Villaume
+ * Copyright 2010, Franck Villaume - Capgemini
+ * Copyright 2012, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -77,7 +78,7 @@
//$external_scm = (gethostbyname(forge_get_config('web_host')) != gethostbyname($scm_box));
$external_scm = !$sys_scm_single_host;
-if (!forge_check_perm ('scm', $Group->getID(), 'read')) {
+if (!forge_check_perm('scm', $Group->getID(), 'read')) {
exit_permission_denied('scm');
}
@@ -88,7 +89,7 @@
$server_script = preg_replace("/^\\//", "", $server_script);
// pass the parameters passed to this script to the remote script in the same fashion
- $script_url = "http://".$scm_box."/".$server_script.$_SERVER["PATH_INFO"]."?".$_SERVER["QUERY_STRING"];
+ $script_url = "http://".$scm_box."/".$server_script.$_SERVER["PATH_INFO"]."?".preg_replace('/group_id=[0-9]+&/','',$_SERVER["QUERY_STRING"]);
$fh = @fopen($script_url, "r");
if (!$fh) {
exit_error(sprintf(_('Could not open script %s.'),$script_url),'home');
More information about the Fusionforge-commits
mailing list