mirror of
https://github.com/friendica/friendica
synced 2024-11-10 02:22:55 +00:00
add db field for removed account, which will also be the first test of update error checking
This commit is contained in:
parent
64060f82dc
commit
249a6814cd
3 changed files with 13 additions and 4 deletions
2
boot.php
2
boot.php
|
@ -11,7 +11,7 @@ require_once('include/cache.php');
|
||||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||||
define ( 'FRIENDICA_VERSION', '2.3.1326' );
|
define ( 'FRIENDICA_VERSION', '2.3.1326' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1139 );
|
define ( 'DB_UPDATE_VERSION', 1140 );
|
||||||
|
|
||||||
define ( 'EOL', "<br />\r\n" );
|
define ( 'EOL', "<br />\r\n" );
|
||||||
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
|
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
|
||||||
|
|
|
@ -1019,6 +1019,7 @@ CREATE TABLE IF NOT EXISTS `user` (
|
||||||
`pwdreset` char(255) NOT NULL,
|
`pwdreset` char(255) NOT NULL,
|
||||||
`maxreq` int(11) NOT NULL DEFAULT '10',
|
`maxreq` int(11) NOT NULL DEFAULT '10',
|
||||||
`expire` int(10) unsigned NOT NULL DEFAULT '0',
|
`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_expired` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
`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',
|
`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 `blocked` (`blocked`),
|
||||||
KEY `verified` (`verified`),
|
KEY `verified` (`verified`),
|
||||||
KEY `unkmail` (`unkmail`),
|
KEY `unkmail` (`unkmail`),
|
||||||
KEY `cntunkmail` (`cntunkmail`)
|
KEY `cntunkmail` (`cntunkmail`),
|
||||||
|
KEY `account_removed` (`account_removed`)
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
-- --------------------------------------------------------
|
||||||
|
|
11
update.php
11
update.php
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
define( 'UPDATE_VERSION' , 1139 );
|
define( 'UPDATE_VERSION' , 1140 );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
@ -1215,4 +1215,11 @@ function update_1137() {
|
||||||
|
|
||||||
function update_1138() {
|
function update_1138() {
|
||||||
q("alter table contact add archive tinyint(1) not null default '0' after hidden, add index (archive)");
|
q("alter table contact add archive tinyint(1) not null default '0' after hidden, add index (archive)");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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 ;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue