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

rev.14 Permissions -> Parser page

Browse source
This commit is contained in:
Visman 2020-09-08 10:43:28 +07:00
parent f58f8c15fa
commit 6b450437f4
11 changed files with 120 additions and 63 deletions

6
app/Controllers/Routing.php
View file

@ -536,9 +536,9 @@ class Routing
);
$r->add(
$r::DUO,
'/admin/permissions',
'AdminPermissions:edit',
'AdminPermissions'
'/admin/parser',
'AdminParser:edit',
'AdminParser'
);
$r->add(
$r::DUO,

2
app/Models/Pages/Admin.php
View file

@ -68,7 +68,7 @@ class Admin extends Page
if ($this->user->isAdmin) {
$nav += [
'options' => [$r->link('AdminOptions'), __('Admin options')],
'permissions' => [$r->link('AdminPermissions'), __('Permissions')],
'parser' => [$r->link('AdminParser'), __('Parser settings')],
'categories' => [$r->link('AdminCategories'), __('Categories')],
'forums' => [$r->link('AdminForums'), __('Forums')],
'groups' => [$r->link('AdminGroups'), __('User groups')],

25
app/Models/Pages/Admin/Parser.php Normal file
View file

@ -0,0 +1,25 @@
<?php
namespace ForkBB\Models\Pages\Admin;
use ForkBB\Core\Container;
use ForkBB\Models\Pages\Admin;
use function \ForkBB\__;
abstract class Parser extends Admin
{
/**
* Конструктор
*
* @param Container $container
*/
public function __construct(Container $container)
{
parent::__construct($container);
$this->aIndex = 'parser';
$this->c->Lang->load('validator');
$this->c->Lang->load('admin_parser');
}
}

66
app/Models/Pages/Admin/Permissions.php → app/Models/Pages/Admin/Parser/Edit.php
View file

@ -1,17 +1,17 @@
<?php
namespace ForkBB\Models\Pages\Admin;
namespace ForkBB\Models\Pages\Admin\Parser;
use ForkBB\Core\Validator;
use ForkBB\Models\Page;
use ForkBB\Models\Pages\Admin;
use ForkBB\Models\Pages\Admin\Parser;
use ForkBB\Models\Config\Model as Config;
use function \ForkBB\__;
class Permissions extends Admin
class Edit extends Parser
{
/**
* Редактирование натроек форума
* Редактирование натроек парсера
*
* @param array $args
* @param string $method
@ -20,24 +20,21 @@ class Permissions extends Admin
*/
public function edit(array $args, string $method): Page
{
$this->c->Lang->load('validator');
$this->c->Lang->load('admin_permissions');
$config = clone $this->c->config;
if ('POST' === $method) {
$v = $this->c->Validator->reset()
->addValidators([
])->addRules([
'token' => 'token:AdminPermissions',
'token' => 'token:AdminParser',
'p_message_bbcode' => 'required|integer|in:0,1',
'p_message_img_tag' => 'required|integer|in:0,1',
'p_sig_bbcode' => 'required|integer|in:0,1',
'p_sig_img_tag' => 'required|integer|in:0,1',
'o_smilies' => 'required|integer|in:0,1',
'o_smilies_sig' => 'required|integer|in:0,1',
'o_make_links' => 'required|integer|in:0,1',
'o_quote_depth' => 'required|integer|min:0|max:9',
'o_smilies' => 'required|integer|in:0,1',
'o_smilies_sig' => 'required|integer|in:0,1',
'o_make_links' => 'required|integer|in:0,1',
'o_quote_depth' => 'required|integer|min:0|max:9',
])->addAliases([
])->addArguments([
])->addMessages([
@ -55,17 +52,16 @@ class Permissions extends Admin
if ($valid) {
$config->save();
return $this->c->Redirect->page('AdminPermissions')->message('Perms updated redirect');
return $this->c->Redirect->page('AdminParser')->message('Parser settings updated redirect');
}
$this->fIswev = $v->getErrors();
}
$this->aIndex = 'permissions';
$this->nameTpl = 'admin/form';
$this->form = $this->formEdit($config);
$this->titleForm = __('Permissions head');
$this->classForm = 'editpermissions';
$this->titleForm = __('Parser settings head');
$this->classForm = 'editparsersettings';
return $this;
}
@ -80,9 +76,9 @@ class Permissions extends Admin
protected function formEdit(Config $config): array
{
$form = [
'action' => $this->c->Router->link('AdminPermissions'),
'action' => $this->c->Router->link('AdminParser'),
'hidden' => [
'token' => $this->c->Csrf->create('AdminPermissions'),
'token' => $this->c->Csrf->create('AdminParser'),
],
'sets' => [],
'btns' => [
@ -97,7 +93,7 @@ class Permissions extends Admin
$yn = [1 => __('Yes'), 0 => __('No')];
$form['sets']['posting'] = [
'legend' => __('Posting subhead'),
'legend' => __('BBCode subhead'),
'fields' => [
'p_message_bbcode' => [
'type' => 'radio',
@ -106,6 +102,13 @@ class Permissions extends Admin
'caption' => __('BBCode label'),
'info' => __('BBCode help'),
],
'p_sig_bbcode' => [
'type' => 'radio',
'value' => $config->p_sig_bbcode,
'values' => $yn,
'caption' => __('BBCode sigs label'),
'info' => __('BBCode sigs help'),
],
'p_message_img_tag' => [
'type' => 'radio',
'value' => $config->p_message_img_tag,
@ -113,12 +116,12 @@ class Permissions extends Admin
'caption' => __('Image tag label'),
'info' => __('Image tag help'),
],
'o_smilies' => [
'p_sig_img_tag' => [
'type' => 'radio',
'value' => $config->o_smilies,
'value' => $config->p_sig_img_tag,
'values' => $yn,
'caption' => __('Smilies label'),
'info' => __('Smilies help'),
'caption' => __('Image tag sigs label'),
'info' => __('Image tag sigs help'),
],
'o_make_links' => [
'type' => 'radio',
@ -139,21 +142,14 @@ class Permissions extends Admin
];
$form['sets']['signatures'] = [
'legend' => __('Signatures subhead'),
'legend' => __('Smilies subhead'),
'fields' => [
'p_sig_bbcode' => [
'o_smilies' => [
'type' => 'radio',
'value' => $config->p_sig_bbcode,
'value' => $config->o_smilies,
'values' => $yn,
'caption' => __('BBCode sigs label'),
'info' => __('BBCode sigs help'),
],
'p_sig_img_tag' => [
'type' => 'radio',
'value' => $config->p_sig_img_tag,
'values' => $yn,
'caption' => __('Image tag sigs label'),
'info' => __('Image tag sigs help'),
'caption' => __('Smilies label'),
'info' => __('Smilies help'),
],
'o_smilies_sig' => [
'type' => 'radio',

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

@ -659,4 +659,38 @@ class Update extends Admin
return null;
}
/**
* rev.13 to rev.14
*/
protected function stageNumber13(array $args): ?int
{
$coreConfig = new CoreConfig($this->c->DIR_CONFIG . '/' . self::CONFIG_FILE);
$result = $coreConfig->delete(
'multiple=>AdminPermissions',
);
$coreConfig->add(
'multiple=>AdminParser',
'\\ForkBB\\Models\\Pages\\Admin\\Parser\\Edit::class',
'AdminReports'
);
$coreConfig->add(
'multiple=>AdminParserSmilies',
'\\ForkBB\\Models\\Pages\\Admin\\Parser\\Smilies::class',
'AdminParser'
);
$coreConfig->add(
'multiple=>AdminParserBBCode',
'\\ForkBB\\Models\\Pages\\Admin\\Parser\\BBCode::class',
'AdminParserSmilies'
);
$coreConfig->save();
return null;
}
}

2
app/bootstrap.php
View file

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

4
app/config/main.dist.php
View file

@ -178,7 +178,6 @@ return [
'AdminIndex' => \ForkBB\Models\Pages\Admin\Index::class,
'AdminStatistics' => \ForkBB\Models\Pages\Admin\Statistics::class,
'AdminOptions' => \ForkBB\Models\Pages\Admin\Options::class,
'AdminPermissions' => \ForkBB\Models\Pages\Admin\Permissions::class,
'AdminCategories' => \ForkBB\Models\Pages\Admin\Categories::class,
'AdminForums' => \ForkBB\Models\Pages\Admin\Forums::class,
'AdminGroups' => \ForkBB\Models\Pages\Admin\Groups::class,
@ -193,6 +192,9 @@ return [
'AdminHost' => \ForkBB\Models\Pages\Admin\Host::class,
'AdminBans' => \ForkBB\Models\Pages\Admin\Bans::class,
'AdminReports' => \ForkBB\Models\Pages\Admin\Reports::class,
'AdminParser' => \ForkBB\Models\Pages\Admin\Parser\Edit::class,
'AdminParserSmilies' => \ForkBB\Models\Pages\Admin\Parser\Smilies::class,
'AdminParserBBCode' => \ForkBB\Models\Pages\Admin\Parser\BBCode::class,
'ConfigModel' => \ForkBB\Models\Config\Model::class,
'ConfigModelLoad' => \ForkBB\Models\Config\Load::class,

4
app/lang/en/admin.po
View file

@ -39,8 +39,8 @@ msgstr "User groups"
msgid "Admin options"
msgstr "Options"
msgid "Permissions"
msgstr "Permissions"
msgid "Parser settings"
msgstr "Parser"
msgid "Censoring"
msgstr "Censoring"

18
app/lang/en/admin_permissions.po → app/lang/en/admin_parser.po
View file

@ -12,14 +12,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Language: en\n"
msgid "Perms updated redirect"
msgstr "Permissions updated. Redirecting …"
msgid "Parser settings updated redirect"
msgstr "arser settings updated. Redirecting …"
msgid "Permissions head"
msgstr "Permissions"
msgid "Parser settings head"
msgstr "Parser settings"
msgid "Posting subhead"
msgstr "Posting"
msgid "BBCode subhead"
msgstr "BBCode"
msgid "BBCode label"
msgstr "BBCode"
@ -33,9 +33,6 @@ msgstr "Image tag"
msgid "Image tag help"
msgstr "Allow the BBCode [img][/img] tag in posts."
msgid "Signatures subhead"
msgstr "Signatures"
msgid "BBCode sigs label"
msgstr "BBCodes in signatures"
@ -48,6 +45,9 @@ msgstr "Image tag in signatures"
msgid "Image tag sigs help"
msgstr "Allow the BBCode [img][/img] tag in user signatures (not recommended)."
msgid "Smilies subhead"
msgstr "Smilies"
msgid "Smilies label"
msgstr "Smilies in posts"

4
app/lang/ru/admin.po
View file

@ -39,8 +39,8 @@ msgstr "Группы"
msgid "Admin options"
msgstr "Опции"
msgid "Permissions"
msgstr "Права"
msgid "Parser settings"
msgstr "Парсер"
msgid "Censoring"
msgstr "Цензура"

18
app/lang/ru/admin_permissions.po → app/lang/ru/admin_parser.po
View file

@ -12,14 +12,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Language: ru\n"
msgid "Perms updated redirect"
msgstr "Права изменены. Переадресация …"
msgid "Parser settings updated redirect"
msgstr "Настройки парсера изменены. Переадресация …"
msgid "Permissions head"
msgstr "Права"
msgid "Parser settings head"
msgstr "Настройки парсера"
msgid "Posting subhead"
msgstr "Сообщения"
msgid "BBCode subhead"
msgstr "BBCode"
msgid "BBCode label"
msgstr "BBcode в сообщениях"
@ -33,9 +33,6 @@ msgstr "Тег IMG в сообщениях"
msgid "Image tag help"
msgstr "Разрешить тег [img][/img] в сообщениях."
msgid "Signatures subhead"
msgstr "Подписи"
msgid "BBCode sigs label"
msgstr "BBcode в подписях"
@ -48,6 +45,9 @@ msgstr "Тег IMG в подписях"
msgid "Image tag sigs help"
msgstr "Разрешить тег [img][/img] в подписях пользователей (не рекомендуется)."
msgid "Smilies subhead"
msgstr "Смайлы"
msgid "Smilies label"
msgstr "Смайлы в сообщениях"