diff --git a/app/Models/Pages/Admin/Categories.php b/app/Models/Pages/Admin/Categories.php index 1343310e..ee10bf3e 100644 --- a/app/Models/Pages/Admin/Categories.php +++ b/app/Models/Pages/Admin/Categories.php @@ -142,17 +142,14 @@ class Categories extends Admin $v = $this->c->Validator->reset() ->addRules([ 'token' => 'token:AdminCategoriesDelete', - 'confirm' => 'integer', + 'confirm' => 'integer', // ???? 'delete' => 'string', - 'cancel' => 'string', ])->addAliases([ ])->addArguments([ 'token' => $args, ]); - if (! $v->validation($_POST) || null === $v->delete) { - return $this->c->Redirect->page('AdminCategories')->message('Cancel redirect'); - } elseif ($v->confirm !== 1) { + if (! $v->validation($_POST) || $v->confirm !== 1) { return $this->c->Redirect->page('AdminCategories')->message('No confirm redirect'); } @@ -180,8 +177,9 @@ class Categories extends Admin 'accesskey' => 'd', ], 'cancel' => [ - 'type' => 'submit', + 'type' => 'btn', 'value' => \ForkBB\__('Cancel'), + 'link' => $this->c->Router->link('AdminCategories'), ], ], ]; diff --git a/app/Models/Pages/Admin/Forums.php b/app/Models/Pages/Admin/Forums.php index 6e88bb47..837ca7f2 100644 --- a/app/Models/Pages/Admin/Forums.php +++ b/app/Models/Pages/Admin/Forums.php @@ -221,17 +221,14 @@ class Forums extends Admin $v = $this->c->Validator->reset() ->addRules([ 'token' => 'token:AdminForumsDelete', - 'confirm' => 'integer', + 'confirm' => 'integer', // ???? 'delete' => 'string', - 'cancel' => 'string', ])->addAliases([ ])->addArguments([ 'token' => $args, ]); - if (! $v->validation($_POST) || null === $v->delete) { - return $this->c->Redirect->page('AdminForums')->message('Cancel redirect'); - } elseif ($v->confirm !== 1) { + if (! $v->validation($_POST) || $v->confirm !== 1) { return $this->c->Redirect->page('AdminForums')->message('No confirm redirect'); } @@ -259,8 +256,9 @@ class Forums extends Admin 'accesskey' => 'd', ], 'cancel' => [ - 'type' => 'submit', + 'type' => 'btn', 'value' => \ForkBB\__('Cancel'), + 'link' => $this->c->Router->link('AdminForums'), ], ], ]; diff --git a/app/Models/Pages/Admin/Groups.php b/app/Models/Pages/Admin/Groups.php index 0d902ead..b3cff2ed 100644 --- a/app/Models/Pages/Admin/Groups.php +++ b/app/Models/Pages/Admin/Groups.php @@ -641,17 +641,14 @@ class Groups extends Admin ->addRules([ 'token' => 'token:AdminGroupsDelete', 'movegroup' => $move, - 'confirm' => 'integer', + 'confirm' => 'integer', // ???? 'delete' => 'string', - 'cancel' => 'string', ])->addAliases([ ])->addArguments([ 'token' => $args, ]); - if (! $v->validation($_POST) || null === $v->delete) { - return $this->c->Redirect->page('AdminGroups')->message('Cancel redirect'); - } elseif ($v->confirm !== 1) { + if (! $v->validation($_POST) || $v->confirm !== 1) { return $this->c->Redirect->page('AdminGroups')->message('No confirm redirect'); } @@ -681,8 +678,9 @@ class Groups extends Admin 'accesskey' => 'd', ], 'cancel' => [ - 'type' => 'submit', + 'type' => 'btn', 'value' => \ForkBB\__('Cancel'), + 'link' => $this->c->Router->link('AdminGroups'), ], ], ]; diff --git a/app/Models/Pages/Delete.php b/app/Models/Pages/Delete.php index fd814410..97804e22 100644 --- a/app/Models/Pages/Delete.php +++ b/app/Models/Pages/Delete.php @@ -31,17 +31,14 @@ class Delete extends Page $v = $this->c->Validator->reset() ->addRules([ 'token' => 'token:DeletePost', - 'confirm' => 'integer', + 'confirm' => 'integer', // ???? 'delete' => 'string', - 'cancel' => 'string', ])->addAliases([ ])->addArguments([ 'token' => $args, ]); - if (! $v->validation($_POST) || null === $v->delete) { - return $this->c->Redirect->page('ViewPost', $args)->message('Cancel redirect'); - } elseif ($v->confirm !== 1) { + if (! $v->validation($_POST) || $v->confirm !== 1) { return $this->c->Redirect->page('ViewPost', $args)->message('No confirm redirect'); } @@ -105,8 +102,9 @@ class Delete extends Page 'accesskey' => 'd', ], 'cancel' => [ - 'type' => 'submit', + 'type' => 'btn', 'value' => \ForkBB\__('Cancel'), + 'link' => $this->c->Router->link('ViewPost', $args), ], ], ];