| '.fullname($user,true).' | '.$user->email.' | ';
- if ($user->emailstop) {
- $error = get_string('emaildisable');
- } elseif (empty($user->email)) {
+ if (empty($user->email)) {
$error = get_string('emailempty');
}
if (!empty($error)) {
Index: moodle/user/messageselect.php
--- moodle/user/messageselect.php Base (1.37)
+++ moodle/user/messageselect.php Locally Modified (Based On 1.37)
@@ -94,7 +94,7 @@
foreach ($_POST as $k => $v) {
if (preg_match('/^(user|teacher)(\d+)$/',$k,$m)) {
if (!array_key_exists($m[2],$SESSION->emailto[$id])) {
- if ($user = $DB->get_record_select('user', "id = ?", array($m[2]), 'id,firstname,lastname,idnumber,email,emailstop,mailformat,lastaccess')) {
+ if ($user = $DB->get_record_select('user', "id = ?", array($m[2]), 'id,firstname,lastname,idnumber,email,mailformat,lastaccess')) {
$SESSION->emailto[$id][$m[2]] = $user;
$count++;
}
Index: moodle/user/profile.php
--- moodle/user/profile.php Base (1.15)
+++ moodle/user/profile.php Locally Modified (Based On 1.15)
@@ -249,49 +249,9 @@
or ($user->maildisplay == 2 && !isguestuser())
or has_capability('moodle/course:useremail', $context)) {
- $emailswitch = '';
-
- if ($currentuser or has_capability('moodle/course:useremail', $context)) { /// Can use the enable/disable email stuff
- if (!empty($enable) and confirm_sesskey()) { /// Recieved a parameter to enable the email address
- $DB->set_field('user', 'emailstop', 0, array('id'=>$user->id));
- $user->emailstop = 0;
+ print_row(get_string("email").":", obfuscate_mailto($user->email, ''));
}
- if (!empty($disable) and confirm_sesskey()) { /// Recieved a parameter to disable the email address
- $DB->set_field('user', 'emailstop', 1, array('id'=>$user->id));
- $user->emailstop = 1;
- }
- }
- if (has_capability('moodle/course:useremail', $context)) { /// Can use the enable/disable email stuff
- if ($user->emailstop) {
- $switchparam = 'enable';
- $switchtitle = get_string('emaildisable');
- $switchclick = get_string('emailenableclick');
- $switchpix = 't/emailno';
- } else {
- $switchparam = 'disable';
- $switchtitle = get_string('emailenable');
- $switchclick = get_string('emaildisableclick');
- $switchpix = 't/email';
- }
- $emailswitch = " id&$switchparam=1&sesskey=".sesskey()."\">".
- "![](\"") pix_url("$switchpix") . "\" alt=\"$switchclick\" />";
-
- } else if ($currentuser) { /// Can only re-enable an email this way
- if ($user->emailstop) { // Include link that tells how to re-enable their email
- $switchparam = 'enable';
- $switchtitle = get_string('emaildisable');
- $switchclick = get_string('emailenableclick');
-
- $emailswitch = " (id&enable=1&sesskey=".sesskey()."\">$switchtitle)";
- }
- }
-
- print_row(get_string("email").":", obfuscate_mailto($user->email, '', $user->emailstop)."$emailswitch");
-}
-
if ($user->url && !isset($hiddenfields['webpage'])) {
$url = $user->url;
if (strpos($user->url, '://') === false) {
Index: moodle/version.php
--- moodle/version.php Base (1.1826)
+++ moodle/version.php Locally Modified (Based On 1.1826)
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2010110201; // YYYYMMDD = date of the last version bump
+$version = 2010110500; // YYYYMMDD = date of the last version bump
// XX = daily increments
$release = '2.0 RC1 (Build: 20101105)'; // Human-friendly version name
Index: moodle/webservice/simpletest/testwebservice.php
--- moodle/webservice/simpletest/testwebservice.php Base (1.3)
+++ moodle/webservice/simpletest/testwebservice.php Locally Modified (Based On 1.3)
@@ -454,7 +454,6 @@
$user1->email = 'testemail1@moodle.com';
$user1->auth = 'manual';
$user1->idnumber = 'testidnumber1';
- $user1->emailstop = 1;
$user1->lang = 'en';
$user1->theme = 'standard';
$user1->timezone = 99;
@@ -522,7 +521,6 @@
$this->assertEqual($dbuser1->email, $user1->email);
$this->assertEqual($dbuser1->auth, $user1->auth);
$this->assertEqual($dbuser1->idnumber, $user1->idnumber);
- $this->assertEqual($dbuser1->emailstop, $user1->emailstop);
$this->assertEqual($dbuser1->lang, $user1->lang);
$this->assertEqual($dbuser1->theme, $user1->theme);
$this->assertEqual($dbuser1->timezone, $user1->timezone);
|