From: nicolasconnault Date: Mon, 10 Aug 2009 04:59:26 +0000 (+0000) Subject: MDL-19807 Converted print_box* to $OUTPUT->box* X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d4b1d58ca3af92e2d5826a66efa21171d01fac05;p=moodle.git MDL-19807 Converted print_box* to $OUTPUT->box* --- diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php index 50ba4c2c7b..b018c8741f 100644 --- a/mod/feedback/analysis.php +++ b/mod/feedback/analysis.php @@ -21,11 +21,11 @@ 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'); } @@ -57,13 +57,13 @@ $strfeedbacks = get_string("modulenameplural", "feedback"); $strfeedback = get_string("modulename", "feedback"); $buttontext = update_module_button($cm->id, $course->id, $strfeedback); - + $navlinks = array(); $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance'); - + $navigation = build_navigation($navlinks); - + print_header_simple(format_string($feedback->name), "", $navigation, "", "", true, $buttontext, navmenu($course, $cm)); @@ -73,7 +73,7 @@ //print analysed items // print_simple_box_start("center", '80%'); - print_box_start('generalbox boxaligncenter boxwidthwide'); + echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); //get the groupid $groupselect = groups_print_activity_menu($cm, 'analysis.php?id=' . $cm->id.'&do_show=analysis', true); @@ -146,7 +146,7 @@ } echo ''; // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); echo $OUTPUT->footer(); diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php index 31c82aa1d9..664a42c5f1 100644 --- a/mod/feedback/analysis_course.php +++ b/mod/feedback/analysis_course.php @@ -10,10 +10,10 @@ require_once("../../config.php"); require_once("lib.php"); - + // $SESSION->feedback->current_tab = 'analysis'; $current_tab = 'analysis'; - + $id = required_param('id', PARAM_INT); //the POST dominated the GET $coursefilter = optional_param('coursefilter', '0', PARAM_INT); $courseitemfilter = optional_param('courseitemfilter', '0', PARAM_INT); @@ -21,20 +21,20 @@ // $searchcourse = optional_param('searchcourse', '', PARAM_ALPHAEXT); $searchcourse = optional_param('searchcourse', '', PARAM_RAW); $courseid = optional_param('courseid', false, PARAM_INT); - + if(($searchcourse OR $courseitemfilter OR $coursefilter) AND !confirm_sesskey()) { print_error('invalidsesskey'); } - + 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'); } @@ -42,22 +42,22 @@ $capabilities = feedback_load_capabilities($cm->id); require_login($course->id, true, $cm); - + if( !( (intval($feedback->publish_stats) == 1) || $capabilities->viewreports)) { print_error('error'); } - + /// Print the page header $strfeedbacks = get_string("modulenameplural", "feedback"); $strfeedback = get_string("modulename", "feedback"); $buttontext = update_module_button($cm->id, $course->id, $strfeedback); - + $navlinks = array(); $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance'); - + $navigation = build_navigation($navlinks); - + print_header_simple(format_string($feedback->name), "", $navigation, "", "", true, $buttontext, navmenu($course, $cm)); @@ -66,7 +66,7 @@ //print the analysed items // print_simple_box_start("center", '80%'); - print_box_start('generalbox boxaligncenter boxwidthwide'); + echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); if( $capabilities->viewreports ) { //button "export to excel" @@ -77,16 +77,16 @@ print_single_button($export_button_link, $export_button_options, $export_button_label, 'post'); echo ''; } - + //get the groupid //lstgroupid is the choosen id $mygroupid = false; //get completed feedbacks $completedscount = feedback_get_completeds_group_count($feedback, $mygroupid, $coursefilter); - + //show the count echo ''.get_string('completed_feedbacks', 'feedback').': '.$completedscount. '
'; - + // get the items of the feedback $items = $DB->get_records('feedback_item', array('feedback'=>$feedback->id, 'hasvalue'=>1), 'position'); //show the count @@ -138,11 +138,11 @@ '{feedback_value} fv, {feedback_item} fi '. 'where c.id = fv.course_id and fv.item = fi.id '. 'and fi.feedback = ?'. - 'and + 'and (c.shortname '.$DB->sql_ilike().' ? OR c.fullname '.$DB->sql_ilike().' ?)'; $params = array($feedback->id, "%$searchcourse%", "%$searchcourse%"); - + if ($courses = $DB->get_records_sql_menu($sql, $params)) { echo ' ' . get_string('filter_by_course', 'feedback') . ': '; @@ -159,7 +159,7 @@ echo ''; foreach($items as $item) { if($item->hasvalue == 0) continue; - echo ''; + echo '
'; //get the class from item-typ $itemclass = 'feedback_item_'.$item->typ; //get the instance of the item-class @@ -173,7 +173,7 @@ $itemobj->print_analysed($item, $printnr, $mygroupid, $coursefilter); if (preg_match('/rated$/i', $item->typ)) { echo ''; + get_string('sort_by_course', 'feedback').''; } echo '
'. - get_string('sort_by_course', 'feedback').'
'; } @@ -181,8 +181,8 @@ } echo ''; echo ''; - print_box_end(); - + echo $OUTPUT->box_end(); + echo $OUTPUT->footer(); ?> diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php index de7fc28c5d..8563a8f1f2 100644 --- a/mod/feedback/complete.php +++ b/mod/feedback/complete.php @@ -38,7 +38,7 @@ }else { $savevalues = false; } - + if($gopage < 0 AND !$savevalues) { if(isset($formdata->gonextpage)){ $gopage = $lastpage + 1; @@ -54,33 +54,33 @@ }else { $gonextpage = $gopreviouspage = false; } - + 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'); } } $capabilities = feedback_load_capabilities($cm->id); - + if($feedback->anonymous == FEEDBACK_ANONYMOUS_YES) { $capabilities->complete = true; } - + //check whether the feedback is located and! started from the mainsite if($course->id == SITEID AND !$courseid) { $courseid = SITEID; } - + //check whether the feedback is mapped to the given courseid if($course->id == SITEID AND !$capabilities->edititems) { if($DB->get_records('feedback_sitecourse_map', array('feedbackid'=>$feedback->id))) { @@ -89,7 +89,7 @@ } } } - + if($feedback->anonymous != FEEDBACK_ANONYMOUS_YES) { if($course->id == SITEID) { require_login($course->id, true); @@ -103,7 +103,7 @@ require_course_login($course, true, $cm); } } - + //check whether the given courseid exists if($courseid AND $courseid != SITEID) { if($course2 = $DB->get_record('course', array('id'=>$courseid))){ @@ -113,22 +113,22 @@ print_error('invalidcourseid'); } } - + if(!$capabilities->complete) { print_error('error'); } - + /// Print the page header $strfeedbacks = get_string("modulenameplural", "feedback"); $strfeedback = get_string("modulename", "feedback"); $buttontext = update_module_button($cm->id, $course->id, $strfeedback); - + $navlinks = array(); $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance'); - + $navigation = build_navigation($navlinks); - + print_header_simple(format_string($feedback->name), "", $navigation, "", "", true, $buttontext, navmenu($course, $cm)); @@ -145,20 +145,20 @@ } feedback_print_errors(); - + //check, if the feedback is open (timeopen, timeclose) $checktime = time(); if(($feedback->timeopen > $checktime) OR ($feedback->timeclose < $checktime AND $feedback->timeclose > 0)) { // print_simple_box_start('center'); - print_box_start('generalbox boxaligncenter'); + echo $OUTPUT->box_start('generalbox boxaligncenter'); echo '

'.get_string('feedback_is_not_open', 'feedback').'

'; print_continue($CFG->wwwroot.'/course/view.php?id='.$course->id); // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); echo $OUTPUT->footer(); exit; } - + //additional check for multiple-submit (prevent browsers back-button). the main-check is in view.php $feedback_can_submit = true; if($feedback->multiple_submit == 0 ) { @@ -179,7 +179,7 @@ add_to_log($course->id, 'feedback', 'startcomplete', 'view.php?id='.$cm->id, $feedback->id, $cm->id, $userid); } if(!$gonextpage AND !$gopreviouspage) $preservevalues = false;//es kann gespeichert werden - + }else { $savereturn = 'failed'; if(isset($lastpage)) { @@ -196,10 +196,10 @@ }else { print_error('missingparameter'); } - + } } - + //saving the items if($savevalues AND !$preservevalues){ //exists there any pagebreak, so there are values in the feedback_valuetmp @@ -231,11 +231,11 @@ $tracking->completed = $new_completed_id; $DB->insert_record('feedback_tracking', $tracking); unset($SESSION->feedback->is_started); - + }else { $savereturn = 'failed'; } - + } @@ -251,10 +251,10 @@ $newpage = 0; $ispagebreak = false; } - + //get the feedbackitems after the last shown pagebreak $feedbackitems = $DB->get_records_select('feedback_item', 'feedback = ? AND position > ?', array($feedback->id, $startposition), 'position'); - + //get the first pagebreak if($pagebreaks = $DB->get_records('feedback_item', array('feedback'=>$feedback->id, 'typ'=>'pagebreak'), 'position')) { $pagebreaks = array_values($pagebreaks); @@ -263,7 +263,7 @@ $firstpagebreak = false; } $maxitemcount = $DB->count_records('feedback_item', array('feedback'=>$feedback->id)); - + //get the values of completeds before done. Anonymous user can not get these values. if((!isset($SESSION->feedback->is_started)) AND (!isset($savereturn)) AND ($feedback->anonymous == FEEDBACK_ANONYMOUS_NO)) { if(!$feedbackcompletedtmp = feedback_get_current_completed($feedback->id, true, $courseid)) { @@ -281,7 +281,7 @@ /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// 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 '
'; @@ -289,14 +289,14 @@ echo '
'; } } - + if(isset($savereturn) && $savereturn == 'saved') { if($feedback->page_after_submit) { // print_simple_box_start('center', '75%'); - print_box_start('generalbox boxaligncenter boxwidthwide'); + echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); echo format_text($feedback->page_after_submit); // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); } else { echo '

'.get_string('entries_saved','feedback').'

'; if( intval($feedback->publish_stats) == 1) { @@ -305,7 +305,7 @@ echo '

'; } } - + // Mark activity viewed for completion-tracking $completion=new completion_info($course); $completion->set_module_viewed($cm); @@ -327,15 +327,15 @@ if(isset($savereturn) && $savereturn == 'failed') { echo '

'.get_string('saving_failed','feedback').'

'; } - + if(isset($savereturn) && $savereturn == 'missing') { echo '

'.get_string('saving_failed_because_missing_or_false_values','feedback').'

'; } - + //print the items if(is_array($feedbackitems)){ // print_simple_box_start('center', '75%'); - print_box_start('generalbox boxaligncenter boxwidthwide'); + echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); echo '
'; echo ''; echo ''; @@ -352,7 +352,7 @@ if($countreq > 0) { echo ''; } - + unset($startitem); $itemnr = $DB->count_records_select('feedback_item', 'feedback = ? AND hasvalue = 1 AND position < ?', array($feedback->id, $startposition)); foreach($feedbackitems as $feedbackitem){ @@ -383,7 +383,7 @@ } echo ''; echo ''; - + $lastbreakposition = $feedbackitem->position; //last item-pos (item or pagebreak) if($feedbackitem->typ == 'pagebreak'){ break; @@ -402,7 +402,7 @@ echo ''; echo ''; } - + if( $ispagebreak AND $lastbreakposition > $firstpagebreak->position) { echo ''; } @@ -412,9 +412,9 @@ if($lastbreakposition >= $maxitemcount) { //last page echo ''; } - + echo ''; - + if($courseid) { echo ''; }else{ @@ -431,16 +431,16 @@ echo ''; $SESSION->feedback->is_started = true; // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); } } }else { // print_simple_box_start('center'); - print_box_start('generalbox boxaligncenter'); + echo $OUTPUT->box_start('generalbox boxaligncenter'); echo '

'.get_string('this_feedback_is_already_submitted', 'feedback').'

'; print_continue($CFG->wwwroot.'/course/view.php?id='.$course->id); // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); } /// Finish the page /////////////////////////////////////////////////////////////////////////// diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php index a5d95cb779..490c2a8ee1 100644 --- a/mod/feedback/complete_guest.php +++ b/mod/feedback/complete_guest.php @@ -25,7 +25,7 @@ if(($formdata = data_submitted()) AND !confirm_sesskey()) { print_error('invalidsesskey'); } - + //if the use hit enter into a textfield so the form should not submit if(isset($formdata->sesskey) AND !isset($formdata->savevalues) AND !isset($formdata->gonextpage) AND !isset($formdata->gopreviouspage)) { $gopage = $formdata->lastpage; @@ -35,7 +35,7 @@ }else { $savevalues = false; } - + if($gopage < 0 AND !$savevalues) { if(isset($formdata->gonextpage)){ $gopage = $lastpage + 1; @@ -51,63 +51,63 @@ }else { $gonextpage = $gopreviouspage = false; } - + 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'); } } $capabilities = feedback_load_capabilities($cm->id); - + //check whether the feedback is anonymous if($feedback->anonymous == FEEDBACK_ANONYMOUS_YES) { $capabilities->complete = true; }else { print_error('feedback_is_not_for_anonymous', 'feedback'); } - + //check whether the user has a session // there used to be a sesskey test - this could not work - sorry - + //check whether the feedback is located and! started from the mainsite if($course->id == SITEID AND !$courseid) { $courseid = SITEID; } - + require_course_login($course); - + if($courseid AND $courseid != SITEID) { $course2 = $DB->get_record('course', array('id'=>$courseid)); require_course_login($course2); //this overwrites the object $course :-( $course = $DB->get_record("course", array("id"=>$cm->course)); // the workaround } - + if(!$capabilities->complete) { print_error('error'); } - + /// Print the page header $strfeedbacks = get_string("modulenameplural", "feedback"); $strfeedback = get_string("modulename", "feedback"); $buttontext = update_module_button($cm->id, $course->id, $strfeedback); - + $navlinks = array(); $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance'); - + $navigation = build_navigation($navlinks); - + print_header_simple(format_string($feedback->name), "", $navigation, "", "", true, $buttontext, navmenu($course, $cm)); @@ -117,20 +117,20 @@ } feedback_print_errors(); - + //check, if the feedback is open (timeopen, timeclose) $checktime = time(); if(($feedback->timeopen > $checktime) OR ($feedback->timeclose < $checktime AND $feedback->timeclose > 0)) { // print_simple_box_start('center'); - print_box_start('generalbox boxaligncenter'); + echo $OUTPUT->box_start('generalbox boxaligncenter'); echo '

'.get_string('feedback_is_not_open', 'feedback').'

'; print_continue($CFG->wwwroot.'/course/view.php?id='.$course->id); // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); echo $OUTPUT->footer(); exit; } - + //additional check for multiple-submit (prevent browsers back-button). the main-check is in view.php $feedback_can_submit = true; if($feedback->multiple_submit == 0 ) { @@ -150,9 +150,9 @@ $userid = $USER->id; //arb if($completedid = feedback_save_guest_values($_POST, sesskey())){ add_to_log($course->id, 'feedback', 'startcomplete', 'view.php?id='.$cm->id, $feedback->id); //arb: log even guest submissions or at least the startcomplete since the other add log event is elsewhere - + if(!$gonextpage AND !$gopreviouspage) $preservevalues = false;//es kann gespeichert werden - + }else { $savereturn = 'failed'; if(isset($lastpage)) { @@ -171,14 +171,14 @@ } } } - + //saving the items if($savevalues AND !$preservevalues){ //exists there any pagebreak, so there are values in the feedback_valuetmp $userid = $USER->id; //arb changed from 0 to $USER->id - no strict anonymous feedbacks - if it is a guest taking it then I want to know that it was a guest (at least in the data saved in the feedback tables) $feedbackcompletedtmp = $DB->get_record('feedback_completedtmp', array('id'=>$completedid)); - + //fake saving for switchrole $is_switchrole = feedback_check_is_switchrole(); if($is_switchrole) { @@ -188,7 +188,7 @@ $savereturn = 'saved'; feedback_send_email_anonym($cm, $feedback, $course, $userid); unset($SESSION->feedback->is_started); - + }else { $savereturn = 'failed'; } @@ -207,7 +207,7 @@ $newpage = 0; $ispagebreak = false; } - + //get the feedbackitems after the last shown pagebreak $feedbackitems = $DB->get_records_select('feedback_item', 'feedback = ? AND position > ?', array($feedback->id, $startposition), 'position'); //get the first pagebreak @@ -225,20 +225,20 @@ /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// echo $OUTPUT->heading(format_text($feedback->name)); - + if( (intval($feedback->publish_stats) == 1) AND ( $capabilities->viewanalysepage) AND !( $capabilities->viewreports) ) { echo '
'; echo get_string('completed_feedbacks', 'feedback').''; echo '
'; } - + if(isset($savereturn) && $savereturn == 'saved') { if($feedback->page_after_submit) { // print_simple_box_start('center', '75%'); - print_box_start('generalbox boxaligncenter boxwidthwide'); + echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); echo format_text($feedback->page_after_submit); // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); } else { echo '

'.get_string('entries_saved','feedback').'

'; if( intval($feedback->publish_stats) == 1) { @@ -268,15 +268,15 @@ if(isset($savereturn) && $savereturn == 'failed') { echo '

'.get_string('saving_failed','feedback').'

'; } - + if(isset($savereturn) && $savereturn == 'missing') { echo '

'.get_string('saving_failed_because_missing_or_false_values','feedback').'

'; } - + //print the items if(is_array($feedbackitems)){ // print_simple_box_start('center', '75%'); - print_box_start('generalbox boxaligncenter boxwidthwide'); + echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); echo '
'; echo '
(*)' . get_string('items_are_required', 'feedback') . '
 
'; echo ''; } - + unset($startitem); $itemnr = $DB->count_records_select('feedback_item', 'feedback = ? AND hasvalue = 1 AND position < ?', array($feedback->id, $startposition)); foreach($feedbackitems as $feedbackitem){ @@ -321,7 +321,7 @@ } echo ''; echo ''; - + $lastbreakposition = $feedbackitem->position; //last item-pos (item or pagebreak) if($feedbackitem->typ == 'pagebreak'){ break; @@ -340,7 +340,7 @@ echo ''; echo ''; } - + if($ispagebreak AND $lastbreakposition > $firstpagebreak->position) { echo ''; } @@ -350,9 +350,9 @@ if($lastbreakposition >= $maxitemcount) { //last page echo ''; } - + echo ''; - + if($courseid) { echo ''; }else{ @@ -369,16 +369,16 @@ echo ''; $SESSION->feedback->is_started = true; // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); } } }else { // print_simple_box_start('center'); - print_box_start('generalbox boxaligncenter'); + echo $OUTPUT->box_start('generalbox boxaligncenter'); echo '

'.get_string('this_feedback_is_already_submitted', 'feedback').'

'; print_continue($CFG->wwwroot.'/course/view.php?id='.$course->id); // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); } /// Finish the page /////////////////////////////////////////////////////////////////////////// diff --git a/mod/feedback/delete_completed.php b/mod/feedback/delete_completed.php index b586b959a2..69695ac0e1 100644 --- a/mod/feedback/delete_completed.php +++ b/mod/feedback/delete_completed.php @@ -23,11 +23,11 @@ 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'); } @@ -35,11 +35,11 @@ $capabilities = feedback_load_capabilities($cm->id); require_login($course->id, true, $cm); - + if(!$capabilities->deletesubmissions){ print_error('error'); } - + $mform = new mod_feedback_delete_completed_form(); $newformdata = array('id'=>$id, 'completedid'=>$completedid, @@ -47,11 +47,11 @@ 'do_show'=>'edit'); $mform->set_data($newformdata); $formdata = $mform->get_data(); - + if ($mform->is_cancelled()) { redirect('show_entries.php?id='.$id.'&do_show=showentries'); } - + if(isset($formdata->confirmdelete) AND $formdata->confirmdelete == 1){ if($completed = $DB->get_record('feedback_completed', array('id'=>$completedid))) { feedback_delete_completed($completedid); @@ -64,13 +64,13 @@ $strfeedbacks = get_string("modulenameplural", "feedback"); $strfeedback = get_string("modulename", "feedback"); $buttontext = update_module_button($cm->id, $course->id, $strfeedback); - + $navlinks = array(); $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance'); - + $navigation = build_navigation($navlinks); - + print_header_simple(format_string($feedback->name), "", $navigation, "", "", true, $buttontext, navmenu($course, $cm)); @@ -80,12 +80,12 @@ /////////////////////////////////////////////////////////////////////////// echo $OUTPUT->heading(format_text($feedback->name)); // print_simple_box_start("center", "60%", "#FFAAAA", 20, "noticebox"); - print_box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal'); + echo $OUTPUT->box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal'); echo $OUTPUT->heading(get_string('confirmdeleteentry', 'feedback')); $mform->display(); // print_simple_box_end(); - print_box_end(); - + echo $OUTPUT->box_end(); + echo $OUTPUT->footer(); diff --git a/mod/feedback/delete_item.php b/mod/feedback/delete_item.php index 8714aca3c8..ea475aca10 100644 --- a/mod/feedback/delete_item.php +++ b/mod/feedback/delete_item.php @@ -7,7 +7,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License * @package feedback */ - + require_once("../../config.php"); require_once("lib.php"); require_once('delete_item_form.php'); @@ -19,11 +19,11 @@ 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'); } @@ -31,39 +31,39 @@ $capabilities = feedback_load_capabilities($cm->id); require_login($course->id, true, $cm); - + if(!$capabilities->edititems){ print_error('error'); } - + $mform = new mod_feedback_delete_item_form(); $newformdata = array('id'=>$id, 'deleteitem'=>$deleteitem, 'confirmdelete'=>'1'); $mform->set_data($newformdata); $formdata = $mform->get_data(); - + if ($mform->is_cancelled()) { redirect('edit.php?id='.$id); } - + if(isset($formdata->confirmdelete) AND $formdata->confirmdelete == 1){ feedback_delete_item($formdata->deleteitem); redirect('edit.php?id=' . $id); } - + /// Print the page header $strfeedbacks = get_string("modulenameplural", "feedback"); $strfeedback = get_string("modulename", "feedback"); $buttontext = update_module_button($cm->id, $course->id, $strfeedback); - + $navlinks = array(); $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance'); - + $navigation = build_navigation($navlinks); - + print_header_simple(format_string($feedback->name), "", $navigation, "", "", true, $buttontext, navmenu($course, $cm)); @@ -73,13 +73,13 @@ /////////////////////////////////////////////////////////////////////////// echo $OUTPUT->heading(format_text($feedback->name)); // print_simple_box_start("center", "60%", "#FFAAAA", 20, "noticebox"); - print_box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal'); + echo $OUTPUT->box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal'); echo $OUTPUT->heading(get_string('confirmdeleteitem', 'feedback')); print_string('relateditemsdeleted','feedback'); $mform->display(); // print_simple_box_end(); - print_box_end(); - + echo $OUTPUT->box_end(); + echo $OUTPUT->footer(); ?> diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php index 7d18106755..dd81b402cb 100644 --- a/mod/feedback/delete_template.php +++ b/mod/feedback/delete_template.php @@ -11,7 +11,7 @@ require_once("../../config.php"); require_once("lib.php"); require_once('delete_template_form.php'); - + // $SESSION->feedback->current_tab = 'templates'; $current_tab = 'templates'; @@ -20,11 +20,11 @@ $shoulddelete = optional_param('shoulddelete', false, PARAM_INT); $deletetempl = optional_param('deletetempl', false, PARAM_INT); // $formdata = data_submitted(); - + if(($formdata = data_submitted()) AND !confirm_sesskey()) { print_error('invalidsesskey'); } - + if($canceldelete == 1){ redirect(htmlspecialchars('edit.php?id='.$id.'&do_show=templates')); } @@ -33,11 +33,11 @@ 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'); } @@ -45,23 +45,23 @@ $capabilities = feedback_load_capabilities($cm->id); require_login($course->id, true, $cm); - + if(!$capabilities->deletetemplate){ print_error('error'); } - + $mform = new mod_feedback_delete_template_form(); $newformdata = array('id'=>$id, 'deletetempl'=>$deletetempl, 'confirmdelete'=>'1'); - + $mform->set_data($newformdata); $formdata = $mform->get_data(); - + if ($mform->is_cancelled()) { redirect(htmlspecialchars('delete_template.php?id='.$id)); } - + if(isset($formdata->confirmdelete) AND $formdata->confirmdelete == 1){ feedback_delete_template($formdata->deletetempl); redirect(htmlspecialchars('delete_template.php?id=' . $id)); @@ -71,38 +71,38 @@ $strfeedbacks = get_string("modulenameplural", "feedback"); $strfeedback = get_string("modulename", "feedback"); $buttontext = update_module_button($cm->id, $course->id, $strfeedback); - + $navlinks = array(); $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance'); - + $navigation = build_navigation($navlinks); - + print_header_simple(format_string($feedback->name), "", $navigation, "", "", true, $buttontext, navmenu($course, $cm)); /// print the tabs include('tabs.php'); - + /// Print the main part of the page /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// echo $OUTPUT->heading(get_string('delete_template','feedback')); if($shoulddelete == 1) { - + // print_simple_box_start("center", "60%", "#FFAAAA", 20, "noticebox"); - print_box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal'); + echo $OUTPUT->box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal'); echo $OUTPUT->heading(get_string('confirmdeletetemplate', 'feedback')); $mform->display(); // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); }else { $templates = feedback_get_template_list($course, true); echo '
'; if(!is_array($templates)) { // print_simple_box(get_string('no_templates_available_yet', 'feedback'), "center"); - print_box(get_string('no_templates_available_yet', 'feedback'), 'generalbox boxaligncenter'); + echo $OUTPUT->box(get_string('no_templates_available_yet', 'feedback'), 'generalbox boxaligncenter'); }else { echo '
@@ -290,7 +290,7 @@ if($countreq > 0) { echo '
(*)' . get_string('items_are_required', 'feedback') . '
 
'; echo ''; diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php index 186c852d54..b207fe7be1 100644 --- a/mod/feedback/edit.php +++ b/mod/feedback/edit.php @@ -17,7 +17,7 @@ if(($formdata = data_submitted()) AND !confirm_sesskey()) { print_error('invalidsesskey'); } - + $do_show = optional_param('do_show', 'edit', PARAM_ALPHA); $moveupitem = optional_param('moveupitem', false, PARAM_INT); $movedownitem = optional_param('movedownitem', false, PARAM_INT); @@ -26,19 +26,19 @@ $switchitemrequired = optional_param('switchitemrequired', false, PARAM_INT); $ME = strip_querystring($FULLME);//sometimes it is not correct set - + // $SESSION->feedback->current_tab = $do_show; $current_tab = $do_show; - + 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'); } @@ -46,7 +46,7 @@ $capabilities = feedback_load_capabilities($cm->id); require_login($course->id, true, $cm); - + if(!$capabilities->edititems){ print_error('error'); } @@ -60,7 +60,7 @@ $item = $DB->get_record('feedback_item', array('id'=>$movedownitem)); feedback_movedown_item($item); } - + //moving of items if($movehere && isset($SESSION->feedback->moving->movingitem)){ $item = $DB->get_record('feedback_item', array('id'=>$SESSION->feedback->moving->movingitem)); @@ -74,14 +74,14 @@ } else { unset($SESSION->feedback->moving); } - + if($switchitemrequired) { $item = $DB->get_record('feedback_item', array('id'=>$switchitemrequired)); @feedback_switch_item_required($item); redirect($ME.'?'.feedback_edit_get_default_query($id, $do_show)); exit; } - + //the create_template-form $create_template_form = new feedback_edit_create_template_form(); $create_template_form->set_feedbackdata(array('capabilities' => $capabilities)); @@ -124,8 +124,8 @@ } } $lastposition++; - - + + //the add_item-form $add_item_form = new feedback_edit_add_question_form('edit_item.php'); $add_item_form->set_data(array('id'=>$id, 'position'=>$lastposition)); @@ -143,13 +143,13 @@ $strfeedbacks = get_string("modulenameplural", "feedback"); $strfeedback = get_string("modulename", "feedback"); $buttontext = update_module_button($cm->id, $course->id, $strfeedback); - + $navlinks = array(); $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance'); - + $navigation = build_navigation($navlinks); - + print_header_simple(format_string($feedback->name), "", $navigation, "", "", true, $buttontext, navmenu($course, $cm)); @@ -160,9 +160,9 @@ /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// - + $savereturn=isset($savereturn)?$savereturn:''; - + //print the messages if($savereturn == 'notsaved_name') { echo '

'.get_string('name_required','feedback').'

'; @@ -171,21 +171,21 @@ if($savereturn == 'saved') { echo '

'.get_string('template_saved','feedback').'

'; } - + if($savereturn == 'failed') { echo '

'.get_string('saving_failed','feedback').'

'; } feedback_print_errors(); - + /////////////////////////////////////////////////////////////////////////// ///print the template-section /////////////////////////////////////////////////////////////////////////// if($do_show == 'templates') { // print_simple_box_start("center", '80%'); - print_box_start('generalbox boxaligncenter boxwidthwide'); + echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); $use_template_form->display(); - + if($capabilities->createprivatetemplate OR $capabilities->createpublictemplate) { $create_template_form->display(); echo '

'.get_string('delete_templates', 'feedback').'

'; @@ -200,34 +200,34 @@

'; } // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); } /////////////////////////////////////////////////////////////////////////// ///print the Item-Edit-section /////////////////////////////////////////////////////////////////////////// if($do_show == 'edit') { - + $add_item_form->display(); if(is_array($feedbackitems)){ $itemnr = 0; - + $helpbutton = helpbutton('preview', get_string('preview','feedback'), 'feedback',true,false,'',true); - + echo $OUTPUT->heading($helpbutton . get_string('preview', 'feedback')); if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) { echo $OUTPUT->heading(''.get_string('cancel_moving', 'feedback').''); } // print_simple_box_start('center', '80%'); - print_box_start('generalbox boxaligncenter boxwidthwide'); - + echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); + //check, if there exists required-elements $countreq = $DB->count_records('feedback_item', array('feedback'=>$feedback->id, 'required'=> 1)); if($countreq > 0) { // echo '(*)' . get_string('items_are_required', 'feedback') . ''; echo ''; } - + echo '
'.get_string('templates', 'feedback').' 
'; if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) { $moveposition = 1; @@ -332,7 +332,7 @@ } echo ''; echo ''; } - + } echo '
'; - + //print the toggle-button to switch required yes/no if($feedbackitem->hasvalue == 1) { // echo '
'; @@ -389,14 +389,14 @@ }else { echo '
 
'; // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); }else{ // print_simple_box(get_string('no_items_available_yet','feedback'),"center"); - print_box(get_string('no_items_available_yet','feedback'),'generalbox boxaligncenter'); + echo $OUTPUT->box(get_string('no_items_available_yet','feedback'),'generalbox boxaligncenter'); } } /// Finish the page @@ -408,17 +408,17 @@ 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 ''; echo ''; echo ''; diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php index 9e5d71549d..44fc11318d 100644 --- a/mod/feedback/edit_item.php +++ b/mod/feedback/edit_item.php @@ -14,11 +14,11 @@ $id = optional_param('id', NULL, PARAM_INT); $typ = optional_param('typ', false, PARAM_ALPHA); $itemid = optional_param('itemid', false, PARAM_INT); - + if(!$typ)redirect(htmlspecialchars('edit.php?id=' . $id)); // set up some general variables - $usehtmleditor = can_use_html_editor(); + $usehtmleditor = can_use_html_editor(); if(($formdata = data_submitted()) AND !confirm_sesskey()) { @@ -29,11 +29,11 @@ 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'); } @@ -41,7 +41,7 @@ $capabilities = feedback_load_capabilities($cm->id); require_login($course->id, true, $cm); - + if(!$capabilities->edititems){ print_error('error'); } @@ -52,7 +52,7 @@ redirect(htmlspecialchars('edit.php?id='.$id)); exit; } - + //get the existing item or create it // $formdata->itemid = isset($formdata->itemid) ? $formdata->itemid : NULL; if($itemid and $item = $DB->get_record('feedback_item', array('id'=>$itemid))) { @@ -78,7 +78,7 @@ // if(isset($formdata->editcancel) AND $formdata->editcancel == 1){ // redirect(htmlspecialchars('edit.php?id=' . $id)); // } - + if(isset($formdata->saveitem) AND $formdata->saveitem == 1){ $newposition = $formdata->position; $formdata->position = $newposition + 1; @@ -91,10 +91,10 @@ $SESSION->feedback->errors[] = get_string('item_creation_failed', 'feedback'); }else { redirect(htmlspecialchars('edit.php?id='.$id)); - } + } } } - + if(isset($formdata->updateitem) AND $formdata->updateitem == 1){ //update the item and go back if (!feedback_update_item($item, $formdata)) { @@ -104,7 +104,7 @@ $SESSION->feedback->errors[] = get_string('item_update_failed', 'feedback'); }else { redirect(htmlspecialchars('edit.php?id='.$id)); - } + } } } //////////////////////////////////////////////////////////////////////////////////// @@ -114,45 +114,45 @@ $strfeedbacks = get_string("modulenameplural", "feedback"); $strfeedback = get_string("modulename", "feedback"); $buttontext = update_module_button($cm->id, $course->id, $strfeedback); - + $navlinks = array(); $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance'); - + $navigation = build_navigation($navlinks); - + print_header_simple(format_string($feedback->name), "", $navigation, "", "", true, $buttontext, navmenu($course, $cm)); /// print the tabs include('tabs.php'); - + /// Print the main part of the page /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// echo $OUTPUT->heading(format_text($feedback->name)); - - + + //print errormsg if(isset($error)){echo $error;} feedback_print_errors(); - + //new formdefinition $itemclass = 'feedback_item_'.$typ; $itemobj = new $itemclass(); $item_form = &$itemobj->show_edit($item); - + $i_form = &$item_form->get_item_form(); // $i_form->addElement('header', 'general', 'Titel'); $i_form->addElement('hidden', 'id', $id); $i_form->addElement('hidden', 'itemid', isset($item->id)?$item->id:''); $i_form->addElement('hidden', 'typ', $typ); $i_form->addElement('hidden', 'feedbackid', $feedback->id); - - $lastposition = $DB->count_records('feedback_item', array('feedback'=>$feedback->id)); + + $lastposition = $DB->count_records('feedback_item', array('feedback'=>$feedback->id)); if($position == -1){ $i_formselect_last = $lastposition + 1; $i_formselect_value = $lastposition + 1; @@ -161,11 +161,11 @@ $i_formselect_value = $item->position; } $i_formselect = $i_form->addElement('select', - 'position', - get_string('position', 'feedback').' ', + 'position', + get_string('position', 'feedback').' ', array_slice(range(0,$i_formselect_last),1,$i_formselect_last,true)); $i_formselect->setValue($i_formselect_value); - + $buttonarray = array(); if(!empty($item->id)){ $i_form->addElement('hidden', 'updateitem', '1'); @@ -181,23 +181,23 @@ $i_form->addGroup($buttonarray, 'buttonar', '', array(' '), false); $item_form->display(); -/* +/* // print_simple_box_start('center'); - print_box_start('generalbox boxwidthwide boxaligncenter'); + echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter'); echo ''; echo ''; - + //this div makes the buttons stand side by side echo '
'; $itemclass = 'feedback_item_'.$typ; $itemobj = new $itemclass(); $itemobj->show_edit($item, $usehtmleditor); - echo '
'; + echo '
'; echo ''; echo ''; echo ''; echo ''; - + //choose the position $lastposition = $DB->count_records('feedback_item', array('feedback'=>$feedback->id)); echo get_string('position', 'feedback').' '; @@ -209,9 +209,9 @@ feedback_print_numeric_option_list(1, $lastposition, $item->position); } echo '
'; - - ////////////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////////////////////////////////////// + + ////////////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////////// if(!empty($item->id)){ echo ''; echo ''; @@ -221,16 +221,16 @@ } echo ''; echo ''; - ////////////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////// */ // print_simple_box_end(); - // print_box_end(); - + // echo $OUTPUT->box_end(); + if ($typ!='label') { $PAGE->requires->js('mod/feedback/feedback.js'); $PAGE->requires->js_function_call('set_item_focus', Array('id_itemname')); - } + } /// Finish the page /////////////////////////////////////////////////////////////////////////// diff --git a/mod/feedback/import.php b/mod/feedback/import.php index 0821a253a4..ea8c6e259f 100644 --- a/mod/feedback/import.php +++ b/mod/feedback/import.php @@ -10,7 +10,7 @@ require_once("../../config.php"); require_once("lib.php"); - + // get parameters $id = required_param('id', PARAM_INT); $choosefile = optional_param('choosefile', false, PARAM_PATH); @@ -19,16 +19,16 @@ if(($formdata = data_submitted()) AND !confirm_sesskey()) { print_error('invalidsesskey'); } - + 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'); } @@ -36,33 +36,33 @@ $capabilities = feedback_load_capabilities($cm->id); require_login($course->id, true, $cm); - + if(!$capabilities->edititems){ print_error('invalidaction'); } - + unset($filename); - if ($action == 'choosefile' AND confirm_sesskey() ) { + if ($action == 'choosefile' AND confirm_sesskey() ) { // file checks out ok $fileisgood = false; - // work out if this is an uploaded file + // work out if this is an uploaded file // or one from the filesarea. if ($choosefile) { $filename = "{$CFG->dataroot}/{$course->id}/{$choosefile}"; } } - + // process if we are happy file is ok - if (isset($filename)) { + if (isset($filename)) { if(!is_file($filename) OR !is_readable($filename)) { print_error('filenotreadable'); } if(!$xmldata = feedback_load_xml_data($filename)) { print_error('cannotloadxml', 'feedback', 'edit.php?id='.$id); } - + $importerror = feedback_import_loaded_data($xmldata, $feedback->id); if($importerror->stat == true) { redirect('edit.php?id='.$id.'&do_show=templates', get_string('import_successfully', 'feedback'), 3); @@ -75,13 +75,13 @@ $strfeedbacks = get_string("modulenameplural", "feedback"); $strfeedback = get_string("modulename", "feedback"); $buttontext = update_module_button($cm->id, $course->id, $strfeedback); - + $navlinks = array(); $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance'); - + $navigation = build_navigation($navlinks); - + print_header_simple(format_string($feedback->name), "", $navigation, "", "", true, $buttontext, navmenu($course, $cm)); @@ -91,17 +91,17 @@ /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// echo $OUTPUT->heading(get_string('import_questions','feedback')); - + if(isset($importerror->msg) AND is_array($importerror->msg)) { // print_simple_box_start('center', '', '#FFAAAA', 5, 'notifyproblem'); - print_box_start('generalbox errorboxcontent boxaligncenter'); + echo $OUTPUT->box_start('generalbox errorboxcontent boxaligncenter'); foreach($importerror->msg as $msg) { echo $msg.'
'; } // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); } - + ?>
@@ -109,7 +109,7 @@ - + box_start('generalbox boxaligncenter boxwidthwide'); ?>

@@ -120,7 +120,7 @@ -
 button->text = get_string('choosefile', 'feedback'); $form->button->title = $form->button->text; @@ -132,8 +132,8 @@
- + box_end(); ?>
$id, 'do_show'=>'templates'), get_string('cancel')); echo ''; echo $OUTPUT->footer(); - + function feedback_load_xml_data($filename) { global $CFG; require_once($CFG->dirroot.'/lib/xmlize.php'); - + $datei = file_get_contents($filename); - + if(!$datei = feedback_check_xml_utf8($datei)) return false; - + $data = xmlize($datei, 1, 'UTF-8'); - + if(intval($data['FEEDBACK']['@']['VERSION']) != 200701) { return false; } $data = $data['FEEDBACK']['#']['ITEMS'][0]['#']['ITEM']; return $data; } - + function feedback_import_loaded_data(&$data, $feedbackid){ global $CFG, $DB; - + $deleteolditems = optional_param('deleteolditems', 0, PARAM_INT); - + $error = new object(); $error->stat = true; $error->msg = array(); - + if(!is_array($data)) { $error->msg[] = get_string('data_is_not_an_array', 'feedback'); $error->stat = false; return $error; } - + if($deleteolditems) { feedback_delete_all_items($feedbackid); $position = 0; @@ -182,12 +182,12 @@ //items will be add to the end of the existing items $position = $DB->count_records('feedback_item', array('feedback'=>$feedbackid)); } - + foreach($data as $item) { $position++; //check the typ $typ = $item['@']['TYPE']; - + //check oldtypes first switch($typ) { case 'radio': @@ -221,7 +221,7 @@ continue; } $itemobj = new $itemclass(); - + $newitem = new object(); $newitem->feedback = $feedbackid; $newitem->template = 0; @@ -246,7 +246,7 @@ $newitem->presentation = 'd>>>>>'.$newitem->presentation; break; } - + if($typ != 'pagebreak') { $newitem->hasvalue = $itemobj->get_hasvalue(); }else { @@ -262,16 +262,16 @@ function feedback_check_xml_utf8($text) { //find the encoding $searchpattern = '/^\<\?xml.+(encoding=\"([a-z0-9-]*)\").+\?\>/is'; - + if(!preg_match($searchpattern, $text, $match)) return false; //no xml-file - + //$match[0] = \<\? xml ... \?\> (without \) //$match[1] = encoding="...." //$match[2] = ISO-8859-1 or so on if(isset($match[0]) AND !isset($match[1])){ //no encoding given. we assume utf-8 return $text; } - + if(isset($match[0]) AND isset($match[1]) AND isset($match[2])) { //encoding is given in $match[2] $enc = $match[2]; $textlib = textlib_get_instance(); diff --git a/mod/feedback/item/captcha/lib.php b/mod/feedback/item/captcha/lib.php index 69071a177c..c4cc1220b5 100644 --- a/mod/feedback/item/captcha/lib.php +++ b/mod/feedback/item/captcha/lib.php @@ -5,20 +5,20 @@ require_once($CFG->dirroot.'/mod/feedback/item/feedback_item_class.php'); class feedback_item_captcha extends feedback_item_base { var $type = "captcha"; function init() { - + } - + function show_edit($item) { global $CFG; - + require_once('captcha_form.php'); - + $item_form = new feedback_captcha_form(); $item->presentation = empty($item->presentation) ? 3 : $item->presentation; $item->name = empty($item->name) ? '' : $item->name; $item->label = empty($item->label) ? '' : $item->label; - + $item->required = isset($item->required) ? $item->required : 1; if($item->required) { $item_form->requiredcheck->setValue(true); @@ -26,7 +26,7 @@ class feedback_item_captcha extends feedback_item_base { $item_form->itemname->setValue($item->name); $item_form->itemlabel->setValue($item->label); - + $item_form->select->setValue($item->presentation); return $item_form; } @@ -49,13 +49,13 @@ class feedback_item_captcha extends feedback_item_base { } function print_item($item, $value = false, $readonly = false, $edit = false, $highlightrequire = false){ - global $SESSION, $CFG, $DB; - + global $SESSION, $CFG, $DB, $OUTPUT; + $align = get_string('thisdirection') == 'ltr' ? 'left' : 'right'; - + $presentation = $item->presentation; $SESSION->feedback->item->captcha->charcount = $presentation; - + $cmid = 0; if(!$readonly) { $feedbackid = $item->feedback; @@ -66,21 +66,21 @@ class feedback_item_captcha extends feedback_item_base { } } } - + if(isset($SESSION->feedback->item->captcha->checked)) { $checked = $SESSION->feedback->item->captcha->checked == true; unset($SESSION->feedback->item->captcha->checked); }else { $checked = false; } - + //check if an false value even the value is not required if(!$readonly AND !$item->required AND $value != '' AND $SESSION->feedback->item->captcha->checkchar != $value) { $falsevalue = true; }else { $falsevalue = false; } - + if(($highlightrequire AND $item->required AND !$checked) OR $falsevalue) { $highlight = 'bgcolor="#FFAAAA" class="missingrequire"'; }else { @@ -101,10 +101,10 @@ class feedback_item_captcha extends feedback_item_base { box_start('generalbox boxalign'.$align); echo $value ? $value : ' '; // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); }else { ?> dirroot.'/mod/feedback/item/feedback_item_class.php'); class feedback_item_info extends feedback_item_base { var $type = "info"; function init() { - + } - + function &show_edit($item) { global $CFG; - + require_once('info_form.php'); - + $item_form = new feedback_info_form(); - + $item->presentation = empty($item->presentation) ? '' : $item->presentation; $item->name = empty($item->name) ? '' : htmlspecialchars($item->name); $item->label = empty($item->label) ? '' : $item->label; - + $item_form->requiredcheck->setValue(false); $item_form->itemname->setValue($item->name); $item_form->itemlabel->setValue($item->label); $item_form->infotype->setValue($item->presentation); - + return $item_form; } //liefert eine Struktur ->name, ->data = array(mit Antworten) function get_analysed($item, $groupid = false, $courseid = false) { - + $presentation = $item->presentation; $aVal = null; $aVal->data = null; @@ -42,7 +42,7 @@ class feedback_item_info extends feedback_item_base { $data = array(); $datavalue = new object(); foreach($values as $value) { - + switch($presentation) { case 1: $datavalue->value = $value->value; @@ -66,7 +66,7 @@ class feedback_item_info extends feedback_item_base { } function get_printval($item, $value) { - + if(!isset($value->value)) return ''; return UserDate($value->value); } @@ -105,9 +105,9 @@ class feedback_item_info extends feedback_item_base { } function print_item($item, $value = false, $readonly = false, $edit = false, $highlightrequire = false){ - global $USER, $DB; + global $USER, $DB, $OUTPUT; $align = get_string('thisdirection') == 'ltr' ? 'left' : 'right'; - + $presentation = $item->presentation; if($highlightrequire AND $item->required AND strval($value) == '') { $highlight = 'bgcolor="#FFAAAA" class="missingrequire"'; @@ -128,10 +128,10 @@ class feedback_item_info extends feedback_item_base { box_start('generalbox boxalign'.$align); echo $value ? UserDate($value):' '; // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); }else { $feedback = $DB->get_record('feedback', array('id'=>$item->feedback)); $course = $DB->get_record('course', array('id'=>$feedback->course)); diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php index 999111e207..bb017404f1 100644 --- a/mod/feedback/item/multichoice/lib.php +++ b/mod/feedback/item/multichoice/lib.php @@ -9,16 +9,16 @@ define('FEEDBACK_MULTICHOICE_ADJUST_SEP', '<<<<<'); class feedback_item_multichoice extends feedback_item_base { var $type = "multichoice"; function init() { - + } - + function show_edit($item) { global $CFG; - + require_once('multichoice_form.php'); - + $item_form = new feedback_multichoice_form(); - + $item->presentation = empty($item->presentation) ? '' : $item->presentation; $item->name = empty($item->name) ? '' : $item->name; $item->label = empty($item->label) ? '' : $item->label; @@ -29,12 +29,12 @@ class feedback_item_multichoice extends feedback_item_base { if($item->required) { $item_form->requiredcheck->setValue(true); } - + $item_form->itemname->setValue($item->name); $item_form->itemlabel->setValue($item->label); - + $item_form->selectadjust->setValue($info->horizontal); - + $item_form->selecttype->setValue($info->subtype); $itemvalues = str_replace(FEEDBACK_MULTICHOICE_LINE_SEP, "\n", $info->presentation); @@ -47,7 +47,7 @@ class feedback_item_multichoice extends feedback_item_base { //XXX ist ein eindimensionales Array (anzahl der Antworten bei Typ Radio) Jedes Element ist eine Struktur (answertext, answercount) function get_analysed($item, $groupid = false, $courseid = false) { $info = $this->get_info($item); - + $analysedItem = array(); $analysedItem[] = $item->typ; $analysedItem[] = $item->name; @@ -55,7 +55,7 @@ class feedback_item_multichoice extends feedback_item_base { $answers = null; // $presentation = ''; // @list($presentation) = explode(FEEDBACK_RADIO_ADJUST_SEP, $item->presentation); //remove the adjustment-info - + $answers = explode (FEEDBACK_MULTICHOICE_LINE_SEP, $info->presentation); if(!is_array($answers)) return null; @@ -63,7 +63,7 @@ class feedback_item_multichoice extends feedback_item_base { $values = feedback_get_group_values($item, $groupid, $courseid); if(!$values) return null; //schleife ueber den Werten und ueber die Antwortmoeglichkeiten - + $analysedAnswer = array(); if($info->subtype == 'c') { for($i = 1; $i <= sizeof($answers); $i++) { @@ -103,15 +103,15 @@ class feedback_item_multichoice extends feedback_item_base { function get_printval($item, $value) { $info = $this->get_info($item); - + $printval = ''; - + if(!isset($value->value)) return $printval; - + // @list($presentation) = explode(FEEDBACK_RADIO_ADJUST_SEP, $item->presentation); //remove the adjustment-info - + $presentation = explode (FEEDBACK_MULTICHOICE_LINE_SEP, $info->presentation); - + if($info->subtype == 'c') { $vallist = array_values(explode (FEEDBACK_MULTICHOICE_LINE_SEP, $value->value)); for($i = 0; $i < sizeof($vallist); $i++) { @@ -140,12 +140,12 @@ class feedback_item_multichoice extends feedback_item_base { if(substr($sep_dec, 0, 2) == '[['){ $sep_dec = FEEDBACK_DECIMAL; } - + $sep_thous = get_string('separator_thousand', 'feedback'); if(substr($sep_thous, 0, 2) == '[['){ $sep_thous = FEEDBACK_THOUSAND; } - + $analysedItem = $this->get_analysed($item, $groupid, $courseid); if($analysedItem) { // $itemnr++; @@ -182,10 +182,10 @@ class feedback_item_multichoice extends feedback_item_base { if(is_array($data)) { for($i = 0; $i < sizeof($data); $i++) { $aData = $data[$i]; - + $worksheet->setFormat(""); $worksheet->write_string($rowOffset, $i + 2, trim($aData->answertext)); - + $worksheet->setFormat(""); $worksheet->write_number($rowOffset + 1, $i + 2, $aData->answercount); $worksheet->setFormat(""); @@ -197,12 +197,13 @@ class feedback_item_multichoice extends feedback_item_base { } function print_item($item, $value = false, $readonly = false, $edit = false, $highlightrequire = false){ + global $OUTPUT; $info = $this->get_info($item); $align = get_string('thisdirection') == 'ltr' ? 'left' : 'right'; - + $presentation = explode (FEEDBACK_MULTICHOICE_LINE_SEP, $info->presentation); - - + + //test if required and no value is set so we have to mark this item //we have to differ check and the other subtypes if($info->subtype == 'c') { @@ -217,11 +218,11 @@ class feedback_item_multichoice extends feedback_item_base { $highlight = ''; } $requiredmark = ($item->required == 1)?'':''; - + echo ''; if($edit OR $readonly) { echo '('.$item->label.') '; - } + } echo format_text($item->name.$requiredmark, true, false, false).''; echo ''; }else { @@ -233,7 +234,7 @@ class feedback_item_multichoice extends feedback_item_base { $requiredmark = ($item->required == 1)?'':''; ?> valign="top" align=""> - label.') '; } @@ -247,7 +248,7 @@ class feedback_item_multichoice extends feedback_item_base { $checked = ''; if($readonly){ if($info->subtype == 'c') { - print_box_start('generalbox boxalign'.$align); + echo $OUTPUT->box_start('generalbox boxalign'.$align); foreach($presentation as $pres){ foreach($values as $val) { if($val == $index){ @@ -258,15 +259,15 @@ class feedback_item_multichoice extends feedback_item_base { $index++; } // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); }else { foreach($presentation as $pres){ if($value == $index){ // print_simple_box_start($align); - print_box_start('generalbox boxalign'.$align); + echo $OUTPUT->box_start('generalbox boxalign'.$align); echo text_to_html($pres, true, false, false); // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); break; } $index++; @@ -293,7 +294,7 @@ class feedback_item_multichoice extends feedback_item_base { echo ''; } } - + switch($info->subtype) { case 'r': $this->print_item_radio($presentation, $item, $value, $info, $align); @@ -305,7 +306,7 @@ class feedback_item_multichoice extends feedback_item_base { $this->print_item_dropdown($presentation, $item, $value, $info, $align); break; } - + if($info->subtype != 'd') { if($info->horizontal) { echo '
'; @@ -324,7 +325,7 @@ class feedback_item_multichoice extends feedback_item_base { function check_value($value, $item) { $info = $this->get_info($item); - + if($info->subtype == 'c') { if((!isset($value) OR !is_array($value) OR $value[0] == '' OR $value[0] == 0) AND $item->required != 1){ return true; @@ -362,17 +363,17 @@ class feedback_item_multichoice extends feedback_item_base { function get_hasvalue() { return 1; } - + function get_info($item) { $presentation = empty($item->presentation) ? '' : $item->presentation; - + $info = new object(); //check the subtype of the multichoice //it can be check(c), radio(r) or dropdown(d) $info->subtype = ''; $info->presentation = ''; $info->horizontal = false; - + @list($info->subtype, $info->presentation) = explode(FEEDBACK_MULTICHOICE_TYPE_SEP, $item->presentation); if(!isset($info->subtype)) { $info->subtype = 'r'; @@ -388,7 +389,7 @@ class feedback_item_multichoice extends feedback_item_base { } return $info; } - + function item_arrayToString($value) { if(!is_array($value)) { return $value; @@ -402,7 +403,7 @@ class feedback_item_multichoice extends feedback_item_base { } return $retval; } - + function print_item_radio($presentation, $item, $value, $info, $align) { $index = 1; $checked = ''; @@ -441,13 +442,13 @@ class feedback_item_multichoice extends feedback_item_base { } function print_item_check($presentation, $item, $value, $info, $align) { - + if (is_array($value)) { $values = $value; }else { $values = explode(FEEDBACK_MULTICHOICE_LINE_SEP, $value); } - + $index = 1; $checked = ''; foreach($presentation as $check){ @@ -469,7 +470,7 @@ class feedback_item_multichoice extends feedback_item_base { value="" /> - @@ -484,7 +485,7 @@ class feedback_item_multichoice extends feedback_item_base { $index++; } } - + function print_item_dropdown($presentation, $item, $value, $info, $align) { ?> diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php index f7b62fa9dd..33937c7157 100644 --- a/mod/feedback/item/multichoicerated/lib.php +++ b/mod/feedback/item/multichoicerated/lib.php @@ -14,16 +14,16 @@ define('FEEDBACK_MULTICHOICERATED_ADJUST_SEP', '<<<<<'); class feedback_item_multichoicerated extends feedback_item_base { var $type = "multichoicerated"; function init() { - + } - + function show_edit($item) { global $CFG; - + require_once('multichoicerated_form.php'); - + $item_form = new feedback_multichoicerated_form(); - + $item->presentation = empty($item->presentation) ? '' : $item->presentation; $item->name = empty($item->name) ? '' : $item->name; $item->label = empty($item->label) ? '' : $item->label; @@ -34,17 +34,17 @@ class feedback_item_multichoicerated extends feedback_item_base { if($item->required) { $item_form->requiredcheck->setValue(true); } - + $item_form->itemname->setValue($item->name); $item_form->itemlabel->setValue($item->label); - + $item_form->selectadjust->setValue($info->horizontal); - + $item_form->selecttype->setValue($info->subtype); $itemvalues = $this->prepare_presentation_values_print($info->presentation, FEEDBACK_MULTICHOICERATED_VALUE_SEP, FEEDBACK_MULTICHOICERATED_VALUE_SEP2); $item_form->values->setValue($itemvalues); - + return $item_form; } @@ -54,7 +54,7 @@ class feedback_item_multichoicerated extends feedback_item_base { $analysedItem = array(); $analysedItem[] = $item->typ; $analysedItem[] = $item->name; - + //die moeglichen Antworten extrahieren $info = $this->get_info($item); $lines = null; @@ -65,7 +65,7 @@ class feedback_item_multichoicerated extends feedback_item_base { $values = feedback_get_group_values($item, $groupid, $courseid); if(!$values) return null; //schleife ueber den Werten und ueber die Antwortmoeglichkeiten - + $analysedAnswer = array(); for($i = 1; $i <= sizeof($lines); $i++) { @@ -93,11 +93,11 @@ class feedback_item_multichoicerated extends feedback_item_base { function get_printval($item, $value) { $printval = ''; - + if(!isset($value->value)) return $printval; - + $info = $this->get_info($item); - + $presentation = explode (FEEDBACK_MULTICHOICERATED_LINE_SEP, $info->presentation); $index = 1; foreach($presentation as $pres){ @@ -116,12 +116,12 @@ class feedback_item_multichoicerated extends feedback_item_base { if(substr($sep_dec, 0, 2) == '[['){ $sep_dec = FEEDBACK_DECIMAL; } - + $sep_thous = get_string('separator_thousand', 'feedback'); if(substr($sep_thous, 0, 2) == '[['){ $sep_thous = FEEDBACK_THOUSAND; } - + $analysedItem = $this->get_analysed($item, $groupid, $courseid); if($analysedItem) { //echo '
'; @@ -139,7 +139,7 @@ class feedback_item_multichoicerated extends feedback_item_base { $pix = "pics/$intvalue.gif"; $pixnr++; $pixwidth = intval($val->quotient * FEEDBACK_MAX_PIX_LENGTH); - + $avg += $val->avg; $quotient = number_format(($val->quotient * 100), 2, $sep_dec, $sep_thous); echo ''; @@ -165,10 +165,10 @@ class feedback_item_multichoicerated extends feedback_item_base { $avg = 0.0; for($i = 0; $i < sizeof($data); $i++) { $aData = $data[$i]; - + $worksheet->setFormat(""); $worksheet->write_string($rowOffset, $i + 2, trim($aData->answertext).' ('.$aData->value.')'); - + $worksheet->setFormat(""); $worksheet->write_number($rowOffset + 1, $i + 2, $aData->answercount); //$worksheet->setFormat(""); @@ -178,7 +178,7 @@ class feedback_item_multichoicerated extends feedback_item_base { //mittelwert anzeigen $worksheet->setFormat(""); $worksheet->write_string($rowOffset, sizeof($data) + 2, get_string('average', 'feedback')); - + $worksheet->setFormat(""); $worksheet->write_number($rowOffset + 1, sizeof($data) + 2, $avg); } @@ -187,9 +187,10 @@ class feedback_item_multichoicerated extends feedback_item_base { } function print_item($item, $value = false, $readonly = false, $edit = false, $highlightrequire = false){ + global $OUTPUT; $align = get_string('thisdirection') == 'ltr' ? 'left' : 'right'; $info = $this->get_info($item); - + $lines = explode (FEEDBACK_MULTICHOICERATED_LINE_SEP, $info->presentation); $requiredmark = ($item->required == 1)?'':''; if($highlightrequire AND $item->required AND intval($value) <= 0) { @@ -215,10 +216,10 @@ class feedback_item_multichoicerated extends feedback_item_base { if($value == $index){ $item_value = explode(FEEDBACK_MULTICHOICERATED_VALUE_SEP, $line); // print_simple_box_start('left'); - print_box_start('generalbox boxalign'.$align); + echo $OUTPUT->box_start('generalbox boxalign'.$align); echo text_to_html($item_value[1], true, false, false); // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); break; } $index++; @@ -267,17 +268,17 @@ class feedback_item_multichoicerated extends feedback_item_base { function get_hasvalue() { return 1; } - + function get_info($item) { $presentation = empty($item->presentation) ? '' : $item->presentation; - + $info = new object(); //check the subtype of the multichoice //it can be check(c), radio(r) or dropdown(d) $info->subtype = ''; $info->presentation = ''; $info->horizontal = false; - + @list($info->subtype, $info->presentation) = explode(FEEDBACK_MULTICHOICE_TYPE_SEP, $item->presentation); if(!isset($info->subtype)) { $info->subtype = 'r'; @@ -295,7 +296,7 @@ class feedback_item_multichoicerated extends feedback_item_base { return $info; } - + function print_item_radio($item, $value, $info, $align, $edit, $lines) { $index = 1; $checked = ''; @@ -361,7 +362,7 @@ class feedback_item_multichoicerated extends feedback_item_base { echo '
-  ' . trim($val->answertext) . ' ('.$val->value.'):'.$intvalue.'' . $val->answercount. (($val->quotient > 0)?' ('. $quotient . ' %)':'') . '
'; } } - + function print_item_dropdown($item, $value, $info, $align, $edit, $lines) { echo ''; - + } - + function prepare_presentation_values_print($valuestring, $valuesep1, $valuesep2) { $lines = explode(FEEDBACK_MULTICHOICERATED_LINE_SEP, $valuestring); $newlines = array(); @@ -397,28 +398,28 @@ class feedback_item_multichoicerated extends feedback_item_base { }else { @list($value, $text) = explode($valuesep1, $line, 2); } - + $value = intval($value); $newlines[] = $value.$valuesep2.$text; } $newlines = implode("\n", $newlines); return $newlines; } - + function prepare_presentation_values_save($valuestring, $valuesep1, $valuesep2) { $lines = explode("\n", $valuestring); $newlines = array(); foreach($lines as $line) { $value = ''; $text = ''; - + if(strpos($line, $valuesep1) === false) { $value = 0; $text = $line; }else { @list($value, $text) = explode($valuesep1, $line, 2); } - + $value = intval($value); $newlines[] = $value.$valuesep2.$text; } diff --git a/mod/feedback/item/numeric/lib.php b/mod/feedback/item/numeric/lib.php index 353e201da5..e51b00cd9f 100644 --- a/mod/feedback/item/numeric/lib.php +++ b/mod/feedback/item/numeric/lib.php @@ -5,30 +5,30 @@ require_once($CFG->dirroot.'/mod/feedback/item/feedback_item_class.php'); class feedback_item_numeric extends feedback_item_base { var $type = "numeric"; var $sep_dec, $sep_thous; - + function init() { $this->sep_dec = get_string('separator_decimal', 'feedback'); if(substr($this->sep_dec, 0, 2) == '[['){ $this->sep_dec = FEEDBACK_DECIMAL; } - + $this->sep_thous = get_string('separator_thousand', 'feedback'); if(substr($this->sep_thous, 0, 2) == '[['){ $this->sep_thous = FEEDBACK_THOUSAND; - } + } } - + function show_edit($item) { global $CFG; - + require_once('numeric_form.php'); - + $item_form = new feedback_numeric_form(); $item->presentation = empty($item->presentation) ? '' : $item->presentation; $item->name = empty($item->name) ? '' : $item->name; $item->label = empty($item->label) ? '' : $item->label; - + $item->required = isset($item->required) ? $item->required : 0; if($item->required) { $item_form->requiredcheck->setValue(true); @@ -36,16 +36,16 @@ class feedback_item_numeric extends feedback_item_base { $item_form->itemname->setValue($item->name); $item_form->itemlabel->setValue($item->label); - + $range_from_to = explode('|',$item->presentation); - + $range_from = (isset($range_from_to[0]) AND is_numeric($range_from_to[0])) ? str_replace(FEEDBACK_DECIMAL, $this->sep_dec, floatval($range_from_to[0])) : '-'; $range_to = (isset($range_from_to[1]) AND is_numeric($range_from_to[1])) ? str_replace(FEEDBACK_DECIMAL, $this->sep_dec, floatval($range_from_to[1])) : '-'; - + $item_form->selectfrom->setValue($range_from); - + $item_form->selectto->setValue($range_to); - + return $item_form; } @@ -58,7 +58,7 @@ class feedback_item_numeric extends feedback_item_base { $analysed->name = $item->name; //$values = $DB->get_records('feedback_value', array('item'=>$item->id)); $values = feedback_get_group_values($item, $groupid, $courseid); - + $avg = 0.0; $counter = 0; if($values) { @@ -79,12 +79,12 @@ class feedback_item_numeric extends feedback_item_base { function get_printval($item, $value) { if(!isset($value->value)) return ''; - + return $value->value; } function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) { - + // $values = feedback_get_group_values($item, $groupid, $courseid); $values = $this->get_analysed($item, $groupid, $courseid); @@ -122,11 +122,11 @@ class feedback_item_numeric extends feedback_item_base { // $worksheet->write_number($rowOffset, 1, $data[$i]); // $rowOffset++; // } - + //mittelwert anzeigen $worksheet->setFormat(""); $worksheet->write_string($rowOffset, 2, get_string('average', 'feedback')); - + $worksheet->setFormat(""); $worksheet->write_number($rowOffset + 1, 2, $analysed_item->avg); $rowOffset++; @@ -136,8 +136,9 @@ class feedback_item_numeric extends feedback_item_base { } function print_item($item, $value = false, $readonly = false, $edit = false, $highlightrequire = false){ + global $OUTPUT; $align = get_string('thisdirection') == 'ltr' ? 'left' : 'right'; - + //get the range $range_from_to = explode('|',$item->presentation); //get the min-value @@ -152,7 +153,7 @@ class feedback_item_numeric extends feedback_item_base { $requiredmark = ($item->required == 1)?'':''; ?> valign="top" align=""> - label.') '; } @@ -176,10 +177,10 @@ class feedback_item_numeric extends feedback_item_base { box_start('generalbox boxalign'.$align); echo (is_numeric($value)) ? number_format($value, 2, $this->sep_dec, $this->sep_thous) : ' '; // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); }else { ?> required != 1) return true; if(!is_numeric($value))return false; - + $range_from_to = explode('|',$item->presentation); $range_from = (isset($range_from_to[0]) AND is_numeric($range_from_to[0])) ? floatval($range_from_to[0]) : '-'; $range_to = (isset($range_from_to[1]) AND is_numeric($range_from_to[1])) ? floatval($range_from_to[1]) : '-'; - + switch(true) { case ($range_from === '-' AND is_numeric($range_to)): if(floatval($value) <= $range_to) return true; @@ -217,13 +218,13 @@ class feedback_item_numeric extends feedback_item_base { if(floatval($value) >= $range_from AND floatval($value) <= $range_to) return true; break; } - + return false; } function create_value($data) { $data = str_replace($this->sep_dec, FEEDBACK_DECIMAL, $data); - + if(is_numeric($data)) { $data = floatval($data); }else { @@ -239,22 +240,22 @@ class feedback_item_numeric extends feedback_item_base { }else { $num1 = '-'; } - + $num2 = str_replace($this->sep_dec, FEEDBACK_DECIMAL, $data->numericrangeto); if(is_numeric($num2)) { $num2 = floatval($num2); }else { $num2 = '-'; } - + if($num1 === '-' OR $num2 === '-') { return $num1 . '|'. $num2; } - + if($num1 > $num2) { return $num2 . '|'. $num1; }else { - return $num1 . '|'. $num2; + return $num1 . '|'. $num2; } } diff --git a/mod/feedback/item/textarea/lib.php b/mod/feedback/item/textarea/lib.php index fee9bb8a6d..32c17de809 100644 --- a/mod/feedback/item/textarea/lib.php +++ b/mod/feedback/item/textarea/lib.php @@ -5,20 +5,20 @@ require_once($CFG->dirroot.'/mod/feedback/item/feedback_item_class.php'); class feedback_item_textarea extends feedback_item_base { var $type = "textarea"; function init() { - + } - + function show_edit($item) { global $CFG; require_once('textarea_form.php'); - + $item_form = new feedback_textarea_form(); $item->presentation = empty($item->presentation) ? '' : $item->presentation; $item->name = empty($item->name) ? '' : $item->name; $item->label = empty($item->label) ? '' : $item->label; - + $item->required = isset($item->required) ? $item->required : 0; if($item->required) { $item_form->requiredcheck->setValue(true); @@ -32,7 +32,7 @@ class feedback_item_textarea extends feedback_item_base { $itemheight = isset($widthAndHeight[1]) ? $widthAndHeight[1] : 5; $item_form->selectwith->setValue($itemwidth); $item_form->selectheight->setValue($itemheight); - + return $item_form; } @@ -56,7 +56,7 @@ class feedback_item_textarea extends feedback_item_base { } function get_printval($item, $value) { - + if(!isset($value->value)) return ''; return $value->value; @@ -100,8 +100,9 @@ class feedback_item_textarea extends feedback_item_base { } function print_item($item, $value = false, $readonly = false, $edit = false, $highlightrequire = false){ + global $OUTPUT; $align = get_string('thisdirection') == 'ltr' ? 'left' : 'right'; - + $presentation = explode ("|", $item->presentation); if($highlightrequire AND $item->required AND strval($value) == '') { $highlight = 'bgcolor="#FFAAAA" class="missingrequire"'; @@ -122,10 +123,10 @@ class feedback_item_textarea extends feedback_item_base { box_start('generalbox boxalign'.$align); echo $value?str_replace("\n",'
',$value):' '; // print_simple_box_end(); - print_box_end(); + echo $OUTPUT->box_end(); }else { ?>