diff --git a/functions.php b/functions.php index 81dbc54..16276b6 100644 --- a/functions.php +++ b/functions.php @@ -1,30 +1,118 @@ $value) { + $csv[$key] = str_getcsv($value); +} + +$zarTxn = getLog('zarathos', $csv); +$symTxn = getLog('symos', $csv); + +$txnVault = array_merge($zarTxn, $symTxn); + +foreach ($txnVault as $key => $value) { + $csvComp = searchForId($value['timestamp'], $csv); + + if (!$csvComp) { + $csvVault[] = $value; + } +} + +// Loop through file pointer and add a line +foreach ($csvVault as $fields) { + fputcsv($fp, $fields); +} + +fclose($fp); + +// searchForID(): Serach CSV array for timestamp ID +function searchForId($id, $array) { foreach ($array as $key => $val) { if ($val[1] == $id) { - return $key; + return true; } } - return null; + return false; } -function formatMoney($number, $cents = 1) -{ // cents: 0=never, 1=if needed, 2=always - if (is_numeric($number)) { // a number - if (!$number) { // zero - $money = ($cents == 2 ? '0.00' : '0'); // output zero - } else { // value - if (floor($number) == $number) { // whole number - $money = number_format($number, ($cents == 2 ? 2 : 0)); // format - } else { // cents - $money = number_format(round($number, 2), ($cents == 0 ? 0 : 2)); // format - } // integer or decimal - } // value - return '$' . $money; - } // numeric -} // formatMoney +// formatMoney(): Format raw transaction vaule to display as money +// cents: 0=never, 1=if needed, 2=always +function formatMoney($number, $cents = 1) { + if (is_numeric($number)) { + if (!$number) { + $money = ($cents == 2 ? '0.00' : '0'); + } else { + if (floor($number) == $number) { + $money = number_format($number, ($cents == 2 ? 2 : 0)); + } else { + $money = number_format(round($number, 2), ($cents == 0 ? 0 : 2)); + } + } + return '$' . $money; + } +} + +// getLog(): Get log entries for user. Uses CSV array for dupe checking. Returns array. +function getLog($user, $csv) { + $tornURL = 'https://api.torn.com/user/?selections=log&key='; + $i = 0; + + if ($user == 'zarathos') { + $usrKey = 'LDtibInYMdgVnM9n'; + $user = 'Zarathos'; + } else { + $usrKey = 'lne9TZLuqvFXtK3V'; + $user = 'Symos'; + } + + $usrURL = $tornURL . $usrKey; + $usrLog = json_decode(file_get_contents($usrURL)); + $usrData = $usrLog->log; + $usrVault = []; + + foreach ($usrData as $entry) { + if ($entry->log == 5851) { + $usrVault[$i]['user'] = $user; + $usrVault[$i]['timestamp'] = $entry->timestamp; + $usrVault[$i]['operation'] = $entry->title; + $usrVault[$i]['amount'] = $entry->data->withdrawn; + + $csvComp = searchForId($entry->timestamp, $csv); + + if ($csvComp) { + //echo 'Withdrawal (ID: ' . $entry->timestamp . ') already in vault'; + } + + // fputcsv($fp, $usrVault[i]); + } elseif ($entry->log == 5850) { + $usrVault[$i]['user'] = $user; + $usrVault[$i]['timestamp'] = $entry->timestamp; + $usrVault[$i]['operation'] = $entry->title; + $usrVault[$i]['amount'] = $entry->data->deposited; + + $csvComp = searchForId($entry->timestamp, $csv); + + if ($csvComp) { + //echo 'Deposit (ID: ' . $entry->timestamp . ') already in vault'; + } + } else { + continue; + } + + $i++; + } + + return $usrVault; +} ?> \ No newline at end of file diff --git a/index.php b/index.php index 7af0574..ed959b7 100644 --- a/index.php +++ b/index.php @@ -1,76 +1,5 @@ $value) { - $csv[$key] = str_getcsv($value); -} - -function getLog($user) { - $tornURL = 'https://api.torn.com/user/?selections=log&key='; - $i = 0; - - if ($user == 'zarathos') { - $usrKey = 'LDtibInYMdgVnM9n'; - } else { - $usrKey = 'lne9TZLuqvFXtK3V'; - } - - $usrURL = $tornURL.$usrKey; - $usrLog = json_decode(file_get_contents($usrURL)); - $usrData = $usrLog->log; - $usrVault = []; - - foreach ($usrData as $entry) { - if ($entry->log == 5851) { - $usrVault[$i]['user'] = $user; - $usrVault[$i]['timestamp'] = $entry->timestamp; - $usrVault[$i]['operation'] = $entry->title; - $usrVault[$i]['amount'] = $entry->data->withdrawn; - - $csvComp = searchForId($entry->timestamp, $csv); - - if ($csvComp) { - echo 'Withdrawal (ID: ' . $entry->timestamp . ') already in vault'; - } - - // fputcsv($fp, $usrVault[i]); - } elseif ($entry->log == 5850) { - $usrVault[$i]['user'] = $user; - $usrVault[$i]['timestamp'] = $entry->timestamp; - $usrVault[$i]['operation'] = $entry->title; - $usrVault[$i]['amount'] = $entry->data->deposited; - - $csvComp = searchForId($entry->timestamp, $csv); - - if ($csvComp) { - echo 'Deposit (ID: ' . $entry->timestamp . ') already in vault'; - } - } else { - continue; - } - - $i++; - } - - return $usrVault; -} - -// Loop through file pointer and a line -// foreach ($zarVault as $fields) { -// fputcsv($fp, $fields); -// } - -fclose($fp); - ?> @@ -97,21 +26,27 @@ fclose($fp); $b[1]; + } + + foreach ($csv as $entry) { echo '