Mascali/raspisms
1
0
Fork 0
mirror of https://github.com/RaspbianFrance/raspisms.git synced 2025-04-21 08:56:27 +02:00
Code Issues Projects Releases Wiki Activity

Fix gammu adapter, first version of gammu sms parser

Browse source
This commit is contained in:
OsaAjani 2020-01-12 22:20:12 +01:00
parent d252f88595
commit fcc438af3c
4 changed files with 60 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

30
adapters/GammuAdapter.php
View file

@ -84,15 +84,7 @@
public function __construct (string $number, string $datas)
{
$this->number = $number;
$this->formatted_number = str_replace('+', '00', $number);
$this->datas = json_decode($datas, true);
$this->api = new Api(
$this->datas['app_key'],
$this->datas['app_secret'],
$this->datas['endpoint'],
$this->datas['consumer_key']
);
}
@ -136,14 +128,14 @@
return false;
}
$find_ok = $this->search_for_string('ok', $command_parts['output']);
$find_ok = $this->search_for_string($result['output'], 'ok');
if (!$find_ok)
{
return false;
}
$uid = false;
foreach ($output as $line)
foreach ($result['output'] as $line)
{
$matches = [];
preg_match('#reference=([0-9]+)#u', $line, $matches);
@ -184,17 +176,7 @@
*/
public function test () : bool
{
if (!file_exists($this->datas['config_file']))
{
return false;
}
$result = $this->exec_command($command_parts);
if ($result['return'] != 0)
{
return false;
}
//Always return true as we cannot test because we would be needing a root account
return true;
}
@ -258,12 +240,18 @@
*/
private function exec_command (array $command_parts) : array
{
//Add redirect of error to stdout
$command_parts[] = '2>&1';
$command = implode(' ', $command_parts);
$output = [];
$return_var = null;
exec($command, $output, $return_var);
var_dump($output);
return ['return' => (int) $return_var, 'output' => $output];
}