[Fusionforge-commits] FusionForge branch master updated. 6.0.4-551-gebde70b

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Fri Jun 17 18:33:40 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  ebde70b2c204bde19e1c9263d538d704f860ab51 (commit)
       via  1d1ec43130c631e281186df5d045e7c0b9b247ba (commit)
       via  536549e8b9718c5e7d849c11f6dd9b0671017b71 (commit)
       via  6720d3ea3a2da6268988ce427c32766cbde04762 (commit)
       via  2615e9fa7dceb59f3c592b5b8e24424832d3c041 (commit)
       via  bebde67b24893747a1b5196f196829ef5421dec6 (commit)
      from  f62c465afa90447b829a2e94659cb59c4f146f0a (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=ebde70b2c204bde19e1c9263d538d704f860ab51

commit ebde70b2c204bde19e1c9263d538d704f860ab51
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Fri Jun 17 18:33:34 2016 +0200

    Use __construct

diff --git a/src/plugins/forumml/include/ForumMLHtmlSearchRenderer.class.php b/src/plugins/forumml/include/ForumMLHtmlSearchRenderer.class.php
index 737a82a..738abda 100644
--- a/src/plugins/forumml/include/ForumMLHtmlSearchRenderer.class.php
+++ b/src/plugins/forumml/include/ForumMLHtmlSearchRenderer.class.php
@@ -23,7 +23,7 @@ class ForumMLHtmlSearchRenderer extends HtmlGroupSearchRenderer {
          * @param int $groupId group id
          * @param array $sections array of all sections to search in (array of strings)
          */
-        function ForumMLHtmlSearchRenderer($words, $offset, $isExact, $groupId) {
+        function __construct($words, $offset, $isExact, $groupId) {
                 $this->groupId = $groupId;
 
                 $searchQuery = new ForumMLSearchQuery($words, $offset, $isExact, $groupId);
diff --git a/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php b/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php
index 5579018..fd8b40e 100644
--- a/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php
+++ b/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php
@@ -34,7 +34,6 @@ class WikiHtmlSearchRenderer extends HtmlGroupSearchRenderer {
      * @param int $offset offset
      * @param bool $isExact if we want to search for all the words or if only one matching the query is sufficient
      * @param int $groupId group id
-     * @internal param array $sections array of all sections to search in (array of strings)
      */
 	function __construct($words, $offset, $isExact, $groupId) {
 		$this->groupId = $groupId;
@@ -42,7 +41,7 @@ class WikiHtmlSearchRenderer extends HtmlGroupSearchRenderer {
 		$searchQuery = new WikiSearchQuery($words, $offset, $isExact, $groupId);
 
 		// init the search renderer
-		$this->HtmlGroupSearchRenderer(SEARCH__TYPE_IS_WIKI, $words, $isExact,
+		parent::__construct(SEARCH__TYPE_IS_WIKI, $words, $isExact,
 			$searchQuery, $groupId, 'wiki');
 
 		$this->tableHeaders = array(_('Page'),_('Author'), _('Date'));
diff --git a/src/plugins/wiki/common/WikiSearchEngine.class.php b/src/plugins/wiki/common/WikiSearchEngine.class.php
index e0c1ad7..168766f 100644
--- a/src/plugins/wiki/common/WikiSearchEngine.class.php
+++ b/src/plugins/wiki/common/WikiSearchEngine.class.php
@@ -34,11 +34,11 @@ class WikiSearchEngine extends GFSearchEngine {
 	var $rendererClassName;
 	var $groupId;
 
-	function WikiSearchEngine($type, $rendererClassName, $label, $groupId) {
+	function __construct($type, $rendererClassName, $label, $groupId) {
 		$this->groupId = $groupId;
 		$this->rendererClassName = $rendererClassName;
 
-		$this->GFSearchEngine($type, $rendererClassName, $label);
+		parent::__construct($type, $rendererClassName, $label);
 	}
 
 	function isAvailable($parameters) {

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

commit 1d1ec43130c631e281186df5d045e7c0b9b247ba
Merge: 536549e f62c465
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Fri Jun 17 17:36:05 2016 +0200

    Merge branch 'master' of git+ssh://scm.fusionforge.org//scmrepos/git/fusionforge/fusionforge


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

commit 536549e8b9718c5e7d849c11f6dd9b0671017b71
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Fri Jun 17 17:26:31 2016 +0200

    Whitespace

diff --git a/src/common/reporting/ReportSetup.class.php b/src/common/reporting/ReportSetup.class.php
index ec6b98e..669e3ce 100644
--- a/src/common/reporting/ReportSetup.class.php
+++ b/src/common/reporting/ReportSetup.class.php
@@ -55,8 +55,8 @@ class ReportSetup extends Report {
 			time_code int not null CONSTRAINT reptimetrk_timecode REFERENCES rep_time_category(time_code),
 				hours float not null);";
 		$sql[]=$sql1;
-	//	$sql[]="CREATE UNIQUE INDEX reptimetrk_weekusrtskcde ON
-	//		rep_time_tracking (week,user_id,project_task_id,time_code);";
+		//	$sql[]="CREATE UNIQUE INDEX reptimetrk_weekusrtskcde ON
+		//		rep_time_tracking (week,user_id,project_task_id,time_code);";
 		$sql[]="CREATE INDEX reptimetracking_userdate ON
 			rep_time_tracking (user_id,week);";
 
@@ -182,7 +182,7 @@ class ReportSetup extends Report {
 		FROM rep_user_act_monthly
 		GROUP BY user_id;";
 
-	//per-project activity
+		//per-project activity
 		$sql[]="DROP TABLE rep_group_act_daily";
 		$sql[]="CREATE TABLE rep_group_act_daily (
 		group_id int not null,
@@ -248,7 +248,7 @@ class ReportSetup extends Report {
 		FROM rep_group_act_monthly
 		GROUP BY group_id;";
 
-	//overall activity
+		//overall activity
 		$sql[]="DROP VIEW rep_site_act_daily_vw";
 		$sql[]="CREATE VIEW rep_site_act_daily_vw AS
 		SELECT day,
@@ -1370,8 +1370,6 @@ class ReportSetup extends Report {
 				$time_code));
 	}
 
-
-
 	/**
 	 * Add a row to the project_status table.
 	 *

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

commit 6720d3ea3a2da6268988ce427c32766cbde04762
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Fri Jun 17 17:26:14 2016 +0200

    Encode brackets in URL

diff --git a/src/common/widget/Widget.class.php b/src/common/widget/Widget.class.php
index 73fb532..1f811ee 100644
--- a/src/common/widget/Widget.class.php
+++ b/src/common/widget/Widget.class.php
@@ -370,9 +370,9 @@ require_once $gfcommon.'widget/Widget_HomeVersion.class.php';
 		return 'widget-preview-'.($this->id).'-'.$locale;
 	}
 	function getAjaxUrl($owner_id, $owner_type) {
-		return '/widgets/widget.php?owner='. $owner_type.$owner_id .'&action=ajax&name['. $this->id .']='. $this->getInstanceId();
+		return '/widgets/widget.php?owner='. $owner_type.$owner_id .'&action=ajax&name%5B'. $this->id .'%5D='. $this->getInstanceId();
 	}
 	function getIframeUrl($owner_id, $owner_type) {
-		return '/widgets/widget.php?owner='. $owner_type.$owner_id .'&action=iframe&name['. $this->id .']='. $this->getInstanceId();
+		return '/widgets/widget.php?owner='. $owner_type.$owner_id .'&action=iframe&name%5B'. $this->id .'%5D='. $this->getInstanceId();
 	}
 }

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

commit 2615e9fa7dceb59f3c592b5b8e24424832d3c041
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Fri Jun 17 17:25:25 2016 +0200

    public is not needed for function __construct

diff --git a/src/common/include/PluginPersistence.class.php b/src/common/include/PluginPersistence.class.php
index c7a3b5f..2f420e0 100644
--- a/src/common/include/PluginPersistence.class.php
+++ b/src/common/include/PluginPersistence.class.php
@@ -35,7 +35,7 @@ class PluginPersistentStore extends FFError {
 	/**
 	 * @param integer $plugin_id
 	 */
-	public function __construct($plugin_id) {
+	function __construct($plugin_id) {
 		$this->plugin_id = $plugin_id;
 	}
 

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

commit bebde67b24893747a1b5196f196829ef5421dec6
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Fri Jun 17 17:24:24 2016 +0200

    Use elseif

diff --git a/src/common/frs/FRSFileType.class.php b/src/common/frs/FRSFileType.class.php
index 3c7276c..b071dc9 100644
--- a/src/common/frs/FRSFileType.class.php
+++ b/src/common/frs/FRSFileType.class.php
@@ -48,11 +48,8 @@ class FRSFileType extends FFError {
 		parent::__construct();
 		if($type_id && $name) {
 			$this->data_array = array( 'type_id' => $type_id, 'name' => $name);
-		}
-		else {
-			if ($type_id) {
-				$this->fetchData($type_id);
-			}
+		} elseif ($type_id) {
+			$this->fetchData($type_id);
 		}
 	}
 

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

Summary of changes:
 src/common/frs/FRSFileType.class.php                           |  7 ++-----
 src/common/include/PluginPersistence.class.php                 |  2 +-
 src/common/reporting/ReportSetup.class.php                     | 10 ++++------
 src/common/widget/Widget.class.php                             |  4 ++--
 .../forumml/include/ForumMLHtmlSearchRenderer.class.php        |  2 +-
 src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php       |  3 +--
 src/plugins/wiki/common/WikiSearchEngine.class.php             |  4 ++--
 7 files changed, 13 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list