rooty/yubikey-val
1
0
Fork 0
mirror of https://github.com/Yubico/yubikey-val.git synced 2025-03-16 03:29:18 +01:00
Code Issues Projects Releases Wiki Activity

Cosmetic changes.

Browse Source
This commit is contained in:
Jean Paul Galea 2015-07-15 18:03:47 +02:00
parent 514b943945
commit 3de52c3a7c
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ykval-import
View File

@ -43,27 +43,34 @@ if (!$db->connect()) {
$myLog->log(LOG_WARNING, "Could not connect to database");
error_log("Could not connect to database");
exit(1);
}
}
while ($res=fgetcsv(STDIN, 0, ",")) {
if($res[0]===null || strpos($res[0], '#')===0) continue;
$params=array("active"=>$res[0],
"created"=>$res[1],
"modified"=>$res[2],
"yk_publicname"=>$res[3],
"yk_counter"=>$res[4],
"yk_use"=>$res[5],
"yk_low"=>$res[6],
"yk_high"=>$res[7],
"nonce"=>$res[8],
"notes"=>$res[9]);
if ($res[0]===null || strpos($res[0], '#')===0)
continue;
$params=array(
"active"=>$res[0],
"created"=>$res[1],
"modified"=>$res[2],
"yk_publicname"=>$res[3],
"yk_counter"=>$res[4],
"yk_use"=>$res[5],
"yk_low"=>$res[6],
"yk_high"=>$res[7],
"nonce"=>$res[8],
"notes"=>$res[9]
);
# FIXME
# INSERT first, if duplicate error, UPDATE.
$query="SELECT * FROM yubikeys WHERE yk_publicname='" . $params['yk_publicname'] . "'";
$result=$db->customQuery($query);
if($db->rowCount($result)) {
if ($db->rowCount($result)) {
$query="UPDATE yubikeys SET " .
"active='" . $params["active"] . "' " .
",created='" . $params["created"] . "' " .
@ -83,8 +90,8 @@ while ($res=fgetcsv(STDIN, 0, ",")) {
error_log("Failed to update yk_publicname with query " . $query);
exit(1);
}
} else {
}
else {
// We didn't have the yk_publicname in database so we need to do insert instead
$query="INSERT INTO yubikeys " .
"(active,created,modified,yk_publicname,yk_counter,yk_use,yk_low,yk_high,nonce,notes) VALUES " .
@ -99,15 +106,15 @@ while ($res=fgetcsv(STDIN, 0, ",")) {
"'" . $params['nonce'] . "'," .
"'" . $params['notes'] . "')";
if(!$db->customQuery($query)){
if (!$db->customQuery($query)) {
$myLog->log(LOG_ERR, "Failed to insert new yk_publicname with query " . $query);
error_log("Failed to insert new yk_publicname with query " . $query);
exit(1);
}
}
$db->closeCursor($result);
}
$db->closeCursor($result);
}
$myLog->log(LOG_NOTICE, "Successfully imported yubikeys to database");
echo "Successfully imported yubikeys to database\n";