Changeset 434

Show
Ignore:
Timestamp:
03/21/07 12:17:45 (2 years ago)
Author:
rats
Message:

fixed bugs #116 & #117

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/engine/traffic/vhcs2-vrl-traff

    r288 r434  
    33# VHCS ω (OMEGA) - Virtual Hosting Control System | Omega Version 
    44# Copyright (c) 2001-2006 by moleSoftware GmbH 
    5 # Copyright (c) 2006-2007 by ispCP | http://isp-control.net 
     5# http://www.molesoftware.com 
     6# Copyright (c) 2006-2007 by isp Control Panel 
     7# http://isp-control.net 
    68# 
    79# 
     
    2325#    http://www.mozilla.org/MPL/MPL-1.1.html 
    2426# 
    25 ######################################################################## 
     27
     28# The VHCS ω Home Page is at: 
     29
     30#    http://isp-control.net 
     31
    2632 
    2733use FindBin; 
     
    372378 
    373379        # Changed by Erik Lehmann 07.06.2005 
    374         my $cmd = "$main::cfg{'CMD_CAT'} $rlog | $main::cfg{'CMD_GREP'} 'postfix' | $main::cfg{'CMD_PFLOGSUMM'} standard 1>$smtp_delivery_log"; 
     380        my $cmd = "$main::cfg{'CMD_CAT'} $rlog | $main::cfg{'CMD_GREP'} 'postfix' | $main::cfg{'CMD_PFLOGSUM'} standard 1>$smtp_delivery_log"; 
    375381 
    376382        $rs = sys_command($cmd); 
  • trunk/engine/traffic/vhcs2-vrl-traff-SUSE

    r154 r434  
    11#!/usr/bin/perl 
    22 
    3 # VHCS(tm) - Virtual Hosting Control System 
    4 # Copyright (c) 2001-2004 by moleSoftware GmbH 
     3# VHCS ω (OMEGA) - Virtual Hosting Control System | Omega Version 
     4# Copyright (c) 2001-2006 by moleSoftware GmbH 
    55# http://www.molesoftware.com 
     6# Copyright (c) 2006-2007 by isp Control Panel 
     7# http://isp-control.net 
    68# 
    79# 
     
    2426# 
    2527# 
    26 # The VHCS Home Page is at: 
     28# The VHCS ω Home Page is at: 
    2729# 
    28 #    http://www.vhcs.net 
    29 #### 
     30#    http://isp-control.net 
     31# 
    3032 
    3133use FindBin; 
     
    373375 
    374376        # Changed by Erik Lehmann 07.06.2005 
    375         my $cmd = "$main::cfg{'CMD_CAT'} $rlog | $main::cfg{'CMD_GREP'} 'postfix' | $main::cfg{'CMD_PFLOGSUMM'} standard 1>$smtp_delivery_log"; 
     377        my $cmd = "$main::cfg{'CMD_CAT'} $rlog | $main::cfg{'CMD_GREP'} 'postfix' | $main::cfg{'CMD_PFLOGSUM'} standard 1>$smtp_delivery_log"; 
    376378 
    377379        $rs = sys_command($cmd); 
  • trunk/engine/traffic/vhcs2-vrl-traff-correction

    r285 r434  
    22 
    33# VHCS ω (OMEGA) - Virtual Hosting Control System | Omega Version 
    4 # Copyright (c) 2006-2007 by ispCP | http://isp-control.net 
     4# Copyright (c) 2006-2007 by isp Control Panel 
     5# http://isp-control.net 
    56# 
    67# 
    78# License: 
    89#    This program is free software; you can redistribute it and/or 
    9 #    modify it under the terms of the GPL General Public License 
    10 #    as published by the Free Software Foundation; either version 2.0 
     10#    modify it under the terms of the MPL Mozilla Public License 
     11#    as published by the Free Software Foundation; either version 1.1 
    1112#    of the License, or (at your option) any later version. 
    1213# 
     
    1415#    but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1516#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    16 #    GPL General Public License for more details. 
     17#    MPL Mozilla Public License for more details. 
    1718# 
    18 #    You may have received a copy of the GPL General Public License 
     19#    You may have received a copy of the MPL Mozilla Public License 
    1920#    along with this program. 
    2021# 
    21 #    An on-line copy of the GPL General Public License can be found 
    22 #    http://www.gnu.org/licenses/gpl.html 
     22#    An on-line copy of the MPL Mozilla Public License can be found 
     23#    http://www.mozilla.org/MPL/MPL-1.1.html 
    2324# 
    2425# 
    25 #    The programm vhcs2-vrl-traff-correction is written by zttom 
     26# The VHCS ω Home Page is at: 
    2627# 
    27 ######################################################################## 
     28#    http://isp-control.net 
     29
    2830 
    2931use FindBin; 
  • trunk/engine/vhcs2-dmn-mngr

    r429 r434  
    11#!/usr/bin/perl 
    22 
    3 # VHCS(tm) - Virtual Hosting Control System 
     3# VHCS ω (OMEGA) - Virtual Hosting Control System | Omega Version 
    44# Copyright (c) 2001-2006 by moleSoftware GmbH 
    55# http://www.molesoftware.com 
  • trunk/engine/vhcs2-htuser-mngr

    r154 r434  
    11#!/usr/bin/perl 
    22 
    3 
    4 # VHCS(tm) - Virtual Hosting Control System 
    5 # Copyright (c) 2001-2005 by moleSoftware GmbH 
     3# VHCS ω (OMEGA) - Virtual Hosting Control System | Omega Version 
     4# Copyright (c) 2001-2006 by moleSoftware GmbH 
    65# http://www.molesoftware.com 
     6# Copyright (c) 2006-2007 by isp Control Panel 
     7# http://isp-control.net 
    78# 
    89# 
    910# License: 
    10 # 
    1111#    This program is free software; you can redistribute it and/or 
    1212#    modify it under the terms of the MPL Mozilla Public License 
     
    2626# 
    2727# 
    28 # The VHCS Home Page is at: 
    29 # 
    30 #    http://www.vhcs.net 
     28# The VHCS ω Home Page is at: 
     29# 
     30#    http://isp-control.net 
    3131# 
    3232 
  • trunk/tools/daemon/lr_syntax.c

    r393 r434  
    33#include <sys/stat.h> 
    44#include <fcntl.h> 
     5 
     6#if defined(__OpenBSD__) || defined(__FreeBSD__) 
     7#include <sys/proc.h> 
     8#else 
    59#include <sys/procfs.h> 
     10#endif 
     11 
    612#include <unistd.h> 
    713#include <sys/param.h> 
     
    5258 
    5359                        if (fork() == 0 ) { 
    54                                  
     60 
    5561                                 int fdres, dupres; 
    5662                                 char logfile[MAXPATHLEN]; 
     
    7379                                        strncpy(daemon_path, fname2, strlen(fname2)-strlen("daemon/vhcs2_daemon")); 
    7480                                        strcat(daemon_path, "engine/vhcs2-rqst-mngr"); 
    75                                          
     81 
    7682                                        fdres = open ( "/dev/null", O_RDONLY ); 
    7783                                        if(fdres == -1) 
     
    121127 
    122128                                        execl( daemon_path, "vhcs2-rqst-mngr" ,(char*)NULL ); 
    123                                         #endif  
     129                                        #endif 
    124130 
    125131                                        exit(0); 
    126132                                #if !defined(__OpenBSD__) && !defined(__FreeBSD__) 
    127133                                } 
    128                                 #endif  
     134                                #endif 
    129135                        } 
    130                          
     136 
    131137                        strcat(lr_ans, message(MSG_CMD_OK)); 
    132138                        strcat(lr_ans, " query scheduled for execution.\r\n"); 
     
    142148                } 
    143149 
    144         }  
     150        } 
    145151 
    146152        return (NO_ERROR);