mirror of
https://github.com/Yubico/yubikey-val.git
synced 2025-02-01 01:52:18 +01:00
Removed dead code, second try.
- grep with -i switch. - left UnixToDbTime... will refactor later and unwrap to plain date() - left timestamp* methods in ykval-db, not used but might be useful while refactoring other code.
This commit is contained in:
parent
b4f9bd4939
commit
057eb0b563
@ -91,19 +91,6 @@ function getUTCTimeStamp() {
|
||||
return date('Y-m-d\TH:i:s\Z0', time()) . $tiny;
|
||||
}
|
||||
|
||||
# NOTE: When we evolve to using general DB-interface, this functinality
|
||||
# should be moved there.
|
||||
function DbTimeToUnix($db_time)
|
||||
{
|
||||
$unix=strptime($db_time, '%F %H:%M:%S');
|
||||
return mktime($unix[tm_hour], $unix[tm_min], $unix[tm_sec], $unix[tm_mon]+1, $unix[tm_mday], $unix[tm_year]+1900);
|
||||
}
|
||||
|
||||
function UnixToDbTime($unix)
|
||||
{
|
||||
return date('Y-m-d H:i:s', $unix);
|
||||
}
|
||||
|
||||
// Sign a http query string in the array of key-value pairs
|
||||
// return b64 encoded hmac hash
|
||||
function sign($a, $apiKey, $logger) {
|
||||
@ -120,16 +107,6 @@ function sign($a, $apiKey, $logger) {
|
||||
|
||||
} // sign an array of query string
|
||||
|
||||
function hex2b64 ($hex_str) {
|
||||
$bin = pack("H*", $hex_str);
|
||||
return base64_encode($bin);
|
||||
}
|
||||
|
||||
function modhex2b64 ($modhex_str) {
|
||||
$hex_str = strtr ($modhex_str, "cbdefghijklnrtuv", "0123456789abcdef");
|
||||
return hex2b64($hex_str);
|
||||
}
|
||||
|
||||
function curl_settings($logger, $ident, $handle, $url, $timeout, $curlopts) {
|
||||
//configure "hard" options
|
||||
$logger->log(LOG_DEBUG, $ident . " adding URL : " . $url);
|
||||
|
@ -126,11 +126,6 @@ class DbImpl extends Db
|
||||
if($result) $result->closeCursor();
|
||||
}
|
||||
|
||||
public function truncateTable($name)
|
||||
{
|
||||
$this->query("TRUNCATE TABLE " . $name);
|
||||
}
|
||||
|
||||
/**
|
||||
* main function used to get rows by multiple key=>value pairs from Db table.
|
||||
*
|
||||
|
38
ykval-db.php
38
ykval-db.php
@ -108,11 +108,6 @@ abstract class Db
|
||||
else return False;
|
||||
}
|
||||
|
||||
public function truncateTable($name)
|
||||
{
|
||||
$this->query("TRUNCATE TABLE " . $name);
|
||||
}
|
||||
|
||||
/**
|
||||
* function to update row in database by a where condition
|
||||
*
|
||||
@ -267,37 +262,4 @@ or false on failure.
|
||||
{
|
||||
return $this->query($query, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* helper function used to get rows from Db table in reversed order.
|
||||
* defaults to obtaining 1 row.
|
||||
*
|
||||
* @param string $table Database table to update row in
|
||||
* @param string $key Column to select rows by
|
||||
* @param string $value Value to select rows by
|
||||
* @param int $nr Number of rows to collect. NULL=>inifinity. Default=1.
|
||||
* @return mixed Array with values from Db row or 2d-array with multiple rows or false on failure.
|
||||
*
|
||||
*/
|
||||
public function lastBy($table, $key, $value, $nr=1)
|
||||
{
|
||||
return Db::findBy($table, $key, $value, $nr, 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* helper function used to get rows from Db table in standard order.
|
||||
* defaults to obtaining 1 row.
|
||||
*
|
||||
* @param string $table Database table to update row in
|
||||
* @param string $key Column to select rows by
|
||||
* @param string $value Value to select rows by
|
||||
* @param int $nr Number of rows to collect. NULL=>inifinity. Default=1.
|
||||
* @return mixed Array with values from Db row or 2d-array with multiple rows or false on failure.
|
||||
*
|
||||
*/
|
||||
public function firstBy($table, $key, $value, $nr=1)
|
||||
{
|
||||
return Db::findBy($table, $key, $value, $nr);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -63,25 +63,11 @@ class SyncLib
|
||||
return $this->isConnected;
|
||||
}
|
||||
|
||||
function DbTimeToUnix($db_time)
|
||||
{
|
||||
$unix=strptime($db_time, '%F %H:%M:%S');
|
||||
return mktime($unix[tm_hour], $unix[tm_min], $unix[tm_sec], $unix[tm_mon]+1, $unix[tm_mday], $unix[tm_year]+1900);
|
||||
}
|
||||
|
||||
function UnixToDbTime($unix)
|
||||
{
|
||||
return date('Y-m-d H:i:s', $unix);
|
||||
}
|
||||
|
||||
function getServer($index)
|
||||
{
|
||||
if (isset($this->syncServers[$index]))
|
||||
return $this->syncServers[$index];
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
function getClientData($client)
|
||||
{
|
||||
$res = $this->db->customQuery("SELECT id, secret FROM clients WHERE active='1' AND id='" . $client . "'");
|
||||
|
Loading…
x
Reference in New Issue
Block a user