From 65de90cbb5159138cf543bf61750d1e1a529583b Mon Sep 17 00:00:00 2001 From: JT Smith Date: Mon, 30 Sep 2002 06:13:52 +0000 Subject: [PATCH] Formatting and general code cleanup to reduce redundancy and increase readability. --- lib/WebGUI/Wobject.pm | 36 +- lib/WebGUI/Wobject/Article.pm | 84 ++-- lib/WebGUI/Wobject/DownloadManager.pm | 229 +++++----- lib/WebGUI/Wobject/EventsCalendar.pm | 283 ++++++------ lib/WebGUI/Wobject/ExtraColumn.pm | 82 ++-- lib/WebGUI/Wobject/FAQ.pm | 4 + lib/WebGUI/Wobject/Item.pm | 38 +- lib/WebGUI/Wobject/LinkList.pm | 152 +++---- lib/WebGUI/Wobject/MailForm.pm | 90 ++-- lib/WebGUI/Wobject/MessageBoard.pm | 35 +- lib/WebGUI/Wobject/Poll.pm | 105 +++-- lib/WebGUI/Wobject/Product.pm | 559 +++++++++++------------- lib/WebGUI/Wobject/SQLReport.pm | 70 ++- lib/WebGUI/Wobject/SiteMap.pm | 56 ++- lib/WebGUI/Wobject/SyndicatedContent.pm | 48 +- lib/WebGUI/Wobject/UserSubmission.pm | 66 ++- lib/WebGUI/Wobject/WobjectProxy.pm | 76 ++-- 17 files changed, 910 insertions(+), 1103 deletions(-) diff --git a/lib/WebGUI/Wobject.pm b/lib/WebGUI/Wobject.pm index e531372c3..158da2295 100644 --- a/lib/WebGUI/Wobject.pm +++ b/lib/WebGUI/Wobject.pm @@ -379,18 +379,13 @@ sub inDateRange { sub moveCollateralDown { my ($id, $seq); - if (WebGUI::Privilege::canEditPage()) { - ($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") - ." and sequenceNumber=$seq+1 group by wobjectId"); - 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]=$id and wobjectId=".$_[0]->get("wobjectId")); - } - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + ($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") + ." and sequenceNumber=$seq+1 group by wobjectId"); + 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]=$id and wobjectId=".$_[0]->get("wobjectId")); + } } #------------------------------------------------------------------- @@ -422,17 +417,12 @@ sub moveCollateralDown { sub moveCollateralUp { my ($id, $seq); - if (WebGUI::Privilege::canEditPage()) { - ($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") - ." and sequenceNumber=$seq-1 group by wobjectId"); - 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]=$id and wobjectId=".$_[0]->get("wobjectId")); - } - return ""; - } else { - return WebGUI::Privilege::insufficient(); + ($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") + ." and sequenceNumber=$seq-1 group by wobjectId"); + 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]=$id and wobjectId=".$_[0]->get("wobjectId")); } } diff --git a/lib/WebGUI/Wobject/Article.pm b/lib/WebGUI/Wobject/Article.pm index 7558e18f7..d575fcd61 100644 --- a/lib/WebGUI/Wobject/Article.pm +++ b/lib/WebGUI/Wobject/Article.pm @@ -56,60 +56,54 @@ sub set { #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $editTimeout, $groupToModerate, %hash, $f); tie %hash, 'Tie::IxHash'; - if (WebGUI::Privilege::canEditPage()) { - if ($_[0]->get("wobjectId") eq "new") { - $editTimeout = 1; - } else { - $editTimeout = $_[0]->get("editTimeout"); - } - $groupToModerate = $_[0]->get("groupToModerate") || 4; - $output = helpIcon(1,$namespace); - $output .= '

'.WebGUI::International::get(12,$namespace).'

'; - $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") - ,'','   '.WebGUI::International::get(11,$namespace).''); - $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; + if ($_[0]->get("wobjectId") eq "new") { + $editTimeout = 1; } else { - return WebGUI::Privilege::insufficient(); + $editTimeout = $_[0]->get("editTimeout"); } + $groupToModerate = $_[0]->get("groupToModerate") || 4; + $output = helpIcon(1,$namespace); + $output .= '

'.WebGUI::International::get(12,$namespace).'

'; + $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") + ,'','   '.WebGUI::International::get(11,$namespace).''); + $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 { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($image, $attachment, %property); - if (WebGUI::Privilege::canEditPage()) { - $_[0]->SUPER::www_editSave(); - $image = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); - $image->save("image"); - $attachment = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); - $attachment->save("attachment"); - $property{image} = $image->getFilename if ($image->getFilename ne ""); - $property{attachment} = $attachment->getFilename if ($attachment->getFilename ne ""); - $property{alignImage} = $session{form}{alignImage}; - $property{convertCarriageReturns} = $session{form}{convertCarriageReturns}; - $property{linkTitle} = $session{form}{linkTitle}; - $property{linkURL} = $session{form}{linkURL}; - $property{allowDiscussion} = $session{form}{allowDiscussion}; - $_[0]->set(\%property); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $_[0]->SUPER::www_editSave(); + $image = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); + $image->save("image"); + $attachment = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); + $attachment->save("attachment"); + $property{image} = $image->getFilename if ($image->getFilename ne ""); + $property{attachment} = $attachment->getFilename if ($attachment->getFilename ne ""); + $property{alignImage} = $session{form}{alignImage}; + $property{convertCarriageReturns} = $session{form}{convertCarriageReturns}; + $property{linkTitle} = $session{form}{linkTitle}; + $property{linkURL} = $session{form}{linkURL}; + $property{allowDiscussion} = $session{form}{allowDiscussion}; + $_[0]->set(\%property); + return ""; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/DownloadManager.pm b/lib/WebGUI/Wobject/DownloadManager.pm index db902f945..32281149a 100644 --- a/lib/WebGUI/Wobject/DownloadManager.pm +++ b/lib/WebGUI/Wobject/DownloadManager.pm @@ -91,44 +91,35 @@ sub set { #------------------------------------------------------------------- sub www_deleteFile { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($delete); - if (WebGUI::Privilege::canEditPage()) { - if ($session{form}{alt} == 1) { - $delete = "alternateVersion1"; - } elsif ($session{form}{alt} == 2) { - $delete = "alternateVersion2"; - } else { - $delete = "downloadFile"; - } - WebGUI::SQL->write("update DownloadManager_file set $delete='' where downloadId=$session{form}{did}"); - return $_[0]->www_editDownload(); - } else { - return WebGUI::Privilege::insufficient(); - } + if ($session{form}{alt} == 1) { + $delete = "alternateVersion1"; + } elsif ($session{form}{alt} == 2) { + $delete = "alternateVersion2"; + } else { + $delete = "downloadFile"; + } + WebGUI::SQL->write("update DownloadManager_file set $delete='' where downloadId=$session{form}{did}"); + return $_[0]->www_editDownload(); } #------------------------------------------------------------------- sub www_deleteDownload { - if (WebGUI::Privilege::canEditPage()) { - return $_[0]->confirm(WebGUI::International::get(12,$namespace), - WebGUI::URL::page('func=deleteDownloadConfirm&wid='.$session{form}{wid}.'&did='.$session{form}{did})); - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + return $_[0]->confirm(WebGUI::International::get(12,$namespace), + WebGUI::URL::page('func=deleteDownloadConfirm&wid='.$session{form}{wid}.'&did='.$session{form}{did})); } #------------------------------------------------------------------- sub www_deleteDownloadConfirm { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $file); - if (WebGUI::Privilege::canEditPage()) { - $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did}); - $file->deleteNode; - $_[0]->deleteCollateral("DownloadManager_file","downloadId",$session{form}{did}); - $_[0]->reorderCollateral("DownloadManager_file","downloadId"); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did}); + $file->deleteNode; + $_[0]->deleteCollateral("DownloadManager_file","downloadId",$session{form}{did}); + $_[0]->reorderCollateral("DownloadManager_file","downloadId"); + return ""; } #------------------------------------------------------------------- @@ -159,134 +150,126 @@ sub www_download { #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $f, $paginateAfter, $proceed); - if (WebGUI::Privilege::canEditPage()) { - if ($_[0]->get("wobjectId") eq "new") { - $proceed = 1; - } - $output .= helpIcon(1,$namespace); - $output .= '

'.WebGUI::International::get(9,$namespace).'

'; - $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(); + if ($_[0]->get("wobjectId") eq "new") { + $proceed = 1; } + $output .= helpIcon(1,$namespace); + $output .= '

'.WebGUI::International::get(9,$namespace).'

'; + $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 { - if (WebGUI::Privilege::canEditPage()) { - $_[0]->SUPER::www_editSave(); - $_[0]->set({ - paginateAfter=>$session{form}{paginateAfter}, - displayThumbnails=>$session{form}{displayThumbnails} - }); - if ($session{form}{proceed}) { - $_[0]->www_editDownload(); - } else { - return ""; - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->SUPER::www_editSave(); + $_[0]->set({ + paginateAfter=>$session{form}{paginateAfter}, + displayThumbnails=>$session{form}{displayThumbnails} + }); + if ($session{form}{proceed}) { + return $_[0]->www_editDownload(); } else { - return WebGUI::Privilege::insufficient(); + return ""; } } #------------------------------------------------------------------- sub www_editDownload { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, %download, $f); tie %download,'Tie::CPHash'; - if (WebGUI::Privilege::canEditPage()) { - if ($session{form}{did} eq "") { - $session{form}{did} = "new"; - } else { - %download = WebGUI::SQL->quickHash("select * from DownloadManager_file where downloadId='$session{form}{did}'"); - } - $output .= helpIcon(2,$namespace); - $output .= '

'.WebGUI::International::get(10,$namespace).'

'; - $f = WebGUI::HTMLForm->new; - $f->hidden("wid",$_[0]->get("wobjectId")); - $f->hidden("did",$session{form}{did}); - $f->hidden("func","editDownloadSave"); - $f->text("fileTitle",WebGUI::International::get(5,$namespace),$download{fileTitle}); - if ($download{downloadFile} ne "") { - $f->readOnly(''.WebGUI::International::get(391). - '',WebGUI::International::get(6,$namespace)); - } else { - $f->file("downloadFile",WebGUI::International::get(6,$namespace)); - } - if ($download{alternateVersion1} ne "") { - $f->readOnly(''. - WebGUI::International::get(391).'',WebGUI::International::get(17,$namespace)); - } else { - $f->file("alternateVersion1",WebGUI::International::get(17,$namespace)); - } - if ($download{alternateVersion2} ne "") { - $f->readOnly(''. - WebGUI::International::get(391).'',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; + if ($session{form}{did} eq "") { + $session{form}{did} = "new"; + } else { + %download = WebGUI::SQL->quickHash("select * from DownloadManager_file where downloadId='$session{form}{did}'"); + } + $output .= helpIcon(2,$namespace); + $output .= '

'.WebGUI::International::get(10,$namespace).'

'; + $f = WebGUI::HTMLForm->new; + $f->hidden("wid",$_[0]->get("wobjectId")); + $f->hidden("did",$session{form}{did}); + $f->hidden("func","editDownloadSave"); + $f->text("fileTitle",WebGUI::International::get(5,$namespace),$download{fileTitle}); + if ($download{downloadFile} ne "") { + $f->readOnly(''.WebGUI::International::get(391). + '',WebGUI::International::get(6,$namespace)); } else { - return WebGUI::Privilege::insufficient(); + $f->file("downloadFile",WebGUI::International::get(6,$namespace)); } + if ($download{alternateVersion1} ne "") { + $f->readOnly(''. + WebGUI::International::get(391).'',WebGUI::International::get(17,$namespace)); + } else { + $f->file("alternateVersion1",WebGUI::International::get(17,$namespace)); + } + if ($download{alternateVersion2} ne "") { + $f->readOnly(''. + WebGUI::International::get(391).'',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 { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($file, %files); - if (WebGUI::Privilege::canEditPage()) { - $files{downloadId} = $_[0]->setCollateral("DownloadManager_file", "downloadId", { - downloadId => $session{form}{did}, - fileTitle => $session{form}{fileTitle}, - briefSynopsis => $session{form}{briefSynopsis}, - dateUploaded => time(), - groupToView => $session{form}{groupToView} - }); - $_[0]->reorderCollateral("DownloadManager_file","downloadId"); - $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did}); - $file->save("downloadFile"); - $files{downloadFile} = $file->getFilename; - $files{fileTitle} = $files{downloadFile} if ($session{form}{fileTitle} eq ""); - $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did}); - $file->save("alternateVersion1"); - $files{alternateVersion1} = $file->getFilename; - $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did}); - $file->save("alternateVersion2"); - $files{alternateVersion2} = $file->getFilename; - $_[0]->setCollateral("DownloadManager_file", "downloadId", \%files); - if ($session{form}{proceed}) { - $session{form}{did} = "new"; - $_[0]->www_editDownload(); - } else { - return ""; - } + $files{downloadId} = $_[0]->setCollateral("DownloadManager_file", "downloadId", { + downloadId => $session{form}{did}, + fileTitle => $session{form}{fileTitle}, + briefSynopsis => $session{form}{briefSynopsis}, + dateUploaded => time(), + groupToView => $session{form}{groupToView} + }); + $_[0]->reorderCollateral("DownloadManager_file","downloadId"); + $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did}); + $file->save("downloadFile"); + $files{downloadFile} = $file->getFilename; + $files{fileTitle} = $files{downloadFile} if ($session{form}{fileTitle} eq ""); + $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did}); + $file->save("alternateVersion1"); + $files{alternateVersion1} = $file->getFilename; + $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did}); + $file->save("alternateVersion2"); + $files{alternateVersion2} = $file->getFilename; + $_[0]->setCollateral("DownloadManager_file", "downloadId", \%files); + if ($session{form}{proceed}) { + $session{form}{did} = "new"; + return $_[0]->www_editDownload(); } else { - return WebGUI::Privilege::insufficient(); + return ""; } } #------------------------------------------------------------------- sub www_moveDownloadDown { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralDown("DownloadManager_file","downloadId",$session{form}{did}); + return ""; } #------------------------------------------------------------------- sub www_moveDownloadUp { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralUp("DownloadManager_file","downloadId",$session{form}{did}); + return ""; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/EventsCalendar.pm b/lib/WebGUI/Wobject/EventsCalendar.pm index 63b3fcae6..10ce5968a 100644 --- a/lib/WebGUI/Wobject/EventsCalendar.pm +++ b/lib/WebGUI/Wobject/EventsCalendar.pm @@ -119,186 +119,169 @@ sub set { #------------------------------------------------------------------- sub www_deleteEvent { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output); - if (WebGUI::Privilege::canEditPage()) { - $output = '

'.WebGUI::International::get(42).'

'; - $output .= WebGUI::International::get(75,$namespace).'

'; - $output .= ''.WebGUI::International::get(76,$namespace).'

'; - $output .= '' - .WebGUI::International::get(77,$namespace).'

'; - $output .= '' - .WebGUI::International::get(78,$namespace).''; - $output .= '

'; - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $output = '

'.WebGUI::International::get(42).'

'; + $output .= WebGUI::International::get(75,$namespace).'

'; + $output .= ''.WebGUI::International::get(76,$namespace).'

'; + $output .= '' + .WebGUI::International::get(77,$namespace).'

'; + $output .= '' + .WebGUI::International::get(78,$namespace).''; + $output .= '

'; + return $output; } #------------------------------------------------------------------- sub www_deleteEventConfirm { - if (WebGUI::Privilege::canEditPage()) { - if ($session{form}{rid} > 0) { - $_[0]->deleteCollateral("EventsCalendar_event","recurringEventId",$session{form}{rid}); - } else { - $_[0]->deleteCollateral("EventsCalendar_event","eventId",$session{form}{eid}); - } - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + if ($session{form}{rid} > 0) { + $_[0]->deleteCollateral("EventsCalendar_event","recurringEventId",$session{form}{rid}); + } else { + $_[0]->deleteCollateral("EventsCalendar_event","eventId",$session{form}{eid}); + } + return ""; } #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, %hash, $f, $paginateAfter, $proceed); tie %hash, 'Tie::IxHash'; - if (WebGUI::Privilege::canEditPage()) { - if ($_[0]->get("wobjectId") eq "new") { - $proceed = 1; - } - $paginateAfter = $_[0]->get("paginateAfter") || 50; - $output = helpIcon(1,$namespace); - $output .= '

'.WebGUI::International::get(12,$namespace).'

'; - $f = WebGUI::HTMLForm->new; - %hash = (list => WebGUI::International::get(17,$namespace), - calendarMonth => WebGUI::International::get(18,$namespace)); - # calendarMonthSmall => WebGUI::International::get(74,$namespace)); - $f->select("calendarLayout",\%hash,WebGUI::International::get(16,$namespace),[$_[0]->get("calendarLayout")]); - $f->integer("paginateAfter",WebGUI::International::get(19,$namespace),$paginateAfter); - $f->yesNo("proceed",WebGUI::International::get(21,$namespace),$proceed); - $output .= $_[0]->SUPER::www_edit($f->printRowsOnly); - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + if ($_[0]->get("wobjectId") eq "new") { + $proceed = 1; + } + $paginateAfter = $_[0]->get("paginateAfter") || 50; + $output = helpIcon(1,$namespace); + $output .= '

'.WebGUI::International::get(12,$namespace).'

'; + $f = WebGUI::HTMLForm->new; + %hash = (list => WebGUI::International::get(17,$namespace), + calendarMonth => WebGUI::International::get(18,$namespace)); + # calendarMonthSmall => WebGUI::International::get(74,$namespace)); + $f->select("calendarLayout",\%hash,WebGUI::International::get(16,$namespace),[$_[0]->get("calendarLayout")]); + $f->integer("paginateAfter",WebGUI::International::get(19,$namespace),$paginateAfter); + $f->yesNo("proceed",WebGUI::International::get(21,$namespace),$proceed); + $output .= $_[0]->SUPER::www_edit($f->printRowsOnly); + return $output; } #------------------------------------------------------------------- sub www_editSave { - if (WebGUI::Privilege::canEditPage()) { - $_[0]->SUPER::www_editSave(); - $_[0]->set({ - calendarLayout=>$session{form}{calendarLayout}, - paginateAfter=>$session{form}{paginateAfter} - }); - if ($session{form}{proceed}) { - $session{form}{eid} = "new"; - return $_[0]->www_editEvent; - } else { - return ""; - } - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->SUPER::www_editSave(); + $_[0]->set({ + calendarLayout=>$session{form}{calendarLayout}, + paginateAfter=>$session{form}{paginateAfter} + }); + if ($session{form}{proceed}) { + $session{form}{eid} = "new"; + return $_[0]->www_editEvent; + } else { + return ""; + } } #------------------------------------------------------------------- sub www_editEvent { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my (%recursEvery, $special, $output, $f, %event); tie %event, 'Tie::CPHash'; tie %recursEvery, 'Tie::IxHash'; - if (WebGUI::Privilege::canEditPage()) { - if ($session{form}{eid} eq "new") { - %recursEvery = ('never'=>WebGUI::International::get(4,$namespace), - 'day'=>WebGUI::International::get(700), - 'week'=>WebGUI::International::get(701), - 'month'=>WebGUI::International::get(702), - 'year'=>WebGUI::International::get(703) - ); - $event{endDate} = $event{endDate}; - $f = WebGUI::HTMLForm->new(1); - $f->raw(''.WebGUI::International::get(8,$namespace).''); - $f->integer("interval","",1,"","","",3); - $f->select("recursEvery",\%recursEvery); - $f->raw(' '.WebGUI::International::get(9,$namespace).' '); - $f->date("until"); - $f->raw(""); - $special = $f->printRowsOnly; - } else { - %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 .= '

'.WebGUI::International::get(13,$namespace).'

'; + if ($session{form}{eid} eq "new") { + %recursEvery = ('never'=>WebGUI::International::get(4,$namespace), + 'day'=>WebGUI::International::get(700), + 'week'=>WebGUI::International::get(701), + 'month'=>WebGUI::International::get(702), + 'year'=>WebGUI::International::get(703) + ); + $event{endDate} = $event{endDate}; + $f = WebGUI::HTMLForm->new(1); + $f->raw(''.WebGUI::International::get(8,$namespace).''); + $f->integer("interval","",1,"","","",3); + $f->select("recursEvery",\%recursEvery); + $f->raw(' '.WebGUI::International::get(9,$namespace).' '); + $f->date("until"); + $f->raw(""); + $special = $f->printRowsOnly; + } else { + %event = WebGUI::SQL->quickHash("select * from EventsCalendar_event where eventId='$session{form}{eid}'"); $f = WebGUI::HTMLForm->new; - $f->hidden("wid",$_[0]->get("wobjectId")); - $f->hidden("eid",$session{form}{eid}); - $f->hidden("func","editEventSave"); - $f->text("name",WebGUI::International::get(99),$event{name}); - $f->HTMLArea("description",WebGUI::International::get(85),$event{description}); - $f->date("startDate",WebGUI::International::get(14,$namespace),$event{startDate}, - 'onBlur="this.form.endDate.value=this.form.startDate.value;this.form.until.value=this.form.startDate.value;"'); - $f->date("endDate",WebGUI::International::get(15,$namespace),$event{endDate}); - $f->raw($special); - $f->yesNo("proceed",WebGUI::International::get(21,$namespace)); - $f->submit; - $output .= $f->print; - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $f->hidden("until"); + $special = $f->printRowsOnly; + } + $output = helpIcon(2,$namespace); + $output .= '

'.WebGUI::International::get(13,$namespace).'

'; + $f = WebGUI::HTMLForm->new; + $f->hidden("wid",$_[0]->get("wobjectId")); + $f->hidden("eid",$session{form}{eid}); + $f->hidden("func","editEventSave"); + $f->text("name",WebGUI::International::get(99),$event{name}); + $f->HTMLArea("description",WebGUI::International::get(85),$event{description}); + $f->date("startDate",WebGUI::International::get(14,$namespace),$event{startDate}, + 'onBlur="this.form.endDate.value=this.form.startDate.value;this.form.until.value=this.form.startDate.value;"'); + $f->date("endDate",WebGUI::International::get(15,$namespace),$event{endDate}); + $f->raw($special); + $f->yesNo("proceed",WebGUI::International::get(21,$namespace)); + $f->submit; + $output .= $f->print; return $output; } #------------------------------------------------------------------- sub www_editEventSave { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my (@startDate, @endDate, $until, @eventId, $i, $recurringEventId); - if (WebGUI::Privilege::canEditPage()) { - if ($session{form}{eid} eq "new") { - $session{form}{eid} = getNextId("eventId"); - $startDate[0] = setToEpoch($session{form}{startDate}); - $endDate[0] = setToEpoch($session{form}{endDate}); - $until = setToEpoch($session{form}{until}); - $eventId[0] = getNextId("eventId"); - $session{form}{interval} = 1 if ($session{form}{interval} < 1); - if ($session{form}{recursEvery} eq "never") { - $recurringEventId = 0; - } else { - $recurringEventId = getNextId("recurringEventId"); - while ($startDate[$i] < $until) { - $i++; - $eventId[$i] = getNextId("eventId"); - if ($session{form}{recursEvery} eq "day") { - $startDate[$i] = addToDate($startDate[0],0,0,($i*$session{form}{interval})); - $endDate[$i] = addToDate($endDate[0],0,0,($i*$session{form}{interval})); - } elsif ($session{form}{recursEvery} eq "week") { - $startDate[$i] = addToDate($startDate[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") { - $startDate[$i] = addToDate($startDate[0],0,($i*$session{form}{interval}),0); - $endDate[$i] = addToDate($endDate[0],0,($i*$session{form}{interval}),0); - } elsif ($session{form}{recursEvery} eq "year") { - $startDate[$i] = addToDate($startDate[0],($i*$session{form}{interval}),0,0); - $endDate[$i] = addToDate($endDate[0],($i*$session{form}{interval}),0,0); - } - } - } - $i = 0; - while ($eventId[$i] > 0) { - WebGUI::SQL->write("insert into EventsCalendar_event values ($eventId[$i], - ".$_[0]->get("wobjectId").", ".quote($session{form}{name}).", ".quote($session{form}{description}).", + if ($session{form}{eid} eq "new") { + $session{form}{eid} = getNextId("eventId"); + $startDate[0] = setToEpoch($session{form}{startDate}); + $endDate[0] = setToEpoch($session{form}{endDate}); + $until = setToEpoch($session{form}{until}); + $eventId[0] = getNextId("eventId"); + $session{form}{interval} = 1 if ($session{form}{interval} < 1); + if ($session{form}{recursEvery} eq "never") { + $recurringEventId = 0; + } else { + $recurringEventId = getNextId("recurringEventId"); + while ($startDate[$i] < $until) { + $i++; + $eventId[$i] = getNextId("eventId"); + if ($session{form}{recursEvery} eq "day") { + $startDate[$i] = addToDate($startDate[0],0,0,($i*$session{form}{interval})); + $endDate[$i] = addToDate($endDate[0],0,0,($i*$session{form}{interval})); + } elsif ($session{form}{recursEvery} eq "week") { + $startDate[$i] = addToDate($startDate[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") { + $startDate[$i] = addToDate($startDate[0],0,($i*$session{form}{interval}),0); + $endDate[$i] = addToDate($endDate[0],0,($i*$session{form}{interval}),0); + } elsif ($session{form}{recursEvery} eq "year") { + $startDate[$i] = addToDate($startDate[0],($i*$session{form}{interval}),0,0); + $endDate[$i] = addToDate($endDate[0],($i*$session{form}{interval}),0,0); + } + } + } + $i = 0; + while ($eventId[$i] > 0) { + WebGUI::SQL->write("insert into EventsCalendar_event values ($eventId[$i], + ".$_[0]->get("wobjectId").", + ".quote($session{form}{name}).", + ".quote($session{form}{description}).", $startDate[$i], $endDate[$i], $recurringEventId)"); - $i++; - } - } else { - WebGUI::SQL->write("update EventsCalendar_event set name=".quote($session{form}{name}).", - description=".quote($session{form}{description}).", startDate='".setToEpoch($session{form}{startDate})."', - endDate='".setToEpoch($session{form}{endDate})."' where eventId=$session{form}{eid}"); - } - if ($session{form}{proceed}) { - $session{form}{eid} = "new"; - return $_[0]->www_editEvent; - } else { - return ""; - } - } else { - return WebGUI::Privilege::insufficient(); - } + $i++; + } + } else { + WebGUI::SQL->write("update EventsCalendar_event set name=".quote($session{form}{name}).", + description=".quote($session{form}{description}).", startDate='".setToEpoch($session{form}{startDate})."', + endDate='".setToEpoch($session{form}{endDate})."' where eventId=$session{form}{eid}"); + } + if ($session{form}{proceed}) { + $session{form}{eid} = "new"; + return $_[0]->www_editEvent; + } else { + return ""; + } } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/ExtraColumn.pm b/lib/WebGUI/Wobject/ExtraColumn.pm index 2edcad045..251f97314 100644 --- a/lib/WebGUI/Wobject/ExtraColumn.pm +++ b/lib/WebGUI/Wobject/ExtraColumn.pm @@ -45,55 +45,49 @@ sub set { #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $f, $endDate, $width, $class, $spacer,$startDate); - if (WebGUI::Privilege::canEditPage()) { - $output = helpIcon(1,$namespace); - $output .= '

'.WebGUI::International::get(6,$namespace).'

'; - if ($_[0]->get("wobjectId") eq "new") { - $width = 200; - $spacer = 10; - } else { - $width = $_[0]->get("width"); - $spacer = $_[0]->get("spacer"); - } - $class = $_[0]->get("class") || "content"; - $startDate = $_[0]->get("startDate") || $session{page}{startDate}; - $endDate = $_[0]->get("endDate") || $session{page}{endDate}; - $f = WebGUI::HTMLForm->new; - $f->hidden("wid",$_[0]->get("wobjectId")); - $f->hidden("namespace",$_[0]->get("namespace")) if ($_[0]->get("wobjectId") eq "new"); - $f->hidden("func","editSave"); - $f->readOnly($_[0]->get("wobjectId"),WebGUI::International::get(499)); - $f->hidden("title",$namespace); - $f->hidden("displayTitle",0); - $f->hidden("processMacros",0); - $f->hidden("templatePosition",0); - $f->date("startDate",WebGUI::International::get(497),$startDate); - $f->date("endDate",WebGUI::International::get(498),$endDate); - $f->integer("spacer",WebGUI::International::get(3,$namespace),$spacer); - $f->integer("width",WebGUI::International::get(4,$namespace),$width); - $f->text("class",WebGUI::International::get(5,$namespace),$class); - $f->submit; - $output .= $f->print; - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $output = helpIcon(1,$namespace); + $output .= '

'.WebGUI::International::get(6,$namespace).'

'; + if ($_[0]->get("wobjectId") eq "new") { + $width = 200; + $spacer = 10; + } else { + $width = $_[0]->get("width"); + $spacer = $_[0]->get("spacer"); + } + $class = $_[0]->get("class") || "content"; + $startDate = $_[0]->get("startDate") || $session{page}{startDate}; + $endDate = $_[0]->get("endDate") || $session{page}{endDate}; + $f = WebGUI::HTMLForm->new; + $f->hidden("wid",$_[0]->get("wobjectId")); + $f->hidden("namespace",$_[0]->get("namespace")) if ($_[0]->get("wobjectId") eq "new"); + $f->hidden("func","editSave"); + $f->readOnly($_[0]->get("wobjectId"),WebGUI::International::get(499)); + $f->hidden("title",$namespace); + $f->hidden("displayTitle",0); + $f->hidden("processMacros",0); + $f->hidden("templatePosition",0); + $f->date("startDate",WebGUI::International::get(497),$startDate); + $f->date("endDate",WebGUI::International::get(498),$endDate); + $f->integer("spacer",WebGUI::International::get(3,$namespace),$spacer); + $f->integer("width",WebGUI::International::get(4,$namespace),$width); + $f->text("class",WebGUI::International::get(5,$namespace),$class); + $f->submit; + $output .= $f->print; + return $output; } #------------------------------------------------------------------- sub www_editSave { - if (WebGUI::Privilege::canEditPage()) { - $_[0]->SUPER::www_editSave(); - $_[0]->set({ - spacer=>$session{form}{spacer}, - width=>$session{form}{width}, - class=>$session{form}{class} - }); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->SUPER::www_editSave(); + $_[0]->set({ + spacer=>$session{form}{spacer}, + width=>$session{form}{width}, + class=>$session{form}{class} + }); + return ""; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/FAQ.pm b/lib/WebGUI/Wobject/FAQ.pm index c2952cb61..8414d001c 100644 --- a/lib/WebGUI/Wobject/FAQ.pm +++ b/lib/WebGUI/Wobject/FAQ.pm @@ -166,12 +166,16 @@ sub www_editQuestionSave { #------------------------------------------------------------------- sub www_moveQuestionDown { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralDown("FAQ_question","questionId",$session{form}{qid}); + return ""; } #------------------------------------------------------------------- sub www_moveQuestionUp { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralUp("FAQ_question","questionId",$session{form}{qid}); + return ""; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/Item.pm b/lib/WebGUI/Wobject/Item.pm index 14bc14752..4a368b224 100644 --- a/lib/WebGUI/Wobject/Item.pm +++ b/lib/WebGUI/Wobject/Item.pm @@ -47,34 +47,28 @@ sub set { #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $f); - if (WebGUI::Privilege::canEditPage()) { - $output = helpIcon(1,$_[0]->get("namespace")); - $output .= '

'.WebGUI::International::get(6,$namespace).'

'; - $f = WebGUI::HTMLForm->new; - $f->url("linkURL",WebGUI::International::get(1,$_[0]->get("namespace")),$_[0]->get("linkURL")); - $f->raw($_[0]->fileProperty("attachment",2)); - $output .= $_[0]->SUPER::www_edit($f->printRowsOnly); - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $output = helpIcon(1,$_[0]->get("namespace")); + $output .= '

'.WebGUI::International::get(6,$namespace).'

'; + $f = WebGUI::HTMLForm->new; + $f->url("linkURL",WebGUI::International::get(1,$_[0]->get("namespace")),$_[0]->get("linkURL")); + $f->raw($_[0]->fileProperty("attachment",2)); + $output .= $_[0]->SUPER::www_edit($f->printRowsOnly); + return $output; } #------------------------------------------------------------------- sub www_editSave { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($attachment, $property); - if (WebGUI::Privilege::canEditPage()) { - $_[0]->SUPER::www_editSave(); - $attachment = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); - $attachment->save("attachment"); - $property->{linkURL} = $session{form}{linkURL}; - $property->{attachment} = $attachment->getFilename if ($attachment->getFilename ne ""); - $_[0]->set($property); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $_[0]->SUPER::www_editSave(); + $attachment = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); + $attachment->save("attachment"); + $property->{linkURL} = $session{form}{linkURL}; + $property->{attachment} = $attachment->getFilename if ($attachment->getFilename ne ""); + $_[0]->set($property); + return ""; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/LinkList.pm b/lib/WebGUI/Wobject/LinkList.pm index bf5440612..378c969c0 100644 --- a/lib/WebGUI/Wobject/LinkList.pm +++ b/lib/WebGUI/Wobject/LinkList.pm @@ -59,130 +59,114 @@ sub set { #------------------------------------------------------------------- sub www_deleteLink { - if (WebGUI::Privilege::canEditPage()) { - return $_[0]->confirm(WebGUI::International::get(9,$namespace), - WebGUI::URL::page('func=deleteLinkConfirm&wid='.$session{form}{wid}.'&lid='.$session{form}{lid})); - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + return $_[0]->confirm(WebGUI::International::get(9,$namespace), + WebGUI::URL::page('func=deleteLinkConfirm&wid='.$session{form}{wid}.'&lid='.$session{form}{lid})); } #------------------------------------------------------------------- sub www_deleteLinkConfirm { - my ($output); - if (WebGUI::Privilege::canEditPage()) { - $_[0]->deleteCollateral("LinkList_link","linkId",$session{form}{lid}); - $_[0]->reorderCollateral("LinkList_link","linkId"); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->deleteCollateral("LinkList_link","linkId",$session{form}{lid}); + $_[0]->reorderCollateral("LinkList_link","linkId"); + return ""; } #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($proceed, $f, $output, $indent, $lineSpacing, $bullet); - if (WebGUI::Privilege::canEditPage()) { - if ($_[0]->get("wobjectId") eq "new") { - $proceed = 1; - } - $bullet = $_[0]->get("bullet") || '·'; - $lineSpacing = $_[0]->get("lineSpacing") || 1; - $indent = $_[0]->get("indent") || 5; - $output = helpIcon(1,$namespace); - $output .= '

'.WebGUI::International::get(10,$namespace).'

'; - $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(); + if ($_[0]->get("wobjectId") eq "new") { + $proceed = 1; } + $bullet = $_[0]->get("bullet") || '·'; + $lineSpacing = $_[0]->get("lineSpacing") || 1; + $indent = $_[0]->get("indent") || 5; + $output = helpIcon(1,$namespace); + $output .= '

'.WebGUI::International::get(10,$namespace).'

'; + $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 { - if (WebGUI::Privilege::canEditPage()) { - $_[0]->SUPER::www_editSave(); - $_[0]->set({ - indent=>$session{form}{indent}, - bullet=>$session{form}{bullet}, - lineSpacing=>$session{form}{lineSpacing} - }); - if ($session{form}{proceed}) { - $_[0]->www_editLink(); - } else { - return ""; - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->SUPER::www_editSave(); + $_[0]->set({ + indent=>$session{form}{indent}, + bullet=>$session{form}{bullet}, + lineSpacing=>$session{form}{lineSpacing} + }); + if ($session{form}{proceed}) { + $_[0]->www_editLink(); } else { - return WebGUI::Privilege::insufficient(); + return ""; } } #------------------------------------------------------------------- sub www_editLink { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, %link, $f, $linkId, $newWindow); tie %link, 'Tie::CPHash'; - if (WebGUI::Privilege::canEditPage()) { - $linkId = $session{form}{lid} || "new"; - %link = WebGUI::SQL->quickHash("select * from LinkList_link where linkId='$session{form}{lid}'"); - if ($linkId eq "new") { - $newWindow = 1; - } else { - $newWindow = $link{newWindow}; - } - $output = helpIcon(2,$namespace); - $output .= '

'.WebGUI::International::get(12,$namespace).'

'; - $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; + $linkId = $session{form}{lid} || "new"; + %link = WebGUI::SQL->quickHash("select * from LinkList_link where linkId='$session{form}{lid}'"); + if ($linkId eq "new") { + $newWindow = 1; } else { - return WebGUI::Privilege::insufficient(); - } + $newWindow = $link{newWindow}; + } + $output = helpIcon(2,$namespace); + $output .= '

'.WebGUI::International::get(12,$namespace).'

'; + $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; } #------------------------------------------------------------------- sub www_editLinkSave { - if (WebGUI::Privilege::canEditPage()) { - $_[0]->setCollateral("LinkList_link", "linkId", { - linkId => $session{form}{lid}, - description => $session{form}{description}, - newWindow => $session{form}{newWindow}, - url => $session{form}{url}, - name => $session{form}{name} - }); - if ($session{form}{proceed}) { - $session{form}{lid} = "new"; - $_[0]->www_editLink(); - } else { - return ""; - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->setCollateral("LinkList_link", "linkId", { + linkId => $session{form}{lid}, + description => $session{form}{description}, + newWindow => $session{form}{newWindow}, + url => $session{form}{url}, + name => $session{form}{name} + }); + if ($session{form}{proceed}) { + $session{form}{lid} = "new"; + return $_[0]->www_editLink(); } else { - return WebGUI::Privilege::insufficient(); + return ""; } } #------------------------------------------------------------------- sub www_moveLinkDown { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralDown("LinkList_link","linkId",$session{form}{lid}); + return ""; } #------------------------------------------------------------------- sub www_moveLinkUp { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralUp("LinkList_link","linkId",$session{form}{lid}); + return ""; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/MailForm.pm b/lib/WebGUI/Wobject/MailForm.pm index c4ef64eb5..7bca0c2b1 100755 --- a/lib/WebGUI/Wobject/MailForm.pm +++ b/lib/WebGUI/Wobject/MailForm.pm @@ -79,36 +79,26 @@ sub set { #------------------------------------------------------------------- sub www_deleteField { - my ($output); - if (WebGUI::Privilege::canEditPage()) { - return $_[0]->confirm(WebGUI::International::get(19,$namespace), - WebGUI::URL::page('func=deleteFieldConfirm&wid='.$_[0]->get("wobjectId").'&fid='.$session{form}{fid})); - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + return $_[0]->confirm(WebGUI::International::get(19,$namespace), + WebGUI::URL::page('func=deleteFieldConfirm&wid='.$_[0]->get("wobjectId").'&fid='.$session{form}{fid})); } #------------------------------------------------------------------- sub www_deleteFieldConfirm { - my ($output); - if (WebGUI::Privilege::canEditPage()) { - $_[0]->deleteCollateral("MailForm_field","mailFieldId",$session{form}{fid}); - $_[0]->reorderCollateral("MailForm_field","mailFieldId"); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->deleteCollateral("MailForm_field","mailFieldId",$session{form}{fid}); + $_[0]->reorderCollateral("MailForm_field","mailFieldId"); + return ""; } #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $f, $proceed); - if (WebGUI::Privilege::canEditPage()) { - - my %fieldStatus = ( 1 => WebGUI::International::get(4, $namespace), - 2 => WebGUI::International::get(5, $namespace), - 3 => WebGUI::International::get(6, $namespace) ); - + my %fieldStatus = ( 1 => WebGUI::International::get(4, $namespace), + 2 => WebGUI::International::get(5, $namespace), + 3 => WebGUI::International::get(6, $namespace) ); # field defaults my %data = ( width => 45, @@ -133,10 +123,10 @@ sub www_edit { if ($_[0]->get("wobjectId") eq "new") { $proceed = 1; } - $output = helpIcon(1,$_[0]->get("namespace")); - $output .= '

'.WebGUI::International::get(7, $namespace).'

'; - $f = WebGUI::HTMLForm->new; - $f->integer("width",WebGUI::International::get(8, $namespace),$_[0]->get("width") || 45); + $output = helpIcon(1,$_[0]->get("namespace")); + $output .= '

'.WebGUI::International::get(7, $namespace).'

'; + $f = WebGUI::HTMLForm->new; + $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, "fromStatus",\%fieldStatus,$data{fromStatus}) ); $f->raw( $_[0]->_textSelectRow("toField",WebGUI::International::get(11, $namespace),$data{toField},128, @@ -147,44 +137,34 @@ sub www_edit { "bccStatus",\%fieldStatus,$data{bccStatus}) ); $f->raw( $_[0]->_textSelectRow("subjectField",WebGUI::International::get(14, $namespace),$data{subjectField},128, "subjectStatus",\%fieldStatus,$data{subjectStatus}) ); - $f->HTMLArea("acknowledgement",WebGUI::International::get(16, $namespace),$_[0]->get("acknowledgement") || WebGUI::International::get(3, $namespace)); - my %storeEntriesOptions = ( - 1 => "Yes", - 0 => "No" - ); - $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(); - } + $f->HTMLArea("acknowledgement",WebGUI::International::get(16, $namespace),$_[0]->get("acknowledgement") || WebGUI::International::get(3, $namespace)); + $f->yesNo("storeEntries",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; } #------------------------------------------------------------------- sub www_editSave { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($property); - if (WebGUI::Privilege::canEditPage()) { - $_[0]->SUPER::www_editSave(); - foreach my $field (@fields) { - $property->{$field} = $session{form}{$field}; - } - $_[0]->set($property); + $_[0]->SUPER::www_editSave(); + foreach my $field (@fields) { + $property->{$field} = $session{form}{$field}; + } + $_[0]->set($property); if ($session{form}{proceed}) { - $_[0]->www_editField(); + return $_[0]->www_editField(); } else { return ""; } - } else { - return WebGUI::Privilege::insufficient(); - } } #------------------------------------------------------------------- sub www_editField { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, %field, $f); tie %field, 'Tie::CPHash'; - my %fieldStatus = ( 1 => WebGUI::International::get(4, $namespace), 2 => WebGUI::International::get(5, $namespace), 3 => WebGUI::International::get(6, $namespace) ); @@ -198,7 +178,6 @@ sub www_editField { yesNo => "Yes/No", select => "Drop-Down Box" ); - if (WebGUI::Privilege::canEditPage()) { %field = WebGUI::SQL->quickHash("select * from MailForm_field where mailFieldId='$session{form}{fid}'"); $output = helpIcon(2,$_[0]->get("namespace")); $output .= '

'.WebGUI::International::get(20,$namespace).'

'; @@ -218,16 +197,12 @@ sub www_editField { $f->submit; $output .= $f->print; return $output; - } else { - return WebGUI::Privilege::insufficient(); - } - return $output; } #------------------------------------------------------------------- sub www_editFieldSave { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($seq); - if (WebGUI::Privilege::canEditPage()) { if ($session{form}{fid} eq "new") { ($seq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from MailForm_field where wobjectId=".$_[0]->get("wobjectId")); $session{form}{fid} = getNextId("mailFieldId"); @@ -246,19 +221,20 @@ sub www_editFieldSave { } else { return ""; } - } else { - return WebGUI::Privilege::insufficient(); - } } #------------------------------------------------------------------- sub www_moveFieldDown { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralDown("MailForm_field","mailFieldId",$session{form}{fid}); + return ""; } #------------------------------------------------------------------- sub www_moveFieldUp { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralUp("MailForm_field","mailFieldId",$session{form}{fid}); + return ""; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/MessageBoard.pm b/lib/WebGUI/Wobject/MessageBoard.pm index 6394d62f2..43ceab9d5 100644 --- a/lib/WebGUI/Wobject/MessageBoard.pm +++ b/lib/WebGUI/Wobject/MessageBoard.pm @@ -52,33 +52,26 @@ sub set { #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $f, $messagesPerPage); - if (WebGUI::Privilege::canEditPage()) { - $messagesPerPage = $_[0]->get("messagesPerPage") || 50; - $output = helpIcon(1,$namespace); - $output .= '

'.WebGUI::International::get(6,$namespace).'

'; - $f = WebGUI::HTMLForm->new; - $f->integer("messagesPerPage",WebGUI::International::get(4,$namespace),$messagesPerPage); - $f->raw($_[0]->SUPER::discussionProperties); - $output .= $_[0]->SUPER::www_edit($f->printRowsOnly); - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $messagesPerPage = $_[0]->get("messagesPerPage") || 50; + $output = helpIcon(1,$namespace); + $output .= '

'.WebGUI::International::get(6,$namespace).'

'; + $f = WebGUI::HTMLForm->new; + $f->integer("messagesPerPage",WebGUI::International::get(4,$namespace),$messagesPerPage); + $f->raw($_[0]->SUPER::discussionProperties); + $output .= $_[0]->SUPER::www_edit($f->printRowsOnly); return $output; } #------------------------------------------------------------------- sub www_editSave { - if (WebGUI::Privilege::canEditPage()) { - $_[0]->SUPER::www_editSave(); - $_[0]->set({ - messagesPerPage=>$session{form}{messagesPerPage} - }); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->SUPER::www_editSave(); + $_[0]->set({ + messagesPerPage=>$session{form}{messagesPerPage} + }); + return ""; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/Poll.pm b/lib/WebGUI/Wobject/Poll.pm index 90db3a3f6..a031d2db5 100644 --- a/lib/WebGUI/Wobject/Poll.pm +++ b/lib/WebGUI/Wobject/Poll.pm @@ -82,75 +82,68 @@ sub set { #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($f, $i, $output, $active, $voteGroup, $graphWidth, $answers, $randomizeAnswers); - if (WebGUI::Privilege::canEditPage()) { - if ($_[0]->get("wobjectId") eq "new") { - $active = 1; - $randomizeAnswers = 1; - } else { - $active = $_[0]->get("active"); - $randomizeAnswers = $_[0]->get("randomizeAnswers"); - } - $voteGroup = $_[0]->get("voteGroup") || 7; - $graphWidth = $_[0]->get("graphWidth") || 150; - for ($i=1; $i<=20; $i++) { - if ($_[0]->get('a'.$i) =~ /\C/) { - $answers .= $_[0]->get("a".$i)."\n"; - } + if ($_[0]->get("wobjectId") eq "new") { + $active = 1; + $randomizeAnswers = 1; + } else { + $active = $_[0]->get("active"); + $randomizeAnswers = $_[0]->get("randomizeAnswers"); + } + $voteGroup = $_[0]->get("voteGroup") || 7; + $graphWidth = $_[0]->get("graphWidth") || 150; + for ($i=1; $i<=20; $i++) { + if ($_[0]->get('a'.$i) =~ /\C/) { + $answers .= $_[0]->get("a".$i)."\n"; } - $output = helpIcon(1,$namespace); - $output .= '

'.WebGUI::International::get(9,$namespace).'

'; - $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).'
'.WebGUI::International::get(8,$namespace).'',$answers); - $f->yesNo("randomizeAnswers",WebGUI::International::get(72,$namespace),$randomizeAnswers); - $output .= $_[0]->SUPER::www_edit($f->printRowsOnly); - if ($_[0]->get("wobjectId") ne "new") { - $output .= '

'; - $output .= '' - .WebGUI::International::get(10,$namespace).''; - } - return $output; - } else { - return WebGUI::Privilege::insufficient(); } + $output = helpIcon(1,$namespace); + $output .= '

'.WebGUI::International::get(9,$namespace).'

'; + $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).'
'.WebGUI::International::get(8,$namespace).'',$answers); + $f->yesNo("randomizeAnswers",WebGUI::International::get(72,$namespace),$randomizeAnswers); + $output .= $_[0]->SUPER::www_edit($f->printRowsOnly); + if ($_[0]->get("wobjectId") ne "new") { + $output .= '

'; + $output .= '' + .WebGUI::International::get(10,$namespace).''; + } + return $output; } #------------------------------------------------------------------- sub www_editSave { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my (@answer, $i, $property); - if (WebGUI::Privilege::canEditPage()) { - $_[0]->SUPER::www_editSave(); - @answer = split("\n",$session{form}{answers}); - for ($i=1; $i<=20; $i++) { - $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(); + $_[0]->SUPER::www_editSave(); + @answer = split("\n",$session{form}{answers}); + for ($i=1; $i<=20; $i++) { + $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 ""; } #------------------------------------------------------------------- sub www_resetVotes { - if (WebGUI::Privilege::canEditPage()) { - $_[0]->deleteCollateral("Poll_answer","wobjectId",$_[0]->get("wobjectId")); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->deleteCollateral("Poll_answer","wobjectId",$_[0]->get("wobjectId")); return ""; } diff --git a/lib/WebGUI/Wobject/Product.pm b/lib/WebGUI/Wobject/Product.pm index ae60d186f..d81cba297 100644 --- a/lib/WebGUI/Wobject/Product.pm +++ b/lib/WebGUI/Wobject/Product.pm @@ -110,107 +110,90 @@ sub set { #------------------------------------------------------------------- sub www_addAccessory { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $f, $accessory, @usedAccessories); - if (WebGUI::Privilege::canEditPage()) { - $output = helpIcon(4,$namespace); - $output .= '

'.WebGUI::International::get(16,$namespace).'

'; - $f = WebGUI::HTMLForm->new; - $f->hidden("wid",$_[0]->get("wobjectId")); - $f->hidden("func","addAccessorySave"); - @usedAccessories = WebGUI::SQL->quickArray("select accessoryWobjectId from Product_accessory - where wobjectId=".$session{form}{wid}); - push(@usedAccessories,$session{form}{wid}); - $accessory = WebGUI::SQL->buildHashRef("select wobjectId,title from wobject where namespace='Product' - and wobjectId not in (".join(",",@usedAccessories).")"); - $f->select("accessoryWobjectId",$accessory,WebGUI::International::get(17,$namespace)); - $f->yesNo("proceed",WebGUI::International::get(18,$namespace)); - $f->submit; - $output .= $f->print; - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $output = helpIcon(4,$namespace); + $output .= '

'.WebGUI::International::get(16,$namespace).'

'; + $f = WebGUI::HTMLForm->new; + $f->hidden("wid",$_[0]->get("wobjectId")); + $f->hidden("func","addAccessorySave"); + @usedAccessories = WebGUI::SQL->quickArray("select accessoryWobjectId from Product_accessory + where wobjectId=".$session{form}{wid}); + push(@usedAccessories,$session{form}{wid}); + $accessory = WebGUI::SQL->buildHashRef("select wobjectId,title from wobject where namespace='Product' + and wobjectId not in (".join(",",@usedAccessories).")"); + $f->select("accessoryWobjectId",$accessory,WebGUI::International::get(17,$namespace)); + $f->yesNo("proceed",WebGUI::International::get(18,$namespace)); + $f->submit; + $output .= $f->print; return $output; } #------------------------------------------------------------------- sub www_addAccessorySave { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($seq); - if (WebGUI::Privilege::canEditPage()) { - ($seq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from Product_accessory - where wobjectId=".$_[0]->get("wobjectId")); - WebGUI::SQL->write("insert into Product_accessory (wobjectId,accessoryWobjectId,sequenceNumber) values - (".$_[0]->get("wobjectId").",$session{form}{accessoryWobjectId},".($seq+1).")"); - if ($session{form}{proceed}) { - return $_[0]->www_addAccessory(); - } else { - return ""; - } + ($seq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from Product_accessory + where wobjectId=".$_[0]->get("wobjectId")); + WebGUI::SQL->write("insert into Product_accessory (wobjectId,accessoryWobjectId,sequenceNumber) values + (".$_[0]->get("wobjectId").",$session{form}{accessoryWobjectId},".($seq+1).")"); + if ($session{form}{proceed}) { + return $_[0]->www_addAccessory(); } else { - return WebGUI::Privilege::insufficient(); + return ""; } } #------------------------------------------------------------------- sub www_addRelated { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $f, $related, @usedRelated); - if (WebGUI::Privilege::canEditPage()) { - $output = helpIcon(5,$namespace); - $output .= '

'.WebGUI::International::get(19,$namespace).'

'; - $f = WebGUI::HTMLForm->new; - $f->hidden("wid",$_[0]->get("wobjectId")); - $f->hidden("func","addRelatedSave"); - @usedRelated = WebGUI::SQL->quickArray("select relatedWobjectId from Product_related - where wobjectId=".$session{form}{wid}); - push(@usedRelated,$session{form}{wid}); - $related = WebGUI::SQL->buildHashRef("select wobjectId,title from wobject where namespace='Product' - and wobjectId not in (".join(",",@usedRelated).")"); - $f->select("relatedWobjectId",$related,WebGUI::International::get(20,$namespace)); - $f->yesNo("proceed",WebGUI::International::get(21,$namespace)); - $f->submit; - $output .= $f->print; - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $output = helpIcon(5,$namespace); + $output .= '

'.WebGUI::International::get(19,$namespace).'

'; + $f = WebGUI::HTMLForm->new; + $f->hidden("wid",$_[0]->get("wobjectId")); + $f->hidden("func","addRelatedSave"); + @usedRelated = WebGUI::SQL->quickArray("select relatedWobjectId from Product_related + where wobjectId=".$session{form}{wid}); + push(@usedRelated,$session{form}{wid}); + $related = WebGUI::SQL->buildHashRef("select wobjectId,title from wobject where namespace='Product' + and wobjectId not in (".join(",",@usedRelated).")"); + $f->select("relatedWobjectId",$related,WebGUI::International::get(20,$namespace)); + $f->yesNo("proceed",WebGUI::International::get(21,$namespace)); + $f->submit; + $output .= $f->print; return $output; } #------------------------------------------------------------------- sub www_addRelatedSave { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($seq); - if (WebGUI::Privilege::canEditPage()) { - ($seq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from Product_related - where wobjectId=".$_[0]->get("wobjectId")); - WebGUI::SQL->write("insert into Product_related (wobjectId,relatedWobjectId,sequenceNumber) values - (".$_[0]->get("wobjectId").",$session{form}{relatedWobjectId},".($seq+1).")"); - if ($session{form}{proceed}) { - return $_[0]->www_addRelated(); - } else { - return ""; - } + ($seq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from Product_related + where wobjectId=".$_[0]->get("wobjectId")); + WebGUI::SQL->write("insert into Product_related (wobjectId,relatedWobjectId,sequenceNumber) values + (".$_[0]->get("wobjectId").",$session{form}{relatedWobjectId},".($seq+1).")"); + if ($session{form}{proceed}) { + return $_[0]->www_addRelated(); } else { - return WebGUI::Privilege::insufficient(); + return ""; } } #------------------------------------------------------------------- sub www_copyTemplate { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my (%data); tie %data, 'Tie::CPHash'; - if (WebGUI::Privilege::canEditPage()) { - %data = WebGUI::SQL->quickHash("select * from Product_template where productTemplateId=".$session{form}{tid}); - WebGUI::SQL->write("insert into Product_template values (".getNextId("productTemplateId")."," - .quote("Copy of ".$data{name}).",".quote($data{template}).")"); - return $_[0]->www_edit(); - } else { - return WebGUI::Privilege::insufficient(); - } + %data = WebGUI::SQL->quickHash("select * from Product_template where productTemplateId=".$session{form}{tid}); + WebGUI::SQL->write("insert into Product_template values (".getNextId("productTemplateId")."," + .quote("Copy of ".$data{name}).",".quote($data{template}).")"); + return $_[0]->www_edit(); } #------------------------------------------------------------------- sub www_deleteAccessory { - $_[0]->confirm( + return $_[0]->confirm( WebGUI::International::get(2,$namespace), WebGUI::URL::page('func=deleteAccessoryConfirm&wid='.$_[0]->get("wobjectId").'&aid='.$session{form}{aid}) ); @@ -218,19 +201,15 @@ sub www_deleteAccessory { #------------------------------------------------------------------- sub www_deleteAccessoryConfirm { - if (WebGUI::Privilege::canEditPage()) { - WebGUI::SQL->write("delete from Product_accessory where wobjectId=$session{form}{wid} - and accessoryWobjectId=$session{form}{aid}"); - $_[0]->reorderCollateral("Product_accessory","accessoryWobjectId"); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + WebGUI::SQL->write("delete from Product_accessory where wobjectId=$session{form}{wid} and accessoryWobjectId=$session{form}{aid}"); + $_[0]->reorderCollateral("Product_accessory","accessoryWobjectId"); + return ""; } #------------------------------------------------------------------- sub www_deleteBenefit { - $_[0]->confirm( + return $_[0]->confirm( WebGUI::International::get(48,$namespace), WebGUI::URL::page('func=deleteBenefitConfirm&wid='.$_[0]->get("wobjectId").'&bid='.$session{form}{bid}) ); @@ -238,18 +217,15 @@ sub www_deleteBenefit { #------------------------------------------------------------------- sub www_deleteBenefitConfirm { - if (WebGUI::Privilege::canEditPage()) { - $_[0]->deleteCollateral("Product_benefit","productBenefitId",$session{form}{bid}); - $_[0]->reorderCollateral("Product_benefit","productBenefitId"); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->deleteCollateral("Product_benefit","productBenefitId",$session{form}{bid}); + $_[0]->reorderCollateral("Product_benefit","productBenefitId"); + return ""; } #------------------------------------------------------------------- sub www_deleteFeature { - $_[0]->confirm( + return $_[0]->confirm( WebGUI::International::get(3,$namespace), WebGUI::URL::page('func=deleteFeatureConfirm&wid='.$_[0]->get("wobjectId").'&fid='.$session{form}{fid}) ); @@ -257,18 +233,15 @@ sub www_deleteFeature { #------------------------------------------------------------------- sub www_deleteFeatureConfirm { - if (WebGUI::Privilege::canEditPage()) { - $_[0]->deleteCollateral("Product_feature","productFeatureId",$session{form}{fid}); - $_[0]->reorderCollateral("Product_feature","productFeatureId"); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->deleteCollateral("Product_feature","productFeatureId",$session{form}{fid}); + $_[0]->reorderCollateral("Product_feature","productFeatureId"); + return ""; } #------------------------------------------------------------------- sub www_deleteRelated { - $_[0]->confirm( + return $_[0]->confirm( WebGUI::International::get(4,$namespace), WebGUI::URL::page('func=deleteRelatedConfirm&wid='.$_[0]->get("wobjectId").'&rid='.$session{form}{rid}) ); @@ -276,19 +249,15 @@ sub www_deleteRelated { #------------------------------------------------------------------- sub www_deleteRelatedConfirm { - if (WebGUI::Privilege::canEditPage()) { - WebGUI::SQL->write("delete from Product_related where wobjectId=$session{form}{wid} - and relatedWobjectId=$session{form}{rid}"); - $_[0]->reorderCollateral("Product_related","relatedWobjectId"); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + WebGUI::SQL->write("delete from Product_related where wobjectId=$session{form}{wid} and relatedWobjectId=$session{form}{rid}"); + $_[0]->reorderCollateral("Product_related","relatedWobjectId"); + return ""; } #------------------------------------------------------------------- sub www_deleteSpecification { - $_[0]->confirm( + return $_[0]->confirm( WebGUI::International::get(5,$namespace), WebGUI::URL::page('func=deleteSpecificationConfirm&wid='.$_[0]->get("wobjectId").'&sid='.$session{form}{sid}) ); @@ -296,18 +265,15 @@ sub www_deleteSpecification { #------------------------------------------------------------------- sub www_deleteSpecificationConfirm { - if (WebGUI::Privilege::canEditPage()) { - $_[0]->deleteCollateral("Product_specification","productSpecificationId",$session{form}{sid}); - $_[0]->reorderCollateral("Product_specification","productSpecificationId"); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->deleteCollateral("Product_specification","productSpecificationId",$session{form}{sid}); + $_[0]->reorderCollateral("Product_specification","productSpecificationId"); + return ""; } #------------------------------------------------------------------- sub www_deleteTemplate { - $_[0]->confirm( + return $_[0]->confirm( WebGUI::International::get(57,$namespace), WebGUI::URL::page('func=deleteTemplateConfirm&wid='.$_[0]->get("wobjectId").'&tid='.$session{form}{tid}), '', @@ -317,307 +283,290 @@ sub www_deleteTemplate { #------------------------------------------------------------------- sub www_deleteTemplateConfirm { - if (WebGUI::Privilege::canEditPage()) { - $_[0]->deleteCollateral("Product_template","productTemplateId",$session{form}{tid}); - WebGUI::SQL->write("update Product set productTemplateId=1 where productTemplateId=$session{form}{tid}"); - return $_[0]->www_edit(); - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->deleteCollateral("Product_template","productTemplateId",$session{form}{tid}); + WebGUI::SQL->write("update Product set productTemplateId=1 where productTemplateId=$session{form}{tid}"); + return $_[0]->www_edit(); } #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($f, $output, $proceed, %data, $sth, $templates, $template); - if (WebGUI::Privilege::canEditPage()) { - $output = helpIcon(1,$namespace); - $output .= '

'.WebGUI::International::get(6,$namespace).'

'; - if ($_[0]->get("wobjectId") eq "new") { - $template = 1; - } else { - $template = $_[0]->get("productTemplateId"); + $output = helpIcon(1,$namespace); + $output .= '

'.WebGUI::International::get(6,$namespace).'

'; + if ($_[0]->get("wobjectId") eq "new") { + $template = 1; + } else { + $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 .= '

'; + $output .= '' + .WebGUI::International::get(56,$namespace).'

'; + 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}.'
'; } - $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 .= '

'; - $output .= '' - .WebGUI::International::get(56,$namespace).'

'; - 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}.'
'; - } - $sth->finish; - } - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $sth->finish; + } + return $output; } #------------------------------------------------------------------- sub www_editSave { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($file, %property); - if (WebGUI::Privilege::canEditPage()) { - $_[0]->SUPER::www_editSave(); - $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); - $file->save("image1"); - $property{image1}=$file->getFilename("image1") if ($file->getFilename("image1") ne ""); - $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); - $file->save("image2"); - $property{image2}=$file->getFilename("image2") if ($file->getFilename("image2") ne ""); - $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); - $file->save("image3"); - $property{image3}=$file->getFilename("image3") if ($file->getFilename("image3") ne ""); - $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); - $file->save("manual"); - $property{manual}=$file->getFilename("manual") if ($file->getFilename("manual") ne ""); - $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); - $file->save("brochure"); - $property{brochure}=$file->getFilename("brochure") if ($file->getFilename("brochure") ne ""); - $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); - $file->save("warranty"); - $property{warranty}=$file->getFilename("warranty") if ($file->getFilename("warranty") ne ""); - $property{productTemplateId}=$session{form}{productTemplateId}; - $property{price}=$session{form}{price}; - $property{productNumber}=$session{form}{productNumber}; - $_[0]->set(\%property); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $_[0]->SUPER::www_editSave(); + $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); + $file->save("image1"); + $property{image1}=$file->getFilename("image1") if ($file->getFilename("image1") ne ""); + $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); + $file->save("image2"); + $property{image2}=$file->getFilename("image2") if ($file->getFilename("image2") ne ""); + $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); + $file->save("image3"); + $property{image3}=$file->getFilename("image3") if ($file->getFilename("image3") ne ""); + $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); + $file->save("manual"); + $property{manual}=$file->getFilename("manual") if ($file->getFilename("manual") ne ""); + $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); + $file->save("brochure"); + $property{brochure}=$file->getFilename("brochure") if ($file->getFilename("brochure") ne ""); + $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId")); + $file->save("warranty"); + $property{warranty}=$file->getFilename("warranty") if ($file->getFilename("warranty") ne ""); + $property{productTemplateId}=$session{form}{productTemplateId}; + $property{price}=$session{form}{price}; + $property{productNumber}=$session{form}{productNumber}; + $_[0]->set(\%property); + return ""; } #------------------------------------------------------------------- sub www_editBenefit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $data, $f, $benefits); - if (WebGUI::Privilege::canEditPage()) { - $data = $_[0]->getCollateral("Product_benefit","productBenefitId",$session{form}{bid}); - $output = helpIcon(6,$namespace); - $output .= '

'.WebGUI::International::get(53,$namespace).'

'; - $f = WebGUI::HTMLForm->new; - $f->hidden("wid",$_[0]->get("wobjectId")); - $f->hidden("bid",$data->{productBenefitId}); - $f->hidden("func","editBenefitSave"); - $benefits = WebGUI::SQL->buildHashRef("select benefit,benefit from Product_benefit order by benefit"); - $f->combo("benefit",$benefits,WebGUI::International::get(51,$namespace),[$data->{benefits}]); - $f->yesNo("proceed",WebGUI::International::get(52,$namespace)); - $f->submit; - $output .= $f->print; - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $data = $_[0]->getCollateral("Product_benefit","productBenefitId",$session{form}{bid}); + $output = helpIcon(6,$namespace); + $output .= '

'.WebGUI::International::get(53,$namespace).'

'; + $f = WebGUI::HTMLForm->new; + $f->hidden("wid",$_[0]->get("wobjectId")); + $f->hidden("bid",$data->{productBenefitId}); + $f->hidden("func","editBenefitSave"); + $benefits = WebGUI::SQL->buildHashRef("select benefit,benefit from Product_benefit order by benefit"); + $f->combo("benefit",$benefits,WebGUI::International::get(51,$namespace),[$data->{benefits}]); + $f->yesNo("proceed",WebGUI::International::get(52,$namespace)); + $f->submit; + $output .= $f->print; return $output; } #------------------------------------------------------------------- sub www_editBenefitSave { - if (WebGUI::Privilege::canEditPage()) { - $session{form}{benefit} = $session{form}{benefit_new} if ($session{form}{benefit_new} ne ""); - $_[0]->setCollateral("Product_benefit", "productBenefitId", { - productBenefitId => $session{form}{bid}, - benefit => $session{form}{benefit} - }); - if ($session{form}{proceed}) { - $session{form}{bid} = "new"; - return $_[0]->www_editBenefit(); - } else { - return ""; - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $session{form}{benefit} = $session{form}{benefit_new} if ($session{form}{benefit_new} ne ""); + $_[0]->setCollateral("Product_benefit", "productBenefitId", { + productBenefitId => $session{form}{bid}, + benefit => $session{form}{benefit} + }); + if ($session{form}{proceed}) { + $session{form}{bid} = "new"; + return $_[0]->www_editBenefit(); } else { - return WebGUI::Privilege::insufficient(); + return ""; } } #------------------------------------------------------------------- sub www_editFeature { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $data, $f, $features); - if (WebGUI::Privilege::canEditPage()) { - $data = $_[0]->getCollateral("Product_feature","productFeatureId",$session{form}{fid}); - $output = helpIcon(2,$namespace); - $output .= '

'.WebGUI::International::get(22,$namespace).'

'; - $f = WebGUI::HTMLForm->new; - $f->hidden("wid",$_[0]->get("wobjectId")); - $f->hidden("fid",$data->{productFeatureId}); - $f->hidden("func","editFeatureSave"); - $features = WebGUI::SQL->buildHashRef("select feature,feature from Product_feature order by feature"); - $f->combo("feature",$features,WebGUI::International::get(23,$namespace),[$data->{feature}]); - $f->yesNo("proceed",WebGUI::International::get(24,$namespace)); - $f->submit; - $output .= $f->print; - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $data = $_[0]->getCollateral("Product_feature","productFeatureId",$session{form}{fid}); + $output = helpIcon(2,$namespace); + $output .= '

'.WebGUI::International::get(22,$namespace).'

'; + $f = WebGUI::HTMLForm->new; + $f->hidden("wid",$_[0]->get("wobjectId")); + $f->hidden("fid",$data->{productFeatureId}); + $f->hidden("func","editFeatureSave"); + $features = WebGUI::SQL->buildHashRef("select feature,feature from Product_feature order by feature"); + $f->combo("feature",$features,WebGUI::International::get(23,$namespace),[$data->{feature}]); + $f->yesNo("proceed",WebGUI::International::get(24,$namespace)); + $f->submit; + $output .= $f->print; return $output; } #------------------------------------------------------------------- sub www_editFeatureSave { - if (WebGUI::Privilege::canEditPage()) { - $session{form}{feature} = $session{form}{feature_new} if ($session{form}{feature_new} ne ""); - $_[0]->setCollateral("Product_feature", "productFeatureId", { - productFeatureId => $session{form}{fid}, - feature => $session{form}{feature} - }); - if ($session{form}{proceed}) { - $session{form}{fid} = "new"; - return $_[0]->www_editFeature(); - } else { - return ""; - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $session{form}{feature} = $session{form}{feature_new} if ($session{form}{feature_new} ne ""); + $_[0]->setCollateral("Product_feature", "productFeatureId", { + productFeatureId => $session{form}{fid}, + feature => $session{form}{feature} + }); + if ($session{form}{proceed}) { + $session{form}{fid} = "new"; + return $_[0]->www_editFeature(); } else { - return WebGUI::Privilege::insufficient(); + return ""; } } #------------------------------------------------------------------- sub www_editSpecification { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $data, $f, $hashRef); - if (WebGUI::Privilege::canEditPage()) { - $data = $_[0]->getCollateral("Product_specification","productSpecificationId",$session{form}{sid}); - $output = helpIcon(3,$namespace); - $output .= '

'.WebGUI::International::get(25,$namespace).'

'; - $f = WebGUI::HTMLForm->new; - $f->hidden("wid",$_[0]->get("wobjectId")); - $f->hidden("sid",$data->{productSpecificationId}); - $f->hidden("func","editSpecificationSave"); - $hashRef = WebGUI::SQL->buildHashRef("select name,name from Product_specification order by name"); - $f->combo("name",$hashRef,WebGUI::International::get(26,$namespace),[$data->{name}]); - $f->text("value",WebGUI::International::get(27,$namespace),$data->{value}); - $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->yesNo("proceed",WebGUI::International::get(28,$namespace)); - $f->submit; - $output .= $f->print; - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $data = $_[0]->getCollateral("Product_specification","productSpecificationId",$session{form}{sid}); + $output = helpIcon(3,$namespace); + $output .= '

'.WebGUI::International::get(25,$namespace).'

'; + $f = WebGUI::HTMLForm->new; + $f->hidden("wid",$_[0]->get("wobjectId")); + $f->hidden("sid",$data->{productSpecificationId}); + $f->hidden("func","editSpecificationSave"); + $hashRef = WebGUI::SQL->buildHashRef("select name,name from Product_specification order by name"); + $f->combo("name",$hashRef,WebGUI::International::get(26,$namespace),[$data->{name}]); + $f->text("value",WebGUI::International::get(27,$namespace),$data->{value}); + $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->yesNo("proceed",WebGUI::International::get(28,$namespace)); + $f->submit; + $output .= $f->print; return $output; } #------------------------------------------------------------------- sub www_editSpecificationSave { - if (WebGUI::Privilege::canEditPage()) { - $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 ""); - $_[0]->setCollateral("Product_specification", "productSpecificationId", { - productSpecificationId => $session{form}{sid}, - name => $session{form}{name}, - value => $session{form}{value}, - units => $session{form}{units} - }); - if ($session{form}{proceed}) { - $session{form}{sid} = "new"; - return $_[0]->www_editSpecification(); - } else { - return ""; - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $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 ""); + $_[0]->setCollateral("Product_specification", "productSpecificationId", { + productSpecificationId => $session{form}{sid}, + name => $session{form}{name}, + value => $session{form}{value}, + units => $session{form}{units} + }); + if ($session{form}{proceed}) { + $session{form}{sid} = "new"; + return $_[0]->www_editSpecification(); } else { - return WebGUI::Privilege::insufficient(); + return ""; } } #------------------------------------------------------------------- sub www_editTemplate { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $data, $f); - if (WebGUI::Privilege::canEditPage()) { - $data = $_[0]->getCollateral("Product_template","productTemplateId",$session{form}{tid}); - $output = helpIcon(7,$namespace); - $output .= '

'.WebGUI::International::get(58,$namespace).'

'; - $f = WebGUI::HTMLForm->new; - $f->hidden("wid",$_[0]->get("wobjectId")); - $f->hidden("tid",$data->{productTemplateId}); - $f->hidden("func","editTemplateSave"); - $f->text("name",WebGUI::International::get(59,$namespace),$data->{name}); - $f->HTMLArea("template",WebGUI::International::get(60,$namespace),$data->{template},'','','',($session{setting}{textAreaRows}+10)); - $f->submit; - $output .= $f->print; - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $data = $_[0]->getCollateral("Product_template","productTemplateId",$session{form}{tid}); + $output = helpIcon(7,$namespace); + $output .= '

'.WebGUI::International::get(58,$namespace).'

'; + $f = WebGUI::HTMLForm->new; + $f->hidden("wid",$_[0]->get("wobjectId")); + $f->hidden("tid",$data->{productTemplateId}); + $f->hidden("func","editTemplateSave"); + $f->text("name",WebGUI::International::get(59,$namespace),$data->{name}); + $f->HTMLArea("template",WebGUI::International::get(60,$namespace),$data->{template},'','','',($session{setting}{textAreaRows}+10)); + $f->submit; + $output .= $f->print; return $output; } #------------------------------------------------------------------- sub www_editTemplateSave { - if (WebGUI::Privilege::canEditPage()) { - $_[0]->setCollateral("Product_template", "productTemplateId", { - productTemplateId => $session{form}{tid}, - name => $session{form}{name}, - template => $session{form}{template} - }, 0, 0); - return $_[0]->www_edit(); - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->setCollateral("Product_template", "productTemplateId", { + productTemplateId => $session{form}{tid}, + name => $session{form}{name}, + template => $session{form}{template} + }, 0, 0); + return $_[0]->www_edit(); } #------------------------------------------------------------------- sub www_moveAccessoryDown { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralDown("Product_related","accessoryWobjectId",$session{form}{aid}); + return ""; } #------------------------------------------------------------------- sub www_moveAccessoryUp { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralUp("Product_accessory","accessoryWobjectId",$session{form}{aid}); + return ""; } #------------------------------------------------------------------- sub www_moveBenefitDown { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralDown("Product_benefit","productBenefitId",$session{form}{bid}); + return ""; } #------------------------------------------------------------------- sub www_moveBenefitUp { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralUp("Product_benefit","productBenefitId",$session{form}{bid}); + return ""; } #------------------------------------------------------------------- sub www_moveFeatureDown { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralDown("Product_feature","productFeatureId",$session{form}{fid}); + return ""; } #------------------------------------------------------------------- sub www_moveFeatureUp { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralUp("Product_feature","productFeatureId",$session{form}{fid}); + return ""; } #------------------------------------------------------------------- sub www_moveRelatedDown { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralDown("Product_related","relatedWobjectId",$session{form}{rid}); + return ""; } #------------------------------------------------------------------- sub www_moveRelatedUp { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralUp("Product_related","relatedWobjectId",$session{form}{rid}); + return ""; } #------------------------------------------------------------------- sub www_moveSpecificationDown { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralDown("Product_specification","productSpecificationId",$session{form}{sid}); + return ""; } #------------------------------------------------------------------- sub www_moveSpecificationUp { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); $_[0]->moveCollateralUp("Product_specification","productSpecificationId",$session{form}{sid}); + return ""; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/SQLReport.pm b/lib/WebGUI/Wobject/SQLReport.pm index f4ce44b11..4f87413ff 100644 --- a/lib/WebGUI/Wobject/SQLReport.pm +++ b/lib/WebGUI/Wobject/SQLReport.pm @@ -53,50 +53,44 @@ sub set { #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $f, $dsn, $username, $paginateAfter); - if (WebGUI::Privilege::canEditPage()) { - $dsn = $_[0]->get("DSN") || $session{config}{dsn}; - $username = $_[0]->get("username") || $session{config}{dbuser}; - $paginateAfter = $_[0]->get("paginateAfter") || 50; - $f = WebGUI::HTMLForm->new; - $output = helpIcon(1,$namespace); - $output .= '

'.WebGUI::International::get(8,$namespace).'

'; - $f->yesNo("preprocessMacros",WebGUI::International::get(15,$namespace),$_[0]->get("preprocessMacros")); - $f->yesNo("debugMode",WebGUI::International::get(16,$namespace),$_[0]->get("debugMode")); - $f->textarea("dbQuery",WebGUI::International::get(4,$namespace),$_[0]->get("dbQuery")); - $f->HTMLArea("template",WebGUI::International::get(3,$namespace),$_[0]->get("template")); - $f->text("DSN",WebGUI::International::get(5,$namespace),$dsn); - $f->text("username",WebGUI::International::get(6,$namespace),$username); - $f->password("identifier",WebGUI::International::get(7,$namespace),$_[0]->get("identifier")); - $f->integer("paginateAfter",WebGUI::International::get(14,$namespace),$paginateAfter); - $f->yesNo("convertCarriageReturns",WebGUI::International::get(13,$namespace),$_[0]->get("convertCarriageReturns")); - $output .= $_[0]->SUPER::www_edit($f->printRowsOnly); - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $dsn = $_[0]->get("DSN") || $session{config}{dsn}; + $username = $_[0]->get("username") || $session{config}{dbuser}; + $paginateAfter = $_[0]->get("paginateAfter") || 50; + $f = WebGUI::HTMLForm->new; + $output = helpIcon(1,$namespace); + $output .= '

'.WebGUI::International::get(8,$namespace).'

'; + $f->yesNo("preprocessMacros",WebGUI::International::get(15,$namespace),$_[0]->get("preprocessMacros")); + $f->yesNo("debugMode",WebGUI::International::get(16,$namespace),$_[0]->get("debugMode")); + $f->textarea("dbQuery",WebGUI::International::get(4,$namespace),$_[0]->get("dbQuery")); + $f->HTMLArea("template",WebGUI::International::get(3,$namespace),$_[0]->get("template")); + $f->text("DSN",WebGUI::International::get(5,$namespace),$dsn); + $f->text("username",WebGUI::International::get(6,$namespace),$username); + $f->password("identifier",WebGUI::International::get(7,$namespace),$_[0]->get("identifier")); + $f->integer("paginateAfter",WebGUI::International::get(14,$namespace),$paginateAfter); + $f->yesNo("convertCarriageReturns",WebGUI::International::get(13,$namespace),$_[0]->get("convertCarriageReturns")); + $output .= $_[0]->SUPER::www_edit($f->printRowsOnly); + return $output; } #------------------------------------------------------------------- sub www_editSave { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($wobjectId, $displayTitle, $image, $attachment); - if (WebGUI::Privilege::canEditPage()) { - $_[0]->SUPER::www_editSave(); - $_[0]->set({ - template=>$session{form}{template}, - dbQuery=>$session{form}{dbQuery}, - convertCarriageReturns=>$session{form}{convertCarriageReturns}, - DSN=>$session{form}{DSN}, - username=>$session{form}{username}, - identifier=>$session{form}{identifier}, - paginateAfter=>$session{form}{paginateAfter}, - preprocessMacros=>$session{form}{preprocessMacros}, - debugMode=>$session{form}{debugMode} - }); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $_[0]->SUPER::www_editSave(); + $_[0]->set({ + template=>$session{form}{template}, + dbQuery=>$session{form}{dbQuery}, + convertCarriageReturns=>$session{form}{convertCarriageReturns}, + DSN=>$session{form}{DSN}, + username=>$session{form}{username}, + identifier=>$session{form}{identifier}, + paginateAfter=>$session{form}{paginateAfter}, + preprocessMacros=>$session{form}{preprocessMacros}, + debugMode=>$session{form}{debugMode} + }); + return ""; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/SiteMap.pm b/lib/WebGUI/Wobject/SiteMap.pm index 831e72de0..03af953a3 100644 --- a/lib/WebGUI/Wobject/SiteMap.pm +++ b/lib/WebGUI/Wobject/SiteMap.pm @@ -78,43 +78,37 @@ sub set { #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $f, $indent, $bullet, $lineSpacing); - if (WebGUI::Privilege::canEditPage()) { - $indent = $_[0]->get("indent") || 5; - $bullet = $_[0]->get("bullet") || '·'; - $lineSpacing = $_[0]->get("lineSpacing") || 1; - $output = helpIcon(1,$_[0]->get("namespace")); - $output .= '

'.WebGUI::International::get(5,$namespace).'

'; - $f = WebGUI::HTMLForm->new; - $f->yesNo("displaySynopsis",WebGUI::International::get(9,$namespace),$_[0]->get("displaySynopsis")); - $f->yesNo("startAtThisLevel",WebGUI::International::get(3,$namespace),$_[0]->get("startAtThisLevel")); - $f->integer("depth",WebGUI::International::get(4,$namespace),$_[0]->get("depth")); - $f->integer("indent",WebGUI::International::get(6,$namespace),$indent); - $f->text("bullet",WebGUI::International::get(7,$namespace),$bullet); - $f->integer("lineSpacing",WebGUI::International::get(8,$namespace),$lineSpacing); - $output .= $_[0]->SUPER::www_edit($f->printRowsOnly); - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $indent = $_[0]->get("indent") || 5; + $bullet = $_[0]->get("bullet") || '·'; + $lineSpacing = $_[0]->get("lineSpacing") || 1; + $output = helpIcon(1,$_[0]->get("namespace")); + $output .= '

'.WebGUI::International::get(5,$namespace).'

'; + $f = WebGUI::HTMLForm->new; + $f->yesNo("displaySynopsis",WebGUI::International::get(9,$namespace),$_[0]->get("displaySynopsis")); + $f->yesNo("startAtThisLevel",WebGUI::International::get(3,$namespace),$_[0]->get("startAtThisLevel")); + $f->integer("depth",WebGUI::International::get(4,$namespace),$_[0]->get("depth")); + $f->integer("indent",WebGUI::International::get(6,$namespace),$indent); + $f->text("bullet",WebGUI::International::get(7,$namespace),$bullet); + $f->integer("lineSpacing",WebGUI::International::get(8,$namespace),$lineSpacing); + $output .= $_[0]->SUPER::www_edit($f->printRowsOnly); + return $output; } #------------------------------------------------------------------- sub www_editSave { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($property); - if (WebGUI::Privilege::canEditPage()) { - $_[0]->SUPER::www_editSave(); - $property->{indent} = $session{form}{indent}; - $property->{displaySynopsis} = $session{form}{displaySynopsis}; - $property->{bullet} = $session{form}{bullet}; - $property->{startAtThisLevel} = $session{form}{startAtThisLevel}; - $property->{depth} = $session{form}{depth}; - $property->{lineSpacing} = $session{form}{lineSpacing}; - $_[0]->set($property); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $_[0]->SUPER::www_editSave(); + $property->{indent} = $session{form}{indent}; + $property->{displaySynopsis} = $session{form}{displaySynopsis}; + $property->{bullet} = $session{form}{bullet}; + $property->{startAtThisLevel} = $session{form}{startAtThisLevel}; + $property->{depth} = $session{form}{depth}; + $property->{lineSpacing} = $session{form}{lineSpacing}; + $_[0]->set($property); + return ""; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/SyndicatedContent.pm b/lib/WebGUI/Wobject/SyndicatedContent.pm index 428527471..d614c2090 100644 --- a/lib/WebGUI/Wobject/SyndicatedContent.pm +++ b/lib/WebGUI/Wobject/SyndicatedContent.pm @@ -45,39 +45,33 @@ sub set { #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $f); - if (WebGUI::Privilege::canEditPage()) { - $output = helpIcon(1,$namespace); - $output .= '

'.WebGUI::International::get(4,$namespace).'

'; - $f = WebGUI::HTMLForm->new; - $f->url("rssUrl",WebGUI::International::get(1,$namespace),$_[0]->get("rssUrl")); - if ($_[0]->get("wobjectId") ne "new") { - $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)); - } else { - $f->hidden("content","Not yet fetched!"); - $f->hidden("lastFetched",time()); - } - $output .= $_[0]->SUPER::www_edit($f->printRowsOnly); - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + $output = helpIcon(1,$namespace); + $output .= '

'.WebGUI::International::get(4,$namespace).'

'; + $f = WebGUI::HTMLForm->new; + $f->url("rssUrl",WebGUI::International::get(1,$namespace),$_[0]->get("rssUrl")); + if ($_[0]->get("wobjectId") ne "new") { + $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)); + } else { + $f->hidden("content","Not yet fetched!"); + $f->hidden("lastFetched",time()); + } + $output .= $_[0]->SUPER::www_edit($f->printRowsOnly); + return $output; } #------------------------------------------------------------------- sub www_editSave { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($property); - if (WebGUI::Privilege::canEditPage()) { - $_[0]->SUPER::www_editSave(); - $property->{rssUrl} = $session{form}{rssUrl}; - $property->{content} = $session{form}{content} if ($session{form}{content} ne ""); - $property->{lastFetched} = $session{form}{lastFetched} if ($session{form}{lastFetched} ne ""); - $_[0]->set($property); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $_[0]->SUPER::www_editSave(); + $property->{rssUrl} = $session{form}{rssUrl}; + $property->{content} = $session{form}{content} if ($session{form}{content} ne ""); + $property->{lastFetched} = $session{form}{lastFetched} if ($session{form}{lastFetched} ne ""); + $_[0]->set($property); + return ""; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/UserSubmission.pm b/lib/WebGUI/Wobject/UserSubmission.pm index 0d11f705a..a8af0fc6e 100644 --- a/lib/WebGUI/Wobject/UserSubmission.pm +++ b/lib/WebGUI/Wobject/UserSubmission.pm @@ -314,6 +314,7 @@ sub www_denySubmission { #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my (%layout, $layout, $output, $f, $defaultStatus, $submissionsPerPage, $groupToApprove); %layout = (traditional=>WebGUI::International::get(55,$namespace), weblog=>WebGUI::International::get(54,$namespace), @@ -322,48 +323,41 @@ sub www_edit { $groupToApprove = $_[0]->get("groupToApprove") || 4; $submissionsPerPage = $_[0]->get("submissionsPerPage") || 50; $defaultStatus = $_[0]->get("defaultStatus") || "Approved"; - if (WebGUI::Privilege::canEditPage()) { - $output = helpIcon(1,$namespace); - $output .= '

'.WebGUI::International::get(18,$namespace).'

'; - $f = WebGUI::HTMLForm->new; - $f->select("layout",\%layout,WebGUI::International::get(53,$namespace),[$layout]); - $f->group("groupToApprove",WebGUI::International::get(1,$namespace),[$groupToApprove]); - $f->group("groupToContribute",WebGUI::International::get(2,$namespace),[$_[0]->get("groupToContribute")]); - $f->integer("submissionsPerPage",WebGUI::International::get(6,$namespace),$submissionsPerPage); - $f->select("defaultStatus",\%submissionStatus,WebGUI::International::get(563),[$defaultStatus]); - if ($session{setting}{useKarma}) { - $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; + $output = helpIcon(1,$namespace); + $output .= '

'.WebGUI::International::get(18,$namespace).'

'; + $f = WebGUI::HTMLForm->new; + $f->select("layout",\%layout,WebGUI::International::get(53,$namespace),[$layout]); + $f->group("groupToApprove",WebGUI::International::get(1,$namespace),[$groupToApprove]); + $f->group("groupToContribute",WebGUI::International::get(2,$namespace),[$_[0]->get("groupToContribute")]); + $f->integer("submissionsPerPage",WebGUI::International::get(6,$namespace),$submissionsPerPage); + $f->select("defaultStatus",\%submissionStatus,WebGUI::International::get(563),[$defaultStatus]); + if ($session{setting}{useKarma}) { + $f->integer("karmaPerSubmission",WebGUI::International::get(30,$namespace),$_[0]->get("karmaPerSubmission")); } 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 { - if (WebGUI::Privilege::canEditPage()) { - $_[0]->SUPER::www_editSave(); - $_[0]->set({ - submissionsPerPage=>$session{form}{submissionsPerPage}, - groupToContribute=>$session{form}{groupToContribute}, - groupToApprove=>$session{form}{groupToApprove}, - defaultStatus=>$session{form}{defaultStatus}, - karmaPerSubmission=>$session{form}{karmaPerSubmission}, - allowDiscussion=>$session{form}{allowDiscussion}, - layout=>$session{form}{layout}, - displayThumbnails=>$session{form}{displayThumbnails} - }); - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); + $_[0]->SUPER::www_editSave(); + $_[0]->set({ + submissionsPerPage=>$session{form}{submissionsPerPage}, + groupToContribute=>$session{form}{groupToContribute}, + groupToApprove=>$session{form}{groupToApprove}, + defaultStatus=>$session{form}{defaultStatus}, + karmaPerSubmission=>$session{form}{karmaPerSubmission}, + allowDiscussion=>$session{form}{allowDiscussion}, + layout=>$session{form}{layout}, + displayThumbnails=>$session{form}{displayThumbnails} + }); + return ""; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/WobjectProxy.pm b/lib/WebGUI/Wobject/WobjectProxy.pm index 4ff840076..a7cd5c68c 100644 --- a/lib/WebGUI/Wobject/WobjectProxy.pm +++ b/lib/WebGUI/Wobject/WobjectProxy.pm @@ -43,56 +43,50 @@ sub set { #------------------------------------------------------------------- sub www_edit { + return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); my ($output, $f, $startDate, $endDate, $templatePosition,%wobjects, %page, %wobject, $a, $b); tie %wobject, 'Tie::CPHash'; tie %page, 'Tie::CPHash'; tie %wobjects, 'Tie::IxHash'; - if (WebGUI::Privilege::canEditPage()) { - $output = helpIcon(1,$namespace); - $output .= '

'.WebGUI::International::get(2,$namespace).'

'; - $templatePosition = $_[0]->get("templatePosition") || '0'; - $startDate = $_[0]->get("startDate") || $session{page}{startDate}; - $endDate = $_[0]->get("endDate") || $session{page}{endDate}; - $f = WebGUI::HTMLForm->new; - $f->hidden("wid",$_[0]->get("wobjectId")); - $f->hidden("namespace",$_[0]->get("namespace")) if ($_[0]->get("wobjectId") eq "new"); - $f->hidden("func","editSave"); - $f->readOnly($_[0]->get("wobjectId"),WebGUI::International::get(499)); - $f->hidden("title",$namespace); - $f->hidden("displayTitle",0); - $f->hidden("processMacros",0); - $f->select("templatePosition",WebGUI::Template::getPositions($session{page}{templateId}),WebGUI::International::get(363),[$templatePosition]); - $f->date("startDate",WebGUI::International::get(497),$startDate); - $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"); - while (%page = $a->hash) { - $b = WebGUI::SQL->read("select wobjectId,title from wobject where pageId=".$page{pageId}." and namespace<>'WobjectProxy' order by sequenceNumber"); - while (%wobject = $b->hash) { - $wobjects{$wobject{wobjectId}} = $page{menuTitle}." / ".$wobject{title}." (".$wobject{wobjectId}.")"; - } - $b->finish; + $output = helpIcon(1,$namespace); + $output .= '

'.WebGUI::International::get(2,$namespace).'

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