Fix auto deletion flow in link-tmpl-template.cgi

    - The file auto-deletion flow was *inside*
    the HAS_MAILSERVER check... oops, fixing that
    - fixing the indenting in the same file, it was
    a clusterfuck (still is but way less).
    - removed an useless for(1) in ValidCookie function
    in gpigeon-template.cgi.
    - Makefile change: I trust more the GNUPGHOME variable
    than the --homedir options of gpg for importing a key and creating
    a GPG directory at the same time.

1 files changed, 2 insertions, 4 deletions

diff --git a/gpigeon-template.cgi b/gpigeon-template.cgi
index 9f9dc4c..529c589 100755
--- a/gpigeon-template.cgi
+++ b/gpigeon-template.cgi
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -wT
+#! /usr/bin/perl -T
 
 use warnings;
 use strict;
@@ -26,9 +26,7 @@ sub ValidCookie {
     my $login_cookiefile = "$dir/$filename.txt";
     if (-e $login_cookiefile){ 
         open my $in, '<', $login_cookiefile or die "can't read file: $!";
-        for(1){
-            my $cookie_line = readline $in;
-        }
+        my $cookie_line = readline $in;
         close $in;
         if (not defined $cookie_line){
             return;