echosystem.fr
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'phpservermon:develop' into fix/DBUserDetailRetention-LDAP

This commit is contained in:
Viharm 2023-08-14 06:34:37 +01:00 committed by GitHub
parent 59966c6cd2 5f65f92678
commit 537b17ac01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/psm/Txtmsg/Octopush.php
View File

@ -57,13 +57,16 @@ class Octopush extends Core
{
$smsType = "sms_premium"; // Or "sms_low_cost"
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, 'https://api.octopush.com/v1/public/sms-campaign/send');
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
curl_setopt($ch, CURLOPT_HTTPHEADER, [
'Content-Type: application/json',
'api-login: '.$this->username,
'api-key: '.$this->password,
'cache-control: no-cache',
]);
$recipients = [];
foreach ($this->recipients as $recipient) {
$recipients[] = ['phone_number' => ((substr($recipient, 0, 1) != '+') ? '+' : '').(string)$recipient];
@ -78,19 +81,14 @@ class Octopush extends Core
'sender' => substr($this->originator, 0, 15),
]));
$headers = array();
$headers[] = 'Content-Type: application/json';
$headers[] = 'Api-Key: '.$this->password;
$headers[] = 'Api-Login: '.$this->username;
$headers[] = 'Cache-Control: no-cache';
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
$response = curl_exec($ch);
$result = json_decode(curl_exec($ch), true);
$httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$err = curl_errno($ch);
curl_close($ch);
if ($err != 0 || $httpcode != 201) {
if ($err != 0 || ($httpcode != 201 && $httpcode != 200)) {
return $result['code'] . " - " . $result['message'];
}

2
src/psm/Txtmsg/Smsglobal.php
View File

@ -64,7 +64,7 @@ class Smsglobal extends Core
$curl = curl_init();
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl, CURLOPT_TIMEOUT, 30);
curl_setopt($curl, CURLOPT_URL, "https://www.smsglobal.com/http-api.php?" . http_build_query(
curl_setopt($curl, CURLOPT_URL, "https://api.smsglobal.com/http-api.php?" . http_build_query(
array(
"action" => "sendsms",
"user" => $this->username,