rhel/centos5 plesk logwatch fix - imapd file

--- imapd~      2012-03-27 05:42:52.000000000 +0300
+++ imapd       2012-03-31 10:46:17.000000000 +0300
@@ -38,18 +38,19 @@
    if (
       ($ThisLine =~ /^Initializing */) or
       ($ThisLine =~ /^spgetpwnam: can't find user: */) or
-      ($ThisLine =~ /^couriertls: read: Connection reset by peer/ )
+      ($ThisLine =~ /^couriertls: read: Connection reset by peer/) or
+      ($ThisLine =~ /digascii: [a-f0-9]*, response: /)
    ) {
       # Don't care about these...
    } elsif ( ($User, $Host) = ( $ThisLine =~ /^Login user=(.*?) host=(.*\[.*\])$/ ) ) {
       $Login{$User}{$Host}++;
-   } elsif ( ($User, $Host) = ( $ThisLine =~ /^LOGIN, user=(.*?), ip=\[(.*)\], protocol=IMAP$/o ) ) {
+   } elsif ( ($User, $Host) = ( $ThisLine =~ /LOGIN, user=(.*?), ip=\[(.*)\], protocol=IMAP$/o ) ) {
       $Login{$User}{$Host}++;
    } elsif ( ($User,$Host) = ( $ThisLine =~ /^Authenticated user=(.*) host=(.*\[.*\])$/ ) ) {
       $Login{$User}{$Host}++;
    } elsif ( ($User,$Host) = ( $ThisLine =~ /^Preauthenticated user=(.*) host=(.*)$/ ) ) {
       $Login{$User}{$Host}++;
-   } elsif ( ($Host) = ( $ThisLine =~ /^imap service init from (.*)$/ ) ) {
+   } elsif ( ($Host) = ( $ThisLine =~ /^IMAP connect from @ \[(.*)\]/ ) ) {
       $ConnectionNonSSL{$Host}++;
       $Connection{$Host}++;
    } elsif ( ($Host) = ( $ThisLine =~ /^imaps SSL service init from (.*)$/ ) ) {
@@ -67,7 +68,12 @@
    } elsif ( ($User, $Host) = ( $ThisLine =~ /^Logout user=(.*?) host=(.*\[.*\])$/) ) {
       $Logout{$User}{$Host}++;
       $Logout2{$User}++;
-   } elsif ( ($dummy, $User, $Host, $DownloadSize1, $DownloadSize2) = ( $ThisLine =~ /^(LOGOUT|TIMEOUT|DISCONNECTED), user=(.*?), ip=\[(.*)\], headers=(\d+), body=(\d+)/o ) ) {
+   } elsif ( ($dummy, $User, $Host, $DownloadSize1, $DownloadSize2) = ( $ThisLine =~ /(LOGOUT|TIMEOUT|DISCONNECTED), (user=.*, )?ip=\[(.*)\], headers=(\d+), body=(\d+)/o ) ) {
+      if ( ($dummy) = ( $User =~ /user=(.*)/ ) ) {
+         $User = $dummy;
+      } else {
+         $User = "unknown";
+      }
       $Logout{$User}{$Host}++;
       $Logout2{$User}++;
       $DownloadedMessagesSize{$User} += $DownloadSize1 + $DownloadSize2;