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

Fixes to restore Postgres compatibility.

Browse source
This commit is contained in:
JT Smith 2002-08-17 20:00:08 +00:00
parent 64218127cb
commit dc247baefd
9 changed files with 76 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/WebGUI/Wobject/DownloadManager.pm
View file

@ -242,8 +242,9 @@ sub www_editDownload {
if (WebGUI::Privilege::canEditPage()) {
if ($session{form}{did} eq "") {
$session{form}{did} = "new";
} else {
%download = WebGUI::SQL->quickHash("select * from DownloadManager_file where downloadId='$session{form}{did}'");
}
%download = WebGUI::SQL->quickHash("select * from DownloadManager_file where downloadId='$session{form}{did}'");
$output .= helpIcon(2,$namespace);
$output .= '<h1>'.WebGUI::International::get(10,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new;

1
lib/WebGUI/Wobject/MessageBoard.pm
View file

@ -199,6 +199,7 @@ sub www_unlockThread {
#-------------------------------------------------------------------
sub www_view {
my ($sth, %data, $html, $i, $pn, $lastId, @last, $replies);
tie %data, 'Tie::CPHash';
if ($session{form}{pn} < 1) {
$pn = 0;
} else {

12
lib/WebGUI/Wobject/Product.pm
View file

@ -527,8 +527,7 @@ sub www_editBenefit {
$output .= '<h1>'.WebGUI::International::get(53,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->hidden("wid",$_[0]->get("wobjectId"));
$session{form}{bid} = "new" if ($session{form}{bid} eq "");
$f->hidden("bid",$session{form}{bid});
$f->hidden("bid",$data->{productBenefitId});
$f->hidden("func","editBenefitSave");
$benefits = WebGUI::SQL->buildHashRef("select benefit,benefit from Product_benefit order by benefit");
$f->combo("benefit",$benefits,WebGUI::International::get(51,$namespace),[$data->{benefits}]);
@ -570,8 +569,7 @@ sub www_editFeature {
$output .= '<h1>'.WebGUI::International::get(22,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->hidden("wid",$_[0]->get("wobjectId"));
$session{form}{fid} = "new" if ($session{form}{fid} eq "");
$f->hidden("fid",$session{form}{fid});
$f->hidden("fid",$data->{productFeatureId});
$f->hidden("func","editFeatureSave");
$features = WebGUI::SQL->buildHashRef("select feature,feature from Product_feature order by feature");
$f->combo("feature",$features,WebGUI::International::get(23,$namespace),[$data->{feature}]);
@ -613,8 +611,7 @@ sub www_editSpecification {
$output .= '<h1>'.WebGUI::International::get(25,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->hidden("wid",$_[0]->get("wobjectId"));
$session{form}{sid} = "new" if ($session{form}{sid} eq "");
$f->hidden("sid",$session{form}{sid});
$f->hidden("sid",$data->{productSpecificationId});
$f->hidden("func","editSpecificationSave");
$hashRef = WebGUI::SQL->buildHashRef("select name,name from Product_specification order by name");
$f->combo("name",$hashRef,WebGUI::International::get(26,$namespace),[$data->{name}]);
@ -662,8 +659,7 @@ sub www_editTemplate {
$output .= '<h1>'.WebGUI::International::get(58,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->hidden("wid",$_[0]->get("wobjectId"));
$session{form}{tid} = "new" if ($session{form}{tid} eq "");
$f->hidden("tid",$session{form}{tid});
$f->hidden("tid",$data->{productTemplateId});
$f->hidden("func","editTemplateSave");
$f->text("name",WebGUI::International::get(59,$namespace),$data->{name});
$f->HTMLArea("template",WebGUI::International::get(60,$namespace),$data->{template},'','','',($session{setting}{textAreaRows}+10));

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

@ -428,36 +428,36 @@ sub www_editSave {
#-------------------------------------------------------------------
sub www_editSubmission {
my ($output, %submission, $f, @submission, $sth);
tie %submission, 'Tie::CPHash';
%submission = WebGUI::SQL->quickHash("select * from UserSubmission_submission where submissionId='$session{form}{sid}'");
if ($session{form}{sid} eq "new") {
$submission{convertCarriageReturns} = 1;
$submission{userId} = $session{user}{userId};
my ($output, $submission, $f, @submission, $sth);
$submission = $_[0]->getCollateral("UserSubmission_submission","submissionId",$session{form}{sid});
if ($submission->{submissionId} eq "new") {
$submission->{convertCarriageReturns} = 1;
$submission->{userId} = $session{user}{userId};
}
if (WebGUI::Privilege::isInGroup($_[0]->get("groupToContribute"))
|| $submission{userId} == $session{user}{userId}
|| $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});
$f->hidden("sid",$session{form}{sid});
$f->hidden("sid",$submission->{submissionId});
$f->hidden("func","editSubmissionSave");
$f->text("title",WebGUI::International::get(35,$namespace),$submission{title});
$f->HTMLArea("content",WebGUI::International::get(31,$namespace),$submission{content});
if ($submission{image} ne "") {
$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteImage&wid='.$session{form}{wid}.'&sid='.$session{form}{sid}).'">'
$f->text("title",WebGUI::International::get(35,$namespace),$submission->{title});
$f->HTMLArea("content",WebGUI::International::get(31,$namespace),$submission->{content});
if ($submission->{image} ne "") {
$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteImage&wid='.$session{form}{wid}.'&sid='.$submission->{submissionId}).'">'
.WebGUI::International::get(391).'</a>',WebGUI::International::get(32,$namespace));
} else {
$f->file("image",WebGUI::International::get(32,$namespace));
}
if ($submission{attachment} ne "") {
$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteAttachment&wid='.$session{form}{wid}.'&sid='.$session{form}{sid}).'">'
if ($submission->{attachment} ne "") {
$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteAttachment&wid='.$session{form}{wid}
.'&sid='.$submission->{submissionId}).'">'
.WebGUI::International::get(391).'</a>',WebGUI::International::get(33,$namespace));
} else {
$f->file("attachment",WebGUI::International::get(33,$namespace));
}
$f->yesNo("convertCarriageReturns",WebGUI::International::get(34,$namespace),$submission{convertCarriageReturns},
$f->yesNo("convertCarriageReturns",WebGUI::International::get(34,$namespace),$submission->{convertCarriageReturns},
'',' &nbsp; '.WebGUI::International::get(38,$namespace));
$f->submit;
$output .= $f->print;
@ -470,12 +470,11 @@ sub www_editSubmission {
#-------------------------------------------------------------------
sub www_editSubmissionSave {
my ($sqlAdd,$owner,$image,$attachment,$title,$u);
($owner) = WebGUI::SQL->quickArray("select userId from UserSubmission_submission where submissionId='$session{form}{sid}'");
if ($owner == $session{user}{userId}
|| ($session{form}{sid} eq "new" && WebGUI::Privilege::isInGroup($_[0]->get("groupToContribute")))
|| WebGUI::Privilege::isInGroup($_[0]->get("groupToApprove"))) {
if ($session{form}{sid} eq "new") {
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->{submissionId} eq "new") {
$session{form}{sid} = getNextId("submissionId");
WebGUI::SQL->write("insert into UserSubmission_submission (wobjectId,submissionId,userId,username)
values (".$_[0]->get("wobjectId").",$session{form}{sid},$session{user}{userId},".quote($session{user}{username}).")");