From d5a56f6b8ce5aad19a227366b4c41d74179a7cd6 Mon Sep 17 00:00:00 2001
From: Jean Paul Galea <jeanpaul@yubico.com>
Date: Wed, 15 Jul 2015 16:46:45 +0200
Subject: [PATCH] Refactor updateDbCounters.

- make it easier to follow what is happening.
---
 ykval-synclib.php | 45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/ykval-synclib.php b/ykval-synclib.php
index dc2d9b4..061fe76 100644
--- a/ykval-synclib.php
+++ b/ykval-synclib.php
@@ -263,24 +263,33 @@ class SyncLib
   {
     if (isset($params['yk_publicname'])) {
       $condition='('.$params['yk_counter'].'>yk_counter or ('.$params['yk_counter'].'=yk_counter and ' . $params['yk_use'] . '>yk_use))' ;
-      if(! $this->db->conditionalUpdateBy('yubikeys', 'yk_publicname', $params['yk_publicname'],
-					  array('modified'=>$params['modified'],
-						'yk_counter'=>$params['yk_counter'],
-						'yk_use'=>$params['yk_use'],
-						'yk_low'=>$params['yk_low'],
-						'yk_high'=>$params['yk_high'],
-						'nonce'=>$params['nonce']),
-					  $condition))
-	{
-	  $this->log(LOG_CRIT, 'failed to update internal DB with new counters');
-	  return false;
-	} else
-	{
-	  if ($this->db->rowCount()>0) $this->log(LOG_INFO, "updated database ", $params);
-	  else $this->log(LOG_INFO, 'database not updated', $params);
-	  return true;
-	}
-    } else return false;
+
+      $arr = array(
+        'modified' => $params['modified'],
+        'yk_counter' => $params['yk_counter'],
+        'yk_use' => $params['yk_use'],
+        'yk_low' => $params['yk_low'],
+        'yk_high' => $params['yk_high'],
+        'nonce' => $params['nonce']
+      );
+
+      if (! $this->db->conditionalUpdateBy('yubikeys', 'yk_publicname', $params['yk_publicname'], $arr, $condition))
+      {
+        $this->log(LOG_CRIT, 'failed to update internal DB with new counters');
+        return false;
+      }
+      else
+      {
+        if ($this->db->rowCount()>0)
+          $this->log(LOG_INFO, "updated database ", $params);
+        else
+          $this->log(LOG_INFO, 'database not updated', $params);
+
+        return true;
+      }
+    }
+
+    return false;
   }
 
   public function countersHigherThan($p1, $p2)