[Rt-commit] rtir branch, 4.0/RunWhoisRequestByDefault-option, created. 2.6.1-4-gdda871f
Ruslan Zakirov
ruz at bestpractical.com
Tue Sep 27 19:01:49 EDT 2011
The branch, 4.0/RunWhoisRequestByDefault-option has been created
at dda871f46f0266e684ff7272816f5842bc1b4bbd (commit)
- Log -----------------------------------------------------------------
commit f7fafe88e203f5f4849a8e4399a20103f1946601
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Tue Sep 27 23:56:32 2011 +0400
delete handparse argument we don't use locally
diff --git a/html/RTIR/Tools/Lookup.html b/html/RTIR/Tools/Lookup.html
index 2913ffb..4629449 100644
--- a/html/RTIR/Tools/Lookup.html
+++ b/html/RTIR/Tools/Lookup.html
@@ -46,7 +46,6 @@
TicketType => $TicketType,
TicketObj => $TicketObj,
WhoisServer => $server,
- handparse => $handparse,
servers => $servers &>
<%INIT>
@@ -117,7 +116,6 @@ if ( $ticket ) {
<%ARGS>
$servers => RT->Config->Get('whois')
$server => undef
-$handparse => 1
$q => undef
$type => undef
$ticket => undef
commit b76d4c4c820d0449364f9915e85cd0adaf4ea562
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Wed Sep 28 00:06:41 2011 +0400
servers should never been in arguments
diff --git a/html/RTIR/Tools/Elements/ToolFormWhois b/html/RTIR/Tools/Elements/ToolFormWhois
index 6dac889..a63064f 100644
--- a/html/RTIR/Tools/Elements/ToolFormWhois
+++ b/html/RTIR/Tools/Elements/ToolFormWhois
@@ -19,6 +19,8 @@ foreach my $s ( sort grep $servers->{ $_ }, keys %{ $servers } ) {
<%args>
$TicketObj => undef
$q => undef
-$servers => undef
$WhoisServer => undef
</%args>
+<%INIT>
+my $servers = RT->Config->Get('whois');
+</%INIT>
diff --git a/html/RTIR/Tools/Lookup.html b/html/RTIR/Tools/Lookup.html
index 4629449..b04fe04 100644
--- a/html/RTIR/Tools/Lookup.html
+++ b/html/RTIR/Tools/Lookup.html
@@ -46,7 +46,7 @@
TicketType => $TicketType,
TicketObj => $TicketObj,
WhoisServer => $server,
- servers => $servers &>
+&>
<%INIT>
@@ -114,7 +114,6 @@ if ( $ticket ) {
</%INIT>
<%ARGS>
-$servers => RT->Config->Get('whois')
$server => undef
$q => undef
$type => undef
commit 2d3e434e43a020649382b875bfbdbdc5e17c100f
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Wed Sep 28 02:08:39 2011 +0400
server was always about whois only
now we have more research tools and they are not
about whois, so drop server title and Lookup.html.
Make new name WhoisServer, keep backwards compatibility
by still supporting server argument.
diff --git a/html/RTIR/Tools/Elements/ToolFormWhois b/html/RTIR/Tools/Elements/ToolFormWhois
index a63064f..a11a781 100644
--- a/html/RTIR/Tools/Elements/ToolFormWhois
+++ b/html/RTIR/Tools/Elements/ToolFormWhois
@@ -4,7 +4,7 @@
<span class="label">WHOIS:</span>
<span class="input">
<input size="30" name="q" value="<% $q %>" /> at
- <select name="server">
+ <select name="WhoisServer">
<%PERL>
foreach my $s ( sort grep $servers->{ $_ }, keys %{ $servers } ) {
my $srv = $servers->{ $s };
@@ -20,7 +20,11 @@ foreach my $s ( sort grep $servers->{ $_ }, keys %{ $servers } ) {
$TicketObj => undef
$q => undef
$WhoisServer => undef
+$server => undef
</%args>
<%INIT>
my $servers = RT->Config->Get('whois');
+
+$WhoisServer = $server unless defined $WhoisServer;
+$WhoisServer ||= '';
</%INIT>
diff --git a/html/RTIR/Tools/Elements/ToolResultsWhois b/html/RTIR/Tools/Elements/ToolResultsWhois
index f4cedc6..6f9d51e 100644
--- a/html/RTIR/Tools/Elements/ToolResultsWhois
+++ b/html/RTIR/Tools/Elements/ToolResultsWhois
@@ -61,9 +61,12 @@ $handparse => undef
$TicketType => undef
$TicketObj => undef
$WhoisServer => undef
+$server => undef
</%args>
<%init>
+$WhoisServer = $server unless defined $WhoisServer;
return unless ($WhoisServer);
+
use Net::Whois::RIPE;
my ($whois, $port) = split(/\s*:\s*/, $WhoisServer, 2);
$port = 43 unless ($port || '') =~ /^\d+$/;
diff --git a/html/RTIR/Tools/Lookup.html b/html/RTIR/Tools/Lookup.html
index b04fe04..09da169 100644
--- a/html/RTIR/Tools/Lookup.html
+++ b/html/RTIR/Tools/Lookup.html
@@ -45,7 +45,6 @@
<& Elements/Tools, %ARGS, q => $q,
TicketType => $TicketType,
TicketObj => $TicketObj,
- WhoisServer => $server,
&>
<%INIT>
@@ -68,7 +67,7 @@ if ( $ARGS{'InvestigateTo'} ) {
);
}
-my $title = loc("Lookup '[_1]' using server [_2]", $q, $server);
+my $title = loc("Lookup '[_1]'", $q);
my $max_age = -60;
@@ -84,7 +83,7 @@ $session{'tickets'} = RT::Tickets->new( $session{'CurrentUser'} );
my $current_subtab = 'RTIR/Tools/Lookup.html';
if ( $q ) {
- $current_subtab .= '?'. $m->comp('/Elements/QueryString', q => $q, server => $server );
+ $current_subtab .= '?'. $m->comp('/Elements/QueryString', q => $q );
my $query;
if ( $type && RT::IR->CustomFields( Field => $type ) ) {
@@ -114,7 +113,6 @@ if ( $ticket ) {
</%INIT>
<%ARGS>
-$server => undef
$q => undef
$type => undef
$ticket => undef
commit dda871f46f0266e684ff7272816f5842bc1b4bbd
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Wed Sep 28 02:13:55 2011 +0400
add RunWhoisRequestByDefault option
diff --git a/etc/RTIR_Config.pm b/etc/RTIR_Config.pm
index b322c02..d73a5fd 100644
--- a/etc/RTIR_Config.pm
+++ b/etc/RTIR_Config.pm
@@ -385,6 +385,16 @@ Set($whois, {
},
} );
+=item C<$RunWhoisRequestByDefault>
+
+RTIR prior to 2.6.1 was running whois request by default on lookup.
+Now it requires user interaction. Set C<$RunWhoisRequestByDefault>
+to true value return back old behaviour.
+
+=cut
+
+Set($RunWhoisRequestByDefault, 0);
+
=back
=head1 Service Level Agreements (SLA)
diff --git a/html/RTIR/Tools/Elements/ToolResultsWhois b/html/RTIR/Tools/Elements/ToolResultsWhois
index 6f9d51e..7509ccb 100644
--- a/html/RTIR/Tools/Elements/ToolResultsWhois
+++ b/html/RTIR/Tools/Elements/ToolResultsWhois
@@ -65,7 +65,13 @@ $server => undef
</%args>
<%init>
$WhoisServer = $server unless defined $WhoisServer;
-return unless ($WhoisServer);
+unless ($WhoisServer) {
+ return unless RT->Config->Get('RunWhoisRequestByDefault');
+
+ my $servers = RT->Config->Get('whois');
+ ($WhoisServer) = map ref $servers->{$_}? $servers->{$_}->{'Host'}: $servers->{$_},
+ (sort keys %$servers)[0];
+}
use Net::Whois::RIPE;
my ($whois, $port) = split(/\s*:\s*/, $WhoisServer, 2);
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list