[Fusionforge-commits] FusionForge branch master updated. da9bf8ddb86cde04f66ac1f964df4e2716a8332b

Franck VILLAUME nerville at fusionforge.org
Wed Feb 19 21:54:04 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  da9bf8ddb86cde04f66ac1f964df4e2716a8332b (commit)
      from  9e6aa9d295fbb572e04fe1f9705a895f8d50be60 (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 da9bf8ddb86cde04f66ac1f964df4e2716a8332b
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Feb 19 21:53:36 2014 +0100

    no need & since we use html_e now

diff --git a/src/www/activity/index.php b/src/www/activity/index.php
index ed577c1..866346b 100644
--- a/src/www/activity/index.php
+++ b/src/www/activity/index.php
@@ -303,22 +303,22 @@ if (count($results) < 1) {
 			}
 			case 'trackeropen': {
 				$icon = html_image('ic/tracker20g.png','','',array('alt'=>_('Trackers')));
-				$url = util_make_link('/tracker/?func=detail&atid='.$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('Tracker Item').' [#'.$arr['subref_id'].'] '.$arr['description'].' '._('Opened'));
+				$url = util_make_link('/tracker/?func=detail&atid='.$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('Tracker Item').' [#'.$arr['subref_id'].'] '.$arr['description'].' '._('Opened'));
 				break;
 			}
 			case 'trackerclose': {
 				$icon = html_image('ic/tracker20g.png','','',array('alt'=>_('Trackers')));
-				$url = util_make_link('/tracker/?func=detail&atid='.$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('Tracker Item').' [#'.$arr['subref_id'].'] '.$arr['description'].' '._('Closed'));
+				$url = util_make_link('/tracker/?func=detail&atid='.$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('Tracker Item').' [#'.$arr['subref_id'].'] '.$arr['description'].' '._('Closed'));
 				break;
 			}
 			case 'frsrelease': {
 				$icon = html_image('ic/cvs16b.png','','',array('alt'=>_('Files')));
-				$url = util_make_link('/frs/?release_id='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('FRS Release').' '.$arr['description']);
+				$url = util_make_link('/frs/?release_id='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('FRS Release').' '.$arr['description']);
 				break;
 			}
 			case 'forumpost': {
 				$icon = html_image('ic/forum20g.png','','',array("alt"=>_('Forum')));
-				$url = util_make_link('/forum/message.php?msg_id='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('Forum Post ').' '.$arr['description']);
+				$url = util_make_link('/forum/message.php?msg_id='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('Forum Post ').' '.$arr['description']);
 				break;
 			}
 			case 'news': {
@@ -328,29 +328,29 @@ if (count($results) < 1) {
 			}
 			case 'taskopen': {
 				$icon = html_image('ic/taskman20w.png','','',array('alt'=>_('Tasks')));
-				$url = util_make_link('/pm/task.php?func=detailtask&project_task_id='.$arr['subref_id'].'&group_id='.$arr['group_id'].'&group_project_id='.$arr['ref_id'],_('Tasks').' '.$arr['description']);
+				$url = util_make_link('/pm/task.php?func=detailtask&project_task_id='.$arr['subref_id'].'&group_id='.$arr['group_id'].'&group_project_id='.$arr['ref_id'],_('Tasks').' '.$arr['description']);
 				break;
 			}
 			case 'taskclose': {
 				$icon = html_image('ic/taskman20w.png','','',array('alt'=>_('Tasks')));
-				$url = util_make_link('/pm/task.php?func=detailtask&project_task_id='.$arr['subref_id'].'&group_id='.$arr['group_id'].'&group_project_id='.$arr['ref_id'],_('Tasks').' '.$arr['description']);
+				$url = util_make_link('/pm/task.php?func=detailtask&project_task_id='.$arr['subref_id'].'&group_id='.$arr['group_id'].'&group_project_id='.$arr['ref_id'],_('Tasks').' '.$arr['description']);
 				break;
 			}
 
 			case 'taskdelete': {
 				$icon = html_image('ic/taskman20w.png','','',array('alt'=>_('Tasks')));
-				$url = util_make_link('/pm/task.php?func=detailtask&project_task_id='.$arr['subref_id'].'&group_id='.$arr['group_id'].'&group_project_id='.$arr['ref_id'],_('Tasks').' '.$arr['description']);
+				$url = util_make_link('/pm/task.php?func=detailtask&project_task_id='.$arr['subref_id'].'&group_id='.$arr['group_id'].'&group_project_id='.$arr['ref_id'],_('Tasks').' '.$arr['description']);
 				break;
 			}
 			case 'docmannew':
 			case 'docmanupdate': {
 				$icon = html_image('ic/docman16b.png', '', '', array('alt'=>_('Documents')));
-				$url = util_make_link('docman/?group_id='.$arr['group_id'].'&view=listfile&dirid='.$arr['ref_id'],_('Document').' '.$arr['description']);
+				$url = util_make_link('docman/?group_id='.$arr['group_id'].'&view=listfile&dirid='.$arr['ref_id'],_('Document').' '.$arr['description']);
 				break;
 			}
 			case 'docgroupnew': {
 				$icon = html_image('ic/cfolder15.png', '', '', array("alt"=>_('Directory')));
-				$url = util_make_link('docman/?group_id='.$arr['group_id'].'&view=listfile&dirid='.$arr['subref_id'],_('Directory').' '.$arr['description']);
+				$url = util_make_link('docman/?group_id='.$arr['group_id'].'&view=listfile&dirid='.$arr['subref_id'],_('Directory').' '.$arr['description']);
 				break;
 			}
 			default: {
diff --git a/src/www/pm/add_task.php b/src/www/pm/add_task.php
index 225eb7c..56914ab 100644
--- a/src/www/pm/add_task.php
+++ b/src/www/pm/add_task.php
@@ -50,7 +50,7 @@ plugin_hook_by_reference("text_editor", $params);
 		<strong><?php echo _('Category') . _(': '); ?></strong><br />
 		<?php
 		echo $pg->categoryBox('category_id');
-		echo util_make_link ('/pm/admin/?group_id='.$group_id.'&add_cat=1&group_project_id='.$group_project_id,'('._('Admin').')');
+		echo util_make_link('/pm/admin/?group_id='.$group_id.'&add_cat=1&group_project_id='.$group_project_id,'('._('Admin').')');
 		?>
 		</td>
 		<td>
diff --git a/src/www/pm/admin/index.php b/src/www/pm/admin/index.php
index 7aa752e..ae9d470 100644
--- a/src/www/pm/admin/index.php
+++ b/src/www/pm/admin/index.php
@@ -355,7 +355,7 @@ if ($add_cat && $group_project_id) {
 	</table>
 	</form>
 	<?php
-	echo '<p>'.util_make_link ('/pm/admin/?group_id='.$group_id.'&add_cat=1&group_project_id='.$group_project_id,_('Category Administration')).'</p>';
+	echo '<p>'.util_make_link('/pm/admin/?group_id='.$group_id.'&add_cat=1&group_project_id='.$group_project_id,_('Category Administration')).'</p>';
 	pm_footer();
 
 } elseif ($delete && $group_project_id) {
diff --git a/src/www/pm/browse_task.php b/src/www/pm/browse_task.php
index c0f823b..2981d08 100644
--- a/src/www/pm/browse_task.php
+++ b/src/www/pm/browse_task.php
@@ -299,13 +299,13 @@ if ($rows < 1) {
 	*/
 	echo '<tr><td colspan="2">';
 	if ($offset > 0) {
-		echo util_make_link ('/pm/task.php?func=browse&group_project_id='.$group_project_id.'&group_id='.$group_id.'&offset='.($offset-$paging),'<strong>← '._('previous').'</strong>');
+		echo util_make_link('/pm/task.php?func=browse&group_project_id='.$group_project_id.'&group_id='.$group_id.'&offset='.($offset-$paging),'<strong>← '._('previous').'</strong>');
 	} else {
 		echo ' ';
 	}
 	echo '</td><td> </td><td colspan="2">';
 	if ( $totalTasks > $offset + $paging) {
-		echo util_make_link ('/pm/task.php?func=browse&group_project_id='.$group_project_id.'&group_id='.$group_id.'&offset='.($offset+$paging),'<strong>'._('next').' →</strong></a>');
+		echo util_make_link('/pm/task.php?func=browse&group_project_id='.$group_project_id.'&group_id='.$group_id.'&offset='.($offset+$paging),'<strong>'._('next').' →</strong>');
 	} else {
 		echo ' ';
 	}
diff --git a/src/www/pm/index.php b/src/www/pm/index.php
index d46987f..3c5a471 100644
--- a/src/www/pm/index.php
+++ b/src/www/pm/index.php
@@ -83,14 +83,11 @@ if (count($pg_arr) < 1 || $pg_arr == false) {
 		global $sortcol, $sortorder ;
 
 		if ($sortcol != $val) {
-			return util_make_link ("/pm/?group_id=$group_id&sortcol=$val",
-					       $title) ;
+			return util_make_link ("/pm/?group_id=$group_id&sortcol=$val", $title);
 		} elseif ($sortorder == 'a') {
-			return util_make_link ("/pm/?group_id=$group_id&sortcol=$val&sortorder=d",
-					       $title.' ▴') ;
+			return util_make_link ("/pm/?group_id=$group_id&sortcol=$val&sortorder=d", $title.' ▴');
 		} else {
-			return util_make_link ("/pm/?group_id=$group_id&sortcol=$val&sortorder=a",
-					       $title.' ▾') ;
+			return util_make_link ("/pm/?group_id=$group_id&sortcol=$val&sortorder=a", $title.' ▾');
 		}
 	}
 
diff --git a/src/www/pm/mod_task.php b/src/www/pm/mod_task.php
index ecc3aae..eae15f0 100644
--- a/src/www/pm/mod_task.php
+++ b/src/www/pm/mod_task.php
@@ -59,7 +59,7 @@ echo notepad_func();
 	<tr>
 		<td>
 			<strong><?php echo _('Category') . _(': '); ?></strong><br />
-			<?php echo $pg->categoryBox('category_id',$pt->getCategoryID()); ?> <?php util_make_link ('/pm/admin/?<?php echo "group_id=$group_id&add_cat=1&group_project_id='.$group_project_id,_('Admin')); ?>
+			<?php echo $pg->categoryBox('category_id',$pt->getCategoryID()); ?> <?php util_make_link('/pm/admin/?group_id='.$group_id.'&add_cat=1&group_project_id='.$group_project_id,_('Admin')); ?>
 		</td>
 
 		<td>
diff --git a/src/www/search/include/renderers/DocsAllHtmlSearchRenderer.class.php b/src/www/search/include/renderers/DocsAllHtmlSearchRenderer.class.php
index 54dc741..9dd1922 100644
--- a/src/www/search/include/renderers/DocsAllHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/DocsAllHtmlSearchRenderer.class.php
@@ -100,7 +100,7 @@ class DocsAllHtmlSearchRenderer extends HtmlSearchRenderer {
 			$document = new Document($currentDocGroupObject, db_result($result, $i, 'docid'));
 			$return .= '<tr '. $GLOBALS['HTML']->boxGetAltRowStyle($rowColor) .'>'
 						. '<td> </td>'
-						. '<td>'.html_image('ic/cfolder15.png', '10', '12', array('border' => '0')).util_make_link('/docman/?group_id='.$currentDocGroupObject->getID().'&view=listfile&dirid='.$document->getDocGroupID(),db_result($result, $i, 'groupname')).'</td>';
+						. '<td>'.html_image('ic/cfolder15.png', '10', '12', array('border' => '0')).util_make_link('/docman/?group_id='.$currentDocGroupObject->getID().'&view=listfile&dirid='.$document->getDocGroupID(),db_result($result, $i, 'groupname')).'</td>';
 						if (db_result($result, $i, 'filetype') == 'URL') {
 							$return .= '<td><a href="'.db_result($result, $i, 'filename').'">';
 						} else {
diff --git a/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php b/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php
index cbcf3b4..6acffa0 100644
--- a/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php
@@ -80,7 +80,7 @@ class DocsHtmlSearchRenderer extends HtmlGroupSearchRenderer {
 			$groupObject = group_get_object($this->groupId);
 			$document = new Document($groupObject, db_result($result, $i, 'docid'));
 			if ($lastDocGroup != $currentDocGroup) {
-				$return .= '<tr><td>'.html_image('ic/cfolder15.png', '10', '12', array('border' => '0')).util_make_link('/docman/?group_id='.$this->groupId.'&view=listfile&dirid='.$document->getDocGroupID(),$currentDocGroup).'</td><td colspan="3"> </td></tr>';
+				$return .= '<tr><td>'.html_image('ic/cfolder15.png', '10', '12', array('border' => '0')).util_make_link('/docman/?group_id='.$this->groupId.'&view=listfile&dirid='.$document->getDocGroupID(),$currentDocGroup).'</td><td colspan="3"> </td></tr>';
 				$lastDocGroup = $currentDocGroup;
 				$rowColor = 0;
 			}
diff --git a/src/www/search/include/renderers/HtmlGroupSearchRenderer.class.php b/src/www/search/include/renderers/HtmlGroupSearchRenderer.class.php
index 9d44aaa..3c7325b 100644
--- a/src/www/search/include/renderers/HtmlGroupSearchRenderer.class.php
+++ b/src/www/search/include/renderers/HtmlGroupSearchRenderer.class.php
@@ -70,7 +70,7 @@ class HtmlGroupSearchRenderer extends HtmlSearchRenderer {
 		site_project_header(array('title' => $title, 'group' => $this->groupId, 'toptab' => $this->topTab));
 
 		printf (_('Tip: Use %s to get more precise results.'),
-			util_make_link('/search/advanced_search.php?group_id='.$this->groupId.'&words='.
+			util_make_link('/search/advanced_search.php?group_id='.$this->groupId.'&words='.
 				htmlspecialchars_decode($this->query['words']),
 				_('Advanced search')));
 	}

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

Summary of changes:
 src/www/activity/index.php                           |   18 +++++++++---------
 src/www/pm/add_task.php                              |    2 +-
 src/www/pm/admin/index.php                           |    2 +-
 src/www/pm/browse_task.php                           |    4 ++--
 src/www/pm/index.php                                 |    9 +++------
 src/www/pm/mod_task.php                              |    2 +-
 .../renderers/DocsAllHtmlSearchRenderer.class.php    |    2 +-
 .../renderers/DocsHtmlSearchRenderer.class.php       |    2 +-
 .../renderers/HtmlGroupSearchRenderer.class.php      |    2 +-
 9 files changed, 20 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list