diff --git a/index.php b/index.php
index 99d7bef15c..3a07d7c473 100644
--- a/index.php
+++ b/index.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.main
 * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Refactoring
-* 	@version $Id: index.php 12186 2007-04-30 04:23:02Z yannoo $
+* 	@version $Id: index.php 12187 2007-04-30 04:28:25Z yannoo $
 *   @todo check the different @todos in this page and really do them
 * 	@todo check if the news management works as expected
 */
@@ -536,7 +536,7 @@ function display_anonymous_course_list()
 				if ($category_has_open_courses)
 				{
 					//the category contains courses accessible to anonymous visitors
-					$htmlListCat .= "<a href=\"".$_SERVER['PHP_SELF']."?category=".$catLine['code']."\">".$catLine['name']."</a>";
+					$htmlListCat .= "<a href=\"".api_get_self()."?category=".$catLine['code']."\">".$catLine['name']."</a>";
 					if (get_setting('show_number_of_courses') == 'true')
 					{
 						$htmlListCat .= " (".$catLine['nbCourse']." ".get_lang("Courses").")";
@@ -562,7 +562,7 @@ function display_anonymous_course_list()
 				$htmlTitre = "<p>";
 				if ($_setting['show_back_link_on_top_of_tree'] == 'true')
 				{
-					$htmlTitre .= "<a href=\"".$_SERVER['PHP_SELF']."\">"."&lt;&lt; ".get_lang("BackToHomePage")."</a>";
+					$htmlTitre .= "<a href=\"".api_get_self()."\">"."&lt;&lt; ".get_lang("BackToHomePage")."</a>";
 				}
 				if (!is_null($catLine['parent_id']) || ($_setting['show_back_link_on_top_of_tree'] <> 'true' && !is_null($catLine['code'])))
 				{
diff --git a/user_portal.php b/user_portal.php
index 97b70ac32a..5e15724c22 100644
--- a/user_portal.php
+++ b/user_portal.php
@@ -882,10 +882,10 @@ echo "<div class=\"maincontent\">"; // start of content for logged in users
 // link to see the session view or course view
 /*if(api_get_setting('use_session_mode')=='true' && api_is_allowed_to_create_course()) {
 	if(isset($_GET['sessionview'])){
-		echo '<a href="'.$_SERVER['PHP_SELF'].'">'.get_lang('CourseView').'</a>';
+		echo '<a href="'.api_get_self().'">'.get_lang('CourseView').'</a>';
 	}
 	else {
-		echo '<a href="'.$_SERVER['PHP_SELF'].'?sessionview=true">'.get_lang('SessionView').'</a>';
+		echo '<a href="'.api_get_self().'?sessionview=true">'.get_lang('SessionView').'</a>';
 	}
 }*/
 
diff --git a/whoisonline.php b/whoisonline.php
index 30310007b7..6bd7edf373 100644
--- a/whoisonline.php
+++ b/whoisonline.php
@@ -1,4 +1,4 @@
-<?php // $Id: whoisonline.php 11180 2007-02-21 14:24:39Z elixir_julian $
+<?php // $Id: whoisonline.php 12187 2007-04-30 04:28:25Z yannoo $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -247,7 +247,7 @@ if ((get_setting('showonline','world') == 'true' AND !$_user['user_id']) OR (get
 		{
 			if(0) // if ($_user['user_id'] && $_GET["id"] != $_user['user_id'])
 			{
-				echo '<a href="'.$_SERVER['PHP_SELF'].'?chatid='.$_GET['id'].'">'.get_lang('SendChatRequest').'</a>';
+				echo '<a href="'.api_get_self().'?chatid='.$_GET['id'].'">'.get_lang('SendChatRequest').'</a>';
 			}
 		}
 	}