From 942b41fd24f6061bcf15050333e99393166a4437 Mon Sep 17 00:00:00 2001 From: Boris Date: Fri, 28 Oct 2022 13:50:49 +0200 Subject: [PATCH] La Bureautique est l'alpha et l'omega --- config.php | 6 +++--- lib/Jaklis.class.php | 13 +++++++++---- lib/Keygen.class.php | 2 +- login.php | 2 ++ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/config.php b/config.php index 236c452..ae35480 100644 --- a/config.php +++ b/config.php @@ -72,14 +72,14 @@ $games = [ 'spationaute' => [ - 'title' => 'SpaceĞ1', - 'description' => 'Les extraterrestres viennent terraformer ta planète', + 'title' => 'H2Ğ1', + 'description' => 'Ne paniquez pas. Prenez votre serviette, enclenchez le propulseur à improbabilité infinie et terraformez votre planète.', 'default_avatar' => 'assets/img/avatars/32/et-in-flying-saucer.png' ], 'magie' => [ - 'title' => 'Ğ1Quest', + 'title' => 'La communauté de Lannot', 'description' => 'Ğarry Potier à l\'école des sourciers.', 'default_avatar' => 'assets/img/avatars/32/wizard.png' ] diff --git a/lib/Jaklis.class.php b/lib/Jaklis.class.php index c82b8f8..1246cc4 100644 --- a/lib/Jaklis.class.php +++ b/lib/Jaklis.class.php @@ -4,7 +4,7 @@ require_once('Fred.class.php'); class Jaklis { - private $mode = 'local'; + private $mode; private $jaklisPath = __DIR__ . '/../vendors/jaklis/jaklis'; @@ -18,14 +18,19 @@ class Jaklis { private $userPubsecPath; - public function __construct ($userPubkey) { + public function __construct ($userPubkey, $mode = 'local') { $this->userPubsecPath = __DIR__ .'/../cache/pubsec/'. $userPubkey .'.dunikey'; + + if ($this->mode != 'local') { + + $this->fred = new Fred(); + } } public function getMessages () { - if ($mode = 'local') { + if ($this->mode = 'local') { return [ @@ -35,7 +40,7 @@ class Jaklis { } else { - $fred->donneMoiSesPutainDeMessagesGchange($_SESSION['salt'], $_SESSION['pepper'], 'coucou'); + $this->fred->donneMoiSesPutainDeMessagesGchange($_SESSION['salt'], $_SESSION['pepper'], 'coucou'); } } diff --git a/lib/Keygen.class.php b/lib/Keygen.class.php index ff178d7..e9e7d42 100644 --- a/lib/Keygen.class.php +++ b/lib/Keygen.class.php @@ -2,7 +2,7 @@ class Keygen { - public function __construct { + public function __construct () { } diff --git a/login.php b/login.php index 5299284..2bb98ae 100644 --- a/login.php +++ b/login.php @@ -2,11 +2,13 @@ require_once('config.php'); require_once('lib/Gchange.class.php'); require_once('lib/Fred.class.php'); +require_once('lib/Keygen.class.php'); if (isset($_POST['salt'], $_POST['pepper'])) { $fred = new Fred(); + $keygen = new Keygen(); $playerG1Id = $fred->donneMoiSaPutaindeG1Pub($_POST['salt'], $_POST['pepper']); $_SESSION['player_pubkey'] = $playerG1Id;