From ed169f49c5b898fcc007c0ba8eca7a3043589c3e Mon Sep 17 00:00:00 2001
From: Jean Paul Galea <jeanpaul@yubico.com>
Date: Fri, 17 Jul 2015 23:12:59 +0200
Subject: [PATCH] Refactor.

- getLocalParams() returns array or bool false on failure.
---
 ykval-resync.php | 3 +--
 ykval-sync.php   | 3 +--
 ykval-verify.php | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ykval-resync.php b/ykval-resync.php
index 6be352e..24ccb28 100644
--- a/ykval-resync.php
+++ b/ykval-resync.php
@@ -84,8 +84,7 @@ if (! $sync->isConnected()) {
 }
 
 foreach($yubikeys as $key) {
-  $localParams = $sync->getLocalParams($key);
-  if (!$localParams) {
+  if (($localParams = $sync->getLocalParams($key)) === FALSE) {
     logdie($myLog, 'ERROR Invalid Yubikey ' . $key);
   }
 
diff --git a/ykval-sync.php b/ykval-sync.php
index 524104e..444e636 100644
--- a/ykval-sync.php
+++ b/ykval-sync.php
@@ -116,8 +116,7 @@ foreach (array('modified','yk_counter', 'yk_use', 'yk_high', 'yk_low') as $param
 
 // get local counter data
 $yk_publicname = $syncParams['yk_publicname'];
-$localParams = $sync->getLocalParams($yk_publicname);
-if (!$localParams)
+if (($localParams = $sync->getLocalParams($yk_publicname)) === FALSE)
 {
 	$myLog->log(LOG_NOTICE, 'Invalid Yubikey ' . $yk_publicname);
 	sendResp(S_BACKEND_ERROR, $myLog);
diff --git a/ykval-verify.php b/ykval-verify.php
index da9f32e..133f917 100644
--- a/ykval-verify.php
+++ b/ykval-verify.php
@@ -282,8 +282,7 @@ $myLog->log(LOG_DEBUG, "Decrypted OTP:", $otpinfo);
 
 // get Yubikey from DB
 $yk_publicname = substr($otp, 0, strlen ($otp) - TOKEN_LEN);
-$localParams = $sync->getLocalParams($yk_publicname);
-if (!$localParams)
+if (($localParams = $sync->getLocalParams($yk_publicname)) === FALSE)
 {
 	$myLog->log(LOG_NOTICE, "Invalid Yubikey $yk_publicname");
 	sendResp(S_BACKEND_ERROR, $myLog, $apiKey);