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

Cosmetic changes.

Browse Source 
- make it easier to read,
	even though we have a couple of long lines now...
This commit is contained in:
Jean Paul Galea 2015-07-15 17:08:44 +02:00
parent dfdc4610d6
commit 2cc0f50257
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
ykval-synclib.php
View File

@ -166,16 +166,20 @@ class SyncLib
public function log($priority, $msg, $params=NULL) public function log($priority, $msg, $params=NULL)
{ {
$logMsg=$msg; $logMsg=$msg;
if ($params) if ($params)
$logMsg .= ' modified=' . $params['modified'] . $logMsg .= ' modified=' . $params['modified'] .
' nonce=' . $params['nonce'] . ' nonce=' . $params['nonce'] .
' yk_publicname=' . $params['yk_publicname'] . ' yk_publicname=' . $params['yk_publicname'] .
' yk_counter=' . $params['yk_counter'] . ' yk_counter=' . $params['yk_counter'] .
' yk_use=' . $params['yk_use'] . ' yk_use=' . $params['yk_use'] .
' yk_high=' . $params['yk_high'] . ' yk_high=' . $params['yk_high'] .
' yk_low=' . $params['yk_low']; ' yk_low=' . $params['yk_low'];
if ($this->myLog) $this->myLog->log($priority, $logMsg);
else error_log("Warning: myLog uninitialized in ykval-synclib.php. Message is " . $logMsg); if ($this->myLog)
$this->myLog->log($priority, $logMsg);
else
error_log("Warning: myLog uninitialized in ykval-synclib.php. Message is " . $logMsg);
} }
function getLocalParams($yk_publicname) function getLocalParams($yk_publicname)
@ -185,18 +189,21 @@ class SyncLib
if (!$res) { if (!$res) {
$this->log(LOG_NOTICE, 'Discovered new identity ' . $yk_publicname); $this->log(LOG_NOTICE, 'Discovered new identity ' . $yk_publicname);
$this->db->save('yubikeys', array('active'=>1, $this->db->save('yubikeys', array(
'created'=>time(), 'active'=>1,
'modified'=>-1, 'created'=>time(),
'yk_publicname'=>$yk_publicname, 'modified'=>-1,
'yk_counter'=>-1, 'yk_publicname'=>$yk_publicname,
'yk_use'=>-1, 'yk_counter'=>-1,
'yk_low'=>-1, 'yk_use'=>-1,
'yk_high'=>-1, 'yk_low'=>-1,
'nonce'=> '0000000000000000', 'yk_high'=>-1,
'notes'=>'')); 'nonce'=> '0000000000000000',
'notes'=>''
));
$res=$this->db->findBy('yubikeys', 'yk_publicname', $yk_publicname,1); $res=$this->db->findBy('yubikeys', 'yk_publicname', $yk_publicname,1);
} }
if ($res) { if ($res) {
$localParams = array( $localParams = array(
'modified' => $res['modified'], 'modified' => $res['modified'],
@ -299,18 +306,16 @@ class SyncLib
public function countersHigherThan($p1, $p2) public function countersHigherThan($p1, $p2)
{ {
if ($p1['yk_counter'] > $p2['yk_counter'] || if ($p1['yk_counter'] > $p2['yk_counter'] || ($p1['yk_counter'] == $p2['yk_counter'] && $p1['yk_use'] > $p2['yk_use']))
($p1['yk_counter'] == $p2['yk_counter'] && return true;
$p1['yk_use'] > $p2['yk_use'])) return true;
return false; return false;
} }
public function countersHigherThanOrEqual($p1, $p2) public function countersHigherThanOrEqual($p1, $p2)
{ {
if ($p1['yk_counter'] > $p2['yk_counter'] || if ($p1['yk_counter'] > $p2['yk_counter'] || ($p1['yk_counter'] == $p2['yk_counter'] && $p1['yk_use'] >= $p2['yk_use']))
($p1['yk_counter'] == $p2['yk_counter'] && return true;
$p1['yk_use'] >= $p2['yk_use'])) return true;
return false; return false;
} }