diff --git a/main/admin/add_courses_to_session.php b/main/admin/add_courses_to_session.php
index 082f0d52df..5981d2dd3d 100644
--- a/main/admin/add_courses_to_session.php
+++ b/main/admin/add_courses_to_session.php
@@ -176,7 +176,7 @@ foreach($Courses as $course)
 unset($Courses);
 ?>
 
-<form name="formulaire" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?page=<?php echo $_GET['page'] ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;">
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $_GET['page'] ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;">
 <input type="hidden" name="formSent" value="1" />
 
 <?php
diff --git a/main/admin/add_users_to_session.php b/main/admin/add_users_to_session.php
index b882863d44..3adaeab34f 100644
--- a/main/admin/add_users_to_session.php
+++ b/main/admin/add_users_to_session.php
@@ -194,7 +194,7 @@ foreach($Users as $user)
 
 ?>
 
-<form name="formulaire" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?page=<?php echo $_GET['page'] ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;">
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $_GET['page'] ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;">
 <input type="hidden" name="formSent" value="1" />
 
 <?php
diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php
index 1248a12996..67dedafec7 100644
--- a/main/admin/configure_homepage.php
+++ b/main/admin/configure_homepage.php
@@ -1,4 +1,4 @@
-<?php // $Id: configure_homepage.php 12263 2007-05-03 13:34:40Z elixir_julian $
+<?php // $Id: configure_homepage.php 12269 2007-05-03 14:17:37Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -487,7 +487,7 @@ elseif($action == 'edit_notice')
 {
 ?>
 
-<form action="<?php echo $_SERVER['PHP_SELF']; ?>?action=<?php echo $action; ?>" method="post" style="margin:0px;">
+<form action="<?php echo api_get_self(); ?>?action=<?php echo $action; ?>" method="post" style="margin:0px;">
 <input type="hidden" name="formSent" value="1"/>
 
 <table border="0" cellpadding="5" cellspacing="0">
@@ -534,7 +534,7 @@ elseif($action == 'insert_link' || $action == 'edit_link')
 ?>
 
 
-<form action="<?php echo $_SERVER['PHP_SELF']; ?>?action=<?php echo $action; ?>" method="post" style="margin:0px;">
+<form action="<?php echo api_get_self(); ?>?action=<?php echo $action; ?>" method="post" style="margin:0px;">
 <input type="hidden" name="formSent" value="1"/>
 <input type="hidden" name="link_index" value="<?php if($action == 'edit_link') echo $link_index; else echo '0'; ?>"/>
 <input type="hidden" name="filename" value="<?php if($action == 'edit_link') echo $filename; else echo ''; ?>"/>
@@ -674,7 +674,7 @@ elseif($action == 'edit_top' || $action == 'edit_news')
 ?>
 
 
-<form action="<?php echo $_SERVER['PHP_SELF']; ?>?action=<?php echo $action; ?>" method="post" style="margin:0px;">
+<form action="<?php echo api_get_self(); ?>?action=<?php echo $action; ?>" method="post" style="margin:0px;">
 <input type="hidden" name="formSent" value="1"/>
 
 <?php
@@ -752,10 +752,10 @@ else
 <table border="0" cellpadding="5" cellspacing="0" width="100%">
 <tr>
   <td width="80%" colspan="2">
-	<a href="<?php echo $_SERVER['PHP_SELF']; ?>?action=edit_top"><img src="../img/edit.gif" border="0" title="<?php echo htmlentities(get_lang('Modify')); ?>"/></a> <a href="<?php echo $_SERVER['PHP_SELF']; ?>?action=edit_top"><?php echo get_lang('EditHomePage'); ?></a>
+	<a href="<?php echo api_get_self(); ?>?action=edit_top"><img src="../img/edit.gif" border="0" title="<?php echo htmlentities(get_lang('Modify')); ?>"/></a> <a href="<?php echo api_get_self(); ?>?action=edit_top"><?php echo get_lang('EditHomePage'); ?></a>
   </td>
   <td width="20%">
-	<a href="<?php echo $_SERVER['PHP_SELF']; ?>?action=insert_link"><img src="../img/insert_row.png" border="0"/></a> <a href="<?php echo $_SERVER['PHP_SELF']; ?>?action=insert_link"/><?php echo get_lang('InsertLink'); ?></a>
+	<a href="<?php echo api_get_self(); ?>?action=insert_link"><img src="../img/insert_row.png" border="0"/></a> <a href="<?php echo api_get_self(); ?>?action=insert_link"/><?php echo get_lang('InsertLink'); ?></a>
   </td>
 </tr>
 <tr>
@@ -780,7 +780,7 @@ else
 	  </td>
 	  <td width="50%">
 		<br />
-		<!--<a href="<?php echo $_SERVER['PHP_SELF']; ?>?action=edit_news"><img src="../img/edit.gif" border="0" title="<?php echo htmlentities(get_lang('Modify')); ?>"/></a> <a href="<?php echo $_SERVER['PHP_SELF']; ?>?action=edit_news"><?php echo get_lang('EditNews'); ?></a>-->
+		<!--<a href="<?php echo api_get_self(); ?>?action=edit_news"><img src="../img/edit.gif" border="0" title="<?php echo htmlentities(get_lang('Modify')); ?>"/></a> <a href="<?php echo api_get_self(); ?>?action=edit_news"><?php echo get_lang('EditNews'); ?></a>-->
 	  </td>
 	</tr>
 	<tr>
@@ -880,7 +880,7 @@ else
 	</div>
 
 	<br />
-	&nbsp;&nbsp;<a href="<?php echo $_SERVER['PHP_SELF']; ?>?action=edit_notice"><img src="../img/edit.gif" border="0" title="<?php echo htmlentities(get_lang('Modify')); ?>"/></a> <a href="<?php echo $_SERVER['PHP_SELF']; ?>?action=edit_notice"><?php echo get_lang('EditNotice'); ?></a>
+	&nbsp;&nbsp;<a href="<?php echo api_get_self(); ?>?action=edit_notice"><img src="../img/edit.gif" border="0" title="<?php echo htmlentities(get_lang('Modify')); ?>"/></a> <a href="<?php echo api_get_self(); ?>?action=edit_notice"><?php echo get_lang('EditNotice'); ?></a>
 
 	<div class="note">
 
diff --git a/main/admin/course_category.php b/main/admin/course_category.php
index 0c91a2c38f..6eaad29f88 100644
--- a/main/admin/course_category.php
+++ b/main/admin/course_category.php
@@ -1,4 +1,4 @@
-<?php // $Id: course_category.php 12263 2007-05-03 13:34:40Z elixir_julian $
+<?php // $Id: course_category.php 12269 2007-05-03 14:17:37Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -125,7 +125,7 @@ if(!empty($category) && empty($action))
 	list($parent_id)=mysql_fetch_row($result);
 ?>
 
-<a href="<?php echo $_SERVER['PHP_SELF']; ?>?category=<?php echo urlencode($parent_id); ?>">&lt;&lt; <?php echo get_lang("Back"); if(!empty($parent_id)) echo ' ('.$parent_id.')'; ?></a>
+<a href="<?php echo api_get_self(); ?>?category=<?php echo urlencode($parent_id); ?>">&lt;&lt; <?php echo get_lang("Back"); if(!empty($parent_id)) echo ' ('.$parent_id.')'; ?></a>
 
 <?php
 }
@@ -134,11 +134,11 @@ if($action == 'add' || $action == 'edit')
 {
 ?>
 
-<a href="<?php echo $_SERVER['PHP_SELF']; ?>?category=<?php echo urlencode($category); ?>">&lt;&lt; <?php echo get_lang("Back"); if(!empty($category)) echo ' ('.$category.')'; ?></a>
+<a href="<?php echo api_get_self(); ?>?category=<?php echo urlencode($category); ?>">&lt;&lt; <?php echo get_lang("Back"); if(!empty($category)) echo ' ('.$category.')'; ?></a>
 
 <h3><?php echo ($action == 'add')?get_lang('AddACategory'):get_lang('EditNode'); if(!empty($category)) echo ' '.get_lang('Into').' '.$category; ?></h3>
 
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?action=<?php echo $action; ?>&category=<?php echo urlencode($category); ?>&amp;id=<?php echo urlencode(stripslashes($_GET['id'])); ?>">
+<form method="post" action="<?php echo api_get_self(); ?>?action=<?php echo $action; ?>&category=<?php echo urlencode($category); ?>&amp;id=<?php echo urlencode(stripslashes($_GET['id'])); ?>">
 <input type="hidden" name="formSent" value="1" />
 <table border="0" cellpadding="5" cellspacing="0">
 
@@ -199,10 +199,10 @@ else
 ?>
 
   <li>
-	<a href="<?php echo $_SERVER['PHP_SELF']; ?>?category=<?php echo urlencode($enreg['code']); ?>"><img src="../img/folder_document.gif" border="0" title="<?php echo get_lang("OpenNode"); ?>" alt="" align="absbottom" /></a>
-	<a href="<?php echo $_SERVER['PHP_SELF']; ?>?category=<?php echo urlencode($category); ?>&amp;action=edit&amp;id=<?php echo urlencode($enreg['code']); ?>"><img src="../img/edit.gif" border="0" title="<?php echo get_lang("EditNode"); ?>" alt ="" /></a>
-	<a href="<?php echo $_SERVER['PHP_SELF']; ?>?category=<?php echo urlencode($category); ?>&amp;action=delete&amp;id=<?php echo urlencode($enreg['code']); ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;"><img src="../img/delete.gif" border="0" title="<?php echo get_lang("DeleteNode"); ?>" alt="" /></a>
-	<a href="<?php echo $_SERVER['PHP_SELF']; ?>?category=<?php echo urlencode($category); ?>&amp;action=moveUp&amp;id=<?php echo urlencode($enreg['code']); ?>&amp;tree_pos=<?php echo $enreg['tree_pos']; ?>"><img src="../img/up.gif" border="0" title="<?php echo get_lang("UpInSameLevel"); ?>" alt="" /></a>
+	<a href="<?php echo api_get_self(); ?>?category=<?php echo urlencode($enreg['code']); ?>"><img src="../img/folder_document.gif" border="0" title="<?php echo get_lang("OpenNode"); ?>" alt="" align="absbottom" /></a>
+	<a href="<?php echo api_get_self(); ?>?category=<?php echo urlencode($category); ?>&amp;action=edit&amp;id=<?php echo urlencode($enreg['code']); ?>"><img src="../img/edit.gif" border="0" title="<?php echo get_lang("EditNode"); ?>" alt ="" /></a>
+	<a href="<?php echo api_get_self(); ?>?category=<?php echo urlencode($category); ?>&amp;action=delete&amp;id=<?php echo urlencode($enreg['code']); ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;"><img src="../img/delete.gif" border="0" title="<?php echo get_lang("DeleteNode"); ?>" alt="" /></a>
+	<a href="<?php echo api_get_self(); ?>?category=<?php echo urlencode($category); ?>&amp;action=moveUp&amp;id=<?php echo urlencode($enreg['code']); ?>&amp;tree_pos=<?php echo $enreg['tree_pos']; ?>"><img src="../img/up.gif" border="0" title="<?php echo get_lang("UpInSameLevel"); ?>" alt="" /></a>
 	<?php echo $enreg['name']; ?>
 	(<?php echo $enreg['children_count']; ?> <?php echo get_lang("Categories"); ?> - <?php echo $enreg['nbr_courses']; ?> <?php echo get_lang("Courses"); ?>)
   </li>
@@ -220,7 +220,7 @@ else
 
 </ul>
 
-<a href="<?php echo $_SERVER['PHP_SELF']; ?>?category=<?php echo $category; ?>&amp;action=add"><?php echo get_lang("AddACategory"); if(!empty($category)) echo ' '.get_lang('Into').' '.$category; ?></a>
+<a href="<?php echo api_get_self(); ?>?category=<?php echo $category; ?>&amp;action=add"><?php echo get_lang("AddACategory"); if(!empty($category)) echo ' '.get_lang('Into').' '.$category; ?></a>
 
 <?php
 }
diff --git a/main/admin/course_import.php b/main/admin/course_import.php
index 1d40948fe9..5445ff877f 100644
--- a/main/admin/course_import.php
+++ b/main/admin/course_import.php
@@ -191,7 +191,7 @@ if (count($errors) != 0)
 	Display :: display_error_message($error_message);
 }
 ?>
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" enctype="multipart/form-data" style="margin:0px;">
+<form method="post" action="<?php echo api_get_self(); ?>" enctype="multipart/form-data" style="margin:0px;">
 <input type="file" name="import_file"/>
 <input type="hidden" name="formSent" value="1"/>
 <input type="submit" value="<?php echo get_lang('Ok'); ?>"/>
diff --git a/main/admin/session_add.php b/main/admin/session_add.php
index 620048730a..707abb38fa 100644
--- a/main/admin/session_add.php
+++ b/main/admin/session_add.php
@@ -79,7 +79,7 @@ Display::display_header($tool_name);
 api_display_tool_title($tool_name);
 ?>
 
-<form method="post" name="form" action="<?php echo $_SERVER['PHP_SELF']; ?>" style="margin:0px;">
+<form method="post" name="form" action="<?php echo api_get_self(); ?>" style="margin:0px;">
 <input type="hidden" name="formSent" value="1">
 
 <table border="0" cellpadding="5" cellspacing="0" width="550">
diff --git a/main/admin/session_course_edit.php b/main/admin/session_course_edit.php
index 1d4bdd15e9..65c7737eeb 100644
--- a/main/admin/session_course_edit.php
+++ b/main/admin/session_course_edit.php
@@ -75,7 +75,7 @@ Display::display_header($tool_name);
 api_display_tool_title($tool_name);
 ?>
 
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&page=<?php echo $_GET['page'] ?>" style="margin:0px;">
+<form method="post" action="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&page=<?php echo $_GET['page'] ?>" style="margin:0px;">
 <input type="hidden" name="formSent" value="1">
 
 <table border="0" cellpadding="5" cellspacing="0" width="550">
diff --git a/main/admin/session_edit.php b/main/admin/session_edit.php
index 33655d53ce..ac9a942e52 100644
--- a/main/admin/session_edit.php
+++ b/main/admin/session_edit.php
@@ -102,7 +102,7 @@ Display::display_header($tool_name);
 api_display_tool_title($tool_name);
 ?>
 
-<form method="post" name="form" action="<?php echo $_SERVER['PHP_SELF']; ?>?page=<?php echo $_GET['page'] ?>&id=<?php echo $id; ?>" style="margin:0px;">
+<form method="post" name="form" action="<?php echo api_get_self(); ?>?page=<?php echo $_GET['page'] ?>&id=<?php echo $id; ?>" style="margin:0px;">
 <input type="hidden" name="formSent" value="1">
 
 <table border="0" cellpadding="5" cellspacing="0" width="550">
diff --git a/main/admin/session_export.php b/main/admin/session_export.php
index 1b79c7bb4b..277cc729e7 100644
--- a/main/admin/session_export.php
+++ b/main/admin/session_export.php
@@ -254,7 +254,7 @@ if(!empty($errorMsg))
 }
 ?>
 
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" style="margin:0px;">
+<form method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;">
 <input type="hidden" name="formSent" value="1">
 <table border="0" cellpadding="5" cellspacing="0">
 <tr>
diff --git a/main/admin/session_import.php b/main/admin/session_import.php
index 821e12b3a4..1e096ca44e 100644
--- a/main/admin/session_import.php
+++ b/main/admin/session_import.php
@@ -559,7 +559,7 @@ api_display_tool_title($tool_name);
 
 ?>
 
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" enctype="multipart/form-data" style="margin:0px;">
+<form method="post" action="<?php echo api_get_self(); ?>" enctype="multipart/form-data" style="margin:0px;">
 <input type="hidden" name="formSent" value="1">
 <table border="0" cellpadding="5" cellspacing="0">
 
diff --git a/main/admin/subscribe_class2course.php b/main/admin/subscribe_class2course.php
index 3b1b223dd3..ae3c97a736 100644
--- a/main/admin/subscribe_class2course.php
+++ b/main/admin/subscribe_class2course.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Id: subscribe_class2course.php 10811 2007-01-22 08:26:40Z elixir_julian $
+// $Id: subscribe_class2course.php 12269 2007-05-03 14:17:37Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -109,7 +109,7 @@ if (!empty ($error_message))
 	Display :: display_normal_message($error_message); 
 }
 ?>
-<form name="formulaire" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" style="margin:0px;">
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;">
  <input type="hidden" name="formSent" value="1"/>
  <table border="0" cellpadding="5" cellspacing="0" width="100%">
   <tr>
diff --git a/main/admin/subscribe_user2class.php b/main/admin/subscribe_user2class.php
index 1559dbca54..61be4eda75 100644
--- a/main/admin/subscribe_user2class.php
+++ b/main/admin/subscribe_user2class.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: subscribe_user2class.php 10811 2007-01-22 08:26:40Z elixir_julian $
+// $Id: subscribe_user2class.php 12269 2007-05-03 14:17:37Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -121,7 +121,7 @@ if (!empty ($error_message))
 	Display :: display_normal_message($error_message); 
 }
 ?>
-<form name="formulaire" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?course=<?php echo urlencode($course); ?>&amp;idclass=<?php echo $class_id; ?>" style="margin:0px;">
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?course=<?php echo urlencode($course); ?>&amp;idclass=<?php echo $class_id; ?>" style="margin:0px;">
  <input type="hidden" name="formSent" value="1"/>
  <table border="0" cellpadding="5" cellspacing="0" width="100%">
   <tr>
diff --git a/main/admin/subscribe_user2course.php b/main/admin/subscribe_user2course.php
index e3a3c2eec0..8727f05a18 100644
--- a/main/admin/subscribe_user2course.php
+++ b/main/admin/subscribe_user2course.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: subscribe_user2course.php 10811 2007-01-22 08:26:40Z elixir_julian $
+// $Id: subscribe_user2course.php 12269 2007-05-03 14:17:37Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -133,7 +133,7 @@ $result = api_sql_query($sql, __FILE__, __LINE__);
 $db_courses = api_store_result($result);
 ?>
 
-<form name="formulaire" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" style="margin:0px;">
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;">
  <input type="hidden" name="formSent" value="1"/>
   <table border="0" cellpadding="5" cellspacing="0" width="100%">
    <tr>
diff --git a/main/auth/my_progress.php b/main/auth/my_progress.php
index 5a151eeaab..135ee36b2a 100644
--- a/main/auth/my_progress.php
+++ b/main/auth/my_progress.php
@@ -89,7 +89,7 @@ echo get_lang('ProgressIntroduction');
 ?>
 <br /><br />
 
-<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>" style="margin: 0px;">
+<form method="get" action="<?php echo api_get_self(); ?>" style="margin: 0px;">
 <center>
 <?php echo get_lang('SessionCourses'); ?> :
 <select name="id_session">
diff --git a/main/chat/chat_hidden.php b/main/chat/chat_hidden.php
index 0dea6135f4..cbf7dbd175 100755
--- a/main/chat/chat_hidden.php
+++ b/main/chat/chat_hidden.php
@@ -84,7 +84,7 @@ list($connected_new)=mysql_fetch_row($result);
 include("header_frame.inc.php");
 ?>
 
-<form name="formHidden" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<form name="formHidden" method="post" action="<?php echo api_get_self(); ?>">
 <input type="hidden" name="chat_size_old" value="<?php echo $chat_size_new; ?>">
 <input type="hidden" name="connected_old" value="<?php echo $connected_new; ?>">
 </form>
diff --git a/main/chat/chat_message.php b/main/chat/chat_message.php
index 0eb17eed4a..3053389607 100755
--- a/main/chat/chat_message.php
+++ b/main/chat/chat_message.php
@@ -138,7 +138,7 @@ if($sent)
 include('header_frame.inc.php');
 ?>
 
-<form name="formMessage" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" onsubmit="javascript:if(document.formMessage.message.value == '') { alert('<?php echo addslashes(htmlentities(get_lang('TypeMessage'))); ?>'); document.formMessage.message.focus(); return false; }" autocomplete="off">
+<form name="formMessage" method="post" action="<?php echo api_get_self(); ?>" onsubmit="javascript:if(document.formMessage.message.value == '') { alert('<?php echo addslashes(htmlentities(get_lang('TypeMessage'))); ?>'); document.formMessage.message.focus(); return false; }" autocomplete="off">
 <input type="hidden" name="sent" value="1">
 <table border="0" cellpadding="5" cellspacing="0" width="100%">
 <tr>
diff --git a/main/chat/chat_whoisonline.php b/main/chat/chat_whoisonline.php
index eacb122c44..ebef60b3e9 100755
--- a/main/chat/chat_whoisonline.php
+++ b/main/chat/chat_whoisonline.php
@@ -87,7 +87,7 @@ else{
 
 <tr>
   <td width="1%" valign="top"><?php if($status == 1) echo '<img src="../img/teachers.gif" align="absbottom" border="0" alt="" style="margin: 1px;">'; else echo '<img src="../img/students.gif" align="absbottom" border="0" alt="" style="margin: 1px;">';?></td>
-  <td width="99%"><a <?php if($status == 1) echo 'class="master"'; ?> name="user_<?php echo $enreg['user_id']; ?>" href="<?php echo $_SERVER['PHP_SELF']; ?>?showPic=<?php if($showPic == $enreg['user_id']) echo '0'; else echo $enreg['user_id']; ?>#user_<?php echo $enreg['user_id']; ?>"><?php echo ucfirst($enreg['firstname']).' '.ucfirst($enreg['lastname']); ?></a></td>
+  <td width="99%"><a <?php if($status == 1) echo 'class="master"'; ?> name="user_<?php echo $enreg['user_id']; ?>" href="<?php echo api_get_self(); ?>?showPic=<?php if($showPic == $enreg['user_id']) echo '0'; else echo $enreg['user_id']; ?>#user_<?php echo $enreg['user_id']; ?>"><?php echo ucfirst($enreg['firstname']).' '.ucfirst($enreg['lastname']); ?></a></td>
 </tr>
 
 <?php if($showPic == $enreg['user_id']): ?>
diff --git a/main/chat/phpfreechat/admin/index.php b/main/chat/phpfreechat/admin/index.php
index 4bb288ea2c..9bbcd7c639 100755
--- a/main/chat/phpfreechat/admin/index.php
+++ b/main/chat/phpfreechat/admin/index.php
@@ -19,7 +19,7 @@ include("index_html_top.php");
 
   <div><h3><?php echo _pfc("Available Languages"); ?></h3>
     <ul>
-      <li><form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
+      <li><form action="<?php echo api_get_self(); ?>" method="post">
           <select name="lang">
         <?php 
         $available_admin_lang = pfcI18N::GetAcceptedLanguage("admin");
diff --git a/main/course_home/2column.php b/main/course_home/2column.php
index c2cf568c9c..4ed2a19317 100644
--- a/main/course_home/2column.php
+++ b/main/course_home/2column.php
@@ -333,8 +333,8 @@ if (api_is_platform_admin())
 			<div id="toolhide">
 			<?php echo get_lang("DelLk"); ?>
 			<br />&nbsp;&nbsp;&nbsp;
-			<a href="<?php echo $_SERVER['PHP_SELF']; ?>"><?php echo get_lang("No"); ?></a>&nbsp;|&nbsp;
-			<a href="<?php echo $_SERVER['PHP_SELF']; ?>?delete=yes&id=<?php echo $_GET["id"]; ?>"><?php echo get_lang("Yes"); ?></a>
+			<a href="<?php echo api_get_self(); ?>"><?php echo get_lang("No"); ?></a>&nbsp;|&nbsp;
+			<a href="<?php echo api_get_self(); ?>?delete=yes&id=<?php echo $_GET["id"]; ?>"><?php echo get_lang("Yes"); ?></a>
 			</div>
 		<?php
 	}
diff --git a/main/document/document.php b/main/document/document.php
index 77b0a49ae1..3ac826ed5d 100644
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -1,4 +1,4 @@
-<?php // $Id: document.php 12268 2007-05-03 14:16:09Z yannoo $
+<?php // $Id: document.php 12269 2007-05-03 14:17:37Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -473,7 +473,7 @@ echo(build_directory_selector($folders,$curdirpath,$group_properties['directory'
 	if ($curdirpath!= '/'&& $curdirpath!=$group_properties['directory'])
 	{
 	?>
-		 <a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo urlencode((dirname($curdirpath)=='\\')?'/':dirname($curdirpath)) ?>">
+		 <a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo urlencode((dirname($curdirpath)=='\\')?'/':dirname($curdirpath)) ?>">
 				<img src="../img/folder_up.gif" border="0" align="absbottom" hspace="5" alt="" />
 				<?php echo get_lang("Up"); ?></a>&nbsp;
 	<?php
@@ -490,14 +490,14 @@ echo(build_directory_selector($folders,$curdirpath,$group_properties['directory'
 			<a href="upload.php?<?php echo api_get_cidreq();?>&path=<?php echo $curdirpathurl.$req_gid; ?>"><img src="../img/submit_file.gif" border="0" title="<?php echo get_lang('UplUploadDocument'); ?>" alt="" /></a>
 			<a href="upload.php?<?php echo api_get_cidreq();?>&path=<?php echo $curdirpathurl.$req_gid; ?>"><?php echo get_lang('UplUploadDocument'); ?></a>&nbsp;
 			<!-- create directory -->
-			<a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo $curdirpathurl; ?>&amp;createdir=1"><img src="../img/folder_new.gif" border="0" alt ="" /></a>
-			<a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo $curdirpathurl; ?>&amp;createdir=1"><?php echo get_lang("CreateDir"); ?></a>&nbsp;
+			<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo $curdirpathurl; ?>&amp;createdir=1"><img src="../img/folder_new.gif" border="0" alt ="" /></a>
+			<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo $curdirpathurl; ?>&amp;createdir=1"><?php echo get_lang("CreateDir"); ?></a>&nbsp;
 		<?php
 	}
 	?>
 	<!-- download zipped folder -->
-	<a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo api_get_cidreq();?>&action=downloadfolder&amp;path=<?php echo $curdirpathurl; ?>"><img src="../img/zip_save.gif" border="0" title="<?php echo get_lang("Save"); ?> (ZIP)" alt="" /></a>
-	<a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo api_get_cidreq();?>&action=downloadfolder&amp;path=<?php echo $curdirpathurl; ?>"><?php echo get_lang("Save"); ?> (ZIP)</a>&nbsp;
+	<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&action=downloadfolder&amp;path=<?php echo $curdirpathurl; ?>"><img src="../img/zip_save.gif" border="0" title="<?php echo get_lang("Save"); ?> (ZIP)" alt="" /></a>
+	<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&action=downloadfolder&amp;path=<?php echo $curdirpathurl; ?>"><?php echo get_lang("Save"); ?> (ZIP)</a>&nbsp;
 	<?php
 	// Slideshow by Patrick Cool, May 2004
 	include("document_slideshow.inc.php");
diff --git a/main/document/upload.php b/main/document/upload.php
index 9a7d13018c..3cf46dbf20 100644
--- a/main/document/upload.php
+++ b/main/document/upload.php
@@ -1,4 +1,4 @@
-<?php // $Id: upload.php 12263 2007-05-03 13:34:40Z elixir_julian $
+<?php // $Id: upload.php 12269 2007-05-03 14:17:37Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -299,7 +299,7 @@ if(isset($_GET['createdir']))
 }
 else {	//give them a link to create a directory
 	?>
-	<p><a href="<?php echo $_SERVER['PHP_SELF']; ?>?path=<?php echo $path; ?>&amp;createdir=1"><img src="../img/folder_new.gif" border="0" align="absmiddle" alt ="" /> <?php echo(get_lang('CreateDir'));?></a></p>
+	<p><a href="<?php echo api_get_self(); ?>?path=<?php echo $path; ?>&amp;createdir=1"><img src="../img/folder_new.gif" border="0" align="absmiddle" alt ="" /> <?php echo(get_lang('CreateDir'));?></a></p>
 	<?php
 }
 ?>
diff --git a/main/exercice/Hpdownload.php b/main/exercice/Hpdownload.php
index 8e882346e3..e72c5eef00 100644
--- a/main/exercice/Hpdownload.php
+++ b/main/exercice/Hpdownload.php
@@ -22,7 +22,7 @@
 *	This script shows the list of exercises for administrators and students.
 *	@package dokeos.exercise
 * 	@author Istvan Mandak
-* 	@version $Id: Hpdownload.php 10789 2007-01-18 19:18:27Z pcool $
+* 	@version $Id: Hpdownload.php 12269 2007-05-03 14:17:37Z elixir_julian $
 */
 
 
@@ -126,7 +126,7 @@ if($content_type == 'text/html')
 	*/
 
 
-		$exercicePath = $_SERVER['PHP_SELF'];
+		$exercicePath = api_get_self();
   	$exfile = explode('/',$exercicePath);
   	$exfile = $exfile[sizeof($exfile)-1];
   	$exercicePath = substr($exercicePath,0,strpos($exercicePath,$exfile));
diff --git a/main/exercice/answer_admin.inc.php b/main/exercice/answer_admin.inc.php
index bd2c1131ad..f757a80f7f 100644
--- a/main/exercice/answer_admin.inc.php
+++ b/main/exercice/answer_admin.inc.php
@@ -22,7 +22,7 @@
 *	This script allows to manage answers. It is included from the script admin.php
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: answer_admin.inc.php 10789 2007-01-18 19:18:27Z pcool $
+* 	@version $Id: answer_admin.inc.php 12269 2007-05-03 14:17:37Z elixir_julian $
 */
 
 
@@ -902,18 +902,18 @@ if($modifyAnswers)
 <?php
 		/*if ($exerciseId==0){
 	?>
-		<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?modifyAnswers=<?php  echo $modifyAnswers; ?>">
+		<form method="post" action="<?php echo api_get_self(); ?>?modifyAnswers=<?php  echo $modifyAnswers; ?>">
 		<?php }
 		else
 		{
 		?>
-		<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?exerciseId=<?php  echo $exerciseId; ?>">
+		<form method="post" action="<?php echo api_get_self(); ?>?exerciseId=<?php  echo $exerciseId; ?>">
 		<?php
 		}*/
 
 
 ?>
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?modifyAnswers=<?php  echo $modifyAnswers; ?>">
+<form method="post" action="<?php echo api_get_self(); ?>?modifyAnswers=<?php  echo $modifyAnswers; ?>">
 
 
 <input type="hidden" name="formSent" value="1">
@@ -1023,7 +1023,7 @@ if($modifyAnswers)
   <?php echo $questionName; ?>
 </h3>
 
-<form name="formulaire" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?modifyAnswers=<?php echo $modifyAnswers; ?>">
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?modifyAnswers=<?php echo $modifyAnswers; ?>">
 <input type="hidden" name="formSent" value="1">
 <input type="hidden" name="setWeighting" value="<?php echo $setWeighting; ?>">
 <input type="hidden" name="myid" value="<?php echo $_REQUEST['myid']; ?>">
@@ -1163,7 +1163,7 @@ if($modifyAnswers)
 			echo $desc = mysql_result($res,0,'description');
 			 ?>
 
-			<form name="formulaire" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?modifyAnswers=<?php echo $modifyAnswers; ?>">
+			<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?modifyAnswers=<?php echo $modifyAnswers; ?>">
 			<input type="hidden" name="formSent" value="1">
 			<input type="hidden" name="setWeighting" value="1">
 			<input type="hidden" name="myid" value="<?php  echo $_REQUEST['myid'];?>">
@@ -1216,7 +1216,7 @@ if($modifyAnswers)
   <?php echo $questionName; ?>
 </h3>
 
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?modifyAnswers=<?php echo $modifyAnswers; ?>">
+<form method="post" action="<?php echo api_get_self(); ?>?modifyAnswers=<?php echo $modifyAnswers; ?>">
 <input type="hidden" name="formSent" value="1">
 <input type="hidden" name="nbrOptions" value="<?php echo $nbrOptions; ?>">
 <input type="hidden" name="nbrMatches" value="<?php echo $nbrMatches; ?>">
@@ -1397,7 +1397,7 @@ if($modifyAnswers)
 			</script>
 		</td>
 		<td valign="top">
-			<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?modifyAnswers=<?php echo $modifyAnswers; ?>" name="frm_exercise">
+			<form method="post" action="<?php echo api_get_self(); ?>?modifyAnswers=<?php echo $modifyAnswers; ?>" name="frm_exercise">
 				<input type="hidden" name="formSent" value="1" />
 				<input type="hidden" name="nbrAnswers" value="<?php echo $nbrAnswers; ?>" />
 				<table border="0" cellpadding="3" cellspacing="0" style="border: 1px solid #4271b5; border-left:none; width: 100%; ">
diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php
index 1d06ae373c..04c356d652 100644
--- a/main/exercice/exercice.php
+++ b/main/exercice/exercice.php
@@ -24,7 +24,7 @@
 *	@author Olivier Brouckaert, original author
 *	@author Denes Nagy, HotPotatoes integration
 *	@author Wolfgang Schneider, code/html cleanup
-* 	@version $Id: exercice.php 12263 2007-05-03 13:34:40Z elixir_julian $
+* 	@version $Id: exercice.php 12269 2007-05-03 14:17:37Z elixir_julian $
 */
 
 
@@ -75,7 +75,7 @@ $audioPath=$documentPath.'/audio';
 
 // hotpotatoes
 $uploadPath = "/HotPotatoes_files";
-$exercicePath = $_SERVER['PHP_SELF'];
+$exercicePath = api_get_self();
 $exfile = explode('/',$exercicePath);
 $exfile = strtolower($exfile[sizeof($exfile)-1]);
 $exercicePath = substr($exercicePath,0,strpos($exercicePath,$exfile));
diff --git a/main/exercice/hotspot_admin.inc.php b/main/exercice/hotspot_admin.inc.php
index 06509a0e77..d5479d0927 100644
--- a/main/exercice/hotspot_admin.inc.php
+++ b/main/exercice/hotspot_admin.inc.php
@@ -322,7 +322,7 @@ if($modifyAnswers)
 			</script>
 		</td>
 		<td valign="top">
-			<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?hotspotadmin=<?php echo $modifyAnswers; ?>" name="frm_exercise">
+			<form method="post" action="<?php echo api_get_self(); ?>?hotspotadmin=<?php echo $modifyAnswers; ?>" name="frm_exercise">
 				<input type="hidden" name="formSent" value="1" />
 				<input type="hidden" name="nbrAnswers" value="<?php echo $nbrAnswers; ?>" />
 				<table class="data_table">
diff --git a/main/exercice/question_list_admin.inc.php b/main/exercice/question_list_admin.inc.php
index a10bc05660..0695459f1b 100644
--- a/main/exercice/question_list_admin.inc.php
+++ b/main/exercice/question_list_admin.inc.php
@@ -22,7 +22,7 @@
 *	Code library for HotPotatoes integration.
 *	@package dokeos.exercise
 * 	@author
-* 	@version $Id: question_list_admin.inc.php 11057 2007-02-05 08:56:17Z elixir_julian $
+* 	@version $Id: question_list_admin.inc.php 12269 2007-05-03 14:17:37Z elixir_julian $
 */
 
 
@@ -105,14 +105,14 @@ if($nbrQuestions)
 
 <tr <?php if($i%2==0) echo 'class="row_odd"'; else echo 'class="row_even"'; ?>>
   <td><?php echo "$i. ".$objQuestionTmp->selectTitle(); ?></td> <td><?php eval('echo get_lang('.get_class($objQuestionTmp).'::$explanationLangVar);'); ?></td>
-  <td> <a href="<?php echo $_SERVER['PHP_SELF']; ?>?myid=1&editQuestion=<?php echo $id; ?>"><img src="../img/edit.gif" border="0" align="absmiddle" alt="<?php echo get_lang('Modify'); ?>" /></a> <a href="<?php echo $_SERVER['PHP_SELF']; ?>?deleteQuestion=<?php echo $id; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;"><img src="../img/delete.gif" border="0" align="absmiddle" alt="<?php echo get_lang('Delete'); ?>" /></a>
+  <td> <a href="<?php echo api_get_self(); ?>?myid=1&editQuestion=<?php echo $id; ?>"><img src="../img/edit.gif" border="0" align="absmiddle" alt="<?php echo get_lang('Modify'); ?>" /></a> <a href="<?php echo api_get_self(); ?>?deleteQuestion=<?php echo $id; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;"><img src="../img/delete.gif" border="0" align="absmiddle" alt="<?php echo get_lang('Delete'); ?>" /></a>
 
 	<?php
 		if($i != 1)
 		{
 ?>
 
-	<a href="<?php echo $_SERVER['PHP_SELF']; ?>?moveUp=<?php echo $id; ?>"><img src="../img/up.gif" border="0" align="absmiddle" alt="<?php echo get_lang('MoveUp'); ?>"></a>
+	<a href="<?php echo api_get_self(); ?>?moveUp=<?php echo $id; ?>"><img src="../img/up.gif" border="0" align="absmiddle" alt="<?php echo get_lang('MoveUp'); ?>"></a>
 
 <?php
 		}
@@ -121,7 +121,7 @@ if($nbrQuestions)
 		{
 ?>
 
-	<a href="<?php echo $_SERVER['PHP_SELF']; ?>?moveDown=<?php echo $id; ?>"><img src="../img/down.gif" border="0" align="absmiddle" alt="<?php echo get_lang('MoveDown'); ?>"></a>
+	<a href="<?php echo api_get_self(); ?>?moveDown=<?php echo $id; ?>"><img src="../img/down.gif" border="0" align="absmiddle" alt="<?php echo get_lang('MoveDown'); ?>"></a>
 
 <?php
 		}
diff --git a/main/exercice/question_pool.php b/main/exercice/question_pool.php
index fb09f164b5..5ba7276840 100644
--- a/main/exercice/question_pool.php
+++ b/main/exercice/question_pool.php
@@ -24,7 +24,7 @@
 * 	One question can be in several exercises
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: question_pool.php 12219 2007-05-01 18:46:59Z yannoo $
+* 	@version $Id: question_pool.php 12269 2007-05-03 14:17:37Z elixir_julian $
 */
 
 // name of the language file that needs to be included
@@ -122,7 +122,7 @@ if($is_allowedToEdit)
   <?php echo $nameTools; ?>
 </h3>
 
-<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<form method="get" action="<?php echo api_get_self(); ?>">
 <input type="hidden" name="fromExercise" value="<?php echo $fromExercise; ?>">
 <table class="data_table">
 <tr>
@@ -209,7 +209,7 @@ if($is_allowedToEdit)
 	{
 ?>
 
-	<a href="<?php echo $_SERVER['PHP_SELF']; ?>?exerciseId=<?php echo $exerciseId; ?>&fromExercise=<?php echo $fromExercise; ?>&page=<?php echo ($page-1); ?>">&lt;&lt; <?php echo get_lang('PreviousPage'); ?></a> |
+	<a href="<?php echo api_get_self(); ?>?exerciseId=<?php echo $exerciseId; ?>&fromExercise=<?php echo $fromExercise; ?>&page=<?php echo ($page-1); ?>">&lt;&lt; <?php echo get_lang('PreviousPage'); ?></a> |
 
 <?php
 	}
@@ -226,7 +226,7 @@ if($is_allowedToEdit)
 	{
 ?>
 
-	<a href="<?php echo $_SERVER['PHP_SELF']; ?>?exerciseId=<?php echo $exerciseId; ?>&fromExercise=<?php echo $fromExercise; ?>&page=<?php echo ($page+1); ?>"><?php echo get_lang('NextPage'); ?> &gt;&gt;</a>
+	<a href="<?php echo api_get_self(); ?>?exerciseId=<?php echo $exerciseId; ?>&fromExercise=<?php echo $fromExercise; ?>&page=<?php echo ($page+1); ?>"><?php echo get_lang('NextPage'); ?> &gt;&gt;</a>
 
 <?php
 	}
@@ -312,7 +312,7 @@ if($is_allowedToEdit)
 ?>
 
   <td align="center">
-    <a href="<?php echo $_SERVER['PHP_SELF']; ?>?exerciseId=<?php echo $exerciseId; ?>&delete=<?php echo $row[id]; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;"><img src="../img/delete.gif" border="0" alt="<?php echo get_lang('Delete'); ?>"></a>
+    <a href="<?php echo api_get_self(); ?>?exerciseId=<?php echo $exerciseId; ?>&delete=<?php echo $row[id]; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;"><img src="../img/delete.gif" border="0" alt="<?php echo get_lang('Delete'); ?>"></a>
   </td>
 
 <?php
diff --git a/main/external_module/external_module.php b/main/external_module/external_module.php
index e954b00eb2..a3e28061d4 100644
--- a/main/external_module/external_module.php
+++ b/main/external_module/external_module.php
@@ -136,7 +136,7 @@ else
 <p><?php echo $toolid ? get_lang('ChangePress') : get_lang('SubTitle'); ?></p>
 
 <table border="0">
-<form method="post" action="<?php echo $toolid ? $_SERVER['PHP_SELF'] . '?id=' . $id : $_SERVER['PHP_SELF']; ?>">
+<form method="post" action="<?php echo $toolid ? $_SERVER['PHP_SELF'] . '?id=' . $id : api_get_self(); ?>">
 <input type="hidden" name="formSent" value="1">
 
 <?php
diff --git a/main/inc/lib/fckeditor/editor/plugins/Attachment/fck_Attachment.php b/main/inc/lib/fckeditor/editor/plugins/Attachment/fck_Attachment.php
index 7ecfc10e06..fc62051937 100644
--- a/main/inc/lib/fckeditor/editor/plugins/Attachment/fck_Attachment.php
+++ b/main/inc/lib/fckeditor/editor/plugins/Attachment/fck_Attachment.php
@@ -133,7 +133,7 @@ require("../loader.class.php");
 $loader = new Loader('formUpload');
 $loader->init();
 ?>
-		<form name="formUpload" enctype="multipart/form-data" action="<?php echo $_SERVER['PHP_SELF']; ?>" method="POST"><!--onSubmit="progress_bar();"-->
+		<form name="formUpload" enctype="multipart/form-data" action="<?php echo api_get_self(); ?>" method="POST"><!--onSubmit="progress_bar();"-->
 <input type="hidden" name="sent" value="1">
 		<input type="hidden" name="MAX_FILE_SIZE" value="10000000" />
 		<div class="title"><span>File Attachment</span></div>
diff --git a/main/inc/lib/system_announcements.lib.php b/main/inc/lib/system_announcements.lib.php
index 5da3a243cc..d0003d7891 100644
--- a/main/inc/lib/system_announcements.lib.php
+++ b/main/inc/lib/system_announcements.lib.php
@@ -62,7 +62,7 @@ class SystemAnnouncementManager
 		{
 			$query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
 			$query_string = ereg_replace('&$', '', $query_string);
-			$url = $_SERVER['PHP_SELF'];
+			$url = api_get_self();
 			echo '<div class="system_announcements">';
 			echo '<h3>'.get_lang('SystemAnnouncements').'</h3>';
 			echo '<table border="0">';
@@ -150,7 +150,7 @@ class SystemAnnouncementManager
 		{
 			$query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
 			$query_string = ereg_replace('&$', '', $query_string);
-			$url = $_SERVER['PHP_SELF'];
+			$url = api_get_self();
 			echo '<div class="system_announcements">';
 			echo '<h3>'.get_lang('SystemAnnouncements').'</h3>';
 			echo '<table align="center">';
diff --git a/main/install/index.php b/main/install/index.php
index 602ed27c0f..15d767da9c 100644
--- a/main/install/index.php
+++ b/main/install/index.php
@@ -300,7 +300,7 @@ elseif (!empty($_POST['step5']))
 </div>
 
 
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?running=1&amp;installType=<?php echo $installType; ?>&amp;updateFromConfigFile=<?php echo urlencode($updateFromConfigFile); ?>">
+<form method="post" action="<?php echo api_get_self(); ?>?running=1&amp;installType=<?php echo $installType; ?>&amp;updateFromConfigFile=<?php echo urlencode($updateFromConfigFile); ?>">
 
 <div id="installation_steps">
 	<img src="../img/bluelogo.gif" hspace="10" vspace="10" alt="Dokeos logo" />
diff --git a/main/install/install_functions.inc.php b/main/install/install_functions.inc.php
index 8fafea2547..8ea469c256 100644
--- a/main/install/install_functions.inc.php
+++ b/main/install/install_functions.inc.php
@@ -321,7 +321,7 @@ function display_language_selection()
 	<h1><?php get_lang('WelcomeToTheDokeosInstaller');?></h1>
 	<h2><?php echo display_step_sequence(); ?><?php echo get_lang('InstallationLanguage');?></h2>
 	<p><?php echo get_lang('PleaseSelectInstallationProcessLanguage');?>:</p>
-	<form id="lang_form" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+	<form id="lang_form" method="post" action="<?php echo api_get_self(); ?>">
 <?php display_language_selection_box(); ?>
 		<input type="submit" name="step1" value="<?php get_lang('Next');?> &gt;" />
 	</form>
diff --git a/main/install/update_courses.php b/main/install/update_courses.php
index 67ae9641fb..e76571b9a5 100644
--- a/main/install/update_courses.php
+++ b/main/install/update_courses.php
@@ -126,7 +126,7 @@ elseif($_POST['step1'])
 </head>
 <body bgcolor="white" dir="<?php echo $text_dir ?>">
 
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<form method="post" action="<?php echo api_get_self(); ?>">
 <table cellpadding="6" cellspacing="0" border="0" width="650" bgcolor="#E6E6E6" align="center">
 <tr bgcolor="#4171B5"">
   <td valign="top">
diff --git a/main/metadata/md_document.php b/main/metadata/md_document.php
index 5960d563b2..d05548e5f7 100644
--- a/main/metadata/md_document.php
+++ b/main/metadata/md_document.php
@@ -117,7 +117,7 @@ function mdo_add_breadcrump_nav()
     global $interbreadcrumb, $langFormats;
     $regs = array(); // for use with ereg()
     
-    $docurl = $_SERVER['PHP_SELF'];  // should be .../main/xxx/yyy.php
+    $docurl = api_get_self();  // should be .../main/xxx/yyy.php
     if (ereg('^(.+[^/\.]+)/[^/\.]+/[^/\.]+.[^/\.]+$', $docurl, $regs))
         $docurl = $regs[1] . '/document/document.php';
     
diff --git a/main/metadata/md_link.php b/main/metadata/md_link.php
index c712cdf9c3..b6f31821f3 100644
--- a/main/metadata/md_link.php
+++ b/main/metadata/md_link.php
@@ -179,7 +179,7 @@ function mdo_add_breadcrump_nav()
     
     $regs = array(); // for use with ereg()
     
-    $docurl = $_SERVER['PHP_SELF'];  // should be .../main/xxx/yyy.php
+    $docurl = api_get_self();  // should be .../main/xxx/yyy.php
     if (ereg('^(.+[^/\.]+)/[^/\.]+/[^/\.]+.[^/\.]+$', $docurl, $regs))
         $docurl = $regs[1] . '/link/link.php';
     
diff --git a/main/metadata/md_scorm.php b/main/metadata/md_scorm.php
index b4160a5773..b36c411fe5 100644
--- a/main/metadata/md_scorm.php
+++ b/main/metadata/md_scorm.php
@@ -67,7 +67,7 @@ function mdo_add_breadcrump_nav()
 	global $interbreadcrumb;
 	$regs = array(); // for use with ereg()
 
-	$docurl = $_SERVER['PHP_SELF'];  // should be .../main/xxx/yyy.php
+	$docurl = api_get_self();  // should be .../main/xxx/yyy.php
 	if (ereg('^(.+[^/\.]+)/[^/\.]+/[^/\.]+.[^/\.]+$', $docurl, $regs))
 		$docurl = $regs[1] . '/newscorm/index.php';
 
diff --git a/main/online/online_chat.php b/main/online/online_chat.php
index 7a1cb343e1..f18cecf66c 100644
--- a/main/online/online_chat.php
+++ b/main/online/online_chat.php
@@ -108,8 +108,8 @@ if($isMaster)
 
 <table border="0" cellpadding="0" cellspacing="0" width="100%">
 <tr>
-  <td width="1%" valign="middle"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?rand=<?php echo $rand; ?>&reset=1#bottom" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmReset'))); ?>')) return false;"><img src="../img/delete.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('ClearList')); ?>"></a></td>
-  <td width="99%">&nbsp;<a href="<?php echo $_SERVER['PHP_SELF']; ?>?rand=<?php echo $rand; ?>&reset=1#bottom" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmReset'))); ?>')) return false;"><?php echo get_lang('ClearList'); ?></a></td>
+  <td width="1%" valign="middle"><a href="<?php echo api_get_self(); ?>?rand=<?php echo $rand; ?>&reset=1#bottom" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmReset'))); ?>')) return false;"><img src="../img/delete.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('ClearList')); ?>"></a></td>
+  <td width="99%">&nbsp;<a href="<?php echo api_get_self(); ?>?rand=<?php echo $rand; ?>&reset=1#bottom" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmReset'))); ?>')) return false;"><?php echo get_lang('ClearList'); ?></a></td>
 </tr>
 </table>
 
diff --git a/main/online/online_hidden1.php b/main/online/online_hidden1.php
index 93449312d4..a27453fb89 100644
--- a/main/online/online_hidden1.php
+++ b/main/online/online_hidden1.php
@@ -107,7 +107,7 @@ else
 include('header_frame.inc.php');
 ?>
 
-<form name="formHidden" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<form name="formHidden" method="post" action="<?php echo api_get_self(); ?>">
 <input type="hidden" name="document" value="<?php echo htmlentities($document); ?>">
 <input type="hidden" name="chat_size_old" value="<?php echo $chat_size_new; ?>">
 <input type="hidden" name="connected_old" value="<?php echo $connected_new; ?>">
diff --git a/main/online/online_links.php b/main/online/online_links.php
index 50ebc9022b..180d9420d4 100644
--- a/main/online/online_links.php
+++ b/main/online/online_links.php
@@ -1,4 +1,4 @@
-<?php // $Id: online_links.php 10204 2006-11-26 20:46:53Z pcool $
+<?php // $Id: online_links.php 12269 2007-05-03 14:17:37Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -178,7 +178,7 @@ include('header_frame.inc.php');
 
 <br>
 
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?action=<?php echo $action; ?>&link=<?php echo $link; ?>" enctype="multipart/form-data">
+<form method="post" action="<?php echo api_get_self(); ?>?action=<?php echo $action; ?>&link=<?php echo $link; ?>" enctype="multipart/form-data">
 <input type="hidden" name="sent" value="1">
 <table border="0" cellpadding="3" cellspacing="0">
 <tr>
@@ -221,8 +221,8 @@ else
 
 <tr>
   <td width="98%"><a href="online_goto.php?url=<?php echo urlencode($enreg['url']); ?>" target="online_working_area"><?php echo $enreg['name']; ?></a></td>
-  <td width="1%" valign="middle"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?action=edit&link=<?php echo $enreg['id']; ?>"><img src="../img/edit.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('Modify')); ?>"></a></td>
-  <td width="1%" valign="middle"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?action=delete&link=<?php echo $enreg['id']; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;"><img src="../img/delete.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('Delete')); ?>"></a></td>
+  <td width="1%" valign="middle"><a href="<?php echo api_get_self(); ?>?action=edit&link=<?php echo $enreg['id']; ?>"><img src="../img/edit.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('Modify')); ?>"></a></td>
+  <td width="1%" valign="middle"><a href="<?php echo api_get_self(); ?>?action=delete&link=<?php echo $enreg['id']; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;"><img src="../img/delete.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('Delete')); ?>"></a></td>
 </tr>
 
 <?php
diff --git a/main/online/online_message.php b/main/online/online_message.php
index 325b2f18b7..e67713f020 100644
--- a/main/online/online_message.php
+++ b/main/online/online_message.php
@@ -1,4 +1,4 @@
-<?php // $Id: online_message.php 10204 2006-11-26 20:46:53Z pcool $
+<?php // $Id: online_message.php 12269 2007-05-03 14:17:37Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -114,7 +114,7 @@ if($sent)
 include('header_frame.inc.php');
 ?>
 
-<form name="formMessage" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" onsubmit="javascript:if(document.formMessage.message.value == '') { alert('<?php echo addslashes(htmlentities(get_lang('TypeMessage'))); ?>'); document.formMessage.message.focus(); return false; }" autocomplete="off">
+<form name="formMessage" method="post" action="<?php echo api_get_self(); ?>" onsubmit="javascript:if(document.formMessage.message.value == '') { alert('<?php echo addslashes(htmlentities(get_lang('TypeMessage'))); ?>'); document.formMessage.message.focus(); return false; }" autocomplete="off">
 <input type="hidden" name="sent" value="1">
 <table border="0" cellpadding="5" cellspacing="0" width="100%">
 <tr>
diff --git a/main/online/online_streaming.php b/main/online/online_streaming.php
index 25ddebe509..f2fea9398f 100644
--- a/main/online/online_streaming.php
+++ b/main/online/online_streaming.php
@@ -1,4 +1,4 @@
-<?php // $Id: online_streaming.php 10204 2006-11-26 20:46:53Z pcool $
+<?php // $Id: online_streaming.php 12269 2007-05-03 14:17:37Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -102,7 +102,7 @@ include('header_frame.inc.php');
 
 <br>
 
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<form method="post" action="<?php echo api_get_self(); ?>">
 <input type="hidden" name="sent" value="1">
 <table border="0" cellpadding="3" cellspacing="0">
 <tr>
diff --git a/main/online/online_whoisonline.php b/main/online/online_whoisonline.php
index 6d297d5e6f..dfd73d4b8f 100644
--- a/main/online/online_whoisonline.php
+++ b/main/online/online_whoisonline.php
@@ -1,4 +1,4 @@
-<?php // $Id: online_whoisonline.php 10204 2006-11-26 20:46:53Z pcool $
+<?php // $Id: online_whoisonline.php 12269 2007-05-03 14:17:37Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -76,7 +76,7 @@ foreach($Users as $enreg)
 
 <tr>
   <td width="1%" rowspan="2" valign="middle"><img src="../img/whoisonline.png" border="0" alt="" style="margin-right: 3px;"></td>
-  <td width="99%"><a <?php if($enreg['status'] == 1) echo 'class="master"'; ?> name="user_<?php echo $enreg['user_id']; ?>" href="<?php echo $_SERVER['PHP_SELF']; ?>?showPic=<?php if($showPic == $enreg['user_id']) echo '0'; else echo $enreg['user_id']; ?>#user_<?php echo $enreg['user_id']; ?>"><b><?php echo $enreg['username']; ?></b></a></td>
+  <td width="99%"><a <?php if($enreg['status'] == 1) echo 'class="master"'; ?> name="user_<?php echo $enreg['user_id']; ?>" href="<?php echo api_get_self(); ?>?showPic=<?php if($showPic == $enreg['user_id']) echo '0'; else echo $enreg['user_id']; ?>#user_<?php echo $enreg['user_id']; ?>"><b><?php echo $enreg['username']; ?></b></a></td>
 </tr>
 <tr>
   <td width="99%"><small><?php echo ucfirst($enreg['lastname']).' '.ucfirst($enreg['firstname']); ?></small></td>
diff --git a/main/upload/upload.document.php b/main/upload/upload.document.php
index 06af8d6508..e1559a8be6 100644
--- a/main/upload/upload.document.php
+++ b/main/upload/upload.document.php
@@ -161,7 +161,7 @@ if(isset($_GET['createdir']))
 }
 else {	//give them a link to create a directory
 	?>
-	<p><a href="<?php echo $_SERVER['PHP_SELF']; ?>?path=<?php echo $path; ?>&amp;createdir=1"><img src="../img/new_folder.gif" border="0" align="absmiddle" alt ="" /> <?php echo(get_lang('CreateDir'));?></a></p>
+	<p><a href="<?php echo api_get_self(); ?>?path=<?php echo $path; ?>&amp;createdir=1"><img src="../img/new_folder.gif" border="0" align="absmiddle" alt ="" /> <?php echo(get_lang('CreateDir'));?></a></p>
 	<?php
 }
 ?>
@@ -175,7 +175,7 @@ else {	//give them a link to create a directory
 </div>
 
 <!-- start upload form -->
-<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="POST" name="upload" enctype="multipart/form-data">
+<form action="<?php echo api_get_self(); ?>" method="POST" name="upload" enctype="multipart/form-data">
 <!-- <input type="hidden" name="MAX_FILE_SIZE" value="5400"> -->
 <input type="hidden" name="curdirpath" value="<?php echo $path; ?>">
 <table>
diff --git a/main/user/user_add.php b/main/user/user_add.php
index 1952e5b3f5..3abf386462 100644
--- a/main/user/user_add.php
+++ b/main/user/user_add.php
@@ -260,7 +260,7 @@ Display::display_header($nameTools,"User");
 
 <?php echo get_lang('OneByOne'); ?>. <?php echo get_lang('UserOneByOneExplanation'); ?>
 
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?register=yes">
+<form method="post" action="<?php echo api_get_self(); ?>?register=yes">
 <table cellpadding="3" cellspacing="0" border="0">
 
 <?php