From a074bd17f5e8ba341a22bbfca1da7093b8351774 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Mon, 10 Sep 2007 10:53:02 +0200 Subject: [PATCH] Replaced ND::Web with NDWeb Hopefully this will work properly --- ND.pm | 4 +- NDWeb/AuthHandler.pm | 2 +- NDWeb/Forum.pm | 4 +- NDWeb/Graph.pm | 2 +- NDWeb/Image.pm | 4 +- NDWeb/Include.pm | 2 +- NDWeb/Page.pm | 2 +- NDWeb/Pages/AddIntel.pm | 10 ++--- NDWeb/Pages/AllianceRankings.pm | 8 ++-- NDWeb/Pages/Alliances.pm | 8 ++-- NDWeb/Pages/Calls.pm | 8 ++-- NDWeb/Pages/Check.pm | 8 ++-- NDWeb/Pages/CovOp.pm | 8 ++-- NDWeb/Pages/DefLeeches.pm | 8 ++-- NDWeb/Pages/DefRequest.pm | 8 ++-- NDWeb/Pages/EditRaid.pm | 8 ++-- NDWeb/Pages/Forum.pm | 10 ++--- NDWeb/Pages/GalaxyRankings.pm | 8 ++-- NDWeb/Pages/Graph.pm | 8 ++-- NDWeb/Pages/HostileAlliances.pm | 8 ++-- NDWeb/Pages/Intel.pm | 10 ++--- NDWeb/Pages/LaunchConfirmation.pm | 8 ++-- NDWeb/Pages/Mail.pm | 10 ++--- NDWeb/Pages/Main.pm | 8 ++-- NDWeb/Pages/MemberIntel.pm | 8 ++-- NDWeb/Pages/Motd.pm | 8 ++-- NDWeb/Pages/PlanetNaps.pm | 8 ++-- NDWeb/Pages/PlanetRankings.pm | 8 ++-- NDWeb/Pages/Points.pm | 8 ++-- NDWeb/Pages/Raids.pm | 8 ++-- NDWeb/Pages/Resources.pm | 8 ++-- NDWeb/Pages/Settings.pm | 8 ++-- NDWeb/Pages/TargetList.pm | 8 ++-- NDWeb/Pages/Users.pm | 8 ++-- NDWeb/XMLPage.pm | 8 ++-- apache-conf.conf | 2 +- startup.pl | 72 +++++++++++++++---------------- 37 files changed, 163 insertions(+), 163 deletions(-) diff --git a/ND.pm b/ND.pm index 3912c1c..e9bc401 100755 --- a/ND.pm +++ b/ND.pm @@ -26,7 +26,7 @@ use Apache2::Request; use Apache2::Response; use Apache2::RequestUtil; use ND::DB; -use ND::Web::Page; +use NDWeb::Page; use strict; use warnings; @@ -46,7 +46,7 @@ sub handler { if ($ENV{'SCRIPT_NAME'} =~ /(\w+)(\.(pl|php|pm))?$/){ $page = $1 unless $1 eq 'index' and $3 eq 'pl'; } - $page = ND::Web::Page->new(PAGE => $page, DBH => $ND::DBH, URI => $ENV{REQUEST_URI}, USER_AGENT => $ENV{HTTP_USER_AGENT}, HTTP_ACCEPT => $ENV{HTTP_ACCEPT}, R => $r); + $page = NDWeb::Page->new(PAGE => $page, DBH => $ND::DBH, URI => $ENV{REQUEST_URI}, USER_AGENT => $ENV{HTTP_USER_AGENT}, HTTP_ACCEPT => $ENV{HTTP_ACCEPT}, R => $r); $page->render; $ND::DBH->rollback unless $ND::DBH->{AutoCommit}; diff --git a/NDWeb/AuthHandler.pm b/NDWeb/AuthHandler.pm index 529b2d1..086d46b 100644 --- a/NDWeb/AuthHandler.pm +++ b/NDWeb/AuthHandler.pm @@ -18,7 +18,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::AuthHandler; +package NDWeb::AuthHandler; use strict; use warnings FATAL => 'all'; diff --git a/NDWeb/Forum.pm b/NDWeb/Forum.pm index ca2195e..810f547 100644 --- a/NDWeb/Forum.pm +++ b/NDWeb/Forum.pm @@ -17,12 +17,12 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Forum; +package NDWeb::Forum; use strict; use warnings FATAL => 'all'; use CGI qw{:standard}; use HTML::Template; -use ND::Web::Include; +use NDWeb::Include; require Exporter; our @ISA = qw/Exporter/; diff --git a/NDWeb/Graph.pm b/NDWeb/Graph.pm index 6f5ff47..b564fc9 100644 --- a/NDWeb/Graph.pm +++ b/NDWeb/Graph.pm @@ -17,7 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Graph; +package NDWeb::Graph; use strict; use warnings; use ND::Include; diff --git a/NDWeb/Image.pm b/NDWeb/Image.pm index 792f1ce..eab37df 100644 --- a/NDWeb/Image.pm +++ b/NDWeb/Image.pm @@ -17,11 +17,11 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Image; +package NDWeb::Image; use strict; use warnings; -use base qw/ND::Web::Page/; +use base qw/NDWeb::Page/; sub render { diff --git a/NDWeb/Include.pm b/NDWeb/Include.pm index 6916392..434fc31 100644 --- a/NDWeb/Include.pm +++ b/NDWeb/Include.pm @@ -17,7 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Include; +package NDWeb::Include; use strict; use warnings; use CGI qw{:standard}; diff --git a/NDWeb/Page.pm b/NDWeb/Page.pm index 2f80d86..e5e703d 100644 --- a/NDWeb/Page.pm +++ b/NDWeb/Page.pm @@ -16,7 +16,7 @@ # Free Software Foundation, Inc., * # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Page; +package NDWeb::Page; use strict; use warnings; use CGI qw/:standard/; diff --git a/NDWeb/Pages/AddIntel.pm b/NDWeb/Pages/AddIntel.pm index 01d2850..1365905 100644 --- a/NDWeb/Pages/AddIntel.pm +++ b/NDWeb/Pages/AddIntel.pm @@ -17,16 +17,16 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::AddIntel; +package NDWeb::Pages::AddIntel; use strict; use warnings FATAL => 'all'; use CGI qw/:standard/; -use ND::Web::Forum; -use ND::Web::Include; +use NDWeb::Forum; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{addintel} = 'ND::Web::Pages::AddIntel'; +$NDWeb::Page::PAGES{addintel} = 'NDWeb::Pages::AddIntel'; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/AllianceRankings.pm b/NDWeb/Pages/AllianceRankings.pm index bd0a2d5..c29d540 100644 --- a/NDWeb/Pages/AllianceRankings.pm +++ b/NDWeb/Pages/AllianceRankings.pm @@ -17,15 +17,15 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::AllianceRankings; +package NDWeb::Pages::AllianceRankings; use strict; use warnings FATAL => 'all'; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{alliancerankings} = __PACKAGE__; +$NDWeb::Page::PAGES{alliancerankings} = __PACKAGE__; sub parse { #TODO: Need to fix some links first diff --git a/NDWeb/Pages/Alliances.pm b/NDWeb/Pages/Alliances.pm index 311adb3..d60f7a7 100644 --- a/NDWeb/Pages/Alliances.pm +++ b/NDWeb/Pages/Alliances.pm @@ -17,16 +17,16 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Alliances; +package NDWeb::Pages::Alliances; use strict; use warnings FATAL => 'all'; use ND::Include; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{alliances} = __PACKAGE__; +$NDWeb::Page::PAGES{alliances} = __PACKAGE__; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/Calls.pm b/NDWeb/Pages/Calls.pm index ddddc7b..a8a9843 100644 --- a/NDWeb/Pages/Calls.pm +++ b/NDWeb/Pages/Calls.pm @@ -16,16 +16,16 @@ # Free Software Foundation, Inc., * # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Calls; +package NDWeb::Pages::Calls; use strict; use warnings FATAL => 'all'; use ND::Include; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{calls} = __PACKAGE__; +$NDWeb::Page::PAGES{calls} = __PACKAGE__; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/Check.pm b/NDWeb/Pages/Check.pm index f68c949..e12d438 100644 --- a/NDWeb/Pages/Check.pm +++ b/NDWeb/Pages/Check.pm @@ -17,17 +17,17 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Check; +package NDWeb::Pages::Check; use strict; use warnings FATAL => 'all'; no warnings qw(uninitialized); use ND::Include; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{check} = __PACKAGE__; +$NDWeb::Page::PAGES{check} = __PACKAGE__; sub parse { my $self = shift; diff --git a/NDWeb/Pages/CovOp.pm b/NDWeb/Pages/CovOp.pm index c1c9a04..56250ab 100644 --- a/NDWeb/Pages/CovOp.pm +++ b/NDWeb/Pages/CovOp.pm @@ -17,15 +17,15 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::CovOp; +package NDWeb::Pages::CovOp; use strict; use warnings FATAL => 'all'; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{covop} = __PACKAGE__; +$NDWeb::Page::PAGES{covop} = __PACKAGE__; sub parse { my ($uri) = @_; diff --git a/NDWeb/Pages/DefLeeches.pm b/NDWeb/Pages/DefLeeches.pm index 21f7dcb..1f05da2 100644 --- a/NDWeb/Pages/DefLeeches.pm +++ b/NDWeb/Pages/DefLeeches.pm @@ -17,15 +17,15 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::DefLeeches; +package NDWeb::Pages::DefLeeches; use strict; use warnings FATAL => 'all'; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{defLeeches} = __PACKAGE__; +$NDWeb::Page::PAGES{defLeeches} = __PACKAGE__; sub render_body { diff --git a/NDWeb/Pages/DefRequest.pm b/NDWeb/Pages/DefRequest.pm index ff3e0f8..b8cec31 100644 --- a/NDWeb/Pages/DefRequest.pm +++ b/NDWeb/Pages/DefRequest.pm @@ -17,15 +17,15 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::DefRequest; +package NDWeb::Pages::DefRequest; use strict; use warnings FATAL => 'all'; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{defrequest} = __PACKAGE__; +$NDWeb::Page::PAGES{defrequest} = __PACKAGE__; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/EditRaid.pm b/NDWeb/Pages/EditRaid.pm index e701f1d..b0f4f99 100644 --- a/NDWeb/Pages/EditRaid.pm +++ b/NDWeb/Pages/EditRaid.pm @@ -16,16 +16,16 @@ # Free Software Foundation, Inc., * # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::EditRaid; +package NDWeb::Pages::EditRaid; use strict; use warnings FATAL => 'all'; use ND::Include; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{editRaid} = __PACKAGE__; +$NDWeb::Page::PAGES{editRaid} = __PACKAGE__; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/Forum.pm b/NDWeb/Pages/Forum.pm index 55cbe96..ac28bb0 100644 --- a/NDWeb/Pages/Forum.pm +++ b/NDWeb/Pages/Forum.pm @@ -17,17 +17,17 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Forum; +package NDWeb::Pages::Forum; use strict; use warnings; -use ND::Web::Forum; +use NDWeb::Forum; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; use ND::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{forum} = __PACKAGE__; +$NDWeb::Page::PAGES{forum} = __PACKAGE__; sub parse { my $self = shift; diff --git a/NDWeb/Pages/GalaxyRankings.pm b/NDWeb/Pages/GalaxyRankings.pm index d09c8e5..4be9471 100644 --- a/NDWeb/Pages/GalaxyRankings.pm +++ b/NDWeb/Pages/GalaxyRankings.pm @@ -17,15 +17,15 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::GalaxyRankings; +package NDWeb::Pages::GalaxyRankings; use strict; use warnings FATAL => 'all'; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{galaxyrankings} = __PACKAGE__; +$NDWeb::Page::PAGES{galaxyrankings} = __PACKAGE__; sub parse { #TODO: Need to fix some links first diff --git a/NDWeb/Pages/Graph.pm b/NDWeb/Pages/Graph.pm index 45cecda..a8530e0 100644 --- a/NDWeb/Pages/Graph.pm +++ b/NDWeb/Pages/Graph.pm @@ -17,18 +17,18 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Graph; +package NDWeb::Pages::Graph; use strict; use warnings FATAL => 'all'; use ND::Include; -use ND::Web::Graph; +use NDWeb::Graph; use DBI qw(:sql_types); use DBD::Pg qw(:pg_types); -use base qw/ND::Web::Image/; +use base qw/NDWeb::Image/; -$ND::Web::Page::PAGES{graph} = 'ND::Web::Pages::Graph'; +$NDWeb::Page::PAGES{graph} = 'NDWeb::Pages::Graph'; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/HostileAlliances.pm b/NDWeb/Pages/HostileAlliances.pm index c9c0916..39ee1db 100644 --- a/NDWeb/Pages/HostileAlliances.pm +++ b/NDWeb/Pages/HostileAlliances.pm @@ -16,16 +16,16 @@ # Free Software Foundation, Inc., * # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::HostileAlliances; +package NDWeb::Pages::HostileAlliances; use strict; use warnings FATAL => 'all'; use ND::Include; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{hostileAlliances} = __PACKAGE__; +$NDWeb::Page::PAGES{hostileAlliances} = __PACKAGE__; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/Intel.pm b/NDWeb/Pages/Intel.pm index c129d90..58a8c67 100644 --- a/NDWeb/Pages/Intel.pm +++ b/NDWeb/Pages/Intel.pm @@ -17,17 +17,17 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Intel; +package NDWeb::Pages::Intel; use strict; use warnings FATAL => 'all'; -use ND::Web::Forum; -use ND::Web::Include; +use NDWeb::Forum; +use NDWeb::Include; use ND::Include; use CGI qw/:standard/; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{intel} = __PACKAGE__; +$NDWeb::Page::PAGES{intel} = __PACKAGE__; sub parse { my $self = shift; diff --git a/NDWeb/Pages/LaunchConfirmation.pm b/NDWeb/Pages/LaunchConfirmation.pm index afb4b55..a7059b2 100644 --- a/NDWeb/Pages/LaunchConfirmation.pm +++ b/NDWeb/Pages/LaunchConfirmation.pm @@ -17,16 +17,16 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::LaunchCoonfirmation; +package NDWeb::Pages::LaunchCoonfirmation; use strict; use warnings FATAL => 'all'; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; use ND::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{launchConfirmation} = __PACKAGE__; +$NDWeb::Page::PAGES{launchConfirmation} = __PACKAGE__; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/Mail.pm b/NDWeb/Pages/Mail.pm index 858d0de..0278ebe 100644 --- a/NDWeb/Pages/Mail.pm +++ b/NDWeb/Pages/Mail.pm @@ -17,18 +17,18 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Mail; +package NDWeb::Pages::Mail; use strict; use warnings FATAL => 'all'; use CGI qw/:standard/; use Mail::Sendmail; -use ND::Web::Forum; -use ND::Web::Include; +use NDWeb::Forum; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{mail} = __PACKAGE__; +$NDWeb::Page::PAGES{mail} = __PACKAGE__; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/Main.pm b/NDWeb/Pages/Main.pm index f6a6696..d35a5b1 100644 --- a/NDWeb/Pages/Main.pm +++ b/NDWeb/Pages/Main.pm @@ -17,16 +17,16 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Main; +package NDWeb::Pages::Main; use strict; use warnings; use CGI qw/:standard/; use ND::Include; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{main} = 'ND::Web::Pages::Main'; +$NDWeb::Page::PAGES{main} = 'NDWeb::Pages::Main'; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/MemberIntel.pm b/NDWeb/Pages/MemberIntel.pm index 476c35e..f6ef0c4 100644 --- a/NDWeb/Pages/MemberIntel.pm +++ b/NDWeb/Pages/MemberIntel.pm @@ -17,15 +17,15 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::MemberIntel; +package NDWeb::Pages::MemberIntel; use strict; use warnings FATAL => 'all'; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{memberIntel} = __PACKAGE__; +$NDWeb::Page::PAGES{memberIntel} = __PACKAGE__; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/Motd.pm b/NDWeb/Pages/Motd.pm index 2914191..5e7889d 100644 --- a/NDWeb/Pages/Motd.pm +++ b/NDWeb/Pages/Motd.pm @@ -17,16 +17,16 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Motd; +package NDWeb::Pages::Motd; use strict; use warnings FATAL => 'all'; use ND::Include; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{motd} = __PACKAGE__; +$NDWeb::Page::PAGES{motd} = __PACKAGE__; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/PlanetNaps.pm b/NDWeb/Pages/PlanetNaps.pm index 1a61380..ded2c6c 100644 --- a/NDWeb/Pages/PlanetNaps.pm +++ b/NDWeb/Pages/PlanetNaps.pm @@ -17,15 +17,15 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::PlanetNaps; +package NDWeb::Pages::PlanetNaps; use strict; use warnings FATAL => 'all'; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{planetNaps} = __PACKAGE__; +$NDWeb::Page::PAGES{planetNaps} = __PACKAGE__; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/PlanetRankings.pm b/NDWeb/Pages/PlanetRankings.pm index d40fa33..3d9f509 100644 --- a/NDWeb/Pages/PlanetRankings.pm +++ b/NDWeb/Pages/PlanetRankings.pm @@ -17,15 +17,15 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::PlanetRankings; +package NDWeb::Pages::PlanetRankings; use strict; use warnings FATAL => 'all'; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{planetrankings} = __PACKAGE__; +$NDWeb::Page::PAGES{planetrankings} = __PACKAGE__; sub parse { #TODO: Need to fix some links first diff --git a/NDWeb/Pages/Points.pm b/NDWeb/Pages/Points.pm index 04c17dd..fb69b2a 100644 --- a/NDWeb/Pages/Points.pm +++ b/NDWeb/Pages/Points.pm @@ -17,15 +17,15 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Points; +package NDWeb::Pages::Points; use strict; use warnings FATAL => 'all'; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{points} = __PACKAGE__; +$NDWeb::Page::PAGES{points} = __PACKAGE__; sub render_body { diff --git a/NDWeb/Pages/Raids.pm b/NDWeb/Pages/Raids.pm index 2ae5201..139b762 100644 --- a/NDWeb/Pages/Raids.pm +++ b/NDWeb/Pages/Raids.pm @@ -17,17 +17,17 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Raids; +package NDWeb::Pages::Raids; use strict; use warnings; use ND::Include; use POSIX; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{raids} = __PACKAGE__; +$NDWeb::Page::PAGES{raids} = __PACKAGE__; sub process { my $self = shift; diff --git a/NDWeb/Pages/Resources.pm b/NDWeb/Pages/Resources.pm index 17790a1..ef098e0 100644 --- a/NDWeb/Pages/Resources.pm +++ b/NDWeb/Pages/Resources.pm @@ -17,15 +17,15 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Resources; +package NDWeb::Pages::Resources; use strict; use warnings FATAL => 'all'; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{resources} = __PACKAGE__; +$NDWeb::Page::PAGES{resources} = __PACKAGE__; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/Settings.pm b/NDWeb/Pages/Settings.pm index 75c5540..8c04414 100644 --- a/NDWeb/Pages/Settings.pm +++ b/NDWeb/Pages/Settings.pm @@ -17,16 +17,16 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Settings; +package NDWeb::Pages::Settings; use strict; use warnings FATAL => 'all'; use ND::Include; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{settings} = __PACKAGE__; +$NDWeb::Page::PAGES{settings} = __PACKAGE__; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/TargetList.pm b/NDWeb/Pages/TargetList.pm index 67c4653..64fed86 100644 --- a/NDWeb/Pages/TargetList.pm +++ b/NDWeb/Pages/TargetList.pm @@ -17,16 +17,16 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::TargetList; +package NDWeb::Pages::TargetList; use strict; use warnings FATAL => 'all'; use ND::Include; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{targetList} = __PACKAGE__; +$NDWeb::Page::PAGES{targetList} = __PACKAGE__; sub render_body { my $self = shift; diff --git a/NDWeb/Pages/Users.pm b/NDWeb/Pages/Users.pm index 8f6fa49..e0d48e6 100644 --- a/NDWeb/Pages/Users.pm +++ b/NDWeb/Pages/Users.pm @@ -17,16 +17,16 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Users; +package NDWeb::Pages::Users; use strict; use warnings; use ND::Include; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{users} = __PACKAGE__; +$NDWeb::Page::PAGES{users} = __PACKAGE__; sub render_body { my $self = shift; diff --git a/NDWeb/XMLPage.pm b/NDWeb/XMLPage.pm index 9e5fce6..3e02608 100644 --- a/NDWeb/XMLPage.pm +++ b/NDWeb/XMLPage.pm @@ -17,17 +17,17 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::XMLPage; +package NDWeb::XMLPage; use strict; use warnings; use CGI qw/:standard/; use HTML::Template; use ND::Include; -use ND::Web::Page; -use ND::Web::Include; +use NDWeb::Page; +use NDWeb::Include; -use base qw/ND::Web::Page/; +use base qw/NDWeb::Page/; sub noAccess () { HTML::Template->new(filename => 'templates/NoAccess.tmpl', global_vars => 1, cache => 1); diff --git a/apache-conf.conf b/apache-conf.conf index c7b4d68..2eb0cae 100644 --- a/apache-conf.conf +++ b/apache-conf.conf @@ -106,7 +106,7 @@ AuthName "NewDawn authentication" AuthType basic - PerlAuthenHandler ND::Web::AuthHandler + PerlAuthenHandler NDWeb::AuthHandler Order Deny,Allow Require valid-user diff --git a/startup.pl b/startup.pl index 19a3590..89cddb0 100644 --- a/startup.pl +++ b/startup.pl @@ -20,42 +20,42 @@ use Mail::Sendmail; use ND; use ND::DB; use ND::Include; -use ND::Web::AuthHandler; -use ND::Web::Include; -use ND::Web::Forum; -use ND::Web::Graph; - -use ND::Web::Page; -use ND::Web::Image; -use ND::Web::XMLPage; - -use ND::Web::Pages::Main; -use ND::Web::Pages::AddIntel; -use ND::Web::Pages::Points; -use ND::Web::Pages::LaunchConfirmation; -use ND::Web::Pages::CovOp; -use ND::Web::Pages::PlanetRankings; -use ND::Web::Pages::DefRequest; -use ND::Web::Pages::Check; -use ND::Web::Pages::Raids; -use ND::Web::Pages::EditRaid; -use ND::Web::Pages::Calls; -use ND::Web::Pages::Users; -use ND::Web::Pages::Intel; -use ND::Web::Pages::Alliances; -use ND::Web::Pages::MemberIntel; -use ND::Web::Pages::Resources; -use ND::Web::Pages::PlanetNaps; -use ND::Web::Pages::Motd; -use ND::Web::Pages::Forum; -use ND::Web::Pages::Settings; -use ND::Web::Pages::Graph; -use ND::Web::Pages::Mail; -use ND::Web::Pages::HostileAlliances; -use ND::Web::Pages::AllianceRankings; -use ND::Web::Pages::GalaxyRankings; -use ND::Web::Pages::TargetList; -use ND::Web::Pages::DefLeeches; +use NDWeb::AuthHandler; +use NDWeb::Include; +use NDWeb::Forum; +use NDWeb::Graph; + +use NDWeb::Page; +use NDWeb::Image; +use NDWeb::XMLPage; + +use NDWeb::Pages::Main; +use NDWeb::Pages::AddIntel; +use NDWeb::Pages::Points; +use NDWeb::Pages::LaunchConfirmation; +use NDWeb::Pages::CovOp; +use NDWeb::Pages::PlanetRankings; +use NDWeb::Pages::DefRequest; +use NDWeb::Pages::Check; +use NDWeb::Pages::Raids; +use NDWeb::Pages::EditRaid; +use NDWeb::Pages::Calls; +use NDWeb::Pages::Users; +use NDWeb::Pages::Intel; +use NDWeb::Pages::Alliances; +use NDWeb::Pages::MemberIntel; +use NDWeb::Pages::Resources; +use NDWeb::Pages::PlanetNaps; +use NDWeb::Pages::Motd; +use NDWeb::Pages::Forum; +use NDWeb::Pages::Settings; +use NDWeb::Pages::Graph; +use NDWeb::Pages::Mail; +use NDWeb::Pages::HostileAlliances; +use NDWeb::Pages::AllianceRankings; +use NDWeb::Pages::GalaxyRankings; +use NDWeb::Pages::TargetList; +use NDWeb::Pages::DefLeeches; -- 2.39.2