[Fusionforge-commits] r7782 - in trunk: . gforge/www/export

Roland Mas lolando at libremir.placard.fr.eu.org
Tue Jun 9 10:33:39 CEST 2009


Author: lolando
Date: 2009-06-09 10:33:38 +0200 (Tue, 09 Jun 2009)
New Revision: 7782

Modified:
   trunk/
   trunk/gforge/www/export/rss20_activity.php
   trunk/gforge/www/export/rss20_newreleases.php
   trunk/gforge/www/export/rss20_news.php
   trunk/gforge/www/export/rss20_projects.php
   trunk/gforge/www/export/rss20_version.php
   trunk/gforge/www/export/rss_sfnewreleases.php
   trunk/gforge/www/export/rss_sfnews.php
   trunk/gforge/www/export/rss_sfprojects.php
   trunk/gforge/www/export/rss_utils.inc
Log:
Merged from 4.8: RSS feeds fixes


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7477,7478,7480,7485,7490-7491,7492,7505,7540,7556-7558,7559-7560,7568,7570-7571,7573,7576,7580,7609-7610,7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7735,7736-7740,7741-7742,7760,7763-7764,7767,7769-7770,7773

   + /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7477,7478,7480,7485,7490-7491,7492,7505,7540,7556-7558,7559-7560,7568,7570-7571,7573,7576,7580,7609-7610,7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7735,7736-7740,7741-7742,7760,7763-7764,7767,7769-7770,7773,7776

Modified: svk:merge
   - 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7623
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7624
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7560
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7580
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7615
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7618
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7622
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7626
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7708
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7713
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7725
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7730
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7732
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7734
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7737
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7739
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7760
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7763
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7764
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7767
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7773

   + 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7623
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7624
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7560
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7580
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7615
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7618
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7622
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7626
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7708
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7713
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7725
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7730
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7732
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7734
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7737
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7739
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7760
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7763
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7764
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7767
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7773
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7776


Modified: trunk/gforge/www/export/rss20_activity.php
===================================================================
--- trunk/gforge/www/export/rss20_activity.php	2009-06-09 08:33:29 UTC (rev 7781)
+++ trunk/gforge/www/export/rss20_activity.php	2009-06-09 08:33:38 UTC (rev 7782)
@@ -49,11 +49,11 @@
 	if ($rowwm = db_fetch_array($reswm)) {
 		$webmaster = $rowwm['user_name']."@".$GLOBALS['sys_users_host']." (".$rowwm['realname'].")";
 	} else {
-		$webmaster = "admin@".$GLOBALS['sys_default_domain'];
+		$webmaster = $GLOBALS['sys_admin_email'];
 	}
 
 	// ## one time output
-	header("Content-Type: text/xml");
+	header("Content-Type: text/xml; charset=utf-8");
 	print '<?xml version="1.0" encoding="UTF-8"?>
        <rss version="2.0">
        ';
@@ -62,22 +62,12 @@
 	print "  <link>$url/activity/$link</link>\n";
 	print "  <description>".$GLOBALS['sys_name']." Project Activity$description</description>\n";
 	print "  <language>en-us</language>\n";
-	print "  <copyright>Copyright 2000-".date("Y")." ".$GLOBALS['sys_name']." OSI</copyright>\n";
+	print "  <copyright>Copyright ".date("Y")." ".$GLOBALS['sys_name']."</copyright>\n";
 	print "  <webMaster>$webmaster</webMaster>\n";
-	print "  <lastBuildDate>".gmdate('D, d M Y G:i:s',time())." GMT</lastBuildDate>\n";
+	print "  <lastBuildDate>".rss_date(time())."</lastBuildDate>\n";
 	print "  <docs>http://blogs.law.harvard.edu/tech/rss</docs>\n";
 	print "  <generator>".$GLOBALS['sys_name']." RSS generator</generator>\n";
 
-	if (file_exists('../images/bflogo-88.png')) {
-		print "  <image>\n";
-		print "    <url>$url/images/bflogo-88.png</url>\n";
-		print "    <title>".$GLOBALS['sys_name']."</title>\n";
-		print "    <link>$url/</link>\n";
-		print "    <width>124</width>\n";
-		print "    <heigth>32</heigth>\n";
-		print "  </image>\n";
-	}
-
 	$sql="SELECT * FROM activity_vw WHERE activity_date BETWEEN '".(time()-(30*86400))."' AND '".time()."'
 	AND group_id='$group_id' ORDER BY activity_date DESC";
 	$res = db_query($sql, $limit);
@@ -90,44 +80,44 @@
 			case 'commit': {
 				print "   <title>".htmlspecialchars('Commit for Tracker Item [#'.$arr['subref_id'].'] '.$arr['description'])."</title>\n";
 				print "   <link>$url/tracker/?func=detail&amp;atid=".$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</link>\n";
-				print "   <comment>$url/tracker/?func=detail&amp;atid=".$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</comment>\n";
+				print "   <comments>$url/tracker/?func=detail&amp;atid=".$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</comments>\n";
 				break;
 			}
 			case 'trackeropen': {
 				print "   <title>".htmlspecialchars('Tracker Item [#'.$arr['subref_id'].' '.$arr['description'].'] Opened')."</title>\n";
 				print "   <link>$url/tracker/?func=detail&amp;atid=".$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</link>\n";
-				print "   <comment>$url/tracker/?func=detail&amp;atid=".$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</comment>\n";
+				print "   <comments>$url/tracker/?func=detail&amp;atid=".$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</comments>\n";
 				break;
 			}
 			case 'trackerclose': {
 				print "   <title>".htmlspecialchars('Tracker Item [#'.$arr['subref_id'].' '.$arr['description'].'] Closed')."</title>\n";
 				print "   <link>$url/tracker/?func=detail&amp;atid=".$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</link>\n";
-				print "   <comment>$url/tracker/?func=detail&amp;atid=".$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</comment>\n";
+				print "   <comments>$url/tracker/?func=detail&amp;atid=".$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</comments>\n";
 				break;
 			}
 			case 'frsrelease': {
 				print "   <title>".htmlspecialchars('FRS Release [#'.$arr['description'].']')."</title>\n";
 				print "   <link>$url/frs/?release_id=".$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</link>\n";
-				print "   <comment>$url/frs/?release_id=".$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</comment>\n";
+				print "   <comments>$url/frs/?release_id=".$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</comments>\n";
 				break;
 			}
 			case 'forumpost': {
 				print "   <title>".htmlspecialchars('Forum Post [#'.$arr['subref_id'].'] '.$arr['description'])."</title>\n";
 				print "   <link>$url/forum/message.php?forum_id=".$arr['ref_id'].'&amp;msg_id='.$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</link>\n";
-				print "   <comment>$url/forum/message.php?forum_id=".$arr['ref_id'].'&amp;msg_id='.$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</comment>\n";
+				print "   <comments>$url/forum/message.php?forum_id=".$arr['ref_id'].'&amp;msg_id='.$arr['subref_id'].'&amp;group_id='.$arr['group_id']."</comments>\n";
 				break;
 			}
 			case 'news': {
 				print "   <title>".htmlspecialchars('News Post [#'.$arr['subref_id'].'] '.$arr['description'])."</title>\n";
 				print "   <link>$url/forum/forum.php?forum_id=".$arr['subref_id']."</link>\n";
-				print "   <comment>$url/forum/forum.php?forum_id=".$arr['subref_id']."</comment>\n";
+				print "   <comments>$url/forum/forum.php?forum_id=".$arr['subref_id']."</comments>\n";
 				break;
 			}
 		}
 
 		print "   <description>".rss_description($arr['description'])."</description>\n";
 		print "   <author>".$arr['user_name']."@".$GLOBALS['sys_users_host']." (".$arr['realname'].")</author>\n";
-		print "   <pubDate>".gmdate('D, d M Y G:i:s',$arr['activity_date'])." GMT</pubDate>\n";
+		print "   <pubDate>".rss_date($arr['activity_date'])."</pubDate>\n";
 		print "  </item>\n";
 	}
 	// ## end output

Modified: trunk/gforge/www/export/rss20_newreleases.php
===================================================================
--- trunk/gforge/www/export/rss20_newreleases.php	2009-06-09 08:33:29 UTC (rev 7781)
+++ trunk/gforge/www/export/rss20_newreleases.php	2009-06-09 08:33:38 UTC (rev 7782)
@@ -7,7 +7,7 @@
 require_once $gfwww.'include/pre.php';
 require_once $gfwww.'export/rss_utils.inc';
 
-header("Content-Type: text/xml");
+header("Content-Type: text/xml; charset=utf-8");
 print '<?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0">
 ';
@@ -45,17 +45,10 @@
 print "  <link>http://".$GLOBALS['sys_default_domain']."$link</link>\n";
 print "  <description>".$GLOBALS['sys_name']." Project Releases$description</description>\n";
 print "  <language>en-us</language>\n";
-print "  <copyright>Copyright 2000-".date("Y")." ".$GLOBALS['sys_name']." OSI</copyright>\n";
+print "  <copyright>Copyright ".date("Y")." ".$GLOBALS['sys_name']."</copyright>\n";
 print "  <webMaster>$webmaster</webMaster>\n";
-print "  <lastBuildDate>".gmdate('D, d M Y G:i:s',time())." GMT</lastBuildDate>\n";
+print "  <lastBuildDate>".rss_date(time())."</lastBuildDate>\n";
 print "  <docs>http://blogs.law.harvard.edu/tech/rss</docs>\n";
-print "  <image>\n";
-print "    <url>http://".$GLOBALS['sys_default_domain']."/images/bflogo-88.png</url>\n";
-print "    <title>".$GLOBALS['sys_name']." Developer</title>\n";
-print "    <link>http://".$GLOBALS['sys_default_domain']."/</link>\n";
-print "    <width>124</width>\n";
-print "    <heigth>32</heigth>\n";
-print "  </image>\n";
 
 $res = db_query("SELECT groups.group_name AS group_name,"
 	. "frs_package.group_id AS group_id,"
@@ -94,8 +87,8 @@
 		print "   <link>http://".$GLOBALS['sys_default_domain']."/project/showfiles.php?group_id=".$row['group_id']."&amp;release_id=".$row['filerelease_id']."</link>\n";
 		print "   <description>".rss_description($row['module_notes'])."</description>\n";
 		print "   <author>".$row['user_name']."@".$GLOBALS['sys_users_host']." (".$row['realname'].")</author>\n";
-		print "   <comment>http://".$GLOBALS['sys_default_domain']."/project/shownotes.php?group_id=".$row['group_id']."&amp;release_id=".$row['filerelease_id']."</comment>\n";
-		print "   <pubDate>".gmdate('D, d M Y G:i:s',$row['release_date'])." GMT</pubDate>\n";
+		print "   <comments>http://".$GLOBALS['sys_default_domain']."/project/shownotes.php?group_id=".$row['group_id']."&amp;release_id=".$row['filerelease_id']."</comments>\n";
+		print "   <pubDate>".rss_date($row['release_date'])."</pubDate>\n";
 		print "   <guid>http://".$GLOBALS['sys_default_domain']."/project/showfiles.php?group_id=".$row['group_id']."&amp;release_id=".$row['filerelease_id']."</guid>\n";
 		print "  </item>\n";
 		$outputtotal++;

Modified: trunk/gforge/www/export/rss20_news.php
===================================================================
--- trunk/gforge/www/export/rss20_news.php	2009-06-09 08:33:29 UTC (rev 7781)
+++ trunk/gforge/www/export/rss20_news.php	2009-06-09 08:33:38 UTC (rev 7782)
@@ -7,7 +7,7 @@
 require_once $gfwww.'include/pre.php';
 require_once $gfwww.'export/rss_utils.inc';
 
-header("Content-Type: text/xml");
+header("Content-Type: text/xml; charset=utf-8");
 print '<?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0">
 ';
@@ -38,24 +38,20 @@
 	$webmaster = $GLOBALS['sys_admin_email'];
 }
 
+$rssTitle = $GLOBALS['sys_name']." Project$title News";
+$rssLink = "http://".$GLOBALS['sys_default_domain']."/news/$link";
+
 // ## one time output
 print " <channel>\n";
-print "  <title>".$GLOBALS['sys_name']." Project$title News</title>\n";
-print "  <link>http://".$GLOBALS['sys_default_domain']."/news/$link</link>\n";
+print "  <title>".$rssTitle."</title>\n";
+print "  <link>".$rssLink."</link>\n";
 print "  <description>".$GLOBALS['sys_name']." Project News$description</description>\n";
 print "  <language>en-us</language>\n";
-print "  <copyright>Copyright 2000-".date("Y")." ".$GLOBALS['sys_name']." OSI</copyright>\n";
+print "  <copyright>Copyright ".date("Y")." ".$GLOBALS['sys_name']."</copyright>\n";
 print "  <webMaster>$webmaster</webMaster>\n";
-print "  <lastBuildDate>".gmdate('D, d M Y G:i:s',time())." GMT</lastBuildDate>\n";
+print "  <lastBuildDate>".rss_date(time())."</lastBuildDate>\n";
 print "  <docs>http://blogs.law.harvard.edu/tech/rss</docs>\n";
 print "  <generator>".$GLOBALS['sys_name']." RSS generator</generator>\n";
-print "  <image>\n";
-print "    <url>http://".$GLOBALS['sys_default_domain']."/images/bflogo-88.png</url>\n";
-print "    <title>".$GLOBALS['sys_name']." Developer</title>\n";
-print "    <link>http://".$GLOBALS['sys_default_domain']."/</link>\n";
-print "    <width>124</width>\n";
-print "    <heigth>32</heigth>\n";
-print "  </image>\n";
 
 $sql = "SELECT forum_id,summary,post_date,details,g.group_id,g.group_name,u.realname,u.user_name
         FROM news_bytes, groups g,users u
@@ -81,7 +77,7 @@
 	}
 	print "   <description>".rss_description($row['details'])."</description>\n";
 	print "   <author>".$row['user_name']."@".$GLOBALS['sys_users_host']." (".$row['realname'].")</author>\n";
-	print "   <pubDate>".gmdate('D, d M Y G:i:s',$row['post_date'])." GMT</pubDate>\n";
+	print "   <pubDate>".rss_date($row['post_date'])."</pubDate>\n";
 	if ($row['group_id'] != $sys_news_group) {
 		print "   <guid>http://".$GLOBALS['sys_default_domain']."/forum/forum.php?forum_id=".$row['forum_id']."</guid>\n";
 	} else {
@@ -89,9 +85,9 @@
 	}
 	// if news group, comment is main page
 	if ($row['group_id'] != $sys_news_group) {
-		print "   <comment>http://".$GLOBALS['sys_default_domain']."/forum/forum.php?forum_id=".$row['forum_id']."</comment>\n";
+		print "   <comments>http://".$GLOBALS['sys_default_domain']."/forum/forum.php?forum_id=".$row['forum_id']."</comments>\n";
 	} else {
-		print "   <comment>http://".$GLOBALS['sys_default_domain']."/</comment>\n";
+		print "   <comments>http://".$GLOBALS['sys_default_domain']."/</comments>\n";
 	}
 	print "  </item>\n";
 }

Modified: trunk/gforge/www/export/rss20_projects.php
===================================================================
--- trunk/gforge/www/export/rss20_projects.php	2009-06-09 08:33:29 UTC (rev 7781)
+++ trunk/gforge/www/export/rss20_projects.php	2009-06-09 08:33:38 UTC (rev 7782)
@@ -3,13 +3,15 @@
 // Author: Scott Grayban <sgrayban at borgnet.us>
 //
 
-include "../env.inc.php";
-include "pre.php";
-include "rss_utils.inc";
-header("Content-Type: text/xml");
-print '<?xml version="1.0"?>
+require_once '../env.inc.php';
+require_once $gfwww.'include/pre.php';
+require_once $gfwww.'export/rss_utils.inc';
+
+header("Content-Type: text/xml; charset=utf-8");
+print '<?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0">
 ';
+
 $limit = getIntFromRequest('limit', 10);
 
 $res = db_query(
@@ -20,6 +22,6 @@
 
 //rss20_dump_project_result_set($res,$GLOBALS['sys_default_name'].' Full Project Listing');
 // quick and dirty fix
-rss_dump_project_result_set($res,$GLOBALS['sys_default_name'].' Full Project Listing');
+rss_dump_project_result_set($res,$GLOBALS['sys_name'].' Full Project Listing');
 ?>
 </rss>

Modified: trunk/gforge/www/export/rss20_version.php
===================================================================
--- trunk/gforge/www/export/rss20_version.php	2009-06-09 08:33:29 UTC (rev 7781)
+++ trunk/gforge/www/export/rss20_version.php	2009-06-09 08:33:38 UTC (rev 7782)
@@ -3,18 +3,20 @@
 // Export software version in RSS 2.0
 // Author: Christian Bayle <bayle at debian.org>
 
-include "../env.inc.php";
-include "pre.php";
+require_once '../env.inc.php';
+require_once $gfwww.'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=gmdate('D, d M Y g:i:s',time())." GMT";
-$link="http://".$GLOBALS[sys_default_domain];
+$date=rss_date(time());
+$link="http://".$GLOBALS['sys_default_domain'].'/';
+$title=$GLOBALS['sys_name'].' - Software version';
 
-header("Content-Type: text/xml");
-print '<?xml version="1.0"?>';
+header("Content-Type: text/xml; charset=utf-8");
+print '<?xml version="1.0" encoding="UTF-8"?>';
 ?>
 <rss version="2.0">
 <channel>
@@ -23,7 +25,6 @@
         <description><?php echo "$name $vers"; ?></description>
         <link><?php echo $link; ?></link>
         <title><?php echo $title; ?></title>
-        <webMaster><?php echo $webmaster; ?></webMaster>
         <language>en-us</language>
 	<item>
               	<title>Name</title>

Modified: trunk/gforge/www/export/rss_sfnewreleases.php
===================================================================
--- trunk/gforge/www/export/rss_sfnewreleases.php	2009-06-09 08:33:29 UTC (rev 7781)
+++ trunk/gforge/www/export/rss_sfnewreleases.php	2009-06-09 08:33:38 UTC (rev 7782)
@@ -17,8 +17,8 @@
 $limit = getIntFromRequest('limit', 10);
 if ($limit > 100) $limit = 100;
 
-header("Content-Type: text/plain");
-print '<?xml version="1.0"?>
+header("Content-Type: text/xml; charset=utf-8");
+print '<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
 <rss version="0.91">
 ';
@@ -46,12 +46,12 @@
 
 // ## one time output
 print " <channel>\n";
-print "  <copyright>Copyright 1999-2000 VA Linux Systems, Inc.</copyright>\n";
-print "  <pubDate>".gmdate('D, d M Y g:i:s',time())." GMT</pubDate>\n";
+print "  <copyright>Copyright ".date("Y")." ".$GLOBALS['sys_name']."</copyright>\n";
+print "  <pubDate>".rss_date(time())."</pubDate>\n";
 print "  <description>".$GLOBALS['sys_name']." New Releases</description>\n";
-print "  <link>http://$GLOBALS[sys_default_domain]</link>\n";
+print "  <link>http://".$GLOBALS['sys_default_domain']."</link>\n";
 print "  <title>".$GLOBALS['sys_name']." New Releases</title>\n";
-print "  <webMaster>webmaster@$GLOBALS[sys_default_domain]</webMaster>\n";
+print "  <webMaster>".$GLOBALS['sys_admin_email']."</webMaster>\n";
 print "  <language>en-us</language>\n";
 // ## item outputs
 $outputtotal = 0;

Modified: trunk/gforge/www/export/rss_sfnews.php
===================================================================
--- trunk/gforge/www/export/rss_sfnews.php	2009-06-09 08:33:29 UTC (rev 7781)
+++ trunk/gforge/www/export/rss_sfnews.php	2009-06-09 08:33:38 UTC (rev 7782)
@@ -18,7 +18,7 @@
 $limit = getIntFromRequest('limit', 10);
 if ($limit > 100) $limit = 100;
 
-header("Content-Type: text/plain");
+header("Content-Type: text/xml; charset=utf-8");
 print '<?xml version="1.0" encoding="UTF-8"?>
 
 <rdf:RDF
@@ -45,7 +45,6 @@
 	$res = db_query($sql, $limit);
 
 print "\n <channel rdf:about=".'"'."http://$GLOBALS[sys_default_domain]/export/rss_sfnews.php".'"'.">\n";
-print "  <copyright>Copyright 1999-2000 VA Linux Systems, Inc.</copyright>\n";
 $grsql = "SELECT group_name from groups where group_id='.$group_id'";
 $grres = db_query($sql,$limit);
 $grrow = db_fetch_array($grres);
@@ -75,7 +74,7 @@
 	print "   <description>".rss_description($row['details'])."</description>\n";
 	print "   <dc:subject>".$row['group_name']."</dc:subject>\n";
 	print "   <dc:creator>".$row['realname']."</dc:creator>\n";
-	print "  <dc:date>".gmdate('D, d M Y g:i:s',$row['post_date'])." GMT</dc:date>\n";
+	print "  <dc:date>".gmdate('c', $row['post_date'])."</dc:date>\n";
 	print "  </item>\n";
 }
 // ## end output

Modified: trunk/gforge/www/export/rss_sfprojects.php
===================================================================
--- trunk/gforge/www/export/rss_sfprojects.php	2009-06-09 08:33:29 UTC (rev 7781)
+++ trunk/gforge/www/export/rss_sfprojects.php	2009-06-09 08:33:38 UTC (rev 7782)
@@ -20,8 +20,8 @@
 	if ($limit > 100) $limit = 100;
 }
 
-header("Content-Type: text/plain");
-print '<?xml version="1.0"?>
+header("Content-Type: text/xml; charset=utf-8");
+print '<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
 <rss version="0.91">
 ';

Modified: trunk/gforge/www/export/rss_utils.inc
===================================================================
--- trunk/gforge/www/export/rss_utils.inc	2009-06-09 08:33:29 UTC (rev 7781)
+++ trunk/gforge/www/export/rss_utils.inc	2009-06-09 08:33:38 UTC (rev 7782)
@@ -20,6 +20,10 @@
 	}
 }
 
+function rss_date($date) {
+	return gmdate('D, d M Y H:i:s', $date).' GMT';
+}
+
 function rss_description ($in) {
 	// if description_maxlen is defined, then truncate appropriately
 	// added for netscape rss schema compat
@@ -40,12 +44,12 @@
         if (!$desription) $desription=$title;
 	// one time output
 	print " <channel>\n";
-	print "  <copyright>Copyright 1999-2000 VA Linux Systems, Inc.</copyright>\n";
-	print "  <pubDate>".gmdate('D, d M Y g:i:s',time())." GMT</pubDate>\n";
+	print "  <copyright>Copyright ".date("Y")." ".$GLOBALS['sys_name']."</copyright>\n";
+	print "  <pubDate>".rss_date(time())."</pubDate>\n";
 	print "  <description>$desription</description>\n";
-	print "  <link>http://$GLOBALS[sys_default_domain]</link>\n";
+	print "  <link>http://".$GLOBALS['sys_default_domain']."/</link>\n";
 	print "  <title>$title</title>\n";
-	print "  <webMaster>webmaster@$GLOBALS[sys_default_domain]</webMaster>\n";
+	print "  <webMaster>".$GLOBALS['sys_admin_email']."</webMaster>\n";
 	print "  <language>en-us</language>\n";
 
 	// item outputs
@@ -67,4 +71,4 @@
 	print " </channel>\n";
 }
 
-?>
+?>
\ No newline at end of file




More information about the Fusionforge-commits mailing list