Changeset 1257

Timestamp:

07/02/08 01:35:12 (2 months ago)

Author:

rats

Message:

* Dropped PHP4 Support
* Fixed #1374: apache2-suexec new in Lenny
* Fixed #1363: Domain Aliase at Root - Wrong in apache2 - ispcp.conf
* Fixed #1179: Changing domain_default_page and errordocs templates
* Fixed #1368: SQL syntax in reseller_user_statistics.php

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/docs/Debian/debian-packages-etch (modified) (1 diff)
• trunk/docs/Debian/debian-packages-lenny (modified) (1 diff)
• trunk/docs/Debian/debian-packages-sarge (modified) (1 diff)
• trunk/docs/OpenBSD/openbsd-packages (modified) (1 diff)
• trunk/docs/SuSE/suse-packages (modified) (1 diff)
• trunk/docs/Ubuntu/ubuntu-packages-edgy (modified) (1 diff)
• trunk/engine/ispcp-als-mngr (modified) (1 diff)
• trunk/engine/ispcp-dmn-mngr (modified) (8 diffs)
• trunk/engine/setup/ispcp-setup (modified) (1 diff)
• trunk/engine/setup/ispcp-setup-methods.pl (modified) (6 diffs)
• trunk/engine/setup/ispcp-update (modified) (1 diff)
• trunk/gui/include/calc-functions.php (modified) (2 diffs)
• trunk/gui/include/htmlpurifier/HTMLPurifier/ConfigDef (deleted)
• trunk/gui/include/htmlpurifier/HTMLPurifier/ConfigDef.php (deleted)
• trunk/gui/include/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer/HTML/3.1.0,0c12436d689bff526ef4fa8710c36163,1.ser (deleted)
• trunk/gui/include/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer/HTML/3.1.0,9ab6778bf13f82ed0fd3c9e2c5162364,1.ser (deleted)
• trunk/gui/reseller/reseller_user_statistics.php (modified) (1 diff)

trunk/CHANGELOG

@@ -3 +3 @@
-
-2008-07-02 Benedikt Heintel
+        - CONFIG:
+                * Dropped PHP4 Support
+        - DOCS:
+                * Fixed #1374: apache2-suexec new in Lenny
+        - ENGINE:
+                * Fixed #1363: Domain Aliase at Root - Wrong in apache2 - ispcp.conf
+        - GUI:
+                * Fixed #1179: Changing domain_default_page and errordocs templates
+                * Fixed #1368: SQL syntax in reseller_user_statistics.php
-        - TOOLS:
-                * Updated HTMLpurifier to version 3.1.1

trunk/docs/Debian/debian-packages-etch

@@ -58 +58 @@
-perl-base
-perl-modules
-php4
-php4-cgi
-php4-gd
-php4-mcrypt
-php4-mysql
-php4-pear
-php5-cgi
-php5-gd

trunk/docs/Debian/debian-packages-lenny

@@ -2 +2 @@
-apache2
-apache2.2-common
+apache2-suexec
+apache2-suexec-custom
-apache2-utils
-awstats

trunk/docs/Debian/debian-packages-sarge

@@ -54 +54 @@
-perl-base
-perl-modules
-php4
-php4-cgi
-php4-gd
-php4-mcrypt
-php4-mysql
-php4-pear
-php5-cgi
-php5-gd

trunk/docs/OpenBSD/openbsd-packages

@@ -52 +52 @@
-pcre
-pdflib
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
-png
-postfix-2.3.7-sasl2

trunk/docs/SuSE/suse-packages

@@ -2 +2 @@
-apache2-mod_auth_mysql
-apache2-mod_perl
-4
+5
-apache2-prefork
-libapr0
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
-postfix
-amavisd-new

trunk/docs/Ubuntu/ubuntu-packages-edgy

@@ -53 +53 @@
-perl-base
-perl-modules
-php4
-php4-cgi
-php4-gd
-php4-mcrypt
-php4-mysql
-php4-pear
-php4-idn
-php5-cgi
-php5-gd

trunk/engine/ispcp-als-mngr

@@ -724 +724 @@
-        push_el(\@main::el, 'als_entry:', "$als_e");
-
+        if ($mount_point == "/") {
+                $mount_point = "";
+        }
+
-        my ($suexec_uid, $suexec_gid)    = get_dmn_suexec_user($dmn_id);
-        my $suexec_user_pref             = $main::cfg{'APACHE_SUEXEC_USER_PREF'};

trunk/engine/ispcp-dmn-mngr

@@ -1377 +1377 @@
-        # PHP4 and PHP5 Directory for usual user
-        #
-
-
-
-
-
-
-
-
-
+#
+#
+#
+#
+#
+#
+#
+#
+#
-        if (! -d "$starter_dir/$dmn_name/php5") {
-                $rs = make_dir(
@@ -1570 +1570 @@
-                return $rs if ($rs != 0);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                return $rs if ($rs != 0);
-        }
@@ -1598 +1580 @@
-        # php.ini for the new domain
-        #
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#
+#
+#
+#
+#
+
+#
+#
+#
+#
+#
+#
+
+#
+#
+
+#
+#
+#
+#
+#
+#
+#
+#
+#
-        if (!(-e "$starter_dir/$dmn_name/php5/php.ini")) {
-                my $ini_tpl     = undef;
@@ -1674 +1656 @@
-                return $rs if ($rs != 0);
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#
+#
+#
+
+#
+#
+
+#
+#
+#
+#
+#
+#
+#
+
+#
+#
+#
+#
+#
+#
+#
+#
+#
-
-        push_el(\@main::el, 'dmn_add_httpd_file_data()', 'Ending...');
@@ -1740 +1722 @@
-        # PHP4 and PHP5 Directory for usual user
-        #
-
-
-
-
+#
+#
+#
+#
-        if (! -d "$starter_dir/$dmn_name/php5") {
-                $rs = make_dir("$starter_dir/$dmn_name/php5", $sys_user, $sys_group, 0750);
@@ -1826 +1808 @@
-        # php.ini for the domain
-        #
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                my $ini_tpl     = undef;
-
+
+
-                ($rs, $ini_tpl) = get_tpl($ini_cfg_dir, 'php.ini');
-                return $rs if ($rs != 0);
@@ -1840 +1840 @@
-                return $rs if ($rs != 0);
-
-                ($rs, $rdata) = store_file("$starter_dir/$dmn_name/php4/php.ini", $cfg, $sys_user, $sys_group, 0640);
-                return $rs if ($rs != 0);
-        }
-        if (! (-e "$starter_dir/$dmn_name/php5/php.ini")) {
-                my $ini_tpl     = undef;
-                my $ini_cfg_dir = "$main::cfg{'CONF_DIR'}/fcgi/parts/php5";
-
-                ($rs, $ini_tpl) = get_tpl($ini_cfg_dir, 'php.ini');
-                return $rs if ($rs != 0);
-
-                my %tag_hash = (
-                        '{PEAR_DIR}' => $pear_dir,
-                        '{WWW_DIR}'  => $www_dir,
-                        '{DMN_NAME}' => $dmn_name
-                );
-                ($rs, $cfg) = prep_tpl(\%tag_hash, $ini_tpl);
-                return $rs if ($rs != 0);
-
-                ($rs, $rdata) = store_file("$starter_dir/$dmn_name/php5/php.ini", $cfg, $sys_user, $sys_group, 0640);
-                return $rs if ($rs != 0);
@@ -1882 +1864 @@
-                return $rs if ($rs != 0);
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#
+#
+#
+
+#
+#
+
+#
+#
+#
+#
+#
+#
+#
+
+#
+#
+#
-
-        push_el(\@main::el, 'dmn_change_httpd_file_data()', 'Ending...');

trunk/engine/setup/ispcp-setup

@@ -199 +199 @@
-
-        do {
-                $rs = ask_php_version();
-        } while ($rs == 1);
-
-        do {
-                $rs = ask_second_dns();
-        } while ($rs == 1);

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

@@ -397 +397 @@
-
-sub ask_second_dns {
-php_version
+second_dns
-
-        my $rdata = undef;
@@ -420 +420 @@
-        }
-
-php_version
+second_dns
-        return 0;
-}
-
-sub ask_mysql_prefix {
-php_version
+mysql_prefix
-
-        my $rdata = undef;
@@ -454 +454 @@
-        }
-
-php_version
+mysql_prefix
-        return 0;
-}
@@ -579 +579 @@
-
-        push_el(\@main::el, 'ask_awstats_dyn()', 'Ending...');
-        return 0;
-}
-
-# Set up PHP Version
-sub ask_php_version {
-
-        my $rdata = undef;
-
-        push_el(\@main::el, 'ask_php_version()', 'Starting...');
-
-        my $qmsg = "\n\tUse which PHP Version? (4 or 5). [5]: ";
-
-        print STDOUT $qmsg;
-
-        $rdata = readline(\*STDIN);
-        chop($rdata);
-
-        if (!defined($rdata) || $rdata eq '') {
-                $main::ua{'php_version'} = '5';
-        }
-        else {
-                if ($rdata eq 'php4' || $rdata eq '4') {
-                        $main::ua{'php_version'} = '4';
-                }
-                elsif ($rdata eq 'php5' || $rdata eq '5') {
-                        $main::ua{'php_version'} = '5';
-                }
-                else {
-                        print STDOUT "\n\tOnly 'php(4)' and 'php(5)' are allowed!";
-                        return 1;
-                }
-        }
-
-        push_el(\@main::el, 'ask_php_version()', 'Ending...');
-        return 0;
-}
@@ -1068 +1034 @@
-
-        ## PHP4 Starter
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#
+#
+
+#
+#
+#
+#
+#
+
+#
+#
+
+#
+#
+
+#
+#
+#
-
-        ## PHP5 Starter
@@ -1108 +1074 @@
-
-        ## php4.ini
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#
+#
+
+#
+
+#
+#
+#
+
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+
+#
+#
+
+#
+
+#
-
-        ## php5.ini

trunk/engine/setup/ispcp-update

@@ -780 +780 @@
-        print STDOUT "\tUpgrading system values ...";
-
-        # PHP Version
-        do {
-                $rs = ask_php_version();
-        } while ($rs == 1);
-
-        # AWStats questions
-        do {

trunk/gui/include/calc-functions.php

@@ -92 +92 @@
-//
-
+/**
+ * Generates a random salt for passwords.
+ *
+ * @param int $min minimum ASCII char
+ * @param int $max maximum ASCII char
+ * @return string Salt for password
+ */
+function generate_rand_salt($min = 46, $max = 126) {
+    if (CRYPT_BLOWFISH == 1) {
+        $length = 13;
+        $pre    = '$2$';
+    } elseif (CRYPT_MD5 == 1) {
+        $length = 9;
+        $pre    = '$1$';
+    } elseif (CRYPT_EXT_DES == 1) {
+        $length = 9;
+        $pre    = '';
+    } elseif (CRYPT_STD_DES == 1) {
+        $length = 2;
+        $pre    = '';
+    }
+
+    $salt = $pre;
+
+    for($i = 0; $i < $length; $i++) {
+        $salt .= chr(mt_rand($min, $max));
+    }
+
+    return $salt;
+}
+
-function get_salt_from($data) {
-    $salt = substr($data, 0, 2);
@@ -102 +133 @@
-}
-
+/**
+ * Encryptes the FTP user password.
+ *
+ * @param string $data the password in clear text
+ * @return string the password encrypted with salt
+ */
-function crypt_user_ftp_pass($data) {
-
+, generate_rand_salt()
-    return $res;
-}

trunk/gui/reseller/reseller_user_statistics.php

@@ -114 +114 @@
-            admin_name ASC
-        LIMIT
-?, ?
+$start_index, $rows_per_page
-SQL_QUERY;
-
-, $start_index, $rows_per_page
+
-        $tpl->assign(
-                        array(