diff --git a/.gitignore b/.gitignore index af77c93..e0f2848 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ composer.lock env.* phinx.* -datas/test_write_sms.json -datas/test_read_sms.json +data/test_write_sms.json +data/test_read_sms.json !*.dist diff --git a/adapters/AdapterInterface.php b/adapters/AdapterInterface.php index 9eb0a0b..f778fcc 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 $datas : JSON string of the datas 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 $datas); + public function __construct(string $data); /** * Classname of the adapter. @@ -51,11 +51,11 @@ namespace adapters; public static function meta_description(): string; /** - * List of entries we want in datas for the adapter. + * List of entries we want in data for the adapter. * * @return array : Eachline line is a field as an array with keys : name, title, description, required */ - public static function meta_datas_fields(): array; + public static function meta_data_fields(): array; /** * Does the implemented service support flash smss. diff --git a/adapters/BenchmarkAdapter.php b/adapters/BenchmarkAdapter.php index f229749..43ea3dc 100644 --- a/adapters/BenchmarkAdapter.php +++ b/adapters/BenchmarkAdapter.php @@ -21,9 +21,9 @@ namespace adapters; class BenchmarkAdapter implements AdapterInterface { /** - * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $datas; + private $data; /** * API URL. @@ -33,11 +33,11 @@ namespace adapters; /** * Adapter constructor, called when instanciated by RaspiSMS. * - * @param json string $datas : JSON string of the datas 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 $datas) + public function __construct(string $data) { - $this->datas = $datas; + $this->data = $data; } /** @@ -76,11 +76,11 @@ namespace adapters; } /** - * List of entries we want in datas for the adapter. + * List of entries we want in data for the adapter. * * @return array : Eachline line is a field as an array with keys : name, title, description, required */ - public static function meta_datas_fields(): array + public static function meta_data_fields(): array { return []; } @@ -140,7 +140,7 @@ namespace adapters; try { - $datas = [ + $data = [ '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($datas)); + curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($data)); $curl_response = curl_exec($curl); curl_close($curl); diff --git a/adapters/GammuAdapter.php b/adapters/GammuAdapter.php index 2b40dd5..d6fec3d 100644 --- a/adapters/GammuAdapter.php +++ b/adapters/GammuAdapter.php @@ -21,18 +21,18 @@ namespace adapters; class GammuAdapter implements AdapterInterface { /** - * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $datas; + private $data; /** * Adapter constructor, called when instanciated by RaspiSMS. * - * @param json string $datas : JSON string of the datas 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 $datas) + public function __construct(string $data) { - $this->datas = json_decode($datas, true); + $this->data = json_decode($data, true); } /** @@ -73,11 +73,11 @@ namespace adapters; } /** - * List of entries we want in datas for the adapter. + * List of entries we want in data for the adapter. * * @return array : Every line is a field as an array with keys : name, title, description, required */ - public static function meta_datas_fields(): array + public static function meta_data_fields(): array { return [ [ @@ -159,7 +159,7 @@ namespace adapters; $command_parts = [ 'gammu', '--config', - escapeshellarg($this->datas['config_file']), + escapeshellarg($this->data['config_file']), 'sendsms', 'TEXT', escapeshellarg($destination), @@ -248,7 +248,7 @@ namespace adapters; $command_parts = [ PWD . '/bin/gammu_get_unread_sms.py', - escapeshellarg($this->datas['config_file']), + escapeshellarg($this->data['config_file']), ]; $return = $this->exec_command($command_parts); @@ -326,7 +326,7 @@ namespace adapters; */ private function unlock_sim(): bool { - if (!$this->datas['pin']) + if (!$this->data['pin']) { return true; } @@ -334,10 +334,10 @@ namespace adapters; $command_parts = [ 'gammu', '--config', - escapeshellarg($this->datas['config_file']), + escapeshellarg($this->data['config_file']), 'entersecuritycode', 'PIN', - escapeshellarg($this->datas['pin']), + escapeshellarg($this->data['pin']), ]; $result = $this->exec_command($command_parts); @@ -346,7 +346,7 @@ namespace adapters; $command_parts = [ 'gammu', '--config', - escapeshellarg($this->datas['config_file']), + escapeshellarg($this->data['config_file']), 'getsecuritystatus', ]; diff --git a/adapters/OctopushShortcodeAdapter.php b/adapters/OctopushShortcodeAdapter.php index 24c42e0..4123bc2 100644 --- a/adapters/OctopushShortcodeAdapter.php +++ b/adapters/OctopushShortcodeAdapter.php @@ -22,9 +22,9 @@ class OctopushShortcodeAdapter implements AdapterInterface const SMS_TYPE_INTERNATIONAL = 'WWW'; /** - * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $datas; + private $data; /** * 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 $datas : JSON string of the datas 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 $datas) + public function __construct(string $data) { - $this->datas = json_decode($datas, true); + $this->data = json_decode($data, true); - $this->login = $this->datas['login']; - $this->api_key = $this->datas['api_key']; - $this->sender = $this->datas['sender'] ?? null; + $this->login = $this->data['login']; + $this->api_key = $this->data['api_key']; + $this->sender = $this->data['sender'] ?? null; } /** @@ -102,11 +102,11 @@ class OctopushShortcodeAdapter implements AdapterInterface } /** - * List of entries we want in datas for the adapter. + * List of entries we want in data for the adapter. * * @return array : Every line is a field as an array with keys : name, title, description, required */ - public static function meta_datas_fields(): array + public static function meta_data_fields(): array { return [ [ @@ -187,7 +187,7 @@ class OctopushShortcodeAdapter implements AdapterInterface try { - $datas = [ + $data = [ 'user_login' => $this->login, 'api_key' => $this->api_key, 'sms_text' => $text, @@ -198,7 +198,7 @@ class OctopushShortcodeAdapter implements AdapterInterface if (null !== $this->sender) { - $datas['sms_sender'] = $this->sender; + $data['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, $datas); + curl_setopt($curl, CURLOPT_POSTFIELDS, $data); $response = curl_exec($curl); curl_close($curl); @@ -285,12 +285,12 @@ class OctopushShortcodeAdapter implements AdapterInterface { $success = true; - if ($this->datas['sender'] && (mb_strlen($this->datas['sender']) < 3 || mb_strlen($this->datas['sender'] > 11))) + if ($this->data['sender'] && (mb_strlen($this->data['sender']) < 3 || mb_strlen($this->data['sender'] > 11))) { return false; } - $datas = [ + $data = [ '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, $datas); + curl_setopt($curl, CURLOPT_POSTFIELDS, $data); $response = curl_exec($curl); curl_close($curl); diff --git a/adapters/OctopushVirtualNumberAdapter.php b/adapters/OctopushVirtualNumberAdapter.php index f3b1aec..830e26b 100644 --- a/adapters/OctopushVirtualNumberAdapter.php +++ b/adapters/OctopushVirtualNumberAdapter.php @@ -22,9 +22,9 @@ class OctopushVirtualNumberAdapter implements AdapterInterface const SMS_TYPE_INTERNATIONAL = 'WWW'; /** - * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $datas; + private $data; /** * 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 $datas : JSON string of the datas 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 $datas) + public function __construct(string $data) { - $this->datas = json_decode($datas, true); + $this->data = json_decode($data, true); - $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); + $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); } /** @@ -108,11 +108,11 @@ class OctopushVirtualNumberAdapter implements AdapterInterface } /** - * List of entries we want in datas for the adapter. + * List of entries we want in data for the adapter. * * @return array : Every line is a field as an array with keys : name, title, description, required */ - public static function meta_datas_fields(): array + public static function meta_data_fields(): array { return [ [ @@ -192,7 +192,7 @@ class OctopushVirtualNumberAdapter implements AdapterInterface try { - $datas = [ + $data = [ '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, $datas); + curl_setopt($curl, CURLOPT_POSTFIELDS, $data); $response = curl_exec($curl); curl_close($curl); @@ -285,12 +285,12 @@ class OctopushVirtualNumberAdapter implements AdapterInterface { $success = true; - if ($this->datas['sender'] && (mb_strlen($this->datas['sender']) < 3 || mb_strlen($this->datas['sender'] > 11))) + if ($this->data['sender'] && (mb_strlen($this->data['sender']) < 3 || mb_strlen($this->data['sender'] > 11))) { return false; } - $datas = [ + $data = [ '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, $datas); + curl_setopt($curl, CURLOPT_POSTFIELDS, $data); $response = curl_exec($curl); curl_close($curl); diff --git a/adapters/OvhSmsShortcodeAdapter.php b/adapters/OvhSmsShortcodeAdapter.php index f23019a..5deeda8 100644 --- a/adapters/OvhSmsShortcodeAdapter.php +++ b/adapters/OvhSmsShortcodeAdapter.php @@ -19,9 +19,9 @@ namespace adapters; class OvhSmsShortcodeAdapter implements AdapterInterface { /** - * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $datas; + private $data; /** * 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 $datas : JSON string of the datas 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 $datas) + public function __construct(string $data) { - $this->datas = json_decode($datas, true); + $this->data = json_decode($data, true); $this->api = new Api( - $this->datas['app_key'], - $this->datas['app_secret'], + $this->data['app_key'], + $this->data['app_secret'], 'ovh-eu', - $this->datas['consumer_key'] + $this->data['consumer_key'] ); } @@ -87,11 +87,11 @@ namespace adapters; } /** - * List of entries we want in datas for the adapter. + * List of entries we want in data for the adapter. * * @return array : Every line is a field as an array with keys : name, title, description, required */ - public static function meta_datas_fields(): array + public static function meta_data_fields(): array { return [ [ @@ -186,16 +186,16 @@ namespace adapters; { $success = true; - $endpoint = '/sms/' . $this->datas['service_name'] . '/jobs'; + $endpoint = '/sms/' . $this->data['service_name'] . '/jobs'; $params = [ 'message' => $text, 'receivers' => [$destination], 'senderForResponse' => true, ]; - if ($this->datas['sender']) + if ($this->data['sender']) { - $params['sender'] = $this->datas['sender']; + $params['sender'] = $this->data['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->datas['sended']) + if ($this->data['sended']) { return $response; } - $endpoint = '/sms/' . $this->datas['service_name'] . '/incoming'; + $endpoint = '/sms/' . $this->data['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->datas['service_name'] . '/incoming/' . $uid; + $endpoint = '/sms/' . $this->data['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->datas['service_name'] . '/incoming/' . $uid; + $endpoint = '/sms/' . $this->data['service_name'] . '/incoming/' . $uid; $this->api->delete($endpoint); } @@ -309,13 +309,13 @@ namespace adapters; { $success = true; - if ($this->datas['sender'] && (mb_strlen($this->datas['sender']) < 3 || mb_strlen($this->datas['sender'] > 11))) + if ($this->data['sender'] && (mb_strlen($this->data['sender']) < 3 || mb_strlen($this->data['sender'] > 11))) { return false; } //Check service name - $endpoint = '/sms/' . $this->datas['service_name']; + $endpoint = '/sms/' . $this->data['service_name']; $response = $this->api->get($endpoint); return $success && (bool) $response; diff --git a/adapters/OvhSmsVirtualNumberAdapter.php b/adapters/OvhSmsVirtualNumberAdapter.php index 48df00d..3e7d3c9 100644 --- a/adapters/OvhSmsVirtualNumberAdapter.php +++ b/adapters/OvhSmsVirtualNumberAdapter.php @@ -19,9 +19,9 @@ namespace adapters; class OvhSmsVirtualNumberAdapter implements AdapterInterface { /** - * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $datas; + private $data; /** * OVH Api instance. @@ -41,20 +41,20 @@ namespace adapters; /** * Adapter constructor, called when instanciated by RaspiSMS. * - * @param json string $datas : JSON string of the datas 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 $datas) + public function __construct(string $data) { - $this->datas = json_decode($datas, true); + $this->data = json_decode($data, true); $this->api = new Api( - $this->datas['app_key'], - $this->datas['app_secret'], + $this->data['app_key'], + $this->data['app_secret'], 'ovh-eu', - $this->datas['consumer_key'] + $this->data['consumer_key'] ); - $this->number = $this->datas['number']; + $this->number = $this->data['number']; $this->formatted_number = str_replace('+', '00', $this->number); } @@ -99,11 +99,11 @@ namespace adapters; } /** - * List of entries we want in datas for the adapter. + * List of entries we want in data for the adapter. * * @return array : Every line is a field as an array with keys : name, title, description, required */ - public static function meta_datas_fields(): array + public static function meta_data_fields(): array { return [ [ @@ -197,7 +197,7 @@ namespace adapters; { $success = true; - $endpoint = '/sms/' . $this->datas['service_name'] . '/virtualNumbers/' . $this->formatted_number . '/jobs'; + $endpoint = '/sms/' . $this->data['service_name'] . '/virtualNumbers/' . $this->formatted_number . '/jobs'; $params = [ 'message' => $text, 'receivers' => [$destination], @@ -255,7 +255,7 @@ namespace adapters; try { - $endpoint = '/sms/' . $this->datas['service_name'] . '/virtualNumbers/' . $this->formatted_number . '/incoming'; + $endpoint = '/sms/' . $this->data['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->datas['service_name'] . '/virtualNumbers/' . $this->formatted_number . '/incoming/' . $uid; + $endpoint = '/sms/' . $this->data['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->datas['service_name'] . '/virtualNumbers/' . $this->formatted_number . '/incoming/' . $uid; + $endpoint = '/sms/' . $this->data['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->datas['service_name']; + $endpoint = '/sms/' . $this->data['service_name']; $response = $this->api->get($endpoint); $success = $success && (bool) $response; diff --git a/adapters/TestAdapter.php b/adapters/TestAdapter.php index 1856a6e..6586bd6 100644 --- a/adapters/TestAdapter.php +++ b/adapters/TestAdapter.php @@ -21,28 +21,28 @@ namespace adapters; class TestAdapter implements AdapterInterface { /** - * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $datas; + private $data; /** * Path for the file to read sms as a json from. */ - private $test_file_read = PWD_DATAS . '/test_read_sms.json'; + private $test_file_read = PWD_DATA . '/test_read_sms.json'; /** * Path for the file to write sms as a json in. */ - private $test_file_write = PWD_DATAS . '/test_write_sms.json'; + private $test_file_write = PWD_DATA . '/test_write_sms.json'; /** * Adapter constructor, called when instanciated by RaspiSMS. * - * @param json string $datas : JSON string of the datas 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 $datas) + public function __construct(string $data) { - $this->datas = $datas; + $this->data = $data; } /** @@ -81,11 +81,11 @@ namespace adapters; } /** - * List of entries we want in datas for the adapter. + * List of entries we want in data for the adapter. * * @return array : Eachline line is a field as an array with keys : name, title, description, required */ - public static function meta_datas_fields(): array + public static function meta_data_fields(): array { return []; } diff --git a/adapters/TwilioVirtualNumberAdapter.php b/adapters/TwilioVirtualNumberAdapter.php index 4120bdc..58e12e8 100644 --- a/adapters/TwilioVirtualNumberAdapter.php +++ b/adapters/TwilioVirtualNumberAdapter.php @@ -19,9 +19,9 @@ use Twilio\Rest\Client; class TwilioVirtualNumberAdapter implements AdapterInterface { /** - * Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). + * Data used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.). */ - private $datas; + private $data; /** * 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 $datas : JSON string of the datas 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 $datas) + public function __construct(string $data) { - $this->datas = json_decode($datas, true); + $this->data = json_decode($data, true); $this->client = new Client( - $this->datas['account_sid'], - $this->datas['auth_token'] + $this->data['account_sid'], + $this->data['auth_token'] ); - $this->number = $this->datas['number']; - $this->status_change_callback = $this->datas['status_change_callback']; + $this->number = $this->data['number']; + $this->status_change_callback = $this->data['status_change_callback']; } /** @@ -98,11 +98,11 @@ class TwilioVirtualNumberAdapter implements AdapterInterface } /** - * List of entries we want in datas for the adapter. + * List of entries we want in data for the adapter. * * @return array : Every line is a field as an array with keys : name, title, description, required */ - public static function meta_datas_fields(): array + public static function meta_data_fields(): array { return [ [ diff --git a/assets/css/style.css b/assets/css/style.css index 3e8485b..b03cf87 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -333,29 +333,29 @@ footer img display: inline-block !important; } -.contact-datas-container input +.contact-data-container input { display: inline-block; } -.contact-datas-container .contact-data-name +.contact-data-container .contact-data-name { width: 25%; } -.contact-datas-container .contact-data-value +.contact-data-container .contact-data-value { width: 50%; } -.contact-datas-container .contact-datas-remove +.contact-data-container .contact-data-remove { color: #c9302c; } /* PHONE */ -#adapter-datas-container +#adapter-data-container { margin-top: 35px; } @@ -365,7 +365,7 @@ footer img margin-top: 20px; } -#adapter-datas-fields +#adapter-data-fields { padding-top: 15px; padding-left: 15px; diff --git a/controllers/internals/Command.php b/controllers/internals/Command.php index eb1e01b..aee4757 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) { - $datas = [ + $data = [ 'name' => $name, 'script' => $script, 'admin' => $admin, ]; - return $this->get_model()->update_for_user($id_user, $id, $datas); + return $this->get_model()->update_for_user($id_user, $id, $data); } /** diff --git a/controllers/internals/ConditionalGroup.php b/controllers/internals/ConditionalGroup.php index e22707d..bed5fa2 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) ['datas' => (object) null]]); + $valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['data' => (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) ['datas' => (object) null]]); + $valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['data' => (object) null]]); if (!$valid_condition) { return false; @@ -112,16 +112,16 @@ namespace controllers\internals; foreach ($contacts as $key => $contact) { - $contact['datas'] = json_decode($contact['datas']); + $contact['data'] = json_decode($contact['data']); $contact = (object) $contact; - //Add metas of contact by adding contact without datas + //Add metas of contact by adding contact without data $metas = clone $contact; - $metas->datas = null; + $metas->data = null; $metas->id_user = null; - $datas = ['contact' => $contact->datas, 'contact_metas' => $metas]; - $is_valid = $ruler->evaluate_condition($condition, $datas); + $data = ['contact' => $contact->data, 'contact_metas' => $metas]; + $is_valid = $ruler->evaluate_condition($condition, $data); if (!$is_valid) { unset($contacts[$key]); diff --git a/controllers/internals/Contact.php b/controllers/internals/Contact.php index 876db70..b33f71d 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 $datas : Contact datas + * @param string $data : Contact data * * @return mixed bool|int : False if cannot create contact, id of the new contact else */ - public function create($id_user, $number, $name, $datas) + public function create($id_user, $number, $name, $data) { $contact = [ 'id_user' => $id_user, 'number' => $number, 'name' => $name, - 'datas' => $datas, + 'data' => $data, ]; $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 $datas : Contact datas + * @param ?string $data : Contact data * * @return int : number of modified rows */ - public function update_for_user(int $id_user, int $id, string $number, string $name, string $datas) + public function update_for_user(int $id_user, int $id, string $number, string $name, string $data) { $contact = [ 'number' => $number, 'name' => $name, - 'datas' => $datas, + 'data' => $data, ]; return $this->get_model()->update_for_user($id_user, $id, $contact); @@ -144,7 +144,7 @@ namespace controllers\internals; continue; } - $datas = []; + $data = []; $i = 0; foreach ($line as $key => $value) { @@ -160,13 +160,13 @@ namespace controllers\internals; } $key = mb_ereg_replace('[\W]', '', $key); - $datas[$key] = $value; + $data[$key] = $value; } - $datas = json_encode($datas); + $data = json_encode($data); try { - $success = $this->create($id_user, $line[array_keys($line)[1]], $line[array_keys($line)[0]], $datas); + $success = $this->create($id_user, $line[array_keys($line)[1]], $line[array_keys($line)[0]], $data); if ($success) { ++$nb_insert; @@ -224,12 +224,12 @@ namespace controllers\internals; continue; } - $datas = $contact['datas'] ?? []; - $datas = json_encode($datas); + $data = $contact['data'] ?? []; + $data = json_encode($data); try { - $success = $this->create($id_user, $contact['number'], $contact['name'], $datas); + $success = $this->create($id_user, $contact['number'], $contact['name'], $data); if ($success) { ++$nb_insert; @@ -264,8 +264,8 @@ namespace controllers\internals; foreach ($contacts as $contact) { - $datas = json_decode($contact['datas'], true); - foreach ($datas as $key => $value) + $data = json_decode($contact['data'], true); + foreach ($data as $key => $value) { $columns[] = $key; } @@ -275,14 +275,14 @@ namespace controllers\internals; $lines = []; foreach ($contacts as $contact) { - $datas = json_decode($contact['datas'], true); + $data = json_decode($contact['data'], true); $line = [$contact['name'], $contact['number']]; foreach ($columns as $column) { - if (isset($datas[$column])) + if (isset($data[$column])) { - $line[] = $datas[$column]; + $line[] = $data[$column]; continue; } @@ -327,7 +327,7 @@ namespace controllers\internals; { unset($contact['id'], $contact['id_user']); - $contact['datas'] = json_decode($contact['datas']); + $contact['data'] = json_decode($contact['data']); } $content = json_encode($contacts); diff --git a/controllers/internals/Mailer.php b/controllers/internals/Mailer.php index 052b6ef..cb25aa2 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 $datas : Datas to inject into email template + * @param array $data : Data to inject into email template * * @return bool : true on success, false on error */ - public function enqueue(string $destination, array $settings, array $datas): bool + public function enqueue(string $destination, array $settings, array $data): bool { - $response = $this->generate_body($settings, $datas); + $response = $this->generate_body($settings, $data); $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 : Datas to inject into email template + * @param array : Data 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 $datas): array + private function generate_body(array $settings, array $data): array { //Generate body of email ob_start(); - $this->render($settings['template'], $datas); + $this->render($settings['template'], $data); $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'], $datas); + $this->render($settings['alt_template'], $data); $alt_body = ob_get_clean(); } diff --git a/controllers/internals/Media.php b/controllers/internals/Media.php index 64c25a7..b02ff5f 100644 --- a/controllers/internals/Media.php +++ b/controllers/internals/Media.php @@ -39,12 +39,12 @@ namespace controllers\internals; return false; } - $datas = [ + $data = [ 'id_scheduled' => $id_scheduled, 'path' => $result_upload_media['content'], ]; - return (bool) $this->get_model()->insert($datas); + return (bool) $this->get_model()->insert($data); } /** diff --git a/controllers/internals/Phone.php b/controllers/internals/Phone.php index 80cc079..fe976d1 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_datas : A JSON string representing adapter's datas (for example credentials for an api) + * @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 */ - public function create(int $id_user, string $name, string $adapter, string $adapter_datas) + public function create(int $id_user, string $name, string $adapter, string $adapter_data) { $phone = [ 'id_user' => $id_user, 'name' => $name, 'adapter' => $adapter, - 'adapter_datas' => $adapter_datas, + 'adapter_data' => $adapter_data, ]; 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_datas : An array of the datas of the adapter (for example credentials for an api) + * @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 */ - public function update_for_user(int $id_user, int $id, string $name, string $adapter, array $adapter_datas): bool + public function update_for_user(int $id_user, int $id, string $name, string $adapter, array $adapter_data): bool { $phone = [ 'id_user' => $id_user, 'name' => $name, 'adapter' => $adapter, - 'adapter_datas' => json_encode($adapter_datas), + 'adapter_data' => json_encode($adapter_data), ]; 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 5753740..ed61dc1 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 $datas : The datas to made available to condition + * @param array $data : The data to made available to condition * * @return bool : false if invalid, true else */ - public function validate_condition(string $condition, array $datas = []): bool + public function validate_condition(string $condition, array $data = []): bool { try { - $this->expression_language->parse($condition, array_keys($datas)); + $this->expression_language->parse($condition, array_keys($data)); return true; } @@ -61,15 +61,15 @@ use Symfony\Component\ExpressionLanguage\ExpressionLanguage; * Evaluate a condition. * * @param string $condition : The condition to evaluate - * @param array $datas : The datas 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 */ - public function evaluate_condition(string $condition, array $datas = []): ?bool + public function evaluate_condition(string $condition, array $data = []): ?bool { try { - $result = $this->expression_language->evaluate($condition, $datas); + $result = $this->expression_language->evaluate($condition, $data); return (bool) $result; } diff --git a/controllers/internals/Scheduled.php b/controllers/internals/Scheduled.php index 7f4ac6a..c0f642b 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['datas'] = json_decode($contact['datas'], true); + $contact['data'] = json_decode($contact['data'], true); - //Add metas of contact by adding contact without datas + //Add metas of contact by adding contact without data $metas = $contact; - unset($metas['datas'], $metas['id_user']); + unset($metas['data'], $metas['id_user']); - $datas = ['contact' => $contact['datas'], 'contact_metas' => $metas]; + $data = ['contact' => $contact['data'], 'contact_metas' => $metas]; - $render = $internal_templating->render($scheduled['text'], $datas); + $render = $internal_templating->render($scheduled['text'], $data); if (!$render['success']) { diff --git a/controllers/internals/SmsStop.php b/controllers/internals/SmsStop.php index 5859907..6ea87ae 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) { - $datas = [ + $data = [ 'number' => $number, ]; - return $this->get_model()->update_for_user($id_user, $id_smsstop, $datas); + return $this->get_model()->update_for_user($id_user, $id_smsstop, $data); } /** diff --git a/controllers/internals/Templating.php b/controllers/internals/Templating.php index 1d76f56..12cffe1 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 $datas : Datas to pass to the template + * @param array $data : Data to pass to the template * * @return array : keys, success, error, result */ - public function render(string $template, array $datas = []) + public function render(string $template, array $data = []) { try { @@ -80,7 +80,7 @@ namespace controllers\internals; ]); $twig->addExtension($this->sandbox); - $result = $twig->render('template', $datas); + $result = $twig->render('template', $data); return [ 'success' => true, diff --git a/controllers/internals/Tool.php b/controllers/internals/Tool.php index ad48153..1cdccb5 100644 --- a/controllers/internals/Tool.php +++ b/controllers/internals/Tool.php @@ -344,7 +344,7 @@ namespace controllers\internals; return $result; } - $new_file_path = PWD_DATAS . '/' . $md5_filename; + $new_file_path = PWD_DATA . '/' . $md5_filename; if (file_exists($new_file_path)) { diff --git a/controllers/internals/Webhook.php b/controllers/internals/Webhook.php index 0e54cb9..1ca4725 100644 --- a/controllers/internals/Webhook.php +++ b/controllers/internals/Webhook.php @@ -66,12 +66,12 @@ class Webhook extends StandardController return false; } - $datas = [ + $data = [ 'url' => $url, 'type' => $type, ]; - return $this->get_model()->update_for_user($id_user, $id, $datas); + return $this->get_model()->update_for_user($id_user, $id, $data); } /** @@ -117,7 +117,7 @@ class Webhook extends StandardController { $message = [ 'url' => $webhook['url'], - 'datas' => [ + 'data' => [ 'webhook_type' => $webhook['type'], 'id' => $sms['id'], 'at' => $sms['at'], diff --git a/controllers/publics/Api.php b/controllers/publics/Api.php index d04f04d..4039aa6 100644 --- a/controllers/publics/Api.php +++ b/controllers/publics/Api.php @@ -311,7 +311,7 @@ namespace controllers\publics; * * @param string $_POST['name'] : Phone name * @param string $_POST['adapter'] : Phone adapter - * @param array $_POST['adapter_datas'] : Phone adapter datas + * @param array $_POST['adapter_data'] : Phone adapter data * * @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_datas = !empty($_POST['adapter_datas']) ? $_POST['adapter_datas'] : []; + $adapter_data = !empty($_POST['adapter_data']) ? $_POST['adapter_data'] : []; if (!$name) { @@ -373,14 +373,14 @@ namespace controllers\publics; } //If missing required data fields, error - foreach ($find_adapter['meta_datas_fields'] as $field) + foreach ($find_adapter['meta_data_fields'] as $field) { if (false === $field['required']) { continue; } - if (!empty($adapter_datas[$field['name']])) + if (!empty($adapter_data[$field['name']])) { continue; } @@ -393,18 +393,18 @@ namespace controllers\publics; } //If field phone number is invalid - foreach ($find_adapter['meta_datas_fields'] as $field) + foreach ($find_adapter['meta_data_fields'] as $field) { if (false === ($field['number'] ?? false)) { continue; } - if (!empty($adapter_datas[$field['name']])) + if (!empty($adapter_data[$field['name']])) { - $adapter_datas[$field['name']] = \controllers\internals\Tool::parse_phone($adapter_datas[$field['name']]); + $adapter_data[$field['name']] = \controllers\internals\Tool::parse_phone($adapter_data[$field['name']]); - if ($adapter_datas[$field['name']]) + if ($adapter_data[$field['name']]) { continue; } @@ -417,11 +417,11 @@ namespace controllers\publics; return $this->json($return); } - $adapter_datas = json_encode($adapter_datas); + $adapter_data = json_encode($adapter_data); - //Check adapter is working correctly with thoses names and datas + //Check adapter is working correctly with thoses names and data $adapter_classname = $find_adapter['meta_classname']; - $adapter_instance = new $adapter_classname($adapter_datas); + $adapter_instance = new $adapter_classname($adapter_data); $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_datas); + $phone_id = $this->internal_phone->create($this->user['id'], $name, $adapter, $adapter_data); if (false === $phone_id) { $return['error'] = self::ERROR_CODES['CANNOT_CREATE']; diff --git a/controllers/publics/Callback.php b/controllers/publics/Callback.php index a41df9e..2f19b97 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 datas with success.'); + $this->logger->error('Callback status with adapter ' . $adapter_uid . ' failed because adapter cannot process data with success.'); return false; } diff --git a/controllers/publics/ConditionalGroup.php b/controllers/publics/ConditionalGroup.php index 4fc0fd5..3723010 100644 --- a/controllers/publics/ConditionalGroup.php +++ b/controllers/publics/ConditionalGroup.php @@ -210,7 +210,7 @@ namespace controllers\publics; } $internal_ruler = new \controllers\internals\Ruler(); - $valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['datas' => (object) null], 'contact_metas' => (object) null]); + $valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['data' => (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 3e93380..3cfabc1 100644 --- a/controllers/publics/Contact.php +++ b/controllers/publics/Contact.php @@ -111,9 +111,9 @@ namespace controllers\publics; foreach ($contacts as &$contact) { - if ($contact['datas']) + if ($contact['data']) { - $contact['datas'] = json_decode($contact['datas']); + $contact['data'] = json_decode($contact['data']); } } @@ -141,7 +141,7 @@ namespace controllers\publics; $name = $_POST['name'] ?? false; $number = $_POST['number'] ?? false; $id_user = $_SESSION['user']['id']; - $datas = $_POST['datas'] ?? []; + $data = $_POST['data'] ?? []; if (!$name || !$number) { @@ -158,8 +158,8 @@ namespace controllers\publics; return $this->redirect(\descartes\Router::url('Contact', 'add')); } - $clean_datas = []; - foreach ($datas as $key => $value) + $clean_data = []; + foreach ($data as $key => $value) { if ('' === $value) { @@ -167,12 +167,12 @@ namespace controllers\publics; } $key = mb_ereg_replace('[\W]', '', $key); - $clean_datas[$key] = (string) $value; + $clean_data[$key] = (string) $value; } - $clean_datas = json_encode($clean_datas); + $clean_data = json_encode($clean_data); - if (!$this->internal_contact->create($id_user, $number, $name, $clean_datas)) + if (!$this->internal_contact->create($id_user, $number, $name, $clean_data)) { \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']; - $datas = $contact['datas'] ?? []; + $data = $contact['data'] ?? []; if (!$name || !$number) { @@ -225,8 +225,8 @@ namespace controllers\publics; continue; } - $clean_datas = []; - foreach ($datas as $key => $value) + $clean_data = []; + foreach ($data as $key => $value) { if ('' === $value) { @@ -234,11 +234,11 @@ namespace controllers\publics; } $key = mb_ereg_replace('[\W]', '', $key); - $clean_datas[$key] = (string) $value; + $clean_data[$key] = (string) $value; } - $clean_datas = json_encode($clean_datas); + $clean_data = json_encode($clean_data); - $nb_contacts_update += (int) $this->internal_contact->update_for_user($id_user, $id_contact, $number, $name, $clean_datas); + $nb_contacts_update += (int) $this->internal_contact->update_for_user($id_user, $id_contact, $number, $name, $clean_data); } if ($nb_contacts_update !== \count($_POST['contacts'])) diff --git a/controllers/publics/Dashboard.php b/controllers/publics/Dashboard.php index d84ccf1..50f2779 100644 --- a/controllers/publics/Dashboard.php +++ b/controllers/publics/Dashboard.php @@ -129,7 +129,7 @@ namespace controllers\publics; 'sendeds' => $sendeds, 'receiveds' => $receiveds, 'events' => $events, - 'datas_area_chart' => json_encode($array_area_chart), + 'data_area_chart' => json_encode($array_area_chart), ]); } } diff --git a/controllers/publics/Phone.php b/controllers/publics/Phone.php index 9843d4b..60e71ab 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 datas about callbacks. + * Return phones as json with additionnals data 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_datas'] : Phone adapter datas + * @param array $_POST['adapter_data'] : Phone adapter data */ 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_datas = !empty($_POST['adapter_datas']) ? $_POST['adapter_datas'] : []; + $adapter_data = !empty($_POST['adapter_data']) ? $_POST['adapter_data'] : []; if (!$name || !$adapter) { @@ -210,14 +210,14 @@ class Phone extends \descartes\Controller } //If missing required data fields, error - foreach ($find_adapter['meta_datas_fields'] as $field) + foreach ($find_adapter['meta_data_fields'] as $field) { if (false === $field['required']) { continue; } - if (!empty($adapter_datas[$field['name']])) + if (!empty($adapter_data[$field['name']])) { continue; } @@ -228,18 +228,18 @@ class Phone extends \descartes\Controller } //If field phone number is invalid - foreach ($find_adapter['meta_datas_fields'] as $field) + foreach ($find_adapter['meta_data_fields'] as $field) { if (false === ($field['number'] ?? false)) { continue; } - if (!empty($adapter_datas[$field['name']])) + if (!empty($adapter_data[$field['name']])) { - $adapter_datas[$field['name']] = \controllers\internals\Tool::parse_phone($adapter_datas[$field['name']]); + $adapter_data[$field['name']] = \controllers\internals\Tool::parse_phone($adapter_data[$field['name']]); - if ($adapter_datas[$field['name']]) + if ($adapter_data[$field['name']]) { continue; } @@ -250,11 +250,11 @@ class Phone extends \descartes\Controller return $this->redirect(\descartes\Router::url('Phone', 'add')); } - $adapter_datas = json_encode($adapter_datas); + $adapter_data = json_encode($adapter_data); - //Check adapter is working correctly with thoses names and datas + //Check adapter is working correctly with thoses names and data $adapter_classname = $find_adapter['meta_classname']; - $adapter_instance = new $adapter_classname($adapter_datas); + $adapter_instance = new $adapter_classname($adapter_data); $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_datas); + $success = $this->internal_phone->create($id_user, $name, $adapter, $adapter_data); 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 c8f78fb..3545b7c 100644 --- a/controllers/publics/Templating.php +++ b/controllers/publics/Templating.php @@ -66,18 +66,18 @@ namespace controllers\publics; return false; } - $contact['datas'] = json_decode($contact['datas'], true); + $contact['data'] = json_decode($contact['data'], true); - //Add metas of contact by adding contact without datas + //Add metas of contact by adding contact without data $metas = $contact; - unset($metas['datas'], $metas['id_user']); + unset($metas['data'], $metas['id_user']); - $datas = [ - 'contact' => $contact['datas'], + $data = [ + 'contact' => $contact['data'], 'contact_metas' => $metas, ]; - $result = $this->internal_templating->render($template, $datas); + $result = $this->internal_templating->render($template, $data); $return = $result; if (!trim($result['result'])) { diff --git a/daemons/Phone.php b/daemons/Phone.php index cee8be2..83a4b01 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_datas']); + $this->adapter = new $adapter_class($this->phone['adapter_data']); $this->logger->info('Starting Phone daemon with pid ' . getmypid()); } diff --git a/daemons/Webhook.php b/daemons/Webhook.php index a7f6e34..62c43c1 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['datas']]); + $promises[] = $this->guzzle_client->postAsync($message['url'], ['form_params' => $message['data']]); } try diff --git a/datas/.tokeep b/data/.tokeep similarity index 100% rename from datas/.tokeep rename to data/.tokeep diff --git a/datas/test_read_sms.json b/datas/test_read_sms.json deleted file mode 100644 index e69de29..0000000 diff --git a/descartes/ApiController.php b/descartes/ApiController.php index da738d3..feaa303 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 $datas : Les données à retourner sous forme de json + * @param array $data : 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 ($datas, $secure = true) + public function json ($data, $secure = true) { header('Content-Type: application/json'); if ($secure) { - echo htmlspecialchars(json_encode($datas), ENT_NOQUOTES); + echo htmlspecialchars(json_encode($data), ENT_NOQUOTES); } else { - echo json_encode($datas); + echo json_encode($data); } return $this; diff --git a/descartes/Model.php b/descartes/Model.php index 000426d..207e680 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 $datas : Datas to pass to query + * @param array $data : Data 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 $datas = array(), int $return_type = self::FETCHALL, int $fetch_mode = \PDO::FETCH_ASSOC, bool $debug = false) + protected function _run_query (string $query, array $data = 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 ($datas as $key => $value) + foreach ($data as $key => $value) { if (is_bool($value)) { - $datas[$key] = (int) $value; + $data[$key] = (int) $value; } } $query = $this->pdo->prepare($query); $query->setFetchMode($return_type); - $query->execute($datas); + $query->execute($data); if ($debug) { @@ -397,18 +397,18 @@ /** * Update data from table with some conditions * @param string $table : table name - * @param array $datas : new data to set + * @param array $data : 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 $datas, array $conditions = array()) : int + protected function _update (string $table, array $data, array $conditions = array()) : int { $params = array(); $sets = array(); - foreach ($datas as $label => $value) + foreach ($data 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 $datas : new datas + * @param array $data : new data * @return mixed : null on error, number of line inserted else */ - protected function _insert (string $table, array $datas) : ?int + protected function _insert (string $table, array $data) : ?int { $params = array(); $field_names = array(); - foreach ($datas as $field_name => $value) + foreach ($data 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 f3788ff..3b1321c 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_DATAS' => PWD . '/datas', + 'PWD_DATA' => PWD . '/data', '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 253ed44..dc92645 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 $datas : datas to update + * @param array $data : data to update * * @return int : number of modified rows */ - public function update_for_user(int $id_user, int $id, array $datas) + public function update_for_user(int $id_user, int $id, array $data) { $params = []; $sets = []; - foreach ($datas as $label => $value) + foreach ($data 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 8c3b07c..f6eea2a 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 $datas : datas to update + * @param array $data : data 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 $datas : datas to update + * @param array $data : data to update * * @return int : number of modified rows */ diff --git a/models/User.php b/models/User.php index 1394855..f6c70f0 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 $datas : Datas to update + * @param array $data : Data to update * * @return int : number of modified rows */ - public function update($id, $datas) + public function update($id, $data) { - return $this->_update('user', $datas, ['id' => $id]); + return $this->_update('user', $data, ['id' => $id]); } /** diff --git a/templates/conditional_group/add.php b/templates/conditional_group/add.php index f166897..6e517ab 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 datas = { + var data = { 'condition' : condition, }; jQuery.ajax({ type: "POST", url: HTTP_PWD + '/conditional_group/preview/', - data: datas, - success: function (datas) { - jQuery('#preview-text-modal').find('.modal-body pre').text(datas.result); + data: data, + success: function (data) { + jQuery('#preview-text-modal').find('.modal-body pre').text(data.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 79761df..6e33838 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 datas = { + var data = { 'condition' : condition, }; jQuery.ajax({ type: "POST", url: HTTP_PWD + '/conditional_group/preview/', - data: datas, - success: function (datas) { - jQuery('#preview-text-modal').find('.modal-body pre').text(datas.result); + data: data, + success: function (data) { + jQuery('#preview-text-modal').find('.modal-body pre').text(data.result); jQuery('#preview-text-modal').modal({'keyboard': true}); }, dataType: 'json' diff --git a/templates/contact/add.php b/templates/contact/add.php index 4f6408f..786951c 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-datas-container').on('input', '.contact-data-value, .contact-data-name', function (e) + jQuery('.contact-data-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-datas-container .form-group').each(function (e) + jQuery('.contact-data-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-datas-container').append(template); + jQuery('.contact-data-container').append(template); }); - jQuery('.contact-datas-container').on('click', '.contact-datas-remove', function (e) + jQuery('.contact-data-container').on('click', '.contact-data-remove', function (e) { e.preventDefault(); - if (jQuery('.contact-datas-container .form-group').length > 1) + if (jQuery('.contact-data-container .form-group').length > 1) { jQuery(this).parent('.form-group').remove(); } @@ -156,11 +156,11 @@ { e.preventDefault(); - jQuery('.contact-datas-container .form-group').each(function () + jQuery('.contact-data-container .form-group').each(function () { var name = jQuery(this).find('.contact-data-name').val(); name = name.replace(/\W/g, ''); - name = 'datas[' + name + ']'; + name = 'data[' + name + ']'; jQuery(this).find('.contact-data-value').attr('name', name); }); diff --git a/templates/contact/edit.php b/templates/contact/edit.php index 0fdfe79..054a487 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-datas-container').on('input', '.contact-data-value, .contact-data-name', function (e) + jQuery('.contact-data-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 datas_container = jQuery(this).parents('.contact-datas-container'); + var data_container = jQuery(this).parents('.contact-data-container'); - datas_container.find('.form-group').each(function (e) + data_container.find('.form-group').each(function (e) { console.log(this); var current_input_name = jQuery(this).find('.contact-data-name'); @@ -154,15 +154,15 @@ '' + ' : ' + '' + - ' ' + + ' ' + '
'; - datas_container.append(template); + data_container.append(template); }); - jQuery('.contact-datas-container').on('click', '.contact-datas-remove', function (e) + jQuery('.contact-data-container').on('click', '.contact-data-remove', function (e) { e.preventDefault(); - if (jQuery('.contact-datas-container .form-group').length > 1) + if (jQuery('.contact-data-container .form-group').length > 1) { jQuery(this).parent('.form-group').remove(); } @@ -174,13 +174,13 @@ { e.preventDefault(); - jQuery('.contact-datas-container .form-group').each(function () + jQuery('.contact-data-container .form-group').each(function () { - var contact_id = jQuery(this).parents('.contact-datas-container').attr('data-id-contact'); + var contact_id = jQuery(this).parents('.contact-data-container').attr('data-id-contact'); var name = jQuery(this).find('.contact-data-name').val(); name = name.replace(/\W/g, ''); - name = 'contacts[' + contact_id + '][datas][' + name + ']'; + name = 'contacts[' + contact_id + '][data][' + name + ']'; jQuery(this).find('.contact-data-value').attr('name', name); }); diff --git a/templates/dashboard/show.php b/templates/dashboard/show.php index bde0577..f64c3d0 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 1b1a84a..74f52b2 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-datas-description').html(option.attr('data-description')); - jQuery('#description-adapter-datas').text(option.attr('data-datas-help')); + jQuery('#adapter-data-description').html(option.attr('data-description')); + jQuery('#description-adapter-data').text(option.attr('data-data-help')); - var datas_fields = option.attr('data-datas-fields'); - datas_fields = JSON.parse(datas_fields); + var data_fields = option.attr('data-data-fields'); + data_fields = JSON.parse(data_fields); var numbers = []; var html = ''; - jQuery.each(datas_fields, function (index, field) + jQuery.each(data_fields, function (index, field) { if (!field.number) { @@ -109,7 +109,7 @@ '' + '

' + field.description + '

' + '
' + - '' + + '' + '
' + '
'; } @@ -139,12 +139,12 @@ html = 'Pas de réglages.'; } - jQuery('#adapter-datas-fields').html(html); + jQuery('#adapter-data-fields').html(html); for (i = 0; i < numbers.length; i++) { var iti_number_input = window.intlTelInput(document.getElementById(numbers[i].id), { - hiddenInput: 'adapter_datas[' + numbers[i].name + ']', + hiddenInput: 'adapter_data[' + 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 4544e38..13ca007 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 datas = { + var data = { 'id_contact' : id_contact, 'template' : template, }; @@ -257,9 +257,9 @@ jQuery.ajax({ type: "POST", url: HTTP_PWD + '/template/preview', - data: datas, - success: function (datas) { - jQuery('#scheduled-preview-text-modal').find('.modal-body pre').text(datas.result); + data: data, + success: function (data) { + jQuery('#scheduled-preview-text-modal').find('.modal-body pre').text(data.result); jQuery('#scheduled-preview-text-modal').modal({'keyboard': true}); }, dataType: 'json' diff --git a/templates/scheduled/edit.php b/templates/scheduled/edit.php index 319cfd1..794cd0f 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 datas = { + var data = { 'id_contact' : id_contact, 'template' : template, }; @@ -264,9 +264,9 @@ jQuery.ajax({ type: "POST", url: HTTP_PWD + '/template/preview', - data: datas, - success: function (datas) { - jQuery('#scheduled-preview-text-modal').find('.modal-body pre').text(datas.result); + data: data, + success: function (data) { + jQuery('#scheduled-preview-text-modal').find('.modal-body pre').text(data.result); jQuery('#scheduled-preview-text-modal').modal({'keyboard': true}); }, dataType: 'json'