New user field called "emailstop" ... to stop emails.

I had to do it ... this is driving me nuts with some people
on moodle.org

diff --git a/backup/backuplib.php b/backup/backuplib.php
index f6793f484a4f525e49138050cd3fe8343f75a403..4bfa38d3ad2cf6fedc8f245d431d48cf7a01d452 100644 (file)
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -712,6 +712,7 @@
                 fwrite ($bf,full_tag("FIRSTNAME",4,false,$user_data->firstname));
                 fwrite ($bf,full_tag("LASTNAME",4,false,$user_data->lastname));
                 fwrite ($bf,full_tag("EMAIL",4,false,$user_data->email));
+                fwrite ($bf,full_tag("EMAILSTOP",4,false,$user_data->emailstop));
                 fwrite ($bf,full_tag("ICQ",4,false,$user_data->icq));
                 fwrite ($bf,full_tag("PHONE1",4,false,$user_data->phone1));
                 fwrite ($bf,full_tag("PHONE2",4,false,$user_data->phone2));

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 8b7b2789f184dc53453f36b25ed647abe9a33618..cc4e88540a32641254f5a0c4c70912210a46387c 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -2029,6 +2029,9 @@
                         case "EMAIL": 
                             $this->info->tempuser->email = $this->getContents();
                             break;
+                        case "EMAILSTOP": 
+                            $this->info->tempuser->emailstop = $this->getContents();
+                            break;
                         case "ICQ": 
                             $this->info->tempuser->icq = $this->getContents();
                             break;

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 37c0b4e44b72bc9768ac09310ca87b35e048665f..87e2fda7c12b1c1952754fe4056fd92ef439644c 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -699,6 +699,10 @@ function main_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2004022000) {
+        table_column("user", "", "emailstop", "integer", "1", "unsigned", "0", "not null", "email");
+    }
+
     return $result;
 
 }

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 1796177c5357ec773a11990b2d01d37bde8c5645..0e971daa42a0f595154c5d19f2fa3d9dab96017b 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -309,6 +309,7 @@ CREATE TABLE `prefix_user` (
   `firstname` varchar(20) NOT NULL default '',
   `lastname` varchar(20) NOT NULL default '',
   `email` varchar(100) NOT NULL default '',
+  `emailstop` tinyint(1) unsigned NOT NULL default '0',
   `icq` varchar(15) default NULL,
   `phone1` varchar(20) default NULL,
   `phone2` varchar(20) default NULL,

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index b64886165f11a2666dbcf6fd4578200c9f0b8fa6..5ad03d1a9fbd2654dc93f8b4bef1ede6ca3fc4bd 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -444,6 +444,10 @@ function main_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2004022000) {
+        table_column("user", "", "emailstop", "integer", "1", "unsigned", "0", "not null", "email");
+    }
+
     return $result;
 
 }

diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index 5b1c9e7933d4359789490047340edb1e47fe0764..5741ad8702ee731751fbb9547fe0615867e29a2a 100644 (file)
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -199,6 +199,7 @@ CREATE TABLE prefix_user (
    firstname varchar(20) NOT NULL default '',
    lastname varchar(20) NOT NULL default '',
    email varchar(100) NOT NULL default '',
+   emailstop integer NOT NULL default '0',
    icq varchar(15) default NULL,
    phone1 varchar(20) default NULL,
    phone2 varchar(20) default NULL,

diff --git a/version.php b/version.php
index 5904ad0af3f356a882071da211a77706e328782b..b0144b44414eec206d57bcb7a8cb6ecd04d56cb7 100644 (file)
--- a/version.php
+++ b/version.php
@@ -5,7 +5,7 @@
 // database to determine whether upgrades should
 // be performed (see lib/db/*.php)
 
-$version = 2004021700;   // The current version is a date (YYYYMMDDXX)
+$version = 2004022000;   // The current version is a date (YYYYMMDDXX)
 
 $release = "1.2 development";   // User-friendly version number