a ton of $session fixes (thanks to Colin), and a new $session checker, that supposedly, shouldn't be needed now. It can be backed out, however, easily.

lib/WebGUI/Macro/AOIHits.pm

@@ -35,7 +35,7 @@ The value for the key that will be looked up.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $key = shift; 
 	my $value = shift;
 	my $sql = "select count from passiveProfileAOI a, metaData_properties f 

lib/WebGUI/Macro/AOIRank.pm

@@ -35,7 +35,7 @@ Define which value, by it's ranking, will be displayed.  The highest ranking is
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $key = shift;
 	my $rank = shift || 1; # 1 is highest rank
 	$rank--;	# Rank is zero based

lib/WebGUI/Macro/AdminBar.pm

@@ -41,7 +41,7 @@ Admin bar to the left of the screen.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return "" unless ($session->var->isAdminOn);
 	my @param = @_;
         my $templateId = $param[0] || "PBtmpl0000000000000090";

lib/WebGUI/Macro/AdminText.pm

@@ -31,7 +31,7 @@ string is returned.
 
 #-------------------------------------------------------------------
 sub process {	
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my @param = @_;
         return "" unless ($session->var->get("adminOn"));
         return $param[0];

lib/WebGUI/Macro/AdminToggle.pm

@@ -45,7 +45,7 @@ A template from the Macro/AdminToggle namespace to use for formatting the link.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
          if ($session->user->isInGroup(12)) {
         	my %var;
                  my ($turnOn,$turnOff,$templateName) = @_;

lib/WebGUI/Macro/AssetProxy.pm

@@ -37,7 +37,7 @@ Admin is turned on.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $url = shift;
 	my $t = [Time::HiRes::gettimeofday()] if ($session->errorHandler->canShowPerformanceIndicators());
 	my $asset = WebGUI::Asset->newByUrl($session,$url);

lib/WebGUI/Macro/At_username.pm

@@ -26,7 +26,7 @@ Macro for displaying the current User's username.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->user->username;
 }
 

lib/WebGUI/Macro/CanEditText.pm

@@ -33,7 +33,7 @@ this asset, an empty string will be returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my @param = @_;
 	if ($session->asset && $session->asset->canEdit) { 
 		return $param[0];

lib/WebGUI/Macro/D_date.pm

@@ -37,7 +37,7 @@ time is used instead.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my (@param, $temp, $time);
         @param = @_;
 	$time = $param[1] ||$session->datetime->time();

lib/WebGUI/Macro/EditableToggle.pm

@@ -48,7 +48,7 @@ A template from the Macro/EditableToggle namespace to use for formatting the lin
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
          if ($session->asset && $session->asset->canEdit && $session->user->isInGroup(12)) {
         	my %var;
               my @param = @_;

lib/WebGUI/Macro/Env.pm

@@ -31,7 +31,7 @@ then undef will be returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->env->get(shift);
 }
 

lib/WebGUI/Macro/Execute.pm

@@ -33,7 +33,7 @@ be blocked and an error message returned instead.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my @param = @_;
 	if ($param[0] =~ /passwd/ || $param[0] =~ /shadow/ || $param[0] =~ /\.conf/) {
 		my $i18n = WebGUI::International->new($session, 'Macro_Execute');

lib/WebGUI/Macro/Extras.pm

@@ -29,7 +29,7 @@ Returns the extrasURL.  A trailing slash '/' is appended to the URL.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->config->get("extrasURL")."/";
 }
 

lib/WebGUI/Macro/FetchMimeType.pm

@@ -35,7 +35,7 @@ A path to a file
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $path = shift;
 	return guess_media_type($path);
 }

lib/WebGUI/Macro/FileUrl.pm

@@ -40,7 +40,7 @@ The URL to the Asset.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $url = shift;
 	my $asset = WebGUI::Asset->newByUrl($session,$url);
 	if (defined $asset) {

lib/WebGUI/Macro/FormParam.pm

@@ -32,7 +32,7 @@ The name of the field to pull from the session variable.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->form->process(shift);
 }
 

lib/WebGUI/Macro/GroupAdd.pm

@@ -44,7 +44,7 @@ An optional template for formatting the text and link.
 #-------------------------------------------------------------------
 sub process {
 	my @param = @_;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return "" if ($param[0] eq "");
 	return "" if ($param[1] eq "");
 	return "" if ($session->user->userId eq '1');

lib/WebGUI/Macro/GroupDelete.pm

@@ -43,7 +43,7 @@ An optional template for formatting the text and link.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my @param = @_;
 	return "" if ($param[0] eq "");
 	return "" if ($param[1] eq "");

lib/WebGUI/Macro/GroupText.pm

@@ -41,7 +41,7 @@ Text to be shown to someone not in the group.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my @param = @_;
 	my ($groupId) = $session->dbSlave->quickArray("select groupId from groups where groupName=".$session->db->quote($param[0]));
 	$groupId = 3 if ($groupId eq "");

lib/WebGUI/Macro/H_homeLink.pm

@@ -42,7 +42,7 @@ be used.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my ($label, $templateUrl) = @_;
 	my $home = WebGUI::Asset->getDefault($session);
 	if ($label ne "linkonly") {

lib/WebGUI/Macro/Hash_userId.pm

@@ -29,7 +29,7 @@ Returns the userId from the session variable for the current user.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->user->userId;
 }
 

lib/WebGUI/Macro/Include.pm

@@ -36,7 +36,7 @@ The complete path to a file in the local filesystem.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my (@param, $temp, $file);
         @param = @_;
 	my $i18n = WebGUI::International->new($session,'Macro_Include');

lib/WebGUI/Macro/JavaScript.pm

@@ -33,7 +33,7 @@ URL to the javascript to include in the page's header tags.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->style->setScript(shift,{type=>'text/javascript'});
 	return "";
 }

lib/WebGUI/Macro/L_loginBox.pm

@@ -36,7 +36,7 @@ text to wrap in a link for logging out.
 
 #-------------------------------------------------------------------
 sub _createURL {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $text = shift;
 	return '<a href="'.$session->url->page("op=auth;method=logout").'">'.$text.'</a>';
 }
@@ -61,7 +61,7 @@ The ID of a template for custom layout of the login box and text.
 =cut
 
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my @param = @_;
 	my $templateId = $param[2] || "PBtmpl0000000000000044";
 	my %var;	

lib/WebGUI/Macro/LastModified.pm

@@ -39,7 +39,7 @@ sprintf.  See L<WebGUI::DateTime/"epochToHuman"> for a list of codes.  Uses
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return '' unless $session->asset;
 	my ($label, $format, $time);
 	($label, $format) = @_;

lib/WebGUI/Macro/LoginToggle.pm

@@ -45,7 +45,7 @@ The ID of a template for custom layout of the link and text.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my @param = @_;
 	my $i18n = WebGUI::International->new($session,'Macro_LoginToggle');
         my $login = $param[0] || $i18n->get(716);

lib/WebGUI/Macro/Page.pm

@@ -33,7 +33,7 @@ The name of the property to retrieve from the assset via $session->asset->get()
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	if ($session->asset) {
 		return $session->asset->get(shift);
 	}

lib/WebGUI/Macro/PageTitle.pm

@@ -30,7 +30,7 @@ no asset cached in the session variable, nothing is returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	if ($session->asset) {
 		if ($session->form->process("op") || $session->form->process("func")) {
 	        	return '<a href="'.$session->asset->getUrl.'">'.$session->asset->get("title").'</a>';

lib/WebGUI/Macro/PageUrl.pm

@@ -28,7 +28,7 @@ process is really a wrapper around $session->url->page();
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->url->page();
 }
 

lib/WebGUI/Macro/Product.pm

@@ -27,7 +27,7 @@ is left blank, a default template from the Macro/Product namespace will be used.
 =cut
 
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my (@param, $productId, $variantId, $product, $variant, $output, $templateId, @variantLoop, %var);
 	
 	@param = @_;

lib/WebGUI/Macro/Quote.pm

@@ -32,7 +32,7 @@ The text to quote.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->db->quote(shift);
 	
 }

lib/WebGUI/Macro/RandomAssetProxy.pm

@@ -34,7 +34,7 @@ if no asset exists at that url, or if the asset has no children.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $url = shift;
 	my $i18n = WebGUI::International->new($session,'Macro_RandomAssetProxy');
 	my $asset = WebGUI::Asset->newByUrl($session, $url);

lib/WebGUI/Macro/RandomThread.pm

@@ -57,7 +57,7 @@ URL of the template to use to display the random thread. Must be a valid URL wit
 =cut
 
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($startURL, $relatives, $templateURL) = @_;
 	# Seed the randomizer:
 	srand;
@@ -129,7 +129,7 @@ Reference to an array with lineage of Collaboration Systems to select a random t
 =cut
 
 sub _getRandomThread {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $lineage = shift;
 
 	# Get random CS:

lib/WebGUI/Macro/RawHeadTags.pm

@@ -32,7 +32,7 @@ Text that will be added to the HEAD tags for this page.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->style->setRawHeadTags(shift);
 	return "";
 }

lib/WebGUI/Macro/RootTitle.pm

@@ -31,7 +31,7 @@ is returned.  Otherwise a space is returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	if ($session->asset) {
 		my $lineage = $session->asset->get("lineage");
 		$lineage = substr($lineage,0,6);

lib/WebGUI/Macro/SQL.pm

@@ -38,7 +38,7 @@ be used to position its output in the format.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($output, @data, $rownum, $temp);
 	my ($statement, $format) = @_;
 	my $i18n = WebGUI::International->new($session,'Macro_SQL');

lib/WebGUI/Macro/Slash_gatewayUrl.pm

@@ -28,7 +28,7 @@ process is really a wrapper around $session->url->gateway();
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->url->gateway();
 }
 

lib/WebGUI/Macro/Spacer.pm

@@ -38,7 +38,7 @@ Set the height of the spacer.
 =cut
 
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my ($output, @param, $width, $height);
         @param = @_;
         $width = $param[0] if defined $param[0];

lib/WebGUI/Macro/Splat_random.pm

@@ -34,7 +34,7 @@ used as a default.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my ($temp, @param);
         @param = @_;
         if ($param[0] ne "") {

lib/WebGUI/Macro/StyleSheet.pm

@@ -32,7 +32,7 @@ The URL to the CSS document.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->style->setLink(shift,{
 		type=>'text/css',
 		rel=>'stylesheet'

lib/WebGUI/Macro/SubscriptionItem.pm

@@ -28,7 +28,7 @@ be used from the Macro/SubscriptionItem namespace.
 =cut
 
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($subscriptionId, $templateId, %var);
 	($subscriptionId, $templateId) = @_;
 	%var = $session->db->quickHash('select * from subscription where subscriptionId='.$session->db->quote($subscriptionId));

lib/WebGUI/Macro/SubscriptionItemPurchaseUrl.pm

@@ -22,7 +22,7 @@ The ID of the subscription item to purchase.
 =cut
 
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->url->page('op=purchaseSubscription;sid='.shift);
 }
 

lib/WebGUI/Macro/Thumbnail.pm

@@ -32,7 +32,7 @@ Image Asset can be found with that URL, then undef will be returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $url = shift;
 	if (my $image = WebGUI::Asset::File::Image->newByUrl($session,$url)) {
 	        return $image->getThumbnailUrl;

lib/WebGUI/Macro/URLEncode.pm

@@ -33,7 +33,7 @@ The text to URL encode.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->url->escape(shift);
 }
 

lib/WebGUI/Macro/User.pm

@@ -29,7 +29,7 @@ the data stored in $session .  If the field does not exist, undef is returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return  $session->user->profileField(shift);
 }
 

lib/WebGUI/Macro/a_account.pm

@@ -39,7 +39,7 @@ A template to use for formatting the link.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my %var;
 	my  @param = @_;
 	return $session->url->page("op=auth;method=init") if ($param[0] eq "linkonly");

lib/WebGUI/Macro/c_companyName.pm

@@ -28,7 +28,7 @@ returns the companyName from the session variable.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->setting->get("companyName");
 }
 

lib/WebGUI/Macro/e_companyEmail.pm

@@ -28,7 +28,7 @@ returns the companyEmail from the session variable.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->setting->get("companyEmail");
 }
 

lib/WebGUI/Macro/r_printable.pm

@@ -49,7 +49,7 @@ is used.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my ($temp, @param, $styleId);
         @param = @_;
 	my $append = 'op=makePrintable';

lib/WebGUI/Macro/u_companyUrl.pm

@@ -29,7 +29,7 @@ returns the companyURL from the session variable.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->setting->get("companyURL");
 }