From 0d8e51a58e23210992ee2ae10e557c65249f2397 Mon Sep 17 00:00:00 2001 From: Julian Prud'homme Date: Thu, 3 May 2007 15:39:49 +0200 Subject: [PATCH] [svn r12265] second step in removing all $_SERVER['PHP_SELF'] --- main/course_home/2column.php | 2 +- main/course_home/activity.php | 2 +- main/inc/lib/blog.lib.php | 16 ++++++------- main/metadata/importdocs.php | 2 +- main/metadata/importlinks.php | 2 +- main/metadata/importmanifest.php | 6 ++--- main/newscorm/learnpath.class.php | 34 +++++++++++++-------------- main/newscorm/lp_add_item.php | 6 ++--- main/newscorm/lp_build.php | 6 ++--- main/newscorm/lp_edit_item.php | 6 ++--- main/newscorm/lp_edit_item_prereq.php | 6 ++--- main/newscorm/lp_move_item.php | 6 ++--- main/newscorm/lp_view_item.php | 6 ++--- 13 files changed, 50 insertions(+), 50 deletions(-) diff --git a/main/course_home/2column.php b/main/course_home/2column.php index ccf108a9bd..c2cf568c9c 100644 --- a/main/course_home/2column.php +++ b/main/course_home/2column.php @@ -222,7 +222,7 @@ function show_tools($course_tool_category) { if (!$toolsRow['adminlink']) { - echo "" . $this_link['name'] . ""; + echo "" . $this_link['name'] . ""; } } } diff --git a/main/course_home/activity.php b/main/course_home/activity.php index ec9b1f8c82..1c8344862f 100644 --- a/main/course_home/activity.php +++ b/main/course_home/activity.php @@ -255,7 +255,7 @@ function show_tools_category($course_tool_category) { if(!$toolsRow['adminlink']) { - echo "" . $this_link['name'] . ""; + echo "" . $this_link['name'] . ""; } } } diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php index e5dc311db2..14d82a8a10 100644 --- a/main/inc/lib/blog.lib.php +++ b/main/inc/lib/blog.lib.php @@ -1265,8 +1265,8 @@ class Blog $counter = 0; global $color2; - echo 'scormbuilder' . get_lang('AddTasks') . ' '; - echo 'scormbuilder' . get_lang('AssignTasks') . ''; + echo 'scormbuilder' . get_lang('AddTasks') . ' '; + echo 'scormbuilder' . get_lang('AssignTasks') . ''; echo '' . get_lang('TaskList') . '
'; echo ""; echo "", @@ -1308,7 +1308,7 @@ class Blog '', '', '', '', '', ''.stripslashes($blog['blog_subtitle']) . '', '', diff --git a/main/metadata/importdocs.php b/main/metadata/importdocs.php index 6e9f9e49cd..b3e485c567 100644 --- a/main/metadata/importdocs.php +++ b/main/metadata/importdocs.php @@ -102,7 +102,7 @@ else if (false && file_exists($phpDigIncCn)) // future: buttons for operations { - echo '', "\n", + echo '', "\n", '', "\n", '', "\n", '', "\n"; diff --git a/main/metadata/importlinks.php b/main/metadata/importlinks.php index 1d4ce7b93d..430fe897c7 100644 --- a/main/metadata/importlinks.php +++ b/main/metadata/importlinks.php @@ -309,7 +309,7 @@ if (isset($lci)) echo '

', $nameTools, $hdrInfo, '

', "\n"; -echo '', "\n"; if (count($lceids)) echo diff --git a/main/metadata/importmanifest.php b/main/metadata/importmanifest.php index b6805ef516..481859ad33 100644 --- a/main/metadata/importmanifest.php +++ b/main/metadata/importmanifest.php @@ -564,7 +564,7 @@ if (file_exists($fhtf = $baseWorkDir . $workWith . '/' . HTF)) if ($mfContents || $xht_doc->error) { echo '

', get_lang('UploadMff'), "

\n\n", - '', "\n", '', "\n", @@ -576,7 +576,7 @@ if ($mfContents || $xht_doc->error) echo '

', get_lang('UploadHtt'), file_exists($fhtf) ? (' + ' . get_lang('RemoveHtt')) : '', "

\n\n", - '', "\n", '', "\n", @@ -590,7 +590,7 @@ echo '

', $nameTools, $hdrInfo, '

', "\n"; if ($mfContents || $perId[$sdi]) // buttons for manifest operations { - echo '', "\n"; if ($mfContents) echo diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index a4bdb6db80..b8b3fefc47 100644 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -3605,7 +3605,7 @@ class learnpath { unset($this->arrMenu); if(api_is_allowed_to_edit()) - $return .= '

'.get_lang("Advanced").' '.get_lang("BasicOverview").' '.get_lang("Display").'

'; + $return .= '

'.get_lang("Advanced").' '.get_lang("BasicOverview").' '.get_lang("Display").'

'; $return .= '
' . stripslashes($task['description']) . '                 ', - '', + '', '', "\n", ''.stripslashes($assignment['title']) . '' . $assignment['target_date'] . '', - '', + '', '', "\n", - '', "\n", @@ -2534,14 +2534,14 @@ class Blog ''.stripslashes($blog['blog_name']) . '', - '', + '', '', "\n", - '', "\n", - '', + '', '', "\n", '
' . "\n"; @@ -3636,7 +3636,7 @@ class learnpath { if($arrLP[$i]['previous_item_id'] != 0) { - $return .= "\t\t\t" . ''; + $return .= "\t\t\t" . ''; $return .= ''; $return .= '' . "\n"; } @@ -3645,7 +3645,7 @@ class learnpath { if($arrLP[$i]['next_item_id'] != 0) { - $return .= "\t\t\t" . ''; + $return .= "\t\t\t" . ''; $return .= ''; $return .= '' . "\n"; } @@ -3658,18 +3658,18 @@ class learnpath { if($arrLP[$i]['item_type'] != 'dokeos_chapter' && $arrLP[$i]['item_type'] != 'dokeos_module') { - $return .= "\t\t\t" . ''; + $return .= "\t\t\t" . ''; $return .= ''; $return .= '' . "\n"; } else { - $return .= "\t\t\t" . ''; + $return .= "\t\t\t" . ''; $return .= ''; $return .= '' . "\n"; } - $return .= "\t\t\t" . ''; + $return .= "\t\t\t" . ''; $return .= ''; $return .= '' . "\n"; @@ -4110,7 +4110,7 @@ class learnpath { $return .= '

'.get_lang("CreateNewStep").'

'; - $return .= '
'.get_lang("NewDocument").'
'; + $return .= '
'.get_lang("NewDocument").'
'; $return .= '

'.get_lang("UseAnExistingResource").'

'; @@ -4169,7 +4169,7 @@ class learnpath { $row_doc = Database::fetch_array($res_doc); //if($show_title) - //$return .= '

' . $row_doc['title'] . ($edit_link ? ' [ Edit this document ]' : '') . '

'; + //$return .= '

' . $row_doc['title'] . ($edit_link ? ' [ Edit this document ]' : '') . '

'; //TODO: add a path filter if($iframe){ @@ -6006,10 +6006,10 @@ function display_thread_form($action = 'add', $id = 0, $extra_info = '') $return .= '

' . $lang . '

'; - $return .= 'Edit the current item '.get_lang("Edit").''; - $return .= 'Move the current item '.get_lang("Move").''; - $return .= ''.get_lang('Prerequisites').' '.get_lang('Prerequisites').''; - $return .= 'Delete the current item '.get_lang("Delete").''; + $return .= 'Edit the current item '.get_lang("Edit").''; + $return .= 'Move the current item '.get_lang("Move").''; + $return .= ''.get_lang('Prerequisites').' '.get_lang('Prerequisites').''; + $return .= 'Delete the current item '.get_lang("Delete").''; //$return .= '

' . ((trim($s_description) == '') ? ''.get_lang("NoDescription").'' : stripslashes(nl2br($s_description))) . '

'; @@ -6492,7 +6492,7 @@ function display_thread_form($action = 'add', $id = 0, $extra_info = '') $return .= '
'; $return .= ''; - $return .= '' . $row_quiz['title'] . ''; + $return .= '' . $row_quiz['title'] . ''; //$return .= $row_quiz['title']; $return .= '
'; @@ -6534,7 +6534,7 @@ function display_thread_form($action = 'add', $id = 0, $extra_info = '') $return .= '
'; $return .= ''; - $return .= '' . $row_link['title'] . ''; + $return .= '' . $row_link['title'] . ''; $return .= '
'; } @@ -6566,7 +6566,7 @@ function display_thread_form($action = 'add', $id = 0, $extra_info = '') $return .= '
'; $return .= '
'; $return .= ''; - $return .= '' . get_lang('AddAssignmentPage') . ''; + $return .= '' . get_lang('AddAssignmentPage') . ''; $return .= '
'; $return .= '
'; @@ -6606,11 +6606,11 @@ function display_thread_form($action = 'add', $id = 0, $extra_info = '') '; $return .= ''; $return .= ' - ' . $forum['forum_title'] . '
'; echo '
'; - echo '

'.get_lang("Build").' '.get_lang("BasicOverview").' '.get_lang("Display").'

'; + echo '

'.get_lang("Build").' '.get_lang("BasicOverview").' '.get_lang("Display").'

'; //links for adding a module, chapter or step echo '
'; echo '

'; - echo ''.get_lang('.get_lang("NewChapter").''; + echo ''.get_lang('.get_lang("NewChapter").''; echo '

'; echo '

'; - echo ''.get_lang('.get_lang("NewStep").''; + echo ''.get_lang('.get_lang("NewStep").''; echo '

'; diff --git a/main/newscorm/lp_build.php b/main/newscorm/lp_build.php index 32fdd799fb..57873edb7b 100644 --- a/main/newscorm/lp_build.php +++ b/main/newscorm/lp_build.php @@ -198,19 +198,19 @@ echo ''; echo '
'; - echo '

'.get_lang("Build").' '.get_lang("BasicOverview").' '.get_lang("Display").'

'; + echo '

'.get_lang("Build").' '.get_lang("BasicOverview").' '.get_lang("Display").'

'; //links for adding a module, chapter or step echo '
'; echo '

'; - echo ''.get_lang('.get_lang("NewChapter").''; + echo ''.get_lang('.get_lang("NewChapter").''; echo '

'; echo '

'; - echo ''.get_lang('.get_lang("NewStep").''; + echo ''.get_lang('.get_lang("NewStep").''; echo '

'; diff --git a/main/newscorm/lp_edit_item.php b/main/newscorm/lp_edit_item.php index 71924cfd4d..06e7acaf36 100644 --- a/main/newscorm/lp_edit_item.php +++ b/main/newscorm/lp_edit_item.php @@ -180,19 +180,19 @@ echo ''; echo '
'; - echo '

'.get_lang("Build").' '.get_lang("BasicOverview").' '.get_lang("Display").'

'; + echo '

'.get_lang("Build").' '.get_lang("BasicOverview").' '.get_lang("Display").'

'; //links for adding a module, chapter or step echo '
'; echo '

'; - echo ''.get_lang('.get_lang("NewChapter").''; + echo ''.get_lang('.get_lang("NewChapter").''; echo '

'; echo '

'; - echo ''.get_lang('.get_lang("NewStep").''; + echo ''.get_lang('.get_lang("NewStep").''; echo '

'; diff --git a/main/newscorm/lp_edit_item_prereq.php b/main/newscorm/lp_edit_item_prereq.php index 2fd4c9b79f..c303063ef0 100644 --- a/main/newscorm/lp_edit_item_prereq.php +++ b/main/newscorm/lp_edit_item_prereq.php @@ -178,19 +178,19 @@ echo ''; echo '
'; - echo '

'.get_lang("Build").' '.get_lang("BasicOverview").' '.get_lang("Display").'

'; + echo '

'.get_lang("Build").' '.get_lang("BasicOverview").' '.get_lang("Display").'

'; //links for adding a module, chapter or step echo '
'; echo '

'; - echo ''.get_lang('.get_lang("NewChapter").''; + echo ''.get_lang('.get_lang("NewChapter").''; echo '

'; echo '

'; - echo ''.get_lang('.get_lang("NewStep").''; + echo ''.get_lang('.get_lang("NewStep").''; echo '

'; diff --git a/main/newscorm/lp_move_item.php b/main/newscorm/lp_move_item.php index deaabd32b4..a61bff7654 100644 --- a/main/newscorm/lp_move_item.php +++ b/main/newscorm/lp_move_item.php @@ -181,19 +181,19 @@ echo ''; echo '
'; - echo '

'.get_lang("Build").' '.get_lang("BasicOverview").' '.get_lang("Display").'

'; + echo '

'.get_lang("Build").' '.get_lang("BasicOverview").' '.get_lang("Display").'

'; //links for adding a module, chapter or step echo '
'; echo '

'; - echo ''.get_lang('.get_lang("NewChapter").''; + echo ''.get_lang('.get_lang("NewChapter").''; echo '

'; echo '

'; - echo ''.get_lang('.get_lang("NewStep").''; + echo ''.get_lang('.get_lang("NewStep").''; echo '

'; diff --git a/main/newscorm/lp_view_item.php b/main/newscorm/lp_view_item.php index ff701763c0..02e168cb84 100644 --- a/main/newscorm/lp_view_item.php +++ b/main/newscorm/lp_view_item.php @@ -182,19 +182,19 @@ echo ''; echo '
'; - echo '

'.get_lang("Build").' '.get_lang("BasicOverview").' '.get_lang("Display").'

'; + echo '

'.get_lang("Build").' '.get_lang("BasicOverview").' '.get_lang("Display").'

'; //links for adding a module, chapter or step echo '
'; echo '

'; - echo ''.get_lang('.get_lang("NewChapter").''; + echo ''.get_lang('.get_lang("NewChapter").''; echo '

'; echo '

'; - echo ''.get_lang('.get_lang("NewStep").''; + echo ''.get_lang('.get_lang("NewStep").''; echo '

';