[Fusionforge-commits] FusionForge branch master updated. 365cff749e1d21c53d5375b03e2b02bd87a85db4

Franck VILLAUME nerville at fusionforge.org
Thu Feb 20 10:47:51 CET 2014


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  365cff749e1d21c53d5375b03e2b02bd87a85db4 (commit)
      from  e3cc693cbbca35eda6b3e566d0ea5df63280dfbe (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 -----------------------------------------------------------------
commit 365cff749e1d21c53d5375b03e2b02bd87a85db4
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Feb 20 10:47:05 2014 +0100

    no need & since we use html_e now

diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php b/src/common/tracker/include/ArtifactTypeHtml.class.php
index c5bd9ee..5f111e3 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -53,34 +53,34 @@ class ArtifactTypeHtml extends ArtifactType {
 		$links[]  = '/tracker/?group_id='.$group_id;
 		$attr[]   = array('title' => _('Get the list of available trackers'), 'class' => 'tabtitle-nw');
 		$labels[] = $this->getName();
-		$links[]  = '/tracker/?func=browse&group_id='.$group_id.'&atid='. $this->getID();
+		$links[]  = '/tracker/?func=browse&group_id='.$group_id.'&atid='. $this->getID();
 		$attr[]   = array('title' => _('Browse this tracker.'), 'class' => 'tabtitle');
 		$labels[] = _('Export CSV');
-		$links[]  = '/tracker/?func=csv&group_id='.$group_id.'&atid='. $this->getID();
+		$links[]  = '/tracker/?func=csv&group_id='.$group_id.'&atid='. $this->getID();
 		$attr[]   = array('title' => _('Download data from this tracker as csv file.'), 'class' => 'tabtitle');
 		if (forge_check_perm ('tracker',$this->getID(),'submit')) {
 			$labels[] = _('Submit New');
-			$links[]  = '/tracker/?func=add&group_id='.$group_id.'&atid='. $this->getID();
+			$links[]  = '/tracker/?func=add&group_id='.$group_id.'&atid='. $this->getID();
 			$attr[]   = array('title' => _('Add a new issue.'), 'class' => 'tabtitle');
 		}
 
 		if (session_loggedin()) {
 			$labels[] = _('Reporting');
-			$links[]  = '/tracker/reporting/?group_id='.$group_id.'&atid='. $this->getID();
+			$links[]  = '/tracker/reporting/?group_id='.$group_id.'&atid='. $this->getID();
 			$attr[]   = array('title' => _('Various graph about statistics.'), 'class' => 'tabtitle');
 			if ($this->isMonitoring()) {
 				$labels[] = _('Stop Monitor');
-				$links[]  = '/tracker/?group_id='.$group_id.'&atid='. $this->getID().'&func=monitor&stop=1';
+				$links[]  = '/tracker/?group_id='.$group_id.'&atid='. $this->getID().'&func=monitor&stop=1';
 				$attr[]   = array('title' => _('Remove this tracker from your monitoring.'), 'class' => 'tabtitle');
 			} else {
 				$labels[] = _('Monitor');
-				$links[]  = '/tracker/?group_id='.$group_id.'&atid='. $this->getID().'&func=monitor&start=1';
+				$links[]  = '/tracker/?group_id='.$group_id.'&atid='. $this->getID().'&func=monitor&start=1';
 				$attr[]   = array('title' => _('Add this tracker from your monitoring.'), 'class' => 'tabtitle');
 			}
 
 			if (forge_check_perm ('tracker', $this->getID(), 'manager')) {
 				$labels[] = _('Administration');
-				$links[]  = '/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID();
+				$links[]  = '/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID();
 				$attr[]   = array('title' => _('Global administration for trackers. Create, clone, workflow, fields ...'), 'class' => 'tabtitle');
 			}
 		}
@@ -105,25 +105,25 @@ class ArtifactTypeHtml extends ArtifactType {
 		$links_arr[]='/tracker/admin/?group_id='.$group_id;
 		$title_arr[]=_('New Tracker');
 
-		$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&update_type=1';
+		$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&update_type=1';
 		$title_arr[]=_('Update Settings');
 
-		$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&add_extrafield=1';
+		$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&add_extrafield=1';
 		$title_arr[]=_('Manage Custom Fields');
 
-		$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&workflow=1';
+		$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&workflow=1';
 		$title_arr[]=_('Manage Workflow');
 
-		$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&customize_list=1';
+		$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&customize_list=1';
 		$title_arr[]=_('Customize List');
 
-		$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&add_canned=1';
+		$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&add_canned=1';
 		$title_arr[]=_('Add/Update Canned Responses');
 
-		$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&clone_tracker=1';
+		$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&clone_tracker=1';
 		$title_arr[]=_('Clone Tracker');
 
-		$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&delete=1';
+		$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&delete=1';
 		$title_arr[]=_('Delete');
 
 		echo $HTML->printSubMenu($title_arr, $links_arr, array());
@@ -347,7 +347,7 @@ class ArtifactTypeHtml extends ArtifactType {
 				$enddate   = date(_('Y-m-d H:i'), $taskinfo['end_date']);
 				$status   = $taskinfo['status_name'];
 				echo '<tr>
-						<td><a href="/pm/task.php?func=detailtask&project_task_id='.$taskid.'&group_id='.$groupid.'&group_project_id='.$projectid.'">[T'.$taskid.'] '.$summary.'</a></td>
+						<td>'.util_make_link('/pm/task.php?func=detailtask&project_task_id='.$taskid.'&group_id='.$groupid.'&group_project_id='.$projectid, '[T'.$taskid.'] '.$summary).'</td>
 						<td><div class="percentbar" style="width: 100px;">
 							<div style="width:'.round($taskinfo['percent_complete']).'px;"></div></div></td>
 						<td>'.$startdate.'</td>
@@ -387,7 +387,7 @@ class ArtifactTypeHtml extends ArtifactType {
 				echo '<td>'.htmlspecialchars($file->getName()).'</td>';
 				echo '<td>'.date(_('Y-m-d H:i'), $file->getDate()).'</td>';
 				echo '<td>'.$file->getSubmittedUnixName().'</td>';
-				echo '<td><a href="/tracker/download.php/'.$group_id.'/'. $this->getID().'/'. $ah->getID() .'/'.$file->getID().'/'.$file->getName() .'">'. htmlspecialchars($file->getName()) .'</a></td>';
+				echo '<td>'.util_make_link('/tracker/download.php/'.$group_id.'/'. $this->getID().'/'. $ah->getID() .'/'.$file->getID().'/'.$file->getName(), htmlspecialchars($file->getName())).'</td>';
 				if (forge_check_perm ('tracker', $this->getID(), 'tech')) {
 					echo '<td><input type="checkbox" name="delete_file[]" value="'. $file->getID() .'">'._('Delete').'</td>';
 				}
diff --git a/src/plugins/forumml/include/forummlPlugin.class.php b/src/plugins/forumml/include/forummlPlugin.class.php
index 782ebda..bd6070f 100644
--- a/src/plugins/forumml/include/forummlPlugin.class.php
+++ b/src/plugins/forumml/include/forummlPlugin.class.php
@@ -52,7 +52,7 @@ class ForumMLPlugin extends Plugin {
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab
 			if ($G_SESSION->usesPlugin("mailman")) {
-				$param = '?type=user&id=' . $G_SESSION->getId() . "&pluginname=" . $this->name; // we indicate the part we�re calling is the user one
+				$param = '?type=user&id=' . $G_SESSION->getId() . '&pluginname=' . $this->name; // we indicate the part we�re calling is the user one
 				echo ' | ' . $HTML->PrintSubMenu (array ($text),
 						array ('/plugins/mailman/index.php' . $param ));
 			}
diff --git a/src/plugins/globaldashboard/include/globaldashboardPlugin.class.php b/src/plugins/globaldashboard/include/globaldashboardPlugin.class.php
index 9662685..09d0bdc 100644
--- a/src/plugins/globaldashboard/include/globaldashboardPlugin.class.php
+++ b/src/plugins/globaldashboard/include/globaldashboardPlugin.class.php
@@ -40,7 +40,7 @@ class globaldashboardPlugin extends Plugin {
 		global $G_SESSION,$HTML;
 		$text = $this->text; // this is what shows in the tab
 		if ($G_SESSION->usesPlugin("globaldashboard")) {
-			$param = '?type=user&id=' . $G_SESSION->getId() . "&pluginname=" . $this->name; // we indicate the part we're calling is the user one
+			$param = '?type=user&id=' . $G_SESSION->getId() . '&pluginname=' . $this->name; // we indicate the part we're calling is the user one
 			echo $HTML->PrintSubMenu (array ($text),
 			array ('/plugins/globaldashboard/index.php' . $param ), array());
 		}
diff --git a/src/plugins/helloworld/include/helloworldPlugin.class.php b/src/plugins/helloworld/include/helloworldPlugin.class.php
index 1a71bc7..fd1ee27 100644
--- a/src/plugins/helloworld/include/helloworldPlugin.class.php
+++ b/src/plugins/helloworld/include/helloworldPlugin.class.php
@@ -41,7 +41,7 @@ class helloworldPlugin extends Plugin {
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab
 			if ($G_SESSION->usesPlugin("helloworld")) {
-				$param = '?type=user&id=' . $G_SESSION->getId() . "&pluginname=" . $this->name; // we indicate the part we're calling is the user one
+				$param = '?type=user&id=' . $G_SESSION->getId() . '&pluginname=' . $this->name; // we indicate the part we're calling is the user one
 				echo $HTML->PrintSubMenu (array ($text),
 						  array ('/plugins/helloworld/index.php' . $param ));
 
diff --git a/src/plugins/hudson/include/hudsonPlugin.class.php b/src/plugins/hudson/include/hudsonPlugin.class.php
index dc34c48..eff086a 100644
--- a/src/plugins/hudson/include/hudsonPlugin.class.php
+++ b/src/plugins/hudson/include/hudsonPlugin.class.php
@@ -59,7 +59,7 @@ class hudsonPlugin extends Plugin {
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab
 			if ($G_SESSION->usesPlugin("hudson")) {
-				$param = '?type=user&id=' . $G_SESSION->getId() . "&pluginname=" . $this->name; // we indicate the part we're calling is the user one
+				$param = '?type=user&;id=' . $G_SESSION->getId() . '&pluginname=' . $this->name; // we indicate the part we're calling is the user one
 				echo ' | ' . $HTML->PrintSubMenu (array ($text),
 						array ('/plugins/hudson/index.php' . $param ));
 			}
@@ -77,7 +77,7 @@ class hudsonPlugin extends Plugin {
 			}
 			if ( $project->usesPlugin( $this->name )) {
 				$params['TITLES'][] = $this->text;
-				$params['DIRS'][] = '/plugins/hudson/index.php?group_id=' . $group_id . "&pluginname=" . $this->name; // we indicate the part we're calling is the project one
+				$params['DIRS'][] = '/plugins/hudson/index.php?group_id=' . $group_id . '&pluginname=' . $this->name; // we indicate the part we're calling is the project one
 				$params['ADMIN'][] = '';
 				$params['TOOLTIPS'][] = _('Continuous Integration Scheduler');
 			}
diff --git a/src/plugins/oauthconsumer/common/oauthconsumer-init.php b/src/plugins/oauthconsumer/common/oauthconsumer-init.php
index 8534f4c..1f9fe87 100644
--- a/src/plugins/oauthconsumer/common/oauthconsumer-init.php
+++ b/src/plugins/oauthconsumer/common/oauthconsumer-init.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  *
  * This file is part of FusionForge.
diff --git a/src/plugins/oslc/include/oslcPlugin.class.php b/src/plugins/oslc/include/oslcPlugin.class.php
index 71eabe0..bb43011 100644
--- a/src/plugins/oslc/include/oslcPlugin.class.php
+++ b/src/plugins/oslc/include/oslcPlugin.class.php
@@ -44,7 +44,7 @@ class oslcPlugin extends Plugin {
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab
 			if ($G_SESSION->usesPlugin("oslc")) {
-				$param = '?type=user&id=' . $G_SESSION->getId() . "&pluginname=" . $this->name; // we indicate the part we're calling is the user one
+				$param = '?type=user&id=' . $G_SESSION->getId() . '&pluginname=' . $this->name; // we indicate the part we're calling is the user one
 				echo $HTML->PrintSubMenu (array ($text),
 						  array ('/plugins/oslc/index.php' . $param ));
 			}
@@ -64,10 +64,12 @@ class oslcPlugin extends Plugin {
 				$params['TITLES'][]=$this->text;
 				$params['DIRS'][]=util_make_uri('/plugins/oslc/');
 				$params['ADMIN'][]='';
+				$params['TOOLTIPS'][] = NULL;
 			} else {
 				$params['TITLES'][]=$this->text." is [Off]";
 				$params['DIRS'][]='';
 				$params['ADMIN'][]='';
+				$params['TOOLTIPS'][] = NULL;
 			}
 			(($params['toptab'] == $this->name) ? $params['selected']=(count($params['TITLES'])-1) : '' );
 		} elseif ($hookname == "groupisactivecheckbox") {
diff --git a/src/plugins/soapadmin/include/soapadminPlugin.class.php b/src/plugins/soapadmin/include/soapadminPlugin.class.php
index 2694177..ff0e329 100644
--- a/src/plugins/soapadmin/include/soapadminPlugin.class.php
+++ b/src/plugins/soapadmin/include/soapadminPlugin.class.php
@@ -41,7 +41,7 @@ class soapadminPlugin extends Plugin {
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab
 			if ($G_SESSION->usesPlugin("soapadmin")) {
-				$param = '?type=user&id=' . $G_SESSION->getId() . "&pluginname=" . $this->name; // we indicate the part we're calling is the user one
+				$param = '?type=user&id=' . $G_SESSION->getId() . '&pluginname=' . $this->name; // we indicate the part we're calling is the user one
 				echo ' | ' . $HTML->PrintSubMenu (array ($text),
 						  array ('/plugins/soapadmin/index.php' . $param ));
 			}
@@ -59,7 +59,7 @@ class soapadminPlugin extends Plugin {
 			}
 			if ( $project->usesPlugin ( $this->name ) ) {
 				$params['TITLES'][]=$this->text;
-				$params['DIRS'][]=util_make_url ('/plugins/soapadmin/index.php?type=group&id=' . $group_id . "&pluginname=" . $this->name) ; // we indicate the part we're calling is the project one
+				$params['DIRS'][]=util_make_url ('/plugins/soapadmin/index.php?type=group&id=' . $group_id . '&pluginname=' . $this->name) ; // we indicate the part we're calling is the project one
 			} else {
 				$params['TITLES'][]=$this->text." is [Off]";
 				$params['DIRS'][]='';
diff --git a/src/www/forum/index.php b/src/www/forum/index.php
index 32b1f42..2c511bf 100644
--- a/src/www/forum/index.php
+++ b/src/www/forum/index.php
@@ -80,10 +80,7 @@ if ($group_id) {
 			echo $farr[$j]->getErrorMessage();
 		} else {
 			echo '<tr '. $HTML->boxGetAltRowStyle($j) . '><td>'.
-				'<a href="'.util_make_uri('/forum/forum.php?forum_id='.$farr[$j]->getID().'&group_id='.$group_id).'">'.
-				html_image('ic/forum20w.png') .
-				' ' .
-				$farr[$j]->getName() .'</a></td>
+				util_make_link('/forum/forum.php?forum_id='.$farr[$j]->getID().'&group_id='.$group_id), html_image('ic/forum20w.png').' '.$farr[$j]->getName()).'</td>
 				<td>'.$farr[$j]->getDescription().'</td>
 				<td class="align-center">'.$farr[$j]->getThreadCount().'</td>
 				<td class="align-center">'. $farr[$j]->getMessageCount() .'</td>

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

Summary of changes:
 .../tracker/include/ArtifactTypeHtml.class.php     |   32 ++++++++++----------
 .../forumml/include/forummlPlugin.class.php        |    2 +-
 .../include/globaldashboardPlugin.class.php        |    2 +-
 .../helloworld/include/helloworldPlugin.class.php  |    2 +-
 src/plugins/hudson/include/hudsonPlugin.class.php  |    4 +--
 .../oauthconsumer/common/oauthconsumer-init.php    |    1 -
 src/plugins/oslc/include/oslcPlugin.class.php      |    4 ++-
 .../soapadmin/include/soapadminPlugin.class.php    |    4 +--
 src/www/forum/index.php                            |    5 +--
 9 files changed, 27 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list