diff --git a/lib/WebGUI/Operation/Package.pm b/lib/WebGUI/Operation/Package.pm index 8fbb53db9..79ff917b5 100644 --- a/lib/WebGUI/Operation/Package.pm +++ b/lib/WebGUI/Operation/Package.pm @@ -7,7 +7,7 @@ package WebGUI::Operation::Package; # (docs/license.txt) that came with this distribution before using # this software. #------------------------------------------------------------------- -# http://www.plainblack.com info@plainblack.com +# http://www.plainblack.com info@plainblack.com #------------------------------------------------------------------- use Exporter; @@ -25,41 +25,41 @@ our @EXPORT = qw(&www_deployPackage &www_selectPackageToDeploy); sub _duplicateWobjects { my ($sth, $wobject, $cmd, %hash, $extra, $w); $sth = WebGUI::SQL->read("select * from wobject where pageId=$_[0]"); - while ($wobject = $sth->hashRef) { + while ($wobject = $sth->hashRef) { $extra = WebGUI::SQL->quickHashRef("select * from ${$wobject}{namespace} where wobjectId=${$wobject}{wobjectId}"); tie %hash, 'Tie::CPHash'; %hash = (%{$wobject},%{$extra}); $wobject = \%hash; - $cmd = "WebGUI::Wobject::".${$wobject}{namespace}; - $w = $cmd->new($wobject); + $cmd = "WebGUI::Wobject::".${$wobject}{namespace}; + $w = $cmd->new($wobject); $w->duplicate($_[1]); - } - $sth->finish; + } + $sth->finish; } #------------------------------------------------------------------- sub _recursePageTree { - my ($a, %package, %newParent, $newPageId, $urlizedTitle); + my ($a, %package, %newParent, $newPageId, $urlizedTitle); tie %newParent, 'Tie::CPHash'; tie %package, 'Tie::CPHash'; %newParent = WebGUI::SQL->quickHash("select * from page where pageId=$_[1]"); _duplicateWobjects($_[0],$_[1]); - $a = WebGUI::SQL->read("select * from page where parentId=$_[0]"); - while (%package = $a->hash) { + $a = WebGUI::SQL->read("select * from page where parentId=$_[0]"); + while (%package = $a->hash) { $newPageId = getNextId("pageId"); $urlizedTitle = WebGUI::URL::makeUnique($package{urlizedTitle}); - WebGUI::SQL->write("insert into page values ($newPageId,$_[1],".quote($package{title}).",$newParent{styleId},$session{user}{userId},$newParent{ownerView},$newParent{ownerEdit},$newParent{groupId},$newParent{groupView},$newParent{groupEdit},$newParent{worldView},$newParent{worldEdit},$package{sequenceNumber},".quote($package{metaTags}).",".quote($urlizedTitle).",$package{defaultMetaTags},".quote($package{template}).",".quote($package{menuTitle}).",".quote($package{synopsis}).")"); - _recursePageTree($package{pageId},$newPageId); - } - $a->finish; + WebGUI::SQL->write("insert into page values ($newPageId,$_[1],".quote($package{title}).",$newParent{styleId},$session{user}{userId},$newParent{ownerView},$newParent{ownerEdit},$newParent{groupId},$newParent{groupView},$newParent{groupEdit},$newParent{worldView},$newParent{worldEdit},$package{sequenceNumber},".quote($package{metaTags}).",".quote($urlizedTitle).",".$package{defaultMetaTags}.",".quote($package{menuTitle}).",".quote($package{synopsis}).",".quote($package{templateId}).")"); + _recursePageTree($package{pageId},$newPageId); + } + $a->finish; } #------------------------------------------------------------------- sub www_selectPackageToDeploy { - my ($output, %data, $sth, $flag); - if (WebGUI::Privilege::canEditPage()) { + my ($output, %data, $sth, $flag); + if (WebGUI::Privilege::canEditPage()) { tie %data,'Tie::CPHash'; - $output = helpIcon(30); + $output = helpIcon(30); $output .= '

'.WebGUI::International::get(375).'

'; $output .= ''; - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + return $output; + } else { + return WebGUI::Privilege::insufficient(); + } } #------------------------------------------------------------------- sub www_deployPackage { - if (WebGUI::Privilege::canEditPage()) { + if (WebGUI::Privilege::canEditPage()) { _recursePageTree($session{form}{pid},$session{page}{pageId}); return ""; } else {