From a3e244086ef74a8cd2c2c9013b769d6b5c37d798 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Sat, 9 Oct 2004 06:19:11 +0000 Subject: [PATCH] fixed SQL quoting for parentId --- lib/WebGUI/Operation/Clipboard.pm | 8 ++++---- lib/WebGUI/Operation/Trash.pm | 4 ++-- lib/WebGUI/Page.pm | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/WebGUI/Operation/Clipboard.pm b/lib/WebGUI/Operation/Clipboard.pm index ab69ca71a..52f626bdd 100644 --- a/lib/WebGUI/Operation/Clipboard.pm +++ b/lib/WebGUI/Operation/Clipboard.pm @@ -97,19 +97,19 @@ sub www_deleteClipboardItemConfirm { WebGUI::ErrorHandler::audit("moved wobject ". $session{form}{wid} ." from clipboard to trash"); } elsif ($session{form}{pageId} ne "") { if ( ($session{setting}{sharedClipboard} eq "1") || (WebGUI::Grouping::isInGroup(3)) ) { - WebGUI::SQL->write("update page set parentId=3, " + WebGUI::SQL->write("update page set parentId='3', " ."bufferDate=".time().", " ."bufferUserId=".quote($session{user}{userId}) .", " ."bufferPrevId=2 " - ."where parentId=2 " + ."where parentId='2' " ."and pageId=".quote($session{form}{pageId}) ); } else { - WebGUI::SQL->write("update page set parentId=3, " + WebGUI::SQL->write("update page set parentId='3', " ."bufferDate=".time().", " ."bufferUserId=".quote($session{user}{userId}) .", " ."bufferPrevId=2 " - ."where parentId=2 " + ."where parentId='2' " ."and pageId=".quote($session{form}{pageId}) ." " ."and bufferUserId=".quote($session{user}{userId}) ); diff --git a/lib/WebGUI/Operation/Trash.pm b/lib/WebGUI/Operation/Trash.pm index 7f74d5fef..535b15c5d 100644 --- a/lib/WebGUI/Operation/Trash.pm +++ b/lib/WebGUI/Operation/Trash.pm @@ -294,10 +294,10 @@ sub www_manageTrash { # Generate list of pages in trash if ($allUsers) { $sth = WebGUI::SQL->read("select pageId,title,urlizedTitle,bufferUserId,bufferDate,bufferPrevId " - ."from page where parentId=3 order by bufferDate"); + ."from page where parentId='3' order by bufferDate"); } else { $sth = WebGUI::SQL->read("select pageId,title,urlizedTitle,bufferUserId,bufferDate,bufferPrevId " - ."from page where parentId=3 and bufferUserId=" + ."from page where parentId='3' and bufferUserId=" . quote($session{user}{userId}) . " order by bufferDate"); } while (@data = $sth->array) { diff --git a/lib/WebGUI/Page.pm b/lib/WebGUI/Page.pm index e7108266d..5597d4f75 100644 --- a/lib/WebGUI/Page.pm +++ b/lib/WebGUI/Page.pm @@ -1296,7 +1296,7 @@ sub paste{ # You do not want to paste a page onto itself, believe me. return $self if ($self->get("pageId") eq $newMother->get("pageId")); return WebGUI::ErrorHandler::fatalError("You cannot paste a page that's not on the clipboard. parentId:". - $self->get("parentId").", pageId:".$self->get("pageId")) unless ($self->get("parentId") == 2); + $self->get("parentId").", pageId:".$self->get("pageId")) unless ($self->get("parentId") eq "2"); # Place page in clipboard (pageId 2) if ($self->move($newMother)) {