Skip to content

Commit

Permalink
Item14467: don't echo invalid parameters
Browse files Browse the repository at this point in the history
... in error messages
  • Loading branch information
MichaelDaum committed Aug 30, 2017
1 parent a3fe011 commit 1b79d8b
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
3 changes: 2 additions & 1 deletion data/System/JQGridPlugin.txt
Expand Up @@ -174,6 +174,7 @@ Custom grid connectors must process the following parameters:
---++ Change History

%TABLE{columnwidths="7em" tablewidth="100%"}%
| 30 Aug 2017: | (2.61) don't echo invalid parameters in error messages |
| 09 Sep 2016: | (2.60) bringing column mapping in line with each other; fixed <nop>SolrConnector |
| 17 Jul 2015: | (2.41) default to =dbcache= connector now as it is the only one really working; fixed example in docu; fixed grid resizer |
| 02 Dec 2014: | (2.40) moving from jquery.tmpl to jsrender |
Expand Down Expand Up @@ -211,7 +212,7 @@ Custom grid connectors must process the following parameters:

%META:FORM{name="PackageForm"}%
%META:FIELD{name="Author" title="Author" value="Michael Daum"}%
%META:FIELD{name="Copyright" title="Copyright" value="2009-2016 Michael Daum http://michaeldaumconsulting.com"}%
%META:FIELD{name="Copyright" title="Copyright" value="2009-2017 Michael Daum http://michaeldaumconsulting.com"}%
%META:FIELD{name="Description" title="Description" value="%25$SHORTDESCRIPTION%25"}%
%META:FIELD{name="Home" title="Home" value="https://foswiki.org/Extensions/JQGridPlugin"}%
%META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
Expand Down
14 changes: 6 additions & 8 deletions lib/Foswiki/Plugins/JQGridPlugin.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2009-2016 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2009-2017 Michael Daum, http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand All @@ -16,8 +16,8 @@ package Foswiki::Plugins::JQGridPlugin;
use strict;
use warnings;

our $VERSION = '2.60';
our $RELEASE = '09 Sep 2016';
our $VERSION = '2.61';
our $RELEASE = '30 Aug 2017';
our $SHORTDESCRIPTION = 'jQuery grid widget for Foswiki';
our $NO_PREFS_IN_TOPIC = 1;
our $doInit = 0;
Expand Down Expand Up @@ -75,18 +75,16 @@ sub restGridConnector {

my $connectorID = $request->param('connector') || $Foswiki::cfg{JQGridPlugin}{DefaultConnector} || 'search';
my $connectorClass = $Foswiki::cfg{JQGridPlugin}{Connector}{$connectorID}
|| $Foswiki::cfg{JQGridPlugin}{ExternalConnectors}{$connectorID}
|| 'Foswiki::Plugins::JQGridPlugin::SearchConnector';

|| $Foswiki::cfg{JQGridPlugin}{ExternalConnectors}{$connectorID};

unless ($connectorClass) {
printRESTResult($response, 500, "ERROR: unknown connector $connectorID");
printRESTResult($response, 500, "ERROR: unknown connector");
return '';
}

eval "require $connectorClass";
if ($@) {
printRESTResult($response, 500, "ERROR: loading connector $connectorID - $@");
printRESTResult($response, 500, "ERROR: loading connector");
return '';
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Foswiki/Plugins/JQGridPlugin/Connector.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2009-2016 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2009-2017 Michael Daum, http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down
2 changes: 1 addition & 1 deletion lib/Foswiki/Plugins/JQGridPlugin/DBCacheConnector.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2009-2016 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2009-2017 Michael Daum, http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down
2 changes: 1 addition & 1 deletion lib/Foswiki/Plugins/JQGridPlugin/FoswikiConnector.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2009-2016 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2009-2017 Michael Daum, http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down
2 changes: 1 addition & 1 deletion lib/Foswiki/Plugins/JQGridPlugin/GRID.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2009-2016 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2009-2017 Michael Daum, http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down
1 change: 1 addition & 0 deletions lib/Foswiki/Plugins/JQGridPlugin/MANIFEST
@@ -1,3 +1,4 @@
!noci
data/System/JQGridPlugin.txt 0644
lib/Foswiki/Plugins/JQGridPlugin/Config.spec 0644
lib/Foswiki/Plugins/JQGridPlugin/Connector.pm 0644
Expand Down
2 changes: 1 addition & 1 deletion lib/Foswiki/Plugins/JQGridPlugin/SearchConnector.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2009-2016 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2009-2017 Michael Daum, http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down
2 changes: 1 addition & 1 deletion lib/Foswiki/Plugins/JQGridPlugin/SolrConnector.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2011-2016 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2011-2017 Michael Daum, http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down

0 comments on commit 1b79d8b

Please sign in to comment.