Merge branch 'wip-MDL-38442-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
authorDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 07:40:38 +0000 (15:40 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 07:40:38 +0000 (15:40 +0800)
21 files changed:
backup/moodle2/restore_stepslib.php
enrol/externallib.php
lib/dml/mssql_native_moodle_database.php
lib/dml/sqlsrv_native_moodle_database.php
lib/modinfolib.php
lib/moodlelib.php
lib/phpunit/classes/util.php
lib/tests/fixtures/langtest/aa/langconfig.php [new file with mode: 0644]
lib/tests/fixtures/langtest/bb/langconfig.php [new file with mode: 0644]
lib/tests/fixtures/langtest/bc/langconfig.php [new file with mode: 0644]
lib/tests/fixtures/langtest/cda/langconfig.php [new file with mode: 0644]
lib/tests/fixtures/langtest/cdb/langconfig.php [new file with mode: 0644]
lib/tests/fixtures/langtest/cdc/langconfig.php [new file with mode: 0644]
lib/tests/fixtures/langtest/de/langconfig.php [new file with mode: 0644]
lib/tests/fixtures/langtest/de_du/langconfig.php [new file with mode: 0644]
lib/tests/fixtures/langtest/de_kids/langconfig.php [new file with mode: 0644]
lib/tests/fixtures/langtest/sd/langconfig.php [new file with mode: 0644]
lib/tests/string_test.php [new file with mode: 0644]
mod/quiz/startattempt.php
mod/wiki/pagelib.php
repository/lib.php

index 4f2a213..db1ab8a 100644 (file)
@@ -150,6 +150,11 @@ class restore_gradebook_structure_step extends restore_structure_step {
         if ($data->itemtype=='manual') {
             // manual grade items store category id in categoryid
             $data->categoryid = $this->get_mappingid('grade_category', $data->categoryid, NULL);
+            // if mapping failed put in course's grade category
+            if (NULL == $data->categoryid) {
+                $coursecat = grade_category::fetch_course_category($this->get_courseid());
+                $data->categoryid = $coursecat->id;
+            }
         } else if ($data->itemtype=='course') {
             // course grade item stores their category id in iteminstance
             $coursecat = grade_category::fetch_course_category($this->get_courseid());
index 7e8dd4c..6486134 100644 (file)
@@ -87,7 +87,7 @@ class core_enrol_external extends external_api {
             }
 
             list($enrolledsqlselect, $enrolledparams) = get_enrolled_sql($context);
-            $enrolledsql = "SELECT COUNT(*) FROM ($enrolledsqlselect) AS enrolleduserids";
+            $enrolledsql = "SELECT COUNT('x') FROM ($enrolledsqlselect) enrolleduserids";
             $enrolledusercount = $DB->count_records_sql($enrolledsql, $enrolledparams);
 
             $result[] = array('id'=>$course->id, 'shortname'=>$course->shortname, 'fullname'=>$course->fullname, 'idnumber'=>$course->idnumber,'visible'=>$course->visible, 'enrolledusercount'=>$enrolledusercount);
index 323a2fe..6c85715 100644 (file)
@@ -713,7 +713,11 @@ class mssql_native_moodle_database extends moodle_database {
         $this->query_end($result);
 
         if ($limitfrom) { // Skip $limitfrom records
-            mssql_data_seek($result, $limitfrom);
+            if (!@mssql_data_seek($result, $limitfrom)) {
+                // Nothing, most probably seek past the end.
+                mssql_free_result($result);
+                $result = null;
+            }
         }
 
         return $this->create_recordset($result);
@@ -1176,7 +1180,7 @@ class mssql_native_moodle_database extends moodle_database {
     public function sql_concat() {
         $arr = func_get_args();
         foreach ($arr as $key => $ele) {
-            $arr[$key] = ' CAST(' . $ele . ' AS VARCHAR(255)) ';
+            $arr[$key] = ' CAST(' . $ele . ' AS NVARCHAR(255)) ';
         }
         $s = implode(' + ', $arr);
         if ($s === '') {
index bfa96b9..6081d0b 100644 (file)
@@ -1241,7 +1241,7 @@ class sqlsrv_native_moodle_database extends moodle_database {
         $arr = func_get_args();
 
         foreach ($arr as $key => $ele) {
-            $arr[$key] = ' CAST('.$ele.' AS VARCHAR(255)) ';
+            $arr[$key] = ' CAST('.$ele.' AS NVARCHAR(255)) ';
         }
         $s = implode(' + ', $arr);
 
index 5b8d3ef..5dce79f 100644 (file)
@@ -1279,6 +1279,12 @@ function get_fast_modinfo(&$course, $userid=0) {
 function rebuild_course_cache($courseid=0, $clearonly=false) {
     global $COURSE, $DB, $CFG;
 
+    if (!$clearonly && !empty($CFG->upgraderunning)) {
+        debugging('Function rebuild_course_cache() should not be called from upgrade script unless with argument clearonly.',
+                DEBUG_DEVELOPER);
+        $clearonly = true;
+    }
+
     // Destroy navigation caches
     navigation_cache::destroy_volatile_caches();
 
index a1252e1..690fc1e 100644 (file)
@@ -6455,28 +6455,18 @@ class core_string_manager implements string_manager {
     }
 
     /**
-     * Returns dependencies of current language, en is not included.
+     * Returns list of all explicit parent languages for the given language.
      *
-     * @param string $lang
-     * @return array all parents, the lang itself is last
+     * English (en) is considered as the top implicit parent of all language packs
+     * and is not included in the returned list. The language itself is appended to the
+     * end of the list. The method is aware of circular dependency risk.
+     *
+     * @see self::populate_parent_languages()
+     * @param string $lang the code of the language
+     * @return array all explicit parent languages with the lang itself appended
      */
     public function get_language_dependencies($lang) {
-        if ($lang === 'en') {
-            return array();
-        }
-        if (!file_exists("$this->otherroot/$lang/langconfig.php")) {
-            return array();
-        }
-        $string = array();
-        include("$this->otherroot/$lang/langconfig.php");
-
-        if (empty($string['parentlanguage'])) {
-            return array($lang);
-        } else {
-            $parentlang = $string['parentlanguage'];
-            unset($string);
-            return array_merge($this->get_language_dependencies($parentlang), array($lang));
-        }
+        return $this->populate_parent_languages($lang);
     }
 
     /**
@@ -6981,6 +6971,46 @@ class core_string_manager implements string_manager {
         fulldelete($this->menucache);
         $this->get_list_of_translations(true);
     }
+
+    /// End of external API ////////////////////////////////////////////////////
+
+    /**
+     * Helper method that recursively loads all parents of the given language.
+     *
+     * @see self::get_language_dependencies()
+     * @param string $lang language code
+     * @param array $stack list of parent languages already populated in previous recursive calls
+     * @return array list of all parents of the given language with the $lang itself added as the last element
+     */
+    protected function populate_parent_languages($lang, array $stack = array()) {
+
+        // English does not have a parent language.
+        if ($lang === 'en') {
+            return $stack;
+        }
+
+        // Prevent circular dependency (and thence the infinitive recursion loop).
+        if (in_array($lang, $stack)) {
+            return $stack;
+        }
+
+        // Load language configuration and look for the explicit parent language.
+        if (!file_exists("$this->otherroot/$lang/langconfig.php")) {
+            return $stack;
+        }
+        $string = array();
+        include("$this->otherroot/$lang/langconfig.php");
+
+        if (empty($string['parentlanguage']) or $string['parentlanguage'] === 'en') {
+            unset($string);
+            return array_merge(array($lang), $stack);
+
+        } else {
+            $parentlang = $string['parentlanguage'];
+            unset($string);
+            return $this->populate_parent_languages($parentlang, array_merge(array($lang), $stack));
+        }
+    }
 }
 
 
index f5a20f7..da15607 100644 (file)
@@ -587,6 +587,14 @@ class phpunit_util {
             if ($COURSE->id != $oldsite->id) {
                 $warnings[] = 'Warning: unexpected change of $COURSE';
             }
+
+            if (ini_get('max_execution_time') != 0) {
+                // TODO un-comment this warning, once we have fixed the test
+                // failures that it causes.
+                // $warnings[] = 'Warning: max_execution_time was changed.';
+                // See MDL-38989 for details.
+                set_time_limit(0);
+            }
         }
 
         // restore original globals
diff --git a/lib/tests/fixtures/langtest/aa/langconfig.php b/lib/tests/fixtures/langtest/aa/langconfig.php
new file mode 100644 (file)
index 0000000..15ea4c8
--- /dev/null
@@ -0,0 +1,4 @@
+<?php
+
+$string['thislanguage'] = 'AA native name';
+$string['thislanguageint'] = 'AA international name';
diff --git a/lib/tests/fixtures/langtest/bb/langconfig.php b/lib/tests/fixtures/langtest/bb/langconfig.php
new file mode 100644 (file)
index 0000000..3e7802c
--- /dev/null
@@ -0,0 +1,4 @@
+<?php
+
+$string['thislanguage'] = 'Orphaned language with non-existing parent';
+$string['parentlanguage'] = 'bbparent';
diff --git a/lib/tests/fixtures/langtest/bc/langconfig.php b/lib/tests/fixtures/langtest/bc/langconfig.php
new file mode 100644 (file)
index 0000000..cec2bf9
--- /dev/null
@@ -0,0 +1,4 @@
+<?php
+
+$string['thislanguage'] = 'My parent is orphaned language';
+$string['parentlanguage'] = 'bb';
diff --git a/lib/tests/fixtures/langtest/cda/langconfig.php b/lib/tests/fixtures/langtest/cda/langconfig.php
new file mode 100644 (file)
index 0000000..e9af9ca
--- /dev/null
@@ -0,0 +1,4 @@
+<?php
+
+$string['thislanguage'] = 'Circular dependency A';
+$string['parentlanguage'] = 'cdc';
diff --git a/lib/tests/fixtures/langtest/cdb/langconfig.php b/lib/tests/fixtures/langtest/cdb/langconfig.php
new file mode 100644 (file)
index 0000000..e3f4c62
--- /dev/null
@@ -0,0 +1,4 @@
+<?php
+
+$string['thislanguage'] = 'Circular dependency B';
+$string['parentlanguage'] = 'cda';
diff --git a/lib/tests/fixtures/langtest/cdc/langconfig.php b/lib/tests/fixtures/langtest/cdc/langconfig.php
new file mode 100644 (file)
index 0000000..42be227
--- /dev/null
@@ -0,0 +1,4 @@
+<?php
+
+$string['thislanguage'] = 'Circular dependency C';
+$string['parentlanguage'] = 'cdb';
diff --git a/lib/tests/fixtures/langtest/de/langconfig.php b/lib/tests/fixtures/langtest/de/langconfig.php
new file mode 100644 (file)
index 0000000..843d7c1
--- /dev/null
@@ -0,0 +1,4 @@
+<?php
+
+$string['thislanguage'] = 'Deutsch';
+$string['parentlanguage'] = 'en';
diff --git a/lib/tests/fixtures/langtest/de_du/langconfig.php b/lib/tests/fixtures/langtest/de_du/langconfig.php
new file mode 100644 (file)
index 0000000..173d669
--- /dev/null
@@ -0,0 +1,4 @@
+<?php
+
+$string['thislanguage'] = 'Deutsch - Du';
+$string['parentlanguage'] = 'de';
diff --git a/lib/tests/fixtures/langtest/de_kids/langconfig.php b/lib/tests/fixtures/langtest/de_kids/langconfig.php
new file mode 100644 (file)
index 0000000..c5305ef
--- /dev/null
@@ -0,0 +1,4 @@
+<?php
+
+$string['thislanguage'] = 'Deutsch - Kids';
+$string['parentlanguage'] = 'de_du';
diff --git a/lib/tests/fixtures/langtest/sd/langconfig.php b/lib/tests/fixtures/langtest/sd/langconfig.php
new file mode 100644 (file)
index 0000000..6551f7f
--- /dev/null
@@ -0,0 +1,4 @@
+<?php
+
+$string['thislanguage'] = 'Self dependency';
+$string['parentlanguage'] = 'sd';
diff --git a/lib/tests/string_test.php b/lib/tests/string_test.php
new file mode 100644 (file)
index 0000000..c238881
--- /dev/null
@@ -0,0 +1,113 @@
+<?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/>.
+
+/**
+ * Unit tests for localization support in lib/moodlelib.php
+ *
+ * @package     core
+ * @category    test
+ * @copyright   2013 David Mudrak <david@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->libdir.'/moodlelib.php');
+
+/**
+ * Tests for the API of the string_manager
+ *
+ * @copyright 2013 David Mudrak <david@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class string_manager_test extends advanced_testcase {
+
+    public function test_string_manager_instance() {
+        global $CFG;
+        $this->resetAfterTest();
+
+        $otherroot = dirname(__FILE__).'/fixtures/langtest';
+        $stringman = testable_core_string_manager::instance($otherroot);
+        $this->assertTrue(in_array('string_manager', class_implements($stringman)));
+    }
+
+    public function test_get_language_dependencies() {
+        global $CFG;
+        $this->resetAfterTest();
+
+        $otherroot = dirname(__FILE__).'/fixtures/langtest';
+        $stringman = testable_core_string_manager::instance($otherroot);
+
+        // There is no parent language for 'en'.
+        $this->assertSame(array(), $stringman->get_language_dependencies('en'));
+        // Language with no parent language declared.
+        $this->assertSame(array('aa'), $stringman->get_language_dependencies('aa'));
+        // Language with parent language explicitly set to English (en < de).
+        $this->assertSame(array('de'), $stringman->get_language_dependencies('de'));
+        // Language dependency hierarchy (de < de_du < de_kids).
+        $this->assertSame(array('de', 'de_du', 'de_kids'), $stringman->get_language_dependencies('de_kids'));
+        // Language with the parent language misconfigured to itself (sd < sd).
+        $this->assertSame(array('sd'), $stringman->get_language_dependencies('sd'));
+        // Language with circular dependency (cda < cdb < cdc < cda).
+        $this->assertSame(array('cda', 'cdb', 'cdc'), $stringman->get_language_dependencies('cdc'));
+        // Orphaned language (N/A < bb).
+        $this->assertSame(array('bb'), $stringman->get_language_dependencies('bb'));
+        // Descendant of an orphaned language (N/A < bb < bc).
+        $this->assertSame(array('bb', 'bc'), $stringman->get_language_dependencies('bc'));
+    }
+}
+
+
+/**
+ * Helper class providing testable string_manager
+ *
+ * @copyright 2013 David Mudrak <david@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class testable_core_string_manager extends core_string_manager {
+
+    /**
+     * Factory method
+     *
+     * @param string $otherroot full path to the location of installed upstream language packs
+     * @param string $localroot full path to the location of locally customized language packs, defaults to $otherroot
+     * @param string $cacheroot full path to the location of on-disk cache
+     * @param bool $usecache use application permanent cache
+     * @param array $translist explicit list of visible translations
+     * @param string $menucache the location of a file that caches the list of available translations
+     * @return testable_core_string_manager
+     */
+    public static function instance($otherroot, $localroot = null, $cacheroot = null, $usecache = false,
+                                    array $translist = array(), $menucache = null) {
+        global $CFG;
+
+        if (is_null($localroot)) {
+            $localroot = $otherroot;
+        }
+
+        if (is_null($cacheroot)) {
+            $cacheroot = $CFG->cachedir.'/lang';
+        }
+
+        if (is_null($menucache)) {
+            $menucache = $CFG->cachedir.'/languages';
+        }
+
+        return new testable_core_string_manager($otherroot, $localroot, $cacheroot, $usecache, $translist, $menucache);
+    }
+}
index 374db3f..f1f08ca 100644 (file)
@@ -105,7 +105,7 @@ if ($lastattempt && ($lastattempt->state == quiz_attempt::IN_PROGRESS ||
 
 } else {
     // Get number for the next or unfinished attempt.
-    if ($lastattempt && !$lastattempt->preview && !$quizobj->is_preview_user()) {
+    if ($lastattempt) {
         $attemptnumber = $lastattempt->attempt + 1;
     } else {
         $lastattempt = false;
index 6779d80..0cb5302 100644 (file)
@@ -2065,7 +2065,7 @@ class page_wiki_save extends page_wiki_edit {
 
             //deleting old locks
             wiki_delete_locks($this->page->id, $USER->id, $this->section);
-            $url = new moodle_url('view.php', array('pageid' => $this->page->id, 'group' => $this->subwiki->groupid));
+            $url = new moodle_url('/mod/wiki/view.php', array('pageid' => $this->page->id, 'group' => $this->subwiki->groupid));
             redirect($url);
         } else {
             print_error('savingerror', 'wiki');
index 9d59b2d..d59a7c0 100644 (file)
@@ -652,7 +652,14 @@ abstract class repository {
 
         // Prevent access to private repositories when logged in as.
         if (session_is_loggedinas()) {
-            $can = false;
+            $allowed = array('coursefiles', 'equella', 'filesystem', 'flickr_public', 'local', 'merlot', 'recent',
+                's3', 'upload', 'url', 'user', 'webdav', 'wikimedia', 'youtube');
+            // Are only accessible the repositories which do not contain private data (any data
+            // that is not part of Moodle, "Private files" is not considered "Pivate"). And if they
+            // do not contain private data, then it should not be a user instance, which is private by definition.
+            if (!in_array($this->type, $allowed) || $repocontext->contextlevel == CONTEXT_USER) {
+                $can = false;
+            }
         }
 
         // We are going to ensure that the current context was legit, and reliable to check