From e88fe856a267a1b58dd49f41ef04497b1be6c8cc Mon Sep 17 00:00:00 2001
From: Paul Driver <frodwith@gmail.com>
Date: Tue, 1 Jun 2010 12:29:45 -0700
Subject: [PATCH] style nits in www_importPackage

---
 lib/WebGUI/AssetPackage.pm | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/lib/WebGUI/AssetPackage.pm b/lib/WebGUI/AssetPackage.pm
index eb718386a..7d37a678f 100644
--- a/lib/WebGUI/AssetPackage.pm
+++ b/lib/WebGUI/AssetPackage.pm
@@ -346,10 +346,12 @@ sub www_exportPackage {
 =cut
 
 sub www_importPackage {
-	my $self = shift;
-	return $self->session->privilege->insufficient() unless ($self->canEdit && $self->session->user->isInGroup(4));
-	my $storage = WebGUI::Storage->createTemp($self->session);
-    my $inheritPermissions = $self->session->form->process('inheritPermissions');
+	my $self    = shift;
+	my $session = $self->session;
+	return $session->privilege->insufficient() unless ($self->canEdit && $session->user->isInGroup(4));
+
+	my $form    = $session->form;
+	my $storage = WebGUI::Storage->createTemp($session);
 
 	##This is a hack.  It should use the WebGUI::Form::File API to insulate
 	##us from future form name changes.
@@ -357,22 +359,25 @@ sub www_importPackage {
 
 	my $error = "";
 	if ($storage->getFileExtension($storage->getFiles->[0]) eq "wgpkg") {
-		$error = $self->importPackage($storage, {
-			inheritPermissions => $inheritPermissions,
-			clearPackageFlag   => $self->session->form->process('clearPackageFlag'),
-		});
+		$error = $self->importPackage(
+			$storage, {
+				inheritPermissions => $form->get('inheritPermissions'),
+				clearPackageFlag   => $form->get('clearPackageFlag'),
+			}
+		);
 	}
 	if (!blessed $error) {
-		my $i18n = WebGUI::International->new($self->session, "Asset");
-        if ($error eq 'corrupt') {
-            return $self->session->style->userStyle($i18n->get("package corrupt"));
-        }
-        else {
-            return $self->session->style->userStyle($i18n->get("package extract error"));
-        }
+		my $i18n  = WebGUI::International->new($session, "Asset");
+		my $style = $session->style;
+		if ($error eq 'corrupt') {
+			return $style->userStyle($i18n->get("package corrupt"));
+		}
+		else {
+			return $style->userStyle($i18n->get("package extract error"));
+		}
 	}
     # Handle autocommit workflows
-    if (WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session, {
+    if (WebGUI::VersionTag->autoCommitWorkingIfEnabled($session, {
         allowComments   => 1,
         returnUrl       => $self->getUrl,
     }) eq 'redirect') {