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 771fa035727f1e879ecd454a183d40d920e94f07 (commit)
via 4bd48f1344d89cda15b76e65827c97c5e7088003 (commit)
from 11dfc428f13f34ec235d7dbdee19f0c4a751540e (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=771fa035727f1e879ecd454a183d40d920e94f07
commit 771fa035727f1e879ecd454a183d40d920e94f07
Author: Franck Villaume <[email protected]>
Date: Mon Jan 1 19:36:56 2018 +0100
space & use rss_utils when possible
diff --git a/src/www/export/rss20_news.php b/src/www/export/rss20_news.php
index eaa0967..3402fe9 100644
--- a/src/www/export/rss20_news.php
+++ b/src/www/export/rss20_news.php
@@ -111,6 +111,4 @@ while ($row = db_fetch_array($res)) {
print " </item>\n";
}
// ## end output
-print " </channel>\n";
-?>
-</rss>
+endFeed();
diff --git a/src/www/export/rss20_version.php b/src/www/export/rss20_version.php
index 77730ee..3366ff7 100644
--- a/src/www/export/rss20_version.php
+++ b/src/www/export/rss20_version.php
@@ -26,12 +26,12 @@ require_once $gfcommon.'include/pre.php';
require_once $gfwww.'export/rss_utils.inc';
require_once $gfcommon.'include/FusionForge.class.php';
-$forge=new FusionForge();
-$vers=$forge->software_version;
-$name=$forge->software_name;
-$date=rss_date(time());
-$link="http://".forge_get_config('web_host').'/';
-$title=forge_get_config ('forge_name').' - Software version';
+$forge = new FusionForge();
+$vers = $forge->software_version;
+$name = $forge->software_name;
+$date = rss_date(time());
+$link = util_make_url();
+$title = forge_get_config ('forge_name').' - Software version';
header("Content-Type: text/xml; charset=utf-8");
print '<?xml version="1.0" encoding="UTF-8"?>';
@@ -54,5 +54,5 @@ print '<?xml version="1.0" encoding="UTF-8"?>';
<link><?php echo $link; ?></link>
<description><?php echo $vers; ?></description>
</item>
-</channel>
-</rss>
+<?
+endFeed();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4bd48f1344d89cda15b76e65827c97c5e7088003
commit 4bd48f1344d89cda15b76e65827c97c5e7088003
Author: Franck Villaume <[email protected]>
Date: Mon Jan 1 19:36:15 2018 +0100
space
diff --git a/src/www/export/rss_utils.inc b/src/www/export/rss_utils.inc
index a5edef9..17544c6 100644
--- a/src/www/export/rss_utils.inc
+++ b/src/www/export/rss_utils.inc
@@ -36,7 +36,7 @@ function rss_date($date) {
return gmdate('D, d M Y H:i:s', $date).' GMT';
}
-function rss_description ($in) {
+function rss_description($in) {
// if description_maxlen is defined, then truncate appropriately
// added for netscape rss schema compat
if (isset($GLOBALS['description_maxlen']) &&
$GLOBALS['description_maxlen'] &&
@@ -65,13 +65,13 @@ function rss_dump_project_result_set($res, $title
,$desription = '', $callback =
print " <language>en-us</language>\n";
// item outputs
- $addendum = '' ;
+ $addendum = '';
while ($row = db_fetch_array($res)) {
- if (!forge_check_perm ('project_read', $row['group_id'])) {
- continue ;
+ if (!forge_check_perm('project_read', $row['group_id'])) {
+ continue;
}
if ($callback) {
- $addendum=$callback($row);
+ $addendum = $callback($row);
}
print " <item>\n";
print "
<title>".htmlspecialchars($row['group_name'])."</title>\n";
@@ -86,8 +86,8 @@ function rss_dump_project_result_set($res, $title
,$desription = '', $callback =
print " </channel>\n";
}
-function rss_dump_project_result_array
($result,$title,$desription='',$callback=0) {
- if (!$desription) $desription=$title;
+function rss_dump_project_result_array($result, $title, $desription = '',
$callback = 0) {
+ if (!$desription) $desription = $title;
// one time output
print " <channel>\n";
print " <copyright>Copyright ".date("Y")." ".forge_get_config
('forge_name')."</copyright>\n";
@@ -99,13 +99,13 @@ function rss_dump_project_result_array
($result,$title,$desription='',$callback=
print " <language>en-us</language>\n";
// item outputs
- $addendum = '' ;
+ $addendum = '';
foreach ($result as $row) {
- if (!forge_check_perm ('project_read', $row['group_id'])) {
- continue ;
+ if (!forge_check_perm('project_read', $row['group_id'])) {
+ continue;
}
if ($callback) {
- $addendum=$callback($row);
+ $addendum = $callback($row);
}
print " <item>\n";
print "
<title>".htmlspecialchars($row['group_name'])."</title>\n";
-----------------------------------------------------------------------
Summary of changes:
src/www/export/rss20_news.php | 4 +---
src/www/export/rss20_version.php | 16 ++++++++--------
src/www/export/rss_utils.inc | 22 +++++++++++-----------
3 files changed, 20 insertions(+), 22 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
