[Rt-commit] rtir branch, 2.5-trunk, updated. b6a522443964261f1395aff60dd1f53e3de6d1a6

[Ruslan Zakirov]

The branch, 2.5-trunk has been updated
       via  b6a522443964261f1395aff60dd1f53e3de6d1a6 (commit)
       via  610a8fe07a0d05d43b2cd4a0fb76e9fae67cbf97 (commit)
       via  568e88b318913c153d0e12894a185dc07b0a8f2e (commit)
       via  50802d271799133e6083a877dd7df27ad4e8fd46 (commit)
       via  a89be41bcdceb022a1d8139cbd5f9dbf42aaedfb (commit)
       via  da33f7befe75bfa91c73389f9ce9bc78cc2ad97d (commit)
       via  71646c5d3630d74c5a5184375c859c9e59a3dac6 (commit)
       via  aabdf280a54eeaadc7ab11082b04b783faa4620e (commit)
       via  72d9387813c8a08b79de8f8f35b8fb9d5b846d1d (commit)
       via  d312586c3d3bb3cd0058eae6ecd48bc02b6655cc (commit)
       via  f3f895cfb6bb71f98cfb013a79cb431721fc359b (commit)
       via  b7347b3561b26a4ced9863ab0f6e9e378368c09b (commit)
      from  20355b6a3c77f57548f3cc6ca4fb50c9edc4de52 (commit)

Summary of changes:
 CHANGES                            |    4 ++++
 Makefile.PL                        |    4 ++--
 README                             |    8 ++++----
 html/RTIR/Advanced.html            |    4 ++--
 html/RTIR/Elements/PickRestriction |    2 +-
 html/RTIR/Incident/Create.html     |   13 +++++++++++--
 html/RTIR/Incident/Display.html    |    2 +-
 html/RTIR/Incident/Edit.html       |    2 +-
 html/RTIR/NoAuth/webrtir.css       |   11 +++++------
 lib/RT/Action/RTIR_FindIP.pm       |    4 +++-
 lib/RT/IR.pm                       |    6 +++++-
 lib/RT/IR/Tutorial.pod             |    4 ++--
 12 files changed, 41 insertions(+), 23 deletions(-)

- Log -----------------------------------------------------------------
commit 610a8fe07a0d05d43b2cd4a0fb76e9fae67cbf97
Author: Ruslan Zakirov <ruz at bestpractica.com>
Date:   Wed Aug 12 19:14:16 2009 +0400

    0.0.0.0 is illegal IP address

diff --git a/lib/RT/Action/RTIR_FindIP.pm b/lib/RT/Action/RTIR_FindIP.pm
index 3a60090..1efab3b 100644
--- a/lib/RT/Action/RTIR_FindIP.pm
+++ b/lib/RT/Action/RTIR_FindIP.pm
@@ -38,13 +38,15 @@ sub Commit {
         $existing{ $_->Content } =  1;
     }
     my $content = $attach->Content || '';
-    my @IPs = ( $content =~ /(?<!\d)($RE{net}{IPv4})(?!\d)(?!\/(?:3[0-2]|[1-2]?[0-9])(?:\D|\z))/go );
+# 0.0.0.0 is illegal IP address
+    my @IPs = ( $content =~ /(?<!\d)(?!0\.0\.0\.0)($RE{net}{IPv4})(?!\d)(?!\/(?:3[0-2]|[1-2]?[0-9])(?:\D|\z))/go );
     $self->AddIP(
         IP          => $_,
         CustomField => $cf,
         Skip        => \%existing,
     ) foreach @IPs;
 
+# but 0.0.0.0/0 is legal CIDR
     my @CIDRs = ( $content =~ /(?<![0-9.])$RE{net}{CIDR}{IPv4}{-keep}(?!\.?[0-9])/go );
     while ( my ($addr, $bits) = splice @CIDRs, 0, 2 ) {
         my $cidr = join( '.', map $_||0, (split /\./, $addr)[0..3] ) ."/$bits";

commit b6a522443964261f1395aff60dd1f53e3de6d1a6
Merge: 20355b6 610a8fe
Author: Ruslan Zakirov <ruz at bestpractica.com>
Date:   Wed Aug 12 19:36:30 2009 +0400

    Merge branch '2.4-trunk' into 2.5-trunk
    
    Conflicts:
    	t/000-mason-syntax.t
    	t/001-basic-RTIR.t
    	t/002-test-reject.t
    	t/003-resolve-IR-when-all-incidents-resolved.t
    	t/004-rtfm-in-rtir.t
    	t/005-resolve-investigations.t
    	t/006-saved-searches.t
    	t/008-workflow-blocks.t
    	t/009-attachments-processing.t
    	t/010-bulk-reject.t
    	t/011-merge.t
    	t/015-make-clicky.t
    	t/016-date-due.t
    	t/016-date-started.t
    	t/019-watchers-on-create.t
    	t/019-webui-block-fields.t
    	t/020-incident-and-investigation.t
    	t/021-gnupg-on-create.t
    	t/022-gnupg-on-update.t
    	t/023-gnupg-on-incident.t
    	t/constituency/acl.t
    	t/constituency/basics.t
    	t/constituency/email.t
    	t/constituency/email_outgoing.t
    	t/constituency/propagation-inherit.t
    	t/constituency/propagation-no.t
    	t/constituency/propagation-reject.t
    	t/custom-fields/ip.t
    	t/incident/abandon.t
    	t/incident/bulk-abandon.t
    	t/incident/split.t
    	t/lib/RT/IR/Test.pm
    	t/mail/skip_notification.t

diff --cc html/RTIR/Incident/Edit.html
index a61d904,9ba56c8..4ad10d9
--- a/html/RTIR/Incident/Edit.html
+++ b/html/RTIR/Incident/Edit.html
@@@ -62,8 -70,17 +62,8 @@@
      <td class="value"><input name="Subject" value="<%$Ticket->Subject|h%>" size="50" /></td>
    </tr>
    <tr>
 -    <td class="label"><&|/l&>Description</&>:</td>
 -    <td class="value">
 -      <& /RTIR/Elements/EditRTIRField, 
 -         TicketObj => $Ticket, 
 -     Name => 'Description',
 -     Cols => 60 &>
 -    </td>
 -  </tr>
 -  <tr>
      <td class="label"><&|/l&>Priority</&>:</td>
-     <td class="value"><input name="Priority" value="<%$Ticket->Priority|h%>" size="5" /></td>
+     <td class="value"><&/Elements/SelectPriority, Name=>"Priority", Default=>$Ticket->Priority &></td>
    </tr>
    <tr>
      <td class="label"><&|/l&>Time Worked</&>:</td>
diff --cc lib/RT/Action/RTIR_FindIP.pm
index 467227f,1efab3b..9cd94cf
--- a/lib/RT/Action/RTIR_FindIP.pm
+++ b/lib/RT/Action/RTIR_FindIP.pm
@@@ -39,14 -37,9 +39,15 @@@ sub Commit 
      for( @{$cf->ValuesForObject( $ticket )->ItemsArrayRef} ) {
          $existing{ $_->Content } =  1;
      }
 +
 +    if ( $how_many_can && $how_many_can >= keys %existing ) {
 +        $RT::Logger->debug("Ticket #". $ticket->id ." already has maximum number of IPs, skipping" );
 +        return 1;
 +    }
 +
      my $content = $attach->Content || '';
-     my @IPs = ( $content =~ /(?<!\d)($RE{net}{IPv4})(?!\d)(?!\/(?:3[0-2]|[1-2]?[0-9])(?:\D|\z))/go );
+ # 0.0.0.0 is illegal IP address
+     my @IPs = ( $content =~ /(?<!\d)(?!0\.0\.0\.0)($RE{net}{IPv4})(?!\d)(?!\/(?:3[0-2]|[1-2]?[0-9])(?:\D|\z))/go );
      $self->AddIP(
          IP          => $_,
          CustomField => $cf,

-----------------------------------------------------------------------