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, master has been updated
via 33922896caaa7c631a8b6c1d4a62a2b5491ee6dc (commit)
from 7697fd69fda087bdd66cc7b7b8e723d9705f51f8 (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=33922896caaa7c631a8b6c1d4a62a2b5491ee6dc
commit 33922896caaa7c631a8b6c1d4a62a2b5491ee6dc
Author: Franck Villaume <[email protected]>
Date: Sun Sep 10 17:58:01 2017 +0200
more getBoxForProject
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index c872e33..668a506 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -289,7 +289,7 @@ control over it to the project's administrator.");
}
$protocol = forge_get_config('use_ssl', 'scmgit')?
'https' : 'http';
- $box = forge_get_config('scm_host');
+ $box = $this->getBoxForProject($project);
if ($project->enableAnonSCM()) {
$iframesrc =
"$protocol://$box/anonscm/gitweb/?p=$repo";
} elseif (session_loggedin()) {
@@ -983,7 +983,7 @@ control over it to the project's administrator.");
}
// Grab commit log
$protocol = forge_get_config('use_ssl', 'scmgit') ?
'https://' : 'http://';
- $script_url = $protocol . forge_get_config('scm_host')
+ $script_url =
$protocol.$this->getBoxForProject($project)
. $server_script
.'?unix_group_name='.$project->getUnixName()
.'&mode=date_range'
@@ -1211,7 +1211,7 @@ control over it to the project's administrator.");
} else {
$params = '&mode=latest';
}
- $script_url = $protocol . forge_get_config('scm_host')
+ $script_url =
$protocol.$this->getBoxForProject($project)
. $server_script
.'?unix_group_name='.$project->getUnixName()
. $params
@@ -1282,15 +1282,16 @@ control over it to the project's administrator.");
continue;
}
$urls = array();
+ $project = group_get_object($arr['group_id']);
if (forge_get_config('use_smarthttp', 'scmgit')) {
- $urls[] =
$protocol.'://'.forge_get_config('scm_host').'/anonscm/git/'.$arr['unix_group_name'].'/'.$arr['unix_group_name'].'.git';
+ $urls[] =
$protocol.'://'.$this->getBoxForProject($project).'/anonscm/git/'.$arr['unix_group_name'].'/'.$arr['unix_group_name'].'.git';
}
if (session_loggedin()) {
if (forge_get_config('use_ssh', 'scmgit')) {
- $urls[] = 'git+ssh://'.$d.'@' .
forge_get_config('scm_host') . forge_get_config('repos_path', 'scmgit') .'/'.
$arr['unix_group_name'] .'/'. $arr['unix_group_name'] .'.git';
+ $urls[] =
'git+ssh://'.$d.'@'.$this->getBoxForProject($project).forge_get_config('repos_path',
'scmgit') .'/'. $arr['unix_group_name'] .'/'. $arr['unix_group_name'] .'.git';
}
if (forge_get_config('use_smarthttp',
'scmgit')) {
- $urls[] =
$protocol.'://'.$d.'@'.forge_get_config('scm_host').'/authscm/'.$d.'/git/'.$arr['unix_group_name'].'/'.$arr['unix_group_name'].'.git';
+ $urls[] =
$protocol.'://'.$d.'@'.$this->getBoxForProject($project).'/authscm/'.$d.'/git/'.$arr['unix_group_name'].'/'.$arr['unix_group_name'].'.git';
}
}
$results[] = array('group_id' => $arr['group_id'],
@@ -1319,15 +1320,16 @@ control over it to the project's administrator.");
continue;
}
$urls = array();
+ $project = group_get_object($arr['group_id']);
if (forge_get_config('use_smarthttp', 'scmgit')) {
- $urls[] =
$protocol.'://'.forge_get_config('scm_host').'/anonscm/git/'.$arr['unix_group_name'].'/'.$arr['repo_name'].'.git';
+ $urls[] =
$protocol.'://'.$this->getBoxForProject($project).'/anonscm/git/'.$arr['unix_group_name'].'/'.$arr['repo_name'].'.git';
}
if (session_loggedin()) {
if (forge_get_config('use_ssh', 'scmgit')) {
- $urls[] = 'git+ssh://'.$d.'@' .
forge_get_config('scm_host') . forge_get_config('repos_path', 'scmgit') .'/'.
$arr['unix_group_name'] .'/'. $arr['repo_name'] .'.git';
+ $urls[] =
'git+ssh://'.$d.'@'.$this->getBoxForProject($project).forge_get_config('repos_path',
'scmgit') .'/'. $arr['unix_group_name'] .'/'. $arr['repo_name'] .'.git';
}
if (forge_get_config('use_smarthttp',
'scmgit')) {
- $urls[] =
$protocol.'://'.$d.'@'.forge_get_config('scm_host').'/authscm/'.$d.'/git/'.$arr['unix_group_name'].'/'.$arr['repo_name'].'.git';
+ $urls[] =
$protocol.'://'.$d.'@'.$this->getBoxForProject($project).'/authscm/'.$d.'/git/'.$arr['unix_group_name'].'/'.$arr['repo_name'].'.git';
}
}
$results[] = array('group_id' => $arr['group_id'],
@@ -1358,15 +1360,16 @@ control over it to the project's administrator.");
continue;
}
$urls = array();
+ $project = group_get_object($arr['group_id']);
if (forge_get_config('use_smarthttp', 'scmgit')) {
- $urls[] =
$protocol.'://'.forge_get_config('scm_host').'/anonscm/git/'.$arr['unix_group_name'].'/users/'.$arr['user_name'].'.git';
+ $urls[] =
$protocol.'://'.$this->getBoxForProject($project).'/anonscm/git/'.$arr['unix_group_name'].'/users/'.$arr['user_name'].'.git';
}
if (session_loggedin()) {
if (forge_get_config('use_ssh', 'scmgit')) {
- $urls[] = 'git+ssh://'.$d.'@' .
forge_get_config('scm_host') . forge_get_config('repos_path', 'scmgit') .'/'.
$arr['unix_group_name'] .'/users/'. $arr['user_name'] .'.git';
+ $urls[] =
'git+ssh://'.$d.'@'.$this->getBoxForProject($project).forge_get_config('repos_path',
'scmgit') .'/'. $arr['unix_group_name'] .'/users/'. $arr['user_name'] .'.git';
}
if (forge_get_config('use_smarthttp',
'scmgit')) {
- $urls[] =
$protocol.'://'.$d.'@'.forge_get_config('scm_host').'/authscm/'.$d.'/git/'.$arr['unix_group_name'].'/users/'.$arr['user_name'].'.git';
+ $urls[] =
$protocol.'://'.$d.'@'.$this->getBoxForProject($project).'/authscm/'.$d.'/git/'.$arr['unix_group_name'].'/users/'.$arr['user_name'].'.git';
}
}
$results[] = array('group_id' => $arr['group_id'],
diff --git a/src/www/scm/viewvc.php b/src/www/scm/viewvc.php
index c2ebafa..1d7590d 100644
--- a/src/www/scm/viewvc.php
+++ b/src/www/scm/viewvc.php
@@ -93,7 +93,7 @@ if ($external_scm && !$Group->usesPlugin('scmcvs')) {
$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
+ $script_url = $protocol . $Group->getSCMBox(). $server_script
. $pathinfo . '?' . $_SERVER["QUERY_STRING"];
if ($redirect) {
header("Location: $script_url");
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmgit/common/GitPlugin.class.php | 27 +++++++++++++++------------
src/www/scm/viewvc.php | 2 +-
2 files changed, 16 insertions(+), 13 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
