Mascali/raspisms
1
0
Fork 0
mirror of https://github.com/RaspbianFrance/raspisms.git synced 2025-04-20 16:37:48 +02:00
Code Issues Projects Releases Wiki Activity

fix error transfer received sms + finish octopush shortcode adapter

Browse source
This commit is contained in:
osaajani 2020-04-03 03:38:35 +02:00
parent 6ad299f21e
commit 49f3a4b28c
8 changed files with 139 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
controllers/internals/Tool.php
View file

@ -64,7 +64,7 @@ namespace controllers\internals;
}
catch (\Exception $e)
{
return $number;
return false;
}
}

8
controllers/internals/User.php
View file

@ -19,12 +19,14 @@ namespace controllers\internals;
private $model_user;
private $internal_event;
private $internal_setting;
private $internal_phone;
public function __construct(\PDO $bdd)
{
$this->model_user = new \models\User($bdd);
$this->internal_event = new \controllers\internals\Event($bdd);
$this->internal_setting = new \controllers\internals\Setting($bdd);
$this->internal_phone = new Phone($bdd);
}
/**
@ -267,8 +269,7 @@ namespace controllers\internals;
*/
public function transfer_received (int $id_user, array $received) : bool
{
$internal_setting = new Setting($this->bdd);
$settings = $internal_setting->gets_for_user($id_user);
$settings = $this->internal_setting->gets_for_user($id_user);
if (!$settings['transfer'] ?? false)
{
@ -281,8 +282,7 @@ namespace controllers\internals;
return false;
}
$internal_phone = new Phone($this->bdd);
$phone = $internal_phone->get_for_user($id_user, $destination);
$phone = $this->internal_phone->get_for_user($id_user, $destination);
if (!$phone)
{
return false;

8
controllers/publics/Callback.php
View file

@ -23,6 +23,7 @@ use Monolog\Logger;
private $user;
private $internal_user;
private $internal_sended;
private $internal_received;
private $internal_adapter;
public function __construct()
@ -31,6 +32,7 @@ use Monolog\Logger;
$this->internal_user = new \controllers\internals\User($bdd);
$this->internal_sended = new \controllers\internals\Sended($bdd);
$this->internal_received = new \controllers\internals\Received($bdd);
$this->internal_adapter = new \controllers\internals\Adapter();
//Logger
@ -172,14 +174,16 @@ use Monolog\Logger;
return false;
}
$response = $internal_received->receive($this->user['id'], $id_phone, $response['sms']['text'], $response['sms']['origin'], $response['sms']['at']);
$sms = $response['sms'];
$response = $this->internal_received->receive($this->user['id'], $id_phone, $sms['text'], $sms['origin'], $sms['at']);
if ($response['error'])
{
$this->logger->error('Failed receive message : ' . json_encode($sms) . ' with error : ' . $response['error_message']);
return false;
}
$this->logger->info('Callback reception successfully received message ' . json_encode($response['sms']));
$this->logger->info('Callback reception successfully received message : ' . json_encode($sms));
return true;
}
}