From c4b4f277963af2a3ef782dc14d369cbfe3b46a2e Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sun, 22 Dec 2013 20:47:57 +0000 Subject: Some sys chan stuff --- install/update.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'install') diff --git a/install/update.php b/install/update.php index f498ec042..05bddba42 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Sun, 22 Dec 2013 20:54:41 +0000 Subject: Ooops, also update the DB --- install/database.sql | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'install') diff --git a/install/database.sql b/install/database.sql index ef79862c3..915cecdba 100644 --- a/install/database.sql +++ b/install/database.sql @@ -1029,3 +1029,11 @@ CREATE TABLE IF NOT EXISTS `xtag` ( KEY `xtag_hash` (`xtag_hash`), KEY `xtag_flags` (`xtag_flags`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE if not exists `sys_perms` ( + `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , + `cat` CHAR( 255 ) NOT NULL , + `k` CHAR( 255 ) NOT NULL , + `v` MEDIUMTEXT NOT NULL, + `public_perm` TINYINT( 1 ) UNSIGNED NOT NULL +) ENGINE = MYISAM DEFAULT CHARSET = utf8"); -- cgit v1.2.3 From 1a42580ad44f768ba8d4eb0669f3b8be03670e04 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 18:37:39 -0800 Subject: remove a couple of mysql reserved words from being used as table or row names. For this round we're getting 'group' and 'desc'. Warning: potentially destabilising as this touches a lot of code. --- install/database.sql | 6 +++--- install/update.php | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) (limited to 'install') diff --git a/install/database.sql b/install/database.sql index 915cecdba..f73460937 100644 --- a/install/database.sql +++ b/install/database.sql @@ -240,7 +240,7 @@ CREATE TABLE IF NOT EXISTS `event` ( `start` datetime NOT NULL, `finish` datetime NOT NULL, `summary` text NOT NULL, - `desc` text NOT NULL, + `description` text NOT NULL, `location` text NOT NULL, `type` char(255) NOT NULL, `nofinish` tinyint(1) NOT NULL DEFAULT '0', @@ -319,7 +319,7 @@ CREATE TABLE IF NOT EXISTS `fsuggest` ( PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -CREATE TABLE IF NOT EXISTS `group` ( +CREATE TABLE IF NOT EXISTS `groups` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `hash` char(255) NOT NULL DEFAULT '', `uid` int(10) unsigned NOT NULL, @@ -639,7 +639,7 @@ CREATE TABLE IF NOT EXISTS `photo` ( `created` datetime NOT NULL, `edited` datetime NOT NULL, `title` char(255) NOT NULL, - `desc` text NOT NULL, + `description` text NOT NULL, `album` char(255) NOT NULL, `filename` char(255) NOT NULL, `type` char(128) NOT NULL DEFAULT 'image/jpeg', diff --git a/install/update.php b/install/update.php index 05bddba42..817e4b6bc 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Mon, 23 Dec 2013 15:13:09 -0800 Subject: add account_level, is_foreigner and is_member functions; convert all e2ee user input and prompts to hex to avoid javascipt's lame handling of quotes. !!This breaks all prior encrypted posts.!! --- install/database.sql | 4 +++- install/update.php | 11 ++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'install') diff --git a/install/database.sql b/install/database.sql index f73460937..cb332c75b 100644 --- a/install/database.sql +++ b/install/database.sql @@ -54,6 +54,7 @@ CREATE TABLE IF NOT EXISTS `account` ( `account_expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `account_expire_notified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `account_service_class` char(32) NOT NULL DEFAULT '', + `account_level` int(10) unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`account_id`), KEY `account_email` (`account_email`), KEY `account_service_class` (`account_service_class`), @@ -63,7 +64,8 @@ CREATE TABLE IF NOT EXISTS `account` ( KEY `account_lastlog` (`account_lastlog`), KEY `account_expires` (`account_expires`), KEY `account_default_channel` (`account_default_channel`), - KEY `account_external` (`account_external`) + KEY `account_external` (`account_external`), + KEY `account_level` (`account_level`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `addon` ( diff --git a/install/update.php b/install/update.php index 817e4b6bc..c731eab06 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 25 Dec 2013 01:22:51 -0800 Subject: db update for directory profiles - and fix broken database.sql from the sys_perms addition a couple days back --- install/database.sql | 31 ++++++++++++++++++------------- install/update.php | 12 +++++++++++- 2 files changed, 29 insertions(+), 14 deletions(-) (limited to 'install') diff --git a/install/database.sql b/install/database.sql index cb332c75b..6be73f193 100644 --- a/install/database.sql +++ b/install/database.sql @@ -54,7 +54,7 @@ CREATE TABLE IF NOT EXISTS `account` ( `account_expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `account_expire_notified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `account_service_class` char(32) NOT NULL DEFAULT '', - `account_level` int(10) unsigned NOT NULL DEFAULT 0, + `account_level` int(10) unsigned NOT NULL, PRIMARY KEY (`account_id`), KEY `account_email` (`account_email`), KEY `account_service_class` (`account_service_class`), @@ -848,6 +848,15 @@ CREATE TABLE IF NOT EXISTS `spam` ( KEY `term` (`term`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `sys_perms` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `cat` char(255) NOT NULL, + `k` char(255) NOT NULL, + `v` mediumtext NOT NULL, + `public_perm` tinyint(1) unsigned NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + CREATE TABLE IF NOT EXISTS `term` ( `tid` int(10) unsigned NOT NULL AUTO_INCREMENT, `aid` int(10) unsigned NOT NULL DEFAULT '0', @@ -915,7 +924,7 @@ CREATE TABLE IF NOT EXISTS `verify` ( KEY `token` (`token`), KEY `meta` (`meta`), KEY `created` (`created`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `vote` ( `vote_id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -971,7 +980,7 @@ CREATE TABLE IF NOT EXISTS `xconfig` ( KEY `xchan` (`xchan`), KEY `cat` (`cat`), KEY `k` (`k`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `xign` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -1008,6 +1017,9 @@ CREATE TABLE IF NOT EXISTS `xprof` ( `xprof_postcode` char(32) NOT NULL DEFAULT '', `xprof_country` char(255) NOT NULL DEFAULT '', `xprof_keywords` text NOT NULL, + `xprof_about` text NOT NULL, + `xprof_homepage` char(255) NOT NULL DEFAULT '', + `xprof_hometown` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`xprof_hash`), KEY `xprof_desc` (`xprof_desc`), KEY `xprof_dob` (`xprof_dob`), @@ -1018,7 +1030,8 @@ CREATE TABLE IF NOT EXISTS `xprof` ( KEY `xprof_region` (`xprof_region`), KEY `xprof_postcode` (`xprof_postcode`), KEY `xprof_country` (`xprof_country`), - KEY `xprof_age` (`xprof_age`) + KEY `xprof_age` (`xprof_age`), + KEY `xprof_hometown` (`xprof_hometown`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `xtag` ( @@ -1030,12 +1043,4 @@ CREATE TABLE IF NOT EXISTS `xtag` ( KEY `xtag_term` (`xtag_term`), KEY `xtag_hash` (`xtag_hash`), KEY `xtag_flags` (`xtag_flags`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - -CREATE TABLE if not exists `sys_perms` ( - `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `cat` CHAR( 255 ) NOT NULL , - `k` CHAR( 255 ) NOT NULL , - `v` MEDIUMTEXT NOT NULL, - `public_perm` TINYINT( 1 ) UNSIGNED NOT NULL -) ENGINE = MYISAM DEFAULT CHARSET = utf8"); +) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/update.php b/install/update.php index c731eab06..8e64413dc 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Sat, 28 Dec 2013 16:05:03 -0800 Subject: allow objects to have permissions --- install/database.sql | 4 ++++ install/update.php | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'install') diff --git a/install/database.sql b/install/database.sql index 6be73f193..ac8382162 100644 --- a/install/database.sql +++ b/install/database.sql @@ -592,6 +592,10 @@ CREATE TABLE IF NOT EXISTS `obj` ( `obj_type` int(10) unsigned NOT NULL DEFAULT '0', `obj_obj` char(255) NOT NULL DEFAULT '', `obj_channel` int(10) unsigned NOT NULL DEFAULT '0', + `allow_cid` MEDIUMTEXT NOT NULL DEFAULT '', + `allow_gid` MEDIUMTEXT NOT NULL DEFAULT '', + `deny_cid` MEDIUMTEXT NOT NULL DEFAULT '', + `deny_gid` MEDIUMTEXT NOT NULL DEFAULT '', PRIMARY KEY (`obj_id`), KEY `obj_verb` (`obj_verb`), KEY `obj_page` (`obj_page`), diff --git a/install/update.php b/install/update.php index 8e64413dc..5025222a6 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 8 Jan 2014 18:20:47 -0800 Subject: add store directory write check to install checks --- install/INSTALL.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'install') diff --git a/install/INSTALL.txt b/install/INSTALL.txt index ee029f0ee..500abb0f9 100644 --- a/install/INSTALL.txt +++ b/install/INSTALL.txt @@ -74,11 +74,13 @@ directory/path component in the URL) is REQUIRED. git pull - - make sure folder *view/tpl/smarty3* exists and is writable by webserver + - make sure folders *view/tpl/smarty3* and *store* exist and are writable by webserver mkdir view/tpl/smarty3 + mkdir store chmod 777 view/tpl/smarty3 + chmod 777 store [This permission (777) is very dangerous and if you have sufficient privilege and knowledge you should make this directory writeable only -- cgit v1.2.3 From a309bc0d478f5335853ed0cb7a0f0bfe41110643 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 Jan 2014 19:20:10 -0800 Subject: only let visitors remove their own files. --- install/database.sql | 2 ++ install/update.php | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'install') diff --git a/install/database.sql b/install/database.sql index ac8382162..d28128795 100644 --- a/install/database.sql +++ b/install/database.sql @@ -87,6 +87,7 @@ CREATE TABLE IF NOT EXISTS `attach` ( `aid` int(10) unsigned NOT NULL DEFAULT '0', `uid` int(10) unsigned NOT NULL DEFAULT '0', `hash` char(64) NOT NULL DEFAULT '', + `creator` char(128) NOT NULL DEFAULT '0', `filename` char(255) NOT NULL DEFAULT '', `filetype` char(64) NOT NULL DEFAULT '', `filesize` int(10) unsigned NOT NULL DEFAULT '0', @@ -104,6 +105,7 @@ CREATE TABLE IF NOT EXISTS `attach` ( KEY `aid` (`aid`), KEY `uid` (`uid`), KEY `hash` (`hash`), + KEY `creator` (`creator`), KEY `filename` (`filename`), KEY `filetype` (`filetype`), KEY `filesize` (`filesize`), diff --git a/install/update.php b/install/update.php index 5025222a6..3e04df51b 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 15 Jan 2014 12:57:12 -0800 Subject: allow menus to have special roles --- install/database.sql | 4 +++- install/update.php | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'install') diff --git a/install/database.sql b/install/database.sql index d28128795..597124566 100644 --- a/install/database.sql +++ b/install/database.sql @@ -536,9 +536,11 @@ CREATE TABLE IF NOT EXISTS `menu` ( `menu_channel_id` int(10) unsigned NOT NULL DEFAULT '0', `menu_name` char(255) NOT NULL DEFAULT '', `menu_desc` char(255) NOT NULL DEFAULT '', + `menu_flags` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`menu_id`), KEY `menu_channel_id` (`menu_channel_id`), - KEY `menu_name` (`menu_name`) + KEY `menu_name` (`menu_name`), + KEY `menu_flags` (`menu_flags`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `menu_item` ( diff --git a/install/update.php b/install/update.php index 3e04df51b..022d7f0dc 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Tue, 21 Jan 2014 00:19:53 -0800 Subject: move some store things --- install/update.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'install') diff --git a/install/update.php b/install/update.php index 022d7f0dc..3e5589820 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Mon, 27 Jan 2014 21:02:57 -0800 Subject: chat data structures --- install/database.sql | 60 +++++++++++++++++++++++++++++++++++++++++++++------- install/update.php | 59 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 109 insertions(+), 10 deletions(-) (limited to 'install') diff --git a/install/database.sql b/install/database.sql index 597124566..1c87b725b 100644 --- a/install/database.sql +++ b/install/database.sql @@ -87,7 +87,7 @@ CREATE TABLE IF NOT EXISTS `attach` ( `aid` int(10) unsigned NOT NULL DEFAULT '0', `uid` int(10) unsigned NOT NULL DEFAULT '0', `hash` char(64) NOT NULL DEFAULT '', - `creator` char(128) NOT NULL DEFAULT '0', + `creator` char(128) NOT NULL DEFAULT '', `filename` char(255) NOT NULL DEFAULT '', `filetype` char(64) NOT NULL DEFAULT '', `filesize` int(10) unsigned NOT NULL DEFAULT '0', @@ -105,7 +105,6 @@ CREATE TABLE IF NOT EXISTS `attach` ( KEY `aid` (`aid`), KEY `uid` (`uid`), KEY `hash` (`hash`), - KEY `creator` (`creator`), KEY `filename` (`filename`), KEY `filetype` (`filetype`), KEY `filesize` (`filesize`), @@ -113,7 +112,8 @@ CREATE TABLE IF NOT EXISTS `attach` ( KEY `edited` (`edited`), KEY `revision` (`revision`), KEY `folder` (`folder`), - KEY `flags` (`flags`) + KEY `flags` (`flags`), + KEY `creator` (`creator`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `auth_codes` ( @@ -214,6 +214,50 @@ CREATE TABLE IF NOT EXISTS `channel` ( KEY `channel_dirdate` (`channel_dirdate`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `chat` ( + `chat_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `chat_room` int(10) unsigned NOT NULL DEFAULT '0', + `chat_xchan` char(255) NOT NULL DEFAULT '', + `chat_text` mediumtext NOT NULL, + `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`chat_id`), + KEY `chat_room` (`chat_room`), + KEY `chat_xchan` (`chat_xchan`), + KEY `created` (`created`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `chatpresence` ( + `cp_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `cp_room` int(10) unsigned NOT NULL DEFAULT '0', + `cp_xchan` char(255) NOT NULL DEFAULT '', + `cp_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `cp_status` char(255) NOT NULL, + PRIMARY KEY (`cp_id`), + KEY `cp_room` (`cp_room`), + KEY `cp_xchan` (`cp_xchan`), + KEY `cp_last` (`cp_last`), + KEY `cp_status` (`cp_status`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `chatroom` ( + `cr_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `cr_aid` int(10) unsigned NOT NULL DEFAULT '0', + `cr_uid` int(10) unsigned NOT NULL DEFAULT '0', + `cr_name` char(255) NOT NULL DEFAULT '', + `cr_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `cr_edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `allow_cid` mediumtext NOT NULL, + `allow_gid` mediumtext NOT NULL, + `deny_cid` mediumtext NOT NULL, + `deny_gid` mediumtext NOT NULL, + PRIMARY KEY (`cr_id`), + KEY `cr_aid` (`cr_aid`), + KEY `cr_uid` (`cr_uid`), + KEY `cr_name` (`cr_name`), + KEY `cr_created` (`cr_created`), + KEY `cr_edited` (`cr_edited`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + CREATE TABLE IF NOT EXISTS `clients` ( `client_id` varchar(20) NOT NULL, `pw` varchar(20) NOT NULL, @@ -596,17 +640,17 @@ CREATE TABLE IF NOT EXISTS `obj` ( `obj_type` int(10) unsigned NOT NULL DEFAULT '0', `obj_obj` char(255) NOT NULL DEFAULT '', `obj_channel` int(10) unsigned NOT NULL DEFAULT '0', - `allow_cid` MEDIUMTEXT NOT NULL DEFAULT '', - `allow_gid` MEDIUMTEXT NOT NULL DEFAULT '', - `deny_cid` MEDIUMTEXT NOT NULL DEFAULT '', - `deny_gid` MEDIUMTEXT NOT NULL DEFAULT '', + `allow_cid` mediumtext NOT NULL, + `allow_gid` mediumtext NOT NULL, + `deny_cid` mediumtext NOT NULL, + `deny_gid` mediumtext NOT NULL, PRIMARY KEY (`obj_id`), KEY `obj_verb` (`obj_verb`), KEY `obj_page` (`obj_page`), KEY `obj_type` (`obj_type`), KEY `obj_channel` (`obj_channel`), KEY `obj_obj` (`obj_obj`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `outq` ( `outq_hash` char(255) NOT NULL, diff --git a/install/update.php b/install/update.php index 3e5589820..9ab5db8c6 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Tue, 28 Jan 2014 15:05:44 -0800 Subject: add client field to chatpresence - which will give us a place to put IP addresses for webRTC. Might as well allow for that since we'll (soon) have presence. Then we wouldn't need SIP and folks can "just" p2p each other using any mechanism they wish if they have permission to do so. --- install/database.sql | 1 + install/update.php | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'install') diff --git a/install/database.sql b/install/database.sql index 1c87b725b..dba03da65 100644 --- a/install/database.sql +++ b/install/database.sql @@ -232,6 +232,7 @@ CREATE TABLE IF NOT EXISTS `chatpresence` ( `cp_xchan` char(255) NOT NULL DEFAULT '', `cp_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `cp_status` char(255) NOT NULL, + `cp_client` char(128) NOT NULL DEFAULT '', PRIMARY KEY (`cp_id`), KEY `cp_room` (`cp_room`), KEY `cp_xchan` (`cp_xchan`), diff --git a/install/update.php b/install/update.php index 9ab5db8c6..180b8d5a0 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 29 Jan 2014 00:08:29 -0800 Subject: basic chatroom management backend --- install/htconfig.sample.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'install') diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php index 33258cf41..b23dfe3b6 100755 --- a/install/htconfig.sample.php +++ b/install/htconfig.sample.php @@ -3,7 +3,7 @@ // If automatic system installation fails: // Copy or rename this file to .htconfig.php in the top level -// Friendica directory +// Red Matrix directory // Why .htconfig.php? Because it contains sensitive information which could // give somebody complete control of your database. Apache's default -- cgit v1.2.3 From a1d40431f22e82b8e018dce65ced0801c40b20ff Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 30 Jan 2014 20:10:47 -0800 Subject: chat expiration (default 2 hours) - but can be set on a per-chatroom basis --- install/database.sql | 4 +++- install/update.php | 11 ++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'install') diff --git a/install/database.sql b/install/database.sql index dba03da65..c89e4cef2 100644 --- a/install/database.sql +++ b/install/database.sql @@ -247,6 +247,7 @@ CREATE TABLE IF NOT EXISTS `chatroom` ( `cr_name` char(255) NOT NULL DEFAULT '', `cr_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `cr_edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `cr_expire` int(10) unsigned NOT NULL DEFAULT '0', `allow_cid` mediumtext NOT NULL, `allow_gid` mediumtext NOT NULL, `deny_cid` mediumtext NOT NULL, @@ -256,7 +257,8 @@ CREATE TABLE IF NOT EXISTS `chatroom` ( KEY `cr_uid` (`cr_uid`), KEY `cr_name` (`cr_name`), KEY `cr_created` (`cr_created`), - KEY `cr_edited` (`cr_edited`) + KEY `cr_edited` (`cr_edited`), + KEY `cr_expire` (`cr_expire`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `clients` ( diff --git a/install/update.php b/install/update.php index 180b8d5a0..e8b6d37f6 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Tue, 4 Feb 2014 00:52:34 -0800 Subject: bookmark permissions --- install/database.sql | 2 ++ install/update.php | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'install') diff --git a/install/database.sql b/install/database.sql index c89e4cef2..86531a415 100644 --- a/install/database.sql +++ b/install/database.sql @@ -177,6 +177,7 @@ CREATE TABLE IF NOT EXISTS `channel` ( `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '128', `channel_w_pages` int(10) unsigned NOT NULL DEFAULT '128', `channel_a_republish` int(10) unsigned NOT NULL DEFAULT '128', + `channel_a_bookmark` int(10) unsigned NOT NULL DEFAULT '128', PRIMARY KEY (`channel_id`), UNIQUE KEY `channel_address_unique` (`channel_address`), KEY `channel_account_id` (`channel_account_id`), @@ -211,6 +212,7 @@ CREATE TABLE IF NOT EXISTS `channel` ( KEY `channel_w_pages` (`channel_w_pages`), KEY `channel_deleted` (`channel_deleted`), KEY `channel_a_republish` (`channel_a_republish`), + KEY `channel_a_bookmark` (`channel_a_bookmark`), KEY `channel_dirdate` (`channel_dirdate`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/update.php b/install/update.php index e8b6d37f6..93442a81f 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Fri, 7 Feb 2014 22:47:03 -0800 Subject: set default for account_level in DB --- install/database.sql | 2 +- install/update.php | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'install') diff --git a/install/database.sql b/install/database.sql index 86531a415..cd31a0285 100644 --- a/install/database.sql +++ b/install/database.sql @@ -54,7 +54,7 @@ CREATE TABLE IF NOT EXISTS `account` ( `account_expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `account_expire_notified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `account_service_class` char(32) NOT NULL DEFAULT '', - `account_level` int(10) unsigned NOT NULL, + `account_level` int(10) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`account_id`), KEY `account_email` (`account_email`), KEY `account_service_class` (`account_service_class`), diff --git a/install/update.php b/install/update.php index 93442a81f..ccfec9ddf 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Mon, 10 Feb 2014 21:36:19 +0000 Subject: s/Options All/AllowOverride All --- install/INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'install') diff --git a/install/INSTALL.txt b/install/INSTALL.txt index 500abb0f9..65efa9cfe 100644 --- a/install/INSTALL.txt +++ b/install/INSTALL.txt @@ -37,7 +37,7 @@ Decide if you will use SSL and obtain an SSL cert before software installation. 1. Requirements - - Apache with mod-rewrite enabled and "Options All" so you can use a + - Apache with mod-rewrite enabled and "AllowOverride All" so you can use a local .htaccess file - PHP 5.3+. The later the better. -- cgit v1.2.3 From a7194bc79a83bc7269a20a3c7ff2eb3d368527cb Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 20 Feb 2014 01:44:29 -0800 Subject: fix the broken hublocs in an update --- install/update.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'install') diff --git a/install/update.php b/install/update.php index ccfec9ddf..3e39a5b4c 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Thu, 20 Feb 2014 02:30:37 -0800 Subject: vsprintf error on update --- install/update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'install') diff --git a/install/update.php b/install/update.php index 3e39a5b4c..7d1305863 100644 --- a/install/update.php +++ b/install/update.php @@ -1088,7 +1088,7 @@ function update_r1097() { // fix some mangled hublocs from a bug long ago - $r = q("select hubloc_id, hubloc_addr from hubloc where hubloc_addr like '%/%'"); + $r = q("select hubloc_id, hubloc_addr from hubloc where hubloc_addr like '%%/%%'"); if($r) { foreach($r as $rr) { q("update hubloc set hubloc_addr = '%s' where hubloc_id = %d limit 1", -- cgit v1.2.3