summaryrefslogtreecommitdiff
path: root/Xerl
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2011-04-26 19:13:48 +0000
committerPaul Buetow <paul@buetow.org>2011-04-26 19:13:48 +0000
commitd87c0e16f9b880ce38e1ff6a39f22ba49263aef0 (patch)
treee9fa42aa49bcf532ca75fc17928aaff850815e1c /Xerl
parent4aae3132de0ff117290cdc5a8cebeb5bf467942f (diff)
code cleanup using perltidy
Diffstat (limited to 'Xerl')
-rw-r--r--Xerl/Page/Configure.pm12
-rw-r--r--Xerl/Page/Content.pm9
-rw-r--r--Xerl/Page/Document.pm11
-rw-r--r--Xerl/Page/Menu.pm10
-rw-r--r--Xerl/Page/Templates.pm16
-rw-r--r--Xerl/Tools/FileIO.pm6
-rw-r--r--Xerl/XML/Reader.pm8
7 files changed, 36 insertions, 36 deletions
diff --git a/Xerl/Page/Configure.pm b/Xerl/Page/Configure.pm
index 9429f25..9fa3002 100644
--- a/Xerl/Page/Configure.pm
+++ b/Xerl/Page/Configure.pm
@@ -42,9 +42,9 @@ sub parse($) {
my Xerl::Tools::FileIO $file =
Xerl::Tools::FileIO->new( 'path' => $self->get_config() );
- if (-1 == $file->fslurp()) {
- $self->set_shutdown(1);
- return undef;
+ if ( -1 == $file->fslurp() ) {
+ $self->set_shutdown(1);
+ return undef;
}
my $re = qr/^(.+?) *=(.+?) *\n?$/;
@@ -87,8 +87,8 @@ sub defaults($) {
Xerl::Tools::FileIO->new( 'path' => $redirect );
$file->fslurp();
my $location = $file->shift();
- Xerl::Main::Global::REDIRECT( $location );
- $self->set_shutdown(1);
+ Xerl::Main::Global::REDIRECT($location);
+ $self->set_shutdown(1);
}
my $alias = $self->get_hostroot() . 'alias:' . $self->get_host();
if ( -f $alias ) {
@@ -153,7 +153,7 @@ sub insertxmlvars($$) {
return $self
unless defined $element
- or $element->get_array() eq 'ARRAY';
+ or $element->get_array() eq 'ARRAY';
my $text;
for ( @{ $element->get_array() } ) {
diff --git a/Xerl/Page/Content.pm b/Xerl/Page/Content.pm
index 9100215..9bdca50 100644
--- a/Xerl/Page/Content.pm
+++ b/Xerl/Page/Content.pm
@@ -48,9 +48,9 @@ sub parse($) {
config => $config
);
- if (-1 == $xmlcontent->open()) {
- $config->set_shutdown(1);
- return undef;
+ if ( -1 == $xmlcontent->open() ) {
+ $config->set_shutdown(1);
+ return undef;
}
$xmlcontent->parse();
@@ -144,8 +144,7 @@ sub _insertrules($$$) {
$name =~ s/^=//o; # Remove the leading =
if ( $succ->get_single() ) {
push @content,
- "<$name"
- . ( $succ->params_str() || '' ) . " />\n"
+ "<$name" . ( $succ->params_str() || '' ) . " />\n"
}
else {
diff --git a/Xerl/Page/Document.pm b/Xerl/Page/Document.pm
index 13a8254..2ca9f10 100644
--- a/Xerl/Page/Document.pm
+++ b/Xerl/Page/Document.pm
@@ -45,7 +45,7 @@ sub parse($) {
my $document = $config->get_document();
my ($filename) = $document =~ m#([^/]+)$#;
- my ($postfix) = $document =~ /\.(.+)$/;
+ my ($postfix) = $document =~ /\.(.+)$/;
my $path;
print 'Content-Type: ';
@@ -62,10 +62,11 @@ sub parse($) {
my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new( path => $path );
- if (-1 == $io->fslurp()) {
- $config->set_shutdown(1);
- } else {
- $io->print();
+ if ( -1 == $io->fslurp() ) {
+ $config->set_shutdown(1);
+ }
+ else {
+ $io->print();
}
return undef;
diff --git a/Xerl/Page/Menu.pm b/Xerl/Page/Menu.pm
index 326f508..2545bc0 100644
--- a/Xerl/Page/Menu.pm
+++ b/Xerl/Page/Menu.pm
@@ -74,12 +74,12 @@ sub get_menu($$$$) {
path => $config->get_hostpath() . $content,
basename => 1,
);
-
- unless ($io->exists()) {
- Xerl::Main::Global::REDIRECT( $config->get_404() );
- $config->set_shutdown(1);
+
+ unless ( $io->exists() ) {
+ Xerl::Main::Global::REDIRECT( $config->get_404() );
+ $config->set_shutdown(1);
}
-
+
$io->dslurp();
my $dir = $io->get_array();
diff --git a/Xerl/Page/Templates.pm b/Xerl/Page/Templates.pm
index 84adf30..aef9be0 100644
--- a/Xerl/Page/Templates.pm
+++ b/Xerl/Page/Templates.pm
@@ -75,10 +75,10 @@ sub parse($) {
my Xerl::Tools::FileIO $io =
Xerl::Tools::FileIO->new( path => $cachepath . $cachefile );
- if (-1 == $io->fslurp()) {
- $config->set_shutdown(1);
- return undef;
- }
+ if ( -1 == $io->fslurp() ) {
+ $config->set_shutdown(1);
+ return undef;
+ }
$self->set_array( $io->get_array() );
@@ -93,10 +93,10 @@ sub parse($) {
my Xerl::XML::Reader $xmlconfigreader =
Xerl::XML::Reader->new( path => $xmlconfigpath, config => $config );
- if (-1 == $xmlconfigreader->open()) {
- $config->set_shutdown(1);
- return undef;
- }
+ if ( -1 == $xmlconfigreader->open() ) {
+ $config->set_shutdown(1);
+ return undef;
+ }
$xmlconfigreader->parse();
$config->set_xmlconfigrootobj( $xmlconfigreader->get_root() );
diff --git a/Xerl/Tools/FileIO.pm b/Xerl/Tools/FileIO.pm
index 25da55e..71e480c 100644
--- a/Xerl/Tools/FileIO.pm
+++ b/Xerl/Tools/FileIO.pm
@@ -60,9 +60,9 @@ sub fslurp($) {
my Xerl::Tools::FileIO $self = $_[0];
my $path = SECUREPATH( $self->get_path() );
- unless (-f $path) {
- Xerl::Main::Global::HTTP( 404, "Not found: $path" );
- return -1;
+ unless ( -f $path ) {
+ Xerl::Main::Global::HTTP( 404, "Not found: $path" );
+ return -1;
}
open my $file, $path or Xerl::Main::Global::ERROR( $!, $path, caller() );
diff --git a/Xerl/XML/Reader.pm b/Xerl/XML/Reader.pm
index 9fed848..277f8d9 100644
--- a/Xerl/XML/Reader.pm
+++ b/Xerl/XML/Reader.pm
@@ -139,10 +139,10 @@ sub parse($) {
config => $config
);
- if (-1 == $reader->open()) {
- $config->set_shutdown(1);
- return undef;
- }
+ if ( -1 == $reader->open() ) {
+ $config->set_shutdown(1);
+ return undef;
+ }
$reader->parse();
my Xerl::XML::Element $starttag =