Commit 00dfbafa authored by redray's avatar redray
Browse files

charset corrections

parent 141f4cfa
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
//* Main //* Main
$conf['language'] = 'en'; $conf['language'] = 'en';
$conf['distname'] = 'centos52'; $conf['distname'] = 'centos52';
$conf['hostname'] = 'server1.example.com'; // Full hostname $conf['hostname'] = 'server1.domain.tld'; // Full hostname
$conf['ispconfig_install_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_install_dir'] = '/usr/local/ispconfig';
$conf['ispconfig_config_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_config_dir'] = '/usr/local/ispconfig';
$conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error $conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error
...@@ -24,6 +24,7 @@ $conf['mysql']['port'] = '3306'; ...@@ -24,6 +24,7 @@ $conf['mysql']['port'] = '3306';
$conf['mysql']['database'] = 'dbispconfig'; $conf['mysql']['database'] = 'dbispconfig';
$conf['mysql']['admin_user'] = 'root'; $conf['mysql']['admin_user'] = 'root';
$conf['mysql']['admin_password'] = ''; $conf['mysql']['admin_password'] = '';
$conf['mysql']['charset'] = 'utf8';
$conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_user'] = 'ispconfig';
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand())); $conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
//* Main //* Main
$conf['language'] = 'en'; $conf['language'] = 'en';
$conf['distname'] = 'debian40'; $conf['distname'] = 'debian40';
$conf['hostname'] = 'server1.example.com'; // Full hostname $conf['hostname'] = 'server1.domain.tld'; // Full hostname
$conf['ispconfig_install_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_install_dir'] = '/usr/local/ispconfig';
$conf['ispconfig_config_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_config_dir'] = '/usr/local/ispconfig';
$conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error $conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error
...@@ -24,6 +24,7 @@ $conf['mysql']['port'] = '3306'; ...@@ -24,6 +24,7 @@ $conf['mysql']['port'] = '3306';
$conf['mysql']['database'] = 'dbispconfig'; $conf['mysql']['database'] = 'dbispconfig';
$conf['mysql']['admin_user'] = 'root'; $conf['mysql']['admin_user'] = 'root';
$conf['mysql']['admin_password'] = ''; $conf['mysql']['admin_password'] = '';
$conf['mysql']['charset'] = 'utf8';
$conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_user'] = 'ispconfig';
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand())); $conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
//* Main //* Main
$conf['language'] = 'en'; $conf['language'] = 'en';
$conf['distname'] = 'fedora9'; $conf['distname'] = 'fedora9';
$conf['hostname'] = 'server1.example.com'; // Full hostname $conf['hostname'] = 'server1.domain.tld'; // Full hostname
$conf['ispconfig_install_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_install_dir'] = '/usr/local/ispconfig';
$conf['ispconfig_config_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_config_dir'] = '/usr/local/ispconfig';
$conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error $conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error
...@@ -24,6 +24,7 @@ $conf['mysql']['port'] = '3306'; ...@@ -24,6 +24,7 @@ $conf['mysql']['port'] = '3306';
$conf['mysql']['database'] = 'dbispconfig'; $conf['mysql']['database'] = 'dbispconfig';
$conf['mysql']['admin_user'] = 'root'; $conf['mysql']['admin_user'] = 'root';
$conf['mysql']['admin_password'] = ''; $conf['mysql']['admin_password'] = '';
$conf['mysql']['charset'] = 'utf8';
$conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_user'] = 'ispconfig';
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand())); $conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
//* Main //* Main
$conf['language'] = 'en'; $conf['language'] = 'en';
$conf['distname'] = 'opensuse110'; $conf['distname'] = 'opensuse110';
$conf['hostname'] = 'server1.example.com'; // Full hostname $conf['hostname'] = 'server1.domain.tld'; // Full hostname
$conf['ispconfig_install_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_install_dir'] = '/usr/local/ispconfig';
$conf['ispconfig_config_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_config_dir'] = '/usr/local/ispconfig';
$conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error $conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error
...@@ -24,6 +24,7 @@ $conf['mysql']['port'] = '3306'; ...@@ -24,6 +24,7 @@ $conf['mysql']['port'] = '3306';
$conf['mysql']['database'] = 'dbispconfig'; $conf['mysql']['database'] = 'dbispconfig';
$conf['mysql']['admin_user'] = 'root'; $conf['mysql']['admin_user'] = 'root';
$conf['mysql']['admin_password'] = ''; $conf['mysql']['admin_password'] = '';
$conf['mysql']['charset'] = 'utf8';
$conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_user'] = 'ispconfig';
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand())); $conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
......
...@@ -32,9 +32,6 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -32,9 +32,6 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
ISPConfig 3 installer. ISPConfig 3 installer.
*/ */
//** Check for existing installation
//if(is_dir("/usr/local/ispconfig")) die('We will stop here. There is already a ISPConfig installation, use the update script to update this installation.');
error_reporting(E_ALL|E_STRICT); error_reporting(E_ALL|E_STRICT);
//** The banner on the command line //** The banner on the command line
...@@ -56,20 +53,25 @@ require_once('lib/install.lib.php'); ...@@ -56,20 +53,25 @@ require_once('lib/install.lib.php');
//** Include the base class of the installer class //** Include the base class of the installer class
require_once('lib/installer_base.lib.php'); require_once('lib/installer_base.lib.php');
//** Install logfile
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
//** Check for existing installation
/*if(is_dir("/usr/local/ispconfig")) {
die('We will stop here. There is already a ISPConfig installation, use the update script to update this installation.');
}*/
//** Get distribution identifier //** Get distribution identifier
$dist = get_distname(); $dist = get_distname();
if($dist['id'] == '') die('Linux Dustribution or Version not recognized.'); if($dist['id'] == '') die('Linux Distribution or Version not recognized.');
//** Include the distribution specific installer class library and configuration //** Include the distribution specific installer class library and configuration
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php'); if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
include_once('dist/lib/'.$dist['id'].'.lib.php'); include_once('dist/lib/'.$dist['id'].'.lib.php');
include_once('dist/conf/'.$dist['id'].'.conf.php'); include_once('dist/conf/'.$dist['id'].'.conf.php');
//** Install logfile
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
//**************************************************************************************************** //****************************************************************************************************
//** Installer Interface //** Installer Interface
//**************************************************************************************************** //****************************************************************************************************
...@@ -97,7 +99,7 @@ $install_mode = $inst->simple_query('Installation mode', array('Standard','Exper ...@@ -97,7 +99,7 @@ $install_mode = $inst->simple_query('Installation mode', array('Standard','Exper
//** Get the hostname //** Get the hostname
$tmp_out = array(); $tmp_out = array();
exec('hostname -f', $tmp_out); exec('hostname -f', $tmp_out);
$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg foo.example.com ', $tmp_out[0]); $conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg server1.domain.tld ', $tmp_out[0]);
unset($tmp_out); unset($tmp_out);
//** Get MySQL root credentials //** Get MySQL root credentials
...@@ -107,6 +109,7 @@ do { ...@@ -107,6 +109,7 @@ do {
$tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user']); $tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user']);
$tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']); $tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
$tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']); $tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']);
$tmp_mysql_server_charset = $inst->free_query('MySQL charset', $conf['mysql']['charset']);
//* Initialize the MySQL server connection //* Initialize the MySQL server connection
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) { if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
...@@ -114,6 +117,7 @@ do { ...@@ -114,6 +117,7 @@ do {
$conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user; $conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;
$conf['mysql']['admin_password'] = $tmp_mysql_server_admin_password; $conf['mysql']['admin_password'] = $tmp_mysql_server_admin_password;
$conf['mysql']['database'] = $tmp_mysql_server_database; $conf['mysql']['database'] = $tmp_mysql_server_database;
$conf['mysql']['charset'] = $tmp_mysql_server_charset;
$finished = true; $finished = true;
} else { } else {
swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error()); swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
......
...@@ -119,7 +119,7 @@ class installer_base { ...@@ -119,7 +119,7 @@ class installer_base {
$cf = $conf['mysql']; // make $conf['mysql'] more accessible $cf = $conf['mysql']; // make $conf['mysql'] more accessible
//** Create the database //** Create the database
if(!$this->db->query('CREATE DATABASE IF NOT EXISTS '.$cf['database'])) { if(!$this->db->query('CREATE DATABASE IF NOT EXISTS '.$cf['database'].' DEFAULT CHARACTER SET '.$cf['charset'])) {
$this->error('Unable to create MySQL database: '.$cf['database'].'.'); $this->error('Unable to create MySQL database: '.$cf['database'].'.');
} }
...@@ -132,10 +132,10 @@ class installer_base { ...@@ -132,10 +132,10 @@ class installer_base {
$this->error('Stopped: Database already contains some tables.'); $this->error('Stopped: Database already contains some tables.');
} else { } else {
if($cf['admin_password'] == '') { if($cf['admin_password'] == '') {
caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", caselog("mysql --default-character-set=".$cf['charset']." -h '".$cf['host']."' -u '".$cf['admin_user']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql'); __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
} else { } else {
caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' -p'".$cf['admin_password']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", caselog("mysql --default-character-set=".$cf['charset']." -h '".$cf['host']."' -u '".$cf['admin_user']."' -p'".$cf['admin_password']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql'); __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
} }
$db_tables = $this->db->getTables(); $db_tables = $this->db->getTables();
......
...@@ -29,18 +29,19 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -29,18 +29,19 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
class db class db
{ {
var $dbHost = ""; // hostname of the MySQL server var $dbHost = ""; // hostname of the MySQL server
var $dbName = ""; // logical database name on that server var $dbName = ""; // logical database name on that server
var $dbUser = ""; // database authorized user var $dbUser = ""; // database authorized user
var $dbPass = ""; // user's password var $dbPass = ""; // user's password
var $linkId = 0; // last result of mysql_connect() var $dbCharset = ""; // what charset comes and goes to mysql: utf8 / latin1
var $queryId = 0; // last result of mysql_query() var $linkId = 0; // last result of mysql_connect()
var $record = array(); // last record fetched var $queryId = 0; // last result of mysql_query()
var $autoCommit = 1; // Autocommit Transactions var $record = array(); // last record fetched
var $currentRow; // current row number var $autoCommit = 1; // Autocommit Transactions
var $errorNumber = 0; // last error number var $currentRow; // current row number
var $errorMessage = ""; // last error message var $errorNumber = 0; // last error number
var $errorLocation = "";// last error location var $errorMessage = ""; // last error message
var $errorLocation = ""; // last error location
var $show_error_messages = false; var $show_error_messages = false;
// constructor // constructor
...@@ -52,6 +53,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -52,6 +53,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//$this->dbName = $conf["mysql"]["database"]; //$this->dbName = $conf["mysql"]["database"];
$this->dbUser = $conf["mysql"]["admin_user"]; $this->dbUser = $conf["mysql"]["admin_user"];
$this->dbPass = $conf["mysql"]["admin_password"]; $this->dbPass = $conf["mysql"]["admin_password"];
$this->dbCharset = $conf["mysql"]["charset"];
//$this->connect(); //$this->connect();
} }
...@@ -79,6 +81,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -79,6 +81,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
$this->updateError('DB::connect()<br />mysql_connect'); $this->updateError('DB::connect()<br />mysql_connect');
return false; return false;
} }
$this->queryId = @mysql_query('SET NAMES '.$this->dbCharset, $this->linkId);
} }
return true; return true;
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
$conf['language'] = 'en'; $conf['language'] = 'en';
$conf['distname'] = 'debian40'; $conf['distname'] = 'debian40';
$conf['hostname'] = 'server1.example.com'; // Full hostname $conf['hostname'] = 'server1.domain.tld'; // Full hostname
$conf['ispconfig_install_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_install_dir'] = '/usr/local/ispconfig';
$conf['ispconfig_config_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_config_dir'] = '/usr/local/ispconfig';
$conf['server_id'] = 1; $conf['server_id'] = 1;
...@@ -18,6 +18,7 @@ $conf['mysql']['port'] = '3306'; ...@@ -18,6 +18,7 @@ $conf['mysql']['port'] = '3306';
$conf['mysql']['database'] = 'dbispconfig'; $conf['mysql']['database'] = 'dbispconfig';
$conf['mysql']['admin_user'] = 'root'; $conf['mysql']['admin_user'] = 'root';
$conf['mysql']['admin_password'] = ''; $conf['mysql']['admin_password'] = '';
$conf['mysql']['charset'] = 'utf8';
$conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_user'] = 'ispconfig';
$conf['mysql']['ispconfig_password'] = '5sDrewBhk'; $conf['mysql']['ispconfig_password'] = '5sDrewBhk';
......
-- phpMyAdmin SQL Dump
-- version 2.9.0.3 -- ISPConfig 3
-- http://www.phpmyadmin.net -- DB-Version: 3.0.0.8
--
-- Host: localhost -- --------------------------------------------------------
-- Erstellungszeit: 29. Juni 2007 um 16:37
-- Server Version: 5.0.24
-- PHP-Version: 5.1.4
-- --
-- Datenbank: `ispconfig3` -- Datenbank: `ispconfig_v3`
-- --
-- -------------------------------------------------------- -- --------------------------------------------------------
...@@ -36,7 +34,7 @@ CREATE TABLE `client` ( ...@@ -36,7 +34,7 @@ CREATE TABLE `client` (
`mobile` varchar(255) default NULL, `mobile` varchar(255) default NULL,
`fax` varchar(255) default NULL, `fax` varchar(255) default NULL,
`email` varchar(255) default NULL, `email` varchar(255) default NULL,
`internet` varchar(255) NOT NULL default 'http://', `internet` varchar(255) NOT NULL,
`icq` varchar(255) default NULL, `icq` varchar(255) default NULL,
`notes` text, `notes` text,
`default_mailserver` int(11) NOT NULL default '1', `default_mailserver` int(11) NOT NULL default '1',
...@@ -71,7 +69,7 @@ CREATE TABLE `client` ( ...@@ -71,7 +69,7 @@ CREATE TABLE `client` (
`language` varchar(255) NOT NULL default 'en', `language` varchar(255) NOT NULL default 'en',
`usertheme` varchar(255) NOT NULL default 'default', `usertheme` varchar(255) NOT NULL default 'default',
PRIMARY KEY (`client_id`) PRIMARY KEY (`client_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --
-- Daten fr Tabelle `client` -- Daten fr Tabelle `client`
...@@ -101,7 +99,7 @@ CREATE TABLE `dns_rr` ( ...@@ -101,7 +99,7 @@ CREATE TABLE `dns_rr` (
`active` enum('N','Y') NOT NULL default 'Y', `active` enum('N','Y') NOT NULL default 'Y',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `rr` (`zone`,`name`,`type`,`data`) UNIQUE KEY `rr` (`zone`,`name`,`type`,`data`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- -------------------------------------------------------- -- --------------------------------------------------------
...@@ -131,7 +129,7 @@ CREATE TABLE `dns_soa` ( ...@@ -131,7 +129,7 @@ CREATE TABLE `dns_soa` (
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `origin` (`origin`), UNIQUE KEY `origin` (`origin`),
KEY `active` (`active`) KEY `active` (`active`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- -------------------------------------------------------- -- --------------------------------------------------------
...@@ -151,7 +149,7 @@ CREATE TABLE `dns_template` ( ...@@ -151,7 +149,7 @@ CREATE TABLE `dns_template` (
`template` text, `template` text,
`visible` varchar(255) NOT NULL default 'Y', `visible` varchar(255) NOT NULL default 'Y',
PRIMARY KEY (`template_id`) PRIMARY KEY (`template_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ; ) ENGINE=MyISAM AUTO_INCREMENT=3 ;
-- --
-- Daten fr Tabelle `dns_template` -- Daten fr Tabelle `dns_template`
...@@ -180,7 +178,7 @@ CREATE TABLE `firewall` ( ...@@ -180,7 +178,7 @@ CREATE TABLE `firewall` (
`udp_port` varchar(255) default NULL, `udp_port` varchar(255) default NULL,
`active` varchar(255) NOT NULL default 'y', `active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`firewall_id`) PRIMARY KEY (`firewall_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --
-- Daten fr Tabelle `firewall` -- Daten fr Tabelle `firewall`
...@@ -219,7 +217,7 @@ CREATE TABLE `ftp_user` ( ...@@ -219,7 +217,7 @@ CREATE TABLE `ftp_user` (
KEY `server_id` (`server_id`), KEY `server_id` (`server_id`),
KEY `username` (`username`), KEY `username` (`username`),
KEY `quota_files` (`quota_files`) KEY `quota_files` (`quota_files`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --
-- Daten fr Tabelle `ftp_user` -- Daten fr Tabelle `ftp_user`
...@@ -246,7 +244,7 @@ CREATE TABLE `mail_access` ( ...@@ -246,7 +244,7 @@ CREATE TABLE `mail_access` (
`active` enum('n','y') NOT NULL default 'y', `active` enum('n','y') NOT NULL default 'y',
PRIMARY KEY (`access_id`), PRIMARY KEY (`access_id`),
KEY `server_id` (`server_id`,`source`) KEY `server_id` (`server_id`,`source`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --
-- Daten fr Tabelle `mail_access` -- Daten fr Tabelle `mail_access`
...@@ -273,7 +271,7 @@ CREATE TABLE `mail_content_filter` ( ...@@ -273,7 +271,7 @@ CREATE TABLE `mail_content_filter` (
`action` varchar(255) default NULL, `action` varchar(255) default NULL,
`active` varchar(255) NOT NULL default 'y', `active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`content_filter_id`) PRIMARY KEY (`content_filter_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- -------------------------------------------------------- -- --------------------------------------------------------
...@@ -294,7 +292,7 @@ CREATE TABLE `mail_domain` ( ...@@ -294,7 +292,7 @@ CREATE TABLE `mail_domain` (
PRIMARY KEY (`domain_id`), PRIMARY KEY (`domain_id`),
KEY `server_id` (`server_id`,`domain`), KEY `server_id` (`server_id`,`domain`),
KEY `domain_active` (`domain`,`active`) KEY `domain_active` (`domain`,`active`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --
-- Daten fr Tabelle `mail_domain` -- Daten fr Tabelle `mail_domain`
...@@ -321,7 +319,7 @@ CREATE TABLE `mail_forwarding` ( ...@@ -321,7 +319,7 @@ CREATE TABLE `mail_forwarding` (
`active` enum('y','n') NOT NULL, `active` enum('y','n') NOT NULL,
PRIMARY KEY (`forwarding_id`), PRIMARY KEY (`forwarding_id`),
KEY `server_id` (`server_id`,`source`) KEY `server_id` (`server_id`,`source`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --
-- Daten fr Tabelle `mail_forwarding` -- Daten fr Tabelle `mail_forwarding`
...@@ -350,7 +348,7 @@ CREATE TABLE `mail_get` ( ...@@ -350,7 +348,7 @@ CREATE TABLE `mail_get` (
`destination` varchar(255) default NULL, `destination` varchar(255) default NULL,
`active` varchar(255) NOT NULL default 'y', `active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`mailget_id`) PRIMARY KEY (`mailget_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --
-- Daten fr Tabelle `mail_get` -- Daten fr Tabelle `mail_get`
...@@ -372,7 +370,7 @@ CREATE TABLE `mail_greylist` ( ...@@ -372,7 +370,7 @@ CREATE TABLE `mail_greylist` (
`origin_type` enum('MANUAL','AUTO') NOT NULL default 'AUTO', `origin_type` enum('MANUAL','AUTO') NOT NULL default 'AUTO',
`create_time` datetime NOT NULL default '0000-00-00 00:00:00', `create_time` datetime NOT NULL default '0000-00-00 00:00:00',
PRIMARY KEY (`greylist_id`) PRIMARY KEY (`greylist_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --
-- Daten fr Tabelle `mail_greylist` -- Daten fr Tabelle `mail_greylist`
...@@ -394,7 +392,7 @@ CREATE TABLE `mail_mailman_domain` ( ...@@ -394,7 +392,7 @@ CREATE TABLE `mail_mailman_domain` (
`mm_user` varchar(50) NOT NULL default '', `mm_user` varchar(50) NOT NULL default '',
`mm_group` varchar(50) NOT NULL default '', `mm_group` varchar(50) NOT NULL default '',
PRIMARY KEY (`mailman_id`,`server_id`,`domain`) PRIMARY KEY (`mailman_id`,`server_id`,`domain`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --
-- Daten fr Tabelle `mail_mailman_domain` -- Daten fr Tabelle `mail_mailman_domain`
...@@ -413,7 +411,7 @@ CREATE TABLE `mail_traffic` ( ...@@ -413,7 +411,7 @@ CREATE TABLE `mail_traffic` (
`traffic` bigint(20) unsigned NOT NULL, `traffic` bigint(20) unsigned NOT NULL,
PRIMARY KEY (`traffic_id`), PRIMARY KEY (`traffic_id`),
KEY `mailuser_id` (`mailuser_id`,`month`) KEY `mailuser_id` (`mailuser_id`,`month`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; ) ENGINE=MyISAM AUTO_INCREMENT=2 ;
-- --
-- Daten fr Tabelle `mail_traffic` -- Daten fr Tabelle `mail_traffic`
...@@ -441,7 +439,7 @@ CREATE TABLE `mail_transport` ( ...@@ -441,7 +439,7 @@ CREATE TABLE `mail_transport` (
PRIMARY KEY (`transport_id`), PRIMARY KEY (`transport_id`),
KEY `server_id` (`server_id`,`transport`), KEY `server_id` (`server_id`,`transport`),
KEY `server_id_2` (`server_id`,`domain`) KEY `server_id_2` (`server_id`,`domain`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --
-- Daten fr Tabelle `mail_transport` -- Daten fr Tabelle `mail_transport`
...@@ -480,7 +478,7 @@ CREATE TABLE `mail_user` ( ...@@ -480,7 +478,7 @@ CREATE TABLE `mail_user` (
PRIMARY KEY (`mailuser_id`), PRIMARY KEY (`mailuser_id`),
KEY `server_id` (`server_id`,`email`), KEY `server_id` (`server_id`,`email`),
KEY `email_access` (`email`,`access`) KEY `email_access` (`email`,`access`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --
-- Daten fr Tabelle `mail_user` -- Daten fr Tabelle `mail_user`
...@@ -509,7 +507,7 @@ CREATE TABLE `mail_user_filter` ( ...@@ -509,7 +507,7 @@ CREATE TABLE `mail_user_filter` (
`target` varchar(255) default NULL, `target` varchar(255) default NULL,
`active` varchar(255) NOT NULL default 'y', `active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`filter_id`) PRIMARY KEY (`filter_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- -------------------------------------------------------- -- --------------------------------------------------------
...@@ -523,7 +521,7 @@ CREATE TABLE `remote_session` ( ...@@ -523,7 +521,7 @@ CREATE TABLE `remote_session` (
`remote_functions` text NOT NULL, `remote_functions` text NOT NULL,
`tstamp` int(10) unsigned NOT NULL, `tstamp` int(10) unsigned NOT NULL,
PRIMARY KEY (`remote_session`) PRIMARY KEY (`remote_session`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1; ) ENGINE=MyISAM;
-- --
-- Daten fr Tabelle `remote_session` -- Daten fr Tabelle `remote_session`
...@@ -542,7 +540,7 @@ CREATE TABLE `remote_user` ( ...@@ -542,7 +540,7 @@ CREATE TABLE `remote_user` (
`remote_password` varchar(255) NOT NULL,