From 2e1de9d214e309e80b090e397ba3169796f5c20b Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 30 May 2006 15:50:13 +0000
Subject: [PATCH]  - fix: Column Layout seems a little messed up  - Fixed the
 EMS default templates to expose all functionality.  - Fixed a problem in the
 EMS where it wouldn't let you add any events.  - fix: FieldName incorrect
 after adding profile field  - fix: preload.perl for other roots than
 /data/WebGUI  - Fixed a bug where polls weren't distributing karma.

---
 docs/changelog/6.x.x.txt           |  6 ++++++
 lib/WebGUI/Asset/Wobject/Layout.pm | 14 +++++++-------
 lib/WebGUI/Asset/Wobject/Poll.pm   |  3 +--
 lib/WebGUI/ProfileField.pm         |  2 +-
 lib/WebGUI/i18n/English/WebGUI.pm  |  4 ++--
 sbin/preload.perl                  |  2 +-
 6 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index e652e2386..02a5edc65 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,6 +1,12 @@
 6.99.3
  - Someone removed the status from the submission templates. That has been
    fixed.
+ - fix: Column Layout seems a little messed up
+ - Fixed the EMS default templates to expose all functionality.
+ - Fixed a problem in the EMS where it wouldn't let you add any events.
+ - fix: FieldName incorrect after adding profile field
+ - fix: preload.perl for other roots than /data/WebGUI
+ - Fixed a bug where polls weren't distributing karma.
 
 6.99.2
  - fix - demo.plainblack.com getting started
diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm
index b3e5c0737..1aeebf4b6 100644
--- a/lib/WebGUI/Asset/Wobject/Layout.pm
+++ b/lib/WebGUI/Asset/Wobject/Layout.pm
@@ -146,7 +146,8 @@ sub prepareView {
 	# I'm sure there's a more efficient way to do this. We'll figure it out someday.
 	my @positions = split(/\./,$self->get("contentPositions"));
 	my @hidden = split("\n",$self->get("assetsToHide"));
-	my @placeHolder = ();
+	my @placeHolder1 = ();
+	my @placeHolderN = ();
 	my $i = 1;
 	my $template = WebGUI::Asset->new($self->session,$self->get("templateId"),"WebGUI::Asset::Template");
 	my $templateContent = $template->get("template");
@@ -164,13 +165,14 @@ sub prepareView {
 					unless (isIn($asset,@hidden) || !($child->canView)) {
 						$self->session->style->setRawHeadTags($child->getExtraHeadTags);
 						$child->prepareView;
-						push(@placeHolder, $child);
-						if ($i > $numPositions) {
+						if ($i > $numPositions || $i==1) {
+							push(@placeHolder1, $child);
 							push(@{$vars{"position1_loop"}},{
 								id=>$child->getId,
 								content=>"~~~"
 							});
 						} else {
+							push(@placeHolderN, $child);
 							push(@{$vars{"position".$i."_loop"}},{
 								id=>$child->getId,
 								content=>"~~~"
@@ -188,7 +190,7 @@ sub prepareView {
 		unless (isIn($child->getId, @found)||isIn($child->getId,@hidden)) {
 			if ($child->canView) {
 				$child->prepareView;
-				push(@placeHolder, $child);
+				push(@placeHolder1, $child);
 				push(@{$vars{"position1_loop"}},{
 					id=>$child->getId,
 					content=>"~~~"
@@ -196,7 +198,7 @@ sub prepareView {
 			}
 		}
 	}
-	$self->{_viewPlaceholders} = \@placeHolder;
+	@{$self->{_viewPlaceholders}} = (@placeHolder1, @placeHolderN);
 	$vars{showAdmin} = ($self->session->var->isAdminOn && $self->canEdit);
 	$self->{_viewVars} = \%vars;
 	if ($vars{showAdmin}) {
@@ -220,9 +222,7 @@ sub view {
 	if ($self->{_viewVars}{showAdmin} && $self->canEditIfLocked) {
 		# under normal circumstances we don't put HTML stuff in our code, but this will make it much easier
 		# for end users to work with our templates
-		#$self->{_viewVars}{"dragger.icon"} = $self->session->icon->drag();
 		$self->{_viewVars}{"dragger.icon"} = '<div id="dragTrigger" class="dragTrigger">'.$self->session->icon->drag('class="dragTrigger"').'</div></div>';
-		#$self->{_viewVars}{"dragger.icon"} = '<div id="dragTrigger" class="dragTrigger dragTriggerFormatting"> / / / / / / / / / / </div>';
 		$self->{_viewVars}{"dragger.init"} = '
 			<iframe id="dragSubmitter" style="display: none;" src="'.$self->session->url->extras('spacer.gif').'"></iframe>
 			<script type="text/javascript">
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index d0b5cb4db..f8dc92548 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -414,8 +414,7 @@ sub www_vote {
         if ($self->session->form->process("answer") ne "" && $self->session->user->isInGroup($self->get("voteGroup")) && !($self->_hasVoted())) {
         	$self->setVote($self->session->form->process("answer"),$self->session->user->userId,$self->session->env->get("REMOTE_ADDR"));
 		if ($self->session->setting->get("useKarma")) {
-			$u = WebGUI::User->new($self->session->user->userId);
-			$u->karma($self->get("karmaPerVote"),"Poll (".$self->getId.")","Voted on this poll.");
+			$self->session->user->karma($self->get("karmaPerVote"),"Poll (".$self->getId.")","Voted on this poll.");
 		}
 		$self->getContainer->purgeCache;
 	}
diff --git a/lib/WebGUI/ProfileField.pm b/lib/WebGUI/ProfileField.pm
index cbbed8642..863723673 100644
--- a/lib/WebGUI/ProfileField.pm
+++ b/lib/WebGUI/ProfileField.pm
@@ -86,7 +86,7 @@ sub create {
 	my $categoryId = shift || "1";
 	my ($fieldNameExists) = $session->db->quickArray("select count(*) from userProfileField where fieldName=".$session->db->quote($fieldName));
 	return undef if ($fieldNameExists);
-        my $id = $session->db->setRow("userProfileField","fieldName",{fieldName=>"new"},undef,$fieldName);
+        my $id = $session->db->setRow("userProfileField","fieldName",{fieldName=>"new"},$fieldName);
         my $self = $class->new($session,$id);
 	$self->setCategory($categoryId);
         $self->set($properties);
diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index 878359ad1..ef9d4a13d 100644
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -2835,8 +2835,8 @@ The headings of columns on things like message boards and user contributions.
 	},
 
 	'319' => {
-		message => q|<p><a href="http://messenger.msn.com/">MSN Messenger</a> Id</p>|,
-		lastUpdated => 1031514049
+		message => q|<a href="http://messenger.msn.com/">MSN Messenger</a> Id|,
+		lastUpdated => 1149003146
 	},
 
 	'1052' => {
diff --git a/sbin/preload.perl b/sbin/preload.perl
index cc83a7e3f..1cd1493dc 100644
--- a/sbin/preload.perl
+++ b/sbin/preload.perl
@@ -84,7 +84,7 @@ sub getWebGUIModules {
         my $filename = $File::Find::dir."/".$_;
         return unless $filename =~ m/\.pm$/;
         my $package = $filename;
-        $package =~ s/^\/data\/WebGUI\/lib\/(.*)\.pm$/$1/;
+        $package =~ s/^$webguiRoot\/lib\/(.*)\.pm$/$1/;
         $package =~ s/\//::/g;
         push(@modules,$package);
 }