use Request::has()tic-4587

5 files changed, 12 insertions, 12 deletions

diff --git a/app/controllers/api/oauth2/authorize.php b/app/controllers/api/oauth2/authorize.php
index 2643c19..bd0b2ca 100644
--- a/app/controllers/api/oauth2/authorize.php
+++ b/app/controllers/api/oauth2/authorize.php
@@ -23,7 +23,7 @@ class Api_Oauth2_AuthorizeController extends OAuth2Controller
     {
         $method = $this->getMethod();
 
-        if (Request::submitted('auth_token')) {
+        if (Request::has('auth_token')) {
             if ('nobody' === $GLOBALS['user']->id) {
                 throw new LoginException();
             }
@@ -124,7 +124,7 @@ class Api_Oauth2_AuthorizeController extends OAuth2Controller
      */
     private function assertValidAuthToken(string $authToken): void
     {
-        if (Request::submitted('auth_token') && $authToken !== Request::get('auth_token')) {
+        if (Request::has('auth_token') && $authToken !== Request::get('auth_token')) {
             throw InvalidAuthTokenException::different();
         }
     }
diff --git a/app/controllers/consultation/admin.php b/app/controllers/consultation/admin.php
index 2387775..f64c651 100644
--- a/app/controllers/consultation/admin.php
+++ b/app/controllers/consultation/admin.php
@@ -643,7 +643,7 @@ class Consultation_AdminController extends ConsultationController
                 } elseif ($deleted > 0) {
                     PageLayout::postSuccess(_('Die freien Termine wurden gelöscht'));
                 }
-            } elseif (Request::option('delete') === 'cancel' && Request::submitted('reason')) {
+            } elseif (Request::option('delete') === 'cancel' && Request::has('reason')) {
                 $reason = trim(Request::get('reason'));
 
                 $deleted = 0;
@@ -668,7 +668,7 @@ class Consultation_AdminController extends ConsultationController
                 return;
             }
         } elseif (Request::submitted('cancel')) {
-            if (!Request::submitted('reason')) {
+            if (!Request::has('reason')) {
                 PageLayout::setTitle(_('Termine absagen'));
                 $this->action = $this->bulk($page, $expired);
                 $this->render_action('cancel_slots');
@@ -925,7 +925,7 @@ class Consultation_AdminController extends ConsultationController
             $index_time = $index;
         }
 
-        if (!Request::submitted("{$index}-date") || !Request::submitted("{$index_time}-time")) {
+        if (!Request::has("{$index}-date") || !Request::has("{$index_time}-time")) {
             throw new Exception("Date with index '{$index}' was not submitted properly");
         }
 
diff --git a/app/controllers/consultation/consultation_controller.php b/app/controllers/consultation/consultation_controller.php
index 00e10ad..ecdf6e4 100644
--- a/app/controllers/consultation/consultation_controller.php
+++ b/app/controllers/consultation/consultation_controller.php
@@ -13,9 +13,9 @@ abstract class ConsultationController extends AuthenticatedController
         parent::before_filter($action, $args);
 
         $type = 'person';
-        if (Request::submitted('username')) {
+        if (Request::has('username')) {
             $this->range = User::findByUsername(Request::username('username'));
-        } elseif (Request::submitted('cid')) {
+        } elseif (Request::has('cid')) {
             $this->range = Context::get();
             $type = 'object';
         } else {
diff --git a/app/controllers/messages.php b/app/controllers/messages.php
index 3c374b2..d7590e0 100644
--- a/app/controllers/messages.php
+++ b/app/controllers/messages.php
@@ -240,7 +240,7 @@ class MessagesController extends AuthenticatedController {
         $group_ids = [];
         if (Request::option('group_id')) {
             $group_ids[] = Request::option('group_id');
-        } elseif (Request::submitted('group_ids')) {
+        } elseif (Request::has('group_ids')) {
             $group_ids = Request::getArray('group_ids');
         }
         if ($group_ids) {
@@ -579,9 +579,9 @@ class MessagesController extends AuthenticatedController {
 
         if (count($recipients) === 0) {
             PageLayout::postError(_('Sie haben nicht angegeben, wer die Nachricht empfangen soll!'));
-        } elseif (Request::submitted('message_id') && Message::exists(Request::option('message_id'))) {
+        } elseif (Request::has('message_id') && Message::exists(Request::option('message_id'))) {
             PageLayout::postInfo(_('Diese Nachricht wurde bereits verschickt.'));
-        } elseif (Request::submitted('message_body')) {
+        } elseif (Request::has('message_body')) {
             $messaging = new messaging();
             $rec_uname = User::findAndMapMany(function ($user) {
                 return $user->username;
@@ -1019,7 +1019,7 @@ class MessagesController extends AuthenticatedController {
             $this->url_for("messages/{$action}"),
             null,
             ['class' => 'tag all-tags']
-        )->setActive(!Request::submitted("tag"));
+        )->setActive(!Request::has("tag"));
         if (empty($this->tags)) {
             $folderwidget->style = 'display:none';
         } else {
diff --git a/app/controllers/tfa.php b/app/controllers/tfa.php
index 370d883..86ece64 100644
--- a/app/controllers/tfa.php
+++ b/app/controllers/tfa.php
@@ -13,7 +13,7 @@ class TfaController extends AuthenticatedController
 
         $this->own_profile = true;
 
-        if ($this->is_root && Request::submitted('username')) {
+        if ($this->is_root && Request::has('username')) {
             $username = Request::username('username');
             $this->user = User::findOneByUsername($username);