[Fusionforge-commits] FusionForge branch 6.1 updated. v6.1beta1-151-gc300a3e

Franck Villaume nerville at libremir.placard.fr.eu.org
Mon Feb 12 14:19:27 CET 2018


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.1 has been updated
       via  c300a3e81c71ce0e80371fe7e137983e4b5269b5 (commit)
      from  9b41397c2f6b5409e4d2b666a92a58b4e2fe0d74 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c300a3e81c71ce0e80371fe7e137983e4b5269b5

commit c300a3e81c71ce0e80371fe7e137983e4b5269b5
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Feb 12 13:19:19 2018 +0000

    SCM browser: make it allow_multiple_scm friendly

diff --git a/src/plugins/scmbzr/common/BzrPlugin.class.php b/src/plugins/scmbzr/common/BzrPlugin.class.php
index 0dd940b..e99fa64 100644
--- a/src/plugins/scmbzr/common/BzrPlugin.class.php
+++ b/src/plugins/scmbzr/common/BzrPlugin.class.php
@@ -144,7 +144,7 @@ over it to the project's administrator.");
 		$b .= _('You may also view the complete histories of any file in the repository.');
 		$b .= '</p>';
 		$b .= '<p>[' ;
-		$b .= util_make_link ("/scm/browser.php?group_id=".$project->getID(),
+		$b .= util_make_link ("/scm/browser.php?group_id=".$project->getID().'&scm_plugin='.$this->name,
 								sprintf(_('Browse %s Repository'), 'Bazaar')
 			) ;
 		$b .= ']</p>' ;
@@ -156,6 +156,9 @@ over it to the project's administrator.");
 	}
 
 	function printBrowserPage($params) {
+		if ($params['scm_plugin'] != $this->name) {
+			return;
+		}
 		global $HTML;
 		$project = $this->checkParams($params);
 		if (!$project) {
diff --git a/src/plugins/scmcvs/common/CVSPlugin.class.php b/src/plugins/scmcvs/common/CVSPlugin.class.php
index 37027fe..66c6b85 100644
--- a/src/plugins/scmcvs/common/CVSPlugin.class.php
+++ b/src/plugins/scmcvs/common/CVSPlugin.class.php
@@ -157,7 +157,7 @@ over it to the project's administrator.");
 		$b .= _('You may also view the complete histories of any file in the repository.');
 		$b .= '</p>';
 		$b .= '<p>[' ;
-		$b .= util_make_link ("/scm/browser.php?group_id=".$project->getID(),
+		$b .= util_make_link ("/scm/browser.php?group_id=".$project->getID().'&scm_plugin='.$this->name,
 								sprintf(_('Browse %s Repository'), 'CVS')
 			) ;
 		$b .= ']</p>' ;
@@ -206,6 +206,9 @@ over it to the project's administrator.");
 	}
 
 	function printBrowserPage ($params) {
+		if ($params['scm_plugin'] != $this->name) {
+			return;
+		}
 		$project = $this->checkParams ($params) ;
 		if (!$project) {
 			return;
diff --git a/src/plugins/scmdarcs/common/DarcsPlugin.class.php b/src/plugins/scmdarcs/common/DarcsPlugin.class.php
index 0f6cd30..3335fb5 100644
--- a/src/plugins/scmdarcs/common/DarcsPlugin.class.php
+++ b/src/plugins/scmdarcs/common/DarcsPlugin.class.php
@@ -163,7 +163,7 @@ over it to the project's administrator.");
 		$repo_names = $this->getRepositories($project);
 		if (count($repo_names) > 0) {
 			foreach ($repo_names as $repo_name) {
-				$b .= html_e('p', array(), '['.util_make_link('/scm/browser.php?group_id='.$project->getID()."&repo_name=".$repo_name,
+				$b .= html_e('p', array(), '['.util_make_link('/scm/browser.php?group_id='.$project->getID()."&repo_name=".$repo_name.'&scm_plugin='.$this->name,
 									_('Browse Darcs repository').' '.$repo_name).']');
 			}
 		} else {
@@ -229,6 +229,9 @@ over it to the project's administrator.");
 	}
 
 	function printBrowserPage($params) {
+		if ($params['scm_plugin'] != $this->name) {
+			return;
+		}
 		$project = $this->checkParams($params);
 		if (!$project) {
 			return;
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php b/src/plugins/scmgit/common/GitPlugin.class.php
index de8b990..072013a 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -278,6 +278,9 @@ control over it to the project's administrator.");
 	}
 
 	function printBrowserPage($params) {
+		if ($params['scm_plugin'] != $this-name) {
+			return;
+		}
 		global $HTML;
 		$useautoheight = 0;
 		$project = $this->checkParams($params);
@@ -315,12 +318,12 @@ control over it to the project's administrator.");
 		$b .= html_e('p', array(), _("Browsing the Git tree gives you a view into the current status"
 						. " of this project's code. You may also view the complete"
 						. " history of any file in the repository."));
-		$b .= html_e('p', array(), '['.util_make_link('/scm/browser.php?group_id='.$project->getID(), _('Browse main git repository')).']');
+		$b .= html_e('p', array(), '['.util_make_link('/scm/browser.php?group_id='.$project->getID().'&scm_plugin='.$this->name, _('Browse main git repository')).']');
 
 		# Extra repos
 		$repo_list = $this->getRepositories($project, false);
 		foreach ($repo_list as $repo_name) {
-			$b .= '['.util_make_link('/scm/browser.php?group_id='.$project->getID().'&extra='.$repo_name, _('Browse extra git repository')._(': ').$repo_name).']'.html_e('br');
+			$b .= '['.util_make_link('/scm/browser.php?group_id='.$project->getID().'&extra='.$repo_name.'&scm_plugin='.$this->name, _('Browse extra git repository')._(': ').$repo_name).']'.html_e('br');
 		}
 
 		$result = db_query_params('SELECT u.user_id, u.user_name FROM scm_personal_repos p, users u WHERE p.group_id=$1 AND u.user_id=p.user_id AND u.unix_status=$2 AND plugin_id=$3',
@@ -331,7 +334,7 @@ control over it to the project's administrator.");
 		for ($i=0; $i<$rows; $i++) {
 			$user_id = db_result($result,$i,'user_id');
 			$user_name = db_result($result,$i,'user_name');
-			$b .= '['.util_make_link('/scm/browser.php?group_id='.$project->getID().'&user_id='.$user_id, _('Browse personal git repository')._(': ').$user_name).']'.html_e('br');
+			$b .= '['.util_make_link('/scm/browser.php?group_id='.$project->getID().'&user_id='.$user_id.'&scm_plugin='.$this->name, _('Browse personal git repository')._(': ').$user_name).']'.html_e('br');
 		}
 
 		return $b;
diff --git a/src/plugins/scmhg/common/HgPlugin.class.php b/src/plugins/scmhg/common/HgPlugin.class.php
index 5387708..6b86775 100644
--- a/src/plugins/scmhg/common/HgPlugin.class.php
+++ b/src/plugins/scmhg/common/HgPlugin.class.php
@@ -202,10 +202,10 @@ Offer DAV or SSH access.");
 		global $HTML;
 		$b = html_e('h2', array(), _('Mercurial Repository Browser'));
 		$b .= html_e('p', array(), _('Browsing the Mercurial tree gives you a view into the current status of this project\'s code. You may also view the complete histories of any file in the repository.'));
-		$b .= html_e('p', array(), '['.util_make_link('/scm/browser.php?group_id='.$project->getID(), _('Browse Hg Repository')).']');
+		$b .= html_e('p', array(), '['.util_make_link('/scm/browser.php?group_id='.$project->getID().'&scm_plugin='.$this->name, _('Browse Hg Repository')).']');
 		$repo_list = $this->getRepositories($project, false);
 		foreach ($repo_list as $repo_name) {
-			$b .= '['.util_make_link('/scm/browser.php?group_id='.$project->getID().'&extra='.$repo_name, _('Browse extra Hg repository')._(': ').$repo_name).']'.html_e('br');
+			$b .= '['.util_make_link('/scm/browser.php?group_id='.$project->getID().'&extra='.$repo_name.'&scm_plugin='.$this->name, _('Browse extra Hg repository')._(': ').$repo_name).']'.html_e('br');
 		}
 		return $b;
 	}
@@ -272,6 +272,9 @@ Offer DAV or SSH access.");
 	}
 
 	function printBrowserPage($params) {
+		if ($params['scm_plugin'] != $this->name) {
+			return;
+		}
 		global $HTML;
 		$project = $this->checkParams($params);
 		if (!$project) {
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 30ea420..681ca19 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -230,7 +230,7 @@ some control over it to the project's administrator.");
 		$b .= _('You may also view the complete histories of any file in the repository.');
 		$b .= '</p>';
 		$b .= '<p>[' ;
-		$b .= util_make_link ("/scm/browser.php?group_id=".$project->getID(),
+		$b .= util_make_link ("/scm/browser.php?group_id=".$project->getID().'&scm_plugin='.$this->name,
 								sprintf(_('Browse %s Repository'), 'Subversion')
 		) ;
 		$b .= ']</p>' ;
@@ -279,6 +279,9 @@ some control over it to the project's administrator.");
 	}
 
 	function printBrowserPage($params) {
+		if ($params['scm_plugin'] != $this->name) {
+			return;
+		}
 		global $HTML;
 		$useautoheight = 0;
 		$project = $this->checkParams($params);
diff --git a/src/www/scm/browser.php b/src/www/scm/browser.php
index dbbc492..7b44e76 100644
--- a/src/www/scm/browser.php
+++ b/src/www/scm/browser.php
@@ -36,6 +36,7 @@ $hook_params['repo_name'] = getStringFromRequest('repo_name', 'none');
 $hook_params['user_id'] = getIntFromRequest('user_id');
 $hook_params['extra'] = getStringFromRequest('extra');
 $hook_params['commit'] = getStringFromRequest('commit');
+$hook_params['scm_plugin'] = getStringFromRequest('scm_plugin');
 plugin_hook ('scm_browser_page', $hook_params);
 
 scm_footer();

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

Summary of changes:
 src/plugins/scmbzr/common/BzrPlugin.class.php     | 5 ++++-
 src/plugins/scmcvs/common/CVSPlugin.class.php     | 5 ++++-
 src/plugins/scmdarcs/common/DarcsPlugin.class.php | 5 ++++-
 src/plugins/scmgit/common/GitPlugin.class.php     | 9 ++++++---
 src/plugins/scmhg/common/HgPlugin.class.php       | 7 +++++--
 src/plugins/scmsvn/common/SVNPlugin.class.php     | 5 ++++-
 src/www/scm/browser.php                           | 1 +
 7 files changed, 28 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list