[Fusionforge-commits] FusionForge branch master updated. 9e6aa9d295fbb572e04fe1f9705a895f8d50be60

Franck VILLAUME nerville at fusionforge.org
Wed Feb 19 21:43:14 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  9e6aa9d295fbb572e04fe1f9705a895f8d50be60 (commit)
      from  c31f2753e17c7f9c21d15e3f9cfba816f4df58ee (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 9e6aa9d295fbb572e04fe1f9705a895f8d50be60
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Feb 19 21:42:56 2014 +0100

    no need & since we use html_e now

diff --git a/src/www/admin/userlist.php b/src/www/admin/userlist.php
index 334bafc..f84dd9f 100644
--- a/src/www/admin/userlist.php
+++ b/src/www/admin/userlist.php
@@ -66,10 +66,10 @@ function performAction($newStatus, $statusString, $user_id) {
 function show_users_list($users, $filter = '', $sortorder = 'realname') {
 	echo '<p>' ._('Status')._(': ').
 		util_make_link('/admin/userlist.php', _('All')). '
-		<span class="active">'.util_make_link('/admin/userlist.php?status=A'.'&sortorder='.$sortorder,_('Active')). '</span>
-		<span class="deleted">'.util_make_link('/admin/userlist.php?status=D'.'&sortorder='.$sortorder,_('Deleted')).'</span>
-		<span class="suspended">'.util_make_link('/admin/userlist.php?status=S'.'&sortorder='.$sortorder,_('Suspended')).'</span>
-		<span class="pending">'.util_make_link('/admin/userlist.php?status=P'.'&sortorder='.$sortorder,_('(*)Pending')).'</span>'.'</p>';
+		<span class="active">'.util_make_link('/admin/userlist.php?status=A&sortorder='.$sortorder,_('Active')). '</span>
+		<span class="deleted">'.util_make_link('/admin/userlist.php?status=D&sortorder='.$sortorder,_('Deleted')).'</span>
+		<span class="suspended">'.util_make_link('/admin/userlist.php?status=S&sortorder='.$sortorder,_('Suspended')).'</span>
+		<span class="pending">'.util_make_link('/admin/userlist.php?status=P&sortorder='.$sortorder,_('(*)Pending')).'</span>'.'</p>';
 
 	if (!count($users)) {
 		echo '<div class="warning_msg">'._('No user found matching selected criteria.').'</div>';
@@ -124,19 +124,19 @@ function show_users_list($users, $filter = '', $sortorder = 'realname') {
 		echo '</td>';
 		echo '<td width="15%" style="text-align:center">';
 		if ($u->getStatus() != 'A') {
-			echo util_make_link('/admin/userlist.php?action=activate&user_id='.$u->getID().$filter,_('Activate'));
+			echo util_make_link('/admin/userlist.php?action=activate&user_id='.$u->getID().$filter,_('Activate'));
 		} else {
 			echo '<strike>'._('Activate').'</strike>';
 		}
 		echo '</td>';
 		echo '<td width="15%" style="text-align:center">';
 		if ($u->getStatus() != 'D') {
-			echo util_make_link('/admin/userlist.php?action=delete&user_id='.$u->getID().$filter,_('Delete'));
+			echo util_make_link('/admin/userlist.php?action=delete&user_id='.$u->getID().$filter,_('Delete'));
 		} else {
 			echo '<strike>'._('Delete').'</strike>';
 		}
 		echo '</td>';
-		echo '<td width="15%" style="text-align:center">'.util_make_link('/admin/userlist.php?action=suspend&user_id='.$u->getID().$filter,_('Suspend')).'</td>';
+		echo '<td width="15%" style="text-align:center">'.util_make_link('/admin/userlist.php?action=suspend&user_id='.$u->getID().$filter,_('Suspend')).'</td>';
 		echo '<td width="12%" style="text-align:center">'.util_make_link('/admin/passedit.php?user_id='.$u->getID().$filter,_('Change Password')).'</td>';
 		echo '</tr>';
 		$count ++;
diff --git a/src/www/include/project_summary.php b/src/www/include/project_summary.php
index 24ea4e6..5c0e5d5 100644
--- a/src/www/include/project_summary.php
+++ b/src/www/include/project_summary.php
@@ -138,7 +138,7 @@ function project_summary($group_id, $mode, $no_table) {
 			} else {
 				for ($j = 0; $j < $rows; $j++) {
 					$return .= '<p>
-					 - '.util_make_link ('/tracker/?atid='. db_result($result, $j, 'group_artifact_id') . '&group_id='.$group_id.'&func=browse',db_result($result, $j, 'name'));
+					 - '.util_make_link('/tracker/?atid='. db_result($result, $j, 'group_artifact_id') . '&group_id='.$group_id.'&func=browse',db_result($result, $j, 'name'));
 					$return .= sprintf(ngettext('(<strong>%1$s</strong> open / <strong>%2$s</strong> total)', '(<strong>%1$s</strong> open / <strong>%2$s</strong> total)', (int) db_result($result, $j, 'open_count')), (int) db_result($result, $j, 'open_count'), (int) db_result($result, $j, 'count')) ;
 					$return .= '</p>';
 				}
@@ -218,7 +218,7 @@ function project_summary($group_id, $mode, $no_table) {
 			} else {
 				for ($j = 0; $j < $rows; $j++) {
 					$return .= '
-					<br />   - '.util_make_link ('/pm/task.php?group_project_id='.db_result($result, $j, 'group_project_id').'&group_id='.$group_id.'&func=browse',db_result($result, $j, 'project_name'));
+					<br />   - '.util_make_link ('/pm/task.php?group_project_id='.db_result($result, $j, 'group_project_id').'&group_id='.$group_id.'&func=browse',db_result($result, $j, 'project_name'));
 				}
 				db_free_result($result);
 			}
diff --git a/src/www/news/admin/index.php b/src/www/news/admin/index.php
index 2063fd9..ae36128 100644
--- a/src/www/news/admin/index.php
+++ b/src/www/news/admin/index.php
@@ -165,7 +165,7 @@ details=$3 WHERE id=$4 AND group_id=$5", array($status, htmlspecialchars($summar
 				<ul>';
 			for ($i=0; $i<$rows; $i++) {
 				echo '
-				<li>'.util_make_link ('/news/admin/?approve=1&id='.db_result($result,$i,'id').'&group_id='.db_result($result,$i,'group_id'),db_result($result,$i,'summary')).'</li>';
+				<li>'.util_make_link('/news/admin/?approve=1&id='.db_result($result,$i,'id').'&group_id='.db_result($result,$i,'group_id'),db_result($result,$i,'summary')).'</li>';
 			}
 			echo '</ul>';
 		}
diff --git a/src/www/project/report/index.php b/src/www/project/report/index.php
index eef1f41..eab3175 100644
--- a/src/www/project/report/index.php
+++ b/src/www/project/report/index.php
@@ -190,7 +190,7 @@ foreach ($group->getUsers() as $member) {
                 for ($m=0; $m < $num_artifacts; $m++) {
 			echo '
 		<tr class="priority'.db_result($artifacts, $m, 'priority').'">
-			<td>'.util_make_link ('/tracker/?func=detail&aid='. db_result($artifacts, $m, 'artifact_id') .'&group_id='.$group_id.'&atid='.$artifact_type['group_artifact_id'], $artifact_type['name'].' '.db_result($artifacts, $m, 'artifact_id')).'
+			<td>'.util_make_link('/tracker/?func=detail&aid='. db_result($artifacts, $m, 'artifact_id') .'&group_id='.$group_id.'&atid='.$artifact_type['group_artifact_id'], $artifact_type['name'].' '.db_result($artifacts, $m, 'artifact_id')).'
 			</td>
 			<td>'.db_result($artifacts, $m, 'summary').'</td>';
 			echo '
@@ -229,7 +229,7 @@ foreach ($group->getUsers() as $member) {
 		if ( $task_type['percent_complete'] != 100 ) {
                 	echo '
 		<tr class="priority'.$task_type['priority'].'">
-			<td>'.util_make_link ('/pm/task.php?func=detailtask&project_task_id='. $task_type['project_task_id'].'&group_id='.$group_id.'&group_project_id='.$task_type['group_project_id'],_('Task').' '.$task_type['project_task_id']).'
+			<td>'.util_make_link('/pm/task.php?func=detailtask&project_task_id='. $task_type['project_task_id'].'&group_id='.$group_id.'&group_project_id='.$task_type['group_project_id'],_('Task').' '.$task_type['project_task_id']).'
 			</td>
 			<td>'.$task_type['summary'].'
 			</td>
diff --git a/src/www/reporting/usersummary.php b/src/www/reporting/usersummary.php
index 0c4febc..0bbd50d 100644
--- a/src/www/reporting/usersummary.php
+++ b/src/www/reporting/usersummary.php
@@ -121,7 +121,7 @@ if (!$res || db_numrows($res) < 1) {
 		echo '
 		<tr '.$HTML->boxGetAltRowStyle(1).'>
 			<td> </td>
-			<td>'.util_make_link ('/pm/task.php?func=detailtask&group_id='.db_result($res,$i,'group_id') .'&project_task_id='.db_result($res,$i,'project_task_id') .'&group_project_id='.db_result($res,$i,'group_project_id'),db_result($res,$i,'summary')) .'
+			<td>'.util_make_link('/pm/task.php?func=detailtask&group_id='.db_result($res,$i,'group_id') .'&project_task_id='.db_result($res,$i,'project_task_id') .'&group_project_id='.db_result($res,$i,'group_project_id'),db_result($res,$i,'summary')) .'
 			</td>
 			<td>'.db_result($res,$i,'status_name').'</td>
 			<td>'.number_format(db_result($res,$i,'cumulative_hrs'),1).'</td>
@@ -156,7 +156,7 @@ if (!$res || db_numrows($res) < 1) {
 				}
 				echo '
 			</td>
-			<td colspan="2">'.util_make_link ('/tracker/?func=detail&atid='.db_result($res2,$j,'group_artifact_id'). '&group_id='.db_result($res2,$j,'group_id'). '&aid='.db_result($res2,$j,'artifact_id'), db_result($res2,$j,'summary')).'
+			<td colspan="2">'.util_make_link('/tracker/?func=detail&atid='.db_result($res2,$j,'group_artifact_id').'&group_id='.db_result($res2,$j,'group_id').'&aid='.db_result($res2,$j,'artifact_id'), db_result($res2,$j,'summary')).'
 			</td>
 		</tr>';
 			}
diff --git a/src/www/survey/include/SurveyHTML.class.php b/src/www/survey/include/SurveyHTML.class.php
index f06ece9..94212d3 100644
--- a/src/www/survey/include/SurveyHTML.class.php
+++ b/src/www/survey/include/SurveyHTML.class.php
@@ -263,8 +263,8 @@ class SurveyHTML extends Error {
 			$ret.= '<td>'.$arr_to_del[$i]->getID().'</td>';
 			$ret.= '<td>'.$arr_to_del[$i]->getQuestion().'</td>';
 			$ret.= '<td>'.$arr_to_del[$i]->getQuestionStringType().'</td>';
-			$ret.= '<td><center>['.util_make_link ('/survey/admin/survey.php?group_id='.$group_id.'&survey_id='. $survey_id.'&is_up=1&updown=Y'.'&question_id='.$arr_to_del[$i]->getID(),_('Up')).'] ';
-			$ret.= '['.util_make_link ('/survey/admin/survey.php?group_id='.$group_id.'&survey_id='. $survey_id.'&is_up=0&updown=Y'.'&question_id='.$arr_to_del[$i]->getID(),_('Down')).']</center></td>';
+			$ret.= '<td><center>['.util_make_link ('/survey/admin/survey.php?group_id='.$group_id.'&survey_id='. $survey_id.'&is_up=1&updown=Y&question_id='.$arr_to_del[$i]->getID(),_('Up')).'] ';
+			$ret.= '['.util_make_link ('/survey/admin/survey.php?group_id='.$group_id.'&survey_id='. $survey_id.'&is_up=0&updown=Y&question_id='.$arr_to_del[$i]->getID(),_('Down')).']</center></td>';
 
 			$ret.= '<td><center><input type="checkbox" name="to_del[]" value="'.$arr_to_del[$i]->getID().'" /></center></td>';
 			$ret.= '</tr>';
@@ -399,7 +399,7 @@ class SurveyHTML extends Error {
 
 			$ret.= '<td>';
 			if ($surveys[$i]->isActive()) {
-				$ret.= util_make_link ('/survey/survey.php?group_id='.$group_id.'&survey_id='. $surveys[$i]->getID(), $surveys[$i]->getTitle());
+				$ret.= util_make_link ('/survey/survey.php?group_id='.$group_id.'&survey_id='. $surveys[$i]->getID(), $surveys[$i]->getTitle());
 			} else {
 				$ret.= '<strike>'.$surveys[$i]->getTitle().'</strike>';
 			}
@@ -424,30 +424,29 @@ class SurveyHTML extends Error {
 			}
 			if ($show_edit) {
 				/* Edit/Delete Link */
-				$ret.= '<td>['.util_make_link ('/survey/admin/survey.php?group_id='.$group_id.'&survey_id='. $surveys[$i]->getID(),_('Edit')).'] ';
+				$ret.= '<td>['.util_make_link ('/survey/admin/survey.php?group_id='.$group_id.'&survey_id='. $surveys[$i]->getID(),_('Edit')).'] ';
 
 				/* We don't support delete yet. Need to delete all results as well */
 				/*
-				$ret.= '['.util_make_link ('/survey/admin/survey.php?delete=Y&group_id='.$group_id.'&survey_id='. $surveys[$i]->getID(),_('Delete')).']';
+				$ret.= '['.util_make_link ('/survey/admin/survey.php?delete=Y&group_id='.$group_id.'&survey_id='. $surveys[$i]->getID(),_('Delete')).']';
                                 */
                                 $ret.='</td>';
 			}
 			if ($show_result) {
 				/* Edit/Delete Link */
-				$ret.= '<td>['.util_make_link ('/survey/admin/show_results.php?group_id='.$group_id.'&survey_id='. $surveys[$i]->getID(),_('Result')).']</td>';
+				$ret.= '<td>['.util_make_link('/survey/admin/show_results.php?group_id='.$group_id.'&survey_id='. $surveys[$i]->getID(),_('Result')).']</td>';
 			}
 			if ($show_result_graph) {
 				/* Edit/Delete Link */
-				$ret.= '<td>['.util_make_link ('/survey/admin/show_results.php?graph=yes&group_id='.$group_id.'&survey_id='.  $surveys[$i]->getID(),_('Result with Graph')).']</td>';
+				$ret.= '<td>['.util_make_link('/survey/admin/show_results.php?graph=yes&group_id='.$group_id.'&survey_id='.  $surveys[$i]->getID(),_('Result with Graph')).']</td>';
 			}
 			if ($show_result_comment) {
 				/* Edit/Delete Link */
-				$ret.= '<td>['.util_make_link ('/survey/admin/show_results.php?graph=yes&show_comment=yes&group_id='.$group_id.'&survey_id='.$surveys[$i]->getID(),_('Result with Graph and Comments')).']</td>';
+				$ret.= '<td>['.util_make_link('/survey/admin/show_results.php?graph=yes&show_comment=yes&group_id='.$group_id.'&survey_id='.$surveys[$i]->getID(),_('Result with Graph and Comments')).']</td>';
 			}
 			if ($show_result_csv) {
 				/* Csv Link */
-				$ret.= "<td>[<a href=\"/survey/admin/show_csv.php?group_id=$group_id&survey_id=".$surveys[$i]->getID().'">';
-				$ret.= _("CSV").'</a>]</td>';
+				$ret.= "<td>['.util_make_link('/survey/admin/show_csv.php?group_id=$group_id&survey_id=".$surveys[$i]->getID(), _("CSV")).']</td>';
 			}
 			$ret.= "</tr>\n";
 		}
@@ -557,7 +556,7 @@ class SurveyHTML extends Error {
 
 		$ret.='<tr><td class="align-center" colspan="2">'.
 			'<input type="submit" name="submit" value="'._('Submit').'" />'.
-			'<br />'.util_make_link ('/survey/privacy.php?group_id='.$group_id,_('Survey Privacy')).
+			'<br />'.util_make_link('/survey/privacy.php?group_id='.$group_id, _('Survey Privacy')).
 			'</td></tr></form></table>';
 
 		return $ret;

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

Summary of changes:
 src/www/admin/userlist.php                  |   14 +++++++-------
 src/www/include/project_summary.php         |    4 ++--
 src/www/news/admin/index.php                |    2 +-
 src/www/project/report/index.php            |    4 ++--
 src/www/reporting/usersummary.php           |    4 ++--
 src/www/survey/include/SurveyHTML.class.php |   21 ++++++++++-----------
 6 files changed, 24 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list