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

fix style

This commit is contained in:
osaajani 2021-02-23 00:31:54 +01:00
parent 296fbd61e8
commit 3b662c1153
24 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,6 +4,7 @@
.credentials
.credentials*
vendor/
scripts/
composer.lock
env.*
phinx.*

4
adapters/AdapterInterface.php
View File

@ -39,8 +39,8 @@ namespace adapters;
public static function meta_uid(): string;
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only.
*/
public static function meta_hidden(): bool;

4
adapters/BenchmarkAdapter.php
View File

@ -56,10 +56,10 @@ namespace adapters;
{
return 'benchmark_adapter';
}
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
* available to creation through API only.
*/
public static function meta_hidden(): bool
{

5
adapters/GammuAdapter.php
View File

@ -51,17 +51,16 @@ namespace adapters;
{
return 'gammu_adapter';
}
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
* available to creation through API only.
*/
public static function meta_hidden(): bool
{
return false;
}
/**
* Name of the adapter.
* It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.).

6
adapters/OctopushShortcodeAdapter.php
View File

@ -50,7 +50,7 @@ class OctopushShortcodeAdapter implements AdapterInterface
* Adapter constructor, called when instanciated by RaspiSMS.
*
* @param string $number : Phone number the adapter is used for
* @param json string $data : JSON string of the data to configure interaction with the implemented service
* @param json string $data : JSON string of the data to configure interaction with the implemented service
*/
public function __construct(string $data)
{
@ -77,10 +77,10 @@ class OctopushShortcodeAdapter implements AdapterInterface
{
return 'octopush_shortcode_adapter';
}
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
* available to creation through API only.
*/
public static function meta_hidden(): bool
{

6
adapters/OctopushVirtualNumberAdapter.php
View File

@ -55,7 +55,7 @@ class OctopushVirtualNumberAdapter implements AdapterInterface
* Adapter constructor, called when instanciated by RaspiSMS.
*
* @param string $number : Phone number the adapter is used for
* @param json string $data : JSON string of the data to configure interaction with the implemented service
* @param json string $data : JSON string of the data to configure interaction with the implemented service
*/
public function __construct(string $data)
{
@ -83,10 +83,10 @@ class OctopushVirtualNumberAdapter implements AdapterInterface
{
return 'octopush_virtual_number_adapter';
}
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
* available to creation through API only.
*/
public static function meta_hidden(): bool
{

6
adapters/OvhSmsShortcodeAdapter.php
View File

@ -32,7 +32,7 @@ namespace adapters;
* Adapter constructor, called when instanciated by RaspiSMS.
*
* @param string $number : Phone number the adapter is used for
* @param json string $data : JSON string of the data to configure interaction with the implemented service
* @param json string $data : JSON string of the data to configure interaction with the implemented service
*/
public function __construct(string $data)
{
@ -62,10 +62,10 @@ namespace adapters;
{
return 'ovh_sms_shortcode_adapter';
}
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
* available to creation through API only.
*/
public static function meta_hidden(): bool
{

4
adapters/OvhSmsVirtualNumberAdapter.php
View File

@ -74,10 +74,10 @@ namespace adapters;
{
return 'ovh_sms_virtual_number_adapter';
}
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
* available to creation through API only.
*/
public static function meta_hidden(): bool
{

4
adapters/TestAdapter.php
View File

@ -61,10 +61,10 @@ namespace adapters;
{
return 'test_adapter';
}
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
* available to creation through API only.
*/
public static function meta_hidden(): bool
{

6
adapters/TwilioVirtualNumberAdapter.php
View File

@ -42,7 +42,7 @@ class TwilioVirtualNumberAdapter implements AdapterInterface
* Adapter constructor, called when instanciated by RaspiSMS.
*
* @param string $number : Phone number the adapter is used for
* @param json string $data : JSON string of the data to configure interaction with the implemented service
* @param json string $data : JSON string of the data to configure interaction with the implemented service
*/
public function __construct(string $data)
{
@ -73,10 +73,10 @@ class TwilioVirtualNumberAdapter implements AdapterInterface
{
return 'twilio_virtual_number_adapter';
}
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
* available to creation through API only.
*/
public static function meta_hidden(): bool
{

2
controllers/internals/Console.php
View File

@ -71,8 +71,6 @@ namespace controllers\internals;
* Check if a user exists based on email.
*
* @param string $email : User email
*
* @return void : exit code 1 on false, 0 else
*/
public function user_exists(string $email)
{

13
controllers/internals/Contact.php
View File

@ -59,7 +59,7 @@ namespace controllers\internals;
* @param int $id_user : User id
* @param string $number : Contact number
* @param string $name : Contact name
* @param string $data : Contact data
* @param string $data : Contact data
*
* @return mixed bool|int : False if cannot create contact, id of the new contact else
*/
@ -91,7 +91,7 @@ namespace controllers\internals;
* @param int $id : Contact id
* @param string $number : Contact number
* @param string $name : Contact name
* @param ?string $data : Contact data
* @param ?string $data : Contact data
*
* @return int : number of modified rows
*/
@ -135,7 +135,7 @@ namespace controllers\internals;
//Padding line with '' entries to make sure its same length as head
//this allow to mix users with data with users without data
$line = array_pad($line, count($head), '');
$line = array_pad($line, \count($head), '');
$line = array_combine($head, $line);
if (false === $line)
@ -282,15 +282,16 @@ namespace controllers\internals;
$data = json_decode($contact['data'], true);
$line = [$contact['name'], $contact['number']];
foreach (array_slice($columns, 2) as $column) //ignore first two columns as it's alway name & number
{
foreach (\array_slice($columns, 2) as $column)
{ //ignore first two columns as it's alway name & number
//If their is no data for this column key, we set '' to ignore
if (!isset($data[$column]))
{
$line[] = '';
continue;
}
$line[] = $data[$column];
}
$lines[] = $line;

2
controllers/internals/ExpressionProvider.php
View File

@ -27,7 +27,7 @@ class ExpressionProvider implements ExpressionFunctionProviderInterface
{
return null;
});
//Exists must be personnalized because it inverse is_null
$exists = new ExpressionFunction('exists', function ($str)
{

2
controllers/internals/Mailer.php
View File

@ -100,7 +100,7 @@ class Mailer extends \descartes\Controller
*
* @param string $destination : email address to send email to
* @param array $settings : Email settings
* @param array $data : Data to inject into email template
* @param array $data : Data to inject into email template
*
* @return bool : true on success, false on error
*/

14
controllers/internals/Phone.php
View File

@ -55,9 +55,9 @@ namespace controllers\internals;
/**
* Create a phone.
*
* @param int $id_user : User to insert phone for
* @param string $name : The name of the phone
* @param string $adapter : The adapter to use the phone
* @param int $id_user : User to insert phone for
* @param string $name : The name of the phone
* @param string $adapter : The adapter to use the phone
* @param string json $adapter_data : A JSON string representing adapter's data (for example credentials for an api)
*
* @return bool|int : false on error, new id on success
@ -77,10 +77,10 @@ namespace controllers\internals;
/**
* Update a phone.
*
* @param int $id_user : User to insert phone for
* @param int $id : Phone id
* @param string $name : The name of the phone
* @param string $adapter : The adapter to use the phone
* @param int $id_user : User to insert phone for
* @param int $id : Phone id
* @param string $name : The name of the phone
* @param string $adapter : The adapter to use the phone
* @param array $adapter_data : An array of the data of the adapter (for example credentials for an api)
*
* @return bool : false on error, true on success

4
controllers/internals/Ruler.php
View File

@ -35,7 +35,7 @@ use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
* Verify if a condition is valid. i.e we can evaluate it without error.
*
* @param string $condition : The condition to evaluate
* @param array $data : The data to made available to condition
* @param array $data : The data to made available to condition
*
* @return bool : false if invalid, true else
*/
@ -61,7 +61,7 @@ use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
* Evaluate a condition.
*
* @param string $condition : The condition to evaluate
* @param array $data : The data to made available to condition
* @param array $data : The data to made available to condition
*
* @return ?bool : false if invalid, true else, null only on error
*/

2
controllers/internals/Templating.php
View File

@ -57,7 +57,7 @@ namespace controllers\internals;
* Render a string as a twig template.
*
* @param string $template : Template string
* @param array $data : Data to pass to the template
* @param array $data : Data to pass to the template
*
* @return array : keys, success, error, result
*/

4
controllers/internals/Webhook.php
View File

@ -126,10 +126,10 @@ class Webhook extends StandardController
{
$timestamp = time();
$webhook_random_id = $timestamp . '-' . bin2hex(openssl_random_pseudo_bytes(16));
//signature is hexa string representing hmac sha256 of webhook_random_id
$webhook_signature = hash_hmac(self::HMAC_ALGO, $webhook_random_id, $user['api_key']);
$message = [
'url' => $webhook['url'],
'data' => [

4
controllers/publics/Api.php
View File

@ -309,8 +309,8 @@ namespace controllers\publics;
/**
* Create a new phone.
*
* @param string $_POST['name'] : Phone name
* @param string $_POST['adapter'] : Phone adapter
* @param string $_POST['name'] : Phone name
* @param string $_POST['adapter'] : Phone adapter
* @param array $_POST['adapter_data'] : Phone adapter data
*
* @return int : id phone the new phone on success

4
controllers/publics/Phone.php
View File

@ -157,8 +157,8 @@ class Phone extends \descartes\Controller
* Create a new phone.
*
* @param $csrf : CSRF token
* @param string $_POST['name'] : Phone name
* @param string $_POST['adapter'] : Phone adapter
* @param string $_POST['name'] : Phone name
* @param string $_POST['adapter'] : Phone adapter
* @param array $_POST['adapter_data'] : Phone adapter data
*/
public function create($csrf)

10
controllers/publics/Scheduled.php
View File

@ -96,8 +96,8 @@ namespace controllers\publics;
/**
* Cette fonction retourne la page d'ajout d'un scheduled.
*
* @param array? int $contacts_ids : Ids of contacts to prefilled
* @param array? int $groups_ids : Ids of groups to prefilled
* @param array? int $contacts_ids : Ids of contacts to prefilled
* @param array? int $groups_ids : Ids of groups to prefilled
* @param array? int $conditional_groups_ids : Ids of conditional groups to prefilled
* @param $prefilled : If we have prefilled some fields (possible values : 'contacts', 'groups', 'conditional_groups', false)
*/
@ -112,9 +112,9 @@ namespace controllers\publics;
$contacts = $this->internal_contact->gets_for_user($id_user);
$phones = $this->internal_phone->gets_for_user($id_user);
$contact_ids = (isset($_GET['contact_ids']) && is_array($_GET['contact_ids'])) ? $_GET['contact_ids'] : [];
$group_ids = (isset($_GET['group_ids']) && is_array($_GET['group_ids'])) ? $_GET['group_ids'] : [];
$conditional_group_ids = (isset($_GET['conditional_group_ids']) && is_array($_GET['conditional_group_ids'])) ? $_GET['conditional_group_ids'] : [];
$contact_ids = (isset($_GET['contact_ids']) && \is_array($_GET['contact_ids'])) ? $_GET['contact_ids'] : [];
$group_ids = (isset($_GET['group_ids']) && \is_array($_GET['group_ids'])) ? $_GET['group_ids'] : [];
$conditional_group_ids = (isset($_GET['conditional_group_ids']) && \is_array($_GET['conditional_group_ids'])) ? $_GET['conditional_group_ids'] : [];
$prefilled_contacts = [];
$prefilled_groups = [];

2
models/Media.php
View File

@ -188,7 +188,7 @@ namespace models;
*
* @param int $id_user : User id
* @param int $id : Entry id
* @param array $data : data to update
* @param array $data : data to update
*
* @return int : number of modified rows
*/

4
models/StandardModel.php
View File

@ -154,7 +154,7 @@ namespace models;
*
* @param int $id_user : User id
* @param int $id : Entry id
* @param array $data : data to update
* @param array $data : data to update
*
* @return int : number of modified rows
*/
@ -166,7 +166,7 @@ namespace models;
/**
* Update a entry by his id.
*
* @param int $id : Entry id
* @param int $id : Entry id
* @param array $data : data to update
*
* @return int : number of modified rows

2
models/User.php
View File

@ -95,7 +95,7 @@ namespace models;
/**
* Update a user using his is.
*
* @param int $id : User id
* @param int $id : User id
* @param array $data : Data to update
*
* @return int : number of modified rows