Mascali
/
raspisms
mirror of https://github.com/RaspbianFrance/raspisms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pass from gammu to smsd

This commit is contained in:
osaajani 2020-01-12 21:25:10 +01:00
parent 7d46c27a0d
commit 2175343b95
1 changed files with 2 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
adapters/GammuAdapter.php → adapters/GammuSmsdAdapter.php
View File

@ -8,7 +8,7 @@
* *
* All Phone Adapters must implement this interface * All Phone Adapters must implement this interface
*/ */
class GammuAdapter implements AdapterInterface class GammuSmsdAdapter implements AdapterInterface
{ {
/** /**
* Classname of the adapter * Classname of the adapter
@ -25,7 +25,7 @@
* Description of the adapter. * Description of the adapter.
* A short description of the service the adapter implements. * A short description of the service the adapter implements.
*/ */
public static function meta_description() : string { return 'Utilisation du logiciel Gammu qui doit être installé sur le serveur et configuré. Voir https://wammu.eu.'; } public static function meta_description() : string { return 'Utilisation du logiciel Gammu & Gammu SMSd qui doivent être installés sur le serveur et configuré. Voir https://wammu.eu.'; }
/** /**
* Description of the datas expected by the adapter to help the user. (e.g : A list of expecteds Api credentials fields, with name and value) * Description of the datas expected by the adapter to help the user. (e.g : A list of expecteds Api credentials fields, with name and value)
@ -45,12 +45,6 @@
'description' => 'Chemin vers le fichier de configuration que Gammu devra utilisé pour se connecter au téléphone.', 'description' => 'Chemin vers le fichier de configuration que Gammu devra utilisé pour se connecter au téléphone.',
'required' => true, 'required' => true,
], ],
[
'name' => 'pin',
'title' => 'Code PIN',
'description' => 'Code PIN devant être utilisé pour activer la carte SIM (laisser vide pour ne pas utiliser de code PIN).',
'required' => false,
],
]; ];
} }
@ -105,11 +99,6 @@
*/ */
public function send (string $destination, string $text, bool $flash = false) public function send (string $destination, string $text, bool $flash = false)
{ {
if (!$this->unlock_sim())
{
return false;
}
$command_parts = [ $command_parts = [
'gammu', 'gammu',
'--config', '--config',
@ -170,10 +159,6 @@
*/ */
public function read () : array public function read () : array
{ {
if (!$this->unlock_sim())
{
return [];
}
} }
@ -188,12 +173,6 @@
{ {
return false; return false;
} }
$result = $this->exec_command($command_parts);
if ($result['return'] != 0)
{
return false;
}
return true; return true;
} }
@ -209,48 +188,6 @@
} }
/**
* Function to unlock pin
* @return bool : False on error, true else
*/
private function unlock_sim () : bool
{
if (!$this->datas['pin'])
{
return true;
}
$command_parts = [
'gammu',
'--config',
escapeshellarg($this->datas['config_file']),
'entersecuritycode',
'PIN',
escapeshellarg($this->datas['pin']),
];
$result = $this->exec_command($command_parts);
//Check security status
$command_parts = [
'gammu',
'--config',
escapeshellarg($this->datas['config_file']),
'getsecuritystatus',
];
$result = $this->exec_command($command_parts);
if ($result['return'] != 0)
{
return false;
}
return $this->search_for_string($result['output'], 'nothing');
}
/** /**
* Function to execute a command and transmit it to Gammu * Function to execute a command and transmit it to Gammu
* @param array $command_parts : Commands parts to be join with a space * @param array $command_parts : Commands parts to be join with a space