diff --git a/.gitignore b/.gitignore index e0f2848..af77c93 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ composer.lock env.* phinx.* -data/test_write_sms.json -data/test_read_sms.json +datas/test_write_sms.json +datas/test_read_sms.json !*.dist diff --git a/adapters/AdapterInterface.php b/adapters/AdapterInterface.php index f778fcc..9eb0a0b 100644 --- a/adapters/AdapterInterface.php +++ b/adapters/AdapterInterface.php @@ -23,9 +23,9 @@ namespace adapters; /** * Adapter constructor, called when instanciated by RaspiSMS. * - * @param json string $data : JSON string of the data to configure interaction with the implemented service + * @param json string $datas : JSON string of the datas to configure interaction with the implemented service */ - public function __construct(string $data); + public function __construct(string $datas); /** * Classname of the adapter. @@ -51,11 +51,11 @@ namespace adapters; public static function meta_description(): string; /** - * List of entries we want in data for the adapter. + * List of entries we want in datas for the adapter. * * @return array : Eachline line is a field as an array with keys : name, title, description, required */ - public static function meta_data_fields(): array; + public static function meta_datas_fields(): array; /** * Does the implemented service support flash smss. diff --git a/adapters/BenchmarkAdapter.php b/adapters/BenchmarkAdapter.php index 43ea3dc..f229749 100644 --- a/adapters/BenchmarkAdapter.php +++ b/adapters/BenchmarkAdapter.php @@ -21,9 +21,9 @@ namespace adapters; class BenchmarkAdapter implements AdapterInterface { /** - * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $data; + private $datas; /** * API URL. @@ -33,11 +33,11 @@ namespace adapters; /** * Adapter constructor, called when instanciated by RaspiSMS. * - * @param json string $data : JSON string of the data to configure interaction with the implemented service + * @param json string $datas : JSON string of the datas to configure interaction with the implemented service */ - public function __construct(string $data) + public function __construct(string $datas) { - $this->data = $data; + $this->datas = $datas; } /** @@ -76,11 +76,11 @@ namespace adapters; } /** - * List of entries we want in data for the adapter. + * List of entries we want in datas for the adapter. * * @return array : Eachline line is a field as an array with keys : name, title, description, required */ - public static function meta_data_fields(): array + public static function meta_datas_fields(): array { return []; } @@ -140,7 +140,7 @@ namespace adapters; try { - $data = [ + $datas = [ 'sms_text' => $text, 'sms_destination' => $destination, 'sms_flash' => $flash, @@ -153,7 +153,7 @@ namespace adapters; curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($data)); + curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($datas)); $curl_response = curl_exec($curl); curl_close($curl); diff --git a/adapters/GammuAdapter.php b/adapters/GammuAdapter.php index d6fec3d..2b40dd5 100644 --- a/adapters/GammuAdapter.php +++ b/adapters/GammuAdapter.php @@ -21,18 +21,18 @@ namespace adapters; class GammuAdapter implements AdapterInterface { /** - * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $data; + private $datas; /** * Adapter constructor, called when instanciated by RaspiSMS. * - * @param json string $data : JSON string of the data to configure interaction with the implemented service + * @param json string $datas : JSON string of the datas to configure interaction with the implemented service */ - public function __construct(string $data) + public function __construct(string $datas) { - $this->data = json_decode($data, true); + $this->datas = json_decode($datas, true); } /** @@ -73,11 +73,11 @@ namespace adapters; } /** - * List of entries we want in data for the adapter. + * List of entries we want in datas for the adapter. * * @return array : Every line is a field as an array with keys : name, title, description, required */ - public static function meta_data_fields(): array + public static function meta_datas_fields(): array { return [ [ @@ -159,7 +159,7 @@ namespace adapters; $command_parts = [ 'gammu', '--config', - escapeshellarg($this->data['config_file']), + escapeshellarg($this->datas['config_file']), 'sendsms', 'TEXT', escapeshellarg($destination), @@ -248,7 +248,7 @@ namespace adapters; $command_parts = [ PWD . '/bin/gammu_get_unread_sms.py', - escapeshellarg($this->data['config_file']), + escapeshellarg($this->datas['config_file']), ]; $return = $this->exec_command($command_parts); @@ -326,7 +326,7 @@ namespace adapters; */ private function unlock_sim(): bool { - if (!$this->data['pin']) + if (!$this->datas['pin']) { return true; } @@ -334,10 +334,10 @@ namespace adapters; $command_parts = [ 'gammu', '--config', - escapeshellarg($this->data['config_file']), + escapeshellarg($this->datas['config_file']), 'entersecuritycode', 'PIN', - escapeshellarg($this->data['pin']), + escapeshellarg($this->datas['pin']), ]; $result = $this->exec_command($command_parts); @@ -346,7 +346,7 @@ namespace adapters; $command_parts = [ 'gammu', '--config', - escapeshellarg($this->data['config_file']), + escapeshellarg($this->datas['config_file']), 'getsecuritystatus', ]; diff --git a/adapters/OctopushShortcodeAdapter.php b/adapters/OctopushShortcodeAdapter.php index 4123bc2..24c42e0 100644 --- a/adapters/OctopushShortcodeAdapter.php +++ b/adapters/OctopushShortcodeAdapter.php @@ -22,9 +22,9 @@ class OctopushShortcodeAdapter implements AdapterInterface const SMS_TYPE_INTERNATIONAL = 'WWW'; /** - * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $data; + private $datas; /** * Octopush login. @@ -50,15 +50,15 @@ 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 $datas : JSON string of the datas to configure interaction with the implemented service */ - public function __construct(string $data) + public function __construct(string $datas) { - $this->data = json_decode($data, true); + $this->datas = json_decode($datas, true); - $this->login = $this->data['login']; - $this->api_key = $this->data['api_key']; - $this->sender = $this->data['sender'] ?? null; + $this->login = $this->datas['login']; + $this->api_key = $this->datas['api_key']; + $this->sender = $this->datas['sender'] ?? null; } /** @@ -102,11 +102,11 @@ class OctopushShortcodeAdapter implements AdapterInterface } /** - * List of entries we want in data for the adapter. + * List of entries we want in datas for the adapter. * * @return array : Every line is a field as an array with keys : name, title, description, required */ - public static function meta_data_fields(): array + public static function meta_datas_fields(): array { return [ [ @@ -187,7 +187,7 @@ class OctopushShortcodeAdapter implements AdapterInterface try { - $data = [ + $datas = [ 'user_login' => $this->login, 'api_key' => $this->api_key, 'sms_text' => $text, @@ -198,7 +198,7 @@ class OctopushShortcodeAdapter implements AdapterInterface if (null !== $this->sender) { - $data['sms_sender'] = $this->sender; + $datas['sms_sender'] = $this->sender; } $endpoint = $this->api_url . '/sms/json'; @@ -208,7 +208,7 @@ class OctopushShortcodeAdapter implements AdapterInterface curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $data); + curl_setopt($curl, CURLOPT_POSTFIELDS, $datas); $response = curl_exec($curl); curl_close($curl); @@ -285,12 +285,12 @@ class OctopushShortcodeAdapter implements AdapterInterface { $success = true; - if ($this->data['sender'] && (mb_strlen($this->data['sender']) < 3 || mb_strlen($this->data['sender'] > 11))) + if ($this->datas['sender'] && (mb_strlen($this->datas['sender']) < 3 || mb_strlen($this->datas['sender'] > 11))) { return false; } - $data = [ + $datas = [ 'user_login' => $this->login, 'api_key' => $this->api_key, ]; @@ -302,7 +302,7 @@ class OctopushShortcodeAdapter implements AdapterInterface curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $data); + curl_setopt($curl, CURLOPT_POSTFIELDS, $datas); $response = curl_exec($curl); curl_close($curl); diff --git a/adapters/OctopushVirtualNumberAdapter.php b/adapters/OctopushVirtualNumberAdapter.php index 830e26b..f3b1aec 100644 --- a/adapters/OctopushVirtualNumberAdapter.php +++ b/adapters/OctopushVirtualNumberAdapter.php @@ -22,9 +22,9 @@ class OctopushVirtualNumberAdapter implements AdapterInterface const SMS_TYPE_INTERNATIONAL = 'WWW'; /** - * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $data; + private $datas; /** * Octopush login. @@ -55,16 +55,16 @@ 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 $datas : JSON string of the datas to configure interaction with the implemented service */ - public function __construct(string $data) + public function __construct(string $datas) { - $this->data = json_decode($data, true); + $this->datas = json_decode($datas, true); - $this->login = $this->data['login']; - $this->api_key = $this->data['api_key']; - $this->number = $this->data['number']; - $this->formatted_number = '+' . mb_substr($this->data['number'], 2); + $this->login = $this->datas['login']; + $this->api_key = $this->datas['api_key']; + $this->number = $this->datas['number']; + $this->formatted_number = '+' . mb_substr($this->datas['number'], 2); } /** @@ -108,11 +108,11 @@ class OctopushVirtualNumberAdapter implements AdapterInterface } /** - * List of entries we want in data for the adapter. + * List of entries we want in datas for the adapter. * * @return array : Every line is a field as an array with keys : name, title, description, required */ - public static function meta_data_fields(): array + public static function meta_datas_fields(): array { return [ [ @@ -192,7 +192,7 @@ class OctopushVirtualNumberAdapter implements AdapterInterface try { - $data = [ + $datas = [ 'user_login' => $this->login, 'api_key' => $this->api_key, 'sms_text' => $text, @@ -208,7 +208,7 @@ class OctopushVirtualNumberAdapter implements AdapterInterface curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $data); + curl_setopt($curl, CURLOPT_POSTFIELDS, $datas); $response = curl_exec($curl); curl_close($curl); @@ -285,12 +285,12 @@ class OctopushVirtualNumberAdapter implements AdapterInterface { $success = true; - if ($this->data['sender'] && (mb_strlen($this->data['sender']) < 3 || mb_strlen($this->data['sender'] > 11))) + if ($this->datas['sender'] && (mb_strlen($this->datas['sender']) < 3 || mb_strlen($this->datas['sender'] > 11))) { return false; } - $data = [ + $datas = [ 'user_login' => $this->login, 'api_key' => $this->api_key, ]; @@ -302,7 +302,7 @@ class OctopushVirtualNumberAdapter implements AdapterInterface curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $data); + curl_setopt($curl, CURLOPT_POSTFIELDS, $datas); $response = curl_exec($curl); curl_close($curl); diff --git a/adapters/OvhSmsShortcodeAdapter.php b/adapters/OvhSmsShortcodeAdapter.php index 5deeda8..f23019a 100644 --- a/adapters/OvhSmsShortcodeAdapter.php +++ b/adapters/OvhSmsShortcodeAdapter.php @@ -19,9 +19,9 @@ namespace adapters; class OvhSmsShortcodeAdapter implements AdapterInterface { /** - * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $data; + private $datas; /** * OVH Api instance. @@ -32,17 +32,17 @@ 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 $datas : JSON string of the datas to configure interaction with the implemented service */ - public function __construct(string $data) + public function __construct(string $datas) { - $this->data = json_decode($data, true); + $this->datas = json_decode($datas, true); $this->api = new Api( - $this->data['app_key'], - $this->data['app_secret'], + $this->datas['app_key'], + $this->datas['app_secret'], 'ovh-eu', - $this->data['consumer_key'] + $this->datas['consumer_key'] ); } @@ -87,11 +87,11 @@ namespace adapters; } /** - * List of entries we want in data for the adapter. + * List of entries we want in datas for the adapter. * * @return array : Every line is a field as an array with keys : name, title, description, required */ - public static function meta_data_fields(): array + public static function meta_datas_fields(): array { return [ [ @@ -186,16 +186,16 @@ namespace adapters; { $success = true; - $endpoint = '/sms/' . $this->data['service_name'] . '/jobs'; + $endpoint = '/sms/' . $this->datas['service_name'] . '/jobs'; $params = [ 'message' => $text, 'receivers' => [$destination], 'senderForResponse' => true, ]; - if ($this->data['sender']) + if ($this->datas['sender']) { - $params['sender'] = $this->data['sender']; + $params['sender'] = $this->datas['sender']; $params['senderForResponse'] = false; } @@ -252,12 +252,12 @@ namespace adapters; try { //If we use a sender we cannot receive response, no need to make queries - if ($this->data['sended']) + if ($this->datas['sended']) { return $response; } - $endpoint = '/sms/' . $this->data['service_name'] . '/incoming'; + $endpoint = '/sms/' . $this->datas['service_name'] . '/incoming'; $uids = $this->api->get($endpoint); if (!\is_array($uids) || !$uids) @@ -267,7 +267,7 @@ namespace adapters; foreach ($uids as $uid) { - $endpoint = '/sms/' . $this->data['service_name'] . '/incoming/' . $uid; + $endpoint = '/sms/' . $this->datas['service_name'] . '/incoming/' . $uid; $sms_details = $this->api->get($endpoint); if (!isset($sms_details['creationDatetime'], $sms_details['message'], $sms_details['sender'])) @@ -282,7 +282,7 @@ namespace adapters; ]; //Remove the sms to prevent double reading as ovh do not offer a filter for unread messages only - $endpoint = '/sms/' . $this->data['service_name'] . '/incoming/' . $uid; + $endpoint = '/sms/' . $this->datas['service_name'] . '/incoming/' . $uid; $this->api->delete($endpoint); } @@ -309,13 +309,13 @@ namespace adapters; { $success = true; - if ($this->data['sender'] && (mb_strlen($this->data['sender']) < 3 || mb_strlen($this->data['sender'] > 11))) + if ($this->datas['sender'] && (mb_strlen($this->datas['sender']) < 3 || mb_strlen($this->datas['sender'] > 11))) { return false; } //Check service name - $endpoint = '/sms/' . $this->data['service_name']; + $endpoint = '/sms/' . $this->datas['service_name']; $response = $this->api->get($endpoint); return $success && (bool) $response; diff --git a/adapters/OvhSmsVirtualNumberAdapter.php b/adapters/OvhSmsVirtualNumberAdapter.php index 3e7d3c9..48df00d 100644 --- a/adapters/OvhSmsVirtualNumberAdapter.php +++ b/adapters/OvhSmsVirtualNumberAdapter.php @@ -19,9 +19,9 @@ namespace adapters; class OvhSmsVirtualNumberAdapter implements AdapterInterface { /** - * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $data; + private $datas; /** * OVH Api instance. @@ -41,20 +41,20 @@ namespace adapters; /** * Adapter constructor, called when instanciated by RaspiSMS. * - * @param json string $data : JSON string of the data to configure interaction with the implemented service + * @param json string $datas : JSON string of the datas to configure interaction with the implemented service */ - public function __construct(string $data) + public function __construct(string $datas) { - $this->data = json_decode($data, true); + $this->datas = json_decode($datas, true); $this->api = new Api( - $this->data['app_key'], - $this->data['app_secret'], + $this->datas['app_key'], + $this->datas['app_secret'], 'ovh-eu', - $this->data['consumer_key'] + $this->datas['consumer_key'] ); - $this->number = $this->data['number']; + $this->number = $this->datas['number']; $this->formatted_number = str_replace('+', '00', $this->number); } @@ -99,11 +99,11 @@ namespace adapters; } /** - * List of entries we want in data for the adapter. + * List of entries we want in datas for the adapter. * * @return array : Every line is a field as an array with keys : name, title, description, required */ - public static function meta_data_fields(): array + public static function meta_datas_fields(): array { return [ [ @@ -197,7 +197,7 @@ namespace adapters; { $success = true; - $endpoint = '/sms/' . $this->data['service_name'] . '/virtualNumbers/' . $this->formatted_number . '/jobs'; + $endpoint = '/sms/' . $this->datas['service_name'] . '/virtualNumbers/' . $this->formatted_number . '/jobs'; $params = [ 'message' => $text, 'receivers' => [$destination], @@ -255,7 +255,7 @@ namespace adapters; try { - $endpoint = '/sms/' . $this->data['service_name'] . '/virtualNumbers/' . $this->formatted_number . '/incoming'; + $endpoint = '/sms/' . $this->datas['service_name'] . '/virtualNumbers/' . $this->formatted_number . '/incoming'; $uids = $this->api->get($endpoint); if (!\is_array($uids) || !$uids) @@ -265,7 +265,7 @@ namespace adapters; foreach ($uids as $uid) { - $endpoint = '/sms/' . $this->data['service_name'] . '/virtualNumbers/' . $this->formatted_number . '/incoming/' . $uid; + $endpoint = '/sms/' . $this->datas['service_name'] . '/virtualNumbers/' . $this->formatted_number . '/incoming/' . $uid; $sms_details = $this->api->get($endpoint); if (!isset($sms_details['creationDatetime'], $sms_details['message'], $sms_details['sender'])) @@ -280,7 +280,7 @@ namespace adapters; ]; //Remove the sms to prevent double reading as ovh do not offer a filter for unread messages only - $endpoint = '/sms/' . $this->data['service_name'] . '/virtualNumbers/' . $this->formatted_number . '/incoming/' . $uid; + $endpoint = '/sms/' . $this->datas['service_name'] . '/virtualNumbers/' . $this->formatted_number . '/incoming/' . $uid; $this->api->delete($endpoint); } @@ -309,7 +309,7 @@ namespace adapters; $success = true; //Check service name - $endpoint = '/sms/' . $this->data['service_name']; + $endpoint = '/sms/' . $this->datas['service_name']; $response = $this->api->get($endpoint); $success = $success && (bool) $response; diff --git a/adapters/TestAdapter.php b/adapters/TestAdapter.php index 6586bd6..1856a6e 100644 --- a/adapters/TestAdapter.php +++ b/adapters/TestAdapter.php @@ -21,28 +21,28 @@ namespace adapters; class TestAdapter implements AdapterInterface { /** - * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $data; + private $datas; /** * Path for the file to read sms as a json from. */ - private $test_file_read = PWD_DATA . '/test_read_sms.json'; + private $test_file_read = PWD_DATAS . '/test_read_sms.json'; /** * Path for the file to write sms as a json in. */ - private $test_file_write = PWD_DATA . '/test_write_sms.json'; + private $test_file_write = PWD_DATAS . '/test_write_sms.json'; /** * Adapter constructor, called when instanciated by RaspiSMS. * - * @param json string $data : JSON string of the data to configure interaction with the implemented service + * @param json string $datas : JSON string of the datas to configure interaction with the implemented service */ - public function __construct(string $data) + public function __construct(string $datas) { - $this->data = $data; + $this->datas = $datas; } /** @@ -81,11 +81,11 @@ namespace adapters; } /** - * List of entries we want in data for the adapter. + * List of entries we want in datas for the adapter. * * @return array : Eachline line is a field as an array with keys : name, title, description, required */ - public static function meta_data_fields(): array + public static function meta_datas_fields(): array { return []; } diff --git a/adapters/TwilioVirtualNumberAdapter.php b/adapters/TwilioVirtualNumberAdapter.php index 58e12e8..4120bdc 100644 --- a/adapters/TwilioVirtualNumberAdapter.php +++ b/adapters/TwilioVirtualNumberAdapter.php @@ -19,9 +19,9 @@ use Twilio\Rest\Client; class TwilioVirtualNumberAdapter implements AdapterInterface { /** - * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $data; + private $datas; /** * Twilio Api client. @@ -42,19 +42,19 @@ 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 $datas : JSON string of the datas to configure interaction with the implemented service */ - public function __construct(string $data) + public function __construct(string $datas) { - $this->data = json_decode($data, true); + $this->datas = json_decode($datas, true); $this->client = new Client( - $this->data['account_sid'], - $this->data['auth_token'] + $this->datas['account_sid'], + $this->datas['auth_token'] ); - $this->number = $this->data['number']; - $this->status_change_callback = $this->data['status_change_callback']; + $this->number = $this->datas['number']; + $this->status_change_callback = $this->datas['status_change_callback']; } /** @@ -98,11 +98,11 @@ class TwilioVirtualNumberAdapter implements AdapterInterface } /** - * List of entries we want in data for the adapter. + * List of entries we want in datas for the adapter. * * @return array : Every line is a field as an array with keys : name, title, description, required */ - public static function meta_data_fields(): array + public static function meta_datas_fields(): array { return [ [ diff --git a/assets/css/style.css b/assets/css/style.css index b03cf87..3e8485b 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -333,29 +333,29 @@ footer img display: inline-block !important; } -.contact-data-container input +.contact-datas-container input { display: inline-block; } -.contact-data-container .contact-data-name +.contact-datas-container .contact-data-name { width: 25%; } -.contact-data-container .contact-data-value +.contact-datas-container .contact-data-value { width: 50%; } -.contact-data-container .contact-data-remove +.contact-datas-container .contact-datas-remove { color: #c9302c; } /* PHONE */ -#adapter-data-container +#adapter-datas-container { margin-top: 35px; } @@ -365,7 +365,7 @@ footer img margin-top: 20px; } -#adapter-data-fields +#adapter-datas-fields { padding-top: 15px; padding-left: 15px; diff --git a/controllers/internals/Command.php b/controllers/internals/Command.php index aee4757..eb1e01b 100644 --- a/controllers/internals/Command.php +++ b/controllers/internals/Command.php @@ -59,13 +59,13 @@ namespace controllers\internals; */ public function update_for_user(int $id_user, int $id, string $name, string $script, bool $admin) { - $data = [ + $datas = [ 'name' => $name, 'script' => $script, 'admin' => $admin, ]; - return $this->get_model()->update_for_user($id_user, $id, $data); + return $this->get_model()->update_for_user($id_user, $id, $datas); } /** diff --git a/controllers/internals/ConditionalGroup.php b/controllers/internals/ConditionalGroup.php index bed5fa2..e22707d 100644 --- a/controllers/internals/ConditionalGroup.php +++ b/controllers/internals/ConditionalGroup.php @@ -33,7 +33,7 @@ namespace controllers\internals; ]; $internal_ruler = new Ruler(); - $valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['data' => (object) null]]); + $valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['datas' => (object) null]]); if (!$valid_condition) { return false; @@ -69,7 +69,7 @@ namespace controllers\internals; ]; $internal_ruler = new Ruler(); - $valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['data' => (object) null]]); + $valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['datas' => (object) null]]); if (!$valid_condition) { return false; @@ -112,16 +112,16 @@ namespace controllers\internals; foreach ($contacts as $key => $contact) { - $contact['data'] = json_decode($contact['data']); + $contact['datas'] = json_decode($contact['datas']); $contact = (object) $contact; - //Add metas of contact by adding contact without data + //Add metas of contact by adding contact without datas $metas = clone $contact; - $metas->data = null; + $metas->datas = null; $metas->id_user = null; - $data = ['contact' => $contact->data, 'contact_metas' => $metas]; - $is_valid = $ruler->evaluate_condition($condition, $data); + $datas = ['contact' => $contact->datas, 'contact_metas' => $metas]; + $is_valid = $ruler->evaluate_condition($condition, $datas); if (!$is_valid) { unset($contacts[$key]); diff --git a/controllers/internals/Contact.php b/controllers/internals/Contact.php index b33f71d..876db70 100644 --- a/controllers/internals/Contact.php +++ b/controllers/internals/Contact.php @@ -59,17 +59,17 @@ 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 $datas : Contact datas * * @return mixed bool|int : False if cannot create contact, id of the new contact else */ - public function create($id_user, $number, $name, $data) + public function create($id_user, $number, $name, $datas) { $contact = [ 'id_user' => $id_user, 'number' => $number, 'name' => $name, - 'data' => $data, + 'datas' => $datas, ]; $result = $this->get_model()->insert($contact); @@ -91,16 +91,16 @@ 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 $datas : Contact datas * * @return int : number of modified rows */ - public function update_for_user(int $id_user, int $id, string $number, string $name, string $data) + public function update_for_user(int $id_user, int $id, string $number, string $name, string $datas) { $contact = [ 'number' => $number, 'name' => $name, - 'data' => $data, + 'datas' => $datas, ]; return $this->get_model()->update_for_user($id_user, $id, $contact); @@ -144,7 +144,7 @@ namespace controllers\internals; continue; } - $data = []; + $datas = []; $i = 0; foreach ($line as $key => $value) { @@ -160,13 +160,13 @@ namespace controllers\internals; } $key = mb_ereg_replace('[\W]', '', $key); - $data[$key] = $value; + $datas[$key] = $value; } - $data = json_encode($data); + $datas = json_encode($datas); try { - $success = $this->create($id_user, $line[array_keys($line)[1]], $line[array_keys($line)[0]], $data); + $success = $this->create($id_user, $line[array_keys($line)[1]], $line[array_keys($line)[0]], $datas); if ($success) { ++$nb_insert; @@ -224,12 +224,12 @@ namespace controllers\internals; continue; } - $data = $contact['data'] ?? []; - $data = json_encode($data); + $datas = $contact['datas'] ?? []; + $datas = json_encode($datas); try { - $success = $this->create($id_user, $contact['number'], $contact['name'], $data); + $success = $this->create($id_user, $contact['number'], $contact['name'], $datas); if ($success) { ++$nb_insert; @@ -264,8 +264,8 @@ namespace controllers\internals; foreach ($contacts as $contact) { - $data = json_decode($contact['data'], true); - foreach ($data as $key => $value) + $datas = json_decode($contact['datas'], true); + foreach ($datas as $key => $value) { $columns[] = $key; } @@ -275,14 +275,14 @@ namespace controllers\internals; $lines = []; foreach ($contacts as $contact) { - $data = json_decode($contact['data'], true); + $datas = json_decode($contact['datas'], true); $line = [$contact['name'], $contact['number']]; foreach ($columns as $column) { - if (isset($data[$column])) + if (isset($datas[$column])) { - $line[] = $data[$column]; + $line[] = $datas[$column]; continue; } @@ -327,7 +327,7 @@ namespace controllers\internals; { unset($contact['id'], $contact['id_user']); - $contact['data'] = json_decode($contact['data']); + $contact['datas'] = json_decode($contact['datas']); } $content = json_encode($contacts); diff --git a/controllers/internals/Mailer.php b/controllers/internals/Mailer.php index cb25aa2..052b6ef 100755 --- a/controllers/internals/Mailer.php +++ b/controllers/internals/Mailer.php @@ -100,13 +100,13 @@ 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 $datas : Datas to inject into email template * * @return bool : true on success, false on error */ - public function enqueue(string $destination, array $settings, array $data): bool + public function enqueue(string $destination, array $settings, array $datas): bool { - $response = $this->generate_body($settings, $data); + $response = $this->generate_body($settings, $datas); $message = [ 'destinations' => [$destination], @@ -131,18 +131,18 @@ class Mailer extends \descartes\Controller * string 'template' => Email template to use * ?string 'alt_template' => Template to use for alt message, if null ignore * ] - * @param array : Data to inject into email template + * @param array : Datas to inject into email template * * @return array [ * string 'body' => email body * ?string 'alt_body' => email alternative body if needed * ] */ - private function generate_body(array $settings, array $data): array + private function generate_body(array $settings, array $datas): array { //Generate body of email ob_start(); - $this->render($settings['template'], $data); + $this->render($settings['template'], $datas); $body = ob_get_clean(); //Generate alt body if needed @@ -150,7 +150,7 @@ class Mailer extends \descartes\Controller if ($settings['alt_template'] ?? false) { ob_start(); - $this->render($settings['alt_template'], $data); + $this->render($settings['alt_template'], $datas); $alt_body = ob_get_clean(); } diff --git a/controllers/internals/Media.php b/controllers/internals/Media.php index b02ff5f..64c25a7 100644 --- a/controllers/internals/Media.php +++ b/controllers/internals/Media.php @@ -39,12 +39,12 @@ namespace controllers\internals; return false; } - $data = [ + $datas = [ 'id_scheduled' => $id_scheduled, 'path' => $result_upload_media['content'], ]; - return (bool) $this->get_model()->insert($data); + return (bool) $this->get_model()->insert($datas); } /** diff --git a/controllers/internals/Phone.php b/controllers/internals/Phone.php index fe976d1..80cc079 100644 --- a/controllers/internals/Phone.php +++ b/controllers/internals/Phone.php @@ -58,17 +58,17 @@ namespace controllers\internals; * @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) + * @param string json $adapter_datas : A JSON string representing adapter's datas (for example credentials for an api) * * @return bool|int : false on error, new id on success */ - public function create(int $id_user, string $name, string $adapter, string $adapter_data) + public function create(int $id_user, string $name, string $adapter, string $adapter_datas) { $phone = [ 'id_user' => $id_user, 'name' => $name, 'adapter' => $adapter, - 'adapter_data' => $adapter_data, + 'adapter_datas' => $adapter_datas, ]; return $this->get_model()->insert($phone); @@ -81,17 +81,17 @@ namespace controllers\internals; * @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) + * @param array $adapter_datas : An array of the datas of the adapter (for example credentials for an api) * * @return bool : false on error, true on success */ - public function update_for_user(int $id_user, int $id, string $name, string $adapter, array $adapter_data): bool + public function update_for_user(int $id_user, int $id, string $name, string $adapter, array $adapter_datas): bool { $phone = [ 'id_user' => $id_user, 'name' => $name, 'adapter' => $adapter, - 'adapter_data' => json_encode($adapter_data), + 'adapter_datas' => json_encode($adapter_datas), ]; return (bool) $this->get_model()->update_for_user($id_user, $id, $phone); diff --git a/controllers/internals/Ruler.php b/controllers/internals/Ruler.php index ed61dc1..5753740 100644 --- a/controllers/internals/Ruler.php +++ b/controllers/internals/Ruler.php @@ -35,15 +35,15 @@ 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 $datas : The datas to made available to condition * * @return bool : false if invalid, true else */ - public function validate_condition(string $condition, array $data = []): bool + public function validate_condition(string $condition, array $datas = []): bool { try { - $this->expression_language->parse($condition, array_keys($data)); + $this->expression_language->parse($condition, array_keys($datas)); return true; } @@ -61,15 +61,15 @@ 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 $datas : The datas to made available to condition * * @return ?bool : false if invalid, true else, null only on error */ - public function evaluate_condition(string $condition, array $data = []): ?bool + public function evaluate_condition(string $condition, array $datas = []): ?bool { try { - $result = $this->expression_language->evaluate($condition, $data); + $result = $this->expression_language->evaluate($condition, $datas); return (bool) $result; } diff --git a/controllers/internals/Scheduled.php b/controllers/internals/Scheduled.php index c0f642b..7f4ac6a 100644 --- a/controllers/internals/Scheduled.php +++ b/controllers/internals/Scheduled.php @@ -334,15 +334,15 @@ namespace controllers\internals; if ((int) ($users_settings[$scheduled['id_user']]['templating'] ?? false)) { - $contact['data'] = json_decode($contact['data'], true); + $contact['datas'] = json_decode($contact['datas'], true); - //Add metas of contact by adding contact without data + //Add metas of contact by adding contact without datas $metas = $contact; - unset($metas['data'], $metas['id_user']); + unset($metas['datas'], $metas['id_user']); - $data = ['contact' => $contact['data'], 'contact_metas' => $metas]; + $datas = ['contact' => $contact['datas'], 'contact_metas' => $metas]; - $render = $internal_templating->render($scheduled['text'], $data); + $render = $internal_templating->render($scheduled['text'], $datas); if (!$render['success']) { diff --git a/controllers/internals/SmsStop.php b/controllers/internals/SmsStop.php index 6ea87ae..5859907 100644 --- a/controllers/internals/SmsStop.php +++ b/controllers/internals/SmsStop.php @@ -44,11 +44,11 @@ namespace controllers\internals; */ public function update_for_user(int $id_user, int $id_smsstop, string $number) { - $data = [ + $datas = [ 'number' => $number, ]; - return $this->get_model()->update_for_user($id_user, $id_smsstop, $data); + return $this->get_model()->update_for_user($id_user, $id_smsstop, $datas); } /** diff --git a/controllers/internals/Templating.php b/controllers/internals/Templating.php index 12cffe1..1d76f56 100644 --- a/controllers/internals/Templating.php +++ b/controllers/internals/Templating.php @@ -57,11 +57,11 @@ 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 $datas : Datas to pass to the template * * @return array : keys, success, error, result */ - public function render(string $template, array $data = []) + public function render(string $template, array $datas = []) { try { @@ -80,7 +80,7 @@ namespace controllers\internals; ]); $twig->addExtension($this->sandbox); - $result = $twig->render('template', $data); + $result = $twig->render('template', $datas); return [ 'success' => true, diff --git a/controllers/internals/Tool.php b/controllers/internals/Tool.php index 1cdccb5..ad48153 100644 --- a/controllers/internals/Tool.php +++ b/controllers/internals/Tool.php @@ -344,7 +344,7 @@ namespace controllers\internals; return $result; } - $new_file_path = PWD_DATA . '/' . $md5_filename; + $new_file_path = PWD_DATAS . '/' . $md5_filename; if (file_exists($new_file_path)) { diff --git a/controllers/internals/Webhook.php b/controllers/internals/Webhook.php index 1ca4725..0e54cb9 100644 --- a/controllers/internals/Webhook.php +++ b/controllers/internals/Webhook.php @@ -66,12 +66,12 @@ class Webhook extends StandardController return false; } - $data = [ + $datas = [ 'url' => $url, 'type' => $type, ]; - return $this->get_model()->update_for_user($id_user, $id, $data); + return $this->get_model()->update_for_user($id_user, $id, $datas); } /** @@ -117,7 +117,7 @@ class Webhook extends StandardController { $message = [ 'url' => $webhook['url'], - 'data' => [ + 'datas' => [ 'webhook_type' => $webhook['type'], 'id' => $sms['id'], 'at' => $sms['at'], diff --git a/controllers/publics/Api.php b/controllers/publics/Api.php index 4039aa6..d97beba 100644 --- a/controllers/publics/Api.php +++ b/controllers/publics/Api.php @@ -87,7 +87,7 @@ namespace controllers\publics; $return = self::DEFAULT_RETURN; $return['error'] = self::ERROR_CODES['INVALID_CREDENTIALS']; $return['message'] = self::ERROR_MESSAGES['INVALID_CREDENTIALS']; - $this->set_http_code(401); + $this->auto_http_code(false); $this->json($return); exit(self::ERROR_CODES['INVALID_CREDENTIALS']); @@ -98,7 +98,7 @@ namespace controllers\publics; $return = self::DEFAULT_RETURN; $return['error'] = self::ERROR_CODES['SUSPENDED_USER']; $return['message'] = self::ERROR_MESSAGES['SUSPENDED_USER']; - $this->set_http_code(403); + $this->auto_http_code(false); $this->json($return); exit(self::ERROR_CODES['SUSPENDED_USER']); @@ -311,7 +311,7 @@ namespace controllers\publics; * * @param string $_POST['name'] : Phone name * @param string $_POST['adapter'] : Phone adapter - * @param array $_POST['adapter_data'] : Phone adapter data + * @param array $_POST['adapter_datas'] : Phone adapter datas * * @return int : id phone the new phone on success */ @@ -321,7 +321,7 @@ namespace controllers\publics; $name = $_POST['name'] ?? false; $adapter = $_POST['adapter'] ?? false; - $adapter_data = !empty($_POST['adapter_data']) ? $_POST['adapter_data'] : []; + $adapter_datas = !empty($_POST['adapter_datas']) ? $_POST['adapter_datas'] : []; if (!$name) { @@ -373,14 +373,14 @@ namespace controllers\publics; } //If missing required data fields, error - foreach ($find_adapter['meta_data_fields'] as $field) + foreach ($find_adapter['meta_datas_fields'] as $field) { if (false === $field['required']) { continue; } - if (!empty($adapter_data[$field['name']])) + if (!empty($adapter_datas[$field['name']])) { continue; } @@ -393,18 +393,18 @@ namespace controllers\publics; } //If field phone number is invalid - foreach ($find_adapter['meta_data_fields'] as $field) + foreach ($find_adapter['meta_datas_fields'] as $field) { if (false === ($field['number'] ?? false)) { continue; } - if (!empty($adapter_data[$field['name']])) + if (!empty($adapter_datas[$field['name']])) { - $adapter_data[$field['name']] = \controllers\internals\Tool::parse_phone($adapter_data[$field['name']]); + $adapter_datas[$field['name']] = \controllers\internals\Tool::parse_phone($adapter_datas[$field['name']]); - if ($adapter_data[$field['name']]) + if ($adapter_datas[$field['name']]) { continue; } @@ -417,11 +417,11 @@ namespace controllers\publics; return $this->json($return); } - $adapter_data = json_encode($adapter_data); + $adapter_datas = json_encode($adapter_datas); - //Check adapter is working correctly with thoses names and data + //Check adapter is working correctly with thoses names and datas $adapter_classname = $find_adapter['meta_classname']; - $adapter_instance = new $adapter_classname($adapter_data); + $adapter_instance = new $adapter_classname($adapter_datas); $adapter_working = $adapter_instance->test(); if (!$adapter_working) @@ -433,7 +433,7 @@ namespace controllers\publics; return $this->json($return); } - $phone_id = $this->internal_phone->create($this->user['id'], $name, $adapter, $adapter_data); + $phone_id = $this->internal_phone->create($this->user['id'], $name, $adapter, $adapter_datas); if (false === $phone_id) { $return['error'] = self::ERROR_CODES['CANNOT_CREATE']; diff --git a/controllers/publics/Callback.php b/controllers/publics/Callback.php index 2f19b97..a41df9e 100644 --- a/controllers/publics/Callback.php +++ b/controllers/publics/Callback.php @@ -101,7 +101,7 @@ use Monolog\Logger; $callback_return = $adapter_classname::status_change_callback(); if (!$callback_return) { - $this->logger->error('Callback status with adapter ' . $adapter_uid . ' failed because adapter cannot process data with success.'); + $this->logger->error('Callback status with adapter ' . $adapter_uid . ' failed because adapter cannot process datas with success.'); return false; } diff --git a/controllers/publics/ConditionalGroup.php b/controllers/publics/ConditionalGroup.php index 28ad23e..4fc0fd5 100644 --- a/controllers/publics/ConditionalGroup.php +++ b/controllers/publics/ConditionalGroup.php @@ -62,7 +62,7 @@ namespace controllers\publics; /** * Cette fonction va supprimer une liste de groups. * - * @param array int $_GET['conditional_group_ids'] : Les id des groups à supprimer + * @param array int $_GET['ids'] : Les id des groups à supprimer * @param mixed $csrf * * @return boolean; @@ -76,7 +76,7 @@ namespace controllers\publics; return $this->redirect(\descartes\Router::url('ConditionalGroup', 'list')); } - $ids = $_GET['conditional_group_ids'] ?? []; + $ids = $_GET['ids'] ?? []; foreach ($ids as $id) { $this->internal_conditional_group->delete_for_user($_SESSION['user']['id'], $id); @@ -100,7 +100,7 @@ namespace controllers\publics; */ public function edit() { - $ids = $_GET['conditional_group_ids'] ?? []; + $ids = $_GET['ids'] ?? []; $groups = $this->internal_conditional_group->gets_in_for_user($_SESSION['user']['id'], $ids); @@ -210,7 +210,7 @@ namespace controllers\publics; } $internal_ruler = new \controllers\internals\Ruler(); - $valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['data' => (object) null], 'contact_metas' => (object) null]); + $valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['datas' => (object) null], 'contact_metas' => (object) null]); if (!$valid_condition) { $return['result'] = 'Syntaxe de la condition invalide.'; diff --git a/controllers/publics/Contact.php b/controllers/publics/Contact.php index 530520e..3e93380 100644 --- a/controllers/publics/Contact.php +++ b/controllers/publics/Contact.php @@ -61,7 +61,7 @@ namespace controllers\publics; /** * Cette fonction va supprimer une liste de contacts. * - * @param array int $_GET['contact_ids'] : Les id des contactes à supprimer + * @param array int $_GET['ids'] : Les id des contactes à supprimer * @param mixed $csrf * * @return boolean; @@ -75,7 +75,7 @@ namespace controllers\publics; return $this->redirect(\descartes\Router::url('Contact', 'list')); } - $ids = $_GET['contact_ids'] ?? []; + $ids = $_GET['ids'] ?? []; foreach ($ids as $id) { $this->internal_contact->delete_for_user($_SESSION['user']['id'], $id); @@ -99,7 +99,7 @@ namespace controllers\publics; */ public function edit() { - $ids = $_GET['contact_ids'] ?? []; + $ids = $_GET['ids'] ?? []; $id_user = $_SESSION['user']['id']; $contacts = $this->internal_contact->gets_in_for_user($id_user, $ids); @@ -111,9 +111,9 @@ namespace controllers\publics; foreach ($contacts as &$contact) { - if ($contact['data']) + if ($contact['datas']) { - $contact['data'] = json_decode($contact['data']); + $contact['datas'] = json_decode($contact['datas']); } } @@ -141,7 +141,7 @@ namespace controllers\publics; $name = $_POST['name'] ?? false; $number = $_POST['number'] ?? false; $id_user = $_SESSION['user']['id']; - $data = $_POST['data'] ?? []; + $datas = $_POST['datas'] ?? []; if (!$name || !$number) { @@ -158,8 +158,8 @@ namespace controllers\publics; return $this->redirect(\descartes\Router::url('Contact', 'add')); } - $clean_data = []; - foreach ($data as $key => $value) + $clean_datas = []; + foreach ($datas as $key => $value) { if ('' === $value) { @@ -167,12 +167,12 @@ namespace controllers\publics; } $key = mb_ereg_replace('[\W]', '', $key); - $clean_data[$key] = (string) $value; + $clean_datas[$key] = (string) $value; } - $clean_data = json_encode($clean_data); + $clean_datas = json_encode($clean_datas); - if (!$this->internal_contact->create($id_user, $number, $name, $clean_data)) + if (!$this->internal_contact->create($id_user, $number, $name, $clean_datas)) { \FlashMessage\FlashMessage::push('danger', 'Impossible de créer ce contact.'); @@ -212,7 +212,7 @@ namespace controllers\publics; $name = $contact['name'] ?? false; $number = $contact['number'] ?? false; $id_user = $_SESSION['user']['id']; - $data = $contact['data'] ?? []; + $datas = $contact['datas'] ?? []; if (!$name || !$number) { @@ -225,8 +225,8 @@ namespace controllers\publics; continue; } - $clean_data = []; - foreach ($data as $key => $value) + $clean_datas = []; + foreach ($datas as $key => $value) { if ('' === $value) { @@ -234,11 +234,11 @@ namespace controllers\publics; } $key = mb_ereg_replace('[\W]', '', $key); - $clean_data[$key] = (string) $value; + $clean_datas[$key] = (string) $value; } - $clean_data = json_encode($clean_data); + $clean_datas = json_encode($clean_datas); - $nb_contacts_update += (int) $this->internal_contact->update_for_user($id_user, $id_contact, $number, $name, $clean_data); + $nb_contacts_update += (int) $this->internal_contact->update_for_user($id_user, $id_contact, $number, $name, $clean_datas); } if ($nb_contacts_update !== \count($_POST['contacts'])) diff --git a/controllers/publics/Dashboard.php b/controllers/publics/Dashboard.php index 50f2779..d84ccf1 100644 --- a/controllers/publics/Dashboard.php +++ b/controllers/publics/Dashboard.php @@ -129,7 +129,7 @@ namespace controllers\publics; 'sendeds' => $sendeds, 'receiveds' => $receiveds, 'events' => $events, - 'data_area_chart' => json_encode($array_area_chart), + 'datas_area_chart' => json_encode($array_area_chart), ]); } } diff --git a/controllers/publics/Group.php b/controllers/publics/Group.php index fa8b8af..97dbc52 100644 --- a/controllers/publics/Group.php +++ b/controllers/publics/Group.php @@ -58,7 +58,7 @@ namespace controllers\publics; /** * Cette fonction va supprimer une liste de groups. * - * @param array int $_GET['group_ids'] : Les id des groups à supprimer + * @param array int $_GET['ids'] : Les id des groups à supprimer * @param mixed $csrf * * @return boolean; @@ -72,7 +72,7 @@ namespace controllers\publics; return $this->redirect(\descartes\Router::url('Group', 'list')); } - $ids = $_GET['group_ids'] ?? []; + $ids = $_GET['ids'] ?? []; foreach ($ids as $id) { $this->internal_group->delete_for_user($_SESSION['user']['id'], $id); @@ -96,7 +96,7 @@ namespace controllers\publics; */ public function edit() { - $ids = $_GET['group_ids'] ?? []; + $ids = $_GET['ids'] ?? []; $groups = $this->internal_group->gets_in_for_user($_SESSION['user']['id'], $ids); diff --git a/controllers/publics/Phone.php b/controllers/publics/Phone.php index 60e71ab..9843d4b 100644 --- a/controllers/publics/Phone.php +++ b/controllers/publics/Phone.php @@ -73,7 +73,7 @@ class Phone extends \descartes\Controller } /** - * Return phones as json with additionnals data about callbacks. + * Return phones as json with additionnals datas about callbacks. */ public function list_json() { @@ -159,7 +159,7 @@ class Phone extends \descartes\Controller * @param $csrf : CSRF token * @param string $_POST['name'] : Phone name * @param string $_POST['adapter'] : Phone adapter - * @param array $_POST['adapter_data'] : Phone adapter data + * @param array $_POST['adapter_datas'] : Phone adapter datas */ public function create($csrf) { @@ -173,7 +173,7 @@ class Phone extends \descartes\Controller $id_user = $_SESSION['user']['id']; $name = $_POST['name'] ?? false; $adapter = $_POST['adapter'] ?? false; - $adapter_data = !empty($_POST['adapter_data']) ? $_POST['adapter_data'] : []; + $adapter_datas = !empty($_POST['adapter_datas']) ? $_POST['adapter_datas'] : []; if (!$name || !$adapter) { @@ -210,14 +210,14 @@ class Phone extends \descartes\Controller } //If missing required data fields, error - foreach ($find_adapter['meta_data_fields'] as $field) + foreach ($find_adapter['meta_datas_fields'] as $field) { if (false === $field['required']) { continue; } - if (!empty($adapter_data[$field['name']])) + if (!empty($adapter_datas[$field['name']])) { continue; } @@ -228,18 +228,18 @@ class Phone extends \descartes\Controller } //If field phone number is invalid - foreach ($find_adapter['meta_data_fields'] as $field) + foreach ($find_adapter['meta_datas_fields'] as $field) { if (false === ($field['number'] ?? false)) { continue; } - if (!empty($adapter_data[$field['name']])) + if (!empty($adapter_datas[$field['name']])) { - $adapter_data[$field['name']] = \controllers\internals\Tool::parse_phone($adapter_data[$field['name']]); + $adapter_datas[$field['name']] = \controllers\internals\Tool::parse_phone($adapter_datas[$field['name']]); - if ($adapter_data[$field['name']]) + if ($adapter_datas[$field['name']]) { continue; } @@ -250,11 +250,11 @@ class Phone extends \descartes\Controller return $this->redirect(\descartes\Router::url('Phone', 'add')); } - $adapter_data = json_encode($adapter_data); + $adapter_datas = json_encode($adapter_datas); - //Check adapter is working correctly with thoses names and data + //Check adapter is working correctly with thoses names and datas $adapter_classname = $find_adapter['meta_classname']; - $adapter_instance = new $adapter_classname($adapter_data); + $adapter_instance = new $adapter_classname($adapter_datas); $adapter_working = $adapter_instance->test(); if (!$adapter_working) @@ -264,7 +264,7 @@ class Phone extends \descartes\Controller return $this->redirect(\descartes\Router::url('Phone', 'add')); } - $success = $this->internal_phone->create($id_user, $name, $adapter, $adapter_data); + $success = $this->internal_phone->create($id_user, $name, $adapter, $adapter_datas); if (!$success) { \FlashMessage\FlashMessage::push('danger', 'Impossible de créer ce téléphone.'); diff --git a/controllers/publics/Templating.php b/controllers/publics/Templating.php index 3545b7c..c8f78fb 100644 --- a/controllers/publics/Templating.php +++ b/controllers/publics/Templating.php @@ -66,18 +66,18 @@ namespace controllers\publics; return false; } - $contact['data'] = json_decode($contact['data'], true); + $contact['datas'] = json_decode($contact['datas'], true); - //Add metas of contact by adding contact without data + //Add metas of contact by adding contact without datas $metas = $contact; - unset($metas['data'], $metas['id_user']); + unset($metas['datas'], $metas['id_user']); - $data = [ - 'contact' => $contact['data'], + $datas = [ + 'contact' => $contact['datas'], 'contact_metas' => $metas, ]; - $result = $this->internal_templating->render($template, $data); + $result = $this->internal_templating->render($template, $datas); $return = $result; if (!trim($result['result'])) { diff --git a/daemons/Phone.php b/daemons/Phone.php index 83a4b01..cee8be2 100644 --- a/daemons/Phone.php +++ b/daemons/Phone.php @@ -82,7 +82,7 @@ class Phone extends AbstractDaemon //Instanciate adapter $adapter_class = $this->phone['adapter']; - $this->adapter = new $adapter_class($this->phone['adapter_data']); + $this->adapter = new $adapter_class($this->phone['adapter_datas']); $this->logger->info('Starting Phone daemon with pid ' . getmypid()); } diff --git a/daemons/Webhook.php b/daemons/Webhook.php index 62c43c1..a7f6e34 100644 --- a/daemons/Webhook.php +++ b/daemons/Webhook.php @@ -79,7 +79,7 @@ class Webhook extends AbstractDaemon $this->logger->info('Trigger webhook : ' . json_encode($message)); - $promises[] = $this->guzzle_client->postAsync($message['url'], ['form_params' => $message['data']]); + $promises[] = $this->guzzle_client->postAsync($message['url'], ['form_params' => $message['datas']]); } try diff --git a/data/.tokeep b/datas/.tokeep similarity index 100% rename from data/.tokeep rename to datas/.tokeep diff --git a/datas/test_read_sms.json b/datas/test_read_sms.json new file mode 100644 index 0000000..e69de29 diff --git a/db/migrations/20210117022706_rename_datas_to_data.php b/db/migrations/20210117022706_rename_datas_to_data.php deleted file mode 100644 index ac3f79f..0000000 --- a/db/migrations/20210117022706_rename_datas_to_data.php +++ /dev/null @@ -1,47 +0,0 @@ -table('phone'); - $table->renameColumn('adapter_datas', 'adapter_data'); - $table->update(); - - $table = $this->table('contact'); - $table->renameColumn('datas', 'data'); - $table->update(); - - $table = $this->table('validation'); - $table->renameColumn('datas', 'data'); - $table->update(); - - } -} diff --git a/descartes/ApiController.php b/descartes/ApiController.php index feaa303..da738d3 100644 --- a/descartes/ApiController.php +++ b/descartes/ApiController.php @@ -91,21 +91,21 @@ /** * Cette fonction permet de faire un retour sous forme de json - * @param array $data : Les données à retourner sous forme de json + * @param array $datas : Les données à retourner sous forme de json * @param boolean $secure : Défini si l'affichage doit être sécurisé contre les XSS, par défaut true * @return ApiController : On retourne l'API controlleur lui meme pour pouvoir chainer */ - public function json ($data, $secure = true) + public function json ($datas, $secure = true) { header('Content-Type: application/json'); if ($secure) { - echo htmlspecialchars(json_encode($data), ENT_NOQUOTES); + echo htmlspecialchars(json_encode($datas), ENT_NOQUOTES); } else { - echo json_encode($data); + echo json_encode($datas); } return $this; diff --git a/descartes/Model.php b/descartes/Model.php index 207e680..000426d 100644 --- a/descartes/Model.php +++ b/descartes/Model.php @@ -54,28 +54,28 @@ /** * Run a query and return result * @param string $query : Query to run - * @param array $data : Data to pass to query + * @param array $datas : Datas to pass to query * @param const $return_type : Type of return, by default all results, see Model constants * @param const $fetch_mode : Format of result from db, by default array, FETCH_ASSOC * @param boolean $debug : If we must return debug info instead of data, by default false * @return mixed : Result of query, depend of $return_type | null | array | object | int */ - protected function _run_query (string $query, array $data = array(), int $return_type = self::FETCHALL, int $fetch_mode = \PDO::FETCH_ASSOC, bool $debug = false) + protected function _run_query (string $query, array $datas = array(), int $return_type = self::FETCHALL, int $fetch_mode = \PDO::FETCH_ASSOC, bool $debug = false) { try { //Must convert bool to 1 or 0 because of some strange inconsistent behavior between PHP versions - foreach ($data as $key => $value) + foreach ($datas as $key => $value) { if (is_bool($value)) { - $data[$key] = (int) $value; + $datas[$key] = (int) $value; } } $query = $this->pdo->prepare($query); $query->setFetchMode($return_type); - $query->execute($data); + $query->execute($datas); if ($debug) { @@ -397,18 +397,18 @@ /** * Update data from table with some conditions * @param string $table : table name - * @param array $data : new data to set + * @param array $datas : new data to set * @param array $conditions : conditions of update, Les conditions pour la mise à jour sous la forme "label" => "valeur". Un operateur '<, >, <=, >=, !' peux précder le label pour modifier l'opérateur par défaut (=) * @param array $conditions : conditions to use, format 'fieldname' => 'value', fieldname can be preceed by operator '<, >, <=, >=, ! or = (by default)' to adapt comparaison operator * @return mixed : Number of line modified */ - protected function _update (string $table, array $data, array $conditions = array()) : int + protected function _update (string $table, array $datas, array $conditions = array()) : int { $params = array(); $sets = array(); - foreach ($data as $label => $value) + foreach ($datas as $label => $value) { $label = preg_replace('#[^a-zA-Z0-9_]#', '', $label); $params['set_' . $label] = $value; @@ -454,15 +454,15 @@ /** * Insert new line into table * @param string $table : table name - * @param array $data : new data + * @param array $datas : new datas * @return mixed : null on error, number of line inserted else */ - protected function _insert (string $table, array $data) : ?int + protected function _insert (string $table, array $datas) : ?int { $params = array(); $field_names = array(); - foreach ($data as $field_name => $value) + foreach ($datas as $field_name => $value) { //Protect against injection in fieldname $field_name = preg_replace('#[^a-zA-Z0-9_]#', '', $field_name); diff --git a/env.php.dist b/env.php.dist index 3b1321c..f3788ff 100644 --- a/env.php.dist +++ b/env.php.dist @@ -15,7 +15,7 @@ 'PWD_RECEIVEDS' => PWD . '/receiveds', 'HTTP_PWD_SOUND' => HTTP_PWD_ASSETS . '/sounds', 'PWD_ADAPTERS' => PWD . '/adapters', - 'PWD_DATA' => PWD . '/data', + 'PWD_DATAS' => PWD . '/datas', 'PWD_LOGS' => '/var/log/raspisms', 'PWD_PID' => '/var/run/raspisms', 'APP_SECRET' => '%APP_SECRET%', diff --git a/models/Media.php b/models/Media.php index dc92645..253ed44 100644 --- a/models/Media.php +++ b/models/Media.php @@ -188,16 +188,16 @@ namespace models; * * @param int $id_user : User id * @param int $id : Entry id - * @param array $data : data to update + * @param array $datas : datas to update * * @return int : number of modified rows */ - public function update_for_user(int $id_user, int $id, array $data) + public function update_for_user(int $id_user, int $id, array $datas) { $params = []; $sets = []; - foreach ($data as $label => $value) + foreach ($datas as $label => $value) { $label = preg_replace('#[^a-zA-Z0-9_]#', '', $label); $params['set_' . $label] = $value; diff --git a/models/StandardModel.php b/models/StandardModel.php index f6eea2a..8c3b07c 100644 --- a/models/StandardModel.php +++ b/models/StandardModel.php @@ -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 $datas : datas to update * * @return int : number of modified rows */ @@ -167,7 +167,7 @@ namespace models; * Update a entry by his id. * * @param int $id : Entry id - * @param array $data : data to update + * @param array $datas : datas to update * * @return int : number of modified rows */ diff --git a/models/User.php b/models/User.php index f6c70f0..1394855 100644 --- a/models/User.php +++ b/models/User.php @@ -96,13 +96,13 @@ namespace models; * Update a user using his is. * * @param int $id : User id - * @param array $data : Data to update + * @param array $datas : Datas to update * * @return int : number of modified rows */ - public function update($id, $data) + public function update($id, $datas) { - return $this->_update('user', $data, ['id' => $id]); + return $this->_update('user', $datas, ['id' => $id]); } /** diff --git a/templates/conditional_group/add.php b/templates/conditional_group/add.php index 6e517ab..f166897 100644 --- a/templates/conditional_group/add.php +++ b/templates/conditional_group/add.php @@ -90,16 +90,16 @@ jQuery(document).ready(function() e.preventDefault(); var condition = jQuery(this).parents('.form-group').find('input').val(); - var data = { + var datas = { 'condition' : condition, }; jQuery.ajax({ type: "POST", url: HTTP_PWD + '/conditional_group/preview/', - data: data, - success: function (data) { - jQuery('#preview-text-modal').find('.modal-body pre').text(data.result); + data: datas, + success: function (datas) { + jQuery('#preview-text-modal').find('.modal-body pre').text(datas.result); jQuery('#preview-text-modal').modal({'keyboard': true}); }, dataType: 'json' diff --git a/templates/conditional_group/edit.php b/templates/conditional_group/edit.php index 6e33838..79761df 100644 --- a/templates/conditional_group/edit.php +++ b/templates/conditional_group/edit.php @@ -93,16 +93,16 @@ jQuery(document).ready(function() e.preventDefault(); var condition = jQuery(this).parents('.form-group').find('input').val(); - var data = { + var datas = { 'condition' : condition, }; jQuery.ajax({ type: "POST", url: HTTP_PWD + '/conditional_group/preview/', - data: data, - success: function (data) { - jQuery('#preview-text-modal').find('.modal-body pre').text(data.result); + data: datas, + success: function (datas) { + jQuery('#preview-text-modal').find('.modal-body pre').text(datas.result); jQuery('#preview-text-modal').modal({'keyboard': true}); }, dataType: 'json' diff --git a/templates/contact/add.php b/templates/contact/add.php index 786951c..4f6408f 100644 --- a/templates/contact/add.php +++ b/templates/contact/add.php @@ -53,18 +53,18 @@
-

+

Les données d'un contact vous permettent de l'enrichir afin de pouvoir accéder à ces données au sein d'un message via l'utilisation de templates.
Laissez vide si vous ne souhaitez pas renseigner d'informations supplémentaires pour le contact. Utilisez uniquement des lettres, des chiffres et des underscore pour les noms de données, ni espace ni caractères spéciaux.

-
- $value) { ?> +
+ $value) { ?>
: - +
@@ -101,14 +101,14 @@ }); - jQuery('.contact-data-container').on('input', '.contact-data-value, .contact-data-name', function (e) + jQuery('.contact-datas-container').on('input', '.contact-data-value, .contact-data-name', function (e) { var focus_group = jQuery(this).parent('.form-group'); var focus_input = this; var input_name = focus_group.find('.contact-data-name'); var input_value = focus_group.find('.contact-data-value'); - jQuery('.contact-data-container .form-group').each(function (e) + jQuery('.contact-datas-container .form-group').each(function (e) { var current_input_name = jQuery(this).find('.contact-data-name'); var current_input_value = jQuery(this).find('.contact-data-value'); @@ -136,15 +136,15 @@ '' + ' : ' + '' + - ' ' + + ' ' + '
'; - jQuery('.contact-data-container').append(template); + jQuery('.contact-datas-container').append(template); }); - jQuery('.contact-data-container').on('click', '.contact-data-remove', function (e) + jQuery('.contact-datas-container').on('click', '.contact-datas-remove', function (e) { e.preventDefault(); - if (jQuery('.contact-data-container .form-group').length > 1) + if (jQuery('.contact-datas-container .form-group').length > 1) { jQuery(this).parent('.form-group').remove(); } @@ -156,11 +156,11 @@ { e.preventDefault(); - jQuery('.contact-data-container .form-group').each(function () + jQuery('.contact-datas-container .form-group').each(function () { var name = jQuery(this).find('.contact-data-name').val(); name = name.replace(/\W/g, ''); - name = 'data[' + name + ']'; + name = 'datas[' + name + ']'; jQuery(this).find('.contact-data-value').attr('name', name); }); diff --git a/templates/contact/edit.php b/templates/contact/edit.php index 054a487..0fdfe79 100644 --- a/templates/contact/edit.php +++ b/templates/contact/edit.php @@ -55,31 +55,31 @@
-

+

Les données d'un contact vous permettent de l'enrichir afin de pouvoir accéder à ces données au sein d'un message via l'utilisation de templates.
Laissez vide si vous ne souhaitez pas renseigner d'informations supplémentaires pour le contact. Utilisez uniquement des lettres, des chiffres et des underscore pour les noms de données, ni espace ni caractères spéciaux.

-
- +
+
:
- $data) { ?> + $data) { ?>
: - +
: - +
@@ -116,16 +116,16 @@ }); - jQuery('.contact-data-container').on('input', '.contact-data-value, .contact-data-name', function (e) + jQuery('.contact-datas-container').on('input', '.contact-data-value, .contact-data-name', function (e) { var focus_group = jQuery(this).parent('.form-group'); var focus_input = this; var input_name = focus_group.find('.contact-data-name'); var input_value = focus_group.find('.contact-data-value'); - var data_container = jQuery(this).parents('.contact-data-container'); + var datas_container = jQuery(this).parents('.contact-datas-container'); - data_container.find('.form-group').each(function (e) + datas_container.find('.form-group').each(function (e) { console.log(this); var current_input_name = jQuery(this).find('.contact-data-name'); @@ -154,15 +154,15 @@ '' + ' : ' + '' + - ' ' + + ' ' + '
'; - data_container.append(template); + datas_container.append(template); }); - jQuery('.contact-data-container').on('click', '.contact-data-remove', function (e) + jQuery('.contact-datas-container').on('click', '.contact-datas-remove', function (e) { e.preventDefault(); - if (jQuery('.contact-data-container .form-group').length > 1) + if (jQuery('.contact-datas-container .form-group').length > 1) { jQuery(this).parent('.form-group').remove(); } @@ -174,13 +174,13 @@ { e.preventDefault(); - jQuery('.contact-data-container .form-group').each(function () + jQuery('.contact-datas-container .form-group').each(function () { - var contact_id = jQuery(this).parents('.contact-data-container').attr('data-id-contact'); + var contact_id = jQuery(this).parents('.contact-datas-container').attr('data-id-contact'); var name = jQuery(this).find('.contact-data-name').val(); name = name.replace(/\W/g, ''); - name = 'contacts[' + contact_id + '][data][' + name + ']'; + name = 'contacts[' + contact_id + '][datas][' + name + ']'; jQuery(this).find('.contact-data-value').attr('name', name); }); diff --git a/templates/dashboard/show.php b/templates/dashboard/show.php index f64c3d0..bde0577 100644 --- a/templates/dashboard/show.php +++ b/templates/dashboard/show.php @@ -244,7 +244,7 @@ element: 'morris-area-chart', behaveLikeLine: true, fillOpacity: 0.4, - data: , + data: , xkey: 'period', parseTime: false, ykeys: ['sendeds', 'receiveds'], diff --git a/templates/phone/add.php b/templates/phone/add.php index 74f52b2..1b1a84a 100644 --- a/templates/phone/add.php +++ b/templates/phone/add.php @@ -57,7 +57,7 @@
-
-
+
+

Description de l'adaptateur

-
+

Réglages de l'adaptateur

-
+
Annuler @@ -91,17 +91,17 @@ function change_adapter () { var option = jQuery('#adapter-select').find('option:selected'); - jQuery('#adapter-data-description').html(option.attr('data-description')); - jQuery('#description-adapter-data').text(option.attr('data-data-help')); + jQuery('#adapter-datas-description').html(option.attr('data-description')); + jQuery('#description-adapter-datas').text(option.attr('data-datas-help')); - var data_fields = option.attr('data-data-fields'); - data_fields = JSON.parse(data_fields); + var datas_fields = option.attr('data-datas-fields'); + datas_fields = JSON.parse(datas_fields); var numbers = []; var html = ''; - jQuery.each(data_fields, function (index, field) + jQuery.each(datas_fields, function (index, field) { if (!field.number) { @@ -109,7 +109,7 @@ '' + '

' + field.description + '

' + '
' + - '' + + '' + '
' + '
'; } @@ -139,12 +139,12 @@ html = 'Pas de réglages.'; } - jQuery('#adapter-data-fields').html(html); + jQuery('#adapter-datas-fields').html(html); for (i = 0; i < numbers.length; i++) { var iti_number_input = window.intlTelInput(document.getElementById(numbers[i].id), { - hiddenInput: 'adapter_data[' + numbers[i].name + ']', + hiddenInput: 'adapter_datas[' + numbers[i].name + ']', defaultCountry: 's($_SESSION['user']['settings']['default_phone_country']); ?>', preferredCountries: s(json_encode(explode(',', $_SESSION['user']['settings']['preferred_phone_country'])), false, false); ?>, nationalMode: true, diff --git a/templates/scheduled/add.php b/templates/scheduled/add.php index 13ca007..4544e38 100644 --- a/templates/scheduled/add.php +++ b/templates/scheduled/add.php @@ -249,7 +249,7 @@ var id_contact = jQuery(this).parents('.scheduled-preview-container').find('select').val(); var template = jQuery(this).parents('.form-group').find('textarea').val(); - var data = { + var datas = { 'id_contact' : id_contact, 'template' : template, }; @@ -257,9 +257,9 @@ jQuery.ajax({ type: "POST", url: HTTP_PWD + '/template/preview', - data: data, - success: function (data) { - jQuery('#scheduled-preview-text-modal').find('.modal-body pre').text(data.result); + data: datas, + success: function (datas) { + jQuery('#scheduled-preview-text-modal').find('.modal-body pre').text(datas.result); jQuery('#scheduled-preview-text-modal').modal({'keyboard': true}); }, dataType: 'json' diff --git a/templates/scheduled/edit.php b/templates/scheduled/edit.php index 794cd0f..319cfd1 100644 --- a/templates/scheduled/edit.php +++ b/templates/scheduled/edit.php @@ -256,7 +256,7 @@ var id_contact = jQuery(this).parents('.scheduled-preview-container').find('select').val(); var template = jQuery(this).parents('.form-group').find('textarea').val(); - var data = { + var datas = { 'id_contact' : id_contact, 'template' : template, }; @@ -264,9 +264,9 @@ jQuery.ajax({ type: "POST", url: HTTP_PWD + '/template/preview', - data: data, - success: function (data) { - jQuery('#scheduled-preview-text-modal').find('.modal-body pre').text(data.result); + data: datas, + success: function (datas) { + jQuery('#scheduled-preview-text-modal').find('.modal-body pre').text(datas.result); jQuery('#scheduled-preview-text-modal').modal({'keyboard': true}); }, dataType: 'json'