Mascali/raspisms
1
0
Fork 0
mirror of https://github.com/RaspbianFrance/raspisms.git synced 2025-06-06 14:46:27 +02:00
Code Issues Projects Releases Wiki Activity

rename all instances of 'datas' to 'data'

Browse source
This commit is contained in:
osaajani 2021-01-17 03:16:57 +01:00
parent 730ac8963b
commit 61d644c247
48 changed files with 316 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

8
descartes/ApiController.php
View file

@ -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;

22
descartes/Model.php
View file

@ -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);