bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #6446 from annando/approve

Browse source 
Now storing the "manually approve" data / fix update routine
This commit is contained in:
Hypolite Petovan 2019-01-14 08:38:08 -05:00 committed by GitHub
parent b4ffd980d3 5554448162
commit 990bbea19d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/dbstructure.config.php
View file

@ -34,7 +34,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1292); define('DB_UPDATE_VERSION', 1293);
} }
return [ return [
@ -65,6 +65,7 @@ return [
"inbox" => ["type" => "varchar(255)", "not null" => "1", "comment" => ""], "inbox" => ["type" => "varchar(255)", "not null" => "1", "comment" => ""],
"outbox" => ["type" => "varchar(255)", "comment" => ""], "outbox" => ["type" => "varchar(255)", "comment" => ""],
"sharedinbox" => ["type" => "varchar(255)", "comment" => ""], "sharedinbox" => ["type" => "varchar(255)", "comment" => ""],
"manually-approve" => ["type" => "boolean", "comment" => ""],
"nick" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "nick" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"name" => ["type" => "varchar(255)", "comment" => ""], "name" => ["type" => "varchar(255)", "comment" => ""],
"about" => ["type" => "text", "comment" => ""], "about" => ["type" => "text", "comment" => ""],

13
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2018.12-dev (The Tazmans Flax-lily) -- Friendica 2019.01-rc (The Tazmans Flax-lily)
-- DB_UPDATE_VERSION 1290 -- DB_UPDATE_VERSION 1293
-- ------------------------------------------ -- ------------------------------------------
@ -31,6 +31,7 @@ CREATE TABLE IF NOT EXISTS `apcontact` (
`inbox` varchar(255) NOT NULL COMMENT '', `inbox` varchar(255) NOT NULL COMMENT '',
`outbox` varchar(255) COMMENT '', `outbox` varchar(255) COMMENT '',
`sharedinbox` varchar(255) COMMENT '', `sharedinbox` varchar(255) COMMENT '',
`manually-approve` boolean COMMENT '',
`nick` varchar(255) NOT NULL DEFAULT '' COMMENT '', `nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
`name` varchar(255) COMMENT '', `name` varchar(255) COMMENT '',
`about` text COMMENT '', `about` text COMMENT '',
@ -578,6 +579,7 @@ CREATE TABLE IF NOT EXISTS `item` (
INDEX `uid_contactid_created` (`uid`,`contact-id`,`created`), INDEX `uid_contactid_created` (`uid`,`contact-id`,`created`),
INDEX `authorid_created` (`author-id`,`created`), INDEX `authorid_created` (`author-id`,`created`),
INDEX `ownerid` (`owner-id`), INDEX `ownerid` (`owner-id`),
INDEX `contact-id` (`contact-id`),
INDEX `uid_uri` (`uid`,`uri`(190)), INDEX `uid_uri` (`uid`,`uri`(190)),
INDEX `resource-id` (`resource-id`), INDEX `resource-id` (`resource-id`),
INDEX `deleted_changed` (`deleted`,`changed`), INDEX `deleted_changed` (`deleted`,`changed`),
@ -813,7 +815,9 @@ CREATE TABLE IF NOT EXISTS `participation` (
`server` varchar(60) NOT NULL COMMENT '', `server` varchar(60) NOT NULL COMMENT '',
`cid` int unsigned NOT NULL COMMENT '', `cid` int unsigned NOT NULL COMMENT '',
`fid` int unsigned NOT NULL COMMENT '', `fid` int unsigned NOT NULL COMMENT '',
PRIMARY KEY(`iid`,`server`) PRIMARY KEY(`iid`,`server`),
INDEX `cid` (`cid`),
INDEX `fid` (`fid`)
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Storage for participation messages from Diaspora'; ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Storage for participation messages from Diaspora';
-- --
@ -967,7 +971,8 @@ CREATE TABLE IF NOT EXISTS `profile` (
`publish` boolean NOT NULL DEFAULT '0' COMMENT 'publish default profile in local directory', `publish` boolean NOT NULL DEFAULT '0' COMMENT 'publish default profile in local directory',
`net-publish` boolean NOT NULL DEFAULT '0' COMMENT 'publish profile in global directory', `net-publish` boolean NOT NULL DEFAULT '0' COMMENT 'publish profile in global directory',
PRIMARY KEY(`id`), PRIMARY KEY(`id`),
INDEX `uid_is-default` (`uid`,`is-default`) INDEX `uid_is-default` (`uid`,`is-default`),
FULLTEXT INDEX `pub_keywords` (`pub_keywords`)
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='user profiles data'; ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='user profiles data';
-- --

2
src/Database/DBA.php
View file

@ -1239,7 +1239,7 @@ class DBA
foreach ($old_fields AS $fieldname => $content) { foreach ($old_fields AS $fieldname => $content) {
if (isset($fields[$fieldname])) { if (isset($fields[$fieldname])) {
if ($fields[$fieldname] == $content) { if (($fields[$fieldname] == $content) && !is_null($content)) {
unset($fields[$fieldname]); unset($fields[$fieldname]);
} else { } else {
$do_update = true; $do_update = true;

6
src/Model/APContact.php
View file

@ -157,7 +157,7 @@ class APContact extends BaseObject
$apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted, 'w3id:publicKey', 'w3id:publicKeyPem')); $apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted, 'w3id:publicKey', 'w3id:publicKeyPem'));
$manually_approve = JsonLD::fetchElement($compacted, 'as:manuallyApprovesFollowers'); $apcontact['manually-approve'] = (int)JsonLD::fetchElement($compacted, 'as:manuallyApprovesFollowers');
// To-Do // To-Do
@ -204,8 +204,8 @@ class APContact extends BaseObject
$contact_fields['prv'] = false; $contact_fields['prv'] = false;
} else { } else {
// Otherwise set the corresponding forum type // Otherwise set the corresponding forum type
$contact_fields['forum'] = !$manually_approve; $contact_fields['forum'] = !$apcontact['manually-approve'];
$contact_fields['prv'] = $manually_approve; $contact_fields['prv'] = $apcontact['manually-approve'];
} }
} }
} }