kleine änderungen draft default tip
authorEric Schmalfuß (prakti) <eric.schmalfuss@schlittermann.de>
Fri, 15 Feb 2013 16:47:36 +0100
changeset 14 5a256b08fdc6
parent 13 2d60fada033e
kleine änderungen
htdocs/cgi-bin/receive_a.test
htdocs/cgi-bin/receive_n
htdocs/cgi-bin/receive_test
htdocs/cgi-bin/send
htdocs/cgi-bin/send_a.test
htdocs/templates/download.html
htdocs/templates/index.html
htdocs/templates/status.html
htdocs/templates/wait.html
testing
--- a/htdocs/cgi-bin/receive_a.test	Mon Feb 11 09:37:04 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-use CGI;
-
-my ( $input, $q, $key, $wert, $param, %result );
-
-#read(STDIN, $input, $ENV{'CONTENT_LENGTH'})or die "error in read: $!";
-$q = new CGI;
-
-$anhang = $q->param('POSTDATA');
-
-my @params = split( /&/, $anhang );
-
-foreach (@params) {
-    ( $key, $wert ) = split( /=/, $_ );
-    $result{$key} = $wert;
-}
-
-# Folgend SSL-Script
--- a/htdocs/cgi-bin/receive_n	Mon Feb 11 09:37:04 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-my (
-    $Daten, $value, $name, $text,  $anhang, $input,
-    $q,     $key,   $wert, $param, %result
-);
-my $i = 0;
-my %Formular;
-my @Formularfelder;
-
-$anhang = $ENV{'QUERY_STRING'};
-read( STDIN, $Daten, $ENV{'CONTENT_LENGTH'} );
-&verarbeiten;
-
-sub verarbeiten {
-    @Formularfelder = split( /&/, $Daten );
-    foreach my $Feld (@Formularfelder) {
-        ( $name, $value ) = split( /=/, $Feld );
-        $value =~ tr/+/ /;
-        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
-        $Formular{$name} = $value;
-    }
-}
-my @schluessel = keys(%Formular);
-my @values     = values(%Formular);
-open( OUT, ">test" );
-print OUT ("\@schluessel: @schluessel\n\@values: @values\n");
-close OUT;
-
-# Folgend SSL-Script
--- a/htdocs/cgi-bin/receive_test	Mon Feb 11 09:37:04 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-
-my (
-    $Daten, $value, $name, $text,  $anhang, $input,
-    $q,     $key,   $wert, $param, %result
-);
-my $i = 0;
-my %Formular;
-my @Formularfelder;
-
-$anhang = $ENV{'QUERY_STRING'};
-read( STDIN, $Daten, $ENV{'CONTENT_LENGTH'} );
-print $Daten;
-&verarbeiten;
-
-sub verarbeiten {
-    @Formularfelder = split( /&/, $Daten );
-    foreach my $Feld (@Formularfelder) {
-        ( $name, $value ) = split( /=/, $Feld );
-        $value =~ tr/+/ /;
-        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
-        $Formular{$name} = $value;
-    }
-}
-my @schluessel = keys(%Formular);
-@schluessel = reverse @schluessel;
-my @values = values(%Formular);
-@values = reverse @values;
-
-# Folgend Test-Script
-
- 
-
-# Test
-my $x = 0;
-open( OUT, ">/var/www/index.html" );
-print OUT (
-'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" xml:lang="en-US"><head>
-<title>CGI-Feedback</title><body><h1>CGI-Feedback vom Programm  <i>recieve</i></h1>'
-);
-foreach (@schluessel) {
-    print OUT ( '<p><B>Feldname: </B>'
-          . $schluessel[$x]
-          . ' <B> Inhalt: </B>'
-          . $values[$x]
-          . '<br>' );
-    $x++;
-}
-print OUT ('</body></html>');
-close OUT;
--- a/htdocs/cgi-bin/send	Mon Feb 11 09:37:04 2013 +0100
+++ b/htdocs/cgi-bin/send	Fri Feb 15 16:47:36 2013 +0100
@@ -35,12 +35,12 @@
    s/\r\n/\<n\>/g;
 }
 $requ=join(" ",@req);
-open (OUT,">req");
-print OUT "@req";
-close OUT;
-open (IN,"<req");
-my @req2=<IN>;
-close IN;
+#open (OUT,">req");
+#print OUT "@req";
+#close OUT;
+#open (IN,"<req");
+#my @req2=<IN>;
+#close IN;
 my (%error, $ffarbe, $ofarbe, $mfarbe, $rfarbe);
 if ($cgi->param("firma") eq ''){
    $error{firma} = "missing company";
@@ -111,15 +111,15 @@
    s/\+/\<2B\>/g;
    s/\r\n/\n/g;
 }
-my $test='test';
-open( TEST,"> $test" ) or die "Kann $test nicht öffnen: $!\n";
-foreach (sort keys %field) {
-   print TEST "$_: $field{$_}\n";
-}
-print TEST "@req\n";
-print TEST " .:. @req2\n";
-close TEST;
-my @Feldnamen = $cgi->param();
+#my $test='test';
+#open( TEST,"> $test" ) or die "Kann $test nicht öffnen: $!\n";
+#foreach (sort keys %field) {
+#   print TEST "$_: $field{$_}\n";
+#}
+#print TEST "@req\n";
+#print TEST " .:. @req2\n";
+#close TEST;
+#my @Feldnamen = $cgi->param();
 
 #######################
 # Senden der Daten    #
@@ -146,7 +146,6 @@
 unlink grep { -M > 3/(24*36) } glob("/var/www/tmp/*");
 
 __END__
-# Test
 
 open( HTML, ">/var/www/tmp/$uid.html") or die "$!\n";
 print HTML ("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\"><html><head><title>Download</title><meta http_equiv=\"refresh\" content=\"10;URL=http://192.168.0.138/tmp/". $uid . "1.html\"></head><script type=\"text/javascript\">
@@ -207,18 +206,18 @@
 }
 
 
-#foreach my $file (@files) {
-#   if (time() - (stat $file)[9] > 300) {
-#         unlink $file;
-#   }
-#   if (-M $file > 3/(24*36)) {
-#      unlink $file;
-#   }
-#}
+foreach my $file (@files) {
+   if (time() - (stat $file)[9] > 300) {
+         unlink $file;
+   }
+   if (-M $file > 3/(24*36)) {
+      unlink $file;
+   }
+}
 
-#open( WRITE, "|sudo at now + 5 minutes" ) or die;
-#print WRITE "rm /var/www/$uid*\n";
-#print WRITE "rm /var/www/download/$uid*\n";
-#close WRITE;
+open( WRITE, "|sudo at now + 5 minutes" ) or die;
+print WRITE "rm /var/www/$uid*\n";
+print WRITE "rm /var/www/download/$uid*\n";
+close WRITE;
 
 
--- a/htdocs/cgi-bin/send_a.test	Mon Feb 11 09:37:04 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#!/usr/bin/perl
-
-use warnings;
-use strict;
-require LWP::UserAgent;
-require CGI;
-require CGI::Carp qw(fatalsToBrowser);
-
-my ( $cgi, $firma, $mail, $text, $url, $ua, $req );
-$cgi = new CGI;
-
-# Auswerten der Daten.
-#$firma=$cgi->param('Firma');
-#$mail=$cgi->param('Mail');
-#$text=$cgi->param('Text');
-my @param = $cgi->param();
-open( TEST, ">test" );
-print TEST ("@param");
-close TEST;
-
-exit(0)
-
-  #$url='http://192.168.0.144/cgi-bin/recieve';
-
-  #$ua=LWP::UserAgent->new;
-  #$ua->env_proxy;
-
-  #$req=HTTP::Request->new("POST",$url);
-  #$req->header('Content-Type' => 'text/html');
-  #$req->content('Firma=Wir&Mail=mail');
-
-  #$ua->request($req);
--- a/htdocs/templates/download.html	Mon Feb 11 09:37:04 2013 +0100
+++ b/htdocs/templates/download.html	Fri Feb 15 16:47:36 2013 +0100
@@ -1,8 +1,10 @@
+[% USE date %]
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd\">
 <html>
    <head>
-      <link rel="shortcut icon" href="http://192.168.0.138/certsign/favicon.ico" >
-      <link rel="icon" href="httP://192.168.0.138/certsign/animated_favicon.gif" type="image/gif" >
+      <meta name="Author"    content="Eric Schmalfu&szlig;"/>
+      <link rel="shortcut icon" href="http://192.168.0.138/favicon.ico" >
+      <link rel="icon" href="httP://192.168.0.138/animated_favicon.gif" type="image/gif" >
       <title>Download</title>
 </head>
    <body bgcolor="#00FFFF">
@@ -11,5 +13,6 @@
    </p>
    <p>
    <a style="text-decoration: none;"  href="/tmp/[%uuid%]" type="application/octet-stream">[%uuid%]</a></p >
+   <div align=right>[% date.format %]</div>
    </body>
 </html>
--- a/htdocs/templates/index.html	Mon Feb 11 09:37:04 2013 +0100
+++ b/htdocs/templates/index.html	Fri Feb 15 16:47:36 2013 +0100
@@ -2,13 +2,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
    <head>
-      <link rel="shortcut icon" href="http://192.168.0.138/certsign/favicon.ico" >
-      <link rel="icon" href="httP://192.168.0.138/certsign/animated_favicon.gif" type="image/gif" >
+      <meta name="Author"    content="Eric Schmalfu&szlig;"/>
+      <link rel="shortcut icon" href="http://192.168.0.138/favicon.ico" >
+      <link rel="icon" href="httP://192.168.0.138/animated_favicon.gif" type="image/gif" >
       <title>SSL-Zertifikat erneuern</title>
       </head>
       <body bgcolor="#00FFFF">
-         <div align=right>[% date.format %]</div>
-         <div align=right>[% date.format(now) %]</div>
          [% dump %]
          <h1>Zertifikat abgelaufen?</h1>
          <p>Dann f&uuml;llen Sie doch einfach das Formular aus.</p>
@@ -50,6 +49,7 @@
                </tr>
             </table>
             <p>Sie haben bereits eine Anfrage gesendet?<br />Klicken Sie bitte <a href="/cgi-bin/status">hier</a>.</p>
+         <div align=right>[% date.format %]</div>
       </form>
    </body>
 </html>                                                  
--- a/htdocs/templates/status.html	Mon Feb 11 09:37:04 2013 +0100
+++ b/htdocs/templates/status.html	Fri Feb 15 16:47:36 2013 +0100
@@ -1,8 +1,10 @@
+[% USE date %]
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
    <head>
-      <link rel="shortcut icon" href="http://192.168.0.138/certsign/favicon.ico" >
-      <link rel="icon" href="httP://192.168.0.138/certsign/animated_favicon.gif" type="image/gif" >
+      <meta name="Author"    content="Eric Schmalfu&szlig;"/>
+      <link rel="shortcut icon" href="http://192.168.0.138/favicon.ico" >
+      <link rel="icon" href="httP://192.168.0.138/animated_favicon.gif" type="image/gif" >
       <title>Auftragsstatus</title>
       </head>
       <body bgcolor="#00FFFF">
@@ -35,7 +37,8 @@
                   <td><p><input type="submit" name="_submit" value="Status pr&uuml;fen"></p>
                </tr>
             </table>
-         <p><a href="http://192.168.0.138/certsign/cgi-bin/send">zur&uuml;ck zur Startseite</a></p>
+         <p><a href="http://192.168.0.138/cgi-bin/send">zur&uuml;ck zur Startseite</a></p>
+         <div align=right>[% date.format %]</div>
       </form>
    </body>
 </html>                                                  
--- a/htdocs/templates/wait.html	Mon Feb 11 09:37:04 2013 +0100
+++ b/htdocs/templates/wait.html	Fri Feb 15 16:47:36 2013 +0100
@@ -2,8 +2,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
    <head>
-      <link rel="shortcut icon" href="http://192.168.0.138/certsign/favicon.ico" >
-      <link rel="icon" href="httP://192.168.0.138/certsign/animated_favicon.gif" type="image/gif" >
+      <meta name="Author"    content="Eric Schmalfu&szlig;"/>
+      <link rel="shortcut icon" href="http://192.168.0.138/favicon.ico" >
+      <link rel="icon" href="httP://192.168.0.138/animated_favicon.gif" type="image/gif" >
       <title>Anfrage wird bearbeitet</title>
       </head>
       <body bgcolor="#00FFFF">
@@ -11,6 +12,7 @@
          <p>Ihre Anfrage wurde an die zust&auml;ndige CA &uuml;bermittelt.<br />Dieser Vorgang kann einige Zeit in Anspruch nehmen.<br />Bitte notieren Sie sich die folgende Nummer.<br />Mit dieser Nummer k&ouml;nnen Sie sp&auml;ter den Status ihres Auftrages &uuml;berpr&uuml;fen</p>
          <p>[%uid%]</p>
          <p>Danke f&uuml;r ihr entgegengebrachtes Vertrauen.</p>
-         <p><a href="http://192.168.0.138/certsign/cgi-bin/send">zur&uuml;ck zur Startseite</a></p>
+         <p><a href="http://192.168.0.138/cgi-bin/send">zur&uuml;ck zur Startseite</a></p>
+         <div align=right>[% date.format %]</div>
    </body>
 </html>