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

Update Update page for rev.3

Browse source
This commit is contained in:
Visman 2020-08-09 15:54:38 +07:00
parent 2eca001f10
commit a38b65384c
1 changed files with 60 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@
namespace ForkBB\Models\Pages\Admin;
use ForkBB\Core\Config;
use ForkBB\Core\Config as CoreConfig;
use ForkBB\Core\Container;
use ForkBB\Core\Validator;
use ForkBB\Models\Page;
@ -24,12 +24,6 @@ class Update extends Admin
const CONFIG_FILE = 'main.php';
/**
* Конфиг
* @var Config
*/
protected $coreConfig;
/**
* Конструктор
*
@ -176,7 +170,7 @@ class Update extends Admin
// загрузка и проверка конфига
if (null === $e) {
try {
$this->coreConfig = new Config($this->c->DIR_CONFIG . '/' . self::CONFIG_FILE);
$coreConfig = new CoreConfig($this->c->DIR_CONFIG . '/' . self::CONFIG_FILE);
} catch (ForkException $excp) {
$e = $excp->getMessage();
}
@ -358,38 +352,42 @@ class Update extends Admin
*/
public function stage(array $args, string $method): Page
{
$uid = $this->setLock($args['uid']);
try {
$uid = $this->setLock($args['uid']);
if (null === $uid) {
return $this->returnMaintenance();
}
$stage = \max((int) $args['stage'], (int) $this->c->config->i_fork_revision);
do {
if (\method_exists($this, 'stageNumber' . $stage)) {
$start = $this->{'stageNumber' . $stage}($args);
if (null === $start) {
++$stage;
}
return $this->c->Redirect->page(
'AdminUpdateStage',
['uid' => $uid, 'stage' => $stage, 'start' => $start]
)->message(__('Stage %1$s (%2$s)', $stage, (int) $start));
if (null === $uid) {
return $this->returnMaintenance();
}
++$stage;
} while ($stage < $this->c->FORK_REVISION);
$stage = \max((int) $args['stage'], (int) $this->c->config->i_fork_revision);
$this->c->config->i_fork_revision = $this->c->FORK_REVISION;
do {
if (\method_exists($this, 'stageNumber' . $stage)) {
$start = $this->{'stageNumber' . $stage}($args);
$this->c->config->save();
if (null === $start) {
++$stage;
}
$this->c->Cache->clear();
return $this->c->Redirect->page(
'AdminUpdateStage',
['uid' => $uid, 'stage' => $stage, 'start' => $start]
)->message(__('Stage %1$s (%2$s)', $stage, (int) $start));
}
return $this->c->Redirect->page('Index')->message('Successfully updated');
++$stage;
} while ($stage < $this->c->FORK_REVISION);
$this->c->config->i_fork_revision = $this->c->FORK_REVISION;
$this->c->config->save();
$this->c->Cache->clear();
return $this->c->Redirect->page('Index')->message('Successfully updated');
} catch (ForkException $excp) {
return $this->c->Message->message($excp->getMessage(), true, 503);
}
}
# /**
@ -400,15 +398,16 @@ class Update extends Admin
# */
# protected function stageNumber1(array $args): ?int
# {
# $this->coreConfig->add(
# [
# 'multiple' => [
# 'AdminUsersRecalculate' => '\ForkBB\Models\Pages\Admin\Users\Recalculate::class'
# ],
# ],
# 'after:AdminUsersNew'
# $coreConfig = new CoreConfig($this->c->DIR_CONFIG . '/' . self::CONFIG_FILE);
#
# $coreConfig->add(
# 'multiple=>AdminUsersRecalculate',
# '\\ForkBB\\Models\\Pages\\Admin\\Users\\Recalculate::class',
# 'AdminUsersNew'
# );
#
# $coreConfig->save();
#
# return null;
# }
@ -426,4 +425,25 @@ class Update extends Admin
return null;
}
/**
* rev.2 to rev.3
*/
protected function stageNumber2(array $args): ?int
{
$coreConfig = new CoreConfig($this->c->DIR_CONFIG . '/' . self::CONFIG_FILE);
$coreConfig->add(
'multiple=>AdminUsersRecalculate',
'\\ForkBB\\Models\\Pages\\Admin\\Users\\Recalculate::class',
'AdminUsersNew'
);
$coreConfig->add(
'EOL',
'\\PHP_EOL'
);
$coreConfig->save();
return null;
}
}