0ct0pu5/forkbb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rev.26 Update DB for polls

Browse source
This commit is contained in:
Visman 2020-11-09 15:33:45 +07:00
parent ce2a299ad0
commit a8adda66ba
4 changed files with 47 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/Models/Pages/Admin/Install.php
View file

@ -800,10 +800,10 @@ class Install extends Admin
'stick_fp' => ['TINYINT(1)', false, 0],
'moved_to' => ['INT(10) UNSIGNED', false, 0],
'forum_id' => ['INT(10) UNSIGNED', false, 0],
'poll_type' => ['TINYINT(4)', false, 0],
'poll_type' => ['TINYINT', false, 0],
'poll_time' => ['INT(10) UNSIGNED', false, 0],
'poll_term' => ['TINYINT(4)', false, 0],
'poll_kol' => ['INT(10) UNSIGNED', false, 0],
'poll_term' => ['TINYINT', false, 0],
'poll_votes' => ['INT(10) UNSIGNED', false, 0],
],
'PRIMARY KEY' => ['id'],
'INDEXES' => [
@ -984,13 +984,13 @@ class Install extends Admin
// poll
$schema = [
'FIELDS' => [
'tid' => ['INT(10) UNSIGNED', false, 0],
'question' => ['TINYINT(4)', false, 0],
'field' => ['TINYINT(4)', false, 0],
'choice' => ['VARCHAR(255)', false, ''],
'votes' => ['INT(10) UNSIGNED', false, 0],
'tid' => ['INT(10) UNSIGNED', false, 0],
'question_id' => ['TINYINT', false, 0],
'field_id' => ['TINYINT', false, 0],
'qna_text' => ['VARCHAR(255)', false, ''],
'votes' => ['INT(10) UNSIGNED', false, 0],
],
'PRIMARY KEY' => ['tid', 'question', 'field'],
'PRIMARY KEY' => ['tid', 'question_id', 'field_id'],
'ENGINE' => $this->DBEngine,
];
$this->c->DB->createTable('poll', $schema);
@ -1127,12 +1127,12 @@ class Install extends Admin
'p_force_guest_email' => 1,
'o_pms_enabled' => 1, // New PMS - Visman
'o_pms_min_kolvo' => 0,
'o_poll_enabled' => 0, // опросы - Visman
'o_poll_max_ques' => 3,
'o_poll_max_field' => 20,
'o_poll_time' => 60,
'o_poll_term' => 3,
'o_poll_guest' => 0,
'b_poll_enabled' => 0, // опросы - Visman
'i_poll_max_questions' => 3,
'i_poll_max_fields' => 20,
'i_poll_time' => 60,
'i_poll_term' => 3,
'b_poll_guest' => 0,
'a_max_users' => \json_encode(['number' => 1, 'time' => \time()], self::JSON_OPTIONS),
'a_bb_white_mes' => \json_encode([], self::JSON_OPTIONS),
'a_bb_white_sig' => \json_encode(['b', 'i', 'u', 'color', 'colour', 'email', 'url'], self::JSON_OPTIONS),

31
app/Models/Pages/Admin/Update.php
View file

@ -19,7 +19,7 @@ class Update extends Admin
{
const PHP_MIN = '7.3.0';
const LATEST_REV_WITH_DB_CHANGES = 24;
const LATEST_REV_WITH_DB_CHANGES = 25;
const LOCK_NAME = 'lock_update';
const LOCk_TTL = 1800;
@ -1066,4 +1066,33 @@ class Update extends Admin
return null;
}
/**
* rev.25 to rev.26
*/
protected function stageNumber25(array $args): ?int
{
$this->c->DB->renameField('topics', 'poll_kol', 'poll_votes');
$this->c->DB->renameField('poll', 'question', 'question_id');
$this->c->DB->renameField('poll', 'field', 'field_id');
$this->c->DB->renameField('poll', 'choice', 'qna_text');
$this->c->config->b_poll_enabled = $this->c->config->o_poll_enabled ?? 0;
$this->c->config->i_poll_max_questions = $this->c->config->o_poll_max_ques ?? 3;
$this->c->config->i_poll_max_fields = $this->c->config->o_poll_max_field ?? 20;
$this->c->config->i_poll_time = $this->c->config->o_poll_time ?? 60;
$this->c->config->i_poll_term = $this->c->config->o_poll_term ?? 3;
$this->c->config->b_poll_guest = $this->c->config->o_poll_guest ?? 0;
unset($this->c->config->o_poll_enabled);
unset($this->c->config->o_poll_max_ques);
unset($this->c->config->o_poll_max_field);
unset($this->c->config->o_poll_time);
unset($this->c->config->o_poll_term);
unset($this->c->config->o_poll_guest);
$this->c->config->save();
return null;
}
}

2
app/bootstrap.php
View file

@ -44,7 +44,7 @@ if (
}
$c->PUBLIC_URL = $c->BASE_URL . $forkPublicPrefix;
$c->FORK_REVISION = 25;
$c->FORK_REVISION = 26;
$c->START = $forkStart;
$c->DIR_APP = __DIR__;
$c->DIR_PUBLIC = $forkPublic;

2
readme.md
View file

@ -1,4 +1,4 @@
# ForkBB rev.25 Pre-Alpha Readme
# ForkBB rev.26 Pre-Alpha Readme
## About