Mascali/raspisms
1
0
Fork 0
mirror of https://github.com/RaspbianFrance/raspisms.git synced 2025-04-20 16:37:48 +02:00
Code Issues Projects Releases Wiki Activity

Fix php style

Browse source
This commit is contained in:
osaajani 2020-01-17 18:19:25 +01:00
parent 461bd9c98d
commit b8bd067dc7
59 changed files with 2307 additions and 1868 deletions
Download patch file Download diff file Expand all files Collapse all files

27
controllers/publics/ConditionalGroup.php
View file

@ -40,7 +40,7 @@ namespace controllers\publics;
}
/**
* Return all conditionnals groups for administration
* Return all conditionnals groups for administration.
*
* @param mixed $page
*/
@ -48,7 +48,6 @@ namespace controllers\publics;
{
$page = (int) $page;
$groups = $this->internal_conditional_group->list_for_user($_SESSION['user']['id'], 25, $page);
$this->render('conditional_group/list', ['groups' => $groups]);
}
@ -107,7 +106,7 @@ namespace controllers\publics;
* Cette fonction insert un nouveau group.
*
* @param $csrf : Le jeton CSRF
* @param string $_POST['name'] : Le nom du group
* @param string $_POST['name'] : Le nom du group
* @param array $_POST['condition'] : The condition to used
*/
public function create($csrf)
@ -178,14 +177,15 @@ namespace controllers\publics;
return $this->redirect(\descartes\Router::url('ConditionalGroup', 'list'));
}
/**
* Try to get the preview of contacts for a conditionnal group
* Try to get the preview of contacts for a conditionnal group.
*
* @param string $_POST['condition'] : Condition to apply
*
* @return json string
*/
public function contacts_preview ()
public function contacts_preview()
{
$return = [
'success' => false,
@ -193,21 +193,22 @@ namespace controllers\publics;
];
$condition = $_POST['condition'] ?? false;
if (!$condition)
{
$return['result'] = 'Vous devez renseigner une condition.';
echo json_encode($return);
return false;
}
$internal_ruler = new \controllers\internals\Ruler();
$valid_condition = $internal_ruler->validate_condition($condition, ['contact' => (object) ['datas' => (object) null]]);
if (!$valid_condition)
{
$return['result'] = 'Syntaxe de la condition invalide.';
echo json_encode($return);
return false;
}
@ -216,6 +217,7 @@ namespace controllers\publics;
{
$return['result'] = 'Aucun contact dans le groupe.';
echo json_encode($return);
return false;
}
@ -225,16 +227,15 @@ namespace controllers\publics;
$contacts_name[] = $contact['name'];
}
$return['result'] = "Contacts du groupe : " . implode(', ', $contacts_name);
$return['result'] = 'Contacts du groupe : '.implode(', ', $contacts_name);
$return['success'] = true;
echo json_encode($return);
return true;
}
/**
* Return the list of groups as JSON
* Return the list of groups as JSON.
*/
public function json_list()
{