provide "service_class" identifier which will let us provide service_class limits...

diff --git a/boot.php b/boot.php
index ed083d6177c2b6eb1dc494ca68343eb4c6ef14b1..f357487b992db39b0264cb38671677a8d3b9683d 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.1329' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1142      );
+define ( 'DB_UPDATE_VERSION',      1143      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --git a/database.sql b/database.sql
index dc586bc2be01851a1a4eeea2912dba39bca0afd5..cf086796a66f4538b8580f4269607b7f1d203583 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1027,6 +1027,7 @@ CREATE TABLE IF NOT EXISTS `user` (
   `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',
+  `service_class` char(32) NOT NULL,
   `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
@@ -1042,7 +1043,8 @@ CREATE TABLE IF NOT EXISTS `user` (
   KEY `verified` (`verified`),
   KEY `unkmail` (`unkmail`),
   KEY `cntunkmail` (`cntunkmail`),
-  KEY `account_removed` (`account_removed`)
+  KEY `account_removed` (`account_removed`),
+  KEY `service_class` (`service_class`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------

diff --git a/update.php b/update.php
index cce942f27e7c77d2809f988515a403b1aee8baad..e363aa942e2157124a08f986057ad02c6cbadf76 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1142 );
+define( 'UPDATE_VERSION' , 1143 );
 
 /**
  *
@@ -1239,3 +1239,12 @@ function update_1141() {
 }
 
 
+function update_1142() {
+       $r = q("alter table user add service_class char(32) not null after expire_notification_sent, add index(service_class) ");
+       if(! $r)
+               return UPDATE_FAILED ;
+       return UPDATE_SUCCESS ;
+}
+
+
+