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 1a7b4f115b89d8394ea2eaef0e85cf02880d4a98 (commit)
via ed11a6476618b8b2375ce312ae720e17daf1617b (commit)
via 5d3f251b0ee8e7feee918d4335ecff0398029938 (commit)
from 3d33d38dbbf90b58a2edca2a336f404a7804e8d5 (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=1a7b4f115b89d8394ea2eaef0e85cf02880d4a98
commit 1a7b4f115b89d8394ea2eaef0e85cf02880d4a98
Author: Sylvain Beucler <[email protected]>
Date: Thu Nov 26 16:06:06 2015 +0100
viewvc: fix PHP warning during anonymous browsing
diff --git a/src/www/scm/viewvc.php b/src/www/scm/viewvc.php
index 1bc320c..0c7ba80 100644
--- a/src/www/scm/viewvc.php
+++ b/src/www/scm/viewvc.php
@@ -105,7 +105,7 @@ if ($external_scm) {
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
- curl_setopt($ch, CURLOPT_COOKIE, $_SERVER['HTTP_COOKIE']); //
for session validation
+ curl_setopt($ch, CURLOPT_COOKIE, @$_SERVER['HTTP_COOKIE']); //
for session validation
curl_setopt($ch, CURLOPT_USERAGENT,
$_SERVER['HTTP_USER_AGENT']); // for session validation
curl_setopt($ch, CURLOPT_HTTPHEADER,
array('Accept-Language:
'.$_SERVER['HTTP_ACCEPT_LANGUAGE'], // for i18n
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ed11a6476618b8b2375ce312ae720e17daf1617b
commit ed11a6476618b8b2375ce312ae720e17daf1617b
Author: Sylvain Beucler <[email protected]>
Date: Thu Nov 26 16:02:09 2015 +0100
mediawiki: fix missing </body> tag
diff --git a/src/plugins/mediawiki/mediawiki-skin/FusionForge.php
b/src/plugins/mediawiki/mediawiki-skin/FusionForge.php
index 9af47c2..6058bd4 100644
--- a/src/plugins/mediawiki/mediawiki-skin/FusionForge.php
+++ b/src/plugins/mediawiki/mediawiki-skin/FusionForge.php
@@ -90,6 +90,7 @@ class FusionForgeTemplate extends BaseTemplate {
$this->html( 'headelement' );
echo "\n<!-- FUSIONFORGE BodyHeader BEGIN -->\n";
+ html_ao('body'); // don't print, makes "html helpers" stack
consistent
$GLOBALS['HTML']->bodyHeader($this->params);
echo "<div id=\"ff-mw-wrapper\"><div
style=\"font-size:x-small;\">\n";
echo "<!-- FUSIONFORGE BodyHeader END -->\n";
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=5d3f251b0ee8e7feee918d4335ecff0398029938
commit 5d3f251b0ee8e7feee918d4335ecff0398029938
Author: Sylvain Beucler <[email protected]>
Date: Thu Nov 26 15:08:55 2015 +0100
project html export: fix references to 'is_public' fields
diff --git a/src/www/export/projhtml.php b/src/www/export/projhtml.php
index c41c5d9..260817b 100644
--- a/src/www/export/projhtml.php
+++ b/src/www/export/projhtml.php
@@ -1,6 +1,7 @@
<?php
/**
* Exports: Export project summary page as HTML
+ * Referenced by older versions of default /home/groups/xxxxx/htdocs/index.php
*
* Copyright 2004 (c) Tim Perdue - GForge LLC
* http://fusionforge.org
diff --git a/src/www/include/project_summary.php
b/src/www/include/project_summary.php
index 5c0e5d5..3905dd5 100644
--- a/src/www/include/project_summary.php
+++ b/src/www/include/project_summary.php
@@ -5,6 +5,7 @@
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2010, FusionForge Team
* Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2015 Inria (Sylvain Beucler)
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -127,7 +128,6 @@ function project_summary($group_id, $mode, $no_table) {
FROM artifact_group_list agl
LEFT JOIN artifact_counts_agg aca USING
(group_artifact_id)
WHERE agl.group_id=$1
- AND agl.is_public=1
ORDER BY group_artifact_id ASC',
array($group_id));
@@ -137,8 +137,11 @@ function project_summary($group_id, $mode, $no_table) {
$return .= '<br /><em>'._('There are no public
trackers available').'</em>';
} else {
for ($j = 0; $j < $rows; $j++) {
+ $artifact_id = db_result($result, $j,
'group_artifact_id');
+ if (!forge_check_perm('tracker',
$artifact_id, 'read'))
+ continue;
$return .= '<p>
-
- '.util_make_link('/tracker/?atid='. db_result($result, $j,
'group_artifact_id') . '&group_id='.$group_id.'&func=browse',db_result($result,
$j, 'name'));
+
- '.util_make_link('/tracker/?atid='. $artifact_id .
'&group_id='.$group_id.'&func=browse',db_result($result, $j, 'name'));
$return .=
sprintf(ngettext('(<strong>%1$s</strong> open / <strong>%2$s</strong> total)',
'(<strong>%1$s</strong> open / <strong>%2$s</strong> total)', (int)
db_result($result, $j, 'open_count')), (int) db_result($result, $j,
'open_count'), (int) db_result($result, $j, 'count')) ;
$return .= '</p>';
}
@@ -209,16 +212,18 @@ function project_summary($group_id, $mode, $no_table) {
$return .= ' Task Manager</a>';
if ($mode != 'compact') {
- //get a list of publicly available projects
- $result = db_query_params ('SELECT * FROM
project_group_list WHERE group_id=$1 AND is_public=1',
- array ($group_id));
+ //get a list of publicly available subprojects
+ $result = db_query_params('SELECT * FROM
project_group_list WHERE group_id=$1',
+ array($group_id));
$rows = db_numrows($result);
if (!$result || $rows < 1) {
$return .= '<br /><em>There are no public
subprojects available</em>';
} else {
for ($j = 0; $j < $rows; $j++) {
- $return .= '
- <br /> - '.util_make_link
('/pm/task.php?group_project_id='.db_result($result, $j,
'group_project_id').'&group_id='.$group_id.'&func=browse',db_result($result,
$j, 'project_name'));
+ $subproject_id = db_result($result, $j,
'group_project_id');
+ if (!forge_check_perm('pm',
$subproject_id, 'read'))
+ continue;
+ $return .= '<br /> -
'.util_make_link('/pm/task.php?group_project_id='.$subproject_id.'&group_id='.$group_id.'&func=browse',db_result($result,
$j, 'project_name'));
}
db_free_result($result);
}
-----------------------------------------------------------------------
Summary of changes:
src/plugins/mediawiki/mediawiki-skin/FusionForge.php | 1 +
src/www/export/projhtml.php | 1 +
src/www/include/project_summary.php | 19 ++++++++++++-------
src/www/scm/viewvc.php | 2 +-
4 files changed, 15 insertions(+), 8 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
