diff options
| -rw-r--r-- | Xerl.pm | 18 | ||||
| -rw-r--r-- | Xerl/Page/Content.pm | 8 | ||||
| -rw-r--r-- | Xerl/Page/Document.pm | 4 | ||||
| -rw-r--r-- | Xerl/Page/Menu.pm | 6 | ||||
| -rw-r--r-- | Xerl/Page/Rules.pm | 4 | ||||
| -rw-r--r-- | Xerl/Page/Templates.pm | 10 | ||||
| -rw-r--r-- | Xerl/Setup/Configure.pm (renamed from Xerl/Page/Configure.pm) | 10 | ||||
| -rw-r--r-- | Xerl/Setup/Parameter.pm (renamed from Xerl/Page/Parameter.pm) | 8 | ||||
| -rw-r--r-- | Xerl/Setup/Request.pm (renamed from Xerl/Page/Request.pm) | 4 |
9 files changed, 36 insertions, 36 deletions
@@ -15,30 +15,30 @@ use Time::HiRes 'gettimeofday'; use Xerl::Base; use Xerl::Main::Global; -use Xerl::Page::Configure; +use Xerl::Setup::Configure; use Xerl::Page::Document; -use Xerl::Page::Parameter; -use Xerl::Page::Request; +use Xerl::Setup::Parameter; +use Xerl::Setup::Request; use Xerl::Page::Templates; sub run($) { my Xerl $self = $_[0]; my $time = [gettimeofday]; - my Xerl::Page::Request $request = - Xerl::Page::Request->new( request => $ENV{REQUEST_URI} ); + my Xerl::Setup::Request $request = + Xerl::Setup::Request->new( request => $ENV{REQUEST_URI} ); $request->parse(); - my Xerl::Page::Configure $config = - Xerl::Page::Configure->new( config => $self->get_config(), %$request ); + my Xerl::Setup::Configure $config = + Xerl::Setup::Configure->new( config => $self->get_config(), %$request ); $config->parse(); return undef if $config->finish_request_exists(); $config->defaults(); - my Xerl::Page::Parameter $parameter = - Xerl::Page::Parameter->new( config => $config ); + my Xerl::Setup::Parameter $parameter = + Xerl::Setup::Parameter->new( config => $config ); $parameter->parse(); return undef if $config->finish_request_exists(); diff --git a/Xerl/Page/Content.pm b/Xerl/Page/Content.pm index c56db72..8e4a4bf 100644 --- a/Xerl/Page/Content.pm +++ b/Xerl/Page/Content.pm @@ -18,11 +18,11 @@ use Xerl::XML::Reader; use Xerl::XML::Element; use Xerl::Page::Rules; -use Xerl::Page::Configure; +use Xerl::Setup::Configure; sub parse($) { my Xerl::Page::Content $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Setup::Configure $config = $self->get_config(); my Xerl::XML::Reader $xmlcontent = Xerl::XML::Reader->new( path => $config->get_templatepath(), @@ -73,7 +73,7 @@ sub _insertrules($$$) { my Xerl::Page::Content $self = $_[0]; my Xerl::Page::Rules $rules = $_[1]; my Xerl::XML::Element $element = $_[2]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Setup::Configure $config = $self->get_config(); my $nonewlines = 0; # Don't interate through the XML childs if we have a leaf node. @@ -184,7 +184,7 @@ sub _insert_special_vars($$$$) { my Xerl::Page::Content $self = $_[0]; my Xerl::Page::Rules $rules = $_[1]; my Xerl::XML::Element $element = $_[2]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Setup::Configure $config = $self->get_config(); my $rtext = $_[3]; $$rtext =~ s/@\@text\@\@/$_=$element->get_text();chomp;$_/geo; diff --git a/Xerl/Page/Document.pm b/Xerl/Page/Document.pm index 1fba56f..a42c698 100644 --- a/Xerl/Page/Document.pm +++ b/Xerl/Page/Document.pm @@ -14,12 +14,12 @@ use v5.14.0; use Xerl::Base; use Xerl::Main::Global; -use Xerl::Page::Configure; +use Xerl::Setup::Configure; use Xerl::Tools::FileIO; sub parse($) { my Xerl::Page::Document $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Setup::Configure $config = $self->get_config(); return undef unless $config->document_exists(); diff --git a/Xerl/Page/Menu.pm b/Xerl/Page/Menu.pm index 62cb58d..c702c51 100644 --- a/Xerl/Page/Menu.pm +++ b/Xerl/Page/Menu.pm @@ -12,13 +12,13 @@ use warnings; use v5.14.0; -use Xerl::Page::Configure; +use Xerl::Setup::Configure; use Xerl::Tools::FileIO; use Xerl::XML::Element; sub generate($;$) { my Xerl::Page::Menu $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Setup::Configure $config = $self->get_config(); my @site = split /\//, $config->get_site(); my @compare = @site; @@ -46,7 +46,7 @@ sub generate($;$) { sub get_menu($$$$) { my Xerl::Page::Menu $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Setup::Configure $config = $self->get_config(); my ( $content, $siteadd, $compare ) = ( @_[ 1 ... 2 ], lc $_[3] ); my $issubsection = $content =~ m{\.sub/$}; diff --git a/Xerl/Page/Rules.pm b/Xerl/Page/Rules.pm index c15ba3d..cc4b2b0 100644 --- a/Xerl/Page/Rules.pm +++ b/Xerl/Page/Rules.pm @@ -14,12 +14,12 @@ use v5.14.0; use Xerl::Base; use Xerl::XML::Element; -use Xerl::Page::Configure; +use Xerl::Setup::Configure; sub parse($) { my Xerl::Page::Rules $self = $_[0]; my Xerl::XML::Element $element = $_[1]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Setup::Configure $config = $self->get_config(); $element = $element->starttag2( 'rules', $config->get_outputformat() ); return unless defined $element; diff --git a/Xerl/Page/Templates.pm b/Xerl/Page/Templates.pm index 75b3807..1dd9cf7 100644 --- a/Xerl/Page/Templates.pm +++ b/Xerl/Page/Templates.pm @@ -17,7 +17,7 @@ use Digest::MD5; use Xerl::Base; -use Xerl::Page::Configure; +use Xerl::Setup::Configure; use Xerl::Page::Content; use Xerl::Page::Menu; @@ -27,7 +27,7 @@ use constant RECURSIVE => 1; sub parse($) { my Xerl::Page::Templates $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Setup::Configure $config = $self->get_config(); my $site = $config->get_site(); @@ -147,7 +147,7 @@ sub parse($) { sub parsetemplate($$;$) { my Xerl::Page::Templates $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Setup::Configure $config = $self->get_config(); my $deepnesslevel = $_[2] || 0; return $self if $deepnesslevel == 100; @@ -164,7 +164,7 @@ sub parsetemplate($$;$) { sub print($;$) { my Xerl::Page::Templates $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Setup::Configure $config = $self->get_config(); my ( $code, $flag ) = ( '', 0 ); my $time = $_[1]; @@ -210,7 +210,7 @@ sub print($;$) { # Static sub sub PARSELINE($$$;$) { - my Xerl::Page::Configure $config = $_[0]; + my Xerl::Setup::Configure $config = $_[0]; my ( $sep, $line, $foundflag ) = @_[ 1 .. 3 ]; $$line =~ s/$sep(!)?(.+?)$sep/ diff --git a/Xerl/Page/Configure.pm b/Xerl/Setup/Configure.pm index e359c52..c4fbe18 100644 --- a/Xerl/Page/Configure.pm +++ b/Xerl/Setup/Configure.pm @@ -5,7 +5,7 @@ # This is free software, you may use it and distribute it under the same # terms as Perl itself. -package Xerl::Page::Configure; +package Xerl::Setup::Configure; use strict; use warnings; @@ -17,7 +17,7 @@ use Xerl::Tools::FileIO; use Xerl::XML::Element; sub parse($) { - my Xerl::Page::Configure $self = $_[0]; + my Xerl::Setup::Configure $self = $_[0]; my Xerl::Tools::FileIO $file = Xerl::Tools::FileIO->new( 'path' => $self->get_config() ); @@ -40,7 +40,7 @@ sub parse($) { } sub defaults($) { - my Xerl::Page::Configure $self = $_[0]; + my Xerl::Setup::Configure $self = $_[0]; $self->set_proto('https') if exists $ENV{HTTPS}; @@ -124,7 +124,7 @@ sub defaults($) { } sub eval($$) { - my Xerl::Page::Configure $self = $_[0]; + my Xerl::Setup::Configure $self = $_[0]; my $val = $_[1]; $val =~ s/^!(.+)/`$1`/eo; @@ -133,7 +133,7 @@ sub eval($$) { } sub insertxmlvars($$) { - my Xerl::Page::Configure $self = $_[0]; + my Xerl::Setup::Configure $self = $_[0]; my Xerl::XML::Element $element = $_[1]; $element = $element->starttag('variables'); diff --git a/Xerl/Page/Parameter.pm b/Xerl/Setup/Parameter.pm index 9c626b0..45c860d 100644 --- a/Xerl/Page/Parameter.pm +++ b/Xerl/Setup/Parameter.pm @@ -5,7 +5,7 @@ # This is free software, you may use it and distribute it under the same # terms as Perl itself. -package Xerl::Page::Parameter; +package Xerl::Setup::Parameter; use strict; use warnings; @@ -14,12 +14,12 @@ use v5.14.0; use Xerl::Base; use Xerl::Main::Global; -use Xerl::Page::Configure; +use Xerl::Setup::Configure; use Xerl::Tools::FileIO; sub parse($) { - my Xerl::Page::Parameter $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Setup::Parameter $self = $_[0]; + my Xerl::Setup::Configure $config = $self->get_config(); print "Content-Type: text/plain\n\n" if $config->plain_exists(); diff --git a/Xerl/Page/Request.pm b/Xerl/Setup/Request.pm index 77f893d..31c18a3 100644 --- a/Xerl/Page/Request.pm +++ b/Xerl/Setup/Request.pm @@ -5,7 +5,7 @@ # This is free software, you may use it and distribute it under the same # terms as Perl itself. -package Xerl::Page::Request; +package Xerl::Setup::Request; use strict; use warnings; @@ -15,7 +15,7 @@ use v5.14.0; use Xerl::Base; sub parse($) { - my Xerl::Page::Request $self = $_[0]; + my Xerl::Setup::Request $self = $_[0]; my $request = $self->get_request(); # Secure it! |
