Merge pull request #12002 from irfanhanfi/request-to-query

Get request variables from query instead of request.
mautic · Mar 28, 2023 · 6072e36 · 6072e36
2 parents 21c945d + c8cf33c
commit 6072e36
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/app/bundles/EmailBundle/Controller/AjaxController.php b/app/bundles/EmailBundle/Controller/AjaxController.php
@@ -120,7 +120,7 @@ protected function generatePlaintTextAction(Request $request)
      */
     protected function getAttachmentsSizeAction(Request $request)
     {
-        $assets = $request->get('assets', [], true);
+        $assets = $request->query->get('assets', []);
         $size   = 0;
         if ($assets) {
             /** @var \Mautic\AssetBundle\Model\AssetModel $assetModel */
@@ -287,8 +287,8 @@ protected function getEmailCountStatsAction(Request $request)
         /** @var EmailModel $model */
         $model = $this->getModel('email');
 
-        $id  = $request->get('id');
-        $ids = $request->get('ids');
+        $id  = $request->query->get('id');
+        $ids = $request->query->get('ids');
 
         // Support for legacy calls
         if (!$ids && $id) {

diff --git a/app/bundles/EmailBundle/Tests/Functional/PendingCountTest.php b/app/bundles/EmailBundle/Tests/Functional/PendingCountTest.php
@@ -55,7 +55,7 @@ public function testPendingCountWithDeletedContactsInEmailStats(): void
         $this->em->flush();
 
         // The counts are loaded via ajax call after the email list page loads, so checking the ajax request instead of the HTML.
-        $this->client->request(Request::METHOD_POST, '/s/ajax?action=email:getEmailCountStats', ['id' => $email->getId()]);
+        $this->client->request(Request::METHOD_GET, '/s/ajax?action=email:getEmailCountStats', ['id' => $email->getId()]);
 
         Assert::assertSame(
             '{"id":'.$email->getId().',"pending":"1 Pending","queued":0,"sentCount":"0 Sent","readCount":"0 Read","readPercent":"0% Read"}',

diff --git a/app/bundles/LeadBundle/Controller/AjaxController.php b/app/bundles/LeadBundle/Controller/AjaxController.php
@@ -55,9 +55,9 @@ protected function userListAction(Request $request)
      */
     protected function getLeadIdsByFieldValueAction(Request $request)
     {
-        $field     = InputHelper::clean($request->request->get('field'));
-        $value     = InputHelper::clean($request->request->get('value'));
-        $ignore    = (int) $request->request->get('ignore');
+        $field     = InputHelper::clean($request->query->get('field'));
+        $value     = InputHelper::clean($request->query->get('value'));
+        $ignore    = (int) $request->query->get('ignore');
         $dataArray = ['items' => []];
 
         if ($field && $value) {
@@ -649,7 +649,7 @@ protected function getNewLeadsAction(Request $request)
     protected function getEmailTemplateAction(Request $request)
     {
         $data    = ['success' => 1, 'body' => '', 'subject' => ''];
-        $emailId = $request->get('template');
+        $emailId = $request->query->get('template');
 
         /** @var \Mautic\EmailBundle\Model\EmailModel $model */
         $model = $this->getModel('email');
@@ -932,8 +932,8 @@ protected function setAsPrimaryCompanyAction(Request $request)
 
     protected function getCampaignShareStatsAction(Request $request)
     {
-        $ids      = $request->get('ids');
-        $entityid = $request->get('entityId');
+        $ids      = $request->query->get('ids');
+        $entityid = $request->query->get('entityId');
         /** @var SegmentCampaignShare $segmentCampaignShareService */
         $segmentCampaignShareService = $this->get('mautic.lead.segment.stat.campaign.share');
 

diff --git a/app/bundles/PluginBundle/Controller/AjaxController.php b/app/bundles/PluginBundle/Controller/AjaxController.php
@@ -123,8 +123,8 @@ protected function getIntegrationFieldsAction(Request $request)
      */
     protected function getIntegrationConfigAction(Request $request)
     {
-        $integration = $request->request->get('integration');
-        $settings    = $request->request->get('settings');
+        $integration = $request->query->get('integration');
+        $settings    = $request->query->get('settings');
         $dataArray   = ['success' => 0];
 
         if (!empty($integration) && !empty($settings)) {
@@ -180,9 +180,9 @@ protected function getIntegrationConfigAction(Request $request)
 
     protected function getIntegrationCampaignStatusAction(Request $request)
     {
-        $integration = $request->request->get('integration');
-        $campaign    = $request->request->get('campaign');
-        $settings    = $request->request->get('settings');
+        $integration = $request->query->get('integration');
+        $campaign    = $request->query->get('campaign');
+        $settings    = $request->query->get('settings');
         $dataArray   = ['success' => 0];
         $statusData  = [];
         if (!empty($integration) && !empty($campaign)) {
@@ -240,7 +240,7 @@ protected function getIntegrationCampaignStatusAction(Request $request)
      */
     protected function getIntegrationCampaignsAction(Request $request)
     {
-        $integration = $request->request->get('integration');
+        $integration = $request->query->get('integration');
         $dataArray   = ['success' => 0];
 
         if (!empty($integration)) {