Skip to content

Commit faff9af

Browse files
committed
Use HttpFoundation\Request instead of $_POST array
1 parent 8634302 commit faff9af

File tree

1 file changed

+24
-21
lines changed

1 file changed

+24
-21
lines changed

public/main/inc/ajax/install.ajax.php

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
/* For licensing terms, see /license.txt */
44

5+
use GuzzleHttp\Client;
6+
use GuzzleHttp\Exception\GuzzleException;
7+
use Symfony\Component\HttpFoundation\Request;
58
use Symfony\Component\Mailer\Transport;
69
use Symfony\Component\Mailer\Mailer;
710
use Symfony\Component\Mime\Address;
@@ -12,21 +15,23 @@
1215
*/
1316
require_once __DIR__.'/../../../../vendor/autoload.php';
1417

15-
$action = $_GET['a'];
18+
$request = Request::createFromGlobals();
19+
20+
$action = $request->query->getString('a');
1621

1722
switch ($action) {
1823
case 'send_contact_information':
19-
if (!empty($_POST)) {
24+
if ($request->isXmlHttpRequest()) {
2025
// get params from contact form
21-
$person_name = $_POST['person_name'];
22-
$person_email = $_POST['person_email'];
23-
$person_role = $_POST['person_role'];
24-
$financial_decision = $_POST['financial_decision'];
25-
$contact_language = $_POST['language'];
26-
$company_name = $_POST['company_name'];
27-
$company_activity = $_POST['company_activity'];
28-
$company_country = $_POST['company_country'];
29-
$company_city = $_POST['company_city'];
26+
$person_name = $request->request->get('person_name');
27+
$person_email = $request->request->get('person_email');
28+
$person_role = $request->request->get('person_role');
29+
$financial_decision = $request->request->get('financial_decision');
30+
$contact_language = $request->request->get('language');
31+
$company_name = $request->request->get('company_name');
32+
$company_activity = $request->request->get('company_activity');
33+
$company_country = $request->request->get('company_country');
34+
$company_city = $request->request->get('company_city');
3035

3136
// validating required fields
3237
$a_required_fields = [$person_name, $person_role, $company_name, $company_activity, $company_country];
@@ -58,7 +63,7 @@
5863
if ('200' == $res->getStatusCode() || '301' == $res->getStatusCode()) {
5964
$urlValidated = true;
6065
}
61-
} catch (Exception $e) {
66+
} catch (Exception|GuzzleException $e) {
6267
error_log("Could not check $url from ".__FILE__);
6368
break;
6469
}
@@ -75,7 +80,7 @@
7580
'company_city' => $company_city,
7681
];
7782

78-
$client = new GuzzleHttp\Client();
83+
$client = new Client();
7984
$options['query'] = $data;
8085
$res = $client->request('GET', $url, $options);
8186
if ('200' == $res->getStatusCode()) {
@@ -86,21 +91,19 @@
8691
break;
8792

8893
case 'test_mailer':
89-
if (!empty($_POST)) {
90-
$mailerDsn = $_POST['mailerDsn'] ?? '';
91-
$mailerFromEmail = $_POST['mailerFromEmail'] ?? '';
92-
$mailerFromName = $_POST['mailerFromName'] ?? '';
94+
if ($request->isXmlHttpRequest()) {
95+
$mailerDsn = $request->request->get('mailerDsn');
96+
$mailerTestFrom = $request->request->get('mailerTestFrom');
97+
$mailerFromEmail = $request->request->get('mailerFromEmail');
98+
$mailerFromName = $request->request->get('mailerFromName');
9399

94100
try {
95101
$transport = Transport::fromDsn($mailerDsn);
96102

97103
$mailer = new Mailer($transport);
98104

99105
$email = (new Email())
100-
->from(new Address(
101-
$mailerFromEmail ?: 'test@example.com',
102-
$mailerFromName ?: 'Test Sender'
103-
))
106+
->from(new Address($mailerTestFrom))
104107
->to($mailerFromEmail ?: 'test@example.com')
105108
->subject('Chamilo Mail Test')
106109
->text('This is a test e-mail sent from Chamilo installation wizard.');

0 commit comments

Comments
 (0)