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

Fix two remaining non-portable uses of rowCount.

Browse Source
This commit is contained in:
Simon Josefsson 2011-11-14 10:28:08 +00:00
parent 9eafe43aa3
commit 72a001072b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -12,6 +12,8 @@
* Install non-bin PHP files with --mode 644 to avoid executable bit. * Install non-bin PHP files with --mode 644 to avoid executable bit.
From Fredrik Thulin. From Fredrik Thulin.
* Fix two remaining non-portable uses of rowCount.
* Version 2.10 released 2011-08-18 * Version 2.10 released 2011-08-18
* Don't echo (unsanitized) OTP/NONCE values back to client when * Don't echo (unsanitized) OTP/NONCE values back to client when

4
ykval-synclib.php
View File

@ -290,12 +290,12 @@ class SyncLib
/* Loop over all unique servers in queue */ /* Loop over all unique servers in queue */
$queued_limit=time()-$older_than; $queued_limit=time()-$older_than;
$res=$this->db->customQuery("select distinct server from queue WHERE queued < " . $queued_limit . " or queued is null"); $res=$this->db->customQuery("select distinct server from queue WHERE queued < " . $queued_limit . " or queued is null");
$this->log(LOG_INFO, "found " . $res->rowCount() . " unique servers"); $this->log(LOG_INFO, "found " . $this->db->rowCount() . " unique servers");
foreach ($res as $my_server) { foreach ($res as $my_server) {
$this->log(LOG_INFO, "Sending queue request to server on server " . $my_server['server']); $this->log(LOG_INFO, "Sending queue request to server on server " . $my_server['server']);
$res=$this->db->customQuery("select * from queue WHERE (queued < " . $queued_limit . " or queued is null) and server='" . $my_server['server'] . "'"); $res=$this->db->customQuery("select * from queue WHERE (queued < " . $queued_limit . " or queued is null) and server='" . $my_server['server'] . "'");
$this->log(LOG_INFO, "found " . $res->rowCount() . " queue entries"); $this->log(LOG_INFO, "found " . $this->db->rowCount() . " queue entries");
while ($entry=$res->fetch(PDO::FETCH_ASSOC)) { while ($entry=$res->fetch(PDO::FETCH_ASSOC)) {
$this->log(LOG_INFO, "server=" . $entry['server'] . " , info=" . $entry['info']); $this->log(LOG_INFO, "server=" . $entry['server'] . " , info=" . $entry['info']);