L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Non standard codingstyle,

Browse Source 
replaced some urls with use of moodle_url class
This commit is contained in:
Andreas Grabs
2010-03-28 15:29:49 +00:00
parent 2c3c4c8d63
commit 5dee2210f4
14 changed files with 131 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/feedback/complete.php
+6 -2
View File
@@ -278,11 +278,15 @@ if($feedback_can_submit) {
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
$analysisurl = new moodle_url('/mod/feedback/analysis.php', array('id'=>$id));
if($courseid > 0) {
$analysisurl->param('courseid', $courseid);
}
echo $OUTPUT->heading(format_text($feedback->name));
if( (intval($feedback->publish_stats) == 1) AND ( $capabilities->viewanalysepage) AND !( $capabilities->viewreports) ) {
if($multiple_count = $DB->count_records('feedback_tracking', array('userid'=>$USER->id, 'feedback'=>$feedback->id))) {
echo '<div class="mdl-align"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
echo '<div class="mdl-align"><a href="'.$analysisurl->out().'">';
echo get_string('completed_feedbacks', 'feedback').'</a>';
echo '</div>';
}
@@ -296,7 +300,7 @@ if($feedback_can_submit) {
} else {
echo '<p align="center"><b><font color="green">'.get_string('entries_saved','feedback').'</font></b></p>';
if( intval($feedback->publish_stats) == 1) {
echo '<p align="center"><a href="analysis.php?id=' . $id . '&courseid='.$courseid.'">';
echo '<p align="center"><a href="'.$analysisurl->out().'">';
echo get_string('completed_feedbacks', 'feedback').'</a>';
echo '</p>';
}
mod/feedback/complete_guest.php
+6 -2
View File
@@ -247,10 +247,14 @@ if($feedback_can_submit) {
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
$analysisurl = new moodle_url('/mod/feedback/analysis.php', array('id'=>$id));
if($courseid > 0) {
$analysisurl->param('courseid', $courseid);
}
echo $OUTPUT->heading(format_text($feedback->name));
if( (intval($feedback->publish_stats) == 1) AND ( $capabilities->viewanalysepage) AND !( $capabilities->viewreports) ) {
echo '<div class="mdl-align"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
echo '<div class="mdl-align"><a href="'.$analysisurl->out().'">';
echo get_string('completed_feedbacks', 'feedback').'</a>';
echo '</div>';
}
@@ -263,7 +267,7 @@ if($feedback_can_submit) {
} else {
echo '<p align="center"><b><font color="green">'.get_string('entries_saved','feedback').'</font></b></p>';
if( intval($feedback->publish_stats) == 1) {
echo '<p align="center"><a href="analysis.php?id=' . $id . '&courseid='.$courseid.'">';
echo '<p align="center"><a href="'.$analysisurl->out().'">';
echo get_string('completed_feedbacks', 'feedback').'</a>';
echo '</p>';
}
mod/feedback/delete_template.php
+6 -3
View File
@@ -38,7 +38,8 @@ if(($formdata = data_submitted()) AND !confirm_sesskey()) {
}
if($canceldelete == 1){
redirect(htmlspecialchars('edit.php?id='.$id.'&do_show=templates'));
$editurl = new moodle_url('/mod/feedback/edit.php', array('id'=>$id, 'do_show'=>'templates'));
redirect($editurl->out(false));
}
if ($id) {
@@ -70,13 +71,15 @@ $newformdata = array('id'=>$id,
$mform->set_data($newformdata);
$formdata = $mform->get_data();
$deleteurl = new moodle_url('/mod/feedback/delete_template.php', array('id'=>$id));
if ($mform->is_cancelled()) {
redirect(htmlspecialchars('delete_template.php?id='.$id));
redirect($deleteurl->out(false));
}
if(isset($formdata->confirmdelete) AND $formdata->confirmdelete == 1){
feedback_delete_template($formdata->deletetempl);
redirect(htmlspecialchars('delete_template.php?id=' . $id));
redirect($deleteurl->out(false));
}
/// Print the page header
mod/feedback/edit.php
+34 -30
View File
@@ -30,6 +30,8 @@ $switchitemrequired = optional_param('switchitemrequired', false, PARAM_INT);
// $SESSION->feedback->current_tab = $do_show;
$current_tab = $do_show;
$url = new moodle_url('/mod/feedback/edit.php', array('id'=>$id, 'do_show'=>$do_show));
if ($id) {
if (! $cm = get_coursemodule_from_id('feedback', $id)) {
print_error('invalidcoursemodule');
@@ -78,7 +80,7 @@ if($moveitem){
if($switchitemrequired) {
$item = $DB->get_record('feedback_item', array('id'=>$switchitemrequired));
@feedback_switch_item_required($item);
redirect($CFG->wwwroot.'/mod/feedback/edit.php?'.feedback_edit_get_default_query($id, $do_show));
redirect($url->out(false));
exit;
}
@@ -185,16 +187,19 @@ if($do_show == 'templates') {
$use_template_form->display();
if($capabilities->createprivatetemplate OR $capabilities->createpublictemplate) {
$deleteurl = new moodle_url('/mod/feedback/delete_template.php', array('id'=>$id));
$create_template_form->display();
echo '<p><a href="'.htmlspecialchars('delete_template.php?id='.$id).'">'.get_string('delete_templates', 'feedback').'</a></p>';
echo '<p><a href="'.$deleteurl->out().'">'.get_string('delete_templates', 'feedback').'</a></p>';
}else {
echo '&nbsp;';
}
if($capabilities->edititems) {
$exporturl = new moodle_url('/mod/feedback/export.php', array('action'=>'exportfile', 'id'=>$id));
$importurl = new moodle_url('/mod/feedback/import.php', array('id'=>$id));
echo '<p>
<a href="'.htmlspecialchars('export.php?action=exportfile&id='.$id).'">'.get_string('export_questions', 'feedback').'</a>/
<a href="'.htmlspecialchars('import.php?id='.$id).'">'.get_string('import_questions', 'feedback').'</a>
<a href="'.$exporturl->out().'">'.get_string('export_questions', 'feedback').'</a>/
<a href="'.$importurl->out().'">'.get_string('import_questions', 'feedback').'</a>
</p>';
}
echo $OUTPUT->box_end();
@@ -227,9 +232,10 @@ if($do_show == 'edit') {
echo '<table>';
if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) {
$moveposition = 1;
$movehereurl = new moodle_url($url, array('movehere'=>$moveposition));
echo '<tr>'; //only shown if shouldmoving = 1
echo '<td>';
$buttonlink = 'edit.php?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&movehere='.$moveposition);
$buttonlink = $movehereurl->out();
echo '<a title="'.get_string('move_here','feedback').'" href="'.$buttonlink.'">
<img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->pix_url('movehere') . '" />
</a>';
@@ -265,7 +271,8 @@ if($do_show == 'edit') {
echo '<td>('.get_string('position', 'feedback').':'.$itempos .')</td>';
echo '<td>';
if($feedbackitem->position > 1){
$buttonlink = 'edit.php?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&moveupitem='.$feedbackitem->id);
$moveupurl = new moodle_url($url, array('moveupitem'=>$feedbackitem->id));
$buttonlink = $moveupurl->out();
echo '<a class="icon up" title="'.get_string('moveup_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('moveup_item','feedback').'" src="'.$OUTPUT->pix_url('t/up') . '" />
</a>';
@@ -282,7 +289,8 @@ if($do_show == 'edit') {
echo '</td>';
echo '<td>';
if($feedbackitem->position < $lastposition - 1){
$buttonlink = 'edit.php?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&movedownitem='.$feedbackitem->id);
$movedownurl = new moodle_url($url, array('movedownitem'=>$feedbackitem->id));
$buttonlink = $movedownurl->out();
echo '<a class="icon down" title="'.get_string('movedown_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('movedown_item','feedback').'" src="'.$OUTPUT->pix_url('t/down') . '" />
</a>';
@@ -298,7 +306,8 @@ if($do_show == 'edit') {
}
echo '</td>';
echo '<td>';
$buttonlink = 'edit.php?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&moveitem='.$feedbackitem->id);
$moveurl = new moodle_url($url, array('moveitem'=>$feedbackitem->id));
$buttonlink = $moveurl->out();
echo '<a class="editing_move" title="'.get_string('move_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('move_item','feedback').'" src="'.$OUTPUT->pix_url('t/move') . '" />
</a>';
@@ -312,8 +321,14 @@ if($do_show == 'edit') {
echo '<td>';
//print the button to edit the item
if($feedbackitem->typ != 'pagebreak') {
$editurl = new moodle_url('/mod/feedback/edit_item.php');
$editurl->params(array('do_show'=>$do_show,
'cmid'=>$id,
'id'=>$feedbackitem->id,
'typ'=>$feedbackitem->typ));
// in edit_item.php the param id is used for the itemid and the cmid is the id to get the module
$buttonlink = 'edit_item.php?'.htmlspecialchars('do_show='.$do_show.'&cmid='.$id.'&id='.$feedbackitem->id.'&typ='.$feedbackitem->typ);
$buttonlink = $editurl->out();
echo '<a class="editing_update" title="'.get_string('edit_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('edit_item','feedback').'" src="'.$OUTPUT->pix_url('t/edit') . '" />
</a>';
@@ -344,7 +359,8 @@ if($do_show == 'edit') {
$buttontitle = get_string('switch_item_to_required','feedback');
$buttonimg = 'pics/notrequired.gif';
}
$buttonlink = 'edit.php?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&switchitemrequired='.$feedbackitem->id);
$requiredurl = new moodle_url($url, array('switchitemrequired'=>$feedbackitem->id));
$buttonlink = $requiredurl->out();
echo '<a class="icon feedback_switchrequired" title="'.$buttontitle.'" href="'.$buttonlink.'">
<img alt="'.$buttontitle.'" src="'.$buttonimg.'" />
</a>';
@@ -356,7 +372,12 @@ if($do_show == 'edit') {
}
echo '</td>';
echo '<td>';
$buttonlink = 'delete_item.php?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&deleteitem='.$feedbackitem->id);
$deleteitemurl = new moodle_url('/mod/feedback/delete_item.php');
$deleteitemurl->params(array('id'=>$id,
'do_show'=>$do_show,
'deleteitem'=>$feedbackitem->id));
$buttonlink = $deleteitemurl->out();
echo '<a class="icon delete" title="'.get_string('delete_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('delete_item','feedback').'" src="'.$OUTPUT->pix_url('t/delete') . '" />
</a>';
@@ -370,9 +391,10 @@ if($do_show == 'edit') {
echo '</tr>';
if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) {
$moveposition++;
$movehereurl->param('movehere', $moveposition);
echo '<tr>'; //only shown if shouldmoving = 1
echo '<td>';
$buttonlink = 'edit.php?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&movehere='.$moveposition);
$buttonlink = $movehereurl->out();
echo '<a title="'.get_string('move_here','feedback').'" href="'.$buttonlink.'">
<img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->pix_url('movehere') . '" />
</a>';
@@ -400,21 +422,3 @@ if($do_show == 'edit') {
///////////////////////////////////////////////////////////////////////////
echo $OUTPUT->footer();
function feedback_edit_get_default_query($id, $tab) {
global $USER;
$query = 'id='.$id;
$query .= '&do_show='.$tab;
//$query .= '&sesskey='.sesskey();
return $query;
}
function feedback_edit_print_default_form_values($id, $tab) {
global $USER;
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
echo '<input type="hidden" name="id" value="'.$id.'" />';
echo '<input type="hidden" name="do_show" value="'.$tab.'" />';
}
mod/feedback/edit_item.php
+8 -6
View File
@@ -17,7 +17,9 @@ $cmid = optional_param('cmid', NULL, PARAM_INT);
$typ = optional_param('typ', false, PARAM_ALPHA);
$id = optional_param('id', false, PARAM_INT);
if(!$typ)redirect(htmlspecialchars('edit.php?id=' . $cmid));
$editurl = new moodle_url('/mod/feedback/edit.php', array('id'=>$cmid));
if(!$typ)redirect($editurl->out(false));
$url = new moodle_url('/mod/feedback/edit_item.php', array('cmid'=>$cmid));
if ($typ !== false) {
@@ -60,7 +62,7 @@ if(!$capabilities->edititems){
//if the typ is pagebreak so the item will be saved directly
if($typ == 'pagebreak') {
feedback_create_pagebreak($feedback->id);
redirect(htmlspecialchars('edit.php?id='.$cmid));
redirect($editurl->out(false));
exit;
}
@@ -76,7 +78,7 @@ if($id and $item = $DB->get_record('feedback_item', array('id'=>$id))) {
$position = 0;
}
if (!$typ) {
print_error('typemissing', 'feedback', $CFG->wwwroot.'/mod/feedback/edit.php?id='.$cmid);
print_error('typemissing', 'feedback', $editurl->out(false));
}
}
@@ -133,7 +135,7 @@ $i_form->addGroup($buttonarray, 'buttonar', '', array(' '), false);
$item_form->set_data($item);
if ($formdata = $item_form->get_data()) {
if (isset($formdata->cancel)){
redirect(htmlspecialchars('edit.php?id=' . $cmid));
redirect($editurl->out(false));
} else if (isset($formdata->saveitem) AND $formdata->saveitem == 1) {
$newposition = $formdata->position;
$formdata->position = $newposition + 1;
@@ -145,7 +147,7 @@ if ($formdata = $item_form->get_data()) {
if (!feedback_move_item($newitem, $newposition)){
$SESSION->feedback->errors[] = get_string('item_creation_failed', 'feedback');
}else {
redirect(htmlspecialchars('edit.php?id='.$cmid));
redirect($editurl->out(false));
}
}
} else if (isset($formdata->updateitem) AND $formdata->updateitem == 1) {
@@ -156,7 +158,7 @@ if ($formdata = $item_form->get_data()) {
if (!feedback_move_item($item, $formdata->position)){
$SESSION->feedback->errors[] = get_string('item_update_failed', 'feedback');
}else {
redirect(htmlspecialchars('edit.php?id='.$cmid));
redirect($editurl->out(false));
}
}
}
mod/feedback/index.php
+7 -9
View File
@@ -13,7 +13,9 @@ require_once("lib.php");
$id = required_param('id', PARAM_INT);
$PAGE->set_url('/mod/feedback/index.php', array('id'=>$id));
$url = new moodle_url('/mod/feedback/index.php', array('id'=>$id));
$PAGE->set_url($url);
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('invalidcourseid');
@@ -23,7 +25,7 @@ $capabilities = feedback_load_course_capabilities($course->id);
require_login($course->id);
$PAGE->set_pagelayout('incourse');
add_to_log($course->id, 'feedback', 'view all', htmlspecialchars('index.php?id='.$course->id), $course->id);
add_to_log($course->id, 'feedback', 'view all', $url->out(false), $course->id);
/// Print the page header
@@ -80,18 +82,14 @@ if ($course->format == "weeks") {
foreach ($feedbacks as $feedback) {
//get the responses of each feedback
$viewurl = new moodle_url('/mod/feedback/view.php', array('id'=>$feedback->coursemodule));
if($capabilities->viewreports) {
$completedFeedbackCount = intval(feedback_get_completeds_group_count($feedback));
}
if (!$feedback->visible) {
//Show dimmed if the mod is hidden
$link = '<a class="dimmed" href="'.htmlspecialchars('view.php?id='.$feedback->coursemodule).'">'.$feedback->name.'</a>';
} else {
//Show normal if the mod is visible
$link = '<a href="'.htmlspecialchars('view.php?id='.$feedback->coursemodule).'">'.$feedback->name.'</a>';
}
$dimmedclass = $feedback->visible ? '' : 'class="dimmed"';
$link = '<a '.$dimmedclass.' href="'.$viewurl->out().'">'.$feedback->name.'</a>';
if ($course->format == "weeks" or $course->format == "topics") {
$tabledata = array ($feedback->section, $link);
mod/feedback/item/captcha/lib.php
+2 -1
View File
@@ -94,8 +94,9 @@ class feedback_item_captcha extends feedback_item_base {
echo '('.$item->label.') ';
}
echo format_text($item->name . $requiredmark, true, false, false);
$imglink = new moodle_url('/mod/feedback/item/captcha/print_captcha.php', array('id'=>$cmid));
?>
<img alt="<?php echo $this->type;?>" src="<?php echo $CFG->wwwroot.htmlspecialchars('/mod/feedback/item/captcha/print_captcha.php?id='.$cmid);?>" />
<img alt="<?php echo $this->type;?>" src="<?php echo $imglink->out();?>" />
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
mod/feedback/lib.php
+3 -3
View File
@@ -2282,9 +2282,9 @@ function feedback_send_email_text($info, $course) {
function feedback_send_email_html($info, $course, $cm) {
global $CFG;
$posthtml = '<p><font face="sans-serif">'.
'<a href="'.$CFG->wwwroot.htmlspecialchars('/course/view.php?id='.$course->id).'">'.$course->shortname.'</a> ->'.
'<a href="'.$CFG->wwwroot.htmlspecialchars('/mod/feedback/index.php?id='.$course->id).'">'.get_string('modulenameplural', 'feedback').'</a> ->'.
'<a href="'.$CFG->wwwroot.htmlspecialchars('/mod/feedback/view.php?id='.$cm->id).'">'.$info->feedback.'</a></font></p>';
'<a href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">'.$course->shortname.'</a> ->'.
'<a href="'.$CFG->wwwroot.'/mod/feedback/index.php?id='.$course->id.'">'.get_string('modulenameplural', 'feedback').'</a> ->'.
'<a href="'.$CFG->wwwroot.'/mod/feedback/view.php?id='.$cm->id.'">'.$info->feedback.'</a></font></p>';
$posthtml .= '<hr /><font face="sans-serif">';
$posthtml .= '<p>'.get_string('emailteachermailhtml', 'feedback', $info).'</p>';
$posthtml .= '</font><hr />';
mod/feedback/mapcourse.php
+3 -1
View File
@@ -116,8 +116,10 @@ if($coursemap = feedback_get_courses_from_sitecourse_map($feedback->id)) {
$table->setup();
$unmapurl = new moodle_url('/mod/feedback/unmapcourse.php');
foreach ($coursemap as $cmap) {
$table->add_data(array('<a href="'.htmlspecialchars('unmapcourse.php?id='.$id.'&cmapid='.$cmap->id).'"><img src="'.$OUTPUT->pix_url('t/delete') . '" alt="Delete" /></a> ('.$cmap->shortname.') '.$cmap->fullname));
$unmapurl->params(array('id'=>$id, 'cmapid'=>$cmap->id));
$table->add_data(array('<a href="'.$unmapurl->out().'"><img src="'.$OUTPUT->pix_url('t/delete') . '" alt="Delete" /></a> ('.$cmap->shortname.') '.$cmap->fullname));
}
$table->print_html();
mod/feedback/show_entries.php
+24 -20
View File
@@ -28,21 +28,21 @@ if($userid) {
$formdata->userid = intval($userid);
}
if ($id) {
if (! $cm = get_coursemodule_from_id('feedback', $id)) {
print_error('invalidcoursemodule');
}
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
print_error('coursemisconf');
}
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
print_error('invalidcoursemodule');
}
if (! $cm = get_coursemodule_from_id('feedback', $id)) {
print_error('invalidcoursemodule');
}
$PAGE->set_url('/mod/feedback/show_entries.php', array('id'=>$cm->id, 'do_show'=>$do_show));
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
print_error('coursemisconf');
}
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
print_error('invalidcoursemodule');
}
$url = new moodle_url('/mod/feedback/show_entries.php', array('id'=>$cm->id, 'do_show'=>$do_show));
$PAGE->set_url($url);
$capabilities = feedback_load_capabilities($cm->id);
@@ -92,8 +92,9 @@ if($do_show == 'showentries'){
} else {
$groupmode = $course->groupmode;
}
$groupselect = groups_print_activity_menu($cm, $CFG->wwwroot . '/mod/feedback/show_entries.php?id=' . $cm->id.'&do_show=showentries', true);
// $groupselect = groups_print_activity_menu($cm, $CFG->wwwroot . '/mod/feedback/show_entries.php?id=' . $cm->id.'&do_show=showentries', true);
$groupselect = groups_print_activity_menu($cm, $url->out(), true);
$mygroupid = groups_get_activity_group($cm);
//get students in conjunction with groupmode
@@ -110,12 +111,14 @@ if($do_show == 'showentries'){
$completedFeedbackCount = feedback_get_completeds_group_count($feedback, $mygroupid);
if($feedback->course == SITEID){
echo '<div class="mdl-align"><a href="'.htmlspecialchars('analysis_course.php?id=' . $id . '&courseid='.$courseid).'">';
$analysisurl = new moodle_url('/mod/feedback/analysis_course.php', array('id'=>$id, 'courseid'=>$courseid));
echo '<div class="mdl-align"><a href="'.$analysisurl->out().'">';
echo get_string('course') .' '. get_string('analysis', 'feedback') . ' ('.get_string('completed_feedbacks', 'feedback').': '.intval($completedFeedbackCount).')</a>';
echo $OUTPUT->help_icon('viewcompleted', '', 'feedback', true);
echo '</div>';
}else {
echo '<div class="mdl-align"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
$analysisurl = new moodle_url('/mod/feedback/analysis.php', array('id'=>$id, 'courseid'=>$courseid));
echo '<div class="mdl-align"><a href="'.$analysisurl->out().'">';
echo get_string('analysis', 'feedback') . ' ('.get_string('completed_feedbacks', 'feedback').': '.intval($completedFeedbackCount).')</a>';
echo '</div>';
}
@@ -152,7 +155,7 @@ if($do_show == 'showentries'){
</td>
<td align="right">
<?php
$aurl = new moodle_url('show_entries.php', array('sesskey'=>sesskey(), 'userid'=>$student->id, 'do_show'=>'showoneentry', 'id'=>$id));
$aurl = new moodle_url($url, array('sesskey'=>sesskey(), 'userid'=>$student->id, 'do_show'=>'showoneentry'));
echo $OUTPUT->single_button($aurl, get_string('show_entries', 'feedback'));
?>
</td>
@@ -161,7 +164,7 @@ if($do_show == 'showentries'){
?>
<td align="right">
<?php
$aurl = new moodle_url('delete_completed.php', array('sesskey'=>sesskey(), 'completedid'=>$feedbackcompleted->id, 'do_show'=>'showoneentry', 'id'=>$id));
$aurl = new moodle_url($url, array('sesskey'=>sesskey(), 'completedid'=>$feedbackcompleted->id, 'do_show'=>'showoneentry'));
echo $OUTPUT->single_button($aurl, get_string('delete_entry', 'feedback'));
?>
</td>
@@ -242,7 +245,8 @@ if($do_show == 'showoneentry') {
echo '</form>';
echo $OUTPUT->box_end();
}
echo $OUTPUT->continue_button(htmlspecialchars('show_entries.php?id='.$id.'&do_show=showentries'));
// echo $OUTPUT->continue_button(htmlspecialchars('show_entries.php?id='.$id.'&do_show=showentries'));
echo $OUTPUT->continue_button(new moodle_url($url, array('do_show'=>'showentries')));
}
/// Finish the page
///////////////////////////////////////////////////////////////////////////
mod/feedback/show_entries_anonym.php
+2 -1
View File
@@ -82,7 +82,8 @@ include('tabs.php');
echo $OUTPUT->heading(format_text($feedback->name));
echo $OUTPUT->continue_button(htmlspecialchars('show_entries.php?id='.$id.'&do_show=showentries'));
$continueurl = new moodle_url('/mod/feedback/show_entries.php', array('id'=>$id, 'do_show'=>'showentries'));
echo $OUTPUT->continue_button($continueurl);
//print the list with anonymous completeds
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
$PAGE->requires->js('/mod/feedback/feedback.js');
mod/feedback/tabs.php
+21 -6
View File
@@ -13,29 +13,44 @@
$inactive = array();
$activated = array();
//some pages deliver the cmid instead the id
if(isset($cmid) AND intval($cmid) AND $cmid > 0) {
$usedid = $cmid;
}else {
$usedid = $id;
}
$courseid = optional_param('courseid', false, PARAM_INT);
// $current_tab = $SESSION->feedback->current_tab;
if (!isset($current_tab)) {
$current_tab = '';
}
$row[] = new tabobject('view', $CFG->wwwroot.htmlspecialchars('/mod/feedback/view.php?id='.$id.'&do_show=view'), get_string('overview', 'feedback'));
$viewurl = new moodle_url('/mod/feedback/view.php', array('id'=>$usedid, 'do_show'=>'view'));
$row[] = new tabobject('view', $viewurl->out(), get_string('overview', 'feedback'));
if($capabilities->edititems) {
$row[] = new tabobject('edit', $CFG->wwwroot.htmlspecialchars('/mod/feedback/edit.php?id='.$id.'&do_show=edit'), get_string('edit_items', 'feedback'));
$row[] = new tabobject('templates', $CFG->wwwroot.htmlspecialchars('/mod/feedback/edit.php?id='.$id.'&do_show=templates'), get_string('templates', 'feedback'));
$editurl = new moodle_url('/mod/feedback/edit.php', array('id'=>$usedid, 'do_show'=>'edit'));
$row[] = new tabobject('edit', $editurl->out(), get_string('edit_items', 'feedback'));
$templateurl = new moodle_url('/mod/feedback/edit.php', array('id'=>$usedid, 'do_show'=>'templates'));
$row[] = new tabobject('templates', $templateurl->out(), get_string('templates', 'feedback'));
}
if($capabilities->viewreports) {
if($feedback->course == SITEID){
$row[] = new tabobject('analysis', $CFG->wwwroot.htmlspecialchars('/mod/feedback/analysis_course.php?id='.$id.'&courseid='.$courseid.'&do_show=analysis'), get_string('analysis', 'feedback'));
$analysisurl = new moodle_url('/mod/feedback/analysis_course.php', array('id'=>$usedid, 'courseid'=>$courseid, 'do_show'=>'analysis'));
$row[] = new tabobject('analysis', $analysisurl->out(), get_string('analysis', 'feedback'));
}else {
$row[] = new tabobject('analysis', $CFG->wwwroot.htmlspecialchars('/mod/feedback/analysis.php?id='.$id.'&courseid='.$courseid.'&do_show=analysis'), get_string('analysis', 'feedback'));
$analysisurl = new moodle_url('/mod/feedback/analysis.php', array('id'=>$usedid, 'courseid'=>$courseid, 'do_show'=>'analysis'));
$row[] = new tabobject('analysis', $analysisurl->out(), get_string('analysis', 'feedback'));
}
}
if($capabilities->viewreports) {
$row[] = new tabobject('showentries', $CFG->wwwroot.htmlspecialchars('/mod/feedback/show_entries.php?id='.$id.'&do_show=showentries'), get_string('show_entries', 'feedback'));
$reporturl = new moodle_url('/mod/feedback/show_entries.php', array('id'=>$usedid, 'do_show'=>'showentries'));
$row[] = new tabobject('showentries', $reporturl->out(), get_string('show_entries', 'feedback'));
}
if(count($row) > 1) {
mod/feedback/unmapcourse.php
+2 -1
View File
@@ -44,7 +44,8 @@ if (!$capabilities->mapcourse) {
feedback_clean_up_sitecourse_map();
if ($DB->delete_records('feedback_sitecourse_map', array('id'=>$cmapid))) {
redirect (htmlspecialchars('mapcourse.php?id='.$id));
$mapurl = new moodle_url('/mod/feedback/mapcourse.php', array('id'=>$id));
redirect ($mapurl->out(false));
} else {
print_error('cannotunmap', 'feedback');
}
mod/feedback/view.php
+7 -5
View File
@@ -122,7 +122,8 @@ if($capabilities->edititems) {
if( (intval($feedback->publish_stats) == 1) AND ( $capabilities->viewanalysepage) AND !( $capabilities->viewreports) ) {
if($multiple_count = $DB->count_records('feedback_tracking', array('userid'=>$USER->id, 'feedback'=>$feedback->id))) {
echo '<div class="mdl-align"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
$analysisurl = new moodle_url('/mod/feedback/analysis.php', array('id'=>$id, 'courseid'=>$courseid));
echo '<div class="mdl-align"><a href="'.$analysisurl->out().'">';
echo get_string('completed_feedbacks', 'feedback').'</a>';
echo '</div>';
}
@@ -177,14 +178,15 @@ if($capabilities->complete) {
$completefile = 'complete.php';
$guestid = false;
}
$completeurl = new moodle_url('/mod/feedback/'.$completefile, array('id'=>$id, 'courseid'=>$courseid, 'gopage'=>0));
if($feedbackcompletedtmp = feedback_get_current_completed($feedback->id, true, $courseid, $guestid)) {
if($startpage = feedback_get_page_to_continue($feedback->id, $courseid, $guestid)) {
echo '<a href="'.htmlspecialchars($completefile.'?id='.$id.'&gopage='.$startpage.'&courseid='.$courseid).'">'.get_string('continue_the_form', 'feedback').'</a>';
}else {
echo '<a href="'.htmlspecialchars($completefile.'?id='.$id.'&gopage=0&courseid='.$courseid).'">'.get_string('continue_the_form', 'feedback').'</a>';
$completeurl->param('gopage', $startpage);
}
echo '<a href="'.$completeurl->out().'">'.get_string('continue_the_form', 'feedback').'</a>';
}else {
echo '<a href="'.htmlspecialchars($completefile.'?id='.$id.'&gopage=0&courseid='.$courseid).'">'.get_string('complete_the_form', 'feedback').'</a>';
echo '<a href="'.$completeurl->out().'">'.get_string('complete_the_form', 'feedback').'</a>';
}
}else {
echo '<h2><font color="red">'.get_string('this_feedback_is_already_submitted', 'feedback').'</font></h2>';