[Everydevel-opers] SF.net SVN: everydevel: [926] trunk/ebase

[<pau...@us...>]

Revision: 926
          http://svn.sourceforge.net/everydevel/?rev=926&view=rev
Author:   paul_the_nomad
Date:     2006-12-10 05:42:14 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
Task 133810 - Exports from HTML.pm and Everything/Nodeball.pm to export on
request only

Modified Paths:
--------------
    trunk/ebase/bin/nbmasta
    trunk/ebase/lib/Everything/HTML/FormObject/AuthorMenu.pm
    trunk/ebase/lib/Everything/HTML.pm
    trunk/ebase/lib/Everything/Nodeball.pm
    trunk/ebase/web/index.in

Modified: trunk/ebase/bin/nbmasta
===================================================================
--- trunk/ebase/bin/nbmasta	2006-12-10 10:55:45 UTC (rev 925)
+++ trunk/ebase/bin/nbmasta	2006-12-10 13:42:14 UTC (rev 926)
@@ -12,7 +12,7 @@
 use strict;
 use Everything;
 use Everything::Node;
-use Everything::Nodeball;
+use Everything::Nodeball ':all';
 use Everything::XML;
 
 my $usagestr =<<END_HERE;

Modified: trunk/ebase/lib/Everything/HTML/FormObject/AuthorMenu.pm
===================================================================
--- trunk/ebase/lib/Everything/HTML/FormObject/AuthorMenu.pm	2006-12-10 10:55:45 UTC (rev 925)
+++ trunk/ebase/lib/Everything/HTML/FormObject/AuthorMenu.pm	2006-12-10 13:42:14 UTC (rev 926)
@@ -11,7 +11,6 @@
 
 use strict;
 use Everything;
-use Everything::HTML;
 
 use Everything::HTML::FormObject;
 use vars qw(@ISA);

Modified: trunk/ebase/lib/Everything/HTML.pm
===================================================================
--- trunk/ebase/lib/Everything/HTML.pm	2006-12-10 10:55:45 UTC (rev 925)
+++ trunk/ebase/lib/Everything/HTML.pm	2006-12-10 13:42:14 UTC (rev 926)
@@ -17,39 +17,35 @@
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 
-sub BEGIN
-{
-	use Exporter ();
-	use vars qw($DB $AUTH $VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-	@ISA    = qw(Exporter);
-	@EXPORT = qw(
-		$DB
-		%HTMLVARS
-		%GLOBAL
-		$query
-		$AUTH
-		newFormObject
-		parseLinks
-		htmlScreen
-		htmlFormatErr
-		quote
-		urlGen
-		getPage
-		getPageForType
-		linkNode
-		linkNodeTitle
-		searchForNodeByName
-		evalX
-		evalXTrapErrors
-		htmlcode
-		embedCode
-		displayPage
-		gotoNode
-		encodeHTML
-		decodeHTML
-		mod_perlInit);
-}
+use base 'Exporter';
+our @EXPORT_OK = qw(
+  $DB
+  %HTMLVARS
+  %GLOBAL
+  $query
+  $AUTH
+  newFormObject
+  parseLinks
+  htmlScreen
+  htmlFormatErr
+  quote
+  urlGen
+  getPage
+  getPageForType
+  linkNode
+  linkNodeTitle
+  searchForNodeByName
+  evalX
+  evalXTrapErrors
+  htmlcode
+  embedCode
+  displayPage
+  gotoNode
+  encodeHTML
+  decodeHTML
+  mod_perlInit);
 
+our ($AUTH, $DB);
 use vars qw( $query $GNODE $NODELET $THEME $USER $VARS %HTMLVARS %INCJS );
 
 # This is used for nodes to pass vars back-n-forth

Modified: trunk/ebase/lib/Everything/Nodeball.pm
===================================================================
--- trunk/ebase/lib/Everything/Nodeball.pm	2006-12-10 10:55:45 UTC (rev 925)
+++ trunk/ebase/lib/Everything/Nodeball.pm	2006-12-10 13:42:14 UTC (rev 926)
@@ -11,14 +11,11 @@
 use Everything;
 use Everything::XML (qw/xmlfile2node fixNodes/);
 
-use vars qw(%OPTIONS);
+our %OPTIONS;
 
-sub BEGIN
-{
-	use Exporter();
-	use vars qw($VERSIONS @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-	@ISA    = qw(Exporter);
-	@EXPORT = qw(
+use base 'Exporter';
+
+our @EXPORT_OK = qw(
 		%OPTIONS
 		setupOptions
 		removeNodeball
@@ -48,8 +45,9 @@
 		buildSqlCmdline
 		printSettings
 	);
-}
 
+our %EXPORT_TAGS = ( all => \@EXPORT_OK );
+
 =cut
 
 

Modified: trunk/ebase/web/index.in
===================================================================
--- trunk/ebase/web/index.in	2006-12-10 10:55:45 UTC (rev 925)
+++ trunk/ebase/web/index.in	2006-12-10 13:42:14 UTC (rev 926)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w 
 
 use strict;
-use Everything::HTML;
+use Everything::HTML qw/mod_perlInit/;
 
 # >>> Extra Packages
 # <<< Extra Packages


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.