Compare commits
10 Commits
acb072f237
...
c3945709c3
Author | SHA1 | Date |
---|---|---|
hmoreau | c3945709c3 | |
Tim Zandbergen | fccc264107 | |
Viharm | 61afb81554 | |
Viharm | 537b17ac01 | |
Tim Zandbergen | 5f65f92678 | |
Marc Farré | 850f0eac8d | |
Viharm | 59966c6cd2 | |
Viharm | c81a4a426c | |
Raphael.Bergmann | 7245f65873 | |
viharm | 9643ef3f6f |
|
@ -252,7 +252,7 @@ class User
|
||||||
// Delegate the authentication to the PsmLDAPauth module.
|
// Delegate the authentication to the PsmLDAPauth module.
|
||||||
// If LDAP auth fails or if library not found, fall back to native auth
|
// If LDAP auth fails or if library not found, fall back to native auth
|
||||||
include_once($ldaplibpath);
|
include_once($ldaplibpath);
|
||||||
$ldapauthstatus = psmldapauth($user_name, $user_password, $GLOBALS['sm_config'], $this->db_connection);
|
$ldapauthstatus = psmldapauth($user_name, $user_password, $GLOBALS['sm_config'], $this->db_connection, $this->getUserByUsername($user_name));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,13 +57,16 @@ class Octopush extends Core
|
||||||
{
|
{
|
||||||
$smsType = "sms_premium"; // Or "sms_low_cost"
|
$smsType = "sms_premium"; // Or "sms_low_cost"
|
||||||
|
|
||||||
|
|
||||||
$ch = curl_init();
|
$ch = curl_init();
|
||||||
|
|
||||||
curl_setopt($ch, CURLOPT_URL, 'https://api.octopush.com/v1/public/sms-campaign/send');
|
curl_setopt($ch, CURLOPT_URL, 'https://api.octopush.com/v1/public/sms-campaign/send');
|
||||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
|
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
|
||||||
curl_setopt($ch, CURLOPT_POST, 1);
|
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 = [];
|
$recipients = [];
|
||||||
foreach ($this->recipients as $recipient) {
|
foreach ($this->recipients as $recipient) {
|
||||||
$recipients[] = ['phone_number' => ((substr($recipient, 0, 1) != '+') ? '+' : '').(string)$recipient];
|
$recipients[] = ['phone_number' => ((substr($recipient, 0, 1) != '+') ? '+' : '').(string)$recipient];
|
||||||
|
@ -78,19 +81,14 @@ class Octopush extends Core
|
||||||
'sender' => substr($this->originator, 0, 15),
|
'sender' => substr($this->originator, 0, 15),
|
||||||
]));
|
]));
|
||||||
|
|
||||||
$headers = array();
|
$response = curl_exec($ch);
|
||||||
$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);
|
|
||||||
|
|
||||||
$result = json_decode(curl_exec($ch), true);
|
$result = json_decode(curl_exec($ch), true);
|
||||||
$httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
$httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||||
$err = curl_errno($ch);
|
$err = curl_errno($ch);
|
||||||
curl_close($ch);
|
curl_close($ch);
|
||||||
|
|
||||||
if ($err != 0 || $httpcode != 201) {
|
if ($err != 0 || ($httpcode != 201 && $httpcode != 200)) {
|
||||||
return $result['code'] . " - " . $result['message'];
|
return $result['code'] . " - " . $result['message'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,7 @@ class Smsglobal extends Core
|
||||||
$curl = curl_init();
|
$curl = curl_init();
|
||||||
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
|
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
|
||||||
curl_setopt($curl, CURLOPT_TIMEOUT, 30);
|
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(
|
array(
|
||||||
"action" => "sendsms",
|
"action" => "sendsms",
|
||||||
"user" => $this->username,
|
"user" => $this->username,
|
||||||
|
|
Loading…
Reference in New Issue