temp remove includedirs tag, perltidy indention set to 2, initial XML::LibXML

16 files changed, 932 insertions, 972 deletions

diff --git a/Makefile b/Makefile
index 1fd9f8d..757c3fc 100644
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,9 @@ replace:
 		w .tmp" {} && mv -f .tmp {}' \;
 	chmod 755 index.pl
 perltidy:
-	find . -name \*.fpl | xargs perltidy -b 
-	find . -name \*.pl | xargs perltidy -b 
-	find . -name \*.pm | xargs perltidy -b 
+	find . -name \*.fpl | xargs perltidy -i=2 -b 
+	find . -name \*.pl | xargs perltidy -i=2 -b 
+	find . -name \*.pm | xargs perltidy -i=2 -b 
 	find . -name \*.bak | xargs rm -f
 todo:
 	grep -R TODO . | grep -v Makefile | grep -v .git
diff --git a/Xerl.pm b/Xerl.pm
index 8844e85..c8d816a 100644
--- a/Xerl.pm
+++ b/Xerl.pm
@@ -44,45 +44,45 @@ use Xerl::Page::Request;
 use Xerl::Page::Templates;
 
 sub run($) {
-    my Xerl $self = $_[0];
-    my $time = [gettimeofday];
+  my Xerl $self = $_[0];
+  my $time = [gettimeofday];
 
-    my Xerl::Page::Request $request =
-      Xerl::Page::Request->new( request => $ENV{REQUEST_URI} );
+  my Xerl::Page::Request $request =
+    Xerl::Page::Request->new( request => $ENV{REQUEST_URI} );
 
-    $request->parse();
-    my Xerl::Page::Configure $config =
-      Xerl::Page::Configure->new( config => $self->get_config(), %$request );
+  $request->parse();
+  my Xerl::Page::Configure $config =
+    Xerl::Page::Configure->new( config => $self->get_config(), %$request );
 
-    $config->parse();
-    return undef if $config->finish_request_exists();
+  $config->parse();
+  return undef if $config->finish_request_exists();
 
-    $config->defaults();
+  $config->defaults();
 
-    my Xerl::Page::Parameter $parameter =
-      Xerl::Page::Parameter->new( config => $config );
+  my Xerl::Page::Parameter $parameter =
+    Xerl::Page::Parameter->new( config => $config );
 
-    $parameter->parse();
-    return undef if $config->finish_request_exists();
+  $parameter->parse();
+  return undef if $config->finish_request_exists();
 
-    if ( $config->document_exists() ) {
-        my Xerl::Page::Document $document =
-          Xerl::Page::Document->new( config => $config );
+  if ( $config->document_exists() ) {
+    my Xerl::Page::Document $document =
+      Xerl::Page::Document->new( config => $config );
 
-        $document->parse();
-        return undef if $config->finish_request_exists();
+    $document->parse();
+    return undef if $config->finish_request_exists();
 
-    }
-    else {
-        my Xerl::Page::Templates $templates =
-          Xerl::Page::Templates->new( config => $config );
+  }
+  else {
+    my Xerl::Page::Templates $templates =
+      Xerl::Page::Templates->new( config => $config );
 
-        $templates->parse();
-        return undef if $config->finish_request_exists();
-        $templates->print($time);
-    }
+    $templates->parse();
+    return undef if $config->finish_request_exists();
+    $templates->print($time);
+  }
 
-    return undef;
+  return undef;
 }
 
 1;
diff --git a/Xerl/Base.pm b/Xerl/Base.pm
index 53368a9..6b71565 100644
--- a/Xerl/Base.pm
+++ b/Xerl/Base.pm
@@ -33,97 +33,97 @@ use strict;
 use warnings;
 
 sub new ($;) {
-    my $self = shift;
+  my $self = shift;
 
-    bless {@_} => $self;
+  bless {@_} => $self;
 }
 
 sub setval($$$) {
-    my UNIVERSAL $self = $_[0];
+  my UNIVERSAL $self = $_[0];
 
-    $self->{ $_[1] } = $_[2];
+  $self->{ $_[1] } = $_[2];
 
-    return undef;
+  return undef;
 }
 
 sub getval($$) {
-    my UNIVERSAL $self = $_[0];
+  my UNIVERSAL $self = $_[0];
 
-    return defined $self->{ $_[1] } ? $self->{ $_[1] } : '';
+  return defined $self->{ $_[1] } ? $self->{ $_[1] } : '';
 }
 
 sub exists($$) {
-    my UNIVERSAL $self = $_[0];
+  my UNIVERSAL $self = $_[0];
 
-    return exists $self->{ $_[1] } ? 1 : 0;
+  return exists $self->{ $_[1] } ? 1 : 0;
 }
 
 sub AUTOLOAD {
-    my UNIVERSAL $self = $_[0];
-    my $auto = our $AUTOLOAD;
-    return $self if $auto =~ /DESTROY/;
+  my UNIVERSAL $self = $_[0];
+  my $auto = our $AUTOLOAD;
+  return $self if $auto =~ /DESTROY/;
 
-    if ( $auto =~ /.*::set_(.+)$/ ) {
-        $self->{$1} = $_[1];
+  if ( $auto =~ /.*::set_(.+)$/ ) {
+    $self->{$1} = $_[1];
 
-    }
-    elsif ( $auto =~ /.*::get_(.+)_ref$/ ) {
-        return defined $self->{$1} ? \$self->{$1} : [''];
-
-    }
-    elsif ( $auto =~ /.*::get_(.+)$/ ) {
-        return defined $self->{$1} ? $self->{$1} : '';
+  }
+  elsif ( $auto =~ /.*::get_(.+)_ref$/ ) {
+    return defined $self->{$1} ? \$self->{$1} : [''];
 
-    }
-    elsif ( $auto =~ /.*::undef_(.+)$/ ) {
-        return '' unless defined $self->{$1};
+  }
+  elsif ( $auto =~ /.*::get_(.+)$/ ) {
+    return defined $self->{$1} ? $self->{$1} : '';
 
-        my $retval = $self->{$1};
-        undef $self->{$1};
-        return $retval;
+  }
+  elsif ( $auto =~ /.*::undef_(.+)$/ ) {
+    return '' unless defined $self->{$1};
 
-    }
-    elsif ( $auto =~ /.*::append_(.+)$/ ) {
-        if ( defined $self->{$1} ) {
-            $self->{$1} .= $_[1];
+    my $retval = $self->{$1};
+    undef $self->{$1};
+    return $retval;
 
-        }
-        else {
-            $self->{$1} = $_[1];
-        }
+  }
+  elsif ( $auto =~ /.*::append_(.+)$/ ) {
+    if ( defined $self->{$1} ) {
+      $self->{$1} .= $_[1];
 
     }
-    elsif ( $auto =~ /.*::push_(.+)$/ ) {
-        if ( exists $self->{$1} ) {
-            push @{ $self->{$1} }, $_[1];
+    else {
+      $self->{$1} = $_[1];
+    }
 
-        }
-        else {
-            $self->{$1} = [ $_[1] ];
-        }
+  }
+  elsif ( $auto =~ /.*::push_(.+)$/ ) {
+    if ( exists $self->{$1} ) {
+      push @{ $self->{$1} }, $_[1];
 
     }
-    elsif ( $auto =~ /.*::first_(.+)$/ ) {
-        return exists $self->{$1} ? ${ $self->{$1} }[0] : '';
-
+    else {
+      $self->{$1} = [ $_[1] ];
     }
-    elsif ( $auto =~ /.*::(.+)_exists$/ ) {
-        return exists $self->{$1} ? 1 : 0;
 
-    }
-    elsif ( $auto =~ /.*::(.+)_length$/ ) {
-        return ( ref $self->{$1} eq 'ARRAY' ) ? scalar @{ $self->{$1} } : 0;
+  }
+  elsif ( $auto =~ /.*::first_(.+)$/ ) {
+    return exists $self->{$1} ? ${ $self->{$1} }[0] : '';
 
-    }
-    elsif ( $auto =~ /.*::(.+)_isset$/ ) {
-        return exists $self->{$1} ? $self->{ $_[0] } : 0;
+  }
+  elsif ( $auto =~ /.*::(.+)_exists$/ ) {
+    return exists $self->{$1} ? 1 : 0;
 
-    }
-    else {
-        print "$auto is not a method of $self or UNIVERSAL\n";
-    }
+  }
+  elsif ( $auto =~ /.*::(.+)_length$/ ) {
+    return ( ref $self->{$1} eq 'ARRAY' ) ? scalar @{ $self->{$1} } : 0;
+
+  }
+  elsif ( $auto =~ /.*::(.+)_isset$/ ) {
+    return exists $self->{$1} ? $self->{ $_[0] } : 0;
+
+  }
+  else {
+    print "$auto is not a method of $self or UNIVERSAL\n";
+  }
 
-    return $self;
+  return $self;
 }
 
 1;
diff --git a/Xerl/Main/Global.pm b/Xerl/Main/Global.pm
index bd2b140..f70ef6d 100644
--- a/Xerl/Main/Global.pm
+++ b/Xerl/Main/Global.pm
@@ -30,67 +30,67 @@
 package Xerl::Main::Global;
 
 sub SHUTDOWN {
-    exit 0;
+  exit 0;
 
-    # Never reach this point
-    return undef;
+  # Never reach this point
+  return undef;
 }
 
 sub DEBUG {
-    print 'Debug::', @_, "\n";
+  print 'Debug::', @_, "\n";
 
-    return undef;
+  return undef;
 }
 
 sub ERROR {
-    print "Content-Type: text/plain\n\nXerl runtime error: ",
-      join( ' ', time, @_ );
+  print "Content-Type: text/plain\n\nXerl runtime error: ",
+    join( ' ', time, @_ );
 
-    Xerl::Main::Global::SHUTDOWN();
+  Xerl::Main::Global::SHUTDOWN();
 
-    # Never reach this point
-    return undef;
+  # Never reach this point
+  return undef;
 }
 
 sub PLAIN {
-    print "Content-Type: text/plain\n\n";
+  print "Content-Type: text/plain\n\n";
 
-    DEBUG(@_) if @_;
+  DEBUG(@_) if @_;
 
-    return undef;
+  return undef;
 }
 
 sub REDIRECT ($) {
-    my $location = shift;
-    print "Status: 301 Moved Permanantly\n";
-    print "Location: $location\n\n";
-    return undef;
+  my $location = shift;
+  print "Status: 301 Moved Permanantly\n";
+  print "Location: $location\n\n";
+  return undef;
 }
 
 sub _HTTP_DESCR ($;$) {
-    my ( $status, $infomsg ) = @_;
+  my ( $status, $infomsg ) = @_;
 
-    $infomsg //= '';
+  $infomsg //= '';
 
-    if ( $status == 404 ) {
-        "Status: 404 Not Found $infomsg\015\012\n\n"
+  if ( $status == 404 ) {
+    "Status: 404 Not Found $infomsg\015\012\n\n"
 
-    }
-    else {
-        "Status: 405 Method not allowed $infomsg\015\012\n\n";
-    }
+  }
+  else {
+    "Status: 405 Method not allowed $infomsg\015\012\n\n";
+  }
 }
 
 sub HTTP {
-    my $descr = _HTTP_DESCR(shift);
-    print $descr;
-    local $, = ' ';
-    print $descr;
+  my $descr = _HTTP_DESCR(shift);
+  print $descr;
+  local $, = ' ';
+  print $descr;
 
-    Xerl::Main::Global::SHUTDOWN();
+  Xerl::Main::Global::SHUTDOWN();
 
-    # Never reach this point
-    return undef;
+  # Never reach this point
+  return undef;
 }
 
 1;
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