[Fusionforge-commits] FusionForge branch master updated. 484c35d Merge branch '6.0'

Roland Mas lolando at libremir.placard.fr.eu.org
Fri Jun 5 18:18:05 CEST 2015


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  484c35dd0f727ec2aca0cedf56e447c7604aa63a (commit)
       via  385f53806060dfc82b90e1efb08c092e4b1fe11f (commit)
       via  547a4a04fc64ab7df68e4fc6168d90b5b01b8424 (commit)
       via  7e8189ee4935d660b974c7fdb0341f52cfe139e7 (commit)
       via  d85b7495b80c496c986d8ebb47195a58678fdc7d (commit)
      from  d1baeacc7abf265b270d03338e53b29d7d39e3cc (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 484c35dd0f727ec2aca0cedf56e447c7604aa63a
Merge: d1baeac 385f538
Author: Roland Mas <lolando at debian.org>
Date:   Fri Jun 5 18:17:50 2015 +0200

    Merge branch '6.0'


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

Summary of changes:
 autoinstall/common-backports                                   |  3 +++
 src/CHANGES                                                    |  1 +
 src/common/tracker/Artifact.class.php                          |  2 +-
 src/plugins/scmgit/common/GitPlugin.class.php                  | 10 +++++-----
 .../scmgit/common/scmgit_Widget_MyRepositories.class.php       |  2 +-
 src/plugins/scmsvn/common/SVNPlugin.class.php                  |  6 +++---
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index 68d13b7..efddd0d 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -265,6 +265,9 @@ EOF
     REMOVEDEPS=$DEPS
     backport_rpm_from_fedora php-htmlpurifier-htmlpurifier
 
+    mkdir -p /usr/src/fusionforge/build/RPMS/
+    cp -r ~/rpmbuild/RPMS/* /usr/src/fusionforge/build/RPMS/
+
     # TODO: postfix: rebuild from RHEL/CentOS sources with pgsql enabled,
     # so we can test mta-postfix
 }
diff --git a/src/CHANGES b/src/CHANGES
index de52f65..3f27b5f 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -4,6 +4,7 @@ FusionForge 6.0.1:
 * SCM: fix commit privileges (*_scmro group membership) (Inria)
 * FRS: display new releases first (Roland Mas, for Inria)
 * Tracker: fix description re-html-ization when editing item (Inria)
+* Tracker: fix HTML entities in mail notifications (Inria)
 * Widgets: MyProjects: only display active projects (Inria)
 * SCM SVN: fix double-compression in ViewVC (Inria)
 * Plugin scmhook: git commitemail: fix subject, handle special chars (Roland Mas, for Inria)
diff --git a/src/common/tracker/Artifact.class.php b/src/common/tracker/Artifact.class.php
index 6f0eaa9..e9a86ae 100644
--- a/src/common/tracker/Artifact.class.php
+++ b/src/common/tracker/Artifact.class.php
@@ -1607,7 +1607,7 @@ class Artifact extends Error {
 		$efd = $this->getExtraFieldDataText();
 		foreach ($efd as $efid => $ef) {
 			$body .= $this->marker('extra_fields', $changes, $efid);
-			$body .= $ef["name"].": ".$ef["value"]."\n";
+			$body .= $ef["name"].": ".htmlspecialchars_decode($ef["value"])."\n";
 		}
 
 		$subject='['. $this->ArtifactType->Group->getUnixName() . '-' . $name . ']' . $this->getStringID() .' '. util_unconvert_htmlspecialchars( $this->getSummary() );
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php b/src/plugins/scmgit/common/GitPlugin.class.php
index e5cece1..878e705 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -106,7 +106,7 @@ control over it to the project's administrator.");
 		foreach ($repo_list as $repo_name) {
 			if (forge_get_config('use_smarthttp', 'scmgit')) {
 				$protocol = forge_get_config('use_ssl', 'scmgit')? 'https' : 'http';
-				$clone_commands[] = 'git clone '.$protocol.'://'.$this->getBoxForProject($project).'/anonscm/git/'.$project->getUnixName().'/'.$repo_name.'.git';
+				$clone_commands[] = 'git clone '.$protocol.'://'.forge_get_config('scm_host').'/anonscm/git/'.$project->getUnixName().'/'.$repo_name.'.git';
 			}
 		}
 
@@ -143,7 +143,7 @@ control over it to the project's administrator.");
 				$user_id = db_result($result,$i,'user_id');
 				$user_name = db_result($result,$i,'user_name');
 				$real_name = db_result($result,$i,'realname');
-				$htmlRepo .= html_e('tt', array(), 'git clone '.$protocol.'://'.$this->getBoxForProject($project).'/anonscm/git/'.$project->getUnixName().'/users/'.$user_name.'.git')
+				$htmlRepo .= html_e('tt', array(), 'git clone '.$protocol.'://'.forge_get_config('scm_host').'/anonscm/git/'.$project->getUnixName().'/users/'.$user_name.'.git')
 					. ' ('.util_make_link_u($user_name, $user_id, $real_name).')'
 					. html_e('br');
 			}
@@ -180,7 +180,7 @@ control over it to the project's administrator.");
 					' '. _('SSH must be installed on your client machine.'));
 				$htmlRepo = '';
 				foreach ($repo_list as $repo_name) {
-						$htmlRepo .= html_e('tt', array(), 'git clone git+ssh://'.$d.'@' . $this->getBoxForProject($project) . forge_get_config('repos_path', 'scmgit') .'/'. $project->getUnixName() .'/'. $repo_name .'.git').html_e('br');
+						$htmlRepo .= html_e('tt', array(), 'git clone git+ssh://'.$d.'@' . forge_get_config('scm_host') . forge_get_config('repos_path', 'scmgit') .'/'. $project->getUnixName() .'/'. $repo_name .'.git').html_e('br');
 				}
 				$b .= html_e('p', array(), $htmlRepo);
 			}
@@ -210,7 +210,7 @@ control over it to the project's administrator.");
 					' '. _('Substitute <em>developername</em> with the proper value.'));
 				$htmlRepo = '';
 				foreach ($repo_list as $repo_name) {
-					$htmlRepo .= html_e('tt', array(), 'git clone git+ssh://'.html_e('i', array(), _('developername'), true, false).'@' . $this->getBoxForProject($project) . forge_get_config('repos_path', 'scmgit') .'/'. $project->getUnixName() .'/'. $repo_name .'.git').html_e('br');
+					$htmlRepo .= html_e('tt', array(), 'git clone git+ssh://'.html_e('i', array(), _('developername'), true, false).'@' . forge_get_config('scm_host') . forge_get_config('repos_path', 'scmgit') .'/'. $project->getUnixName() .'/'. $repo_name .'.git').html_e('br');
 				}
 				$b .= html_e('p', array(), $htmlRepo);
 			}
@@ -244,7 +244,7 @@ control over it to the project's administrator.");
 					$b .= html_e('h3', array(), _('Access to your personal repository'));
 					$b .= html_e('p', array(), _('You have a personal repository for this project, accessible through the following methods. Enter your site password when prompted.'));
 					if (forge_get_config('use_ssh', 'scmgit')) {
-						$b .= html_e('tt', array(), 'git clone git+ssh://'.$u->getUnixName().'@' . $this->getBoxForProject($project) . forge_get_config('repos_path', 'scmgit') .'/'. $project->getUnixName() .'/users/'. $u->getUnixName() .'.git').html_e('br');
+						$b .= html_e('tt', array(), 'git clone git+ssh://'.$u->getUnixName().'@' . forge_get_config('scm_host') . forge_get_config('repos_path', 'scmgit') .'/'. $project->getUnixName() .'/users/'. $u->getUnixName() .'.git').html_e('br');
 					}
 					if (forge_get_config('use_smarthttp', 'scmgit')) {
 						$b .= html_e('tt', array(), 'git clone '.$protocol.'://'.$u->getUnixName().'@' . forge_get_config('scm_host').'/authscm/'.$u->getUnixName().'/git/'.$project->getUnixName() .'/users/'. $u->getUnixName() .'.git').html_e('br');
diff --git a/src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php b/src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php
index f42caa8..a15c060 100644
--- a/src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php
+++ b/src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php
@@ -50,7 +50,7 @@ class scmgit_Widget_MyRepositories extends Widget {
 			foreach ($GitRepositories as $GitRepository) {
 				$project = group_get_object($GitRepository);
 				$cells = array();
-				$cells[][] = '<tt>git clone git+ssh://'.$user->getUnixName().'@' . $scmgitplugin->getBoxForProject($project) .'/'. forge_get_config('scm_root', 'scmgit') .'/'. $project->getUnixName() .'/users/'. $user->getUnixName() .'.git</tt>';
+				$cells[][] = '<tt>git clone git+ssh://'.$user->getUnixName().'@' . forge_get_config('scm_host') .'/'. forge_get_config('scm_root', 'scmgit') .'/'. $project->getUnixName() .'/users/'. $user->getUnixName() .'.git</tt>';
 				$cells[][] = util_make_link('/scm/browser.php?group_id='.$project->getID().'&user_id='.$user->getID(), _('Browse Git Repository'));
 				$returnhtml .= $HTML->multiTableRow(array(), $cells);
 			}
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php b/src/plugins/scmsvn/common/SVNPlugin.class.php
index b908dc7..84789c2 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -120,7 +120,7 @@ some control over it to the project's administrator.");
 		$b .= '<p>' ;
 		$module = $this->topModule($project);
 		if (forge_get_config('use_ssh', 'scmsvn')) {
-			$b .= '<tt>svn checkout svn://'.$this->getBoxForProject($project).$this->svn_root_fs.'/'.$project->getUnixName().$module.'</tt><br />';
+			$b .= '<tt>svn checkout svn://'.forge_get_config('scm_host').$this->svn_root_fs.'/'.$project->getUnixName().$module.'</tt><br />';
 		}
 		if (forge_get_config('use_dav', 'scmsvn')) {
 				$b .= '<p><tt>svn checkout http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' : '').'://'. forge_get_config('scm_host'). '/anonscm/svn/'.$project->getUnixName().$module.'</tt></p>' ;
@@ -148,7 +148,7 @@ some control over it to the project's administrator.");
 				$b .= ' ';
 				$b .= _('Enter your site password when prompted.');
 				$b .= '</p>';
-				$b .= '<p><tt>svn checkout svn+ssh://'.$d.'@' . $this->getBoxForProject($project) . $this->svn_root_fs .'/'. $project->getUnixName().$module.'</tt></p>' ;
+				$b .= '<p><tt>svn checkout svn+ssh://'.$d.'@' . forge_get_config('scm_host') . $this->svn_root_fs .'/'. $project->getUnixName().$module.'</tt></p>' ;
 			}
 			if (forge_get_config('use_dav', 'scmsvn')) {
 				$b .= '<h2>';
@@ -175,7 +175,7 @@ some control over it to the project's administrator.");
 				$b .= ' ';
 				$b .= _('Enter your site password when prompted.');
 				$b .= '</p>';
-				$b .= '<p><tt>svn checkout svn+ssh://<i>'._('developername').'</i>@' . $this->getBoxForProject($project) . $this->svn_root_fs .'/'. $project->getUnixName().$module.'</tt></p>' ;
+				$b .= '<p><tt>svn checkout svn+ssh://<i>'._('developername').'</i>@' . forge_get_config('scm_host') . $this->svn_root_fs .'/'. $project->getUnixName().$module.'</tt></p>' ;
 			}
 			if (forge_get_config('use_dav', 'scmsvn')) {
 				$b .= '<h2>';


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list