diff --git a/lib/WebGUI/Wobject/DataForm.pm b/lib/WebGUI/Wobject/DataForm.pm index 6c965935e..62b902519 100644 --- a/lib/WebGUI/Wobject/DataForm.pm +++ b/lib/WebGUI/Wobject/DataForm.pm @@ -88,7 +88,7 @@ sub _fieldAdminIcons { my $fid = $_[1]; my $tid = $_[2]; my $output; - $output = deleteIcon('func=deleteField&wid='.$_[0]->get("wobjectId").'&fid='.$fid.'&tid='.$tid) unless ($_[3]); + $output = deleteIcon('func=deleteFieldConfirm&wid='.$_[0]->get("wobjectId").'&fid='.$fid.'&tid='.$tid,'',WebGUI::International::get(19,$_[0]->get("namespace"))) unless ($_[3]); $output .= editIcon('func=editField&wid='.$_[0]->get("wobjectId").'&fid='.$fid.'&tid='.$tid) .moveUpIcon('func=moveFieldUp&wid='.$_[0]->get("wobjectId").'&fid='.$fid.'&tid='.$tid) .moveDownIcon('func=moveFieldDown&wid='.$_[0]->get("wobjectId").'&fid='.$fid.'&tid='.$tid); @@ -98,7 +98,7 @@ sub _fieldAdminIcons { sub _tabAdminIcons { my $tid = $_[1]; my $output; - $output = deleteIcon('func=deleteTab&wid='.$_[0]->get("wobjectId").'&tid='.$tid) unless ($_[2]); + $output = deleteIcon('func=deleteTabConfirm&wid='.$_[0]->get("wobjectId").'&tid='.$tid,'',WebGUI::International::get(100,$_[0]->get("namespace"))) unless ($_[2]); $output .= editIcon('func=editTab&wid='.$_[0]->get("wobjectId").'&tid='.$tid) .moveLeftIcon('func=moveTabLeft&wid='.$_[0]->get("wobjectId").'&tid='.$tid) .moveRightIcon('func=moveTabRight&wid='.$_[0]->get("wobjectId").'&tid='.$tid); @@ -487,13 +487,6 @@ sub www_deleteEntry { return $_[0]->www_view(); } -#------------------------------------------------------------------- -sub www_deleteField { - return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); - return $_[0]->confirm(WebGUI::International::get(19,$_[0]->get("namespace")), - WebGUI::URL::page('func=deleteFieldConfirm&wid='.$_[0]->get("wobjectId").'&fid='.$session{form}{fid})); -} - #------------------------------------------------------------------- sub www_deleteFieldConfirm { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); @@ -502,13 +495,6 @@ sub www_deleteFieldConfirm { return ""; } -#------------------------------------------------------------------- -sub www_deleteTab { - return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); - return $_[0]->confirm(WebGUI::International::get(100,$_[0]->get("namespace")), - WebGUI::URL::page('func=deleteTabConfirm&wid='.$_[0]->get("wobjectId").'&tid='.$session{form}{tid})); -} - #------------------------------------------------------------------- sub www_deleteTabConfirm { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); diff --git a/lib/WebGUI/Wobject/FileManager.pm b/lib/WebGUI/Wobject/FileManager.pm index becb0c274..640d9cc20 100644 --- a/lib/WebGUI/Wobject/FileManager.pm +++ b/lib/WebGUI/Wobject/FileManager.pm @@ -141,13 +141,6 @@ sub www_deleteFile { return $_[0]->www_editDownload(); } -#------------------------------------------------------------------- -sub www_deleteDownload { - return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); - return $_[0]->confirm(WebGUI::International::get(12,$_[0]->get("namespace")), - WebGUI::URL::page('func=deleteDownloadConfirm&wid='.$session{form}{wid}.'&did='.$session{form}{did})); -} - #------------------------------------------------------------------- sub www_deleteDownloadConfirm { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); @@ -370,8 +363,8 @@ sub www_view { $file3 = WebGUI::Attachment->new($file->{alternateVersion2},$_[0]->get("wobjectId"),$file->{FileManager_fileId}); push (@fileloop,{ "file.canView"=>(WebGUI::Grouping::isInGroup($file->{groupToView}) || $canEditWobject), - "file.controls"=>deleteIcon('func=deleteDownload&wid='.$_[0]->get("wobjectId") - .'&did='.$file->{FileManager_fileId}).editIcon('func=editDownload&wid='.$_[0]->get("wobjectId") + "file.controls"=>deleteIcon('func=deleteDownloadConfirm&wid='.$_[0]->get("wobjectId") + .'&did='.$file->{FileManager_fileId},'',WebGUI::International::get(12,$_[0]->get("namespace"))).editIcon('func=editDownload&wid='.$_[0]->get("wobjectId") .'&did='.$file->{FileManager_fileId}).moveUpIcon('func=moveDownloadUp&wid=' .$_[0]->get("wobjectId") .'&did='.$file->{FileManager_fileId}).moveDownIcon('func=moveDownloadDown&wid=' diff --git a/lib/WebGUI/Wobject/MessageBoard.pm b/lib/WebGUI/Wobject/MessageBoard.pm index d5f01f80a..796c78198 100644 --- a/lib/WebGUI/Wobject/MessageBoard.pm +++ b/lib/WebGUI/Wobject/MessageBoard.pm @@ -32,7 +32,8 @@ our @ISA = qw(WebGUI::Wobject); #------------------------------------------------------------------- sub _formatControls { - my $controls = deleteIcon("func=deleteForum&wid=".$_[0]->get("wobjectId")."&forumId=".$_[1]) + my $controls = deleteIcon("func=deleteForumConfirm&wid=".$_[0]->get("wobjectId")."&forumId=".$_[1],'', + WebGUI::International::get(76,$_[0]->get("namespace"))) .editIcon("func=editForum&wid=".$_[0]->get("wobjectId")."&forumId=".$_[1]) .moveUpIcon("func=moveForumUp&wid=".$_[0]->get("wobjectId")."&forumId=".$_[1]) .moveDownIcon("func=moveForumDown&wid=".$_[0]->get("wobjectId")."&forumId=".$_[1]); @@ -138,13 +139,6 @@ sub purge { $_[0]->SUPER::purge(); } -#------------------------------------------------------------------- -sub www_deleteForum { - return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); - return $_[0]->confirm(WebGUI::International::get(76,$_[0]->get("namespace")), - WebGUI::URL::page('func=deleteForumConfirm&wid='.$_[0]->get("wobjectId").'&forumId='.$session{form}{forumId})); -} - #------------------------------------------------------------------- sub www_deleteForumConfirm { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);