Merge branch 'master' of cybelle:kisscount

This commit is contained in:
Grégory Soutadé 2010-10-04 22:12:01 +02:00
commit 31c7b6f585

View File

@ -60,7 +60,7 @@ if (!isset($_SESSION["user"]))
echo "<option value=\"$name\">$name</option>\n"; echo "<option value=\"$name\">$name</option>\n";
echo "</select><br /><br />\n"; echo "</select><br /><br />\n";
echo "Password : <input type=\"password\" name=\"password\" /><br /><br />\n"; echo "Password : <input type=\"password\" name=\"password\" /><br /><br />\n";
echo "<input type=\"submit\" />\n"; echo "<input type=\"submit\" value=\"Connect\"/>\n";
echo "</form></center>\n"; echo "</form></center>\n";
echo "<br /><br />\n"; echo "<br /><br />\n";
echo "<center><a href=\"http://indefero.soutade.fr/p/kisscount\">KissCount</a> &copy; 2010 Grégory Soutadé</center>\n"; echo "<center><a href=\"http://indefero.soutade.fr/p/kisscount\">KissCount</a> &copy; 2010 Grégory Soutadé</center>\n";
@ -92,6 +92,8 @@ $total_incomes = $total_outcomes = $cur_incomes = $cur_outcomes = 0;
while($operation = $operations->fetchArray()) while($operation = $operations->fetchArray())
{ {
if ($operation["transfert"] != "" || $operation["meta"] == "1") continue;
$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"];
@ -99,8 +101,6 @@ while($operation = $operations->fetchArray())
if ($date <= $cur_date) if ($date <= $cur_date)
$accounts[$operation["account"]]["cur"] += $operation["amount"]; $accounts[$operation["account"]]["cur"] += $operation["amount"];
if ($operation["transfert"] != "") continue;
if ($operation["amount"] < 0) if ($operation["amount"] < 0)
{ {
$categories[$operation["category"]] -= $operation["amount"]; $categories[$operation["category"]] -= $operation["amount"];
@ -162,7 +162,7 @@ function changeMonths()
} }
?> ?>
</select> </select>
<input type="submit" /> <input type="submit" value="OK"/>
</form> </form>
<a id="disconnect" href="?disconnect=1">Disconnect</a> <a id="disconnect" href="?disconnect=1">Disconnect</a>
<br /><br /> <br /><br />
@ -197,6 +197,8 @@ function changeMonths()
$operations = LoadMonth($_SESSION["user"], $_SESSION["cur_month"], $_SESSION["cur_year"]); $operations = LoadMonth($_SESSION["user"], $_SESSION["cur_month"], $_SESSION["cur_year"]);
while($operation = $operations->fetchArray()) while($operation = $operations->fetchArray())
{ {
if ($operation["meta"] == "1") continue;
$category = $_SESSION["user"]->GetCategory($operation["category"]); $category = $_SESSION["user"]->GetCategory($operation["category"]);
if ($operation["fix_cost"] == "0") if ($operation["fix_cost"] == "0")
{ {