[Fusionforge-commits] r10729 - in trunk/src: common/search www/search/include/renderers

Franck VILLAUME nerville at libremir.placard.fr.eu.org
Mon Sep 27 13:05:55 CEST 2010


Author: nerville
Date: 2010-09-27 13:05:55 +0200 (Mon, 27 Sep 2010)
New Revision: 10729

Modified:
   trunk/src/common/search/DocsSearchQuery.class.php
   trunk/src/common/search/ForumsSearchQuery.class.php
   trunk/src/common/search/FrsSearchQuery.class.php
   trunk/src/common/search/NewsSearchQuery.class.php
   trunk/src/common/search/PeopleSearchQuery.class.php
   trunk/src/common/search/ProjectSearchQuery.class.php
   trunk/src/common/search/SkillSearchQuery.class.php
   trunk/src/common/search/TasksSearchQuery.class.php
   trunk/src/common/search/TrackersSearchQuery.class.php
   trunk/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php
   trunk/src/www/search/include/renderers/ForumsHtmlSearchRenderer.class.php
   trunk/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
   trunk/src/www/search/include/renderers/NewsHtmlSearchRenderer.class.php
   trunk/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
   trunk/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
   trunk/src/www/search/include/renderers/SkillHtmlSearchRenderer.class.php
   trunk/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
   trunk/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
Log:
php warnings

Modified: trunk/src/common/search/DocsSearchQuery.class.php
===================================================================
--- trunk/src/common/search/DocsSearchQuery.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/common/search/DocsSearchQuery.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -4,6 +4,7 @@
  *
  * Copyright 2004, Dominik Haas
  * Copyright 2009, Roland Mas
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -23,7 +24,7 @@
  * USA
  */
 
-require_once $gfcommon.'search/SearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/SearchQuery.class.php';
 
 class DocsSearchQuery extends SearchQuery {
 	
@@ -182,7 +183,7 @@
 	 * @param $groupId int group id
 	 * @param $showNonPublic boolean if we should consider non public sections
 	 */
-	function getSections($groupId, $showNonPublic=false) {
+	static function getSections($groupId, $showNonPublic=false) {
 		$sql = 'SELECT doc_groups.doc_group, doc_groups.groupname FROM doc_groups, doc_data'
 			.' WHERE doc_groups.doc_group = doc_data.doc_group AND doc_groups.group_id=$1';
 		if ($showNonPublic) {

Modified: trunk/src/common/search/ForumsSearchQuery.class.php
===================================================================
--- trunk/src/common/search/ForumsSearchQuery.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/common/search/ForumsSearchQuery.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -4,6 +4,7 @@
  *
  * Copyright 2004, Dominik Haas
  * Copyright 2009, Roland Mas
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -23,7 +24,7 @@
  * USA
  */
  
-require_once $gfcommon.'search/SearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/SearchQuery.class.php';
 
 class ForumsSearchQuery extends SearchQuery {
 	
@@ -147,7 +148,7 @@
 	 * @param $groupId int group id
 	 * @param $showNonPublic boolean if we should consider non public sections
 	 */
-	function getSections($groupId, $showNonPublic=false) {
+	static function getSections($groupId, $showNonPublic=false) {
 		$sql = 'SELECT group_forum_id, forum_name FROM forum_group_list WHERE group_id = $1 AND is_public <> 9';
 		if (!$showNonPublic) {
 			$sql .= ' AND is_public = 1';

Modified: trunk/src/common/search/FrsSearchQuery.class.php
===================================================================
--- trunk/src/common/search/FrsSearchQuery.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/common/search/FrsSearchQuery.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -4,6 +4,7 @@
  *
  * Copyright 2004, Dominik Haas
  * Copyright 2009, Roland Mas
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -23,7 +24,7 @@
  * USA
  */
 
-require_once $gfcommon.'search/SearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/SearchQuery.class.php';
 
 class FrsSearchQuery extends SearchQuery {
 	
@@ -151,7 +152,7 @@
 	 * @param $groupId int group id
 	 * @param $showNonPublic boolean if we should consider non public sections
 	 */
-	function getSections($groupId, $showNonPublic) {
+	static function getSections($groupId, $showNonPublic) {
 		$sql = 'SELECT package_id, name FROM frs_package WHERE group_id=$1';
 		if(!$showNonPublic) {
 			$sql .= ' AND is_public=1';

Modified: trunk/src/common/search/NewsSearchQuery.class.php
===================================================================
--- trunk/src/common/search/NewsSearchQuery.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/common/search/NewsSearchQuery.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -3,6 +3,7 @@
  * FusionForge search engine
  *
  * Copyright 2004, Dominik Haas
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -22,7 +23,7 @@
  * USA
  */
 
-require_once $gfcommon.'search/SearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/SearchQuery.class.php';
 
 class NewsSearchQuery extends SearchQuery {
 	

Modified: trunk/src/common/search/PeopleSearchQuery.class.php
===================================================================
--- trunk/src/common/search/PeopleSearchQuery.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/common/search/PeopleSearchQuery.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001, VA Linux Systems, Inc
  * Copyright 2004, Guillaume Smet/Open Wide
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -23,7 +24,7 @@
  * USA
  */
 
-require_once $gfcommon.'search/SearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/SearchQuery.class.php';
 
 class PeopleSearchQuery extends SearchQuery {
 

Modified: trunk/src/common/search/ProjectSearchQuery.class.php
===================================================================
--- trunk/src/common/search/ProjectSearchQuery.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/common/search/ProjectSearchQuery.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001, VA Linux Systems, Inc
  * Copyright 2004, Guillaume Smet/Open Wide
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -23,7 +24,7 @@
  * USA
  */
 
-require_once $gfcommon.'search/SearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/SearchQuery.class.php';
 
 class ProjectSearchQuery extends SearchQuery {
 

Modified: trunk/src/common/search/SkillSearchQuery.class.php
===================================================================
--- trunk/src/common/search/SkillSearchQuery.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/common/search/SkillSearchQuery.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001, VA Linux Systems, Inc
  * Copyright 2004, Guillaume Smet/Open Wide
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -23,7 +24,7 @@
  * USA
  */
 
-require_once $gfcommon.'search/SearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/SearchQuery.class.php';
 
 class SkillSearchQuery extends SearchQuery {
 

Modified: trunk/src/common/search/TasksSearchQuery.class.php
===================================================================
--- trunk/src/common/search/TasksSearchQuery.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/common/search/TasksSearchQuery.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -4,6 +4,7 @@
  *
  * Copyright 2004, Dominik Haas
  * Copyright 2009, Roland Mas
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -23,7 +24,7 @@
  * USA
  */
 
-require_once $gfcommon.'search/SearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/SearchQuery.class.php';
 
 class TasksSearchQuery extends SearchQuery {
 	
@@ -148,7 +149,7 @@
 	 * @param $groupId int group id
 	 * @param $showNonPublic boolean if we should consider non public sections
 	 */
-	function getSections($groupId, $showNonPublic=false) {
+	static function getSections($groupId, $showNonPublic=false) {
 		$sql = 'SELECT group_project_id, project_name FROM project_group_list WHERE group_id=$1' ;
 		if (!$showNonPublic) {
 			$sql .= ' AND is_public = 1';

Modified: trunk/src/common/search/TrackersSearchQuery.class.php
===================================================================
--- trunk/src/common/search/TrackersSearchQuery.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/common/search/TrackersSearchQuery.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -4,6 +4,7 @@
  *
  * Copyright 2004, Dominik Haas
  * Copyright 2009, Roland Mas
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -23,7 +24,7 @@
  * USA
  */
 
-require_once $gfcommon.'search/SearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/SearchQuery.class.php';
 
 class TrackersSearchQuery extends SearchQuery {
 	
@@ -153,7 +154,7 @@
 	 * @param $groupId int group id
 	 * @param $showNonPublic boolean if we should consider non public sections
 	 */
-	function getSections($groupId, $showNonPublic=false) {
+	static function getSections($groupId, $showNonPublic=false) {
 		$sql = 'SELECT group_artifact_id, name FROM artifact_group_list WHERE group_id = $1';
 		if (!$showNonPublic) {
 			$sql .= ' AND artifact_group_list.is_public = 1';

Modified: trunk/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php
===================================================================
--- trunk/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -23,7 +23,7 @@
  */
 
 require_once $gfwww.'search/include/renderers/HtmlGroupSearchRenderer.class.php';
-require_once $gfcommon.'search/DocsSearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/DocsSearchQuery.class.php';
 			  
 class DocsHtmlSearchRenderer extends HtmlGroupSearchRenderer {
 	

Modified: trunk/src/www/search/include/renderers/ForumsHtmlSearchRenderer.class.php
===================================================================
--- trunk/src/www/search/include/renderers/ForumsHtmlSearchRenderer.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/www/search/include/renderers/ForumsHtmlSearchRenderer.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -23,7 +23,7 @@
  */
 
 require_once $gfwww.'search/include/renderers/HtmlGroupSearchRenderer.class.php';
-require_once $gfcommon.'search/ForumsSearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/ForumsSearchQuery.class.php';
 	
 class ForumsHtmlSearchRenderer extends HtmlGroupSearchRenderer {
 

Modified: trunk/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
===================================================================
--- trunk/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -23,7 +23,7 @@
  */
 
 require_once $gfwww.'search/include/renderers/HtmlGroupSearchRenderer.class.php';
-require_once $gfcommon.'search/FrsSearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/FrsSearchQuery.class.php';
 			  
 class FrsHtmlSearchRenderer extends HtmlGroupSearchRenderer {
 	

Modified: trunk/src/www/search/include/renderers/NewsHtmlSearchRenderer.class.php
===================================================================
--- trunk/src/www/search/include/renderers/NewsHtmlSearchRenderer.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/www/search/include/renderers/NewsHtmlSearchRenderer.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -23,7 +23,7 @@
  */
  
 require_once $gfwww.'search/include/renderers/HtmlGroupSearchRenderer.class.php';
-require_once $gfcommon.'search/NewsSearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/NewsSearchQuery.class.php';
 
 class NewsHtmlSearchRenderer extends HtmlGroupSearchRenderer {
 	

Modified: trunk/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
===================================================================
--- trunk/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -24,7 +24,7 @@
  */
 
 require_once $gfwww.'search/include/renderers/HtmlSearchRenderer.class.php';
-require_once $gfcommon.'search/PeopleSearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/PeopleSearchQuery.class.php';
 
 class PeopleHtmlSearchRenderer extends HtmlSearchRenderer {
 

Modified: trunk/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
===================================================================
--- trunk/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -24,7 +24,7 @@
  */
 
 require_once $gfwww.'search/include/renderers/HtmlSearchRenderer.class.php';
-require_once $gfcommon.'search/ProjectSearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/ProjectSearchQuery.class.php';
 
 class ProjectHtmlSearchRenderer extends HtmlSearchRenderer {
 

Modified: trunk/src/www/search/include/renderers/SkillHtmlSearchRenderer.class.php
===================================================================
--- trunk/src/www/search/include/renderers/SkillHtmlSearchRenderer.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/www/search/include/renderers/SkillHtmlSearchRenderer.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -24,7 +24,7 @@
  */
 
 require_once $gfwww.'search/include/renderers/HtmlSearchRenderer.class.php';
-require_once $gfcommon.'search/SkillSearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/SkillSearchQuery.class.php';
 
 class SkillHtmlSearchRenderer extends HtmlSearchRenderer {
 

Modified: trunk/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
===================================================================
--- trunk/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -23,8 +23,8 @@
  */
 
 require_once $gfwww.'search/include/renderers/HtmlGroupSearchRenderer.class.php';
-require_once $gfcommon.'search/TasksSearchQuery.class.php';
-	
+require_once $GLOBALS['gfcommon'].'search/TasksSearchQuery.class.php';
+
 class TasksHtmlSearchRenderer extends HtmlGroupSearchRenderer {
 	
 	/**

Modified: trunk/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
===================================================================
--- trunk/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php	2010-09-26 17:52:48 UTC (rev 10728)
+++ trunk/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php	2010-09-27 11:05:55 UTC (rev 10729)
@@ -23,7 +23,7 @@
  */
 
 require_once $gfwww.'search/include/renderers/HtmlGroupSearchRenderer.class.php';
-require_once $gfcommon.'search/TrackersSearchQuery.class.php';
+require_once $GLOBALS['gfcommon'].'search/TrackersSearchQuery.class.php';
 	
 class TrackersHtmlSearchRenderer extends HtmlGroupSearchRenderer {
 




More information about the Fusionforge-commits mailing list