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

Bug fixes for 4.6.5

Browse source
This commit is contained in:
JT Smith 2002-08-28 02:16:09 +00:00
parent c5fc879565
commit e305e8ca07
6 changed files with 34 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI.pm
View file

@ -1,5 +1,5 @@
package WebGUI;
our $VERSION = "4.6.4";
our $VERSION = "4.6.5";
#-------------------------------------------------------------------
# WebGUI is Copyright 2001-2002 Plain Black LLC.

28
lib/WebGUI/Operation/Page.pm
View file

@ -75,20 +75,22 @@ sub _traversePageTree {
}
$a = WebGUI::SQL->read("select * from page where (pageId<2 or pageId>25) and parentId='$_[0]' order by sequenceNumber");
while (%page = $a->hash) {
$output .= $depth
.pageIcon()
.deleteIcon('op=deletePage',$page{urlizedTitle})
.editIcon('op=editPage',$page{urlizedTitle})
.' <a href="'.WebGUI::URL::gateway($page{urlizedTitle}).'">'.$page{title}.'</a><br>';
$b = WebGUI::SQL->read("select * from wobject where pageId=$page{pageId}");
while (%wobject = $b->hash) {
$output .= $depth.$spacer
.wobjectIcon()
.deleteIcon('func=delete&wid='.$wobject{wobjectId},$page{urlizedTitle})
.editIcon('func=edit&wid='.$wobject{wobjectId},$page{urlizedTitle})
.' '. $wobject{title}.'<br>';
if (WebGUI::Privilege::canEditPage($page{pageId})) {
$output .= $depth
.pageIcon()
.deleteIcon('op=deletePage',$page{urlizedTitle})
.editIcon('op=editPage',$page{urlizedTitle})
.' <a href="'.WebGUI::URL::gateway($page{urlizedTitle}).'">'.$page{title}.'</a><br>';
$b = WebGUI::SQL->read("select * from wobject where pageId=$page{pageId}");
while (%wobject = $b->hash) {
$output .= $depth.$spacer
.wobjectIcon()
.deleteIcon('func=delete&wid='.$wobject{wobjectId},$page{urlizedTitle})
.editIcon('func=edit&wid='.$wobject{wobjectId},$page{urlizedTitle})
.' '. $wobject{title}.'<br>';
}
$b->finish;
}
$b->finish;
$output .= _traversePageTree($page{pageId},$_[1]+1);
}
$a->finish;

7
lib/WebGUI/Wobject/UserSubmission.pm
View file

@ -434,9 +434,7 @@ sub www_editSubmission {
$submission->{convertCarriageReturns} = 1;
$submission->{userId} = $session{user}{userId};
}
if (WebGUI::Privilege::isInGroup($_[0]->get("groupToContribute"))
|| $submission->{userId} == $session{user}{userId}
|| WebGUI::Privilege::isInGroup($_[0]->get("groupToApprove"))) {
if (WebGUI::Privilege::isInGroup($_[0]->get("groupToContribute")) || $submission->{userId} == $session{user}{userId} || WebGUI::Privilege::isInGroup($_[0]->get("groupToApprove"))) {
$output = '<h1>'.WebGUI::International::get(19,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->hidden("wid",$session{form}{wid});
@ -472,8 +470,7 @@ sub www_editSubmission {
sub www_editSubmissionSave {
my ($sqlAdd,$submission,$image,$attachment,$title,$u);
$submission = $_[0]->getCollateral("UserSubmission_submission","submissionId",$session{form}{sid});
if ($submission->{owner} == $session{user}{userId} || ($submission->{submissionId} eq "new"
&& WebGUI::Privilege::isInGroup($_[0]->get("groupToContribute"))) || WebGUI::Privilege::isInGroup($_[0]->get("groupToApprove"))) {
if ($submission->{userId} == $session{user}{userId} || ($submission->{submissionId} eq "new" && WebGUI::Privilege::isInGroup($_[0]->get("groupToContribute"))) || WebGUI::Privilege::isInGroup($_[0]->get("groupToApprove"))) {
if ($submission->{submissionId} eq "new") {
$session{form}{sid} = getNextId("submissionId");
WebGUI::SQL->write("insert into UserSubmission_submission (wobjectId,submissionId,userId,username)