Ignore:
Timestamp:
02/02/10 03:33:35 (2 years ago)
Author:
nuxwin
Message:
  • Synchronization with trunk
Location:
branches/2188
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2188

  • branches/2188/engine/ispcp-rqst-mngr

    r2505 r2572  
    120120                                $dmn_status eq "restore" || 
    121121                                $dmn_status eq "toenable" || 
    122                                 $dmn_status eq "todisable" 
     122                                $dmn_status eq "todisable" || 
     123                                $dmn_status eq "dnschange" 
    123124                           ) { 
    124125 
     
    176177        } 
    177178 
    178         $sql = "select mail_id, mail_acc, status from mail_users where status != 'ok' and status != 'ordered' order by mail_id"; 
     179        $sql = "select mail_id, mail_acc, status from mail_users where status != 'ok' and status != 'disabled' and status != 'ordered' order by mail_id"; 
    179180 
    180181        ($rs, $rdata) = doSQL($sql); 
     
    300301        } 
    301302 
    302         $sql = "select alias_id, alias_name, alias_status from domain_aliasses where alias_status in ('toadd', 'change') order by alias_id"; 
     303        $sql = "select alias_id, alias_name, alias_status from domain_aliasses where alias_status in ('toadd', 'change','dnschange') order by alias_id"; 
    303304 
    304305        ($rs, $rdata) = doSQL($sql); 
     
    371372                        my ($sub_id, $sub_name, $sub_status) = (@$row[0], @$row[1], @$row[2]); 
    372373 
    373                         if ($sub_status eq "toadd" || $sub_status eq "change" || $sub_status eq "delete") { 
     374                        if ($sub_status eq "toadd" || $sub_status eq "change" || $sub_status eq "delete" || $sub_status eq "dnschange") { 
    374375 
    375376                                if (defined($main::engine_debug)) { 
Note: See TracChangeset for help on using the changeset viewer.