diff options
| author | Paul Buetow (pluto.buetow.org) <paul@buetow.org> | 2013-09-15 11:51:10 +0200 |
|---|---|---|
| committer | Paul Buetow (pluto.buetow.org) <paul@buetow.org> | 2013-09-15 11:51:10 +0200 |
| commit | 6aa12ae5f556ab884b7705379c41a566df86d028 (patch) | |
| tree | 85441b3a046f58970ebe9ad55460c16e4f4d3d01 /Xerl/Page | |
| parent | c183faa4d53b6e4f091d6b38397847e55b5d2251 (diff) | |
temp remove includedirs tag, perltidy indention set to 2, initial XML::LibXML
Diffstat (limited to 'Xerl/Page')
| -rw-r--r-- | Xerl/Page/Configure.pm | 188 | ||||
| -rw-r--r-- | Xerl/Page/Content.pm | 280 | ||||
| -rw-r--r-- | Xerl/Page/Document.pm | 50 | ||||
| -rw-r--r-- | Xerl/Page/Menu.pm | 136 | ||||
| -rw-r--r-- | Xerl/Page/Parameter.pm | 44 | ||||
| -rw-r--r-- | Xerl/Page/Request.pm | 40 | ||||
| -rw-r--r-- | Xerl/Page/Rules.pm | 86 | ||||
| -rw-r--r-- | Xerl/Page/Templates.pm | 282 |
8 files changed, 551 insertions, 555 deletions
diff --git a/Xerl/Page/Configure.pm b/Xerl/Page/Configure.pm index dfe4ec4..1a9ecde 100644 --- a/Xerl/Page/Configure.pm +++ b/Xerl/Page/Configure.pm @@ -37,134 +37,134 @@ use Xerl::Tools::FileIO; use Xerl::XML::Element; sub parse($) { - my Xerl::Page::Configure $self = $_[0]; + my Xerl::Page::Configure $self = $_[0]; - my Xerl::Tools::FileIO $file = - Xerl::Tools::FileIO->new( 'path' => $self->get_config() ); + my Xerl::Tools::FileIO $file = + Xerl::Tools::FileIO->new( 'path' => $self->get_config() ); - if ( -1 == $file->fslurp() ) { - $self->set_finish_request(1); - return undef; - } + if ( -1 == $file->fslurp() ) { + $self->set_finish_request(1); + return undef; + } - my $re = qr/^(.+?) *=(.+?) *\n?$/; + my $re = qr/^(.+?) *=(.+?) *\n?$/; - for ( @{ $file->get_array() } ) { - next if /^ *#/; + for ( @{ $file->get_array() } ) { + next if /^ *#/; - $self->setval( $1, $self->eval($2) ) if $_ =~ $re; - } + $self->setval( $1, $self->eval($2) ) if $_ =~ $re; + } - return $self; + return $self; } sub defaults($) { - my Xerl::Page::Configure $self = $_[0]; - - $self->set_proto('https') if exists $ENV{HTTPS}; - - $self->set_site( $self->get_defaultcontent() ) - unless $self->site_exists(); - - $self->set_nsite( $self->get_site() =~ /^(?:\d*\.)?(.*)/ ); - - $self->set_template( $self->get_defaulttemplate() ) - unless $self->template_exists(); - - $self->set_style( $self->get_defaultstyle() ) - unless $self->style_exists(); - - $self->set_proto( $self->get_defaultproto() ) - unless $self->proto_exists(); - - $self->set_host( lc $ENV{HTTP_HOST} ) - unless $self->host_exists(); - - unless ( -d $self->get_hostroot() . $self->get_host() ) { - my $redirect = $self->get_hostroot() . 'redirect:' . $self->get_host(); - if ( -f $redirect ) { - my Xerl::Tools::FileIO $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:' . $self->get_host(); - if ( -f $alias ) { - my Xerl::Tools::FileIO $file = - Xerl::Tools::FileIO->new( 'path' => $alias ); - $file->fslurp(); - $self->set_host( $file->shift() ); - } - } + my Xerl::Page::Configure $self = $_[0]; + + $self->set_proto('https') if exists $ENV{HTTPS}; + + $self->set_site( $self->get_defaultcontent() ) + unless $self->site_exists(); + + $self->set_nsite( $self->get_site() =~ /^(?:\d*\.)?(.*)/ ); + + $self->set_template( $self->get_defaulttemplate() ) + unless $self->template_exists(); - $self->set_outputformat( $self->get_defaultoutputformat() ) - unless $self->outputformat_exists(); + $self->set_style( $self->get_defaultstyle() ) + unless $self->style_exists(); - if ( $self->format_exists() ) { - $self->set_outputformat( $self->get_format() ); - $self->set_template( $self->get_format() ); - $self->set_site( $self->get_format() ); - $self->set_nocache(1) - if $self->get_format() =~ /\.feed$/; + $self->set_proto( $self->get_defaultproto() ) + unless $self->proto_exists(); + + $self->set_host( lc $ENV{HTTP_HOST} ) + unless $self->host_exists(); + + unless ( -d $self->get_hostroot() . $self->get_host() ) { + my $redirect = $self->get_hostroot() . 'redirect:' . $self->get_host(); + if ( -f $redirect ) { + my Xerl::Tools::FileIO $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:' . $self->get_host(); + if ( -f $alias ) { + my Xerl::Tools::FileIO $file = + Xerl::Tools::FileIO->new( 'path' => $alias ); + $file->fslurp(); + $self->set_host( $file->shift() ); + } + } - $self->set_host( $self->getval( $self->get_host() ) ) - if $self->exists( $self->get_host() ); + $self->set_outputformat( $self->get_defaultoutputformat() ) + unless $self->outputformat_exists(); - $self->set_host( $self->getval( $self->get_host() ) ) - if $self->exists( $self->get_host() ); + if ( $self->format_exists() ) { + $self->set_outputformat( $self->get_format() ); + $self->set_template( $self->get_format() ); + $self->set_site( $self->get_format() ); + $self->set_nocache(1) + if $self->get_format() =~ /\.feed$/; + } - my $request_subdir = $self->get_request_subdir(); - $self->set_hostpath( - $self->get_hostroot() . $self->get_host() . $request_subdir . "/" ); + $self->set_host( $self->getval( $self->get_host() ) ) + if $self->exists( $self->get_host() ); - $self->set_defaulthostpath( - $self->get_hostroot() . $self->get_defaulthost() . '/' ); + $self->set_host( $self->getval( $self->get_host() ) ) + if $self->exists( $self->get_host() ); - $self->set_cachepath( - $self->get_cacheroot() . $self->get_host() . $request_subdir . '/' ); + my $request_subdir = $self->get_request_subdir(); + $self->set_hostpath( + $self->get_hostroot() . $self->get_host() . $request_subdir . "/" ); - $self->set_htdocspath( $self->get_hostpath() . 'htdocs/' ); + $self->set_defaulthostpath( + $self->get_hostroot() . $self->get_defaulthost() . '/' ); - $self->set_templatespath( $self->get_hostpath() . 'templates/' ); + $self->set_cachepath( + $self->get_cacheroot() . $self->get_host() . $request_subdir . '/' ); - $self->set_contentpath( $self->get_hostpath() . 'content/' ); + $self->set_htdocspath( $self->get_hostpath() . 'htdocs/' ); - # $self->set_ipv6( $ENV{REMOTE_ADDR} =~ /:/ ? 1 : 0 ); + $self->set_templatespath( $self->get_hostpath() . 'templates/' ); - return undef; + $self->set_contentpath( $self->get_hostpath() . 'content/' ); + + # $self->set_ipv6( $ENV{REMOTE_ADDR} =~ /:/ ? 1 : 0 ); + + return undef; } sub eval($$) { - my Xerl::Page::Configure $self = $_[0]; - my $val = $_[1]; + my Xerl::Page::Configure $self = $_[0]; + my $val = $_[1]; - $val =~ s/^!(.+)/`$1`/eo; - return $val; + $val =~ s/^!(.+)/`$1`/eo; + return $val; } sub insertxmlvars($$) { - my Xerl::Page::Configure $self = $_[0]; - my Xerl::XML::Element $element = $_[1]; + my Xerl::Page::Configure $self = $_[0]; + my Xerl::XML::Element $element = $_[1]; - $element = $element->starttag('variables'); + $element = $element->starttag('variables'); - return $self - unless defined $element - or $element->get_array() eq 'ARRAY'; + return $self + unless defined $element + or $element->get_array() eq 'ARRAY'; - my $text; - for ( @{ $element->get_array() } ) { - $text = $_->get_text(); - chomp $text; + my $text; + for ( @{ $element->get_array() } ) { + $text = $_->get_text(); + chomp $text; - $text =~ s/%%(.*?)%%/$self->getval($1)/eg; - $self->setval( $_->get_name(), $text ); - } + $text =~ s/%%(.*?)%%/$self->getval($1)/eg; + $self->setval( $_->get_name(), $text ); + } - return $self; + return $self; } 1; diff --git a/Xerl/Page/Content.pm b/Xerl/Page/Content.pm index da70139..bd3e8ee 100644 --- a/Xerl/Page/Content.pm +++ b/Xerl/Page/Content.pm @@ -40,190 +40,188 @@ use Xerl::Page::Rules; use Xerl::Page::Configure; sub parse($) { - my Xerl::Page::Content $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Page::Content $self = $_[0]; + my Xerl::Page::Configure $config = $self->get_config(); - my Xerl::XML::Reader $xmlcontent = Xerl::XML::Reader->new( - path => $config->get_templatepath(), - config => $config - ); + my Xerl::XML::Reader $xmlcontent = Xerl::XML::Reader->new( + path => $config->get_templatepath(), + config => $config + ); - if ( -1 == $xmlcontent->open() ) { - $config->set_finish_request(1); - return undef; - } + if ( -1 == $xmlcontent->open() ) { + $config->set_finish_request(1); + return undef; + } - $xmlcontent->parse(); + $xmlcontent->parse(); - my Xerl::Page::Rules $rules = Xerl::Page::Rules->new( config => $config ); - $rules->parse( $config->get_xmlconfigrootobj() ) - unless $config->exists('noparse'); + my Xerl::Page::Rules $rules = Xerl::Page::Rules->new( config => $config ); + $rules->parse( $config->get_xmlconfigrootobj() ) + unless $config->exists('noparse'); - $config->insertxmlvars( $config->get_xmlconfigrootobj() ); - $self->insertrules( $rules, $xmlcontent->get_root() ); + $config->insertxmlvars( $config->get_xmlconfigrootobj() ); + $self->insertrules( $rules, $xmlcontent->get_root() ); - return undef; + return undef; } sub insertrules($$$$) { - my Xerl::Page::Content $self = $_[0]; - my Xerl::Page::Rules $rules = $_[1]; - my Xerl::XML::Element $element = $_[2]; + my Xerl::Page::Content $self = $_[0]; + my Xerl::Page::Rules $rules = $_[1]; + my Xerl::XML::Element $element = $_[2]; - # Start inserting rules at <content> - $element = $element->starttag('content'); + # Start inserting rules at <content> + $element = $element->starttag('content'); - # If there is no <content>-tag, dont use a rule! - return unless defined $element; + # If there is no <content>-tag, dont use a rule! + return unless defined $element; - my @content; - my $params = $element->get_params(); + my @content; + my $params = $element->get_params(); - unshift @content, "Content-Type: $params->{type}\n\n" - if ref $params eq 'HASH' and exists $params->{type}; + unshift @content, "Content-Type: $params->{type}\n\n" + if ref $params eq 'HASH' and exists $params->{type}; - push @content, $self->_insertrules( $rules, $element ); - $self->set_content( \@content ); + push @content, $self->_insertrules( $rules, $element ); + $self->set_content( \@content ); - return undef; + return undef; } 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 $nonewlines = 0; - - #$element->print(); - # - # Don't interate through the XML childs if we have a leaf node. - return () unless ref $element->get_array() eq 'ARRAY'; - my ( $name, $rule, @content, $text, $params ); - - for my $succ ( @{ $element->get_array() } ) { - $name = $succ->get_name(); - $text = $succ->get_text(); - $params = $succ->get_params(); - - # Remove leading and ending whitespaces, also ending newlines. - $text =~ s/^ *(.*)( |\n)*$/$1/g; - unless ( ref( $rule = $rules->getval($name) ) eq 'ARRAY' ) { - if ( lc $name eq 'noop' ) { - if ( ref $succ->get_array() eq 'ARRAY' ) { - push @content, $self->_insertrules( $rules, $succ ); - - } - else { - push @content, "$text\n"; - } - - } - elsif ( lc $name eq 'tag' ) { - push @content, "<$text>\n"; - - } - elsif ( lc $name eq 'perl' ) { + 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 $nonewlines = 0; + + #$element->print(); + # + # Don't interate through the XML childs if we have a leaf node. + return () unless ref $element->get_array() eq 'ARRAY'; + my ( $name, $rule, @content, $text, $params ); + + for my $succ ( @{ $element->get_array() } ) { + $name = $succ->get_name(); + $text = $succ->get_text(); + $params = $succ->get_params(); + + # Remove leading and ending whitespaces, also ending newlines. + $text =~ s/^ *(.*)( |\n)*$/$1/g; + unless ( ref( $rule = $rules->getval($name) ) eq 'ARRAY' ) { + if ( lc $name eq 'noop' ) { + if ( ref $succ->get_array() eq 'ARRAY' ) { + push @content, $self->_insertrules( $rules, $succ ); + + } + else { + push @content, "$text\n"; + } + + } + elsif ( lc $name eq 'tag' ) { + push @content, "<$text>\n"; + + } + elsif ( lc $name eq 'perl' ) { # Perl content will be interpreted by Xerl::Page::Templates::print later - push @content, '<perl>', $text, '</perl>'; - - } - elsif ( lc $name eq 'navigation' ) { - my $menus = $config->get_menuobj()->get_array(); - - if ( ref $menus eq 'ARRAY' ) { - push @content, $self->_insertrules( $rules, $_ ) - for @$menus; - } - - } - else { - - # No rule available, use the tag unmodified! - $name =~ s/^=//o; # Remove the leading = - if ( $succ->get_single() ) { - push @content, - "<$name" . ( $succ->params_str() || '' ) . " />\n" - - } - else { - push @content, - "<$name" . ( $succ->params_str() || '' ) . '>', - $self->_insertrules( $rules, $succ ), $text, "</$name>\n"; - } - } + push @content, '<perl>', $text, '</perl>'; + + } + elsif ( lc $name eq 'navigation' ) { + my $menus = $config->get_menuobj()->get_array(); + if ( ref $menus eq 'ARRAY' ) { + push @content, $self->_insertrules( $rules, $_ ) for @$menus; } - else { - # Get a local copy of lrule, because orule may be modified. - # And then insert special vars if required: - # @@text@@ => Text content of the current tag. + } + else { - my $ruleparams = $rule->[2]; - $nonewlines = 1 if exists $ruleparams->{nonewlines}; + # No rule available, use the tag unmodified! + $name =~ s/^=//o; # Remove the leading = + if ( $succ->get_single() ) { + push @content, "<$name" . ( $succ->params_str() || '' ) . " />\n" - my ( $orule, $crule ) = ( $rule->[0], $rule->[1] ); + } + else { + push @content, + "<$name" . ( $succ->params_str() || '' ) . '>', + $self->_insertrules( $rules, $succ ), $text, "</$name>\n"; + } + } - $self->_insert_special_vars( $rules, $succ, \$orule ); - $self->_insert_special_vars( $rules, $succ, \$crule ); - chomp $orule; + } + else { - # Parse for known tag params. - if ( ref $params eq 'HASH' ) { - Xerl::Page::Templates::PARSELINE( $config, '%%', \$text ); + # Get a local copy of lrule, because orule may be modified. + # And then insert special vars if required: + # @@text@@ => Text content of the current tag. - # <tag basename='yes'>path/to/file.bla</tag> => <tag>file.bla</tag> - $text =~ s#.*/(.*)$#$1# if lc $params->{basename} eq 'yes'; + my $ruleparams = $rule->[2]; + $nonewlines = 1 if exists $ruleparams->{nonewlines}; - # <tag cut='?'>foo.bar.tld?options</tag> => <tag>?options</tag> - if ( exists $params->{cut} ) { - my $cut = quotemeta $params->{cut}; - $text =~ s/.*$cut(.*)$/$1/o; - } + my ( $orule, $crule ) = ( $rule->[0], $rule->[1] ); - $text .= $params->{addback} - if exists $params->{addback}; - $text = $params->{addfront} . $text - if exists $params->{addfront}; - } + $self->_insert_special_vars( $rules, $succ, \$orule ); + $self->_insert_special_vars( $rules, $succ, \$crule ); + chomp $orule; - my $oadd = - exists $ruleparams->{addfront} - ? '<' . $ruleparams->{addfront} - : ''; + # Parse for known tag params. + if ( ref $params eq 'HASH' ) { + Xerl::Page::Templates::PARSELINE( $config, '%%', \$text ); - my $cadd = - exists $ruleparams->{addback} ? $ruleparams->{addback} . '>' : ''; + # <tag basename='yes'>path/to/file.bla</tag> => <tag>file.bla</tag> + $text =~ s#.*/(.*)$#$1# if lc $params->{basename} eq 'yes'; - push @content, $orule, $oadd, $self->_insertrules( $rules, $succ ), - $text, $cadd, $crule; + # <tag cut='?'>foo.bar.tld?options</tag> => <tag>?options</tag> + if ( exists $params->{cut} ) { + my $cut = quotemeta $params->{cut}; + $text =~ s/.*$cut(.*)$/$1/o; } + + $text .= $params->{addback} + if exists $params->{addback}; + $text = $params->{addfront} . $text + if exists $params->{addfront}; + } + + my $oadd = + exists $ruleparams->{addfront} + ? '<' . $ruleparams->{addfront} + : ''; + + my $cadd = + exists $ruleparams->{addback} ? $ruleparams->{addback} . '>' : ''; + + push @content, $orule, $oadd, $self->_insertrules( $rules, $succ ), + $text, $cadd, $crule; } + } - return $nonewlines ? map { s/\n/ /go; $_ } @content : @content; + return $nonewlines ? map { s/\n/ /go; $_ } @content : @content; } 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 $rtext = $_[3]; + 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 $rtext = $_[3]; - $$rtext =~ s/@\@text\@\@/$_=$element->get_text();chomp;$_/geo; - $$rtext =~ s/@\@ln\@\@//go; + $$rtext =~ s/@\@text\@\@/$_=$element->get_text();chomp;$_/geo; + $$rtext =~ s/@\@ln\@\@//go; - #$$rtext =~ s/@\@link\@\@/$element->get_params()->{link}.'$$params$$'/geo; + #$$rtext =~ s/@\@link\@\@/$element->get_params()->{link}.'$$params$$'/geo; - if ( $$rtext =~ /@\@(.*?)\@\@/ ) { - my $params = $element->get_params(); - return unless ref $params eq 'HASH'; - $$rtext =~ s/@\@(.*?)\@\@/$params->{$1}||''/geo; - } + if ( $$rtext =~ /@\@(.*?)\@\@/ ) { + my $params = $element->get_params(); + return unless ref $params eq 'HASH'; + $$rtext =~ s/@\@(.*?)\@\@/$params->{$1}||''/geo; + } - return undef; + return undef; } 1; diff --git a/Xerl/Page/Document.pm b/Xerl/Page/Document.pm index bb58016..afc4da3 100644 --- a/Xerl/Page/Document.pm +++ b/Xerl/Page/Document.pm @@ -38,38 +38,38 @@ use Xerl::Page::Configure; use Xerl::Tools::FileIO; sub parse($) { - my Xerl::Page::Document $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Page::Document $self = $_[0]; + my Xerl::Page::Configure $config = $self->get_config(); - return undef unless $config->document_exists(); + return undef unless $config->document_exists(); - my $document = $config->get_document(); - my ($filename) = $document =~ m#([^/]+)$#; - my ($postfix) = $document =~ /\.(.+)$/; - my $path; + my $document = $config->get_document(); + my ($filename) = $document =~ m#([^/]+)$#; + my ($postfix) = $document =~ /\.(.+)$/; + my $path; - print 'Content-Type: '; - print $config->getval( 'ctype.' . lc($postfix) ), "\n"; - print "Content-Disposition: attachment; filename=\"$filename\"\n\n"; + print 'Content-Type: '; + print $config->getval( 'ctype.' . lc($postfix) ), "\n"; + print "Content-Disposition: attachment; filename=\"$filename\"\n\n"; - $path = $config->get_hostpath() . "/htdocs/$document"; - unless ( -f $path ) { - $path = - $config->get_hostroot() - . $config->get_defaulthost() - . "/htdocs/$document"; - } + $path = $config->get_hostpath() . "/htdocs/$document"; + unless ( -f $path ) { + $path = + $config->get_hostroot() + . $config->get_defaulthost() + . "/htdocs/$document"; + } - my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new( path => $path ); + my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new( path => $path ); - if ( -1 == $io->fslurp() ) { - $config->set_finish_request(1); - } - else { - $io->print(); - } + if ( -1 == $io->fslurp() ) { + $config->set_finish_request(1); + } + else { + $io->print(); + } - return undef; + return undef; } 1; diff --git a/Xerl/Page/Menu.pm b/Xerl/Page/Menu.pm index 0ba9568..3bd158b 100644 --- a/Xerl/Page/Menu.pm +++ b/Xerl/Page/Menu.pm @@ -37,95 +37,95 @@ 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::Page::Menu $self = $_[0]; + my Xerl::Page::Configure $config = $self->get_config(); - my @site = split /\//, $config->get_site(); - my @compare = @site; - my $site = pop @site; + my @site = split /\//, $config->get_site(); + my @compare = @site; + my $site = pop @site; - my ( $content, $siteadd ) = ( 'content/', '' ); + my ( $content, $siteadd ) = ( 'content/', '' ); - my Xerl::XML::Element $menuelem = - $self->get_menu( $content, $siteadd, shift @compare ); + my Xerl::XML::Element $menuelem = + $self->get_menu( $content, $siteadd, shift @compare ); + $self->push_array($menuelem) + if $menuelem->first_array()->array_length() > 1; + + for my $s (@site) { + $content .= "$s.sub/"; + $siteadd .= "$s/"; + $menuelem = $self->get_menu( $content, $siteadd, shift @compare ); $self->push_array($menuelem) if $menuelem->first_array()->array_length() > 1; + } - for my $s (@site) { - $content .= "$s.sub/"; - $siteadd .= "$s/"; - $menuelem = $self->get_menu( $content, $siteadd, shift @compare ); - $self->push_array($menuelem) - if $menuelem->first_array()->array_length() > 1; - } - - return undef; + return undef; } sub get_menu($$$$) { - my Xerl::Page::Menu $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); - my ( $content, $siteadd, $compare ) = ( @_[ 1 ... 2 ], lc $_[3] ); - my $issubsection = $content =~ m{\.sub/$}; - my $pattern = qr/\.(?:xml)|(?:sub)$/; - - my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new( - path => $config->get_hostpath() . $content, - basename => 1, - ); - - unless ( $io->exists() ) { - Xerl::Main::Global::REDIRECT( $config->get_404() ); - $config->set_finish_request(1); + my Xerl::Page::Menu $self = $_[0]; + my Xerl::Page::Configure $config = $self->get_config(); + my ( $content, $siteadd, $compare ) = ( @_[ 1 ... 2 ], lc $_[3] ); + my $issubsection = $content =~ m{\.sub/$}; + my $pattern = qr/\.(?:xml)|(?:sub)$/; + + my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new( + path => $config->get_hostpath() . $content, + basename => 1, + ); + + unless ( $io->exists() ) { + Xerl::Main::Global::REDIRECT( $config->get_404() ); + $config->set_finish_request(1); + } + + $io->dslurp(); + my $dir = $io->get_array(); + + my ( @prec, @dir ); + map { + if (/^\d+\..+\./) { push @prec, $_ } + else { push @dir, $_ } } + grep { + $_ !~ /^home\.xml$/i + && $_ !~ /\.feed\.xml$/i + && $_ !~ /\.hide\.xml$/i + } @$dir; - $io->dslurp(); - my $dir = $io->get_array(); + my Xerl::XML::Element $root = Xerl::XML::Element->new(); + my Xerl::XML::Element $menu = Xerl::XML::Element->new(); - my ( @prec, @dir ); - map { - if (/^\d+\..+\./) { push @prec, $_ } - else { push @dir, $_ } - } - grep { - $_ !~ /^home\.xml$/i - && $_ !~ /\.feed\.xml$/i - && $_ !~ /\.hide\.xml$/i - } @$dir; + $menu->set_name('menu'); - my Xerl::XML::Element $root = Xerl::XML::Element->new(); - my Xerl::XML::Element $menu = Xerl::XML::Element->new(); + for ( $issubsection ? ( @dir, @prec ) : ( 'home.xml', @dir, @prec ) ) { + my ($site) = /(.*)$pattern/o; - $menu->set_name('menu'); + $site =~ s#\.$#/home#o; + $site =~ s/^\d+\.//; - for ( $issubsection ? ( @dir, @prec ) : ( 'home.xml', @dir, @prec ) ) { - my ($site) = /(.*)$pattern/o; + my $linkname = $site; + $linkname =~ s/(?:\d+\.)?(.)/\U$1/o; + $compare .= '/' if $linkname =~ s#(.*/)[^/]+$#$1#; - $site =~ s#\.$#/home#o; - $site =~ s/^\d+\.//; - - my $linkname = $site; - $linkname =~ s/(?:\d+\.)?(.)/\U$1/o; - $compare .= '/' if $linkname =~ s#(.*/)[^/]+$#$1#; - - my Xerl::XML::Element $item = Xerl::XML::Element->new( - params => { link => "?site=$siteadd$site" }, - text => $linkname - ); + my Xerl::XML::Element $item = Xerl::XML::Element->new( + params => { link => "?site=$siteadd$site" }, + text => $linkname + ); - $compare =~ s/^(\d+\.)//; - $item->set_name( - lc $linkname eq lc $compare ? 'activemenuitem' : 'menuitem' ); + $compare =~ s/^(\d+\.)//; + $item->set_name( + lc $linkname eq lc $compare ? 'activemenuitem' : 'menuitem' ); - $item->set_prev($menu); - $menu->push_array($item); - } + $item->set_prev($menu); + $menu->push_array($item); + } - $root->push_array($menu); - $menu->set_prev($root); + $root->push_array($menu); + $menu->set_prev($root); - return $root; + return $root; } 1; diff --git a/Xerl/Page/Parameter.pm b/Xerl/Page/Parameter.pm index 3f580a7..ba0a6cd 100644 --- a/Xerl/Page/Parameter.pm +++ b/Xerl/Page/Parameter.pm @@ -38,33 +38,33 @@ use Xerl::Page::Configure; use Xerl::Tools::FileIO; sub parse($) { - my Xerl::Page::Parameter $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Page::Parameter $self = $_[0]; + my Xerl::Page::Configure $config = $self->get_config(); - print "Content-Type: text/plain\n\n" - if $config->plain_exists(); + print "Content-Type: text/plain\n\n" + if $config->plain_exists(); - if ( $config->href_exists() ) { - print "Location: ", $config->get_href(), "\n\n"; - $config->set_finish_request(1); - } - elsif ( $config->env_exists() ) { - print "Content-Type: text/plain\n\n"; - print "$_=", $ENV{$_}, "\n" for keys %ENV; - $config->set_finish_request(1); - } + if ( $config->href_exists() ) { + print "Location: ", $config->get_href(), "\n\n"; + $config->set_finish_request(1); + } + elsif ( $config->env_exists() ) { + print "Content-Type: text/plain\n\n"; + print "$_=", $ENV{$_}, "\n" for keys %ENV; + $config->set_finish_request(1); + } - if ( $config->devel_exists() ) { - $config->set_nocache(1); - } + if ( $config->devel_exists() ) { + $config->set_nocache(1); + } - if ( $config->conf_exists() ) { - print "Content-Type: text/plain\n\n"; - print "$_=", $config->{$_}, "\n" for keys %$config; - $config->set_finish_request(1); - } + if ( $config->conf_exists() ) { + print "Content-Type: text/plain\n\n"; + print "$_=", $config->{$_}, "\n" for keys %$config; + $config->set_finish_request(1); + } - return $self; + return $self; } 1; diff --git a/Xerl/Page/Request.pm b/Xerl/Page/Request.pm index 94c6037..11106ec 100644 --- a/Xerl/Page/Request.pm +++ b/Xerl/Page/Request.pm @@ -35,35 +35,35 @@ use warnings; use Xerl::Base; sub parse($) { - my Xerl::Page::Request $self = $_[0]; - my $request = $self->get_request(); + my Xerl::Page::Request $self = $_[0]; + my $request = $self->get_request(); - # Secure it! - $request =~ s#/\.\.##g; + # Secure it! + $request =~ s#/\.\.##g; - # Remove last / - $request =~ s#/$##; + # Remove last / + $request =~ s#/$##; - my $request_subdir = $request; - $request_subdir =~ s#/\?.*##; - $self->set_request_subdir($request_subdir); + my $request_subdir = $request; + $request_subdir =~ s#/\?.*##; + $self->set_request_subdir($request_subdir); - # List context returns $1 - ($_) = $request =~ /\?(.+)/; + # List context returns $1 + ($_) = $request =~ /\?(.+)/; - return $self unless defined; + return $self unless defined; - my $params = ''; - for ( split /&/ ) { + my $params = ''; + for ( split /&/ ) { - # List context uses ($1,$2) as method args - $self->setval(/(.+?)=(.+)/); - $params .= "&$1=$2" if $1 ne 'site'; - } + # List context uses ($1,$2) as method args + $self->setval(/(.+?)=(.+)/); + $params .= "&$1=$2" if $1 ne 'site'; + } - $self->set_params($params); + $self->set_params($params); - return undef; + return undef; } 1; diff --git a/Xerl/Page/Rules.pm b/Xerl/Page/Rules.pm index 4a08d19..3895f4e 100644 --- a/Xerl/Page/Rules.pm +++ b/Xerl/Page/Rules.pm @@ -37,59 +37,59 @@ use Xerl::XML::Element; use Xerl::Page::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::Page::Rules $self = $_[0]; + my Xerl::XML::Element $element = $_[1]; + my Xerl::Page::Configure $config = $self->get_config(); - $element = $element->starttag2( 'rules', $config->get_outputformat() ); - return unless defined $element; + $element = $element->starttag2( 'rules', $config->get_outputformat() ); + return unless defined $element; - # Open and close rules: - my ( $orule, $crule ); + # Open and close rules: + my ( $orule, $crule ); - # For all available rules in config.xml - for my $rule ( @{ $element->get_array() } ) { - my $params = $rule->get_params(); + # For all available rules in config.xml + for my $rule ( @{ $element->get_array() } ) { + my $params = $rule->get_params(); - $orule = $rule->get_text(); - chomp $orule; + $orule = $rule->get_text(); + chomp $orule; - $orule =~ s/\[/</go; - $orule =~ s/\]/>/go; + $orule =~ s/\[/</go; + $orule =~ s/\]/>/go; - unless ( - ref $params eq 'HASH' - && ( lc $params->{end} eq 'yes' - || lc $params->{start} eq 'yes' ) - ) - { - $crule = join '><', reverse split /> *</, $orule; - $crule = "<$crule>"; - $crule =~ s/<</</go; - $crule =~ s/>>/>/go; - $crule =~ s/</<\//go; - $crule =~ s/\n//go; - $crule =~ s/ .+?>/>/go; - $crule .= "\n"; + unless ( + ref $params eq 'HASH' + && ( lc $params->{end} eq 'yes' + || lc $params->{start} eq 'yes' ) + ) + { + $crule = join '><', reverse split /> *</, $orule; + $crule = "<$crule>"; + $crule =~ s/<</</go; + $crule =~ s/>>/>/go; + $crule =~ s/</<\//go; + $crule =~ s/\n//go; + $crule =~ s/ .+?>/>/go; + $crule .= "\n"; - } - else { - if ( lc $$params{start} eq 'yes' ) { - $crule = ''; - - } - else { - $crule = $orule; - $orule = ''; - } - $crule .= "\n"; - } + } + else { + if ( lc $$params{start} eq 'yes' ) { + $crule = ''; - $params = {} unless ref $params eq 'HASH'; - $self->setval( $rule->get_name(), [ "$orule\n", $crule, $params ] ); + } + else { + $crule = $orule; + $orule = ''; + } + $crule .= "\n"; } - return undef; + $params = {} unless ref $params eq 'HASH'; + $self->setval( $rule->get_name(), [ "$orule\n", $crule, $params ] ); + } + + return undef; } 1; diff --git a/Xerl/Page/Templates.pm b/Xerl/Page/Templates.pm index efe7321..3b7d13f 100644 --- a/Xerl/Page/Templates.pm +++ b/Xerl/Page/Templates.pm @@ -44,200 +44,198 @@ use Xerl::Tools::FileIO; use constant RECURSIVE => 1; sub parse($) { - my Xerl::Page::Templates $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); + my Xerl::Page::Templates $self = $_[0]; + my Xerl::Page::Configure $config = $self->get_config(); - my $site = $config->get_site(); + my $site = $config->get_site(); - my $subpath = $site; - if ( $site =~ s#^.*/(.*)$#$1#o ) { - $subpath =~ s#/[^/]+$#/#; - $subpath =~ s#/#.sub/#go; + my $subpath = $site; + if ( $site =~ s#^.*/(.*)$#$1#o ) { + $subpath =~ s#/[^/]+$#/#; + $subpath =~ s#/#.sub/#go; - } - else { - $subpath = ''; - } + } + else { + $subpath = ''; + } - my $cachefile = - $config->get_template() . ';' - . $config->get_outputformat() . ';' - . $site - . ( $config->noparse_exists() ? '.noparse' : '' ) - . '.cache'; + my $cachefile = + $config->get_template() . ';' + . $config->get_outputformat() . ';' + . $site + . ( $config->noparse_exists() ? '.noparse' : '' ) + . '.cache'; - my $cachepath = $config->get_cachepath() . $subpath; + my $cachepath = $config->get_cachepath() . $subpath; - if ( -f $cachepath . $cachefile - && ( $config->usecache_exists() or not $config->nocache_exists() ) ) - { + if ( -f $cachepath . $cachefile + && ( $config->usecache_exists() or not $config->nocache_exists() ) ) + { - my Xerl::Tools::FileIO $io = - Xerl::Tools::FileIO->new( path => $cachepath . $cachefile ); + my Xerl::Tools::FileIO $io = + Xerl::Tools::FileIO->new( path => $cachepath . $cachefile ); - if ( -1 == $io->fslurp() ) { - $config->set_finish_request(1); - return undef; - } + if ( -1 == $io->fslurp() ) { + $config->set_finish_request(1); + return undef; + } - $self->set_array( $io->get_array() ); + $self->set_array( $io->get_array() ); - } - else { - my $xmlconfigpath = $config->get_hostpath() . 'config.xml'; + } + else { + my $xmlconfigpath = $config->get_hostpath() . 'config.xml'; - $xmlconfigpath = $config->get_defaulthostpath() . 'config.xml' - unless -f $xmlconfigpath; + $xmlconfigpath = $config->get_defaulthostpath() . 'config.xml' + unless -f $xmlconfigpath; - my Xerl::XML::Reader $xmlconfigreader = - Xerl::XML::Reader->new( path => $xmlconfigpath, config => $config ); + my Xerl::XML::Reader $xmlconfigreader = + Xerl::XML::Reader->new( path => $xmlconfigpath, config => $config ); - if ( -1 == $xmlconfigreader->open() ) { - $config->set_finish_request(1); - return undef; - } + if ( -1 == $xmlconfigreader->open() ) { + $config->set_finish_request(1); + return undef; + } - $xmlconfigreader->parse(); - $config->set_xmlconfigrootobj( $xmlconfigreader->get_root() ); + $xmlconfigreader->parse(); + $config->set_xmlconfigrootobj( $xmlconfigreader->get_root() ); - my Xerl::Page::Menu $menu = Xerl::Page::Menu->new( config => $config ); + my Xerl::Page::Menu $menu = Xerl::Page::Menu->new( config => $config ); - $menu->generate(); - $config->set_menuobj($menu); + $menu->generate(); + $config->set_menuobj($menu); - if ( $site =~ /^(\d+)\./ ) { - $config->set_templatepath( - $config->get_hostpath() . "content/$subpath$site.xml" ); - } - elsif ( -f $config->get_hostpath() . "content/$subpath$site.xml" ) { - $config->set_templatepath( - $config->get_hostpath() . "content/$subpath$site.xml" ); - } + if ( $site =~ /^(\d+)\./ ) { + $config->set_templatepath( + $config->get_hostpath() . "content/$subpath$site.xml" ); + } + elsif ( -f $config->get_hostpath() . "content/$subpath$site.xml" ) { + $config->set_templatepath( + $config->get_hostpath() . "content/$subpath$site.xml" ); + } - # Hidden files - elsif ( -f $config->get_hostpath() . "content/$subpath.$site.xml" ) { - $config->set_templatepath( - $config->get_hostpath() . "content/$subpath.$site.xml" ); - } - else { - my $glob = $config->get_hostpath() . "content/$subpath*.$site.xml"; - eval "(\$glob) = sort <$glob>;"; - $config->set_templatepath($glob); - } + # Hidden files + elsif ( -f $config->get_hostpath() . "content/$subpath.$site.xml" ) { + $config->set_templatepath( + $config->get_hostpath() . "content/$subpath.$site.xml" ); + } + else { + my $glob = $config->get_hostpath() . "content/$subpath*.$site.xml"; + eval "(\$glob) = sort <$glob>;"; + $config->set_templatepath($glob); + } - my Xerl::Page::Content $bodycontent = - Xerl::Page::Content->new( config => $config ); + my Xerl::Page::Content $bodycontent = + Xerl::Page::Content->new( config => $config ); - $bodycontent->parse(); + $bodycontent->parse(); - my $templatepath = - $config->get_hostpath() - . "templates/" - . $config->get_template() . '.xml'; + my $templatepath = + $config->get_hostpath() . "templates/" . $config->get_template() . '.xml'; - $templatepath = - $config->get_defaulthostpath() - . "templates/" - . $config->get_template() . '.xml' - unless -f $templatepath; + $templatepath = + $config->get_defaulthostpath() + . "templates/" + . $config->get_template() . '.xml' + unless -f $templatepath; - $config->set_templatepath($templatepath); + $config->set_templatepath($templatepath); - my Xerl::Page::Content $templatecontent = - Xerl::Page::Content->new( config => $config ); + my Xerl::Page::Content $templatecontent = + Xerl::Page::Content->new( config => $config ); - $templatecontent->parse(); + $templatecontent->parse(); - $self->set_array( $templatecontent->get_content() ); - $config->set_content( $bodycontent->get_content() ); - $self->parsetemplate( '%%', RECURSIVE ); + $self->set_array( $templatecontent->get_content() ); + $config->set_content( $bodycontent->get_content() ); + $self->parsetemplate( '%%', RECURSIVE ); - my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new( - path => $cachepath, - filename => $cachefile, - array => $self->get_array(), - ); + my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new( + path => $cachepath, + filename => $cachefile, + array => $self->get_array(), + ); - $io->fwrite(); - } + $io->fwrite(); + } - $self->parsetemplate('$$'); # Parsing dynamic vars. - return undef; + $self->parsetemplate('$$'); # Parsing dynamic vars. + return undef; } sub parsetemplate($$;$) { - my Xerl::Page::Templates $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); - my $deepnesslevel = $_[2] || 0; + my Xerl::Page::Templates $self = $_[0]; + my Xerl::Page::Configure $config = $self->get_config(); + my $deepnesslevel = $_[2] || 0; - return $self if $deepnesslevel == 100; + return $self if $deepnesslevel == 100; - my ( $sep, $foundflag ) = quotemeta $_[1]; + my ( $sep, $foundflag ) = quotemeta $_[1]; - PARSELINE( $config, $sep, \$_, \$foundflag ) for @{ $self->get_array() }; + PARSELINE( $config, $sep, \$_, \$foundflag ) for @{ $self->get_array() }; - return $self->parsetemplate( $_[1], $deepnesslevel + 1 ) - if defined $deepnesslevel > 0 and $foundflag; + return $self->parsetemplate( $_[1], $deepnesslevel + 1 ) + if defined $deepnesslevel > 0 and $foundflag; - return undef; + return undef; } # Static sub sub PARSELINE($$$;$) { - my Xerl::Page::Configure $config = $_[0]; - my ( $sep, $line, $foundflag ) = @_[ 1 .. 3 ]; + my Xerl::Page::Configure $config = $_[0]; + my ( $sep, $line, $foundflag ) = @_[ 1 .. 3 ]; - $$line =~ s/$sep(!)?(.+?)$sep/ + $$line =~ s/$sep(!)?(.+?)$sep/ defined $1 ? `$2` : (ref $config->getval($2) eq 'ARRAY') ? join '', @{$config->getval($2)} : $config->getval($2)/eg and $$foundflag = 1; - return undef; + return undef; } sub print($;$) { - my Xerl::Page::Templates $self = $_[0]; - my Xerl::Page::Configure $config = $self->get_config(); - - my ( $code, $flag ) = ( '', 0 ); - my $time = $_[1]; - my $hflag = 1; - - for my $line ( @{ $self->get_array() } ) { - if ( $hflag == 1 && $config->exists('noparse') ) { - $line =~ s#^Content-Type.*#Content-Type: text/plain#i; - $hflag = 0; - } - $line =~ s/ +/ /g; - redo if !$flag and $line =~ s/<perl>((?:.|\n)*?)<\/perl>/eval $1/ego; - - if ( !$flag and $line =~ s/<perl>(.*)$//o ) { - $code .= $1; - $flag = 1; - - } - elsif ( $line =~ s/^(.*?)<\/perl>/eval $code.$1/eo ) { - ( $code, $flag ) = ( '', 0 ); - redo; - - } - elsif ($flag) { - $line =~ s/^(.*\n)$//o; - $code .= $1; - next; - } - - my $time = defined $time ? sprintf '%1.4f', tv_interval($time) : ''; - - $line =~ s/!!TIME!!/$time/ge; - $line =~ s/!!LT!!/</g; - $line =~ s/!!GT!!/>/g; - $line =~ s#!!URL\((.+?)\)!!#<a href="$1">$1</a>#g; - print $line; + my Xerl::Page::Templates $self = $_[0]; + my Xerl::Page::Configure $config = $self->get_config(); + + my ( $code, $flag ) = ( '', 0 ); + my $time = $_[1]; + my $hflag = 1; + + for my $line ( @{ $self->get_array() } ) { + if ( $hflag == 1 && $config->exists('noparse') ) { + $line =~ s#^Content-Type.*#Content-Type: text/plain#i; + $hflag = 0; + } + $line =~ s/ +/ /g; + redo if !$flag and $line =~ s/<perl>((?:.|\n)*?)<\/perl>/eval $1/ego; + + if ( !$flag and $line =~ s/<perl>(.*)$//o ) { + $code .= $1; + $flag = 1; + } + elsif ( $line =~ s/^(.*?)<\/perl>/eval $code.$1/eo ) { + ( $code, $flag ) = ( '', 0 ); + redo; + + } + elsif ($flag) { + $line =~ s/^(.*\n)$//o; + $code .= $1; + next; + } + + my $time = defined $time ? sprintf '%1.4f', tv_interval($time) : ''; + + $line =~ s/!!TIME!!/$time/ge; + $line =~ s/!!LT!!/</g; + $line =~ s/!!GT!!/>/g; + $line =~ s#!!URL\((.+?)\)!!#<a href="$1">$1</a>#g; + print $line; + } - return undef; + return undef; } 1; |
