fixed SQL quoting for parentId

This commit is contained in:
Colin Kuskie 2004-10-09 06:19:11 +00:00
parent d769d1aeab
commit a3e244086e
3 changed files with 7 additions and 7 deletions

View file

@ -97,19 +97,19 @@ sub www_deleteClipboardItemConfirm {
WebGUI::ErrorHandler::audit("moved wobject ". $session{form}{wid} ." from clipboard to trash"); WebGUI::ErrorHandler::audit("moved wobject ". $session{form}{wid} ." from clipboard to trash");
} elsif ($session{form}{pageId} ne "") { } elsif ($session{form}{pageId} ne "") {
if ( ($session{setting}{sharedClipboard} eq "1") || (WebGUI::Grouping::isInGroup(3)) ) { 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().", " ."bufferDate=".time().", "
."bufferUserId=".quote($session{user}{userId}) .", " ."bufferUserId=".quote($session{user}{userId}) .", "
."bufferPrevId=2 " ."bufferPrevId=2 "
."where parentId=2 " ."where parentId='2' "
."and pageId=".quote($session{form}{pageId}) ."and pageId=".quote($session{form}{pageId})
); );
} else { } else {
WebGUI::SQL->write("update page set parentId=3, " WebGUI::SQL->write("update page set parentId='3', "
."bufferDate=".time().", " ."bufferDate=".time().", "
."bufferUserId=".quote($session{user}{userId}) .", " ."bufferUserId=".quote($session{user}{userId}) .", "
."bufferPrevId=2 " ."bufferPrevId=2 "
."where parentId=2 " ."where parentId='2' "
."and pageId=".quote($session{form}{pageId}) ." " ."and pageId=".quote($session{form}{pageId}) ." "
."and bufferUserId=".quote($session{user}{userId}) ."and bufferUserId=".quote($session{user}{userId})
); );

View file

@ -294,10 +294,10 @@ sub www_manageTrash {
# Generate list of pages in trash # Generate list of pages in trash
if ($allUsers) { if ($allUsers) {
$sth = WebGUI::SQL->read("select pageId,title,urlizedTitle,bufferUserId,bufferDate,bufferPrevId " $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 { } else {
$sth = WebGUI::SQL->read("select pageId,title,urlizedTitle,bufferUserId,bufferDate,bufferPrevId " $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"); . quote($session{user}{userId}) . " order by bufferDate");
} }
while (@data = $sth->array) { while (@data = $sth->array) {

View file

@ -1296,7 +1296,7 @@ sub paste{
# You do not want to paste a page onto itself, believe me. # You do not want to paste a page onto itself, believe me.
return $self if ($self->get("pageId") eq $newMother->get("pageId")); 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:". 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) # Place page in clipboard (pageId 2)
if ($self->move($newMother)) { if ($self->move($newMother)) {