diff --git a/www/index.php b/www/index.php index 7cba181..a9dc96a 100644 --- a/www/index.php +++ b/www/index.php @@ -97,21 +97,22 @@ $total_incomes = $total_outcomes = $cur_incomes = $cur_outcomes = 0; while($operation = $operations->fetchArray()) { - if ($operation["meta"] == "1" || - ($operation["transfert"] != "" && ($operation["amount"] < 0 - || $_SESSION["user"]->IsAccountBlocked($operation["account"])))) + if ($operation["meta"] == "1") continue; - if ($operation["transfert"] == "") - { - $date = mktime(0, 0, 0, $operation["month"]+1, $operation["day"]+1, $operation["year"]); + $date = mktime(0, 0, 0, $operation["month"]+1, $operation["day"]+1, $operation["year"]); - $accounts[$operation["account"]]["total"] += $operation["amount"]; + $accounts[$operation["account"]]["total"] += $operation["amount"]; - if ($date <= $cur_date) - $accounts[$operation["account"]]["cur"] += $operation["amount"]; - } - else + if ($date <= $cur_date) + $accounts[$operation["account"]]["cur"] += $operation["amount"]; + + if ($operation["transfert"] != "" && ($operation["amount"] < 0 + || $_SESSION["user"]->IsAccountBlocked($operation["account"]))) + continue; + + + if ($operation["transfert"] != "") { $operation["amount"] = -$operation["amount"]; }