[evolvis-commits] r12244: cleanup in activity code and initial support for news in activ?==?UTF-8?Q?ity↵

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 01:31:27 CET 2011


Author: mirabilos
Date: 2011-02-28 01:31:27 +0100 (Mon, 28 Feb 2011)
New Revision: 12244

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/activity/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_activity.php
Log:
cleanup in activity code and initial support for news in activity


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/activity/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/activity/index.php	2011-02-28 00:31:26 UTC (rev 12243)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/activity/index.php	2011-02-28 00:31:27 UTC (rev 12244)
@@ -49,9 +49,9 @@
 $ids=array();
 $texts=array();
 
-if ($GLOBALS['sys_use_scm']) {
-	$ids[]='commit';
-	$texts[]=_('Commits');
+if ($GLOBALS['sys_use_forum']) {
+	$ids[]='forumpost';
+	$texts[]=_('Forum Post');
 }
 
 if ($GLOBALS['sys_use_tracker']) {
@@ -61,16 +61,21 @@
 	$texts[]=_('Tracker Closed');
 }
 
+if ($GLOBALS['sys_use_news']) {
+	$ids[]='news';
+	$texts[]=_('News');
+}
+
+if ($GLOBALS['sys_use_scm']) {
+	$ids[]='commit';
+	$texts[]=_('Commits');
+}
+
 if ($GLOBALS['sys_use_frs']) {
 	$ids[]='frsrelease';
 	$texts[]=_('FRS Release');
 }
 
-if ($GLOBALS['sys_use_forum']) {
-	$ids[]='forumpost';
-	$texts[]=_('Forum Post');
-}
-
 if (count($show) < 1) {
 	$show=$ids;
 }
@@ -132,7 +137,7 @@
 		}
 		switch ($arr['section']) {
 			case 'commit': {
-				$icon=html_image("ic/cvs16b.png","20","20",array("border"=>"0","ALT"=>"SCM"));
+				$icon=html_image("ic/cvs16b.png","20","20",array("border"=>"0","alt"=>"SCM"));
 				$url='<a href="'.$GLOBALS['sys_urlprefix'].'/tracker/?func=detail&atid='.$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id'].'">Commit for Tracker Item [#'.$arr['subref_id'].'] '.$arr['description'].' </a>';
 				break;
 			}
@@ -147,15 +152,20 @@
 				break;
 			}
 			case 'frsrelease': {
-				$icon=html_image("ic/cvs16b.png","20","20",array("border"=>"0","ALT"=>"SCM"));
+				$icon=html_image("ic/cvs16b.png","20","20",array("border"=>"0","alt"=>"SCM"));
 				$url='<a href="'.$GLOBALS['sys_urlprefix'].'/frs/?release_id='.$arr['subref_id'].'&group_id='.$arr['group_id'].'">FRS Release '.$arr['description'].'</a>';
 				break;
 			}
 			case 'forumpost': {
-				$icon=html_image("ic/forum20g.png","20","20",array("border"=>"0","ALT"=>"Forum"));
+				$icon=html_image("ic/forum20g.png","20","20",array("border"=>"0","alt"=>"Forum"));
 				$url='<a href="'.$GLOBALS['sys_urlprefix'].'/forum/message.php?msg_id='.$arr['subref_id'].'&group_id='.$arr['group_id'].'">Forum Post '.$arr['description'].'</a>';
 				break;
 			}
+			case 'news': {
+				$icon=html_image("ic/write16w.png","20","20",array("border"=>"0","alt"=>"News"));
+				$url='<a href="'.$GLOBALS['sys_urlprefix'].'/forum/forum.php?forum_id='.$arr['subref_id'].'">News '.$arr['description'].'</a>';
+				break;
+			}
 		}
 		echo '<tr '. $HTML->boxGetAltRowStyle($j++) . '>
 			<td>    '.date('H:i:s',$arr['activity_date']).'</td>

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_activity.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_activity.php	2011-02-28 00:31:26 UTC (rev 12243)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_activity.php	2011-02-28 00:31:27 UTC (rev 12244)
@@ -6,7 +6,7 @@
  * Author: 2006,  Daniel A. Perez <daniel at gforgegroup.com>
  * http://gforge.org/
  *
- * @version   
+ * @version
  *
  * This file is part of GForge.
  *
@@ -26,108 +26,120 @@
  */
 
 include "../env.inc.php";
-include "pre.php";
-include "rss_utils.inc";
+include "www/include/pre.php";
+include "www/export/rss_utils.inc";
 
 // ## default limit
-if (!$limit) $limit = 10;
+if (!isset($limit)) $limit = 10;
 if ($limit > 100) $limit = 100;
 
 $group_id = getIntFromRequest('group_id');
 
+$proto = ($GLOBALS['sys_use_ssl']) ? 'https://' : 'http://';
+$url = $proto.$GLOBALS['sys_default_domain'].$GLOBALS['sys_urlprefix'];
+
 if ($group_id) {
 	$where = "group_id=$group_id and is_public=1";
 	$query = "SELECT group_name FROM groups WHERE $where";
 	$res = db_query($query,1);
 	$row = db_fetch_array($res);
-	$title = "".$row[group_name]." - ";
+	$title = $row['group_name'];
 	$link = "?group_id=$group_id";
-	$description = " of ".$row[group_name];
+	$description = " of ".$row['group_name'];
 	$querywm =  "SELECT users.user_name,users.realname FROM user_group,users WHERE group_id=$group_id AND admin_flags='A' AND users.user_id=user_group.user_id ORDER BY users.add_date";
 	$reswm = db_query($querywm,1);
 	if ($rowwm = db_fetch_array($reswm)) {
-	  $webmaster = $rowwm[user_name]."@".$GLOBALS[sys_users_host]." (".$rowwm[realname].")";
+		$webmaster = $rowwm['user_name']."@".$GLOBALS['sys_users_host']." (".$rowwm['realname'].")";
 	} else {
-	  $webmaster = "admin@".$GLOBALS[sys_default_domain];
+		$webmaster = "admin@".$GLOBALS['sys_default_domain'];
 	}
-	$sql="SELECT * FROM activity_vw WHERE activity_date BETWEEN '".(time()-(30*86400))."' AND '".time()."'
-	AND activity_vw.group_id = groups.group_id AND groups.is_public=1 AND activity_vw.group_id='$group_id' ORDER BY activity_date DESC";
-	
+
 	// ## one time output
 	header("Content-Type: text/xml");
 	print '<?xml version="1.0" encoding="UTF-8"?>
-	<rss version="2.0">
-	';	
+       <rss version="2.0">
+       ';
 	print " <channel>\n";
-	print "  <title>".$GLOBALS[sys_default_name]." $title Activity</title>\n";
-	print "  <link>http://".$GLOBALS[sys_default_domain]."/activity/$link</link>\n";
-	print "  <description>".$GLOBALS[sys_name]." Project Activity$description</description>\n";
+	print "  <title>".$GLOBALS['sys_name']." $title Activity</title>\n";
+	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 2000-".date("Y")." ".$GLOBALS['sys_name']." OSI</copyright>\n";
 	print "  <webMaster>$webmaster</webMaster>\n";
 	print "  <lastBuildDate>".gmdate('D, d M Y G:i:s',time())." GMT</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";
-	
+	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);
-	
+
 	// ## item outputs
 	while ($arr = db_fetch_array($res)) {
 		print "  <item>\n";
-		
+
 		switch ($arr['section']) {
 			case 'commit': {
 				print "   <title>".htmlspecialchars('Commit for Tracker Item [#'.$arr['subref_id'].'] '.$arr['description'])."</title>\n";
-				print "   <link>http://".$GLOBALS[sys_default_domain].'/tracker/?func=detail&atid='.$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id']."</link>\n";
-				print "   <comment>http://".$GLOBALS[sys_default_domain].'/tracker/?func=detail&atid='.$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id']."</comment>\n";
+				print "   <link>$url/tracker/?func=detail&atid=".$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id']."</link>\n";
+				print "   <comment>$url/tracker/?func=detail&atid=".$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id']."</comment>\n";
 				break;
 			}
 			case 'trackeropen': {
 				print "   <title>".htmlspecialchars('Tracker Item [#'.$arr['subref_id'].' '.$arr['description'].'] Opened')."</title>\n";
-				print "   <link>http://".$GLOBALS[sys_default_domain].'/tracker/?func=detail&atid='.$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id']."</link>\n";
-				print "   <comment>http://".$GLOBALS[sys_default_domain].'/tracker/?func=detail&atid='.$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id']."</comment>\n";
+				print "   <link>$url/tracker/?func=detail&atid=".$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id']."</link>\n";
+				print "   <comment>$url/tracker/?func=detail&atid=".$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id']."</comment>\n";
 				break;
 			}
 			case 'trackerclose': {
 				print "   <title>".htmlspecialchars('Tracker Item [#'.$arr['subref_id'].' '.$arr['description'].'] Closed')."</title>\n";
-				print "   <link>http://".$GLOBALS[sys_default_domain].'/tracker/?func=detail&atid='.$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id']."</link>\n";
-				print "   <comment>http://".$GLOBALS[sys_default_domain].'/tracker/?func=detail&atid='.$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id']."</comment>\n";
+				print "   <link>$url/tracker/?func=detail&atid=".$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id']."</link>\n";
+				print "   <comment>$url/tracker/?func=detail&atid=".$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id']."</comment>\n";
 				break;
 			}
 			case 'frsrelease': {
 				print "   <title>".htmlspecialchars('FRS Release [#'.$arr['description'].']')."</title>\n";
-				print "   <link>http://".$GLOBALS[sys_default_domain].'/frs/?release_id='.$arr['subref_id'].'&group_id='.$arr['group_id']."</link>\n";
-				print "   <comment>http://".$GLOBALS[sys_default_domain].'/frs/?release_id='.$arr['subref_id'].'&group_id='.$arr['group_id']."</comment>\n";
+				print "   <link>$url/frs/?release_id=".$arr['subref_id'].'&group_id='.$arr['group_id']."</link>\n";
+				print "   <comment>$url/frs/?release_id=".$arr['subref_id'].'&group_id='.$arr['group_id']."</comment>\n";
 				break;
 			}
 			case 'forumpost': {
 				print "   <title>".htmlspecialchars('Forum Post [#'.$arr['subref_id'].'] '.$arr['description'])."</title>\n";
-				print "   <link>http://".$GLOBALS[sys_default_domain].'/forum/message.php?forum_id='.$arr['ref_id'].'&msg_id='.$arr['subref_id'].'&group_id='.$arr['group_id']."</link>\n";
-				print "   <comment>http://".$GLOBALS[sys_default_domain].'/forum/message.php?forum_id='.$arr['ref_id'].'&msg_id='.$arr['subref_id'].'&group_id='.$arr['group_id']."</comment>\n";
+				print "   <link>$url/forum/message.php?forum_id=".$arr['ref_id'].'&msg_id='.$arr['subref_id'].'&group_id='.$arr['group_id']."</link>\n";
+				print "   <comment>$url/forum/message.php?forum_id=".$arr['ref_id'].'&msg_id='.$arr['subref_id'].'&group_id='.$arr['group_id']."</comment>\n";
 				break;
-			}		
-		}	
-	
-		print "   <description>".rss_description($arr[description])."</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[activity_date])." GMT</pubDate>\n";
+			}
+			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";
+				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 "  </item>\n";
 	}
 	// ## end output
 	print " </channel>\n";
 	print "</rss>\n";
-	
+
 } else {
-       // Print error showing no group was selected
+	// Print error showing no group was selected
 
-       echo "<br><span class=\"error\">    Error: No group selected</span>";
+	echo "<br><span class=\"error\">    Error: No group selected</span>";
 }
 
 



More information about the evolvis-commits mailing list