[Fusionforge-commits] r6882 - in trunk: . gforge/common/frs gforge/www/export gforge/www/frs gforge/www/frs/admin

Roland Mas lolando at libremir.placard.fr.eu.org
Sun Feb 1 20:21:58 CET 2009


Author: lolando
Date: 2009-02-01 20:21:57 +0100 (Sun, 01 Feb 2009)
New Revision: 6882

Modified:
   trunk/
   trunk/gforge/common/frs/FRSRelease.class.php
   trunk/gforge/www/export/rss20_news.php
   trunk/gforge/www/frs/admin/qrs.php
   trunk/gforge/www/frs/download.php
Log:
Merged from 4.7


Property changes on: trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/Branch_4_7:6879,6881


Modified: trunk/gforge/common/frs/FRSRelease.class.php
===================================================================
--- trunk/gforge/common/frs/FRSRelease.class.php	2009-02-01 19:20:45 UTC (rev 6881)
+++ trunk/gforge/common/frs/FRSRelease.class.php	2009-02-01 19:21:57 UTC (rev 6882)
@@ -286,16 +286,16 @@
 		$subject = sprintf (_('[%1$s Release] %2$s'),
 				    $this->FRSPackage->Group->getUnixName(),
 				    $this->FRSPackage->getName());
-		$text = stripcslashes(sprintf(_("Project %1$s (%2$s) has released a new version of package \"%3$s\".
+		$text = stripcslashes(sprintf(_('Project %1$s (%2$s) has released a new version of package "%3$s".
 You can download it by following this link:
 
 %4$s
 
 You receive this email because you requested to be notified when new
-versions of this package were released. If you don't wish to be
+versions of this package were released. If you don\'t wish to be
 notified in the future, please login to %5$s and click this link:
 
-%6$s"),
+%6$s'),
 					      $this->FRSPackage->Group->getPublicName(),
 					      $this->FRSPackage->Group->getUnixName(),
 					      $this->FRSPackage->getName(),

Modified: trunk/gforge/www/export/rss20_news.php
===================================================================
--- trunk/gforge/www/export/rss20_news.php	2009-02-01 19:20:45 UTC (rev 6881)
+++ trunk/gforge/www/export/rss20_news.php	2009-02-01 19:21:57 UTC (rev 6882)
@@ -81,7 +81,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['date'])." GMT</pubDate>\n";
+	print "   <pubDate>".gmdate('D, d M Y G:i:s',$row['post_date'])." GMT</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 {

Modified: trunk/gforge/www/frs/admin/qrs.php
===================================================================
--- trunk/gforge/www/frs/admin/qrs.php	2009-02-01 19:20:45 UTC (rev 6881)
+++ trunk/gforge/www/frs/admin/qrs.php	2009-02-01 19:21:57 UTC (rev 6882)
@@ -50,6 +50,7 @@
 	$release_changes = getStringFromRequest('release_changes');
 	$preformatted = getStringFromRequest('preformatted');
 	$ftp_filename = getStringFromRequest('ftp_filename');
+	$feedback = '' ;
 	if ($sys_use_ftpuploads && $ftp_filename && util_is_valid_filename($ftp_filename) && is_file($upload_dir.'/'.$ftp_filename)) {
 		//file was uploaded already via ftp
 		//use setuid prog to chown it

Modified: trunk/gforge/www/frs/download.php
===================================================================
--- trunk/gforge/www/frs/download.php	2009-02-01 19:20:45 UTC (rev 6881)
+++ trunk/gforge/www/frs/download.php	2009-02-01 19:21:57 UTC (rev 6882)
@@ -100,8 +100,9 @@
 		$us=100;
 	}
 
+	$ip=getStringFromServer('REMOTE_ADDR');
 	$res=db_query("INSERT INTO frs_dlstats_file (ip_address,file_id,month,day,user_id) 
-		VALUES ('$REMOTE_ADDR','$file_id','".date('Ym')."','".date('d')."','$us')");
+		VALUES ('$ip','$file_id','".date('Ym')."','".date('d')."','$us')");
 } else {
 	Header("Status: 404");
 }




More information about the Fusionforge-commits mailing list