[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1237-gc7f863e

Franck Villaume nerville at libremir.placard.fr.eu.org
Sat Dec 17 14:50:06 CET 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  c7f863e5625c56100db2308372f4576f1df67305 (commit)
       via  c4212a63219f4fb40e6921889a6152b576ad07ae (commit)
       via  9bc4afb0b504701d6b427985c4898e9ca56e26fd (commit)
       via  57b986c63ad76c73e3a00464588de389ffd425d9 (commit)
      from  ca02215287fdc9025ed489e09ae0619b51fb36a6 (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=c7f863e5625c56100db2308372f4576f1df67305

commit c7f863e5625c56100db2308372f4576f1df67305
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Dec 17 14:45:01 2016 +0100

    display realname as link

diff --git a/src/www/project/memberlist.php b/src/www/project/memberlist.php
index 2427235..8d31733 100644
--- a/src/www/project/memberlist.php
+++ b/src/www/project/memberlist.php
@@ -75,7 +75,7 @@ foreach ($members as $user) {
 		$content .= $user->getRealName();
 	}
 	$cells[][] = html_e('div', array('about' => $member_uri, 'typeof' => 'sioc:UserAccount'), $content);
-	$cells[][] = util_display_user($user->getUnixName(),$user->getID(),$user->getUnixName(), 's');
+	$cells[][] = util_display_user($user->getUnixName(), $user->getID(), $user->getRealName(), 's');
 
 	$roles = RBACEngine::getInstance()->getAvailableRolesForUser ($user) ;
 	sortRoleList ($roles) ;

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

commit c4212a63219f4fb40e6921889a6152b576ad07ae
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Dec 17 14:40:17 2016 +0100

    add support for link_text in util_display_user when invoking user_link_with_tooltip

diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index efbe460..a6624ee 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -1073,7 +1073,7 @@ function util_make_link_u($username, $user_id, $text) {
  */
 function util_display_user($username, $user_id = 0, $text = '', $size = 'xs') {
 	// Invoke user_link_with_tooltip plugin
-	$hook_params = array('resource_type' => 'user', 'username' => $username, 'user_id' => $user_id, 'size' => $size, 'user_link' => '');
+	$hook_params = array('resource_type' => 'user', 'username' => $username, 'user_id' => $user_id, 'size' => $size, 'link_text' => $text, 'user_link' => '');
 	plugin_hook_by_reference('user_link_with_tooltip', $hook_params);
 	if ($hook_params['user_link'] != '') {
 		return $hook_params['user_link'];

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

commit 9bc4afb0b504701d6b427985c4898e9ca56e26fd
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Dec 17 14:39:27 2016 +0100

    coding style + support link_text in getResourceLink for user

diff --git a/src/plugins/compactpreview/common/compactpreview-init.php b/src/plugins/compactpreview/common/compactpreview-init.php
index ed39f26..76c46e1 100644
--- a/src/plugins/compactpreview/common/compactpreview-init.php
+++ b/src/plugins/compactpreview/common/compactpreview-init.php
@@ -1,6 +1,6 @@
 <?php
-
 /**
+ * CompactPreviewPlugin init
  *
  * This file is part of FusionForge.
  *
diff --git a/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php b/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php
index 64647e1..a328fb0 100644
--- a/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php
+++ b/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php
@@ -1,15 +1,12 @@
 <?php
-
 /**
  * CompactPreviewPlugin Class
  *
- *
- * 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.
+ * 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 Licence, 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
@@ -17,13 +14,13 @@
  * 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.,
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 class CompactPreviewPlugin extends Plugin {
 
-	function __construct($id=0) {
+	function __construct($id = 0) {
 		parent::__construct($id);
 		$this->name = "compactpreview";
 		$this->text = _("CompactPreview!"); // To show in the tabs, use...
@@ -46,8 +43,7 @@ _("This plugin adds support for user and project compact-preview
 	 * override util_display_user() with modified version to display compact preview popup on user links
 	 * @param array $params hook params (return in $params['user_link'])
 	 */
-	function user_link_with_tooltip (&$params) {
-		//
+	function user_link_with_tooltip(&$params) {
 		require_once dirname( __FILE__ ) . '/CompactResource.class.php';
 		$cR = CompactResource::createCompactResource($params);
 		$params['user_link'] = $cR->getResourceLink();
@@ -57,20 +53,20 @@ _("This plugin adds support for user and project compact-preview
 	 * override util_make_link_g() with modified version to display compact preview popup on project links
 	 * @param array $params hook params (return in $params['user_link'])
 	 */
-	function project_link_with_tooltip (&$params) {
+	function project_link_with_tooltip(&$params) {
 		require_once dirname( __FILE__ ) . '/CompactResource.class.php';
 		$cR = CompactResource::createCompactResource($params);
 		$params['group_link'] = $cR->getResourceLink();
 	}
 
-	function javascript_file (&$params) {
+	function javascript_file(&$params) {
 		// The userTooltip.js script is used by the compact preview feature (see content_negociated_user_home)
 		html_use_jquery();
 		// provides support for the popup for compact preview
 		use_javascript('/plugins/'.$this->name.'/scripts/oslcTooltip.js');
 	}
 
-	function cssfile (&$params) {
+	function cssfile(&$params) {
 		use_stylesheet('/plugins/'.$this->name.'/css/oslcTooltipStyle.css');
 	}
 
@@ -78,7 +74,7 @@ _("This plugin adds support for user and project compact-preview
 	 * Declaration of which content-negociation alternatives are provided by this plugin
 	 * @param unknown_type $params
 	 */
-	function script_accepted_types (&$params) {
+	function script_accepted_types(&$params) {
 		$script = $params['script'];
 		if ($script == 'user_home' || $script == 'project_home') {
 			// we do support content-negociation on /users and /project with the following accept header values
diff --git a/src/plugins/compactpreview/include/CompactResource.class.php b/src/plugins/compactpreview/include/CompactResource.class.php
index 1755dbb..a17d96a 100644
--- a/src/plugins/compactpreview/include/CompactResource.class.php
+++ b/src/plugins/compactpreview/include/CompactResource.class.php
@@ -1,26 +1,25 @@
 <?php
 /**
- * This file is (c) Copyright 2011 by Sabri LABBENE, Institut TELECOM
+ * CompactPreviewPlugin Classes
  *
- * This file is part of FusionForge.
+ * Copyright 2011, Sabri LABBENE, Institut TELECOM
+ * Copyright 2016, Franck Villaume, TrivialDev
+ * http://fusionforge.org/
  *
- * This program 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.
+ * 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 Licence, or (at your option)
+ * any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * 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.
- *
- * This program has been developed in the frame of the COCLICO
- * project with financial support of its funders.
- *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**
@@ -61,7 +60,7 @@ class CompactResource {
 				return new CompatResource($params);
 				break;
 			default :
-				return 'Unknown resource type !';
+				return _('Unknown resource type!');
 				break;
 		}
 	}
@@ -81,6 +80,11 @@ class UserCompactResource extends CompactResource {
 	public function getResourceLink() {
 		$username = $this->params['username'];
 		$user_id = $this->params['user_id'];
+		if (isset($this->params['link_text'])) {
+			$link_text = $this->params['link_text'];
+		} else {
+			$link_text = $username;
+		}
 
 		// invoke user_logo hook
 		$logo_params = array('user_id' => $user_id, 'size' => $this->params['size'], 'content' => '');
@@ -96,12 +100,10 @@ class UserCompactResource extends CompactResource {
 		//				'" rel="'. $resource_url .'">'. $username . '</a>';
 		$css_class = $this->getCssClass();
 
-		$url = '<a class="'. $css_class .
-				'" href="'. $resource_url .'">'. $username .'</a>';
+		$url = util_make_link($resource_url, $link_text, array('class' => $css_class), true);
 		if ($logo_params['content']) {
 			$html = $logo_params['content'] . $url .'<div class="new_line"></div>';
-		}
-		else {
+		} else {
 			$html = $url;
 		}
 		return $html;
@@ -144,8 +146,7 @@ class LocalGroupCompactResource extends GroupCompactResource {
 		$link_text = $this->params['link_text'];
 		$resource_url = util_make_url_g ($group_name, $group_id);
 		$css_class = $this->getCssClass();
-		return '<a class="'.$css_class .'" href="'. $resource_url .
-					'">'. $link_text . '</a>';
+		return util_make_link($resource_url, $link_text, array('class' => $css_class), true);
 	}
 }
 
@@ -157,7 +158,6 @@ class OslcGroupCompactResource extends GroupCompactResource {
 		$name = $this->params['name'];
 		$resource_url = $this->params['url'];
 		$css_class = $this->getCssClass();
-		return '<a class="'.$css_class .'" href="'. $resource_url .
-					'">'. $name . '</a>';
+		return util_make_link($resource_url, $name, array('class' => $css_class), true);
 	}
 }
diff --git a/src/plugins/compactpreview/www/project.php b/src/plugins/compactpreview/www/project.php
index 07766c1..3a1c296 100644
--- a/src/plugins/compactpreview/www/project.php
+++ b/src/plugins/compactpreview/www/project.php
@@ -1,26 +1,23 @@
 <?php
-
 /**
- * This file is (c) Copyright 2010 by Sabri LABBENE, Institut
- * TELECOM
+ * Copyright 2010, Sabri LABBENE, Institut TELECOM
+ *
+ * http://fusionforge.org/
  *
- * This program 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.
+ * 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 Licence, or (at your option)
+ * any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * 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.
- *
- * This program has been developed in the frame of the HELIOS
- * project with financial support of its funders.
- *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 require_once '../../env.inc.php';
diff --git a/src/plugins/compactpreview/www/scripts/oslcTooltip.js b/src/plugins/compactpreview/www/scripts/oslcTooltip.js
index e984936..aa77f56 100644
--- a/src/plugins/compactpreview/www/scripts/oslcTooltip.js
+++ b/src/plugins/compactpreview/www/scripts/oslcTooltip.js
@@ -1,26 +1,23 @@
 /**
- * This file is (c) Copyright 2011 by Sabri LABBENE, Institut TELECOM
+ * Copyright 2011, Sabri LABBENE, Institut TELECOM
  * Copyright 2014, Franck Villaume - TrivialDev
  *
- * This file is part of FusionForge.
+ * http://fusionforge.org/
  *
- * This program 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.
+ * 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 Licence, or (at your option)
+ * any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * 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.
- *
- * This program has been developed in the frame of the COCLICO
- * project with financial support of its funders.
- *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 // This is heavily inspired by code presented in http://rndnext.blogspot.com/2009/02/jquery-ajax-tooltip.html from Caleb Tucker
diff --git a/src/plugins/compactpreview/www/user.php b/src/plugins/compactpreview/www/user.php
index 94d3742..1c6adf6 100644
--- a/src/plugins/compactpreview/www/user.php
+++ b/src/plugins/compactpreview/www/user.php
@@ -1,26 +1,23 @@
 <?php
-
 /**
- * This file is (c) Copyright 2010 by Sabri LABBENE, Institut
- * TELECOM
+ * Copyright 2010, Sabri LABBENE, Institut TELECOM
+ *
+ * http://fusionforge.org/
  *
- * This program 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.
+ * 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 Licence, or (at your option)
+ * any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * 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.
- *
- * This program has been developed in the frame of the HELIOS
- * project with financial support of its funders.
- *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 require_once '../../env.inc.php';

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

commit 57b986c63ad76c73e3a00464588de389ffd425d9
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Dec 17 14:12:34 2016 +0100

    disable by default online_help and mediawiki plugins: unmaintained

diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index 7afd735..6bc988c 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -56,6 +56,6 @@ fi
     make install-base install-shell install-scm \
         install-plugin-scmcvs install-plugin-scmsvn install-plugin-scmgit \
         install-plugin-blocks install-plugin-moinmoin \
-        install-plugin-online_help install-plugin-taskboard install-plugin-message
+        install-plugin-taskboard install-plugin-message
     make post-install
 )
diff --git a/autoinstall/install.sh b/autoinstall/install.sh
index 494f1bf..ea2f671 100755
--- a/autoinstall/install.sh
+++ b/autoinstall/install.sh
@@ -58,7 +58,7 @@ else
 	# Initial installation
 	yum --enablerepo=epel install -y fusionforge fusionforge-shell fusionforge-scm \
 	    fusionforge-plugin-scmcvs fusionforge-plugin-scmsvn fusionforge-plugin-scmgit \
-	    fusionforge-plugin-blocks fusionforge-plugin-online_help fusionforge-plugin-taskboard \
+	    fusionforge-plugin-blocks fusionforge-plugin-taskboard \
 	    fusionforge-plugin-message fusionforge-plugin-moinmoin
     fi
 fi
diff --git a/src/plugins/mediawiki/etc/mediawiki.ini b/src/plugins/mediawiki/etc/mediawiki.ini
index c4d9977..09f4cb6 100644
--- a/src/plugins/mediawiki/etc/mediawiki.ini
+++ b/src/plugins/mediawiki/etc/mediawiki.ini
@@ -5,7 +5,7 @@
 ; valid means : production ready.
 ; Any other strings means it's under work or broken and plugin 
 ; is available in installation_environment = development only.
-plugin_status = valid
+plugin_status = "unmaintained"
 
 ; Whether uploads are allowed on the mediawiki
 enable_uploads = false
diff --git a/src/plugins/online_help/etc/online_help.ini b/src/plugins/online_help/etc/online_help.ini
index f3c9c4e..39a39da 100644
--- a/src/plugins/online_help/etc/online_help.ini
+++ b/src/plugins/online_help/etc/online_help.ini
@@ -5,4 +5,4 @@
 ; valid means : production ready.
 ; Any other strings means it's under work or broken and plugin 
 ; is available in installation_environment = development only.
-plugin_status = valid
\ No newline at end of file
+plugin_status = "unmaintained"

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

Summary of changes:
 autoinstall/install-src.sh                         |  2 +-
 autoinstall/install.sh                             |  2 +-
 src/common/include/utils.php                       |  2 +-
 .../compactpreview/common/compactpreview-init.php  |  2 +-
 .../include/CompactPreviewPlugin.class.php         | 28 ++++++-------
 .../include/CompactResource.class.php              | 46 +++++++++++-----------
 src/plugins/compactpreview/www/project.php         | 27 ++++++-------
 .../compactpreview/www/scripts/oslcTooltip.js      | 25 ++++++------
 src/plugins/compactpreview/www/user.php            | 27 ++++++-------
 src/plugins/mediawiki/etc/mediawiki.ini            |  2 +-
 src/plugins/online_help/etc/online_help.ini        |  2 +-
 src/www/project/memberlist.php                     |  2 +-
 12 files changed, 77 insertions(+), 90 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list