From d4a1fcaf11a02d65b73f2423fdd23b94858f43fe Mon Sep 17 00:00:00 2001 From: skodak Date: Fri, 2 Jan 2009 10:36:25 +0000 Subject: [PATCH] MDL-16613 sesskey cleanup --- admin/auth_config.php | 2 +- admin/blocks.php | 12 ++++++------ admin/enrol.php | 2 +- admin/enrol_config.php | 2 +- admin/environment.php | 2 +- admin/lang.php | 4 ++-- admin/mnet/access_control.php | 6 +++--- admin/mnet/delete.html | 2 +- admin/mnet/enr_courses.php | 2 +- admin/mnet/enr_hosts.php | 2 +- admin/mnet/index.php | 6 +++--- admin/mnet/mnet_review.html | 2 +- admin/mnet/mnet_services.html | 2 +- admin/mnet/peers.html | 4 ++-- admin/mnet/trustedhosts.html | 4 ++-- admin/replace.php | 2 +- admin/settings.php | 4 ++-- blocks/site_main_menu/block_site_main_menu.php | 6 +++--- .../social_activities/block_social_activities.php | 6 +++--- course/category.php | 8 ++++---- course/format/topics/format.php | 14 +++++++------- course/format/weeks/format.php | 10 +++++----- course/lib.php | 4 ++-- course/report/participation/index.php | 2 +- enrol/authorize/uploadcsv.php | 2 +- lib/adminlib.php | 2 +- lib/ajax/ajaxlib.php | 2 +- message/discussion.php | 2 +- message/send.php | 2 +- mod/chat/gui_basic/index.php | 2 +- mod/feedback/complete_guest.php | 2 +- mod/feedback/mapcourse.php | 2 +- mod/feedback/view.php | 2 +- mod/hotpot/index.php | 2 +- mod/lesson/action/addbranchtable.php | 2 +- mod/lesson/action/addpage.php | 2 +- mod/lesson/action/editpage.php | 2 +- mod/lesson/action/move.php | 4 ++-- mod/quiz/edit.php | 2 +- mod/quiz/editlib.php | 6 +++--- question/editlib.php | 4 ++-- user/addnote.php | 2 +- user/extendenrol.php | 2 +- user/groupaddnote.php | 2 +- user/groupextendenrol.php | 2 +- user/index.php | 2 +- 46 files changed, 81 insertions(+), 81 deletions(-) diff --git a/admin/auth_config.php b/admin/auth_config.php index 902d78906f..b38b3593cf 100644 --- a/admin/auth_config.php +++ b/admin/auth_config.php @@ -63,7 +63,7 @@ admin_externalpage_print_header(); // choose an authentication method echo "
frametarget id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n"; echo "
\n"; -echo "sesskey."\" />\n"; +echo "\n"; echo "\n"; // auth plugin description diff --git a/admin/blocks.php b/admin/blocks.php index 6195cb7574..9074bfefb1 100644 --- a/admin/blocks.php +++ b/admin/blocks.php @@ -163,7 +163,7 @@ $blockobject = $blockobjects[$blockid]; $block = $blocks[$blockid]; - $delete = ''.$strdelete.''; + $delete = ''.$strdelete.''; $settings = ''; // By default, no configuration if ($blockobject->has_config()) { @@ -190,19 +190,19 @@ $class = ''; // Nothing fancy, by default if ($blocks[$blockid]->visible) { - $visible = ''. + $visible = ''. ''.$strhide.''; } else { - $visible = ''. + $visible = ''. ''.$strshow.''; $class = ' class="dimmed_text"'; // Leading space required! } if ($blockobject->instance_allow_multiple()) { if($blocks[$blockid]->multiple) { - $multiple = ''.get_string('yes').' ('.get_string('change', 'admin').')'; + $multiple = ''.get_string('yes').' ('.get_string('change', 'admin').')'; } else { - $multiple = ''.get_string('no').' ('.get_string('change', 'admin').')'; + $multiple = ''.get_string('no').' ('.get_string('change', 'admin').')'; } } else { @@ -239,7 +239,7 @@ foreach ($incompatible as $block) { $table->add_data(array( $block->name, - ''.$strdelete.'', + ''.$strdelete.'', )); } $table->print_html(); diff --git a/admin/enrol.php b/admin/enrol.php index 707e183b65..5f210ad6ed 100644 --- a/admin/enrol.php +++ b/admin/enrol.php @@ -64,7 +64,7 @@ echo "frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol.php\">"; echo "
"; - echo "sesskey."\" />"; + echo ""; $table = new stdClass(); $table->head = array(get_string('name'), get_string('enable'), get_string('default'), $str->settings); diff --git a/admin/enrol_config.php b/admin/enrol_config.php index 0ed836f733..76b83013fa 100644 --- a/admin/enrol_config.php +++ b/admin/enrol_config.php @@ -45,7 +45,7 @@ echo "frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">"; echo "
"; - echo "sesskey."\" />"; + echo ""; echo ""; /// Print current enrolment type description diff --git a/admin/environment.php b/admin/environment.php index 74eb8f04c1..8acd278680 100644 --- a/admin/environment.php +++ b/admin/environment.php @@ -55,7 +55,7 @@ admin_externalpage_print_header(); /// Print the component download link - echo '
'.$strupdate.'
'; + echo '
'.$strupdate.'
'; print_heading($strenvironment); diff --git a/admin/lang.php b/admin/lang.php index d0349f1d37..f20cc1225d 100644 --- a/admin/lang.php +++ b/admin/lang.php @@ -670,7 +670,7 @@ } if ($editable) { $o .= ' 
'; - $o .= ''; + $o .= ''; $o .= ''; $o .= ''; $o .= ''; @@ -819,7 +819,7 @@ // generate an editor for the current help file in $saveto echo '
'.$strsavetotitle.''; echo ""; - echo ''; + echo ''; echo ''; echo ''; echo "
\n"; diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php index 0bd1c9b491..a39433f5ab 100644 --- a/admin/mnet/access_control.php +++ b/admin/mnet/access_control.php @@ -169,14 +169,14 @@ if (!$acl) { foreach ($acl as $aclrecord) { if ($aclrecord->accessctrl == 'allow') { $accesscolumn = get_string('allow', 'mnet') - . " (id}&action=acl&accessctrl=deny&sesskey={$USER->sesskey}\">" + . " (id}&action=acl&accessctrl=deny&sesskey=".sesskey()."\">" . get_string('deny', 'mnet') . ")"; } else { $accesscolumn = get_string('deny', 'mnet') - . " (id}&action=acl&accessctrl=allow&sesskey={$USER->sesskey}\">" + . " (id}&action=acl&accessctrl=allow&sesskey=".sesskey()."\">" . get_string('allow', 'mnet') . ")"; } - $deletecolumn = "id}&action=delete&sesskey={$USER->sesskey}\">" + $deletecolumn = "id}&action=delete&sesskey=".sesskey()."\">" . get_string('delete') . ""; $table->data[] = array ($aclrecord->username, $aclrecord->mnet_host_id, $accesscolumn, $deletecolumn); } diff --git a/admin/mnet/delete.html b/admin/mnet/delete.html index 66ed858133..4ff22fad55 100644 --- a/admin/mnet/delete.html +++ b/admin/mnet/delete.html @@ -33,7 +33,7 @@ print_heading(get_string('mnetsettings', 'mnet')); - + diff --git a/admin/mnet/enr_courses.php b/admin/mnet/enr_courses.php index 74b4a74b07..cd16a7dd0a 100644 --- a/admin/mnet/enr_courses.php +++ b/admin/mnet/enr_courses.php @@ -38,7 +38,7 @@ foreach ($courses as $course) { $link = "$CFG->wwwroot/$CFG->admin/mnet/enr_course_enrol.php?" - . "host={$mnethost}&courseid={$course->id}&sesskey={$USER->sesskey}"; + . "host={$mnethost}&courseid={$course->id}&sesskey=".sesskey(); echo '' . "$icon" . "".format_string($course->fullname). "" diff --git a/admin/mnet/enr_hosts.php b/admin/mnet/enr_hosts.php index 546f3cef19..23f47d0c81 100644 --- a/admin/mnet/enr_hosts.php +++ b/admin/mnet/enr_hosts.php @@ -37,7 +37,7 @@ . ''; $hosts = $enrolment->list_remote_servers(); foreach ($hosts as $host) { - $coursesurl = "$CFG->wwwroot/$CFG->admin/mnet/enr_courses.php?host={$host->id}&sesskey={$USER->sesskey}"; + $coursesurl = "$CFG->wwwroot/$CFG->admin/mnet/enr_courses.php?host={$host->id}&sesskey=".sesskey(); $coursecount = $DB->get_field_sql("SELECT COUNT(id) FROM {mnet_enrol_course} WHERE hostid=?", array($host->id)); if (empty($coursecount)) { $coursecount = '?'; diff --git a/admin/mnet/index.php b/admin/mnet/index.php index 6128163220..948d13e7ea 100644 --- a/admin/mnet/index.php +++ b/admin/mnet/index.php @@ -50,9 +50,9 @@ $MNET->get_private_key(); $SESSION->mnet_confirm_delete_key = md5(sha1($MNET->keypair['keypair_PEM'])).':'.time(); notice_yesno(get_string("deletekeycheck", "mnet"), - "index.php?sesskey=$USER->sesskey&confirm=".md5($MNET->public_key), + "index.php?sesskey=".sesskey()."&confirm=".md5($MNET->public_key), "index.php", - array('sesskey' => $USER->sesskey), + array('sesskey' => sesskey()), NULL, 'post', 'get'); @@ -126,7 +126,7 @@ - + diff --git a/admin/mnet/mnet_review.html b/admin/mnet/mnet_review.html index 1243b097cc..44723b25d8 100644 --- a/admin/mnet/mnet_review.html +++ b/admin/mnet/mnet_review.html @@ -23,7 +23,7 @@ print_simple_box_start("center", ""); ?>
- + diff --git a/admin/mnet/mnet_services.html b/admin/mnet/mnet_services.html index 0fac12636b..101537b241 100644 --- a/admin/mnet/mnet_services.html +++ b/admin/mnet/mnet_services.html @@ -20,7 +20,7 @@ print_simple_box_start("center", "");
- + diff --git a/admin/mnet/peers.html b/admin/mnet/peers.html index 120d3e4179..91d5e99cfc 100644 --- a/admin/mnet/peers.html +++ b/admin/mnet/peers.html @@ -8,7 +8,7 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
- +
@@ -71,7 +71,7 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict' diff --git a/admin/mnet/trustedhosts.html b/admin/mnet/trustedhosts.html index 26da1699bd..d849642b21 100644 --- a/admin/mnet/trustedhosts.html +++ b/admin/mnet/trustedhosts.html @@ -13,7 +13,7 @@ admin_externalpage_print_header(); '; //check, if there exists required-elements diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php index 6c1943fc58..dd02aba9c3 100644 --- a/mod/feedback/mapcourse.php +++ b/mod/feedback/mapcourse.php @@ -96,7 +96,7 @@ print_box_start('generalbox boxaligncenter boxwidthwide'); echo ''; echo ''; - echo ''; + echo ''; $sql = "select c.id, c.shortname from {course} c diff --git a/mod/feedback/view.php b/mod/feedback/view.php index af85ce0998..1641e893f1 100644 --- a/mod/feedback/view.php +++ b/mod/feedback/view.php @@ -145,7 +145,7 @@ print_box_start('generalbox boxaligncenter boxwidthwide'); echo '
'; echo ''; - echo ''; + echo ''; echo ''; echo ''; helpbutton('mapcourse', '', 'feedback', true, true); diff --git a/mod/hotpot/index.php b/mod/hotpot/index.php index 5b06c52549..8e51480e57 100644 --- a/mod/hotpot/index.php +++ b/mod/hotpot/index.php @@ -20,7 +20,7 @@ // Moodle 1.4+ requires sesskey to be passed in forms if (isset($USER->sesskey)) { - $sesskey = ''; + $sesskey = ''; } else { $sesskey = ''; } diff --git a/mod/lesson/action/addbranchtable.php b/mod/lesson/action/addbranchtable.php index 88e9e2026f..ae518e9172 100644 --- a/mod/lesson/action/addbranchtable.php +++ b/mod/lesson/action/addbranchtable.php @@ -42,7 +42,7 @@ - +
- +
- +
@@ -54,7 +54,7 @@ admin_externalpage_print_header();
- +
diff --git a/admin/replace.php b/admin/replace.php index cd1ffb74af..da9a99a95a 100644 --- a/admin/replace.php +++ b/admin/replace.php @@ -21,7 +21,7 @@ if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) { /// Pr print_simple_box_start('center'); echo '
'; echo ''; - echo ''; + echo ''; echo 'Search whole database for:
'; echo 'Replace with this string:
'; echo '
'; diff --git a/admin/settings.php b/admin/settings.php index 0edb1120cd..2cdef063f0 100644 --- a/admin/settings.php +++ b/admin/settings.php @@ -87,7 +87,7 @@ if (empty($SITE->fullname)) { echo ''; echo '
'; echo ''; - echo ''; + echo ''; echo ''; echo $page->output_html(); @@ -135,7 +135,7 @@ if (empty($SITE->fullname)) { echo ''; echo '
'; echo ''; - echo ''; + echo ''; echo ''; print_heading($page->visiblename); diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php index ccf8e06921..31f958b400 100644 --- a/blocks/site_main_menu/block_site_main_menu.php +++ b/blocks/site_main_menu/block_site_main_menu.php @@ -88,7 +88,7 @@ class block_site_main_menu extends block_list { if ($ismoving) { $this->content->icons[] = ''; - $this->content->items[] = $USER->activitycopyname.' ('.$strcancel.')'; + $this->content->items[] = $USER->activitycopyname.' ('.$strcancel.')'; } if (!empty($section->sequence)) { @@ -116,7 +116,7 @@ class block_site_main_menu extends block_list { if ($mod->id == $USER->activitycopy) { continue; } - $this->content->items[] = ''. + $this->content->items[] = ''. ''.$strmovehere.''; $this->content->icons[] = ''; } @@ -148,7 +148,7 @@ class block_site_main_menu extends block_list { } if ($ismoving) { - $this->content->items[] = ''. + $this->content->items[] = ''. ''.$strmovehere.''; $this->content->icons[] = ''; } diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php index 75058ca7c6..65d5c2c84e 100644 --- a/blocks/social_activities/block_social_activities.php +++ b/blocks/social_activities/block_social_activities.php @@ -94,7 +94,7 @@ class block_social_activities extends block_list { if ($ismoving) { $this->content->icons[] = ' '; - $this->content->items[] = $USER->activitycopyname.' ('.$strcancel.')'; + $this->content->items[] = $USER->activitycopyname.' ('.$strcancel.')'; } if (!empty($section) && !empty($section->sequence)) { @@ -122,7 +122,7 @@ class block_social_activities extends block_list { if ($mod->id == $USER->activitycopy) { continue; } - $this->content->items[] = ''. + $this->content->items[] = ''. ''.$strmovehere.''; $this->content->icons[] = ''; } @@ -154,7 +154,7 @@ class block_social_activities extends block_list { } if ($ismoving) { - $this->content->items[] = ''. + $this->content->items[] = ''. ''.$strmovehere.''; $this->content->icons[] = ''; } diff --git a/course/category.php b/course/category.php index 7473e75af5..3bc713f2e8 100644 --- a/course/category.php +++ b/course/category.php @@ -328,11 +328,11 @@ if (has_capability('moodle/course:visibility', $coursecontext) && has_capability('moodle/course:viewhiddencourses', $coursecontext)) { if (!empty($acourse->visible)) { echo ''. + '&perpage='.$perpage.'&hide='.$acourse->id.'&sesskey='.sesskey().'">'. ''.$strhide.' '; } else { echo ''. + '&perpage='.$perpage.'&show='.$acourse->id.'&sesskey='.sesskey().'">'. ''.$strshow.' '; } } else { @@ -357,7 +357,7 @@ if (has_capability('moodle/category:manage', $context)) { if ($up) { echo ''. + '&perpage='.$perpage.'&moveup='.$acourse->id.'&sesskey='.sesskey().'">'. ''.$strmoveup.' '; } else { echo $spacer; @@ -365,7 +365,7 @@ if ($down) { echo ''. + '&perpage='.$perpage.'&movedown='.$acourse->id.'&sesskey='.sesskey().'">'. ''.$strmovedown.' '; } else { echo $spacer; diff --git a/course/format/topics/format.php b/course/format/topics/format.php index fe8cb39f5f..6e84af8e9c 100644 --- a/course/format/topics/format.php +++ b/course/format/topics/format.php @@ -115,7 +115,7 @@ $stractivityclipboard = strip_tags(get_string('activityclipboard', '', $USER->activitycopyname)); $strcancel= get_string('cancel'); echo '
  • '; - echo $stractivityclipboard.'  ('.$strcancel.')'; + echo $stractivityclipboard.'  ('.$strcancel.')'; echo "
    • \n"; } @@ -225,25 +225,25 @@ if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) { if ($course->marker == $section) { // Show the "light globe" on/off - echo ''.''.$strmarkedthistopic.'
    '; + echo ''.''.$strmarkedthistopic.'
    '; } else { - echo ''.''.$strmarkthistopic.'
    '; + echo ''.''.$strmarkthistopic.'
    '; } if ($thissection->visible) { // Show the hide/show eye - echo ''. + echo ''. ''.$strtopichide.'
    '; } else { - echo ''. + echo ''. ''.$strtopicshow.'
    '; } if ($section > 1) { // Add a arrow to move section up - echo ''. + echo ''. ''.$strmoveup.'
    '; } if ($section < $course->numsections) { // Add a arrow to move section down - echo ''. + echo ''. ''.$strmovedown.'
    '; } } diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php index d000213d23..1f5621344f 100644 --- a/course/format/weeks/format.php +++ b/course/format/weeks/format.php @@ -105,7 +105,7 @@ $stractivityclipboard = strip_tags(get_string('activityclipboard', '', $USER->activitycopyname)); $strcancel= get_string('cancel'); echo '
  • '; - echo $stractivityclipboard.'  ('.$strcancel.')'; + echo $stractivityclipboard.'  ('.$strcancel.')'; echo "
    • \n"; } @@ -220,19 +220,19 @@ if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) { if ($thissection->visible) { // Show the hide/show eye - echo ''. + echo ''. ''.$strweekhide.'
    '; } else { - echo ''. + echo ''. ''.$strweekshow.'
    '; } if ($section > 1) { // Add a arrow to move section up - echo ''. + echo ''. ''.$strmoveup.'
    '; } if ($section < $course->numsections) { // Add a arrow to move section down - echo ''. + echo ''. ''.$strmovedown.'
    '; } } diff --git a/course/lib.php b/course/lib.php index 9046e262dd..bd93ece8f0 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1421,7 +1421,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, echo '
  • '; // Unique ID if ($ismoving) { echo ''. + ' href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&sesskey='.sesskey().'">'. ''.$strmovehere.'
    '; @@ -1636,7 +1636,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, if ($ismoving) { echo '
  • '. + ' href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&sesskey='.sesskey().'">'. ''.$strmovehere.'
    • '; diff --git a/course/report/participation/index.php b/course/report/participation/index.php index 9ffc9fbacd..a1cdaa641a 100644 --- a/course/report/participation/index.php +++ b/course/report/participation/index.php @@ -287,7 +287,7 @@ function checknos() { echo '
    '."\n"; echo ''."\n"; echo ''."\n"; - echo ''."\n"; + echo ''."\n"; foreach ($users as $u) { $data = array(''.fullname($u,true).''."\n", diff --git a/enrol/authorize/uploadcsv.php b/enrol/authorize/uploadcsv.php index 9b34d865ec..625eb4b9fe 100644 --- a/enrol/authorize/uploadcsv.php +++ b/enrol/authorize/uploadcsv.php @@ -42,7 +42,7 @@ $maxuploadsize = get_max_upload_file_size(); echo '
    - '; + '; upload_print_form_fragment(1, array('csvfile'), array(get_string('file'))); echo ''; echo '

    '; diff --git a/lib/adminlib.php b/lib/adminlib.php index 8cd4178ebc..8ac5a23974 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -6103,7 +6103,7 @@ class admin_setting_managerepository extends admin_setting { foreach ($plugins as $p) { if (!in_array($p, $alreadyplugins)) { $instancehtml .= '
  • '.get_string('add', 'repository') + .sesskey().'&new='.$p.'">'.get_string('add', 'repository') .' "'.get_string('repositoryname', 'repository_'.$p).'" ' .'
    • '; $addable++; diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php index af1aacd095..26df22db18 100644 --- a/lib/ajax/ajaxlib.php +++ b/lib/ajax/ajaxlib.php @@ -201,7 +201,7 @@ class jsportal { $output .= " main.portal.strings['deletecheck']='".get_string('deletecheck','','_var_')."';\n"; $output .= " main.portal.strings['resource']='".get_string('resource')."';\n"; $output .= " main.portal.strings['activity']='".get_string('activity')."';\n"; - $output .= " main.portal.strings['sesskey']='".$USER->sesskey."';\n"; + $output .= " main.portal.strings['sesskey']='".sesskey()."';\n"; $output .= " onloadobj.load();\n"; $output .= " main.process_blocks();\n"; $output .= ""; diff --git a/message/discussion.php b/message/discussion.php index 0f9f13015c..6be0c0acbb 100644 --- a/message/discussion.php +++ b/message/discussion.php @@ -180,7 +180,7 @@ echo ''; echo ''; echo ''; - echo ''; + echo ''; echo ' '; echo ''; echo ''; diff --git a/message/send.php b/message/send.php index bb64513dc7..efc13d1609 100644 --- a/message/send.php +++ b/message/send.php @@ -76,7 +76,7 @@ if (has_capability('moodle/site:sendmessage', get_context_instance(CONTEXT_SYSTE echo '
    '; echo '
    '; echo ''; - echo ''; + echo ''; $usehtmleditor = (can_use_html_editor() && get_user_preferences('message_usehtmleditor', 0)); if ($usehtmleditor) { diff --git a/mod/chat/gui_basic/index.php b/mod/chat/gui_basic/index.php index a095ee54c9..14d70c2b6f 100644 --- a/mod/chat/gui_basic/index.php +++ b/mod/chat/gui_basic/index.php @@ -125,7 +125,7 @@ echo ''; echo ''; echo ''; - echo ''; + echo ''; echo ' '; echo ''; echo ''; diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php index 5de1f22e17..88818e718c 100644 --- a/mod/feedback/complete_guest.php +++ b/mod/feedback/complete_guest.php @@ -284,7 +284,7 @@ echo '
    - +  

    diff --git a/mod/lesson/action/addpage.php b/mod/lesson/action/addpage.php index c45f292738..10229e1f3e 100644 --- a/mod/lesson/action/addpage.php +++ b/mod/lesson/action/addpage.php @@ -51,7 +51,7 @@ - + '.get_string("questiontype", "lesson").": \n"; echo helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson")."
    "; diff --git a/mod/lesson/action/editpage.php b/mod/lesson/action/editpage.php index 244d0983b7..9c9966b747 100644 --- a/mod/lesson/action/editpage.php +++ b/mod/lesson/action/editpage.php @@ -58,7 +58,7 @@ - +
    diff --git a/mod/lesson/action/move.php b/mod/lesson/action/move.php index 217528f0c5..891571f41f 100644 --- a/mod/lesson/action/move.php +++ b/mod/lesson/action/move.php @@ -17,7 +17,7 @@ } echo "
    \n"; - echo "\n"; while (true) { if ($page->id != $pageid) { @@ -25,7 +25,7 @@ $title = "<< ".get_string("notitle", "lesson")." >>"; } echo "\n"; - echo "\n"; } if ($page->nextpageid) { diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php index 26b19893d4..4b91178349 100644 --- a/mod/quiz/edit.php +++ b/mod/quiz/edit.php @@ -690,7 +690,7 @@ if($quiz_reordertool){ echo ''; echo '
    '; echo $thispageurl->hidden_params_out(); - echo ''; + echo ''; //YUI does not submit the value of the submit button so //we need to add the value: echo ''; diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php index 858356479c..520928eacc 100644 --- a/mod/quiz/editlib.php +++ b/mod/quiz/editlib.php @@ -284,7 +284,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete=true, echo '
    '; echo $pageurl->hidden_params_out(); - echo ''; + echo ''; echo $reordercontrolstop; } @@ -447,7 +447,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete=true,
    :
    - + hidden_params_out(); ?> '; echo '
    '; - echo ''; + echo ''; echo $pageurl->hidden_params_out(); echo '
    '; echo '
    id&sesskey=".$USER->sesskey."&action=moveit&pageid=$pageid&after=0\">". + echo "
    id&sesskey=".sesskey()."&action=moveit&pageid=$pageid&after=0\">". get_string("movepagehere", "lesson")."
    $title
    id&sesskey=".$USER->sesskey."&action=moveit&pageid=$pageid&after={$page->id}\">". + echo "
    id&sesskey=".sesskey()."&action=moveit&pageid=$pageid&after={$page->id}\">". get_string("movepagehere", "lesson")."
    '; diff --git a/question/editlib.php b/question/editlib.php index bf30d1dc53..72721d301b 100644 --- a/question/editlib.php +++ b/question/editlib.php @@ -282,7 +282,7 @@ function question_list($contexts, $pageurl, $categoryandcontext, $cm = null, echo ''; echo '
    '; - echo ''; + echo ''; echo $pageurl->hidden_params_out(); echo '
    '; echo ""; @@ -417,7 +417,7 @@ function question_sort_options($pageurl, $sortorder){ // non-POSTed page to not break the back button $html .= ''; $html .= '
    '; - $html .= ''; + $html .= ''; $html .= $pageurl->hidden_params_out(array('qsortorder')); //choose_from_menu concatenates the form name with //"menu" so the label is for menuqsortorder diff --git a/user/addnote.php b/user/addnote.php index 7f9391e498..93b25581f3 100644 --- a/user/addnote.php +++ b/user/addnote.php @@ -59,7 +59,7 @@ print_heading($straddnote); echo ''; echo '
    '; echo ''; -echo ''; +echo ''; echo '
    '; $table->head = array (get_string('fullname'), get_string('content', 'notes') . helpbutton('writing', get_string('helpwriting'), 'moodle', true, false, '', true), diff --git a/user/extendenrol.php b/user/extendenrol.php index ec5ddb2862..c44f2fd2fe 100644 --- a/user/extendenrol.php +++ b/user/extendenrol.php @@ -115,7 +115,7 @@ $title = get_string('extendenrol'); print_heading($title . helpbutton('extendenrol', $title, 'moodle', true, false, '', true)); echo "\n"; echo ''; -echo ''; +echo ''; $table->head = array (get_string('fullnameuser'), get_string('enrolmentstart'), get_string('enrolmentend'), get_string('extendperiod'), get_string('startingfrom')); $table->align = array ('left', 'center', 'center', 'center'); $table->width = "600"; diff --git a/user/groupaddnote.php b/user/groupaddnote.php index 800e957771..96c453bbe9 100644 --- a/user/groupaddnote.php +++ b/user/groupaddnote.php @@ -57,7 +57,7 @@ print_heading($straddnote); echo ''; echo '
    '; echo ''; -echo ''; +echo ''; $state_names = note_get_state_names(); // the first time list hack diff --git a/user/groupextendenrol.php b/user/groupextendenrol.php index 6f32af5ec1..8a64a5893f 100755 --- a/user/groupextendenrol.php +++ b/user/groupextendenrol.php @@ -112,7 +112,7 @@ $title = get_string('groupextendenrol'); print_heading($title . helpbutton('groupextendenrol', $title, 'moodle', true, false, '', true)); echo ''; echo ''; -echo ''; +echo ''; $table->head = array (get_string('fullnameuser'), get_string('enrolmentstart'), get_string('enrolmentend')); $table->align = array ('left', 'center', 'center', 'center'); $table->width = "600"; diff --git a/user/index.php b/user/index.php index 2082b40980..d567b97b60 100644 --- a/user/index.php +++ b/user/index.php @@ -665,7 +665,7 @@ '; echo ''; echo '
    '; - echo ''; + echo ''; echo ''; } -- 2.39.5
    $straction