diff --git a/public/ajax/getG1PubKey.php b/public/ajax/getG1PubKey.php
index 6c29bce..862b7a9 100644
--- a/public/ajax/getG1PubKey.php
+++ b/public/ajax/getG1PubKey.php
@@ -1,24 +1,25 @@
0\'');
- putenv("silkPubKeyUser=$silkPubKeyUser");
- $silkUser = system('echo "$silkPubKeyUser" | tail -n2 | head -n1');
- if ($silkUser == $parseUser)
- {
- $silkPubKey = system('echo "$silkPubKeyUser" | head -n1');
- }
- }
+ if (empty($silkPubKey))
+ {
+ $silkPubKeyUser = shell_exec('curl -s https:\/\/duniter-g1.p2p.legal/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');
+ }
+ }
-
-// echo $silkPubKey
-
-// }
+ if (empty($silkPubKey))
+ {
+ echo "Aucune clé n'a été trouvé à partir de ce pseudo";
+ }
+}
?>
diff --git a/public/ajax/readRecords.php b/public/ajax/readRecords.php
index f0f485f..d7e9c86 100644
--- a/public/ajax/readRecords.php
+++ b/public/ajax/readRecords.php
@@ -19,7 +19,7 @@ $bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
';
$params["antenne_slug"] = $antenne_slug;
- $requete = "SELECT products.*, users.username
+ $requete = "SELECT products.*, users.username, users.pubkey
FROM products
LEFT JOIN antennes
ON antennes.id = products.antenne_id
@@ -41,7 +41,7 @@ $bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
$data .= '
'.$row['name'].' | ';
$data .= ' | ';
$data .= ''.$row['username'].' | ';
- $data .= ' | ';
+ $data .= ''.$row['pubkey'].' | ';
$data .= ''.$row['quantite'].' | ';
$data .= ''.$row['prix'].' | ';
$data .= '';
diff --git a/public/js/script.js b/public/js/script.js
index 1e6f07c..cf2df3e 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1,4 +1,5 @@
// Add Record
+
function addRecord(antenne_slug, antenne_id, nom_connecte, id_user) {
var produit = $("#produit").val();
diff --git a/src/Account/Action/SignupAction.php b/src/Account/Action/SignupAction.php
index 1338700..7d633d2 100644
--- a/src/Account/Action/SignupAction.php
+++ b/src/Account/Action/SignupAction.php
@@ -58,8 +58,9 @@ class SignupAction
}
$params = $request->getParsedBody();
$validator = (new Validator($params))
- ->required('username', 'email', 'password', 'password_confirm', 'firstname', 'lastname', 'created_at')
+ ->required('username', 'pubkey', 'email', 'password', 'password_confirm', 'created_at')
->length('username', 3)
+ ->length('pubkey', 44)
->length('firstname', 2)
->length('lastname', 2)
->email('email')
@@ -70,6 +71,7 @@ class SignupAction
if ($validator->isValid()) {
$userParams = [
'username' => $params['username'],
+ 'pubkey' => $params['pubkey'],
'firstname'=> $params['firstname'],
'lastname'=> $params['lastname'],
'email' => $params['email'],
@@ -89,6 +91,7 @@ class SignupAction
'errors' => $errors,
'user' => [
'username' => $params['username'],
+ 'pubkey' => $params['pubkey'],
'email' => $params['email'],
'firstname'=> $params['firstname'],
'lastname'=> $params['lastname'],
diff --git a/src/Account/views/signup.twig b/src/Account/views/signup.twig
index 7eff096..5d13cbc 100644
--- a/src/Account/views/signup.twig
+++ b/src/Account/views/signup.twig
@@ -1,18 +1,13 @@
{% extends 'layout.twig' %}
{% block body %}
+
|