X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-suggestions.pl;h=ac6172d4cc2fe23937ada09c4caef8c482416040;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=2f0dc368865b2864fcf5f04b1cd123913921e303;hpb=aaa0cdb9e82930b2d920ee02b71673e6e236b5f8;p=koha_fer

diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl
index 2f0dc36886..ac6172d4cc 100755
--- a/opac/opac-suggestions.pl
+++ b/opac/opac-suggestions.pl
@@ -11,26 +11,36 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
 
 use CGI;
 use C4::Auth;    # get_template_and_user
+use C4::Members;
 use C4::Branch;
 use C4::Koha;
 use C4::Output;
 use C4::Suggestions;
 use C4::Koha;
 use C4::Dates;
+use C4::Scrubber;
 
 my $input           = new CGI;
 my $allsuggestions  = $input->param('showall');
 my $op              = $input->param('op');
 my $suggestion      = $input->Vars;
+my $negcaptcha      = $input->param('negcap');
+
+# If a spambot accidentally populates the 'negcap' field in the sugesstions form, then silently skip and return.
+if ($negcaptcha ) {
+    print $input->redirect("/cgi-bin/koha/opac-suggestions.pl");
+    exit;
+}
+
 delete $$suggestion{$_} foreach qw<op suggestedbyme>;
 $op = 'else' unless $op;
 
@@ -76,8 +86,13 @@ if ( $op eq "add_confirm" ) {
 		#some suggestion are answering the request Donot Add
 	}
 	else {
+		my $scrubber = C4::Scrubber->new();
+		foreach my $suggest (keys %$suggestion){
+		    $suggestion->{$suggest} = $scrubber->scrub($suggestion->{$suggest});
+		}
 		$$suggestion{'suggesteddate'}=C4::Dates->today;
-		$$suggestion{'branchcode'}=C4::Context->userenv->{"branch"};
+		$$suggestion{'branchcode'}= $input->param('branch') || C4::Context->userenv->{"branch"};
+
 		&NewSuggestion($suggestion);
 		# empty fields, to avoid filter in "SearchSuggestion"
 		$$suggestion{$_}='' foreach qw<title author publishercode copyrightdate place collectiontitle isbn STATUS>;
@@ -122,6 +137,22 @@ foreach my $suggestion(@$suggestions_loop) {
 
 my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG");
 
+# Is the person allowed to choose their branch
+if ( C4::Context->preference("AllowPurchaseSuggestionBranchChoice") ) {
+    my ( $borr ) = GetMemberDetails( $borrowernumber );
+
+# pass the pickup branch along....
+    my $userbranch = '';
+    if (C4::Context->userenv && C4::Context->userenv->{'branch'}) {
+        $userbranch = C4::Context->userenv->{'branch'};
+    }
+    my $branch = $input->param('branch') || $borr->{'branchcode'} || $userbranch || '' ;
+
+# make branch selection options...
+    my $branchloop = GetBranchesLoop($branch);
+    $template->param( branchloop => $branchloop );
+}
+
 $template->param(
 	%$suggestion,
 	itemtypeloop=> $supportlist,