projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
36ed9a9
)
fix sql query, RT#8035
author
ivan
<ivan>
Sun, 6 Jun 2010 03:01:48 +0000
(
03:01
+0000)
committer
ivan
<ivan>
Sun, 6 Jun 2010 03:01:48 +0000
(
03:01
+0000)
httemplate/search/elements/search.html
patch
|
blob
|
history
httemplate/search/sql.html
patch
|
blob
|
history
diff --git
a/httemplate/search/elements/search.html
b/httemplate/search/elements/search.html
index
b97a9b3
..
3c5ff68
100644
(file)
--- a/
httemplate/search/elements/search.html
+++ b/
httemplate/search/elements/search.html
@@
-332,7
+332,7
@@
if ( $opt{'disableable'} ) {
my $limit = '';
my($confmax, $maxrecords, $offset );
my $limit = '';
my($confmax, $maxrecords, $offset );
-
if ( !
$type =~ /^(csv|\w*.xls)$/) {
+
unless (
$type =~ /^(csv|\w*.xls)$/) {
# html mode
unless (exists($opt{count_query}) && length($opt{count_query})) {
( $opt{count_query} = $opt{query} ) =~
# html mode
unless (exists($opt{count_query}) && length($opt{count_query})) {
( $opt{count_query} = $opt{query} ) =~
diff --git
a/httemplate/search/sql.html
b/httemplate/search/sql.html
index
df9b8cd
..
bf54469
100644
(file)
--- a/
httemplate/search/sql.html
+++ b/
httemplate/search/sql.html
@@
-1,13
+1,15
@@
<% include( 'elements/search.html',
'title' => 'Query Results',
'name' => 'rows',
<% include( 'elements/search.html',
'title' => 'Query Results',
'name' => 'rows',
- 'query' => 'SELECT '. ( $cgi->param('sql')
- || errorpage('Empty query') ),
- )
+ 'query' => "SELECT $sql",
+ )
%>
<%init>
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Raw SQL');
%>
<%init>
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Raw SQL');
+my $sql = $cgi->param('sql') or errorpage('Empty query');
+$sql =~ s/;+\s*$//; #remove trailing ;
+
</%init>
</%init>