diff --git a/public/ajax/getG1PubKey.php b/public/ajax/getG1PubKey.php index e92a9a5..3b5bbb5 100644 --- a/public/ajax/getG1PubKey.php +++ b/public/ajax/getG1PubKey.php @@ -1,27 +1,28 @@ 0\''); + putenv("silkPubKeyUser=$silkPubKeyUser"); + $silkUser = system('echo "$silkPubKeyUser" | tail -n2 | head -n1'); + if ($silkUser == $parseUser) { - $silkPubKeyUser = shell_exec('curl -s $g1_node/wot/lookup/$parseUser | head | grep -i -w -A 3 "pubkey" | awk -F \'"\' \'{ print $4 }\' | awk \'NF > 0\''); - putenv("silkPubKeyUser=$silkPubKeyUser"); - $silkUser = system('echo "$silkPubKeyUser" | tail -n2 | head -n1'); - if ($silkUser == $parseUser) - { - $silkPubKey = system('echo "$silkPubKeyUser" | head -n1'); - } + $silkPubKey = system('echo "$silkPubKeyUser" | head -n1'); } + } - if (empty($silkPubKey)) - { - echo "Aucune clé n'a été trouvé à partir de ce pseudo"; - } + if (empty($silkPubKey)) + { + echo "Aucune clé n'a été trouvée à partir de ce pseudo"; + } } ?> diff --git a/public/js/script.js b/public/js/script.js index 710f9e1..fe77086 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -21,7 +21,8 @@ function addRecord(antenne_slug, antenne_id, nom_connecte, id_user) { }, function (data, status) { // close the popup $("#add_new_record_modal").modal("hide"); - + // On recharge la page pour tenir compte de la connexion de l'utilisateur + window.location.reload(true); // On relit les enregistrements readRecords(antenne_slug, nom_connecte); // On efface les champs du popup @@ -57,7 +58,8 @@ function addRecord2(antenne_slug, antenne_id, nom_connecte, id_user) { }, function (data, status) { // close the popup $("#add_new_record_modal").modal("hide"); - + // On recharge la page pour tenir compte de la connexion de l'utilisateur + window.location.reload(true); // On relit les enregistrements readRecords2(antenne_slug, nom_connecte); @@ -188,6 +190,8 @@ function UpdateProduitsDetails(nom_connecte) { function (data, status) { // Fermeture de la fenêtre modale $("#update_user_modal").modal("hide"); + // On recharge la page pour tenir compte de la connexion de l'utilisateur + window.location.reload(true); // Réaffichage des biens/services readRecords(antenne_slug, nom_connecte); } @@ -214,6 +218,8 @@ function UpdateRecherchesDetails(nom_connecte) { function (data, status) { // hide modal popup $("#update_user_modal").modal("hide"); + // On recharge la page pour tenir compte de la connexion de l'utilisateur + window.location.reload(true); // reload Recherches by using readRecords2(); readRecords2(antenne_slug, nom_connecte); } diff --git a/src/Account/views/signup.twig b/src/Account/views/signup.twig index bcdc960..523a9eb 100644 --- a/src/Account/views/signup.twig +++ b/src/Account/views/signup.twig @@ -1,7 +1,6 @@ {% extends 'layout.twig' %} {% block body %} -
{{ csrf_input() }} @@ -35,7 +34,7 @@ textInput.onkeyup = function (e) { xmlhttp.onreadystatechange=function() { if (this.readyState==4 && this.status==200) { pubkeyAnswer=this.responseText; - pubkeyIsNull = pubkeyAnswer.includes("Aucune clé n'a été trouvé à partir de ce pseudo"); + pubkeyIsNull = pubkeyAnswer.includes("Aucune clé n'a été trouvée à partir de ce pseudo"); // (pubkeyIsNull) ? sentenceAnswer=this.responseText : sentenceAnswer="j'ai trouvé ta clé publique Ḡ1 !"; // sentenceAnswer=this.responseText; (pubkeyIsNull) ? document.getElementById("livesearch-pubkey").innerHTML=pubkeyAnswer : document.getElementById("livesearch-pubkey").innerHTML='ḠTrouvé une clé ! =)
Clé publique: ' + pubkeyAnswer; diff --git a/src/Contact/ContactAction.php b/src/Contact/ContactAction.php index 4519215..0ab2a8b 100644 --- a/src/Contact/ContactAction.php +++ b/src/Contact/ContactAction.php @@ -26,7 +26,13 @@ class ContactAction public function __invoke(ServerRequestInterface $request) { if ($request->getMethod() === 'GET') { - return $this->renderer->render('@contact/contact'); + session_start(); + if (isset($_SESSION['user'])) { + $nom_user = $_SESSION['user']; + } else { + $nom_user = ''; + } + return $this->renderer->render('@contact/contact',compact('nom_user')); } } } diff --git a/src/Gmarche/Actions/AntenneShowAction.php b/src/Gmarche/Actions/AntenneShowAction.php index 236feeb..10ddbe9 100644 --- a/src/Gmarche/Actions/AntenneShowAction.php +++ b/src/Gmarche/Actions/AntenneShowAction.php @@ -62,10 +62,10 @@ class AntenneShowAction }*/ session_start(); if (isset($_SESSION['user'])) { - $user = $_SESSION['user']; + $nom_user = $_SESSION['user']; } else { - $user = ''; + $nom_user = ''; } - return $this->renderer->render('@gmarche/antenne', compact('user','slug', 'region', 'gmarchePrefix','antennes', 'page')); + return $this->renderer->render('@gmarche/antenne', compact('nom_user','slug', 'region', 'gmarchePrefix','antennes', 'page')); } } diff --git a/src/Gmarche/Actions/RegionIndexAction.php b/src/Gmarche/Actions/RegionIndexAction.php index 88bbabf..9b81ebd 100644 --- a/src/Gmarche/Actions/RegionIndexAction.php +++ b/src/Gmarche/Actions/RegionIndexAction.php @@ -35,10 +35,10 @@ class RegionIndexAction $regions = $this->regionTable->findAll()->paginate(15, $params['p'] ?? 1); session_start(); if (isset($_SESSION['user'])) { - $user = $_SESSION['user']; + $nom_user = $_SESSION['user']; } else { - $user = ''; + $nom_user = ''; } - return $this->renderer->render('@gmarche/index', compact('user','regions')); + return $this->renderer->render('@gmarche/index', compact('nom_user','regions')); } } diff --git a/src/Product/Actions/ProductIndexAction.php b/src/Product/Actions/ProductIndexAction.php index 482fe24..8563e46 100644 --- a/src/Product/Actions/ProductIndexAction.php +++ b/src/Product/Actions/ProductIndexAction.php @@ -54,19 +54,17 @@ class ProductIndexAction $requete_region = $this->regionTable->findBy('slug', $region_slug); $region_name = $requete_region->name; $page = $params['p'] ?? 1; - //$routePrefix = 'product.admin'; - //$routePrefix = 'product.index'; $viewPath = '@product/admin/products'; $items = $this->productTable->findByAntenneId('antenne_id', $antenne_id)->paginate(20, $page); session_start(); if (isset($_SESSION['user'])) { - $user = $_SESSION['user']; - $requete_user = $this->userTable->findBy('username', $user); + $nom_user = $_SESSION['user']; + $requete_user = $this->userTable->findBy('username', $nom_user); $user_id = $requete_user->id; } else { - $user = ''; + $nom_user = ''; $user_id = ''; } - return $this->renderer->render($viewPath.'/index', compact('user','user_id', 'antenne_slug','gmarchePrefix','region_name','region_slug','antenne_id','antenne_name','viewPath', 'items' )); + return $this->renderer->render($viewPath.'/index', compact('nom_user','user_id', 'antenne_slug','gmarchePrefix','region_name','region_slug','antenne_id','antenne_name','viewPath', 'items' )); } } diff --git a/src/Product/Actions/RechIndexAction.php b/src/Product/Actions/RechIndexAction.php index f717c01..6cc84c1 100644 --- a/src/Product/Actions/RechIndexAction.php +++ b/src/Product/Actions/RechIndexAction.php @@ -60,13 +60,13 @@ class RechIndexAction $items = $this->rechTable->findByAntenneId('antenne_id', $antenne_id)->paginate(20, $page); session_start(); if (isset($_SESSION['user'])) { - $user = $_SESSION['user']; - $requete_user = $this->userTable->findBy('username', $user); + $nom_user = $_SESSION['user']; + $requete_user = $this->userTable->findBy('username', $nom_user); $user_id = $requete_user->id; } else { - $user = ''; + $nom_user = ''; $user_id = ''; } - return $this->renderer->render($viewPath.'/index', compact('user','user_id','antenne_slug','gmarchePrefix','region_name','region_slug','antenne_id','antenne_name','viewPath', 'items' )); + return $this->renderer->render($viewPath.'/index', compact('nom_user','user_id','antenne_slug','gmarchePrefix','region_name','region_slug','antenne_id','antenne_name','viewPath', 'items' )); } } diff --git a/src/Product/views/admin/products/index.twig b/src/Product/views/admin/products/index.twig index e31dd6f..fb258fc 100644 --- a/src/Product/views/admin/products/index.twig +++ b/src/Product/views/admin/products/index.twig @@ -132,7 +132,7 @@ Mettez bien le pseudo, la clé publique, le bien ou service, et le prix en june.

- {% if user != '' %} + {% if nom_user != '' %} + onclick="addRecord('{{ antenne_slug }}','{{ antenne_id }}','{{ nom_user }}','{{ user_id }}')">Ajouter @@ -232,7 +232,7 @@

- {% if user != '' %} + {% if nom_user != '' %} + onclick="addRecord2('{{ antenne_slug }}','{{ antenne_id }}','{{ nom_user }}','{{ user_id }}')">Ajouter @@ -235,7 +235,7 @@

- - diff --git a/views/layout.twig b/views/layout.twig index 14bf088..67a0791 100644 --- a/views/layout.twig +++ b/views/layout.twig @@ -51,9 +51,9 @@ {{ "now"|date('d/m/y') }} - {% if user != '' %} + {% if nom_user != '' %} @@ -96,7 +96,7 @@