[evolvis-commits] r6554: merge bm:taramir/patches/new-rss-feeds

Thorsten Glaser t.glaser at tarent.de
Tue Apr 20 17:20:05 CEST 2010


Author: Thorsten Glaser <t.glaser at tarent.de>
Date: 2010-04-20 17:20:04 +0200 (Tue, 20 Apr 2010)
New Revision: 6554

Modified:
   trunk/gforge_base/evolvisforge/gforge/debian/changelog
   trunk/gforge_base/evolvisforge/gforge/www/export/rss20_docman.php
   trunk/gforge_base/evolvisforge/gforge/www/export/rss20_forum.php
   trunk/gforge_base/evolvisforge/gforge/www/export/rss20_tasks.php
   trunk/gforge_base/evolvisforge/gforge/www/export/rss20_tracker.php
Log:
merge bm:taramir/patches/new-rss-feeds

Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-04-20 15:19:59 UTC (rev 6553)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-04-20 15:20:04 UTC (rev 6554)
@@ -1,10 +1,15 @@
-gforge (4.8.3+evolvis6) UNRELEASED; urgency=low
+gforge (4.8.3+evolvis6) unstable; urgency=low
 
+  [ Roland Mas ]
   * Added ability to sort by the values of the columns in the subproject
     list page (branch sort-subprojects, item #573).
+  * Merged bugfixes from delegate-role-settings-to-plugins
 
- -- Roland Mas <roland at gnurandal.com>  Tue, 20 Apr 2010 15:14:56 +0200
+  [ Thorsten Glaser ]
+  * Bugfix the dataintransit RSS feeds (convert to new-style *forge)
 
+ -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 20 Apr 2010 17:00:00 +0200
+
 gforge (4.8.3+evolvis5) unstable; urgency=low
 
   * gf-p-mediawiki: default to enabling file uploads; [TTID# 1003495]

Modified: trunk/gforge_base/evolvisforge/gforge/www/export/rss20_docman.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/export/rss20_docman.php	2010-04-20 15:19:59 UTC (rev 6553)
+++ trunk/gforge_base/evolvisforge/gforge/www/export/rss20_docman.php	2010-04-20 15:20:04 UTC (rev 6554)
@@ -13,10 +13,11 @@
 // Keep in mind to write "&" in URLs as &amp; in RSS feeds
 
 
-include "pre.php";
-include "rss_utils.inc";
-require_once('common/docman/DocumentFactory.class');
-require_once('common/docman/DocumentGroupFactory.class');
+require_once '../env.inc.php';
+require_once $gfwww.'include/pre.php';
+require_once $gfwww.'export/rss_utils.inc';
+require_once $gfcommon.'docman/DocumentFactory.class.php';
+require_once $gfcommon.'docman/DocumentGroupFactory.class.php';
 
 
 if (isset($_GET['group_id'])&&!empty($_GET['group_id'])&&is_numeric($_GET['group_id'])) {
@@ -105,7 +106,7 @@
 	$child_count = count($nested_groups["$parent_group"]);
 	*/	
 	if (!$d_arr || count($d_arr) < 1) {
-		endOnError($Language->getText('docman','error_no_docs'));
+		endOnError(_("No documents found in Document Manager"));
 
 	} else {
 		//	Put the result set (list of documents for this group) into feed items

Modified: trunk/gforge_base/evolvisforge/gforge/www/export/rss20_forum.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/export/rss20_forum.php	2010-04-20 15:19:59 UTC (rev 6553)
+++ trunk/gforge_base/evolvisforge/gforge/www/export/rss20_forum.php	2010-04-20 15:20:04 UTC (rev 6554)
@@ -22,12 +22,13 @@
 // none: 10 last threads of evolvis as a whole
 //
 
-include "pre.php";
-include "rss_utils.inc";
-require_once('common/forum/Forum.class');
-require_once('common/forum/ForumFactory.class');
-require_once('common/forum/ForumMessage.class');
-require_once('common/forum/ForumMessageFactory.class');
+require_once '../env.inc.php';
+require_once $gfwww.'include/pre.php';
+require_once $gfwww.'export/rss_utils.inc';
+require_once $gfcommon.'forum/Forum.class.php';
+require_once $gfcommon.'forum/ForumFactory.class.php';
+require_once $gfcommon.'forum/ForumMessage.class.php';
+require_once $gfcommon.'forum/ForumMessageFactory.class.php';
 
 global $sys_name, $sys_default_domain;
 
@@ -79,7 +80,7 @@
                 if ($ff &&is_object($ff) && !$ff->isError()) {
                     $farr = array_merge($farr, $ff->getForums());
                     if (count($farr) < 1) {
-                            error_log("Forum RSS: ".$Language->getText('forum','error_no_forums_found', array($group->getPublicName())),0);
+                            error_log(_("Forum RSS: No forums found"),0);
                     }
                 }
                 else error_log("Forum RSS: ForumFactory error: ".$ff->getErrorMessage()." - No forums for group ".$group->getPublicName(),0);
@@ -244,7 +245,7 @@
     
     $res_msg = db_query($msg_sql);
     if (!$res_msg || db_numrows($res_msg) < 1) {
-            error_log("Forum RSS: ".$Language->getText('forum','error_forum_not_found').' '.db_error(),0);
+            error_log(_("Forum RSS: Forum not found: ").' '.db_error(),0);
     }
     if ($debug) error_log("Forum RSS: ". $msg_sql,0);
 

Modified: trunk/gforge_base/evolvisforge/gforge/www/export/rss20_tasks.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/export/rss20_tasks.php	2010-04-20 15:19:59 UTC (rev 6553)
+++ trunk/gforge_base/evolvisforge/gforge/www/export/rss20_tasks.php	2010-04-20 15:20:04 UTC (rev 6554)
@@ -1,7 +1,9 @@
 <?php
-include "../include/pre.php";
-include "rss_utils.inc";
 
+require_once '../env.inc.php';
+require_once $gfwww.'include/pre.php';
+require_once $gfwww.'export/rss_utils.inc';
+
 global $sys_name, $sys_default_domain;
 
 //Default Vars

Modified: trunk/gforge_base/evolvisforge/gforge/www/export/rss20_tracker.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/export/rss20_tracker.php	2010-04-20 15:19:59 UTC (rev 6553)
+++ trunk/gforge_base/evolvisforge/gforge/www/export/rss20_tracker.php	2010-04-20 15:20:04 UTC (rev 6554)
@@ -12,11 +12,10 @@
 //Notes:
 // Keep in mind to write "&" in URLs as &amp; in RSS feeds
 
+require_once '../env.inc.php';
+require_once $gfwww.'include/pre.php';
+require_once $gfwww.'export/rss_utils.inc';
 
-include "pre.php";
-include "rss_utils.inc";
-
-
 if (isset($_GET['group_id'])&&!empty($_GET['group_id'])&&is_numeric($_GET['group_id'])) {
 	$group_id = $_GET['group_id'];
 
@@ -90,7 +89,7 @@
 	//if ($limit > 100) $limit = 100;
 
 	if (!$at_arr || count($at_arr) < 1) {
-		endOnError($Language->getText('tracker','no_trackers_text'));
+		endOnError(_("Tracker RSS: No trackers found"));
 
 	} else {
 		//	Put the result set (list of trackers for this group) into feed items




More information about the evolvis-commits mailing list