Changeset 675

Timestamp:

06/24/07 22:28:48 (1 year ago)

Author:

rats

Message:

serveral changes

Files:

• trunk/configs/crontab/crontab.conf (modified) (2 diffs)
• trunk/engine/ispcp_common_code.pl (modified) (3 diffs)
• trunk/engine/ispcp_common_methods.pl (modified) (8 diffs)
• trunk/engine/setup/ispcp-setup (modified) (3 diffs)
• trunk/keys/rpl.pl (modified) (2 diffs)

trunk/configs/crontab/crontab.conf

@@ -3 +3 @@
-
-# Quota
-       23              * * 
+23     *       *       
-
-# Traffic
-       * * 
-       * * 
-       * * 
-       23              * * 
+*      *       
+*      *       
+*      *       
+23     *       *       
-
-# Backup
-       1               * * 
+1      *       *       
-
-# AWStats
@@ -18 +18 @@
-
-# Rootkit Hunter
-       0,12    * * * 
+0,12   *       *       *
-
-# [{DMN_NAME}] backup task START.

trunk/engine/ispcp_common_code.pl

@@ -26 +26 @@
-#
-#
-ISP
+isp
-#
-#    http://isp-control.net
@@ -32 +32 @@
-
-use strict;
-
-use warnings;
-
-require 'ispcp_common_methods.pl';
-
-require 'ispcp-db-keys.pl';
-
@@ -120 +118 @@
-$main::ispcp_dsk_quota_el = "$main::log_dir/ispcp-dsk-quota.el";
-
-
-$main::level1_license = "S2F10-144BD";
-
-$main::level1_dmn_count = 10;
-
-$main::level2_license = "37FD1-ED3DB";
-
-$main::level2_dmn_count = 30;
-
-$main::level3_license = "QDA53-HE4CC";
-
-$main::level3_dmn_count = 100;
-
-$main::level4_license = "A5F26-AC7DF";
-
-$main::level4_dmn_count = "unlimited";
-
-$main::working_license = $main::level1_license;
-
-########################################################################
-
-return 1;
-

trunk/engine/ispcp_common_methods.pl

@@ -6 +6 @@
-# Copyright (c) 2006-2007 by isp Control Panel
-# http://isp-control.net
-# Copyright (c) 2007 by Raphael Geissert
-#
-#
@@ -27 +26 @@
-#
-#
-ISP
+isp
-#
-#    http://isp-control.net
@@ -936 +935 @@
-
-    }
-
+
-    my $rs = open(F, '<', '/dev/random');
-
@@ -944 +943 @@
-
-        return (-1, '');
-
-
-
+
+
+
-    my ($i, $rdata, $rc, $rci) = (0, undef, undef, undef);
-
-
+
+=
-
-        read(F, $rc, 1);
-
+
-        $rci = ord($rc);
-
+
-        next if ($rci <= 32 || $rci >= 125 || $rci == 92 );
-
+
-        $rdata .= $rc;
-        $rc = undef;
@@ -962 +961 @@
-
-    }
-
+
-    close(F);
-
@@ -1620 +1619 @@
-
-    }
-
+
-    if (length($main::db_pass_key) != 32 || length($main::db_pass_iv) != 8) {
-
@@ -1663 +1662 @@
-
-    }
-
+
-    if (length($main::db_pass_key) != 32 || length($main::db_pass_iv) != 8) {
-
@@ -1715 +1714 @@
-
-        ($rs, $main::db_pwd) = decrypt_db_password($main::db_pwd);
-
+
-        # Silently quit
-        return 0 if ($rs != 0);

trunk/engine/setup/ispcp-setup

@@ -1468 +1468 @@
-sub setup_crontab {
-
-undef
+''
-
-        push_el(\@main::el, 'setup_crontab()', 'Starting...');
@@ -1507 +1507 @@
-
-                if ($main::cfg{'AWSTATS_ACTIVE'} eq 'yes') {
-     6 * * * 
+ 6       *       *       *       
-                }
-                else {
@@ -2882 +2882 @@
-
-        }
-
+
-        if ( ! -e "/etc/init.d/vhcs2_daemon" ) {
-
-            sys_command_rs("$main::cfg{'CMD_ISPCPD'} stop &> /tmp/ispcp-setup-services.log");
-            sys_command_rs("$main::cfg{'CMD_ISPCPN'} stop &> /tmp/ispcp-setup-services.log");
-
+
-            sleep(3);
-
+
-            sys_command_rs("$main::cfg{'CMD_ISPCPD'} start &> /tmp/ispcp-setup-services.log");
-            sys_command_rs("$main::cfg{'CMD_ISPCPN'} start &> /tmp/ispcp-setup-services.log");

trunk/keys/rpl.pl

@@ -1 +1 @@
-#!/usr/bin/perl
+
+# ispCP ω (OMEGA) a Virtual Hosting Control Panel
+# Copyright (c) 2001-2006 by moleSoftware GmbH
+# http://www.molesoftware.com
+# Copyright (c) 2006-2007 by isp Control Panel
+# http://isp-control.net
+#
+#
+# License:
+#    This program is free software; you can redistribute it and/or
+#    modify it under the terms of the MPL Mozilla Public License
+#    as published by the Free Software Foundation; either version 1.1
+#    of the License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    MPL Mozilla Public License for more details.
+#
+#    You may have received a copy of the MPL Mozilla Public License
+#    along with this program.
+#
+#    An on-line copy of the MPL Mozilla Public License can be found
+#    http://www.mozilla.org/MPL/MPL-1.1.html
+#
+#
+# The ispCP ω Home Page is at:
+#
+#    http://isp-control.net
+#
-
-use FindBin;
@@ -13 +43 @@
-my ($php_fname, $perl_fname, $perl_fname2) = ($ARGV[0], $ARGV[1], $ARGV[2]);
-
-3
-9
+2
+8
-
-$key =~ s/'/\\'/gi;