fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-03 01:03:28 +09:00
Code Issues Projects Releases Packages Wiki Activity

Update several mail and SMS drivers to use HTTP class instead of Requests or raw curl

Browse source
This commit is contained in:
Kijin Sung 2023-04-23 00:40:30 +09:00
parent cf84d70ca1
commit 4f73c9562b
4 changed files with 25 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

15
common/framework/drivers/mail/sendgrid.php
View file

@ -147,25 +147,26 @@ class SendGrid extends Base implements \Rhymix\Framework\Drivers\MailInterface
$headers = array(
'Authorization' => 'Bearer ' . $this->_config['api_token'],
'Content-Type' => 'application/json',
'User-Agent' => 'PHP',
);
$options = array(
'timeout' => 8,
'useragent' => 'PHP',
);
// Send the API request.
$request = \Requests::post(self::$_url, $headers, json_encode($data), $options);
$response_code = intval($request->status_code);;
$request = \Rhymix\Framework\HTTP::post(self::$_url, $data, $headers, [], $options);
$status_code = $request->getStatusCode();
$result = $request->getBody()->getContents();
// Parse the result.
if (!$response_code)
if (!$status_code)
{
$message->errors[] = 'SendGrid: Connection error: ' . $request->body;
$message->errors[] = 'SendGrid: Connection error: ' . $result;
return false;
}
elseif ($response_code > 202)
elseif ($status_code > 202)
{
$message->errors[] = 'SendGrid: Response code ' . $response_code . ': ' . $request->body;
$message->errors[] = 'SendGrid: Response code ' . $status_code . ': ' . $result;
return false;
}