From 8e02050582fcc8f58996c38ef260f2ec930914be Mon Sep 17 00:00:00 2001 From: "Chuck Norris (uranus.fritz.box)" Date: Sun, 17 Aug 2014 14:22:23 +0200 Subject: add backslash --- Xerl/Setup/Configure.pm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Xerl/Setup/Configure.pm') diff --git a/Xerl/Setup/Configure.pm b/Xerl/Setup/Configure.pm index 18c49fe..c179ec0 100644 --- a/Xerl/Setup/Configure.pm +++ b/Xerl/Setup/Configure.pm @@ -36,6 +36,12 @@ sub parse($) { $self->setval( $1, $self->eval($2) ) if $_ =~ $re; } + my $hostroot = $self->get_hostroot(); + $self->set_hostroot("$hostroot/") unless $hostroot !~ m#/$#; + + my $cacheroot = $self->get_cacheroot(); + $self->set_cacheroot("$cacheroot/") unless $cacheroot !~ m#/$#; + return $self; } -- cgit v1.2.3 From 98eea5583d0c3b52d0fe3dde9e9870ccba2fb983 Mon Sep 17 00:00:00 2001 From: "Chuck Norris (uranus.fritz.box)" Date: Sun, 17 Aug 2014 14:24:14 +0200 Subject: Knock, knock! Who's there? Sam and Janet. Sam and Janet who? Sam and Janet Evening... --- Xerl/Setup/Configure.pm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'Xerl/Setup/Configure.pm') diff --git a/Xerl/Setup/Configure.pm b/Xerl/Setup/Configure.pm index c179ec0..18c49fe 100644 --- a/Xerl/Setup/Configure.pm +++ b/Xerl/Setup/Configure.pm @@ -36,12 +36,6 @@ sub parse($) { $self->setval( $1, $self->eval($2) ) if $_ =~ $re; } - my $hostroot = $self->get_hostroot(); - $self->set_hostroot("$hostroot/") unless $hostroot !~ m#/$#; - - my $cacheroot = $self->get_cacheroot(); - $self->set_cacheroot("$cacheroot/") unless $cacheroot !~ m#/$#; - return $self; } -- cgit v1.2.3 From b16cca8b3944c071a15ba57820804cfb6da9cbdb Mon Sep 17 00:00:00 2001 From: "Chuck Norris (mars.fritz.box)" Date: Thu, 28 Aug 2014 09:33:11 +0200 Subject: refactor --- Xerl/Setup/Configure.pm | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'Xerl/Setup/Configure.pm') diff --git a/Xerl/Setup/Configure.pm b/Xerl/Setup/Configure.pm index 18c49fe..2d248f2 100644 --- a/Xerl/Setup/Configure.pm +++ b/Xerl/Setup/Configure.pm @@ -1,4 +1,4 @@ -# Xerl (c) 2005-2011, 2013, 2014 Dipl.-Inform. (FH) Paul C. Buetow +# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow # # E-Mail: xerl@dev.buetow.org WWW: http://xerl.buetow.org # @@ -16,11 +16,9 @@ use Xerl::Base; use Xerl::Tools::FileIO; use Xerl::XML::Element; -sub parse($) { - my Xerl::Setup::Configure $self = $_[0]; - - my Xerl::Tools::FileIO $file = - Xerl::Tools::FileIO->new( 'path' => $self->get_config() ); +sub parse { + my $self = $_[0]; + my $file = Xerl::Tools::FileIO->new( 'path' => $self->get_config() ); if ( -1 == $file->fslurp() ) { $self->set_finish_request(1); @@ -39,8 +37,8 @@ sub parse($) { return $self; } -sub defaults($) { - my Xerl::Setup::Configure $self = $_[0]; +sub defaults { + my $self = $_[0]; $self->set_proto('https') if exists $ENV{HTTPS}; @@ -70,8 +68,7 @@ sub defaults($) { my $redirect = $self->get_hostroot() . 'redirect:' . $self->get_host(); if ( -f $redirect ) { - my Xerl::Tools::FileIO $file = - Xerl::Tools::FileIO->new( 'path' => $redirect ); + my $file = Xerl::Tools::FileIO->new( 'path' => $redirect ); $file->fslurp(); my $location = $file->shift(); @@ -82,8 +79,7 @@ sub defaults($) { my $alias = $self->get_hostroot() . 'alias:' . $self->get_host(); if ( -f $alias ) { - my Xerl::Tools::FileIO $file = - Xerl::Tools::FileIO->new( 'path' => $alias ); + my $file = Xerl::Tools::FileIO->new( 'path' => $alias ); $file->fslurp(); $self->set_host( $file->shift() ); @@ -128,8 +124,8 @@ sub defaults($) { return undef; } -sub eval($$) { - my Xerl::Setup::Configure $self = $_[0]; +sub eval { + my $self = $_[0]; my $val = $_[1]; $val =~ s/^!(.+)/`$1`/eo; @@ -137,9 +133,9 @@ sub eval($$) { return $val; } -sub insertxmlvars($$) { - my Xerl::Setup::Configure $self = $_[0]; - my Xerl::XML::Element $element = $_[1]; +sub insertxmlvars { + my $self = $_[0]; + my $element = $_[1]; $element = $element->starttag('variables'); -- cgit v1.2.3 From 11b1896cf142b490323a91b04344a20e7a25c9f4 Mon Sep 17 00:00:00 2001 From: "Chuck Norris (mars.fritz.box)" Date: Thu, 28 Aug 2014 09:36:37 +0200 Subject: un perltig --- Xerl/Setup/Configure.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Xerl/Setup/Configure.pm') diff --git a/Xerl/Setup/Configure.pm b/Xerl/Setup/Configure.pm index 2d248f2..537ac4f 100644 --- a/Xerl/Setup/Configure.pm +++ b/Xerl/Setup/Configure.pm @@ -126,7 +126,7 @@ sub defaults { sub eval { my $self = $_[0]; - my $val = $_[1]; + my $val = $_[1]; $val =~ s/^!(.+)/`$1`/eo; @@ -134,7 +134,7 @@ sub eval { } sub insertxmlvars { - my $self = $_[0]; + my $self = $_[0]; my $element = $_[1]; $element = $element->starttag('variables'); -- cgit v1.2.3 From 6dd2e1db76e167693f62027bab9a04857b693980 Mon Sep 17 00:00:00 2001 From: "Paul Buetow (europa)" Date: Sun, 31 May 2015 16:57:05 +0100 Subject: use https --- Xerl/Setup/Configure.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Xerl/Setup/Configure.pm') diff --git a/Xerl/Setup/Configure.pm b/Xerl/Setup/Configure.pm index 537ac4f..edbf929 100644 --- a/Xerl/Setup/Configure.pm +++ b/Xerl/Setup/Configure.pm @@ -1,6 +1,6 @@ # Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow # -# E-Mail: xerl@dev.buetow.org WWW: http://xerl.buetow.org +# E-Mail: xerl@dev.buetow.org WWW: https://xerl.buetow.org # # This is free software, you may use it and distribute it under the same # terms as Perl itself. -- cgit v1.2.3 From 2103e642583ad50c06c66025ffa10b790e0cfea8 Mon Sep 17 00:00:00 2001 From: "Paul Buetow (europa)" Date: Sun, 31 May 2015 16:58:10 +0100 Subject: Add 2015 --- Xerl/Setup/Configure.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Xerl/Setup/Configure.pm') diff --git a/Xerl/Setup/Configure.pm b/Xerl/Setup/Configure.pm index edbf929..bdd23b9 100644 --- a/Xerl/Setup/Configure.pm +++ b/Xerl/Setup/Configure.pm @@ -1,4 +1,4 @@ -# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow +# Xerl (c) 2005-2011, 2013-2015 by Paul Buetow # # E-Mail: xerl@dev.buetow.org WWW: https://xerl.buetow.org # -- cgit v1.2.3 From a5f6484478072e359834bb1b83a29cf4dcd2539c Mon Sep 17 00:00:00 2001 From: "Paul Buetow (europa)" Date: Fri, 24 Jul 2015 23:53:06 +0100 Subject: introducing host aliasing --- Xerl/Setup/Configure.pm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'Xerl/Setup/Configure.pm') diff --git a/Xerl/Setup/Configure.pm b/Xerl/Setup/Configure.pm index bdd23b9..dfacc1d 100644 --- a/Xerl/Setup/Configure.pm +++ b/Xerl/Setup/Configure.pm @@ -64,8 +64,9 @@ sub defaults { $self->set_hostname( lc $hostname ) unless $self->hostname_exists(); - unless ( -d $self->get_hostroot() . $self->get_host() ) { - my $redirect = $self->get_hostroot() . 'redirect:' . $self->get_host(); + my $host = $self->get_host(); + unless ( -d $self->get_hostroot() . $host ) { + my $redirect = $self->get_hostroot() . 'redirect:' . $host; if ( -f $redirect ) { my $file = Xerl::Tools::FileIO->new( 'path' => $redirect ); @@ -76,13 +77,22 @@ sub defaults { $self->set_finish_request(1); } - my $alias = $self->get_hostroot() . 'alias:' . $self->get_host(); + my $alias = $self->get_hostroot() . 'alias:' . $host; + my $alias_host = ''; + + unless ( -f $alias ) { + my ($hostname, @domain) = split /\./, $host; + my $domain = join '.', @domain; + $alias = $self->get_hostroot() . 'alias:' . $domain; + $alias_host = "$hostname."; + } if ( -f $alias ) { my $file = Xerl::Tools::FileIO->new( 'path' => $alias ); + $alias_host .= $file->shift(); $file->fslurp(); - $self->set_host( $file->shift() ); + $self->set_host( $alias_host ); } } -- cgit v1.2.3 From 7397ede1a0805f3bc0a14f04b6e4b4b38db168e6 Mon Sep 17 00:00:00 2001 From: "Paul Buetow (europa)" Date: Sat, 25 Jul 2015 00:06:02 +0100 Subject: fixing multi aliasing --- Xerl/Setup/Configure.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Xerl/Setup/Configure.pm') diff --git a/Xerl/Setup/Configure.pm b/Xerl/Setup/Configure.pm index dfacc1d..8f19f80 100644 --- a/Xerl/Setup/Configure.pm +++ b/Xerl/Setup/Configure.pm @@ -89,9 +89,9 @@ sub defaults { if ( -f $alias ) { my $file = Xerl::Tools::FileIO->new( 'path' => $alias ); + $file->fslurp(); $alias_host .= $file->shift(); - $file->fslurp(); $self->set_host( $alias_host ); } } -- cgit v1.2.3 From 23efa13ccfec0cb3915f4c9656e11d1254f721e7 Mon Sep 17 00:00:00 2001 From: "paul (uranus)" Date: Sun, 1 Jan 2017 12:59:25 +0000 Subject: add support for redirection even for alias hosts --- Xerl/Setup/Configure.pm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Xerl/Setup/Configure.pm') diff --git a/Xerl/Setup/Configure.pm b/Xerl/Setup/Configure.pm index 8f19f80..406df9c 100644 --- a/Xerl/Setup/Configure.pm +++ b/Xerl/Setup/Configure.pm @@ -66,17 +66,6 @@ sub defaults { my $host = $self->get_host(); unless ( -d $self->get_hostroot() . $host ) { - my $redirect = $self->get_hostroot() . 'redirect:' . $host; - - if ( -f $redirect ) { - my $file = Xerl::Tools::FileIO->new( 'path' => $redirect ); - $file->fslurp(); - - my $location = $file->shift(); - Xerl::Main::Global::REDIRECT($location); - $self->set_finish_request(1); - } - my $alias = $self->get_hostroot() . 'alias:' . $host; my $alias_host = ''; @@ -94,6 +83,17 @@ sub defaults { $self->set_host( $alias_host ); } + + my $redirect = $self->get_hostroot() . 'redirect:' . $self->get_host(); + + if ( -f $redirect ) { + my $file = Xerl::Tools::FileIO->new( 'path' => $redirect ); + $file->fslurp(); + + my $location = $file->shift(); + Xerl::Main::Global::REDIRECT($location); + $self->set_finish_request(1); + } } $self->set_outputformat( $self->get_defaultoutputformat() ) -- cgit v1.2.3