Moodle release 2.5.9

This also removes set_url() and changes require_course_login to
require_login as guests cannot set tracking.

admin/category.php

@@ -97,27 +97,26 @@ foreach ($settingspage->children as $childpage) {
         $outputhtml .= $OUTPUT->heading(html_writer::link($childpage->url, $childpage->visiblename), 3);
     } else if ($childpage instanceof admin_settingpage) {
         $outputhtml .= $OUTPUT->heading(html_writer::link(new moodle_url('/'.$CFG->admin.'/settings.php', array('section' => $childpage->name)), $childpage->visiblename), 3);
+        // If its a settings page and has settings lets display them.
+        if (!empty($childpage->settings)) {
+            $outputhtml .= html_writer::start_tag('fieldset', array('class' => 'adminsettings'));
+            foreach ($childpage->settings as $setting) {
+                if (empty($setting->nosave)) {
+                    $savebutton = true;
+                }
+                $fullname = $setting->get_full_name();
+                if (array_key_exists($fullname, $adminroot->errors)) {
+                    $data = $adminroot->errors[$fullname]->data;
+                } else {
+                    $data = $setting->get_setting();
+                }
+                $outputhtml .= html_writer::tag('div', '<!-- -->', array('class' => 'clearer'));
+                $outputhtml .= $setting->output_html($data);
+            }
+            $outputhtml .= html_writer::end_tag('fieldset');
+        }
     } else if ($childpage instanceof admin_category) {
         $outputhtml .= $OUTPUT->heading(html_writer::link(new moodle_url('/'.$CFG->admin.'/category.php', array('category' => $childpage->name)), get_string('admincategory', 'admin', $childpage->visiblename)), 3);
-    } else {
-        continue;
-    }
-    if (!empty($childpage->settings)) {
-        $outputhtml .= html_writer::start_tag('fieldset', array('class' => 'adminsettings'));
-        foreach ($childpage->settings as $setting) {
-            if (empty($setting->nosave)) {
-                $savebutton = true;
-            }
-            $fullname = $setting->get_full_name();
-            if (array_key_exists($fullname, $adminroot->errors)) {
-                $data = $adminroot->errors[$fullname]->data;
-            } else {
-                $data = $setting->get_setting();
-            }
-            $outputhtml .= html_writer::tag('div', '<!-- -->', array('class' => 'clearer'));
-            $outputhtml .= $setting->output_html($data);
-        }
-        $outputhtml .= html_writer::end_tag('fieldset');
     }
 }
 if ($savebutton) {

admin/roles/manage.php

@@ -75,7 +75,8 @@
                 $a->id = $roleid;
                 $a->name = $roles[$roleid]->name;
                 $a->shortname = $roles[$roleid]->shortname;
-                $a->count = $DB->count_records('role_assignments', array('roleid'=>$roleid));
+                $a->count = $DB->count_records_select('role_assignments',
+                    'roleid = ?', array($roleid), 'COUNT(DISTINCT userid)');
 
                 $formcontinue = new single_button(new moodle_url($baseurl, $optionsyes), get_string('yes'));
                 $formcancel = new single_button(new moodle_url($baseurl), get_string('no'), 'get');

admin/tool/behat/index.php

@@ -27,6 +27,11 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->dirroot . '/' . $CFG->admin . '/tool/behat/locallib.php');
 require_once($CFG->libdir . '/behat/classes/behat_config_manager.php');
 
+// This page usually takes an exceedingly long time to load, so we need to
+// increase the time limit. At present it takes about a minute on some
+// systems, but let's allow room for expansion.
+set_time_limit(300);
+
 $filter = optional_param('filter', '', PARAM_ALPHANUMEXT);
 $type = optional_param('type', false, PARAM_ALPHAEXT);
 $component = optional_param('component', '', PARAM_ALPHAEXT);

auth/shibboleth/index.php

@@ -49,21 +49,7 @@
         if ($shibbolethauth->user_login($frm->username, $frm->password)
                 && $user = authenticate_user_login($frm->username, $frm->password)) {
 
-            enrol_check_plugins($user);
-            session_set_user($user);
-
-            $USER->loggedin = true;
-            $USER->site     = $CFG->wwwroot; // for added security, store the site in the
-
-            update_user_login_times();
-
-            // Don't show previous shibboleth username on login page
-
-            set_login_session_preferences();
-
-            unset($SESSION->lang);
-            $SESSION->justloggedin = true;
-
+            complete_user_login($user);
             add_to_log(SITEID, 'user', 'login', "view.php?id=$USER->id&course=".SITEID, $USER->id, 0, $USER->id);
 
             if (user_not_fully_set_up($USER)) {

badges/award.php

@@ -78,6 +78,14 @@ $output = $PAGE->get_renderer('core', 'badges');
 // Roles that can award this badge.
 $acceptedroles = array_keys($badge->criteria[BADGE_CRITERIA_TYPE_MANUAL]->params);
 
+if (empty($acceptedroles)) {
+    echo $OUTPUT->header();
+    $return = html_writer::link(new moodle_url('recipients.php', array('id' => $badge->id)), $strrecipients);
+    echo $OUTPUT->notification(get_string('notacceptedrole', 'badges', $return));
+    echo $OUTPUT->footer();
+    die();
+}
+
 if (count($acceptedroles) > 1) {
     // If there is more than one role that can award a badge, prompt user to make a selection.
     // If it is an admin, include all accepted roles, otherwise only the ones that current user has in this context.
@@ -117,7 +125,7 @@ if (count($acceptedroles) > 1) {
     }
 } else {
     // User has to be an admin or the one with the required role.
-    $users = get_role_users($acceptedroles[0], $context, false, 'u.id', 'u.id ASC');
+    $users = get_role_users($acceptedroles[0], $context, true, 'u.id', 'u.id ASC');
     $usersids = array_keys($users);
     if (!$isadmin && !in_array($USER->id, $usersids)) {
         echo $OUTPUT->header();

badges/criteria/award_criteria_manual.php

@@ -147,6 +147,11 @@ class award_criteria_manual extends award_criteria {
     public function review($userid) {
         global $DB;
 
+        // Roles should always have a parameter.
+        if (empty($this->params)) {
+            return false;
+        }
+
         $overall = false;
         foreach ($this->params as $param) {
             $crit = $DB->get_record('badge_manual_award', array('issuerrole' => $param['role'], 'recipientid' => $userid, 'badgeid' => $this->badgeid));

badges/renderer.php

@@ -41,7 +41,7 @@ class core_badges_renderer extends plugin_renderer_base {
                 $bname = $badge->name;
                 $imageurl = moodle_url::make_pluginfile_url($context->id, 'badges', 'badgeimage', $badge->id, '/', 'f1', false);
             } else {
-                $bname = $badge->assertion->badge->name;
+                $bname = s($badge->assertion->badge->name);
                 $imageurl = $badge->imageUrl;
             }
 
@@ -421,47 +421,48 @@ class core_badges_renderer extends plugin_renderer_base {
         }
 
         $datatable->data[] = array($this->output->heading(get_string('issuerdetails', 'badges'), 3), '');
-        $datatable->data[] = array(get_string('issuername', 'badges'), $issuer->name);
+        $datatable->data[] = array(get_string('issuername', 'badges'), s($issuer->name));
         $datatable->data[] = array(get_string('issuerurl', 'badges'),
-                html_writer::tag('a', $issuer->origin, array('href' => $issuer->origin)));
+                html_writer::tag('a', s($issuer->origin), array('href' => $issuer->origin)));
         if (isset($issuer->contact)) {
             $datatable->data[] = array(get_string('contact', 'badges'), obfuscate_mailto($issuer->contact));
         }
         $datatable->data[] = array($this->output->heading(get_string('badgedetails', 'badges'), 3), '');
-        $datatable->data[] = array(get_string('name'), $assertion->badge->name);
-        $datatable->data[] = array(get_string('description', 'badges'), $assertion->badge->description);
+        $datatable->data[] = array(get_string('name'), s($assertion->badge->name));
+        $datatable->data[] = array(get_string('description', 'badges'), s($assertion->badge->description));
         $datatable->data[] = array(get_string('bcriteria', 'badges'),
-                html_writer::tag('a', $assertion->badge->criteria, array('href' => $assertion->badge->criteria)));
+                html_writer::tag('a', s($assertion->badge->criteria), array('href' => $assertion->badge->criteria)));
         $datatable->data[] = array($this->output->heading(get_string('issuancedetails', 'badges'), 3), '');
         if (isset($assertion->issued_on)) {
-            $datatable->data[] = array(get_string('dateawarded', 'badges'), $assertion->issued_on);
+            $issuedate = !strtotime($assertion->issued_on) ? s($assertion->issued_on) : strtotime($assertion->issued_on);
+            $datatable->data[] = array(get_string('dateawarded', 'badges'), userdate($issuedate));
         }
-        if (isset($assertion->badge->expire)) {
+        if (isset($assertion->expires)) {
             $today_date = date('Y-m-d');
             $today = strtotime($today_date);
-            $expiration = strtotime($assertion->badge->expire);
+            $expiration = !strtotime($assertion->expires) ? s($assertion->expires) : strtotime($assertion->expires);
             if ($expiration < $today) {
-                $cell = new html_table_cell($assertion->badge->expire . get_string('warnexpired', 'badges'));
+                $cell = new html_table_cell(userdate($expiration) . get_string('warnexpired', 'badges'));
                 $cell->attributes = array('class' => 'notifyproblem warning');
                 $datatable->data[] = array(get_string('expirydate', 'badges'), $cell);
 
                 $image = html_writer::start_tag('div', array('class' => 'badge'));
-                $image .= html_writer::empty_tag('img', array('src' => $issued['badge']['image']));
+                $image .= html_writer::empty_tag('img', array('src' => $issued->imageUrl));
                 $image .= html_writer::start_tag('span', array('class' => 'expired'))
                             . $this->output->pix_icon('i/expired',
-                                get_string('expireddate', 'badges', $assertion->badge->expire),
+                                get_string('expireddate', 'badges', userdate($expiration)),
                                 'moodle',
                                 array('class' => 'expireimage'))
                             . html_writer::end_tag('span');
                 $image .= html_writer::end_tag('div');
                 $imagetable->data[0] = array($image);
             } else {
-                $datatable->data[] = array(get_string('expirydate', 'badges'), $assertion->badge->expire);
+                $datatable->data[] = array(get_string('expirydate', 'badges'), userdate($expiration));
             }
         }
         if (isset($assertion->evidence)) {
             $datatable->data[] = array(get_string('evidence', 'badges'),
-                html_writer::tag('a', $assertion->evidence, array('href' => $assertion->evidence)));
+                html_writer::tag('a', s($assertion->evidence), array('href' => $assertion->evidence)));
         }
         $table->attributes = array('class' => 'generalbox boxaligncenter issuedbadgebox');
         $table->data[] = array(html_writer::table($imagetable), html_writer::table($datatable));

blocks/course_overview/renderer.php

@@ -307,11 +307,11 @@ class block_course_overview_renderer extends plugin_renderer_base {
         $plural = 's';
         if ($msgcount > 0) {
             $output .= get_string('youhavemessages', 'block_course_overview', $msgcount);
-        } else {
-            $output .= get_string('youhavenomessages', 'block_course_overview');
             if ($msgcount == 1) {
                 $plural = '';
             }
+        } else {
+            $output .= get_string('youhavenomessages', 'block_course_overview');
         }
         $output .= html_writer::link(new moodle_url('/message/index.php'), get_string('message'.$plural, 'block_course_overview'));
         $output .= $this->output->box_end();

blocks/course_summary/tests/behat/block_course_summary_course.feature

@@ -25,19 +25,19 @@ Feature: Course summary block used in a course
   Scenario: Student can view course summary
     When I log in as "student1"
     And I follow "Course 1"
-    Then "block_course_summary" "block" should exist
-    And I should see "Proved the course summary block works!" in the "block_course_summary" "block"
+    Then "Course/site summary" "block" should exist
+    And I should see "Proved the course summary block works!" in the "Course/site summary" "block"
 
   Scenario: Teacher can see an edit icon when edit mode is on and follow it to the course edit page
     When I log in as "teacher1"
     And I follow "Course 1"
     And I turn editing mode on
-    Then I should see "Proved the course summary block works!" in the "block_course_summary" "block"
-    And I click on "Edit" "link" in the "block_course_summary" "block"
+    Then I should see "Proved the course summary block works!" in the "Course/site summary" "block"
+    And I click on "Edit" "link" in the "Course/site summary" "block"
     Then I should see "Edit course settings" in the "h2" "css_element"
 
   Scenario: Teacher can not see edit icon when edit mode is off
     When I log in as "teacher1"
     And I follow "Course 1"
-    Then I should see "Proved the course summary block works!" in the "block_course_summary" "block"
-    And "Edit" "link" should not exist in the "block_course_summary" "block"
+    Then I should see "Proved the course summary block works!" in the "Course/site summary" "block"
+    And "Edit" "link" should not exist in the "Course/site summary" "block"

blocks/course_summary/tests/behat/block_course_summary_frontpage.feature

@@ -15,19 +15,19 @@ Feature: Course summary block used on the frontpage
 
   Scenario: Guest can view site summary
     When I am on homepage
-    Then "block_course_summary" "block" should exist
-    And I should see "Proved the summary block works!" in the "block_course_summary" "block"
+    Then "Course/site summary" "block" should exist
+    And I should see "Proved the summary block works!" in the "Course/site summary" "block"
 
   Scenario: Admin can see an edit icon when edit mode is on and follow it to the front page settings
     When I log in as "admin"
     And I am on homepage
     And I follow "Turn editing on"
-    Then I should see "Proved the summary block works!" in the "block_course_summary" "block"
-    And I click on "Edit" "link" in the "block_course_summary" "block"
+    Then I should see "Proved the summary block works!" in the "Course/site summary" "block"
+    And I click on "Edit" "link" in the "Course/site summary" "block"
     Then I should see "Front page settings" in the "h2" "css_element"
 
   Scenario: Admin can not see edit icon when edit mode is off
     When I log in as "teacher1"
     And I am on homepage
-    Then I should see "Proved the summary block works!" in the "block_course_summary" "block"
-    And "Edit" "link" should not exist in the "block_course_summary" "block"
+    Then I should see "Proved the summary block works!" in the "Course/site summary" "block"
+    And "Edit" "link" should not exist in the "Course/site summary" "block"

blocks/html/tests/behat/configuring_html_block.feature

@@ -0,0 +1,38 @@
+@block @block_html @core_block
+Feature: Adding and configuring HTML blocks
+  In order to have custom blocks on a page
+  As admin
+  I need to be able to create, configure and change HTML blocks
+
+  @javascript
+  Scenario: Configuring the HTML block with Javascript on
+    Given I log in as "admin"
+    When I click on "Turn editing on" "link" in the "Administration" "block"
+    And I add the "HTML" block
+    And I configure the "(new HTML block)" block
+    And I set the field "Content" to "Static text without a header"
+    And I press "Save changes"
+    Then I should not see "(new HTML block)"
+    And I configure the "block_html" block
+    And I set the field "Block title" to "The HTML block header"
+    And I set the field "Content" to "Static text with a header"
+    And I press "Save changes"
+    And "block_html" "block" should exist
+    And "The HTML block header" "block" should exist
+    And I should see "Static text with a header" in the "The HTML block header" "block"
+
+  Scenario: Configuring the HTML block with Javascript off
+    Given I log in as "admin"
+    When I click on "Turn editing on" "link" in the "Administration" "block"
+    And I add the "HTML" block
+    And I configure the "(new HTML block)" block
+    And I set the field "Content" to "Static text without a header"
+    And I press "Save changes"
+    Then I should not see "(new HTML block)"
+    And I configure the "block_html" block
+    And I set the field "Block title" to "The HTML block header"
+    And I set the field "Content" to "Static text with a header"
+    And I press "Save changes"
+    And "block_html" "block" should exist
+    And "The HTML block header" "block" should exist
+    And I should see "Static text with a header" in the "The HTML block header" "block"

blocks/html/tests/behat/course_block.feature

@@ -0,0 +1,36 @@
+@block @block_html
+Feature: HTML blocks in a course
+  In order to have one or multiple HTML blocks in a course
+  As a teacher
+  I need to be able to create and change such blocks
+
+  Scenario: Adding HTML block in a course
+    Given the following "users" exist:
+      | username | firstname | lastname | email            |
+      | teacher1 | Terry1    | Teacher1 | teacher@asd.com  |
+      | student1 | Sam1      | Student1 | student1@asd.com |
+    And the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+      | student1 | C1     | student        |
+    When I log in as "teacher1"
+    And I follow "Course 1"
+    And I turn editing mode on
+    And I add the "HTML" block
+    And I configure the "(new HTML block)" block
+    And I set the field "Content" to "First block content"
+    And I set the field "Block title" to "First block header"
+    And I press "Save changes"
+    And I add the "HTML" block
+    And I configure the "(new HTML block)" block
+    And I set the field "Content" to "Second block content"
+    And I set the field "Block title" to "Second block header"
+    And I press "Save changes"
+    And I log out
+    And I log in as "student1"
+    And I follow "Course 1"
+    And I should see "First block content" in the "First block header" "block"
+    And I should see "Second block content" in the "Second block header" "block"

blocks/html/tests/behat/multiple_instances.feature

@@ -0,0 +1,41 @@
+@block @block_html
+Feature: Adding and configuring HTML blocks
+  In order to have one or multiple HTML blocks on a page
+  As admin
+  I need to be able to create, configure and change HTML blocks
+
+  Background:
+    Given I log in as "admin"
+    When I click on "Turn editing on" "link" in the "Administration" "block"
+    And I add the "HTML" block
+
+  Scenario: Other users can not see HTML block that has not been configured
+    Then "(new HTML block)" "block" should exist
+    And I log out
+    And "(new HTML block)" "block" should not exist
+    And "block_html" "block" should not exist
+
+  Scenario: Other users can see HTML block that has been configured even when it has no header
+    And I configure the "(new HTML block)" block
+    And I set the field "Content" to "Static text without a header"
+    And I press "Save changes"
+    Then I should not see "(new HTML block)"
+    And I log out
+    And I am on homepage
+    And "block_html" "block" should exist
+    And I should see "Static text without a header" in the "block_html" "block"
+    And I should not see "(new HTML block)"
+
+  Scenario: Adding multiple instances of HTML block on a page
+    And I configure the "block_html" block
+    And I set the field "Block title" to "The HTML block header"
+    And I set the field "Content" to "Static text with a header"
+    And I press "Save changes"
+    And I add the "HTML" block
+    And I configure the "(new HTML block)" block
+    And I set the field "Block title" to "The second HTML block header"
+    And I set the field "Content" to "Second block contents"
+    And I press "Save changes"
+    And I log out
+    Then I should see "Static text with a header" in the "The HTML block header" "block"
+    And I should see "Second block contents" in the "The second HTML block header" "block"

blocks/tests/behat/behat_blocks.php

@@ -58,4 +58,18 @@ class behat_blocks extends behat_base {
         return $steps;
     }
 
+    /**
+     * Clicks on Configure block for specified block. Page must be in editing mode.
+     *
+     * Argument block_name may be either the name of the block or CSS class of the block.
+     *
+     * @Given /^I configure the "(?P<block_name_string>(?:[^"]|\\")*)" block$/
+     * @param string $blockname
+     */
+    public function i_configure_the_block($blockname) {
+        // Note that since $blockname may be either block name or CSS class, we can not use the exact label of "Configure" link.
+        return array(
+            new Given('I click on "Configure" "link" in the "'.$this->escape($blockname).'" "block"')
+        );
+    }
 }

blocks/tests/behat/configure_block_throughout_site.feature

@@ -4,7 +4,6 @@ Feature: Add and configure blocks throughout the site
   As a manager
   I need to set and configure blocks throughout the site
 
-  @javascript
   Scenario: Add and configure a block throughtout the site
     Given the following "courses" exists:
       | fullname | shortname | category |
@@ -18,7 +17,7 @@ Feature: Add and configure blocks throughout the site
     And I log in as "manager1"
     And I follow "Turn editing on"
     And I add the "Comments" block
-    And I follow "Configure Comments block"
+    And I configure the "Comments" block
     And I fill the moodle form with:
       | Page contexts | Display throughout the entire site |
     And I press "Save changes"
@@ -26,7 +25,7 @@ Feature: Add and configure blocks throughout the site
     Then I should see "Comments" in the "Comments" "block"
     And I should see "Save comment" in the "Comments" "block"
     And I am on homepage
-    And I follow "Configure Comments block"
+    And I configure the "Comments" block
     And I fill the moodle form with:
       | Default weight | -10 (first) |
     And I press "Save changes"

blocks/tests/behat/manage_blocks.feature

@@ -42,17 +42,16 @@ Feature: Block appearances
     And I follow "Course 1"
     And I follow "Turn editing on"
     And I add the "Comments" block
-    And I follow "Configure Comments block"
+    And I configure the "Comments" block
     And I fill the moodle form with:
       | Display on page types | Any page |
     And I press "Save changes"
 
-  @javascript
   Scenario: Block settings can be modified so that a block apprears on any page
     When I follow "Test survey name"
     Then I should see "Comments" in the "Comments" "block"
     And I follow "Course 1"
-    And I follow "Configure Comments block"
+    And I configure the "Comments" block
     And I fill the moodle form with:
       | Display on page types | Any course page |
     And I press "Save changes"
@@ -60,10 +59,9 @@ Feature: Block appearances
     And I follow "Test survey name"
     And I should not see "Comments"
 
-  @javascript
   Scenario: Block settings can be modified so that a block can be hidden or moved
     When I follow "Test book name"
-    And I follow "Configure Comments block"
+    And I configure the "Comments" block
     And I fill the moodle form with:
       | Visible | No |
     And I press "Save changes"
@@ -72,7 +70,7 @@ Feature: Block appearances
     Then I should not see "Comments"
     And I expand "Course administration" node
     And I follow "Turn editing on"
-    And I follow "Configure Comments block"
+    And I configure the "Comments" block
     And I fill the moodle form with:
       | Visible | Yes |
       | Region  | Right |

blocks/tests/behat/restrict_available_blocks.feature

@@ -15,7 +15,6 @@ Feature: Allowed blocks controls
       | user | course | role |
       | teacher1 | C1 | editingteacher |
 
-  @javascript
   Scenario: Blocks can be added with the default permissions
     Given I log in as "teacher1"
     And I follow "Course 1"

blocks/tests/behat/return_block_original_state.feature

@@ -4,7 +4,6 @@ Feature: The context of a block can always be returned to it's original state.
   As an admin
   I need to be able to return the block to original state
 
-  @javascript
   Scenario: Add and configure a block to display on every page and revert back
     Given the following "courses" exists:
       | fullname | shortname | category |
@@ -15,7 +14,7 @@ Feature: The context of a block can always be returned to it's original state.
     And I add the "Tags" block
     Then I should see "Tags" in the "Tags" "block"
     And I click on "Participants" "link" in the "//li[p/span[contains(normalize-space(string(.)), 'Current course')]]" "xpath_element"
-    And I follow "Configure Tags block"
+    And I configure the "Tags" block
     And I fill the moodle form with:
       | Display on page types | Any page |
     And I press "Save changes"
@@ -24,7 +23,7 @@ Feature: The context of a block can always be returned to it's original state.
       | Assignment name | Assignment1 |
       | Description | Description |
     And I follow "Assignment1"
-    And I follow "Configure Tags block"
+    And I configure the "Tags" block
     And I fill the moodle form with:
       | Display on page types | Any assignment module page |
     And I press "Save changes"
@@ -39,7 +38,7 @@ Feature: The context of a block can always be returned to it's original state.
       | Description | Description |
     And I follow "Assignment2"
     And I should see "Tags" in the "Tags" "block"
-    And I follow "Configure Tags block"
+    And I configure the "Tags" block
     And I fill the moodle form with:
       | Display on page types | Any page |
     And I press "Save changes"

cache/classes/helper.php

@@ -718,7 +718,8 @@ class cache_helper {
             return $stores;
         } else {
             $stores = self::get_cache_stores($definition);
-            if (count($stores) === 0) {
+            // If mappingsonly is set, having 0 stores is ok.
+            if ((count($stores) === 0) && (!$definition->is_for_mappings_only())) {
                 // No suitable stores we found for the definition. We need to come up with a sensible default.
                 // If this has happened we can be sure that the user has mapped custom stores to either the
                 // mode of the definition. The first alternative to try is the system default for the mode.

cache/tests/cache_test.php

@@ -470,6 +470,33 @@ class cache_phpunit_tests extends advanced_testcase {
         $this->assertEquals('Test has no value really.', $cache->get('Test'));
     }
 
+    /**
+     * Test the mappingsonly setting.
+     */
+    public function test_definition_mappings_only() {
+        $instance = cache_config_phpunittest::instance(true);
+        $instance->phpunit_add_definition('phpunit/mappingsonly', array(
+            'mode' => cache_store::MODE_APPLICATION,
+            'component' => 'phpunit',
+            'area' => 'mappingsonly',
+            'mappingsonly' => true
+        ));
+        $instance->phpunit_add_definition('phpunit/nonmappingsonly', array(
+            'mode' => cache_store::MODE_APPLICATION,
+            'component' => 'phpunit',
+            'area' => 'nonmappingsonly',
+            'mappingsonly' => false
+        ));
+
+        $cacheonly = cache::make('phpunit', 'mappingsonly');
+        $this->assertInstanceOf('cache_application', $cacheonly);
+        $this->assertEquals('cachestore_dummy', $cacheonly->phpunit_get_store_class());
+
+        $cachenon = cache::make('phpunit', 'nonmappingsonly');
+        $this->assertInstanceOf('cache_application', $cachenon);
+        $this->assertEquals('cachestore_file', $cachenon->phpunit_get_store_class());
+    }
+
     /**
      * Test a very basic definition.
      */

comment/lib.php

@@ -526,9 +526,9 @@ class comment {
             $c->content     = $u->ccontent;
             $c->format      = $u->cformat;
             $c->timecreated = $u->ctimecreated;
-            $c->strftimeformat = get_string('strftimerecent', 'langconfig');
+            $c->strftimeformat = get_string('strftimerecentfull', 'langconfig');
             $url = new moodle_url('/user/view.php', array('id'=>$u->id, 'course'=>$this->courseid));
-            $c->profileurl = $url->out(true);
+            $c->profileurl = $url->out(false); // URL should not be escaped just yet.
             $c->fullname = fullname($u);
             $c->time = userdate($c->timecreated, $c->strftimeformat);
             $c->content = format_text($c->content, $c->format, $formatoptions);

composer.json

@@ -8,6 +8,6 @@
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
         "phpunit/dbUnit": "1.2.*",
-        "moodlehq/behat-extension": "1.25.12"
+        "moodlehq/behat-extension": "1.25.13"
     }
 }

course/modlib.php

@@ -178,6 +178,7 @@ function add_moduleinfo($moduleinfo, $course, $mform = null) {
  */
 function edit_module_post_actions($moduleinfo, $course, $eventname) {
     global $USER, $CFG;
+    require_once($CFG->libdir.'/gradelib.php');
 
     $modcontext = context_module::instance($moduleinfo->coursemodule);
 

grade/grading/form/guide/guideeditor.php

@@ -100,6 +100,7 @@ class moodlequickform_guideeditor extends HTML_QuickForm_input {
             $mode = gradingform_guide_controller::DISPLAY_EDIT_FULL;
             $module = array('name'=>'gradingform_guideeditor',
                 'fullpath'=>'/grade/grading/form/guide/js/guideeditor.js',
+                'requires' => array('base', 'dom', 'event', 'event-touch', 'escape'),
                 'strings' => array(
                     array('confirmdeletecriterion', 'gradingform_guide'),
                     array('clicktoedit', 'gradingform_guide'),

grade/grading/form/guide/js/guide.js

@@ -10,7 +10,7 @@ M.gradingform_guide.init = function(Y, options) {
         currentfocus = e.currentTarget;
     });
     Y.all('.markingguidecomment').on('click', function(e) {
-        currentfocus.set('value', currentfocus.get('value') + '\n' + e.currentTarget.get('innerHTML'));
+        currentfocus.set('value', currentfocus.get('value') + '\n' + e.currentTarget.get('text'));
         currentfocus.focus();
     });
 

grade/grading/form/guide/js/guideeditor.js

@@ -111,9 +111,9 @@ M.gradingform_guideeditor.editmode = function(el, editmode) {
             value = M.str.gradingform_guide.clicktoedit
             taplain.addClass('empty')
         }
-        taplain.one('.textvalue').set('innerHTML', value)
+        taplain.one('.textvalue').set('innerHTML', Y.Escape.html(value))
         if (tb) {
-            tbplain.one('.textvalue').set('innerHTML', tb.get('value'))
+            tbplain.one('.textvalue').set('innerHTML', Y.Escape.html(tb.get('value')))
         }
         // hide/display textarea, textbox and plaintexts
         taplain.removeClass('hiddenelement')

grade/grading/form/guide/lib.php

@@ -882,7 +882,7 @@ class gradingform_guide_instance extends gradingform_instance {
             if (!empty($this->validationerrors)) {
                 foreach ($this->validationerrors as $id => $err) {
                     $a = new stdClass();
-                    $a->criterianame = $criteria[$id]['shortname'];
+                    $a->criterianame = s($criteria[$id]['shortname']);
                     $a->maxscore = $criteria[$id]['maxscore'];
                     $html .= html_writer::tag('div', get_string('err_scoreinvalid', 'gradingform_guide', $a),
                         array('class' => 'gradingform_guide-error'));

grade/grading/form/guide/renderer.php

@@ -93,20 +93,20 @@ class gradingform_guide_renderer extends plugin_renderer_base {
                 'name' => '{NAME}[criteria][{CRITERION-id}][sortorder]', 'value' => $criterion['sortorder']));
 
             $shortname = html_writer::empty_tag('input', array('type'=> 'text',
-                'name' => '{NAME}[criteria][{CRITERION-id}][shortname]',  'value' => htmlspecialchars($criterion['shortname']),
+                'name' => '{NAME}[criteria][{CRITERION-id}][shortname]',  'value' => $criterion['shortname'],
                 'id ' => '{NAME}[criteria][{CRITERION-id}][shortname]'));
             $shortname = html_writer::tag('div', $shortname, array('class'=>'criterionname'));
-            $description = html_writer::tag('textarea', htmlspecialchars($criterion['description']),
+            $description = html_writer::tag('textarea', s($criterion['description']),
                 array('name' => '{NAME}[criteria][{CRITERION-id}][description]', 'cols' => '65', 'rows' => '5'));
             $description = html_writer::tag('div', $description, array('class'=>'criteriondesc'));
 
-            $descriptionmarkers = html_writer::tag('textarea', htmlspecialchars($criterion['descriptionmarkers']),
+            $descriptionmarkers = html_writer::tag('textarea', s($criterion['descriptionmarkers']),
                 array('name' => '{NAME}[criteria][{CRITERION-id}][descriptionmarkers]', 'cols' => '65', 'rows' => '5'));
             $descriptionmarkers = html_writer::tag('div', $descriptionmarkers, array('class'=>'criteriondescmarkers'));
 
             $maxscore = html_writer::empty_tag('input', array('type'=> 'text',
                 'name' => '{NAME}[criteria][{CRITERION-id}][maxscore]', 'size' => '3',
-                'value' => htmlspecialchars($criterion['maxscore']),
+                'value' => $criterion['maxscore'],
                 'id' => '{NAME}[criteria][{CRITERION-id}][maxscore]'));
             $maxscore = html_writer::tag('div', $maxscore, array('class'=>'criterionmaxscore'));
         } else {
@@ -125,7 +125,7 @@ class gradingform_guide_renderer extends plugin_renderer_base {
                        $mode == gradingform_guide_controller::DISPLAY_VIEW) {
                 $descriptionclass = 'descriptionreadonly';
             }
-            $shortname   = html_writer::tag('div', $criterion['shortname'],
+            $shortname   = html_writer::tag('div', s($criterion['shortname']),
                 array('class'=>'criterionshortname', 'name' => '{NAME}[criteria][{CRITERION-id}][shortname]'));
             $descmarkerclass = '';
             $descstudentclass = '';
@@ -137,13 +137,13 @@ class gradingform_guide_renderer extends plugin_renderer_base {
                     $descstudentclass = ' hide';
                 }
             }
-            $description = html_writer::tag('div', $criterion['description'],
+            $description = html_writer::tag('div', s($criterion['description']),
                 array('class'=>'criteriondescription'.$descstudentclass,
                       'name' => '{NAME}[criteria][{CRITERION-id}][descriptionmarkers]'));
-            $descriptionmarkers   = html_writer::tag('div', $criterion['descriptionmarkers'],
+            $descriptionmarkers   = html_writer::tag('div', s($criterion['descriptionmarkers']),
                 array('class'=>'criteriondescriptionmarkers'.$descmarkerclass,
                       'name' => '{NAME}[criteria][{CRITERION-id}][descriptionmarkers]'));
-            $maxscore   = html_writer::tag('div', $criterion['maxscore'],
+            $maxscore   = html_writer::tag('div', s($criterion['maxscore']),
                 array('class'=>'criteriondescriptionscore', 'name' => '{NAME}[criteria][{CRITERION-id}][maxscore]'));
         }
 
@@ -193,7 +193,7 @@ class gradingform_guide_renderer extends plugin_renderer_base {
                 $scoreclass = 'error';
                 $currentscore = $validationerrors[$criterion['id']]['score']; // Show invalid score in form.
             }
-            $input = html_writer::tag('textarea', htmlspecialchars($currentremark),
+            $input = html_writer::tag('textarea', s($currentremark),
                 array('name' => '{NAME}[criteria][{CRITERION-id}][remark]', 'cols' => '65', 'rows' => '5',
                       'class' => 'markingguideremark'));
             $criteriontemplate .= html_writer::tag('td', $input, array('class' => 'remark'));
@@ -202,7 +202,7 @@ class gradingform_guide_renderer extends plugin_renderer_base {
             $score .= html_writer::empty_tag('input', array('type'=> 'text',
                 'name' => '{NAME}[criteria][{CRITERION-id}][score]', 'class' => $scoreclass,
                 'id' => '{NAME}[criteria][{CRITERION-id}][score]',
-                'size' => '3', 'value' => htmlspecialchars($currentscore)));
+                'size' => '3', 'value' => $currentscore));
             $score .= '/'.$maxscore;
 
             $criteriontemplate .= html_writer::tag('td', $score, array('class' => 'score'));
@@ -211,9 +211,9 @@ class gradingform_guide_renderer extends plugin_renderer_base {
                 'name' => '{NAME}[criteria][{CRITERION-id}][remark]', 'value' => $currentremark));
         } else if ($mode == gradingform_guide_controller::DISPLAY_REVIEW ||
             $mode == gradingform_guide_controller::DISPLAY_VIEW) {
-            $criteriontemplate .= html_writer::tag('td', $currentremark, array('class' => 'remark'));
+            $criteriontemplate .= html_writer::tag('td', s($currentremark), array('class' => 'remark'));
             if (!empty($options['showmarkspercriterionstudents'])) {
-                $criteriontemplate .= html_writer::tag('td', htmlspecialchars($currentscore). ' / '.$maxscore,
+                $criteriontemplate .= html_writer::tag('td', s($currentscore). ' / '.$maxscore,
                     array('class' => 'score'));
             }
         }
@@ -272,7 +272,7 @@ class gradingform_guide_renderer extends plugin_renderer_base {
             $criteriontemplate .= html_writer::end_tag('td'); // Controls.
             $criteriontemplate .= html_writer::empty_tag('input', array('type' => 'hidden',
                 'name' => '{NAME}[comments][{COMMENT-id}][sortorder]', 'value' => $comment['sortorder']));
-            $description = html_writer::tag('textarea', htmlspecialchars($comment['description']),
+            $description = html_writer::tag('textarea', s($comment['description']),
                 array('name' => '{NAME}[comments][{COMMENT-id}][description]', 'cols' => '65', 'rows' => '5'));
             $description = html_writer::tag('div', $description, array('class'=>'criteriondesc'));
         } else {
@@ -283,12 +283,12 @@ class gradingform_guide_renderer extends plugin_renderer_base {
                     'name' => '{NAME}[comments][{COMMENT-id}][description]', 'value' => $comment['description']));
             }
             if ($mode == gradingform_guide_controller::DISPLAY_EVAL) {
-                $description = html_writer::tag('span', htmlspecialchars($comment['description']),
+                $description = html_writer::tag('span', s($comment['description']),
                     array('name' => '{NAME}[comments][{COMMENT-id}][description]',
                           'title' => get_string('clicktocopy', 'gradingform_guide'),
                           'id' => '{NAME}[comments][{COMMENT-id}]', 'class'=>'markingguidecomment'));
             } else {
-                $description = $comment['description'];
+                $description = s($comment['description']);
             }
         }
         $descriptionclass = 'description';

grade/grading/form/rubric/js/rubriceditor.js

@@ -93,8 +93,8 @@ M.gradingform_rubriceditor.editmode = function(el, editmode, focustb) {
             value = (el.hasClass('level')) ? M.str.gradingform_rubric.levelempty : M.str.gradingform_rubric.criterionempty
             taplain.addClass('empty')
         }
-        taplain.one('.textvalue').set('innerHTML', value)
-        if (tb) tbplain.one('.textvalue').set('innerHTML', tb.get('value'))
+        taplain.one('.textvalue').set('innerHTML', Y.Escape.html(value));
+        if (tb) tbplain.one('.textvalue').set('innerHTML', Y.Escape.html(tb.get('value')));
         // hide/display textarea, textbox and plaintexts
         taplain.removeClass('hiddenelement')
         ta.addClass('hiddenelement')

grade/grading/form/rubric/renderer.php

@@ -79,13 +79,13 @@ class gradingform_rubric_renderer extends plugin_renderer_base {
             }
             $criteriontemplate .= html_writer::end_tag('td'); // .controls
             $criteriontemplate .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => '{NAME}[criteria][{CRITERION-id}][sortorder]', 'value' => $criterion['sortorder']));
-            $description = html_writer::tag('textarea', htmlspecialchars($criterion['description']), array('name' => '{NAME}[criteria][{CRITERION-id}][description]', 'cols' => '10', 'rows' => '5'));
+            $description = html_writer::tag('textarea', s($criterion['description']), array('name' => '{NAME}[criteria][{CRITERION-id}][description]', 'cols' => '10', 'rows' => '5'));
         } else {
             if ($mode == gradingform_rubric_controller::DISPLAY_EDIT_FROZEN) {
                 $criteriontemplate .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => '{NAME}[criteria][{CRITERION-id}][sortorder]', 'value' => $criterion['sortorder']));
                 $criteriontemplate .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => '{NAME}[criteria][{CRITERION-id}][description]', 'value' => $criterion['description']));
             }
-            $description = $criterion['description'];
+            $description = s($criterion['description']);
         }
         $descriptionclass = 'description';
         if (isset($criterion['error_description'])) {
@@ -111,12 +111,12 @@ class gradingform_rubric_renderer extends plugin_renderer_base {
                 $currentremark = $value['remark'];
             }
             if ($mode == gradingform_rubric_controller::DISPLAY_EVAL) {
-                $input = html_writer::tag('textarea', htmlspecialchars($currentremark), array('name' => '{NAME}[criteria][{CRITERION-id}][remark]', 'cols' => '10', 'rows' => '5'));
+                $input = html_writer::tag('textarea', s($currentremark), array('name' => '{NAME}[criteria][{CRITERION-id}][remark]', 'cols' => '10', 'rows' => '5'));
                 $criteriontemplate .= html_writer::tag('td', $input, array('class' => 'remark'));
             } else if ($mode == gradingform_rubric_controller::DISPLAY_EVAL_FROZEN) {
                 $criteriontemplate .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => '{NAME}[criteria][{CRITERION-id}][remark]', 'value' => $currentremark));
             }else if ($mode == gradingform_rubric_controller::DISPLAY_REVIEW || $mode == gradingform_rubric_controller::DISPLAY_VIEW) {
-                $criteriontemplate .= html_writer::tag('td', $currentremark, array('class' => 'remark'));
+                $criteriontemplate .= html_writer::tag('td', s($currentremark), array('class' => 'remark'));
             }
         }
         $criteriontemplate .= html_writer::end_tag('tr'); // .criterion
@@ -169,7 +169,7 @@ class gradingform_rubric_renderer extends plugin_renderer_base {
         $leveltemplate = html_writer::start_tag('td', $tdattributes);
         $leveltemplate .= html_writer::start_tag('div', array('class' => 'level-wrapper'));
         if ($mode == gradingform_rubric_controller::DISPLAY_EDIT_FULL) {
-            $definition = html_writer::tag('textarea', htmlspecialchars($level['definition']), array('name' => '{NAME}[criteria][{CRITERION-id}][levels][{LEVEL-id}][definition]', 'cols' => '10', 'rows' => '4'));
+            $definition = html_writer::tag('textarea', s($level['definition']), array('name' => '{NAME}[criteria][{CRITERION-id}][levels][{LEVEL-id}][definition]', 'cols' => '10', 'rows' => '4'));
             $score = html_writer::label(get_string('criterionempty', 'gradingform_rubric'), '{NAME}criteria{CRITERION-id}levels{LEVEL-id}', false, array('class' => 'accesshide'));
             $score .= html_writer::empty_tag('input', array('type' => 'text','id' => '{NAME}criteria{CRITERION-id}levels{LEVEL-id}', 'name' => '{NAME}[criteria][{CRITERION-id}][levels][{LEVEL-id}][score]', 'size' => '3', 'value' => $level['score']));
         } else {
@@ -177,7 +177,7 @@ class gradingform_rubric_renderer extends plugin_renderer_base {
                 $leveltemplate .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => '{NAME}[criteria][{CRITERION-id}][levels][{LEVEL-id}][definition]', 'value' => $level['definition']));
                 $leveltemplate .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => '{NAME}[criteria][{CRITERION-id}][levels][{LEVEL-id}][score]', 'value' => $level['score']));
             }
-            $definition = $level['definition'];
+            $definition = s($level['definition']);
             $score = $level['score'];
         }
         if ($mode == gradingform_rubric_controller::DISPLAY_EVAL) {

grade/grading/form/rubric/rubriceditor.php

@@ -106,6 +106,7 @@ class MoodleQuickForm_rubriceditor extends HTML_QuickForm_input {
         if (!$this->_flagFrozen) {
             $mode = gradingform_rubric_controller::DISPLAY_EDIT_FULL;
             $module = array('name'=>'gradingform_rubriceditor', 'fullpath'=>'/grade/grading/form/rubric/js/rubriceditor.js',
+                'requires' => array('base', 'dom', 'event', 'event-touch', 'escape'),
                 'strings' => array(array('confirmdeletecriterion', 'gradingform_rubric'), array('confirmdeletelevel', 'gradingform_rubric'),
                     array('criterionempty', 'gradingform_rubric'), array('levelempty', 'gradingform_rubric')
                     ));

grade/querylib.php

@@ -251,9 +251,9 @@ function grade_get_grade_items_for_activity($cm, $only_main_item=false) {
 
     if (!isset($cm->modname)) {
         $params = array($cm->id);
-        $cm = $DB->get_record_sql("SELECT cm.*, m.name, md.name as modname
+        $cm = $DB->get_record_sql("SELECT cm.*, md.name as modname
                                     FROM {course_modules} cm,
-                                         {modules} md,
+                                         {modules} md
                                    WHERE cm.id = ? AND md.id = cm.module", $params);
     }
 

grade/tests/querylib_test.php

@@ -50,4 +50,15 @@ class grade_querylib_testcase extends advanced_testcase {
         $this->assertEquals(1, count($cms));
         $this->assertTrue(isset($cms[$forum1->cmid]));
     }
+
+    public function test_grade_get_grade_items_for_activity() {
+        $this->resetAfterTest(true);
+
+        $course = $this->getDataGenerator()->create_course();
+        $forum = $this->getDataGenerator()->create_module('forum', array('course'=>$course->id));
+        $cm = get_coursemodule_from_id('forum', $forum->cmid, $forum->course);
+        unset($cm->modname);
+        $grade = grade_get_grade_items_for_activity($cm);
+
+    }
 }

group/autogroup_form.php

@@ -133,7 +133,7 @@ class autogroup_form extends moodleform {
         $mform->setType('seed', PARAM_INT);
 
         $buttonarray = array();
-        $buttonarray[] = &$mform->createElement('submit', 'preview', get_string('preview'), 'xx');
+        $buttonarray[] = &$mform->createElement('submit', 'preview', get_string('preview'));
         $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('submit'));
         $buttonarray[] = &$mform->createElement('cancel');
         $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);

install/lang/af/install.php

@@ -0,0 +1,33 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['availablelangs'] = 'Beskikbare taal pakkette';

install/lang/af/moodle.php

@@ -0,0 +1,36 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['language'] = 'Taal';
+$string['next'] = 'Volgende';
+$string['previous'] = 'Vorige';
+$string['reload'] = 'Herlaai';

install/lang/an/langconfig.php

@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['thisdirection'] = 'ltr';
+$string['thislanguage'] = 'Aragonés';

install/lang/ckb/admin.php

@@ -0,0 +1,44 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['clianswerno'] = 'n';
+$string['cliansweryes'] = 'y';
+$string['cliincorrectvalueerror'] = 'هەڵە، نرخی نادروستی "{$a->value}" بۆ "{$a->option}"';
+$string['cliincorrectvalueretry'] = 'نرخەکە نادرووستە، تکایە دووبارەبکەوە';
+$string['clitypevalue'] = 'نرخی جۆر';
+$string['clitypevaluedefault'] = 'نرخی جۆر، تکایە Enter دابگرە بۆ بەکارهێنانی نرخی بنەڕەتیی ({$a})';
+$string['cliunknowoption'] = 'هەلبژاردنە نەناسراوەکان:
+ {$a}
+تکایە بەکاربهینە --هەلبژاردنى یارمەتى.';
+$string['cliyesnoprompt'] = 'جۆرى y (واتا بەڵێ) یاخود n (واتا نەخێر)';
+$string['environmentrequireinstall'] = 'پیویستى بە دامەزراندن و چالاکە';
+$string['environmentrequireversion'] = 'چاپ {$a->پیویست بوو} پیویست دەکات و ئایا بەکار دەخەى {$a->رەوان}';

install/lang/ckb/error.php

@@ -0,0 +1,55 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['cannotcreatedboninstall'] = '<p>ناتوانرێت داتابەیس دروست بکرێت.</p>
+<p>داتابەیستی دیاری کراو بوونی نییەو بەکارهێنەری دراو مۆڵەتی دروست کردنی داتابەیسی نییە.</p>
+<p>پێویستە سەرپەرشتیاری ماڵپەڕ سازاندنی داتابەیس پەسەند بکات.</p>';
+$string['cannotcreatelangdir'] = 'ناتوانریت ڕابەرنامەی زمان دروست بکرێت';
+$string['cannotcreatetempdir'] = 'ناتوانرێت ڕابەرنامەی کاتیی دروست بکرێت';
+$string['cannotdownloadcomponents'] = 'ناتوانرێت پێکهێنەرەکان داببەزێنرێن';
+$string['cannotdownloadzipfile'] = 'ناتوانریت فایلی زیپ داببەزێنرێت';
+$string['cannotfindcomponent'] = 'تانتوانرێت پێکهێنەر بدۆزرێتەوە';
+$string['cannotsavemd5file'] = 'ناتوانرێت فایلی md5 پاشەکەوت بکرێت';
+$string['cannotsavezipfile'] = 'ناتوانرێت فایلی زیپ پاشەکەوت بکرێت';
+$string['cannotunzipfile'] = 'ناتوانرێت فایلەکە لە زیپ بهێنرێتە دەرەوە';
+$string['componentisuptodate'] = 'سەرنجەکە تەواو نوێیە';
+$string['dmlexceptiononinstall'] = '<p>هەڵە ڕویدا لە داتابەیس [{$a->errorcode}]. <br />{$a->debuginfo}</p>.
+
+<br />{$a->debuginfo}</p>';
+$string['downloadedfilecheckfailed'] = 'پشکنینی دابەزاندنی فایل سەرکەوتوو نەبوو';
+$string['invalidmd5'] = 'پشکنینی گۆڕاو هەڵە بو - دووبارە بکەوە';
+$string['missingrequiredfield'] = 'هەندێ بواری داواکراو دیاری نەکراون';
+$string['remotedownloaderror'] = '<p>دابەزاندنی پێکهێنەری ڕاژەکارەکەت سەرکەوتو نەبوو. تکایە ڕێکخستنەکانی پڕۆکسی پشت ڕاست بکەوە: درێژبوونەوەی PHP cURL بەشێوەیەکی زۆر پێشنیاز کراوە. </p>
+<p>پێویستە تۆ فایلی <a href="{$a->url}">{$a->url}</a> بەدەست دابەزێنی، کۆپی بکە بۆ "{$a->dest}" لە نێو ڕاژەکارەکەت و لەوێ لەنێو زیپ بیهێنە دەرەوە. </p>';
+$string['wrongdestpath'] = 'ڕێڕەوی ئامانج هەڵەیە';
+$string['wrongsourcebase'] = 'بنچینەی URLی سەرچاوە هەڵەیە';
+$string['wrongzipfilename'] = 'ناوی فایلی زیپ هەڵەیە';

install/lang/cs/error.php

@@ -46,7 +46,8 @@ $string['dmlexceptiononinstall'] = '<p>Došlo k chybě databáze [{$a->errorcode
 $string['downloadedfilecheckfailed'] = 'Selhala kontrola staženého souboru';
 $string['invalidmd5'] = 'Ověření selhalo - zkuste to znovu';
 $string['missingrequiredfield'] = 'Chybí některé z povinných polí';
-$string['remotedownloaderror'] = 'Stahování komponenty na váš server selhalo. Prověřte nastavení proxy. Vřele doporučujeme PHP rozšíření cURL.<br /><br />Nyní musíte stáhnout soubor <a href="{$a->url}">{$a->url}</a> ručně, překopírovat jej do "{$a->dest}" na vašem serveru a tam jej rozbalit.';
+$string['remotedownloaderror'] = '<p>Stahování komponenty na váš server selhalo. Prověřte nastavení proxy. Vřele doporučujeme PHP rozšíření cURL.</p>
+<p>Nyní musíte stáhnout soubor <a href="{$a->url}">{$a->url}</a> ručně, překopírovat jej do "{$a->dest}" na vašem serveru a tam jej rozbalit.</p>';
 $string['wrongdestpath'] = 'Chybné cílové umístění';
 $string['wrongsourcebase'] = 'Chybné URL zdrojového serveru';
 $string['wrongzipfilename'] = 'Chybné jméno souboru ZIP';

install/lang/de/admin.php

@@ -41,4 +41,4 @@ $string['cliunknowoption'] = 'Nicht erkannte Optionen:
 Hilfe wird über die Option --help angezeigt.';
 $string['cliyesnoprompt'] = 'y (yes=ja) oder n (no=nein) eingeben';
 $string['environmentrequireinstall'] = 'muss installiert und aktiviert sein';
-$string['environmentrequireversion'] = 'Version {$a->needed} ist erforderlich - aktuell ist {$a->current} installiert.';
+$string['environmentrequireversion'] = 'notwendig: {$a->needed} - installiert: {$a->current}';

install/lang/de/install.php

@@ -34,8 +34,8 @@ $string['admindirname'] = 'Admin-Verzeichnis';
 $string['availablelangs'] = 'Verfügbare Sprachpakete';
 $string['chooselanguagehead'] = 'Sprache wählen';
 $string['chooselanguagesub'] = 'Wählen Sie eine Sprache, die Sie während der Installation verwenden wollen. Die ausgewählte Sprache wird nach der Installation als Standardsprache der Instanz benutzt, aber Sie dürfen die Sprache jederzeit ändern.';
-$string['clialreadyconfigured'] = 'Die Datei config.php existiert bereits. Bitte benutzen Sie admin/cli/install_database.php, wenn sie diese Website installieren möchten.';
-$string['clialreadyinstalled'] = 'Die Datei config.php existiert bereits. Bitte benutzen Sie admin/cli/upgrade.php, wenn Sie diese Website aktualisieren möchten.';
+$string['clialreadyconfigured'] = 'Die Datei config.php existiert bereits. Bitte benutzen Sie admin/cli/install_database.php, wenn Sie diese Site installieren möchten.';
+$string['clialreadyinstalled'] = 'Die Datei config.php existiert bereits. Bitte benutzen Sie admin/cli/install_database.php, wenn Sie diese Site aktualisieren möchten.';
 $string['cliinstallheader'] = 'Installation von Moodle {$a} über die Kommandozeile';
 $string['databasehost'] = 'Datenbank-Server';
 $string['databasename'] = 'Datenbank-Name';
@@ -48,7 +48,7 @@ $string['environmenthead'] = 'Installationsvoraussetzungen werden geprüft ...';
 $string['environmentsub2'] = 'Jede Version hat Mindestvoraussetzungen für der PHP-Version und für verbindliche PHP-Extensions. Vor einer Installation oder einer Aktualisierung wird eine vollständige Prüfung durchgeführt. Bitte fragen Sie den Administrator des Servers, wenn Sie mit der Installation einer neuen Version oder mit der Aktivierung von PHP-Extensions nicht weiterkommen.';
 $string['errorsinenvironment'] = 'Fehler bei der Prüfung der Systemvoraussetzungen!';
 $string['installation'] = 'Installation';
-$string['langdownloaderror'] = 'Leider konnte das Sprachpaket \'{$a}\' nicht heruntergeladen werden. Die Installation wird in englischer Sprache fortgesetzt.';
+$string['langdownloaderror'] = 'Das Sprachpaket \'{$a}\' konnte nicht heruntergeladen werden. Die Installation wird in englischer Sprache fortgesetzt.';
 $string['memorylimithelp'] = '<p>Die PHP-Einstellung memory_limit Ihres Servers ist zur Zeit auf {$a} eingestellt. </p>
 <p>Wenn Sie Moodle mit vielen Aktivitäten oder vielen Nutzer/innen verwenden, wird dies vermutlich zu Problemen führen.</p>
 <p>Wir empfehlen die Einstellung wenn möglich zu erhöhen, z.B. auf 40M oder mehr. Dies können Sie auf verschiedene Arten machen:</p>
@@ -64,11 +64,11 @@ $string['pathshead'] = 'Pfade bestätigen';
 $string['pathsrodataroot'] = 'Das Verzeichnis dataroot ist schreibgeschützt.';
 $string['pathsroparentdataroot'] = 'Das Verzeichnis ({$a->parent}) ist schreibgeschützt. Deswegen kann das Datenverzeichnis ({$a->dataroot})  vom Installer nicht angelegt werden.';
 $string['pathssubadmindir'] = 'Einige Webserver benutzen /admin als speziellen Link, um auf Einstellungsseiten oder Ähnliches zu verweisen. Unglücklicherweise kollidiert dies mit dem standardmäßigen Verzeichnis für die Moodle-Administration. Sie können dieses Problem beheben, indem Sie das Verzeichnis admin in Ihrer Moodle-Installation umbenennen und den neuen Namen hier eingeben (z.B. <em>moodleadmin</em>). Mit dieser Änderung werden alle Admin-Links korrigiert.';
-$string['pathssubdataroot'] = 'Sie benötigen einen Platz, wo Moodle hochgeladene Dateien abspeichern kann. Dieses Verzeichnis muss Lese- und Schreibrechte für das Nutzerkonto besitzen, mit dem Ihr Webservers läuft (üblicherweise \'nobody\', \'apache\' oder \'www\'). Außerdem sollte das Verzeichnis nicht direkt aus dem Internet erreichbar sein. Das Intallationsskript wird versuchen, ein solches Verzeichnis zu erstellen, falls es nicht existiert.</p>';
-$string['pathssubdirroot'] = 'Vollständiger Pfad der Moodle-Installation';
-$string['pathssubwwwroot'] = 'Vollständige Webadresse für den Zugriff auf Moodle. Es ist nicht möglich, über unterschiedliche Adressen auf Moodle zuzugreifen. Sollte Ihre Website mehrere öffentliche Adressen verwenden, so müssen Sie eine Adresse festlegen und für die übrigen Adressen dauerhafte Weiterleitungen dorthin einrichten.
-<p>Falls Ihre Website gleichzeitig im Intranet und im Internet erreichbar ist, so tragen Sie die öffentliche Adresse ein. Konfigurieren Sie den DNS so, dass Moodle auch aus dem Intranet über die öffentliche Adresse erreichbar ist.
-<p>Führen Sie Ihre Moodle-Installation unbedingt mit der richtigen Adresse durch, weil es andernfalls zu Problemen kommen könnte.';
+$string['pathssubdataroot'] = '<p>Sie benötigen einen Platz, wo Moodle hochgeladene Dateien abspeichern kann. </p><p>Dieses Verzeichnis muss Lese- und Schreibrechte für das Nutzerkonto besitzen, mit dem Ihr Webservers läuft (üblicherweise \'nobody\', \'apache\' oder \'www-data).</p><p>  Außerdem sollte das Verzeichnis nicht direkt aus dem Internet erreichbar sein. </p><p>Das Intallationsskript wird versuchen, ein solches Verzeichnis zu erstellen, falls es nicht existiert.</p>';
+$string['pathssubdirroot'] = '<p>Vollständiger Pfad der Moodle-Installation.</p>';
+$string['pathssubwwwroot'] = '<p>Webadresse, die ein Nutzer im Browser eingibt, um auf Moodle zuzugreifen.</p><p> Es ist nicht möglich, über unterschiedliche Adressen auf Moodle zuzugreifen. Sollte Ihre Website mehrere öffentliche Adressen verwenden, so müssen Sie eine Adresse festlegen und für die übrigen Adressen dauerhafte Weiterleitungen dorthin einrichten.</p>
+<p>Falls Ihre Website gleichzeitig im Intranet und im Internet erreichbar ist, so tragen Sie die öffentliche Adresse ein. Konfigurieren Sie den DNS so, dass Moodle auch aus dem Intranet über die öffentliche Adresse erreichbar ist.</p>
+<p>Führen Sie Ihre Moodle-Installation unbedingt mit der richtigen Adresse durch, weil es andernfalls zu Problemen kommen könnte.</p>';
 $string['pathsunsecuredataroot'] = 'Der Speicherort des Verzeichnisses \'dataroot\' ist unsicher';
 $string['pathswrongadmindir'] = 'Das Admin-Verzeichnis existiert nicht';
 $string['phpextension'] = 'PHP-Extension {$a}';

install/lang/eo/langconfig.php

@@ -0,0 +1,33 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['thislanguage'] = 'Esperanto';

install/lang/es/langconfig.php

@@ -30,5 +30,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+$string['parentlanguage'] = '';
 $string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Español - Internacional';

install/lang/es_ve/langconfig.php

@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'es';
+$string['thislanguage'] = 'Español Venezuela';

install/lang/fr/install.php

@@ -35,7 +35,7 @@ $string['availablelangs'] = 'Paquetages de langue disponibles';
 $string['chooselanguagehead'] = 'Choisissez une langue';
 $string['chooselanguagesub'] = 'Veuillez choisir la langue d\'installation. Cette langue sera utilisée comme langue par défaut du site, que vous pourrez modifier ultérieurement.';
 $string['clialreadyconfigured'] = 'Le fichier config.php existe déjà. Veuillez utiliser admin/cli/install_database.php pour installer Moodle sur ce site.';
-$string['clialreadyinstalled'] = 'Le fichier config.php existe déjà. Veuillez utiliser admin/cli/upgrade.php si vous désirez mettre à jour ce site.';
+$string['clialreadyinstalled'] = 'Le fichier config.php existe déjà. Veuillez utiliser admin/cli/install_database.php si vous désirez mettre à jour ce site Moodle.';
 $string['cliinstallheader'] = 'Programme d\'installation de Moodle {$a} en ligne de commande';
 $string['databasehost'] = 'Serveur de base de données';
 $string['databasename'] = 'Nom de la base de données';

install/lang/hr/install.php

@@ -56,7 +56,7 @@ $string['memorylimithelp'] = '<p>PHP ograničenje memorije na poslužitelju je t
 
 <p>Preporučujemo da konfigurirate PHP s većim ograničenjem ako je moguće, recimo 40M. Postoji nekoliko načina na koje to možete napraviti:</p>
 <ol>
-<li>Ako možete, rekompajlirajte PHP s <i>--enable-memory-limit</i>. Ovo će dozvoliti Moodle sustavu samostalno postavljanje memorijskog ograničenja.</li>
+<li>Ako možete, rekompajlirajte PHP s <i>--enable-memory-limit</i>. Ovo će dopustiti Moodle sustavu samostalno postavljanje memorijskog ograničenja.</li>
 <li>Ako imate pristup php.ini datoteci, možete promijeniti <b>memory_limit</b> vrijednost na 40M. Ako nemate pristup toj datoteci možete pitati svog administratora da to uradi.</li>
 <li>Na nekim PHP poslužiteljima možete napraviti .htaccess datoteku u Moodle mapi koja sadrži red: <p><blockquote>php_value memory_limit 40M</blockquote></p>
 <p>Uzmite u obzir da će na nekim poslužiteljima to spriječiti prikazivanje <b>svih</b> PHP stranica (bit će vam prikazana poruka o grešci), pa ćete na takvim poslužiteljima morati ukloniti .htaccess datoteku.</p></li> </ol>';

install/lang/hr/moodle.php

@@ -31,6 +31,6 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['language'] = 'Jezik';
-$string['next'] = 'Nastavite';
+$string['next'] = 'Nastavi';
 $string['previous'] = 'Prethodni';
 $string['reload'] = 'Učitaj ponovno';

install/lang/kn/moodle.php

@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['language'] = 'ಭಾಷೆ';
+$string['next'] = 'ಮುಂದಿನ';

install/lang/lt/error.php

@@ -34,3 +34,15 @@ $string['cannotcreatelangdir'] = 'Negalima sukurti kalbos katalogo';
 $string['cannotcreatetempdir'] = 'Negalima sukurti laikinojo katalogo';
 $string['cannotdownloadcomponents'] = 'Negalima atsisiųsti komponentų';
 $string['cannotdownloadzipfile'] = 'Negalima atsisiųsti ZIP failo';
+$string['cannotfindcomponent'] = 'Nepavyko rasti komponento';
+$string['cannotsavemd5file'] = 'Negalima įrašyti md5 failo';
+$string['cannotsavezipfile'] = 'Negalima įrašyti ZIP failo';
+$string['cannotunzipfile'] = 'Negalima išskleisti failo';
+$string['componentisuptodate'] = 'Komponentas atnaujintas';
+$string['downloadedfilecheckfailed'] = 'Nepavyko patikrinti atsisiųsto failo';
+$string['invalidmd5'] = 'Kintamojo patikra nepavyko – bandykite dar kartą';
+$string['missingrequiredfield'] = 'Trūksta būtino lauko';
+$string['remotedownloaderror'] = 'Nepavyko į serverį atsisiųsti komponento, patikrinkite tarpinio serverio parametrus, labai rekomenduojama naudoti PHP cURL plėtinį.<br /><br />Turite rankiniu būdu atsisiųsti <a href="{$a->url}">{$a->url}</a> failą, nukopijuoti jį į {$a->dest} serveryje ir ten jį išskleisti.';
+$string['wrongdestpath'] = 'Neteisingas paskirties kelias';
+$string['wrongsourcebase'] = 'Neteisingas šaltinio URL pagrindas';
+$string['wrongzipfilename'] = 'Neteisingas ZIP failo vardas';

install/lang/lt/langconfig.php

@@ -30,5 +30,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+$string['parentlanguage'] = '';
 $string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Lietuvių';

install/lang/oc_lnc/admin.php

@@ -0,0 +1,44 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['clianswerno'] = 'n';
+$string['cliansweryes'] = 'y';
+$string['cliincorrectvalueerror'] = 'Error, valor incorrecte « {$a->value} » per lo paramètre « {$a->option} »';
+$string['cliincorrectvalueretry'] = 'Valor incorrecte, veuillez réessayer';
+$string['clitypevalue'] = 'tipe valor';
+$string['clitypevaluedefault'] = 'tipe valor, tapez Entrée per utilizar la valor per defaut ({$a})';
+$string['cliunknowoption'] = 'Options non reconnues :
+ {$a}.
+Utilisez l\'option --help.';
+$string['cliyesnoprompt'] = 'Tapez y (pour oui) o n (pour non)';
+$string['environmentrequireinstall'] = 'doit être installé e activé';
+$string['environmentrequireversion'] = 'la version {$a->needed} es requise ; vous utilisez actualament la version {$a->current}';

install/lang/oc_lnc/error.php

@@ -0,0 +1,53 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['cannotcreatedboninstall'] = '<p>Impossible de crear la banca de donadas.</p>
+<p>La banca de donadas indicada existís pas e l\'utilizaire especificat a pas las autorizacions que permeton de crear una banca de donadas.</p>.
+<p>L\'administrator del site deu repassar la configuracion de la banca de donadas.</p>';
+$string['cannotcreatelangdir'] = 'Creacion del dorsièr lang impossible';
+$string['cannotcreatetempdir'] = 'Creacion del dorsièr temp impossibla';
+$string['cannotdownloadcomponents'] = 'Telecargament dels components impossible';
+$string['cannotdownloadzipfile'] = 'Telecargament del fichièr ZIP impossible';
+$string['cannotfindcomponent'] = 'Component introbable';
+$string['cannotsavemd5file'] = 'Enregistrament del fichièr md5 impossible';
+$string['cannotsavezipfile'] = 'Enregistrament del fichièr ZIP impossible';
+$string['cannotunzipfile'] = 'Descompression del fichièr ZIP impossibla';
+$string['componentisuptodate'] = 'Lo component es a jorn';
+$string['dmlexceptiononinstall'] = '<p>Una error de banca de donadas s\'es produsida [{$a->errorcode}].<br />{$a->debuginfo}</p>';
+$string['downloadedfilecheckfailed'] = 'La verificacion del fichièr telecargat a fracassat';
+$string['invalidmd5'] = 'Lo còde de contraròtle md5 es pas valid';
+$string['missingrequiredfield'] = 'Un camp obligatòri es pas completat';
+$string['remotedownloaderror'] = '<p>Lo telecargament del component sus vòstre servidor a fracassat. Verificatz los reglatges de proxy. L\'extension cURL de PHP es bravament recomandada.</p>
+<p>Vos cal telecargar manualament lo fichièr <a href="{$a->url}">{$a->url}</a>, lo copiar sus vòstre servidor a l\'emplaçament « {$a->dest} » e lo descompressar a aqueste endrech.</p>';
+$string['wrongdestpath'] = 'Camin de destinacion incorrècte';
+$string['wrongsourcebase'] = 'Adreça URL de basa de la font incorrècta';
+$string['wrongzipfilename'] = 'Nom de fichièr ZIP incorrècte';

install/lang/oc_lnc/langconfig.php

@@ -0,0 +1,35 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = '';
+$string['thisdirection'] = 'ltr';
+$string['thislanguage'] = 'Occitan-Lengadocian';

install/lang/oc_lnc/moodle.php

@@ -0,0 +1,36 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['language'] = 'Langue';
+$string['next'] = 'Seguent';
+$string['previous'] = 'Précédent';
+$string['reload'] = 'Actualiser';

install/lang/pt/error.php

@@ -44,7 +44,7 @@ $string['dmlexceptiononinstall'] = '<p>Ocorreu um erro de base de dados [{$a->er
 $string['downloadedfilecheckfailed'] = 'A verificação do ficheiro descarregado falhou.';
 $string['invalidmd5'] = 'A variável de verificação está errada - tente novamente.';
 $string['missingrequiredfield'] = 'Um dos campos obrigatórios está em falta';
-$string['remotedownloaderror'] = 'O download do componente para o servidor falhou. Verifique as configurações do proxy. A instalação da extensão cURL do PHP é muito recomendada.<br /><br />Terá que descarregar o ficheiro <a href="{$a->url}">{$a->url}</a> manualmente, copiá-lo para a pasta "{$a->dest}" no seu servidor e descompactá-lo.';
-$string['wrongdestpath'] = 'Caminho de destino errado.';
+$string['remotedownloaderror'] = 'O download do componente para o servidor falhou. Verifique as configurações do proxy. A instalação da extensão cURL do PHP é muito recomendada.<br /><br />Terá de fazer manualmente o download do ficheiro <a href="{$a->url}">{$a->url}</a>, copiá-lo para a pasta "{$a->dest}" no seu servidor e descompactá-lo';
+$string['wrongdestpath'] = 'Caminho de destino errado';
 $string['wrongsourcebase'] = 'Base do URL de origem errada';
-$string['wrongzipfilename'] = 'Nome de ficheiro ZIP errado.';
+$string['wrongzipfilename'] = 'Nome de ficheiro ZIP errado';

install/lang/pt/install.php

@@ -34,8 +34,8 @@ $string['admindirname'] = 'Pasta de administração';
 $string['availablelangs'] = 'Pacotes de idiomas disponíveis';
 $string['chooselanguagehead'] = 'Selecione um idioma';
 $string['chooselanguagesub'] = 'Selecione o idioma a utilizar durante a instalação. Poderá depois selecionar um outro idioma para o site e para os utilizadores.';
-$string['clialreadyconfigured'] = 'O ficheiro config.php já existe, use admin/cli/install_database.php se desejar instalar este site.';
-$string['clialreadyinstalled'] = 'O ficheiro <b>config.php</b> já se encontra no servidor, o que indica que já existe uma instalação prévia do Moodle. Se pretender realizar uma atualização do Moodle existente, deve usar o <i>script</i> <b>admin/cli/upgrade.php</b>';
+$string['clialreadyconfigured'] = 'O ficheiro config.php já existe, use admin/cli/install_database.php para instalar o Moodle para este site.';
+$string['clialreadyinstalled'] = 'O ficheiro config.php já existe, use admin/cli/install_database.php para atualizar o Moodle para este site.';
 $string['cliinstallheader'] = 'Programa para instalação do Moodle <b>{$a}</b> através da linha de comandos';
 $string['databasehost'] = 'Servidor da base de dados';
 $string['databasename'] = 'Nome da base de dados';
@@ -56,9 +56,12 @@ $string['pathshead'] = 'Confirmar caminhos';
 $string['pathsrodataroot'] = 'A pasta de dados não tem permissões de escrita.';
 $string['pathsroparentdataroot'] = 'A pasta pai <b>{$a->parent}</b> não tem permissões de escrita. O programa de instalação não conseguiu criar a pasta <b>{$a->dataroot}</b>.';
 $string['pathssubadmindir'] = 'Alguns servidores Web utilizam a pasta <strong>admin</strong> em URLs especiais de acesso a funcionalidades especiais, como é o caso de painéis de controlo. Algumas situações podem criar conflitos com a localização normal das páginas de administração do Moodle. Estes problemas podem ser resolvidos renomeando a pasta <strong>admin</strong> na instalação do Moodle e indicando aqui o novo nome a utilizar. Por exemplo:<br /><br /><b>moodleadmin</b><br /><br />Esta ação resolverá os problemas de acesso dos links para as funcionalidades de administração do Moodle.';
-$string['pathssubdataroot'] = 'É necessária uma pasta onde o Moodle possa gravar os ficheiros enviados para a plataforma. Esta pasta deve ter permissão de <b>leitura</b> e <b>escrita</b> pelo utilizador do web server (normalmente <b>nobody</b> ou <b>apache</b>). Por razões de segurança esta pasta não deve estar diretamente acessível através da Internet.';
-$string['pathssubdirroot'] = 'Caminho completo para a pasta de instalação do Moodle.';
-$string['pathssubwwwroot'] = 'Endereço web completo de acesso ao Moodle. Não é possível aceder ao Moodle usando mais do que um endereço. Se o site tiver mais do que um endereço público, devem ser configurados redireccionamentos permanentes em todos eles, à exceção deste. Se o site pode ser acedido a partir da Internet e de Intranets, então este endereço deve ser configurado no DNS de forma a que os utilizadores das Intranets possam usar este endereço público para aceder ao Moodle. Se o endereço não está correto, então altere o endereço indicado no browser para reiniciar a instalação com o URL correto.';
+$string['pathssubdataroot'] = '<p>Uma diretoria em que o Moodle irá armazenar todo o conteúdo de ficheiros enviados pelos utilizadores.</p>
+<p>Esta diretoria deve ser legível e gravável pelo utilizador do servidor web (geralmente \'www-data\', \'nobody\', ou \'apache\').</p>
+<p>Não deve ser diretamente acessível através da web.</p>
+<p> Se a diretoria não existir atualmente, o processo de instalação tentará criá-la.</p>';
+$string['pathssubdirroot'] = 'Caminho completo para a diretoria que contém o código Moodle.';
+$string['pathssubwwwroot'] = 'Endereço web completo de acesso ao Moodle. Não é possível aceder ao Moodle usando mais do que um endereço. Se o site tiver mais do que um endereço público, devem ser configurados redirecionamentos permanentes em todos eles, à exceção deste. Se o site pode ser acedido a partir da Internet e de Intranet, então use o endereço público aqui. Se o endereço atual não está correto, então altere o endereço indicado na barra de endereço do seu navegador e reinicie a instalação.';
 $string['pathsunsecuredataroot'] = 'A localização da pasta de dados não é segura';
 $string['pathswrongadmindir'] = 'A pasta <b>admin</b> não existe';
 $string['phpextension'] = 'Extensão <b>{$a}</b> do PHP';

install/lang/ru/error.php

@@ -44,7 +44,8 @@ $string['dmlexceptiononinstall'] = '<p>Произошла ошибка базы
 $string['downloadedfilecheckfailed'] = 'Ошибка проверки загруженного файла';
 $string['invalidmd5'] = 'Некорректная md5';
 $string['missingrequiredfield'] = 'Отсутствуют некоторые обязательные поля';
-$string['remotedownloaderror'] = 'Не удалось загрузить компонент на сервер, проверьте настройки прокси-сервера, настоятельно рекомендуется установка расширения cURL языка PHP.<br /> <br />Вам следует вручную загрузить файл по ссылке <a href="{$a->url}">{$a->url}</a>, скопировать его в папку «{$a->dest}» на своем сервере и там его распаковать.';
+$string['remotedownloaderror'] = '<p>Не удалось загрузить компонент на сервер. Проверьте настройки прокси-сервера; настоятельно рекомендуется установка расширения  PHP cURL.</p>
+<p>Вам следует вручную загрузить файл по ссылке <a href="{$a->url}">{$a->url}</a>, скопировать его в папку «{$a->dest}» на своем сервере и там его распаковать.</p>';
 $string['wrongdestpath'] = 'Ошибочный путь назначения';
 $string['wrongsourcebase'] = 'Неправильный адрес источника';
 $string['wrongzipfilename'] = 'Неверное имя ZIP-файла';

install/lang/ru/install.php

@@ -30,12 +30,12 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$string['admindirname'] = 'Каталог администратора';
+$string['admindirname'] = 'Каталог администрирования';
 $string['availablelangs'] = 'Доступные языковые пакеты';
 $string['chooselanguagehead'] = 'Выберите язык';
 $string['chooselanguagesub'] = 'Сейчас необходимо выбрать язык ТОЛЬКО для сообщений во время установки. Язык сайта и пользовательских интерфейсов можно будет указать далее в процессе установки.';
-$string['clialreadyconfigured'] = 'Файл config.php уже существует. Если Вы хотите установить этот сайт, используйте admin/cli/install_database.php.';
-$string['clialreadyinstalled'] = 'Файл config.php уже существует. Если Вы хотите обновить сайт, то используйте скрипт admin/cli/upgrade.php.';
+$string['clialreadyconfigured'] = 'Файл config.php уже существует. Если Вы хотите установить Moodle на этот сайт, используйте admin/cli/install_database.php.';
+$string['clialreadyinstalled'] = 'Файл config.php уже существует. Если Вы хотите обновить сайт Moodle, то используйте скрипт admin/cli/upgrade.php.';
 $string['cliinstallheader'] = 'Программа установки Moodle {$a} в режиме командной строки';
 $string['databasehost'] = 'Сервер баз данных';
 $string['databasename'] = 'Название базы данных';
@@ -45,7 +45,7 @@ $string['datarootpermission'] = 'Разрешения на каталоги да
 $string['dbprefix'] = 'Префикс имен таблиц';
 $string['dirroot'] = 'Каталог Moodle';
 $string['environmenthead'] = 'Проверка среды...';
-$string['environmentsub2'] = 'У каждой версии Moodle есть минимальные требования к версии PHP и набор обязательных расширений PHP.
+$string['environmentsub2'] = 'У каждой версии Moodle есть минимальные требования к версии PHP и набору обязательных расширений PHP.
 Полная проверка среды осуществляется перед каждой установкой и обновлением.
 Пожалуйста, свяжитесь с администратором сервера, если не знаете, как установить новую версию или включить расширения PHP.';
 $string['errorsinenvironment'] = 'Проверка окружения не выполнена!';
@@ -72,13 +72,12 @@ $string['pathshead'] = 'Подтвердите пути';
 $string['pathsrodataroot'] = 'Каталог данных недоступен для записи.';
 $string['pathsroparentdataroot'] = 'Родительский каталог ({$a->parent}) не доступен для записи. Программа установки не может создать каталог данных ({$a->dataroot}).';
 $string['pathssubadmindir'] = 'На небольшом числе веб-хостингов путь /admin используется для доступа к панели управления или чему-то еще. К сожалению, это противоречит стандартному расположению страниц управления Moodle. Это можно исправить путем переименования папки admin в каталоге Moodle и указания нового имени здесь. Например: <em>moodleadmin</em>. При этом все ссылки на панель управления Moodle исправятся автоматически.';
-$string['pathssubdataroot'] = 'Необходимо указать место, где Moodle будет хранить загружаемые файлы. Этот каталог должен быть доступен для чтения и ЗАПИСИ тому пользователю, от чьего имени запускается веб-сервер (обычно \'nobody\' или \'apache\'), но при этом не должен быть доступен напрямую через Интернет. Программа установки попробует создать этот каталог, если он не существует.';
-$string['pathssubdirroot'] = 'Полный путь к каталогу установки Moodle.';
-$string['pathssubwwwroot'] = 'Полный веб-адрес, по которому будет доступен Moodle.
-Использовать для доступа к Moodle несколько публичных адресов невозможно.
-Если у вашего сайта есть еще несколько публичных адресов, вам следует настроить постоянные перенаправления с этих адресов на указанный.
-Если ваш сайт доступен как из Интернета, так и из локальной сети, укажите здесь публичный адрес и настройте DNS таким образом, чтобы этот адрес был доступен и локальным пользователям.
-Если указанный здесь адрес неверный, измените URL в строке адреса браузера, чтобы перезапустить установку с другим значением.';
+$string['pathssubdataroot'] = '<p>Каталог, в котором Moodle будет хранить все файлы, размещаемые пользователями. </p><p>Этот каталог должен быть доступен для чтения и ЗАПИСИ тому пользователю, от чьего имени запускается веб-сервер (обычно \'www-data\', \'nobody\' или \'apache\'). </p><p>Этот каталог не должен быть доступен напрямую через Интернет. </p><p>Программа установки попробует создать этот каталог, если он не существует. </p>';
+$string['pathssubdirroot'] = '<p>Полный путь к каталогу установки Moodle.</p>';
+$string['pathssubwwwroot'] = '<p>Полный веб-адрес, по которому будет доступен Moodle, т.е. адрес, который пользователи будут вводить в адресной строке своего браузера для доступа к сайту Moodle.</p>
+<p>Использовать для доступа к Moodle несколько публичных адресов невозможно. Если у Вашего сайта есть еще несколько публичных адресов, то следует настроить постоянные перенаправления с этих адресов на указанный.</p>
+</p>Если Ваш сайт доступен как из Интернета, так и из локальной сети (иногда называют Интранет), укажите здесь публичный адрес.</p>
+</p>Если указанный здесь адрес неверный, измените URL в адресной строке браузера и перезапустите установку.</p>';
 $string['pathsunsecuredataroot'] = 'Расположение каталога данных не отвечает требованиям безопасности';
 $string['pathswrongadmindir'] = 'Каталог admin не существует';
 $string['phpextension'] = 'Расширение PHP «{$a}»';
@@ -91,7 +90,7 @@ $string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
 $string['welcomep20'] = 'Вы видите эту страницу, потому что успешно установили и запустили на своем компьютере набор программ <strong>{$a->packname} {$a->packversion}</strong>. Поздравляем!';
 $string['welcomep30'] = 'Эта версия набора программ <strong>{$a->installername}</strong> включает следующие программы, необходимые для создания среды, в которой будет работать <strong>Moodle</strong>:';
 $string['welcomep40'] = 'Также в этот набор входит <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
-$string['welcomep50'] = 'Порядок использования приложений, входящих в этот набор, регламентируется соответствующими лицензиями. Набор программ <strong>{$a->installername}</strong> является полностью <a href="http://ru.wikipedia.org/wiki/Открытое_программное_обеспечение">открытым </a> и распространяется на условиях лицензии <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a>.';
+$string['welcomep50'] = 'Порядок использования приложений, входящих в этот набор, регламентируется соответствующими лицензиями. Набор программ <strong>{$a->installername}</strong> является <a href="http://www.opensource.org/docs/definition_plain.html">открытым программным обеспечением</a> и распространяется на условиях лицензии <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a>.';
 $string['welcomep60'] = 'На следующих страницах Вы сможете за несколько простых шагов настроить и установить <strong>Moodle</strong> на свой компьютер. Вы сможете принять настройки по умолчанию или изменить их в зависимости от своих потребностей.';
 $string['welcomep70'] = 'Нажмите кнопку «Далее» чтобы продолжить процесс установки <strong>Moodle</strong>.';
 $string['wwwroot'] = 'Веб-адрес';

install/lang/sl/admin.php

@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
 $string['clianswerno'] = 'n';
 $string['cliansweryes'] = 'd';
 $string['cliincorrectvalueerror'] = 'Napaka, nepravilna vrednost "{$a->value}" za "{$a->option}"';
-$string['cliincorrectvalueretry'] = 'Nepravilna vrednost, prosimo poskusite znova.';
+$string['cliincorrectvalueretry'] = 'Nepravilna vrednost, poskusite znova.';
 $string['clitypevalue'] = 'tip vrednosti';
 $string['clitypevaluedefault'] = 'tip vrednosti, kliknite Enter za uporabo privzete vrednosti ({$a})';
 $string['cliunknowoption'] = 'Neprepoznane možnosti:

install/lang/sl/error.php

@@ -40,9 +40,9 @@ $string['cannotsavezipfile'] = 'Datoteke ZIP ni možno shraniti.';
 $string['cannotunzipfile'] = 'Datoteke ni možno razširiti (unzip).';
 $string['componentisuptodate'] = 'Komponenta je posodobljena.';
 $string['downloadedfilecheckfailed'] = 'Preverjanje prenesene datoteke je spodletelo.';
-$string['invalidmd5'] = 'Neveljaven MD5';
+$string['invalidmd5'] = '';
 $string['missingrequiredfield'] = 'Eno izmed zahtevanih polj manjka';
-$string['remotedownloaderror'] = 'Prenos komponent na vaš strežnik ni uspel. Prosimo, da preverite nastavitve prehodnega strežnika. Priporočamo uporabo razširitve cURL za PHP.<br /><br />Datoteko <a href="{$a->url}">{$a->url}</a> morate prenesti ročno - skopirajte jo v imenik "{$a->dest}" in razširite.';
+$string['remotedownloaderror'] = 'Prenos komponent na vaš strežnik ni uspel. Preverite nastavitve prehodnega strežnika. Priporočljiva je uporaba razširitve cURL za PHP.<br /><br />Datoteko <a href="{$a->url}">{$a->url}</a> morate prenesti ročno - skopirajte jo v imenik "{$a->dest}" in razširite.';
 $string['wrongdestpath'] = 'Napačna ciljna pot.';
 $string['wrongsourcebase'] = 'Napačna osnova URL vira.';
 $string['wrongzipfilename'] = 'Napačno ime datoteke ZIP.';

install/lang/sl/install.php

@@ -33,8 +33,8 @@ defined('MOODLE_INTERNAL') || die();
 $string['admindirname'] = 'Skrbniški imenik';
 $string['availablelangs'] = 'Jezikovni paketi na voljo';
 $string['chooselanguagehead'] = 'Izberite jezik';
-$string['chooselanguagesub'] = 'Izberite jezika SAMO za namestitev. Pozneje boste lahko izbrali tudi jezike strani in uporabniške jezike.';
-$string['clialreadyinstalled'] = 'Datoteka config.php že obstaja, prosimo uporabite admin/cli/upgrade.php, če želite posodobiti vašo stran.';
+$string['chooselanguagesub'] = 'Izberite jezik za namestitev. Pozneje boste lahko izbrali tudi jezike strani in uporabniške jezike.';
+$string['clialreadyinstalled'] = 'Datoteka config.php že obstaja. Uporabite admin/cli/upgrade.php, če želite posodobiti vašo stran.';
 $string['cliinstallheader'] = 'Moodle {$a} namestitveni program z ukazno vrstico';
 $string['databasehost'] = 'Gostitelj podatkovne baze';
 $string['databasename'] = 'Ime podatkovne baze';
@@ -43,7 +43,7 @@ $string['dataroot'] = 'Imenik za podatke';
 $string['dbprefix'] = 'Predpona tabel';
 $string['dirroot'] = 'Imenik Moodle';
 $string['environmenthead'] = 'Preverjanje vašega okolja ...';
-$string['environmentsub2'] = 'Vsaka moodle izdaja ima nekatere minimalne PHP zahteve in številne mandatorne PHP razširitve. Pred vsako namestitvijo ali posodobitvijo se izvede popolna preverba okolja. Prosimo kontaktirajte strežniškega administratorja, če ne veste kako namestiti novo verzijo ali omogočiti PHP razširitev.';
+$string['environmentsub2'] = 'Vsaka izdaja Moodla ima nekatere minimalne PHP zahteve in številne mandatorne PHP razširitve. Pred vsako namestitvijo ali posodobitvijo se izvede popolno preverjanje okolja. Obrnite se na skrbnika strežnika, če ne veste, kako namestiti novo verzijo ali omogočiti PHP razširitev.';
 $string['errorsinenvironment'] = 'Preverjanje okolja ni uspelo!';
 $string['installation'] = 'Namestitev';
 $string['langdownloaderror'] = 'Žal jezik "{$a}" ni bil nameščen. Postopek namestitve se bo nadaljeval v angleščini.';
@@ -74,7 +74,7 @@ $string['pathsroparentdataroot'] = 'Starševska mapa ({$a->parent}) ni za pisanj
 $string['pathssubadmindir'] = 'Zelo malo Spletnih gostiteljev uporablja /admin kot posebni URL preko katerega dostopate do nadzorn plošče. Na žalost je to v konfliktu s standardno lokacijo za Moodlove skrbniške strani. To lahko popravite s preimenovanjemskrbniške mape v vaši namestitvi in vnesete tukaj to novo ime. Na primer: <em>moodleadmin</em>. To bo popravilo skrbniške povezave v Moodlu.';
 $string['pathssubdataroot'] = 'Potrebujete prostor, kamor bo Moodle shranjeval naložene datoteke. Ta mapa naj ima omogočeno branje IN PISANJE s strani uporabnika spletnega strežnika (po navadi \'brez\' ali \'apache\'), ampak ne sme biti dostopno neposredno preko spleta. Namestitveni program jo bo poskušal ustvariti, če že ne obstaja.';
 $string['pathssubdirroot'] = 'Polna pot do Moodle nameščene mape.';
-$string['pathssubwwwroot'] = 'Polni spletni naslov kjer bo Moodle dostopan. Dostop do Moodla z uporabo več naslovov ni mogoč. Če ima vaša stran več javnih naslovov, morate nastaviti trajne preusmeritve na vse naslove razen tega. Če je vaša stran dosropana preko interneta in omrežja, uporabite tukaj javne naslove in nastaviet DNS tako, da lahko uporabniki znotraj omrežja uporabljajo tudi javne naslove. Če naslovi niso pravilni prosimo spremenite URL v vašem brskalniku in ponovno poženite namestitev z drugo vrednostjo.';
+$string['pathssubwwwroot'] = 'Polni spletni naslov kjer bo Moodle dostopan. Dostop do Moodla z uporabo več naslovov ni mogoč. Če ima vaša stran več javnih naslovov, morate nastaviti trajne preusmeritve na vse naslove razen tega. Če je vaša stran dostopana preko interneta in omrežja, uporabite tukaj javne naslove in nastaviet DNS tako, da lahko uporabniki znotraj omrežja uporabljajo tudi javne naslove. Če naslovi niso pravilni, spremenite URL v vašem brskalniku in ponovno poženite namestitev z drugo vrednostjo.';
 $string['pathsunsecuredataroot'] = '({$a->dataroot})';
 $string['pathswrongadmindir'] = 'Skrbniška mapa ne obstaja';
 $string['phpextension'] = '{$a} PHP razširitev';

install/lang/sr_cr/install.php

@@ -67,12 +67,12 @@ $string['pathshead'] = 'Потврди путање';
 $string['pathsrodataroot'] = 'У директоријум за податке није могућ упис';
 $string['pathsroparentdataroot'] = 'Није могућ упис у надређени директоријум ({$a->parent}).  Инсталациони програм не може да креира директоријум за податке ({$a->dataroot}).';
 $string['pathssubadmindir'] = 'Врло мали број веб сервера користи /admin као специјални URL за приступ разним подешавањима (контролни панел и сл.). Нажалост, то доводи до конфликта са стандардном локацијом за администраторске странице у Moodleu. Овај проблем можете решити тако што ћете променити име администраторског директоријума у вашој инсталацији, и овде уписати то ново име. На пример <em>moodleadmin</em>. Ово подешавање ће преправити администраторске линкове у Moodle систему.';
-$string['pathssubdataroot'] = 'Потребан вам је простор где ће Moodle чувати постављене датотеке. Овај директоријум треба да буде подешен тако да се може читати и у њега уписивати од стране корисника веб сервера (обично \'nobody\' или \'apache\'), али истовремено мора бити доступан директно преко веба. Уколико овај директоријум не постоји Moodle ће покушати да га креира током инсталације.';
-$string['pathssubdirroot'] = 'Пуна путања до директотијума за инсталацију Moodlea.';
-$string['pathssubwwwroot'] = 'Пуна веб адреса путем које ће се приступати Moodleu. Није могуће приступати Moodleu користећи више адреса.
-Ако ваш сајт има више јавних адреса онда на свима морате да подесите перманентне редирекције осим на овој.
-Ако је ваш сајт доступан са интернета али и из интранет окружења овде употребите јавну адресу и подесите DNS тако да и интранет корисници могу да користе јавну адресу.
-Ако је адреса нетачна промените URL у свом веб читачу да бисте поново покренули инсталацију са другачијом вредношћу.';
+$string['pathssubdataroot'] = '<p>Потребан вам је простор где ће Moodle чувати постављене датотеке.</p><p>Овај директоријум треба да буде подешен тако да се може читати и у њега уписивати од стране корисника веб сервера (обично \'www-data\', \'nobody\' или \'apache\').</p><p>Истовремено не сме бити доступан директно преко веба.</p><p>Уколико овај директоријум не постоји Moodle ће покушати да га креира током инсталације.</p>';
+$string['pathssubdirroot'] = '<p>Пуна путања до директоријума који садржи код Moodlea.</p>';
+$string['pathssubwwwroot'] = '<p>Пуна адреса путем које ће се приступати платформи.</p>
+<p>Није могуће приступати јој користећи више адреса. Ако ваш сајт има више јавних адреса одаберите најједноставнију и на осталим подесите перманентне редирекције на њу.</p>
+<p>Ако је ваш сајт доступан са Интернета али и из интранет окружења овде употребите јавну адресу.</p>
+<p>Ако је адреса нетачна промените URL у свом веб читачу да бисте поново покренули инсталацију са другачијом вредношћу.</p>';
 $string['pathsunsecuredataroot'] = 'Dataroot локација није безбедна';
 $string['pathswrongadmindir'] = 'Админ директоријум не постоји';
 $string['phpextension'] = '{$a} PHP екстензија';

install/lang/sr_lt/install.php

@@ -67,12 +67,12 @@ $string['pathshead'] = 'Potvrdi putanje';
 $string['pathsrodataroot'] = 'U direktorijum za podatke nije moguć upis';
 $string['pathsroparentdataroot'] = 'Nije moguć upis u nadređeni direktorijum ({$a->parent}).  Instalacioni program ne može da kreira direktorijum za podatke ({$a->dataroot}).';
 $string['pathssubadmindir'] = 'Vrlo mali broj veb servera koristi /admin kao specijalni URL za pristup raznim podešavanjima (kontrolni panel i sl.). Nažalost, to dovodi do konflikta sa standardnom lokacijom za administratorske stranice u Moodleu. Ovaj problem možete rešiti tako što ćete promeniti ime administratorskog direktorijuma u vašoj instalaciji, i ovde upisati to novo ime. Na primer <em>moodleadmin</em>. Ovo podešavanje će prepraviti administratorske linkove u Moodle sistemu.';
-$string['pathssubdataroot'] = 'Potreban vam je prostor gde će Moodle čuvati postavljene datoteke. Ovaj direktorijum treba da bude podešen tako da se može čitati i u njega upisivati od strane korisnika veb servera (obično \'nobody\' ili \'apache\'), ali istovremeno mora biti dostupan direktno preko veba. Ukoliko ovaj direktorijum ne postoji Moodle će pokušati da ga kreira tokom instalacije.';
-$string['pathssubdirroot'] = 'Puna putanja do direktotijuma za instalaciju Moodlea.';
-$string['pathssubwwwroot'] = 'Puna veb adresa putem koje će se pristupati Moodleu. Nije moguće pristupati Moodleu koristeći više adresa.
-Ako vaš sajt ima više javnih adresa onda na svima morate da podesite permanentne redirekcije osim na ovoj.
-Ako je vaš sajt dostupan sa interneta ali i iz intranet okruženja ovde upotrebite javnu adresu i podesite DNS tako da i intranet korisnici mogu da koriste javnu adresu.
-Ako je adresa netačna promenite URL u svom veb čitaču da biste ponovo pokrenuli instalaciju sa drugačijom vrednošću.';
+$string['pathssubdataroot'] = '<p>Potreban vam je prostor gde će Moodle čuvati postavljene datoteke.</p><p>Ovaj direktorijum treba da bude podešen tako da se može čitati i u njega upisivati od strane korisnika Web servera (obično \'www-data\', \'nobody\' ili \'apache\').</p><p>Istovremeno ne sme biti dostupan direktno preko Weba.</p><p>Ukoliko ovaj direktorijum ne postoji Moodle će pokušati da ga kreira tokom instalacije.</p>';
+$string['pathssubdirroot'] = '<p>Puna putanja do direktorijuma koji sadrži kod Moodlea.</p>';
+$string['pathssubwwwroot'] = '<p>Puna adresa putem koje će se pristupati platformi.</p>
+<p>Nije moguće pristupati joj koristeći više adresa. Ako vaš sajt ima više javnih adresa odaberite najjednostavniju i na ostalim podesite permanentne redirekcije na nju.</p>
+<p>Ako je vaš sajt dostupan sa Interneta ali i iz intranet okruženja ovde upotrebite javnu adresu.</p>
+<p>Ako je adresa netačna promenite URL u svom Web čitaču da biste ponovo pokrenuli instalaciju sa drugačijom vrednošću.</p>';
 $string['pathsunsecuredataroot'] = 'Dataroot lokacija nije bezbedna';
 $string['pathswrongadmindir'] = 'Admin direktorijum ne postoji';
 $string['phpextension'] = '{$a} PHP ekstenѕija';

install/lang/te/install.php

@@ -30,12 +30,18 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+$string['admindirname'] = 'అడ్మిన్ డైరెక్టరీ';
 $string['availablelangs'] = 'అందుబాటులో ఉన్న భాషల జాబితా';
 $string['chooselanguagehead'] = 'భాషను ఎంచుకోండి';
 $string['databasehost'] = 'డేటాబేసు హోస్టు';
 $string['databasename'] = 'డేటాబేసు పేరు';
+$string['databasetypehead'] = 'డేటాబేస్ డ్రైవర్ ఎంచుకోండి';
 $string['dataroot'] = 'డేటా డైరెక్టరీ';
+$string['datarootpermission'] = 'డేటా డైరెక్టరీల అనుమతి';
 $string['dbprefix'] = 'టేబుళ్ళ ఆదిపదం (ప్రిఫిక్స్)';
 $string['dirroot'] = 'Moodle డైరెక్టరీ';
 $string['environmenthead'] = 'మీ ఎన్విరాన్మెంటును పరిశీలిస్తున్నాం ...';
+$string['installation'] = 'సంస్థాపన';
+$string['paths'] = 'మార్గాలు';
+$string['pathswrongadmindir'] = 'అడ్మిన్ డైరెక్టరీ అసలు లేదు';
 $string['wwwroot'] = 'వెబ్ చిరునామా';

install/lang/uk/admin.php

@@ -30,5 +30,13 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+$string['clianswerno'] = 'ні';
+$string['cliansweryes'] = 'так';
+$string['cliincorrectvalueerror'] = 'Помилка, некоректне значення "{$a->value}" для "{$a->option}"';
+$string['cliincorrectvalueretry'] = 'Некоректне значення, повторіть правильно';
+$string['clitypevalue'] = 'тип значення';
+$string['clitypevaluedefault'] = 'тип значення, натисніть Enter для використання типового значення ({$a})';
+$string['cliunknowoption'] = 'Невизначені опції: {$a}. Будь ласка, використайте опцію --help.';
+$string['cliyesnoprompt'] = 'натисніть y (означає так) або n (означає ні)';
 $string['environmentrequireinstall'] = 'повинен бути встановлений і включений';
 $string['environmentrequireversion'] = 'рекомендується версія {$a->needed}, використовується версія {$a->current}';

install/lang/uk/error.php

@@ -0,0 +1,50 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['cannotcreatedboninstall'] = '<p>Не вдається створити базу даних.</p> <p>Вказаної бази даних не існує і такий користувач не має права на створення бази даних.</p> <p>Адміністратор сайту повинен перевірити налаштування бази даних.</p>';
+$string['cannotcreatelangdir'] = 'Не створюється каталог lang';
+$string['cannotcreatetempdir'] = 'Не можу створити каталог temp';
+$string['cannotdownloadcomponents'] = 'Не можу завантажити компоненти.';
+$string['cannotdownloadzipfile'] = 'Не можу завантажити ZIP-файл.';
+$string['cannotfindcomponent'] = 'Не можу знайти компоненти.';
+$string['cannotsavemd5file'] = 'Не можу зберегти md5-файл.';
+$string['cannotsavezipfile'] = 'Не можу зберегти ZIP-файл.';
+$string['cannotunzipfile'] = 'Не можу розпакувати архівний файл.';
+$string['componentisuptodate'] = 'Компонент останньої редакції.';
+$string['dmlexceptiononinstall'] = '<p>Виникла помилка бази даних [{$a->errorcode}].<br />{$a->debuginfo}</p>';
+$string['downloadedfilecheckfailed'] = 'Помилка завантаження файлу.';
+$string['invalidmd5'] = 'Перевірка змінної повернула її помилку - спробуйте знову';
+$string['missingrequiredfield'] = 'Деякі обов\'язкові поля відсутні';
+$string['remotedownloaderror'] = 'Завантаження компонентів до вашого серверу зазнало невдачі, будь ласка перевірте налаштування проксі, та врахуйте рекомендацію встановлення PHP cURL.<br /><br /> Вам доведеться завантажити файл <a href="{$a->url}">{$a->url}</a> вручну, скопіювати його до "{$a->dest}" на вашому сервері та розпакувати там.';
+$string['wrongdestpath'] = 'Неправильний шлях призначення.';
+$string['wrongsourcebase'] = 'Неправильне джерело базового URL.';
+$string['wrongzipfilename'] = 'Неправильне ім\'я ZIP-архіву';

install/lang/uk/install.php

@@ -30,5 +30,51 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+$string['admindirname'] = 'Адмін-каталог';
+$string['availablelangs'] = 'Список доступних мов';
+$string['chooselanguagehead'] = 'Виберіть мову';
+$string['chooselanguagesub'] = 'Виберіть мову ТІЛЬКИ для процесу встановлення. Ви зможете вибрати мову для сайту та користувачів пізніше.';
+$string['clialreadyconfigured'] = 'Файл config.php вже створено, будь ласка, використовуйте admin/cli/install_database.php, якщо ви хочете встановити цей сайт.';
+$string['clialreadyinstalled'] = 'Файл config.php вже створено, будь ласка, використовуйте admin/cli/upgrade.php, якщо ви хочете оновити ваш сайт.';
+$string['cliinstallheader'] = 'Moodle {$a} командний рядок програми установки';
 $string['databasehost'] = 'Сервер бази даних';
 $string['databasename'] = 'Ім’я бази даних';
+$string['databasetypehead'] = 'Виберіть драйвер бази даних';
+$string['dataroot'] = 'Каталог Даних';
+$string['datarootpermission'] = 'Права каталогу даних';
+$string['dbprefix'] = 'Префікс таблиць';
+$string['dirroot'] = 'Moodle Каталог';
+$string['environmenthead'] = 'Перевірка залежностей...';
+$string['environmentsub2'] = 'Кожен Moodle реліз вимагає деяку мінімальну версію РНР та специфічний набір додаткових розширень. Повна перевірка проводиться до початку встановлення або оновлення. Будь ласка, зв’яжіться з вашим адміністратором, якщо ви не знаєте, як встановити нову версію або налаштувати РНР.';
+$string['errorsinenvironment'] = 'Залежності перевірити не вдалося!';
+$string['installation'] = 'Встановлення';
+$string['langdownloaderror'] = 'На жаль, мова "{$a}" не встановлена. Встановлення буде продовжено англійською мовою.';
+$string['memorylimithelp'] = '<p>Обмеження пам\'яті в PHP на сервері зараз встановлено в {$a}.</p> <p>Це може стати проблемою при подальшій роботі Moodle, коли ви будете мати багато курсів, модулів та користувачів.</p> <p>Ми рекомендуємо сконфігурувати РНР на обмеження пам\'яті не менше 16 Мб. Це можна зробити шляхом:</p> <ol> <li>перекомпіляції PHP з параметром <i>--enable-memory-limit</i>. Це надасть можливість Moodle встановити обмеження пам\'яті самостійно.</li> <li>встановлення в php.ini змінної <b>memory_limit</b> порядка 16Mб. Якщо ви не маєте доступу до цього файлу попросіть адміністратора зробити це для вас.</li> <li>створення в корні сайту файлу .htaccess, куди добавити наступний рядок: <p><blockquote>php_value memory_limit 16M</blockquote></p> <p>Але на деяких серверах це призведе до помилок на <b>всіх</b> сторінках, тоді вам потрібно видалити .htaccess.</p></li> </ol>';
+$string['paths'] = 'Шляхи';
+$string['pathserrcreatedataroot'] = 'Каталог даних ({$a->dataroot}) не може бути створений інсталятором.';
+$string['pathshead'] = 'Підтвердження шляхів';
+$string['pathsrodataroot'] = 'Каталог даних не має прав запису.';
+$string['pathsroparentdataroot'] = 'Батьківський каталог ({$a->parent}) не має прав запису. Каталог даних ({$a->dataroot}) не може бути створений інсталятором.';
+$string['pathssubadmindir'] = 'Дуже мало web хостингів використовують /admin в якості спеціальної адреси для доступу до адміністративного управління. На жаль, це суперечить стандартному розташуванню сторінок адміністрування для Moodle. Ви можете виправити це перейменуванням каталогу admin в будь-яке інше ім’я та вписати його тут. Наприклад: <em>moodleadmin</em>. Це виправить посилання на адміністрування в Moodle.';
+$string['pathssubdataroot'] = '<p>Каталог, де Moodle буде зберігати всі файли, які завантажують користувачі.</p>
+<p>Цей каталог повинен бути доступним для читання та запису для користувача, від імені якого запущено веб-сервер (зазвичай \'www-data\', \'nobody\', або \'apache\').</p>
+<p>Цей каталог не повинен бути доступним безпосередньо з Інтернету.</p>
+<p>Програма встановлення спробує створити цей каталог, якщо його не існує.</p>';
+$string['pathssubdirroot'] = '<p>Повний шлях до каталогу встановлення moodle.</p>';
+$string['pathssubwwwroot'] = '<p>Повна веб-адреса, за якою ваш сайт moodle буде доступним. Moodle може мати тільки одну адресу доступу. </p>
+<p>Якщо ваш сайт має кілька публічних адрес, то встановіть в DNS перенаправлення всіх інших адрес на цю. </p>
+<p>Якщо до вашого сайту мають одночасний доступ і з Інтернету, і з Інтранету (локальної мережі), то забезпечте доступ з локального середовища за публічною адресою. </p>
+<p>Якщо ви почали встановлення з неправильної адреси, видаліть все і почніть встановлення заново.</p>';
+$string['pathsunsecuredataroot'] = 'Розташування каталогу з даними не є безпечним';
+$string['pathswrongadmindir'] = 'Не створено адміністративний каталог';
+$string['phpextension'] = '{$a} РНР розширення';
+$string['phpversion'] = 'Версія РНР';
+$string['phpversionhelp'] = '<p>Moodle потребує PHP версії не менше ніж 4.3.0 або 5.1.0 (версії 5.0.x мають деякі відомі проблеми).</p> <p>Наразі ви працюєте з версією {$a}</p> <p>Вам потрібно оновити PHP або змінити хост з новішою версією PHP!<br /> (У разі 5.0.x ви також можете повернутися до версії 4.4.x)</p>';
+$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
+$string['welcomep20'] = 'Ви бачите цю сторінку, тому що ви успішно встановили та запустили  пакет <strong>{$a->packname} {$a->packversion}</strong> на вашому комп’ютері. Вітаємо!';
+$string['welcomep30'] = 'Цей випуск <strong>{$a->installername}</strong> включає в себе програми для створення середовища, в якому <strong>Moodle</strong> працюватиме, а саме:';
+$string['welcomep40'] = 'Цей пакет також включає <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
+$string['welcomep50'] = 'Використання всіх частин цього пакету регламентується їх ліцензіями. Повний пакет <strong>{$a->installername}</strong> є <a href="http://www.opensource.org/docs/definition_plain.html">відкритим програмним забезпеченням</a> і розповсюджується під ліценцією <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a>.';
+$string['welcomep60'] = 'Наступні сторінки будуть проводити вас через процедуру встановлення та налаштування <strong>Moodle</strong> на вашому комп’ютері. Ви можете прийняти автоматичне налаштування, а потім змінити параметри під себе.';
+$string['welcomep70'] = 'Натисніть кнопку "Далі" для продовження встановлення <strong>Moodle</strong>.';
+$string['wwwroot'] = 'Веб-адреса';

install/lang/vi/admin.php

@@ -34,5 +34,11 @@ $string['clianswerno'] = 'n';
 $string['cliansweryes'] = 'y';
 $string['cliincorrectvalueerror'] = 'Lỗi, giá trị không đúng "{$a->value}" for "{$a->option}"';
 $string['cliincorrectvalueretry'] = 'Giá trị không đúng, vui lòng thử lại';
+$string['clitypevalue'] = 'nhập giá trị';
+$string['clitypevaluedefault'] = 'nhập giá trị, nhấn phím Enter để dùng giá trị mặc định ({$a})';
+$string['cliunknowoption'] = 'Lựa chọn chưa được nhận diện:
+  {$a}
+Vui lòng sử dụng lựa chọn --help.';
+$string['cliyesnoprompt'] = 'nhập y (có) hay n (không)';
 $string['environmentrequireinstall'] = 'cần phải được cài hay kích hoạt.';
 $string['environmentrequireversion'] = 'Cần phiên bản {$a->needed} trong khi bạn đang dùng {$a->current}';

install/lang/vi/error.php

@@ -30,10 +30,24 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+$string['cannotcreatedboninstall'] = '<p>Không thể tạo CSDL.</p>
+<p>CSDL được chỉ định không tồn tại và người dùng không được phép tạo CSDL.</p>
+<p>Quản trị trang nên xác minh thiết lập CSDL.</p>';
+$string['cannotcreatelangdir'] = 'Không thể tạo thư mục lang';
 $string['cannotcreatetempdir'] = 'Không thể tạo thư mục tạm thời';
 $string['cannotdownloadcomponents'] = 'Không thể tải component';
 $string['cannotdownloadzipfile'] = 'Không thể tải tập tin ZIP';
 $string['cannotfindcomponent'] = 'Không thấy component';
+$string['cannotsavemd5file'] = 'Không thể lưu tệp md5';
 $string['cannotsavezipfile'] = 'Không thể lưu tập tin ZIP';
 $string['cannotunzipfile'] = 'Không thể giải nén tập tin';
 $string['componentisuptodate'] = 'Component đang ở tình trạng mới nhất';
+$string['dmlexceptiononinstall'] = '<p>Lỗi CSDL xảy ra [{$a->errorcode}].<br />{$a->debuginfo}</p>';
+$string['downloadedfilecheckfailed'] = 'Kiểm tra tệp tải về bất thành';
+$string['invalidmd5'] = 'Biến kiểm tra sai - thử lại';
+$string['missingrequiredfield'] = 'Thiếu một số mục bắt buộc';
+$string['remotedownloaderror'] = '<p>Tải về thành phần máy chủ của bạn bất thành. Hãy xác minh các thiết lập proxy; bộ mở rộng PHP cURL được khuyến nghị.<p>
+<p>Bạn phải tải tệp <a href="{$a->url}">{$a->url}</a> thủ công, chép nó vào "{$a->dest}" trong máy chủ của mình và giải nén nó.</p>';
+$string['wrongdestpath'] = 'Đường dẫn sai';
+$string['wrongsourcebase'] = 'Nền URL nguồn sai';
+$string['wrongzipfilename'] = 'Tên tệp ZIP sai';

install/lang/zgh/langconfig.php

@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['thisdirection'] = 'ltr';
+$string['thislanguage'] = 'ⵜⴰⵎⴰⵣⵉⵖⵜ';

iplookup/index.php

@@ -27,7 +27,11 @@
 require('../config.php');
 require_once('lib.php');
 
-require_login();
+require_login(0, false);
+if (isguestuser()) {
+    // Guest users cannot perform lookups.
+    throw new require_login_exception('Guests are not allowed here.');
+}
 
 $ip   = optional_param('ip', getremoteaddr(), PARAM_HOST);
 $user = optional_param('user', 0, PARAM_INT);

lib/behat/classes/behat_selectors.php

@@ -91,7 +91,10 @@ class behat_selectors {
     normalize-space(descendant::div[@class='hd']) = %locator%]
 XPATH
         , 'block' => <<<XPATH
-//div[contains(concat(' ', normalize-space(@class), ' '), concat(' ', %locator%, ' '))] | //div[contains(concat(' ', normalize-space(@class), ' '), ' block ')]/descendant::h2[normalize-space(.) = %locator%]/ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' block ')]
+//div[contains(concat(' ', normalize-space(@class), ' '), ' block ') and
+    (contains(concat(' ', normalize-space(@class), ' '), concat(' ', %locator%, ' ')) or
+     descendant::h2[normalize-space(.) = %locator%] or
+     @aria-label = %locator%)]
 XPATH
         , 'region' => <<<XPATH
 .//*[self::div | self::section | self::aside][./@id = %locator%]

lib/conditionlib.php

@@ -631,7 +631,7 @@ abstract class condition_info_base {
      * @return array Associative array from user field constants to display name
      */
     public static function get_condition_user_fields($formatoptions = null) {
-        global $DB;
+        global $DB, $CFG;
 
         $userfields = array(
             'firstname' => get_user_field_name('firstname'),
@@ -655,7 +655,19 @@ abstract class condition_info_base {
 
         // Go through the custom profile fields now
         if ($user_info_fields = $DB->get_records('user_info_field')) {
+            require_once($CFG->dirroot . '/user/profile/lib.php');
             foreach ($user_info_fields as $field) {
+                // This logic is the same as used in profile_user_record function
+                // to exclude some field types from being loaded into the $USER
+                // record.
+                require_once($CFG->dirroot . '/user/profile/field/' .
+                        $field->datatype . '/field.class.php');
+                $newfield = 'profile_field_' . $field->datatype;
+                $formfield = new $newfield();
+                if (!$formfield->is_user_object_data()) {
+                    continue;
+                }
+
                 if ($formatoptions) {
                     $userfields[$field->id] = format_string($field->name, true, $formatoptions);
                 } else {

lib/csslib.php

@@ -189,9 +189,9 @@ function css_chunk_by_selector_count($css, $importurl, $maxselectors = 4095, $bu
             }
         }
 
-        // Let's count the number of selectors, but only if we are not in a rule as they
-        // can contain commas too.
-        if (!$inrule && $char === ',') {
+        // Let's count the number of selectors, but only if we are not in a rule, or in
+        // the definition of a media query, as they can contain commas too.
+        if (!$mediacoming && !$inrule && $char === ',') {
             $selectorcount++;
         }
 
@@ -208,6 +208,12 @@ function css_chunk_by_selector_count($css, $importurl, $maxselectors = 4095, $bu
                 }
             } else {
                 $inrule--;
+                // Handle stupid broken CSS where there are too many } brackets,
+                // as this can cause it to break (with chunking) where it would
+                // coincidentally have worked otherwise.
+                if ($inrule < 0) {
+                    $inrule = 0;
+                }
             }
 
             // We are not in a media query, and there is no pending rule, it is safe to split here.

lib/datalib.php

@@ -1607,6 +1607,11 @@ function add_to_log($courseid, $module, $action, $url='', $info='', $cm=0, $user
     // database so that it doesn't cause a DB error. Log a warning so that
     // developers can avoid doing things which are likely to cause this on a
     // routine basis.
+    if (textlib::strlen($action) > 40) {
+        $action = textlib::substr($action, 0, 37) . '...';
+        debugging('Warning: logged very long action', DEBUG_DEVELOPER);
+    }
+
     if(!empty($info) && textlib::strlen($info)>255) {
         $info = textlib::substr($info,0,252).'...';
         debugging('Warning: logged very long info',DEBUG_DEVELOPER);

lib/db/upgrade.php

@@ -2361,5 +2361,34 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2013051405.10);
     }
 
+    // MDL-32543 Make sure that the log table has correct length for action and url fields.
+    if ($oldversion < 2013051406.01) {
+
+        $table = new xmldb_table('log');
+
+        $columns = $DB->get_columns('log');
+        if ($columns['action']->max_length < 40) {
+            $index1 = new xmldb_index('course-module-action', XMLDB_INDEX_NOTUNIQUE, array('course', 'module', 'action'));
+            if ($dbman->index_exists($table, $index1)) {
+                $dbman->drop_index($table, $index1);
+            }
+            $index2 = new xmldb_index('action', XMLDB_INDEX_NOTUNIQUE, array('action'));
+            if ($dbman->index_exists($table, $index2)) {
+                $dbman->drop_index($table, $index2);
+            }
+            $field = new xmldb_field('action', XMLDB_TYPE_CHAR, '40', null, XMLDB_NOTNULL, null, null, 'cmid');
+            $dbman->change_field_precision($table, $field);
+            $dbman->add_index($table, $index1);
+            $dbman->add_index($table, $index2);
+        }
+
+        if ($columns['url']->max_length < 100) {
+            $field = new xmldb_field('url', XMLDB_TYPE_CHAR, '100', null, XMLDB_NOTNULL, null, null, 'action');
+            $dbman->change_field_precision($table, $field);
+        }
+
+        upgrade_main_savepoint(true, 2013051406.01);
+    }
+
     return true;
 }

lib/filelib.php

@@ -3920,7 +3920,7 @@ function file_pluginfile($relativepath, $forcedownload, $preview = null) {
             }
 
             session_get_instance()->write_close(); // unlock session during fileserving
-            send_stored_file($file, 60*60, 0, $forcedownload, array('preview' => $preview));
+            send_stored_file($file, 0, 0, true, array('preview' => $preview));
 
         } else if ($filearea === 'event_description' and $context->contextlevel == CONTEXT_COURSE) {
 

lib/form/editor.php

@@ -94,6 +94,25 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
         editors_head_setup();
     }
 
+    /**
+     * Called by HTML_QuickForm whenever form event is made on this element
+     *
+     * @param string $event Name of event
+     * @param mixed $arg event arguments
+     * @param object $caller calling object
+     * @return bool
+     */
+    function onQuickFormEvent($event, $arg, &$caller)
+    {
+        switch ($event) {
+            case 'createElement':
+                $caller->setType($arg[0] . '[format]', PARAM_ALPHANUM);
+                $caller->setType($arg[0] . '[itemid]', PARAM_INT);
+                break;
+        }
+        return parent::onQuickFormEvent($event, $arg, $caller);
+    }
+
     /**
      * Sets name of editor
      *
@@ -413,7 +432,8 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
         if (!during_initial_install() && empty($CFG->adminsetuppending)) {
             // 0 means no files, -1 unlimited
             if ($maxfiles != 0 ) {
-                $str .= '<input type="hidden" name="'.$elname.'[itemid]" value="'.$draftitemid.'" />';
+                $str .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => $elname.'[itemid]',
+                        'value' => $draftitemid));
 
                 // used by non js editor only
                 $editorurl = new moodle_url("$CFG->wwwroot/repository/draftfiles_manager.php", array(

lib/form/filemanager.php

@@ -79,6 +79,24 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element {
         parent::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
     }
 
+    /**
+     * Called by HTML_QuickForm whenever form event is made on this element
+     *
+     * @param string $event Name of event
+     * @param mixed $arg event arguments
+     * @param object $caller calling object
+     * @return bool
+     */
+    function onQuickFormEvent($event, $arg, &$caller)
+    {
+        switch ($event) {
+            case 'createElement':
+                $caller->setType($arg[0], PARAM_INT);
+                break;
+        }
+        return parent::onQuickFormEvent($event, $arg, $caller);
+    }
+
     /**
      * Sets name of filemanager
      *
@@ -263,9 +281,9 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element {
         $output = $PAGE->get_renderer('core', 'files');
         $html .= $output->render($fm);
 
-        $html .= '<input value="'.$draftitemid.'" name="'.$elname.'" type="hidden" />';
+        $html .= html_writer::empty_tag('input', array('value' => $draftitemid, 'name' => $elname, 'type' => 'hidden'));
         // label element needs 'for' attribute work
-        $html .= '<input value="" id="id_'.$elname.'" type="hidden" />';
+        $html .= html_writer::empty_tag('input', array('value' => '', 'id' => 'id_'.$elname, 'type' => 'hidden'));
 
         return $html;
     }

lib/moodlelib.php

@@ -10500,43 +10500,7 @@ function message_popup_window() {
     //if we have new messages to notify the user about
     if (!empty($message_users)) {
 
-        $strmessages = '';
-        if (count($message_users)>1) {
-            $strmessages = get_string('unreadnewmessages', 'message', count($message_users));
-        } else {
-            $message_users = reset($message_users);
-
-            //show who the message is from if its not a notification
-            if (!$message_users->notification) {
-                $strmessages = get_string('unreadnewmessage', 'message', fullname($message_users) );
-            }
-
-            //try to display the small version of the message
-            $smallmessage = null;
-            if (!empty($message_users->smallmessage)) {
-                //display the first 200 chars of the message in the popup
-                $smallmessage = null;
-                if (textlib::strlen($message_users->smallmessage) > 200) {
-                    $smallmessage = textlib::substr($message_users->smallmessage,0,200).'...';
-                } else {
-                    $smallmessage = $message_users->smallmessage;
-                }
-
-                //prevent html symbols being displayed
-                if ($message_users->fullmessageformat == FORMAT_HTML) {
-                    $smallmessage = html_to_text($smallmessage);
-                } else {
-                    $smallmessage = s($smallmessage);
-                }
-            } else if ($message_users->notification) {
-                //its a notification with no smallmessage so just say they have a notification
-                $smallmessage = get_string('unreadnewnotification', 'message');
-            }
-            if (!empty($smallmessage)) {
-                $strmessages .= '<div id="usermessage">'.s($smallmessage).'</div>';
-            }
-        }
-
+        $strmessages = get_string('unreadnewmessages', 'message', count($message_users));
         $strgomessage = get_string('gotomessages', 'message');
         $strstaymessage = get_string('ignore','admin');
 

lib/navigationlib.php

@@ -2740,6 +2740,12 @@ class global_navigation_for_ajax extends global_navigation {
                 break;
             case self::TYPE_COURSE :
                 $course = $DB->get_record('course', array('id' => $this->instanceid), '*', MUST_EXIST);
+                if (!can_access_course($course)) {
+                    // Thats OK all courses are expandable by default. We don't need to actually expand it we can just
+                    // add the course node and break. This leads to an empty node.
+                    $this->add_course($course);
+                    break;
+                }
                 require_course_login($course, true, null, false, true);
                 $this->page->set_context(context_course::instance($course->id));
                 $coursenode = $this->add_course($course);

lib/outputrenderers.php

@@ -632,7 +632,7 @@ class core_renderer extends renderer_base {
                 $loggedinas = get_string('loggedinas', 'moodle', $username).$rolename;
                 if ($withlinks) {
                     $url = new moodle_url('/course/switchrole.php', array('id'=>$course->id,'sesskey'=>sesskey(), 'switchrole'=>0, 'returnurl'=>$this->page->url->out_as_local_url(false)));
-                    $loggedinas .= '('.html_writer::tag('a', get_string('switchrolereturn'), array('href'=>$url)).')';
+                    $loggedinas .= ' ('.html_writer::tag('a', get_string('switchrolereturn'), array('href' => $url)).')';
                 }
             } else {
                 $loggedinas = $realuserinfo.get_string('loggedinas', 'moodle', $username);

lib/outputrequirementslib.php

@@ -711,7 +711,7 @@ class page_requirements_manager {
                                     'requires' => array('node', 'event', 'json', 'core_filepicker'),
                                     'strings'  => array(array('uploadformlimit', 'moodle'), array('droptoupload', 'moodle'), array('maxfilesreached', 'moodle'),
                                                         array('dndenabled_inbox', 'moodle'), array('fileexists', 'moodle'), array('maxbytesforfile', 'moodle'),
-                                                        array('maxareabytesreached', 'moodle')
+                                                        array('maxareabytesreached', 'moodle'), array('serverconnection', 'error'),
                                                     ));
                     break;
             }

lib/phpunit/bootstrap.php

@@ -26,6 +26,10 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+if (isset($_SERVER['REMOTE_ADDR'])) {
+    die; // No access from web!
+}
+
 // we want to know about all problems
 error_reporting(E_ALL | E_STRICT);
 ini_set('display_errors', '1');

lib/setup.php

@@ -798,6 +798,27 @@ session_get_instance();
 $SESSION = &$_SESSION['SESSION'];
 $USER    = &$_SESSION['USER'];
 
+// Set default content type and encoding, developers are still required to use
+// echo $OUTPUT->header() everywhere, anything that gets set later should override these headers.
+// This is intended to mitigate some security problems.
+if (AJAX_SCRIPT) {
+    $supportsjsoncontenttype = !check_browser_version('MSIE') ||
+        (check_browser_version('MSIE', 8) &&
+            !(preg_match("/MSIE 7.0/", $_SERVER['HTTP_USER_AGENT']) && preg_match("/Trident\/([0-9\.]+)/", $_SERVER['HTTP_USER_AGENT'])));
+    if (!$supportsjsoncontenttype) {
+        // Some bloody old IE.
+        @header('Content-type: text/plain; charset=utf-8');
+        @header('X-Content-Type-Options: nosniff');
+    } else if (!empty($_FILES)) {
+        // Some ajax code may have problems with json and file uploads.
+        @header('Content-type: text/plain; charset=utf-8');
+    } else {
+        @header('Content-type: application/json; charset=utf-8');
+    }
+} else if (!CLI_SCRIPT) {
+    @header('Content-type: text/html; charset=utf-8');
+}
+
 // Late profiling, only happening if early one wasn't started
 if (!empty($CFG->profilingenabled)) {
     require_once($CFG->libdir . '/xhprof/xhprof_moodle.php');

lib/tests/csslib_test.php

@@ -1182,6 +1182,12 @@ CSS;
         $this->assertCount(1, $chunks);
         $this->assertSame('@media (min-width: 980px) { .a,.b{} }', $chunks[0]);
 
+        // Test media queries, with commas.
+        $css = '.a{} @media (min-width: 700px), handheld and (orientation: landscape) { .b{} }';
+        $chunks = css_chunk_by_selector_count($css, 'styles.php?type=test', 2);
+        $this->assertCount(1, $chunks);
+        $this->assertSame($css, $chunks[0]);
+
         // Test special rules.
         $css = 'a,b{ background-image: linear-gradient(to bottom, #ffffff, #cccccc);}d,e{}';
         $chunks = css_chunk_by_selector_count($css, 'styles.php?type=test', 2);
@@ -1235,5 +1241,22 @@ CSS;
         $this->assertCount(2, $chunks);
         $this->assertSame('a,b{}', $chunks[0]);
         $this->assertSame("@import url(styles.php?type=test&chunk=0);\n nav a:hover:after { content: \"↓\"; } b{ color:test;}", $chunks[1]);
+
+        // Test that if there is broken CSS with too many close brace symbols,
+        // media rules after that point are still kept together.
+        $mediarule = '@media (width=480) {a{}b{}}';
+        $css = 'c{}}' . $mediarule . 'd{}';
+        $chunks = css_chunk_by_selector_count($css, 'styles.php?type=test', 2);
+        $this->assertCount(3, $chunks);
+        $this->assertEquals($mediarule, $chunks[1]);
+
+        // Test that this still works even with too many close brace symbols
+        // inside a media query (note: that broken media query may be split
+        // after the break, but any following ones should not be).
+        $brokenmediarule = '@media (width=480) {c{}}d{}}';
+        $css = $brokenmediarule . 'e{}' . $mediarule . 'f{}';
+        $chunks = css_chunk_by_selector_count($css, 'styles.php?type=test', 2);
+        $this->assertCount(4, $chunks);
+        $this->assertEquals($mediarule, $chunks[2]);
     }
 }

lib/wordlist.txt

@@ -1,35 +1,183 @@
+aardvark
+albatross
+alligator
+alpaca
+ant
+anteater
+antelope
 ape
-baby
+armadillo
+barracuda
+bat
+bee
+bison
+boar
+buffalo
+galago
+butterfly
 camel
-car
+caribou
 cat
-class
+cattle
+chamois
+cheetah
+chough
+clam
+cobra
+cod
+cormorant
+coyote
+crane
+crocodile
+crow
+curlew
+deer
+dinosaur
 dog
-eat
+dogfish
+dolphin
+dotterel
+dove
+dragonfly
+duck
+dugong
+dunlin
+eagle
+echidna
+eel
+eland
 elephant
-fence
-flower
+elk
+emu
+falcon
+ferret
+finch
+flamingo
+fly
 frog
-gate
-grass
-how
-item
-joke
-keep
-learn
-music
-nice
-own
-peg
-pillow
-quiet
+gaur
+gazelle
+gerbil
+giraffe
+gnat
+gnu
+goat
+goose
+goldfinch
+goldfish
+gorilla
+goshawk
+grouse
+guanaco
+gull
+hamster
+hare
+hawk
+hedgehog
+heron
+herring
+hornet
+horse
+human
+hyena
+jackal
+jaguar
+jay
+jellyfish
+kangaroo
+koala
+kouprey
+kudu
+lapwing
+lark
+lemur
+leopard
+lion
+llama
+lobster
+locust
+loris
+louse
+lyrebird
+magpie
+mallard
+manatee
+marten
+meerkat
+mink
+mole
+moose
+mouse
+mosquito
+narwhal
+newt
+octopus
+okapi
+opossum
+oryx
+ostrich
+otter
+owl
+ox
+oyster
+panther
+parrot
+partridge
+peafowl
+pelican
+penguin
+pheasant
+pigeon
+pony
+porcupine
+porpoise
+quail
+quelea
 rabbit
-rock
-seek
-stop
-tree
-ufo
-vat
-why
-xan
-zoo
+raccoon
+rail
+rat
+raven
+reindeer
+rook
+ruff
+salmon
+sandpiper
+sardine
+scorpion
+seahorse
+seal
+shark
+sheep
+shrew
+shrimp
+snail
+spider
+squid
+squirrel
+starling
+stingray
+stinkbug
+stork
+swallow
+swan
+tapir
+tarsier
+termite
+tiger
+toad
+trout
+turkey
+turtle
+viper
+vulture
+wallaby
+walrus
+wasp
+weasel
+wolf
+wolverine
+wombat
+wren
+yak
+zebra

lib/yui/build/moodle-core-notification/moodle-core-notification-debug.js

@@ -302,13 +302,13 @@ Y.extend(EXCEPTION, DIALOGUE, {
             delay = this.get('hideTimeoutDelay');
         this.get(BASE).addClass('moodle-dialogue-exception');
         this.setStdModContent(Y.WidgetStdMod.HEADER, '<h1 id="moodle-dialogue-'+this.get('COUNT')+'-header-text">'
-                + config.name + '</h1>', Y.WidgetStdMod.REPLACE);
+                + Y.Escape.html(config.name) + '</h1>', Y.WidgetStdMod.REPLACE);
         content = Y.Node.create('<div class="moodle-exception"></div>')
-                .append(Y.Node.create('<div class="moodle-exception-message">'+this.get('message')+'</div>'))
+                .append(Y.Node.create('<div class="moodle-exception-message">'+Y.Escape.html(this.get('message'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-filename"><label>File:</label> '
-                        + this.get('fileName')+'</div>'))
+                        + Y.Escape.html(this.get('fileName'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-linenumber"><label>Line:</label> '
-                        + this.get('lineNumber')+'</div>'))
+                        + Y.Escape.html(this.get('lineNumber'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-stacktrace"><label>Stack trace:</label> <pre>'
                         + this.get('stack')+'</pre></div>'));
         if (M.cfg.developerdebug) {
@@ -351,7 +351,7 @@ Y.extend(EXCEPTION, DIALOGUE, {
         },
         stack : {
             setter : function(str) {
-                var lines = str.split("\n"),
+                var lines = Y.Escape.html(str).split("\n"),
                     pattern = new RegExp('^(.+)@('+M.cfg.wwwroot+')?(.{0,75}).*:(\\d+)$'),
                     i;
                 for (i in lines) {
@@ -382,15 +382,15 @@ Y.extend(AJAXEXCEPTION, DIALOGUE, {
             delay = this.get('hideTimeoutDelay');
         this.get(BASE).addClass('moodle-dialogue-exception');
         this.setStdModContent(Y.WidgetStdMod.HEADER, '<h1 id="moodle-dialogue-'+this.get('COUNT')+'-header-text">'
-                + config.name + '</h1>', Y.WidgetStdMod.REPLACE);
+                + Y.Escape.html(config.name) + '</h1>', Y.WidgetStdMod.REPLACE);
         content = Y.Node.create('<div class="moodle-ajaxexception"></div>')
-                .append(Y.Node.create('<div class="moodle-exception-message">'+this.get('error')+'</div>'))
+                .append(Y.Node.create('<div class="moodle-exception-message">'+Y.Escape.html(this.get('error'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-debuginfo"><label>URL:</label> '
                         + this.get('reproductionlink')+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-debuginfo"><label>Debug info:</label> '
-                        + this.get('debuginfo')+'</div>'))
+                        + Y.Escape.html(this.get('debuginfo'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-stacktrace"><label>Stack trace:</label> <pre>'
-                        + this.get('stacktrace')+'</pre></div>'));
+                        + Y.Escape.html(this.get('stacktrace'))+'</pre></div>'));
         if (M.cfg.developerdebug) {
             content.all('.moodle-exception-param').removeClass('hidden');
         }
@@ -427,6 +427,7 @@ Y.extend(AJAXEXCEPTION, DIALOGUE, {
         reproductionlink : {
             setter : function(link) {
                 if (link !== null) {
+                    link = Y.Escape.html(link);
                     link = '<a href="'+link+'">'+link.replace(M.cfg.wwwroot, '')+'</a>';
                 }
                 return link;
@@ -448,4 +449,4 @@ M.core.exception = EXCEPTION;
 M.core.ajaxException = AJAXEXCEPTION;
 
 
-}, '@VERSION@', {"requires": ["base", "node", "panel", "event-key", "dd-plugin"]});
+}, '@VERSION@', {"requires": ["base", "node", "panel", "event-key", "escape", "dd-plugin"]});

lib/yui/build/moodle-core-notification/moodle-core-notification.js

@@ -302,13 +302,13 @@ Y.extend(EXCEPTION, DIALOGUE, {
             delay = this.get('hideTimeoutDelay');
         this.get(BASE).addClass('moodle-dialogue-exception');
         this.setStdModContent(Y.WidgetStdMod.HEADER, '<h1 id="moodle-dialogue-'+this.get('COUNT')+'-header-text">'
-                + config.name + '</h1>', Y.WidgetStdMod.REPLACE);
+                + Y.Escape.html(config.name) + '</h1>', Y.WidgetStdMod.REPLACE);
         content = Y.Node.create('<div class="moodle-exception"></div>')
-                .append(Y.Node.create('<div class="moodle-exception-message">'+this.get('message')+'</div>'))
+                .append(Y.Node.create('<div class="moodle-exception-message">'+Y.Escape.html(this.get('message'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-filename"><label>File:</label> '
-                        + this.get('fileName')+'</div>'))
+                        + Y.Escape.html(this.get('fileName'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-linenumber"><label>Line:</label> '
-                        + this.get('lineNumber')+'</div>'))
+                        + Y.Escape.html(this.get('lineNumber'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-stacktrace"><label>Stack trace:</label> <pre>'
                         + this.get('stack')+'</pre></div>'));
         if (M.cfg.developerdebug) {
@@ -351,7 +351,7 @@ Y.extend(EXCEPTION, DIALOGUE, {
         },
         stack : {
             setter : function(str) {
-                var lines = str.split("\n"),
+                var lines = Y.Escape.html(str).split("\n"),
                     pattern = new RegExp('^(.+)@('+M.cfg.wwwroot+')?(.{0,75}).*:(\\d+)$'),
                     i;
                 for (i in lines) {
@@ -382,15 +382,15 @@ Y.extend(AJAXEXCEPTION, DIALOGUE, {
             delay = this.get('hideTimeoutDelay');
         this.get(BASE).addClass('moodle-dialogue-exception');
         this.setStdModContent(Y.WidgetStdMod.HEADER, '<h1 id="moodle-dialogue-'+this.get('COUNT')+'-header-text">'
-                + config.name + '</h1>', Y.WidgetStdMod.REPLACE);
+                + Y.Escape.html(config.name) + '</h1>', Y.WidgetStdMod.REPLACE);
         content = Y.Node.create('<div class="moodle-ajaxexception"></div>')
-                .append(Y.Node.create('<div class="moodle-exception-message">'+this.get('error')+'</div>'))
+                .append(Y.Node.create('<div class="moodle-exception-message">'+Y.Escape.html(this.get('error'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-debuginfo"><label>URL:</label> '
                         + this.get('reproductionlink')+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-debuginfo"><label>Debug info:</label> '
-                        + this.get('debuginfo')+'</div>'))
+                        + Y.Escape.html(this.get('debuginfo'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-stacktrace"><label>Stack trace:</label> <pre>'
-                        + this.get('stacktrace')+'</pre></div>'));
+                        + Y.Escape.html(this.get('stacktrace'))+'</pre></div>'));
         if (M.cfg.developerdebug) {
             content.all('.moodle-exception-param').removeClass('hidden');
         }
@@ -427,6 +427,7 @@ Y.extend(AJAXEXCEPTION, DIALOGUE, {
         reproductionlink : {
             setter : function(link) {
                 if (link !== null) {
+                    link = Y.Escape.html(link);
                     link = '<a href="'+link+'">'+link.replace(M.cfg.wwwroot, '')+'</a>';
                 }
                 return link;
@@ -448,4 +449,4 @@ M.core.exception = EXCEPTION;
 M.core.ajaxException = AJAXEXCEPTION;
 
 
-}, '@VERSION@', {"requires": ["base", "node", "panel", "event-key", "dd-plugin"]});
+}, '@VERSION@', {"requires": ["base", "node", "panel", "event-key", "escape", "dd-plugin"]});

lib/yui/src/notification/js/notification.js

@@ -300,13 +300,13 @@ Y.extend(EXCEPTION, DIALOGUE, {
             delay = this.get('hideTimeoutDelay');
         this.get(BASE).addClass('moodle-dialogue-exception');
         this.setStdModContent(Y.WidgetStdMod.HEADER, '<h1 id="moodle-dialogue-'+this.get('COUNT')+'-header-text">'
-                + config.name + '</h1>', Y.WidgetStdMod.REPLACE);
+                + Y.Escape.html(config.name) + '</h1>', Y.WidgetStdMod.REPLACE);
         content = Y.Node.create('<div class="moodle-exception"></div>')
-                .append(Y.Node.create('<div class="moodle-exception-message">'+this.get('message')+'</div>'))
+                .append(Y.Node.create('<div class="moodle-exception-message">'+Y.Escape.html(this.get('message'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-filename"><label>File:</label> '
-                        + this.get('fileName')+'</div>'))
+                        + Y.Escape.html(this.get('fileName'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-linenumber"><label>Line:</label> '
-                        + this.get('lineNumber')+'</div>'))
+                        + Y.Escape.html(this.get('lineNumber'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-stacktrace"><label>Stack trace:</label> <pre>'
                         + this.get('stack')+'</pre></div>'));
         if (M.cfg.developerdebug) {
@@ -349,7 +349,7 @@ Y.extend(EXCEPTION, DIALOGUE, {
         },
         stack : {
             setter : function(str) {
-                var lines = str.split("\n"),
+                var lines = Y.Escape.html(str).split("\n"),
                     pattern = new RegExp('^(.+)@('+M.cfg.wwwroot+')?(.{0,75}).*:(\\d+)$'),
                     i;
                 for (i in lines) {
@@ -380,15 +380,15 @@ Y.extend(AJAXEXCEPTION, DIALOGUE, {
             delay = this.get('hideTimeoutDelay');
         this.get(BASE).addClass('moodle-dialogue-exception');
         this.setStdModContent(Y.WidgetStdMod.HEADER, '<h1 id="moodle-dialogue-'+this.get('COUNT')+'-header-text">'
-                + config.name + '</h1>', Y.WidgetStdMod.REPLACE);
+                + Y.Escape.html(config.name) + '</h1>', Y.WidgetStdMod.REPLACE);
         content = Y.Node.create('<div class="moodle-ajaxexception"></div>')
-                .append(Y.Node.create('<div class="moodle-exception-message">'+this.get('error')+'</div>'))
+                .append(Y.Node.create('<div class="moodle-exception-message">'+Y.Escape.html(this.get('error'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-debuginfo"><label>URL:</label> '
                         + this.get('reproductionlink')+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-debuginfo"><label>Debug info:</label> '
-                        + this.get('debuginfo')+'</div>'))
+                        + Y.Escape.html(this.get('debuginfo'))+'</div>'))
                 .append(Y.Node.create('<div class="moodle-exception-param hidden param-stacktrace"><label>Stack trace:</label> <pre>'
-                        + this.get('stacktrace')+'</pre></div>'));
+                        + Y.Escape.html(this.get('stacktrace'))+'</pre></div>'));
         if (M.cfg.developerdebug) {
             content.all('.moodle-exception-param').removeClass('hidden');
         }
@@ -425,6 +425,7 @@ Y.extend(AJAXEXCEPTION, DIALOGUE, {
         reproductionlink : {
             setter : function(link) {
                 if (link !== null) {
+                    link = Y.Escape.html(link);
                     link = '<a href="'+link+'">'+link.replace(M.cfg.wwwroot, '')+'</a>';
                 }
                 return link;

lib/yui/src/notification/meta/notification.json

@@ -5,6 +5,7 @@
         "node",
         "panel",
         "event-key",
+        "escape",
         "dd-plugin"
     ]
   }

mod/assign/db/upgrade.php

@@ -425,6 +425,15 @@ function xmldb_assign_upgrade($oldversion) {
     // Moodle v2.5.0 release upgrade line.
     // Put any upgrade step following this.
 
+    if ($oldversion < 2013050101) {
+
+        // Cleanup bad database records where assignid is missing.
+
+        $DB->delete_records('assign_user_mapping', array('assignment'=>0));
+        // Assign savepoint reached.
+        upgrade_mod_savepoint(true, 2013050101, 'assign');
+    }
+
     return true;
 }
 

mod/assign/locallib.php

@@ -5990,14 +5990,13 @@ class assign {
         // Shuffle the users.
         shuffle($users);
 
-        $record = new stdClass();
-        $record->assignment = $assignid;
         foreach ($users as $user) {
             $record = $DB->get_record('assign_user_mapping',
                                       array('assignment'=>$assignid, 'userid'=>$user->id),
                                      'id');
             if (!$record) {
                 $record = new stdClass();
+                $record->assignment = $assignid;
                 $record->userid = $user->id;
                 $DB->insert_record('assign_user_mapping', $record);
             }

mod/assign/submission/onlinetext/locallib.php

@@ -293,7 +293,8 @@ class assign_submission_onlinetext extends assign_submission_plugin {
             $formattedtext = format_text($finaltext,
                                          $onlinetextsubmission->onlineformat,
                                          array('context'=>$this->assignment->get_context()));
-            $submissioncontent = '<html><body>'. $formattedtext . '</body></html>';
+            $head = '<head><meta charset="UTF-8"></head>';
+            $submissioncontent = '<!DOCTYPE html><html>' . $head . '<body>'. $formattedtext . '</body></html>';
 
             $filename = get_string('onlinetextfilename', 'assignsubmission_onlinetext');
             $files[$filename] = array($submissioncontent);

mod/assign/version.php

@@ -25,8 +25,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $module->component = 'mod_assign'; // Full name of the plugin (used for diagnostics).
-$module->version  = 2013050100;    // The current module version (Date: YYYYMMDDXX).
+$module->version  = 2013050101;    // The current module version (Date: YYYYMMDDXX).
 $module->requires = 2013050100;    // Requires this Moodle version.
 $module->cron     = 60;
 
-

mod/data/edit.php

@@ -168,7 +168,6 @@ if ($datarecord = data_submitted() and confirm_sesskey()) {
             $record->approved = 0;
         }
 
-        $record->groupid = $currentgroup;
         $record->timemodified = time();
         $DB->update_record('data_records', $record);
 

mod/feedback/mapcourse.php

@@ -111,11 +111,11 @@ if (($courses = $DB->get_records_sql_menu($sql, $params)) && !empty($searchcours
                 'value="'.get_string('searchagain').'" '.
                 'onclick="document.location=\'mapcourse.php?id='.$id.'\'"/>';
 
-    echo '<input type="hidden" name="searchcourse" value="'.$searchcourse.'"/>';
+    echo '<input type="hidden" name="searchcourse" value="'.s($searchcourse).'"/>';
     echo '<input type="hidden" name="feedbackid" value="'.$feedback->id.'"/>';
     echo $OUTPUT->help_icon('searchcourses', 'feedback');
 } else {
-    echo '<input type="text" name="searchcourse" value="'.$searchcourse.'"/> ';
+    echo '<input type="text" name="searchcourse" value="'.s($searchcourse).'"/> ';
     echo '<input type="submit" value="'.get_string('searchcourses').'"/>';
     echo $OUTPUT->help_icon('searchcourses', 'feedback');
 }

mod/forum/db/upgrade.php

@@ -86,6 +86,24 @@ function xmldb_forum_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    if ($oldversion < 2013050101) {
+
+        // Incorrect values that need to be replaced.
+        $replacements = array(
+            11 => 20,
+            12 => 50,
+            13 => 100
+        );
+
+        // Run the replacements.
+        foreach ($replacements as $old => $new) {
+            $DB->set_field('forum', 'maxattachments', $new, array('maxattachments' => $old));
+        }
+
+        // Forum savepoint reached.
+        upgrade_mod_savepoint(true, 2013050101, 'forum');
+    }
+
     return true;
 }