diff --git a/Slash/DB/MySQL/MySQL.pm b/Slash/DB/MySQL/MySQL.pm index eb99cbab7..addcb313b 100644 --- a/Slash/DB/MySQL/MySQL.pm +++ b/Slash/DB/MySQL/MySQL.pm @@ -2082,7 +2082,7 @@ sub saveBlock { $self->sqlInsert('blocks', { bid => $bid, seclev => 500 }); } - my($portal, $retrieve) = (0, 0); + my($portal, $retrieve, $all_sections) = (0, 0, 0); # If someone marks a block as a portald block then potald is a portald # something tell me I may regret this... -Brian @@ -2091,6 +2091,7 @@ sub saveBlock { # this is to make sure that a static block doesn't get # saved with retrieve set to true $form->{retrieve} = 0 if $form->{type} ne 'portald'; + $form->{all_sections} = 0 if $form->{type} ne 'all_sections'; # If a block is a portald block then portal=1. type # is done so poorly -Brian @@ -2113,6 +2114,7 @@ sub saveBlock { items => $form->{items}, section => $form->{section}, retrieve => $form->{retrieve}, + all_sections => $form->{all_sections}, autosubmit => $form->{autosubmit}, portal => $form->{portal}, }, 'bid=' . $self->sqlQuote($bid)); diff --git a/plugins/Admin/admin.pl b/plugins/Admin/admin.pl index 7417d3c54..dcfbeb365 100755 --- a/plugins/Admin/admin.pl +++ b/plugins/Admin/admin.pl @@ -487,7 +487,7 @@ sub blockEdit { print getData('blockDelete-message', { bid => $form->{deletebid} }); } - my($blockref, $saveflag, $block_select, $retrieve_checked, + my($blockref, $saveflag, $block_select, $retrieve_checked, $all_sections_checked, $portal_checked, $block_select1, $block_select2); my($blockedit_flag, $blockdelete_flag, $blockform_flag) = (0, 0, 0); $blockref = {}; @@ -535,6 +535,7 @@ sub blockEdit { $blockedit_flag = 1; $blockref->{ordernum} = "NA" if $blockref->{ordernum} eq ''; $retrieve_checked = "CHECKED" if $blockref->{retrieve} == 1; + $all_sections_checked = "CHECKED" if $blockref->{all_sections} == 1; $portal_checked = "CHECKED" if $blockref->{portal} == 1; } } @@ -555,6 +556,7 @@ sub blockEdit { blockform_flag => $blockform_flag, portal_checked => $portal_checked, retrieve_checked => $retrieve_checked, + all_sections_checked => $all_sections_checked, blocktype_select => $blocktype_select, sectionbid => $sectionbid, autosubmit_select => $autosubmit_select, diff --git a/plugins/Admin/templates/blockEdit;admin;default b/plugins/Admin/templates/blockEdit;admin;default index 5c83cbb83..a0ffb61c2 100644 --- a/plugins/Admin/templates/blockEdit;admin;default +++ b/plugins/Admin/templates/blockEdit;admin;default @@ -94,6 +94,10 @@ __template__ Retrieve + + All Sections + + URL