allow events to be ignored

diff --git a/boot.php b/boot.php
index 5d08e7cec8b50f7d87184c4f2cc12076b629a18e..c0a7a0e298522830fca8070ef443e6d04a1479d4 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -13,7 +13,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '3.0.1464' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1154      );
+define ( 'DB_UPDATE_VERSION',      1155      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --git a/database.sql b/database.sql
index 6ba4921cb744a3db76674075ae30db1a9ce6e272..da3462a752e82d0c5237a80f2969c4549885724a 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -260,6 +260,7 @@ CREATE TABLE IF NOT EXISTS `event` (
   `type` char(255) NOT NULL,
   `nofinish` tinyint(1) NOT NULL DEFAULT '0',
   `adjust` tinyint(1) NOT NULL DEFAULT '1',
+  `ignore` tinyint(1) NOT NULL DEFAULT '0',
   `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
@@ -271,7 +272,8 @@ CREATE TABLE IF NOT EXISTS `event` (
   KEY `type` ( `type` ),
   KEY `start` ( `start` ),
   KEY `finish` ( `finish` ),
-  KEY `adjust` ( `adjust` )
+  KEY `adjust` ( `adjust` ),
+  KEY `ignore` ( `ignore` ),
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------

diff --git a/update.php b/update.php
index 19e6cf3bdf78c06eae128ee1f383eb4f902d3492..cf6fa138eaf35ca6e27143874052e18f38bebaee 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1154 );
+define( 'UPDATE_VERSION' , 1155 );
 
 /**
  *
@@ -1343,3 +1343,11 @@ function update_1153() {
        if(!$r) return UPDATE_FAILED;
        return UPDATE_SUCCESS;
 }
+
+function update_1154() {
+       $r = q("ALTER TABLE `event` ADD `ignore` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0' AFTER `adjust` , ADD INDEX ( `ignore` )");
+
+       if(!$r) return UPDATE_FAILED;
+       return UPDATE_SUCCESS;
+}
+