Revert vaultLoop to per-user SQL MAX(running_balance)

includes/utilities.php

@@ -205,14 +205,17 @@ function fetchVaultRecords($user = null) {
  * @return int The total balance of the given user (or all users if no user is given).
  */
 function vaultLoop ($name=null) {
-    if ($name !== null) {
-        // Per-user path: prefer live /money balance, fall back to MAX(running_balance).
-        $liveBalance = fetchLiveVaultBalance($name);
-        if ($liveBalance !== null) {
-            return $liveBalance;
+    $pdo = getDatabaseConnection();
+
+    if ($name === null) {
+        $stmt = $pdo->query(
+            'SELECT COALESCE(SUM(max_balance), 0) FROM '
+            . '(SELECT MAX(running_balance) AS max_balance FROM vault GROUP BY user)'
+        );
+
+        return (int)$stmt->fetchColumn();
     }
 
-        $pdo = getDatabaseConnection();
     $stmt = $pdo->prepare('SELECT MAX(running_balance) FROM vault WHERE user = :user');
     $stmt->bindValue(':user', $name);
     $stmt->execute();
@@ -220,26 +223,6 @@ function vaultLoop ($name=null) {
     return (int)$stmt->fetchColumn();
 }
 
-    // All-users path: sum the live /money value for each user. For any user
-    // whose /money call failed, fall back to MAX(running_balance) for that user.
-    $pdo  = getDatabaseConnection();
-    $sum  = 0;
-    foreach (USER_KEYS as $user => $apiKey) {
-        $live = fetchLiveVaultBalance($user);
-        if ($live !== null) {
-            $sum += $live;
-            continue;
-        }
-
-        $stmt = $pdo->prepare('SELECT MAX(running_balance) FROM vault WHERE user = :user');
-        $stmt->bindValue(':user', $user);
-        $stmt->execute();
-        $sum += (int)$stmt->fetchColumn();
-    }
-
-    return $sum;
-}
-
 /**
  * Returns a string indicating the sign of a number, with a dollar symbol.
  *