diff --git a/backup/util/xml/output/xml_output.class.php b/backup/util/xml/output/xml_output.class.php index a1d816db4d2..159fbdb10b9 100644 --- a/backup/util/xml/output/xml_output.class.php +++ b/backup/util/xml/output/xml_output.class.php @@ -51,7 +51,7 @@ abstract class xml_output { public function __construct($usebuffer = true) { $this->inittime = microtime(true); - $this->finishtime = $this->inittime;; + $this->finishtime = $this->inittime; $this->sentbytes = 0; $this->usebuffer = $usebuffer; diff --git a/course/lib.php b/course/lib.php index a58b86ad3c9..52302409346 100644 --- a/course/lib.php +++ b/course/lib.php @@ -527,7 +527,7 @@ function print_mnet_log($hostid, $course, $user=0, $date=0, $order="l.time ASC", echo "\n"; echo "\n"; echo $log->action .': '.$log->module; - echo "\n";; + echo "\n"; echo "{$log->info}\n"; echo "\n"; } diff --git a/course/reset.php b/course/reset.php index 09a440bd0cf..0517f392bd8 100644 --- a/course/reset.php +++ b/course/reset.php @@ -72,7 +72,7 @@ if ($mform->is_cancelled()) { $data->reset_start_date_old = $course->startdate; $status = reset_course_userdata($data); - $data = array();; + $data = array(); foreach ($status as $item) { $line = array(); $line[] = $item['component']; diff --git a/enrol/paypal/ipn.php b/enrol/paypal/ipn.php index 77ed062f607..2a25472cdfc 100644 --- a/enrol/paypal/ipn.php +++ b/enrol/paypal/ipn.php @@ -185,7 +185,7 @@ if (strlen($result) > 0) { } if (!$course = $DB->get_record('course', array('id'=>$data->courseid))) { // Check that course exists - message_paypal_error_to_admin("Course $data->courseid doesn't exist", $data);; + message_paypal_error_to_admin("Course $data->courseid doesn't exist", $data); die; } diff --git a/enrol/users.php b/enrol/users.php index 683de562427..d33174a2e05 100644 --- a/enrol/users.php +++ b/enrol/users.php @@ -203,7 +203,7 @@ foreach ($users as $userid=>&$user) { $user['picture'] = $OUTPUT->render($user['picture']); $user['role'] = $renderer->user_roles_and_actions($userid, $user['roles'], $manager->get_assignable_roles(), $canassign, $PAGE->url); $user['group'] = $renderer->user_groups_and_actions($userid, $user['groups'], $manager->get_all_groups(), has_capability('moodle/course:managegroups', $manager->get_context()), $PAGE->url); - $user['enrol'] = $renderer->user_enrolments_and_actions($user['enrolments']);; + $user['enrol'] = $renderer->user_enrolments_and_actions($user['enrolments']); } $table->set_total_users($manager->get_total_users()); $table->set_users($users); diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php index 62c7a4f0edb..6a71f1a8e17 100644 --- a/grade/edit/tree/lib.php +++ b/grade/edit/tree/lib.php @@ -309,7 +309,7 @@ class grade_edit_tree { $endcell->colspan = (19 - $level); $endcell->attributes['class'] = 'colspan ' . $levelclass; - $returnrows[] = new html_table_row(array($endcell));; + $returnrows[] = new html_table_row(array($endcell)); } else { // Dealing with a grade item diff --git a/lib/ddl/tests/ddl_test.php b/lib/ddl/tests/ddl_test.php index 3484b043b5d..56eac3320ba 100644 --- a/lib/ddl/tests/ddl_test.php +++ b/lib/ddl/tests/ddl_test.php @@ -1213,7 +1213,7 @@ class ddl_testcase extends database_driver_testcase { try { $result = $DB->insert_record('test_table_cust0', $record, false); } catch (dml_exception $e) { - $result = false;; + $result = false; } $this->resetDebugging(); $this->assertFalse($result); diff --git a/lib/dtl/xml_database_importer.php b/lib/dtl/xml_database_importer.php index da522dd13af..98fc18ca38c 100644 --- a/lib/dtl/xml_database_importer.php +++ b/lib/dtl/xml_database_importer.php @@ -120,7 +120,7 @@ abstract class xml_database_importer extends database_importer { case 'record' : $this->import_table_data($this->current_table, $this->current_row); - $this->current_row = null;; + $this->current_row = null; break; case 'field' : diff --git a/lib/enrollib.php b/lib/enrollib.php index 76a7bf5b7fa..6f1d7ae0789 100644 --- a/lib/enrollib.php +++ b/lib/enrollib.php @@ -1545,7 +1545,7 @@ abstract class enrol_plugin { return NULL; } - return new moodle_url("/enrol/$name/unenrolself.php", array('enrolid'=>$instance->id));; + return new moodle_url("/enrol/$name/unenrolself.php", array('enrolid'=>$instance->id)); } /** diff --git a/lib/eventslib.php b/lib/eventslib.php index b51195a1f44..4717fb3f6ba 100644 --- a/lib/eventslib.php +++ b/lib/eventslib.php @@ -515,7 +515,7 @@ function events_trigger($eventname, $eventdata) { events_get_handlers('reset'); } else { - $errormessage = 'Unknown error';; + $errormessage = 'Unknown error'; $result = events_dispatch($handler, $eventdata, $errormessage); if ($result === true) { // everything is fine - event dispatched @@ -615,4 +615,4 @@ function events_pending_count($eventname) { WHERE h.eventname = ?"; return $DB->count_records_sql($sql, array($eventname)); -} \ No newline at end of file +} diff --git a/lib/filelib.php b/lib/filelib.php index 7782421c013..eaa3590e702 100644 --- a/lib/filelib.php +++ b/lib/filelib.php @@ -1331,7 +1331,7 @@ function download_file_content($url, $headers=null, $postdata=null, $fullrespons $response->error = 'Unknown cURL error'; } else { - $response = new stdClass();; + $response = new stdClass(); $response->status = (string)$info['http_code']; $response->headers = $received->headers; $response->response_code = $received->headers[0]; diff --git a/lib/filestorage/file_storage.php b/lib/filestorage/file_storage.php index 043e350e82c..9c444304d9c 100644 --- a/lib/filestorage/file_storage.php +++ b/lib/filestorage/file_storage.php @@ -1674,7 +1674,7 @@ class file_storage { $reference['component'] = is_null($params['component']) ? null : clean_param($params['component'], PARAM_COMPONENT); $reference['itemid'] = is_null($params['itemid']) ? null : clean_param($params['itemid'], PARAM_INT); $reference['filearea'] = is_null($params['filearea']) ? null : clean_param($params['filearea'], PARAM_AREA); - $reference['filepath'] = is_null($params['filepath']) ? null : clean_param($params['filepath'], PARAM_PATH);; + $reference['filepath'] = is_null($params['filepath']) ? null : clean_param($params['filepath'], PARAM_PATH); $reference['filename'] = is_null($params['filename']) ? null : clean_param($params['filename'], PARAM_FILE); return base64_encode(serialize($reference)); } diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 534861b5763..d27391a6509 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -5881,7 +5881,7 @@ function get_file_browser() { function get_file_packer($mimetype='application/zip') { global $CFG; - static $fp = array();; + static $fp = array(); if (isset($fp[$mimetype])) { return $fp[$mimetype]; diff --git a/lib/odslib.class.php b/lib/odslib.class.php index 8192a37f426..f22eb72cddd 100644 --- a/lib/odslib.class.php +++ b/lib/odslib.class.php @@ -65,7 +65,7 @@ class MoodleODSWorkbook { */ function &add_format($properties = array()) { $format = new MoodleODSFormat($properties); - return $format;; + return $format; } /* Close the Moodle Workbook diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index 4e097b95730..8e57f287bd6 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -2105,7 +2105,7 @@ class core_renderer extends renderer_base { $attributes = array('src'=>$src, 'alt'=>$alt, 'title'=>$alt, 'class'=>$class, 'width'=>$size, 'height'=>$size); // get the image html output fisrt - $output = html_writer::empty_tag('img', $attributes);; + $output = html_writer::empty_tag('img', $attributes); // then wrap it in link if needed if (!$userpicture->link) { diff --git a/lib/portfolio/exporter.php b/lib/portfolio/exporter.php index 3225ddf6af3..cc73d37eb89 100644 --- a/lib/portfolio/exporter.php +++ b/lib/portfolio/exporter.php @@ -335,7 +335,7 @@ class portfolio_exporter { $mform->display(); echo $OUTPUT->box_end(); echo $OUTPUT->footer(); - return false;; + return false; } } else { $this->noexportconfig = true; diff --git a/lib/statslib.php b/lib/statslib.php index 51d7b7ce7b2..3582c018a93 100644 --- a/lib/statslib.php +++ b/lib/statslib.php @@ -406,7 +406,7 @@ function stats_cron_daily($maxdays=1) { SELECT 'enrolments', $nextmidnight, ".SITEID.", $defaultfproleid, $totalactiveusers AS stat1, $dailyactiveusers AS stat2" . - $DB->sql_null_from_clause();; + $DB->sql_null_from_clause(); if ($logspresent && !stats_run_query($sql)) { $failed = true; diff --git a/lib/tests/conditionlib_test.php b/lib/tests/conditionlib_test.php index 75fed3cf3d2..b3ae7f5d402 100644 --- a/lib/tests/conditionlib_test.php +++ b/lib/tests/conditionlib_test.php @@ -41,7 +41,7 @@ class conditionlib_testcase extends advanced_testcase { $CFG->enableavailability = 1; $CFG->enablecompletion = 1; - $user = $this->getDataGenerator()->create_user();; + $user = $this->getDataGenerator()->create_user(); $this->setUser($user); } diff --git a/lib/tests/navigationlib_test.php b/lib/tests/navigationlib_test.php index b4c35eb8cdf..5dea4da1d04 100644 --- a/lib/tests/navigationlib_test.php +++ b/lib/tests/navigationlib_test.php @@ -68,7 +68,7 @@ class navigation_node_testcase extends basic_testcase { $demo5->add('activity1', null, navigation_node::TYPE_ACTIVITY, null, 'activity1')->make_active(); $hiddendemo1 = $this->node->add('hiddendemo1', $this->inactiveurl, navigation_node::TYPE_CATEGORY, null, 'hiddendemo1', new pix_icon('i/course', '')); $hiddendemo1->hidden = true; - $hiddendemo1->add('hiddendemo2', $this->inactiveurl, navigation_node::TYPE_COURSE, null, 'hiddendemo2', new pix_icon('i/course', ''))->helpbutton = 'Here is a help button';; + $hiddendemo1->add('hiddendemo2', $this->inactiveurl, navigation_node::TYPE_COURSE, null, 'hiddendemo2', new pix_icon('i/course', ''))->helpbutton = 'Here is a help button'; $hiddendemo1->add('hiddendemo3', $this->inactiveurl, navigation_node::TYPE_COURSE,null, 'hiddendemo3', new pix_icon('i/course', ''))->display = false; } diff --git a/lib/upgradelib.php b/lib/upgradelib.php index 8adb97a60af..c077858f298 100644 --- a/lib/upgradelib.php +++ b/lib/upgradelib.php @@ -786,7 +786,7 @@ function upgrade_plugins_blocks($startcallback, $endcallback, $verbose) { require_once($fullblock.'/db/install.php'); // Set installation running flag, we need to recover after exception or error set_config('installrunning', 1, 'block_'.$blockname); - $post_install_function = 'xmldb_block_'.$blockname.'_install';; + $post_install_function = 'xmldb_block_'.$blockname.'_install'; $post_install_function(); unset_config('installrunning', 'block_'.$blockname); } diff --git a/mnet/lib.php b/mnet/lib.php index 170522124ac..aa233c57f94 100644 --- a/mnet/lib.php +++ b/mnet/lib.php @@ -310,7 +310,7 @@ function mnet_encrypt_message($message, $remote_certificate) { * @return string The signature over that text */ function mnet_get_keypair() { - global $CFG, $DB;; + global $CFG, $DB; static $keypair = null; if (!is_null($keypair)) return $keypair; if ($result = get_config('mnet', 'openssl')) { diff --git a/mod/feedback/item/info/lib.php b/mod/feedback/item/info/lib.php index 46a9e4c3d16..a51c8f881aa 100644 --- a/mod/feedback/item/info/lib.php +++ b/mod/feedback/item/info/lib.php @@ -106,7 +106,7 @@ class feedback_item_info extends feedback_item_base { public function get_analysed($item, $groupid = false, $courseid = false) { $presentation = $item->presentation; - $analysed_val = new stdClass();; + $analysed_val = new stdClass(); $analysed_val->data = null; $analysed_val->name = $item->name; $values = feedback_get_group_values($item, $groupid, $courseid); diff --git a/mod/forum/index.php b/mod/forum/index.php index 8c334ad3a51..fc9903de13e 100644 --- a/mod/forum/index.php +++ b/mod/forum/index.php @@ -228,7 +228,7 @@ if ($generalforums) { } $forum->intro = shorten_text(format_module_intro('forum', $forum, $cm->id), $CFG->forum_shortpost); - $forumname = format_string($forum->name, true);; + $forumname = format_string($forum->name, true); if ($cm->visible) { $style = ''; @@ -366,7 +366,7 @@ if ($course->id != SITEID) { // Only real courses have learning forums $printsection = ''; } - $forumname = format_string($forum->name,true);; + $forumname = format_string($forum->name,true); if ($cm->visible) { $style = ''; diff --git a/mod/forum/lib.php b/mod/forum/lib.php index fdb9521eed8..68e6ad8affd 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -7192,7 +7192,7 @@ function forum_reset_userdata($data) { if( $removeposts || !empty($data->reset_forum_ratings) ) { $forumssql = "$allforumssql $typesql"; $forums = $forums = $DB->get_records_sql($forumssql, $params); - $rm = new rating_manager();; + $rm = new rating_manager(); $ratingdeloptions = new stdClass; $ratingdeloptions->component = 'mod_forum'; $ratingdeloptions->ratingarea = 'post'; diff --git a/mod/lesson/continue.php b/mod/lesson/continue.php index 9677e220f80..79f3499aab3 100644 --- a/mod/lesson/continue.php +++ b/mod/lesson/continue.php @@ -30,7 +30,7 @@ require_once($CFG->dirroot.'/mod/lesson/locallib.php'); $id = required_param('id', PARAM_INT); -$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);; +$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST); $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST)); @@ -214,4 +214,4 @@ if ($lesson->review && !$result->correctanswer && !$result->noanswer && !$result echo $OUTPUT->single_button($url, get_string('continue', 'lesson')); } -echo $lessonoutput->footer(); \ No newline at end of file +echo $lessonoutput->footer(); diff --git a/mod/lesson/edit.php b/mod/lesson/edit.php index e7c8f0af984..aeeb2014297 100644 --- a/mod/lesson/edit.php +++ b/mod/lesson/edit.php @@ -29,7 +29,7 @@ require_once($CFG->dirroot.'/mod/lesson/locallib.php'); $id = required_param('id', PARAM_INT); -$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);; +$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST); $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST)); diff --git a/mod/lesson/editpage.php b/mod/lesson/editpage.php index 827f1a44a0c..140de2e3b72 100644 --- a/mod/lesson/editpage.php +++ b/mod/lesson/editpage.php @@ -34,7 +34,7 @@ $id = required_param('id', PARAM_INT); // Course Module ID $qtype = optional_param('qtype', 0, PARAM_INT); $edit = optional_param('edit', false, PARAM_BOOL); -$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);; +$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST); $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST)); diff --git a/mod/lesson/essay.php b/mod/lesson/essay.php index 4767fc9dbbc..e0dd5336b0a 100644 --- a/mod/lesson/essay.php +++ b/mod/lesson/essay.php @@ -32,7 +32,7 @@ require_once($CFG->libdir.'/eventslib.php'); $id = required_param('id', PARAM_INT); // Course Module ID $mode = optional_param('mode', 'display', PARAM_ALPHA); -$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);; +$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST); $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST)); diff --git a/mod/lesson/grade.php b/mod/lesson/grade.php index 7761c5ac02b..8a98406b297 100644 --- a/mod/lesson/grade.php +++ b/mod/lesson/grade.php @@ -31,7 +31,7 @@ require_once($CFG->dirroot.'/mod/lesson/locallib.php'); $id = required_param('id', PARAM_INT); -$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);; +$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST); $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST)); diff --git a/mod/lesson/highscores.php b/mod/lesson/highscores.php index aefb7dc0511..c75dbbff47f 100644 --- a/mod/lesson/highscores.php +++ b/mod/lesson/highscores.php @@ -32,7 +32,7 @@ $id = required_param('id', PARAM_INT); // Course Module ID $mode = optional_param('mode', '', PARAM_ALPHA); $link = optional_param('link', 0, PARAM_INT); -$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);; +$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST); $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST)); @@ -224,4 +224,4 @@ switch ($mode) { break; } -echo $lessonoutput->footer(); \ No newline at end of file +echo $lessonoutput->footer(); diff --git a/mod/lesson/import.php b/mod/lesson/import.php index 1a9e93c673f..4f3814c72d3 100644 --- a/mod/lesson/import.php +++ b/mod/lesson/import.php @@ -35,7 +35,7 @@ $pageid = optional_param('pageid', '', PARAM_INT); // Page ID $PAGE->set_url('/mod/lesson/import.php', array('id'=>$id, 'pageid'=>$pageid)); -$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);; +$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST); $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST)); @@ -106,4 +106,4 @@ if ($data = $mform->get_data()) { $mform->display(); } -echo $OUTPUT->footer(); \ No newline at end of file +echo $OUTPUT->footer(); diff --git a/mod/lesson/lesson.php b/mod/lesson/lesson.php index e76c91047ca..75ee4bb288c 100644 --- a/mod/lesson/lesson.php +++ b/mod/lesson/lesson.php @@ -36,7 +36,7 @@ $id = required_param('id', PARAM_INT); // Course Module ID $action = required_param('action', PARAM_ALPHA); // Action $pageid = required_param('pageid', PARAM_INT); -$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);; +$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST); $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST)); @@ -166,4 +166,4 @@ switch ($action) { break; } -echo $lessonoutput->footer(); \ No newline at end of file +echo $lessonoutput->footer(); diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php index 9c9c07acf6a..f4addcca314 100644 --- a/mod/lesson/locallib.php +++ b/mod/lesson/locallib.php @@ -948,7 +948,7 @@ class lesson extends lesson_base { require_once($CFG->libdir.'/gradelib.php'); require_once($CFG->dirroot.'/calendar/lib.php'); - $DB->delete_records("lesson", array("id"=>$this->properties->id));; + $DB->delete_records("lesson", array("id"=>$this->properties->id)); $DB->delete_records("lesson_pages", array("lessonid"=>$this->properties->id)); $DB->delete_records("lesson_answers", array("lessonid"=>$this->properties->id)); $DB->delete_records("lesson_attempts", array("lessonid"=>$this->properties->id)); diff --git a/mod/lesson/mediafile.php b/mod/lesson/mediafile.php index ecf94896c7f..7ad10af06e7 100644 --- a/mod/lesson/mediafile.php +++ b/mod/lesson/mediafile.php @@ -33,7 +33,7 @@ require_once($CFG->dirroot.'/mod/lesson/locallib.php'); $id = required_param('id', PARAM_INT); // Course Module ID $printclose = optional_param('printclose', 0, PARAM_INT); -$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);; +$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST); $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST)); @@ -109,4 +109,4 @@ if ($lesson->mediaclose) { echo ''; } -echo $lessonoutput->footer(); \ No newline at end of file +echo $lessonoutput->footer(); diff --git a/mod/lesson/pagetypes/endofbranch.php b/mod/lesson/pagetypes/endofbranch.php index 38c07a2694a..315f51dab21 100644 --- a/mod/lesson/pagetypes/endofbranch.php +++ b/mod/lesson/pagetypes/endofbranch.php @@ -122,7 +122,7 @@ class lesson_page_type_endofbranch extends lesson_page { $answer = new stdClass; } - $answer->timemodified = time();; + $answer->timemodified = time(); if (isset($properties->jumpto[0])) { $answer->jumpto = $properties->jumpto[0]; } @@ -230,4 +230,4 @@ class lesson_add_page_form_endofbranch extends lesson_add_page_form_base { redirect($CFG->wwwroot."/mod/lesson/edit.php?id=".$PAGE->cm->id); } -} \ No newline at end of file +} diff --git a/mod/lesson/pagetypes/endofcluster.php b/mod/lesson/pagetypes/endofcluster.php index edca1fde088..f4cdb8b6e62 100644 --- a/mod/lesson/pagetypes/endofcluster.php +++ b/mod/lesson/pagetypes/endofcluster.php @@ -91,7 +91,7 @@ class lesson_page_type_endofcluster extends lesson_page { $answer = new stdClass; } - $answer->timemodified = time();; + $answer->timemodified = time(); if (isset($properties->jumpto[0])) { $answer->jumpto = $properties->jumpto[0]; } @@ -198,4 +198,4 @@ class lesson_add_page_form_endofcluster extends lesson_add_page_form_base { $lesson->add_message(get_string('addedendofcluster', 'lesson'), 'notifysuccess'); redirect($CFG->wwwroot.'/mod/lesson/edit.php?id='.$PAGE->cm->id); } -} \ No newline at end of file +} diff --git a/mod/lesson/view.php b/mod/lesson/view.php index c4dc6346cf2..0631dde7b51 100644 --- a/mod/lesson/view.php +++ b/mod/lesson/view.php @@ -35,7 +35,7 @@ $edit = optional_param('edit', -1, PARAM_BOOL); $userpassword = optional_param('userpassword','',PARAM_RAW); $backtocourse = optional_param('backtocourse', false, PARAM_RAW); -$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);; +$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST); $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST)); @@ -475,7 +475,7 @@ if ($pageid != LESSON_EOL) { } else { if ($lesson->timed) { if ($outoftime == 'normal') { - $grade = new stdClass();; + $grade = new stdClass(); $grade->lessonid = $lesson->id; $grade->userid = $USER->id; $grade->grade = 0; diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php index 54d9b8a21c1..c7e814bea52 100644 --- a/mod/quiz/editlib.php +++ b/mod/quiz/editlib.php @@ -1317,7 +1317,7 @@ function quiz_print_status_bar($quiz) { if (empty($dates)) { $dates[] = get_string('alwaysavailable', 'quiz'); } - $tooltip = implode(', ', $dates);; + $tooltip = implode(', ', $dates); // Brief summary on the page. if ($timenow < $quiz->timeopen) { diff --git a/mod/scorm/datamodels/scormlib.php b/mod/scorm/datamodels/scormlib.php index 2e4390fecab..6fa4f5d5775 100644 --- a/mod/scorm/datamodels/scormlib.php +++ b/mod/scorm/datamodels/scormlib.php @@ -367,7 +367,7 @@ function scorm_get_manifest($blocks, $scoes) { } if ($sequencing['name']=='IMSSS:ROLLUPRULES') { if (isset($sequencing['attrs']['ROLLUPOBJECTIVESATISFIED'])) { - $scoes->elements[$manifest][$parent->organization][$parent->identifier]->rollupobjectivesatisfied = $sequencing['attrs']['ROLLUPOBJECTIVESATISFIED'] == 'true'?1:0;; + $scoes->elements[$manifest][$parent->organization][$parent->identifier]->rollupobjectivesatisfied = $sequencing['attrs']['ROLLUPOBJECTIVESATISFIED'] == 'true'?1:0; } if (isset($sequencing['attrs']['ROLLUPPROGRESSCOMPLETION'])) { $scoes->elements[$manifest][$parent->organization][$parent->identifier]->rollupprogresscompletion = $sequencing['attrs']['ROLLUPPROGRESSCOMPLETION'] == 'true'?1:0; diff --git a/question/format/xhtml/format.php b/question/format/xhtml/format.php index 7b3d9b657c4..a8c9a97250f 100644 --- a/question/format/xhtml/format.php +++ b/question/format/xhtml/format.php @@ -132,7 +132,7 @@ class qformat_xhtml extends qformat_default { $quest_text = $this->repchar( $subquestion->questiontext ); $dropdown = html_writer::label(get_string('answer', 'qtype_match', $option+1), 'quest_'.$id.'_'.$option, false, array('class' => 'accesshide')); $dropdown .= html_writer::select($selectoptions, "quest_{$id}_{$option}", '', false, array('id' => "quest_{$id}_{$option}")); - $expout .= html_writer::tag('li', $quest_text);; + $expout .= html_writer::tag('li', $quest_text); $expout .= $dropdown; $option++; } diff --git a/question/type/calculated/questiontype.php b/question/type/calculated/questiontype.php index fc996c80fb5..0468dba8ad6 100644 --- a/question/type/calculated/questiontype.php +++ b/question/type/calculated/questiontype.php @@ -1150,7 +1150,7 @@ class qtype_calculated extends question_type { } $qtext = $qtext.$str; } - $answer->answer = $qtext.$qtextremaining;; + $answer->answer = $qtext.$qtextremaining; $comment->stranswers[$key]= $answer->answer; } diff --git a/question/type/questiontypebase.php b/question/type/questiontypebase.php index 9b51a8b0043..7294decc8e2 100644 --- a/question/type/questiontypebase.php +++ b/question/type/questiontypebase.php @@ -342,7 +342,7 @@ class question_type { if (empty($form->questiontext['text'])) { $question->questiontext = ''; } else { - $question->questiontext = trim($form->questiontext['text']);; + $question->questiontext = trim($form->questiontext['text']); } $question->questiontextformat = !empty($form->questiontext['format']) ? $form->questiontext['format'] : 0; diff --git a/rating/lib.php b/rating/lib.php index 9484702b249..969fbd98c5d 100644 --- a/rating/lib.php +++ b/rating/lib.php @@ -180,7 +180,7 @@ class rating implements renderable { $ratingoptions->scaleid = $this->scaleid; $ratingoptions->userid = $this->userid; - $rm = new rating_manager();; + $rm = new rating_manager(); $items = $rm->get_ratings($ratingoptions); $firstitem = $items[0]->rating; diff --git a/report/log/lib.php b/report/log/lib.php index 1102b8a46e6..c45bf1c8454 100644 --- a/report/log/lib.php +++ b/report/log/lib.php @@ -82,7 +82,7 @@ function report_log_can_access_user_report($user, $course) { $today = true; } if (has_capability('report/log:viewtoday', $coursecontext)) { - $all = true;; + $all = true; } if ($today and $all) { diff --git a/report/outline/index.php b/report/outline/index.php index a4144b1624f..21816647fe0 100644 --- a/report/outline/index.php +++ b/report/outline/index.php @@ -127,7 +127,7 @@ foreach ($modinfo->sections as $sectionnum=>$section) { $attributes['class'] = 'dimmed'; } - $activitycell->text = $activityicon . html_writer::link("$CFG->wwwroot/mod/$cm->modname/view.php?id=$cm->id", format_string($cm->name), $attributes);; + $activitycell->text = $activityicon . html_writer::link("$CFG->wwwroot/mod/$cm->modname/view.php?id=$cm->id", format_string($cm->name), $attributes); $reportrow->cells[] = $activitycell; diff --git a/report/security/locallib.php b/report/security/locallib.php index 8191a67c78e..a4e16d688ae 100644 --- a/report/security/locallib.php +++ b/report/security/locallib.php @@ -563,7 +563,7 @@ function report_security_check_defaultuserrole($detailed=false) { $result->info = null; $result->details = null; $result->status = null; - $result->link = "wwwroot/$CFG->admin/settings.php?section=userpolicies\">".get_string('userpolicies', 'admin').'';; + $result->link = "wwwroot/$CFG->admin/settings.php?section=userpolicies\">".get_string('userpolicies', 'admin').''; if (!$default_role = $DB->get_record('role', array('id'=>$CFG->defaultuserroleid))) { $result->status = REPORT_SECURITY_WARNING; @@ -621,7 +621,7 @@ function report_security_check_guestrole($detailed=false) { $result->info = null; $result->details = null; $result->status = null; - $result->link = "wwwroot/$CFG->admin/settings.php?section=userpolicies\">".get_string('userpolicies', 'admin').'';; + $result->link = "wwwroot/$CFG->admin/settings.php?section=userpolicies\">".get_string('userpolicies', 'admin').''; if (!$guest_role = $DB->get_record('role', array('id'=>$CFG->guestroleid))) { $result->status = REPORT_SECURITY_WARNING; @@ -679,7 +679,7 @@ function report_security_check_frontpagerole($detailed=false) { $result->info = null; $result->details = null; $result->status = null; - $result->link = "wwwroot/$CFG->admin/settings.php?section=frontpagesettings\">".get_string('frontpagesettings','admin').'';; + $result->link = "wwwroot/$CFG->admin/settings.php?section=frontpagesettings\">".get_string('frontpagesettings','admin').''; if (!$frontpage_role = $DB->get_record('role', array('id'=>$CFG->defaultfrontpageroleid))) { $result->status = REPORT_SECURITY_INFO; diff --git a/repository/coursefiles/lib.php b/repository/coursefiles/lib.php index ba4891a3edd..959f34e344a 100644 --- a/repository/coursefiles/lib.php +++ b/repository/coursefiles/lib.php @@ -65,7 +65,7 @@ class repository_coursefiles extends repository { if (!empty($encodedpath)) { $params = unserialize(base64_decode($encodedpath)); if (is_array($params)) { - $filepath = is_null($params['filepath']) ? NULL : clean_param($params['filepath'], PARAM_PATH);; + $filepath = is_null($params['filepath']) ? NULL : clean_param($params['filepath'], PARAM_PATH); $filename = is_null($params['filename']) ? NULL : clean_param($params['filename'], PARAM_FILE); $context = context::instance_by_id(clean_param($params['contextid'], PARAM_INT)); } @@ -155,7 +155,7 @@ class repository_coursefiles extends repository { $contextid = clean_param($params['contextid'], PARAM_INT); $fileitemid = clean_param($params['itemid'], PARAM_INT); $filename = clean_param($params['filename'], PARAM_FILE); - $filepath = clean_param($params['filepath'], PARAM_PATH);; + $filepath = clean_param($params['filepath'], PARAM_PATH); $filearea = clean_param($params['filearea'], PARAM_AREA); $component = clean_param($params['component'], PARAM_COMPONENT); $context = context::instance_by_id($contextid); diff --git a/repository/lib.php b/repository/lib.php index 3a7d54bc8ac..714e1b9f454 100644 --- a/repository/lib.php +++ b/repository/lib.php @@ -1325,7 +1325,7 @@ abstract class repository { $event['existingfile'] = new stdClass; $event['existingfile']->filepath = $record->filepath; $event['existingfile']->filename = $old_filename; - $event['existingfile']->url = moodle_url::make_draftfile_url($draftitemid, $record->filepath, $old_filename)->out();; + $event['existingfile']->url = moodle_url::make_draftfile_url($draftitemid, $record->filepath, $old_filename)->out(); return $event; } if ($file = $fs->create_file_from_pathname($record, $thefile)) { diff --git a/repository/local/lib.php b/repository/local/lib.php index f3be1567497..5798ad6f560 100644 --- a/repository/local/lib.php +++ b/repository/local/lib.php @@ -61,7 +61,7 @@ class repository_local extends repository { $component = is_null($params['component']) ? NULL : clean_param($params['component'], PARAM_COMPONENT); $filearea = is_null($params['filearea']) ? NULL : clean_param($params['filearea'], PARAM_AREA); $itemid = is_null($params['itemid']) ? NULL : clean_param($params['itemid'], PARAM_INT); - $filepath = is_null($params['filepath']) ? NULL : clean_param($params['filepath'], PARAM_PATH);; + $filepath = is_null($params['filepath']) ? NULL : clean_param($params['filepath'], PARAM_PATH); $filename = is_null($params['filename']) ? NULL : clean_param($params['filename'], PARAM_FILE); $context = context::instance_by_id(clean_param($params['contextid'], PARAM_INT)); } diff --git a/repository/repository_ajax.php b/repository/repository_ajax.php index d2fccd9b098..96c83bb788a 100644 --- a/repository/repository_ajax.php +++ b/repository/repository_ajax.php @@ -267,7 +267,7 @@ switch ($action) { $event['existingfile'] = new stdClass; $event['existingfile']->filepath = $saveas_path; $event['existingfile']->filename = $saveas_filename; - $event['existingfile']->url = moodle_url::make_draftfile_url($itemid, $saveas_path, $saveas_filename)->out();; + $event['existingfile']->url = moodle_url::make_draftfile_url($itemid, $saveas_path, $saveas_filename)->out(); } else { $storedfile = $fs->create_file_from_reference($record, $repo_id, $reference); diff --git a/repository/user/lib.php b/repository/user/lib.php index b2f4f1414e7..2b8412fc007 100644 --- a/repository/user/lib.php +++ b/repository/user/lib.php @@ -63,7 +63,7 @@ class repository_user extends repository { if (!empty($encodedpath)) { $params = unserialize(base64_decode($encodedpath)); if (is_array($params)) { - $filepath = clean_param($params['filepath'], PARAM_PATH);; + $filepath = clean_param($params['filepath'], PARAM_PATH); $filename = clean_param($params['filename'], PARAM_FILE); } } else { diff --git a/webservice/upload.php b/webservice/upload.php index 9c01869e004..c7b563aab29 100644 --- a/webservice/upload.php +++ b/webservice/upload.php @@ -131,7 +131,7 @@ foreach ($files as $file) { $file_record->filepath = $filepath; $file_record->itemid = 0; $file_record->license = $CFG->sitedefaultlicense; - $file_record->author = fullname($authenticationinfo['user']);; + $file_record->author = fullname($authenticationinfo['user']); $file_record->source = ''; //Check if the file already exist