after installing apache 1.3.19 (win) i had to patch the BEGIN-Blocks (to get the...

diff --git a/selfforum-cgi/shared/Template.pm b/selfforum-cgi/shared/Template.pm
index 74626d981f7004567f0a7ee6b78750d6241141db..d02949392a017cc1097e7d67c8509c7cfcd3fadd 100644 (file)
--- a/selfforum-cgi/shared/Template.pm
+++ b/selfforum-cgi/shared/Template.pm
@@ -12,6 +12,7 @@ use strict;
 
 package Template;
 
 
 package Template;
 

+use CGI::Carp qw(croak);

 use XML::DOM;
 
 # ====================================================
 use XML::DOM;
 
 # ====================================================


@@ -63,7 +64,7 @@ sub file {
 
 sub insert {
   my $self=shift;
 
 sub insert {
   my $self=shift;

-  die "no template file specified" unless (defined $self -> {file});
+  croak "no template file specified" unless (defined $self -> {file});

 
   my $name=shift;
 
 
   my $name=shift;
 


@@ -81,7 +82,7 @@ sub list {
   my $self=shift;
   my $name=shift;
 
   my $self=shift;
   my $name=shift;
 

-  die "no template file specified" unless (defined $self->{file});
+  croak "no template file specified" unless (defined $self->{file});

 
   my $list = join '', map { ${ $self -> scrap ($name, $_) } } @{ +shift };
 
 
   my $list = join '', map { ${ $self -> scrap ($name, $_) } } @{ +shift };
 


@@ -99,7 +100,7 @@ sub scrap {
   my $self=shift;
   my $name=shift;
 
   my $self=shift;
   my $name=shift;
 

-  die "no template file specified" unless (defined $self->{file});
+  croak "no template file specified" unless (defined $self->{file});

 
   my %params;
 
 
   my %params;
 


@@ -147,15 +148,15 @@ sub parse_file {
     $self -> {metaon}  = $template -> getAttribute ('metaon');
     $self -> {metaoff} = $template -> getAttribute ('metaoff');
 
     $self -> {metaon}  = $template -> getAttribute ('metaon');
     $self -> {metaoff} = $template -> getAttribute ('metaoff');
 

-    die "missing meta defintion(s) in template file '$filename'." unless ($self -> {metaon} and $self -> {metaoff});
+    croak "missing meta defintion(s) in template file '$filename'." unless ($self -> {metaon} and $self -> {metaoff});

 
     $self -> {parsed} = {};
     foreach ($template -> getElementsByTagName ('Scrap', 0)) {
       my $name = $_ -> getAttribute ('id');
 
 
     $self -> {parsed} = {};
     foreach ($template -> getElementsByTagName ('Scrap', 0)) {
       my $name = $_ -> getAttribute ('id');
 

-      die "Element 'Scrap' requires attribute 'id' in template file '$filename'." unless (length ($name));
-      die "double defined id '$name' in template file '$filename'." if (exists ($self -> {parsed} -> {$name}));
-      die "use '/^[_a-zA-Z]\\S*\$/' for 'Scrap'-ids in template file '$filename' (wrong: '$name')." unless ($name =~ /^[_a-zA-Z]\S*$/);
+      croak "Element 'Scrap' requires attribute 'id' in template file '$filename'." unless (length ($name));
+      croak "double defined id '$name' in template file '$filename'." if (exists ($self -> {parsed} -> {$name}));
+      croak "use '/^[_a-zA-Z]\\S*\$/' for 'Scrap'-ids in template file '$filename' (wrong: '$name')." unless ($name =~ /^[_a-zA-Z]\S*$/);

 
       $self -> {parsed} -> {$name} = $_ -> getFirstChild -> getData;
       $self -> {parsed} -> {$name} =~ s/^\s+|\s+$//g;}
 
       $self -> {parsed} -> {$name} = $_ -> getFirstChild -> getData;
       $self -> {parsed} -> {$name} =~ s/^\s+|\s+$//g;}

diff --git a/selfforum-cgi/user/fo_posting.pl b/selfforum-cgi/user/fo_posting.pl
index 91a21a1f5f1124a93e0cf2d9ae77c5168bfece86..9bc7eb03a1ff80a3678b4685a5cd8421f18ec68e 100644 (file)
--- a/selfforum-cgi/user/fo_posting.pl
+++ b/selfforum-cgi/user/fo_posting.pl
@@ -14,9 +14,11 @@ use strict;
 use vars qw($Bin $Shared $Script %subhash $httpurl $flocked);
 
 BEGIN {
 use vars qw($Bin $Shared $Script %subhash $httpurl $flocked);
 
 BEGIN {

-  ($Bin)    = ($0 =~ /^(.*)\/.*$/)? $1 : '.';
+  my $null = $0; $null =~ s/\\/\//g; # for win :-(
+  ($Bin)    = ($null =~ /^(.*)\/.*$/)? $1 : '.';

   $Shared   = "$Bin/../shared";
   $Shared   = "$Bin/../shared";

-  ($Script) = ($0 =~ /^.*\/(.*)$/)? $1 : $0;}
+  ($Script) = ($null =~ /^.*\/(.*)$/)? $1 : $null;
+}

 
 use CGI::Carp qw(fatalsToBrowser);
 
 
 use CGI::Carp qw(fatalsToBrowser);
 

diff --git a/selfforum-cgi/user/fo_view.pl b/selfforum-cgi/user/fo_view.pl
index c6b21cd51e1d3b00d1330922212a0a3f1366e3c7..0aefde4c943097b2e0884875cbdad29d560a15b0 100644 (file)
--- a/selfforum-cgi/user/fo_view.pl
+++ b/selfforum-cgi/user/fo_view.pl
@@ -2,12 +2,14 @@
 
 use strict;
 
 
 use strict;
 

-use vars qw($Bin $Shared $Script $t0);
+use vars qw($Bin $Shared $Script);

 
 BEGIN {
 
 BEGIN {

-  ($Bin)    = ($0 =~ /^(.*)\/.*$/)? $1 : '.';
+  my $null = $0; $null =~ s/\\/\//g; # for win :-(
+  ($Bin)    = ($null =~ /^(.*)\/.*$/)? $1 : '.';

   $Shared   = "$Bin/../shared";
   $Shared   = "$Bin/../shared";

-  ($Script) = ($0 =~ /^.*\/(.*)$/)? $1 : $0;}
+  ($Script) = ($null =~ /^.*\/(.*)$/)? $1 : $null;
+}

 
 use lib "$Shared";
 use CGI::Carp qw(fatalsToBrowser);
 
 use lib "$Shared";
 use CGI::Carp qw(fatalsToBrowser);