diff --git a/htdocs/public/dons/don.xhtml b/htdocs/public/dons/don.xhtml index fc6b7f80739..b489eedc78a 100644 --- a/htdocs/public/dons/don.xhtml +++ b/htdocs/public/dons/don.xhtml @@ -56,13 +56,8 @@ - - - Montant - - - euros - + + euros diff --git a/htdocs/public/dons/therm.php b/htdocs/public/dons/therm.php index efb0149c233..50887e77260 100644 --- a/htdocs/public/dons/therm.php +++ b/htdocs/public/dons/therm.php @@ -25,53 +25,17 @@ if (file_exists ($thermlib)) { include($thermlib); - $posten_file = "/var/www/www.eucd.info/htdocs/posten.txt"; - $totaal_file = "/var/www/www.eucd.info/htdocs/totaal.txt"; - - /* * Read Values */ - if (file_exists ($posten_file)) - { - if (file_exists ($totaal_file)) - { - - /* lees posten uit file */ - $fp = fopen($posten_file, 'r' ); - - - if ($fp) - { - $post_donaties = fgets( $fp, 10 ); - $post_sponsoring = fgets( $fp, 10 ); - $post_intent = fgets( $fp, 10 ); - fclose( $fp ); - } - - /* lees posten uit file */ - $fp = fopen( $totaal_file, 'r' ); - if ($fp) - { - $totaal_ontvangen = fgets( $fp, 10 ); - $totaal_pending = fgets( $fp, 10 ); - fclose( $fp ); - } - } - } - - /* - * Graph thermometer - */ - $conf = new Conf(); $db = new Db(); - $don = new Don($db); + $dontherm = new Don($db); - $actualValue = $don->sum_actual(); - $pendingValue = $don->sum_pending(); - $intentValue = $don->sum_intent(); + $actualValue = $dontherm->sum_actual(); + $pendingValue = $dontherm->sum_pending(); + $intentValue = $dontherm->sum_intent(); print moneyMeter($actualValue, $pendingValue, $intentValue);