[Fusionforge-commits] FusionForge branch master updated. 6.0.4-595-gbc83350

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Fri Jun 24 16:10:05 CEST 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  bc83350d2adc1b14eff19c99731220d61d13ce1f (commit)
       via  f9e564d4762ee756a0887675c83c189eb5f719a7 (commit)
      from  297e48630bf69a7387d3daaf934d5fba1b63953e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=bc83350d2adc1b14eff19c99731220d61d13ce1f

commit bc83350d2adc1b14eff19c99731220d61d13ce1f
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Fri Jun 24 16:09:59 2016 +0200

    Use __construct

diff --git a/src/plugins/externalsearch/common/ExternalSearchEngine.class.php b/src/plugins/externalsearch/common/ExternalSearchEngine.class.php
index 6ed417e..0746437 100644
--- a/src/plugins/externalsearch/common/ExternalSearchEngine.class.php
+++ b/src/plugins/externalsearch/common/ExternalSearchEngine.class.php
@@ -4,8 +4,21 @@
  *
  * Copyright 2004 (c) Guillaume Smet
  *
- * http://gforge.org
+ * This file is part of FusionForge.
  *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 require_once $gfwww.'search/include/engines/GroupSearchEngine.class.php';
@@ -26,11 +39,11 @@ class ExternalSearchEngine extends GroupSearchEngine {
 	*/
 	var $url;
 
-	function ExternalSearchEngine($type, $name, $url) {
+	function __construct($type, $name, $url) {
 		$this->name = $name;
 		$this->url = $url;
 
-		$this->GroupSearchEngine($type, 'ExternalHtmlSearchRenderer', $name);
+		parent::__construct($type, 'ExternalHtmlSearchRenderer', $name);
 	}
 
 	function isAvailable($parameters) {
diff --git a/src/plugins/forumml/include/ForumMLGroupSearchEngine.class.php b/src/plugins/forumml/include/ForumMLGroupSearchEngine.class.php
index 8dce772..b7ef918 100644
--- a/src/plugins/forumml/include/ForumMLGroupSearchEngine.class.php
+++ b/src/plugins/forumml/include/ForumMLGroupSearchEngine.class.php
@@ -1,18 +1,32 @@
 <?php
 /**
- * Wiki Search Engine for GForge
+ * ForumML Search Engine for FusionForge
  *
  * Copyright 2006 (c) Alain Peyrat
  *
- * @version $Id: GroupSearchEngine.class,v 1.2 2004/12/12 23:34:46 gsmet Exp $
+ * This file is part of FusionForge.
+ *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 require_once $gfwww.'search/include/engines/GroupSearchEngine.class.php';
 
 class ForumMLGroupSearchEngine extends GroupSearchEngine {
 
-	function ForumMLGroupSearchEngine() {
-		$this->GroupSearchEngine(SEARCH__TYPE_IS_LIST,
+	function __construct() {
+		parent::__construct(SEARCH__TYPE_IS_LIST,
 					 'ForumMLHtmlSearchRenderer',
 					 _('ForumML'));
 	}
diff --git a/src/plugins/forumml/include/ForumMLSearchEngine.class.php b/src/plugins/forumml/include/ForumMLSearchEngine.class.php
index beb26e6..7fbab0d 100644
--- a/src/plugins/forumml/include/ForumMLSearchEngine.class.php
+++ b/src/plugins/forumml/include/ForumMLSearchEngine.class.php
@@ -4,9 +4,21 @@
  *
  * Copyright 2004 (c) Guillaume Smet
  *
- * http://gforge.org
+ * This file is part of FusionForge.
  *
- * @version $Id: ExternalSearchEngine.class 3933 2005-02-19 13:04:45Z gsmet $
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 require_once $GLOBALS['gfwww'].'search/include/engines/GroupSearchEngine.class.php';
@@ -21,11 +33,11 @@ class ForumMLSearchEngine extends GroupSearchEngine {
 	var $rendererClassName;
 	var $groupId;
 
-	function ForumMLSearchEngine($type, $rendererClassName, $label, $groupId) {
+	function __construct($type, $rendererClassName, $label, $groupId) {
 		$this->groupId = $groupId;
 		$this->rendererClassName = $rendererClassName;
 
-		$this->GroupSearchEngine($type, $rendererClassName, $label);
+		parent::__construct($type, $rendererClassName, $label);
 	}
 
 	function isAvailable($parameters) {

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f9e564d4762ee756a0887675c83c189eb5f719a7

commit f9e564d4762ee756a0887675c83c189eb5f719a7
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Fri Jun 24 16:08:32 2016 +0200

    Add function getPluginDescription

diff --git a/src/plugins/webanalytics/common/webanalyticsPlugin.class.php b/src/plugins/webanalytics/common/webanalyticsPlugin.class.php
index d45928f..a4c2681 100644
--- a/src/plugins/webanalytics/common/webanalyticsPlugin.class.php
+++ b/src/plugins/webanalytics/common/webanalyticsPlugin.class.php
@@ -181,4 +181,13 @@ such as Piwik or Google Analytics.");
 		include $gfplugins.$this->name.'/view/admin/viewGlobalConfiguration.php';
 		return true;
 	}
+
+	/**
+	 * getPluginDescription - display the description of this plugin in pluginman admin page
+	 *
+	 * @return	string	the description
+	 */
+	function getPluginDescription() {
+		return _('Get the ability to configure specific URL for web analytics tool such as Piwik or Google Analytics.');
+	}
 }

-----------------------------------------------------------------------

Summary of changes:
 .../common/ExternalSearchEngine.class.php          | 19 ++++++++++++++++---
 .../include/ForumMLGroupSearchEngine.class.php     | 22 ++++++++++++++++++----
 .../forumml/include/ForumMLSearchEngine.class.php  | 20 ++++++++++++++++----
 .../common/webanalyticsPlugin.class.php            |  9 +++++++++
 4 files changed, 59 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list