mirror of
https://github.com/RaspbianFrance/raspisms.git
synced 2025-05-16 21:16:26 +02:00
rename all instances of 'datas' to 'data'
This commit is contained in:
osaajani
parent
730ac8963b
commit
61d644c247
48 changed files with 316 additions and 316 deletions
|
|
@ -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'];
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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.';
|
||||
|
|
|
|||
|
|
@ -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']))
|
||||
|
|
|
|||
|
|
@ -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),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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.');
|
||||
|
|
|
|||
|
|
@ -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']))
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue