Version 15.05.19

html/moodle2/CHANGES.txt

@@ -3,6 +3,20 @@ Release notes for Odissea (http://odissea.xtec.cat)
 More information on each of the fixes can be found in the project
 development home at http://projectes.lafarga.cat/projects/odissea/
 
+Changes 15.05.19
+---------------------------------------------------------------------------------------
+- Moodle upgraded to from 2.6.10 to 2.6.11
+- Added new activity choicegroup that allow group enrolling over a choice activity
+- Allow tracking of activities in frontpage to users without role
+- Update Mailer library to reduce log and improve stability
+- Remove warnings in admin page
+- Move sessioncookie to settings
+- Update Marsupial to be enabled by default
+- Added proxy settings
+- Updated modules:
+  - Marsupial rcontent now has reports
+  - Hotpot, Moodle mobile, DD question types..
+
 Changes 15.03.20
 ---------------------------------------------------------------------------------------
 - Moodle upgraded to from 2.6.7 to 2.6.10

html/moodle2/auth/email/auth.php

@@ -139,12 +139,12 @@ function user_confirm($username, $confirmsecret) {
         $user = get_complete_user_data('username', $username);
 
         if (!empty($user)) {
-            if ($user->confirmed) {
-                return AUTH_CONFIRM_ALREADY;
-
-            } else if ($user->auth != $this->authtype) {
+            if ($user->auth != $this->authtype) {
                 return AUTH_CONFIRM_ERROR;
 
+            } else if ($user->secret == $confirmsecret && $user->confirmed) {
+                return AUTH_CONFIRM_ALREADY;
+
             } else if ($user->secret == $confirmsecret) {   // They have provided the secret key to get in
                 $DB->set_field("user", "confirmed", 1, array("id"=>$user->id));
                 if ($user->firstaccess == 0) {

html/moodle2/auth/ldap/auth.php

@@ -627,12 +627,12 @@ function user_confirm($username, $confirmsecret) {
         $user = get_complete_user_data('username', $username);
 
         if (!empty($user)) {
-            if ($user->confirmed) {
-                return AUTH_CONFIRM_ALREADY;
-
-            } else if ($user->auth != $this->authtype) {
+            if ($user->auth != $this->authtype) {
                 return AUTH_CONFIRM_ERROR;
 
+            } else if ($user->secret == $confirmsecret && $user->confirmed) {
+                return AUTH_CONFIRM_ALREADY;
+
             } else if ($user->secret == $confirmsecret) {   // They have provided the secret key to get in
                 if (!$this->user_activate($username)) {
                     return AUTH_CONFIRM_FAIL;
@@ -1672,7 +1672,8 @@ function loginpage_hook() {
                                       $_SERVER['HTTP_REFERER'] != $CFG->wwwroot &&
                                       $_SERVER['HTTP_REFERER'] != $CFG->wwwroot.'/' &&
                                       $_SERVER['HTTP_REFERER'] != $CFG->httpswwwroot.'/login/' &&
-                                      $_SERVER['HTTP_REFERER'] != $CFG->httpswwwroot.'/login/index.php')
+                                      $_SERVER['HTTP_REFERER'] != $CFG->httpswwwroot.'/login/index.php' &&
+                                      clean_param($_SERVER['HTTP_REFERER'], PARAM_LOCALURL) != '')
                     ? $_SERVER['HTTP_REFERER'] : NULL;
             }
 

html/moodle2/blocks/my_books/block_my_books.php

@@ -78,7 +78,7 @@ private function get_item($usercredential, $mybooksconfig) {
         }
 
         // Old book formats
-        $bookformat = textlib::strtolower($book->format);
+        $bookformat = core_text::strtolower($book->format);
         if (!in_array($bookformat, rcommon_book::$allowedformats)) {
             return false;
         }

html/moodle2/blocks/my_books/db/install.php

@@ -0,0 +1,22 @@
+<?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/>.
+
+function xmldb_block_my_books_install() {
+    global $DB, $CFG;
+    if (isset($CFG->isagora) && $CFG->isagora) {
+        $DB->set_field('block', 'visible', 0, array('name' => 'my_books'));
+    }
+}

html/moodle2/blocks/my_books/db/upgrade.php

@@ -77,4 +77,5 @@ function xmldb_block_my_books_upgrade($oldversion=0) {
         upgrade_block_savepoint(true, 2014111100, 'my_books');
     }
 
+    return true;
 }

html/moodle2/blocks/my_books/version.php

@@ -18,7 +18,7 @@
  * Version details
  *
  * @package    block
- * @subpackage marsupial
+ * @subpackage mybooks
  * @copyright  2012 xtec.cat
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -30,3 +30,8 @@
 $plugin->component = 'block_my_books';  // Full name of the plugin (used for diagnostics)
 $plugin->release   = 'v2.0.5';          // Human-readable version name
 $plugin->maturity  = MATURITY_STABLE;   // How stable the plugin is
+
+$plugin->dependencies = array(
+    'local_rcommon' => ANY_VERSION,
+    'mod_rcontent' => ANY_VERSION
+);

html/moodle2/course/tests/externallib_test.php

@@ -225,7 +225,8 @@ public function test_get_categories() {
             $generatedcat = $generatedcats[$category['id']];
             $this->assertEquals($category['idnumber'], $generatedcat->idnumber);
             $this->assertEquals($category['name'], $generatedcat->name);
-            $this->assertEquals($category['description'], $generatedcat->description);
+            // Description was converted to the HTML format.
+            $this->assertEquals($category['description'], format_text($generatedcat->description, FORMAT_MOODLE, array('para' => false)));
             $this->assertEquals($category['descriptionformat'], FORMAT_HTML);
         }
 
@@ -530,7 +531,8 @@ public function test_get_courses () {
             $dbcourse = $generatedcourses[$course['id']];
             $this->assertEquals($course['idnumber'], $dbcourse->idnumber);
             $this->assertEquals($course['fullname'], $dbcourse->fullname);
-            $this->assertEquals($course['summary'], $dbcourse->summary);
+            // Summary was converted to the HTML format.
+            $this->assertEquals($course['summary'], format_text($dbcourse->summary, FORMAT_MOODLE, array('para' => false)));
             $this->assertEquals($course['summaryformat'], FORMAT_HTML);
             $this->assertEquals($course['shortname'], $dbcourse->shortname);
             $this->assertEquals($course['categoryid'], $dbcourse->category);

html/moodle2/course/togglecompletion.php

@@ -73,8 +73,9 @@
         }
 
         // Return to previous page
-        if (!empty($_SERVER['HTTP_REFERER'])) {
-            redirect($_SERVER['HTTP_REFERER']);
+        $referer = clean_param($_SERVER['HTTP_REFERER'], PARAM_LOCALURL);
+        if (!empty($referer)) {
+            redirect($referer);
         } else {
             redirect('view.php?id='.$course->id);
         }

html/moodle2/files/externallib.php

@@ -321,6 +321,7 @@ public static function upload($contextid, $component, $filearea, $itemid, $filep
         $context = self::get_context_from_params($fileinfo);
         self::validate_context($context);
         if (($fileinfo['component'] == 'user' and $fileinfo['filearea'] == 'private')) {
+            require_capability('moodle/user:manageownfiles', $context);
             debugging('Uploading directly to user private files area is deprecated. Upload to a draft area and then move the files with core_user::add_user_private_files');
         }
 

html/moodle2/filter/wiris/filter.php

@@ -50,38 +50,39 @@ public function filter($text, array $options = array()) {
 		$n0 = stripos($text, '«math');
 		$n1 = stripos($text, '<math');
 		$n2 = stripos($text, '«applet');
-		
+
 		if ($n0 === false && $n1 === false && $n2 === false) {
 			// Nothing to do
 			return $text;
 		}
 
 		require_once "wirispluginwrapper.php";
-		
+
 		$wirisplugin = new WIRISpluginWrapper();
 		if (!$wirisplugin->is_installed()) {
 			return $text;
 		}
 
 		$wirisplugin->begin();
 		$textservice = $wirisplugin->get_instance()->newTextService();
-		
+
 		$query = '';
 
 		global $COURSE;
-        
+
         if(isset($COURSE->id)){
-            $query .= 'course=' . $COURSE->id;
+            $query .= '?course=' . $COURSE->id;
         }
         if(isset($COURSE->category)) {
-            $query .= empty($query) ? '' : '/';
+            $query .= empty($query) ? '?' : '/';
             $query .= 'category=' . $COURSE->category;
         }
 
         $prop['refererquery'] = $query;
-
+
+        $prop['savemode'] = 'safeXml'; // safeXml filtering.
 		$text = $textservice->filter($text, $prop);
-		$prop['savemode'] = 'xml';
+		$prop['savemode'] = 'xml'; // xml filtering.
 		$text = $textservice->filter($text, $prop);
 		$wirisplugin->end();
 		return $text;

html/moodle2/filter/wiris/version.php

@@ -19,50 +19,53 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2014120400;
-$plugin->release = '3.53.1.1145';
+$plugin->version = 2015041000;
+$plugin->release = '3.53.3.1155';
 $plugin->requires =  2011120511;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->component = 'filter_wiris';
 $plugin->dependencies = array();
-global $CFG, $PAGE;
+global $CFG, $PAGE, $DB;
 
 // If uninstall method is enabled, dependencies are disabled.
 // cyclical dependencies prevents uninstall.
-if (!get_config('filter_wiris', 'uninstall')) {
-	if ($CFG->version>=2012120300) { // Moodle 2.4 and upwards.
-		$editors = array_flip(explode(',', $CFG->texteditors));
-		// If atto and tinymce editors installed choose first for dependencies check. Atto plugin not supported for 2.6
-		if (array_key_exists('atto', $editors) && array_key_exists('tinymce', $editors)  && $CFG->version>=2014051200) {
-			$plugin->dependencies = ($editors['atto'] < $editors['tinymce']) ?
-									array('atto_wiris' => 2014120400):
-									array('tinymce_tiny_mce_wiris' => 2014120400);
-		} else { // Default dependencies atto for Moodle 2.7 and upwards.
-			$plugin->dependencies = ($CFG->version>=2014051200) ?
-									array('atto_wiris' => 2014120400):
-									array('tinymce_tiny_mce_wiris'=>2014120400);
+$dbman = $DB->get_manager();
+if ($dbman->table_exists('config_plugins')) {
+	if (!get_config('filter_wiris', 'uninstall')) {
+			if ($CFG->version>=2012120300) { // Moodle 2.4 and upwards.
+				$editors = array_flip(explode(',', $CFG->texteditors));
+				// If atto and tinymce editors installed choose first for dependencies check. Atto plugin not supported for 2.6
+				if (array_key_exists('atto', $editors) && array_key_exists('tinymce', $editors)  && $CFG->version>=2014051200) {
+					$plugin->dependencies = ($editors['atto'] < $editors['tinymce']) ?
+											array('atto_wiris' => 2015040900):
+											array('tinymce_tiny_mce_wiris' => 2015040900);
+				} else { // Default dependencies atto for Moodle 2.7 and upwards.
+					$plugin->dependencies = ($CFG->version>=2014051200) ?
+											array('atto_wiris' => 2015040900):
+											array('tinymce_tiny_mce_wiris'=>2015040900);
+				}
+			}
 		}
-	}
-}
 
-// Minimal quizzes version compatible with 3.5 plugin is 2014081900.
 
-if ($CFG->version>=2013111800) {
-	$pluginmanager = core_plugin_manager::instance();
-	if ($plugininfo = $pluginmanager->get_plugin_info('qtype_wq')) {
-		if ($plugininfo->versiondisk < 2014081900 ) {
-			$PAGE->requires->js('/filter/wiris/js/installmessage.js',false);
+	// Minimal quizzes version compatible with 3.5 plugin is 2014081900.
+
+	if ($CFG->version>=2013111800) {
+		$pluginmanager = core_plugin_manager::instance();
+		if ($plugininfo = $pluginmanager->get_plugin_info('qtype_wq')) {
+			if ($plugininfo->versiondisk < 2014081900 ) {
+				$PAGE->requires->js('/filter/wiris/js/installmessage.js',false);
+			}
+			$plugin->dependencies = array_merge($plugin->dependencies, array('qtype_wq' => 2014081900));
 		}
-		$plugin->dependencies = array_merge($plugin->dependencies, array('qtype_wq' => 2014081900));
-	}
-} else if ($CFG->version>=2012120300) { // core_plugin_manager not implemented since 2.6
-	require_once($CFG->libdir . '/pluginlib.php');
-	$pluginmanager = plugin_manager::instance();
-	if ($plugininfo = $pluginmanager->get_plugin_info('qtype_wq')) {
-		if ($plugininfo->versiondisk < 2014081900 ) {
-			$PAGE->requires->js('/filter/wiris/js/installmessage.js',false);
+	} else if ($CFG->version>=2012120300) { // core_plugin_manager not implemented since 2.6
+		require_once($CFG->libdir . '/pluginlib.php');
+		$pluginmanager = plugin_manager::instance();
+		if ($plugininfo = $pluginmanager->get_plugin_info('qtype_wq')) {
+			if ($plugininfo->versiondisk < 2014081900 ) {
+				$PAGE->requires->js('/filter/wiris/js/installmessage.js',false);
+			}
+			$plugin->dependencies = array_merge($plugin->dependencies, array('qtype_wq' => 2014081900));
 		}
-		$plugin->dependencies = array_merge($plugin->dependencies, array('qtype_wq' => 2014081900));
 	}
 }
-

html/moodle2/install/lang/ba/langconfig.php

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

html/moodle2/install/lang/ja/error.php

@@ -42,7 +42,7 @@
 $string['cannotsavezipfile'] = 'ZIPファイルを保存できません。';
 $string['cannotunzipfile'] = 'ZIPファイルを解凍できません。';
 $string['componentisuptodate'] = 'コンポーネントは最新です。';
-$string['dmlexceptiononinstall'] = '<p>データベースエラーが発生しました: [{$a->errorcode}].<br />{$a->debuginfo}</p>';
+$string['dmlexceptiononinstall'] = '<p>データベースエラーが発生しました: [{$a->errorcode}]<br />{$a->debuginfo}</p>';
 $string['downloadedfilecheckfailed'] = 'ダウンロードファイルのチェックに失敗しました。';
 $string['invalidmd5'] = 'チェック変数が正しくありません - 再度お試しください。';
 $string['missingrequiredfield'] = 'いくつかの必須入力フィールドが入力されていません。';

html/moodle2/install/lang/mn/admin.php

@@ -30,5 +30,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+$string['clianswerno'] = 'n';
+$string['cliansweryes'] = 'y';
+$string['cliincorrectvalueretry'] = 'Буруу утга, дахин оролдоно уу';
+$string['clitypevalue'] = 'төрлийн утга';
 $string['environmentrequireinstall'] = 'суусан/идэвхжсэн байх ёстой';
 $string['environmentrequireversion'] = 'та {$a->current} хувилбар ашиглаж байна {$a->needed} хувилбарыг ашиглагх ёстой';

html/moodle2/install/lang/mn/moodle.php

@@ -33,3 +33,4 @@
 $string['language'] = 'Хэл';
 $string['next'] = 'Дараагийн';
 $string['previous'] = 'Өмнөх';
+$string['reload'] = 'Дахин ачаалах';

html/moodle2/install/lang/oc_lnc/admin.php

@@ -39,6 +39,6 @@
 $string['cliunknowoption'] = 'Options non reconnues :
  {$a}.
 Utilisez l\'option --help.';
-$string['cliyesnoprompt'] = 'Tapez y (pour oui) o n (pour non)';
+$string['cliyesnoprompt'] = 'Picatz y (per òc) o n (per non)';
 $string['environmentrequireinstall'] = 'doit être installé e activé';
 $string['environmentrequireversion'] = 'la version {$a->needed} es requise ; vous utilisez actualament la version {$a->current}';