Bring code into the next century

[infodrom.org/service.infodrom.org] / src / InfoCon / buch / infocon

diff --git a/src/InfoCon/buch/infocon b/src/InfoCon/buch/infocon
index 878495d..45e64f5 100755 (executable)
--- a/src/InfoCon/buch/infocon
+++ b/src/InfoCon/buch/infocon
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 #  infocon - Admin-Tool for InfoCon
-#  Copyright (c) 1998-2003,2005  Martin Schulze <joey@infodrom.org>
+#  Copyright (c) 1998-2003,2005-6,7  Martin Schulze <joey@infodrom.org>
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@ sub date_to_string
     return "" if (!$_[0]);
 
     ($date_sec,$date_min,$date_hour,$date_mday,$date_mon,$date_year,$date_wday,$date_isdst)
-       = localtime();
+       = localtime;
 
     if ($_[0] eq "heute" || $_[0] eq "sofort" || $_[0] eq "pronto" || $_[0] eq "today" || $_[0] eq "now") {
        $day = $date_mday;
@@ -149,7 +149,7 @@ sub sales_list
        print "------------------------------------------------------------------\n";
        while (@row = $sth->fetchrow_array) {
            $descr = substr($row[2],0,40);
-           printf "%4d %8s %-40s  %9.2f\n", $row[0], &sdate($row[1]), $descr, $row[3];
+           printf "%4d %8s %-40s  %9.2f\n", $row[0], sdate($row[1]), $descr, $row[3];
            if ($row[3] < 0.0) {
                $sum_neg -= $row[3];
            } else {
@@ -186,7 +186,7 @@ sub get_categories
 
 sub list_categories
 {
-    @categories = &get_categories() if ($#categories);
+    @categories = get_categories unless @categories;
 
     printf "%s\n", join (", ",@categories);
 }
@@ -240,14 +240,16 @@ sub buchung_input
     my $i;
     my $query;
     my ($date_sec,$date_min,$date_hour,$date_mday,$date_mon,$date_year,$date_wday,$date_isdst)
-       = localtime();
+       = localtime;
+
+    $sth = $dbh->prepare ("INSERT INTO $table VALUES (?,?,?,?,?,?,?,?,?)");
 
     print "Buchungseingabe\n\n";
-    while ($weiter =~ /[JjYy]/) {
+    while ($weiter =~ /[JjYy1]/) {
        $i=0;while ($i <= $#fieldname) {
-           $ans = &read_input($fieldname[$i],$input[$i]);
+           $ans = read_input($fieldname[$i],$input[$i]);
            if ($fieldname[$i] eq "Category" && $ans eq "?") {
-               @categories = &get_categories() if ($#categories);
+               @categories = get_categories unless @categories;
                printf "  %s\n", join (", ",@categories);
            } elsif ($fieldname[$i] eq "Datum") {
                if ($ans =~ /^\d+\.\d+.\d+$/) {
@@ -262,6 +264,13 @@ sub buchung_input
                    $input[$i] = $ans;
                    $i++;
                }
+           } elsif ($fieldname[$i] eq "Paid") {
+               if ($ans =~ /[1jJyY]/) {
+                   $input[$i] = 1;
+               } else {
+                   $input[$i] = 0;
+               }
+               $i++;
            } else {
                $input[$i] = $ans;
                $i++;
@@ -281,11 +290,9 @@ sub buchung_input
            $input[6] *= -1 if ($input[6] > 0);
        }
 
-       $query = sprintf ("INSERT INTO $table VALUES (%d,'%s','%s','%s',%8.2f,%8.2f,%8.2f,%d,%d)",
-                         &get_next_nr(), &date_to_string($input[0]), $input[1], $input[2], $input[4],
+       $sth->execute (get_next_nr(), date_to_string($input[0]), $input[1], $input[2], $input[4],
                          $input[5], $input[6], 1, $input[7]);
-       $sth = $dbh->do($query);
-       $weiter = &read_input("Weiter",'j');
+       $weiter = read_input("Weiter",'j');
        $input[5] = 0.0;
     }
 }
@@ -314,7 +321,7 @@ $i = 0;
 $opt_all = 0;
 $opt_verbose = 0;
 $opt_year = 0;
-&usage() if ($#ARGV == -1);
+usage unless @ARGV;
 while ($i <= $#ARGV) {
     # Some aliases
     if ($ARGV[$i] eq "-bc") {
@@ -323,70 +330,72 @@ while ($i <= $#ARGV) {
        $ARGV[$i] = "--buchung-input";
     } elsif ($ARGV[$i] eq "-bh") {
        $ARGV[$i] = "--buchung-hidden";
+    } elsif ($ARGV[$i] eq "-bu") {
+       $ARGV[$i] = "--buchung-unpaid";
     } elsif ($ARGV[$i] eq "-lc") {
        $ARGV[$i] = "--list-categories";
     }
 
     if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "--help") {
-       &usage();
+       usage;
     } elsif ($ARGV[$i] =~ /^--list-/) {
        $ARGV[$i] =~ s/^--list-//;
        if ($ARGV[$i] eq "categories") {
-           &list_categories();
+           list_categories;
        } else {
-           &usage();
+           usage;
        }
     } elsif ($ARGV[$i] =~ /^--buchung-/) {
        $ARGV[$i] =~ s/^--buchung-//;
        if ($ARGV[$i] eq "category") {
            if ($i+1 <= $#ARGV && ($ARGV[$i+1] !~ /^-/)) {
                $i++;
-               &sales_list("category = '$ARGV[$i]'");
+               sales_list("category = '$ARGV[$i]'");
            } else {
-               &sales_list();
+               sales_list;
            }
        } elsif ($ARGV[$i] eq "hidden") {
            $saved_table = $table;
            $table = "sales_dm";
-           &sales_list("visible = 0");
+           sales_list("visible = 0");
            $table = "sales";
-           &sales_list("visible = 0");
+           sales_list("visible = 0");
            $table = $table_saved;
        } elsif ($ARGV[$i] eq "input") {
-           &buchung_input();
+           buchung_input;
        } elsif ($ARGV[$i] eq "unpaid") {
            $saved_table = $table;
            $table = "sales_dm";
-           &sales_list("paid = 0");
+           sales_list("paid = 0");
            $table = "sales";
-           &sales_list("paid = 0");
+           sales_list("paid = 0");
            $table = $table_saved;
        } else {
-           &usage();
+           usage;
        }
     } elsif ($ARGV[$i] eq "--pay") {
        if ($i+1 <= $#ARGV && ($ARGV[$i+1] !~ /^-/)
            && ($ARGV[$i+1] =~ /^\d+$/)) {
            $i++;
-           &pay_invoice ($ARGV[$i], 1);
+           pay_invoice ($ARGV[$i], 1);
        }
     } elsif ($ARGV[$i] eq "--unpay") {
        if ($i+1 <= $#ARGV && ($ARGV[$i+1] !~ /^-/)
            && ($ARGV[$i+1] =~ /^\d+$/)) {
            $i++;
-           &pay_invoice ($ARGV[$i], 0);
+           pay_invoice ($ARGV[$i], 0);
        }
     } elsif ($ARGV[$i] eq "--hide") {
        if ($i+1 <= $#ARGV && ($ARGV[$i+1] !~ /^-/)
            && ($ARGV[$i+1] =~ /^\d+$/)) {
            $i++;
-           &hide_invoice ($ARGV[$i], 1);
+           hide_invoice ($ARGV[$i], 1);
        }
     } elsif ($ARGV[$i] eq "--unhide") {
        if ($i+1 <= $#ARGV && ($ARGV[$i+1] !~ /^-/)
            && ($ARGV[$i+1] =~ /^\d+$/)) {
            $i++;
-           &hide_invoice ($ARGV[$i], 0);
+           hide_invoice ($ARGV[$i], 0);
        }
     } elsif ($ARGV[$i] eq "--year" || $ARGV[$i] eq "-y") {
        if ($i+1 <= $#ARGV && ($ARGV[$i+1] =~ /^(\d+)$/)) {