[Fusionforge-commits] FusionForge branch master updated. e3cc693cbbca35eda6b3e566d0ea5df63280dfbe

Franck VILLAUME nerville at fusionforge.org
Wed Feb 19 22:26:26 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  e3cc693cbbca35eda6b3e566d0ea5df63280dfbe (commit)
      from  da9bf8ddb86cde04f66ac1f964df4e2716a8332b (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 e3cc693cbbca35eda6b3e566d0ea5df63280dfbe
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Feb 19 22:26:03 2014 +0100

    no need & since we use html_e now

diff --git a/src/common/forum/ForumHTML.class.php b/src/common/forum/ForumHTML.class.php
index 84654e6..4a830cd 100644
--- a/src/common/forum/ForumHTML.class.php
+++ b/src/common/forum/ForumHTML.class.php
@@ -68,7 +68,7 @@ function forum_header($params) {
 				<strong>'._('Posted by')._(': ').'</strong> '.$user->getRealName().'<br />
 				<strong>'._('Date')._(': ').'</strong> '. relative_date(db_result($result,0,'post_date')).'<br />
 				<strong>'._('Summary')._(': ').'</strong>'.
-				util_make_link('/forum/forum.php?forum_id='.db_result($result, 0, 'forum_id').'&group_id='.$group_id,
+				util_make_link('/forum/forum.php?forum_id='.db_result($result, 0, 'forum_id').'&group_id='.$group_id,
 						db_result($result, 0, 'summary')).'<br/>
 				<strong>'._('Project')._(': ').'</strong>'.
 				util_make_link_g($group->getUnixName(),db_result($result, 0, 'group_id'),$group->getPublicName()).'<br />
@@ -136,22 +136,21 @@ function forum_header($params) {
 	if (session_loggedin() ) {
 		if ($f) {
 			if ($f->isMonitoring()) {
-				echo util_make_link ('/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&stop=1',
+				echo util_make_link('/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&stop=1',
 								 html_image('ic/xmail16w.png').' '._('Stop Monitoring')).' | ';
 			} else {
-				echo util_make_link ('/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&start=1',
+				echo util_make_link('/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&start=1',
 							 html_image('ic/mail16w.png').' '._('Monitor Forum')).' | ';
 			}
-			echo util_make_link ('/forum/save.php?forum_id='.$forum_id.'&group_id='.$group_id,
+			echo util_make_link('/forum/save.php?forum_id='.$forum_id.'&group_id='.$group_id,
 						 html_image('ic/save.png') .' '._('Save Place')).' | ';
 		}
 	} elseif ($f) {
-		echo '<a href="/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&start=1">' .
-			html_image('ic/mail16w.png').' '._('Monitor Forum').'</a> | ';
+		echo util_make_link('/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&start=1', html_image('ic/mail16w.png').' '._('Monitor Forum')).' | ';
 	}
 
 	if ($f && $forum_id) {
-		echo util_make_link ('/forum/new.php?forum_id='.$forum_id.'&group_id='.$group_id,
+		echo util_make_link ('/forum/new.php?forum_id='.$forum_id.'&group_id='.$group_id,
 					 html_image('ic/write16w.png','20','20',array('alt'=>_('Start New Thread'))) .' '.
 					 _('Start New Thread'));
 	}
diff --git a/src/common/include/forge_events.php b/src/common/include/forge_events.php
index d184839..f980996 100644
--- a/src/common/include/forge_events.php
+++ b/src/common/include/forge_events.php
@@ -26,8 +26,8 @@ abstract class ForgeEvent extends Plugin {
 		echo '<li><a name="jobs"></a>'.util_make_link('/admin/?action=listjobs#jobs', _('Jobs'))."\n";
 		if ($action == 'listjobs') {
 			echo '<ul>';
-			echo '<li>'.util_make_link('/admin/?action=runjobs&job=create_scm_repos#jobs', _('Create SCM Repositories')).'</li>'."\n";
-			echo '<li>'.util_make_link('/admin/?action=runjobs&job=scm_update#jobs', _('Upgrade Forge Software')).'</li>'."\n";
+			echo '<li>'.util_make_link('/admin/?action=runjobs&job=create_scm_repos#jobs', _('Create SCM Repositories')).'</li>'."\n";
+			echo '<li>'.util_make_link('/admin/?action=runjobs&job=scm_update#jobs', _('Upgrade Forge Software')).'</li>'."\n";
 			echo '</ul>';
 		}
 		echo '</li>';
diff --git a/src/common/tracker/actions/mod.php b/src/common/tracker/actions/mod.php
index f5e426e..1583f17 100644
--- a/src/common/tracker/actions/mod.php
+++ b/src/common/tracker/actions/mod.php
@@ -169,7 +169,7 @@ echo html_build_select_box ($res,'new_artifact_type_id',$ath->getID(),false);
 		<?php
 		echo $ath->technicianBox('assigned_to', $ah->getAssignedTo() );
 		echo " ";
-		echo util_make_link ('/tracker/admin/?group_id='.$group_id.'&atid='. $ath->getID() .'&update_users=1','('._('Admin').')');
+		echo util_make_link ('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&update_users=1', '('._('Admin').')');
 		?>
 		</td><td>
 		<strong><?php echo _('Priority'). _(': ') ?></strong><br />
@@ -220,7 +220,7 @@ $nb = $count? ' ('.$count.')' : '';
 		<?php
 		echo $ath->cannedResponseBox('canned_response');
 		echo " ";
-		echo util_make_link ('/tracker/admin/?group_id='.$group_id.'&atid='. $ath->getID() .'&add_canned=1','('._('Admin').')');
+		echo util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&add_canned=1', '('._('Admin').')');
 		?>
 		<script type="text/javascript">/* <![CDATA[ */
 			$('#tracker-canned_response').change(function() {
diff --git a/src/common/tracker/include/build_submission_form.php b/src/common/tracker/include/build_submission_form.php
index 90ea9e5..91c32d6 100644
--- a/src/common/tracker/include/build_submission_form.php
+++ b/src/common/tracker/include/build_submission_form.php
@@ -61,7 +61,7 @@ function artifact_submission_form($ath, $group) {
 		echo '<tr>
 		<td><strong>'._('Assigned to')._(':').'</strong><br />';
 		echo $ath->technicianBox('assigned_to');
-		echo ' '.util_make_link ('/tracker/admin/?group_id='.$group->getID().'&atid='.$ath->getID().'&update_users=1', '('._('Admin').')' );
+		echo ' '.util_make_link('/tracker/admin/?group_id='.$group->getID().'&atid='.$ath->getID().'&update_users=1', '('._('Admin').')' );
 
 		echo '</td><td><strong>'._('Priority')._(':').'</strong><br />';
 		build_priority_select_box('priority');
diff --git a/src/common/widget/Widget_MyArtifacts.class.php b/src/common/widget/Widget_MyArtifacts.class.php
index 28dd6e6..052b73f 100644
--- a/src/common/widget/Widget_MyArtifacts.class.php
+++ b/src/common/widget/Widget_MyArtifacts.class.php
@@ -200,7 +200,7 @@ class Widget_MyArtifacts extends Widget {
 						$hide_url.
 						util_make_link('/tracker/?group_id='.$group_id_old, $group_name, array('class'=>'tabtitle-nw', 'title'=>_('Browse Trackers List for this project'))).
 						' - '.
-						util_make_link('/tracker/?group_id='.$group_id_old.'&atid='.$atid_old, $tracker_name, array('class'=>'tabtitle', 'title'=>_('Browse this tracker for this project'))).
+						util_make_link('/tracker/?group_id='.$group_id_old.'&atid='.$atid_old, $tracker_name, array('class'=>'tabtitle', 'title'=>_('Browse this tracker for this project'))).
 						'    ';
 					$count_new = max(0, $count_diff);
 
@@ -260,7 +260,7 @@ class Widget_MyArtifacts extends Widget {
 						$html .= '
 							<tr '. $HTML->boxGetAltRowStyle($count_aids) .'>'.
 							'<td class="priority'.$trackers_array->getPriority().'">'.$trackers_array->getPriority().'</td>'.
-							'<td>'.util_make_link('/tracker/?func=detail&group_id='.$group_id.'&aid='.$aid.'&atid='.$atid, stripslashes($summary), array("class"=>"tabtitle", "title"=>_('Browse this artefact'))).
+							'<td>'.util_make_link('/tracker/?func=detail&group_id='.$group_id.'&aid='.$aid.'&atid='.$atid, stripslashes($summary), array("class"=>"tabtitle", "title"=>_('Browse this artefact'))).
 							'</td>'.
 							'<td class="small tabtitle-ne" title="'.$AS_title.'">';
 						$html .= ' '.$AS_flag.'</td></tr>';
@@ -277,7 +277,7 @@ class Widget_MyArtifacts extends Widget {
 				$hide_url.
 				util_make_link('/tracker/?group_id='.$group_id_old, $group_name, array('class'=>'tabtitle-nw', 'title'=>_('Browse Trackers List for this project'))).
 				' - '.
-				util_make_link('/tracker/?group_id='.$group_id_old.'&atid='.$atid_old, $tracker_name, array('class'=>'tabtitle', 'title'=>_('Browse this tracker for this project'))).
+				util_make_link('/tracker/?group_id='.$group_id_old.'&atid='.$atid_old, $tracker_name, array('class'=>'tabtitle', 'title'=>_('Browse this tracker for this project'))).
 				'    ';
 			$count_new = max(0, $count_diff);
 
diff --git a/src/common/widget/Widget_ProjectLatestFileReleases.class.php b/src/common/widget/Widget_ProjectLatestFileReleases.class.php
index 046be68..0280bc0 100644
--- a/src/common/widget/Widget_ProjectLatestFileReleases.class.php
+++ b/src/common/widget/Widget_ProjectLatestFileReleases.class.php
@@ -115,7 +115,7 @@ class Widget_ProjectLatestFileReleases extends Widget {
 							<strong>' . $package_name . '</strong>
 						</td>';
 					// Releases to display
-//print '<div about="" xmlns:sioc="http://rdfs.org/sioc/ns#" rel="container_of" resource="'.util_make_link ('/frs/?group_id=' . $group_id . '&release_id=' . db_result($res_files,$f,'release_id').'">';
+//print '<div about="" xmlns:sioc="http://rdfs.org/sioc/ns#" rel="container_of" resource="'.util_make_link('/frs/?group_id='.$group_id.'&release_id='.db_result($res_files,$f,'release_id').'">';
 					echo '
 						<td>'
 						.$package_release.'
diff --git a/src/common/widget/Widget_ProjectPublicAreas.class.php b/src/common/widget/Widget_ProjectPublicAreas.class.php
index bb8c7ab..c82ed17 100644
--- a/src/common/widget/Widget_ProjectPublicAreas.class.php
+++ b/src/common/widget/Widget_ProjectPublicAreas.class.php
@@ -82,7 +82,7 @@ class Widget_ProjectPublicAreas extends Widget {
 					$tracker_stdzd_uri = util_make_url('/tracker/cm/project/'. $project->getUnixName() .'/atid/'. $group_artifact_id);
 					echo "\t".'<li about="'. $tracker_stdzd_uri . '" typeof="sioc:Container">'."\n";
 					print '<span rel="http://www.w3.org/2002/07/owl#sameAs">'."\n";
-					echo util_make_link ('/tracker/?atid='. $group_artifact_id . '&group_id='.$group_id.'&func=browse',$row['name']) . ' ' ;
+					echo util_make_link ('/tracker/?atid='. $group_artifact_id . '&group_id='.$group_id.'&func=browse',$row['name']) . ' ' ;
 					echo "</span>\n"; // /owl:sameAs
 					printf(ngettext('(<strong>%1$s</strong> open / <strong>%2$s</strong> total)', '(<strong>%1$s</strong> open / <strong>%2$s</strong> total)', $row['open_count']), $row['open_count'], $row['count']);
 					echo '<br />';
@@ -156,7 +156,7 @@ class Widget_ProjectPublicAreas extends Widget {
 				echo "\n".'<ul class="task-manager">';
 				foreach ($pgs as $pg) {
 					echo "\n\t<li>";
-					print util_make_link ('/pm/task.php?group_project_id='.$pg->getID().'&group_id='.$group_id.'&func=browse',$pg->getName());
+					print util_make_link ('/pm/task.php?group_project_id='.$pg->getID().'&group_id='.$group_id.'&func=browse',$pg->getName());
 					echo '</li>' ;
 				}
 				echo "\n</ul>";
diff --git a/src/www/admin/pluginman.php b/src/www/admin/pluginman.php
index 636ab2d..4fd8cb0 100644
--- a/src/www/admin/pluginman.php
+++ b/src/www/admin/pluginman.php
@@ -212,7 +212,7 @@ foreach ($filelist as $filename) {
 		$msg = _('Active');
 		$status = "active";
 		$next = 'deactivate';
-		$link = util_make_link("/admin/pluginman.php?update=$filename&action=deactivate", _('Deactivate'));
+		$link = util_make_link("/admin/pluginman.php?update=$filename&action=deactivate", _('Deactivate'));
 
 		$res = db_query_params ('SELECT u.user_name FROM plugins p, user_plugin up, users u WHERE p.plugin_name = $1 and up.user_id = u.user_id and p.plugin_id = up.plugin_id',
 			array($filename));
@@ -259,7 +259,7 @@ foreach ($filelist as $filename) {
 		$msg = _('Inactive');
 		$status = "inactive";
 		$next = 'activate';
-		$link = util_make_link("/admin/pluginman.php?update=$filename&action=activate", _('Activate'));
+		$link = util_make_link("/admin/pluginman.php?update=$filename&action=activate", _('Activate'));
 		$users = _('None');
 		$groups = _('None');
 		$adminlink = '';

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

Summary of changes:
 src/common/forum/ForumHTML.class.php                      |   13 ++++++-------
 src/common/include/forge_events.php                       |    4 ++--
 src/common/tracker/actions/mod.php                        |    4 ++--
 src/common/tracker/include/build_submission_form.php      |    2 +-
 src/common/widget/Widget_MyArtifacts.class.php            |    6 +++---
 .../widget/Widget_ProjectLatestFileReleases.class.php     |    2 +-
 src/common/widget/Widget_ProjectPublicAreas.class.php     |    4 ++--
 src/www/admin/pluginman.php                               |    4 ++--
 8 files changed, 19 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list