diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php index 6bd90d84ad..40428a9bae 100644 --- a/main/admin/configure_homepage.php +++ b/main/admin/configure_homepage.php @@ -1,4 +1,4 @@ -'; $delete_link=''; - echo str_replace(array('href="'.$_configuration['root_web'].'index.php?include=',''),array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename($_SERVER['PHP_SELF']).'?action=open_link&link=','
'.$edit_link.' '.$delete_link.''),$enreg); + echo str_replace(array('href="'.$_configuration['root_web'].'index.php?include=',''),array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename(api_get_self()).'?action=open_link&link=','
'.$edit_link.' '.$delete_link.''),$enreg); } } ?> diff --git a/main/course_home/activity.php b/main/course_home/activity.php index 1c8344862f..e1aa2571b0 100644 --- a/main/course_home/activity.php +++ b/main/course_home/activity.php @@ -388,8 +388,8 @@ if(api_is_platform_admin())

    -  |  - "> +  |  + ">
addElement('select', 'curdirpath', get_lang('CurrentDirectory'),'','onchange="javascript:document.selector.submit()"'); diff --git a/main/document/upload.php b/main/document/upload.php index 3cf46dbf20..7a0f4d1e8d 100644 --- a/main/document/upload.php +++ b/main/document/upload.php @@ -1,4 +1,4 @@ -addElement('hidden','curdirpath',$path); diff --git a/main/inc/banner.inc.php b/main/inc/banner.inc.php index abf44e3243..0b7997c80d 100644 --- a/main/inc/banner.inc.php +++ b/main/inc/banner.inc.php @@ -367,7 +367,7 @@ else "call for chat" module section ----------------------------------------------------------------------------- */ -$chat = strpos($_SERVER['PHP_SELF'], 'chat_banner.php'); +$chat = strpos(api_get_self(), 'chat_banner.php'); if (!$chat) { include_once (api_get_path(LIBRARY_PATH)."online.inc.php"); diff --git a/main/inc/lib/pear/Pager/Common.php b/main/inc/lib/pear/Pager/Common.php index d198cca702..12a42589b1 100644 --- a/main/inc/lib/pear/Pager/Common.php +++ b/main/inc/lib/pear/Pager/Common.php @@ -33,7 +33,7 @@ * @author Richard Heyes * @copyright 2003-2006 Lorenzo Alberton, Richard Heyes * @license http://www.debian.org/misc/bsd.license BSD License (3 Clause) - * @version CVS: $Id: Common.php 9608 2006-10-20 11:43:03Z bmol $ + * @version CVS: $Id: Common.php 12273 2007-05-03 14:49:21Z elixir_julian $ * @link http://pear.php.net/package/Pager */ @@ -41,12 +41,12 @@ * Two constants used to guess the path- and file-name of the page * when the user doesn't set any other value */ -if (substr($_SERVER['PHP_SELF'], -1) == '/') { +if (substr(api_get_self(), -1) == '/') { define('CURRENT_FILENAME', ''); - define('CURRENT_PATHNAME', 'http://'.$_SERVER['HTTP_HOST'].str_replace('\\', '/', $_SERVER['PHP_SELF'])); + define('CURRENT_PATHNAME', 'http://'.$_SERVER['HTTP_HOST'].str_replace('\\', '/', api_get_self())); } else { - define('CURRENT_FILENAME', preg_replace('/(.*)\?.*/', '\\1', basename($_SERVER['PHP_SELF']))); - define('CURRENT_PATHNAME', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))); + define('CURRENT_FILENAME', preg_replace('/(.*)\?.*/', '\\1', basename(api_get_self()))); + define('CURRENT_PATHNAME', str_replace('\\', '/', dirname(api_get_self()))); } /** * Error codes diff --git a/main/inc/lib/xajax/xajax.inc.php b/main/inc/lib/xajax/xajax.inc.php index ada6f1e4fb..121849e4dd 100644 --- a/main/inc/lib/xajax/xajax.inc.php +++ b/main/inc/lib/xajax/xajax.inc.php @@ -906,7 +906,7 @@ class xajax if (!empty($_SERVER['PATH_INFO'])) { $sPath = parse_url($_SERVER['PATH_INFO']); } else { - $sPath = parse_url($_SERVER['PHP_SELF']); + $sPath = parse_url(api_get_self()); } $aURL['path'] = $sPath['path']; unset($sPath); diff --git a/main/inc/tool_navigation_menu.inc.php b/main/inc/tool_navigation_menu.inc.php index 4327dc09db..caa8d99d9e 100644 --- a/main/inc/tool_navigation_menu.inc.php +++ b/main/inc/tool_navigation_menu.inc.php @@ -1,5 +1,5 @@ $navigation_item) { echo '', "\n", - '
', "\n", + '', "\n", get_lang($label), ' :', "\n", $specifics, "\n", '', "\n", '
', "\n"; diff --git a/main/metadata/phpdig/config.php b/main/metadata/phpdig/config.php index af7d3976e4..d12c6b8d4e 100644 --- a/main/metadata/phpdig/config.php +++ b/main/metadata/phpdig/config.php @@ -72,7 +72,7 @@ if ((isset($_SERVER['SCRIPT_NAME'])) && (eregi("config.php",$_SERVER['SCRIPT_NAM if ((isset($_SERVER['PATH_TRANSLATED'])) && (eregi("config.php",$_SERVER['PATH_TRANSLATED']))) { exit(); } -if ((isset($_SERVER['PHP_SELF'])) && (eregi("config.php",$_SERVER['PHP_SELF']))) { +if ((isset(api_get_self())) && (eregi("config.php",api_get_self()))) { exit(); } diff --git a/main/metadata/phpdig/search.php b/main/metadata/phpdig/search.php index 916c6e9756..d3c8b6151e 100644 --- a/main/metadata/phpdig/search.php +++ b/main/metadata/phpdig/search.php @@ -242,7 +242,7 @@ if ($ckwcdt{0} != '?') // there is a file with extra criteria -
+
diff --git a/main/metadata/playscormmdset.inc.php b/main/metadata/playscormmdset.inc.php index 3a3da00dae..b7dd34efbe 100644 --- a/main/metadata/playscormmdset.inc.php +++ b/main/metadata/playscormmdset.inc.php @@ -66,7 +66,7 @@ require($drs . 'main/metadata/md_' . strtolower(EID_TYPE) . '.php'); $mdObj = new mdobject($_course, EID_ID); define('DR', $_SERVER['DOCUMENT_ROOT']); -define('SELF', $_SERVER['PHP_SELF']); +define('SELF', api_get_self()); define('DIRECTORY', DR . $self = substr(SELF, 0, strrpos(SELF, '/'))); if (!file_exists(DIRECTORY)) give_up('No such directory: ' . DIRECTORY); diff --git a/main/metadata/search.php b/main/metadata/search.php index eb4daf54ba..9fb520bbab 100644 --- a/main/metadata/search.php +++ b/main/metadata/search.php @@ -55,7 +55,7 @@ $xhtDoc = define_htt(HTT . '.htt', $urlp, $_course['path']); $xhtDoc->xht_param['type'] = TYPE; $xhtDoc->xht_param['index'] = - str_replace('/search.php', '/index.php', $_SERVER['PHP_SELF']); + str_replace('/search.php', '/index.php', api_get_self()); // XML and DB STUFF -----------------------------------------------------------> diff --git a/main/newscorm/aicc_api.php b/main/newscorm/aicc_api.php index e158289506..f29f20e048 100644 --- a/main/newscorm/aicc_api.php +++ b/main/newscorm/aicc_api.php @@ -291,7 +291,7 @@ function savedata(origin) { //origin can be 'commit', 'finish' or 'terminate' param = 'id='+lms_item_id+'&origin='+origin+'&score='+score+'&max='+max+'&min='+min+'&lesson_status='+lesson_status+'&time='+session_time+'&suspend_data='+suspend_data; url="http://$value) { $parameter[$key]=$value; @@ -289,7 +289,7 @@ function display_image_matrix($permission_array, $tool, $permission,$inherited_p { if($editable) { - $url=$_SERVER['PHP_SELF']; + $url=api_get_self(); foreach($_GET as $key=>$value) { $parameter[$key]=$value; @@ -346,7 +346,7 @@ function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $per { if($editable) { - $url=$_SERVER['PHP_SELF']; + $url=api_get_self(); foreach($_GET as $key=>$value) { $parameter[$key]=$value; @@ -374,7 +374,7 @@ function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $per { if($editable) { - $url=$_SERVER['PHP_SELF']; + $url=api_get_self(); foreach($_GET as $key=>$value) { $parameter[$key]=$value;