Replaced ND::Web with NDWeb

Hopefully this will work properly

diff --git a/ND.pm b/ND.pm
index 3912c1cebda22f9b5f9b8dc45adc403438209075..e9bc401f83138574447f6e1b9855782effd3d753 100755 (executable)
--- 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 529b2d12a6878e38e1562eceaeafd01bff7fb7f5..086d46b0ee44e2fdf03687b89a7c7486345fa4c0 100644 (file)
--- 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 ca2195e352f3d7bd313af97f8b95dabd70ac5809..810f547af6346541ca99576d5c6e4f5bb0532ffb 100644 (file)
--- 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 6f5ff477b2d1e7e3aa4d4ed6832894f593676bea..b564fc9b3ce07a2d226efd08d9de91dc9766c243 100644 (file)
--- 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 792f1ce629cbbab997b311a2ffa3ca2602b82966..eab37dfca486629b91e00211c71d37f876e76890 100644 (file)
--- 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 6916392aac0d37a8255574bc8455a9c3b2b24f24..434fc3137a73889d4ef285e842ea0608826b9ceb 100644 (file)
--- 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 2f80d86fe913fd21db85467ebbce91470a9d3365..e5e703d9ef4035227222c1a9b142b2742ebcc158 100644 (file)
--- 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 01d28505919079799f19159358993d7f5ee81d40..13659050c76122d2a211785cba341a8debf825fe 100644 (file)
--- 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 bd0a2d5ccc71d5765585caaffe0e3f0f6c5e1058..c29d540af821cb0696b4f05439349caa6cd76858 100644 (file)
--- 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 311adb3c7b726d41d452a7fdfd67dc4d21ce9154..d60f7a7feca96e2f1c56b8ebf2dd14f1853d7f06 100644 (file)
--- 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 ddddc7bc78a41527c4c2b8acb00febe73f02cd4e..a8a9843d378c9541056fe2bb8b792e4cba02d706 100644 (file)
--- 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 f68c949f6d4d6bb5d8cd9596b5c4fa44f96a1c10..e12d438c519711d4417ed7c40e9830baecc681a6 100644 (file)
--- 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 c1c9a046f60a1eca83ccb729fa0cd59cf9447b46..56250ab7ae1a5631eec4d5f2e301af8e819dc0b4 100644 (file)
--- 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 21f7dcb5948dbe8fd7d0fe192aaccd23e294cbf6..1f05da28bcbb785e9f6f2707a47cd6497d4a293b 100644 (file)
--- 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 ff3e0f863af48250f8bde5a5c64f9fb220adf92f..b8cec3127646da6ea5a829f6ab307cd19608ccae 100644 (file)
--- 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 e701f1d2d418492ee9912fd9e05dc4d88c2e1968..b0f4f99c7ca2a12e88448cc8087ccbfa20f93f3b 100644 (file)
--- 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 55cbe9615481a4ca5ffe35c84ba6fb47e80bd5c7..ac28bb023394e28ad7828cfc6a33e73d70e67d64 100644 (file)
--- 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 d09c8e592eb547e3e227b17b9e99d40fa7f81000..4be94715533c4a484e767c76ca2e1ad33db862fb 100644 (file)
--- 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 45cecda627e39830d8d51bdca1f950f294e42a31..a8530e03ae86e90a6be3f89b26b944a5c3b38156 100644 (file)
--- 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 c9c0916d3ecc28e0a2224550586b5abcb6a50e82..39ee1db6e84be3f519f431446de876c6d12fe696 100644 (file)
--- 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 c129d907c2109a465a28833533b54a6f0047ca8d..58a8c67510ab72320e08e516fc117114ca9e0655 100644 (file)
--- 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 afb4b55d2ba92d94533e6a04f655aac4ac760fd2..a7059b2e6a3fa089b42d241622b3b24e238a6eb5 100644 (file)
--- 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 858d0ded49585e663e33288b61f80f5a32e70ea4..0278ebe8bbbc8542dc6763e5c2bbd7cdd2e33991 100644 (file)
--- 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 f6a6696407e5ff41ecb07a5b434f122f37ae92f5..d35a5b174fa13174b824627d5c12622d429c46e4 100644 (file)
--- 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 476c35ed62dc93ae6047f0470fe01a6ea8e77b28..f6ef0c49a0d16ca416a5f7b29fe8de3869f693e5 100644 (file)
--- 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 2914191611461933035ead519d32a81f286eb7b3..5e7889d525f6b9764e000a12c9b51c014460d3d9 100644 (file)
--- 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 1a613809e7db24f0126a7a29ef5a95ef80b6152b..ded2c6c66176a7b4a8948404a40758d01b3c948d 100644 (file)
--- 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 d40fa3356844ede716e74fa596c9500b694be68e..3d9f50923c2548b8127c5cc970b85c3551729e23 100644 (file)
--- 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 04c17dd4fa8f9f0cd3b322f21a7419a27d87164f..fb69b2ace3cbca3d434aae4e11799495b2c84381 100644 (file)
--- 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 2ae5201e0a187cf78788b31005159b21539f7b98..139b76204e6351f9b9e3059c2148248f5ec1b12b 100644 (file)
--- 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 17790a1c7cabefeea6c6885c53d5705a9ea05029..ef098e049cd5eb59bd18be108ad17f1d3ea2650e 100644 (file)
--- 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 75c55403096492931ca1fb2c1fe6343aa3c83cd4..8c0441407398faaff1df29d2429ebb276626505a 100644 (file)
--- 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 67c4653d2fd9cfbdfd284bd863c55359a937e115..64fed86b117e187a0f3bccfbbb1f18b0e564daa8 100644 (file)
--- 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 8f6fa490b66b957e398d198dabb4d647baa49403..e0d48e67783bfb6fc92f9c974427bb92be609cbc 100644 (file)
--- 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 9e5fce64f846f32f6e11e25a370ca3509bf31d84..3e026080963f0fd4bcbe52dd322e199576e09379 100644 (file)
--- 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 c7b4d68125f4fd01a75f9cefba92610ad4d4c47c..2eb0caeff2e987967d68cc91507578c5a485aa25 100644 (file)
--- 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 19a3590f681cf7b84c007119adaef6494c4085d4..89cddb048d10bc5dbe2112292565dad1869d87fb 100644 (file)
--- 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;