Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle

Conflicts: user/view.php
mvaraujo · Jan 8, 2013 · f44e7d0 · f44e7d0
2 parents 60fb0ef + 0e35ba6
commit f44e7d0
Show file tree

Hide file tree

Showing 52 changed files with 65 additions and 65 deletions.
diff --git 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
@@ -527,7 +527,7 @@ function print_mnet_log($hostid, $course, $user=0, $date=0, $order="l.time ASC",
         echo "</td>\n";
         echo "<td class=\"r$row c4\">\n";
         echo $log->action .': '.$log->module;
-        echo "</td>\n";;
+        echo "</td>\n";
         echo "<td class=\"r$row c5\">{$log->info}</td>\n";
         echo "</tr>\n";
     }

diff --git a/course/reset.php b/course/reset.php
@@ -72,7 +72,7 @@
         $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
@@ -185,7 +185,7 @@
         }
 
         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
@@ -203,7 +203,7 @@
     $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
@@ -309,7 +309,7 @@ public function build_html_tree($element, $totals, $parents, $level, &$row_count
             $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
@@ -1213,7 +1213,7 @@ public function testAddUniqueIndex() {
         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
@@ -120,7 +120,7 @@ protected function tag_close($parser, $tag) {
 
             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
@@ -1545,7 +1545,7 @@ public function get_unenrolself_link($instance) {
             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
@@ -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));
-}
+}
diff --git 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
@@ -1674,7 +1674,7 @@ public static function pack_reference($params) {
         $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
@@ -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
@@ -65,7 +65,7 @@ function add_worksheet($name = '') {
      */
     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
@@ -2105,7 +2105,7 @@ protected function render_user_picture(user_picture $userpicture) {
         $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
@@ -335,7 +335,7 @@ public function process_stage_config() {
                 $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
@@ -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
@@ -41,7 +41,7 @@ protected function setUp() {
 
         $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
@@ -68,7 +68,7 @@ protected function setUp() {
         $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
@@ -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
@@ -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
@@ -106,7 +106,7 @@ public function save_item() {
     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
@@ -228,7 +228,7 @@
         }
 
         $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 @@
                 $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
@@ -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
@@ -30,7 +30,7 @@
 
 $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 @@
     echo $OUTPUT->single_button($url, get_string('continue', 'lesson'));
 }
 
-echo $lessonoutput->footer();
+echo $lessonoutput->footer();
diff --git a/mod/lesson/edit.php b/mod/lesson/edit.php
@@ -29,7 +29,7 @@
 
 $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
@@ -34,7 +34,7 @@
 $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
@@ -32,7 +32,7 @@
 $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
@@ -31,7 +31,7 @@
 
 $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
@@ -32,7 +32,7 @@
 $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 @@
         break;
 }
 
-echo $lessonoutput->footer();
+echo $lessonoutput->footer();
diff --git a/mod/lesson/import.php b/mod/lesson/import.php
@@ -35,7 +35,7 @@
 
 $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 @@
     $mform->display();
 }
 
-echo $OUTPUT->footer();
+echo $OUTPUT->footer();
diff --git a/mod/lesson/lesson.php b/mod/lesson/lesson.php
@@ -36,7 +36,7 @@
 $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 @@
         break;
 }
 
-echo $lessonoutput->footer();
+echo $lessonoutput->footer();
diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
@@ -948,7 +948,7 @@ public function delete() {
         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
@@ -33,7 +33,7 @@
 $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 @@
    echo '</div>';
 }
 
-echo $lessonoutput->footer();
+echo $lessonoutput->footer();
diff --git a/mod/lesson/pagetypes/endofbranch.php b/mod/lesson/pagetypes/endofbranch.php
@@ -122,7 +122,7 @@ public function update($properties, $context = null, $maxbytes = null) {
             $answer = new stdClass;
         }
 
-        $answer->timemodified = time();;
+        $answer->timemodified = time();
         if (isset($properties->jumpto[0])) {
             $answer->jumpto = $properties->jumpto[0];
         }
@@ -230,4 +230,4 @@ public function construction_override($pageid, lesson $lesson) {
 
         redirect($CFG->wwwroot."/mod/lesson/edit.php?id=".$PAGE->cm->id);
     }
-}
+}
diff --git a/mod/lesson/pagetypes/endofcluster.php b/mod/lesson/pagetypes/endofcluster.php
@@ -91,7 +91,7 @@ public function update($properties, $context = null, $maxbytes = null) {
             $answer = new stdClass;
         }
 
-        $answer->timemodified = time();;
+        $answer->timemodified = time();
         if (isset($properties->jumpto[0])) {
             $answer->jumpto = $properties->jumpto[0];
         }
@@ -198,4 +198,4 @@ public function construction_override($pageid, lesson $lesson) {
         $lesson->add_message(get_string('addedendofcluster', 'lesson'), 'notifysuccess');
         redirect($CFG->wwwroot.'/mod/lesson/edit.php?id='.$PAGE->cm->id);
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -185,7 +185,7 @@ @@
             }
             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;
             }
@@ Expand Down @@