Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: ppichet/moodle
...
head fork: ppichet/moodle
Checking mergeability… Don't worry, you can still create the pull request.
  • 18 commits
  • 11 files changed
  • 0 commit comments
  • 9 contributors
Commits on Mar 30, 2012
@rajeshtaneja rajeshtaneja MDL-30051 cron: login error sql is now cross db
8f343c6
@rwijaya rwijaya MDL-30843 and MDL-30842 - accessibility compliance: Add <label> for f…
…orm input text and select tag
0add004
Commits on Apr 03, 2012
@rajeshtaneja rajeshtaneja MDL-32270 Library: ->defaulthomepage is checked before used
d5830dd
Commits on Apr 07, 2012
@grabs grabs MDL-32124 - mails to non respondents are sent as plain text with html…
…-tags
53dcf63
@ppichet MDL-32217_21 Setting options->unitgradingtype
Signed-off-by: ppichet <pichet.pierre@uqam.ca>
ff4d877
Commits on Apr 09, 2012
AMOS bot Automatically generated installer lang files
4f7d9de
Hugh Davenport MDL-32308 Fix error when testing id of guest user
4d6bcda
@samhemelryk samhemelryk Merge branch 'wip-mdl-32270-m21' of git://github.com/rajeshtaneja/moo…
…dle into MOODLE_21_STABLE
56e270e
@samhemelryk samhemelryk Merge branch 'MDL-30843_b_m21' of git://github.com/rwijaya/moodle int…
…o MOODLE_21_STABLE
ea71709
Commits on Apr 10, 2012
@danpoltawski danpoltawski Merge branch 'wip-mdl-30051-m21' of git://github.com/rajeshtaneja/moo…
…dle into MOODLE_21_STABLE
4c9d373
@phalacee phalacee MDL-27427 - Blog - Adding ability to delete entries from external blogs
5cd936c
@samhemelryk samhemelryk Merge branch 'MDL-32124_21_wip' of git://github.com/grabs/moodle into…
… MOODLE_21_STABLE
365e69b
@samhemelryk samhemelryk MDL-32124 mod_feedback: Cleanup post-integration of unused var
e17f0d3
Commits on Apr 11, 2012
@danpoltawski danpoltawski Merge branch 'MDL-32217_21' of git://github.com/ppichet/moodle into M…
…OODLE_21_STABLE
d08845f
@samhemelryk samhemelryk Revert "MDL-30843 and MDL-30842 - accessibility compliance: Add <labe…
…l> for form input text and select tag"

This reverts commit 0add004.
fad5279
Commits on Apr 12, 2012
AMOS bot Automatically generated installer lang files
bf5ff54
@danpoltawski danpoltawski Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle i…
…nto MOODLE_21_STABLE
6d73da4
@danpoltawski danpoltawski weekly release 2.1.5+
8e35d0a
View
13 blog/locallib.php
@@ -292,9 +292,16 @@ public function print_html($return=false) {
$contentcell->text .= $OUTPUT->container_start('commands');
- if (blog_user_can_edit_entry($this) && empty($this->uniquehash)) {
- $contentcell->text .= html_writer::link(new moodle_url('/blog/edit.php', array('action' => 'edit', 'entryid' => $this->id)), $stredit) . ' | ';
- $contentcell->text .= html_writer::link(new moodle_url('/blog/edit.php', array('action' => 'delete', 'entryid' => $this->id)), $strdelete) . ' | ';
+ if (blog_user_can_edit_entry($this)) {
+ if (empty($this->uniquehash)) {
+ //External blog entries should not be edited
+ $contentcell->text .= html_writer::link(new moodle_url('/blog/edit.php',
+ array('action' => 'edit', 'entryid' => $this->id)),
+ $stredit) . ' | ';
+ }
+ $contentcell->text .= html_writer::link(new moodle_url('/blog/edit.php',
+ array('action' => 'delete', 'entryid' => $this->id)),
+ $strdelete) . ' | ';
}
$contentcell->text .= html_writer::link(new moodle_url('/blog/index.php', array('entryid' => $this->id)), get_string('permalink', 'blog'));
View
6 index.php
@@ -35,7 +35,7 @@
redirect_if_major_upgrade_required();
$urlparams = array();
- if ($CFG->defaulthomepage == HOMEPAGE_MY && optional_param('redirect', 1, PARAM_BOOL) === 0) {
+ if (!empty($CFG->defaulthomepage) && ($CFG->defaulthomepage == HOMEPAGE_MY) && optional_param('redirect', 1, PARAM_BOOL) === 0) {
$urlparams['redirect'] = 0;
}
$PAGE->set_url('/', $urlparams);
@@ -62,9 +62,9 @@
// Redirect logged-in users to My Moodle overview if required
if (optional_param('setdefaulthome', false, PARAM_BOOL)) {
set_user_preference('user_home_page_preference', HOMEPAGE_SITE);
- } else if ($CFG->defaulthomepage == HOMEPAGE_MY && optional_param('redirect', 1, PARAM_BOOL) === 1) {
+ } else if (!empty($CFG->defaulthomepage) && ($CFG->defaulthomepage == HOMEPAGE_MY) && optional_param('redirect', 1, PARAM_BOOL) === 1) {
redirect($CFG->wwwroot .'/my/');
- } else if (!empty($CFG->defaulthomepage) && $CFG->defaulthomepage == HOMEPAGE_USER) {
+ } else if (!empty($CFG->defaulthomepage) && ($CFG->defaulthomepage == HOMEPAGE_USER)) {
$PAGE->settingsnav->get('usercurrentsettings')->add(get_string('makethismyhome'), new moodle_url('/', array('setdefaulthome'=>true)), navigation_node::TYPE_SETTING);
}
}
View
12 install/lang/de/error.php
@@ -30,13 +30,13 @@
defined('MOODLE_INTERNAL') || die();
-$string['cannotcreatelangdir'] = 'Verzeichnis "lang" kann nicht angelegt werden';
-$string['cannotcreatetempdir'] = 'Das Verzeichnis "temp" kann nicht angelegt werden.';
-$string['cannotdownloadcomponents'] = 'Einige Komponenten können nicht heruntergeladen werden.';
+$string['cannotcreatelangdir'] = 'Verzeichnis \'lang\' wurde nicht angelegt';
+$string['cannotcreatetempdir'] = 'Das Verzeichnis \'temp\' wurde nicht angelegt';
+$string['cannotdownloadcomponents'] = 'Einige Komponenten können nicht geladen werden.';
$string['cannotdownloadzipfile'] = 'ZIP-Datei kann nicht heruntergeladen werden.';
-$string['cannotfindcomponent'] = 'Eine Komponente kann nicht gefunden werden';
-$string['cannotsavemd5file'] = 'Die md5-Datei kann nicht gespeichert werden';
-$string['cannotsavezipfile'] = 'Die ZIP-Datei kann nicht gespeichert werden';
+$string['cannotfindcomponent'] = 'Komponente wurde nicht gefunden';
+$string['cannotsavemd5file'] = 'Die md5-Datei wurde nicht gespeichert';
+$string['cannotsavezipfile'] = 'Die ZIP-Datei wurde nicht gespeichert';
$string['cannotunzipfile'] = 'Die Datei kann nicht entpackt werden';
$string['componentisuptodate'] = 'Die Komponente ist aktuell.';
$string['downloadedfilecheckfailed'] = 'Die Überprüfung der heruntergeladenen Datei ist gescheitert';
View
35 install/lang/de_comm/langconfig.php
@@ -0,0 +1,35 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle 2.1 installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package installer
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'de';
+$string['thisdirection'] = 'ltr';
+$string['thislanguage'] = 'Deutsch community';
View
2  install/lang/ru/error.php
@@ -44,5 +44,5 @@
$string['missingrequiredfield'] = 'Отсутствуют некоторые обязательные поля';
$string['remotedownloaderror'] = 'Не удалось загрузить компонент на сервер, проверьте настройки прокси-сервера, настоятельно рекомендуется установка расширения cURL языка PHP.<br /> <br />Вам следует вручную загрузить файл по ссылке <a href="{$a->url}">{$a->url}</a>, скопировать его в папку "{$a->dest}" на своём сервере и там его распаковать.';
$string['wrongdestpath'] = 'Ошибочный путь назначения';
-$string['wrongsourcebase'] = 'Ошибочный источник базового URL';
+$string['wrongsourcebase'] = 'Неправильный адрес источника';
$string['wrongzipfilename'] = 'Неверное имя ZIP-файла';
View
4 lib/enrollib.php
@@ -257,8 +257,8 @@ function enrol_sharing_course($user1, $user2) {
function enrol_get_shared_courses($user1, $user2, $preloadcontexts = false, $checkexistsonly = false) {
global $DB, $CFG;
- $user1 = !empty($user1->id) ? $user1->id : $user1;
- $user2 = !empty($user2->id) ? $user2->id : $user2;
+ $user1 = isset($user1->id) ? $user1->id : $user1;
+ $user2 = isset($user2->id) ? $user2->id : $user2;
if (empty($user1) or empty($user2)) {
return false;
View
7 lib/moodlelib.php
@@ -8173,7 +8173,8 @@ function notify_login_failures() {
/// Now, select all the login error logged records belonging to the ips and infos
/// since lastnotifyfailure, that we have stored in the cache_flags table
- $sql = "SELECT l.*, u.firstname, u.lastname
+ $sql = "SELECT * FROM (
+ SELECT l.*, u.firstname, u.lastname
FROM {log} l
JOIN {cache_flags} cf ON l.ip = cf.name
LEFT JOIN {user} u ON l.userid = u.id
@@ -8187,8 +8188,8 @@ function notify_login_failures() {
LEFT JOIN {user} u ON l.userid = u.id
WHERE l.module = 'login' AND l.action = 'error'
AND l.time > ?
- AND cf.flagtype = 'login_failure_by_info'
- ORDER BY time DESC";
+ AND cf.flagtype = 'login_failure_by_info') t
+ ORDER BY t.time DESC";
$params = array($CFG->lastnotifyfailure, $CFG->lastnotifyfailure);
/// Init some variables
View
2  lib/navigationlib.php
@@ -1042,7 +1042,7 @@ public function initialise() {
} else {
// The home element should be the site because the root node is my moodle
$this->rootnodes['home'] = $this->add(get_string('sitehome'), new moodle_url('/'), self::TYPE_SETTING, null, 'home');
- if ($CFG->defaulthomepage == HOMEPAGE_MY) {
+ if (!empty($CFG->defaulthomepage) && ($CFG->defaulthomepage == HOMEPAGE_MY)) {
// We need to stop automatic redirection
$this->rootnodes['home']->action->param('redirect', '0');
}
View
30 mod/feedback/show_nonrespondents.php
@@ -69,9 +69,28 @@
require_capability('mod/feedback:viewreports', $context);
if($action == 'sendmessage' AND has_capability('moodle/course:bulkmessaging', $coursecontext)) {
- // require_once($CFG->dirroot.'/message/lib.php');
+ $shortname = format_string($course->shortname,
+ true,
+ array('context' => $coursecontext));
+ $strfeedbacks = get_string("modulenameplural", "feedback");
+
+ $htmlmessage = "<body id=\"email\">";
+
+ $link1 = $CFG->wwwroot.'/course/view.php?id='.$course->id;
+ $link2 = $CFG->wwwroot.'/mod/feedback/index.php?id='.$course->id;
+ $link3 = $CFG->wwwroot.'/mod/feedback/view.php?id='.$cm->id;
+
+ $htmlmessage .= '<div class="navbar">'.
+ '<a target="_blank" href="'.$link1.'">'.$shortname.'</a> &raquo; '.
+ '<a target="_blank" href="'.$link2.'">'.$strfeedbacks.'</a> &raquo; '.
+ '<a target="_blank" href="'.$link3.'">'.format_string($feedback->name, true).'</a>'.
+ '</div>';
+
+ $htmlmessage .= $message;
+ $htmlmessage .= '</body>';
+
$good = 1;
- if(is_array($messageuser)) {
+ if (is_array($messageuser)) {
foreach ($messageuser as $userid) {
$senduser = $DB->get_record('user', array('id'=>$userid));
$eventdata = new stdClass();
@@ -80,9 +99,9 @@
$eventdata->userfrom = $USER;
$eventdata->userto = $senduser;
$eventdata->subject = $subject;
- $eventdata->fullmessage = $message;
+ $eventdata->fullmessage = html_to_text($htmlmessage);
$eventdata->fullmessageformat = FORMAT_PLAIN;
- $eventdata->fullmessagehtml = '';
+ $eventdata->fullmessagehtml = $htmlmessage;
$eventdata->smallmessage = '';
$good = $good && message_send($eventdata);
}
@@ -101,9 +120,6 @@
////////////////////////////////////////////////////////
/// Print the page header
- $strfeedbacks = get_string("modulenameplural", "feedback");
- $strfeedback = get_string("modulename", "feedback");
-
$PAGE->navbar->add(get_string('show_nonrespondents','feedback'));
$PAGE->set_heading(format_string($course->fullname));
$PAGE->set_title(format_string($feedback->name));
View
4 question/type/numerical/questiontype.php
@@ -281,7 +281,9 @@ public function save_unit_options($question) {
} else if (isset($question->showunits)) {
// Updated import, e.g. Moodle XML.
$options->showunits = $question->showunits;
-
+ if (isset($question->unitgradingtype)) {
+ $options->unitgradingtype = $question->unitgradingtype;
+ }
} else {
// Legacy import.
if ($defaultunit = $this->get_default_numerical_unit($question)) {
View
4 version.php
@@ -30,10 +30,10 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2011070105.04; // 20110701 = branching date YYYYMMDD - do not modify!
+$version = 2011070105.05; // 20110701 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches
// .XX = incremental changes
-$release = '2.1.5+ (Build: 20120405)'; // Human-friendly version name
+$release = '2.1.5+ (Build: 20120412)'; // Human-friendly version name
$maturity = MATURITY_STABLE; // this version's maturity level

No commit comments for this range

Something went wrong with that request. Please try again.