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

Code style

Browse source
This commit is contained in:
Visman 2021-02-13 17:03:24 +07:00
parent 1cc6f7a2a9
commit 05e53b5bcc
31 changed files with 146 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Models/Pages/Admin/Bans.php
View file

@ -128,9 +128,8 @@ class Bans extends Admin
'sets' => [],
'btns' => [
'search' => [
'type' => 'submit',
'value' => __('Submit search'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Submit search'),
],
],
];
@ -242,9 +241,8 @@ class Bans extends Admin
'sets' => [],
'btns' => [
'submit' => [
'type' => 'submit',
'value' => __('AdminBansNew' === $this->formBanPage ? 'Add' : 'Update'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('AdminBansNew' === $this->formBanPage ? 'Add' : 'Update'),
],
],
];

16
app/Models/Pages/Admin/Categories.php
View file

@ -78,9 +78,8 @@ class Categories extends Admin
'sets' => [],
'btns' => [
'submit' => [
'type' => 'submit',
'value' => __('Save changes'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Save changes'),
],
],
];
@ -224,14 +223,13 @@ class Categories extends Admin
],
'btns' => [
'delete' => [
'type' => 'submit',
'value' => __('Delete category'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Delete category'),
],
'cancel' => [
'type' => 'btn',
'value' => __('Cancel'),
'link' => $this->c->Router->link('AdminCategories'),
'type' => 'btn',
'value' => __('Cancel'),
'link' => $this->c->Router->link('AdminCategories'),
],
],
];

5
app/Models/Pages/Admin/Censoring.php
View file

@ -90,9 +90,8 @@ class Censoring extends Admin
],
'btns' => [
'submit' => [
'type' => 'submit',
'value' => __('Save changes'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Save changes'),
],
],
];

35
app/Models/Pages/Admin/Forums.php
View file

@ -141,15 +141,13 @@ class Forums extends Admin
'sets' => [],
'btns' => [
'new' => [
'type' => 'btn',
'value' => __('New forum'),
'link' => $this->c->Router->link('AdminForumsNew'),
// 'accesskey' => 'n',
'type' => 'btn',
'value' => __('New forum'),
'link' => $this->c->Router->link('AdminForumsNew'),
],
'update' => [
'type' => 'submit',
'value' => __('Update positions'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Update positions'),
],
],
];
@ -315,14 +313,13 @@ class Forums extends Admin
],
'btns' => [
'delete' => [
'type' => 'submit',
'value' => __('Delete forum'),
// 'accesskey' => 'd',
'type' => 'submit',
'value' => __('Delete forum'),
],
'cancel' => [
'type' => 'btn',
'value' => __('Cancel'),
'link' => $this->c->Router->link('AdminForums'),
'type' => 'btn',
'value' => __('Cancel'),
'link' => $this->c->Router->link('AdminForums'),
],
],
];
@ -448,17 +445,15 @@ class Forums extends Admin
if ($forum->id > 0) {
$form['btns']['reset'] = [
'type' => 'submit',
'value' => __('Revert to default'),
// 'accesskey' => 'r',
'class' => 'f-opacity',
'type' => 'submit',
'value' => __('Revert to default'),
'class' => 'f-opacity',
];
}
$form['btns']['submit'] = [
'type' => 'submit',
'value' => empty($forum->id) ? __('Add') : __('Update'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => empty($forum->id) ? __('Add') : __('Update'),
];
$form['sets']['forum'] = [

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

@ -90,9 +90,8 @@ class Groups extends Admin
],
'btns' => [
'submit' => [
'type' => 'submit',
'value' => __('Add'),
// 'accesskey' => 'n',
'type' => 'submit',
'value' => __('Add'),
],
],
];
@ -124,9 +123,8 @@ class Groups extends Admin
],
'btns' => [
'submit' => [
'type' => 'submit',
'value' => __('Update'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Update'),
],
],
];
@ -205,10 +203,7 @@ class Groups extends Admin
$vars = ['id' => $group->g_id];
$notNext .= ',' . $group->g_id;
$this->aCrumbs[] = [
$this->c->Router->link(
$marker,
$vars
),
$this->c->Router->link($marker, $vars),
__('Edit group'),
];
$this->aCrumbs[] = __('"%s"', $group->g_title);
@ -368,9 +363,8 @@ class Groups extends Admin
'sets' => [],
'btns' => [
'submit' => [
'type' => 'submit',
'value' => null === $group->g_id ? __('Add') : __('Update'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => null === $group->g_id ? __('Add') : __('Update'),
],
],
];
@ -756,14 +750,13 @@ class Groups extends Admin
'sets' => [],
'btns' => [
'delete' => [
'type' => 'submit',
'value' => __('Delete group'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Delete group'),
],
'cancel' => [
'type' => 'btn',
'value' => __('Cancel'),
'link' => $this->c->Router->link('AdminGroups'),
'type' => 'btn',
'value' => __('Cancel'),
'link' => $this->c->Router->link('AdminGroups'),
],
],
];

10
app/Models/Pages/Admin/Maintenance.php
View file

@ -92,9 +92,8 @@ class Maintenance extends Admin
],
'btns' => [
'submit' => [
'type' => 'submit',
'value' => __('Save changes'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Save changes'),
],
],
];
@ -158,9 +157,8 @@ class Maintenance extends Admin
],
'btns' => [
'rebuild' => [
'type' => 'submit',
'value' => __('Rebuild index'),
// 'accesskey' => 'r',
'type' => 'submit',
'value' => __('Rebuild index'),
],
],
];

5
app/Models/Pages/Admin/Options.php
View file

@ -190,9 +190,8 @@ class Options extends Admin
'sets' => [],
'btns' => [
'save' => [
'type' => 'submit',
'value' => __('Save changes'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Save changes'),
],
],
];

26
app/Models/Pages/Admin/Parser/BBCode.php
View file

@ -126,15 +126,13 @@ class BBCode extends Parser
],
'btns' => [
'new' => [
'type' => 'btn',
'value' => __('New BBCode'),
'link' => $this->c->Router->link('AdminBBCodeNew'),
// 'accesskey' => 'n',
'type' => 'btn',
'value' => __('New BBCode'),
'link' => $this->c->Router->link('AdminBBCodeNew'),
],
'save' => [
'type' => 'submit',
'value' => __('Save changes'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Save changes'),
],
],
];
@ -407,22 +405,20 @@ class BBCode extends Parser
'sets' => [],
'btns' => [
'reset' => [
'class' => 'f-opacity',
'type' => 'btn',
'value' => __('Default structure'),
'link' => $this->c->Router->link(
'class' => 'f-opacity',
'type' => 'btn',
'value' => __('Default structure'),
'link' => $this->c->Router->link(
'AdminBBCodeDefault',
[
'id' => $id,
'token' => null,
]
),
// 'accesskey' => 'r',
],
'save' => [
'type' => 'submit',
'value' => __('Save'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Save'),
],
],
];

5
app/Models/Pages/Admin/Parser/Edit.php
View file

@ -79,9 +79,8 @@ class Edit extends Parser
'sets' => [],
'btns' => [
'save' => [
'type' => 'submit',
'value' => __('Save changes'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Save changes'),
],
],
];

10
app/Models/Pages/Admin/Parser/Smilies.php
View file

@ -150,9 +150,8 @@ class Smilies extends Parser
],
'btns' => [
'save' => [
'type' => 'submit',
'value' => __('Save changes'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Save changes'),
],
],
];
@ -337,9 +336,8 @@ class Smilies extends Parser
],
'btns' => [
'upload' => [
'type' => 'submit',
'value' => __('Upload'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Upload'),
],
],
];

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

@ -323,9 +323,8 @@ class Update extends Admin
],
'btns' => [
'start' => [
'type' => 'submit',
'value' => __('Start update'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Start update'),
],
],
];

22
app/Models/Pages/Admin/Users/Action.php
View file

@ -194,14 +194,13 @@ class Action extends Users
],
'btns' => [
'delete' => [
'type' => 'submit',
'value' => __('Delete users'),
// 'accesskey' => 'd',
'type' => 'submit',
'value' => __('Delete users'),
],
'cancel' => [
'type' => 'btn',
'value' => __('Cancel'),
'link' => $this->c->Router->link('AdminUsers'),
'type' => 'btn',
'value' => __('Cancel'),
'link' => $this->c->Router->link('AdminUsers'),
],
],
];
@ -354,14 +353,13 @@ class Action extends Users
],
'btns' => [
'move' => [
'type' => 'submit',
'value' => __('Move users'),
// 'accesskey' => 'm',
'type' => 'submit',
'value' => __('Move users'),
],
'cancel' => [
'type' => 'btn',
'value' => __('Cancel'),
'link' => $linkCancel,
'type' => 'btn',
'value' => __('Cancel'),
'link' => $linkCancel,
],
],
];

5
app/Models/Pages/Admin/Users/NewUser.php
View file

@ -127,9 +127,8 @@ class NewUser extends Users
],
'btns' => [
'add' => [
'type' => 'submit',
'value' => __('Add'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Add'),
],
],
];

15
app/Models/Pages/Admin/Users/Result.php
View file

@ -241,23 +241,20 @@ class Result extends Users
if ($this->c->userRules->banUsers) {
$form['btns']['ban'] = [
'type' => 'submit',
'value' => __('Ban'),
// 'accesskey' => null,
'type' => 'submit',
'value' => __('Ban'),
];
}
if ($this->c->userRules->deleteUsers) {
$form['btns']['delete'] = [
'type' => 'submit',
'value' => __('Delete'),
// 'accesskey' => null,
'type' => 'submit',
'value' => __('Delete'),
];
}
if ($this->c->userRules->changeGroup) {
$form['btns']['change_group'] = [
'type' => 'submit',
'value' => __('Change group'),
// 'accesskey' => null,
'type' => 'submit',
'value' => __('Change group'),
];
}

22
app/Models/Pages/Admin/Users/View.php
View file

@ -147,10 +147,9 @@ class View extends Users
],
'btns' => [
'new' => [
'type' => 'btn',
'value' => __('Add'),
'link' => $this->c->Router->link('AdminUsersNew'),
// 'accesskey' => 'n',
'type' => 'btn',
'value' => __('Add'),
'link' => $this->c->Router->link('AdminUsersNew'),
],
],
];
@ -171,9 +170,8 @@ class View extends Users
'sets' => [],
'btns' => [
'search' => [
'type' => 'submit',
'value' => __('Submit search'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Submit search'),
],
],
];
@ -392,9 +390,8 @@ class View extends Users
'sets' => [],
'btns' => [
'find' => [
'type' => 'submit',
'value' => __('Find IP address'),
// 'accesskey' => 'f',
'type' => 'submit',
'value' => __('Find IP address'),
],
],
];
@ -455,9 +452,8 @@ class View extends Users
],
'btns' => [
'recalculate' => [
'type' => 'submit',
'value' => __('Recalculate'),
// 'accesskey' => 'r',
'type' => 'submit',
'value' => __('Recalculate'),
],
],
];

15
app/Models/Pages/Auth.php
View file

@ -169,9 +169,8 @@ class Auth extends Page
],
'btns' => [
'login' => [
'type' => 'submit',
'value' => __('Sign in'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Sign in'),
],
],
];
@ -347,9 +346,8 @@ class Auth extends Page
],
'btns' => [
'submit' => [
'type' => 'submit',
'value' => __('Send email'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Send email'),
],
],
];
@ -479,9 +477,8 @@ class Auth extends Page
],
'btns' => [
'submit' => [
'type' => 'submit',
'value' => __('Change passphrase'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Change passphrase'),
],
],
];

11
app/Models/Pages/Delete.php
View file

@ -123,14 +123,13 @@ class Delete extends Page
],
'btns' => [
'delete' => [
'type' => 'submit',
'value' => __($deleteTopic ? 'Delete topic' : 'Delete post'),
// 'accesskey' => 'd',
'type' => 'submit',
'value' => __($deleteTopic ? 'Delete topic' : 'Delete post'),
],
'cancel' => [
'type' => 'btn',
'value' => __('Cancel'),
'link' => $this->c->Router->link('ViewPost', $args),
'type' => 'btn',
'value' => __('Cancel'),
'link' => $this->c->Router->link('ViewPost', $args),
],
],
];

13
app/Models/Pages/Email.php
View file

@ -169,15 +169,14 @@ class Email extends Page
],
'btns' => [
'send' => [
'type' => 'submit',
'value' => __('Send email'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Send email'),
],
'back' => [
'type' => 'btn',
'value' => __('Go back'),
'link' => $data['redirect'],
'class' => 'f-opacity f-go-back',
'type' => 'btn',
'value' => __('Go back'),
'link' => $data['redirect'],
'class' => 'f-opacity f-go-back',
],
],
];

9
app/Models/Pages/Moderate.php
View file

@ -613,13 +613,12 @@ class Moderate extends Page
];
$form['sets']['moderate']['fields'] = $fields;
$form['btns'][$v->action] = [
'type' => 'submit',
'value' => $this->buttonValue,
// 'accesskey' => 's',
'type' => 'submit',
'value' => $this->buttonValue,
];
$form['btns']['cancel'] = [
'type' => 'submit',
'value' => __('Cancel'),
'type' => 'submit',
'value' => __('Cancel'),
];
return $form;

12
app/Models/Pages/PostFormTrait.php
View file

@ -32,15 +32,13 @@ trait PostFormTrait
'sets' => [],
'btns' => [
'submit' => [
'type' => 'submit',
'value' => __('Submit'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Submit'),
],
'preview' => [
'type' => 'submit',
'value' => __('Preview'),
// 'accesskey' => 'p',
'class' => 'f-opacity',
'type' => 'submit',
'value' => __('Preview'),
'class' => 'f-opacity',
],
],
];

5
app/Models/Pages/Profile/Config.php
View file

@ -139,9 +139,8 @@ class Config extends Profile
'sets' => [],
'btns' => [
'save' => [
'type' => 'submit',
'value' => __('Save changes'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Save changes'),
],
],
];

5
app/Models/Pages/Profile/Edit.php
View file

@ -223,9 +223,8 @@ class Edit extends Profile
'sets' => [],
'btns' => [
'save' => [
'type' => 'submit',
'value' => __('Save changes'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Save changes'),
],
],
];

5
app/Models/Pages/Profile/Email.php
View file

@ -207,9 +207,8 @@ class Email extends Profile
],
'btns' => [
'submit' => [
'type' => 'submit',
'value' => __('Submit'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Submit'),
],
],
];

5
app/Models/Pages/Profile/Mod.php
View file

@ -107,9 +107,8 @@ class Mod extends Profile
'sets' => [],
'btns' => [
'save' => [
'type' => 'submit',
'value' => __('Save'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Save'),
],
],
];

5
app/Models/Pages/Profile/Pass.php
View file

@ -119,9 +119,8 @@ class Pass extends Profile
],
'btns' => [
'submit' => [
'type' => 'submit',
'value' => __('Submit'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Submit'),
],
],
];

5
app/Models/Pages/Register.php
View file

@ -137,9 +137,8 @@ class Register extends Page
],
'btns' => [
'register' => [
'type' => 'submit',
'value' => __('Sign up'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Sign up'),
],
],
];

13
app/Models/Pages/Report.php
View file

@ -142,15 +142,14 @@ class Report extends Page
],
'btns' => [
'report' => [
'type' => 'submit',
'value' => __('Submit'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Submit'),
],
'back' => [
'type' => 'btn',
'value' => __('Go back'),
'link' => $this->c->Router->link('ViewPost', ['id' => $args['id']]),
'class' => 'f-opacity f-go-back',
'type' => 'btn',
'value' => __('Go back'),
'link' => $this->c->Router->link('ViewPost', ['id' => $args['id']]),
'class' => 'f-opacity f-go-back',
],
],
];

5
app/Models/Pages/Rules.php
View file

@ -84,9 +84,8 @@ class Rules extends Page
],
'btns' => [
'register' => [
'type' => 'submit',
'value' => __('Register'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Register'),
],
],
];

10
app/Models/Pages/Search.php
View file

@ -176,9 +176,8 @@ class Search extends Page
],
'btns' => [
'search' => [
'type' => 'submit',
'value' => __('Search btn'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Search btn'),
],
],
];
@ -303,9 +302,8 @@ class Search extends Page
],
'btns' => [
'search' => [
'type' => 'submit',
'value' => __('Search btn'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __('Search btn'),
],
],
];

10
app/Models/Pages/Userlist.php
View file

@ -118,10 +118,7 @@ class Userlist extends Page
foreach (['ASC', 'DESC'] as $j => $dir) {
$vars['dir'] = $dir;
$links[$i * 2 + $j] = $this->c->Router->link(
'Userlist',
$vars
);
$links[$i * 2 + $j] = $this->c->Router->link('Userlist', $vars);
if (
$v->sort === $sort
@ -168,9 +165,8 @@ class Userlist extends Page
'sets' => [],
'btns' => [
'submit' => [
'type' => 'submit',
'value' => __($this->user->searchUsers ? 'Search btn' : 'Submit'),
// 'accesskey' => 's',
'type' => 'submit',
'value' => __($this->user->searchUsers ? 'Search btn' : 'Submit'),
],
],
];

5
app/Models/Search/Model.php
View file

@ -43,10 +43,7 @@ class Model extends ParentModel
*/
protected function getlink(): string
{
return $this->c->Router->link(
$this->linkMarker,
$this->linkArgs
);
return $this->c->Router->link($this->linkMarker, $this->linkArgs);
}
/**