Moodle release 3.1.11

Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_31_STABLE
MDL-61392 enrol_paypal: Improve IPN input parameters checking
2018-03-17 01:18:16 +01:00 · 2018-03-17 01:18:13 +01:00 · 2018-03-14 09:19:02 +08:00 · 2018-03-14 09:19:02 +08:00 · 2018-03-12 23:51:49 +01:00 · 2018-03-07 17:49:47 -05:00
40 changed files with 1193 additions and 375 deletions
@@ -2259,4 +2259,180 @@
      </CUSTOM_CHECK>
    </CUSTOM_CHECKS>
  </MOODLE>
+  <MOODLE version="3.5" requires="3.1">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="5.5.31" />
+      <VENDOR name="mysql" version="5.5.31" />
+      <VENDOR name="postgres" version="9.3" />
+      <VENDOR name="mssql" version="10.0" />
+      <VENDOR name="oracle" version="10.2" />
+    </DATABASE>
+    <PHP version="7.0.0" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -411,7 +411,7 @@ function calendar_get_mini($courses, $groups, $users, $calmonth = false, $calyea
                        $name = format_string($event->name, true);
                    }
                }
-                $popupcontent .= html_writer::link($dayhref, $name);
+                $popupcontent .= html_writer::link($dayhref, clean_text($name));
                $popupcontent .= html_writer::end_tag('div');
            }

@@ -4,6 +4,6 @@
        "phpunit/dbUnit": "1.4.1",
        "sebastian/environment": "1.3.7",
        "sebastian/recursion-context": "1.0.2",
-        "moodlehq/behat-extension": "3.31.6"
+        "moodlehq/behat-extension": "3.31.7"
    }
 }
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "content-hash": "be501c2af95e3e00762b8cf30d957b2b",
+    "content-hash": "3a6c6907fe5405dbbd8ae2ba209fa942",
    "packages": [],
    "packages-dev": [
        {
@@ -89,16 +89,16 @@
        },
        {
            "name": "behat/gherkin",
-            "version": "v4.4.5",
+            "version": "v4.5.1",
            "source": {
                "type": "git",
                "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74"
+                "reference": "74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/5c14cff4f955b17d20d088dec1bde61c0539ec74",
-                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a",
+                "reference": "74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a",
                "shasum": ""
            },
            "require": {
@@ -144,7 +144,7 @@
                "gherkin",
                "parser"
            ],
-            "time": "2016-10-30T11:50:56+00:00"
+            "time": "2017-08-30T11:04:43+00:00"
        },
        {
            "name": "behat/mink",
@@ -262,27 +262,27 @@
        },
        {
            "name": "behat/mink-extension",
-            "version": "v2.2",
+            "version": "2.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/Behat/MinkExtension.git",
-                "reference": "5b4bda64ff456104564317e212c823e45cad9d59"
+                "reference": "badc565b7a1d05c4a4bf49c789045bcf7af6c6de"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/5b4bda64ff456104564317e212c823e45cad9d59",
-                "reference": "5b4bda64ff456104564317e212c823e45cad9d59",
+                "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/badc565b7a1d05c4a4bf49c789045bcf7af6c6de",
+                "reference": "badc565b7a1d05c4a4bf49c789045bcf7af6c6de",
                "shasum": ""
            },
            "require": {
-                "behat/behat": "~3.0,>=3.0.5",
-                "behat/mink": "~1.5",
+                "behat/behat": "^3.0.5",
+                "behat/mink": "^1.5",
                "php": ">=5.3.2",
-                "symfony/config": "~2.2|~3.0"
+                "symfony/config": "^2.7|^3.0|^4.0"
            },
            "require-dev": {
-                "behat/mink-goutte-driver": "~1.1",
-                "phpspec/phpspec": "~2.0"
+                "behat/mink-goutte-driver": "^1.1",
+                "phpspec/phpspec": "^2.0"
            },
            "type": "behat-extension",
            "extra": {
@@ -317,7 +317,7 @@
                "test",
                "web"
            ],
-            "time": "2016-02-15T07:55:18+00:00"
+            "time": "2017-11-24T19:30:49+00:00"
        },
        {
            "name": "behat/mink-goutte-driver",
@@ -437,25 +437,29 @@
        },
        {
            "name": "behat/transliterator",
-            "version": "v1.1.0",
+            "version": "v1.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/Behat/Transliterator.git",
-                "reference": "868e05be3a9f25ba6424c2dd4849567f50715003"
+                "reference": "826ce7e9c2a6664c0d1f381cbb38b1fb80a7ee2c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Transliterator/zipball/868e05be3a9f25ba6424c2dd4849567f50715003",
-                "reference": "868e05be3a9f25ba6424c2dd4849567f50715003",
+                "url": "https://api.github.com/repos/Behat/Transliterator/zipball/826ce7e9c2a6664c0d1f381cbb38b1fb80a7ee2c",
+                "reference": "826ce7e9c2a6664c0d1f381cbb38b1fb80a7ee2c",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
+            "require-dev": {
+                "chuyskywalker/rolling-curl": "^3.1",
+                "php-yaoi/php-yaoi": "^1.0"
+            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "1.2-dev"
                }
            },
            "autoload": {
@@ -473,7 +477,7 @@
                "slug",
                "transliterator"
            ],
-            "time": "2015-09-28T16:26:35+00:00"
+            "time": "2017-04-04T11:38:05+00:00"
        },
        {
            "name": "doctrine/instantiator",
@@ -580,21 +584,22 @@
        },
        {
            "name": "guzzlehttp/guzzle",
-            "version": "5.3.1",
+            "version": "5.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "70f1fa53b71c4647bf2762c09068a95f77e12fb8"
+                "reference": "f9acb4761844317e626a32259205bec1f1bc60d2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/70f1fa53b71c4647bf2762c09068a95f77e12fb8",
-                "reference": "70f1fa53b71c4647bf2762c09068a95f77e12fb8",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f9acb4761844317e626a32259205bec1f1bc60d2",
+                "reference": "f9acb4761844317e626a32259205bec1f1bc60d2",
                "shasum": ""
            },
            "require": {
                "guzzlehttp/ringphp": "^1.1",
-                "php": ">=5.4.0"
+                "php": ">=5.4.0",
+                "react/promise": "^2.2"
            },
            "require-dev": {
                "ext-curl": "*",
@@ -628,7 +633,7 @@
                "rest",
                "web service"
            ],
-            "time": "2016-07-15T19:28:39+00:00"
+            "time": "2018-01-15T07:18:01+00:00"
        },
        {
            "name": "guzzlehttp/ringphp",
@@ -733,16 +738,16 @@
        },
        {
            "name": "instaclick/php-webdriver",
-            "version": "1.4.3",
+            "version": "1.4.5",
            "source": {
                "type": "git",
                "url": "https://github.com/instaclick/php-webdriver.git",
-                "reference": "0c20707dcf30a32728fd6bdeeab996c887fdb2fb"
+                "reference": "6fa959452e774dcaed543faad3a9d1a37d803327"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/0c20707dcf30a32728fd6bdeeab996c887fdb2fb",
-                "reference": "0c20707dcf30a32728fd6bdeeab996c887fdb2fb",
+                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/6fa959452e774dcaed543faad3a9d1a37d803327",
+                "reference": "6fa959452e774dcaed543faad3a9d1a37d803327",
                "shasum": ""
            },
            "require": {
@@ -750,7 +755,8 @@
                "php": ">=5.3.2"
            },
            "require-dev": {
-                "satooshi/php-coveralls": "dev-master"
+                "phpunit/phpunit": "^4.8",
+                "satooshi/php-coveralls": "^1.0||^2.0"
            },
            "type": "library",
            "extra": {
@@ -787,20 +793,20 @@
                "webdriver",
                "webtest"
            ],
-            "time": "2015-06-15T20:19:33+00:00"
+            "time": "2017-06-30T04:02:48+00:00"
        },
        {
            "name": "moodlehq/behat-extension",
-            "version": "v3.31.6",
+            "version": "v3.31.7",
            "source": {
                "type": "git",
                "url": "https://github.com/moodlehq/moodle-behat-extension.git",
-                "reference": "ae6be43e359fb36f825da1f248b727d7a46a94ed"
+                "reference": "9baefa57d61771b7ec46bcc899a48046dba50b2b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/moodlehq/moodle-behat-extension/zipball/ae6be43e359fb36f825da1f248b727d7a46a94ed",
-                "reference": "ae6be43e359fb36f825da1f248b727d7a46a94ed",
+                "url": "https://api.github.com/repos/moodlehq/moodle-behat-extension/zipball/9baefa57d61771b7ec46bcc899a48046dba50b2b",
+                "reference": "9baefa57d61771b7ec46bcc899a48046dba50b2b",
                "shasum": ""
            },
            "require": {
@@ -836,20 +842,20 @@
                "Behat",
                "moodle"
            ],
-            "time": "2017-01-19T00:08:20+00:00"
+            "time": "2018-01-24T19:13:01+00:00"
        },
        {
            "name": "phpdocumentor/reflection-docblock",
-            "version": "2.0.4",
+            "version": "2.0.5",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+                "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e6a969a640b00d8daa3c66518b0405fb41ae0c4b",
+                "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b",
                "shasum": ""
            },
            "require": {
@@ -885,37 +891,37 @@
                    "email": "mike.vanriel@naenius.com"
                }
            ],
-            "time": "2015-02-03T12:10:50+00:00"
+            "time": "2016-01-25T08:17:30+00:00"
        },
        {
            "name": "phpspec/prophecy",
-            "version": "v1.6.2",
+            "version": "1.7.3",
            "source": {
                "type": "git",
                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
+                "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb",
-                "reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf",
+                "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf",
                "shasum": ""
            },
            "require": {
                "doctrine/instantiator": "^1.0.2",
                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
-                "sebastian/comparator": "^1.1",
-                "sebastian/recursion-context": "^1.0|^2.0"
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
+                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
            },
            "require-dev": {
-                "phpspec/phpspec": "^2.0",
-                "phpunit/phpunit": "^4.8 || ^5.6.5"
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8.35 || ^5.7"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.6.x-dev"
+                    "dev-master": "1.7.x-dev"
                }
            },
            "autoload": {
@@ -948,7 +954,7 @@
                "spy",
                "stub"
            ],
-            "time": "2016-11-21T14:58:47+00:00"
+            "time": "2017-11-24T13:59:53+00:00"
        },
        {
            "name": "phpunit/dbunit",
@@ -1073,16 +1079,16 @@
        },
        {
            "name": "phpunit/php-file-iterator",
-            "version": "1.4.2",
+            "version": "1.4.5",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
-                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
                "shasum": ""
            },
            "require": {
@@ -1116,7 +1122,7 @@
                "filesystem",
                "iterator"
            ],
-            "time": "2016-10-03T07:40:28+00:00"
+            "time": "2017-11-27T13:52:08+00:00"
        },
        {
            "name": "phpunit/php-text-template",
@@ -1161,25 +1167,30 @@
        },
        {
            "name": "phpunit/php-timer",
-            "version": "1.0.8",
+            "version": "1.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3 || ^7.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "~4|~5"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
            },
            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
            "autoload": {
                "classmap": [
                    "src/"
@@ -1201,20 +1212,20 @@
            "keywords": [
                "timer"
            ],
-            "time": "2016-05-12T18:03:57+00:00"
+            "time": "2017-02-26T11:10:40+00:00"
        },
        {
            "name": "phpunit/php-token-stream",
-            "version": "1.4.9",
+            "version": "1.4.12",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b"
+                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b",
-                "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16",
+                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16",
                "shasum": ""
            },
            "require": {
@@ -1250,7 +1261,7 @@
            "keywords": [
                "tokenizer"
            ],
-            "time": "2016-11-15T14:06:22+00:00"
+            "time": "2017-12-04T08:55:13+00:00"
        },
        {
            "name": "phpunit/phpunit",
@@ -1429,21 +1440,24 @@
        },
        {
            "name": "react/promise",
-            "version": "v2.5.0",
+            "version": "v2.5.1",
            "source": {
                "type": "git",
                "url": "https://github.com/reactphp/promise.git",
-                "reference": "2760f3898b7e931aa71153852dcd48a75c9b95db"
+                "reference": "62785ae604c8d69725d693eb370e1d67e94c4053"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/2760f3898b7e931aa71153852dcd48a75c9b95db",
-                "reference": "2760f3898b7e931aa71153852dcd48a75c9b95db",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/62785ae604c8d69725d693eb370e1d67e94c4053",
+                "reference": "62785ae604c8d69725d693eb370e1d67e94c4053",
                "shasum": ""
            },
            "require": {
                "php": ">=5.4.0"
            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
            "type": "library",
            "autoload": {
                "psr-4": {
@@ -1468,20 +1482,20 @@
                "promise",
                "promises"
            ],
-            "time": "2016-12-22T14:09:01+00:00"
+            "time": "2017-03-25T12:08:31+00:00"
        },
        {
            "name": "sebastian/comparator",
-            "version": "1.2.2",
+            "version": "1.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f"
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
-                "reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
                "shasum": ""
            },
            "require": {
@@ -1532,27 +1546,27 @@
                "compare",
                "equality"
            ],
-            "time": "2016-11-19T09:18:40+00:00"
+            "time": "2017-01-29T09:50:25+00:00"
        },
        {
            "name": "sebastian/diff",
-            "version": "1.4.1",
+            "version": "1.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3 || ^7.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "~4.8"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
            },
            "type": "library",
            "extra": {
@@ -1584,7 +1598,7 @@
            "keywords": [
                "diff"
            ],
-            "time": "2015-12-08T07:14:41+00:00"
+            "time": "2017-05-22T07:24:03+00:00"
        },
        {
            "name": "sebastian/environment",
@@ -1844,16 +1858,16 @@
        },
        {
            "name": "symfony/browser-kit",
-            "version": "v2.8.16",
+            "version": "v2.8.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "d2a5de15c8341a470a66becf4597bc675686a72b"
+                "reference": "e49a78bcf09ba2e6d03e63e80211f889c037add5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/d2a5de15c8341a470a66becf4597bc675686a72b",
-                "reference": "d2a5de15c8341a470a66becf4597bc675686a72b",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/e49a78bcf09ba2e6d03e63e80211f889c037add5",
+                "reference": "e49a78bcf09ba2e6d03e63e80211f889c037add5",
                "shasum": ""
            },
            "require": {
@@ -1861,8 +1875,8 @@
                "symfony/dom-crawler": "~2.1|~3.0.0"
            },
            "require-dev": {
-                "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
-                "symfony/process": "~2.3.34|~2.7,>=2.7.6|~3.0.0"
+                "symfony/css-selector": "^2.0.5|~3.0.0",
+                "symfony/process": "~2.3.34|^2.7.6|~3.0.0"
            },
            "suggest": {
                "symfony/process": ""
@@ -1897,20 +1911,20 @@
            ],
            "description": "Symfony BrowserKit Component",
            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
+            "time": "2018-01-03T07:36:31+00:00"
        },
        {
            "name": "symfony/class-loader",
-            "version": "v2.8.16",
+            "version": "v2.8.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/class-loader.git",
-                "reference": "7c46951128f7169cbece2c303fba4a9eb35cbe68"
+                "reference": "f87f46e5e1bf31382a65966795fa2d4dd7e2b300"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/class-loader/zipball/7c46951128f7169cbece2c303fba4a9eb35cbe68",
-                "reference": "7c46951128f7169cbece2c303fba4a9eb35cbe68",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/f87f46e5e1bf31382a65966795fa2d4dd7e2b300",
+                "reference": "f87f46e5e1bf31382a65966795fa2d4dd7e2b300",
                "shasum": ""
            },
            "require": {
@@ -1918,7 +1932,7 @@
                "symfony/polyfill-apcu": "~1.1"
            },
            "require-dev": {
-                "symfony/finder": "~2.0,>=2.0.5|~3.0.0"
+                "symfony/finder": "^2.0.5|~3.0.0"
            },
            "type": "library",
            "extra": {
@@ -1950,20 +1964,20 @@
            ],
            "description": "Symfony ClassLoader Component",
            "homepage": "https://symfony.com",
-            "time": "2017-01-10T14:03:07+00:00"
+            "time": "2018-01-03T07:36:31+00:00"
        },
        {
            "name": "symfony/config",
-            "version": "v2.8.16",
+            "version": "v2.8.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/config.git",
-                "reference": "4537f2413348fe271c2c4b09da219ed615d79f9c"
+                "reference": "705d1687222c08deabac8993ec2e04ad1a422c52"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/4537f2413348fe271c2c4b09da219ed615d79f9c",
-                "reference": "4537f2413348fe271c2c4b09da219ed615d79f9c",
+                "url": "https://api.github.com/repos/symfony/config/zipball/705d1687222c08deabac8993ec2e04ad1a422c52",
+                "reference": "705d1687222c08deabac8993ec2e04ad1a422c52",
                "shasum": ""
            },
            "require": {
@@ -2006,25 +2020,25 @@
            ],
            "description": "Symfony Config Component",
            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
+            "time": "2018-01-03T07:36:31+00:00"
        },
        {
            "name": "symfony/console",
-            "version": "v2.8.16",
+            "version": "v2.8.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "2e18b8903d9c498ba02e1dfa73f64d4894bb6912"
+                "reference": "a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/2e18b8903d9c498ba02e1dfa73f64d4894bb6912",
-                "reference": "2e18b8903d9c498ba02e1dfa73f64d4894bb6912",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe",
+                "reference": "a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.9",
-                "symfony/debug": "~2.7,>=2.7.2|~3.0.0",
+                "symfony/debug": "^2.7.2|~3.0.0",
                "symfony/polyfill-mbstring": "~1.0"
            },
            "require-dev": {
@@ -2067,20 +2081,20 @@
            ],
            "description": "Symfony Console Component",
            "homepage": "https://symfony.com",
-            "time": "2017-01-08T20:43:03+00:00"
+            "time": "2018-01-03T07:36:31+00:00"
        },
        {
            "name": "symfony/css-selector",
-            "version": "v2.8.16",
+            "version": "v2.8.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/css-selector.git",
-                "reference": "f45daea42232d9ca5cf561ec64f0d4aea820877f"
+                "reference": "c5b39674eacd34adedbef78227c57109caa9e318"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/f45daea42232d9ca5cf561ec64f0d4aea820877f",
-                "reference": "f45daea42232d9ca5cf561ec64f0d4aea820877f",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/c5b39674eacd34adedbef78227c57109caa9e318",
+                "reference": "c5b39674eacd34adedbef78227c57109caa9e318",
                "shasum": ""
            },
            "require": {
@@ -2120,20 +2134,20 @@
            ],
            "description": "Symfony CssSelector Component",
            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
+            "time": "2018-01-03T07:36:31+00:00"
        },
        {
            "name": "symfony/debug",
-            "version": "v2.8.16",
+            "version": "v2.8.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/debug.git",
-                "reference": "567681e2c4e5431704e884e4be25a95fd900770f"
+                "reference": "546db6f2bf8aefb43f37ce6f2f67fb700c51c1c2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/567681e2c4e5431704e884e4be25a95fd900770f",
-                "reference": "567681e2c4e5431704e884e4be25a95fd900770f",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/546db6f2bf8aefb43f37ce6f2f67fb700c51c1c2",
+                "reference": "546db6f2bf8aefb43f37ce6f2f67fb700c51c1c2",
                "shasum": ""
            },
            "require": {
@@ -2145,7 +2159,7 @@
            },
            "require-dev": {
                "symfony/class-loader": "~2.2|~3.0.0",
-                "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0"
+                "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2|~3.0.0"
            },
            "type": "library",
            "extra": {
@@ -2177,20 +2191,20 @@
            ],
            "description": "Symfony Debug Component",
            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
+            "time": "2018-01-03T17:12:09+00:00"
        },
        {
            "name": "symfony/dependency-injection",
-            "version": "v2.8.16",
+            "version": "v2.8.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "b75356611675364607d697f314850d9d870a84aa"
+                "reference": "954ff7c61879479b2f57f427798f9c82555438a6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/b75356611675364607d697f314850d9d870a84aa",
-                "reference": "b75356611675364607d697f314850d9d870a84aa",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/954ff7c61879479b2f57f427798f9c82555438a6",
+                "reference": "954ff7c61879479b2f57f427798f9c82555438a6",
                "shasum": ""
            },
            "require": {
@@ -2240,20 +2254,20 @@
            ],
            "description": "Symfony DependencyInjection Component",
            "homepage": "https://symfony.com",
-            "time": "2017-01-10T14:27:01+00:00"
+            "time": "2018-01-03T07:36:31+00:00"
        },
        {
            "name": "symfony/dom-crawler",
-            "version": "v2.8.16",
+            "version": "v2.8.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "52cc211afa9458c0a54c478010a55f44892c1c02"
+                "reference": "31ff8f1d7a3de4b43b35ff821e6e223d81a8988b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/52cc211afa9458c0a54c478010a55f44892c1c02",
-                "reference": "52cc211afa9458c0a54c478010a55f44892c1c02",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/31ff8f1d7a3de4b43b35ff821e6e223d81a8988b",
+                "reference": "31ff8f1d7a3de4b43b35ff821e6e223d81a8988b",
                "shasum": ""
            },
            "require": {
@@ -2296,20 +2310,20 @@
            ],
            "description": "Symfony DomCrawler Component",
            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
+            "time": "2018-01-03T07:36:31+00:00"
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v2.8.16",
+            "version": "v2.8.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "74877977f90fb9c3e46378d5764217c55f32df34"
+                "reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/74877977f90fb9c3e46378d5764217c55f32df34",
-                "reference": "74877977f90fb9c3e46378d5764217c55f32df34",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d64be24fc1eba62f9daace8a8918f797fc8e87cc",
+                "reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc",
                "shasum": ""
            },
            "require": {
@@ -2317,7 +2331,7 @@
            },
            "require-dev": {
                "psr/log": "~1.0",
-                "symfony/config": "~2.0,>=2.0.5|~3.0.0",
+                "symfony/config": "^2.0.5|~3.0.0",
                "symfony/dependency-injection": "~2.6|~3.0.0",
                "symfony/expression-language": "~2.6|~3.0.0",
                "symfony/stopwatch": "~2.3|~3.0.0"
@@ -2356,20 +2370,20 @@
            ],
            "description": "Symfony EventDispatcher Component",
            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
+            "time": "2018-01-03T07:36:31+00:00"
        },
        {
            "name": "symfony/filesystem",
-            "version": "v2.8.16",
+            "version": "v2.8.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "5b77d49ab76e5b12743b359ef4b4a712e6f5360d"
+                "reference": "1f4e8351e0196562f5e8ec584baeceeb8e2e92f6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/5b77d49ab76e5b12743b359ef4b4a712e6f5360d",
-                "reference": "5b77d49ab76e5b12743b359ef4b4a712e6f5360d",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/1f4e8351e0196562f5e8ec584baeceeb8e2e92f6",
+                "reference": "1f4e8351e0196562f5e8ec584baeceeb8e2e92f6",
                "shasum": ""
            },
            "require": {
@@ -2405,20 +2419,20 @@
            ],
            "description": "Symfony Filesystem Component",
            "homepage": "https://symfony.com",
-            "time": "2017-01-08T20:43:03+00:00"
+            "time": "2018-01-03T07:36:31+00:00"
        },
        {
            "name": "symfony/polyfill-apcu",
-            "version": "v1.3.0",
+            "version": "v1.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-apcu.git",
-                "reference": "5d4474f447403c3348e37b70acc2b95475b7befa"
+                "reference": "04f62674339602def515bff4bc6901fc1d4951e8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/5d4474f447403c3348e37b70acc2b95475b7befa",
-                "reference": "5d4474f447403c3348e37b70acc2b95475b7befa",
+                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/04f62674339602def515bff4bc6901fc1d4951e8",
+                "reference": "04f62674339602def515bff4bc6901fc1d4951e8",
                "shasum": ""
            },
            "require": {
@@ -2427,10 +2441,13 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.3-dev"
+                    "dev-master": "1.6-dev"
                }
            },
            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Apcu\\": ""
+                },
                "files": [
                    "bootstrap.php"
                ]
@@ -2458,20 +2475,20 @@
                "portable",
                "shim"
            ],
-            "time": "2016-11-14T01:06:16+00:00"
+            "time": "2017-10-11T12:05:26+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.3.0",
+            "version": "v1.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
+                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
-                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
+                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
                "shasum": ""
            },
            "require": {
@@ -2483,7 +2500,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.3-dev"
+                    "dev-master": "1.6-dev"
                }
            },
            "autoload": {
@@ -2517,20 +2534,20 @@
                "portable",
                "shim"
            ],
-            "time": "2016-11-14T01:06:16+00:00"
+            "time": "2017-10-11T12:05:26+00:00"
        },
        {
            "name": "symfony/process",
-            "version": "v2.8.16",
+            "version": "v2.8.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "ebb3c2abe0940a703f08e0cbe373f62d97d40231"
+                "reference": "ea3226daa3c6789efa39570bfc6e5d55f7561a0a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/ebb3c2abe0940a703f08e0cbe373f62d97d40231",
-                "reference": "ebb3c2abe0940a703f08e0cbe373f62d97d40231",
+                "url": "https://api.github.com/repos/symfony/process/zipball/ea3226daa3c6789efa39570bfc6e5d55f7561a0a",
+                "reference": "ea3226daa3c6789efa39570bfc6e5d55f7561a0a",
                "shasum": ""
            },
            "require": {
@@ -2566,20 +2583,20 @@
            ],
            "description": "Symfony Process Component",
            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
+            "time": "2018-01-03T07:36:31+00:00"
        },
        {
            "name": "symfony/translation",
-            "version": "v2.8.16",
+            "version": "v2.8.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "b4ac4a393f6970cc157fba17be537380de396a86"
+                "reference": "a1623f94ec61090fded29ade24e14ce4f4e5878b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/b4ac4a393f6970cc157fba17be537380de396a86",
-                "reference": "b4ac4a393f6970cc157fba17be537380de396a86",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/a1623f94ec61090fded29ade24e14ce4f4e5878b",
+                "reference": "a1623f94ec61090fded29ade24e14ce4f4e5878b",
                "shasum": ""
            },
            "require": {
@@ -2592,7 +2609,7 @@
            "require-dev": {
                "psr/log": "~1.0",
                "symfony/config": "~2.8",
-                "symfony/intl": "~2.4|~3.0.0",
+                "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
                "symfony/yaml": "~2.2|~3.0.0"
            },
            "suggest": {
@@ -2630,20 +2647,20 @@
            ],
            "description": "Symfony Translation Component",
            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
+            "time": "2018-01-03T07:36:31+00:00"
        },
        {
            "name": "symfony/yaml",
-            "version": "v2.8.16",
+            "version": "v2.8.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/yaml.git",
-                "reference": "dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2"
+                "reference": "be720fcfae4614df204190d57795351059946a77"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2",
-                "reference": "dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/be720fcfae4614df204190d57795351059946a77",
+                "reference": "be720fcfae4614df204190d57795351059946a77",
                "shasum": ""
            },
            "require": {
@@ -2679,7 +2696,7 @@
            ],
            "description": "Symfony Yaml Component",
            "homepage": "https://symfony.com",
-            "time": "2017-01-03T13:49:52+00:00"
+            "time": "2018-01-03T07:36:31+00:00"
        }
    ],
    "aliases": [],
@@ -32,6 +32,7 @@
 // comment out when debugging or better look into error log!
 define('NO_DEBUG_DISPLAY', true);

+// @codingStandardsIgnoreLine This script does not require login.
 require("../../config.php");
 require_once("lib.php");
 require_once($CFG->libdir.'/eventslib.php');
@@ -42,9 +43,16 @@ require_once($CFG->libdir . '/filelib.php');
 // the custom handler just logs exceptions and stops.
 set_exception_handler('enrol_paypal_ipn_exception_handler');

+// Make sure we are enabled in the first place.
+if (!enrol_is_enabled('paypal')) {
+    http_response_code(503);
+    throw new moodle_exception('errdisabled', 'enrol_paypal');
+}
+
 /// Keep out casual intruders
 if (empty($_POST) or !empty($_GET)) {
-    print_error("Sorry, you can not use the script that way.");
+    http_response_code(400);
+    throw new moodle_exception('invalidrequest', 'core_error');
 }

 /// Read all the data from PayPal and get it ready for later;
@@ -57,11 +65,27 @@ $req = 'cmd=_notify-validate';
 $data = new stdClass();

 foreach ($_POST as $key => $value) {
+    if ($key !== clean_param($key, PARAM_ALPHANUMEXT)) {
+        throw new moodle_exception('invalidrequest', 'core_error', '', null, $key);
+    }
+    if (is_array($value)) {
+        throw new moodle_exception('invalidrequest', 'core_error', '', null, 'Unexpected array param: '.$key);
+    }
    $req .= "&$key=".urlencode($value);
    $data->$key = fix_utf8($value);
 }

+if (empty($data->custom)) {
+    throw new moodle_exception('invalidrequest', 'core_error', '', null, 'Missing request param: custom');
+}
+
 $custom = explode('-', $data->custom);
+unset($data->custom);
+
+if (empty($custom) || count($custom) < 3) {
+    throw new moodle_exception('invalidrequest', 'core_error', '', null, 'Invalid value of the request param: custom');
+}
+
 $data->userid           = (int)$custom[0];
 $data->courseid         = (int)$custom[1];
 $data->instanceid       = (int)$custom[2];
@@ -69,29 +93,11 @@ $data->payment_gross    = $data->mc_gross;
 $data->payment_currency = $data->mc_currency;
 $data->timeupdated      = time();

+$user = $DB->get_record("user", array("id" => $data->userid), "*", MUST_EXIST);
+$course = $DB->get_record("course", array("id" => $data->courseid), "*", MUST_EXIST);
+$context = context_course::instance($course->id, MUST_EXIST);

-/// get the user and course records
-
-if (! $user = $DB->get_record("user", array("id"=>$data->userid))) {
-    message_paypal_error_to_admin("Not a valid user id", $data);
-    die;
-}
-
-if (! $course = $DB->get_record("course", array("id"=>$data->courseid))) {
-    message_paypal_error_to_admin("Not a valid course id", $data);
-    die;
-}
-
-if (! $context = context_course::instance($course->id, IGNORE_MISSING)) {
-    message_paypal_error_to_admin("Not a valid context id", $data);
-    die;
-}
-
-if (! $plugin_instance = $DB->get_record("enrol", array("id"=>$data->instanceid, "status"=>0))) {
-    message_paypal_error_to_admin("Not a valid instance id", $data);
-    die;
-}
-
+$plugin_instance = $DB->get_record("enrol", array("id" => $data->instanceid, "enrol" => "paypal", "status" => 0), "*", MUST_EXIST);
 $plugin = enrol_get_plugin('paypal');

 /// Open a connection back to PayPal to validate the data
@@ -106,10 +112,9 @@ $options = array(
 $location = "https://$paypaladdr/cgi-bin/webscr";
 $result = $c->post($location, $req, $options);

-if (!$result) {  /// Could not connect to PayPal - FAIL
-    echo "<p>Error: could not access paypal.com</p>";
-    message_paypal_error_to_admin("Could not access paypal.com to verify payment", $data);
-    die;
+if ($c->get_errno()) {
+    throw new moodle_exception('errpaypalconnect', 'enrol_paypal', '', array('url' => $paypaladdr, 'result' => $result),
+        json_encode($data));
 }

 /// Connection is OK, so now we post the data to validate it
@@ -304,7 +309,7 @@ if (strlen($result) > 0) {

    } else if (strcmp ($result, "INVALID") == 0) { // ERROR
        $DB->insert_record("enrol_paypal", $data, false);
-        message_paypal_error_to_admin("Received an invalid payment notification!! (Fake payment?)", $data);
+        throw new moodle_exception('erripninvalid', 'enrol_paypal', '', null, json_encode($data));
    }
 }

@@ -354,5 +359,9 @@ function enrol_paypal_ipn_exception_handler($ex) {
    }
    error_log($logerrmsg);

+    if (http_response_code() == 200) {
+        http_response_code(500);
+    }
+
    exit(0);
 }
@@ -39,6 +39,9 @@ $string['enrolperiod_desc'] = 'Default length of time that the enrolment is vali
 $string['enrolperiod_help'] = 'Length of time that the enrolment is valid, starting with the moment the user is enrolled. If disabled, the enrolment duration will be unlimited.';
 $string['enrolstartdate'] = 'Start date';
 $string['enrolstartdate_help'] = 'If enabled, users can be enrolled from this date onward only.';
+$string['errdisabled'] = 'PayPal plugin is disabled and does not handle payment notifications.';
+$string['erripninvalid'] = 'Instant payment notification has not been verified by PayPal.';
+$string['errpaypalconnect'] = 'Could not connect to {$a->url} to verify the instant payment notification: {$a->result}';
 $string['expiredaction'] = 'Enrolment expiration action';
 $string['expiredaction_help'] = 'Select action to carry out when user enrolment expires. Please note that some user data and settings are purged from course during course unenrolment.';
 $string['mailadmins'] = 'Notify admin';
@@ -0,0 +1,45 @@
+<?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'] = 's';
+$string['cliincorrectvalueerror'] = 'Error, valor incorrecta  "{$a->value}" pa "{$a->option}"';
+$string['cliincorrectvalueretry'] = 'Valor incorrecta, per favor, intente de nuevo';
+$string['clitypevalue'] = 'valor d\'o tipo';
+$string['clitypevaluedefault'] = 'valor d\'o tipo, prete Enter pa utilizar la valor per defecto ({$a})';
+$string['cliunknowoption'] = 'Opcions no reconoixidas:
+{$a}
+Per favor, utilice la opción Aduya.';
+$string['cliyesnoprompt'] = 'escriba s (pa sí) u n (pa no)';
+$string['environmentrequireinstall'] = 'ha d\'estar instalau/activau';
+$string['environmentrequireversion'] = 'versión {$a->needed} ye obligatoria y ye executando {$a->current}';
+$string['upgradekeyset'] = 'Clau d\'actualización (deixar en blanco pa no establir-la)';
@@ -0,0 +1,51 @@
+<?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> No se puede creyar la base de datos. </p><p> La base de datos especificada no existe y l\'usuario indicau no tiene permiso pa creyar la base de datos. </p><p> L\'administrador d\'o puesto ha de comprebar la configuración de base de datos. </p>';
+$string['cannotcreatelangdir'] = 'No se puede creyar lo directorio d\'idioma.';
+$string['cannotcreatetempdir'] = 'No se puede creyar lo directorio temp.';
+$string['cannotdownloadcomponents'] = 'No se puede descargar components';
+$string['cannotdownloadzipfile'] = 'No se puede descargar lo fichero ZIP';
+$string['cannotfindcomponent'] = 'No se puede trobar lo component.';
+$string['cannotsavemd5file'] = 'No se puede alzar lo fichero md5';
+$string['cannotsavezipfile'] = 'No se puede alzar lo fichero ZIP';
+$string['cannotunzipfile'] = 'No se puede descomprimir lo fichero';
+$string['componentisuptodate'] = 'Lo component ye actualizau';
+$string['dmlexceptiononinstall'] = '<p>S\'ha produciu una error de base de datos [{$a->errorcode}].<br />{$a->debuginfo}</p>';
+$string['downloadedfilecheckfailed'] = 'Ha fallau la comprebación d\'o fichero descargau';
+$string['invalidmd5'] = 'La variable de verificación MD5 ye incorrecta no ye valida - tracte nuevament';
+$string['missingrequiredfield'] = 'Falta bell campo necesario';
+$string['remotedownloaderror'] = '<p>Falló la descarga d\'o component a lo suyo servidor. Se recomienda verificar los achustes d\'o proxy, extensión PHP cURL.</p>
+<p>Ha de descargar lo <a href="{$a->url}">{$a->url}</a> fichero manualment, copiar-lo en "{$a->dest}" en o suyo servidor y descomprimir-lo allí.</p>';
+$string['wrongdestpath'] = 'Rota de destín erronia.';
+$string['wrongsourcebase'] = 'Base de fuent d\'URL erronia.';
+$string['wrongzipfilename'] = 'Nombre de fichero ZIP erronio.';
@@ -0,0 +1,95 @@
+<?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['admindirname'] = 'Directorio Admin';
+$string['availablelangs'] = 'Packs d\'idiomas disponibles';
+$string['chooselanguagehead'] = 'Triar idioma';
+$string['chooselanguagesub'] = 'Per favor, tríe un idioma pa lo proceso d\'instalación. Este idioma s\'usará tamién como idioma per defecto d\'o puesto, si bien puede cambiar-se mas abance.';
+$string['clialreadyconfigured'] = 'Lo fichero de configuración config.php ya existe. Per favor, faga servir admin/cli/install_database.php pa instalar Moodle en este puesto.';
+$string['clialreadyinstalled'] = 'Lo fichero de configuración config.php ya existe. Per favor, faga servir admin/cli/install_database.php pa actualizar Moodle en este puesto.';
+$string['cliinstallheader'] = 'Programa d\'instalación Moodle de linia de comando {$a}';
+$string['databasehost'] = 'Servidor d\'a base de datos';
+$string['databasename'] = 'Nombre d\'a base de datos';
+$string['databasetypehead'] = 'Tríe lo controlador d\'a base de datos';
+$string['dataroot'] = 'Directorio de Datos';
+$string['datarootpermission'] = 'Permiso directorios de datos';
+$string['dbprefix'] = 'Prefixo de tablas';
+$string['dirroot'] = 'Directorio de Moodle';
+$string['environmenthead'] = 'Comprebando lo suyo entorno';
+$string['environmentsub2'] = 'Cada versión de Moodle tiene bell requisito minimo d\'a versión de PHP y un numero obligatorio d\'extensions de PHP.
+Una comprebación de l\'entorno completo se realiza antes de cada instalación y actualización. Per favor, se meta en contacto con l\'administrador d\'o servidor si no sabes cómo instalar la nueva versión u habilitar las extensions PHP.';
+$string['errorsinenvironment'] = 'La comprebación de l\'entorno fallo!';
+$string['installation'] = 'Instalación';
+$string['langdownloaderror'] = 'L\'idioma "{$a}" no podió estar descargau. Lo proceso d\'instalación continará en Anglés.';
+$string['memorylimithelp'] = '<p>Lo limite de memoria PHP en o suyo servidor ye actualment {$a}.</p>
+
+<p>Esto puede ocasionar que Moodle tienga problemas de memoria mas abance, especialment si vusté tiene activaus muitos modulos y/u muitos usuarios.</p>
+
+<p>Recomendamos que configure PHP con o limite mas alto posible, y.g. 40M.
+I hai quantas formas de fer esto:</p>
+<ol>
+<li>Si puede fer-lo, recompile PHP con <i>--enable-memory-limit</i>.
+Esto fa que Moodle fixe per ell mesmo lo limite de memoria.</li>
+<li>Si tiene acceso a lo fichero php.ini, puede cambiar l\'achuste <b>memory_limit</b>
+a, digamos, 40M. Si no lo tiene, pida a lo suyo administrador que lo faiga per vusté.</li>
+<li>En qualques servidors PHP vusté puede creyar en o directorio Moodle un fichero .htaccess que contienga esta linia:
+<p><blockquote>php_value memory_limit 40M</blockquote></p>
+<p>Manimenos, en qualques servidors esto fa que <b>totas</b> las pachinas PHP deixen de funcionar (podrá veyer las errors quan mire las pachinas) de traza que habrá d\'eliminar lo fichero .htaccess.</p></li>
+</ol>';
+$string['paths'] = 'Rotas';
+$string['pathserrcreatedataroot'] = 'Lo directorio d\'os datos ({$a->dataroot}) no puede estar creyau per l\'instalador.';
+$string['pathshead'] = 'Confirme las rotas';
+$string['pathsrodataroot'] = 'Lo directorio dataroot no tiene permisos d\'escritura.';
+$string['pathsroparentdataroot'] = 'Lo directorio pai ({$a->parent}) no tiene permisos d\'escritura. Lo directorio d\'os datos ({$a->dataroot}) no puede estar creyau per l\'instalador.';
+$string['pathssubadmindir'] = 'Muit pocos servidors web usan /admin como un URL especial pa acceder a un panel de control u bella cosa semellant. Lamentablement, esto dentra en conflicto con a ubicación estandard pa las pachinas d\'administración de Moodle. Vusté puede solucionar este problema, renombrando lo directorio admin en a suya instalación Moodle, metendo un nuevo nombre aquí. Per eixemplo: <em> moodleadmin </em>. Esto solucionará los vinclos d\'administración en instalación Moodle.';
+$string['pathssubdataroot'] = 'Necesita bell espacio an que Moodle puede alzar los fichers puyaus. En este directorio ha de poder LEYER y ESCRIBIR l\'usuario d\'o servidor web (per lo cheneral \'nobody\',  \'apache\' u \'www-data\'), pero no ha de poder-se acceder a esta carpeta dreitament a traviés d\'a web. L\'instalador tractará de creyar-la si no existe.';
+$string['pathssubdirroot'] = '<p>Rota completa d\'o directorio que contiene lo codigo de  Moodle.</p>';
+$string['pathssubwwwroot'] = 'Adreza web completa pa acceder a Moodle. No ye posible acceder a Moodle utilizando multiples adrezas. Si lo suyo puesto tiene quantas adrezas publicas ha de configurar redireccions permanents en totas ellas, fueras d\'en2 esta. Si lo suyo puesto web ye accesible tanto dende una intranet como dende Internet, escriba aquí l\'adreza publica y configure la suya DNS pa que los usuarios d\'o suyo intranet puedan tamién utilizar l\'adreza publica.';
+$string['pathsunsecuredataroot'] = 'La ubicación de dataroot no ye segura';
+$string['pathswrongadmindir'] = 'Lo directorio admin no existe';
+$string['phpextension'] = 'Extensión PHP {$a}';
+$string['phpversion'] = 'Versión PHP';
+$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
+$string['welcomep20'] = 'Si ye veyendo esta pachina ye perque ha puesto executar lo paquet <strong>{$a->packname} {$a->packversion}</strong> en o suyo ordinador. Parabiens!';
+$string['welcomep30'] = 'Esta versión de <strong>{$a->installername}</strong> incluye las
+    aplicacions necesarias pa que <strong>Moodle</strong> funcione en o suyo ordinador,
+    principalment:';
+$string['welcomep40'] = 'Lo paquet tamién incluye <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
+$string['welcomep50'] = 'L\'uso de totas las aplicacions d\'o paquet ye gubernau per las suyas respectivas
+    licencias. Lo programa <strong>{$a->installername}</strong> ye
+    <a href="http://www.opensource.org/docs/definition_plain.html">codigo ubierto</a> y se distribuye
+    baixo licencia <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a>.';
+$string['welcomep60'] = 'Las siguients pachinas le guiarán a traviés de qualques sencillos pasos pa configurar
+    y achustar <strong>Moodle</strong> en o suyo ordinador. Puede utilizar las valors per defecto sucherius u,
+    de forma opcional, modificar-los pa que s\'achusten a las suyas necesidatz.';
+$string['welcomep70'] = 'Prete en o botón "Siguient" pa continar con a configuración de <strong>Moodle</strong>.';
+$string['wwwroot'] = 'Adreza Web';
@@ -0,0 +1,37 @@
+<?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'] = 'Idioma';
+$string['moodlelogo'] = 'Logo de Moodle';
+$string['next'] = 'Siguient';
+$string['previous'] = 'Anterior';
+$string['reload'] = 'Recargar';
@@ -31,7 +31,7 @@
 defined('MOODLE_INTERNAL') || die();

 $string['admindirname'] = 'Directorio Admin';
-$string['availablelangs'] = 'Packs de idiomas disponibles';
+$string['availablelangs'] = 'Paquetes de idiomas disponibles';
 $string['chooselanguagehead'] = 'Seleccionar idioma';
 $string['chooselanguagesub'] = 'Por favor, seleccione un idioma para el proceso de instalación. Este idioma se usará también como idioma por defecto del sitio, si bien puede cambiarse más adelante.';
 $string['clialreadyconfigured'] = 'El archivo de configuración config.php ya existe. Por favor, utilice admin/cli/install_database.php para instalar Moodle en este sitio.';
@@ -41,3 +41,4 @@ Mesedez, erabili --laguntza aukera.';
 $string['cliyesnoprompt'] = 'idatzi b (bai esateko) edo e (ez esateko)';
 $string['environmentrequireinstall'] = 'derrigorrezkoa da instalatuta eta gaituta izatea';
 $string['environmentrequireversion'] = '{$a->needed} bertsioa beharrezkoa da eta zu {$a->current} ari zara egikaritzen';
+$string['upgradekeyset'] = 'Eguneraketa-kodea (utzi hutsik kodea erabili nahi ez baduzu)';
@@ -31,6 +31,7 @@
 defined('MOODLE_INTERNAL') || die();

 $string['language'] = 'שפת ממשק';
+$string['moodlelogo'] = 'לוגו של Moodle';
 $string['next'] = 'הבא';
 $string['previous'] = 'קודם';
 $string['reload'] = 'טעינה מחדש';
@@ -35,4 +35,8 @@ $string['cliansweryes'] = 'वाई';
 $string['cliincorrectvalueerror'] = 'त्रुटि, "{$a->option}" के लिए गलत मान  जो की  "{$a->value}" है';
 $string['cliincorrectvalueretry'] = 'ग़लत मान, कृपया पुनः प्रयास करें';
 $string['clitypevalue'] = 'टाइप मूल्य';
+$string['clitypevaluedefault'] = 'वैल्यू टाइप करें, डिफ़ॉल्ट वैल्यू ({$ a}) का उपयोग करने के लिए Enter दबाएं';
+$string['cliunknowoption'] = 'अपरिचित विकल्प:
+   {$a}
+कृपया --help विकल्प का उपयोग करें।';
 $string['cliyesnoprompt'] = 'टाइप Y (का मतलब है हाँ) या N (का मतलब है नहीं )';
@@ -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'] = 'Igbo';
@@ -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'] = 'Pidgin';
@@ -37,9 +37,9 @@ $string['chooselanguagesub'] = 'Por favor, escolha o idioma para a instalação.
 $string['clialreadyconfigured'] = 'Arquivo config.php já existe. Por favor, use admin/cli/install_database.php para instalar o Moodle neste site.';
 $string['clialreadyinstalled'] = 'Arquivo config.php já existe. Por favor use admin/cli/install_database.php para atualizar o Moodle neste site.';
 $string['cliinstallheader'] = 'Programa de instalação por linha de comando do Moodle {$a}';
-$string['databasehost'] = 'Host da base de dados';
-$string['databasename'] = 'Nome da base de dados';
-$string['databasetypehead'] = 'Escolha o driver da base de dados';
+$string['databasehost'] = 'Host do banco de dados';
+$string['databasename'] = 'Nome do banco de dados';
+$string['databasetypehead'] = 'Escolha o driver do banco de dados';
 $string['dataroot'] = 'Diretório de dados';
 $string['datarootpermission'] = 'Permissões nos diretórios de dados';
 $string['dbprefix'] = 'Prefixo das tabelas';
@@ -31,6 +31,7 @@
 defined('MOODLE_INTERNAL') || die();

 $string['language'] = 'Забон';
+$string['moodlelogo'] = 'Логотипи Moodle';
 $string['next'] = 'Давомаш';
 $string['previous'] = 'Ба ақиб';
 $string['reload'] = 'Навсозӣ карда шавад';
@@ -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'] = 'Uyghur - latin';
@@ -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['clianswerno'] = 'ن';
+$string['cliansweryes'] = 'ي';
@@ -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'] = 'rtl';
+$string['thislanguage'] = 'ئۇيغۇرچە';
@@ -31,14 +31,14 @@ defined('MOODLE_INTERNAL') || die();
 */
 class core_iplookup_geoip_testcase extends advanced_testcase {

-    public function test_geoip() {
+    public function setUp() {
        global $CFG;
        require_once("$CFG->libdir/filelib.php");
        require_once("$CFG->dirroot/iplookup/lib.php");

        if (!PHPUNIT_LONGTEST) {
            // this may take a long time
-            return;
+            $this->markTestSkipped('PHPUNIT_LONGTEST is not defined');
        }

        $this->resetAfterTest();
@@ -70,17 +70,19 @@ class core_iplookup_geoip_testcase extends advanced_testcase {
        $this->assertTrue(file_exists($geoipfile));

        $CFG->geoipfile = $geoipfile;
+    }

-        $result = iplookup_find_location('147.230.16.1');
+    public function test_ipv4() {
+
+        $result = iplookup_find_location('192.30.255.112');

        $this->assertEquals('array', gettype($result));
-        $this->assertEquals('Liberec', $result['city']);
-        $this->assertEquals(15.0653, $result['longitude'], '', 0.001);
-        $this->assertEquals(50.7639, $result['latitude'], '', 0.001);
+        $this->assertEquals('San Francisco', $result['city']);
+        $this->assertEquals(-122.3933, $result['longitude'], 'Coordinates are out of accepted tolerance', 0.01);
+        $this->assertEquals(37.7697, $result['latitude'], 'Coordinates are out of accepted tolerance', 0.01);
        $this->assertNull($result['error']);
        $this->assertEquals('array', gettype($result['title']));
-        $this->assertEquals('Liberec', $result['title'][0]);
-        $this->assertEquals('Czech Republic', $result['title'][1]);
+        $this->assertEquals('San Francisco', $result['title'][0]);
+        $this->assertEquals('United States', $result['title'][1]);
    }
 }
-
@@ -31,30 +31,31 @@ defined('MOODLE_INTERNAL') || die();
 */
 class core_iplookup_geoplugin_testcase extends advanced_testcase {

-    public function test_geoip() {
+    public function setUp() {
        global $CFG;
        require_once("$CFG->libdir/filelib.php");
        require_once("$CFG->dirroot/iplookup/lib.php");

        if (!PHPUNIT_LONGTEST) {
            // we do not want to DDOS their server, right?
-            return;
+            $this->markTestSkipped('PHPUNIT_LONGTEST is not defined');
        }

        $this->resetAfterTest();

        $CFG->geoipfile = '';
+    }

-        $result = iplookup_find_location('147.230.16.1');
+    public function test_geoip_ipv4() {
+        $result = iplookup_find_location('192.30.255.112');

        $this->assertEquals('array', gettype($result));
-        $this->assertEquals('Liberec', $result['city']);
-        $this->assertEquals(15.0653, $result['longitude'], '', 0.001);
-        $this->assertEquals(50.7639, $result['latitude'], '', 0.001);
+        $this->assertEquals('San Francisco', $result['city']);
+        $this->assertEquals(-122.3933, $result['longitude'], 'Coordinates are out of accepted tolerance', 0.01);
+        $this->assertEquals(37.7697, $result['latitude'], 'Coordinates are out of accepted tolerance', 0.01);
        $this->assertNull($result['error']);
        $this->assertEquals('array', gettype($result['title']));
-        $this->assertEquals('Liberec', $result['title'][0]);
-        $this->assertEquals('Czech Republic', $result['title'][1]);
+        $this->assertEquals('San Francisco', $result['title'][0]);
+        $this->assertEquals('United States', $result['title'][1]);
    }
 }
-
@@ -288,8 +288,8 @@ $string['configproxypassword'] = 'Password needed to access internet through pro
 $string['configproxyport'] = 'If this server needs to use a proxy computer, then provide the proxy port here.';
 $string['configproxytype'] = 'Type of web proxy (PHP5 and cURL extension required for SOCKS5 support).';
 $string['configproxyuser'] = 'Username needed to access internet through proxy if required, empty if none (PHP cURL extension required).';
-$string['configrecaptchaprivatekey'] = 'String of characters (private key) used to communicate between your Moodle server and the recaptcha server. ReCAPTCHA keys can be obtained from <a target="_blank" href="https://www.google.com/recaptcha">Google reCAPTCHA</a>.';
-$string['configrecaptchapublickey'] = 'String of characters (public key) used to display the reCAPTCHA element in the signup form. ReCAPTCHA keys can be obtained from <a target="_blank" href="https://www.google.com/recaptcha">Google reCAPTCHA</a>.';
+$string['configrecaptchaprivatekey'] = 'String of characters (secret key) used to communicate between your Moodle server and the recaptcha server. ReCAPTCHA keys can be obtained from <a target="_blank" href="https://www.google.com/recaptcha">Google reCAPTCHA</a>.';
+$string['configrecaptchapublickey'] = 'String of characters (site key) used to display the reCAPTCHA element in the signup form. ReCAPTCHA keys can be obtained from <a target="_blank" href="https://www.google.com/recaptcha">Google reCAPTCHA</a>.';
 $string['configrequestcategoryselection'] = 'Allow the selection of a category when requesting a course.';
 $string['configrequestedstudentname'] = 'Word for student used in requested courses';
 $string['configrequestedstudentsname'] = 'Word for students used in requested courses';
@@ -95,6 +95,7 @@ $string['forgottenpasswordurl'] = 'Forgotten password URL';
 $string['getanaudiocaptcha'] = 'Get an audio CAPTCHA';
 $string['getanimagecaptcha'] = 'Get an image CAPTCHA';
 $string['getanothercaptcha'] = 'Get another CAPTCHA';
+$string['getrecaptchaapi'] = 'To use reCAPTCHA you must get an API key from <a href=\'https://www.google.com/recaptcha/admin\'>https://www.google.com/recaptcha/admin</a>';
 $string['guestloginbutton'] = 'Guest login button';
 $string['changepassword'] = 'Change password URL';
 $string['changepasswordhelp'] = 'URL of lost password recovery page, which will be sent to users in an email. Note that this setting will have no effect if a forgotten password URL is set in the authentication common settings.';
@@ -131,9 +132,9 @@ $string['pluginnotenabled'] = 'Authentication plugin \'{$a}\' is not enabled.';
 $string['pluginnotinstalled'] = 'Authentication plugin \'{$a}\' is not installed.';
 $string['potentialidps'] = 'Log in using your account on:';
 $string['recaptcha'] = 'reCAPTCHA';
-$string['recaptcha_help'] = 'The CAPTCHA is for preventing abuse from automated programs. Simply enter the words in the box, in order and separated by a space.
+$string['recaptcha_help'] = 'The CAPTCHA is for preventing abuse from automated programs. Follow the instructions to verify you are a person. This could be a box to check, characters presented in an image you must enter or a set of images to select from.

-If you are not sure what the words are, you can try getting another CAPTCHA or an audio CAPTCHA.';
+If you are not sure what the images are, you can try getting another CAPTCHA or an audio CAPTCHA.';
 $string['recaptcha_link'] = 'auth/email';
 $string['security_question'] = 'Security question';
 $string['selfregistration'] = 'Self registration';
@@ -1143,7 +1143,7 @@ $string['missinglastname'] = 'Missing surname';
 $string['missingname'] = 'Missing name';
 $string['missingnewpassword'] = 'Missing new password';
 $string['missingpassword'] = 'Missing password';
-$string['missingrecaptchachallengefield'] = 'Missing reCAPTCHA challenge field';
+$string['missingrecaptchachallengefield'] = 'Failed reCAPTCHA challenge, try again.';
 $string['missingreqreason'] = 'Missing reason';
 $string['missingshortname'] = 'Missing short name';
 $string['missingshortsitename'] = 'Missing short site name';
@@ -164,6 +164,7 @@ $string['manage'] = 'Manage repositories';
 $string['manageinstances'] = 'Manage instances';
 $string['manageurl'] = 'Manage';
 $string['manageuserrepository'] = 'Manage individual repository';
+$string['missingsourcekey'] = 'The source key is missing. This key must also be provided to retrieve the file.';
 $string['moving'] = 'Moving';
 $string['name'] = 'Name';
 $string['newfolder'] = 'New folder';
@@ -220,6 +221,7 @@ $string['setmainfile'] = 'Set main file';
 $string['setmainfile_help'] = 'If there are multiple files in the folder, the main file is the one that appears on the view page. Other files such as images or videos may be embedded in it. In filemanager the main file is indicated with a title in bold.';
 $string['siteinstances'] = 'Repositories instances of the site';
 $string['size'] = 'Size';
+$string['sourcekeymismatch'] = 'The source url does not match the sourcekey.';
 $string['submit'] = 'Submit';
 $string['sync'] = 'Sync';
 $string['syncfiletimeout'] = 'Sync file timeout';
@@ -1148,6 +1148,12 @@ function badges_download($userid) {
 * @return string Code of backpack accessibility status.
 */
 function badges_check_backpack_accessibility() {
+    if (defined('BEHAT_SITE_RUNNING') && BEHAT_SITE_RUNNING) {
+        // For behat sites, do not poll the remote badge site.
+        // Behat sites should not be available, but we should pretend as though they are.
+        return 'available';
+    }
+
    global $CFG;
    include_once $CFG->libdir . '/filelib.php';

@@ -42,9 +42,6 @@ class MoodleQuickForm_recaptcha extends HTML_QuickForm_input {
    /** @var string html for help button, if empty then no help */
    var $_helpbutton='';

-    /** @var bool if true, recaptcha will be servered from https */
-    var $_https=false;
-
    /**
     * constructor
     *
@@ -54,14 +51,8 @@ class MoodleQuickForm_recaptcha extends HTML_QuickForm_input {
     *              or an associative array
     */
    public function __construct($elementName = null, $elementLabel = null, $attributes = null) {
-        global $CFG;
        parent::__construct($elementName, $elementLabel, $attributes);
        $this->_type = 'recaptcha';
-        if (is_https()) {
-            $this->_https = true;
-        } else {
-            $this->_https = false;
-        }
    }

    /**
@@ -75,49 +66,15 @@ class MoodleQuickForm_recaptcha extends HTML_QuickForm_input {
    }

    /**
-     * Returns the recaptcha element in HTML
+     * Returns the reCAPTCHA element in HTML
     *
-     * @return string
+     * @return string The HTML to render
     */
-    function toHtml() {
-        global $CFG, $PAGE;
-        require_once $CFG->libdir . '/recaptchalib.php';
+    public function toHtml() {
+        global $CFG;
+        require_once($CFG->libdir . '/recaptchalib_v2.php');

-        $recaptureoptions = Array('theme'=>'custom', 'custom_theme_widget'=>'recaptcha_widget');
-        $html = html_writer::script(js_writer::set_variable('RecaptchaOptions', $recaptureoptions));
-
-        $attributes = $this->getAttributes();
-        if (empty($attributes['error_message'])) {
-            $attributes['error_message'] = null;
-            $this->setAttributes($attributes);
-        }
-        $error = $attributes['error_message'];
-        unset($attributes['error_message']);
-
-        $strincorrectpleasetryagain = get_string('incorrectpleasetryagain', 'auth');
-        $strenterthewordsabove = get_string('enterthewordsabove', 'auth');
-        $strenterthenumbersyouhear = get_string('enterthenumbersyouhear', 'auth');
-        $strgetanothercaptcha = get_string('getanothercaptcha', 'auth');
-        $strgetanaudiocaptcha = get_string('getanaudiocaptcha', 'auth');
-        $strgetanimagecaptcha = get_string('getanimagecaptcha', 'auth');
-
-        $html .= '
-<div id="recaptcha_widget" style="display:none">
-
-<div id="recaptcha_image"></div>
-<div class="recaptcha_only_if_incorrect_sol" style="color:red">' . $strincorrectpleasetryagain . '</div>
-
-<span class="recaptcha_only_if_image"><label for="recaptcha_response_field">' . $strenterthewordsabove . '</label></span>
-<span class="recaptcha_only_if_audio"><label for="recaptcha_response_field">' . $strenterthenumbersyouhear . '</label></span>
-
-<input type="text" id="recaptcha_response_field" name="recaptcha_response_field" />
-<input type="hidden" name="recaptcha_element" value="dummyvalue" /> <!-- Dummy value to fool formslib -->
-<div><a href="javascript:Recaptcha.reload()">' . $strgetanothercaptcha . '</a></div>
-<div class="recaptcha_only_if_image"><a href="javascript:Recaptcha.switch_type(\'audio\')">' . $strgetanaudiocaptcha . '</a></div>
-<div class="recaptcha_only_if_audio"><a href="javascript:Recaptcha.switch_type(\'image\')">' . $strgetanimagecaptcha . '</a></div>
-</div>';
-
-        return $html . recaptcha_get_html($CFG->recaptchapublickey, $error, $this->_https);
+        return recaptcha_get_challenge_html(RECAPTCHA_API_URL, $CFG->recaptchapublickey);
    }

    /**
@@ -130,25 +87,22 @@ class MoodleQuickForm_recaptcha extends HTML_QuickForm_input {
    }

    /**
-     * Checks input and challenged field
+     * Checks recaptcha response with Google.
     *
-     * @param string $challenge_field recaptcha shown  to user
-     * @param string $response_field input value by user
+     * @param string $responsestr
     * @return bool
     */
-    function verify($challenge_field, $response_field) {
+    public function verify($responsestr) {
        global $CFG;
-        require_once $CFG->libdir . '/recaptchalib.php';
-        $response = recaptcha_check_answer($CFG->recaptchaprivatekey,
-                                           getremoteaddr(),
-                                           $challenge_field,
-                                           $response_field,
-                                           $this->_https);
-        if (!$response->is_valid) {
+        require_once($CFG->libdir . '/recaptchalib_v2.php');
+
+        $response = recaptcha_check_response(RECAPTCHA_VERIFY_URL, $CFG->recaptchaprivatekey,
+                                           getremoteaddr(), $responsestr);
+        if (!$response['isvalid']) {
            $attributes = $this->getAttributes();
-            $attributes['error_message'] = $response->error;
+            $attributes['error_message'] = $response['error'];
            $this->setAttributes($attributes);
-            return $response->error;
+            return $response['error'];
        }
        return true;
    }
@@ -0,0 +1,189 @@
+<?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/>.
+ // 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/>.
+
+/**
+ * This is a PHP library that handles calling reCAPTCHA v2.
+ *
+ *    - Documentation
+ *          {@link https://developers.google.com/recaptcha/docs/display}
+ *    - Get a reCAPTCHA API Key
+ *          {@link https://www.google.com/recaptcha/admin}
+ *    - Discussion group
+ *          {@link http://groups.google.com/group/recaptcha}
+ *
+ * @package core
+ * @copyright 2018 Jeff Webster
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * The reCAPTCHA URL's
+ */
+define('RECAPTCHA_API_URL', 'https://www.google.com/recaptcha/api.js');
+define('RECAPTCHA_VERIFY_URL', 'https://www.google.com/recaptcha/api/siteverify');
+
+/**
+ * Returns the language code the reCAPTCHA element should use.
+ * Google reCAPTCHA uses different language codes than Moodle so we must convert.
+ * https://developers.google.com/recaptcha/docs/language
+ *
+ * @return string A language code
+ */
+function recaptcha_lang() {
+
+    $mlang = current_language();
+
+    $glang = $mlang;
+    switch ($glang) {
+        case 'en':
+            $glang = 'en-GB';
+            break;
+        case 'en_us':
+            $glang = 'en';
+            break;
+        case 'zh_cn':
+            $glang = 'zh-CN';
+            break;
+        case 'zh_tw':
+            $glang = 'zh-TW';
+            break;
+        case 'fr_ca':
+            $glang = 'fr-CA';
+            break;
+        case 'pt_br':
+            $glang = 'pt-BR';
+            break;
+        case 'he':
+            $glang = 'iw';
+            break;
+    }
+    // For any language code that didn't change reduce down to the base language.
+    if (($mlang === $glang) and (strpos($mlang, '_') !== false)) {
+        list($glang, $trash) = explode('_', $mlang, 2);
+    }
+    return $glang;
+}
+
+/**
+ * Gets the challenge HTML
+ * This is called from the browser, and the resulting reCAPTCHA HTML widget
+ * is embedded within the HTML form it was called from.
+ *
+ * @param string $apiurl URL for reCAPTCHA API
+ * @param string $pubkey The public key for reCAPTCHA
+ * @return string - The HTML to be embedded in the user's form.
+ */
+function recaptcha_get_challenge_html($apiurl, $pubkey) {
+    global $CFG, $PAGE;
+
+    // To use reCAPTCHA you must have an API key.
+    if ($pubkey === null || $pubkey === '') {
+        return get_string('getrecaptchaapi', 'auth');
+    }
+
+    $jscode = "
+        var recaptchacallback = function() {
+            grecaptcha.render('recaptcha_element', {
+              'sitekey' : '$pubkey'
+            });
+        }";
+
+    $lang = recaptcha_lang();
+    $apicode = "\n<script type=\"text/javascript\" ";
+    $apicode .= "src=\"$apiurl?onload=recaptchacallback&render=explicit&hl=$lang\" async defer>";
+    $apicode .= "</script>\n";
+
+    $return = html_writer::script($jscode, '');
+    $return .= html_writer::div('', 'recaptcha_element', array('id' => 'recaptcha_element'));
+    $return .= $apicode;
+
+    return $return;
+}
+
+/**
+ * Calls an HTTP POST function to verify if the user's response was correct
+ *
+ * @param string $verifyurl URL for reCAPTCHA verification
+ * @param string $privkey The private key for reCAPTCHA
+ * @param string $remoteip The user's IP
+ * @param string $response The response from reCAPTCHA
+ * @return ReCaptchaResponse
+ */
+function recaptcha_check_response($verifyurl, $privkey, $remoteip, $response) {
+    global $CFG;
+    require_once($CFG->libdir.'/filelib.php');
+
+    // Check response - isvalid boolean, error string.
+    $checkresponse = array('isvalid' => false, 'error' => 'check-not-started');
+
+    // To use reCAPTCHA you must have an API key.
+    if ($privkey === null || $privkey === '') {
+        $checkresponse['isvalid'] = false;
+        $checkresponse['error'] = 'no-apikey';
+        return $checkresponse;
+    }
+
+    // For security reasons, you must pass the remote ip to reCAPTCHA.
+    if ($remoteip === null || $remoteip === '') {
+        $checkresponse['isvalid'] = false;
+        $checkresponse['error'] = 'no-remoteip';
+        return $checkresponse;
+    }
+
+    // Discard spam submissions.
+    if ($response === null || strlen($response) === 0) {
+        $checkresponse['isvalid'] = false;
+        $checkresponse['error'] = 'incorrect-captcha-sol';
+        return $checkresponse;
+    }
+
+    $params = array('secret' => $privkey, 'remoteip' => $remoteip, 'response' => $response);
+    $curl = new curl();
+    $curlresponse = $curl->post($verifyurl, $params);
+
+    if ($curl->get_errno() === 0) {
+        $curldata = json_decode($curlresponse);
+
+        if (isset($curldata->success) && $curldata->success === true) {
+            $checkresponse['isvalid'] = true;
+            $checkresponse['error'] = '';
+        } else {
+            $checkresponse['isvalid'] = false;
+            $checkresponse['error'] = $curldata->{error-codes};
+        }
+    } else {
+        $checkresponse['isvalid'] = false;
+        $checkresponse['error'] = 'check-failed';
+    }
+    return $checkresponse;
+}
+
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -119,7 +118,15 @@ class login_signup_form extends moodleform {
        }
    }

-    function validation($data, $files) {
+    /**
+     * Validate user supplied data on the signup form.
+     *
+     * @param array $data array of ("fieldname"=>value) of submitted data
+     * @param array $files array of uploaded files "element_name"=>tmp_file_path
+     * @return array of "element_name"=>"error_description" if there are errors,
+     *         or an empty array if everything is OK (true allowed for backwards compatibility too).
+     */
+    public function validation($data, $files) {
        global $CFG, $DB;
        $errors = parent::validation($data, $files);

@@ -128,7 +135,7 @@ class login_signup_form extends moodleform {
        if ($DB->record_exists('user', array('username'=>$data['username'], 'mnethostid'=>$CFG->mnet_localhost_id))) {
            $errors['username'] = get_string('usernameexists');
        } else {
-            //check allowed characters
+            // Check allowed characters.
            if ($data['username'] !== core_text::strtolower($data['username'])) {
                $errors['username'] = get_string('usernamelowercase');
            } else {
@@ -139,8 +146,8 @@ class login_signup_form extends moodleform {
            }
        }

-        //check if user exists in external db
-        //TODO: maybe we should check all enabled plugins instead
+        // Check if user exists in external db.
+        // TODO: maybe we should check all enabled plugins instead.
        if ($authplugin->user_exists($data['username'])) {
            $errors['username'] = get_string('usernameexists');
        }
@@ -171,15 +178,14 @@ class login_signup_form extends moodleform {
        }

        if ($this->signup_captcha_enabled()) {
-            $recaptcha_element = $this->_form->getElement('recaptcha_element');
-            if (!empty($this->_form->_submitValues['recaptcha_challenge_field'])) {
-                $challenge_field = $this->_form->_submitValues['recaptcha_challenge_field'];
-                $response_field = $this->_form->_submitValues['recaptcha_response_field'];
-                if (true !== ($result = $recaptcha_element->verify($challenge_field, $response_field))) {
-                    $errors['recaptcha'] = $result;
+            $recaptchaelement = $this->_form->getElement('recaptcha_element');
+            if (!empty($this->_form->_submitValues['g-recaptcha-response'])) {
+                $response = $this->_form->_submitValues['g-recaptcha-response'];
+                if (!$recaptchaelement->verify($response)) {
+                    $errors['recaptcha_element'] = get_string('incorrectpleasetryagain', 'auth');
                }
            } else {
-                $errors['recaptcha'] = get_string('missingrecaptchachallengefield');
+                $errors['recaptcha_element'] = get_string('missingrecaptchachallengefield');
            }
        }
        // Validate customisable profile fields. (profile_validation expects an object as the parameter with userid set)
@@ -188,7 +194,6 @@ class login_signup_form extends moodleform {
        $errors += profile_validation($dataobject, $files);

        return $errors;
-
    }

    /**
@@ -25,13 +25,13 @@ class feedback_item_captcha extends feedback_item_base {

        $editurl = new moodle_url('/mod/feedback/edit.php', array('id'=>$cm->id));

-        //ther are no settings for recaptcha
+        // There are no settings for recaptcha.
        if (isset($item->id) AND $item->id > 0) {
            notice(get_string('there_are_no_settings_for_recaptcha', 'feedback'), $editurl->out());
            exit;
        }

-        //only one recaptcha can be in a feedback
+        // Only one recaptcha can be in a feedback.
        $params = array('feedback' => $feedback->id, 'typ' => $this->type);
        if ($DB->record_exists('feedback_item', $params)) {
            notice(get_string('only_one_captcha_allowed', 'feedback'), $editurl->out());
@@ -39,7 +39,7 @@ class feedback_item_captcha extends feedback_item_base {
        }

        $this->item = $item;
-        $this->item_form = true; //dummy
+        $this->item_form = true; // Dummy.

        $lastposition = $DB->count_records('feedback_item', array('feedback'=>$feedback->id));

@@ -139,16 +139,13 @@ class feedback_item_captcha extends feedback_item_base {
        $form->add_validation_rule(function($values, $files) use ($item, $form) {
            $elementname = $item->typ . '_' . $item->id . 'recaptcha';
            $recaptchaelement = $form->get_form_element($elementname);
-            if (empty($values['recaptcha_response_field'])) {
+            if (empty($values['g-recaptcha-response'])) {
                return array($elementname => get_string('required'));
-            } else if (!empty($values['recaptcha_challenge_field'])) {
-                $challengefield = $values['recaptcha_challenge_field'];
-                $responsefield = $values['recaptcha_response_field'];
-                if (true !== ($result = $recaptchaelement->verify($challengefield, $responsefield))) {
+            } else {
+                $response = $values['g-recaptcha-response'];
+                if (true !== ($result = $recaptchaelement->verify($response))) {
                    return array($elementname => $result);
                }
-            } else {
-                return array($elementname => get_string('missingrecaptchachallengefield'));
            }
            return true;
        });
@@ -163,7 +160,7 @@ class feedback_item_captcha extends feedback_item_base {
    public function get_hasvalue() {
        global $CFG;

-        //is recaptcha configured in moodle?
+        // Is recaptcha configured in moodle?
        if (empty($CFG->recaptchaprivatekey) OR empty($CFG->recaptchapublickey)) {
            return 0;
        }
@@ -859,7 +859,7 @@ class mod_quiz_external extends external_api {
    /**
     * Describes a single question structure.
     *
-     * @return external_single_structure the question structure
+     * @return external_single_structure the question data. Some fields may not be returned depending on the quiz display settings.
     * @since  Moodle 3.1
     */
    private static function question_structure() {
@@ -871,11 +871,16 @@ class mod_quiz_external extends external_api {
                'html' => new external_value(PARAM_RAW, 'the question rendered'),
                'flagged' => new external_value(PARAM_BOOL, 'whether the question is flagged or not'),
                'number' => new external_value(PARAM_INT, 'question ordering number in the quiz', VALUE_OPTIONAL),
-                'state' => new external_value(PARAM_ALPHA, 'the state where the question is in', VALUE_OPTIONAL),
+                'state' => new external_value(PARAM_ALPHA, 'the state where the question is in.
+                    It will not be returned if the user cannot see it due to the quiz display correctness settings.',
+                    VALUE_OPTIONAL),
                'status' => new external_value(PARAM_RAW, 'current formatted state of the question', VALUE_OPTIONAL),
-                'mark' => new external_value(PARAM_RAW, 'the mark awarded', VALUE_OPTIONAL),
-                'maxmark' => new external_value(PARAM_FLOAT, 'the maximum mark possible for this question attempt', VALUE_OPTIONAL),
-            )
+                'mark' => new external_value(PARAM_RAW, 'the mark awarded.
+                    It will be returned only if the user is allowed to see it.', VALUE_OPTIONAL),
+                'maxmark' => new external_value(PARAM_FLOAT, 'the maximum mark possible for this question attempt.
+                    It will be returned only if the user is allowed to see it.', VALUE_OPTIONAL),
+            ),
+            'The question data. Some fields may not be returned depending on the quiz display settings.'
        );
    }

@@ -907,7 +912,10 @@ class mod_quiz_external extends external_api {

            if ($attemptobj->is_real_question($slot)) {
                $question['number'] = $attemptobj->get_question_number($slot);
-                $question['state'] = (string) $attemptobj->get_question_state($slot);
+                $showcorrectness = $displayoptions->correctness && $attemptobj->get_question_attempt($slot)->has_marks();
+                if ($showcorrectness) {
+                    $question['state'] = (string) $attemptobj->get_question_state($slot);
+                }
                $question['status'] = $attemptobj->get_question_status($slot, $displayoptions->correctness);
            }
            if ($displayoptions->marks >= question_display_options::MAX_ONLY) {
@@ -850,6 +850,9 @@ class mod_quiz_external_testcase extends externallib_advanced_testcase {
        // Create a new quiz with one attempt started.
        list($quiz, $context, $quizobj, $attempt, $attemptobj) = $this->create_quiz_with_questions(true);

+        // Set correctness mask so questions state can be fetched only after finishing the attempt.
+        $DB->set_field('quiz', 'reviewcorrectness', mod_quiz_display_options::IMMEDIATELY_AFTER, array('id' => $quiz->id));
+
        $quizobj = $attemptobj->get_quizobj();
        $quizobj->preload_questions();
        $quizobj->load_questions();
@@ -868,7 +871,7 @@ class mod_quiz_external_testcase extends externallib_advanced_testcase {
        $this->assertEquals(1, $result['questions'][0]['slot']);
        $this->assertEquals(1, $result['questions'][0]['number']);
        $this->assertEquals('numerical', $result['questions'][0]['type']);
-        $this->assertEquals('todo', $result['questions'][0]['state']);
+        $this->assertArrayNotHasKey('state', $result['questions'][0]);  // We don't receive the state yet.
        $this->assertEquals(get_string('notyetanswered', 'question'), $result['questions'][0]['status']);
        $this->assertFalse($result['questions'][0]['flagged']);
        $this->assertEquals(0, $result['questions'][0]['page']);
@@ -886,7 +889,7 @@ class mod_quiz_external_testcase extends externallib_advanced_testcase {
        $this->assertEquals(2, $result['questions'][0]['slot']);
        $this->assertEquals(2, $result['questions'][0]['number']);
        $this->assertEquals('numerical', $result['questions'][0]['type']);
-        $this->assertEquals('todo', $result['questions'][0]['state']);
+        $this->assertArrayNotHasKey('state', $result['questions'][0]);  // We don't receive the state yet.
        $this->assertEquals(get_string('notyetanswered', 'question'), $result['questions'][0]['status']);
        $this->assertFalse($result['questions'][0]['flagged']);
        $this->assertEquals(1, $result['questions'][0]['page']);
@@ -894,6 +897,11 @@ class mod_quiz_external_testcase extends externallib_advanced_testcase {
        // Finish previous attempt.
        $attemptobj->process_finish(time(), false);

+        // Now we should receive the question state.
+        $result = mod_quiz_external::get_attempt_review($attempt->id, 1);
+        $result = external_api::clean_returnvalue(mod_quiz_external::get_attempt_review_returns(), $result);
+        $this->assertEquals('gaveup', $result['questions'][0]['state']);
+
        // Change setting and expect two pages.
        $quiz->questionsperpage = 4;
        $DB->update_record('quiz', $quiz);
@@ -23,6 +23,8 @@
 * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
 require_once(dirname(dirname(dirname(__FILE__))).'/config.php');
+require_once($CFG->dirroot . '/repository/lib.php');
+
 $json = required_param('tlelinks', PARAM_RAW);

 require_login();
@@ -60,6 +62,7 @@ if (isset($info->license)) {
 }

 $source = base64_encode(json_encode(array('url'=>$url,'filename'=>$filename)));
+$sourcekey = sha1($source . repository::get_secret_key() . sesskey());

 $js =<<<EOD
 <html>
@@ -70,6 +73,7 @@ $js =<<<EOD
        var resource = {};
        resource.title = "$filename";
        resource.source = "$source";
+        resource.sourcekey = "$sourcekey";
        resource.thumbnail = '$thumbnail';
        resource.author = "$author";
        resource.license = "$license";
@@ -1116,6 +1116,7 @@ M.core_filepicker.init = function(Y, options) {
            selectnode.one('.fp-setauthor input').set('value', args.author ? args.author : this.options.author);
            this.set_selected_license(selectnode.one('.fp-setlicense'), args.license);
            selectnode.one('form #filesource-'+client_id).set('value', args.source);
+            selectnode.one('form #filesourcekey-'+client_id).set('value', args.sourcekey);

            // display static information about a file (when known)
            var attrs = ['datemodified','datecreated','size','license','author','dimensions'];
@@ -1159,7 +1160,8 @@ M.core_filepicker.init = function(Y, options) {
                var repository_id = this.active_repo.id;
                var title = selectnode.one('.fp-saveas input').get('value');
                var filesource = selectnode.one('form #filesource-'+client_id).get('value');
-                var params = {'title':title, 'source':filesource, 'savepath': this.options.savepath};
+                var filesourcekey = selectnode.one('form #filesourcekey-'+client_id).get('value');
+                var params = {'title':title, 'source':filesource, 'savepath': this.options.savepath, sourcekey: filesourcekey};
                var license = selectnode.one('.fp-setlicense select');
                if (license) {
                    params['license'] = license.get('value');
@@ -1217,6 +1219,8 @@ M.core_filepicker.init = function(Y, options) {
            var elform = selectnode.one('form');
            elform.appendChild(Y.Node.create('<input/>').
                setAttrs({type:'hidden',id:'filesource-'+client_id}));
+            elform.appendChild(Y.Node.create('<input/>').
+                setAttrs({type:'hidden',id:'filesourcekey-'+client_id}));
            elform.on('keydown', function(e) {
                if (e.keyCode == 13) {
                    getfile.simulate('click');
@@ -2194,6 +2194,11 @@ abstract class repository implements cacheable_object {
                $file =& $list[$i];
                $converttoobject = false;
            }
+
+            if (isset($file['source'])) {
+                $file['sourcekey'] = sha1($file['source'] . self::get_secret_key() . sesskey());
+            }
+
            if (isset($file['size'])) {
                $file['size'] = (int)$file['size'];
                $file['size_f'] = display_size($file['size']);
@@ -2789,6 +2794,20 @@ abstract class repository implements cacheable_object {
        debugging('The method repository::uses_post_requests() is deprecated and must not be used anymore.', DEBUG_DEVELOPER);
        return false;
    }
+
+    /**
+     * Generate a secret key to be used for passing sensitive information around.
+     *
+     * @return string repository secret key.
+     */
+    final static public function get_secret_key() {
+        global $CFG;
+
+        if (!isset($CFG->reposecretkey)) {
+            set_config('reposecretkey', time() . random_string(32));
+        }
+        return $CFG->reposecretkey;
+    }
 }

 /**
@@ -40,6 +40,7 @@ $env       = optional_param('env', 'filepicker', PARAM_ALPHA);  // Opened in edi
 $license   = optional_param('license', $CFG->sitedefaultlicense, PARAM_TEXT);
 $author    = optional_param('author', '', PARAM_TEXT);          // File author
 $source    = optional_param('source', '', PARAM_RAW);           // File to download
+$sourcekey = optional_param('sourcekey', '', PARAM_RAW);        // Used to verify the source.
 $itemid    = optional_param('itemid', 0, PARAM_INT);            // Itemid
 $page      = optional_param('page', '', PARAM_RAW);             // Page
 $maxbytes  = optional_param('maxbytes', 0, PARAM_INT);          // Maxbytes
@@ -157,6 +158,16 @@ switch ($action) {
        // allow external links in url element all the time
        $allowexternallink = ($allowexternallink || ($env == 'url'));

+        // Validate the sourcekey.
+        if (empty($sourcekey)) {
+            throw new moodle_exception('missingsourcekey', 'repository');
+        }
+
+        // Check that the sourcekey matches.
+        if (sha1($source . repository::get_secret_key() . sesskey()) !== $sourcekey) {
+            throw new moodle_exception('sourcekeymismatch', 'repository');
+        }
+
        $reference = $repo->get_file_reference($source);

        // Use link of the files
@@ -6,57 +6,57 @@ Feature: View course participants

  Background:
    Given the following "users" exist:
-      | username  | firstname | lastname | email                 |
-      | teacher1  | Teacher   | 1        | teacher1@example.com  |
-      | student1  | Student   | 1        | student1@example.com  |
-      | student2  | Student   | 2        | student2@example.com  |
-      | student3  | Student   | 3        | student3@example.com  |
-      | student4  | Student   | 4        | student4@example.com  |
-      | student5  | Student   | 5        | student5@example.com  |
-      | student6  | Student   | 6        | student6@example.com  |
-      | student7  | Student   | 7        | student7@example.com  |
-      | student8  | Student   | 8        | student8@example.com  |
-      | student9  | Student   | 9        | student9@example.com  |
-      | student10 | Student   | 10       | student10@example.com |
-      | student11 | Student   | 11       | student11@example.com |
-      | student12 | Student   | 12       | student12@example.com |
-      | student13 | Student   | 13       | student13@example.com |
-      | student14 | Student   | 14       | student14@example.com |
-      | student15 | Student   | 15       | student15@example.com |
-      | student16 | Student   | 16       | student16@example.com |
-      | student17 | Student   | 17       | student17@example.com |
-      | student18 | Student   | 18       | student18@example.com |
-      | student19 | Student   | 19       | student19@example.com |
-      | student20 | Student   | 20       | student20@example.com |
+      | username   | firstname | lastname | email                 |
+      | teacher1x  | Teacher   | 1x       | teacher1x@example.com  |
+      | student1x  | Student   | 1x       | student1x@example.com  |
+      | student2x  | Student   | 2x       | student2x@example.com  |
+      | student3x  | Student   | 3x       | student3x@example.com  |
+      | student4x  | Student   | 4x       | student4x@example.com  |
+      | student5x  | Student   | 5x       | student5x@example.com  |
+      | student6x  | Student   | 6x       | student6x@example.com  |
+      | student7x  | Student   | 7x       | student7x@example.com  |
+      | student8x  | Student   | 8x       | student8x@example.com  |
+      | student9x  | Student   | 9x       | student9x@example.com  |
+      | student10x | Student   | 10x      | student10x@example.com |
+      | student11x | Student   | 11x      | student11x@example.com |
+      | student12x | Student   | 12x      | student12x@example.com |
+      | student13x | Student   | 13x      | student13x@example.com |
+      | student14x | Student   | 14x      | student14x@example.com |
+      | student15x | Student   | 15x      | student15x@example.com |
+      | student16x | Student   | 16x      | student16x@example.com |
+      | student17x | Student   | 17x      | student17x@example.com |
+      | student18x | Student   | 18x      | student18x@example.com |
+      | student19x | Student   | 19x      | student19x@example.com |
+      | student20x | Student   | 20x      | student20x@example.com |
    And the following "courses" exist:
      | fullname | shortname | format |
      | Course 1 | C1        | topics |
    And the following "course enrolments" exist:
      | user      | course | role           |
-      | teacher1  | C1     | editingteacher |
-      | student1  | C1     | student        |
-      | student2  | C1     | student        |
-      | student3  | C1     | student        |
-      | student4  | C1     | student        |
-      | student5  | C1     | student        |
-      | student6  | C1     | student        |
-      | student7  | C1     | student        |
-      | student8  | C1     | student        |
-      | student9  | C1     | student        |
-      | student10 | C1     | student        |
-      | student11 | C1     | student        |
-      | student12 | C1     | student        |
-      | student13 | C1     | student        |
-      | student14 | C1     | student        |
-      | student15 | C1     | student        |
-      | student16 | C1     | student        |
-      | student17 | C1     | student        |
-      | student18 | C1     | student        |
-      | student19 | C1     | student        |
+      | teacher1x  | C1     | editingteacher |
+      | student1x  | C1     | student        |
+      | student2x  | C1     | student        |
+      | student3x  | C1     | student        |
+      | student4x  | C1     | student        |
+      | student5x  | C1     | student        |
+      | student6x  | C1     | student        |
+      | student7x  | C1     | student        |
+      | student8x  | C1     | student        |
+      | student9x  | C1     | student        |
+      | student10x | C1     | student        |
+      | student11x | C1     | student        |
+      | student12x | C1     | student        |
+      | student13x | C1     | student        |
+      | student14x | C1     | student        |
+      | student15x | C1     | student        |
+      | student16x | C1     | student        |
+      | student17x | C1     | student        |
+      | student18x | C1     | student        |
+      | student19x | C1     | student        |

  @javascript
  Scenario: Use select and deselect all buttons
-    Given I log in as "teacher1"
+    Given I log in as "teacher1x"
    And I follow "Course 1"
    And I follow "Participants"
    When I press "Select all"
@@ -106,14 +106,14 @@ Feature: View course participants
  @javascript
  Scenario: Use select all users on this page, select all n users and deselect all
    Given the following "course enrolments" exist:
-      | user      | course | role    |
-      | student20 | C1     | student |
-    When I log in as "teacher1"
+      | user       | course | role    |
+      | student20x | C1     | student |
+    When I log in as "teacher1x"
    And I follow "Course 1"
    And I follow "Participants"
    And I follow "Surname"
    And I press "Select all users on this page"
-    Then I should not see "Student 9"
+    Then I should not see "Student 9x"
    And the field with xpath "//tbody//tr[1]//input[@class='usercheckbox']" matches value "1"
    And the field with xpath "//tbody//tr[2]//input[@class='usercheckbox']" matches value "1"
    And the field with xpath "//tbody//tr[3]//input[@class='usercheckbox']" matches value "1"
@@ -158,7 +158,7 @@ Feature: View course participants
    And the field with xpath "//tbody//tr[20]//input[@class='usercheckbox']" matches value "0"

    And I press "Select all 21 users"
-    And I should see "Student 9"
+    And I should see "Student 9x"
    And the field with xpath "//tbody//tr[1]//input[@class='usercheckbox']" matches value "1"
    And the field with xpath "//tbody//tr[2]//input[@class='usercheckbox']" matches value "1"
    And the field with xpath "//tbody//tr[3]//input[@class='usercheckbox']" matches value "1"
@@ -29,11 +29,11 @@

 defined('MOODLE_INTERNAL') || die();

-$version  = 2016052309.00;              // 20160523      = branching date YYYYMMDD - do not modify!
+$version  = 2016052311.00;              // 20160523      = branching date YYYYMMDD - do not modify!
                                        //         RR    = release increments - 00 in DEV branches.
                                        //           .XX = incremental changes.

-$release  = '3.1.9 (Build: 20171113)'; // Human-friendly version name
+$release  = '3.1.11 (Build: 20180319)'; // Human-friendly version name

 $branch   = '31';                       // This version's branch.
 $maturity = MATURITY_STABLE;             // This version's maturity level.
Author	SHA1	Message	Date
Eloy Lafuente (stronk7)	e25e165231	Moodle release 3.1.11	2018-03-17 01:18:16 +01:00
Eloy Lafuente (stronk7)	fdcf7fb3f6	Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_31_STABLE	2018-03-17 01:18:13 +01:00
David Mudrák	88bd118665	MDL-61392 enrol_paypal: Improve IPN input parameters checking	2018-03-14 09:19:02 +08:00
David Mudrák	b061fba2c4	MDL-61392 enrol_paypal: Improve the IPN notifications handling * Notify administrators once incoming IPN request is verified by PayPal. * Fix the HTTP status as expected by the IPN protocol.	2018-03-14 09:19:02 +08:00
Eloy Lafuente (stronk7)	7f5f07b68e	Merge branch 'MDL-48501-mdl31' of git://github.com/jswebster/moodle into MOODLE_31_STABLE	2018-03-12 23:51:49 +01:00
Jeff Webster	6843744660	MDL-48501 mod_feedback: update feedback to use reCAPTCHA v2	2018-03-07 17:49:47 -05:00
Jeff Webster	fe82348810	MDL-48501 login: update signup_form to use reCAPTCHA v2	2018-03-07 17:49:46 -05:00
Jeff Webster	cfefd25d6c	MDL-48501 form/recaptcha: update to use reCAPTCHA v2	2018-03-07 17:01:01 -05:00
Jeff Webster	956166b766	MDL-48501 recaptchalib_v2: add new lib to support reCAPTCHA v2	2018-03-07 17:01:01 -05:00
Jeff Webster	c692bb567f	MDL-48501 lang: update reCAPTCHA language strings	2018-03-07 15:52:02 -05:00
AMOS bot	70a7b23df5	Automatically generated installer lang files	2018-03-07 00:07:03 +00:00
AMOS bot	42c5d3aa9d	Automatically generated installer lang files	2018-02-19 00:06:59 +00:00
AMOS bot	f0a15feedb	Automatically generated installer lang files	2018-02-17 00:07:02 +00:00
David Monllao	2078761831	weekly release 3.1.10+	2018-02-08 17:40:21 +01:00
Andrew Nicols	6fb9c39256	Merge branch 'MDL-61269_31' of git://github.com/stronk7/moodle into MOODLE_31_STABLE	2018-02-05 17:55:08 +08:00
David Monllao	8103058154	weekly release 3.1.10+	2018-02-01 14:26:54 +01:00
David Monllao	f9000970ca	Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_31_STABLE	2018-02-01 14:26:53 +01:00
AMOS bot	2412171944	Automatically generated installer lang files	2018-02-01 00:07:20 +00:00
David Mudrák	ea12e51d4d	MDL-61242 repository_equella: Fix missing class repository The call to the class 'repository' introduced in the commit `d05c2ac7cc` didn't fully work and threw: "Exception - Class 'repository' not found". This fixes the missing library inclusion.	2018-01-31 23:42:58 +01:00
AMOS bot	40b1f7f86d	Automatically generated installer lang files	2018-01-31 00:07:08 +00:00
AMOS bot	e052fe614f	Automatically generated installer lang files	2018-01-30 00:07:08 +00:00
Eloy Lafuente (stronk7)	52c730014e	Merge branch 'wip-MDL-61242-31' of git://github.com/abgreeve/moodle into MOODLE_31_STABLE	2018-01-29 16:35:57 +08:00
Andrew Nicols	787727c745	weekly release 3.1.10+	2018-01-29 11:02:31 +08:00
Andrew Nicols	5e99464c96	Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_31_STABLE	2018-01-29 11:02:28 +08:00
Eloy Lafuente (stronk7)	46ecac536c	MDL-61269 behat-extension: bump to fix some caps & defaults	2018-01-25 00:55:14 +01:00
Adrian Greeve	b4e05280c1	MDL-61242 repository_equella: Add source key when sending the source. A thank you to Nelson Cheng for find this issue and suggesting a patch.	2018-01-20 11:03:58 +08:00
AMOS bot	572838664d	Automatically generated installer lang files	2018-01-19 00:07:34 +00:00
AMOS bot	2090c294bc	Automatically generated installer lang files	2018-01-17 00:06:58 +00:00
Jun Pataleta	a9c4c8da11	Merge branch 'MDL-61221-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE	2018-01-16 23:02:14 +08:00
Andrew Nicols	499c8d894d	MDL-61221 badges: Ignore site availabilty for behat Behat sites should not be available publically, and the check against the backpack API for site availablity can time out in some situations. We should be testing as though the site _is_ available, as this is the standard expectation.	2018-01-16 13:26:30 +08:00
Eloy Lafuente (stronk7)	16ab239fb4	Merge branch 'MDL-61204-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE	2018-01-16 02:17:39 +01:00
Andrew Nicols	4940aa5152	MDL-61204 user: Fix random failure in behat We need to get into the habit of not using usernames like 'student1' and 'student10' as our matches are non-strict, and the tests become dependent upon DB sort order. This change adds a character after the varying value to act as a delimter for all of these tests.	2018-01-16 08:33:09 +08:00
AMOS bot	3e130de203	Automatically generated installer lang files	2018-01-16 00:07:14 +00:00
Eloy Lafuente (stronk7)	f41a173317	Moodle release 3.1.10	2018-01-12 20:35:29 +01:00
Eloy Lafuente (stronk7)	dc7420d411	Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_31_STABLE	2018-01-12 20:35:27 +01:00
Adrian Greeve	96e40b6cfc	MDL-61131 repositories: Added a key to verify incoming urls.	2018-01-09 11:35:05 +01:00
Simey Lameze	a1eb47211d	MDL-60235 core_calendar: clean event name field	2018-01-08 22:05:36 +08:00
Juan Leyva	f5f0074aee	MDL-60908 mod_quiz: Return question state only when configured The question state should be returned following the quiz review options settings.	2018-01-08 22:05:36 +08:00
Andrew Nicols	ea8f903568	MDL-61169 iplookup: Change to github.com IP	2018-01-08 15:02:47 +01:00
AMOS bot	51a43f5fa7	Automatically generated installer lang files	2018-01-04 00:07:36 +00:00
AMOS bot	2edcf6861a	Automatically generated installer lang files	2018-01-03 00:06:55 +00:00
AMOS bot	bd5779cfb5	Automatically generated installer lang files	2017-12-18 00:06:49 +00:00
Eloy Lafuente (stronk7)	5a13113b07	weekly release 3.1.9+	2017-12-14 14:47:35 +01:00
Eloy Lafuente (stronk7)	6ac052dbc4	Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_31_STABLE	2017-12-14 14:47:34 +01:00
AMOS bot	c8c5e35bb1	Automatically generated installer lang files	2017-12-14 00:06:41 +00:00
Damyon Wiese	28964ed251	Merge branch 'MDL-61002-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE	2017-12-11 09:49:00 +08:00
Andrew Nicols	e362c66d49	MDL-61002 iplookup: Improve test stability	2017-12-11 08:12:43 +08:00
AMOS bot	977861a47b	Automatically generated installer lang files	2017-12-08 00:10:26 +00:00
Jun Pataleta	b8067e0b01	weekly release 3.1.9+	2017-12-08 09:09:56 +13:00
Andrew Nicols	cf877600b7	Merge branch 'MDL-59159_31' of git://github.com/stronk7/moodle into MOODLE_31_STABLE	2017-12-06 10:06:26 +08:00
Eloy Lafuente (stronk7)	d1660a6aae	MDL-59159 environment: 3.1 (LTS) required	2017-12-04 02:05:42 +01:00
Eloy Lafuente (stronk7)	e0b391da98	MDL-59159 environment: 3.5 base information This is a direct copy of the 3.4 branch to have changes under control easier in next commits.	2017-12-04 02:05:41 +01:00