From: Christian Bayle <cbayle@gmail.com>
Date: Sun, 9 Mar 2008 23:15:39 +0000 (+0000)
Subject: Migrate to util_make_url() and util_make_link()
X-Git-Tag: v4_7_b2~146
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=da1ceb2bdc2ccf141df587e877154973172db381

Migrate to util_make_url() and util_make_link()
---

diff --git a/gforge/ChangeLog b/gforge/ChangeLog
index 70aa94a137..26c318e0fe 100644
--- a/gforge/ChangeLog
+++ b/gforge/ChangeLog
@@ -1,12 +1,13 @@
-2008-03-09  Christian Bayle <bayle@debian.org>
+2008-03-10  Christian Bayle <bayle@debian.org>
 	
-	* plugins/*: Migrate to util_make_url() and util_make_link()
-	* snippet/*: Ditto
-	* include/*: Ditto
-	* admin/*: Ditto
-	* my/*: Ditto
-	* tracker/*: Ditto
-	* search/*: Ditto
+	* Removed as much php warning as possible
+	* Migrate to util_make_url() and util_make_link()
+	* - www/export/*,www/developer/*,www/themes/*
+	* - www/frs/*,www/activity/*,www/project/*
+	* - www/news/*,www/pm/*,www/people/*,www/docman/*
+	* - plugins/*
+	* - www/snippet/*,www/include/*,www/admin/*
+	* - www/my/*,www/tracker/*,www/search/*
 	* introduced $sys_noforcetype to make possible to get rid of /projects
 	and /users forcetype
 
diff --git a/gforge/www/activity/index.php b/gforge/www/activity/index.php
index 785c0c3e3b..192d24ed77 100644
--- a/gforge/www/activity/index.php
+++ b/gforge/www/activity/index.php
@@ -138,39 +138,44 @@ if ($rows<1) {
 		switch ($arr['section']) {
 			case 'commit': {
 				$icon=html_image("ic/cvs16b.png","20","20",array("border"=>"0","alt"=>"SCM"));
-				$url='<a href="'.$GLOBALS['sys_urlprefix'].'/tracker/?func=detail&amp;atid='.$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id'].'">Commit for Tracker Item [#'.$arr['subref_id'].'] '.$arr['description'].' </a>';
+				$url=util_make_link ('/tracker/?func=detail&amp;atid='.$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id'],_('Commit for Tracker Item').' [#'.$arr['subref_id'].'] '.$arr['description']);
 				break;
 			}
 			case 'trackeropen': {
 				$icon=html_image("ic/tracker20g.png",'20','20',array('alt'=>'Tracker'));
-				$url='<a href="'.$GLOBALS['sys_urlprefix'].'/tracker/?func=detail&amp;atid='.$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id'].'">Tracker Item [#'.$arr['subref_id'].' '.$arr['description'].' ] Opened</a>';
+				$url=util_make_link ('/tracker/?func=detail&amp;atid='.$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id'],_('Tracker Item').' [#'.$arr['subref_id'].' '.$arr['description'].' ] '._('Opened'));
 				break;
 			}
 			case 'trackerclose': {
 				$icon=html_image("ic/tracker20g.png",'20','20',array('alt'=>'Tracker'));
-				$url='<a href="'.$GLOBALS['sys_urlprefix'].'/tracker/?func=detail&amp;atid='.$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id'].'">Tracker Item [#'.$arr['subref_id'].' '.$arr['description'].' ] Closed</a>';
+				$url=util_make_link ('/tracker/?func=detail&amp;atid='.$arr['ref_id'].'&amp;aid='.$arr['subref_id'].'&amp;group_id='.$arr['group_id'],_('Tracker Item').' [#'.$arr['subref_id'].' '.$arr['description'].' ] '._('Closed'));
 				break;
 			}
 			case 'frsrelease': {
 				$icon=html_image("ic/cvs16b.png","20","20",array("border"=>"0","alt"=>"SCM"));
-				$url='<a href="'.$GLOBALS['sys_urlprefix'].'/frs/?release_id='.$arr['subref_id'].'&amp;group_id='.$arr['group_id'].'">FRS Release '.$arr['description'].'</a>';
+				$url=util_make_link ('/frs/?release_id='.$arr['subref_id'].'&amp;group_id='.$arr['group_id'],_('FRS Release').' '.$arr['description']);
 				break;
 			}
 			case 'forumpost': {
 				$icon=html_image("ic/forum20g.png","20","20",array("border"=>"0","alt"=>"Forum"));
-				$url='<a href="'.$GLOBALS['sys_urlprefix'].'/forum/message.php?msg_id='.$arr['subref_id'].'&amp;group_id='.$arr['group_id'].'">Forum Post '.$arr['description'].'</a>';
+				$url=util_make_link ('/forum/message.php?msg_id='.$arr['subref_id'].'&amp;group_id='.$arr['group_id'],_('Forum Post ').' '.$arr['description']);
 				break;
 			}
 			case 'news': {
 				$icon=html_image("ic/write16w.png","20","20",array("border"=>"0","alt"=>"News"));
-				$url='<a href="'.$GLOBALS['sys_urlprefix'].'/forum/forum.php?forum_id='.$arr['subref_id'].'">News '.$arr['description'].'</a>';
+				$url=util_make_link ('/forum/forum.php?forum_id='.$arr['subref_id'],_('News').' '.$arr['description']);
 				break;
 			}
 		}
+		if (isset ($GLOBALS['sys_noforcetype']) && $GLOBALS['sys_noforcetype']) {
+			$userlink='/developer/?user_id='.$arr['user_id'];
+		} else {
+			$userlink='/users/'.$arr['user_name'].'/';
+		}
 		echo '<tr '. $HTML->boxGetAltRowStyle($j++) . '>
 			<td>&nbsp;&nbsp;&nbsp;&nbsp;'.date('H:i:s',$arr['activity_date']).'</td>
 			<td>'.$icon .' '.$url.'</td>
-			<td><a href="'.$GLOBALS['sys_urlprefix'].'/users/'.$arr['user_name'].'/">'.$arr['realname'].'</a></td>
+			<td>'.util_make_link ($userlink,$arr['realname']).'</td>
 			</tr>';
 	}
 
diff --git a/gforge/www/developer/index.php b/gforge/www/developer/index.php
index 4b309698e9..81d7c2ea5d 100644
--- a/gforge/www/developer/index.php
+++ b/gforge/www/developer/index.php
@@ -39,6 +39,18 @@ if (!$user_id) {
 	$user_id=$form_dev;
 }
 
-header("Location: ".$GLOBALS['sys_urlprefix']."/users/". user_getname($user_id) ."/");
+if (isset ($sys_noforcetype) && $sys_noforcetype) {
+	if (!$user_id) {
+		exit_error("Missing User Argument","A user must be specified for this page.");
+	} else {
+		$user =& user_get_object($user_id);
+		if (!$user || !is_object($user) || $user->isError() || !$user->isActive()) {
+			exit_error(_('That user does not exist.'),_('Invalid User'));
+		}
+		include('user_home.php');
+	}
+} else {
+	header("Location: ".util_make_url ('/users/'.user_getname($user_id).'/'));
+}
 
 ?>
diff --git a/gforge/www/docman/index.php b/gforge/www/docman/index.php
index 122823693a..202e01cb4d 100644
--- a/gforge/www/docman/index.php
+++ b/gforge/www/docman/index.php
@@ -127,14 +127,14 @@ function docman_recursive_display($docgroup) {
 }
 
 ?>
-<script language="JavaScript" src="<?php echo $GLOBALS['sys_urlprefix']; ?>/jscook/JSCookTree.js"></script>
-<link rel="stylesheet" href="<?php echo $GLOBALS['sys_urlprefix']; ?>/jscook/ThemeXP/theme.css" type="text/css" />
+<script language="JavaScript" src="<?php echo util_make_url ('/jscook/JSCookTree.js'); ?>"></script>
+<link rel="stylesheet" href="<?php echo util_make_url ('/jscook/ThemeXP/theme.css'); ?>" type="text/css" />
 <script src="/jscook/ThemeXP/theme.js" type="text/javascript"></script>
 
 <script language="JavaScript"><!--
 var myMenu =
 [
-['<span class="JSCookTreeFolderClosed"><i><img src="<?php echo $GLOBALS['sys_urlprefix']; ?>/jscook/ThemeXP/folder1.gif"></i></span><span class="JSCookTreeFolderOpen"><i><img src="/jscook/ThemeXP/folderopen1.gif"></i></span>', '/', '#', '', '',
+['<span class="JSCookTreeFolderClosed"><i><img src="<?php echo util_make_url ('/jscook/ThemeXP/folder1.gif'); ?>"></i></span><span class="JSCookTreeFolderOpen"><i><img src="/jscook/ThemeXP/folderopen1.gif"></i></span>', '/', '#', '', '',
 <?php
 docman_recursive_display(0);
 ?>
diff --git a/gforge/www/export/rss20_activity.php b/gforge/www/export/rss20_activity.php
index 94e0fc5337..2fc67fc473 100644
--- a/gforge/www/export/rss20_activity.php
+++ b/gforge/www/export/rss20_activity.php
@@ -34,8 +34,7 @@ $limit = getIntFromRequest('limit', 10);
 
 if ($limit > 100) $limit = 100;
 
-$proto = ($GLOBALS['sys_use_ssl']) ? 'https://' : 'http://';
-$url = $proto.$GLOBALS['sys_default_domain'].$GLOBALS['sys_urlprefix'];
+$url = util_make_url ('/');
 
 if ($group_id) {
 	$where = "group_id=$group_id and is_public=1";
diff --git a/gforge/www/frs/admin/qrs.php b/gforge/www/frs/admin/qrs.php
index 6c157babcc..677923bb6a 100644
--- a/gforge/www/frs/admin/qrs.php
+++ b/gforge/www/frs/admin/qrs.php
@@ -136,8 +136,8 @@ if (getStringFromRequest('submit')) {
 						<p>
 							 <?php 
 							 printf (_('You can now <a href="%1$s"><strong>add files to this release</strong></a> if you wish, or edit the release. Please note that file(s) may not appear immediately on the <a href="%2$s">download page</a>. Allow several hours for propagation.'),
-								 $GLOBALS['sys_urlprefix'].'/frs/admin/editrelease.php?release_id='.$frsr->getID().'&amp;group_id='.$group_id.'&amp;package_id='.$package_id,
-								 $GLOBALS['sys_urlprefix'].'/frs/?group_id='.$group_id
+								 util_make_url ('/frs/admin/editrelease.php?release_id='.$frsr->getID().'&amp;group_id='.$group_id.'&amp;package_id='.$package_id),
+								 util_make_url ('/frs/?group_id='.$group_id)
 								 )
 							 ?>
 						<?php
@@ -157,6 +157,17 @@ if (getStringFromRequest('submit')) {
 
 	}
 
+} else {
+	$release_name = '';
+	$userfile = '';
+	$userfile_name = '';
+	$type_id = '';
+	$processor_id = '';
+	$release_date = '';
+	$release_notes = '';
+	$release_changes = '';
+	$preformatted = '';
+	$ftp_filename = '';
 }
 
 frs_admin_header(array('title'=>_('Quick Release System'),'group'=>$group_id));
@@ -189,7 +200,7 @@ frs_admin_header(array('title'=>_('Quick Release System'),'group'=>$group_id));
 ?>
 			&nbsp;&nbsp;
 			
-			<?php printf(_('Or %1$s create a new package %2$s'), '<a href="'.$GLOBALS['sys_urlprefix'].'/frs/admin/?group_id='.$group_id.'">', '</a>') ?>
+			<?php printf(_('Or %1$s create a new package %2$s'), '<a href="'.util_make_url ('/frs/admin/?group_id='.$group_id).'">', '</a>') ?>
 		</td>
 	</tr>
 	<tr>
diff --git a/gforge/www/frs/index.php b/gforge/www/frs/index.php
index 28d3008d70..eb9dac36e5 100644
--- a/gforge/www/frs/index.php
+++ b/gforge/www/frs/index.php
@@ -119,7 +119,7 @@ if ( $num_packages < 1) {
 		$cur_style = $GLOBALS['HTML']->boxGetAltRowStyle($p);
 
 		print '<tr '.$cur_style.'><td colspan="3"><h3>'.db_result($res_package,$p,'name').'
-	<a href="'.$GLOBALS['sys_urlprefix'].'/frs/monitor.php?filemodule_id='. db_result($res_package,$p,'package_id') .'&group_id='.db_result($res_package,$p,'group_id').'&start=1">'.
+	<a href="'.util_make_url ('/frs/monitor.php?filemodule_id='. db_result($res_package,$p,'package_id') .'&group_id='.db_result($res_package,$p,'group_id').'&start=1').'">'.
 		html_image('ic/mail16w.png','20','20',array('alt'=>_('Monitor this package'))) .
 		'</a></h3></td><td colspan="4">&nbsp;</td></tr>';
 
@@ -192,8 +192,7 @@ if ( $num_packages < 1) {
 						$cell_data=array();
 							
 						$cell_data[] = array('<dd>
-						<a href="'.$GLOBALS['sys_urlprefix'].'/frs/download.php/'.$file_release['file_id'].'/'.$file_release['filename'].'">'
-						. $file_release['filename'] .'</a>',
+						'.util_make_link ('/frs/download.php/'.$file_release['file_id'].'/'.$file_release['filename'],$file_release['filename']),
 						'colspan=3');
 
 						$cell_data[] = array(human_readable_bytes($file_release['file_size']),'align="right"');
diff --git a/gforge/www/frs/shownotes.php b/gforge/www/frs/shownotes.php
index 3446145998..1ea4b657ce 100644
--- a/gforge/www/frs/shownotes.php
+++ b/gforge/www/frs/shownotes.php
@@ -57,7 +57,7 @@ if (!$result || db_numrows($result) < 1) {
 
 	echo $HTML->boxTop(_('Notes:'));
 
-	echo '<h3>'._('Release Name:').' <a href="'.$GLOBALS['sys_urlprefix'].'/frs/?group_id='.db_result($result,0,'group_id').'">'.db_result($result,0,'name').'</a></h3>
+	echo '<h3>'._('Release Name:').' '.util_make_link ('/frs/?group_id='.db_result($result,0,'group_id'),db_result($result,0,'name')).'</h3>
 		<p>';
 
 /*
diff --git a/gforge/www/news/admin/index.php b/gforge/www/news/admin/index.php
index 5fcf1a3029..2cf8045edc 100644
--- a/gforge/www/news/admin/index.php
+++ b/gforge/www/news/admin/index.php
@@ -173,9 +173,7 @@ if ($group_id && $group_id != $sys_news_group && user_ismember($group_id,'A')) {
 				<ul>';
 			for ($i=0; $i<$rows; $i++) {
 				echo '
-				<li><a href="'.$GLOBALS['sys_urlprefix'].'/news/admin/?approve=1&id='.db_result($result,$i,'id').'&amp;group_id='.
-					db_result($result,$i,'group_id').'">'.
-					db_result($result,$i,'summary').'</a></li>';
+				<li>'.util_make_link ('/news/admin/?approve=1&id='.db_result($result,$i,'id').'&amp;group_id='.db_result($result,$i,'group_id'),db_result($result,$i,'summary')).'</li>';
 			}
 			echo '</ul>';
 		}
@@ -270,7 +268,8 @@ if ($group_id && $group_id != $sys_news_group && user_ismember($group_id,'A')) {
 		<form action="'.getStringFromServer('PHP_SELF').'" method="post">
 		<input type="hidden" name="for_group" value="'.db_result($result,0,'group_id').'" />
 		<input type="hidden" name="id" value="'.db_result($result,0,'id').'" />
-		<strong>'._('Submitted for group').':</strong> <a href="'.$GLOBALS['sys_urlprefix'].'/projects/'.strtolower(db_result($result,0,'unix_group_name')).'/">'.$group->getPublicName().'</a><br />
+		<strong>'._('Submitted for group').':</strong> '.
+		util_make_link ('/projects/'.strtolower(db_result($result,0,'unix_group_name')).'/',$group->getPublicName()).'<br />
 		<strong>'._('Submitted by').':</strong> '.$user->getRealName().'<br />
 		<input type="hidden" name="approve" value="y" />
 		<input type="hidden" name="post_changes" value="y" />
diff --git a/gforge/www/news/admin/news_admin_utils.php b/gforge/www/news/admin/news_admin_utils.php
index 90775a13cf..220ea3f1bd 100644
--- a/gforge/www/news/admin/news_admin_utils.php
+++ b/gforge/www/news/admin/news_admin_utils.php
@@ -47,13 +47,9 @@ function show_news_approve_form($sql_pending, $sql_rejected, $sql_approved) {
        		<a href="'.getStringFromServer('PHP_SELF').'?approve=1&amp;id='.db_result($result,$i,'id').'">'.db_result($result,$i,'summary').'</a>
        		</td>
 
-       		<td width="35%">
-       		<a href="'.$GLOBALS['sys_urlprefix'].'/projects/'
-       		.db_result($result,$i,'unix_group_name').'/">'
-       		.db_result($result,$i,'group_name')
-       		.' ('.db_result($result,$i,'unix_group_name').')'
-       		.'</a>
-       		</td>
+       		<td width="35%">'
+		.util_make_link ('/projects/'.db_result($result,$i,'unix_group_name').'/',db_result($result,$i,'group_name').' ('.db_result($result,$i,'unix_group_name').')')
+       		.'</td>
        		</tr>'
        		;
        	}
diff --git a/gforge/www/news/index.php b/gforge/www/news/index.php
index 2fac1caa5b..62addae385 100644
--- a/gforge/www/news/index.php
+++ b/gforge/www/news/index.php
@@ -71,7 +71,7 @@ if ($rows < 1) {
 
 	for ($j = 0; $j < $rows; $j++) { 
 		echo '
-		<a href="'.$GLOBALS['sys_urlprefix'].'/forum/forum.php?forum_id='.db_result($result, $j, 'forum_id').'">'.
+		<a href="'.util_make_url ('/forum/forum.php?forum_id='.db_result($result, $j, 'forum_id')).'">'.
 			html_image("ic/cfolder15.png","15","13",array("border"=>"0")) . ' &nbsp;'.
 			stripslashes(db_result($result, $j, 'summary')).'</a> ';
 		echo '
diff --git a/gforge/www/news/news_utils.php b/gforge/www/news/news_utils.php
index 7f1f49b8a6..61d8b4e2c3 100644
--- a/gforge/www/news/news_utils.php
+++ b/gforge/www/news/news_utils.php
@@ -122,7 +122,7 @@ function news_show_latest($group_id='',$limit=10,$show_summaries=true,$allow_sub
 				} else {
 					$summ_txt='<br />'. util_make_links( $arr[0] );
 				}
-				$proj_name=' &nbsp; - &nbsp; <a href="'.$GLOBALS['sys_urlprefix'].'/projects/'. strtolower(db_result($result,$i,'unix_group_name')) .'/">'. db_result($result,$i,'group_name') .'</a>';
+				$proj_name=' &nbsp; - &nbsp; '.util_make_link ('/projects/'. strtolower(db_result($result,$i,'unix_group_name')) .'/',db_result($result,$i,'group_name'));
 			} else {
 				$proj_name='';
 				$summ_txt='';
@@ -130,15 +130,14 @@ function news_show_latest($group_id='',$limit=10,$show_summaries=true,$allow_sub
 
 			if (!$limit) {
 				if ($show_forum) {
-					$return .= '<li><a href="'.$GLOBALS['sys_urlprefix'].'/forum/forum.php?forum_id='. db_result($result,$i,'forum_id') .'"><strong>'. db_result($result,$i,'summary') . '</strong></a>';
+					$return .= '<li>'.util_make_link ('/forum/forum.php?forum_id='. db_result($result,$i,'forum_id'),'<strong>'. db_result($result,$i,'summary') . '</strong>');
 				} else {
 					$return .= '<li><strong>'. db_result($result,$i,'summary') . '</strong>';
 				}
 				$return .= ' &nbsp; <em>'. date(_('Y-m-d H:i'),db_result($result,$i,'post_date')).'</em><br /></li>';
 			} else {
 				if ($show_forum) {
-					$return .= '
-					<a href="'.$GLOBALS['sys_urlprefix'].'/forum/forum.php?forum_id='. db_result($result,$i,'forum_id') .'"><strong>'. db_result($result,$i,'summary') . '</strong></a>';
+					$return .= util_make_link ('/forum/forum.php?forum_id='. db_result($result,$i,'forum_id'),'<strong>'. db_result($result,$i,'summary').'</strong>');
 				} else {
 					$return .= '
 					<strong>'. db_result($result,$i,'summary') . '</strong>';
@@ -166,7 +165,8 @@ function news_show_latest($group_id='',$limit=10,$show_summaries=true,$allow_sub
 				}
 
 				if ($show_forum){
-					$return .= '<div align="center">(' . $num_comments .' '. $comments_txt . ') <a href="'.$GLOBALS['sys_urlprefix'].'/forum/forum.php?forum_id='. db_result($result,$i,'forum_id') .'">[' . _('Read&nbsp;More/Comment') . ']</a></div><hr width="100%" size="1" />';
+					$return .= '<div align="center">(' . $num_comments .' '. $comments_txt . ') '
+					.util_make_link ('/forum/forum.php?forum_id='. db_result($result,$i,'forum_id'),'[' . _('Read&nbsp;More/Comment') . ']').'</div><hr width="100%" size="1" />';
 				} else {
 					$return .= '<hr width="100%" size="1" />';
 				}
@@ -184,9 +184,9 @@ function news_show_latest($group_id='',$limit=10,$show_summaries=true,$allow_sub
 			$return .= '<hr width="100%" size="1" />'."\n";
 		}
 		if ($group_id != $sys_news_group) {
-			$archive_url=$GLOBALS['sys_urlprefix'].'/news/?group_id='.$group_id;
+			$archive_url=util_make_url ('/news/?group_id='.$group_id);
 		} else {
-			$archive_url=$GLOBALS['sys_urlprefix'].'/news/';
+			$archive_url=util_make_url ('/news/');
 		}
 
 		if ($show_forum) {
@@ -203,7 +203,8 @@ function news_show_latest($group_id='',$limit=10,$show_summaries=true,$allow_sub
 		}
 		//you can only submit news from a project now
 		//you used to be able to submit general news
-		$return .= '<div align="center"><a href="'.$GLOBALS['sys_urlprefix'].'/news/submit.php?group_id='.$group_id.'">[' . _('Submit News') . ']</a></div>';
+		$return .= '<div align="center">'
+		.util_make_link ('/news/submit.php?group_id='.$group_id,'['._('Submit News').']').'</div>';
 	}
 
 	return $return;
@@ -243,14 +244,13 @@ function news_foundry_latest($group_id=0,$limit=5,$show_summaries=true) {
 				}
 
 				//show the project name
-				$proj_name=' &nbsp; - &nbsp; <a href="'.$GLOBALS['sys_urlprefix'].'/projects/'. strtolower(db_result($result,$i,'unix_group_name')) .'/">'. db_result($result,$i,'group_name') .'</a>';
+				$proj_name=' &nbsp; - &nbsp; '.util_make_link ('/projects/'. strtolower(db_result($result,$i,'unix_group_name')) .'/',db_result($result,$i,'group_name'));
 			} else {
 				$proj_name='';
 				$summ_txt='';
 			}
-			$return .= '
-				<a href="'.$GLOBALS['sys_urlprefix'].'/forum/forum.php?forum_id='. db_result($result,$i,'forum_id') .'"><strong>'. db_result($result,$i,'summary') . '</strong></a>
-				<br /><em>'. db_result($result,$i,'realname') .' - '.
+			$return .= util_make_link ('/forum/forum.php?forum_id='. db_result($result,$i,'forum_id'),'<strong>'. db_result($result,$i,'summary') . '</strong>')
+				.'<br /><em>'. db_result($result,$i,'realname') .' - '.
 					date(_('Y-m-d H:i'),db_result($result,$i,'post_date')) . $proj_name . '</em>
 				'. $summ_txt .'<hr width="100%" size="1" />';
 		}
diff --git a/gforge/www/people/createjob.php b/gforge/www/people/createjob.php
index 024fec9d79..5d57bd41f4 100644
--- a/gforge/www/people/createjob.php
+++ b/gforge/www/people/createjob.php
@@ -46,7 +46,7 @@ if ($group_id && (user_ismember($group_id, 'A'))) {
 	echo '
 		<p>'._('Start by filling in the fields below. When you click continue, you will be shown a list of skills and experience levels that this job requires.').'	</p>
 		<p>
-		<form action="/people/editjob.php" method="post">
+		<form action="'.util_make_url ('/people/editjob.php').'" method="post">
 		<input type="hidden" name="group_id" value="'.$group_id.'" />
 		<input type="hidden" name="form_key" value="' . form_generate_key() . '">
 		<strong>'._('Category').'</strong>'.utils_requiredField().'<br /></p>
diff --git a/gforge/www/people/people_utils.php b/gforge/www/people/people_utils.php
index fb33886578..5e689cdd63 100644
--- a/gforge/www/people/people_utils.php
+++ b/gforge/www/people/people_utils.php
@@ -37,7 +37,7 @@ function people_header($params) {
 	}
 
 	if ($group_id && $job_id) {
-		echo ' | <a href="'.$GLOBALS['sys_urlprefix'].'/people/editjob.php?group_id='. $group_id .'&amp;job_id='. $job_id .'">Edit Job</a>';
+		echo ' | '.util_make_link ('/people/editjob.php?group_id='. $group_id .'&amp;job_id='. $job_id,_('Edit Job'));
 	}
 }
 
@@ -385,9 +385,8 @@ function people_show_category_table() {
 	} else {
 		for ($i=0; $i<$rows; $i++) {
 			echo db_error();
-			$return .= '<tr '. $GLOBALS['HTML']->boxGetAltRowStyle($i) .'><td><a href="'.$GLOBALS['sys_urlprefix'].'/people/?category_id='.
-				db_result($result,$i,'category_id') .'">'.
-				db_result($result,$i,'name') .'</a> ('. db_result($result,$i,'total') .')</td></tr>';
+			$return .= '<tr '. $GLOBALS['HTML']->boxGetAltRowStyle($i) .'><td>'
+			.util_make_link ('/people/?category_id='.  db_result($result,$i,'category_id'), db_result($result,$i,'name')) .' ('. db_result($result,$i,'total') .')</td></tr>';
 		}
 	}
 	$return .= $GLOBALS['HTML']->listTableBottom();
@@ -441,14 +440,10 @@ function people_show_job_list($result) {
 		for ($i=0; $i < $rows; $i++) {
 			$return .= '
 				<tr '. $GLOBALS['HTML']->boxGetAltRowStyle($i) .
-					'><td><a href="'.$GLOBALS['sys_urlprefix'].'/people/viewjob.php?group_id='.
-					db_result($result,$i,'group_id') .'&amp;job_id='.
-					db_result($result,$i,'job_id') .'">'.
-					db_result($result,$i,'title') .'</a></td><td>'.
+					'><td>'.util_make_link ('/people/viewjob.php?group_id='. db_result($result,$i,'group_id') .'&amp;job_id='.  db_result($result,$i,'job_id'), db_result($result,$i,'title')) .'</td><td>'.
 					db_result($result,$i,'category_name') .'</td><td>'.
 					date(_('Y-m-d H:i'),db_result($result,$i,'post_date')) .
-					'</td><td><a href="'.$GLOBALS['sys_urlprefix'].'/projects/'.strtolower(db_result($result,$i,'unix_group_name')).'/">'.
-					db_result($result,$i,'group_name') .'</a></td></tr>';
+					'</td><td>'.util_make_link ('/projects/'.strtolower(db_result($result,$i,'unix_group_name')).'/', db_result($result,$i,'group_name')) .'</td></tr>';
 		}
 	}
 
diff --git a/gforge/www/people/viewjob.php b/gforge/www/people/viewjob.php
index f507bc7297..437d95bfda 100644
--- a/gforge/www/people/viewjob.php
+++ b/gforge/www/people/viewjob.php
@@ -72,7 +72,7 @@ if ($group_id && $job_id) {
 
 		<tr><td>
 			<strong>'._('Contact Info').'<br />
-			<a href="'.$GLOBALS['sys_urlprefix'].'/sendmessage.php?touser='. db_result($result,0,'user_id') .'&amp;subject='. urlencode( 'RE: '.db_result($result,0,'title')) .'">'. db_result($result,0,'user_name') .'</a></strong>
+			'.util_make_link ('/sendmessage.php?touser='. db_result($result,0,'user_id') .'&amp;subject='. urlencode( 'RE: '.db_result($result,0,'title')), db_result($result,0,'user_name')) .'</strong>
 		</td><td>
 			<strong>'._('Status').'</strong><br />
 			'. db_result($result,0,'status_name') .'
@@ -83,7 +83,7 @@ if ($group_id && $job_id) {
 			'. date(_('Y-m-d H:i'),db_result($result,0,'post_date')) .'
 		</td><td>
 			<strong>'._('For project').'<br />
-			<a href="'.$GLOBALS['sys_urlprefix'].'/project/?group_id='. $group_id .'">'. db_result($result,0,'group_name') .'</a></strong>
+			'.util_make_link ('/project/?group_id='. $group_id, db_result($result,0,'group_name')) .'</strong>
 		</td></tr>
 
 		<tr><td colspan="2">
diff --git a/gforge/www/pm/add_task.php b/gforge/www/pm/add_task.php
index 9d5cf62b38..a6668e7432 100644
--- a/gforge/www/pm/add_task.php
+++ b/gforge/www/pm/add_task.php
@@ -34,7 +34,10 @@ echo notepad_func();
 	<tr>
 		<td>
 		<strong><?php echo _('Category') ?></strong><br />
-		<?php echo $pg->categoryBox('category_id'); ?> <a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/pm/admin/?<?php echo "group_id=$group_id&amp;add_cat=1&amp;group_project_id=$group_project_id"; ?>">(<?php echo _('admin') ?>)</a>
+		<?php
+		echo $pg->categoryBox('category_id'); 
+		echo util_make_link ('/pm/admin/?group_id='.$group_id.'&amp;add_cat=1&amp;group_project_id='.$group_project_id,'('._('admin').')');
+		?>
 		</td>
 
 		
diff --git a/gforge/www/pm/browse_task.php b/gforge/www/pm/browse_task.php
index fd7e9456cf..1a357b8235 100644
--- a/gforge/www/pm/browse_task.php
+++ b/gforge/www/pm/browse_task.php
@@ -286,18 +286,14 @@ if ($rows < 1) {
 	*/
 	echo '<tr><td colspan="2">';
 	if ($offset > 0) {
-		echo '<a href="'.$GLOBALS['sys_urlprefix'].'/pm/task.php?func=browse&amp;group_project_id='.
-			$group_project_id.'&amp;group_id='.$group_id.'&amp;offset='.($offset-50).'">
-			<strong>'._('previous 50').'<--</strong></a>';
+		echo util_make_link ('/pm/task.php?func=browse&amp;group_project_id='.$group_project_id.'&amp;group_id='.$group_id.'&amp;offset='.($offset-50),'<strong>'._('previous 50').'<--</strong>');
 	} else {
 		echo '&nbsp;';
 	}
 	echo '</td><td>&nbsp;</td><td colspan="2">';
 
 	if ($rows==50) {
-		echo '<a href="'.$GLOBALS['sys_urlprefix'].'/pm/task.php?func=browse&amp;group_project_id='.
-			$group_project_id.'&amp;group_id='.$group_id.'&amp;offset='.($offset+50).
-			'"><strong>'._('next 50').' --></strong></a>';
+		echo util_make_link ('/pm/task.php?func=browse&amp;group_project_id='.$group_project_id.'&amp;group_id='.$group_id.'&amp;offset='.($offset+50),'<strong>'._('next 50').' --></strong></a>');
 	} else {
 		echo '&nbsp;';
 	}
diff --git a/gforge/www/pm/calendar.php b/gforge/www/pm/calendar.php
index 681fbb1d77..578d4a1662 100644
--- a/gforge/www/pm/calendar.php
+++ b/gforge/www/pm/calendar.php
@@ -126,9 +126,7 @@ $HTML->header(array('title'=>_('Calendar'),'group'=>$group_id));
 function make_task_link($task, $type) {
 	global $HTML, $group_id, $group_project_id;
 	return '<a title="'. sprintf(_('Task summary: %s'), $task->getSummary())
-		. '" href="'.$GLOBALS['sys_urlprefix'].'/pm/task.php?func=detailtask&amp;project_task_id=' . $task->getID()
-		. '&amp;group_id=' . $group_id
-		. '&amp;group_project_id=' .$group_project_id
+		. '" href="'.util_make_url ('/pm/task.php?func=detailtask&amp;project_task_id=' . $task->getID() . '&amp;group_id=' . $group_id . '&amp;group_project_id=' .$group_project_id)
 		. '">' . ($type == 'begin' ?
 			  sprintf(_('Task %d begins'), $task->getID()) :
 			  sprintf(_('Task %d ends'), $task->getID()) )
diff --git a/gforge/www/project/index.php b/gforge/www/project/index.php
index 2d12173b93..40af6094b4 100644
--- a/gforge/www/project/index.php
+++ b/gforge/www/project/index.php
@@ -30,8 +30,6 @@ if (!$group_id) {
 }
 
 if (isset ($sys_noforcetype) && $sys_noforcetype) {
-	require_once('../env.inc.php');
-	require_once('pre.php');
 	$project = &group_get_object($group_id);
 	include('project_home.php');
 } else {
diff --git a/gforge/www/themes/gforge-simple-theme/Theme.class.php b/gforge/www/themes/gforge-simple-theme/Theme.class.php
index 4c02d6a990..3a3f1c3a53 100644
--- a/gforge/www/themes/gforge-simple-theme/Theme.class.php
+++ b/gforge/www/themes/gforge-simple-theme/Theme.class.php
@@ -66,7 +66,7 @@ class Theme extends Error {
 	 *	@param	string	The user's realname
 	 */
 	function createLinkToUserHome($user_name, $realname) {
-		return '<a href="'.$GLOBALS['sys_urlprefix'].'/users/'.$user_name.'/">'.$realname.'</a>';
+		return util_make_link ('/users/'.$user_name.'/',$realname);
 	}
 
 	/**
@@ -96,19 +96,21 @@ class Theme extends Error {
 <title><?php echo $params['title']; ?></title>
 <link rel="alternate"
 	title="<?php echo $GLOBALS['sys_name']; ?> - Project News Highlights RSS"
-	href="<?php echo $GLOBALS['sys_urlprefix']; ?>/export/rss_sfnews.php"
+	href="<?php echo util_make_url ('/export/rss_sfnews.php'); ?>"
 	type="application/rss+xml" />
 <link rel="alternate"
 	title="<?php echo $GLOBALS['sys_name']; ?> - Project News Highlights RSS 2.0"
-	href="<?php echo $GLOBALS['sys_urlprefix']; ?>/export/rss20_news.php"
+	href="<?php echo util_make_url ('/export/rss20_news.php'); ?>"
 	type="application/rss+xml" />
 <link rel="alternate"
 	title="<?php echo $GLOBALS['sys_name']; ?> - New Projects RSS"
-	href="<?php echo $GLOBALS['sys_urlprefix']; ?>/export/rss_sfprojects.php"
+	href="<?php echo util_make_url ('/export/rss_sfprojects.php'); ?>"
 	type="application/rss+xml" />
 
 		<?php	if (isset($GLOBALS['group_id'])) {
-			$activity = '<link rel="alternate" title="'.$GLOBALS['sys_name'].' - New Activity RSS" href="'.$GLOBALS['sys_urlprefix'].'/export/rss20_activity.php?group_id='.$GLOBALS['group_id'].'" type="application/rss+xml"/>';
+			$activity = '<link rel="alternate" title="'.$GLOBALS['sys_name'].' - New Activity RSS" href="'.
+			util_make_url ('/export/rss20_activity.php?group_id='.$GLOBALS['group_id']).
+			'" type="application/rss+xml"/>';
 			echo $activity;
 		}
 		?>
@@ -121,7 +123,7 @@ class Theme extends Error {
 		$theme_cssfile=$GLOBALS['sys_themeroot'].$GLOBALS['sys_theme'].'/css/'.$GLOBALS['sys_theme'].'.css';
 		if (file_exists($theme_cssfile)){
 			echo '
-<link rel="stylesheet" type="text/css" href="'.$GLOBALS['sys_urlprefix'].'/themes/'.$GLOBALS['sys_theme'].'/css/'.$GLOBALS['sys_theme'].'.css"/>';
+<link rel="stylesheet" type="text/css" href="'.util_make_url ('/themes/'.$GLOBALS['sys_theme'].'/css/'.$GLOBALS['sys_theme'].'.css').'"/>';
 		}
 		?>
 
@@ -153,18 +155,15 @@ function header($params) {
 
 <div id="container">
 <div id="logo">
-<h1><a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/">Goto GForge</a></h1>
-<!--<a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/"><img src="<?php echo $GLOBALS['sys_urlprefix']; ?>/themes/gforge-simple-theme/images/logo.png" border="0" margin="0" padding="0" valign="top"/></a>-->
+<h1><?php echo util_make_link ('/',_('Goto GForge')); ?></h1>
 </div>
 <div id="util"><?php	if (session_loggedin()) {
-	?> <a
-	href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/logout.php"><?php echo _('Log Out'); ?></a><br />
-<a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/"><?php echo _('My Account'); ?></a><br />
-
+	echo util_make_link ('/account/logout.php',_('Log Out')); ?><br />
+<?php echo util_make_link ('/account/',_('My Account')); ?><br />
 	<?php
 } else {
-	?> <a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/login.php"><?php echo _('Log In'); ?></a><br />
-<a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/register.php"><?php echo _('New Account'); ?></a>
+	echo util_make_link ('/account/login.php',_('Log In')); ?><br />
+<?php echo util_make_link ('/account/register.php',_('New Account')); ?>
 	<?php
 }
 ?></div>
@@ -220,7 +219,7 @@ function footerEnd($params) { ?> <!-- PLEASE LEAVE "Powered By GForge" on your s
 <?php
 global $sys_show_source;
 if ($sys_show_source) {
-	print '<a class="showsource" href="'.$GLOBALS['sys_urlprefix'].'/source.php?file=' . getStringFromServer('SCRIPT_NAME') . '"> '._('Show source').' </a>';
+	echo util_make_link ('/source.php?file='.getStringFromServer('SCRIPT_NAME'),_('Show source'),array('class'=>'showsource'));
 }
 ?>
 
@@ -686,9 +685,7 @@ function searchBox() {
 
 
 	if (isset($group_id)&& $group_id) {
-		print '
-					
-					<a class="lnkutility" href="'.$GLOBALS['sys_urlprefix'].'/search/advanced_search.php?group_id='.$group_id.'"> '._('Advanced search').'</a>';
+		echo util_make_link ('/search/advanced_search.php?group_id='.$group_id,_('Advanced search'),array('class'=>'lnkutility'));
 	}
 	print '</form>';
 
diff --git a/gforge/www/themes/gforge/Theme.class.php b/gforge/www/themes/gforge/Theme.class.php
index 30652aec99..68a87aacdc 100644
--- a/gforge/www/themes/gforge/Theme.class.php
+++ b/gforge/www/themes/gforge/Theme.class.php
@@ -855,6 +855,7 @@ if ($sys_show_source) {
     }
     
     function createUnderSections($sectionsArray) {
+    	global $group_subsection_names;
         $countLines = 0;
         foreach ($sectionsArray as $section) {
             if(is_array($section)) {
diff --git a/gforge/www/themes/lite/Theme.class.php b/gforge/www/themes/lite/Theme.class.php
index 2446c4d620..a9f93b2745 100644
--- a/gforge/www/themes/lite/Theme.class.php
+++ b/gforge/www/themes/lite/Theme.class.php
@@ -77,7 +77,7 @@ class Theme extends Layout {
   <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 	<title><?php echo $params['title']; ?></title>
-	<link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['sys_urlprefix']; ?>/themes/lite/css/theme.css" />
+	<link rel="stylesheet" type="text/css" href="<?php echo util_make_url ('/themes/lite/css/theme.css'); ?>" />
 	<script type="text/javascript">
 	<!--
 	function help_window(helpurl) {
@@ -117,19 +117,15 @@ class Theme extends Layout {
 <table border="0px" width="100%" cellspacing="0px" cellpadding="0px" class="content">
 
 	<tr>
-		<td><a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/"><img src="/themes/lite/images/gforge_logo.png" border="0" alt="Gforge Logo" width="200px" /></a></td>
+		<td><a href="<?php echo util_make_url ('/'); ?>"><img src="/themes/lite/images/gforge_logo.png" border="0" alt="Gforge Logo" width="200px" /></a></td>
 		<td align="right"><?php echo $this->searchBox(); ?></td>
 		<td align="right"><?php
 			if (session_loggedin()) {
-				?>
-				<a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/logout.php">Logout</a><br />
-				<a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/">My Account</a>
-				<?php
-			} else {
-				?>
-				<a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/login.php">Login</a><br />
-				<a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/register.php">New Account</a>
-				<?php
+				echo util_make_link ('/account/logout.php',_('Logout')); ?><br /><?php
+				echo util_make_link ('/account/',_('My Account')); ?><br /><?php
+			} else { 
+				echo util_make_link ('/account/login.php',_('Login')); ?><br /><?php
+				echo util_make_link ('/account/register.php',_('New Account')); ?><br /><?php
 			}
 
 		?></td>
diff --git a/gforge/www/themes/osx/Theme.class.php b/gforge/www/themes/osx/Theme.class.php
index 65b75c4200..3e3861fa46 100644
--- a/gforge/www/themes/osx/Theme.class.php
+++ b/gforge/www/themes/osx/Theme.class.php
@@ -69,13 +69,13 @@ class Theme extends Layout {
 		<td style="text-align:right"><?php
 			if (session_loggedin()) {
 				?>
-				<b><a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/logout.php"><?php echo _('Log Out'); ?></a></b><br />
-				<b><a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/"><?php echo _('My Account'); ?></a></b>
+				<b><?php echo util_make_link ('/account/logout.php',_('Log Out')); ?></b><br />
+				<b><?php echo util_make_link ('/account/',_('My Account')); ?></b>
 				<?php
 			} else {
 				?>
-				<b><a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/login.php"><?php echo _('Log In'); ?></a></b><br />
-				<b><a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/register.php"><?php echo _('New Account'); ?></a></b>
+				<b><?php echo util_make_link ('/account/login.php',_('Log In')); ?></b><br />
+				<b><?php echo util_make_link ('/account/register.php',_('New Account')); ?></b>
 				<?php
 			}
 
diff --git a/gforge/www/themes/ultralite/Theme.class.php b/gforge/www/themes/ultralite/Theme.class.php
index 449691ecdc..2a22e9a447 100644
--- a/gforge/www/themes/ultralite/Theme.class.php
+++ b/gforge/www/themes/ultralite/Theme.class.php
@@ -35,19 +35,19 @@ class Theme extends Layout {
 		
 		<body>
 		<p align=left>
-		<a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/"><h2>GForge</h2></a>
+		<?php echo util_make_link ('/',_('GForge')); ?></h2></a>
 		</p>
 		<p align=right>
 		<?php
 		if (session_loggedin()) {
 		?>
-		<b><a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/logout.php"><?php echo _('Log Out'); ?></a></b>
-		<b><a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/"><?php echo _('My Account'); ?></a></b>
+		<b><?php echo util_make_link ('/account/logout.php',_('Log Out')); ?></b>
+		<b><?php echo util_make_link ('/account/',_('My Account')); ?></b>
 		<?php
 		} else {
 		?>
-		<b><a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/login.php"><?php echo _('Log In'); ?></a></b>
-		<b><a href="<?php echo $GLOBALS['sys_urlprefix']; ?>/account/register.php"><?php echo _('New Account'); ?></a></b>
+		<b><?php echo util_make_link ('/account/login.php',_('Log In')); ?></b>
+		<b><?php echo util_make_link ('/account/register.php',_('New Account')); ?></b>
 		<?php
 		}
 		?>
@@ -144,7 +144,7 @@ class Theme extends Layout {
 		<?php
 		global $sys_show_source;
 		if ($sys_show_source) {
-		print '<a class="showsource" href="'.$GLOBALS['sys_urlprefix'].'/source.php?file=' . getStringFromServer('SCRIPT_NAME') . '">Show Source</a>';
+			echo util_make_link ('/source.php?file='.getStringFromServer('SCRIPT_NAME'),_('Show Source'),array('class'=>'showsource'));
 		}
 		?>
 		</body>