clean up some regex's for i18n, and eliminate old ereg patterns.

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index 78c7d27c22dff3d8bc29e90ef8944608d18c3201..ced7573f3bd41d7b1f41f0a40fb838a899f9cad0 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -53,14 +53,18 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `self` tinyint(1) NOT NULL DEFAULT '0',
   `rel` tinyint(1) NOT NULL DEFAULT '0',
+  `duplex` tinyint(1) NOT NULL DEFAULT '0',
   `network` char(255) NOT NULL,
   `name` char(255) NOT NULL,
+  `nick` char(255) NOT NULL,
   `photo` text NOT NULL, 
   `thumb` text NOT NULL,
+  `micro` text NOT NULL,
   `site-pubkey` text NOT NULL,
   `issued-id` char(255) NOT NULL,
   `dfrn-id` char(255) NOT NULL,
   `url` char(255) NOT NULL,
+  `lrdd` char(255) NOT NULL,
   `pubkey` text NOT NULL,
   `prvkey` text NOT NULL,
   `request` text NOT NULL,
@@ -76,6 +80,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `name-date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `uri-date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `avatar-date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `term-date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `priority` tinyint(3) NOT NULL,
   `blocked` tinyint(1) NOT NULL DEFAULT '1',
   `readonly` tinyint(1) NOT NULL DEFAULT '0',
@@ -131,6 +136,7 @@ CREATE TABLE IF NOT EXISTS `intro` (
   `uid` int(10) unsigned NOT NULL,
   `contact-id` int(11) NOT NULL,
   `knowyou` tinyint(1) NOT NULL,
+  `duplex` tinyint(1) NOT NULL DEFAULT '0',
   `note` text NOT NULL,
   `hash` char(255) NOT NULL,
   `datetime` datetime NOT NULL,
@@ -165,11 +171,15 @@ CREATE TABLE IF NOT EXISTS `item` (
   `author-link` char(255) NOT NULL,
   `author-avatar` char(255) NOT NULL,
   `title` char(255) NOT NULL,
-  `body` text NOT NULL,
+  `body` mediumtext NOT NULL,
+  `verb` char(255) NOT NULL,
+  `object-type` char(255) NOT NULL,
+  `object` text NOT NULL,
+  `target-type` char(255) NOT NULL,
+  `target` text NOT NULL,
   `resource-id` char(255) NOT NULL,
-  `like` mediumtext NOT NULL,
-  `dislike` mediumtext NOT NULL,
   `tag` mediumtext NOT NULL,
+  `inform` mediumtext NOT NULL,
   `location` char(255) NOT NULL,
   `coord` char(255) NOT NULL,
   `allow_cid` mediumtext NOT NULL,
@@ -276,6 +286,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
   `country-name` char(255) NOT NULL,
   `gender` char(32) NOT NULL,
   `marital` char(255) NOT NULL,
+  `with` text NOT NULL,
   `sexual` char(255) NOT NULL,
   `politic` char(255) NOT NULL,
   `religion` char(255) NOT NULL,
@@ -342,19 +353,24 @@ CREATE TABLE IF NOT EXISTS `user` (
   `email` char(255) NOT NULL,
   `timezone` char(128) NOT NULL,
   `default-location` char(255) NOT NULL,
+  `allow_location` tinyint(1) NOT NULL DEFAULT '0',
   `theme` char(255) NOT NULL,
   `pubkey` text NOT NULL,
   `prvkey` text NOT NULL,
-  `verified` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `blocked` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `notify-flags` int(11) unsigned NOT NULL DEFAULT '65535',
+  `spubkey` text NOT NULL,
+  `sprvkey` text NOT NULL,
+  `verified` tinyint(1) unsigned NOT NULL DEFAULT '0', 
+  `blocked` tinyint(1) unsigned NOT NULL DEFAULT '0', 
+  `notify-flags` int(11) unsigned NOT NULL DEFAULT '65535', 
+  `page-flags` int(11) unsigned NOT NULL DEFAULT '0',
   `pwdreset` char(255) NOT NULL,
-  `allow_cid` mediumtext NOT NULL,
+  `allow_cid` mediumtext NOT NULL, 
   `allow_gid` mediumtext NOT NULL,
-  `deny_cid` mediumtext NOT NULL,
+  `deny_cid` mediumtext NOT NULL, 
   `deny_gid` mediumtext NOT NULL,
-  PRIMARY KEY (`uid`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+  PRIMARY KEY (`uid`), 
+  KEY `nickname` (`nickname`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
 CREATE TABLE IF NOT EXISTS `register` (