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

Formatting and general code cleanup to reduce redundancy and increase readability.

Browse source
This commit is contained in:
JT Smith 2002-09-30 06:13:52 +00:00
parent d309be32f5
commit 65de90cbb5
17 changed files with 910 additions and 1103 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/WebGUI/Wobject.pm
View file

@ -379,18 +379,13 @@ sub inDateRange {
sub moveCollateralDown { sub moveCollateralDown {
my ($id, $seq); my ($id, $seq);
if (WebGUI::Privilege::canEditPage()) { ($seq) = WebGUI::SQL->quickArray("select sequenceNumber from $_[1] where $_[2]=$_[3] and wobjectId=".$_[0]->get("wobjectId"));
($seq) = WebGUI::SQL->quickArray("select sequenceNumber from $_[1] where $_[2]=$_[3] and wobjectId=".$_[0]->get("wobjectId")); ($id) = WebGUI::SQL->quickArray("select $_[2] from $_[1] where wobjectId=".$_[0]->get("wobjectId")
($id) = WebGUI::SQL->quickArray("select $_[2] from $_[1] where wobjectId=".$_[0]->get("wobjectId") ." and sequenceNumber=$seq+1 group by wobjectId");
." and sequenceNumber=$seq+1 group by wobjectId"); if ($id ne "") {
if ($id ne "") { WebGUI::SQL->write("update $_[1] set sequenceNumber=sequenceNumber+1 where $_[2]=$_[3] and wobjectId=".$_[0]->get("wobjectId"));
WebGUI::SQL->write("update $_[1] set sequenceNumber=sequenceNumber+1 where $_[2]=$_[3] and wobjectId=".$_[0]->get("wobjectId")); WebGUI::SQL->write("update $_[1] set sequenceNumber=sequenceNumber-1 where $_[2]=$id and wobjectId=".$_[0]->get("wobjectId"));
WebGUI::SQL->write("update $_[1] set sequenceNumber=sequenceNumber-1 where $_[2]=$id and wobjectId=".$_[0]->get("wobjectId")); }
}
return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -422,17 +417,12 @@ sub moveCollateralDown {
sub moveCollateralUp { sub moveCollateralUp {
my ($id, $seq); my ($id, $seq);
if (WebGUI::Privilege::canEditPage()) { ($seq) = WebGUI::SQL->quickArray("select sequenceNumber from $_[1] where $_[2]=$_[3] and wobjectId=".$_[0]->get("wobjectId"));
($seq) = WebGUI::SQL->quickArray("select sequenceNumber from $_[1] where $_[2]=$_[3] and wobjectId=".$_[0]->get("wobjectId")); ($id) = WebGUI::SQL->quickArray("select $_[2] from $_[1] where wobjectId=".$_[0]->get("wobjectId")
($id) = WebGUI::SQL->quickArray("select $_[2] from $_[1] where wobjectId=".$_[0]->get("wobjectId") ." and sequenceNumber=$seq-1 group by wobjectId");
." and sequenceNumber=$seq-1 group by wobjectId"); if ($id ne "") {
if ($id ne "") { WebGUI::SQL->write("update $_[1] set sequenceNumber=sequenceNumber-1 where $_[2]=$_[3] and wobjectId=".$_[0]->get("wobjectId"));
WebGUI::SQL->write("update $_[1] set sequenceNumber=sequenceNumber-1 where $_[2]=$_[3] and wobjectId=".$_[0]->get("wobjectId")); WebGUI::SQL->write("update $_[1] set sequenceNumber=sequenceNumber+1 where $_[2]=$id and wobjectId=".$_[0]->get("wobjectId"));
WebGUI::SQL->write("update $_[1] set sequenceNumber=sequenceNumber+1 where $_[2]=$id and wobjectId=".$_[0]->get("wobjectId"));
}
return "";
} else {
return WebGUI::Privilege::insufficient();
} }
} }

84
lib/WebGUI/Wobject/Article.pm
View file

@ -56,60 +56,54 @@ sub set {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $editTimeout, $groupToModerate, %hash, $f); my ($output, $editTimeout, $groupToModerate, %hash, $f);
tie %hash, 'Tie::IxHash'; tie %hash, 'Tie::IxHash';
if (WebGUI::Privilege::canEditPage()) { if ($_[0]->get("wobjectId") eq "new") {
if ($_[0]->get("wobjectId") eq "new") { $editTimeout = 1;
$editTimeout = 1;
} else {
$editTimeout = $_[0]->get("editTimeout");
}
$groupToModerate = $_[0]->get("groupToModerate") || 4;
$output = helpIcon(1,$namespace);
$output .= '<h1>'.WebGUI::International::get(12,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->raw($_[0]->fileProperty("image",6));
%hash = (
right => WebGUI::International::get(15,$namespace),
left => WebGUI::International::get(16,$namespace),
center => WebGUI::International::get(17,$namespace)
);
$f->select("alignImage",\%hash,WebGUI::International::get(14,$namespace),[$_[0]->get("alignImage")]);
$f->raw($_[0]->fileProperty("attachment",9));
$f->text("linkTitle",WebGUI::International::get(7,$namespace),$_[0]->get("linkTitle"));
$f->url("linkURL",WebGUI::International::get(8,$namespace),$_[0]->get("linkURL"));
$f->yesNo("convertCarriageReturns",WebGUI::International::get(10,$namespace),$_[0]->get("convertCarriageReturns")
,'',' &nbsp; <span style="font-size: 8pt;">'.WebGUI::International::get(11,$namespace).'</span>');
$f->yesNo("allowDiscussion",WebGUI::International::get(18,$namespace),$_[0]->get("allowDiscussion"));
$f->raw($_[0]->SUPER::discussionProperties);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
return $output;
} else { } else {
return WebGUI::Privilege::insufficient(); $editTimeout = $_[0]->get("editTimeout");
} }
$groupToModerate = $_[0]->get("groupToModerate") || 4;
$output = helpIcon(1,$namespace);
$output .= '<h1>'.WebGUI::International::get(12,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->raw($_[0]->fileProperty("image",6));
%hash = (
right => WebGUI::International::get(15,$namespace),
left => WebGUI::International::get(16,$namespace),
center => WebGUI::International::get(17,$namespace)
);
$f->select("alignImage",\%hash,WebGUI::International::get(14,$namespace),[$_[0]->get("alignImage")]);
$f->raw($_[0]->fileProperty("attachment",9));
$f->text("linkTitle",WebGUI::International::get(7,$namespace),$_[0]->get("linkTitle"));
$f->url("linkURL",WebGUI::International::get(8,$namespace),$_[0]->get("linkURL"));
$f->yesNo("convertCarriageReturns",WebGUI::International::get(10,$namespace),$_[0]->get("convertCarriageReturns")
,'',' &nbsp; <span style="font-size: 8pt;">'.WebGUI::International::get(11,$namespace).'</span>');
$f->yesNo("allowDiscussion",WebGUI::International::get(18,$namespace),$_[0]->get("allowDiscussion"));
$f->raw($_[0]->SUPER::discussionProperties);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($image, $attachment, %property); my ($image, $attachment, %property);
if (WebGUI::Privilege::canEditPage()) { $_[0]->SUPER::www_editSave();
$_[0]->SUPER::www_editSave(); $image = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
$image = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); $image->save("image");
$image->save("image"); $attachment = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
$attachment = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); $attachment->save("attachment");
$attachment->save("attachment"); $property{image} = $image->getFilename if ($image->getFilename ne "");
$property{image} = $image->getFilename if ($image->getFilename ne ""); $property{attachment} = $attachment->getFilename if ($attachment->getFilename ne "");
$property{attachment} = $attachment->getFilename if ($attachment->getFilename ne ""); $property{alignImage} = $session{form}{alignImage};
$property{alignImage} = $session{form}{alignImage}; $property{convertCarriageReturns} = $session{form}{convertCarriageReturns};
$property{convertCarriageReturns} = $session{form}{convertCarriageReturns}; $property{linkTitle} = $session{form}{linkTitle};
$property{linkTitle} = $session{form}{linkTitle}; $property{linkURL} = $session{form}{linkURL};
$property{linkURL} = $session{form}{linkURL}; $property{allowDiscussion} = $session{form}{allowDiscussion};
$property{allowDiscussion} = $session{form}{allowDiscussion}; $_[0]->set(\%property);
$_[0]->set(\%property); return "";
return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

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

@ -91,44 +91,35 @@ sub set {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteFile { sub www_deleteFile {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($delete); my ($delete);
if (WebGUI::Privilege::canEditPage()) { if ($session{form}{alt} == 1) {
if ($session{form}{alt} == 1) { $delete = "alternateVersion1";
$delete = "alternateVersion1"; } elsif ($session{form}{alt} == 2) {
} elsif ($session{form}{alt} == 2) { $delete = "alternateVersion2";
$delete = "alternateVersion2"; } else {
} else { $delete = "downloadFile";
$delete = "downloadFile"; }
} WebGUI::SQL->write("update DownloadManager_file set $delete='' where downloadId=$session{form}{did}");
WebGUI::SQL->write("update DownloadManager_file set $delete='' where downloadId=$session{form}{did}"); return $_[0]->www_editDownload();
return $_[0]->www_editDownload();
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteDownload { sub www_deleteDownload {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
return $_[0]->confirm(WebGUI::International::get(12,$namespace), return $_[0]->confirm(WebGUI::International::get(12,$namespace),
WebGUI::URL::page('func=deleteDownloadConfirm&wid='.$session{form}{wid}.'&did='.$session{form}{did})); WebGUI::URL::page('func=deleteDownloadConfirm&wid='.$session{form}{wid}.'&did='.$session{form}{did}));
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteDownloadConfirm { sub www_deleteDownloadConfirm {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $file); my ($output, $file);
if (WebGUI::Privilege::canEditPage()) { $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did});
$file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did}); $file->deleteNode;
$file->deleteNode; $_[0]->deleteCollateral("DownloadManager_file","downloadId",$session{form}{did});
$_[0]->deleteCollateral("DownloadManager_file","downloadId",$session{form}{did}); $_[0]->reorderCollateral("DownloadManager_file","downloadId");
$_[0]->reorderCollateral("DownloadManager_file","downloadId"); return "";
return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -159,134 +150,126 @@ sub www_download {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $f, $paginateAfter, $proceed); my ($output, $f, $paginateAfter, $proceed);
if (WebGUI::Privilege::canEditPage()) { if ($_[0]->get("wobjectId") eq "new") {
if ($_[0]->get("wobjectId") eq "new") { $proceed = 1;
$proceed = 1;
}
$output .= helpIcon(1,$namespace);
$output .= '<h1>'.WebGUI::International::get(9,$namespace).'</h1>';
$paginateAfter = $_[0]->get("paginateAfter") || 50;
$f = WebGUI::HTMLForm->new;
$f->integer("paginateAfter",WebGUI::International::get(20,$namespace),$paginateAfter);
$f->yesNo("displayThumbnails",WebGUI::International::get(21,$namespace),$_[0]->get("displayThumbnails"));
$f->yesNo("proceed",WebGUI::International::get(22,$namespace),$proceed);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
return $output;
} else {
return WebGUI::Privilege::insufficient();
} }
$output .= helpIcon(1,$namespace);
$output .= '<h1>'.WebGUI::International::get(9,$namespace).'</h1>';
$paginateAfter = $_[0]->get("paginateAfter") || 50;
$f = WebGUI::HTMLForm->new;
$f->integer("paginateAfter",WebGUI::International::get(20,$namespace),$paginateAfter);
$f->yesNo("displayThumbnails",WebGUI::International::get(21,$namespace),$_[0]->get("displayThumbnails"));
$f->yesNo("proceed",WebGUI::International::get(22,$namespace),$proceed);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->SUPER::www_editSave(); $_[0]->SUPER::www_editSave();
$_[0]->set({ $_[0]->set({
paginateAfter=>$session{form}{paginateAfter}, paginateAfter=>$session{form}{paginateAfter},
displayThumbnails=>$session{form}{displayThumbnails} displayThumbnails=>$session{form}{displayThumbnails}
}); });
if ($session{form}{proceed}) { if ($session{form}{proceed}) {
$_[0]->www_editDownload(); return $_[0]->www_editDownload();
} else {
return "";
}
} else { } else {
return WebGUI::Privilege::insufficient(); return "";
} }
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editDownload { sub www_editDownload {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, %download, $f); my ($output, %download, $f);
tie %download,'Tie::CPHash'; tie %download,'Tie::CPHash';
if (WebGUI::Privilege::canEditPage()) { if ($session{form}{did} eq "") {
if ($session{form}{did} eq "") { $session{form}{did} = "new";
$session{form}{did} = "new"; } else {
} 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 .= helpIcon(2,$namespace); $output .= '<h1>'.WebGUI::International::get(10,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(10,$namespace).'</h1>'; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId"));
$f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("did",$session{form}{did});
$f->hidden("did",$session{form}{did}); $f->hidden("func","editDownloadSave");
$f->hidden("func","editDownloadSave"); $f->text("fileTitle",WebGUI::International::get(5,$namespace),$download{fileTitle});
$f->text("fileTitle",WebGUI::International::get(5,$namespace),$download{fileTitle}); if ($download{downloadFile} ne "") {
if ($download{downloadFile} ne "") { $f->readOnly('<a href="'.WebGUI::URL::page('func=deleteFile&wid='.
$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteFile&wid='. $session{form}{wid}.'&did='.$session{form}{did}).'">'.WebGUI::International::get(391).
$session{form}{wid}.'&did='.$session{form}{did}).'">'.WebGUI::International::get(391). '</a>',WebGUI::International::get(6,$namespace));
'</a>',WebGUI::International::get(6,$namespace));
} else {
$f->file("downloadFile",WebGUI::International::get(6,$namespace));
}
if ($download{alternateVersion1} ne "") {
$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteFile&alt=1&wid='.
$session{form}{wid}.'&did='.$session{form}{did}).'">'.
WebGUI::International::get(391).'</a>',WebGUI::International::get(17,$namespace));
} else {
$f->file("alternateVersion1",WebGUI::International::get(17,$namespace));
}
if ($download{alternateVersion2} ne "") {
$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteFile&alt=2&wid='.
$session{form}{wid}.'&did='.$session{form}{did}).'">'.
WebGUI::International::get(391).'</a>',WebGUI::International::get(18,$namespace));
} else {
$f->file("alternateVersion2",WebGUI::International::get(18,$namespace));
}
$f->text("briefSynopsis",WebGUI::International::get(8,$namespace),$download{briefSynopsis});
$f->group("groupToView",WebGUI::International::get(7,$namespace),[$download{groupToView}]);
$f->yesNo("proceed",WebGUI::International::get(22,$namespace));
$f->submit;
$output .= $f->print;
return $output;
} else { } else {
return WebGUI::Privilege::insufficient(); $f->file("downloadFile",WebGUI::International::get(6,$namespace));
} }
if ($download{alternateVersion1} ne "") {
$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteFile&alt=1&wid='.
$session{form}{wid}.'&did='.$session{form}{did}).'">'.
WebGUI::International::get(391).'</a>',WebGUI::International::get(17,$namespace));
} else {
$f->file("alternateVersion1",WebGUI::International::get(17,$namespace));
}
if ($download{alternateVersion2} ne "") {
$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteFile&alt=2&wid='.
$session{form}{wid}.'&did='.$session{form}{did}).'">'.
WebGUI::International::get(391).'</a>',WebGUI::International::get(18,$namespace));
} else {
$f->file("alternateVersion2",WebGUI::International::get(18,$namespace));
}
$f->text("briefSynopsis",WebGUI::International::get(8,$namespace),$download{briefSynopsis});
$f->group("groupToView",WebGUI::International::get(7,$namespace),[$download{groupToView}]);
$f->yesNo("proceed",WebGUI::International::get(22,$namespace));
$f->submit;
$output .= $f->print;
return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editDownloadSave { sub www_editDownloadSave {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($file, %files); my ($file, %files);
if (WebGUI::Privilege::canEditPage()) { $files{downloadId} = $_[0]->setCollateral("DownloadManager_file", "downloadId", {
$files{downloadId} = $_[0]->setCollateral("DownloadManager_file", "downloadId", { downloadId => $session{form}{did},
downloadId => $session{form}{did}, fileTitle => $session{form}{fileTitle},
fileTitle => $session{form}{fileTitle}, briefSynopsis => $session{form}{briefSynopsis},
briefSynopsis => $session{form}{briefSynopsis}, dateUploaded => time(),
dateUploaded => time(), groupToView => $session{form}{groupToView}
groupToView => $session{form}{groupToView} });
}); $_[0]->reorderCollateral("DownloadManager_file","downloadId");
$_[0]->reorderCollateral("DownloadManager_file","downloadId"); $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did});
$file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did}); $file->save("downloadFile");
$file->save("downloadFile"); $files{downloadFile} = $file->getFilename;
$files{downloadFile} = $file->getFilename; $files{fileTitle} = $files{downloadFile} if ($session{form}{fileTitle} eq "");
$files{fileTitle} = $files{downloadFile} if ($session{form}{fileTitle} eq ""); $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did});
$file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did}); $file->save("alternateVersion1");
$file->save("alternateVersion1"); $files{alternateVersion1} = $file->getFilename;
$files{alternateVersion1} = $file->getFilename; $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did});
$file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did}); $file->save("alternateVersion2");
$file->save("alternateVersion2"); $files{alternateVersion2} = $file->getFilename;
$files{alternateVersion2} = $file->getFilename; $_[0]->setCollateral("DownloadManager_file", "downloadId", \%files);
$_[0]->setCollateral("DownloadManager_file", "downloadId", \%files); if ($session{form}{proceed}) {
if ($session{form}{proceed}) { $session{form}{did} = "new";
$session{form}{did} = "new"; return $_[0]->www_editDownload();
$_[0]->www_editDownload();
} else {
return "";
}
} else { } else {
return WebGUI::Privilege::insufficient(); return "";
} }
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveDownloadDown { sub www_moveDownloadDown {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralDown("DownloadManager_file","downloadId",$session{form}{did}); $_[0]->moveCollateralDown("DownloadManager_file","downloadId",$session{form}{did});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveDownloadUp { sub www_moveDownloadUp {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralUp("DownloadManager_file","downloadId",$session{form}{did}); $_[0]->moveCollateralUp("DownloadManager_file","downloadId",$session{form}{did});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

283
lib/WebGUI/Wobject/EventsCalendar.pm
View file

@ -119,186 +119,169 @@ sub set {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteEvent { sub www_deleteEvent {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output); my ($output);
if (WebGUI::Privilege::canEditPage()) { $output = '<h1>'.WebGUI::International::get(42).'</h1>';
$output = '<h1>'.WebGUI::International::get(42).'</h1>'; $output .= WebGUI::International::get(75,$namespace).'<p><blockquote>';
$output .= WebGUI::International::get(75,$namespace).'<p><blockquote>'; $output .= '<a href="'.WebGUI::URL::page('func=deleteEventConfirm&wid='.$session{form}{wid}.'&eid='
$output .= '<a href="'.WebGUI::URL::page('func=deleteEventConfirm&wid='.$session{form}{wid}.'&eid=' .$session{form}{eid}).'">'.WebGUI::International::get(76,$namespace).'</a><p>';
.$session{form}{eid}).'">'.WebGUI::International::get(76,$namespace).'</a><p>'; $output .= '<a href="'.WebGUI::URL::page('func=deleteEventConfirm&wid='.$session{form}{wid}.'&eid='
$output .= '<a href="'.WebGUI::URL::page('func=deleteEventConfirm&wid='.$session{form}{wid}.'&eid=' .$session{form}{eid}.'&rid='.$session{form}{rid}).'">'
.$session{form}{eid}.'&rid='.$session{form}{rid}).'">' .WebGUI::International::get(77,$namespace).'</a><p>';
.WebGUI::International::get(77,$namespace).'</a><p>'; $output .= '<a href="'.WebGUI::URL::page('func=edit&wid='.$session{form}{wid}).'">'
$output .= '<a href="'.WebGUI::URL::page('func=edit&wid='.$session{form}{wid}).'">' .WebGUI::International::get(78,$namespace).'</a>';
.WebGUI::International::get(78,$namespace).'</a>'; $output .= '</blockquote>';
$output .= '</blockquote>'; return $output;
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteEventConfirm { sub www_deleteEventConfirm {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
if ($session{form}{rid} > 0) { if ($session{form}{rid} > 0) {
$_[0]->deleteCollateral("EventsCalendar_event","recurringEventId",$session{form}{rid}); $_[0]->deleteCollateral("EventsCalendar_event","recurringEventId",$session{form}{rid});
} else { } else {
$_[0]->deleteCollateral("EventsCalendar_event","eventId",$session{form}{eid}); $_[0]->deleteCollateral("EventsCalendar_event","eventId",$session{form}{eid});
} }
return ""; return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, %hash, $f, $paginateAfter, $proceed); my ($output, %hash, $f, $paginateAfter, $proceed);
tie %hash, 'Tie::IxHash'; tie %hash, 'Tie::IxHash';
if (WebGUI::Privilege::canEditPage()) { if ($_[0]->get("wobjectId") eq "new") {
if ($_[0]->get("wobjectId") eq "new") { $proceed = 1;
$proceed = 1; }
} $paginateAfter = $_[0]->get("paginateAfter") || 50;
$paginateAfter = $_[0]->get("paginateAfter") || 50; $output = helpIcon(1,$namespace);
$output = helpIcon(1,$namespace); $output .= '<h1>'.WebGUI::International::get(12,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(12,$namespace).'</h1>'; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; %hash = (list => WebGUI::International::get(17,$namespace),
%hash = (list => WebGUI::International::get(17,$namespace), calendarMonth => WebGUI::International::get(18,$namespace));
calendarMonth => WebGUI::International::get(18,$namespace)); # calendarMonthSmall => WebGUI::International::get(74,$namespace));
# calendarMonthSmall => WebGUI::International::get(74,$namespace)); $f->select("calendarLayout",\%hash,WebGUI::International::get(16,$namespace),[$_[0]->get("calendarLayout")]);
$f->select("calendarLayout",\%hash,WebGUI::International::get(16,$namespace),[$_[0]->get("calendarLayout")]); $f->integer("paginateAfter",WebGUI::International::get(19,$namespace),$paginateAfter);
$f->integer("paginateAfter",WebGUI::International::get(19,$namespace),$paginateAfter); $f->yesNo("proceed",WebGUI::International::get(21,$namespace),$proceed);
$f->yesNo("proceed",WebGUI::International::get(21,$namespace),$proceed); $output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly); return $output;
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->SUPER::www_editSave(); $_[0]->SUPER::www_editSave();
$_[0]->set({ $_[0]->set({
calendarLayout=>$session{form}{calendarLayout}, calendarLayout=>$session{form}{calendarLayout},
paginateAfter=>$session{form}{paginateAfter} paginateAfter=>$session{form}{paginateAfter}
}); });
if ($session{form}{proceed}) { if ($session{form}{proceed}) {
$session{form}{eid} = "new"; $session{form}{eid} = "new";
return $_[0]->www_editEvent; return $_[0]->www_editEvent;
} else { } else {
return ""; return "";
} }
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editEvent { sub www_editEvent {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my (%recursEvery, $special, $output, $f, %event); my (%recursEvery, $special, $output, $f, %event);
tie %event, 'Tie::CPHash'; tie %event, 'Tie::CPHash';
tie %recursEvery, 'Tie::IxHash'; tie %recursEvery, 'Tie::IxHash';
if (WebGUI::Privilege::canEditPage()) { if ($session{form}{eid} eq "new") {
if ($session{form}{eid} eq "new") { %recursEvery = ('never'=>WebGUI::International::get(4,$namespace),
%recursEvery = ('never'=>WebGUI::International::get(4,$namespace), 'day'=>WebGUI::International::get(700),
'day'=>WebGUI::International::get(700), 'week'=>WebGUI::International::get(701),
'week'=>WebGUI::International::get(701), 'month'=>WebGUI::International::get(702),
'month'=>WebGUI::International::get(702), 'year'=>WebGUI::International::get(703)
'year'=>WebGUI::International::get(703) );
); $event{endDate} = $event{endDate};
$event{endDate} = $event{endDate}; $f = WebGUI::HTMLForm->new(1);
$f = WebGUI::HTMLForm->new(1); $f->raw('<tr><td class="formdescription" valign="top">'.WebGUI::International::get(8,$namespace).'</td><td class="tableData">');
$f->raw('<tr><td class="formdescription" valign="top">'.WebGUI::International::get(8,$namespace).'</td><td class="tableData">'); $f->integer("interval","",1,"","","",3);
$f->integer("interval","",1,"","","",3); $f->select("recursEvery",\%recursEvery);
$f->select("recursEvery",\%recursEvery); $f->raw(' '.WebGUI::International::get(9,$namespace).' ');
$f->raw(' '.WebGUI::International::get(9,$namespace).' '); $f->date("until");
$f->date("until"); $f->raw("</td><tr>");
$f->raw("</td><tr>"); $special = $f->printRowsOnly;
$special = $f->printRowsOnly; } else {
} else { %event = WebGUI::SQL->quickHash("select * from EventsCalendar_event where eventId='$session{form}{eid}'");
%event = WebGUI::SQL->quickHash("select * from EventsCalendar_event where eventId='$session{form}{eid}'");
$f = WebGUI::HTMLForm->new;
$f->hidden("until");
$special = $f->printRowsOnly;
}
$output = helpIcon(2,$namespace);
$output .= '<h1>'.WebGUI::International::get(13,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new;
$f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("until");
$f->hidden("eid",$session{form}{eid}); $special = $f->printRowsOnly;
$f->hidden("func","editEventSave"); }
$f->text("name",WebGUI::International::get(99),$event{name}); $output = helpIcon(2,$namespace);
$f->HTMLArea("description",WebGUI::International::get(85),$event{description}); $output .= '<h1>'.WebGUI::International::get(13,$namespace).'</h1>';
$f->date("startDate",WebGUI::International::get(14,$namespace),$event{startDate}, $f = WebGUI::HTMLForm->new;
'onBlur="this.form.endDate.value=this.form.startDate.value;this.form.until.value=this.form.startDate.value;"'); $f->hidden("wid",$_[0]->get("wobjectId"));
$f->date("endDate",WebGUI::International::get(15,$namespace),$event{endDate}); $f->hidden("eid",$session{form}{eid});
$f->raw($special); $f->hidden("func","editEventSave");
$f->yesNo("proceed",WebGUI::International::get(21,$namespace)); $f->text("name",WebGUI::International::get(99),$event{name});
$f->submit; $f->HTMLArea("description",WebGUI::International::get(85),$event{description});
$output .= $f->print; $f->date("startDate",WebGUI::International::get(14,$namespace),$event{startDate},
return $output; 'onBlur="this.form.endDate.value=this.form.startDate.value;this.form.until.value=this.form.startDate.value;"');
} else { $f->date("endDate",WebGUI::International::get(15,$namespace),$event{endDate});
return WebGUI::Privilege::insufficient(); $f->raw($special);
} $f->yesNo("proceed",WebGUI::International::get(21,$namespace));
$f->submit;
$output .= $f->print;
return $output; return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editEventSave { sub www_editEventSave {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my (@startDate, @endDate, $until, @eventId, $i, $recurringEventId); my (@startDate, @endDate, $until, @eventId, $i, $recurringEventId);
if (WebGUI::Privilege::canEditPage()) { if ($session{form}{eid} eq "new") {
if ($session{form}{eid} eq "new") { $session{form}{eid} = getNextId("eventId");
$session{form}{eid} = getNextId("eventId"); $startDate[0] = setToEpoch($session{form}{startDate});
$startDate[0] = setToEpoch($session{form}{startDate}); $endDate[0] = setToEpoch($session{form}{endDate});
$endDate[0] = setToEpoch($session{form}{endDate}); $until = setToEpoch($session{form}{until});
$until = setToEpoch($session{form}{until}); $eventId[0] = getNextId("eventId");
$eventId[0] = getNextId("eventId"); $session{form}{interval} = 1 if ($session{form}{interval} < 1);
$session{form}{interval} = 1 if ($session{form}{interval} < 1); if ($session{form}{recursEvery} eq "never") {
if ($session{form}{recursEvery} eq "never") { $recurringEventId = 0;
$recurringEventId = 0; } else {
} else { $recurringEventId = getNextId("recurringEventId");
$recurringEventId = getNextId("recurringEventId"); while ($startDate[$i] < $until) {
while ($startDate[$i] < $until) { $i++;
$i++; $eventId[$i] = getNextId("eventId");
$eventId[$i] = getNextId("eventId"); if ($session{form}{recursEvery} eq "day") {
if ($session{form}{recursEvery} eq "day") { $startDate[$i] = addToDate($startDate[0],0,0,($i*$session{form}{interval}));
$startDate[$i] = addToDate($startDate[0],0,0,($i*$session{form}{interval})); $endDate[$i] = addToDate($endDate[0],0,0,($i*$session{form}{interval}));
$endDate[$i] = addToDate($endDate[0],0,0,($i*$session{form}{interval})); } elsif ($session{form}{recursEvery} eq "week") {
} elsif ($session{form}{recursEvery} eq "week") { $startDate[$i] = addToDate($startDate[0],0,0,(7*$i*$session{form}{interval}));
$startDate[$i] = addToDate($startDate[0],0,0,(7*$i*$session{form}{interval})); $endDate[$i] = addToDate($endDate[0],0,0,(7*$i*$session{form}{interval}));
$endDate[$i] = addToDate($endDate[0],0,0,(7*$i*$session{form}{interval})); } elsif ($session{form}{recursEvery} eq "month") {
} elsif ($session{form}{recursEvery} eq "month") { $startDate[$i] = addToDate($startDate[0],0,($i*$session{form}{interval}),0);
$startDate[$i] = addToDate($startDate[0],0,($i*$session{form}{interval}),0); $endDate[$i] = addToDate($endDate[0],0,($i*$session{form}{interval}),0);
$endDate[$i] = addToDate($endDate[0],0,($i*$session{form}{interval}),0); } elsif ($session{form}{recursEvery} eq "year") {
} elsif ($session{form}{recursEvery} eq "year") { $startDate[$i] = addToDate($startDate[0],($i*$session{form}{interval}),0,0);
$startDate[$i] = addToDate($startDate[0],($i*$session{form}{interval}),0,0); $endDate[$i] = addToDate($endDate[0],($i*$session{form}{interval}),0,0);
$endDate[$i] = addToDate($endDate[0],($i*$session{form}{interval}),0,0); }
} }
} }
} $i = 0;
$i = 0; while ($eventId[$i] > 0) {
while ($eventId[$i] > 0) { WebGUI::SQL->write("insert into EventsCalendar_event values ($eventId[$i],
WebGUI::SQL->write("insert into EventsCalendar_event values ($eventId[$i], ".$_[0]->get("wobjectId").",
".$_[0]->get("wobjectId").", ".quote($session{form}{name}).", ".quote($session{form}{description}).", ".quote($session{form}{name}).",
".quote($session{form}{description}).",
$startDate[$i], $endDate[$i], $recurringEventId)"); $startDate[$i], $endDate[$i], $recurringEventId)");
$i++; $i++;
} }
} else { } else {
WebGUI::SQL->write("update EventsCalendar_event set name=".quote($session{form}{name}).", WebGUI::SQL->write("update EventsCalendar_event set name=".quote($session{form}{name}).",
description=".quote($session{form}{description}).", startDate='".setToEpoch($session{form}{startDate})."', description=".quote($session{form}{description}).", startDate='".setToEpoch($session{form}{startDate})."',
endDate='".setToEpoch($session{form}{endDate})."' where eventId=$session{form}{eid}"); endDate='".setToEpoch($session{form}{endDate})."' where eventId=$session{form}{eid}");
} }
if ($session{form}{proceed}) { if ($session{form}{proceed}) {
$session{form}{eid} = "new"; $session{form}{eid} = "new";
return $_[0]->www_editEvent; return $_[0]->www_editEvent;
} else { } else {
return ""; return "";
} }
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

82
lib/WebGUI/Wobject/ExtraColumn.pm
View file

@ -45,55 +45,49 @@ sub set {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $f, $endDate, $width, $class, $spacer,$startDate); my ($output, $f, $endDate, $width, $class, $spacer,$startDate);
if (WebGUI::Privilege::canEditPage()) { $output = helpIcon(1,$namespace);
$output = helpIcon(1,$namespace); $output .= '<h1>'.WebGUI::International::get(6,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(6,$namespace).'</h1>'; if ($_[0]->get("wobjectId") eq "new") {
if ($_[0]->get("wobjectId") eq "new") { $width = 200;
$width = 200; $spacer = 10;
$spacer = 10; } else {
} else { $width = $_[0]->get("width");
$width = $_[0]->get("width"); $spacer = $_[0]->get("spacer");
$spacer = $_[0]->get("spacer"); }
} $class = $_[0]->get("class") || "content";
$class = $_[0]->get("class") || "content"; $startDate = $_[0]->get("startDate") || $session{page}{startDate};
$startDate = $_[0]->get("startDate") || $session{page}{startDate}; $endDate = $_[0]->get("endDate") || $session{page}{endDate};
$endDate = $_[0]->get("endDate") || $session{page}{endDate}; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId"));
$f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("namespace",$_[0]->get("namespace")) if ($_[0]->get("wobjectId") eq "new");
$f->hidden("namespace",$_[0]->get("namespace")) if ($_[0]->get("wobjectId") eq "new"); $f->hidden("func","editSave");
$f->hidden("func","editSave"); $f->readOnly($_[0]->get("wobjectId"),WebGUI::International::get(499));
$f->readOnly($_[0]->get("wobjectId"),WebGUI::International::get(499)); $f->hidden("title",$namespace);
$f->hidden("title",$namespace); $f->hidden("displayTitle",0);
$f->hidden("displayTitle",0); $f->hidden("processMacros",0);
$f->hidden("processMacros",0); $f->hidden("templatePosition",0);
$f->hidden("templatePosition",0); $f->date("startDate",WebGUI::International::get(497),$startDate);
$f->date("startDate",WebGUI::International::get(497),$startDate); $f->date("endDate",WebGUI::International::get(498),$endDate);
$f->date("endDate",WebGUI::International::get(498),$endDate); $f->integer("spacer",WebGUI::International::get(3,$namespace),$spacer);
$f->integer("spacer",WebGUI::International::get(3,$namespace),$spacer); $f->integer("width",WebGUI::International::get(4,$namespace),$width);
$f->integer("width",WebGUI::International::get(4,$namespace),$width); $f->text("class",WebGUI::International::get(5,$namespace),$class);
$f->text("class",WebGUI::International::get(5,$namespace),$class); $f->submit;
$f->submit; $output .= $f->print;
$output .= $f->print; return $output;
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->SUPER::www_editSave(); $_[0]->SUPER::www_editSave();
$_[0]->set({ $_[0]->set({
spacer=>$session{form}{spacer}, spacer=>$session{form}{spacer},
width=>$session{form}{width}, width=>$session{form}{width},
class=>$session{form}{class} class=>$session{form}{class}
}); });
return ""; return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

4
lib/WebGUI/Wobject/FAQ.pm
View file

@ -166,12 +166,16 @@ sub www_editQuestionSave {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveQuestionDown { sub www_moveQuestionDown {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralDown("FAQ_question","questionId",$session{form}{qid}); $_[0]->moveCollateralDown("FAQ_question","questionId",$session{form}{qid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveQuestionUp { sub www_moveQuestionUp {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralUp("FAQ_question","questionId",$session{form}{qid}); $_[0]->moveCollateralUp("FAQ_question","questionId",$session{form}{qid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

38
lib/WebGUI/Wobject/Item.pm
View file

@ -47,34 +47,28 @@ sub set {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $f); my ($output, $f);
if (WebGUI::Privilege::canEditPage()) { $output = helpIcon(1,$_[0]->get("namespace"));
$output = helpIcon(1,$_[0]->get("namespace")); $output .= '<h1>'.WebGUI::International::get(6,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(6,$namespace).'</h1>'; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $f->url("linkURL",WebGUI::International::get(1,$_[0]->get("namespace")),$_[0]->get("linkURL"));
$f->url("linkURL",WebGUI::International::get(1,$_[0]->get("namespace")),$_[0]->get("linkURL")); $f->raw($_[0]->fileProperty("attachment",2));
$f->raw($_[0]->fileProperty("attachment",2)); $output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly); return $output;
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($attachment, $property); my ($attachment, $property);
if (WebGUI::Privilege::canEditPage()) { $_[0]->SUPER::www_editSave();
$_[0]->SUPER::www_editSave(); $attachment = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
$attachment = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); $attachment->save("attachment");
$attachment->save("attachment"); $property->{linkURL} = $session{form}{linkURL};
$property->{linkURL} = $session{form}{linkURL}; $property->{attachment} = $attachment->getFilename if ($attachment->getFilename ne "");
$property->{attachment} = $attachment->getFilename if ($attachment->getFilename ne ""); $_[0]->set($property);
$_[0]->set($property); return "";
return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

152
lib/WebGUI/Wobject/LinkList.pm
View file

@ -59,130 +59,114 @@ sub set {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteLink { sub www_deleteLink {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
return $_[0]->confirm(WebGUI::International::get(9,$namespace), return $_[0]->confirm(WebGUI::International::get(9,$namespace),
WebGUI::URL::page('func=deleteLinkConfirm&wid='.$session{form}{wid}.'&lid='.$session{form}{lid})); WebGUI::URL::page('func=deleteLinkConfirm&wid='.$session{form}{wid}.'&lid='.$session{form}{lid}));
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteLinkConfirm { sub www_deleteLinkConfirm {
my ($output); return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
if (WebGUI::Privilege::canEditPage()) { $_[0]->deleteCollateral("LinkList_link","linkId",$session{form}{lid});
$_[0]->deleteCollateral("LinkList_link","linkId",$session{form}{lid}); $_[0]->reorderCollateral("LinkList_link","linkId");
$_[0]->reorderCollateral("LinkList_link","linkId"); return "";
return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($proceed, $f, $output, $indent, $lineSpacing, $bullet); my ($proceed, $f, $output, $indent, $lineSpacing, $bullet);
if (WebGUI::Privilege::canEditPage()) { if ($_[0]->get("wobjectId") eq "new") {
if ($_[0]->get("wobjectId") eq "new") { $proceed = 1;
$proceed = 1;
}
$bullet = $_[0]->get("bullet") || '&middot;';
$lineSpacing = $_[0]->get("lineSpacing") || 1;
$indent = $_[0]->get("indent") || 5;
$output = helpIcon(1,$namespace);
$output .= '<h1>'.WebGUI::International::get(10,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->integer("indent",WebGUI::International::get(1,$namespace),$indent);
$f->integer("lineSpacing",WebGUI::International::get(2,$namespace),$lineSpacing);
$f->text("bullet",WebGUI::International::get(4,$namespace),$bullet);
$f->yesNo("proceed",WebGUI::International::get(5,$namespace),$proceed);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
return $output;
} else {
return WebGUI::Privilege::insufficient();
} }
$bullet = $_[0]->get("bullet") || '&middot;';
$lineSpacing = $_[0]->get("lineSpacing") || 1;
$indent = $_[0]->get("indent") || 5;
$output = helpIcon(1,$namespace);
$output .= '<h1>'.WebGUI::International::get(10,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->integer("indent",WebGUI::International::get(1,$namespace),$indent);
$f->integer("lineSpacing",WebGUI::International::get(2,$namespace),$lineSpacing);
$f->text("bullet",WebGUI::International::get(4,$namespace),$bullet);
$f->yesNo("proceed",WebGUI::International::get(5,$namespace),$proceed);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->SUPER::www_editSave(); $_[0]->SUPER::www_editSave();
$_[0]->set({ $_[0]->set({
indent=>$session{form}{indent}, indent=>$session{form}{indent},
bullet=>$session{form}{bullet}, bullet=>$session{form}{bullet},
lineSpacing=>$session{form}{lineSpacing} lineSpacing=>$session{form}{lineSpacing}
}); });
if ($session{form}{proceed}) { if ($session{form}{proceed}) {
$_[0]->www_editLink(); $_[0]->www_editLink();
} else {
return "";
}
} else { } else {
return WebGUI::Privilege::insufficient(); return "";
} }
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editLink { sub www_editLink {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, %link, $f, $linkId, $newWindow); my ($output, %link, $f, $linkId, $newWindow);
tie %link, 'Tie::CPHash'; tie %link, 'Tie::CPHash';
if (WebGUI::Privilege::canEditPage()) { $linkId = $session{form}{lid} || "new";
$linkId = $session{form}{lid} || "new"; %link = WebGUI::SQL->quickHash("select * from LinkList_link where linkId='$session{form}{lid}'");
%link = WebGUI::SQL->quickHash("select * from LinkList_link where linkId='$session{form}{lid}'"); if ($linkId eq "new") {
if ($linkId eq "new") { $newWindow = 1;
$newWindow = 1;
} else {
$newWindow = $link{newWindow};
}
$output = helpIcon(2,$namespace);
$output .= '<h1>'.WebGUI::International::get(12,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->hidden("wid",$_[0]->get("wobjectId"));
$f->hidden("lid",$linkId);
$f->hidden("func","editLinkSave");
$f->text("name",WebGUI::International::get(99),$link{name});
$f->url("url",WebGUI::International::get(8,$namespace),$link{url});
$f->yesNo("newWindow",WebGUI::International::get(3,$namespace),$newWindow);
$f->textarea("description",WebGUI::International::get(85),$link{description});
$f->yesNo("proceed",WebGUI::International::get(5,$namespace));
$f->submit;
$output .= $f->print;
return $output;
} else { } else {
return WebGUI::Privilege::insufficient(); $newWindow = $link{newWindow};
} }
$output = helpIcon(2,$namespace);
$output .= '<h1>'.WebGUI::International::get(12,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->hidden("wid",$_[0]->get("wobjectId"));
$f->hidden("lid",$linkId);
$f->hidden("func","editLinkSave");
$f->text("name",WebGUI::International::get(99),$link{name});
$f->url("url",WebGUI::International::get(8,$namespace),$link{url});
$f->yesNo("newWindow",WebGUI::International::get(3,$namespace),$newWindow);
$f->textarea("description",WebGUI::International::get(85),$link{description});
$f->yesNo("proceed",WebGUI::International::get(5,$namespace));
$f->submit;
$output .= $f->print;
return $output; return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editLinkSave { sub www_editLinkSave {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->setCollateral("LinkList_link", "linkId", { $_[0]->setCollateral("LinkList_link", "linkId", {
linkId => $session{form}{lid}, linkId => $session{form}{lid},
description => $session{form}{description}, description => $session{form}{description},
newWindow => $session{form}{newWindow}, newWindow => $session{form}{newWindow},
url => $session{form}{url}, url => $session{form}{url},
name => $session{form}{name} name => $session{form}{name}
}); });
if ($session{form}{proceed}) { if ($session{form}{proceed}) {
$session{form}{lid} = "new"; $session{form}{lid} = "new";
$_[0]->www_editLink(); return $_[0]->www_editLink();
} else {
return "";
}
} else { } else {
return WebGUI::Privilege::insufficient(); return "";
} }
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveLinkDown { sub www_moveLinkDown {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralDown("LinkList_link","linkId",$session{form}{lid}); $_[0]->moveCollateralDown("LinkList_link","linkId",$session{form}{lid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveLinkUp { sub www_moveLinkUp {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralUp("LinkList_link","linkId",$session{form}{lid}); $_[0]->moveCollateralUp("LinkList_link","linkId",$session{form}{lid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

90
lib/WebGUI/Wobject/MailForm.pm
View file

@ -79,36 +79,26 @@ sub set {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteField { sub www_deleteField {
my ($output); return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
if (WebGUI::Privilege::canEditPage()) { return $_[0]->confirm(WebGUI::International::get(19,$namespace),
return $_[0]->confirm(WebGUI::International::get(19,$namespace), WebGUI::URL::page('func=deleteFieldConfirm&wid='.$_[0]->get("wobjectId").'&fid='.$session{form}{fid}));
WebGUI::URL::page('func=deleteFieldConfirm&wid='.$_[0]->get("wobjectId").'&fid='.$session{form}{fid}));
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteFieldConfirm { sub www_deleteFieldConfirm {
my ($output); return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
if (WebGUI::Privilege::canEditPage()) { $_[0]->deleteCollateral("MailForm_field","mailFieldId",$session{form}{fid});
$_[0]->deleteCollateral("MailForm_field","mailFieldId",$session{form}{fid}); $_[0]->reorderCollateral("MailForm_field","mailFieldId");
$_[0]->reorderCollateral("MailForm_field","mailFieldId"); return "";
return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $f, $proceed); my ($output, $f, $proceed);
if (WebGUI::Privilege::canEditPage()) { my %fieldStatus = ( 1 => WebGUI::International::get(4, $namespace),
2 => WebGUI::International::get(5, $namespace),
my %fieldStatus = ( 1 => WebGUI::International::get(4, $namespace), 3 => WebGUI::International::get(6, $namespace) );
2 => WebGUI::International::get(5, $namespace),
3 => WebGUI::International::get(6, $namespace) );
# field defaults # field defaults
my %data = ( my %data = (
width => 45, width => 45,
@ -133,10 +123,10 @@ sub www_edit {
if ($_[0]->get("wobjectId") eq "new") { if ($_[0]->get("wobjectId") eq "new") {
$proceed = 1; $proceed = 1;
} }
$output = helpIcon(1,$_[0]->get("namespace")); $output = helpIcon(1,$_[0]->get("namespace"));
$output .= '<h1>'.WebGUI::International::get(7, $namespace).'</h1>'; $output .= '<h1>'.WebGUI::International::get(7, $namespace).'</h1>';
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new;
$f->integer("width",WebGUI::International::get(8, $namespace),$_[0]->get("width") || 45); $f->integer("width",WebGUI::International::get(8, $namespace),$_[0]->get("width") || 45);
$f->raw( $_[0]->_textSelectRow("fromField",WebGUI::International::get(10, $namespace),$data{fromField},128, $f->raw( $_[0]->_textSelectRow("fromField",WebGUI::International::get(10, $namespace),$data{fromField},128,
"fromStatus",\%fieldStatus,$data{fromStatus}) ); "fromStatus",\%fieldStatus,$data{fromStatus}) );
$f->raw( $_[0]->_textSelectRow("toField",WebGUI::International::get(11, $namespace),$data{toField},128, $f->raw( $_[0]->_textSelectRow("toField",WebGUI::International::get(11, $namespace),$data{toField},128,
@ -147,44 +137,34 @@ sub www_edit {
"bccStatus",\%fieldStatus,$data{bccStatus}) ); "bccStatus",\%fieldStatus,$data{bccStatus}) );
$f->raw( $_[0]->_textSelectRow("subjectField",WebGUI::International::get(14, $namespace),$data{subjectField},128, $f->raw( $_[0]->_textSelectRow("subjectField",WebGUI::International::get(14, $namespace),$data{subjectField},128,
"subjectStatus",\%fieldStatus,$data{subjectStatus}) ); "subjectStatus",\%fieldStatus,$data{subjectStatus}) );
$f->HTMLArea("acknowledgement",WebGUI::International::get(16, $namespace),$_[0]->get("acknowledgement") || WebGUI::International::get(3, $namespace)); $f->HTMLArea("acknowledgement",WebGUI::International::get(16, $namespace),$_[0]->get("acknowledgement") || WebGUI::International::get(3, $namespace));
my %storeEntriesOptions = ( $f->yesNo("storeEntries",WebGUI::International::get(26,$namespace),[ $data{storeEntries} ]);
1 => "Yes", $f->yesNo("proceed",WebGUI::International::get(15,$namespace),$proceed);
0 => "No" $output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
); return $output;
$f->select("storeEntries",\%storeEntriesOptions,WebGUI::International::get(26,$namespace),[ $data{storeEntries} ]);
$f->yesNo("proceed",WebGUI::International::get(15,$namespace),$proceed);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($property); my ($property);
if (WebGUI::Privilege::canEditPage()) { $_[0]->SUPER::www_editSave();
$_[0]->SUPER::www_editSave(); foreach my $field (@fields) {
foreach my $field (@fields) { $property->{$field} = $session{form}{$field};
$property->{$field} = $session{form}{$field}; }
} $_[0]->set($property);
$_[0]->set($property);
if ($session{form}{proceed}) { if ($session{form}{proceed}) {
$_[0]->www_editField(); return $_[0]->www_editField();
} else { } else {
return ""; return "";
} }
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editField { sub www_editField {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, %field, $f); my ($output, %field, $f);
tie %field, 'Tie::CPHash'; tie %field, 'Tie::CPHash';
my %fieldStatus = ( 1 => WebGUI::International::get(4, $namespace), my %fieldStatus = ( 1 => WebGUI::International::get(4, $namespace),
2 => WebGUI::International::get(5, $namespace), 2 => WebGUI::International::get(5, $namespace),
3 => WebGUI::International::get(6, $namespace) ); 3 => WebGUI::International::get(6, $namespace) );
@ -198,7 +178,6 @@ sub www_editField {
yesNo => "Yes/No", yesNo => "Yes/No",
select => "Drop-Down Box" ); select => "Drop-Down Box" );
if (WebGUI::Privilege::canEditPage()) {
%field = WebGUI::SQL->quickHash("select * from MailForm_field where mailFieldId='$session{form}{fid}'"); %field = WebGUI::SQL->quickHash("select * from MailForm_field where mailFieldId='$session{form}{fid}'");
$output = helpIcon(2,$_[0]->get("namespace")); $output = helpIcon(2,$_[0]->get("namespace"));
$output .= '<h1>'.WebGUI::International::get(20,$namespace).'</h1>'; $output .= '<h1>'.WebGUI::International::get(20,$namespace).'</h1>';
@ -218,16 +197,12 @@ sub www_editField {
$f->submit; $f->submit;
$output .= $f->print; $output .= $f->print;
return $output; return $output;
} else {
return WebGUI::Privilege::insufficient();
}
return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editFieldSave { sub www_editFieldSave {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($seq); my ($seq);
if (WebGUI::Privilege::canEditPage()) {
if ($session{form}{fid} eq "new") { if ($session{form}{fid} eq "new") {
($seq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from MailForm_field where wobjectId=".$_[0]->get("wobjectId")); ($seq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from MailForm_field where wobjectId=".$_[0]->get("wobjectId"));
$session{form}{fid} = getNextId("mailFieldId"); $session{form}{fid} = getNextId("mailFieldId");
@ -246,19 +221,20 @@ sub www_editFieldSave {
} else { } else {
return ""; return "";
} }
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveFieldDown { sub www_moveFieldDown {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralDown("MailForm_field","mailFieldId",$session{form}{fid}); $_[0]->moveCollateralDown("MailForm_field","mailFieldId",$session{form}{fid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveFieldUp { sub www_moveFieldUp {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralUp("MailForm_field","mailFieldId",$session{form}{fid}); $_[0]->moveCollateralUp("MailForm_field","mailFieldId",$session{form}{fid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

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

@ -52,33 +52,26 @@ sub set {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $f, $messagesPerPage); my ($output, $f, $messagesPerPage);
if (WebGUI::Privilege::canEditPage()) { $messagesPerPage = $_[0]->get("messagesPerPage") || 50;
$messagesPerPage = $_[0]->get("messagesPerPage") || 50; $output = helpIcon(1,$namespace);
$output = helpIcon(1,$namespace); $output .= '<h1>'.WebGUI::International::get(6,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(6,$namespace).'</h1>'; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $f->integer("messagesPerPage",WebGUI::International::get(4,$namespace),$messagesPerPage);
$f->integer("messagesPerPage",WebGUI::International::get(4,$namespace),$messagesPerPage); $f->raw($_[0]->SUPER::discussionProperties);
$f->raw($_[0]->SUPER::discussionProperties); $output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
return $output; return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->SUPER::www_editSave(); $_[0]->SUPER::www_editSave();
$_[0]->set({ $_[0]->set({
messagesPerPage=>$session{form}{messagesPerPage} messagesPerPage=>$session{form}{messagesPerPage}
}); });
return ""; return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

105
lib/WebGUI/Wobject/Poll.pm
View file

@ -82,75 +82,68 @@ sub set {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($f, $i, $output, $active, $voteGroup, $graphWidth, $answers, $randomizeAnswers); my ($f, $i, $output, $active, $voteGroup, $graphWidth, $answers, $randomizeAnswers);
if (WebGUI::Privilege::canEditPage()) { if ($_[0]->get("wobjectId") eq "new") {
if ($_[0]->get("wobjectId") eq "new") { $active = 1;
$active = 1; $randomizeAnswers = 1;
$randomizeAnswers = 1; } else {
} else { $active = $_[0]->get("active");
$active = $_[0]->get("active"); $randomizeAnswers = $_[0]->get("randomizeAnswers");
$randomizeAnswers = $_[0]->get("randomizeAnswers"); }
} $voteGroup = $_[0]->get("voteGroup") || 7;
$voteGroup = $_[0]->get("voteGroup") || 7; $graphWidth = $_[0]->get("graphWidth") || 150;
$graphWidth = $_[0]->get("graphWidth") || 150; for ($i=1; $i<=20; $i++) {
for ($i=1; $i<=20; $i++) { if ($_[0]->get('a'.$i) =~ /\C/) {
if ($_[0]->get('a'.$i) =~ /\C/) { $answers .= $_[0]->get("a".$i)."\n";
$answers .= $_[0]->get("a".$i)."\n";
}
} }
$output = helpIcon(1,$namespace);
$output .= '<h1>'.WebGUI::International::get(9,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->yesNo("active",WebGUI::International::get(3,$namespace),$active);
$f->group("voteGroup",WebGUI::International::get(4,$namespace),[$voteGroup]);
if ($session{setting}{useKarma}) {
$f->integer("karmaPerVote",WebGUI::International::get(20,$namespace),$_[0]->get("karmaPerVote"));
} else {
$f->hidden("karmaPerVote",$_[0]->get("karmaPerVote"));
}
$f->integer("graphWidth",WebGUI::International::get(5,$namespace),$graphWidth);
$f->text("question",WebGUI::International::get(6,$namespace),$_[0]->get("question"));
$f->textarea("answers",WebGUI::International::get(7,$namespace).'<span class="formSubtext"><br>'.WebGUI::International::get(8,$namespace).'</span>',$answers);
$f->yesNo("randomizeAnswers",WebGUI::International::get(72,$namespace),$randomizeAnswers);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
if ($_[0]->get("wobjectId") ne "new") {
$output .= '<p>';
$output .= '<a href="'.WebGUI::URL::page('func=resetVotes&wid='.$_[0]->get("wobjectId")).'">'
.WebGUI::International::get(10,$namespace).'</a>';
}
return $output;
} else {
return WebGUI::Privilege::insufficient();
} }
$output = helpIcon(1,$namespace);
$output .= '<h1>'.WebGUI::International::get(9,$namespace).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->yesNo("active",WebGUI::International::get(3,$namespace),$active);
$f->group("voteGroup",WebGUI::International::get(4,$namespace),[$voteGroup]);
if ($session{setting}{useKarma}) {
$f->integer("karmaPerVote",WebGUI::International::get(20,$namespace),$_[0]->get("karmaPerVote"));
} else {
$f->hidden("karmaPerVote",$_[0]->get("karmaPerVote"));
}
$f->integer("graphWidth",WebGUI::International::get(5,$namespace),$graphWidth);
$f->text("question",WebGUI::International::get(6,$namespace),$_[0]->get("question"));
$f->textarea("answers",WebGUI::International::get(7,$namespace).'<span class="formSubtext"><br>'.WebGUI::International::get(8,$namespace).'</span>',$answers);
$f->yesNo("randomizeAnswers",WebGUI::International::get(72,$namespace),$randomizeAnswers);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
if ($_[0]->get("wobjectId") ne "new") {
$output .= '<p>';
$output .= '<a href="'.WebGUI::URL::page('func=resetVotes&wid='.$_[0]->get("wobjectId")).'">'
.WebGUI::International::get(10,$namespace).'</a>';
}
return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my (@answer, $i, $property); my (@answer, $i, $property);
if (WebGUI::Privilege::canEditPage()) { $_[0]->SUPER::www_editSave();
$_[0]->SUPER::www_editSave(); @answer = split("\n",$session{form}{answers});
@answer = split("\n",$session{form}{answers}); for ($i=1; $i<=20; $i++) {
for ($i=1; $i<=20; $i++) { $property->{'a'.$i} = $answer[($i-1)];
$property->{'a'.$i} = $answer[($i-1)];
}
$property->{randomizeAnswers} = $session{form}{randomizeAnswers};
$property->{karmaPerVote} = $session{form}{karmaPerVote};
$property->{voteGroup} = $session{form}{voteGroup};
$property->{graphWidth} = $session{form}{graphWidth};
$property->{active} = $session{form}{active};
$property->{question} = $session{form}{question};
$_[0]->set($property);
return "";
} else {
return WebGUI::Privilege::insufficient();
} }
$property->{randomizeAnswers} = $session{form}{randomizeAnswers};
$property->{karmaPerVote} = $session{form}{karmaPerVote};
$property->{voteGroup} = $session{form}{voteGroup};
$property->{graphWidth} = $session{form}{graphWidth};
$property->{active} = $session{form}{active};
$property->{question} = $session{form}{question};
$_[0]->set($property);
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_resetVotes { sub www_resetVotes {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->deleteCollateral("Poll_answer","wobjectId",$_[0]->get("wobjectId")); $_[0]->deleteCollateral("Poll_answer","wobjectId",$_[0]->get("wobjectId"));
}
return ""; return "";
} }

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

@ -110,107 +110,90 @@ sub set {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_addAccessory { sub www_addAccessory {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $f, $accessory, @usedAccessories); my ($output, $f, $accessory, @usedAccessories);
if (WebGUI::Privilege::canEditPage()) { $output = helpIcon(4,$namespace);
$output = helpIcon(4,$namespace); $output .= '<h1>'.WebGUI::International::get(16,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(16,$namespace).'</h1>'; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId"));
$f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("func","addAccessorySave");
$f->hidden("func","addAccessorySave"); @usedAccessories = WebGUI::SQL->quickArray("select accessoryWobjectId from Product_accessory
@usedAccessories = WebGUI::SQL->quickArray("select accessoryWobjectId from Product_accessory where wobjectId=".$session{form}{wid});
where wobjectId=".$session{form}{wid}); push(@usedAccessories,$session{form}{wid});
push(@usedAccessories,$session{form}{wid}); $accessory = WebGUI::SQL->buildHashRef("select wobjectId,title from wobject where namespace='Product'
$accessory = WebGUI::SQL->buildHashRef("select wobjectId,title from wobject where namespace='Product' and wobjectId not in (".join(",",@usedAccessories).")");
and wobjectId not in (".join(",",@usedAccessories).")"); $f->select("accessoryWobjectId",$accessory,WebGUI::International::get(17,$namespace));
$f->select("accessoryWobjectId",$accessory,WebGUI::International::get(17,$namespace)); $f->yesNo("proceed",WebGUI::International::get(18,$namespace));
$f->yesNo("proceed",WebGUI::International::get(18,$namespace)); $f->submit;
$f->submit; $output .= $f->print;
$output .= $f->print;
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
return $output; return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_addAccessorySave { sub www_addAccessorySave {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($seq); my ($seq);
if (WebGUI::Privilege::canEditPage()) { ($seq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from Product_accessory
($seq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from Product_accessory where wobjectId=".$_[0]->get("wobjectId"));
where wobjectId=".$_[0]->get("wobjectId")); WebGUI::SQL->write("insert into Product_accessory (wobjectId,accessoryWobjectId,sequenceNumber) values
WebGUI::SQL->write("insert into Product_accessory (wobjectId,accessoryWobjectId,sequenceNumber) values (".$_[0]->get("wobjectId").",$session{form}{accessoryWobjectId},".($seq+1).")");
(".$_[0]->get("wobjectId").",$session{form}{accessoryWobjectId},".($seq+1).")"); if ($session{form}{proceed}) {
if ($session{form}{proceed}) { return $_[0]->www_addAccessory();
return $_[0]->www_addAccessory();
} else {
return "";
}
} else { } else {
return WebGUI::Privilege::insufficient(); return "";
} }
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_addRelated { sub www_addRelated {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $f, $related, @usedRelated); my ($output, $f, $related, @usedRelated);
if (WebGUI::Privilege::canEditPage()) { $output = helpIcon(5,$namespace);
$output = helpIcon(5,$namespace); $output .= '<h1>'.WebGUI::International::get(19,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(19,$namespace).'</h1>'; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId"));
$f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("func","addRelatedSave");
$f->hidden("func","addRelatedSave"); @usedRelated = WebGUI::SQL->quickArray("select relatedWobjectId from Product_related
@usedRelated = WebGUI::SQL->quickArray("select relatedWobjectId from Product_related where wobjectId=".$session{form}{wid});
where wobjectId=".$session{form}{wid}); push(@usedRelated,$session{form}{wid});
push(@usedRelated,$session{form}{wid}); $related = WebGUI::SQL->buildHashRef("select wobjectId,title from wobject where namespace='Product'
$related = WebGUI::SQL->buildHashRef("select wobjectId,title from wobject where namespace='Product' and wobjectId not in (".join(",",@usedRelated).")");
and wobjectId not in (".join(",",@usedRelated).")"); $f->select("relatedWobjectId",$related,WebGUI::International::get(20,$namespace));
$f->select("relatedWobjectId",$related,WebGUI::International::get(20,$namespace)); $f->yesNo("proceed",WebGUI::International::get(21,$namespace));
$f->yesNo("proceed",WebGUI::International::get(21,$namespace)); $f->submit;
$f->submit; $output .= $f->print;
$output .= $f->print;
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
return $output; return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_addRelatedSave { sub www_addRelatedSave {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($seq); my ($seq);
if (WebGUI::Privilege::canEditPage()) { ($seq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from Product_related
($seq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from Product_related where wobjectId=".$_[0]->get("wobjectId"));
where wobjectId=".$_[0]->get("wobjectId")); WebGUI::SQL->write("insert into Product_related (wobjectId,relatedWobjectId,sequenceNumber) values
WebGUI::SQL->write("insert into Product_related (wobjectId,relatedWobjectId,sequenceNumber) values (".$_[0]->get("wobjectId").",$session{form}{relatedWobjectId},".($seq+1).")");
(".$_[0]->get("wobjectId").",$session{form}{relatedWobjectId},".($seq+1).")"); if ($session{form}{proceed}) {
if ($session{form}{proceed}) { return $_[0]->www_addRelated();
return $_[0]->www_addRelated();
} else {
return "";
}
} else { } else {
return WebGUI::Privilege::insufficient(); return "";
} }
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_copyTemplate { sub www_copyTemplate {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my (%data); my (%data);
tie %data, 'Tie::CPHash'; tie %data, 'Tie::CPHash';
if (WebGUI::Privilege::canEditPage()) { %data = WebGUI::SQL->quickHash("select * from Product_template where productTemplateId=".$session{form}{tid});
%data = WebGUI::SQL->quickHash("select * from Product_template where productTemplateId=".$session{form}{tid}); WebGUI::SQL->write("insert into Product_template values (".getNextId("productTemplateId").","
WebGUI::SQL->write("insert into Product_template values (".getNextId("productTemplateId")."," .quote("Copy of ".$data{name}).",".quote($data{template}).")");
.quote("Copy of ".$data{name}).",".quote($data{template}).")"); return $_[0]->www_edit();
return $_[0]->www_edit();
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteAccessory { sub www_deleteAccessory {
$_[0]->confirm( return $_[0]->confirm(
WebGUI::International::get(2,$namespace), WebGUI::International::get(2,$namespace),
WebGUI::URL::page('func=deleteAccessoryConfirm&wid='.$_[0]->get("wobjectId").'&aid='.$session{form}{aid}) WebGUI::URL::page('func=deleteAccessoryConfirm&wid='.$_[0]->get("wobjectId").'&aid='.$session{form}{aid})
); );
@ -218,19 +201,15 @@ sub www_deleteAccessory {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteAccessoryConfirm { sub www_deleteAccessoryConfirm {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
WebGUI::SQL->write("delete from Product_accessory where wobjectId=$session{form}{wid} WebGUI::SQL->write("delete from Product_accessory where wobjectId=$session{form}{wid} and accessoryWobjectId=$session{form}{aid}");
and accessoryWobjectId=$session{form}{aid}"); $_[0]->reorderCollateral("Product_accessory","accessoryWobjectId");
$_[0]->reorderCollateral("Product_accessory","accessoryWobjectId"); return "";
return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteBenefit { sub www_deleteBenefit {
$_[0]->confirm( return $_[0]->confirm(
WebGUI::International::get(48,$namespace), WebGUI::International::get(48,$namespace),
WebGUI::URL::page('func=deleteBenefitConfirm&wid='.$_[0]->get("wobjectId").'&bid='.$session{form}{bid}) WebGUI::URL::page('func=deleteBenefitConfirm&wid='.$_[0]->get("wobjectId").'&bid='.$session{form}{bid})
); );
@ -238,18 +217,15 @@ sub www_deleteBenefit {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteBenefitConfirm { sub www_deleteBenefitConfirm {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->deleteCollateral("Product_benefit","productBenefitId",$session{form}{bid}); $_[0]->deleteCollateral("Product_benefit","productBenefitId",$session{form}{bid});
$_[0]->reorderCollateral("Product_benefit","productBenefitId"); $_[0]->reorderCollateral("Product_benefit","productBenefitId");
return ""; return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteFeature { sub www_deleteFeature {
$_[0]->confirm( return $_[0]->confirm(
WebGUI::International::get(3,$namespace), WebGUI::International::get(3,$namespace),
WebGUI::URL::page('func=deleteFeatureConfirm&wid='.$_[0]->get("wobjectId").'&fid='.$session{form}{fid}) WebGUI::URL::page('func=deleteFeatureConfirm&wid='.$_[0]->get("wobjectId").'&fid='.$session{form}{fid})
); );
@ -257,18 +233,15 @@ sub www_deleteFeature {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteFeatureConfirm { sub www_deleteFeatureConfirm {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->deleteCollateral("Product_feature","productFeatureId",$session{form}{fid}); $_[0]->deleteCollateral("Product_feature","productFeatureId",$session{form}{fid});
$_[0]->reorderCollateral("Product_feature","productFeatureId"); $_[0]->reorderCollateral("Product_feature","productFeatureId");
return ""; return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteRelated { sub www_deleteRelated {
$_[0]->confirm( return $_[0]->confirm(
WebGUI::International::get(4,$namespace), WebGUI::International::get(4,$namespace),
WebGUI::URL::page('func=deleteRelatedConfirm&wid='.$_[0]->get("wobjectId").'&rid='.$session{form}{rid}) WebGUI::URL::page('func=deleteRelatedConfirm&wid='.$_[0]->get("wobjectId").'&rid='.$session{form}{rid})
); );
@ -276,19 +249,15 @@ sub www_deleteRelated {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteRelatedConfirm { sub www_deleteRelatedConfirm {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
WebGUI::SQL->write("delete from Product_related where wobjectId=$session{form}{wid} WebGUI::SQL->write("delete from Product_related where wobjectId=$session{form}{wid} and relatedWobjectId=$session{form}{rid}");
and relatedWobjectId=$session{form}{rid}"); $_[0]->reorderCollateral("Product_related","relatedWobjectId");
$_[0]->reorderCollateral("Product_related","relatedWobjectId"); return "";
return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteSpecification { sub www_deleteSpecification {
$_[0]->confirm( return $_[0]->confirm(
WebGUI::International::get(5,$namespace), WebGUI::International::get(5,$namespace),
WebGUI::URL::page('func=deleteSpecificationConfirm&wid='.$_[0]->get("wobjectId").'&sid='.$session{form}{sid}) WebGUI::URL::page('func=deleteSpecificationConfirm&wid='.$_[0]->get("wobjectId").'&sid='.$session{form}{sid})
); );
@ -296,18 +265,15 @@ sub www_deleteSpecification {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteSpecificationConfirm { sub www_deleteSpecificationConfirm {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->deleteCollateral("Product_specification","productSpecificationId",$session{form}{sid}); $_[0]->deleteCollateral("Product_specification","productSpecificationId",$session{form}{sid});
$_[0]->reorderCollateral("Product_specification","productSpecificationId"); $_[0]->reorderCollateral("Product_specification","productSpecificationId");
return ""; return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteTemplate { sub www_deleteTemplate {
$_[0]->confirm( return $_[0]->confirm(
WebGUI::International::get(57,$namespace), WebGUI::International::get(57,$namespace),
WebGUI::URL::page('func=deleteTemplateConfirm&wid='.$_[0]->get("wobjectId").'&tid='.$session{form}{tid}), WebGUI::URL::page('func=deleteTemplateConfirm&wid='.$_[0]->get("wobjectId").'&tid='.$session{form}{tid}),
'', '',
@ -317,307 +283,290 @@ sub www_deleteTemplate {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_deleteTemplateConfirm { sub www_deleteTemplateConfirm {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->deleteCollateral("Product_template","productTemplateId",$session{form}{tid}); $_[0]->deleteCollateral("Product_template","productTemplateId",$session{form}{tid});
WebGUI::SQL->write("update Product set productTemplateId=1 where productTemplateId=$session{form}{tid}"); WebGUI::SQL->write("update Product set productTemplateId=1 where productTemplateId=$session{form}{tid}");
return $_[0]->www_edit(); return $_[0]->www_edit();
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($f, $output, $proceed, %data, $sth, $templates, $template); my ($f, $output, $proceed, %data, $sth, $templates, $template);
if (WebGUI::Privilege::canEditPage()) { $output = helpIcon(1,$namespace);
$output = helpIcon(1,$namespace); $output .= '<h1>'.WebGUI::International::get(6,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(6,$namespace).'</h1>'; if ($_[0]->get("wobjectId") eq "new") {
if ($_[0]->get("wobjectId") eq "new") { $template = 1;
$template = 1; } else {
} else { $template = $_[0]->get("productTemplateId");
$template = $_[0]->get("productTemplateId"); }
$f = WebGUI::HTMLForm->new;
$f->text("price",WebGUI::International::get(10,$namespace),$_[0]->get("price"));
$f->text("productNumber",WebGUI::International::get(11,$namespace),$_[0]->get("productNumber"));
$f->raw($_[0]->fileProperty("image1",7));
$f->raw($_[0]->fileProperty("image2",8));
$f->raw($_[0]->fileProperty("image3",9));
$f->raw($_[0]->fileProperty("brochure",13));
$f->raw($_[0]->fileProperty("manual",14));
$f->raw($_[0]->fileProperty("warranty",15));
$templates = WebGUI::SQL->buildHashRef("select productTemplateId,name from Product_template order by name");
$f->select("productTemplateId",$templates,WebGUI::International::get(61,$namespace),[$template]);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
unless ($_[0]->get("wobjectId") eq "new") {
$output .= '<hr size="1" /><p>';
$output .= '<a href="'.WebGUI::URL::page('func=editTemplate&tid=new&wid='.$_[0]->get("wobjectId")).'">'
.WebGUI::International::get(56,$namespace).'</a><p>';
tie %data, 'Tie::CPHash';
$sth = WebGUI::SQL->read("select productTemplateId,name from Product_template order by name");
while (%data = $sth->hash) {
$output .= deleteIcon('func=deleteTemplate&wid='.$_[0]->get("wobjectId").'&tid='.$data{productTemplateId})
.editIcon('func=editTemplate&wid='.$_[0]->get("wobjectId").'&tid='.$data{productTemplateId})
.copyIcon('func=copyTemplate&wid='.$_[0]->get("wobjectId").'&tid='.$data{productTemplateId})
.' '.$data{name}.'<br>';
} }
$f = WebGUI::HTMLForm->new; $sth->finish;
$f->text("price",WebGUI::International::get(10,$namespace),$_[0]->get("price")); }
$f->text("productNumber",WebGUI::International::get(11,$namespace),$_[0]->get("productNumber")); return $output;
$f->raw($_[0]->fileProperty("image1",7));
$f->raw($_[0]->fileProperty("image2",8));
$f->raw($_[0]->fileProperty("image3",9));
$f->raw($_[0]->fileProperty("brochure",13));
$f->raw($_[0]->fileProperty("manual",14));
$f->raw($_[0]->fileProperty("warranty",15));
$templates = WebGUI::SQL->buildHashRef("select productTemplateId,name from Product_template order by name");
$f->select("productTemplateId",$templates,WebGUI::International::get(61,$namespace),[$template]);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
unless ($_[0]->get("wobjectId") eq "new") {
$output .= '<hr size="1" /><p>';
$output .= '<a href="'.WebGUI::URL::page('func=editTemplate&tid=new&wid='.$_[0]->get("wobjectId")).'">'
.WebGUI::International::get(56,$namespace).'</a><p>';
tie %data, 'Tie::CPHash';
$sth = WebGUI::SQL->read("select productTemplateId,name from Product_template order by name");
while (%data = $sth->hash) {
$output .= deleteIcon('func=deleteTemplate&wid='.$_[0]->get("wobjectId").'&tid='.$data{productTemplateId})
.editIcon('func=editTemplate&wid='.$_[0]->get("wobjectId").'&tid='.$data{productTemplateId})
.copyIcon('func=copyTemplate&wid='.$_[0]->get("wobjectId").'&tid='.$data{productTemplateId})
.' '.$data{name}.'<br>';
}
$sth->finish;
}
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($file, %property); my ($file, %property);
if (WebGUI::Privilege::canEditPage()) { $_[0]->SUPER::www_editSave();
$_[0]->SUPER::www_editSave(); $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
$file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); $file->save("image1");
$file->save("image1"); $property{image1}=$file->getFilename("image1") if ($file->getFilename("image1") ne "");
$property{image1}=$file->getFilename("image1") if ($file->getFilename("image1") ne ""); $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
$file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); $file->save("image2");
$file->save("image2"); $property{image2}=$file->getFilename("image2") if ($file->getFilename("image2") ne "");
$property{image2}=$file->getFilename("image2") if ($file->getFilename("image2") ne ""); $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
$file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); $file->save("image3");
$file->save("image3"); $property{image3}=$file->getFilename("image3") if ($file->getFilename("image3") ne "");
$property{image3}=$file->getFilename("image3") if ($file->getFilename("image3") ne ""); $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
$file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); $file->save("manual");
$file->save("manual"); $property{manual}=$file->getFilename("manual") if ($file->getFilename("manual") ne "");
$property{manual}=$file->getFilename("manual") if ($file->getFilename("manual") ne ""); $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
$file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); $file->save("brochure");
$file->save("brochure"); $property{brochure}=$file->getFilename("brochure") if ($file->getFilename("brochure") ne "");
$property{brochure}=$file->getFilename("brochure") if ($file->getFilename("brochure") ne ""); $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
$file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); $file->save("warranty");
$file->save("warranty"); $property{warranty}=$file->getFilename("warranty") if ($file->getFilename("warranty") ne "");
$property{warranty}=$file->getFilename("warranty") if ($file->getFilename("warranty") ne ""); $property{productTemplateId}=$session{form}{productTemplateId};
$property{productTemplateId}=$session{form}{productTemplateId}; $property{price}=$session{form}{price};
$property{price}=$session{form}{price}; $property{productNumber}=$session{form}{productNumber};
$property{productNumber}=$session{form}{productNumber}; $_[0]->set(\%property);
$_[0]->set(\%property); return "";
return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editBenefit { sub www_editBenefit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $data, $f, $benefits); my ($output, $data, $f, $benefits);
if (WebGUI::Privilege::canEditPage()) { $data = $_[0]->getCollateral("Product_benefit","productBenefitId",$session{form}{bid});
$data = $_[0]->getCollateral("Product_benefit","productBenefitId",$session{form}{bid}); $output = helpIcon(6,$namespace);
$output = helpIcon(6,$namespace); $output .= '<h1>'.WebGUI::International::get(53,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(53,$namespace).'</h1>'; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId"));
$f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("bid",$data->{productBenefitId});
$f->hidden("bid",$data->{productBenefitId}); $f->hidden("func","editBenefitSave");
$f->hidden("func","editBenefitSave"); $benefits = WebGUI::SQL->buildHashRef("select benefit,benefit from Product_benefit order by benefit");
$benefits = WebGUI::SQL->buildHashRef("select benefit,benefit from Product_benefit order by benefit"); $f->combo("benefit",$benefits,WebGUI::International::get(51,$namespace),[$data->{benefits}]);
$f->combo("benefit",$benefits,WebGUI::International::get(51,$namespace),[$data->{benefits}]); $f->yesNo("proceed",WebGUI::International::get(52,$namespace));
$f->yesNo("proceed",WebGUI::International::get(52,$namespace)); $f->submit;
$f->submit; $output .= $f->print;
$output .= $f->print;
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
return $output; return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editBenefitSave { sub www_editBenefitSave {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$session{form}{benefit} = $session{form}{benefit_new} if ($session{form}{benefit_new} ne ""); $session{form}{benefit} = $session{form}{benefit_new} if ($session{form}{benefit_new} ne "");
$_[0]->setCollateral("Product_benefit", "productBenefitId", { $_[0]->setCollateral("Product_benefit", "productBenefitId", {
productBenefitId => $session{form}{bid}, productBenefitId => $session{form}{bid},
benefit => $session{form}{benefit} benefit => $session{form}{benefit}
}); });
if ($session{form}{proceed}) { if ($session{form}{proceed}) {
$session{form}{bid} = "new"; $session{form}{bid} = "new";
return $_[0]->www_editBenefit(); return $_[0]->www_editBenefit();
} else {
return "";
}
} else { } else {
return WebGUI::Privilege::insufficient(); return "";
} }
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editFeature { sub www_editFeature {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $data, $f, $features); my ($output, $data, $f, $features);
if (WebGUI::Privilege::canEditPage()) { $data = $_[0]->getCollateral("Product_feature","productFeatureId",$session{form}{fid});
$data = $_[0]->getCollateral("Product_feature","productFeatureId",$session{form}{fid}); $output = helpIcon(2,$namespace);
$output = helpIcon(2,$namespace); $output .= '<h1>'.WebGUI::International::get(22,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(22,$namespace).'</h1>'; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId"));
$f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("fid",$data->{productFeatureId});
$f->hidden("fid",$data->{productFeatureId}); $f->hidden("func","editFeatureSave");
$f->hidden("func","editFeatureSave"); $features = WebGUI::SQL->buildHashRef("select feature,feature from Product_feature order by feature");
$features = WebGUI::SQL->buildHashRef("select feature,feature from Product_feature order by feature"); $f->combo("feature",$features,WebGUI::International::get(23,$namespace),[$data->{feature}]);
$f->combo("feature",$features,WebGUI::International::get(23,$namespace),[$data->{feature}]); $f->yesNo("proceed",WebGUI::International::get(24,$namespace));
$f->yesNo("proceed",WebGUI::International::get(24,$namespace)); $f->submit;
$f->submit; $output .= $f->print;
$output .= $f->print;
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
return $output; return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editFeatureSave { sub www_editFeatureSave {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$session{form}{feature} = $session{form}{feature_new} if ($session{form}{feature_new} ne ""); $session{form}{feature} = $session{form}{feature_new} if ($session{form}{feature_new} ne "");
$_[0]->setCollateral("Product_feature", "productFeatureId", { $_[0]->setCollateral("Product_feature", "productFeatureId", {
productFeatureId => $session{form}{fid}, productFeatureId => $session{form}{fid},
feature => $session{form}{feature} feature => $session{form}{feature}
}); });
if ($session{form}{proceed}) { if ($session{form}{proceed}) {
$session{form}{fid} = "new"; $session{form}{fid} = "new";
return $_[0]->www_editFeature(); return $_[0]->www_editFeature();
} else {
return "";
}
} else { } else {
return WebGUI::Privilege::insufficient(); return "";
} }
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSpecification { sub www_editSpecification {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $data, $f, $hashRef); my ($output, $data, $f, $hashRef);
if (WebGUI::Privilege::canEditPage()) { $data = $_[0]->getCollateral("Product_specification","productSpecificationId",$session{form}{sid});
$data = $_[0]->getCollateral("Product_specification","productSpecificationId",$session{form}{sid}); $output = helpIcon(3,$namespace);
$output = helpIcon(3,$namespace); $output .= '<h1>'.WebGUI::International::get(25,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(25,$namespace).'</h1>'; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId"));
$f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("sid",$data->{productSpecificationId});
$f->hidden("sid",$data->{productSpecificationId}); $f->hidden("func","editSpecificationSave");
$f->hidden("func","editSpecificationSave"); $hashRef = WebGUI::SQL->buildHashRef("select name,name from Product_specification order by name");
$hashRef = WebGUI::SQL->buildHashRef("select name,name from Product_specification order by name"); $f->combo("name",$hashRef,WebGUI::International::get(26,$namespace),[$data->{name}]);
$f->combo("name",$hashRef,WebGUI::International::get(26,$namespace),[$data->{name}]); $f->text("value",WebGUI::International::get(27,$namespace),$data->{value});
$f->text("value",WebGUI::International::get(27,$namespace),$data->{value}); $hashRef = WebGUI::SQL->buildHashRef("select units,units from Product_specification order by units");
$hashRef = WebGUI::SQL->buildHashRef("select units,units from Product_specification order by units"); $f->combo("units",$hashRef,WebGUI::International::get(29,$namespace),[$data->{units}]);
$f->combo("units",$hashRef,WebGUI::International::get(29,$namespace),[$data->{units}]); $f->yesNo("proceed",WebGUI::International::get(28,$namespace));
$f->yesNo("proceed",WebGUI::International::get(28,$namespace)); $f->submit;
$f->submit; $output .= $f->print;
$output .= $f->print;
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
return $output; return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSpecificationSave { sub www_editSpecificationSave {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$session{form}{name} = $session{form}{name_new} if ($session{form}{name_new} ne ""); $session{form}{name} = $session{form}{name_new} if ($session{form}{name_new} ne "");
$session{form}{units} = $session{form}{units_new} if ($session{form}{units_new} ne ""); $session{form}{units} = $session{form}{units_new} if ($session{form}{units_new} ne "");
$_[0]->setCollateral("Product_specification", "productSpecificationId", { $_[0]->setCollateral("Product_specification", "productSpecificationId", {
productSpecificationId => $session{form}{sid}, productSpecificationId => $session{form}{sid},
name => $session{form}{name}, name => $session{form}{name},
value => $session{form}{value}, value => $session{form}{value},
units => $session{form}{units} units => $session{form}{units}
}); });
if ($session{form}{proceed}) { if ($session{form}{proceed}) {
$session{form}{sid} = "new"; $session{form}{sid} = "new";
return $_[0]->www_editSpecification(); return $_[0]->www_editSpecification();
} else {
return "";
}
} else { } else {
return WebGUI::Privilege::insufficient(); return "";
} }
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editTemplate { sub www_editTemplate {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $data, $f); my ($output, $data, $f);
if (WebGUI::Privilege::canEditPage()) { $data = $_[0]->getCollateral("Product_template","productTemplateId",$session{form}{tid});
$data = $_[0]->getCollateral("Product_template","productTemplateId",$session{form}{tid}); $output = helpIcon(7,$namespace);
$output = helpIcon(7,$namespace); $output .= '<h1>'.WebGUI::International::get(58,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(58,$namespace).'</h1>'; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId"));
$f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("tid",$data->{productTemplateId});
$f->hidden("tid",$data->{productTemplateId}); $f->hidden("func","editTemplateSave");
$f->hidden("func","editTemplateSave"); $f->text("name",WebGUI::International::get(59,$namespace),$data->{name});
$f->text("name",WebGUI::International::get(59,$namespace),$data->{name}); $f->HTMLArea("template",WebGUI::International::get(60,$namespace),$data->{template},'','','',($session{setting}{textAreaRows}+10));
$f->HTMLArea("template",WebGUI::International::get(60,$namespace),$data->{template},'','','',($session{setting}{textAreaRows}+10)); $f->submit;
$f->submit; $output .= $f->print;
$output .= $f->print;
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
return $output; return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editTemplateSave { sub www_editTemplateSave {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->setCollateral("Product_template", "productTemplateId", { $_[0]->setCollateral("Product_template", "productTemplateId", {
productTemplateId => $session{form}{tid}, productTemplateId => $session{form}{tid},
name => $session{form}{name}, name => $session{form}{name},
template => $session{form}{template} template => $session{form}{template}
}, 0, 0); }, 0, 0);
return $_[0]->www_edit(); return $_[0]->www_edit();
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveAccessoryDown { sub www_moveAccessoryDown {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralDown("Product_related","accessoryWobjectId",$session{form}{aid}); $_[0]->moveCollateralDown("Product_related","accessoryWobjectId",$session{form}{aid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveAccessoryUp { sub www_moveAccessoryUp {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralUp("Product_accessory","accessoryWobjectId",$session{form}{aid}); $_[0]->moveCollateralUp("Product_accessory","accessoryWobjectId",$session{form}{aid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveBenefitDown { sub www_moveBenefitDown {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralDown("Product_benefit","productBenefitId",$session{form}{bid}); $_[0]->moveCollateralDown("Product_benefit","productBenefitId",$session{form}{bid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveBenefitUp { sub www_moveBenefitUp {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralUp("Product_benefit","productBenefitId",$session{form}{bid}); $_[0]->moveCollateralUp("Product_benefit","productBenefitId",$session{form}{bid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveFeatureDown { sub www_moveFeatureDown {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralDown("Product_feature","productFeatureId",$session{form}{fid}); $_[0]->moveCollateralDown("Product_feature","productFeatureId",$session{form}{fid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveFeatureUp { sub www_moveFeatureUp {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralUp("Product_feature","productFeatureId",$session{form}{fid}); $_[0]->moveCollateralUp("Product_feature","productFeatureId",$session{form}{fid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveRelatedDown { sub www_moveRelatedDown {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralDown("Product_related","relatedWobjectId",$session{form}{rid}); $_[0]->moveCollateralDown("Product_related","relatedWobjectId",$session{form}{rid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveRelatedUp { sub www_moveRelatedUp {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralUp("Product_related","relatedWobjectId",$session{form}{rid}); $_[0]->moveCollateralUp("Product_related","relatedWobjectId",$session{form}{rid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveSpecificationDown { sub www_moveSpecificationDown {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralDown("Product_specification","productSpecificationId",$session{form}{sid}); $_[0]->moveCollateralDown("Product_specification","productSpecificationId",$session{form}{sid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_moveSpecificationUp { sub www_moveSpecificationUp {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->moveCollateralUp("Product_specification","productSpecificationId",$session{form}{sid}); $_[0]->moveCollateralUp("Product_specification","productSpecificationId",$session{form}{sid});
return "";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

70
lib/WebGUI/Wobject/SQLReport.pm
View file

@ -53,50 +53,44 @@ sub set {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $f, $dsn, $username, $paginateAfter); my ($output, $f, $dsn, $username, $paginateAfter);
if (WebGUI::Privilege::canEditPage()) { $dsn = $_[0]->get("DSN") || $session{config}{dsn};
$dsn = $_[0]->get("DSN") || $session{config}{dsn}; $username = $_[0]->get("username") || $session{config}{dbuser};
$username = $_[0]->get("username") || $session{config}{dbuser}; $paginateAfter = $_[0]->get("paginateAfter") || 50;
$paginateAfter = $_[0]->get("paginateAfter") || 50; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $output = helpIcon(1,$namespace);
$output = helpIcon(1,$namespace); $output .= '<h1>'.WebGUI::International::get(8,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(8,$namespace).'</h1>'; $f->yesNo("preprocessMacros",WebGUI::International::get(15,$namespace),$_[0]->get("preprocessMacros"));
$f->yesNo("preprocessMacros",WebGUI::International::get(15,$namespace),$_[0]->get("preprocessMacros")); $f->yesNo("debugMode",WebGUI::International::get(16,$namespace),$_[0]->get("debugMode"));
$f->yesNo("debugMode",WebGUI::International::get(16,$namespace),$_[0]->get("debugMode")); $f->textarea("dbQuery",WebGUI::International::get(4,$namespace),$_[0]->get("dbQuery"));
$f->textarea("dbQuery",WebGUI::International::get(4,$namespace),$_[0]->get("dbQuery")); $f->HTMLArea("template",WebGUI::International::get(3,$namespace),$_[0]->get("template"));
$f->HTMLArea("template",WebGUI::International::get(3,$namespace),$_[0]->get("template")); $f->text("DSN",WebGUI::International::get(5,$namespace),$dsn);
$f->text("DSN",WebGUI::International::get(5,$namespace),$dsn); $f->text("username",WebGUI::International::get(6,$namespace),$username);
$f->text("username",WebGUI::International::get(6,$namespace),$username); $f->password("identifier",WebGUI::International::get(7,$namespace),$_[0]->get("identifier"));
$f->password("identifier",WebGUI::International::get(7,$namespace),$_[0]->get("identifier")); $f->integer("paginateAfter",WebGUI::International::get(14,$namespace),$paginateAfter);
$f->integer("paginateAfter",WebGUI::International::get(14,$namespace),$paginateAfter); $f->yesNo("convertCarriageReturns",WebGUI::International::get(13,$namespace),$_[0]->get("convertCarriageReturns"));
$f->yesNo("convertCarriageReturns",WebGUI::International::get(13,$namespace),$_[0]->get("convertCarriageReturns")); $output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly); return $output;
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($wobjectId, $displayTitle, $image, $attachment); my ($wobjectId, $displayTitle, $image, $attachment);
if (WebGUI::Privilege::canEditPage()) { $_[0]->SUPER::www_editSave();
$_[0]->SUPER::www_editSave(); $_[0]->set({
$_[0]->set({ template=>$session{form}{template},
template=>$session{form}{template}, dbQuery=>$session{form}{dbQuery},
dbQuery=>$session{form}{dbQuery}, convertCarriageReturns=>$session{form}{convertCarriageReturns},
convertCarriageReturns=>$session{form}{convertCarriageReturns}, DSN=>$session{form}{DSN},
DSN=>$session{form}{DSN}, username=>$session{form}{username},
username=>$session{form}{username}, identifier=>$session{form}{identifier},
identifier=>$session{form}{identifier}, paginateAfter=>$session{form}{paginateAfter},
paginateAfter=>$session{form}{paginateAfter}, preprocessMacros=>$session{form}{preprocessMacros},
preprocessMacros=>$session{form}{preprocessMacros}, debugMode=>$session{form}{debugMode}
debugMode=>$session{form}{debugMode} });
}); return "";
return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

56
lib/WebGUI/Wobject/SiteMap.pm
View file

@ -78,43 +78,37 @@ sub set {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $f, $indent, $bullet, $lineSpacing); my ($output, $f, $indent, $bullet, $lineSpacing);
if (WebGUI::Privilege::canEditPage()) { $indent = $_[0]->get("indent") || 5;
$indent = $_[0]->get("indent") || 5; $bullet = $_[0]->get("bullet") || '&middot;';
$bullet = $_[0]->get("bullet") || '&middot;'; $lineSpacing = $_[0]->get("lineSpacing") || 1;
$lineSpacing = $_[0]->get("lineSpacing") || 1; $output = helpIcon(1,$_[0]->get("namespace"));
$output = helpIcon(1,$_[0]->get("namespace")); $output .= '<h1>'.WebGUI::International::get(5,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(5,$namespace).'</h1>'; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $f->yesNo("displaySynopsis",WebGUI::International::get(9,$namespace),$_[0]->get("displaySynopsis"));
$f->yesNo("displaySynopsis",WebGUI::International::get(9,$namespace),$_[0]->get("displaySynopsis")); $f->yesNo("startAtThisLevel",WebGUI::International::get(3,$namespace),$_[0]->get("startAtThisLevel"));
$f->yesNo("startAtThisLevel",WebGUI::International::get(3,$namespace),$_[0]->get("startAtThisLevel")); $f->integer("depth",WebGUI::International::get(4,$namespace),$_[0]->get("depth"));
$f->integer("depth",WebGUI::International::get(4,$namespace),$_[0]->get("depth")); $f->integer("indent",WebGUI::International::get(6,$namespace),$indent);
$f->integer("indent",WebGUI::International::get(6,$namespace),$indent); $f->text("bullet",WebGUI::International::get(7,$namespace),$bullet);
$f->text("bullet",WebGUI::International::get(7,$namespace),$bullet); $f->integer("lineSpacing",WebGUI::International::get(8,$namespace),$lineSpacing);
$f->integer("lineSpacing",WebGUI::International::get(8,$namespace),$lineSpacing); $output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly); return $output;
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($property); my ($property);
if (WebGUI::Privilege::canEditPage()) { $_[0]->SUPER::www_editSave();
$_[0]->SUPER::www_editSave(); $property->{indent} = $session{form}{indent};
$property->{indent} = $session{form}{indent}; $property->{displaySynopsis} = $session{form}{displaySynopsis};
$property->{displaySynopsis} = $session{form}{displaySynopsis}; $property->{bullet} = $session{form}{bullet};
$property->{bullet} = $session{form}{bullet}; $property->{startAtThisLevel} = $session{form}{startAtThisLevel};
$property->{startAtThisLevel} = $session{form}{startAtThisLevel}; $property->{depth} = $session{form}{depth};
$property->{depth} = $session{form}{depth}; $property->{lineSpacing} = $session{form}{lineSpacing};
$property->{lineSpacing} = $session{form}{lineSpacing}; $_[0]->set($property);
$_[0]->set($property); return "";
return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

48
lib/WebGUI/Wobject/SyndicatedContent.pm
View file

@ -45,39 +45,33 @@ sub set {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $f); my ($output, $f);
if (WebGUI::Privilege::canEditPage()) { $output = helpIcon(1,$namespace);
$output = helpIcon(1,$namespace); $output .= '<h1>'.WebGUI::International::get(4,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(4,$namespace).'</h1>'; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $f->url("rssUrl",WebGUI::International::get(1,$namespace),$_[0]->get("rssUrl"));
$f->url("rssUrl",WebGUI::International::get(1,$namespace),$_[0]->get("rssUrl")); if ($_[0]->get("wobjectId") ne "new") {
if ($_[0]->get("wobjectId") ne "new") { $f->readOnly(WebGUI::DateTime::epochToHuman($_[0]->get("lastFetched"),"%z %Z"),WebGUI::International::get(5,$namespace));
$f->readOnly(WebGUI::DateTime::epochToHuman($_[0]->get("lastFetched"),"%z %Z"),WebGUI::International::get(5,$namespace)); $f->readOnly($_[0]->get("content"),WebGUI::International::get(6,$namespace));
$f->readOnly($_[0]->get("content"),WebGUI::International::get(6,$namespace)); } else {
} else { $f->hidden("content","Not yet fetched!");
$f->hidden("content","Not yet fetched!"); $f->hidden("lastFetched",time());
$f->hidden("lastFetched",time()); }
} $output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly); return $output;
return $output;
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($property); my ($property);
if (WebGUI::Privilege::canEditPage()) { $_[0]->SUPER::www_editSave();
$_[0]->SUPER::www_editSave(); $property->{rssUrl} = $session{form}{rssUrl};
$property->{rssUrl} = $session{form}{rssUrl}; $property->{content} = $session{form}{content} if ($session{form}{content} ne "");
$property->{content} = $session{form}{content} if ($session{form}{content} ne ""); $property->{lastFetched} = $session{form}{lastFetched} if ($session{form}{lastFetched} ne "");
$property->{lastFetched} = $session{form}{lastFetched} if ($session{form}{lastFetched} ne ""); $_[0]->set($property);
$_[0]->set($property); return "";
return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

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

@ -314,6 +314,7 @@ sub www_denySubmission {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my (%layout, $layout, $output, $f, $defaultStatus, $submissionsPerPage, $groupToApprove); my (%layout, $layout, $output, $f, $defaultStatus, $submissionsPerPage, $groupToApprove);
%layout = (traditional=>WebGUI::International::get(55,$namespace), %layout = (traditional=>WebGUI::International::get(55,$namespace),
weblog=>WebGUI::International::get(54,$namespace), weblog=>WebGUI::International::get(54,$namespace),
@ -322,48 +323,41 @@ sub www_edit {
$groupToApprove = $_[0]->get("groupToApprove") || 4; $groupToApprove = $_[0]->get("groupToApprove") || 4;
$submissionsPerPage = $_[0]->get("submissionsPerPage") || 50; $submissionsPerPage = $_[0]->get("submissionsPerPage") || 50;
$defaultStatus = $_[0]->get("defaultStatus") || "Approved"; $defaultStatus = $_[0]->get("defaultStatus") || "Approved";
if (WebGUI::Privilege::canEditPage()) { $output = helpIcon(1,$namespace);
$output = helpIcon(1,$namespace); $output .= '<h1>'.WebGUI::International::get(18,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(18,$namespace).'</h1>'; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $f->select("layout",\%layout,WebGUI::International::get(53,$namespace),[$layout]);
$f->select("layout",\%layout,WebGUI::International::get(53,$namespace),[$layout]); $f->group("groupToApprove",WebGUI::International::get(1,$namespace),[$groupToApprove]);
$f->group("groupToApprove",WebGUI::International::get(1,$namespace),[$groupToApprove]); $f->group("groupToContribute",WebGUI::International::get(2,$namespace),[$_[0]->get("groupToContribute")]);
$f->group("groupToContribute",WebGUI::International::get(2,$namespace),[$_[0]->get("groupToContribute")]); $f->integer("submissionsPerPage",WebGUI::International::get(6,$namespace),$submissionsPerPage);
$f->integer("submissionsPerPage",WebGUI::International::get(6,$namespace),$submissionsPerPage); $f->select("defaultStatus",\%submissionStatus,WebGUI::International::get(563),[$defaultStatus]);
$f->select("defaultStatus",\%submissionStatus,WebGUI::International::get(563),[$defaultStatus]); if ($session{setting}{useKarma}) {
if ($session{setting}{useKarma}) { $f->integer("karmaPerSubmission",WebGUI::International::get(30,$namespace),$_[0]->get("karmaPerSubmission"));
$f->integer("karmaPerSubmission",WebGUI::International::get(30,$namespace),$_[0]->get("karmaPerSubmission"));
} else {
$f->hidden("karmaPerSubmission",$_[0]->get("karmaPerSubmission"));
}
$f->yesNo("displayThumbnails",WebGUI::International::get(51,$namespace),$_[0]->get("displayThumbnails"));
$f->yesNo("allowDiscussion",WebGUI::International::get(48,$namespace),$_[0]->get("allowDiscussion"));
$f->raw($_[0]->SUPER::discussionProperties);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
return $output;
} else { } else {
return WebGUI::Privilege::insufficient(); $f->hidden("karmaPerSubmission",$_[0]->get("karmaPerSubmission"));
} }
$f->yesNo("displayThumbnails",WebGUI::International::get(51,$namespace),$_[0]->get("displayThumbnails"));
$f->yesNo("allowDiscussion",WebGUI::International::get(48,$namespace),$_[0]->get("allowDiscussion"));
$f->raw($_[0]->SUPER::discussionProperties);
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->SUPER::www_editSave(); $_[0]->SUPER::www_editSave();
$_[0]->set({ $_[0]->set({
submissionsPerPage=>$session{form}{submissionsPerPage}, submissionsPerPage=>$session{form}{submissionsPerPage},
groupToContribute=>$session{form}{groupToContribute}, groupToContribute=>$session{form}{groupToContribute},
groupToApprove=>$session{form}{groupToApprove}, groupToApprove=>$session{form}{groupToApprove},
defaultStatus=>$session{form}{defaultStatus}, defaultStatus=>$session{form}{defaultStatus},
karmaPerSubmission=>$session{form}{karmaPerSubmission}, karmaPerSubmission=>$session{form}{karmaPerSubmission},
allowDiscussion=>$session{form}{allowDiscussion}, allowDiscussion=>$session{form}{allowDiscussion},
layout=>$session{form}{layout}, layout=>$session{form}{layout},
displayThumbnails=>$session{form}{displayThumbnails} displayThumbnails=>$session{form}{displayThumbnails}
}); });
return ""; return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

76
lib/WebGUI/Wobject/WobjectProxy.pm
View file

@ -43,56 +43,50 @@ sub set {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my ($output, $f, $startDate, $endDate, $templatePosition,%wobjects, %page, %wobject, $a, $b); my ($output, $f, $startDate, $endDate, $templatePosition,%wobjects, %page, %wobject, $a, $b);
tie %wobject, 'Tie::CPHash'; tie %wobject, 'Tie::CPHash';
tie %page, 'Tie::CPHash'; tie %page, 'Tie::CPHash';
tie %wobjects, 'Tie::IxHash'; tie %wobjects, 'Tie::IxHash';
if (WebGUI::Privilege::canEditPage()) { $output = helpIcon(1,$namespace);
$output = helpIcon(1,$namespace); $output .= '<h1>'.WebGUI::International::get(2,$namespace).'</h1>';
$output .= '<h1>'.WebGUI::International::get(2,$namespace).'</h1>'; $templatePosition = $_[0]->get("templatePosition") || '0';
$templatePosition = $_[0]->get("templatePosition") || '0'; $startDate = $_[0]->get("startDate") || $session{page}{startDate};
$startDate = $_[0]->get("startDate") || $session{page}{startDate}; $endDate = $_[0]->get("endDate") || $session{page}{endDate};
$endDate = $_[0]->get("endDate") || $session{page}{endDate}; $f = WebGUI::HTMLForm->new;
$f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId"));
$f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("namespace",$_[0]->get("namespace")) if ($_[0]->get("wobjectId") eq "new");
$f->hidden("namespace",$_[0]->get("namespace")) if ($_[0]->get("wobjectId") eq "new"); $f->hidden("func","editSave");
$f->hidden("func","editSave"); $f->readOnly($_[0]->get("wobjectId"),WebGUI::International::get(499));
$f->readOnly($_[0]->get("wobjectId"),WebGUI::International::get(499)); $f->hidden("title",$namespace);
$f->hidden("title",$namespace); $f->hidden("displayTitle",0);
$f->hidden("displayTitle",0); $f->hidden("processMacros",0);
$f->hidden("processMacros",0); $f->select("templatePosition",WebGUI::Template::getPositions($session{page}{templateId}),WebGUI::International::get(363),[$templatePosition]);
$f->select("templatePosition",WebGUI::Template::getPositions($session{page}{templateId}),WebGUI::International::get(363),[$templatePosition]); $f->date("startDate",WebGUI::International::get(497),$startDate);
$f->date("startDate",WebGUI::International::get(497),$startDate); $f->date("endDate",WebGUI::International::get(498),$endDate);
$f->date("endDate",WebGUI::International::get(498),$endDate); $a = WebGUI::SQL->read("select pageId,menuTitle from page where pageId<2 or pageId>25 order by title");
$a = WebGUI::SQL->read("select pageId,menuTitle from page where pageId<2 or pageId>25 order by title"); while (%page = $a->hash) {
while (%page = $a->hash) { $b = WebGUI::SQL->read("select wobjectId,title from wobject where pageId=".$page{pageId}." and namespace<>'WobjectProxy' order by sequenceNumber");
$b = WebGUI::SQL->read("select wobjectId,title from wobject where pageId=".$page{pageId}." and namespace<>'WobjectProxy' order by sequenceNumber"); while (%wobject = $b->hash) {
while (%wobject = $b->hash) { $wobjects{$wobject{wobjectId}} = $page{menuTitle}." / ".$wobject{title}." (".$wobject{wobjectId}.")";
$wobjects{$wobject{wobjectId}} = $page{menuTitle}." / ".$wobject{title}." (".$wobject{wobjectId}.")";
}
$b->finish;
} }
$a->finish; $b->finish;
$f->select("proxiedWobjectId",\%wobjects,WebGUI::International::get(1,$namespace),[$_[0]->get("proxiedWobjectId")]); }
$f->submit; $a->finish;
$output .= $f->print; $f->select("proxiedWobjectId",\%wobjects,WebGUI::International::get(1,$namespace),[$_[0]->get("proxiedWobjectId")]);
return $output; $f->submit;
} else { $output .= $f->print;
return WebGUI::Privilege::insufficient(); return $output;
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editSave { sub www_editSave {
if (WebGUI::Privilege::canEditPage()) { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
$_[0]->SUPER::www_editSave(); $_[0]->SUPER::www_editSave();
$_[0]->set({ $_[0]->set({
proxiedWobjectId=>$session{form}{proxiedWobjectId} proxiedWobjectId=>$session{form}{proxiedWobjectId}
}); });
return ""; return "";
} else {
return WebGUI::Privilege::insufficient();
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------