RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Do not payout case sensitive on worker names

Browse Source
This commit is contained in:
Sebastian Grewe 2014-05-07 22:47:13 +02:00
parent 36a3eba2c7
commit ddae2a68db
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cronjobs/pplns_payout.php
View File

@ -115,16 +115,16 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
// Add archived shares to users current shares, if we have any in archive // Add archived shares to users current shares, if we have any in archive
if (is_array($aArchiveShares)) { if (is_array($aArchiveShares)) {
$log->logDebug('Found shares in archive to match PPLNS target, calculating per-user shares'); $log->logDebug('Found shares in archive to match PPLNS target, calculating per-user shares');
$strLogMask = "| %-20.20s | %15.15s | %15.15s | %15.15s | %15.15s | %15.15s | %15.15s |"; $strLogMask = "| %5.5s | %-20.20s | %15.15s | %15.15s | %15.15s | %15.15s | %15.15s | %15.15s |";
$log->logDebug(sprintf($strLogMask, 'Username', 'Round Valid', 'Archive Valid', 'Total Valid', 'Round Invalid', 'Archive Invalid', 'Total Invalid')); $log->logDebug(sprintf($strLogMask, 'ID', 'Username', 'Round Valid', 'Archive Valid', 'Total Valid', 'Round Invalid', 'Archive Invalid', 'Total Invalid'));
foreach($aAccountShares as $key => $aData) { foreach($aAccountShares as $key => $aData) {
if (array_key_exists($aData['username'], $aArchiveShares)) { if (array_key_exists(strtolower($aData['username']), $aArchiveShares)) {
$log->logDebug(sprintf($strLogMask, $aData['username'], $log->logDebug(sprintf($strLogMask, $aData['id'], $aData['username'],
$aAccountShares[$key]['valid'], $aArchiveShares[$aData['username']]['valid'], ($aAccountShares[$key]['valid'] + $aArchiveShares[$aData['username']]['valid']), $aAccountShares[$key]['valid'], $aArchiveShares[strtolower($aData['username'])]['valid'], ($aAccountShares[$key]['valid'] + $aArchiveShares[strtolower($aData['username'])]['valid']),
$aAccountShares[$key]['invalid'], $aArchiveShares[$aData['username']]['invalid'], ($aAccountShares[$key]['invalid'] + $aArchiveShares[$aData['username']]['invalid'])) $aAccountShares[$key]['invalid'], $aArchiveShares[strtolower($aData['username'])]['invalid'], ($aAccountShares[$key]['invalid'] + $aArchiveShares[strtolower($aData['username'])]['invalid']))
); );
$aAccountShares[$key]['valid'] += $aArchiveShares[$aData['username']]['valid']; $aAccountShares[$key]['valid'] += $aArchiveShares[strtolower($aData['username'])]['valid'];
$aAccountShares[$key]['invalid'] += $aArchiveShares[$aData['username']]['invalid']; $aAccountShares[$key]['invalid'] += $aArchiveShares[strtolower($aData['username'])]['invalid'];
} }
} }
// reverse payout // reverse payout
@ -132,13 +132,13 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
$log->logDebug('Reverse payout enabled, adding shelved shares for all users'); $log->logDebug('Reverse payout enabled, adding shelved shares for all users');
$aSharesData = NULL; $aSharesData = NULL;
foreach($aAccountShares as $key => $aData) { foreach($aAccountShares as $key => $aData) {
$aSharesData[$aData['username']] = $aData; $aSharesData[strtolower($aData['username'])] = $aData;
} }
// Add users from archive not in current round // Add users from archive not in current round
$strLogMask = "| %-20.20s | %15.15s | %15.15s |"; $strLogMask = "| %-20.20s | %15.15s | %15.15s |";
$log->logDebug(sprintf($strLogMask, 'Username', 'Shelved Valid', 'Shelved Invalid')); $log->logDebug(sprintf($strLogMask, 'Username', 'Shelved Valid', 'Shelved Invalid'));
foreach($aArchiveShares as $key => $aArchData) { foreach($aArchiveShares as $key => $aArchData) {
if (!array_key_exists($aArchData['account'], $aSharesData)) { if (!array_key_exists(strtolower($aArchData['account']), $aSharesData)) {
$log->logDebug(sprintf($strLogMask, $aArchData['account'], $aArchData['valid'], $aArchData['invalid'])); $log->logDebug(sprintf($strLogMask, $aArchData['account'], $aArchData['valid'], $aArchData['invalid']));
$aArchData['username'] = $aArchData['account']; $aArchData['username'] = $aArchData['account'];
$aSharesData[$aArchData['account']] = $aArchData; $aSharesData[$aArchData['account']] = $aArchData;

2
include/classes/share.class.php
View File

@ -146,7 +146,7 @@ class Share Extends Base {
if ($this->checkStmt($stmt) && $stmt->bind_param("ii", $iMinId, $iMaxId) && $stmt->execute() && $result = $stmt->get_result()) { if ($this->checkStmt($stmt) && $stmt->bind_param("ii", $iMinId, $iMaxId) && $stmt->execute() && $result = $stmt->get_result()) {
$aData = NULL; $aData = NULL;
while ($row = $result->fetch_assoc()) { while ($row = $result->fetch_assoc()) {
$aData[$row['account']] = $row; $aData[strtolower($row['account'])] = $row;
} }
if (is_array($aData)) return $aData; if (is_array($aData)) return $aData;
} }