[Rt-commit] [rtir] 01/04: whitespace
Jesse Vincent
jesse at bestpractical.com
Thu Mar 19 02:51:02 EDT 2015
This is an automated email from the git hooks/post-receive script.
jesse pushed a commit to branch 3.4/remove_old_constituencies
in repository rtir.
commit 122d940719cd306c3f9aeb9ef91b6175183f2f29
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Mar 18 22:36:10 2015 -0700
whitespace
---
html/RTIR/Tools/Elements/ToolResultsWhois | 45 ++++++++++++++++++-------------
html/RTIR/Tools/Elements/Tools | 14 +++++-----
2 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/html/RTIR/Tools/Elements/ToolResultsWhois b/html/RTIR/Tools/Elements/ToolResultsWhois
index 0198025..05c828e 100644
--- a/html/RTIR/Tools/Elements/ToolResultsWhois
+++ b/html/RTIR/Tools/Elements/ToolResultsWhois
@@ -58,36 +58,42 @@
% }
<%PERL>
my $DoInvestigate = 0;
-if ( $WhoisIterator ) {
- while ( my $obj = $WhoisIterator->next ) {
+if ($WhoisIterator) {
+ while (my $obj = $WhoisIterator->next) {
my @lines_starting_with_space = grep /^(\s+)(\w+)/, $obj->content;
- if ( $handparse || $#lines_starting_with_space >= 4 ) { #we couldn't parse that. suck
+ if ($handparse || $#lines_starting_with_space >= 4) { #we couldn't parse that. suck
my $content = join "", $obj->content;
- $m->comp( '/Elements/MakeClicky',
- object => $TicketObj,
- lookup_params => "ticket=". ($TicketObj? $TicketObj->id : 0) ."&server=$WhoisServer",
- content => \$content,
- );
+ $m->comp('/Elements/MakeClicky',
+ object => $TicketObj,
+ lookup_params => "ticket=" . ($TicketObj ? $TicketObj->id : 0) . "&server=$WhoisServer",
+ content => \$content,);
$DoInvestigate = 1 if $content =~ /Requestorbox/ig;
</%PERL>
<pre><% $content |n %></pre><br />
% } else {
-Structured RIPE whois data returned. Click <a href="Lookup.html?q=<% $q |u %>&server=<% $WhoisServer |u %>&handparse=1">here</a> to manually parse this data.
+Structured RIPE whois data returned.
+lick <a href="Lookup.html?q=<% $q |u %>&server=<% $WhoisServer |u %>&handparse=1">here</a> to manually parse this data.
<br />Warnings <% $obj->warnings %>
<br />errors <% $obj->errors %>
<hr />
-% foreach my $attribute ( $obj->attributes ) {
-% foreach my $value ( $obj->$attribute() ) {
- <b><%$attribute%></b>:
-% $m->comp('/Elements/MakeClicky', ticket => $TicketObj, lookup_params => "ticket=".$TicketObj->id, content => \$value);
+<%perl>
+foreach my $attribute ( $obj->attributes ) {
+ foreach my $value ( $obj->$attribute() ) {
+</%perl>
+ <b><%$attribute%></b>:
+<& /Elements/MakeClicky,
+ ticket => $TicketObj,
+ lookup_params => "ticket=".$TicketObj->id,
+ content => \$value &>
<% $value |n %><br />
-% }
-% }
-
-% }
-% }
-% }
+<%perl>
+ }
+ }
+ }
+ }
+ }
+</%perl>
%# Don't offer the option of Investigating to unless there are addresses
% if ( $DoInvestigate ) {
<& /Elements/Submit,
@@ -110,6 +116,7 @@ $WhoisServer => undef
$server => undef
</%args>
<%init>
+
$WhoisServer = $server unless defined $WhoisServer;
unless ($WhoisServer) {
return unless RT->Config->Get('RunWhoisRequestByDefault');
diff --git a/html/RTIR/Tools/Elements/Tools b/html/RTIR/Tools/Elements/Tools
index fd6582a..a3e733b 100644
--- a/html/RTIR/Tools/Elements/Tools
+++ b/html/RTIR/Tools/Elements/Tools
@@ -47,15 +47,15 @@
%# END BPS TAGGED BLOCK }}}
<%perl>
my $tools = RT->Config->Get('RTIRResearchTools') || ();
- for my $tool (@$tools) {
-if ($m->comp_exists('ToolForm'.$tool)) {
- $m->comp('ToolForm'.$tool, %ARGS);
-}
-}
for my $tool (@$tools) {
-if ($m->comp_exists('ToolResults'.$tool)) {
- $m->comp('ToolResults'.$tool, %ARGS);
+ if ($m->comp_exists('ToolForm' . $tool)) {
+ $m->comp('ToolForm' . $tool, %ARGS);
+ }
}
+for my $tool (@$tools) {
+ if ($m->comp_exists('ToolResults' . $tool)) {
+ $m->comp('ToolResults' . $tool, %ARGS);
+ }
}
</%perl>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the rt-commit
mailing list