[Rt-commit] rt branch, 4.2/links_in_validator, updated. rt-3.8.8-252-g89b6493

[Ruslan Zakirov]

The branch, 4.2/links_in_validator has been updated
       via  89b6493297c005ebc00f050bddcaa3e7ce8c3fac (commit)
       via  d43569db3c6553c3c41dc2a7a50dad2a8d3acbf5 (commit)
      from  685d8c8614f752be8a127d54f426ffc54fcdc979 (commit)

Summary of changes:
 sbin/rt-validator.in |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit d43569db3c6553c3c41dc2a7a50dad2a8d3acbf5
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Fri Feb 18 06:13:21 2011 +0300

    fix typo

diff --git a/sbin/rt-validator.in b/sbin/rt-validator.in
index 90c4657..2193579 100644
--- a/sbin/rt-validator.in
+++ b/sbin/rt-validator.in
@@ -899,7 +899,7 @@ push @CHECKS, 'Links: wrong organization' => sub {
             . " $column LIKE ? AND $column NOT LIKE ?";
         my @binds = ($scheme ."://%", $prefix ."%");
 
-        while ( my ($k, $v) = each %{ $use->{'Aditional'} || {} } ) {
+        while ( my ($k, $v) = each %{ $use->{'Additional'} || {} } ) {
             $query .= " AND $k = ?";
             push @binds, $v;
         }
@@ -1018,7 +1018,7 @@ push @CHECKS, 'Links: missing object' => sub {
                 ." WHERE s.$scolumn LIKE ? AND t.id IS NULL";
             my @binds = (length($tprefix) + 1, $tprefix.'%');
 
-            while ( my ($k, $v) = each %{ $use->{'Aditional'} || {} } ) {
+            while ( my ($k, $v) = each %{ $use->{'Additional'} || {} } ) {
                 $query .= " AND s.$k = ?";
                 push @binds, $v;
             }

commit 89b6493297c005ebc00f050bddcaa3e7ce8c3fac
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Fri Feb 18 06:13:48 2011 +0300

    look only at correct links when checking LocalX

diff --git a/sbin/rt-validator.in b/sbin/rt-validator.in
index 2193579..cf9488f 100644
--- a/sbin/rt-validator.in
+++ b/sbin/rt-validator.in
@@ -937,8 +937,10 @@ push @CHECKS, 'Links: LocalX for non-ticket' => sub {
     my $table = m2t('Link');
 
     foreach my $dir ( 'Target', 'Base' ) {
+        # we look only at links with correct organization, previouse check deals
+        # with incorrect orgs
         my $where = "Local$dir > 0 AND $dir LIKE ? AND $dir NOT LIKE ?";
-        my @binds = ($scheme ."://%", $prefix ."/ticket/%");
+        my @binds = ($prefix ."/%", $prefix ."/ticket/%");
 
         my $sth = execute_query( "SELECT id FROM $table WHERE $where", @binds );
         while ( my ($id, $value) = $sth->fetchrow_array ) {

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