From ddae2a68dbef4355e1887b6616b717ec02e21dd4 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Wed, 7 May 2014 22:47:13 +0200
Subject: [PATCH] [FIX] Do not payout case sensitive on worker names

---
 cronjobs/pplns_payout.php       | 20 ++++++++++----------
 include/classes/share.class.php |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cronjobs/pplns_payout.php b/cronjobs/pplns_payout.php
index c256b279..093be4ce 100755
--- a/cronjobs/pplns_payout.php
+++ b/cronjobs/pplns_payout.php
@@ -115,16 +115,16 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
         // Add archived shares to users current shares, if we have any in archive
         if (is_array($aArchiveShares)) {
           $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 |";
-          $log->logDebug(sprintf($strLogMask, 'Username', 'Round Valid', 'Archive Valid', 'Total Valid', 'Round Invalid', 'Archive Invalid', 'Total Invalid'));
+          $strLogMask = "| %5.5s | %-20.20s | %15.15s | %15.15s | %15.15s | %15.15s | %15.15s | %15.15s |";
+          $log->logDebug(sprintf($strLogMask, 'ID', 'Username', 'Round Valid', 'Archive Valid', 'Total Valid', 'Round Invalid', 'Archive Invalid', 'Total Invalid'));
           foreach($aAccountShares as $key => $aData) {
-            if (array_key_exists($aData['username'], $aArchiveShares)) {
-              $log->logDebug(sprintf($strLogMask, $aData['username'],
-                $aAccountShares[$key]['valid'], $aArchiveShares[$aData['username']]['valid'], ($aAccountShares[$key]['valid'] + $aArchiveShares[$aData['username']]['valid']),
-                $aAccountShares[$key]['invalid'], $aArchiveShares[$aData['username']]['invalid'], ($aAccountShares[$key]['invalid'] + $aArchiveShares[$aData['username']]['invalid']))
+            if (array_key_exists(strtolower($aData['username']), $aArchiveShares)) {
+              $log->logDebug(sprintf($strLogMask, $aData['id'], $aData['username'],
+                $aAccountShares[$key]['valid'], $aArchiveShares[strtolower($aData['username'])]['valid'], ($aAccountShares[$key]['valid'] + $aArchiveShares[strtolower($aData['username'])]['valid']),
+                $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]['invalid'] += $aArchiveShares[$aData['username']]['invalid'];
+              $aAccountShares[$key]['valid'] += $aArchiveShares[strtolower($aData['username'])]['valid'];
+              $aAccountShares[$key]['invalid'] += $aArchiveShares[strtolower($aData['username'])]['invalid'];
             }
           }
           // reverse payout
@@ -132,13 +132,13 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
             $log->logDebug('Reverse payout enabled, adding shelved shares for all users');
             $aSharesData = NULL;
             foreach($aAccountShares as $key => $aData) {
-              $aSharesData[$aData['username']] = $aData;
+              $aSharesData[strtolower($aData['username'])] = $aData;
             }
             // Add users from archive not in current round
             $strLogMask = "| %-20.20s | %15.15s | %15.15s |";
             $log->logDebug(sprintf($strLogMask, 'Username', 'Shelved Valid', 'Shelved Invalid'));
             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']));
                 $aArchData['username'] = $aArchData['account'];
                 $aSharesData[$aArchData['account']] = $aArchData;
diff --git a/include/classes/share.class.php b/include/classes/share.class.php
index 47c67813..b50188f8 100644
--- a/include/classes/share.class.php
+++ b/include/classes/share.class.php
@@ -146,7 +146,7 @@ class Share Extends Base {
     if ($this->checkStmt($stmt) && $stmt->bind_param("ii", $iMinId, $iMaxId) && $stmt->execute() && $result = $stmt->get_result()) {
       $aData = NULL;
       while ($row = $result->fetch_assoc()) {
-        $aData[$row['account']] = $row;
+        $aData[strtolower($row['account'])] = $row;
       }
       if (is_array($aData)) return $aData;
     }