add db field for removed account, which will also be the first test of update error...

diff --git a/boot.php b/boot.php
index 616e152f9b5a617206b556a1eec051461cbcd0fa..100662a8f8b77231780672ca5baa902d45bf43fe 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '2.3.1326' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1139      );
+define ( 'DB_UPDATE_VERSION',      1140      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --git a/database.sql b/database.sql
index 78b26922bd11dc0c61ea19c484d9769f87a26cb6..80a9197fa5dd7da178960652079d9f80ee8d505e 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1019,6 +1019,7 @@ CREATE TABLE IF NOT EXISTS `user` (
   `pwdreset` char(255) NOT NULL,
   `maxreq` int(11) NOT NULL DEFAULT '10',
   `expire` int(10) unsigned NOT NULL DEFAULT '0',
+  `account_removed` tinyint(1) NOT NULL DEFAULT '0',
   `account_expired` tinyint(1) NOT NULL DEFAULT '0',
   `account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -1036,7 +1037,8 @@ CREATE TABLE IF NOT EXISTS `user` (
   KEY `blocked` (`blocked`),
   KEY `verified` (`verified`),
   KEY `unkmail` (`unkmail`),
-  KEY `cntunkmail` (`cntunkmail`)
+  KEY `cntunkmail` (`cntunkmail`),
+  KEY `account_removed` (`account_removed`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------

diff --git a/update.php b/update.php
index 2758f5906672d127694e8cb7c941d9c4fb4d6cb9..3c2ecebb6b3b053f6ff2d0b3adbc4b3ae61d0fe9 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1139 );
+define( 'UPDATE_VERSION' , 1140 );
 
 /**
  *
@@ -1215,4 +1215,11 @@ function update_1137() {
 
 function update_1138() {
        q("alter table contact add archive tinyint(1) not null default '0' after hidden, add index (archive)");
-}
\ No newline at end of file
+}
+
+function update_1139() {
+       $r = q("alter table user add account_removed tinyint(1) not null default '0' after expire, add index(account_removed) ");
+       if(! $r)
+               return UPDATE_FAILED ;
+       return UPDATE_SUCCESS ;
+}