oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfixes

Browse source
This commit is contained in:
JT Smith 2004-09-13 05:55:21 +00:00
parent 85d935235e
commit a69ba26320
4 changed files with 38 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Operation/Collateral.pm
View file

@ -414,8 +414,8 @@ sub www_listCollateral {
WebGUI::Session::setScratch("collateralPageNumber",$session{form}{pn});
WebGUI::Session::setScratch("collateralFolderId",$session{form}{fid});
$folderId = $session{scratch}{collateralFolderId} || 0;
$constraints = "collateralFolderId=".$folderId;
$constraints .= " and userId=$session{scratch}{collateralUser}" if ($session{scratch}{collateralUser});
$constraints = "collateralFolderId=".quote($folderId);
$constraints .= " and userId=".quote($session{scratch}{collateralUser}) if ($session{scratch}{collateralUser});
$constraints .= " and collateralType=".quote($session{scratch}{collateralType}) if ($session{scratch}{collateralType});
$constraints .= " and name like ".quote('%'.$session{scratch}{keyword}.'%') if ($session{scratch}{keyword});
$p = WebGUI::Paginator->new(WebGUI::URL::page('op=listCollateral'),"",$session{scratch}{collateralPageNumber});

98
lib/WebGUI/Operation/Package.pm
View file

@ -41,83 +41,43 @@ sub _duplicateWobjects {
#-------------------------------------------------------------------
sub _recursePageTree {
my ($a, %package, %newParent, $newPageId, $sequenceNumber, $urlizedTitle);
my ($a, %package, %newParent,$currentPage,$page);
tie %newParent, 'Tie::CPHash';
tie %package, 'Tie::CPHash';
%newParent = WebGUI::SQL->quickHash("select * from page where pageId=".quote($_[1]));
%newParent = WebGUI::SQL->quickHash("select * from page where pageId=$_[1]");
_duplicateWobjects($_[0],$_[1]);
($sequenceNumber) = WebGUI::SQL->quickArray("select max(sequenceNumber) from page where parentId=".quote($_[1]));
$a = WebGUI::SQL->read("select * from page where parentId=".quote($_[0])." order by sequenceNumber");
$a = WebGUI::SQL->read("select * from page where parentId=$_[0] order by sequenceNumber");
while (%package = $a->hash) {
$newPageId = WebGUI::Id::generate();
$sequenceNumber++;
$urlizedTitle = WebGUI::Page::makeUnique($package{urlizedTitle});
WebGUI::SQL->write("insert into page (
pageId,
parentId,
title,
styleId,
ownerId,
groupIdView,
groupIdEdit,
sequenceNumber,
metaTags,
urlizedTitle,
defaultMetaTags,
menuTitle,
synopsis,
templateId,
startDate,
endDate,
redirectURL,
userDefined1,
userDefined2,
userDefined3,
userDefined4,
userDefined5,
hideFromNavigation,
newWindow,
encryptPage,
cacheTimeout,
cacheTimeoutVisitor,
printableStyleId,
wobjectPrivileges
) values (
$newPageId,
".quote($_[1]).",
".quote($package{title}).",
$newParent{styleId},
$session{user}{userId},
$newParent{groupIdView},
$newParent{groupIdEdit},
$sequenceNumber,
".quote($package{metaTags}).",
".quote($urlizedTitle).",
".$package{defaultMetaTags}.",
".quote($package{menuTitle}).",
".quote($package{synopsis}).",
".quote($package{templateId}).",
$newParent{startDate},
$newParent{endDate},
".quote($newParent{redirectURL}).",
".quote($newParent{userDefined1}).",
".quote($newParent{userDefined2}).",
".quote($newParent{userDefined3}).",
".quote($newParent{userDefined4}).",
".quote($newParent{userDefined5}).",
$package{hideFromNavigation},
$package{newWindow},
$package{encryptPage},
$package{cacheTimeout},
$package{cacheTimeoutVisitor},
".quote($package{printableStyleId}).",
$package{wobjectPrivileges}
)");
_recursePageTree($package{pageId},$newPageId);
$currentPage = WebGUI::Page->getPage($_[1]);
$page = $currentPage->add;
$page->set({
title => $package{title},
styleId => $newParent{styleId},
printableStyleId => $package{printableStyleId},
ownerId => $session{user}{userId},
groupIdView => $newParent{groupIdView},
groupIdEdit => $newParent{groupIdEdit},
newWindow => $package{newWindow},
wobjectPrivileges => $package{wobjectPrivileges},
hideFromNavigation => $package{hideFromNavigation},
startDate => $newParent{startDate},
endDate => $newParent{endDate},
cacheTimeout => $package{cacheTimeout},
cacheTimeoutVisitor => $package{cacheTimeoutVisitor},
metaTags => $package{metaTags},
urlizedTitle => WebGUI::Page::makeUnique($package{urlizedTitle}),
redirectURL => $newParent{redirectURL},
defaultMetaTags => $package{defaultMetaTags},
templateId => $package{templateId},
menuTitle => $package{menuTitle},
synopsis => $package{synopsis}
});
_recursePageTree($package{pageId},$page->get('pageId'));
}
$a->finish;
}
#-------------------------------------------------------------------
sub www_deployPackage {
if (WebGUI::Page::canEdit()) {