Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1029

Show
Ignore:
Timestamp:
03/02/08 00:59:01 (6 months ago)
Author:
rats
Message:

IMAP SSL Traffic not counted

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r1028 r1029  
    11ispCP ω 1.0.0 Changelog 
    22~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     3 
     42008-03-02 Benedikt Heintel 
     5        - SETUP: 
     6                * Fixed #317: missing "named.caching-nameserver.conf" during the installation 
     7        - ENGINE: 
     8                * Fixed #824: IMAP SSL Traffic not counted 
    39 
    4102008-03-01 Benedikt Heintel 

  • trunk/engine/setup/ispcp-setup-methods.pl

    r1026 r1029  
    697697        return $rs if ($rs != 0); 
    698698 
    699         if (! -e "$bk_dir/named.conf.ispcp") { 
     699        if ((! -e "$bk_dir/named.conf.ispcp") && (-e $main::cfg{'BIND_CONF_FILE'})) { 
    700700                $cmd = "$main::cfg{'CMD_CP'} -p $main::cfg{'BIND_CONF_FILE'} $bk_dir/named.conf.system"; 
    701701                $rs = sys_command($cmd); 

  • trunk/engine/traffic/ispcp-vrl-traff

    r930 r1029  
    44# Copyright (c) 2001-2006 by moleSoftware GmbH 
    55# http://www.molesoftware.com 
    6 # Copyright (c) 2006-2007 by isp Control Panel 
     6# Copyright (c) 2006-2008 by isp Control Panel 
    77# http://isp-control.net 
    88# 
    …… 
    319319    my ($timestamp) = @_; 
    320320 
    321  
    322321    my ($key, $value, $id) = (undef, undef, undef); 
    323322 
    …… 
    424423 
    425424                # IMAP 
    426                 $rs = sys_command("$cat $rlog|$grep 'imaplogin'|$grep 'user='|$grep 'body='|$grep -v 'ip=\\[::ffff:127.0.0.1\\]'|$awk '{print \$7,\$9,substr(\$10,1,length(\$10)-1);}' 1>$imap_log"); 
     425                #$rs = sys_command("$cat $rlog|$grep 'imaplogin'|$grep 'user='|$grep 'body='|$grep -v 'ip=\\[::ffff:127.0.0.1\\]'|$awk '{print \$7,\$9,substr(\$10,1,length(\$10)-1);}' 1>$imap_log"); 
     426                $rs = sys_command("$cat $rlog|$grep 'imapd'|$grep 'user='|$grep 'body='|$grep -v 'ip=\\[::ffff:127.0.0.1\\]'|$awk '{print \$7,\$9,substr(\$10,1,length(\$10)-1);}' 1>$imap_log"); 
    427427 
    428428        return $rs if ($rs != 0); 
    …… 
    467467 
    468468                # IMAP-SSL 
    469                 $rs = sys_command("$cat $rlog|$grep 'imapd-ssl'|$grep 'user='|$grep 'body='|$grep -v 'ip=\\[::ffff:127.0.0.1\\]'|$awk '{print \$7,\$9,substr(\$10,1,length(\$10)-1);}' 1>$imap_log"); 
     469                #$rs = sys_command("$cat $rlog|$grep 'imapd-ssl'|$grep 'user='|$grep 'body='|$grep -v 'ip=\\[::ffff:127.0.0.1\\]'|$awk '{print \$7,\$9,substr(\$10,1,length(\$10)-1);}' 1>$imap_log"); 
     470                $rs = sys_command("$cat $rlog|$grep 'imapd-ssl'|$grep 'user='|$grep -v 'ip=\\[::ffff:127.0.0.1\\]'|$awk '{print \$7,\$9,substr(\$10,1,length(\$10)-1);}' 1>$imap_log"); 
    470471 
    471472        return $rs if ($rs != 0);