Changeset 1206

Timestamp:

06/13/08 23:16:11 (4 months ago)

Author:

rats

Message:

* Fixed 1346: client mysql password length
* Fixed #1215: POP/IMAP traffic is not added in domain statistics with courier and fedora core 8
* Fixed #1345: Bug in mail log collection (ispcp-vrl-traff)

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/configs/centos/database/database.sql (modified) (1 diff)
• trunk/configs/debian/database/database.sql (modified) (1 diff)
• trunk/configs/fedora/database/database.sql (modified) (1 diff)
• trunk/configs/freebsd/database/database.sql (modified) (1 diff)
• trunk/configs/gentoo/database/database.sql (modified) (1 diff)
• trunk/configs/openbsd/database/database.sql (modified) (1 diff)
• trunk/configs/opensuse/database/database.sql (modified) (1 diff)
• trunk/configs/redhat/database/database.sql (modified) (1 diff)
• trunk/configs/ubuntu/database/database.sql (modified) (1 diff)
• trunk/engine/setup/ispcp1.0.0rc2-ispcp.sql (modified) (1 diff)
• trunk/engine/setup/ispcp1.0.0rc3-ispcp.sql (modified) (1 diff)
• trunk/engine/setup/vhcs2.4.7-ispcp.sql (modified) (2 diffs)
• trunk/engine/setup/vhcs2.4.8-ispcp.sql (modified) (1 diff)
• trunk/engine/traffic/ispcp-vrl-traff (modified) (2 diffs)
• trunk/gui/client/add_mail_acc.php (modified) (1 diff)
• trunk/gui/include/database-update-functions.php (modified) (3 diffs)

trunk/CHANGELOG

@@ -1 +1 @@
-ispCP ω 1.0.0 Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+2008-06-13 Benedikt Heintel
+        - DATABASES:
+                * Fixed 1346: client mysql password length
+        - ENGINE:
+                * Fixed #1215: POP/IMAP traffic is not added in domain statistics with courier and fedora core 8
+                * Fixed #1345: Bug in mail log collection (ispcp-vrl-traff)
-
-2008-06-12 Benedikt Heintel

trunk/configs/centos/database/database.sql

@@ -523 +523 @@
-  `sqlu_id` int(10) unsigned NOT NULL auto_increment,
-  `sqld_id` int(10) unsigned DEFAULT '0',
-16
-16
+64
+64
-  UNIQUE KEY (`sqlu_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ;

trunk/configs/debian/database/database.sql

@@ -523 +523 @@
-  `sqlu_id` int(10) unsigned NOT NULL auto_increment,
-  `sqld_id` int(10) unsigned DEFAULT '0',
-16
-16
+64
+64
-  UNIQUE KEY (`sqlu_id`)
- 
+
-
--- --------------------------------------------------------

trunk/configs/fedora/database/database.sql

@@ -523 +523 @@
-  `sqlu_id` int(10) unsigned NOT NULL auto_increment,
-  `sqld_id` int(10) unsigned DEFAULT '0',
-16
-16
+64
+64
-  UNIQUE KEY (`sqlu_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ;

trunk/configs/freebsd/database/database.sql

@@ -523 +523 @@
-  `sqlu_id` int(10) unsigned NOT NULL auto_increment,
-  `sqld_id` int(10) unsigned DEFAULT '0',
-16
-16
+64
+64
-  UNIQUE KEY (`sqlu_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ;

trunk/configs/gentoo/database/database.sql

@@ -523 +523 @@
-  `sqlu_id` int(10) unsigned NOT NULL auto_increment,
-  `sqld_id` int(10) unsigned DEFAULT '0',
-16
-16
+64
+64
-  UNIQUE KEY (`sqlu_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ;

trunk/configs/openbsd/database/database.sql

@@ -523 +523 @@
-  `sqlu_id` int(10) unsigned NOT NULL auto_increment,
-  `sqld_id` int(10) unsigned DEFAULT '0',
-16
-16
+64
+64
-  UNIQUE KEY (`sqlu_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ;

trunk/configs/opensuse/database/database.sql

@@ -523 +523 @@
-  `sqlu_id` int(10) unsigned NOT NULL auto_increment,
-  `sqld_id` int(10) unsigned DEFAULT '0',
-16
-16
+64
+64
-  UNIQUE KEY (`sqlu_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ;

trunk/configs/redhat/database/database.sql

@@ -523 +523 @@
-  `sqlu_id` int(10) unsigned NOT NULL auto_increment,
-  `sqld_id` int(10) unsigned DEFAULT '0',
-16
-16
+64
+64
-  UNIQUE KEY (`sqlu_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ;

trunk/configs/ubuntu/database/database.sql

@@ -523 +523 @@
-  `sqlu_id` int(10) unsigned NOT NULL auto_increment,
-  `sqld_id` int(10) unsigned DEFAULT '0',
-16
-16
+64
+64
-  UNIQUE KEY (`sqlu_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ;

trunk/engine/setup/ispcp1.0.0rc2-ispcp.sql

@@ -32 +32 @@
-CHANGE `dtraff_mail` `dtraff_mail` BIGINT UNSIGNED NULL DEFAULT NULL ,
-CHANGE `dtraff_pop` `dtraff_pop` BIGINT UNSIGNED NULL DEFAULT NULL;
+
+ALTER IGNORE TABLE `sql_user` CHANGE `sqlu_name` `sqlu_name` varchar(64) binary DEFAULT 'n/a';
+ALTER IGNORE TABLE `sql_user` CHANGE `sqlu_pass` `sqlu_pass` varchar(64) binary DEFAULT 'n/a';
-
--- Drop existing languages (they are outdated anyways)

trunk/engine/setup/ispcp1.0.0rc3-ispcp.sql

@@ -8 +8 @@
--- BEGIN: Upgrade database structure:
-UPDATE `config` SET `value` = '1' WHERE `name` = 'DATABASE_REVISION' LIMIT 1;
+ALTER IGNORE TABLE `sql_user` CHANGE `sqlu_name` `sqlu_name` varchar(64) binary DEFAULT 'n/a';
+ALTER IGNORE TABLE `sql_user` CHANGE `sqlu_pass` `sqlu_pass` varchar(64) binary DEFAULT 'n/a';
--- END: Upgrade database structure
-

trunk/engine/setup/vhcs2.4.7-ispcp.sql

@@ -73 +73 @@
-CHANGE `dtraff_mail` `dtraff_mail` BIGINT UNSIGNED NULL DEFAULT NULL ,
-CHANGE `dtraff_pop` `dtraff_pop` BIGINT UNSIGNED NULL DEFAULT NULL;
+
+ALTER IGNORE TABLE `sql_user` CHANGE `sqlu_name` `sqlu_name` varchar(64) binary DEFAULT 'n/a';
+ALTER IGNORE TABLE `sql_user` CHANGE `sqlu_pass` `sqlu_pass` varchar(64) binary DEFAULT 'n/a';
-
-ALTER IGNORE TABLE `ftp_group` ADD UNIQUE KEY `groupname` (`groupname`);
@@ -163 +166 @@
--- END: Regenerate config files
-
- 
- 
+
+
--- END: Change to default ispCP Theme :
-

trunk/engine/setup/vhcs2.4.8-ispcp.sql

@@ -45 +45 @@
-CHANGE `dtraff_mail` `dtraff_mail` BIGINT UNSIGNED NULL DEFAULT NULL ,
-CHANGE `dtraff_pop` `dtraff_pop` BIGINT UNSIGNED NULL DEFAULT NULL;
+
+ALTER IGNORE TABLE `sql_user` CHANGE `sqlu_name` `sqlu_name` varchar(64) binary DEFAULT 'n/a';
+ALTER IGNORE TABLE `sql_user` CHANGE `sqlu_pass` `sqlu_pass` varchar(64) binary DEFAULT 'n/a';
-
-ALTER IGNORE TABLE `ftp_group` ADD UNIQUE KEY `groupname` (`groupname`);

trunk/engine/traffic/ispcp-vrl-traff

@@ -341 +341 @@
-                if(exists  $main::cfg{'MAIL_LOG_INC_AMAVIS'} && $main::cfg{'MAIL_LOG_INC_AMAVIS'}) {
-                        # Logs including AMAVIS/SPAMASSASSIN/CLAMAV entries
-
-
+
-                } else {
-                        # Logs not including AMAVIS/SPAMASSASSIN/CLAMAV entries
-          $cmd = "$cat $smtp_delivery_log | $awk '{if (\$5 != \"localhost\" && \$6 != \"localhost\" && \$10 != \"?\"
+                      $cmd = "$cat $smtp_delivery_log | $awk '{if ( \$10 != \"?\" && \$6 !~ /virtual/ && !(\$5 ~ /localhost|127.0.0.1/ && \$6 ~ /localhost|127.0.0.1/)
-                }
-
@@ -499 +498 @@
-
-                # POP3
-
-
-
-
-
+
+
+
+
+
+
-
-        $res = open(F, '<', $pop3_log);

trunk/gui/client/add_mail_acc.php

@@ -398 +398 @@
-        // Not permitted chars
-        if (!chk_password($pass)) {
-ncludes not permitted signs!')
+s shorter than %s signs or includes not permitted signs!'), $cfg['PASSWD_CHARS']
-            return;
-        }

trunk/gui/include/database-update-functions.php

@@ -87 +87 @@
-                // Get the next database update revision
-                $newRevision    = getNextRevision();
-
+
-                // Get the needed function name
-                $functionName   = returnFunctionName($newRevision);
@@ -106 +106 @@
-
-                // Set failedUpdate to true if an databaseUpdate failed
-                    
+
-                        $failedUpdate = true;
-
+
-                // Complete the Transactin and rollback if nessessary
-                $sql->CompleteTrans();
-
+
-                // Display an error if nessessary
-                if($failedUpdate)
@@ -207 +207 @@
-        return $sqlUpd;
-}
+
+/*
+ * Fix for ticket #1346 http://www.isp-control.net/ispcp/ticket/1346 (Benedikt Heintel, 2008-06-13)
+ */
+function _databaseUpdate_5() {
+        $sqlUpd = array();
+
+        $sqlUpd[] = "ALTER IGNORE TABLE `sql_user` CHANGE `sqlu_name` `sqlu_name` varchar(64) binary DEFAULT 'n/a';";
+        $sqlUpd[] = "ALTER IGNORE TABLE `sql_user` CHANGE `sqlu_pass` `sqlu_pass` varchar(64) binary DEFAULT 'n/a';";
+
+        return $sqlUpd;
+}
-?>