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 a lot a errors probably due to migration

Browse source
This commit is contained in:
osaajani 2019-11-10 00:27:42 +01:00
parent afb899c003
commit ae42484a60
37 changed files with 561 additions and 581 deletions
Download patch file Download diff file Expand all files Collapse all files

2
controllers/internals/Console.php
View file

@ -121,7 +121,7 @@ class Console extends \descartes\InternalController
foreach ($numbers as $number)
{
//Si les Sms STOP sont activés, on passe au numéro suivant si le numéro actuelle fait parti des Sms STOP
if (RASPISMS_SETTINGS_SMSSTOPS)
if (RASPISMS_SETTINGS_SMSSTOP)
{
foreach ($smsStops as $smsStop)
{

2
controllers/internals/Contact.php
View file

@ -34,7 +34,7 @@ namespace controllers\internals;
*
* @return array : La liste des contactes
*/
public function list($nb_entry = false, $page = false)
public function list($nb_entry = null, $page = null)
{
//Recupération des contactes
return $this->model_contact->list($nb_entry, $nb_entry * $page);

16
controllers/internals/Tool.php
View file

@ -157,12 +157,7 @@ namespace controllers\internals;
*/
public static function is_admin()
{
if (!isset($_SESSION['user']) || !$_SESSION['connect']['admin'])
{
return false;
}
return true;
return (bool) ($_SESSION['user']['admin'] ?? false);
}
/**
@ -175,8 +170,13 @@ namespace controllers\internals;
public static function send_email($to, $settings, $datas = [])
{
$controller = new \descartes\Controller();
$content = $controller->render($settings['template'], $datas, true);
return true; //mail($to, $settings['subject'], $content);
ob_start();
$controller->render($settings['template'], $datas);
$content = ob_get_clean();
$success = mail($to, $settings['subject'], $content);
return $success;
}
}

4
controllers/publics/Account.php
View file

@ -47,14 +47,12 @@ namespace controllers\publics;
if (!$this->verify_csrf($csrf))
{
\FlashMessage\FlashMessage::push('danger', 'Jeton CSRF invalid !');
return $this->redirect(\descartes\Router::url('Account', 'show'));
}
if (!$password)
{
\FlashMessage\FlashMessage::push('danger', 'Vous devez renseigner un mot de passe.');
return $this->redirect(\descartes\Router::url('Account', 'show'));
}
@ -62,12 +60,10 @@ namespace controllers\publics;
if (!$update_password_result)
{
\FlashMessage\FlashMessage::push('danger', 'Impossible de mettre à jour le mot de passe.');
return $this->redirect(\descartes\Router::url('Account', 'show'));
}
\FlashMessage\FlashMessage::push('success', 'Le mot de passe a bien été mis à jour.');
return $this->redirect(\descartes\Router::url('Account', 'show'));
}

5
controllers/publics/Setting.php
View file

@ -49,14 +49,12 @@ namespace controllers\publics;
if (!$this->verify_csrf($csrf))
{
\FlashMessage\FlashMessage::push('danger', 'Jeton CSRF invalid !');
return $this->redirect(\descartes\Router::url('Setting', 'show'));
}
if (!\controllers\internals\Tool::is_admin())
{
\FlashMessage\FlashMessage::push('danger', 'Vous devez être administrateur pour pouvoir modifier un réglage.');
return $this->redirect(\descartes\Router::url('Setting', 'show'));
}
@ -65,7 +63,6 @@ namespace controllers\publics;
if (false === $setting_value)
{
\FlashMessage\FlashMessage::push('danger', 'Vous devez renseigner une valeure pour le réglage.');
return $this->redirect(\descartes\Router::url('Setting', 'show'));
}
@ -73,12 +70,10 @@ namespace controllers\publics;
if (false === $update_setting_result)
{
\FlashMessage\FlashMessage::push('danger', 'Impossible de mettre à jour ce réglage.');
return $this->redirect(\descartes\Router::url('Setting', 'show'));
}
\FlashMessage\FlashMessage::push('success', 'Le réglage a bien été mis à jour.');
return $this->redirect(\descartes\Router::url('Setting', 'show'));
}
}

19
controllers/publics/User.php
View file

@ -101,7 +101,6 @@ class User extends \descartes\Controller
if (!$this->verify_csrf($csrf))
{
\FlashMessage\FlashMessage::push('danger', 'Jeton CSRF invalid !');
return $this->redirect(\descartes\Router::url('User', 'add'));
}
@ -112,22 +111,12 @@ class User extends \descartes\Controller
if (!$email)
{
\FlashMessage\FlashMessage::push('danger', 'Vous devez au moins fournir une adresse e-mail pour l\'utilisateur.');
return $this->redirect(\descartes\Router::url('User', 'add'));
}
if (!filter_var($email, FILTER_VALIDATE_EMAIL))
{
\FlashMessage\FlashMessage::push('danger', 'L\'adresse e-mail n\'est pas valide.');
return $this->redirect(\descartes\Router::url('User', 'add'));
}
$email_send = \controllers\internals\Tool::send_email($email, EMAIL_CREATE_USER, ['email' => $email, 'password' => $password]);
if (!$email_send)
{
\FlashMessage\FlashMessage::push('danger', 'Impossible d\'envoyer l\'e-mail à l\'utilisateur, le compte n\'a donc pas été créé.');
return $this->redirect(\descartes\Router::url('User', 'add'));
}
@ -135,12 +124,16 @@ class User extends \descartes\Controller
if (!$user_id)
{
\FlashMessage\FlashMessage::push('danger', 'Impossible de créer ce user.');
return $this->redirect(\descartes\Router::url('User', 'add'));
}
\FlashMessage\FlashMessage::push('success', 'L\'utilisateur a bien été créé.');
$email_send = \controllers\internals\Tool::send_email($email, EMAIL_CREATE_USER, ['email' => $email, 'password' => $password]);
if (!$email_send)
{
\FlashMessage\FlashMessage::push('danger', 'Impossible d\'envoyer l\'e-mail à l\'utilisateur.');
}
\FlashMessage\FlashMessage::push('success', 'L\'utilisateur a bien été créé.');
return $this->redirect(\descartes\Router::url('User', 'list'));
}
}